From 4ead8259b6a413c6e2255002d5584d77d9f8411c Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Mon, 1 Jun 2020 22:27:39 +0200 Subject: [PATCH 001/260] gcc-arm-embedded: 9-2019-q4-major -> 9-2020-q2-update --- .../compilers/gcc-arm-embedded/9/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/compilers/gcc-arm-embedded/9/default.nix b/pkgs/development/compilers/gcc-arm-embedded/9/default.nix index 8ded47d6e370..98b126e85f88 100644 --- a/pkgs/development/compilers/gcc-arm-embedded/9/default.nix +++ b/pkgs/development/compilers/gcc-arm-embedded/9/default.nix @@ -6,8 +6,8 @@ stdenv.mkDerivation rec { pname = "gcc-arm-embedded"; - version = "9-2019-q4-major"; - subdir = "9-2019q4/RC2.1"; + version = "9-2020-q2-update"; + subdir = "9-2020q2"; suffix = { aarch64-linux = "aarch64-linux"; @@ -18,9 +18,9 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://developer.arm.com/-/media/Files/downloads/gnu-rm/${subdir}/gcc-arm-none-eabi-${version}-${suffix}.tar.bz2"; sha256 = { - aarch64-linux = "1f5b9309006737950b2218250e6bb392e2d68d4f1a764fe66be96e2a78888d83"; - x86_64-darwin = "1249f860d4155d9c3ba8f30c19e7a88c5047923cea17e0d08e633f12408f01f0"; - x86_64-linux = "bcd840f839d5bf49279638e9f67890b2ef3a7c9c7a9b25271e83ec4ff41d177a"; + aarch64-linux = "1b5q2y710hy7lddj8vj3zl54gfl74j30kx3hk3i81zrcbv16ah8z"; + x86_64-darwin = "1ils9z16wrvglh72m428y5irmd36biq79yj86756whib8izbifdv"; + x86_64-linux = "07zi2yr5gvhpbij5pnj49zswb9g2gw7zqp4xwwniqmq477h2xp2s"; }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); }; From 2ced276567a6bb40f5de0daa9804373070b7829d Mon Sep 17 00:00:00 2001 From: Arnout Engelen Date: Tue, 22 Sep 2020 14:26:58 +0200 Subject: [PATCH 002/260] gem: 2020-03-26 -> 2020-09-22 removing the need for a patch, as that PR has now been merged. --- .../audio/pd-plugins/gem/default.nix | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-) diff --git a/pkgs/applications/audio/pd-plugins/gem/default.nix b/pkgs/applications/audio/pd-plugins/gem/default.nix index 2c0d0a24c573..a44ba689a618 100644 --- a/pkgs/applications/audio/pd-plugins/gem/default.nix +++ b/pkgs/applications/audio/pd-plugins/gem/default.nix @@ -15,27 +15,15 @@ stdenv.mkDerivation rec { pname = "gem-unstable"; - # The patch below applies to the latest release (v0.94), but then the build - # fails. I didn't track down what changed between that version and the - # current master that fixes the build on Nix - version = "2020-03-26"; + version = "2020-09-22"; src = fetchFromGitHub { owner = "umlaeute"; repo = "Gem"; - rev = "f38748d71bfca00e4d2b2f31d6c4e3759c03d599"; - sha256 = "0bkky5fk0a836bapslrgzil272iq9y704y7hw254cfq5ffjd4qjy"; + rev = "2edfde4f0587e72ef325e7f53681936dcc19655b"; + sha256 = "0k5sq128wxi2qhaidspkw310pdgysxs47agv09pkjgvch2n4d5dq"; }; - patches = [ - # Update autoconf OpenGL/GLU/GLUT detection scripts - # https://github.com/umlaeute/Gem/pull/251 - (fetchpatch { - url = "https://github.com/umlaeute/Gem/commit/343a486c2b5c3427696f77aeabdff440e6590fc7.diff"; - sha256 = "0gkzxv80rgg8lgp9av5qp6xng3ldhnbjz9d6r7ym784fw8yx41yj"; - }) - ]; - nativeBuildInputs = [ autoreconfHook file From 4d9db3bd4a081a13e5f02b015e8dfa7611e73705 Mon Sep 17 00:00:00 2001 From: Thomas Friese Date: Wed, 23 Sep 2020 08:53:44 +0200 Subject: [PATCH 003/260] bitwig-studio3: 3.2.7 -> 3.2.8 --- pkgs/applications/audio/bitwig-studio/bitwig-studio3.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/bitwig-studio/bitwig-studio3.nix b/pkgs/applications/audio/bitwig-studio/bitwig-studio3.nix index 7e5099f3c318..46c1ce60573a 100644 --- a/pkgs/applications/audio/bitwig-studio/bitwig-studio3.nix +++ b/pkgs/applications/audio/bitwig-studio/bitwig-studio3.nix @@ -2,11 +2,11 @@ bitwig-studio1.overrideAttrs (oldAttrs: rec { name = "bitwig-studio-${version}"; - version = "3.2.7"; + version = "3.2.8"; src = fetchurl { url = "https://downloads.bitwig.com/stable/${version}/bitwig-studio-${version}.deb"; - sha256 = "1mj9kii4bnk5w2p18hypwy8swkpzkaqw98q5fsjq362x4qm0b3py"; + sha256 = "18ldgmnv7bigb4mch888kjpf4abalpiwmlhwd7rjb9qf6p72fhpj"; }; buildInputs = oldAttrs.buildInputs ++ [ xorg.libXtst ]; From 5b934ffccace237cdc1a64b2b9f972efe6ab668d Mon Sep 17 00:00:00 2001 From: Bernard Fortz Date: Wed, 30 Sep 2020 21:26:27 +0200 Subject: [PATCH 004/260] bitwig-studio3: jack dependency fixed --- pkgs/applications/audio/bitwig-studio/bitwig-studio3.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/bitwig-studio/bitwig-studio3.nix b/pkgs/applications/audio/bitwig-studio/bitwig-studio3.nix index 7e5099f3c318..b3ada14ad8ad 100644 --- a/pkgs/applications/audio/bitwig-studio/bitwig-studio3.nix +++ b/pkgs/applications/audio/bitwig-studio/bitwig-studio3.nix @@ -1,4 +1,4 @@ -{ fetchurl, bitwig-studio1, pulseaudio, xorg }: +{ fetchurl, bitwig-studio1, pulseaudio, libjack2, xorg }: bitwig-studio1.overrideAttrs (oldAttrs: rec { name = "bitwig-studio-${version}"; @@ -11,7 +11,7 @@ bitwig-studio1.overrideAttrs (oldAttrs: rec { buildInputs = oldAttrs.buildInputs ++ [ xorg.libXtst ]; - runtimeDependencies = [ pulseaudio ]; + runtimeDependencies = [ pulseaudio libjack2 ]; installPhase = '' ${oldAttrs.installPhase} From 0597e648db13b6119c4f75e3de6fb9943882d036 Mon Sep 17 00:00:00 2001 From: Sam Hofius Date: Fri, 16 Oct 2020 23:28:02 -0400 Subject: [PATCH 005/260] keybase,keybase-gui,kbfs: 5.5.1 -> 5.5.2 --- pkgs/tools/security/keybase/default.nix | 4 ++-- pkgs/tools/security/keybase/gui.nix | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/security/keybase/default.nix b/pkgs/tools/security/keybase/default.nix index ee1cfa9d2a41..af7bc311798e 100644 --- a/pkgs/tools/security/keybase/default.nix +++ b/pkgs/tools/security/keybase/default.nix @@ -6,7 +6,7 @@ buildGoPackage rec { pname = "keybase"; - version = "5.5.1"; + version = "5.5.2"; goPackagePath = "github.com/keybase/client"; subPackages = [ "go/kbnm" "go/keybase" ]; @@ -17,7 +17,7 @@ buildGoPackage rec { owner = "keybase"; repo = "client"; rev = "v${version}"; - sha256 = "03y69zmzbnfay173xkbzvnhh8zjjd2rfnqmpgr0wvh1psn7mgpsh"; + sha256 = "01k50mank6cdc7q3yd8m7xi8vmyklsqlmz7hw17a35lqcsjzy9zj"; }; patches = [ diff --git a/pkgs/tools/security/keybase/gui.nix b/pkgs/tools/security/keybase/gui.nix index 20c1bb8f7f16..0d2928a29c83 100644 --- a/pkgs/tools/security/keybase/gui.nix +++ b/pkgs/tools/security/keybase/gui.nix @@ -4,17 +4,17 @@ , runtimeShell, gsettings-desktop-schemas }: let - versionSuffix = "20200527202541.39ca0071e5"; + versionSuffix = "20201016183637.d4ebf7d999"; in stdenv.mkDerivation rec { pname = "keybase-gui"; - version = "5.5.1"; # Find latest version from https://prerelease.keybase.io/deb/dists/stable/main/binary-amd64/Packages + version = "5.5.2"; # Find latest version from https://prerelease.keybase.io/deb/dists/stable/main/binary-amd64/Packages src = fetchurl { url = "https://s3.amazonaws.com/prerelease.keybase.io/linux_binaries/deb/keybase_${version + "-" + versionSuffix}_amd64.deb"; - sha256 = "1n54a86491aqazqa4rgljbji638nj83ciibqxq46sa2m1php9dfd"; + sha256 = "0qwbqnc6dhfnx3gdwl1lyhdsbclaxpkv3zr3dmxfx1242s64v0c1"; }; nativeBuildInputs = [ From 8ad56944fa000006a057e191f70ff7752c6d540b Mon Sep 17 00:00:00 2001 From: Evan Stoll Date: Sun, 18 Oct 2020 23:06:49 -0400 Subject: [PATCH 006/260] imgbrd-grabber: init at 7.3.2 --- .../graphics/imgbrd-grabber/default.nix | 50 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 52 insertions(+) create mode 100644 pkgs/applications/graphics/imgbrd-grabber/default.nix diff --git a/pkgs/applications/graphics/imgbrd-grabber/default.nix b/pkgs/applications/graphics/imgbrd-grabber/default.nix new file mode 100644 index 000000000000..994f2a10e6cd --- /dev/null +++ b/pkgs/applications/graphics/imgbrd-grabber/default.nix @@ -0,0 +1,50 @@ +{ stdenv +, cmake +, fetchzip +, openssl +, autoPatchelfHook +, makeWrapper +, qtmultimedia +, wrapQtAppsHook +}: +stdenv.mkDerivation rec { + name = "imgbrd-grabber"; + version = "7.3.2"; + + buildInputs = [ + stdenv.cc.cc.lib + openssl + qtmultimedia + ]; + + nativeBuildInputs = [ + autoPatchelfHook + makeWrapper + wrapQtAppsHook + ]; + + installPhase = '' + mkdir -p $out/share/grabber + cp -R * $out/share/grabber + + mkdir -p $out/bin + ln -s $out/share/grabber/Grabber /$out/bin/grabber + + mkdir -p $out/share/applications + mv $out/share/grabber/Grabber.desktop $out/share/applications/ + + ''; + + src = fetchzip { + url = "https://github.com/Bionus/imgbrd-grabber/releases/download/v${version}/Grabber_v${version}.tar.gz"; + sha256 = "05isnqhvcp8ycaj8hx6wn0c3la729mb36dzpmlpxfb1p5dj8p49k"; + }; + + meta = with stdenv.lib; { + homepage = "https://github.com/Bionus/imgbrd-grabber"; + description = "Very customizable imageboard/booru downloader with powerful filenaming features."; + license = licenses.asl20; + platforms = [ "x86_64-linux" ]; + maintainers = with maintainers; [ evanjs ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 850c4243b0d4..166cf8e079dd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21429,6 +21429,8 @@ in img2pdf = with python3Packages; toPythonApplication img2pdf; + imgbrd-grabber = qt5.callPackage ../applications/graphics/imgbrd-grabber { }; + imgcat = callPackage ../applications/graphics/imgcat { }; imgp = python3Packages.callPackage ../applications/graphics/imgp { }; From 99e2f6cb8eb52bc37771f1354e74e419efc7827d Mon Sep 17 00:00:00 2001 From: Evan Stoll Date: Mon, 19 Oct 2020 20:29:30 -0400 Subject: [PATCH 007/260] imgbrd-grabber: build from source --- .../graphics/imgbrd-grabber/default.nix | 91 +++++++++++++------ pkgs/top-level/all-packages.nix | 4 +- 2 files changed, 67 insertions(+), 28 deletions(-) diff --git a/pkgs/applications/graphics/imgbrd-grabber/default.nix b/pkgs/applications/graphics/imgbrd-grabber/default.nix index 994f2a10e6cd..259f40567072 100644 --- a/pkgs/applications/graphics/imgbrd-grabber/default.nix +++ b/pkgs/applications/graphics/imgbrd-grabber/default.nix @@ -1,50 +1,87 @@ { stdenv , cmake -, fetchzip -, openssl -, autoPatchelfHook -, makeWrapper -, qtmultimedia +, fetchFromGitHub , wrapQtAppsHook +, qtmultimedia +, qttools +, qtscript +, qtdeclarative +, qtbase +, autogen +, automake +, makeWrapper +, catch2 +, nodejs +, libpulseaudio +, openssl +, rsync +, typescript }: stdenv.mkDerivation rec { name = "imgbrd-grabber"; + version = "7.3.2"; + src = fetchFromGitHub { + owner = "Bionus"; + repo = "imgbrd-grabber"; + rev = "v${version}"; + sha256 = "053rwvcr88fcba0447a6r115cgnqsm9rl066z8d5jacqnhdij58k"; + fetchSubmodules = true; + }; buildInputs = [ - stdenv.cc.cc.lib openssl - qtmultimedia + makeWrapper + libpulseaudio + typescript ]; nativeBuildInputs = [ - autoPatchelfHook - makeWrapper + qtmultimedia + qtbase + qtdeclarative + qttools + nodejs + cmake wrapQtAppsHook ]; - installPhase = '' - mkdir -p $out/share/grabber - cp -R * $out/share/grabber + extraOutputsToLink = [ "doc" ]; - mkdir -p $out/bin - ln -s $out/share/grabber/Grabber /$out/bin/grabber + postPatch = '' + # the package.sh script provides some install helpers + # using this might make it easier to maintain/less likely for the + # install phase to fail across version bumps + patchShebangs ./scripts/package.sh - mkdir -p $out/share/applications - mv $out/share/grabber/Grabber.desktop $out/share/applications/ + # ensure the script uses the rsync package from nixpkgs + substituteInPlace ../scripts/package.sh --replace "rsync" "${rsync}/bin/rsync" + + # the npm build step only runs typescript + # run this step directly so it doesn't try and fail to download the unnecessary node_modules, etc. + substituteInPlace ./sites/CMakeLists.txt --replace "npm install" "npm run build" + + # remove the vendored catch2 + rm -rf tests/src/vendor/catch + + # link the catch2 sources from nixpkgs + ln -sf ${catch2.src} tests/src/vendor/catch ''; - src = fetchzip { - url = "https://github.com/Bionus/imgbrd-grabber/releases/download/v${version}/Grabber_v${version}.tar.gz"; - sha256 = "05isnqhvcp8ycaj8hx6wn0c3la729mb36dzpmlpxfb1p5dj8p49k"; - }; + postInstall = '' + # move the binaries to the share/Grabber folder so + # some relative links can be resolved (e.g. settings.ini) + mv $out/bin/* $out/share/Grabber/ + + cd ../.. + # run the package.sh with $out/share/Grabber as the $APP_DIR + sh ./scripts/package.sh $out/share/Grabber - meta = with stdenv.lib; { - homepage = "https://github.com/Bionus/imgbrd-grabber"; - description = "Very customizable imageboard/booru downloader with powerful filenaming features."; - license = licenses.asl20; - platforms = [ "x86_64-linux" ]; - maintainers = with maintainers; [ evanjs ]; - }; + # add symlinks for the binaries to $out/bin + ln -s $out/share/Grabber/Grabber $out/bin/Grabber + ln -s $out/share/Grabber/Grabber-cli $out/bin/Grabber-cli + ''; + + sourceRoot = "source/src"; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 166cf8e079dd..fbac860828b8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21429,7 +21429,9 @@ in img2pdf = with python3Packages; toPythonApplication img2pdf; - imgbrd-grabber = qt5.callPackage ../applications/graphics/imgbrd-grabber { }; + imgbrd-grabber = qt5.callPackage ../applications/graphics/imgbrd-grabber/default.nix { + typescript = nodePackages.typescript; + }; imgcat = callPackage ../applications/graphics/imgcat { }; From 80d34ab9a4822c2ede2642274ce2af5cc25d2897 Mon Sep 17 00:00:00 2001 From: Evan Stoll Date: Mon, 19 Oct 2020 20:52:25 -0400 Subject: [PATCH 008/260] Remove trailing whitespace --- pkgs/applications/graphics/imgbrd-grabber/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/graphics/imgbrd-grabber/default.nix b/pkgs/applications/graphics/imgbrd-grabber/default.nix index 259f40567072..883279511162 100644 --- a/pkgs/applications/graphics/imgbrd-grabber/default.nix +++ b/pkgs/applications/graphics/imgbrd-grabber/default.nix @@ -70,10 +70,10 @@ stdenv.mkDerivation rec { ''; postInstall = '' - # move the binaries to the share/Grabber folder so + # move the binaries to the share/Grabber folder so # some relative links can be resolved (e.g. settings.ini) mv $out/bin/* $out/share/Grabber/ - + cd ../.. # run the package.sh with $out/share/Grabber as the $APP_DIR sh ./scripts/package.sh $out/share/Grabber diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fbac860828b8..54fd9d260d87 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21429,7 +21429,7 @@ in img2pdf = with python3Packages; toPythonApplication img2pdf; - imgbrd-grabber = qt5.callPackage ../applications/graphics/imgbrd-grabber/default.nix { + imgbrd-grabber = qt5.callPackage ../applications/graphics/imgbrd-grabber/default.nix { typescript = nodePackages.typescript; }; From 04bac4958cd5034df19709e4bdd1954326b1f583 Mon Sep 17 00:00:00 2001 From: Evan Stoll Date: Mon, 19 Oct 2020 22:42:34 -0400 Subject: [PATCH 009/260] Remove trailing whitespace --- pkgs/applications/graphics/imgbrd-grabber/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/graphics/imgbrd-grabber/default.nix b/pkgs/applications/graphics/imgbrd-grabber/default.nix index 883279511162..f07db4c5c4a6 100644 --- a/pkgs/applications/graphics/imgbrd-grabber/default.nix +++ b/pkgs/applications/graphics/imgbrd-grabber/default.nix @@ -75,7 +75,7 @@ stdenv.mkDerivation rec { mv $out/bin/* $out/share/Grabber/ cd ../.. - # run the package.sh with $out/share/Grabber as the $APP_DIR + # run the package.sh with $out/share/Grabber as the $APP_DIR sh ./scripts/package.sh $out/share/Grabber # add symlinks for the binaries to $out/bin From 3e28aad1624b491d4a48509729ad69c9cbaaf344 Mon Sep 17 00:00:00 2001 From: Spencer Baugh Date: Fri, 4 Sep 2020 16:49:12 -0400 Subject: [PATCH 010/260] pythonPackages.pdoc3: init at 0.9.1 Seems broken on 3.6, hence the disabled = pythonOlder "3.7". --- .../python-modules/pdoc3/default.nix | 28 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 30 insertions(+) create mode 100644 pkgs/development/python-modules/pdoc3/default.nix diff --git a/pkgs/development/python-modules/pdoc3/default.nix b/pkgs/development/python-modules/pdoc3/default.nix new file mode 100644 index 000000000000..e1f68109c055 --- /dev/null +++ b/pkgs/development/python-modules/pdoc3/default.nix @@ -0,0 +1,28 @@ +{ lib, buildPythonPackage, fetchPypi +, pythonOlder +, Mako +, markdown +, setuptools-git +, setuptools_scm +}: + +buildPythonPackage rec { + pname = "pdoc3"; + version = "0.9.1"; + disabled = pythonOlder "3.7"; + + src = fetchPypi { + inherit pname version; + sha256 = "15482rvpg5r70gippj3nbl58x9plgmgvp0rg4xi4dpdqhma8v171"; + }; + + nativeBuildInputs = [ setuptools-git setuptools_scm ]; + propagatedBuildInputs = [ Mako markdown ]; + + meta = with lib; { + description = "Auto-generate API documentation for Python projects."; + homepage = "https://pdoc3.github.io/pdoc/"; + license = with licenses; [ agpl3Plus ]; + maintainers = with maintainers; [ catern ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 6d2d7bed26f1..2543eced3bec 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4392,6 +4392,8 @@ in { pdfx = callPackage ../development/python-modules/pdfx { }; + pdoc3 = callPackage ../development/python-modules/pdoc3 { }; + pecan = callPackage ../development/python-modules/pecan { }; peewee = callPackage ../development/python-modules/peewee { }; From 3f92a7e12380f9373e382c5c383905bae407bdca Mon Sep 17 00:00:00 2001 From: Spencer Baugh Date: Tue, 27 Oct 2020 14:49:47 -0400 Subject: [PATCH 011/260] groff: fix PDF manpage building with -Tpdf/gropdf These files are pure data, just fonts; they shouldn't have been moved to the "perl" output, because the Perl programs (namely, gropdf) use them from the main "out" output. These files don't contain any references to more dependencies (Perl or otherwise), so they don't bloat the closure. And the files themselves are small; 276K total as of this commit. --- pkgs/tools/text/groff/default.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pkgs/tools/text/groff/default.nix b/pkgs/tools/text/groff/default.nix index 8c98a4aba465..20052f6c4cef 100644 --- a/pkgs/tools/text/groff/default.nix +++ b/pkgs/tools/text/groff/default.nix @@ -82,10 +82,6 @@ stdenv.mkDerivation rec { moveToOutput bin/afmtodit $perl moveToOutput bin/gperl $perl moveToOutput bin/chem $perl - moveToOutput share/groff/${version}/font/devpdf $perl - - # idk if this is needed, but Fedora does it - moveToOutput share/groff/${version}/tmac/pdf.tmac $perl moveToOutput bin/gpinyin $perl moveToOutput lib/groff/gpinyin $perl From 1d4dc932d53bf66e7e2500f7ca1951a9de0717af Mon Sep 17 00:00:00 2001 From: ymeister <47071325+ymeister@users.noreply.github.com> Date: Fri, 30 Oct 2020 02:13:54 +0700 Subject: [PATCH 012/260] rss-bridge-cli: init Co-authored-by: Sandro --- .../misc/rss-bridge-cli/default.nix | 28 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 30 insertions(+) create mode 100644 pkgs/applications/misc/rss-bridge-cli/default.nix diff --git a/pkgs/applications/misc/rss-bridge-cli/default.nix b/pkgs/applications/misc/rss-bridge-cli/default.nix new file mode 100644 index 000000000000..f481f0953f81 --- /dev/null +++ b/pkgs/applications/misc/rss-bridge-cli/default.nix @@ -0,0 +1,28 @@ +{ stdenv, writeShellScriptBin, rss-bridge, php }: + +let + phpWithExts = (php.withExtensions + ({ all, ... }: with all; [ + curl + filter + iconv + json + mbstring + openssl + simplexml + sqlite3 + ]) + ); + phpBin = "${phpWithExts}/bin/php"; +in (writeShellScriptBin "rss-bridge-cli" '' + ${phpBin} ${rss-bridge}/index.php "$@" +'').overrideAttrs (oldAttrs: rec { + version = rss-bridge.version; + + meta = with stdenv.lib; { + description = "Command-line interface for RSS-Bridge"; + homepage = "https://github.com/RSS-Bridge/rss-bridge"; + license = licenses.unlicense; + maintainers = with maintainers; [ ymeister ]; + }; +}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a37fab7ec3db..4719e300de48 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6879,6 +6879,8 @@ in rsibreak = libsForQt514.callPackage ../applications/misc/rsibreak { }; + rss-bridge-cli = callPackage ../applications/misc/rss-bridge-cli { }; + rss2email = callPackage ../applications/networking/feedreaders/rss2email { pythonPackages = python3Packages; }; From b51bc901f1b5a64c9a05df2d18c41d39ef65b66f Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 30 Oct 2020 23:40:36 +0100 Subject: [PATCH 013/260] python3Packages.anyio: disable all socket-related tests on darwin They don't work in their sandbox. --- pkgs/development/python-modules/anyio/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/anyio/default.nix b/pkgs/development/python-modules/anyio/default.nix index 516b8520f00e..f79bf23896fd 100644 --- a/pkgs/development/python-modules/anyio/default.nix +++ b/pkgs/development/python-modules/anyio/default.nix @@ -1,4 +1,5 @@ -{ lib +{ stdenv +, lib , buildPythonPackage , fetchFromGitHub , pythonOlder @@ -45,6 +46,9 @@ buildPythonPackage rec { pytestFlagsArray = [ # lots of DNS lookups "--ignore=tests/test_sockets.py" + ] ++ lib.optionals stdenv.isDarwin [ + # darwin sandboxing limitations + "--ignore=tests/streams/test_tls.py" ]; pythonImportsCheck = [ "anyio" ]; From 5a60fcf9e89ba962773bfb723fb682a4a4ab8846 Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Sun, 11 Oct 2020 14:12:04 +0300 Subject: [PATCH 014/260] pg_featureserv: init at 1.1.1 --- pkgs/servers/pg_featureserv/default.nix | 23 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 25 insertions(+) create mode 100644 pkgs/servers/pg_featureserv/default.nix diff --git a/pkgs/servers/pg_featureserv/default.nix b/pkgs/servers/pg_featureserv/default.nix new file mode 100644 index 000000000000..a50c1d593008 --- /dev/null +++ b/pkgs/servers/pg_featureserv/default.nix @@ -0,0 +1,23 @@ +{ lib, fetchFromGitHub, buildGoModule }: + +buildGoModule rec { + pname = "pg_featureserv"; + version = "1.1.1"; + + src = fetchFromGitHub { + owner = "CrunchyData"; + repo = pname; + rev = "v${version}"; + sha256 = "0vfrwncx41yn9n2hqb32av3xgd13fqplrs1qzg5mv25i4qppd88l"; + }; + + vendorSha256 = "1jqrkx850ghmpnfjhqky93r8fq7q63m5ivs0lzljzbvn7ya75f2r"; + + meta = with lib; { + description = "Lightweight RESTful Geospatial Feature Server for PostGIS in Go"; + homepage = "https://github.com/CrunchyData/pg_featureserv"; + license = licenses.asl20; + maintainers = with maintainers; [ sikmir ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5e0130cc1c1b..2be106732fa3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16987,6 +16987,8 @@ in tomcat-native = callPackage ../servers/http/tomcat/tomcat-native.nix { }; + pg_featureserv = callPackage ../servers/pg_featureserv { }; + pg_tileserv = callPackage ../servers/pg_tileserv { }; pies = callPackage ../servers/pies { }; From 9b588992b7abb733cdcc116aa4b06020e06ba7e8 Mon Sep 17 00:00:00 2001 From: freezeboy Date: Wed, 4 Nov 2020 12:22:34 +0100 Subject: [PATCH 015/260] newman: 5.2.0 -> 5.2.1 --- pkgs/development/web/newman/node-packages.nix | 1005 +++++++---------- 1 file changed, 389 insertions(+), 616 deletions(-) diff --git a/pkgs/development/web/newman/node-packages.nix b/pkgs/development/web/newman/node-packages.nix index 22b7aeccc960..a7c29ca49c76 100644 --- a/pkgs/development/web/newman/node-packages.nix +++ b/pkgs/development/web/newman/node-packages.nix @@ -13,22 +13,22 @@ let sha512 = "vG6SvB6oYEhvgisZNFRmRCUkLz11c7rp+tbNTynGqc6mS1d5ATd/sGyV6W0KZZnXRKMTzZDRgQT3Ou9jhpAfUg=="; }; }; - "@babel/core-7.11.6" = { + "@babel/core-7.12.3" = { name = "_at_babel_slash_core"; packageName = "@babel/core"; - version = "7.11.6"; + version = "7.12.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/core/-/core-7.11.6.tgz"; - sha512 = "Wpcv03AGnmkgm6uS6k8iwhIwTrcP0m17TL1n1sy7qD0qelDu4XNeW0dN0mHfa+Gei211yDaLoEe/VlbXQzM4Bg=="; + url = "https://registry.npmjs.org/@babel/core/-/core-7.12.3.tgz"; + sha512 = "0qXcZYKZp3/6N2jKYVxZv0aNCsxTSVCiK72DTiTYZAu7sjg73W0/aynWjMbiGd87EQL4WyA8reiJVh92AVla9g=="; }; }; - "@babel/generator-7.11.6" = { + "@babel/generator-7.12.5" = { name = "_at_babel_slash_generator"; packageName = "@babel/generator"; - version = "7.11.6"; + version = "7.12.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/generator/-/generator-7.11.6.tgz"; - sha512 = "DWtQ1PV3r+cLbySoHrwn9RWEgKMBLLma4OBQloPRyDYvc5msJM9kvTLo1YnlJd1P/ZuKbdli3ijr5q3FvAF3uA=="; + url = "https://registry.npmjs.org/@babel/generator/-/generator-7.12.5.tgz"; + sha512 = "m16TQQJ8hPt7E+OS/XVQg/7U184MLXtvuGbCdA7na61vha+ImkyyNM/9DDA0unYCVZn3ZOhng+qz48/KBOT96A=="; }; }; "@babel/helper-function-name-7.10.4" = { @@ -49,31 +49,31 @@ let sha512 = "EkN3YDB+SRDgiIUnNgcmiD361ti+AVbL3f3Henf6dqqUyr5dMsorno0lJWJuLhDhkI5sYEpgj6y9kB8AOU1I2A=="; }; }; - "@babel/helper-member-expression-to-functions-7.11.0" = { + "@babel/helper-member-expression-to-functions-7.12.1" = { name = "_at_babel_slash_helper-member-expression-to-functions"; packageName = "@babel/helper-member-expression-to-functions"; - version = "7.11.0"; + version = "7.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.11.0.tgz"; - sha512 = "JbFlKHFntRV5qKw3YC0CvQnDZ4XMwgzzBbld7Ly4Mj4cbFy3KywcR8NtNctRToMWJOVvLINJv525Gd6wwVEx/Q=="; + url = "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.12.1.tgz"; + sha512 = "k0CIe3tXUKTRSoEx1LQEPFU9vRQfqHtl+kf8eNnDqb4AUJEy5pz6aIiog+YWtVm2jpggjS1laH68bPsR+KWWPQ=="; }; }; - "@babel/helper-module-imports-7.10.4" = { + "@babel/helper-module-imports-7.12.5" = { name = "_at_babel_slash_helper-module-imports"; packageName = "@babel/helper-module-imports"; - version = "7.10.4"; + version = "7.12.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.10.4.tgz"; - sha512 = "nEQJHqYavI217oD9+s5MUBzk6x1IlvoS9WTPfgG43CbMEeStE0v+r+TucWdx8KFGowPGvyOkDT9+7DHedIDnVw=="; + url = "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.12.5.tgz"; + sha512 = "SR713Ogqg6++uexFRORf/+nPXMmWIn80TALu0uaFb+iQIUoR7bOC7zBWyzBs5b3tBBJXuyD0cRu1F15GyzjOWA=="; }; }; - "@babel/helper-module-transforms-7.11.0" = { + "@babel/helper-module-transforms-7.12.1" = { name = "_at_babel_slash_helper-module-transforms"; packageName = "@babel/helper-module-transforms"; - version = "7.11.0"; + version = "7.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.11.0.tgz"; - sha512 = "02EVu8COMuTRO1TAzdMtpBPbe6aQ1w/8fePD2YgQmxZU4gpNWaL9gK3Jp7dxlkUlUCJOTaSeA+Hrm1BRQwqIhg=="; + url = "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.12.1.tgz"; + sha512 = "QQzehgFAZ2bbISiCpmVGfiGux8YVFXQ0abBic2Envhej22DVXV9nCFaS5hIQbkyo1AdGb+gNME2TSh3hYJVV/w=="; }; }; "@babel/helper-optimise-call-expression-7.10.4" = { @@ -85,22 +85,22 @@ let sha512 = "n3UGKY4VXwXThEiKrgRAoVPBMqeoPgHVqiHZOanAJCG9nQUL2pLRQirUzl0ioKclHGpGqRgIOkgcIJaIWLpygg=="; }; }; - "@babel/helper-replace-supers-7.10.4" = { + "@babel/helper-replace-supers-7.12.5" = { name = "_at_babel_slash_helper-replace-supers"; packageName = "@babel/helper-replace-supers"; - version = "7.10.4"; + version = "7.12.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.10.4.tgz"; - sha512 = "sPxZfFXocEymYTdVK1UNmFPBN+Hv5mJkLPsYWwGBxZAxaWfFu+xqp7b6qWD0yjNuNL2VKc6L5M18tOXUP7NU0A=="; + url = "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.12.5.tgz"; + sha512 = "5YILoed0ZyIpF4gKcpZitEnXEJ9UoDRki1Ey6xz46rxOzfNMAhVIJMoune1hmPVxh40LRv1+oafz7UsWX+vyWA=="; }; }; - "@babel/helper-simple-access-7.10.4" = { + "@babel/helper-simple-access-7.12.1" = { name = "_at_babel_slash_helper-simple-access"; packageName = "@babel/helper-simple-access"; - version = "7.10.4"; + version = "7.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.10.4.tgz"; - sha512 = "0fMy72ej/VEvF8ULmX6yb5MtHG4uH4Dbd6I/aHDb/JVg0bbivwt9Wg+h3uMvX+QSFtwr5MeItvazbrc4jtRAXw=="; + url = "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.12.1.tgz"; + sha512 = "OxBp7pMrjVewSSC8fXDFrHrBcJATOOFssZwv16F3/6Xtc138GHybBfPbm9kfiqQHKhYQrlamWILwlDCeyMFEaA=="; }; }; "@babel/helper-split-export-declaration-7.11.0" = { @@ -121,13 +121,13 @@ let sha512 = "3U9y+43hz7ZM+rzG24Qe2mufW5KhvFg/NhnNph+i9mgCtdTCtMJuI1TMkrIUiK7Ix4PYlRF9I5dhqaLYA/ADXw=="; }; }; - "@babel/helpers-7.10.4" = { + "@babel/helpers-7.12.5" = { name = "_at_babel_slash_helpers"; packageName = "@babel/helpers"; - version = "7.10.4"; + version = "7.12.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helpers/-/helpers-7.10.4.tgz"; - sha512 = "L2gX/XeUONeEbI78dXSrJzGdz4GQ+ZTA/aazfUsFaWjSe95kiCuOZ5HsXvkiw3iwF+mFHSRUfJU8t6YavocdXA=="; + url = "https://registry.npmjs.org/@babel/helpers/-/helpers-7.12.5.tgz"; + sha512 = "lgKGMQlKqA8meJqKsW6rUnc4MdUk35Ln0ATDqdM1a/UpARODdI4j5Y5lVfUScnSNkJcdCRAaWkspykNoFg9sJA=="; }; }; "@babel/highlight-7.10.4" = { @@ -139,13 +139,13 @@ let sha512 = "i6rgnR/YgPEQzZZnbTHHuZdlE8qyoBNalD6F+q4vAFlcMEcqmkoG+mPqJYJCo63qPf74+Y1UZsl3l6f7/RIkmA=="; }; }; - "@babel/parser-7.11.5" = { + "@babel/parser-7.12.5" = { name = "_at_babel_slash_parser"; packageName = "@babel/parser"; - version = "7.11.5"; + version = "7.12.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/parser/-/parser-7.11.5.tgz"; - sha512 = "X9rD8qqm695vgmeaQ4fvz/o3+Wk4ZzQvSHkDBgpYKxpD4qTAUm88ZKtHkVqIOsYFFbIQ6wQYhC6q7pjqVK0E0Q=="; + url = "https://registry.npmjs.org/@babel/parser/-/parser-7.12.5.tgz"; + sha512 = "FVM6RZQ0mn2KCf1VUED7KepYeUWoVShczewOCfm3nzoBybaih51h+sYVVGthW9M6lPByEPTQf+xm27PBdlpwmQ=="; }; }; "@babel/template-7.10.4" = { @@ -157,31 +157,31 @@ let sha512 = "ZCjD27cGJFUB6nmCB1Enki3r+L5kJveX9pq1SvAUKoICy6CZ9yD8xO086YXdYhvNjBdnekm4ZnaP5yC8Cs/1tA=="; }; }; - "@babel/traverse-7.11.5" = { + "@babel/traverse-7.12.5" = { name = "_at_babel_slash_traverse"; packageName = "@babel/traverse"; - version = "7.11.5"; + version = "7.12.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.11.5.tgz"; - sha512 = "EjiPXt+r7LiCZXEfRpSJd+jUMnBd4/9OUv7Nx3+0u9+eimMwJmG0Q98lw4/289JCoxSE8OolDMNZaaF/JZ69WQ=="; + url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.12.5.tgz"; + sha512 = "xa15FbQnias7z9a62LwYAA5SZZPkHIXpd42C6uW68o8uTuua96FHZy1y61Va5P/i83FAAcMpW8+A/QayntzuqA=="; }; }; - "@babel/types-7.11.5" = { + "@babel/types-7.12.6" = { name = "_at_babel_slash_types"; packageName = "@babel/types"; - version = "7.11.5"; + version = "7.12.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/types/-/types-7.11.5.tgz"; - sha512 = "bvM7Qz6eKnJVFIn+1LPtjlBFPVN5jNDc1XmN15vWe7Q3DPBufWWsLiIvUu7xW87uTG6QoggpIDnUgLQvPheU+Q=="; + url = "https://registry.npmjs.org/@babel/types/-/types-7.12.6.tgz"; + sha512 = "hwyjw6GvjBLiyy3W0YQf0Z5Zf4NpYejUnKFcfcUhZCSffoBBp30w6wP2Wn6pk31jMYZvcOrB/1b7cGXvEoKogA=="; }; }; - "@eslint/eslintrc-0.1.3" = { + "@eslint/eslintrc-0.2.1" = { name = "_at_eslint_slash_eslintrc"; packageName = "@eslint/eslintrc"; - version = "0.1.3"; + version = "0.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-0.1.3.tgz"; - sha512 = "4YVwPkANLeNtRjMekzux1ci8hIaH5eGKktGqR0d3LWsKNn5B2X/1Z6Trxy7jQXl9EBGE6Yj02O+t09FMeRllaA=="; + url = "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-0.2.1.tgz"; + sha512 = "XRUeBZ5zBWLYgSANMpThFddrZZkEbGHgUdt5UJjZfnlN9BGCiUBrf+nvbRupSjMvqzwnQN0qwCmOxITt1cfywA=="; }; }; "@istanbuljs/load-nyc-config-1.1.0" = { @@ -202,13 +202,13 @@ let sha512 = "tsAQNx32a8CoFhjhijUIhI4kccIAgmGhy8LZMZgGfmXcpMbPRUqn5LWmgRttILi6yeGmBJd2xsPkFMs0PzgPCw=="; }; }; - "@postman/form-data-3.1.0" = { + "@postman/form-data-3.1.1" = { name = "_at_postman_slash_form-data"; packageName = "@postman/form-data"; - version = "3.1.0"; + version = "3.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/@postman/form-data/-/form-data-3.1.0.tgz"; - sha512 = "6x1UHKQ45Sv5yLFjqhhtyk3YGOF9677RVRQjfr32Bkt45pH8yIlqcpPxiIR4/ZEs3GFk5vl5j9ymmdLTt0HR6Q=="; + url = "https://registry.npmjs.org/@postman/form-data/-/form-data-3.1.1.tgz"; + sha512 = "vjh8Q2a8S6UCm/KKs31XFJqEEgmbjBmpPNVV2eVav6905wyFAwaUOBGA1NPBI4ERH9MMZc6w0umFgM6WbEPMdg=="; }; }; "@postman/tunnel-agent-0.6.3" = { @@ -247,13 +247,13 @@ let sha512 = "KaiQ5pBf1MpS09MuA0kp6KBQt2JUOQycqVG1NZXvzeaXe5LGFqAKueIS0bw4w0P9r7KuBSVdUk5QjXsUdu2CxQ=="; }; }; - "@sinonjs/samsam-5.1.0" = { + "@sinonjs/samsam-5.2.0" = { name = "_at_sinonjs_slash_samsam"; packageName = "@sinonjs/samsam"; - version = "5.1.0"; + version = "5.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/@sinonjs/samsam/-/samsam-5.1.0.tgz"; - sha512 = "42nyaQOVunX5Pm6GRJobmzbS7iLI+fhERITnETXzzwDZh+TtDr/Au3yAvXVjFmZ4wEUaE4Y3NFZfKv0bV0cbtg=="; + url = "https://registry.npmjs.org/@sinonjs/samsam/-/samsam-5.2.0.tgz"; + sha512 = "CaIcyX5cDsjcW/ab7HposFWzV1kC++4HNsfnEdFJa7cP1QIuILAKV+BgfeqRXhcnSAc76r/Rh/O5C+300BwUIw=="; }; }; "@sinonjs/text-encoding-0.7.1" = { @@ -265,13 +265,13 @@ let sha512 = "+iTbntw2IZPb/anVDbypzfQa+ay64MW0Zo8aJ8gZPWMMK6/OubMVb6lUPMagqjOPnmtauXnFCACVl3O7ogjeqQ=="; }; }; - "@types/color-name-1.1.1" = { - name = "_at_types_slash_color-name"; - packageName = "@types/color-name"; - version = "1.1.1"; + "@ungap/promise-all-settled-1.1.2" = { + name = "_at_ungap_slash_promise-all-settled"; + packageName = "@ungap/promise-all-settled"; + version = "1.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/@types/color-name/-/color-name-1.1.1.tgz"; - sha512 = "rr+OQyAjxze7GgWrSaJwydHStIhHq2lvY3BOC2Mj7KnzI7XK0Uw1TOOdI9lDoajEbSWLiYgoo4f1R51erQfhPQ=="; + url = "https://registry.npmjs.org/@ungap/promise-all-settled/-/promise-all-settled-1.1.2.tgz"; + sha512 = "sL/cEvJWAnClXw0wHk85/2L0G6Sj8UB0Ctc1TEMbKSsmpRosqhwj9gWgFRZSrBr2f9tiXISwNhCPmlfqUqyb9Q=="; }; }; "JSONStream-1.3.2" = { @@ -283,13 +283,13 @@ let sha1 = "c102371b6ec3a7cf3b847ca00c20bb0fce4c6dea"; }; }; - "acorn-7.4.0" = { + "acorn-7.4.1" = { name = "acorn"; packageName = "acorn"; - version = "7.4.0"; + version = "7.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/acorn/-/acorn-7.4.0.tgz"; - sha512 = "+G7P8jJmCHr+S+cLfQxygbWhXy+8YTVGzAkpEbcLo2mLoL7tij/VG41QSHACSf5QgYRhMZYHuNc6drJaO0Da+w=="; + url = "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz"; + sha512 = "nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A=="; }; }; "acorn-jsx-5.3.1" = { @@ -310,13 +310,13 @@ let sha512 = "4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA=="; }; }; - "ajv-6.12.4" = { + "ajv-6.12.6" = { name = "ajv"; packageName = "ajv"; - version = "6.12.4"; + version = "6.12.6"; src = fetchurl { - url = "https://registry.npmjs.org/ajv/-/ajv-6.12.4.tgz"; - sha512 = "eienB2c9qVQs2KWexhkrdMLVDoIQCz5KSeLxwg9Lzk4DOfBtIK9PQwwufcsn1jjGuf9WZmqPMbGxOzfcuphJCQ=="; + url = "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz"; + sha512 = "j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g=="; }; }; "ansi-colors-4.1.1" = { @@ -391,13 +391,13 @@ let sha512 = "VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA=="; }; }; - "ansi-styles-4.2.1" = { + "ansi-styles-4.3.0" = { name = "ansi-styles"; packageName = "ansi-styles"; - version = "4.2.1"; + version = "4.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz"; - sha512 = "9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA=="; + url = "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz"; + sha512 = "zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg=="; }; }; "anymatch-3.1.1" = { @@ -481,15 +481,6 @@ let sha1 = "af6ac877a25cc7f74e058894753858dfdb24fdb6"; }; }; - "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=="; - }; - }; "asn1-0.2.4" = { name = "asn1"; packageName = "asn1"; @@ -589,6 +580,15 @@ let sha512 = "zg7Hz2k5lI8kb7U32998pRRFin7zJlkfezGJjUc2heaD4Pw2wObakCDVzkKztTm/Ln7eiVvYsjqak0Ed4LkMDA=="; }; }; + "aws4-1.11.0" = { + name = "aws4"; + packageName = "aws4"; + version = "1.11.0"; + src = fetchurl { + url = "https://registry.npmjs.org/aws4/-/aws4-1.11.0.tgz"; + sha512 = "xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA=="; + }; + }; "balanced-match-1.0.0" = { name = "balanced-match"; packageName = "balanced-match"; @@ -760,6 +760,15 @@ let sha512 = "L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg=="; }; }; + "camelcase-6.2.0" = { + name = "camelcase"; + packageName = "camelcase"; + version = "6.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/camelcase/-/camelcase-6.2.0.tgz"; + sha512 = "c7wVvbw3f37nuobQNtgsgG9POC9qMbNuMQmTCqZv23b6MIz0fcYpBiOlv9gEN/hdLdnZTDQhg6e9Dq5M1vKvfg=="; + }; + }; "caseless-0.12.0" = { name = "caseless"; packageName = "caseless"; @@ -814,13 +823,13 @@ let sha512 = "qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A=="; }; }; - "chardet-1.2.1" = { + "chardet-1.3.0" = { name = "chardet"; packageName = "chardet"; - version = "1.2.1"; + version = "1.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/chardet/-/chardet-1.2.1.tgz"; - sha512 = "bnDt+69nS8Hi7Xmt0uDiQ32/hRpMK/0pc4lc32Y87voBgdsz26VZXOyo5VNQWQfe7rUsevZIfWB82C5QSpCXcQ=="; + url = "https://registry.npmjs.org/chardet/-/chardet-1.3.0.tgz"; + sha512 = "cyTQGGptIjIT+CMGT5J/0l9c6Fb+565GCFjjeUTKxUO7w3oR+FcNCMEKTn5xtVKaLFmladN7QF68IiQsv5Fbdw=="; }; }; "charset-1.0.1" = { @@ -841,13 +850,13 @@ let sha1 = "574d312edd88bb5dd8912e9286dd6c0aed4aac82"; }; }; - "chokidar-3.4.2" = { + "chokidar-3.4.3" = { name = "chokidar"; packageName = "chokidar"; - version = "3.4.2"; + version = "3.4.3"; src = fetchurl { - url = "https://registry.npmjs.org/chokidar/-/chokidar-3.4.2.tgz"; - sha512 = "IZHaDeBeI+sZJRX7lGcXsdzgvZqKv6sECqsbErJA4mHWfpRrD8B97kSFN4cQz6nGBGiuFia1MKR4d6c1o8Cv7A=="; + url = "https://registry.npmjs.org/chokidar/-/chokidar-3.4.3.tgz"; + sha512 = "DtM3g7juCXQxFVSNPNByEC2+NImtBuxQQvWlHunpJIS5Ocr0lG306cC7FCi7cEA0fzmybPUIl4txBIobk1gGOQ=="; }; }; "chownr-1.1.4" = { @@ -904,13 +913,13 @@ let sha512 = "t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ=="; }; }; - "collect-all-1.0.3" = { + "collect-all-1.0.4" = { name = "collect-all"; packageName = "collect-all"; - version = "1.0.3"; + version = "1.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/collect-all/-/collect-all-1.0.3.tgz"; - sha512 = "0y0rBgoX8IzIjBAUnO73SEtSb4Mhk3IoceWJq5zZSxb9mWORhWH8xLYo4EDSOE1jRBk1LhmfjqWFFt10h/+MEA=="; + url = "https://registry.npmjs.org/collect-all/-/collect-all-1.0.4.tgz"; + sha512 = "RKZhRwJtJEP5FWul+gkSMEnaK6H3AGPTTWOiRimCcs+rc/OmQE3Yhy1Q7A7KsdkG3ZXVdZq68Y6ONSdvkeEcKA=="; }; }; "color-convert-1.9.3" = { @@ -1030,13 +1039,13 @@ let sha512 = "P0CysNDQ7rtVw4QIQtm+MRxV66vKFSvlsQvGYXZWR3qFU0jlMKHZZZgw8e+8DSah4UDKMqnknRDQz+xuQXQ/Zg=="; }; }; - "commander-6.1.0" = { + "commander-6.2.0" = { name = "commander"; packageName = "commander"; - version = "6.1.0"; + version = "6.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/commander/-/commander-6.1.0.tgz"; - sha512 = "wl7PNrYWd2y5mp1OK/LhTlv8Ff4kQJQRXXAvF+uU/TPNiVJUxZLRYGj/B0y/lPGAVcSbJqH2Za/cvHmrPMC8mA=="; + url = "https://registry.npmjs.org/commander/-/commander-6.2.0.tgz"; + sha512 = "zP4jEKbe8SHzKJYQmq8Y9gYjtO/POJLgIdKgV7B9qNmABVFVc+ctqSX6iXh4mCpJfRBOabiZ2YKPg8ciDw6C+Q=="; }; }; "comment-parser-0.7.6" = { @@ -1174,15 +1183,6 @@ let sha512 = "mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ=="; }; }; - "debug-4.1.1" = { - name = "debug"; - packageName = "debug"; - version = "4.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz"; - sha512 = "pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw=="; - }; - }; "debug-4.2.0" = { name = "debug"; packageName = "debug"; @@ -1192,6 +1192,15 @@ let sha512 = "IX2ncY78vDTjZMFUdmsvIRFY2Cf4FnD0wRs+nQwJU8Lu99/tPFdb0VybiiMTPe3I6rQmwsqQqRBvxU+bZ/I8sg=="; }; }; + "debug-4.3.0" = { + name = "debug"; + packageName = "debug"; + version = "4.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/debug/-/debug-4.3.0.tgz"; + sha512 = "jjO6JD2rKfiZQnBoRzhRTbXjHLGLfH+UtGkWLc/UXAh/rzZMyjbgn0NcfFpqT8nd1kTtFnDiJcrIFkq4UKeJVg=="; + }; + }; "decamelize-1.2.0" = { name = "decamelize"; packageName = "decamelize"; @@ -1201,6 +1210,15 @@ let sha1 = "f6534d15148269b20352e7bee26f501f9a191290"; }; }; + "decamelize-4.0.0" = { + name = "decamelize"; + packageName = "decamelize"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/decamelize/-/decamelize-4.0.0.tgz"; + sha512 = "9iE1PgSik9HeIIw2JO94IidnE3eBoQrFJ3w7sFuzSX4DpmZ3v5sZpUiV5Swcf6mQEF+Y0ru8Neo+p+nyh2J+hQ=="; + }; + }; "deep-eql-3.0.1" = { name = "deep-eql"; packageName = "deep-eql"; @@ -1237,15 +1255,6 @@ let sha512 = "ek6DpXq/SCpvjhpFsLFRVtIxJCRw6fUR42lYMVZuUMK7n8eMz4Uh5clckdBjEpLhn/gEBZo7hDJnJcwdKLKQjg=="; }; }; - "define-properties-1.1.3" = { - name = "define-properties"; - packageName = "define-properties"; - version = "1.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz"; - sha512 = "3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ=="; - }; - }; "delayed-stream-1.0.0" = { name = "delayed-stream"; packageName = "delayed-stream"; @@ -1327,13 +1336,13 @@ let sha512 = "BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w=="; }; }; - "domelementtype-2.0.1" = { + "domelementtype-2.0.2" = { name = "domelementtype"; packageName = "domelementtype"; - version = "2.0.1"; + version = "2.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/domelementtype/-/domelementtype-2.0.1.tgz"; - sha512 = "5HOHUDsYZWV8FGWN0Njbr/Rn7f/eWSQi1v7+HsUVwXgn8nWWlL64zKDkS0n8ZmQ3mlWOMuXOnR+7Nx/5tMO5AQ=="; + url = "https://registry.npmjs.org/domelementtype/-/domelementtype-2.0.2.tgz"; + sha512 = "wFwTwCVebUrMgGeAwRL/NhZtHAUyT9n9yg4IMDwf10+6iCMxSkVq9MGCVEH+QZWo1nNidy8kNvwmv4zWHDTqvA=="; }; }; "domhandler-2.4.2" = { @@ -1426,40 +1435,13 @@ let sha512 = "MyoZ0jgnLvB2X3Lg5HqpFmn1kybDiIfEQmKzTb5apr51Rb+T3KdmMiqa70T+bhGnyv7bQ6WMj2QMHpGMmlrUYQ=="; }; }; - "es-abstract-1.17.6" = { - name = "es-abstract"; - packageName = "es-abstract"; - version = "1.17.6"; + "entities-2.1.0" = { + name = "entities"; + packageName = "entities"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.6.tgz"; - sha512 = "Fr89bON3WFyUi5EvAeI48QTWX0AyekGgLA8H+c+7fbfCkJwRWRMLd8CQedNEyJuoYYhmtEqY92pgte1FAhBlhw=="; - }; - }; - "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"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/es-get-iterator/-/es-get-iterator-1.1.0.tgz"; - sha512 = "UfrmHuWQlNMTs35e1ypnvikg6jCz3SK8v8ImvmDsh36fCVUR1MqoFDiyn0/k52C8NqO3YsO8Oe0azeesNuqSsQ=="; - }; - }; - "es-to-primitive-1.2.1" = { - name = "es-to-primitive"; - packageName = "es-to-primitive"; - version = "1.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz"; - sha512 = "QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA=="; + url = "https://registry.npmjs.org/entities/-/entities-2.1.0.tgz"; + sha512 = "hCx1oky9PFrJ611mf0ifBLBRW8lUUVRlFolb5gWRfIELabBlbp9xZvrqZLZAs+NxFnbfQoeGd8wDkygjg7U85w=="; }; }; "es6-error-4.1.1" = { @@ -1507,22 +1489,22 @@ let sha512 = "TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA=="; }; }; - "eslint-7.8.0" = { + "eslint-7.12.1" = { name = "eslint"; packageName = "eslint"; - version = "7.8.0"; + version = "7.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/eslint/-/eslint-7.8.0.tgz"; - sha512 = "qgtVyLZqKd2ZXWnLQA4NtVbOyH56zivOAdBFWE54RFkSZjokzNrcP4Z0eVWsZ+84ByXv+jL9k/wE1ENYe8xRFw=="; + url = "https://registry.npmjs.org/eslint/-/eslint-7.12.1.tgz"; + sha512 = "HlMTEdr/LicJfN08LB3nM1rRYliDXOmfoO4vj39xN6BLpFzF00hbwBoqHk8UcJ2M/3nlARZWy/mslvGEuZFvsg=="; }; }; - "eslint-plugin-jsdoc-30.3.0" = { + "eslint-plugin-jsdoc-30.7.6" = { name = "eslint-plugin-jsdoc"; packageName = "eslint-plugin-jsdoc"; - version = "30.3.0"; + version = "30.7.6"; src = fetchurl { - url = "https://registry.npmjs.org/eslint-plugin-jsdoc/-/eslint-plugin-jsdoc-30.3.0.tgz"; - sha512 = "RvDLH26ILwX2J60P7tlNdz5IlTFeC52TEFgAC12+nz/lOx4a7n3/hP8fBPFZrQP07WA1t9ZOO8H/i7cEs2BTnA=="; + url = "https://registry.npmjs.org/eslint-plugin-jsdoc/-/eslint-plugin-jsdoc-30.7.6.tgz"; + sha512 = "w18IOiS/9ahKgRfQOuHbce+EQYx3fwIkZhUZDEK+augNlhJkzgTSZkrBkzaflSbFNZ9/Tk4xzUABEaTbsBSzew=="; }; }; "eslint-plugin-lodash-7.1.0" = { @@ -1552,13 +1534,13 @@ let sha512 = "xlS7P2PLMXeqfhyf3NpqbvbnW04kN8M9NtmhpR3XGyOvt/vNKS7XPXT5EDbwKW9vCjWH4PpfQvgD/+JgN0VJKA=="; }; }; - "eslint-scope-5.1.0" = { + "eslint-scope-5.1.1" = { name = "eslint-scope"; packageName = "eslint-scope"; - version = "5.1.0"; + version = "5.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.0.tgz"; - sha512 = "iiGRvtxWqgtx5m8EyQUJihBloE4EnYeGE/bz1wSPwJE6tZuJUtHlhqDM4Xj2ukE8Dyy1+HCZ4hE0fzIVMzb58w=="; + url = "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz"; + sha512 = "2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw=="; }; }; "eslint-utils-2.1.0" = { @@ -1579,6 +1561,15 @@ let sha512 = "6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ=="; }; }; + "eslint-visitor-keys-2.0.0" = { + name = "eslint-visitor-keys"; + packageName = "eslint-visitor-keys"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.0.0.tgz"; + sha512 = "QudtT6av5WXels9WjIM7qz1XD1cWGvX4gGXvp/zBn9nXG02D0utdU3Em2m/QjTnrsk6bBjmCygl3rmj118msQQ=="; + }; + }; "espree-7.3.0" = { name = "espree"; packageName = "espree"; @@ -1804,13 +1795,13 @@ let sha512 = "78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng=="; }; }; - "flat-4.1.0" = { + "flat-5.0.2" = { name = "flat"; packageName = "flat"; - version = "4.1.0"; + version = "5.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/flat/-/flat-4.1.0.tgz"; - sha512 = "Px/TiLIznH7gEDlPXcUD4KnBusa6kR6ayRUVcnEAbreRIuhkqow/mun59BuRXwoYk7ZQOLW1ZM05ilIvK38hFw=="; + url = "https://registry.npmjs.org/flat/-/flat-5.0.2.tgz"; + sha512 = "b6suED+5/3rTpUBdG1gupIl8MPFCAMA0QXwmljLhvCUKcUvdE4gWky9zpuGCcXHOsz4J9wPGNWq6OKpmIzz3hQ=="; }; }; "flat-cache-2.0.1" = { @@ -1822,13 +1813,22 @@ let sha512 = "LoQe6yDuUMDzQAEH8sgmh4Md6oZnc/7PjtwjNFSzveXqSHt6ka9fPBuso7IGf9Rz4uqnSnWiFH2B/zj24a5ReA=="; }; }; - "flatted-2.0.1" = { + "flatted-2.0.2" = { name = "flatted"; packageName = "flatted"; - version = "2.0.1"; + version = "2.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/flatted/-/flatted-2.0.1.tgz"; - sha512 = "a1hQMktqW9Nmqr5aktAux3JMNqaucxGcjtjWnZLHX7yyPCmlSV3M54nGYbqT8K+0GhF3NBgmJCc3ma+WOgX8Jg=="; + url = "https://registry.npmjs.org/flatted/-/flatted-2.0.2.tgz"; + sha512 = "r5wGx7YeOwNWNlCA0wQ86zKyDLMQr+/RB8xy74M4hTphfmjlijTSSXGuH8rnvKZnfT9i+75zmd8jcKdMR4O6jA=="; + }; + }; + "flatted-3.1.0" = { + name = "flatted"; + packageName = "flatted"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/flatted/-/flatted-3.1.0.tgz"; + sha512 = "tW+UkmtNg/jv9CSofAKvgVcO7c2URjhTdW1ZTkcAritblu8tajiYy7YisnIflEwtKssCtOxpnBRoCB7iap0/TA=="; }; }; "foreground-child-2.0.0" = { @@ -1849,13 +1849,13 @@ let sha1 = "fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"; }; }; - "fromentries-1.2.1" = { + "fromentries-1.3.1" = { name = "fromentries"; packageName = "fromentries"; - version = "1.2.1"; + version = "1.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/fromentries/-/fromentries-1.2.1.tgz"; - sha512 = "Xu2Qh8yqYuDhQGOhD5iJGninErSfI9A3FrriD3tjUgV5VbJFeH8vfgZ9HnC6jWN80QDVNQK5vmxRAmEAp7Mevw=="; + url = "https://registry.npmjs.org/fromentries/-/fromentries-1.3.1.tgz"; + sha512 = "w4t/zm2J+uAcrpeKyW0VmYiIs3aqe/xKQ+2qwazVNZSCklQHhaVjk6XzKw5GtImq5thgL0IVRjGRAOastb08RQ=="; }; }; "fs-constants-1.0.0" = { @@ -1912,13 +1912,13 @@ let sha1 = "1b0ab3bd553b2a0d6399d29c0e3ea0b252078327"; }; }; - "gensync-1.0.0-beta.1" = { + "gensync-1.0.0-beta.2" = { name = "gensync"; packageName = "gensync"; - version = "1.0.0-beta.1"; + version = "1.0.0-beta.2"; src = fetchurl { - url = "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.1.tgz"; - sha512 = "r8EC6NO1sngH/zdD9fiRDLdcgnbayXah+mLgManTaIZJqEC1MZstmnox8KpnI2/fxQwrp5OpCOYWLp4rBl4Jcg=="; + url = "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz"; + sha512 = "3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg=="; }; }; "get-caller-file-2.0.5" = { @@ -2083,22 +2083,13 @@ let sha512 = "EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ=="; }; }; - "has-symbols-1.0.1" = { - name = "has-symbols"; - packageName = "has-symbols"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.1.tgz"; - sha512 = "PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg=="; - }; - }; - "hasha-5.2.0" = { + "hasha-5.2.2" = { name = "hasha"; packageName = "hasha"; - version = "5.2.0"; + version = "5.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/hasha/-/hasha-5.2.0.tgz"; - sha512 = "2W+jKdQbAdSIrggA8Q35Br8qKadTrqCTC8+XZvBWepKDK6m9XkX6Iz1a2yh2KP01kzAR/dpuMeUnocoLYDcskw=="; + url = "https://registry.npmjs.org/hasha/-/hasha-5.2.2.tgz"; + sha512 = "Hrp5vIK/xr5SkeN2onO32H0MgNZ0f17HRNH39WfL0SYUNOTZ5Lz1TJ8Pajo/87dYGEFlLMm7mIc/k/s6Bvz9HQ=="; }; }; "he-1.2.0" = { @@ -2137,13 +2128,13 @@ let sha1 = "a953ca670078669dde142ce899401b9d6e85d3b4"; }; }; - "http-signature-1.3.4" = { + "http-signature-1.3.5" = { name = "http-signature"; packageName = "http-signature"; - version = "1.3.4"; + version = "1.3.5"; src = fetchurl { - url = "https://registry.npmjs.org/http-signature/-/http-signature-1.3.4.tgz"; - sha512 = "CbG3io8gUSIxNNSgq+XMjgpTMzAeVRipxVXjuGrDhH5M1a2kZ03w20s8FCLR1NjnnJj10KbvabvckmtQcYNb9g=="; + url = "https://registry.npmjs.org/http-signature/-/http-signature-1.3.5.tgz"; + sha512 = "NwoTQYSJoFt34jSBbwzDHDofoA61NGXzu6wXh95o1Ry62EnmKjXb/nR/RknLeZ3G/uGwrlKNY2z7uPt+Cdl7Tw=="; }; }; "httpntlm-1.7.6" = { @@ -2182,13 +2173,13 @@ let sha512 = "cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg=="; }; }; - "import-fresh-3.2.1" = { + "import-fresh-3.2.2" = { name = "import-fresh"; packageName = "import-fresh"; - version = "3.2.1"; + version = "3.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/import-fresh/-/import-fresh-3.2.1.tgz"; - sha512 = "6e1q1cnWP2RXD9/keSkxHScg508CdXqXWgWBaETNhyuBFz+kUZlKboh+ISK+bU++DmbHimVBrOz/zzPe0sZ3sQ=="; + url = "https://registry.npmjs.org/import-fresh/-/import-fresh-3.2.2.tgz"; + sha512 = "cTPNrlvJT6twpYy+YmKUKrTSjWFs3bjYjAhCwm+z4EOCubZxAuO+hHpRN64TqjEaYSHs7tJAE0w1CKMGmsG/lw=="; }; }; "imurmurhash-0.1.4" = { @@ -2254,15 +2245,6 @@ let sha1 = "fa78bf5d2e6913c911ce9f819ee5146bb6d844e9"; }; }; - "is-arguments-1.0.4" = { - name = "is-arguments"; - packageName = "is-arguments"; - version = "1.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/is-arguments/-/is-arguments-1.0.4.tgz"; - sha512 = "xPh0Rmt8NE65sNzvyUmWgI1tz3mKq74lGA0mL8LYZcoIzKOzDh6HmrYm3d18k60nHerC8A9Km8kYu87zfSFnLA=="; - }; - }; "is-binary-path-2.1.0" = { name = "is-binary-path"; packageName = "is-binary-path"; @@ -2272,31 +2254,13 @@ let sha512 = "ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw=="; }; }; - "is-buffer-2.0.4" = { - name = "is-buffer"; - packageName = "is-buffer"; - version = "2.0.4"; + "is-core-module-2.0.0" = { + name = "is-core-module"; + packageName = "is-core-module"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/is-buffer/-/is-buffer-2.0.4.tgz"; - sha512 = "Kq1rokWXOPXWuaMAqZiJW4XxsmD9zGx9q4aePabbn3qCRGedtH7Cm+zV8WETitMfu1wdh+Rvd6w5egwSngUX2A=="; - }; - }; - "is-callable-1.2.1" = { - name = "is-callable"; - packageName = "is-callable"; - version = "1.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/is-callable/-/is-callable-1.2.1.tgz"; - sha512 = "wliAfSzx6V+6WfMOmus1xy0XvSgf/dlStkvTfq7F0g4bOIW0PSUbnyse3NhDwdyYS1ozfUtAAySqTws3z9Eqgg=="; - }; - }; - "is-date-object-1.0.2" = { - name = "is-date-object"; - packageName = "is-date-object"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.2.tgz"; - sha512 = "USlDT524woQ08aoZFzh3/Z6ch9Y/EWXEHQ/AaRN0SkKq4t2Jw2R2339tSXmwuVoY7LLlBCbOIlx2myP/L5zk0g=="; + url = "https://registry.npmjs.org/is-core-module/-/is-core-module-2.0.0.tgz"; + sha512 = "jq1AH6C8MuteOoBPwkxHafmByhL9j5q4OaPGdbuD+ZtQJVzH+i6E3BJDQcBA09k57i2Hh2yQbEG8yObZ0jdlWw=="; }; }; "is-extglob-2.1.1" = { @@ -2335,15 +2299,6 @@ let sha512 = "5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg=="; }; }; - "is-map-2.0.1" = { - name = "is-map"; - packageName = "is-map"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/is-map/-/is-map-2.0.1.tgz"; - sha512 = "T/S49scO8plUiAOA2DBTBG3JHpn1yiw0kRp6dgiZ0v2/6twi5eiB0rHtHFH9ZIrvlWc6+4O+m4zg5+Z833aXgw=="; - }; - }; "is-number-7.0.0" = { name = "is-number"; packageName = "is-number"; @@ -2353,31 +2308,13 @@ let sha512 = "41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng=="; }; }; - "is-plain-obj-1.1.0" = { + "is-plain-obj-2.1.0" = { name = "is-plain-obj"; packageName = "is-plain-obj"; - version = "1.1.0"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-1.1.0.tgz"; - sha1 = "71a50c8429dfca773c92a390a4a03b39fcd51d3e"; - }; - }; - "is-regex-1.1.1" = { - name = "is-regex"; - packageName = "is-regex"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/is-regex/-/is-regex-1.1.1.tgz"; - sha512 = "1+QkEcxiLlB7VEyFtyBg94e08OAsvq7FUBgApTq/w2ymCLyKJgDPsybBENVtA7XCQEgEXxKPonG+mvYRxh/LIg=="; - }; - }; - "is-set-2.0.1" = { - name = "is-set"; - packageName = "is-set"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/is-set/-/is-set-2.0.1.tgz"; - sha512 = "eJEzOtVyenDs1TMzSQ3kU3K+E0GUS9sno+F0OBT97xsgcJsF9nXMBtkT9/kut5JEpM7oL7X/0qxR17K3mcwIAA=="; + url = "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-2.1.0.tgz"; + sha512 = "YWnfyRwxL/+SsrWYfOpUtz5b3YD+nyfkHvjbcanzk8zgyO4ASD67uVMRt8k5bM4lLMDnXfriRhOpemw+NfT1eA=="; }; }; "is-stream-2.0.0" = { @@ -2389,24 +2326,6 @@ let sha512 = "XCoy+WlUr7d1+Z8GgSuXmpuUFC9fOhRXglJMx+dwLKTkL44Cjd4W1Z5P+BQZpr+cR93aGP4S/s7Ftw6Nd/kiEw=="; }; }; - "is-string-1.0.5" = { - name = "is-string"; - packageName = "is-string"; - version = "1.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/is-string/-/is-string-1.0.5.tgz"; - sha512 = "buY6VNRjhQMiF1qWDouloZlQbRhDPCebwxSjxMjxgemYT46YMd2NR0/H+fBhEfWX4A/w9TBJ+ol+okqJKFE6vQ=="; - }; - }; - "is-symbol-1.0.3" = { - name = "is-symbol"; - packageName = "is-symbol"; - version = "1.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.3.tgz"; - sha512 = "OwijhaRSgqvhm/0ZdAcXNZt9lYdKFpcRDT5ULUuYXPoT794UNOdU+gpT6Rzo7b4V2HUl/op6GqY894AZwv9faQ=="; - }; - }; "is-typedarray-1.0.0" = { name = "is-typedarray"; packageName = "is-typedarray"; @@ -2443,15 +2362,6 @@ let sha1 = "bb935d48582cba168c06834957a54a3e07124f11"; }; }; - "isarray-2.0.5" = { - name = "isarray"; - packageName = "isarray"; - version = "2.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz"; - sha512 = "xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw=="; - }; - }; "isexe-2.0.0" = { name = "isexe"; packageName = "isexe"; @@ -2533,24 +2443,6 @@ let sha512 = "9tZvz7AiR3PEDNGiV9vIouQ/EAcqMXFmkcA1CDFTwOB98OZVDL0PH9glHotf5Ugp6GCOTypfzGWI/OqjWNCRUw=="; }; }; - "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=="; - }; - }; "js-sha512-0.8.0" = { name = "js-sha512"; packageName = "js-sha512"; @@ -2605,13 +2497,13 @@ let sha1 = "a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"; }; }; - "jsdoc-3.6.5" = { + "jsdoc-3.6.6" = { name = "jsdoc"; packageName = "jsdoc"; - version = "3.6.5"; + version = "3.6.6"; src = fetchurl { - url = "https://registry.npmjs.org/jsdoc/-/jsdoc-3.6.5.tgz"; - sha512 = "SbY+i9ONuxSK35cgVHaI8O9senTE4CDYAmGSDJ5l3+sfe62Ff4gy96osy6OW84t4K4A8iGnMrlRrsSItSNp3RQ=="; + url = "https://registry.npmjs.org/jsdoc/-/jsdoc-3.6.6.tgz"; + sha512 = "znR99e1BHeyEkSvgDDpX0sTiTu+8aQyDl9DawrkOGZTTW8hv0deIFXx87114zJ7gRaDZKVQD/4tr1ifmJp9xhQ=="; }; }; "jsdoc-api-6.0.0" = { @@ -2731,13 +2623,13 @@ let sha512 = "Ioj5I4w18ZcHFaaisqCKdh1z+ipzN7sA2JB+h+WOlGcOMWm0FFN1dfxkgc2I4EXfhSP/mOfM3W43uFzEdz4sTw=="; }; }; - "just-extend-4.1.0" = { + "just-extend-4.1.1" = { name = "just-extend"; packageName = "just-extend"; - version = "4.1.0"; + version = "4.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/just-extend/-/just-extend-4.1.0.tgz"; - sha512 = "ApcjaOdVTJ7y4r08xI5wIqpvwS48Q0PBG4DJROcEkH1f8MdAiNFyFxz3xoL0LWAVwjrwPYZdVHHxhRHcx/uGLA=="; + url = "https://registry.npmjs.org/just-extend/-/just-extend-4.1.1.tgz"; + sha512 = "aWgeGFW67BP3e5181Ep1Fv2v8z//iBJfrvyTnq8wG86vEESwmonn1zPBJ0VfmT9CJq2FIT0VsETtrNFm2a+SHA=="; }; }; "klaw-3.0.0" = { @@ -3010,13 +2902,13 @@ let sha512 = "EGwzEeCcLniFX51DhTpmTom+dSA/MG/OBUDjnWtHbEnjAH180VzUeAw+oE4+Zv+CoYBWyRlYOTR0N8SO9R1PVw=="; }; }; - "marked-1.1.1" = { + "marked-1.2.0" = { name = "marked"; packageName = "marked"; - version = "1.1.1"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/marked/-/marked-1.1.1.tgz"; - sha512 = "mJzT8D2yPxoPh7h0UXkB+dBj4FykPJ2OIfxAWeIHrvoHDkFxukV/29QxoFQoPM6RLEwhIFdJpmKBlqVM3s2ZIw=="; + url = "https://registry.npmjs.org/marked/-/marked-1.2.0.tgz"; + sha512 = "tiRxakgbNPBr301ihe/785NntvYyhxlqcL3YaC8CaxJQh7kiaEtrN9B/eK2I2943Yjkh5gw25chYFDQhOMCwMA=="; }; }; "mdurl-1.0.1" = { @@ -3100,13 +2992,13 @@ let sha512 = "Q2PKB4ZR4UPtjLl76JfzlgSCUZhSV1AXQgAZa1qt5RiaALFjP/CDrGvFBrOz7Ck6McPcwMAxTsJvWOUjOU8XMw=="; }; }; - "mocha-8.1.3" = { + "mocha-8.2.1" = { name = "mocha"; packageName = "mocha"; - version = "8.1.3"; + version = "8.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/mocha/-/mocha-8.1.3.tgz"; - sha512 = "ZbaYib4hT4PpF4bdSO2DohooKXIn4lDeiYqB+vTmCdr6l2woW0b6H3pf5x4sM5nwQMru9RvjjHYWVGltR50ZBw=="; + url = "https://registry.npmjs.org/mocha/-/mocha-8.2.1.tgz"; + sha512 = "cuLBVfyFfFqbNR0uUKbDGXKGk+UDFe6aR4os78XIrMQpZl/nv7JYHcvP5MFIAb374b2zFXsdgEGwmzMtP0Xg8w=="; }; }; "ms-2.1.2" = { @@ -3118,6 +3010,15 @@ let sha512 = "sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="; }; }; + "nanoid-3.1.12" = { + name = "nanoid"; + packageName = "nanoid"; + version = "3.1.12"; + src = fetchurl { + url = "https://registry.npmjs.org/nanoid/-/nanoid-3.1.12.tgz"; + sha512 = "1qstj9z5+x491jfiC4Nelk+f8XBad7LN20PmyWINJEMRSf3wcAjAWysw1qaA8z6NSKe2sjq1hRSDpBH5paCb6A=="; + }; + }; "natural-compare-1.4.0" = { name = "natural-compare"; packageName = "natural-compare"; @@ -3235,24 +3136,6 @@ let sha512 = "OSuu/pU4ENM9kmREg0BdNrUDIl1heYa4mBZacJc+vVWz4GtAwu7jO8s4AIt2aGRUTqxykpWzI3Oqnsm13tTMDA=="; }; }; - "object-inspect-1.8.0" = { - name = "object-inspect"; - packageName = "object-inspect"; - version = "1.8.0"; - src = fetchurl { - url = "https://registry.npmjs.org/object-inspect/-/object-inspect-1.8.0.tgz"; - sha512 = "jLdtEOB112fORuypAyl/50VRVIBIdVQOSUUGQHzJ4xBSbit81zRarz7GThkEFZy1RceYrWYcPcBFPQwHyAc1gA=="; - }; - }; - "object-keys-1.1.1" = { - name = "object-keys"; - packageName = "object-keys"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz"; - sha512 = "NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA=="; - }; - }; "object-to-spawn-args-2.0.0" = { name = "object-to-spawn-args"; packageName = "object-to-spawn-args"; @@ -3262,15 +3145,6 @@ let sha512 = "ZMT4owlXg3JGegecLlAgAA/6BsdKHn63R3ayXcAa3zFkF7oUBHcSb0oxszeutYe0FO2c1lT5pwCuidLkC4Gx3g=="; }; }; - "object.assign-4.1.0" = { - name = "object.assign"; - packageName = "object.assign"; - version = "4.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/object.assign/-/object.assign-4.1.0.tgz"; - sha512 = "exHJeq6kBKj58mqGyTQ9DFvrZC/eR6OwxzoM9YRoGBqrXYonaFyGiFMuc9VZrXf7DarreEwMpurG3dd+CNyW5w=="; - }; - }; "once-1.4.0" = { name = "once"; packageName = "once"; @@ -3496,22 +3370,22 @@ let sha512 = "HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ=="; }; }; - "postcss-7.0.32" = { + "postcss-7.0.35" = { name = "postcss"; packageName = "postcss"; - version = "7.0.32"; + version = "7.0.35"; src = fetchurl { - url = "https://registry.npmjs.org/postcss/-/postcss-7.0.32.tgz"; - sha512 = "03eXong5NLnNCD05xscnGKGDZ98CyzoqPSMjOe6SuoQY7Z2hIj0Ld1g/O/UQRuOle2aRtiIRDg9tDcTGAkLfKw=="; + url = "https://registry.npmjs.org/postcss/-/postcss-7.0.35.tgz"; + sha512 = "3QT8bBJeX/S5zKTTjTCIjRF3If4avAT6kqxcASlTWEtAFCb9NH0OUxNDfgZSWdP5fJnBYCMEWkIFfWeugjzYMg=="; }; }; - "postman-collection-3.6.6" = { + "postman-collection-3.6.8" = { name = "postman-collection"; packageName = "postman-collection"; - version = "3.6.6"; + version = "3.6.8"; src = fetchurl { - url = "https://registry.npmjs.org/postman-collection/-/postman-collection-3.6.6.tgz"; - sha512 = "fm9AGKHbL2coSzD5nw+F07JrX7jzqu2doGIXevPPrwlpTZyTM6yagEdENeO/Na8rSUrI1+tKPj+TgAFiLvtF4w=="; + url = "https://registry.npmjs.org/postman-collection/-/postman-collection-3.6.8.tgz"; + sha512 = "TNPaK2dpVRhttUFo/WN0ReopXEtuSQMktwcvwJbQ0z8K+5hftvyx2ia40xgg9qFl/Ra78qoNTUmLL1s3lRqLMg=="; }; }; "postman-collection-transformer-3.3.3" = { @@ -3532,40 +3406,40 @@ let sha1 = "60e4fbf3b2175f772520b3c978c07a8bd32b5829"; }; }; - "postman-request-2.88.1-postman.24" = { + "postman-request-2.88.1-postman.27" = { name = "postman-request"; packageName = "postman-request"; - version = "2.88.1-postman.24"; + version = "2.88.1-postman.27"; src = fetchurl { - url = "https://registry.npmjs.org/postman-request/-/postman-request-2.88.1-postman.24.tgz"; - sha512 = "afW2QxA9YCSaMUBFGRWvxnyjN4SqgXC5HqKJ0DFNfbx4ZW6AsBCFXeb5NAFgCH3kZ/og0XhUSDV+imjWwahLLg=="; + url = "https://registry.npmjs.org/postman-request/-/postman-request-2.88.1-postman.27.tgz"; + sha512 = "4Qc7p3/cbp5S4Q6LcOzJ+K5N7loWDKjW0S9hj8M2AMJDUVcFUbdgvQb6ZfTERz2+34xP9ByCy7VhdnNCATe/bA=="; }; }; - "postman-runtime-7.26.5" = { + "postman-runtime-7.26.8" = { name = "postman-runtime"; packageName = "postman-runtime"; - version = "7.26.5"; + version = "7.26.8"; src = fetchurl { - url = "https://registry.npmjs.org/postman-runtime/-/postman-runtime-7.26.5.tgz"; - sha512 = "5sY4iWjG4GeGQ5o4QAJkAt79jmcZhOrs3XSbtCLrs4NqoZpTBx5WDQr6h1Dy4Y8Q0X/9NMCYqF/c5pnsqUyDCQ=="; + url = "https://registry.npmjs.org/postman-runtime/-/postman-runtime-7.26.8.tgz"; + sha512 = "ZMUZ7mQ2SMOX/C/ntgx2SAfRt3VV6wOy+aLyWbAqpQPo5Jfodxwv9QhxGj3S2km+IYzO6BT1luzE8X8fr2UafA=="; }; }; - "postman-sandbox-3.5.9" = { + "postman-sandbox-4.0.0" = { name = "postman-sandbox"; packageName = "postman-sandbox"; - version = "3.5.9"; + version = "4.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/postman-sandbox/-/postman-sandbox-3.5.9.tgz"; - sha512 = "B9mREFulQuYOa9+B7rklb94d9iZ6EYyhsUvdIfxphGUByimb6mOhumWV0sGbrtxVTsCAtTpN/68Shm7NCjrZ0A=="; + url = "https://registry.npmjs.org/postman-sandbox/-/postman-sandbox-4.0.0.tgz"; + sha512 = "0j1VCDa5MHMTfZqv2XSYUyn+hgT9izoRdGFAvjtHCH+i+2TP1KxqXzjxXzOdx1pt26wpl9APdJ2hKKFpx9UlrQ=="; }; }; - "postman-url-encoder-2.1.3" = { + "postman-url-encoder-3.0.0" = { name = "postman-url-encoder"; packageName = "postman-url-encoder"; - version = "2.1.3"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/postman-url-encoder/-/postman-url-encoder-2.1.3.tgz"; - sha512 = "CwQjnoxaugCGeOyzVeZ4k1cNQ6iS8OBCzuWzcf4kLStKeRp0MwmLKYv25frynmDpugUUimq/d+FZCq6GtIX9Ag=="; + url = "https://registry.npmjs.org/postman-url-encoder/-/postman-url-encoder-3.0.0.tgz"; + sha512 = "bk5wus5/5Ei9pbh+sQXaAxS5n4ZwiNAaIA8VBvRcXP6QyKcue2yF6xk1HqdtaZoH1G8+6509SVeOBojoFQ7nrA=="; }; }; "prelude-ls-1.2.1" = { @@ -3577,13 +3451,13 @@ let sha512 = "vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g=="; }; }; - "pretty-ms-7.0.0" = { + "pretty-ms-7.0.1" = { name = "pretty-ms"; packageName = "pretty-ms"; - version = "7.0.0"; + version = "7.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/pretty-ms/-/pretty-ms-7.0.0.tgz"; - sha512 = "J3aPWiC5e9ZeZFuSeBraGxSkGMOvulSWsxDByOcbD1Pr75YL3LSNIKIb52WXbCLE1sS5s4inBBbryjF4Y05Ceg=="; + url = "https://registry.npmjs.org/pretty-ms/-/pretty-ms-7.0.1.tgz"; + sha512 = "973driJZvxiGOQ5ONsFhOF/DtzPMOMtgC11kCpUrPGMTgqp2q/1gwzCquocrN33is0VZ5GFHXZYMM9l6h67v2Q=="; }; }; "process-nextick-args-2.0.1" = { @@ -3613,15 +3487,6 @@ let sha512 = "7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA=="; }; }; - "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=="; - }; - }; "propagate-2.0.1" = { name = "propagate"; packageName = "propagate"; @@ -3739,13 +3604,13 @@ let sha1 = "4dd002d3f30dc11afe3bb177ad8e99094f7f62dd"; }; }; - "readdirp-3.4.0" = { + "readdirp-3.5.0" = { name = "readdirp"; packageName = "readdirp"; - version = "3.4.0"; + version = "3.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/readdirp/-/readdirp-3.4.0.tgz"; - sha512 = "0xe001vZBnJEK+uKcj8qOhyAKPzIT+gStxWr3LCB0DwcXR5NZJ3IaC+yGnHCYzB/S7ov3m3EEbZI2zeNvX+hGQ=="; + url = "https://registry.npmjs.org/readdirp/-/readdirp-3.5.0.tgz"; + sha512 = "cMhu7c/8rdhkHXWsY+osBhfSy0JikwpHK/5+imo+LpeasTF8ouErHrlYkwT0++njiyuDvc7OFY5T3ukvZ8qmFQ=="; }; }; "rechoir-0.6.2" = { @@ -3865,13 +3730,13 @@ let sha512 = "YanoyJjykPxGHii0fZP0uUPEXpvqfBDxWV7s6GKAiiOsiqhX6vHNyW3Qzdmqp/iq/ExbhaGbVrjB4ruEVSM4GQ=="; }; }; - "resolve-1.17.0" = { + "resolve-1.18.1" = { name = "resolve"; packageName = "resolve"; - version = "1.17.0"; + version = "1.18.1"; src = fetchurl { - url = "https://registry.npmjs.org/resolve/-/resolve-1.17.0.tgz"; - sha512 = "ic+7JYiV8Vi2yzQGFWOkiZD5Z9z7O2Zhm9XMaTxdJExKasieFCr+yXZ/WmXsckHiKl12ar0y6XiXDx3m4RHn1w=="; + url = "https://registry.npmjs.org/resolve/-/resolve-1.18.1.tgz"; + sha512 = "lDfCPaMKfOJXjy0dPayzPdF1phampNWr3qFCjAu+rw/qbQmr5jWH5xN2hwh9QKfw9E5v4hwV7A+jrCmL8yjjqA=="; }; }; "resolve-from-4.0.0" = { @@ -4009,13 +3874,13 @@ let sha512 = "vybp3GItaR1ZtO2nxZZo8eOo7fnVaNtP3XE2vJKgzkKR2bagCkdJ1EpYYhEMd3qu/80DwQk9KjsNSxE3fXWq0g=="; }; }; - "serialize-javascript-4.0.0" = { + "serialize-javascript-5.0.1" = { name = "serialize-javascript"; packageName = "serialize-javascript"; - version = "4.0.0"; + version = "5.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-4.0.0.tgz"; - sha512 = "GaNA54380uFefWghODBWEGisLZFj00nS5ACs6yHa9nLqlLpVLO8ChDGeKRjZnV4Nh4n0Qi7nhYZD/9fCPzEqkw=="; + url = "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-5.0.1.tgz"; + sha512 = "SaaNal9imEO737H2c05Og0/8LUXG7EnsZyMa8MzkmuHoELfT6txuj0cMqRj6zfPKnmQ1yasR4PCJc8x+M4JSPA=="; }; }; "server-destroy-1.0.1" = { @@ -4081,13 +3946,13 @@ let sha512 = "VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA=="; }; }; - "sinon-9.0.3" = { + "sinon-9.2.1" = { name = "sinon"; packageName = "sinon"; - version = "9.0.3"; + version = "9.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/sinon/-/sinon-9.0.3.tgz"; - sha512 = "IKo9MIM111+smz9JGwLmw5U1075n1YXeAq8YeSFlndCLhAL5KGn6bLgu7b/4AYHTV/LcEMcRm2wU2YiL55/6Pg=="; + url = "https://registry.npmjs.org/sinon/-/sinon-9.2.1.tgz"; + sha512 = "naPfsamB5KEE1aiioaoqJ6MEhdUs/2vtI5w1hPAXX/UwvoPjXcwh1m5HiKx0HGgKR8lQSoFIgY5jM6KK8VrS9w=="; }; }; "slice-ansi-2.1.0" = { @@ -4153,13 +4018,13 @@ let sha512 = "cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q=="; }; }; - "spdx-license-ids-3.0.5" = { + "spdx-license-ids-3.0.6" = { name = "spdx-license-ids"; packageName = "spdx-license-ids"; - version = "3.0.5"; + version = "3.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.5.tgz"; - sha512 = "J+FWzZoynJEXGphVIS+XEh3kFSjZX/1i9gFBaWQcB+/tmpe2qUsSBABpcxqxnAxFdiUFEgAX1bjYGQvIZmoz9Q=="; + url = "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.6.tgz"; + sha512 = "+orQK83kyMva3WyPf59k1+Y525csj5JejicWut55zeTWANuN17qSiSLUXWtzHeNWORSvT7GLDJ/E/XiIWoXBTw=="; }; }; "split-ca-1.0.1" = { @@ -4279,24 +4144,6 @@ let sha512 = "zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg=="; }; }; - "string.prototype.trimend-1.0.1" = { - name = "string.prototype.trimend"; - packageName = "string.prototype.trimend"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.1.tgz"; - sha512 = "LRPxFUaTtpqYsTeNKaFOw3R4bxIzWOnbQ837QfBylo8jIxtcbK/A/sMV7Q+OAV/vWo+7s25pOE10KYSjaSO06g=="; - }; - }; - "string.prototype.trimstart-1.0.1" = { - name = "string.prototype.trimstart"; - packageName = "string.prototype.trimstart"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.1.tgz"; - sha512 = "XxZn+QpvrBI1FOcg6dIpxUPgWCPuNXvMD72aaRaUQv1eD4e/Qy8i/hFTe0BUmD60p/QA6bh1avmuPTfNjqVWRw=="; - }; - }; "string_decoder-0.10.31" = { name = "string_decoder"; packageName = "string_decoder"; @@ -4369,15 +4216,6 @@ let sha512 = "3xurFv5tEgii33Zi8Jtp55wEIILR9eh34FAW00PZf+JnSsTmV/ioewSgQl97JHvgjoRGwPShsWm+IdrxB35d0w=="; }; }; - "strip-json-comments-3.0.1" = { - name = "strip-json-comments"; - packageName = "strip-json-comments"; - version = "3.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.0.1.tgz"; - sha512 = "VTyMAUfdm047mwKl+u79WIdrZxtFtn+nBxHeb844XBQ9uMNTuTHdx2hc5RiAJYqwTj3wc/xe5HLSdJSkJ+WfZw=="; - }; - }; "strip-json-comments-3.1.1" = { name = "strip-json-comments"; packageName = "strip-json-comments"; @@ -4414,15 +4252,6 @@ let sha512 = "qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ=="; }; }; - "supports-color-7.1.0" = { - name = "supports-color"; - packageName = "supports-color"; - version = "7.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz"; - sha512 = "oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g=="; - }; - }; "supports-color-7.2.0" = { name = "supports-color"; packageName = "supports-color"; @@ -4693,13 +4522,13 @@ let sha512 = "8Y75pvTYkLJW2hWQHXxoqRgV7qb9B+9vFEtidML+7koHUFapnVJAZ6cKs+Qjz5Aw3aZWHMC6u0wJE3At+nSGwA=="; }; }; - "uglify-js-3.10.4" = { + "uglify-js-3.11.5" = { name = "uglify-js"; packageName = "uglify-js"; - version = "3.10.4"; + version = "3.11.5"; src = fetchurl { - url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.10.4.tgz"; - sha512 = "kBFT3U4Dcj4/pJ52vfjCSfyLyvG9VYYuGYPmrPvAxRw/i7xHiT4VvCev+uiEMcEEiu6UNB6KgWmGtSUYIWScbw=="; + url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.11.5.tgz"; + sha512 = "btvv/baMqe7HxP7zJSF7Uc16h1mSfuuSplT0/qdjxseesDU+yYzH33eHBH+eMdeRXwujXspaCTooWHQVVBh09w=="; }; }; "underscore-1.10.2" = { @@ -4747,15 +4576,6 @@ let sha1 = "450d4dc9fa70de732762fbd2d4a28981419a0ccf"; }; }; - "uuid-3.3.2" = { - name = "uuid"; - packageName = "uuid"; - version = "3.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/uuid/-/uuid-3.3.2.tgz"; - sha512 = "yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA=="; - }; - }; "uuid-3.4.0" = { name = "uuid"; packageName = "uuid"; @@ -4765,22 +4585,22 @@ let sha512 = "HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A=="; }; }; - "uvm-1.7.9" = { + "uvm-2.0.1" = { name = "uvm"; packageName = "uvm"; - version = "1.7.9"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/uvm/-/uvm-1.7.9.tgz"; - sha512 = "Z3Uf7Jm8Cpvxf8FMjE7cFBaXsXzKu2n3kFqV23pQNLg8rrZqi6fmLFnLCn5EhiEC94XdcQCCNjrGeOnFdy1xsA=="; + url = "https://registry.npmjs.org/uvm/-/uvm-2.0.1.tgz"; + sha512 = "bZAckfNKnr95YkTCVZWyzK+7w1c8sYJuTresCBqhiizByVRtfPqhGJpTwFUSaS2YkaVfsMoN5xZcOCNxTx9uCA=="; }; }; - "v8-compile-cache-2.1.1" = { + "v8-compile-cache-2.2.0" = { name = "v8-compile-cache"; packageName = "v8-compile-cache"; - version = "2.1.1"; + version = "2.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.1.1.tgz"; - sha512 = "8OQ9CL+VWyt3JStj7HX7/ciTL2V3Rl1Wf5OL+SNTm0yK1KvtReVulksyeRnCANHHuUxHlQig+JJDlUhBt1NQDQ=="; + url = "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.2.0.tgz"; + sha512 = "gTpR5XQNKFwOd4clxfnhaqvfqMpqEwr4tOtCyz4MtYZX2JYhfr1JvBFKdS+7K/9rfpZR3VLX+YWBbKoxCgS43Q=="; }; }; "verror-1.10.0" = { @@ -4873,13 +4693,13 @@ let sha512 = "mO8XtqyPvykVCsrwj5MlOVWvSnCdT+C+QVbm6blradR7JExAhbkZ7hZ9A+9NUtwzSqrlUo9a67ws0EiILrvRpw=="; }; }; - "workerpool-6.0.0" = { + "workerpool-6.0.2" = { name = "workerpool"; packageName = "workerpool"; - version = "6.0.0"; + version = "6.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/workerpool/-/workerpool-6.0.0.tgz"; - sha512 = "fU2OcNA/GVAJLLyKUoHkAgIhKb0JoCpSjLC/G2vYKxUjVmQwGbRVeoPJ1a8U4pnVofz4AQV5Y/NEw8oKqxEBtA=="; + url = "https://registry.npmjs.org/workerpool/-/workerpool-6.0.2.tgz"; + sha512 = "DSNyvOpFKrNusaaUwk+ej6cBj1bmhLcBfj80elGk+ZIo5JSkq+unB1dLKEOcNfJDZgjGICfhQ0Q5TbP0PvF4+Q=="; }; }; "wrap-ansi-5.1.0" = { @@ -5008,15 +4828,6 @@ let sha512 = "AX3Zw5iPruN5ie6xGRIDgqkT+ZhnRlZMLMHAs8tg7nRruy2Nb+i5o9bwghAogtM08q1dpr2LVoS8KSTMYpWXUw=="; }; }; - "yargs-14.2.3" = { - name = "yargs"; - packageName = "yargs"; - version = "14.2.3"; - src = fetchurl { - url = "https://registry.npmjs.org/yargs/-/yargs-14.2.3.tgz"; - sha512 = "ZbotRWhF+lkjijC/VhmOT9wSgyBQ7+zr13+YLkhfsSiTriYsMzkTUFP18pFhWwBeMa5gUc1MzbhrO6/VB7c9Xg=="; - }; - }; "yargs-15.4.1" = { name = "yargs"; packageName = "yargs"; @@ -5035,15 +4846,6 @@ let sha512 = "3lbsNRf/j+A4QuSZfDRA7HRSfWrzO0YjqTJd5kjAq37Zep1CEgaYmrH9Q3GwPiB9cHyd1Y1UwggGhJGoxipbzg=="; }; }; - "yargs-parser-15.0.1" = { - name = "yargs-parser"; - packageName = "yargs-parser"; - version = "15.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-15.0.1.tgz"; - sha512 = "0OAMV2mAZQrs3FkNpDQcBk1x5HXb8X4twADss4S0Iuk+2dGnLOE/fRHrsYm542GduMveyA77OF4wrNJuanRCWw=="; - }; - }; "yargs-parser-18.1.3" = { name = "yargs-parser"; packageName = "yargs-parser"; @@ -5053,13 +4855,13 @@ let sha512 = "o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ=="; }; }; - "yargs-unparser-1.6.1" = { + "yargs-unparser-2.0.0" = { name = "yargs-unparser"; packageName = "yargs-unparser"; - version = "1.6.1"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/yargs-unparser/-/yargs-unparser-1.6.1.tgz"; - sha512 = "qZV14lK9MWsGCmcr7u5oXGH0dbGqZAIxTDrWXZDo5zUr6b6iUmelNKO6x6R1dQT24AH3LgRxJpr8meWy2unolA=="; + url = "https://registry.npmjs.org/yargs-unparser/-/yargs-unparser-2.0.0.tgz"; + sha512 = "7pRTIA9Qc1caZ0bZ6RYRGbHJthJWuakf+WmHK0rVeLkNrrGhfoabBNdue6kdINI6r4if7ocq9aD/n7xwKOdzOA=="; }; }; }; @@ -5068,49 +4870,49 @@ in newman = nodeEnv.buildNodePackage { name = "newman"; packageName = "newman"; - version = "5.2.0"; + version = "5.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/newman/-/newman-5.2.0.tgz"; - sha512 = "VzvKHhdPM7QvuwQfnJMj50hHLf27AE9hCAbMgbP5aXIQ12eKhrL3if1U0OWcB+BvSLdww9nKvMDwvuF72/ipFw=="; + url = "https://registry.npmjs.org/newman/-/newman-5.2.1.tgz"; + sha512 = "kEuTMQCiORHZFx92sPVih8RHsJ40JxgxvlsrUe6MFXLQg2/UrO1KaUQCDabTy41tOu0a+dx6Mtg+x+uK1rCPcA=="; }; dependencies = [ sources."@babel/code-frame-7.10.4" - (sources."@babel/core-7.11.6" // { + (sources."@babel/core-7.12.3" // { dependencies = [ - sources."debug-4.2.0" + sources."debug-4.3.0" sources."semver-5.7.1" sources."source-map-0.5.7" ]; }) - (sources."@babel/generator-7.11.6" // { + (sources."@babel/generator-7.12.5" // { dependencies = [ sources."source-map-0.5.7" ]; }) sources."@babel/helper-function-name-7.10.4" sources."@babel/helper-get-function-arity-7.10.4" - sources."@babel/helper-member-expression-to-functions-7.11.0" - sources."@babel/helper-module-imports-7.10.4" - sources."@babel/helper-module-transforms-7.11.0" + sources."@babel/helper-member-expression-to-functions-7.12.1" + sources."@babel/helper-module-imports-7.12.5" + sources."@babel/helper-module-transforms-7.12.1" sources."@babel/helper-optimise-call-expression-7.10.4" - sources."@babel/helper-replace-supers-7.10.4" - sources."@babel/helper-simple-access-7.10.4" + sources."@babel/helper-replace-supers-7.12.5" + sources."@babel/helper-simple-access-7.12.1" sources."@babel/helper-split-export-declaration-7.11.0" sources."@babel/helper-validator-identifier-7.10.4" - sources."@babel/helpers-7.10.4" + sources."@babel/helpers-7.12.5" sources."@babel/highlight-7.10.4" - sources."@babel/parser-7.11.5" + sources."@babel/parser-7.12.5" sources."@babel/template-7.10.4" - (sources."@babel/traverse-7.11.5" // { + (sources."@babel/traverse-7.12.5" // { dependencies = [ - sources."debug-4.2.0" + sources."debug-4.3.0" sources."globals-11.12.0" ]; }) - sources."@babel/types-7.11.5" - (sources."@eslint/eslintrc-0.1.3" // { + sources."@babel/types-7.12.6" + (sources."@eslint/eslintrc-0.2.1" // { dependencies = [ - sources."debug-4.2.0" + sources."debug-4.3.0" ]; }) (sources."@istanbuljs/load-nyc-config-1.1.0" // { @@ -5122,19 +4924,19 @@ in ]; }) sources."@istanbuljs/schema-0.1.2" - sources."@postman/form-data-3.1.0" + sources."@postman/form-data-3.1.1" sources."@postman/tunnel-agent-0.6.3" sources."@sinonjs/commons-1.8.1" sources."@sinonjs/fake-timers-6.0.1" sources."@sinonjs/formatio-5.0.1" - sources."@sinonjs/samsam-5.1.0" + sources."@sinonjs/samsam-5.2.0" sources."@sinonjs/text-encoding-0.7.1" - sources."@types/color-name-1.1.1" + sources."@ungap/promise-all-settled-1.1.2" sources."JSONStream-1.3.2" - sources."acorn-7.4.0" + sources."acorn-7.4.1" sources."acorn-jsx-5.3.1" sources."aggregate-error-3.1.0" - sources."ajv-6.12.4" + sources."ajv-6.12.6" sources."ansi-colors-4.1.1" (sources."ansi-escape-sequences-4.1.0" // { dependencies = [ @@ -5149,7 +4951,6 @@ in sources."argparse-1.0.10" sources."array-back-4.0.1" sources."array-uniq-1.0.3" - sources."array.prototype.map-1.0.2" sources."asn1-0.2.4" sources."assert-plus-1.0.0" sources."assertion-error-1.1.0" @@ -5157,7 +4958,7 @@ in sources."async-3.2.0" sources."asynckit-0.4.0" sources."aws-sign2-0.7.0" - sources."aws4-1.10.1" + sources."aws4-1.11.0" sources."balanced-match-1.0.0" sources."base64-js-1.3.1" sources."bcrypt-pbkdf-1.0.2" @@ -5198,10 +4999,10 @@ in sources."catharsis-0.8.11" sources."chai-4.2.0" sources."chalk-2.4.2" - sources."chardet-1.2.1" + sources."chardet-1.3.0" sources."charset-1.0.1" sources."check-error-1.0.2" - sources."chokidar-3.4.2" + sources."chokidar-3.4.3" sources."chownr-1.1.4" sources."clean-stack-2.2.0" sources."cli-progress-3.8.2" @@ -5215,7 +5016,7 @@ in sources."strip-ansi-5.2.0" ]; }) - sources."collect-all-1.0.3" + sources."collect-all-1.0.4" sources."color-convert-1.9.3" sources."color-name-1.1.3" sources."colors-1.4.0" @@ -5236,7 +5037,7 @@ in sources."array-back-2.0.0" ]; }) - sources."commander-6.1.0" + sources."commander-6.2.0" sources."comment-parser-0.7.6" sources."common-sequence-2.0.0" sources."commondir-1.0.1" @@ -5271,7 +5072,6 @@ in sources."deep-extend-0.6.0" sources."deep-is-0.1.3" sources."default-require-extensions-3.0.0" - sources."define-properties-1.1.3" sources."delayed-stream-1.0.0" sources."diff-4.0.2" (sources."dmd-5.0.2" // { @@ -5297,8 +5097,8 @@ in sources."doctrine-3.0.0" (sources."dom-serializer-0.2.2" // { dependencies = [ - sources."domelementtype-2.0.1" - sources."entities-2.0.3" + sources."domelementtype-2.0.2" + sources."entities-2.1.0" ]; }) sources."domelementtype-1.3.1" @@ -5315,40 +5115,40 @@ in sources."end-of-stream-1.4.4" sources."enquirer-2.3.6" sources."entities-1.1.2" - sources."es-abstract-1.17.6" - sources."es-array-method-boxes-properly-1.0.0" - (sources."es-get-iterator-1.1.0" // { - dependencies = [ - sources."isarray-2.0.5" - ]; - }) - sources."es-to-primitive-1.2.1" sources."es6-error-4.1.1" sources."escape-html-1.0.3" sources."escape-string-regexp-1.0.5" - (sources."eslint-7.8.0" // { + (sources."eslint-7.12.1" // { dependencies = [ - sources."ansi-styles-4.2.1" + sources."ansi-styles-4.3.0" sources."chalk-4.1.0" sources."color-convert-2.0.1" sources."color-name-1.1.4" - sources."debug-4.2.0" + sources."debug-4.3.0" sources."has-flag-4.0.0" sources."supports-color-7.2.0" ]; }) - (sources."eslint-plugin-jsdoc-30.3.0" // { + (sources."eslint-plugin-jsdoc-30.7.6" // { dependencies = [ - sources."debug-4.2.0" + sources."debug-4.3.0" ]; }) sources."eslint-plugin-lodash-7.1.0" sources."eslint-plugin-mocha-8.0.0" sources."eslint-plugin-security-1.4.0" - sources."eslint-scope-5.1.0" - sources."eslint-utils-2.1.0" - sources."eslint-visitor-keys-1.3.0" - sources."espree-7.3.0" + sources."eslint-scope-5.1.1" + (sources."eslint-utils-2.1.0" // { + dependencies = [ + sources."eslint-visitor-keys-1.3.0" + ]; + }) + sources."eslint-visitor-keys-2.0.0" + (sources."espree-7.3.0" // { + dependencies = [ + sources."eslint-visitor-keys-1.3.0" + ]; + }) sources."esprima-4.0.1" (sources."esquery-1.3.1" // { dependencies = [ @@ -5387,19 +5187,23 @@ in ]; }) sources."find-up-5.0.0" - sources."flat-4.1.0" - sources."flat-cache-2.0.1" - sources."flatted-2.0.1" + sources."flat-5.0.2" + (sources."flat-cache-2.0.1" // { + dependencies = [ + sources."flatted-2.0.2" + ]; + }) + sources."flatted-3.1.0" sources."foreground-child-2.0.0" sources."forever-agent-0.6.1" - sources."fromentries-1.2.1" + sources."fromentries-1.3.1" sources."fs-constants-1.0.0" sources."fs-then-native-2.0.0" sources."fs.realpath-1.0.0" sources."fsevents-2.1.3" sources."function-bind-1.1.1" sources."functional-red-black-tree-1.0.1" - sources."gensync-1.0.0-beta.1" + sources."gensync-1.0.0-beta.2" sources."get-caller-file-2.0.5" sources."get-func-name-2.0.0" sources."get-package-type-0.1.0" @@ -5420,18 +5224,17 @@ in ]; }) sources."has-flag-3.0.0" - sources."has-symbols-1.0.1" - sources."hasha-5.2.0" + sources."hasha-5.2.2" sources."he-1.2.0" sources."html-escaper-2.0.2" sources."htmlparser2-3.10.1" sources."http-reasons-0.1.0" - sources."http-signature-1.3.4" + sources."http-signature-1.3.5" sources."httpntlm-1.7.6" sources."httpreq-0.4.24" sources."iconv-lite-0.6.2" sources."ignore-4.0.6" - (sources."import-fresh-3.2.1" // { + (sources."import-fresh-3.2.2" // { dependencies = [ sources."resolve-from-4.0.0" ]; @@ -5451,22 +5254,14 @@ in }) sources."interpret-1.4.0" sources."ip-regex-2.1.0" - sources."is-arguments-1.0.4" sources."is-binary-path-2.1.0" - sources."is-buffer-2.0.4" - sources."is-callable-1.2.1" - sources."is-date-object-1.0.2" + sources."is-core-module-2.0.0" sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-3.0.0" sources."is-glob-4.0.1" - sources."is-map-2.0.1" sources."is-number-7.0.0" - sources."is-plain-obj-1.1.0" - sources."is-regex-1.1.1" - sources."is-set-2.0.1" + sources."is-plain-obj-2.1.0" sources."is-stream-2.0.0" - sources."is-string-1.0.5" - sources."is-symbol-1.0.3" sources."is-typedarray-1.0.0" sources."is-windows-1.0.2" sources."isarray-1.0.0" @@ -5496,18 +5291,16 @@ in }) (sources."istanbul-lib-source-maps-4.0.0" // { dependencies = [ - sources."debug-4.2.0" + sources."debug-4.3.0" ]; }) sources."istanbul-reports-3.0.2" - sources."iterate-iterator-1.0.1" - sources."iterate-value-1.0.2" sources."js-sha512-0.8.0" sources."js-tokens-4.0.0" sources."js-yaml-3.14.0" sources."js2xmlparser-4.0.1" sources."jsbn-0.1.1" - (sources."jsdoc-3.6.5" // { + (sources."jsdoc-3.6.6" // { dependencies = [ sources."bluebird-3.7.2" sources."escape-string-regexp-2.0.0" @@ -5532,7 +5325,7 @@ in sources."xmlbuilder-10.1.1" ]; }) - sources."just-extend-4.1.0" + sources."just-extend-4.1.1" sources."klaw-3.0.0" sources."levn-0.4.1" sources."linkify-it-2.2.0" @@ -5553,7 +5346,7 @@ in sources."lodash.set-4.3.2" (sources."log-symbols-4.0.0" // { dependencies = [ - sources."ansi-styles-4.2.1" + sources."ansi-styles-4.3.0" sources."chalk-4.1.0" sources."color-convert-2.0.1" sources."color-name-1.1.4" @@ -5569,7 +5362,7 @@ in ]; }) sources."markdown-it-anchor-5.3.0" - sources."marked-1.1.1" + sources."marked-1.2.0" sources."mdurl-1.0.1" sources."mime-db-1.44.0" sources."mime-format-2.0.0" @@ -5578,22 +5371,22 @@ in sources."minimist-1.2.5" sources."mkdirp-1.0.4" sources."mkdirp2-1.0.4" - (sources."mocha-8.1.3" // { + (sources."mocha-8.2.1" // { dependencies = [ - sources."debug-4.1.1" + sources."debug-4.2.0" sources."escape-string-regexp-4.0.0" sources."has-flag-4.0.0" - sources."strip-json-comments-3.0.1" - sources."supports-color-7.1.0" + sources."supports-color-7.2.0" ]; }) sources."ms-2.1.2" + sources."nanoid-3.1.12" sources."natural-compare-1.4.0" sources."neo-async-2.6.2" sources."nise-4.0.4" (sources."nock-13.0.4" // { dependencies = [ - sources."debug-4.2.0" + sources."debug-4.3.0" ]; }) sources."node-oauth1-1.3.0" @@ -5602,7 +5395,7 @@ in sources."number-is-nan-1.0.1" (sources."nyc-15.1.0" // { dependencies = [ - sources."ansi-styles-4.2.1" + sources."ansi-styles-4.3.0" sources."cliui-6.0.0" sources."color-convert-2.0.1" sources."color-name-1.1.4" @@ -5622,10 +5415,7 @@ in sources."object-assign-4.1.1" sources."object-get-2.1.1" sources."object-hash-1.3.1" - sources."object-inspect-1.8.0" - sources."object-keys-1.1.1" sources."object-to-spawn-args-2.0.0" - sources."object.assign-4.1.0" sources."once-1.4.0" sources."optionator-0.9.1" sources."p-limit-3.0.2" @@ -5665,12 +5455,12 @@ in sources."p-locate-4.1.0" ]; }) - (sources."postcss-7.0.32" // { + (sources."postcss-7.0.35" // { dependencies = [ sources."supports-color-6.1.0" ]; }) - sources."postman-collection-3.6.6" + sources."postman-collection-3.6.8" (sources."postman-collection-transformer-3.3.3" // { dependencies = [ sources."commander-5.1.0" @@ -5678,24 +5468,24 @@ in ]; }) sources."postman-jsdoc-theme-0.0.3" - (sources."postman-request-2.88.1-postman.24" // { + (sources."postman-request-2.88.1-postman.27" // { dependencies = [ sources."tough-cookie-2.5.0" ]; }) - (sources."postman-runtime-7.26.5" // { + (sources."postman-runtime-7.26.8" // { dependencies = [ sources."async-2.6.3" + sources."aws4-1.10.1" ]; }) - sources."postman-sandbox-3.5.9" - sources."postman-url-encoder-2.1.3" + sources."postman-sandbox-4.0.0" + sources."postman-url-encoder-3.0.0" sources."prelude-ls-1.2.1" - sources."pretty-ms-7.0.0" + sources."pretty-ms-7.0.1" sources."process-nextick-args-2.0.1" sources."process-on-spawn-1.0.0" sources."progress-2.0.3" - sources."promise.allsettled-1.0.2" sources."propagate-2.0.1" sources."pseudomap-1.0.2" sources."psl-1.8.0" @@ -5707,7 +5497,7 @@ in sources."randombytes-2.1.0" sources."readable-stream-3.6.0" sources."readdir-0.0.13" - sources."readdirp-3.4.0" + sources."readdirp-3.5.0" sources."rechoir-0.6.2" sources."recursive-readdir-2.2.2" (sources."reduce-extract-1.0.0" // { @@ -5730,7 +5520,7 @@ in sources."require-directory-2.1.1" sources."require-main-filename-2.0.0" sources."requizzle-0.2.3" - sources."resolve-1.17.0" + sources."resolve-1.18.1" sources."resolve-from-5.0.0" sources."ret-0.1.15" sources."rimraf-2.6.3" @@ -5745,7 +5535,7 @@ in sources."stack-trace-0.0.9" ]; }) - sources."serialize-javascript-4.0.0" + sources."serialize-javascript-5.0.1" sources."server-destroy-1.0.1" sources."set-blocking-2.0.0" sources."shebang-command-2.0.0" @@ -5753,7 +5543,7 @@ in sources."shelljs-0.8.4" sources."sigmund-1.0.1" sources."signal-exit-3.0.3" - (sources."sinon-9.0.3" // { + (sources."sinon-9.2.1" // { dependencies = [ sources."has-flag-4.0.0" sources."supports-color-7.2.0" @@ -5779,7 +5569,7 @@ in }) sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.5" + sources."spdx-license-ids-3.0.6" sources."split-ca-1.0.1" sources."sprintf-js-1.0.3" sources."srcset-1.0.0" @@ -5794,8 +5584,6 @@ in sources."stream-via-1.0.4" sources."strftime-0.10.0" sources."string-width-4.2.0" - sources."string.prototype.trimend-1.0.1" - sources."string.prototype.trimstart-1.0.1" sources."string_decoder-1.3.0" sources."strip-ansi-6.0.0" sources."strip-bom-4.0.0" @@ -5851,19 +5639,14 @@ in sources."typedarray-to-buffer-3.1.5" sources."typical-2.6.1" sources."uc.micro-1.0.6" - sources."uglify-js-3.10.4" + sources."uglify-js-3.11.5" sources."underscore-1.7.0" sources."uri-js-4.4.0" sources."utcstring-0.1.0" sources."util-deprecate-1.0.2" sources."uuid-3.4.0" - (sources."uvm-1.7.9" // { - dependencies = [ - sources."lodash-4.17.19" - sources."uuid-3.3.2" - ]; - }) - sources."v8-compile-cache-2.1.1" + sources."uvm-2.0.1" + sources."v8-compile-cache-2.2.0" sources."verror-1.10.0" sources."walk-back-4.0.0" sources."which-2.0.2" @@ -5885,7 +5668,7 @@ in sources."word-wrap-1.2.3" sources."wordwrap-1.0.0" sources."wordwrapjs-3.0.0" - sources."workerpool-6.0.0" + sources."workerpool-6.0.2" (sources."wrap-ansi-5.1.0" // { dependencies = [ sources."ansi-regex-4.1.0" @@ -5927,20 +5710,10 @@ in ]; }) sources."yargs-parser-13.1.2" - (sources."yargs-unparser-1.6.1" // { + (sources."yargs-unparser-2.0.0" // { dependencies = [ - sources."ansi-regex-4.1.0" - sources."emoji-regex-7.0.3" - sources."find-up-3.0.0" - sources."is-fullwidth-code-point-2.0.0" - sources."locate-path-3.0.0" - sources."p-limit-2.3.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" - sources."yargs-14.2.3" - sources."yargs-parser-15.0.1" + sources."camelcase-6.2.0" + sources."decamelize-4.0.0" ]; }) ]; From a1a4585729631346910a131a27408ea01633ee1e Mon Sep 17 00:00:00 2001 From: Victor Luft Date: Mon, 9 Nov 2020 09:52:15 -0500 Subject: [PATCH 016/260] sublime-merge-dev: 2033 -> 2037 --- .../applications/version-management/sublime-merge/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/sublime-merge/default.nix b/pkgs/applications/version-management/sublime-merge/default.nix index d5713ea23451..773a2c3b4f51 100644 --- a/pkgs/applications/version-management/sublime-merge/default.nix +++ b/pkgs/applications/version-management/sublime-merge/default.nix @@ -9,8 +9,8 @@ in { } {}; sublime-merge-dev = common { - buildVersion = "2033"; - sha256 = "ab937a393eb6ae776a81b30ec5a589ae37763885ba8a91680d5c43e19a01a8fa"; + buildVersion = "2037"; + sha256 = "1s0g18l2msmnn6w7f126andh2dygm9l94fxxhsi64v74mkawqg82"; dev = true; } {}; } From cabec55afd5f97cdc5e6f00bf6a12a194dbc6b77 Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Wed, 11 Nov 2020 19:41:04 +0100 Subject: [PATCH 017/260] osslsigncode: unstable-2020-08-02 -> 2.1 --- pkgs/development/tools/osslsigncode/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/osslsigncode/default.nix b/pkgs/development/tools/osslsigncode/default.nix index 6924ec9e37a7..ef673ed018f2 100644 --- a/pkgs/development/tools/osslsigncode/default.nix +++ b/pkgs/development/tools/osslsigncode/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "osslsigncode"; - version = "unstable-2020-08-02"; + version = "2.1"; src = fetchFromGitHub { owner = "mtrojnar"; repo = pname; - rev = "01b3fb5b542ed0b41e3860aeee7a85b735491ff2"; - sha256 = "03ynm1ycbi86blglma3xiwadck8kc5yb0gawjzlhyv90jidn680l"; + rev = version; + sha256 = "0iwxdzqan2bswz62pmwjcyh01vs6ifpdcannw3s192gqzac1lgg3"; }; nativeBuildInputs = [ autoreconfHook libgsf pkgconfig openssl curl ]; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/mtrojnar/osslsigncode"; description = "OpenSSL based Authenticode signing for PE/MSI/Java CAB files"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ mmahut ]; + maintainers = with maintainers; [ mmahut prusnak ]; platforms = platforms.all; }; } From 0f527d07c56cffa3e0fc3968fc28539c5974ffb4 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 11 Nov 2020 22:27:15 +0000 Subject: [PATCH 018/260] pt2-clone: 1.23 -> 1.24 --- pkgs/applications/audio/pt2-clone/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/pt2-clone/default.nix b/pkgs/applications/audio/pt2-clone/default.nix index eaabcf4bef7d..8a0cd99ff2ba 100644 --- a/pkgs/applications/audio/pt2-clone/default.nix +++ b/pkgs/applications/audio/pt2-clone/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "pt2-clone"; - version = "1.23"; + version = "1.24"; src = fetchFromGitHub { owner = "8bitbubsy"; repo = "pt2-clone"; rev = "v${version}"; - sha256 = "1vixpp0vqpawqviwl44wn8zf602zyyrgqnjzrlwjrmdzydx9c93y"; + sha256 = "0lw18943dqgydgl4byk440j016m486s82k6hhqjn3w75108b7w1r"; }; nativeBuildInputs = [ cmake ]; From d3521527b4ad2358ce2b4fe523c616e4857a3db3 Mon Sep 17 00:00:00 2001 From: gnidorah Date: Thu, 12 Nov 2020 04:10:14 +0300 Subject: [PATCH 019/260] zoom-us: support alsa --- .../networking/instant-messengers/zoom-us/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix index 6c072118bc88..feac6ff8fa43 100644 --- a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix +++ b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix @@ -8,6 +8,7 @@ # Runtime , coreutils, faac, pciutils, procps, utillinux , pulseaudioSupport ? true, libpulseaudio ? null +, alsaSupport ? stdenv.isLinux, alsaLib ? null }: assert pulseaudioSupport -> libpulseaudio != null; @@ -45,7 +46,8 @@ in mkDerivation { qtscript qtwebchannel qtwebengine qtimageformats qtsvg qttools qtwayland ]; - runtimeDependencies = optional pulseaudioSupport libpulseaudio; + runtimeDependencies = optional pulseaudioSupport libpulseaudio + ++ optional alsaSupport alsaLib; installPhase = let From 6d730efa650946b07f75d64f67446a55d2df768d Mon Sep 17 00:00:00 2001 From: Jeff Labonte Date: Fri, 13 Nov 2020 19:42:23 -0500 Subject: [PATCH 020/260] brave: 1.16.72 -> 1.16.76 --- pkgs/applications/networking/browsers/brave/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/brave/default.nix b/pkgs/applications/networking/browsers/brave/default.nix index f0abf2a79fe3..ac924730989e 100644 --- a/pkgs/applications/networking/browsers/brave/default.nix +++ b/pkgs/applications/networking/browsers/brave/default.nix @@ -86,11 +86,11 @@ in stdenv.mkDerivation rec { pname = "brave"; - version = "1.16.72"; + version = "1.16.76"; src = fetchurl { url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb"; - sha256 = "0gcmbqkrkdrjj0cc34bp56iqawhyfz46k7q8x82pw9b1rbjp1x6k"; + sha256 = "1nbgiwflmr3ik428yarmnpx10dmqai2m4k910miqd92mwmfb0pib"; }; dontConfigure = true; From 95bbf889f7e27ea303180416fec779ded960f537 Mon Sep 17 00:00:00 2001 From: alexameen Date: Sat, 14 Nov 2020 00:55:22 -0600 Subject: [PATCH 021/260] Remove AdobeBlank-Regular.ttf from google-fonts package modified: default.nix --- pkgs/data/fonts/google-fonts/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/data/fonts/google-fonts/default.nix b/pkgs/data/fonts/google-fonts/default.nix index 7a3b488212df..eabc1713a722 100644 --- a/pkgs/data/fonts/google-fonts/default.nix +++ b/pkgs/data/fonts/google-fonts/default.nix @@ -30,7 +30,11 @@ stdenv.mkDerivation { rm -rv ofl/comfortaa/*.ttf \ ofl/mavenpro/*.ttf \ ofl/muli/*.ttf \ - ofl/oswald/*.ttf + ofl/oswald/*.ttf \ + + # This abomination of a font causes crashes with `libfontconfig', + # It has an absurd number of symbols + rm -r ofl/adobeblank/ if find . -name "*.ttf" | sed 's|.*/||' | sort | uniq -c | sort -n | grep -v '^.*1 '; then echo "error: duplicate font names" From 80ceb60cb16d63c9d31ed83ffdb505301aa15454 Mon Sep 17 00:00:00 2001 From: Gauvain 'GovanifY' Roussel-Tarbouriech Date: Sat, 14 Nov 2020 00:26:24 +0100 Subject: [PATCH 022/260] ghidra: 9.1.2 -> 9.2 --- pkgs/tools/security/ghidra/default.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/security/ghidra/default.nix b/pkgs/tools/security/ghidra/default.nix index d31e1f2c2758..e11d028f1f8b 100644 --- a/pkgs/tools/security/ghidra/default.nix +++ b/pkgs/tools/security/ghidra/default.nix @@ -14,13 +14,15 @@ }; -in stdenv.mkDerivation { +in stdenv.mkDerivation rec { - name = "ghidra-9.1.2"; + pname = "ghidra"; + version = "9.2"; + versiondate = "20201113"; src = fetchzip { - url = "https://ghidra-sre.org/ghidra_9.1.2_PUBLIC_20200212.zip"; - sha256 = "0j48pijypg44bw06azbrgfqjkigb13ljfdxib70sxwyqia3vkbbm"; + url = "https://www.ghidra-sre.org/ghidra_${version}_PUBLIC_${versiondate}.zip"; + sha256 = "0lcvmbq04qkdsf0bz509frgw79bhyxyixkqg1k712p3576ng3nby"; }; nativeBuildInputs = [ @@ -62,7 +64,7 @@ in stdenv.mkDerivation { homepage = "https://ghidra-sre.org/"; platforms = [ "x86_64-linux" ]; license = licenses.asl20; - maintainers = [ maintainers.ck3d ]; + maintainers = with maintainers; [ ck3d govanify ]; }; } From aaad9fd0daadffa53a65cdeff3a060f0c59db417 Mon Sep 17 00:00:00 2001 From: Mike Sperber Date: Sat, 2 May 2020 16:18:29 +0200 Subject: [PATCH 023/260] nixos/doc: Rudimentary documentation for Subversion-inside-Apache HTTP. Content thanks to: Aaron Andersen --- .../manual/configuration/configuration.xml | 1 + nixos/doc/manual/configuration/subversion.xml | 140 ++++++++++++++++++ 2 files changed, 141 insertions(+) create mode 100644 nixos/doc/manual/configuration/subversion.xml diff --git a/nixos/doc/manual/configuration/configuration.xml b/nixos/doc/manual/configuration/configuration.xml index 6eb8f50bacac..2d7d22e3bb5a 100644 --- a/nixos/doc/manual/configuration/configuration.xml +++ b/nixos/doc/manual/configuration/configuration.xml @@ -22,6 +22,7 @@ + diff --git a/nixos/doc/manual/configuration/subversion.xml b/nixos/doc/manual/configuration/subversion.xml new file mode 100644 index 000000000000..940d63cc4e6d --- /dev/null +++ b/nixos/doc/manual/configuration/subversion.xml @@ -0,0 +1,140 @@ + + Subversion + + + Subversion + is a centralized version-control system. It can use a variety + of protocols for communication between client and server. + +
+ Subversion inside Apache HTTP + + + This section focuses on configuring a web-based server on top of + the Apache HTTP server, which uses + WebDAV/DeltaV + for communication. + + + For more information on the general setup, please refer to + the the + appropriate section of the Subversion book. + + + To configure, include in + /etc/nixos/configuration.nix code to activate + Apache HTTP, setting + appropriately: + + + + + services.httpd.enable = true; + services.httpd.adminAddr = ...; + networking.firewall.allowedTCPPorts = [ 80 443 ]; + + + + For a simple Subversion server with basic authentication, + configure the Subversion module for Apache as follows, setting + hostName and documentRoot + appropriately, and SVNParentPath to the parent + directory of the repositories, + AuthzSVNAccessFile to the location of the + .authz file describing access permission, and + AuthUserFile to the password file. + + + +services.httpd.extraModules = [ + # note that order is *super* important here + { name = "dav_svn"; path = "${pkgs.apacheHttpdPackages.subversion}/modules/mod_dav_svn.so"; } + { name = "authz_svn"; path = "${pkgs.apacheHttpdPackages.subversion}/modules/mod_authz_svn.so"; } + ]; + services.httpd.virtualHosts = { + "svn" = { + hostName = HOSTNAME; + documentRoot = DOCUMENTROOT; + locations."/svn".extraConfig = '' + DAV svn + SVNParentPath REPO_PARENT + AuthzSVNAccessFile ACCESS_FILE + AuthName "SVN Repositories" + AuthType Basic + AuthUserFile PASSWORD_FILE + Require valid-user + ''; + } + + + + + The key "svn" is just a symbolic name identifying the + virtual host. The "/svn" in + locations."/svn".extraConfig is the path underneath + which the repositories will be served. + + + This + page explains how to set up the Subversion configuration + itself. This boils down to the following: + + + Underneath REPO_PARENT repositories can be set up + as follows: + + + +$ svn create REPO_NAME + + + Repository files need to be accessible by + wwwrun: + + + +$ chown -R wwwrun:wwwrun REPO_PARENT + + + + The password file PASSWORD_FILE can be created as follows: + + + +$ htpasswd -cs PASSWORD_FILE USER_NAME + + + + Additional users can be set up similarly, omitting the + c flag: + + + +$ htpasswd -s PASSWORD_FILE USER_NAME + + + + The file describing access permissions + ACCESS_FILE will look something like + the following: + + + +[/] +* = r + +[REPO_NAME:/] +USER_NAME = rw + + + The Subversion repositories will be accessible as http://HOSTNAME/svn/REPO_NAME. +
+ From 477a1763fcecfdd1120b113b6b0f136dcee9d144 Mon Sep 17 00:00:00 2001 From: Pierre Bourdon Date: Sat, 14 Nov 2020 21:20:18 +0100 Subject: [PATCH 024/260] jadx: 1.1.0 -> 1.2.0 --- pkgs/tools/security/jadx/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/jadx/default.nix b/pkgs/tools/security/jadx/default.nix index 961f1e6954a1..770062736bf1 100644 --- a/pkgs/tools/security/jadx/default.nix +++ b/pkgs/tools/security/jadx/default.nix @@ -2,13 +2,13 @@ let pname = "jadx"; - version = "1.1.0"; + version = "1.2.0"; src = fetchFromGitHub { owner = "skylot"; repo = pname; rev = "v${version}"; - sha256 = "1dx3g0sm46qy57gggpg8bpmin5glzbxdbf0qzvha9r2dwh4mrwlg"; + sha256 = "1w1wc81mkjcsgjbrihbsphxkcmwnfnf555pmlsd2vs2a04nki01y"; }; deps = stdenv.mkDerivation { @@ -33,7 +33,7 @@ let outputHashAlgo = "sha256"; outputHashMode = "recursive"; - outputHash = "083r4hg6m9cxzm2m8nckf10awq8kh901v5i39r60x47xk5yw84ps"; + outputHash = "05fsycpd90dbak2vgdpd9cz08liq5j78ag9ry9y1s62ld776g0hz"; }; in stdenv.mkDerivation { inherit pname version src; From c39f4075532cdb446689f318799e19027b7ac70a Mon Sep 17 00:00:00 2001 From: alexameen Date: Sat, 14 Nov 2020 19:39:55 -0600 Subject: [PATCH 025/260] Made AdobeBlank-Regular.ttf available with google-fonts.adobeBlank --- pkgs/data/fonts/google-fonts/default.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/data/fonts/google-fonts/default.nix b/pkgs/data/fonts/google-fonts/default.nix index eabc1713a722..153f37c88e0a 100644 --- a/pkgs/data/fonts/google-fonts/default.nix +++ b/pkgs/data/fonts/google-fonts/default.nix @@ -4,6 +4,8 @@ stdenv.mkDerivation { pname = "google-fonts"; version = "2019-07-14"; + outputs = [ "out" "adobeBlank" ]; + src = fetchFromGitHub { owner = "google"; repo = "fonts"; @@ -30,11 +32,7 @@ stdenv.mkDerivation { rm -rv ofl/comfortaa/*.ttf \ ofl/mavenpro/*.ttf \ ofl/muli/*.ttf \ - ofl/oswald/*.ttf \ - - # This abomination of a font causes crashes with `libfontconfig', - # It has an absurd number of symbols - rm -r ofl/adobeblank/ + ofl/oswald/*.ttf if find . -name "*.ttf" | sed 's|.*/||' | sort | uniq -c | sort -n | grep -v '^.*1 '; then echo "error: duplicate font names" @@ -43,6 +41,9 @@ stdenv.mkDerivation { ''; installPhase = '' + adobeBlankDest=$adobeBlank/share/fonts/truetype + install -m 444 -Dt $adobeBlankDest ofl/adobeblank/AdobeBlank-Regular.ttf + rm -r ofl/adobeblank dest=$out/share/fonts/truetype find . -name '*.ttf' -exec install -m 444 -Dt $dest '{}' + ''; From e4fcc9aed14abc5fd5acd38ca4d5384d993a625b Mon Sep 17 00:00:00 2001 From: Spencer Baugh Date: Sun, 15 Nov 2020 10:59:19 -0500 Subject: [PATCH 026/260] emacs: properly include source code when withCsrc is true Previously, we just copied it into a separate directory in the build directory. That's not useful, and not what was intended. --- pkgs/applications/editors/emacs/generic.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/editors/emacs/generic.nix b/pkgs/applications/editors/emacs/generic.nix index f2904f3e012b..402a6a13cec7 100644 --- a/pkgs/applications/editors/emacs/generic.nix +++ b/pkgs/applications/editors/emacs/generic.nix @@ -142,7 +142,7 @@ in stdenv.mkDerivation { rm -rf $siteVersionDir '' + lib.optionalString withCsrc '' for srcdir in src lisp lwlib ; do - dstdir=$siteVersionDir/$srcdir + dstdir=$out/share/emacs/$siteVersionDir/$srcdir mkdir -p $dstdir find $srcdir -name "*.[chm]" -exec cp {} $dstdir \; cp $srcdir/TAGS $dstdir From 802fa5b9d1b166568243a514a64bb9fc78ceb60d Mon Sep 17 00:00:00 2001 From: Spencer Baugh Date: Sun, 15 Nov 2020 13:32:05 -0500 Subject: [PATCH 027/260] emacs: properly calculate the path of the src directory --- pkgs/applications/editors/emacs/site-start.el | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/pkgs/applications/editors/emacs/site-start.el b/pkgs/applications/editors/emacs/site-start.el index de4708b88908..2f02d6d1a86d 100644 --- a/pkgs/applications/editors/emacs/site-start.el +++ b/pkgs/applications/editors/emacs/site-start.el @@ -52,9 +52,6 @@ least specific (the system profile)" (file-name-directory load-file-name)))) ; .../emacs/site-lisp/ (version (file-name-as-directory - (concat - (number-to-string emacs-major-version) - "." - (number-to-string emacs-minor-version)))) + emacs-version)) (src (file-name-as-directory "src"))) (setq find-function-C-source-directory (concat emacs version src))) From 47f8d830c5703108c1bf58c1205009e4d77961af Mon Sep 17 00:00:00 2001 From: Marek Fajkus Date: Mon, 16 Nov 2020 21:16:36 +0100 Subject: [PATCH 028/260] elmPackages.{elm-language-server,create-elm-app,elm-optimize-level-2}: update --- .../compilers/elm/packages/node-packages.nix | 888 +++++++----------- 1 file changed, 332 insertions(+), 556 deletions(-) diff --git a/pkgs/development/compilers/elm/packages/node-packages.nix b/pkgs/development/compilers/elm/packages/node-packages.nix index 58c9b9a4e918..2685871df0fa 100644 --- a/pkgs/development/compilers/elm/packages/node-packages.nix +++ b/pkgs/development/compilers/elm/packages/node-packages.nix @@ -31,13 +31,13 @@ let sha512 = "vG6SvB6oYEhvgisZNFRmRCUkLz11c7rp+tbNTynGqc6mS1d5ATd/sGyV6W0KZZnXRKMTzZDRgQT3Ou9jhpAfUg=="; }; }; - "@babel/compat-data-7.12.1" = { + "@babel/compat-data-7.12.5" = { name = "_at_babel_slash_compat-data"; packageName = "@babel/compat-data"; - version = "7.12.1"; + version = "7.12.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.12.1.tgz"; - sha512 = "725AQupWJZ8ba0jbKceeFblZTY90McUBWMwHhkFQ9q1zKPJ95GUktljFcgcsIVwRnTnRKlcYzfiNImg5G9m6ZQ=="; + url = "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.12.5.tgz"; + sha512 = "DTsS7cxrsH3by8nqQSpFSyjSfSYl57D6Cf4q8dW3LK83tBKBDCkfcay1nYkXq1nIHXnpX8WMMb/O25HOy3h1zg=="; }; }; "@babel/core-7.12.3" = { @@ -49,13 +49,13 @@ let sha512 = "0qXcZYKZp3/6N2jKYVxZv0aNCsxTSVCiK72DTiTYZAu7sjg73W0/aynWjMbiGd87EQL4WyA8reiJVh92AVla9g=="; }; }; - "@babel/generator-7.12.1" = { + "@babel/generator-7.12.5" = { name = "_at_babel_slash_generator"; packageName = "@babel/generator"; - version = "7.12.1"; + version = "7.12.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/generator/-/generator-7.12.1.tgz"; - sha512 = "DB+6rafIdc9o72Yc3/Ph5h+6hUjeOp66pF0naQBgUFFuPqzQwIlPTm3xZR7YNvduIMtkDIj2t21LSQwnbCrXvg=="; + url = "https://registry.npmjs.org/@babel/generator/-/generator-7.12.5.tgz"; + sha512 = "m16TQQJ8hPt7E+OS/XVQg/7U184MLXtvuGbCdA7na61vha+ImkyyNM/9DDA0unYCVZn3ZOhng+qz48/KBOT96A=="; }; }; "@babel/helper-annotate-as-pure-7.10.4" = { @@ -76,13 +76,13 @@ let sha512 = "L0zGlFrGWZK4PbT8AszSfLTM5sDU1+Az/En9VrdT8/LmEiJt4zXt+Jve9DCAnQcbqDhCI+29y/L93mrDzddCcg=="; }; }; - "@babel/helper-compilation-targets-7.12.1" = { + "@babel/helper-compilation-targets-7.12.5" = { name = "_at_babel_slash_helper-compilation-targets"; packageName = "@babel/helper-compilation-targets"; - version = "7.12.1"; + version = "7.12.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.12.1.tgz"; - sha512 = "jtBEif7jsPwP27GPHs06v4WBV0KrE8a/P7n0N0sSvHn2hwUCYnolP/CLmz51IzAW4NlN+HuoBtb9QcwnRo9F/g=="; + url = "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.12.5.tgz"; + sha512 = "+qH6NrscMolUlzOYngSBMIOQpKUGPPsc61Bu5W10mg84LxZ7cmvnBHzARKbDoFxVvqqAbj6Tg6N7bSrWSPXMyw=="; }; }; "@babel/helper-create-class-features-plugin-7.12.1" = { @@ -157,13 +157,13 @@ let sha512 = "k0CIe3tXUKTRSoEx1LQEPFU9vRQfqHtl+kf8eNnDqb4AUJEy5pz6aIiog+YWtVm2jpggjS1laH68bPsR+KWWPQ=="; }; }; - "@babel/helper-module-imports-7.12.1" = { + "@babel/helper-module-imports-7.12.5" = { name = "_at_babel_slash_helper-module-imports"; packageName = "@babel/helper-module-imports"; - version = "7.12.1"; + version = "7.12.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.12.1.tgz"; - sha512 = "ZeC1TlMSvikvJNy1v/wPIazCu3NdOwgYZLIkmIyAsGhqkNpiDoQQRmaCK8YP4Pq3GPTLPV9WXaPCJKvx06JxKA=="; + url = "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.12.5.tgz"; + sha512 = "SR713Ogqg6++uexFRORf/+nPXMmWIn80TALu0uaFb+iQIUoR7bOC7zBWyzBs5b3tBBJXuyD0cRu1F15GyzjOWA=="; }; }; "@babel/helper-module-transforms-7.12.1" = { @@ -211,13 +211,13 @@ let sha512 = "9d0KQCRM8clMPcDwo8SevNs+/9a8yWVVmaE80FGJcEP8N1qToREmWEGnBn8BUlJhYRFz6fqxeRL1sl5Ogsed7A=="; }; }; - "@babel/helper-replace-supers-7.12.1" = { + "@babel/helper-replace-supers-7.12.5" = { name = "_at_babel_slash_helper-replace-supers"; packageName = "@babel/helper-replace-supers"; - version = "7.12.1"; + version = "7.12.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.12.1.tgz"; - sha512 = "zJjTvtNJnCFsCXVi5rUInstLd/EIVNmIKA1Q9ynESmMBWPWd+7sdR+G4/wdu+Mppfep0XLyG2m7EBPvjCeFyrw=="; + url = "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.12.5.tgz"; + sha512 = "5YILoed0ZyIpF4gKcpZitEnXEJ9UoDRki1Ey6xz46rxOzfNMAhVIJMoune1hmPVxh40LRv1+oafz7UsWX+vyWA=="; }; }; "@babel/helper-simple-access-7.12.1" = { @@ -274,13 +274,13 @@ let sha512 = "Cvb8IuJDln3rs6tzjW3Y8UeelAOdnpB8xtQ4sme2MSZ9wOxrbThporC0y/EtE16VAtoyEfLM404Xr1e0OOp+ow=="; }; }; - "@babel/helpers-7.12.1" = { + "@babel/helpers-7.12.5" = { name = "_at_babel_slash_helpers"; packageName = "@babel/helpers"; - version = "7.12.1"; + version = "7.12.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helpers/-/helpers-7.12.1.tgz"; - sha512 = "9JoDSBGoWtmbay98efmT2+mySkwjzeFeAL9BuWNoVQpkPFQF8SIIFUfY5os9u8wVzglzoiPRSW7cuJmBDUt43g=="; + url = "https://registry.npmjs.org/@babel/helpers/-/helpers-7.12.5.tgz"; + sha512 = "lgKGMQlKqA8meJqKsW6rUnc4MdUk35Ln0ATDqdM1a/UpARODdI4j5Y5lVfUScnSNkJcdCRAaWkspykNoFg9sJA=="; }; }; "@babel/highlight-7.10.4" = { @@ -292,13 +292,13 @@ let sha512 = "i6rgnR/YgPEQzZZnbTHHuZdlE8qyoBNalD6F+q4vAFlcMEcqmkoG+mPqJYJCo63qPf74+Y1UZsl3l6f7/RIkmA=="; }; }; - "@babel/parser-7.12.3" = { + "@babel/parser-7.12.5" = { name = "_at_babel_slash_parser"; packageName = "@babel/parser"; - version = "7.12.3"; + version = "7.12.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/parser/-/parser-7.12.3.tgz"; - sha512 = "kFsOS0IbsuhO5ojF8Hc8z/8vEIOkylVBrjiZUbLTE3XFe0Qi+uu6HjzQixkFaqr0ZPAMZcBVxEwmsnsLPZ2Xsw=="; + url = "https://registry.npmjs.org/@babel/parser/-/parser-7.12.5.tgz"; + sha512 = "FVM6RZQ0mn2KCf1VUED7KepYeUWoVShczewOCfm3nzoBybaih51h+sYVVGthW9M6lPByEPTQf+xm27PBdlpwmQ=="; }; }; "@babel/plugin-proposal-async-generator-functions-7.12.1" = { @@ -364,13 +364,13 @@ let sha512 = "nZY0ESiaQDI1y96+jk6VxMOaL4LPo/QDHBqL+SF3/vl6dHkTwHlOI8L4ZwuRBHgakRBw5zsVylel7QPbbGuYgg=="; }; }; - "@babel/plugin-proposal-numeric-separator-7.12.1" = { + "@babel/plugin-proposal-numeric-separator-7.12.5" = { name = "_at_babel_slash_plugin-proposal-numeric-separator"; packageName = "@babel/plugin-proposal-numeric-separator"; - version = "7.12.1"; + version = "7.12.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.12.1.tgz"; - sha512 = "MR7Ok+Af3OhNTCxYVjJZHS0t97ydnJZt/DbR4WISO39iDnhiD8XHrY12xuSJ90FFEGjir0Fzyyn7g/zY6hxbxA=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.12.5.tgz"; + sha512 = "UiAnkKuOrCyjZ3sYNHlRlfuZJbBHknMQ9VMwVeX97Ofwx7RpD6gS2HfqTCh8KNUQgcOm8IKt103oR4KIjh7Q8g=="; }; }; "@babel/plugin-proposal-object-rest-spread-7.12.1" = { @@ -841,13 +841,13 @@ let sha512 = "J36NhwnfdzpmH41M1DrnkkgAqhZaqr/NBdPfQ677mLzlaXo+oDiv1deyCDtgAhz8p328otdob0Du7+xgHGZbKg=="; }; }; - "@babel/runtime-7.12.1" = { + "@babel/runtime-7.12.5" = { name = "_at_babel_slash_runtime"; packageName = "@babel/runtime"; - version = "7.12.1"; + version = "7.12.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/runtime/-/runtime-7.12.1.tgz"; - sha512 = "J5AIf3vPj3UwXaAzb5j1xM4WAQDX3EMgemF8rjCP3SoW09LfRKAXQKt6CoVYl230P6iWdRcBbnLDDdnqWxZSCA=="; + url = "https://registry.npmjs.org/@babel/runtime/-/runtime-7.12.5.tgz"; + sha512 = "plcc+hbExy3McchJCEQG3knOsuh3HH+Prx1P6cLIkET/0dLuQDEnrT+s27Axgc9bqfsmNUNHfscgMUdBpC9xfg=="; }; }; "@babel/template-7.10.4" = { @@ -859,22 +859,22 @@ let sha512 = "ZCjD27cGJFUB6nmCB1Enki3r+L5kJveX9pq1SvAUKoICy6CZ9yD8xO086YXdYhvNjBdnekm4ZnaP5yC8Cs/1tA=="; }; }; - "@babel/traverse-7.12.1" = { + "@babel/traverse-7.12.5" = { name = "_at_babel_slash_traverse"; packageName = "@babel/traverse"; - version = "7.12.1"; + version = "7.12.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.12.1.tgz"; - sha512 = "MA3WPoRt1ZHo2ZmoGKNqi20YnPt0B1S0GTZEPhhd+hw2KGUzBlHuVunj6K4sNuK+reEvyiPwtp0cpaqLzJDmAw=="; + url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.12.5.tgz"; + sha512 = "xa15FbQnias7z9a62LwYAA5SZZPkHIXpd42C6uW68o8uTuua96FHZy1y61Va5P/i83FAAcMpW8+A/QayntzuqA=="; }; }; - "@babel/types-7.12.1" = { + "@babel/types-7.12.6" = { name = "_at_babel_slash_types"; packageName = "@babel/types"; - version = "7.12.1"; + version = "7.12.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/types/-/types-7.12.1.tgz"; - sha512 = "BzSY3NJBKM4kyatSOWh3D/JJ2O3CVzBybHWxtgxnggaxEuaSTTDqeiSb/xk9lrkw2Tbqyivw5ZU4rT+EfznQsA=="; + url = "https://registry.npmjs.org/@babel/types/-/types-7.12.6.tgz"; + sha512 = "hwyjw6GvjBLiyy3W0YQf0Z5Zf4NpYejUnKFcfcUhZCSffoBBp30w6wP2Wn6pk31jMYZvcOrB/1b7cGXvEoKogA=="; }; }; "@hapi/address-2.1.4" = { @@ -922,24 +922,6 @@ let sha512 = "tAag0jEcjwH+P2quUfipd7liWCNX2F8NvYjQp2wtInsZxnMlypdw0FtAOLxtvvkO+GSRRbmNi8m/5y42PQJYCQ=="; }; }; - "@jest/types-25.5.0" = { - name = "_at_jest_slash_types"; - packageName = "@jest/types"; - version = "25.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@jest/types/-/types-25.5.0.tgz"; - sha512 = "OXD0RgQ86Tu3MazKo8bnrkDRaDXXMGUqd+kTtLtK1Zb7CRzQcaSRPPPV37SvYTdevXEBVxe0HXylEjs8ibkmCw=="; - }; - }; - "@jest/types-26.6.0" = { - name = "_at_jest_slash_types"; - packageName = "@jest/types"; - version = "26.6.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@jest/types/-/types-26.6.0.tgz"; - sha512 = "8pDeq/JVyAYw7jBGU83v8RMYAkdrRxLG3BGnAJuqaQAUd6GWBmND2uyl+awI88+hit48suLoLjNFtR+ZXxWaYg=="; - }; - }; "@mrmlnc/readdir-enhanced-2.2.1" = { name = "_at_mrmlnc_slash_readdir-enhanced"; packageName = "@mrmlnc/readdir-enhanced"; @@ -1075,51 +1057,6 @@ let sha512 = "IrSHl2u6AWXduUaDLqYpt45tLVCtYv7o4Z0s1KghBCDgIIS9oW5K1H8mZG/A2CfeLdEa7rTd1ACOiHBc1EMT2Q=="; }; }; - "@types/istanbul-lib-coverage-2.0.3" = { - name = "_at_types_slash_istanbul-lib-coverage"; - packageName = "@types/istanbul-lib-coverage"; - version = "2.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.3.tgz"; - sha512 = "sz7iLqvVUg1gIedBOvlkxPlc8/uVzyS5OwGz1cKjXzkl3FpL3al0crU8YGU1WoHkxn0Wxbw5tyi6hvzJKNzFsw=="; - }; - }; - "@types/istanbul-lib-report-3.0.0" = { - name = "_at_types_slash_istanbul-lib-report"; - packageName = "@types/istanbul-lib-report"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz"; - sha512 = "plGgXAPfVKFoYfa9NpYDAkseG+g6Jr294RqeqcqDixSbU34MZVJRi/P+7Y8GDpzkEwLaGZZOpKIEmeVZNtKsrg=="; - }; - }; - "@types/istanbul-reports-1.1.2" = { - name = "_at_types_slash_istanbul-reports"; - packageName = "@types/istanbul-reports"; - version = "1.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-1.1.2.tgz"; - sha512 = "P/W9yOX/3oPZSpaYOCQzGqgCQRXn0FFO/V8bWrCQs+wLmvVVxk6CRBXALEvNs9OHIatlnlFokfhuDo2ug01ciw=="; - }; - }; - "@types/istanbul-reports-3.0.0" = { - name = "_at_types_slash_istanbul-reports"; - packageName = "@types/istanbul-reports"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-3.0.0.tgz"; - sha512 = "nwKNbvnwJ2/mndE9ItP/zc2TCzw6uuodnF4EHYWD+gCQDVBuRQL5UzbZD0/ezy1iKsFU2ZQiDqg4M9dN4+wZgA=="; - }; - }; - "@types/jest-26.0.14" = { - name = "_at_types_slash_jest"; - packageName = "@types/jest"; - version = "26.0.14"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/jest/-/jest-26.0.14.tgz"; - sha512 = "Hz5q8Vu0D288x3iWXePSn53W7hAjP0H7EQ6QvDO9c7t46mR0lNOLlfuwQ+JkVxuhygHzlzPX+0jKdA3ZgSh+Vg=="; - }; - }; "@types/json-schema-7.0.6" = { name = "_at_types_slash_json-schema"; packageName = "@types/json-schema"; @@ -1147,13 +1084,13 @@ let sha512 = "tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA=="; }; }; - "@types/node-14.11.10" = { + "@types/node-14.14.7" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "14.11.10"; + version = "14.14.7"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-14.11.10.tgz"; - sha512 = "yV1nWZPlMFpoXyoknm4S56y2nlTAuFYaJuQtYRAOU7xA/FJ9RY0Xm7QOkaYMMmr8ESdHIuUb6oQgR/0+2NqlyA=="; + url = "https://registry.npmjs.org/@types/node/-/node-14.14.7.tgz"; + sha512 = "Zw1vhUSQZYw+7u5dAwNbIA9TuTotpzY/OF7sJM9FqPOF3SPjKnxrjoTktXDZgUjybf4cWVBP7O8wvKdSaGHweg=="; }; }; "@types/parse-json-4.0.0" = { @@ -1201,22 +1138,22 @@ let sha512 = "W+bw9ds02rAQaMvaLYxAbJ6cvguW/iJXNT6lTssS1ps6QdrMKttqEAMEG/b5CR8TZl3/L7/lH0ZV5nNR1LXikA=="; }; }; - "@types/uglify-js-3.11.0" = { + "@types/uglify-js-3.11.1" = { name = "_at_types_slash_uglify-js"; packageName = "@types/uglify-js"; - version = "3.11.0"; + version = "3.11.1"; src = fetchurl { - url = "https://registry.npmjs.org/@types/uglify-js/-/uglify-js-3.11.0.tgz"; - sha512 = "I0Yd8TUELTbgRHq2K65j8rnDPAzAP+DiaF/syLem7yXwYLsHZhPd+AM2iXsWmf9P2F2NlFCgl5erZPQx9IbM9Q=="; + url = "https://registry.npmjs.org/@types/uglify-js/-/uglify-js-3.11.1.tgz"; + sha512 = "7npvPKV+jINLu1SpSYVWG8KvyJBhBa8tmzMMdDoVc2pWUYHN8KIXlPJhjJ4LT97c4dXJA2SHL/q6ADbDriZN+Q=="; }; }; - "@types/webpack-4.41.22" = { + "@types/webpack-4.41.25" = { name = "_at_types_slash_webpack"; packageName = "@types/webpack"; - version = "4.41.22"; + version = "4.41.25"; src = fetchurl { - url = "https://registry.npmjs.org/@types/webpack/-/webpack-4.41.22.tgz"; - sha512 = "JQDJK6pj8OMV9gWOnN1dcLCyU9Hzs6lux0wBO4lr1+gyEhIBR9U3FMrz12t2GPkg110XAxEAw2WHF6g7nZIbRQ=="; + url = "https://registry.npmjs.org/@types/webpack/-/webpack-4.41.25.tgz"; + sha512 = "cr6kZ+4m9lp86ytQc1jPOJXgINQyz3kLLunZ57jznW+WIAL0JqZbGubQk4GlD42MuQL5JGOABrxdpqqWeovlVQ=="; }; }; "@types/webpack-sources-2.0.0" = { @@ -1228,24 +1165,6 @@ let sha512 = "a5kPx98CNFRKQ+wqawroFunvFqv7GHm/3KOI52NY9xWADgc8smu4R6prt4EU/M4QfVjvgBkMqU4fBhw3QfMVkg=="; }; }; - "@types/yargs-15.0.9" = { - name = "_at_types_slash_yargs"; - packageName = "@types/yargs"; - version = "15.0.9"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/yargs/-/yargs-15.0.9.tgz"; - sha512 = "HmU8SeIRhZCWcnRskCs36Q1Q00KBV6Cqh/ora8WN1+22dY07AZdn6Gel8QZ3t26XYPImtcL8WV/eqjhVmMEw4g=="; - }; - }; - "@types/yargs-parser-15.0.0" = { - name = "_at_types_slash_yargs-parser"; - packageName = "@types/yargs-parser"; - version = "15.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-15.0.0.tgz"; - sha512 = "FA/BWv8t8ZWJ+gEOnLLd8ygxH/2UFbAvgEonyfN6yWGLKc7zVjbpl2Y4CTjid9h2RfgPP6SEt6uHwEOply00yw=="; - }; - }; "@webassemblyjs/ast-1.9.0" = { name = "_at_webassemblyjs_slash_ast"; packageName = "@webassemblyjs/ast"; @@ -1867,13 +1786,13 @@ let sha512 = "Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg=="; }; }; - "autoprefixer-10.0.1" = { + "autoprefixer-10.0.2" = { name = "autoprefixer"; packageName = "autoprefixer"; - version = "10.0.1"; + version = "10.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.0.1.tgz"; - sha512 = "aQo2BDIsoOdemXUAOBpFv4ZQa2DrOtEufarYhtFsK1088Ca0TUwu/aQWf0M3mrILXZ3mTIVn1lR3hPW8acacsw=="; + url = "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.0.2.tgz"; + sha512 = "okBmu9OMdt6DNEcZmnl0IYVv8Xl/xYWRSnc2OJ9UJEOt1u30opG1B8aLsViqKryBaYv1SKB4f85fOGZs5zYxHQ=="; }; }; "aws-sign2-0.7.0" = { @@ -1885,13 +1804,13 @@ let sha1 = "b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8"; }; }; - "aws4-1.10.1" = { + "aws4-1.11.0" = { name = "aws4"; packageName = "aws4"; - version = "1.10.1"; + version = "1.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/aws4/-/aws4-1.10.1.tgz"; - sha512 = "zg7Hz2k5lI8kb7U32998pRRFin7zJlkfezGJjUc2heaD4Pw2wObakCDVzkKztTm/Ln7eiVvYsjqak0Ed4LkMDA=="; + url = "https://registry.npmjs.org/aws4/-/aws4-1.11.0.tgz"; + sha512 = "xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA=="; }; }; "babel-extract-comments-1.0.0" = { @@ -1903,13 +1822,13 @@ let sha512 = "qWWzi4TlddohA91bFwgt6zO/J0X+io7Qp184Fw0m2JYRSTZnJbFR8+07KmzudHCZgOiKRCrjhylwv9Xd8gfhVQ=="; }; }; - "babel-loader-8.1.0" = { + "babel-loader-8.2.1" = { name = "babel-loader"; packageName = "babel-loader"; - version = "8.1.0"; + version = "8.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/babel-loader/-/babel-loader-8.1.0.tgz"; - sha512 = "7q7nC1tYOrqvUrN3LQK4GwSk/TQorZSOlO9C+RZDZpODgyN4ZlCqE5q9cDsyWOliN+aU9B4JX01xK9eJXowJLw=="; + url = "https://registry.npmjs.org/babel-loader/-/babel-loader-8.2.1.tgz"; + sha512 = "dMF8sb2KQ8kJl21GUjkW1HWmcsL39GOV5vnzjqrCzEPNY0S0UfMLnumidiwIajDSBmKhYf5iRW+HXaM4cvCKBw=="; }; }; "babel-plugin-dynamic-import-node-2.3.3" = { @@ -1984,13 +1903,13 @@ let sha512 = "5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg=="; }; }; - "base64-js-1.3.1" = { + "base64-js-1.5.1" = { name = "base64-js"; packageName = "base64-js"; - version = "1.3.1"; + version = "1.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/base64-js/-/base64-js-1.3.1.tgz"; - sha512 = "mLQ4i2QO1ytvGWFWmcngKO//JXAQueZvwEKtjgQFM4jIK0kU+ytMfplL8j+n5mspOfjHwoAg+9yhb7BwAHm36g=="; + url = "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz"; + sha512 = "AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA=="; }; }; "batch-0.6.1" = { @@ -2200,13 +2119,13 @@ let sha512 = "BioO1xf3hFwz4kc6iBhI3ieDFompMhrMlnDFC4/0/vd5MokpuAc3R+LYbwTA9A5Yc9pq9UYPqffKpW2ObuwX5A=="; }; }; - "browserify-rsa-4.0.1" = { + "browserify-rsa-4.1.0" = { name = "browserify-rsa"; packageName = "browserify-rsa"; - version = "4.0.1"; + version = "4.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.0.1.tgz"; - sha1 = "21e0abfaf6f2029cf2fafb133567a701d4135524"; + url = "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.1.0.tgz"; + sha512 = "AdEER0Hkspgno2aR97SAf6vi0y0k8NuOpGnVH3O99rcA5Q6sh8QxcngtHuJ6uXwnfAXNM4Gn1Gb7/MV1+Ymbog=="; }; }; "browserify-sign-4.2.1" = { @@ -2236,22 +2155,13 @@ let sha512 = "VBorw+tgpOtZ1BYhrVSVTzTt/3+vSE3eFUh0N2GCFK1HffceOaf32YS/bs6WiFhjDAblAFrx85jMy3BG9fBK2Q=="; }; }; - "browserslist-4.14.5" = { + "browserslist-4.14.7" = { name = "browserslist"; packageName = "browserslist"; - version = "4.14.5"; + version = "4.14.7"; src = fetchurl { - url = "https://registry.npmjs.org/browserslist/-/browserslist-4.14.5.tgz"; - sha512 = "Z+vsCZIvCBvqLoYkBFTwEYH3v5MCQbsAjp50ERycpOjnPmolg1Gjy4+KaWWpm8QOJt9GHkhdqAl14NpCX73CWA=="; - }; - }; - "bs-logger-0.2.6" = { - name = "bs-logger"; - packageName = "bs-logger"; - version = "0.2.6"; - src = fetchurl { - url = "https://registry.npmjs.org/bs-logger/-/bs-logger-0.2.6.tgz"; - sha512 = "pd8DCoxmbgc7hyPKOvxtqNcjYoOsABPQdcCUjGp3d42VR2CX1ORhk2A87oqqu5R1kk+76nsxZupkmyd+MVtCog=="; + url = "https://registry.npmjs.org/browserslist/-/browserslist-4.14.7.tgz"; + sha512 = "BSVRLCeG3Xt/j/1cCGj1019Wbty0H+Yvu2AOuZSuoaUWn3RatbL33Cxk+Q4jRMRAbOm0p7SLravLjpnT6s0vzQ=="; }; }; "buffer-4.9.2" = { @@ -2380,6 +2290,15 @@ let sha512 = "lt0mJ6YAnsrBErpTMWeu5kl/tg9xMAWjavYTN6VQXM1A/teBITuNcccXsCxF0tDQQJf9DfAaX5O4e0zp0KlfZw=="; }; }; + "call-bind-1.0.0" = { + name = "call-bind"; + packageName = "call-bind"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/call-bind/-/call-bind-1.0.0.tgz"; + sha512 = "AEXsYIyyDY3MCzbwdhzG3Jx1R0J2wetQyUynn6dYHAO+bg8l1k7jwZtRv4ryryFs7EP+NDlikJlVe59jr0cM2w=="; + }; + }; "call-me-maybe-1.0.1" = { name = "call-me-maybe"; packageName = "call-me-maybe"; @@ -2452,13 +2371,13 @@ let sha512 = "L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg=="; }; }; - "camelcase-6.1.0" = { + "camelcase-6.2.0" = { name = "camelcase"; packageName = "camelcase"; - version = "6.1.0"; + version = "6.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/camelcase/-/camelcase-6.1.0.tgz"; - sha512 = "WCMml9ivU60+8rEJgELlFp1gxFcEGxwYleE3bziHEDeqsqAWGHdimB7beBFGjLzVNgPGyDsfgXLQEYMpmIFnVQ=="; + url = "https://registry.npmjs.org/camelcase/-/camelcase-6.2.0.tgz"; + sha512 = "c7wVvbw3f37nuobQNtgsgG9POC9qMbNuMQmTCqZv23b6MIz0fcYpBiOlv9gEN/hdLdnZTDQhg6e9Dq5M1vKvfg=="; }; }; "caniuse-api-3.0.0" = { @@ -2470,13 +2389,13 @@ let sha512 = "bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw=="; }; }; - "caniuse-lite-1.0.30001148" = { + "caniuse-lite-1.0.30001158" = { name = "caniuse-lite"; packageName = "caniuse-lite"; - version = "1.0.30001148"; + version = "1.0.30001158"; src = fetchurl { - url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001148.tgz"; - sha512 = "E66qcd0KMKZHNJQt9hiLZGE3J4zuTqE1OnU53miEVtylFbwOEmeA5OsRu90noZful+XGSQOni1aT2tiqu/9yYw=="; + url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001158.tgz"; + sha512 = "s5loVYY+yKpuVA3HyW8BarzrtJvwHReuzugQXlv1iR3LKSReoFXRm86mT6hT7PEF5RxW+XQZg+6nYjlywYzQ+g=="; }; }; "case-sensitive-paths-webpack-plugin-2.3.0" = { @@ -2632,15 +2551,6 @@ let sha512 = "9e/zx1jw7B4CO+c/RXoCsfg/x1AfUBioy4owYH0bJprEYAx5hRFLRhWBqHAG57D0ZM4H7vxbP7bPe0VwhQRYDQ=="; }; }; - "ci-info-2.0.0" = { - name = "ci-info"; - packageName = "ci-info"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/ci-info/-/ci-info-2.0.0.tgz"; - sha512 = "5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ=="; - }; - }; "cipher-base-1.0.4" = { name = "cipher-base"; packageName = "cipher-base"; @@ -2893,13 +2803,13 @@ let sha512 = "P0CysNDQ7rtVw4QIQtm+MRxV66vKFSvlsQvGYXZWR3qFU0jlMKHZZZgw8e+8DSah4UDKMqnknRDQz+xuQXQ/Zg=="; }; }; - "commander-6.1.0" = { + "commander-6.2.0" = { name = "commander"; packageName = "commander"; - version = "6.1.0"; + version = "6.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/commander/-/commander-6.1.0.tgz"; - sha512 = "wl7PNrYWd2y5mp1OK/LhTlv8Ff4kQJQRXXAvF+uU/TPNiVJUxZLRYGj/B0y/lPGAVcSbJqH2Za/cvHmrPMC8mA=="; + url = "https://registry.npmjs.org/commander/-/commander-6.2.0.tgz"; + sha512 = "zP4jEKbe8SHzKJYQmq8Y9gYjtO/POJLgIdKgV7B9qNmABVFVc+ctqSX6iXh4mCpJfRBOabiZ2YKPg8ciDw6C+Q=="; }; }; "common-tags-1.8.0" = { @@ -3118,13 +3028,13 @@ let sha512 = "5wjnpaT/3dV+XB4borEsnAYQchn00XSgTAWKDkEqv+K8KevjbzmofK6hfJ9TZIlpj2N0xQpazy7PiRQiWHqzWg=="; }; }; - "core-js-compat-3.6.5" = { + "core-js-compat-3.7.0" = { name = "core-js-compat"; packageName = "core-js-compat"; - version = "3.6.5"; + version = "3.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.6.5.tgz"; - sha512 = "7ItTKOhOZbznhXAQ2g/slGg1PJV5zDO/WdkTwi7UEOJmkvsE32PWvx6mKtDjiMpjnR2CNf6BAD6sSxIlv7ptng=="; + url = "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.7.0.tgz"; + sha512 = "V8yBI3+ZLDVomoWICO6kq/CD28Y4r1M7CWeO4AGpMdMfseu8bkSubBmUPySMGKRTS+su4XQ07zUkAsiu9FCWTg=="; }; }; "core-util-is-1.0.2" = { @@ -3316,13 +3226,13 @@ let sha512 = "DMxWJg0rnz7UgxKT0Q1HU/L9BeJI0M6ksor0OgqOnF+aRCDWg/N2641HmVyU9KVIu0OVVWOb2IpC9A+BJRnejg=="; }; }; - "css-tree-1.0.0-alpha.39" = { + "css-tree-1.0.1" = { name = "css-tree"; packageName = "css-tree"; - version = "1.0.0-alpha.39"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/css-tree/-/css-tree-1.0.0-alpha.39.tgz"; - sha512 = "7UvkEYgBAHRG9Nt980lYxjsTrCyHFN53ky3wVsDkiMdVqylqRt+Zc+jm5qw7/qyOvN2dHSYtX0e4MbCCExSvnA=="; + url = "https://registry.npmjs.org/css-tree/-/css-tree-1.0.1.tgz"; + sha512 = "WroX+2MvsYcRGP8QA0p+rxzOniT/zpAoQ/DTKDSJzh5T3IQKUkFHeIIfgIapm2uaP178GWY3Mime1qbk8GO/tA=="; }; }; "css-what-2.1.3" = { @@ -3406,13 +3316,13 @@ let sha512 = "WcKx5OY+KoSIAxBW6UBBRay1U6vkYheCdjyVNDm85zt5K9mHoGOfsOsqIszfAqrQQFIIKgjh2+FDgIj/zsl21Q=="; }; }; - "csso-4.0.3" = { + "csso-4.1.1" = { name = "csso"; packageName = "csso"; - version = "4.0.3"; + version = "4.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/csso/-/csso-4.0.3.tgz"; - sha512 = "NL3spysxUkcrOgnpsT4Xdl2aiEiBG6bXswAABQVHcMrfjjBisFOKwLDOmf4wf32aPdcJws1zds2B0Rg+jqMyHQ=="; + url = "https://registry.npmjs.org/csso/-/csso-4.1.1.tgz"; + sha512 = "Rvq+e1e0TFB8E8X+8MQjHSY6vtol45s5gxtLI/018UsAn2IBMmwNEZRM/h+HVnAJRHjasLIKKUO3uvoMM28LvA=="; }; }; "cycle-1.0.3" = { @@ -3667,15 +3577,6 @@ let sha512 = "5tQykt+LqfJFBEYaDITx7S7cR7mJ/zQmLXZ2qt5w04ainYZw6tBf9dBunMjVeVOdYVRUzUOE4HkY5J7+uttb5Q=="; }; }; - "diff-sequences-25.2.6" = { - name = "diff-sequences"; - packageName = "diff-sequences"; - version = "25.2.6"; - src = fetchurl { - url = "https://registry.npmjs.org/diff-sequences/-/diff-sequences-25.2.6.tgz"; - sha512 = "Hq8o7+6GaZeoFjtpgvRBUknSXNeJiCx7V9Fr94ZMljNiCr9n9L8H8aJqgWOQiDDGdyn29fRNcDdRVJ5fdyihfg=="; - }; - }; "diffie-hellman-5.0.3" = { name = "diffie-hellman"; packageName = "diffie-hellman"; @@ -3874,13 +3775,13 @@ let sha1 = "590c61156b0ae2f4f0255732a158b266bc56b21d"; }; }; - "electron-to-chromium-1.3.582" = { + "electron-to-chromium-1.3.596" = { name = "electron-to-chromium"; packageName = "electron-to-chromium"; - version = "1.3.582"; + version = "1.3.596"; src = fetchurl { - url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.582.tgz"; - sha512 = "0nCJ7cSqnkMC+kUuPs0YgklFHraWGl/xHqtZWWtOeVtyi+YqkoAOMGuZQad43DscXCQI/yizcTa3u6B5r+BLww=="; + url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.596.tgz"; + sha512 = "nLO2Wd2yU42eSoNJVQKNf89CcEGqeFZd++QsnN2XIgje1s/19AgctfjLIbPORlvcCO8sYjLwX4iUgDdusOY8Sg=="; }; }; "elliptic-6.5.3" = { @@ -4307,13 +4208,13 @@ let sha512 = "adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA=="; }; }; - "execa-4.0.3" = { + "execa-4.1.0" = { name = "execa"; packageName = "execa"; - version = "4.0.3"; + version = "4.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/execa/-/execa-4.0.3.tgz"; - sha512 = "WFDXGHckXPWZX19t1kCsXzOpqX9LWYNqn4C+HqZlk/V0imTkzJZqf87ZBhvpHaftERYknpk0fjSylnXVlVgI0A=="; + url = "https://registry.npmjs.org/execa/-/execa-4.1.0.tgz"; + sha512 = "j5W0//W7f8UxAn8hXVnwG8tLwdiUy4FJLcSupCg6maBYZDpyBvTApK7KyuI4bKj8KOh1r2YH+6ucuYtJv1bTZA=="; }; }; "expand-brackets-2.1.4" = { @@ -4478,13 +4379,13 @@ let sha512 = "lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw=="; }; }; - "fastq-1.8.0" = { + "fastq-1.9.0" = { name = "fastq"; packageName = "fastq"; - version = "1.8.0"; + version = "1.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/fastq/-/fastq-1.8.0.tgz"; - sha512 = "SMIZoZdLh/fgofivvIkmknUXyPnvxRE3DhtZ5Me3Mrsk5gyPL42F0xr51TdRXskBxHfMp+07bcYzfsYEsSQA9Q=="; + url = "https://registry.npmjs.org/fastq/-/fastq-1.9.0.tgz"; + sha512 = "i7FVWL8HhVY+CTkwFxkN2mk3h+787ixS5S63eb78diVRc1MCssarHq3W5cj0av7YDSwmaV928RNag+U1etRQ7w=="; }; }; "faye-websocket-0.10.0" = { @@ -4523,13 +4424,13 @@ let sha1 = "3ab1a2d2a62c8bfb431a0c94cb797a2fce27c962"; }; }; - "file-loader-6.1.1" = { + "file-loader-6.2.0" = { name = "file-loader"; packageName = "file-loader"; - version = "6.1.1"; + version = "6.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/file-loader/-/file-loader-6.1.1.tgz"; - sha512 = "Klt8C4BjWSXYQAfhpYYkG4qHNTna4toMHEbWrI5IuVoxbU6uiDKeKAP99R8mmbJi3lvewn/jQBOgU4+NS3tDQw=="; + url = "https://registry.npmjs.org/file-loader/-/file-loader-6.2.0.tgz"; + sha512 = "qo3glqyTa61Ytg4u73GultjHGjdRyig3tG6lPtyX/jOEJvHif9uB0/OCI2Kif6ctF3caQTW2G5gym21oAsI4pw=="; }; }; "file-uri-to-path-1.0.0" = { @@ -4901,6 +4802,15 @@ let sha512 = "Auw9a4AxqWpa9GUfj370BMPzzyncfBABW8Mab7BGWBYDj4Isgq+cDKtx0i6u9jcX9pQDnswsaaOTgTmA5pEjuQ=="; }; }; + "fsevents-2.2.1" = { + name = "fsevents"; + packageName = "fsevents"; + version = "2.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/fsevents/-/fsevents-2.2.1.tgz"; + sha512 = "bTLYHSeC0UH/EFXS9KqWnXuOl/wHK5Z/d+ghd5AsFMYN7wIGkUCOJyzy88+wJKkZPGON8u4Z9f6U4FdgURE9qA=="; + }; + }; "function-bind-1.1.1" = { name = "function-bind"; packageName = "function-bind"; @@ -4910,13 +4820,13 @@ let sha512 = "yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A=="; }; }; - "gensync-1.0.0-beta.1" = { + "gensync-1.0.0-beta.2" = { name = "gensync"; packageName = "gensync"; - version = "1.0.0-beta.1"; + version = "1.0.0-beta.2"; src = fetchurl { - url = "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.1.tgz"; - sha512 = "r8EC6NO1sngH/zdD9fiRDLdcgnbayXah+mLgManTaIZJqEC1MZstmnox8KpnI2/fxQwrp5OpCOYWLp4rBl4Jcg=="; + url = "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz"; + sha512 = "3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg=="; }; }; "get-caller-file-1.0.3" = { @@ -4937,6 +4847,15 @@ let sha512 = "DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg=="; }; }; + "get-intrinsic-1.0.1" = { + name = "get-intrinsic"; + packageName = "get-intrinsic"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.0.1.tgz"; + sha512 = "ZnWP+AmS1VUaLgTRy47+zKtjTxz+0xMpx3I52i+aalBK1QP19ggLF3Db89KJX7kjfOfP2eoa01qc++GwPgufPg=="; + }; + }; "get-own-enumerable-property-symbols-3.0.2" = { name = "get-own-enumerable-property-symbols"; packageName = "get-own-enumerable-property-symbols"; @@ -5558,13 +5477,13 @@ let sha512 = "4aFq7wvWyMHKgxsH8QQtGpvbASCf+eM3wPRLI6R+MgAnTCZ6STYsRvttLvRWK0Nfif5piF394St3HeJDaljGPA=="; }; }; - "ieee754-1.1.13" = { + "ieee754-1.2.1" = { name = "ieee754"; packageName = "ieee754"; - version = "1.1.13"; + version = "1.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/ieee754/-/ieee754-1.1.13.tgz"; - sha512 = "4vf7I2LYV/HaWerSo3XmlMkp5eZ83i+/CDluXi/IGTs/O1sejBNhTtnxzmRZfvOUqj7lZjqHkeTvpgSFDlWZTg=="; + url = "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz"; + sha512 = "dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA=="; }; }; "iferr-0.1.5" = { @@ -5612,13 +5531,13 @@ let sha1 = "d81355c15612d386c61f9ddd3922d4304822a546"; }; }; - "import-fresh-3.2.1" = { + "import-fresh-3.2.2" = { name = "import-fresh"; packageName = "import-fresh"; - version = "3.2.1"; + version = "3.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/import-fresh/-/import-fresh-3.2.1.tgz"; - sha512 = "6e1q1cnWP2RXD9/keSkxHScg508CdXqXWgWBaETNhyuBFz+kUZlKboh+ISK+bU++DmbHimVBrOz/zzPe0sZ3sQ=="; + url = "https://registry.npmjs.org/import-fresh/-/import-fresh-3.2.2.tgz"; + sha512 = "cTPNrlvJT6twpYy+YmKUKrTSjWFs3bjYjAhCwm+z4EOCubZxAuO+hHpRN64TqjEaYSHs7tJAE0w1CKMGmsG/lw=="; }; }; "import-local-2.0.0" = { @@ -5855,15 +5774,6 @@ let sha512 = "dnMqspv5nU3LoewK2N/y7KLtxtakvTuaCsU9FU50/QDmdbHNy/4/JuRtMHqRU22o3q+W89YQndQEeCVwK+3qrA=="; }; }; - "is-ci-2.0.0" = { - name = "is-ci"; - packageName = "is-ci"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/is-ci/-/is-ci-2.0.0.tgz"; - sha512 = "YfJT7rkpQB0updsdHLGWrvhBJfcfzNNawYDNIyQXJz0IViGf75O8EBPKSdvw2rF+LGCsX4FZ8tcr3b19LcZq4w=="; - }; - }; "is-color-stop-1.1.0" = { name = "is-color-stop"; packageName = "is-color-stop"; @@ -5873,6 +5783,15 @@ let sha1 = "cfff471aee4dd5c9e158598fbe12967b5cdad345"; }; }; + "is-core-module-2.1.0" = { + name = "is-core-module"; + packageName = "is-core-module"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-core-module/-/is-core-module-2.1.0.tgz"; + sha512 = "YcV7BgVMRFRua2FqQzKtTDMz8iCuLEyGKjr70q8Zm1yy2qKcurbFEd79PAdHV77oL3NrAaOVQIbMmiHQCHB7ZA=="; + }; + }; "is-data-descriptor-0.1.4" = { name = "is-data-descriptor"; packageName = "is-data-descriptor"; @@ -6278,33 +6197,6 @@ let sha512 = "1P/yWsxPlDtn7QeRD+ULKQPaIaN6yF368GZ2vDfv0AL0NwpStafjWCDDdn0k8wgFMWpVAqG7oJhxHnlud42i9w=="; }; }; - "jest-diff-25.5.0" = { - name = "jest-diff"; - packageName = "jest-diff"; - version = "25.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/jest-diff/-/jest-diff-25.5.0.tgz"; - sha512 = "z1kygetuPiREYdNIumRpAHY6RXiGmp70YHptjdaxTWGmA085W3iCnXNx0DhflK3vwrKmrRWyY1wUpkPMVxMK7A=="; - }; - }; - "jest-get-type-25.2.6" = { - name = "jest-get-type"; - packageName = "jest-get-type"; - version = "25.2.6"; - src = fetchurl { - url = "https://registry.npmjs.org/jest-get-type/-/jest-get-type-25.2.6.tgz"; - sha512 = "DxjtyzOHjObRM+sM1knti6or+eOgcGU4xVSb2HNP1TqO4ahsT+rqZg+nyqHWJSvWgKC5cG3QjGFBqxLghiF/Ig=="; - }; - }; - "jest-util-26.6.0" = { - name = "jest-util"; - packageName = "jest-util"; - version = "26.6.0"; - src = fetchurl { - url = "https://registry.npmjs.org/jest-util/-/jest-util-26.6.0.tgz"; - sha512 = "/cUGqcnKeZMjvTQLfJo65nBOEZ/k0RB/8usv2JpfYya05u0XvBmKkIH5o5c4nCh9DD61B1YQjMGGqh1Ha0aXdg=="; - }; - }; "js-tokens-4.0.0" = { name = "js-tokens"; packageName = "js-tokens"; @@ -6827,15 +6719,6 @@ let sha512 = "LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA=="; }; }; - "make-error-1.3.6" = { - name = "make-error"; - packageName = "make-error"; - version = "1.3.6"; - src = fetchurl { - url = "https://registry.npmjs.org/make-error/-/make-error-1.3.6.tgz"; - sha512 = "s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw=="; - }; - }; "map-cache-0.2.2" = { name = "map-cache"; packageName = "map-cache"; @@ -6872,6 +6755,15 @@ let sha512 = "xitP+WxNPcTTOgnTJcrhM0xvdPepipPSf3I8EIpGKeFLjt3PlJLIDG3u8EX53ZIubkb+5U2+3rELYpEhHhzdkg=="; }; }; + "mdn-data-2.0.12" = { + name = "mdn-data"; + packageName = "mdn-data"; + version = "2.0.12"; + src = fetchurl { + url = "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.12.tgz"; + sha512 = "ULbAlgzVb8IqZ0Hsxm6hHSlQl3Jckst2YEQS7fODu9ilNWy2LvcoSY7TRFIktABP2mdppBioc66va90T+NUs8Q=="; + }; + }; "mdn-data-2.0.4" = { name = "mdn-data"; packageName = "mdn-data"; @@ -6881,15 +6773,6 @@ let sha512 = "iV3XNKw06j5Q7mi6h+9vbx23Tv7JkjEVgKHW4pimwyDGWm0OIQntJJ+u1C6mg6mK1EaTv42XQ7w76yuzH7M2cA=="; }; }; - "mdn-data-2.0.6" = { - name = "mdn-data"; - packageName = "mdn-data"; - version = "2.0.6"; - src = fetchurl { - url = "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.6.tgz"; - sha512 = "rQvjv71olwNHgiTbfPZFkJtjNMciWgswYeciZhtvWLO8bmX3TnhyA62I6sTWOyZssWHJJjY6/KiWwqQsWWsqOA=="; - }; - }; "media-typer-0.3.0" = { name = "media-typer"; packageName = "media-typer"; @@ -7187,15 +7070,6 @@ let sha512 = "NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ=="; }; }; - "mkdirp-1.0.4" = { - name = "mkdirp"; - packageName = "mkdirp"; - version = "1.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz"; - sha512 = "vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw=="; - }; - }; "moment-2.29.1" = { name = "moment"; packageName = "moment"; @@ -7304,13 +7178,13 @@ let sha512 = "M2ufzIiINKCuDfBSAUr1vWQ+vuVcA9kqx8JJUsbQi6yf1uGRyb7HfpdfUr5qLXf3B/t8dPvcjhKMmlfnP47EzQ=="; }; }; - "nanoid-3.1.12" = { + "nanoid-3.1.16" = { name = "nanoid"; packageName = "nanoid"; - version = "3.1.12"; + version = "3.1.16"; src = fetchurl { - url = "https://registry.npmjs.org/nanoid/-/nanoid-3.1.12.tgz"; - sha512 = "1qstj9z5+x491jfiC4Nelk+f8XBad7LN20PmyWINJEMRSf3wcAjAWysw1qaA8z6NSKe2sjq1hRSDpBH5paCb6A=="; + url = "https://registry.npmjs.org/nanoid/-/nanoid-3.1.16.tgz"; + sha512 = "+AK8MN0WHji40lj8AEuwLOvLSbWYApQpre/aFJZD71r43wVRLrOYS4FmJOPQYon1TqB462RzrrxlfA74XRES8w=="; }; }; "nanomatch-1.2.13" = { @@ -7403,13 +7277,13 @@ let sha512 = "h/zcD8H9kaDZ9ALUWwlBUDo6TKF8a7qBSCSEGfjTVIYeqsioSKaAX+BN7NgiMGp6iSIXZ3PxgCu8KS3b71YK5Q=="; }; }; - "node-releases-1.1.63" = { + "node-releases-1.1.66" = { name = "node-releases"; packageName = "node-releases"; - version = "1.1.63"; + version = "1.1.66"; src = fetchurl { - url = "https://registry.npmjs.org/node-releases/-/node-releases-1.1.63.tgz"; - sha512 = "ukW3iCfQaoxJkSPN+iK7KznTeqDGVJatAEuXsJERYHa9tn/KaT5lBdIyxQjLEVTzSkyjJEuQ17/vaEjrOauDkg=="; + url = "https://registry.npmjs.org/node-releases/-/node-releases-1.1.66.tgz"; + sha512 = "JHEQ1iWPGK+38VLB2H9ef2otU4l8s3yAMt9Xf934r6+ojCYDMHPMqvCc9TnzfeFSP1QEOeU6YZEd3+De0LTCgg=="; }; }; "node-watch-0.5.5" = { @@ -7610,13 +7484,13 @@ let sha1 = "f79c4493af0c5377b59fe39d395e41042dd045bb"; }; }; - "object.assign-4.1.1" = { + "object.assign-4.1.2" = { name = "object.assign"; packageName = "object.assign"; - version = "4.1.1"; + version = "4.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/object.assign/-/object.assign-4.1.1.tgz"; - sha512 = "VT/cxmx5yaoHSOTSyrCygIDFco+RsibY2NM0a4RdEeY/4KgqezwFtK1yr3U67xYhqJSlASm2pKhLVzPj2lr4bA=="; + url = "https://registry.npmjs.org/object.assign/-/object.assign-4.1.2.tgz"; + sha512 = "ixT2L5THXsApyiUPYKmW+2EHpXXe5Ii3M+f4e+aJFAHao5amFRW6J0OO6c/LU8Be47utCx2GL89hxGB6XSmKuQ=="; }; }; "object.entries-1.1.2" = { @@ -8348,13 +8222,13 @@ let sha512 = "3QT8bBJeX/S5zKTTjTCIjRF3If4avAT6kqxcASlTWEtAFCb9NH0OUxNDfgZSWdP5fJnBYCMEWkIFfWeugjzYMg=="; }; }; - "postcss-8.1.2" = { + "postcss-8.1.7" = { name = "postcss"; packageName = "postcss"; - version = "8.1.2"; + version = "8.1.7"; src = fetchurl { - url = "https://registry.npmjs.org/postcss/-/postcss-8.1.2.tgz"; - sha512 = "mToqEVFq8jF9TFhlIK4HhE34zknFJuNTgqtsr60vUvrWn+9TIYugCwiV1JZRxCuOrej2jjstun1bn4Bc7/1HkA=="; + url = "https://registry.npmjs.org/postcss/-/postcss-8.1.7.tgz"; + sha512 = "llCQW1Pz4MOPwbZLmOddGM9eIJ8Bh7SZ2Oj5sxZva77uVaotYDsYTch1WBTNu7fUY0fpWp0fdt7uW40D4sRiiQ=="; }; }; "postcss-calc-7.0.5" = { @@ -8735,15 +8609,6 @@ let sha512 = "EY5oDzmsX5wvuynAByrmY0P0hcp+QpnAKbJng2A2MPjVKXCxrDSUkzghVJ4ZGPIv+JC4gX8fPUWscC0RtjsWGw=="; }; }; - "pretty-format-25.5.0" = { - name = "pretty-format"; - packageName = "pretty-format"; - version = "25.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/pretty-format/-/pretty-format-25.5.0.tgz"; - sha512 = "kbo/kq2LQ/A/is0PQwsEHM7Ca6//bGPPvU6UnsdDRSKTWxT/ru/xb88v4BJf6a69H+uTytOEsTusT9ksd/1iWQ=="; - }; - }; "process-0.11.10" = { name = "process"; packageName = "process"; @@ -9059,15 +8924,6 @@ let sha512 = "X1Y+0jR47ImDVr54Ab6V9eGk0Hnu7fVWGeHQSOXHf/C2pF9c6uy3gef8QUeuUiWlNb0i08InPSE5a/KJzNzw1Q=="; }; }; - "react-is-16.13.1" = { - name = "react-is"; - packageName = "react-is"; - version = "16.13.1"; - src = fetchurl { - url = "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz"; - sha512 = "24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ=="; - }; - }; "read-1.0.7" = { name = "read"; packageName = "read"; @@ -9167,13 +9023,13 @@ let sha512 = "Ts1Y/anZELhSsjMcU605fU9RE4Oi3p5ORujwbIKXfWa+0Zxs510Qrmrce5/Jowq3cHSZSJqBjypxmHarc+vEWg=="; }; }; - "regenerate-1.4.1" = { + "regenerate-1.4.2" = { name = "regenerate"; packageName = "regenerate"; - version = "1.4.1"; + version = "1.4.2"; src = fetchurl { - url = "https://registry.npmjs.org/regenerate/-/regenerate-1.4.1.tgz"; - sha512 = "j2+C8+NtXQgEKWk49MMP5P/u2GhnahTtVkRIHr5R5lVRlbKvmQ+oS+A5aLKWp2ma5VkT8sh6v+v4hbH0YHR66A=="; + url = "https://registry.npmjs.org/regenerate/-/regenerate-1.4.2.tgz"; + sha512 = "zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A=="; }; }; "regenerate-unicode-properties-8.2.0" = { @@ -9248,13 +9104,13 @@ let sha512 = "ywH2VUraA44DZQuRKzARmw6S66mr48pQVva4LBeRhcOltJ6hExvWly5ZjFLYo67xbIxb6W1q4bAGtgfEl20zfQ=="; }; }; - "registry-auth-token-4.2.0" = { + "registry-auth-token-4.2.1" = { name = "registry-auth-token"; packageName = "registry-auth-token"; - version = "4.2.0"; + version = "4.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/registry-auth-token/-/registry-auth-token-4.2.0.tgz"; - sha512 = "P+lWzPrsgfN+UEpDS3U8AQKg/UjZX6mQSJueZj3EK+vNESoqBSpBUD3gmu4sF9lOsjXWjF11dQKUqemf3veq1w=="; + url = "https://registry.npmjs.org/registry-auth-token/-/registry-auth-token-4.2.1.tgz"; + sha512 = "6gkSb4U6aWJB4SF2ZvLb76yCBjcvufXBqvvEx1HbmKPkutswjW1xNVRY0+daljIYRbogN7O0etYSlbiaEQyMyw=="; }; }; "registry-url-5.1.0" = { @@ -9401,13 +9257,13 @@ let sha1 = "925d2601d39ac485e091cf0da5c6e694dc3dcaff"; }; }; - "resolve-1.17.0" = { + "resolve-1.19.0" = { name = "resolve"; packageName = "resolve"; - version = "1.17.0"; + version = "1.19.0"; src = fetchurl { - url = "https://registry.npmjs.org/resolve/-/resolve-1.17.0.tgz"; - sha512 = "ic+7JYiV8Vi2yzQGFWOkiZD5Z9z7O2Zhm9XMaTxdJExKasieFCr+yXZ/WmXsckHiKl12ar0y6XiXDx3m4RHn1w=="; + url = "https://registry.npmjs.org/resolve/-/resolve-1.19.0.tgz"; + sha512 = "rArEXAgsBG4UgRGcynxWIWKFvh/XZCcS8UJdHhwy91zwAvCZIbcs+vAbflgBnNjYMs/i/i+/Ux6IZhML1yPvxg=="; }; }; "resolve-cwd-2.0.0" = { @@ -9572,13 +9428,13 @@ let sha512 = "tvVnVv01b8c1RrA6Ep7JkStj85Guv/YrMcwqYQnwjsAS2cTmmPGBBjAjpCW7RrSodNSoE2/qg9O4bceNvUuDgQ=="; }; }; - "run-parallel-1.1.9" = { + "run-parallel-1.1.10" = { name = "run-parallel"; packageName = "run-parallel"; - version = "1.1.9"; + version = "1.1.10"; src = fetchurl { - url = "https://registry.npmjs.org/run-parallel/-/run-parallel-1.1.9.tgz"; - sha512 = "DEqnSRTDw/Tc3FXf49zedI638Z9onwUotBMiUFKmrO2sdFKIbXamXGQ3Axd4qgphxKB4kw/qP1w5kTxnfU1B9Q=="; + url = "https://registry.npmjs.org/run-parallel/-/run-parallel-1.1.10.tgz"; + sha512 = "zb/1OuZ6flOlH6tQyMPUrE3x3Ulxjlo9WIVXR4yVYi4H9UXQaeIsPbLn2R3O3vQCnDKkAl2qHiuocKKX4Tz/Sw=="; }; }; "run-queue-1.0.3" = { @@ -10373,22 +10229,22 @@ let sha512 = "zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg=="; }; }; - "string.prototype.trimend-1.0.1" = { + "string.prototype.trimend-1.0.2" = { name = "string.prototype.trimend"; packageName = "string.prototype.trimend"; - version = "1.0.1"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.1.tgz"; - sha512 = "LRPxFUaTtpqYsTeNKaFOw3R4bxIzWOnbQ837QfBylo8jIxtcbK/A/sMV7Q+OAV/vWo+7s25pOE10KYSjaSO06g=="; + url = "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.2.tgz"; + sha512 = "8oAG/hi14Z4nOVP0z6mdiVZ/wqjDtWSLygMigTzAb+7aPEDTleeFf+WrF+alzecxIRkckkJVn+dTlwzJXORATw=="; }; }; - "string.prototype.trimstart-1.0.1" = { + "string.prototype.trimstart-1.0.2" = { name = "string.prototype.trimstart"; packageName = "string.prototype.trimstart"; - version = "1.0.1"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.1.tgz"; - sha512 = "XxZn+QpvrBI1FOcg6dIpxUPgWCPuNXvMD72aaRaUQv1eD4e/Qy8i/hFTe0BUmD60p/QA6bh1avmuPTfNjqVWRw=="; + url = "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.2.tgz"; + sha512 = "7F6CdBTl5zyu30BJFdzSTlSlLPwODC23Od+iLoVH8X6+3fvDPPuBVVj9iaB1GOsSTSIgVfsfm27R2FGrAPznWg=="; }; }; "string_decoder-0.10.31" = { @@ -10616,13 +10472,13 @@ let sha512 = "YfUhPQCJoNQE5N+FJQcdPz63O3x3sdT4Xju69Gj4iZe0lBKOtnAMi0SLj9xKhGkcGhsxThvTJ/usxtFPo438zQ=="; }; }; - "temp-0.9.1" = { + "temp-0.9.4" = { name = "temp"; packageName = "temp"; - version = "0.9.1"; + version = "0.9.4"; src = fetchurl { - url = "https://registry.npmjs.org/temp/-/temp-0.9.1.tgz"; - sha512 = "WMuOgiua1xb5R56lE0eH6ivpVmg/lq2OHm4+LtT/xtEtPQ+sz6N3bBM6WZ5FvO1lO4IKIOb43qnhoc4qxP5OeA=="; + url = "https://registry.npmjs.org/temp/-/temp-0.9.4.tgz"; + sha512 = "yYrrsWnrXMcdsnu/7YMYAofM1ktpL5By7vZhf15CrXijWWrEYZks5AXBudalfSWJLlnen/QUJUB5aoB0kqZUGA=="; }; }; "terser-4.8.0" = { @@ -10688,13 +10544,13 @@ let sha512 = "eHY7nBftgThBqOyHGVN+l8gF0BucP09fMo0oO/Lb0w1OF80dJv+lDVpXG60WMQvkcxAkNybKsrEIE3ZtKGmPrA=="; }; }; - "timers-browserify-2.0.11" = { + "timers-browserify-2.0.12" = { name = "timers-browserify"; packageName = "timers-browserify"; - version = "2.0.11"; + version = "2.0.12"; src = fetchurl { - url = "https://registry.npmjs.org/timers-browserify/-/timers-browserify-2.0.11.tgz"; - sha512 = "60aV6sgJ5YEbzUdn9c8kYGIqOubPoUdqQCul3SBAsRCZ40s6Y5cMcrW4dt3/k/EsbLVJNl9n6Vz3fTc+k2GeKQ=="; + url = "https://registry.npmjs.org/timers-browserify/-/timers-browserify-2.0.12.tgz"; + sha512 = "9phl76Cqm6FhSX9Xe1ZUAMLtm1BLkKj2Qd5ApyWkXzsMRaA7dgr81kf4wJmQf/hAvg8EEyJxDo3du/0KlhPiKQ=="; }; }; "timsort-0.3.0" = { @@ -10868,15 +10724,6 @@ let sha512 = "+TztZrH7GnAD5CKxUohIAqIVHLrtivsYT7tZCLeRTCaBMSsfgYwprhA00kB/m0ezvYheOXJQqPfarAvgoayb7A=="; }; }; - "ts-jest-26.4.1" = { - name = "ts-jest"; - packageName = "ts-jest"; - version = "26.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/ts-jest/-/ts-jest-26.4.1.tgz"; - sha512 = "F4aFq01aS6mnAAa0DljNmKr/Kk9y4HVZ1m6/rtJ0ED56cuxINGq3Q9eVAh+z5vcYKe5qnTMvv90vE8vUMFxomg=="; - }; - }; "ts-union-2.3.0" = { name = "ts-union"; packageName = "ts-union"; @@ -10895,13 +10742,13 @@ let sha512 = "Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg=="; }; }; - "tsyringe-4.3.0" = { + "tsyringe-4.4.0" = { name = "tsyringe"; packageName = "tsyringe"; - version = "4.3.0"; + version = "4.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/tsyringe/-/tsyringe-4.3.0.tgz"; - sha512 = "Vzty1M/EQXSsEE8aoIOLl1l793chcPyQAnFJaS1mFDtFvNPY+jknSPwMIF6yfcjua+2GTgwxWFzuA3cjIx4NZA=="; + url = "https://registry.npmjs.org/tsyringe/-/tsyringe-4.4.0.tgz"; + sha512 = "SlMApe1lhIq546CDp7bF+IdF4RB6d+9C5T7B0AS0P/Bm+Qpizj/gEmZzvw9J/KlXPEt4qHTbi1TRvX3rCPSdTg=="; }; }; "tty-browserify-0.0.0" = { @@ -11390,22 +11237,22 @@ let sha512 = "8TEXQxlldWAuIODdukIb+TR5s+9Ds40eSJrw+1iDDA9IFORPjMELarNQE3myz5XIkWWpdprmJjm1/SxMlWOC8A=="; }; }; - "watchpack-1.7.4" = { + "watchpack-1.7.5" = { name = "watchpack"; packageName = "watchpack"; - version = "1.7.4"; + version = "1.7.5"; src = fetchurl { - url = "https://registry.npmjs.org/watchpack/-/watchpack-1.7.4.tgz"; - sha512 = "aWAgTW4MoSJzZPAicljkO1hsi1oKj/RRq/OJQh2PKI2UKL04c2Bs+MBOB+BBABHTXJpf9mCwHN7ANCvYsvY2sg=="; + url = "https://registry.npmjs.org/watchpack/-/watchpack-1.7.5.tgz"; + sha512 = "9P3MWk6SrKjHsGkLT2KHXdQ/9SNkyoJbabxnKOoJepsvJjJG8uYTR3yTPxPQvNDI3w4Nz1xnE0TLHK4RIVe/MQ=="; }; }; - "watchpack-chokidar2-2.0.0" = { + "watchpack-chokidar2-2.0.1" = { name = "watchpack-chokidar2"; packageName = "watchpack-chokidar2"; - version = "2.0.0"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/watchpack-chokidar2/-/watchpack-chokidar2-2.0.0.tgz"; - sha512 = "9TyfOyN/zLUbA288wZ8IsMZ+6cbzvsNyEzSBp6e/zkifi6xxbl8SmQ/CxQq32k8NNqrdVEVUVSEf56L4rQ/ZxA=="; + url = "https://registry.npmjs.org/watchpack-chokidar2/-/watchpack-chokidar2-2.0.1.tgz"; + sha512 = "nCFfBIPKr5Sh61s4LPpy1Wtfi0HE8isJ3d2Yb5/Ppw2P2B/3eVSEBjKfN0fmHJSK14+31KwMKmcrzs2GM4P0Ww=="; }; }; "wbuf-1.7.3" = { @@ -11507,13 +11354,13 @@ let sha512 = "OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg=="; }; }; - "whatwg-fetch-3.4.1" = { + "whatwg-fetch-3.5.0" = { name = "whatwg-fetch"; packageName = "whatwg-fetch"; - version = "3.4.1"; + version = "3.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-3.4.1.tgz"; - sha512 = "sofZVzE1wKwO+EYPbWfiwzaKovWiZXf4coEzjGP9b2GBVgQRLQUZ2QcuPpQExGDAW5GItpEm6Tl4OU5mywnAoQ=="; + url = "https://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-3.5.0.tgz"; + sha512 = "jXkLtsR42xhXg7akoDKvKWE40eJeI+2KZqcp2h3NsOrRnDvtWX36KcKl30dy+hxECivdk2BVUHVNrPtoMBUx6A=="; }; }; "which-1.3.1" = { @@ -11804,13 +11651,13 @@ let sha512 = "o41D/WmDeca0BqYhsr3nJzQyg9NF5X8l/UdnFNux9cS3lwB+swm8qGWX5rn+aD6xfBU3rGmtHij7g7x6LxFU3A=="; }; }; - "ws-7.3.1" = { + "ws-7.4.0" = { name = "ws"; packageName = "ws"; - version = "7.3.1"; + version = "7.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/ws/-/ws-7.3.1.tgz"; - sha512 = "D3RuNkynyHmEJIpD2qrgVkc9DQ23OrN/moAwZX4L8DfvszsJxpjQuUq3LMx6HoYji9fbIOBY18XWBsAux1ZZUA=="; + url = "https://registry.npmjs.org/ws/-/ws-7.4.0.tgz"; + sha512 = "kyFwXuV/5ymf+IXhS6f0+eAFvydbaBW3zjpT6hUdAh/hbVjTIB5EHBGi0bPoCLSK2wcuz3BrEkB9LrYv1Nm4NQ=="; }; }; "xmlbuilder-13.0.2" = { @@ -11930,15 +11777,6 @@ let sha512 = "o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ=="; }; }; - "yargs-parser-20.2.3" = { - name = "yargs-parser"; - packageName = "yargs-parser"; - version = "20.2.3"; - src = fetchurl { - url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.3.tgz"; - sha512 = "emOFRT9WVHw03QSvN5qor9QQT9+sw5vwxfYweivSMHTcAXPefwVae2FjO7JJjj8hCE4CzPOPeFM83VwT29HCww=="; - }; - }; "yargs-parser-4.2.1" = { name = "yargs-parser"; packageName = "yargs-parser"; @@ -11977,7 +11815,7 @@ in sources."async-limiter-1.0.1" sources."asynckit-0.4.0" sources."aws-sign2-0.7.0" - sources."aws4-1.10.1" + sources."aws4-1.11.0" sources."babel-runtime-6.18.0" sources."bcrypt-pbkdf-1.0.2" sources."body-parser-1.19.0" @@ -12165,7 +12003,7 @@ in sources."astral-regex-1.0.0" sources."asynckit-0.4.0" sources."aws-sign2-0.7.0" - sources."aws4-1.10.1" + sources."aws4-1.11.0" sources."balanced-match-1.0.0" sources."bcrypt-pbkdf-1.0.2" sources."binary-0.3.0" @@ -12510,7 +12348,7 @@ in sources."raw-body-2.4.0" sources."rc-1.2.8" sources."readdirp-3.5.0" - sources."registry-auth-token-4.2.0" + sources."registry-auth-token-4.2.1" sources."registry-url-5.1.0" sources."responselike-1.0.2" sources."rimraf-2.7.1" @@ -12546,7 +12384,7 @@ in sources."vary-1.1.2" sources."which-2.0.2" sources."wrappy-1.0.2" - sources."ws-7.3.1" + sources."ws-7.4.0" ]; buildInputs = globalBuildInputs; meta = { @@ -12561,10 +12399,10 @@ in "@elm-tooling/elm-language-server" = nodeEnv.buildNodePackage { name = "_at_elm-tooling_slash_elm-language-server"; packageName = "@elm-tooling/elm-language-server"; - version = "1.13.1"; + version = "1.13.2"; src = fetchurl { - url = "https://registry.npmjs.org/@elm-tooling/elm-language-server/-/elm-language-server-1.13.1.tgz"; - sha512 = "uE80GpQYlec/kJfjZD1LNByhBGpP8XnxIFB5hsCBAK0leGPSfaaqqEQPGZBwiRfssnnIDN7j081txZy0Y3u1Uw=="; + url = "https://registry.npmjs.org/@elm-tooling/elm-language-server/-/elm-language-server-1.13.2.tgz"; + sha512 = "3bRD+Hut+XPLDY4r0t25tHhfWsXH2UPeruwDfsp/b991AjGpd3HlMNKVAnyu4DD2brUqo6xoHhpp3qTdHPJ2Pw=="; }; dependencies = [ sources."@nodelib/fs.scandir-2.1.3" @@ -12579,7 +12417,7 @@ in sources."async-limiter-1.0.1" sources."asynckit-0.4.0" sources."aws-sign2-0.7.0" - sources."aws4-1.10.1" + sources."aws4-1.11.0" sources."babel-runtime-6.18.0" sources."bcrypt-pbkdf-1.0.2" sources."body-parser-1.19.0" @@ -12609,7 +12447,7 @@ in sources."escape-html-1.0.3" sources."escape-string-regexp-4.0.0" sources."etag-1.8.1" - (sources."execa-4.0.3" // { + (sources."execa-4.1.0" // { dependencies = [ sources."is-stream-2.0.0" ]; @@ -12626,7 +12464,7 @@ in sources."fast-diff-1.2.0" sources."fast-glob-3.2.4" sources."fast-json-stable-stringify-2.1.0" - sources."fastq-1.8.0" + sources."fastq-1.9.0" sources."fill-range-7.0.1" sources."finalhandler-1.1.2" sources."find-0.2.7" @@ -12712,7 +12550,7 @@ in ]; }) sources."reusify-1.0.4" - sources."run-parallel-1.1.9" + sources."run-parallel-1.1.10" sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" (sources."send-0.17.1" // { @@ -12739,7 +12577,7 @@ in sources."traverse-chain-0.1.0" sources."ts-debounce-2.0.1" sources."tslib-1.14.1" - sources."tsyringe-4.3.0" + sources."tsyringe-4.4.0" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" sources."type-is-1.6.18" @@ -12822,7 +12660,7 @@ in sources."finalhandler-1.1.2" sources."follow-redirects-1.13.0" sources."fresh-0.5.2" - sources."fsevents-2.1.3" + sources."fsevents-2.2.1" sources."get-stream-4.1.0" sources."glob-parent-5.1.1" sources."has-ansi-2.0.0" @@ -12911,7 +12749,7 @@ in sources."assert-plus-1.0.0" sources."asynckit-0.4.0" sources."aws-sign2-0.7.0" - sources."aws4-1.10.1" + sources."aws4-1.11.0" sources."balanced-match-1.0.0" sources."bcrypt-pbkdf-1.0.2" sources."binary-0.3.0" @@ -13004,7 +12842,7 @@ in sources."stealthy-require-1.1.1" sources."supports-color-7.2.0" sources."tar-4.4.13" - sources."temp-0.9.1" + sources."temp-0.9.4" sources."through-2.3.8" sources."to-regex-range-5.0.1" sources."tough-cookie-2.5.0" @@ -13045,7 +12883,7 @@ in sources."@types/cacheable-request-6.0.1" sources."@types/http-cache-semantics-4.0.0" sources."@types/keyv-3.1.1" - sources."@types/node-14.11.10" + sources."@types/node-14.14.7" sources."@types/responselike-1.0.0" sources."cacheable-lookup-2.0.1" sources."cacheable-request-7.0.1" @@ -13127,7 +12965,7 @@ in sources."assert-plus-1.0.0" sources."asynckit-0.4.0" sources."aws-sign2-0.7.0" - sources."aws4-1.10.1" + sources."aws4-1.11.0" sources."balanced-match-1.0.0" sources."bcrypt-pbkdf-1.0.2" sources."binary-0.3.0" @@ -13352,20 +13190,20 @@ in create-elm-app = nodeEnv.buildNodePackage { name = "create-elm-app"; packageName = "create-elm-app"; - version = "5.9.0"; + version = "5.14.0"; src = fetchurl { - url = "https://registry.npmjs.org/create-elm-app/-/create-elm-app-5.9.0.tgz"; - sha512 = "aZR8Jxb5FUyY8G+eV4Tn7CXMLo00owwEhQ0ugJVR+QgHS3wMtbMhGPtZLIPlm471XsUwncmGDNbL/Oy9MkaclQ=="; + url = "https://registry.npmjs.org/create-elm-app/-/create-elm-app-5.14.0.tgz"; + sha512 = "OKd2nESweQXnBYjhKVsSeJZXP2YnGmhEEra+CGNeO7YvMdJUoD7CHKZ6FimehrTYlOlnN7aXmGwwPe+Tp2cJRg=="; }; dependencies = [ sources."@babel/cli-7.12.1" sources."@babel/code-frame-7.10.4" - sources."@babel/compat-data-7.12.1" + sources."@babel/compat-data-7.12.5" sources."@babel/core-7.12.3" - sources."@babel/generator-7.12.1" + sources."@babel/generator-7.12.5" sources."@babel/helper-annotate-as-pure-7.10.4" sources."@babel/helper-builder-binary-assignment-operator-visitor-7.10.4" - sources."@babel/helper-compilation-targets-7.12.1" + sources."@babel/helper-compilation-targets-7.12.5" sources."@babel/helper-create-class-features-plugin-7.12.1" sources."@babel/helper-create-regexp-features-plugin-7.12.1" sources."@babel/helper-define-map-7.10.5" @@ -13374,22 +13212,22 @@ in sources."@babel/helper-get-function-arity-7.10.4" sources."@babel/helper-hoist-variables-7.10.4" sources."@babel/helper-member-expression-to-functions-7.12.1" - sources."@babel/helper-module-imports-7.12.1" + sources."@babel/helper-module-imports-7.12.5" sources."@babel/helper-module-transforms-7.12.1" sources."@babel/helper-optimise-call-expression-7.10.4" sources."@babel/helper-plugin-utils-7.10.4" sources."@babel/helper-regex-7.10.5" sources."@babel/helper-remap-async-to-generator-7.12.1" - sources."@babel/helper-replace-supers-7.12.1" + sources."@babel/helper-replace-supers-7.12.5" sources."@babel/helper-simple-access-7.12.1" sources."@babel/helper-skip-transparent-expression-wrappers-7.12.1" sources."@babel/helper-split-export-declaration-7.11.0" sources."@babel/helper-validator-identifier-7.10.4" sources."@babel/helper-validator-option-7.12.1" sources."@babel/helper-wrap-function-7.12.3" - sources."@babel/helpers-7.12.1" + sources."@babel/helpers-7.12.5" sources."@babel/highlight-7.10.4" - sources."@babel/parser-7.12.3" + sources."@babel/parser-7.12.5" sources."@babel/plugin-proposal-async-generator-functions-7.12.1" sources."@babel/plugin-proposal-class-properties-7.12.1" sources."@babel/plugin-proposal-dynamic-import-7.12.1" @@ -13397,7 +13235,7 @@ in sources."@babel/plugin-proposal-json-strings-7.12.1" sources."@babel/plugin-proposal-logical-assignment-operators-7.12.1" sources."@babel/plugin-proposal-nullish-coalescing-operator-7.12.1" - sources."@babel/plugin-proposal-numeric-separator-7.12.1" + sources."@babel/plugin-proposal-numeric-separator-7.12.5" sources."@babel/plugin-proposal-object-rest-spread-7.12.1" sources."@babel/plugin-proposal-optional-catch-binding-7.12.1" sources."@babel/plugin-proposal-optional-chaining-7.12.1" @@ -13450,10 +13288,10 @@ in sources."@babel/plugin-transform-unicode-regex-7.12.1" sources."@babel/preset-env-7.12.1" sources."@babel/preset-modules-0.1.4" - sources."@babel/runtime-7.12.1" + sources."@babel/runtime-7.12.5" sources."@babel/template-7.10.4" - sources."@babel/traverse-7.12.1" - sources."@babel/types-7.12.1" + sources."@babel/traverse-7.12.5" + sources."@babel/types-7.12.6" sources."@hapi/address-2.1.4" sources."@hapi/bourne-1.3.2" sources."@hapi/hoek-8.5.1" @@ -13467,17 +13305,17 @@ in sources."@types/http-proxy-1.17.4" sources."@types/json-schema-7.0.6" sources."@types/minimatch-3.0.3" - sources."@types/node-14.11.10" + sources."@types/node-14.14.7" sources."@types/parse-json-4.0.0" sources."@types/q-1.5.4" sources."@types/source-list-map-0.1.2" sources."@types/tapable-1.0.6" - (sources."@types/uglify-js-3.11.0" // { + (sources."@types/uglify-js-3.11.1" // { dependencies = [ sources."source-map-0.6.1" ]; }) - (sources."@types/webpack-4.41.22" // { + (sources."@types/webpack-4.41.25" // { dependencies = [ sources."source-map-0.6.1" ]; @@ -13557,11 +13395,11 @@ in sources."async-limiter-1.0.1" sources."asynckit-0.4.0" sources."atob-2.1.2" - sources."autoprefixer-10.0.1" + sources."autoprefixer-10.0.2" sources."aws-sign2-0.7.0" - sources."aws4-1.10.1" + sources."aws4-1.11.0" sources."babel-extract-comments-1.0.0" - sources."babel-loader-8.1.0" + sources."babel-loader-8.2.1" sources."babel-plugin-dynamic-import-node-2.3.3" sources."babel-plugin-syntax-object-rest-spread-6.13.0" sources."babel-plugin-transform-object-rest-spread-6.26.0" @@ -13578,7 +13416,7 @@ in sources."isobject-3.0.1" ]; }) - sources."base64-js-1.3.1" + sources."base64-js-1.5.1" sources."batch-0.6.1" sources."bcrypt-pbkdf-1.0.2" sources."big.js-5.2.2" @@ -13608,11 +13446,7 @@ in sources."browserify-aes-1.2.0" sources."browserify-cipher-1.0.1" sources."browserify-des-1.0.2" - (sources."browserify-rsa-4.0.1" // { - dependencies = [ - sources."bn.js-4.11.9" - ]; - }) + sources."browserify-rsa-4.1.0" (sources."browserify-sign-4.2.1" // { dependencies = [ sources."readable-stream-3.6.0" @@ -13620,7 +13454,7 @@ in ]; }) sources."browserify-zlib-0.2.0" - sources."browserslist-4.14.5" + sources."browserslist-4.14.7" sources."buffer-4.9.2" sources."buffer-from-1.1.1" sources."buffer-indexof-1.1.1" @@ -13634,6 +13468,7 @@ in sources."isobject-3.0.1" ]; }) + sources."call-bind-1.0.0" sources."call-me-maybe-1.0.1" sources."caller-callsite-2.0.0" sources."caller-path-2.0.0" @@ -13641,7 +13476,7 @@ in sources."camel-case-4.1.1" sources."camelcase-5.3.1" sources."caniuse-api-3.0.0" - sources."caniuse-lite-1.0.30001148" + sources."caniuse-lite-1.0.30001158" sources."case-sensitive-paths-webpack-plugin-2.3.0" sources."caseless-0.12.0" sources."chainsaw-0.1.0" @@ -13729,7 +13564,7 @@ in ]; }) sources."core-js-2.6.11" - (sources."core-js-compat-3.6.5" // { + (sources."core-js-compat-3.7.0" // { dependencies = [ sources."semver-7.0.0" ]; @@ -13749,7 +13584,7 @@ in sources."css-declaration-sorter-4.0.1" (sources."css-loader-4.3.0" // { dependencies = [ - sources."camelcase-6.1.0" + sources."camelcase-6.2.0" sources."loader-utils-2.0.0" sources."semver-7.3.2" ]; @@ -13769,10 +13604,10 @@ in sources."cssnano-util-get-match-4.0.0" sources."cssnano-util-raw-cache-4.0.1" sources."cssnano-util-same-parent-4.0.1" - (sources."csso-4.0.3" // { + (sources."csso-4.1.1" // { dependencies = [ - sources."css-tree-1.0.0-alpha.39" - sources."mdn-data-2.0.6" + sources."css-tree-1.0.1" + sources."mdn-data-2.0.12" sources."source-map-0.6.1" ]; }) @@ -13836,7 +13671,7 @@ in sources."duplexify-3.7.1" sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.3.582" + sources."electron-to-chromium-1.3.596" (sources."elliptic-6.5.3" // { dependencies = [ sources."bn.js-4.11.9" @@ -13871,7 +13706,7 @@ in sources."entities-2.1.0" sources."errno-0.1.7" sources."error-ex-1.3.2" - sources."es-abstract-1.18.0-next.1" + sources."es-abstract-1.17.7" sources."es-to-primitive-1.2.1" sources."escalade-3.1.1" sources."escape-html-1.0.3" @@ -13974,7 +13809,7 @@ in sources."escape-string-regexp-1.0.5" ]; }) - (sources."file-loader-6.1.1" // { + (sources."file-loader-6.2.0" // { dependencies = [ sources."loader-utils-2.0.0" sources."schema-utils-3.0.0" @@ -14009,8 +13844,9 @@ in sources."fs.realpath-1.0.0" sources."fsevents-2.1.3" sources."function-bind-1.1.1" - sources."gensync-1.0.0-beta.1" + sources."gensync-1.0.0-beta.2" sources."get-caller-file-1.0.3" + sources."get-intrinsic-1.0.1" sources."get-own-enumerable-property-symbols-3.0.2" sources."get-stream-4.1.0" sources."get-value-2.0.6" @@ -14101,7 +13937,7 @@ in sources."i-0.3.6" sources."iconv-lite-0.4.24" sources."icss-utils-4.1.1" - sources."ieee754-1.1.13" + sources."ieee754-1.2.1" sources."iferr-0.1.5" sources."ignore-3.3.10" sources."immer-1.7.2" @@ -14135,6 +13971,7 @@ in sources."is-buffer-1.1.6" sources."is-callable-1.2.2" sources."is-color-stop-1.1.0" + sources."is-core-module-2.1.0" sources."is-data-descriptor-1.0.0" sources."is-date-object-1.0.2" sources."is-descriptor-1.0.2" @@ -14260,7 +14097,7 @@ in sources."mustache-3.2.1" sources."mute-stream-0.0.8" sources."nan-2.14.2" - sources."nanoid-3.1.12" + sources."nanoid-3.1.16" sources."nanomatch-1.2.13" sources."ncp-1.0.1" sources."negotiator-0.6.2" @@ -14282,7 +14119,7 @@ in sources."punycode-1.4.1" ]; }) - sources."node-releases-1.1.63" + sources."node-releases-1.1.66" sources."normalize-package-data-2.5.0" sources."normalize-path-3.0.0" sources."normalize-range-0.1.2" @@ -14311,34 +14148,26 @@ in ]; }) sources."object-inspect-1.8.0" - sources."object-is-1.1.3" + (sources."object-is-1.1.3" // { + dependencies = [ + sources."es-abstract-1.18.0-next.1" + ]; + }) sources."object-keys-1.1.1" (sources."object-visit-1.0.1" // { dependencies = [ sources."isobject-3.0.1" ]; }) - sources."object.assign-4.1.1" - (sources."object.entries-1.1.2" // { - dependencies = [ - sources."es-abstract-1.17.7" - ]; - }) - (sources."object.getownpropertydescriptors-2.1.0" // { - dependencies = [ - sources."es-abstract-1.17.7" - ]; - }) + sources."object.assign-4.1.2" + sources."object.entries-1.1.2" + sources."object.getownpropertydescriptors-2.1.0" (sources."object.pick-1.3.0" // { dependencies = [ sources."isobject-3.0.1" ]; }) - (sources."object.values-1.1.1" // { - dependencies = [ - sources."es-abstract-1.17.7" - ]; - }) + sources."object.values-1.1.1" sources."obuf-1.1.2" sources."on-finished-2.3.0" sources."on-headers-1.0.2" @@ -14433,7 +14262,7 @@ in (sources."postcss-loader-4.0.4" // { dependencies = [ sources."cosmiconfig-7.0.0" - sources."import-fresh-3.2.1" + sources."import-fresh-3.2.2" sources."loader-utils-2.0.0" sources."parse-json-5.1.0" sources."path-type-4.0.0" @@ -14531,7 +14360,7 @@ in }) (sources."postcss-safe-parser-5.0.2" // { dependencies = [ - sources."postcss-8.1.2" + sources."postcss-8.1.7" sources."source-map-0.6.1" ]; }) @@ -14628,16 +14457,12 @@ in sources."readable-stream-2.3.7" sources."readdirp-3.5.0" sources."recursive-readdir-2.2.2" - sources."regenerate-1.4.1" + sources."regenerate-1.4.2" sources."regenerate-unicode-properties-8.2.0" sources."regenerator-runtime-0.13.7" sources."regenerator-transform-0.14.5" sources."regex-not-1.0.2" - (sources."regexp.prototype.flags-1.3.0" // { - dependencies = [ - sources."es-abstract-1.17.7" - ]; - }) + sources."regexp.prototype.flags-1.3.0" sources."regexpu-core-4.7.1" sources."regjsgen-0.5.2" (sources."regjsparser-0.6.4" // { @@ -14660,7 +14485,7 @@ in sources."require-directory-2.1.1" sources."require-main-filename-1.0.1" sources."requires-port-1.0.0" - sources."resolve-1.17.0" + sources."resolve-1.19.0" sources."resolve-cwd-2.0.0" sources."resolve-dir-1.0.1" sources."resolve-from-3.0.0" @@ -14824,14 +14649,14 @@ in sources."strip-ansi-3.0.1" ]; }) - (sources."string.prototype.trimend-1.0.1" // { + (sources."string.prototype.trimend-1.0.2" // { dependencies = [ - sources."es-abstract-1.17.7" + sources."es-abstract-1.18.0-next.1" ]; }) - (sources."string.prototype.trimstart-1.0.1" // { + (sources."string.prototype.trimstart-1.0.2" // { dependencies = [ - sources."es-abstract-1.17.7" + sources."es-abstract-1.18.0-next.1" ]; }) sources."string_decoder-1.1.1" @@ -14868,7 +14693,7 @@ in }) sources."tapable-1.1.3" sources."tar-4.4.13" - (sources."temp-0.9.1" // { + (sources."temp-0.9.4" // { dependencies = [ sources."rimraf-2.6.3" ]; @@ -14889,7 +14714,7 @@ in sources."through-2.3.8" sources."through2-2.0.5" sources."thunky-1.1.0" - sources."timers-browserify-2.0.11" + sources."timers-browserify-2.0.12" sources."timsort-0.3.0" sources."tmp-0.0.33" sources."to-arraybuffer-1.0.1" @@ -14994,8 +14819,8 @@ in sources."vendors-1.0.4" sources."verror-1.10.0" sources."vm-browserify-1.1.2" - sources."watchpack-1.7.4" - (sources."watchpack-chokidar2-2.0.0" // { + sources."watchpack-1.7.5" + (sources."watchpack-chokidar2-2.0.1" // { dependencies = [ sources."anymatch-2.0.0" sources."binary-extensions-1.13.1" @@ -15094,7 +14919,7 @@ in }) sources."websocket-driver-0.7.4" sources."websocket-extensions-0.1.4" - sources."whatwg-fetch-3.4.1" + sources."whatwg-fetch-3.5.0" sources."which-2.0.2" sources."which-module-1.0.0" (sources."winston-2.1.1" // { @@ -15161,97 +14986,48 @@ in elm-optimize-level-2 = nodeEnv.buildNodePackage { name = "elm-optimize-level-2"; packageName = "elm-optimize-level-2"; - version = "0.1.4"; + version = "0.1.5"; src = fetchurl { - url = "https://registry.npmjs.org/elm-optimize-level-2/-/elm-optimize-level-2-0.1.4.tgz"; - sha512 = "3pWWNCurTBfjTfRQViECVUaK+ygwp4gQ0KAPKpYYlGl2KmlBy0JqRcgcSXIgqO4C9Tmeb+20J1qZplCaY/2r/w=="; + url = "https://registry.npmjs.org/elm-optimize-level-2/-/elm-optimize-level-2-0.1.5.tgz"; + sha512 = "9vaPjQEjdxzUXewbCJn1X3oIwUgdBssgy+uQvsqyDSpyEwYWxQCgX4qX3NtqKNgsHEZ+TYFzKlzdKvcRKbjOUg=="; }; dependencies = [ - (sources."@jest/types-25.5.0" // { - dependencies = [ - sources."chalk-3.0.0" - ]; - }) - sources."@types/istanbul-lib-coverage-2.0.3" - sources."@types/istanbul-lib-report-3.0.0" - sources."@types/istanbul-reports-1.1.2" - sources."@types/jest-26.0.14" - sources."@types/node-14.11.10" - sources."@types/yargs-15.0.9" - sources."@types/yargs-parser-15.0.0" - sources."ansi-regex-5.0.0" sources."ansi-styles-4.3.0" sources."balanced-match-1.0.0" sources."brace-expansion-1.1.11" - sources."braces-3.0.2" - sources."bs-logger-0.2.6" - sources."buffer-from-1.1.1" sources."chalk-4.1.0" - sources."ci-info-2.0.0" sources."color-convert-2.0.1" sources."color-name-1.1.4" - sources."commander-6.1.0" + sources."commander-6.2.0" sources."concat-map-0.0.1" - (sources."cross-spawn-6.0.5" // { - dependencies = [ - sources."semver-5.7.1" - ]; - }) - sources."diff-sequences-25.2.6" - sources."fast-json-stable-stringify-2.1.0" - sources."fill-range-7.0.1" + sources."cross-spawn-6.0.5" sources."find-elm-dependencies-2.0.4" sources."firstline-1.3.1" sources."fs.realpath-1.0.0" sources."glob-7.1.6" - sources."graceful-fs-4.2.4" sources."has-flag-4.0.0" sources."inflight-1.0.6" sources."inherits-2.0.4" - sources."is-ci-2.0.0" - sources."is-number-7.0.0" sources."isexe-2.0.0" - (sources."jest-diff-25.5.0" // { - dependencies = [ - sources."chalk-3.0.0" - ]; - }) - sources."jest-get-type-25.2.6" - (sources."jest-util-26.6.0" // { - dependencies = [ - sources."@jest/types-26.6.0" - sources."@types/istanbul-reports-3.0.0" - ]; - }) - sources."json5-2.1.3" sources."lodash-4.17.20" - sources."lodash.memoize-4.1.2" - sources."make-error-1.3.6" - sources."micromatch-4.0.2" sources."minimatch-3.0.4" sources."minimist-1.2.5" - sources."mkdirp-1.0.4" + sources."mkdirp-0.5.5" sources."nice-try-1.0.5" sources."node-elm-compiler-5.0.5" sources."once-1.4.0" sources."path-is-absolute-1.0.1" sources."path-key-2.0.1" - sources."picomatch-2.2.2" - sources."pretty-format-25.5.0" - sources."react-is-16.13.1" sources."rimraf-2.6.3" - sources."semver-7.3.2" + sources."semver-5.7.1" sources."shebang-command-1.2.0" sources."shebang-regex-1.0.0" sources."supports-color-7.2.0" - sources."temp-0.9.1" - sources."to-regex-range-5.0.1" - sources."ts-jest-26.4.1" + sources."temp-0.9.4" sources."ts-union-2.3.0" sources."typescript-3.9.7" sources."which-1.3.1" sources."wrappy-1.0.2" - sources."yargs-parser-20.2.3" ]; buildInputs = globalBuildInputs; meta = { From ec87b7398fadfbe42b85804bab9a1a0da7c43673 Mon Sep 17 00:00:00 2001 From: 06kellyjac Date: Mon, 16 Nov 2020 21:36:24 +0000 Subject: [PATCH 029/260] tektoncd-cli: update to new installShellConfiguration format --- .../networking/cluster/tektoncd-cli/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/cluster/tektoncd-cli/default.nix b/pkgs/applications/networking/cluster/tektoncd-cli/default.nix index 1e2a21d46679..43ab976445c5 100644 --- a/pkgs/applications/networking/cluster/tektoncd-cli/default.nix +++ b/pkgs/applications/networking/cluster/tektoncd-cli/default.nix @@ -27,10 +27,10 @@ buildGoModule rec { mkdir -p "$out/share/man/man1" cp docs/man/man1/* "$out/share/man/man1" - # TODO: Move to enhanced installShellCompletion when merged: PR #83630 - $out/bin/tkn completion bash > tkn.bash - $out/bin/tkn completion zsh > _tkn - installShellCompletion tkn.bash --zsh _tkn + installShellCompletion --cmd tkn \ + --bash <($out/bin/tkn completion bash) \ + --fish <($out/bin/tkn completion fish) \ + --zsh <($out/bin/tkn completion zsh) ''; meta = with lib; { From bcfdcaed7902c9b42b247f31cde84e69a3604bcc Mon Sep 17 00:00:00 2001 From: 06kellyjac Date: Mon, 16 Nov 2020 21:36:49 +0000 Subject: [PATCH 030/260] tektoncd-cli: 0.13.1 -> 0.14.0 --- pkgs/applications/networking/cluster/tektoncd-cli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/tektoncd-cli/default.nix b/pkgs/applications/networking/cluster/tektoncd-cli/default.nix index 43ab976445c5..aeaff2ff5f15 100644 --- a/pkgs/applications/networking/cluster/tektoncd-cli/default.nix +++ b/pkgs/applications/networking/cluster/tektoncd-cli/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "tektoncd-cli"; - version = "0.13.1"; + version = "0.14.0"; src = fetchFromGitHub { owner = "tektoncd"; repo = "cli"; rev = "v${version}"; - sha256 = "0cjih8h64wwdp022pn70xqxafdk34z2y2ipxb86dlf2zdrf9xv53"; + sha256 = "1mkbwh4cmhx9in928vlvs7xjjklpsxbv5niv8jmsbnifflg1an8p"; }; vendorSha256 = null; From 168f36153b1e89ff9482398f37ba23825da9bf3e Mon Sep 17 00:00:00 2001 From: David Anderson Date: Mon, 16 Nov 2020 14:37:12 -0800 Subject: [PATCH 031/260] tailscale: 1.2.6 -> 1.2.8 Signed-off-by: David Anderson --- pkgs/servers/tailscale/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/tailscale/default.nix b/pkgs/servers/tailscale/default.nix index 353ac4d5d882..a32f8115e273 100644 --- a/pkgs/servers/tailscale/default.nix +++ b/pkgs/servers/tailscale/default.nix @@ -2,14 +2,14 @@ buildGoModule rec { pname = "tailscale"; - version = "1.2.6"; - tagHash = "0423683af6500dacbbc0194cb97eedaa312a34f2"; # from `git rev-parse v1.2.6` + version = "1.2.8"; + tagHash = "37adb62a35d818f4af638924d3fc1526bdeaf215"; # from `git rev-parse v1.2.7` src = fetchFromGitHub { owner = "tailscale"; repo = "tailscale"; rev = "v${version}"; - sha256 = "0p2ygv2vwpjq6yhhaxis8j9gxkv0qcx0byxlf0vbmy9xqb03cs87"; + sha256 = "0305n5gwp2w36z3yh0w8x3ma8a074zr913cx3y73szln56jz88hg"; }; nativeBuildInputs = [ makeWrapper ]; From 62dad96c3923288b467aa3a0a892b4d15939768d Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 17 Nov 2020 04:57:52 +0100 Subject: [PATCH 032/260] zigbee2mqtt: 1.16.0 -> 1.16.1 --- pkgs/servers/zigbee2mqtt/default.nix | 4 +- pkgs/servers/zigbee2mqtt/node-packages.nix | 225 +++++++++++++++------ 2 files changed, 170 insertions(+), 59 deletions(-) diff --git a/pkgs/servers/zigbee2mqtt/default.nix b/pkgs/servers/zigbee2mqtt/default.nix index 10fa4e3340c9..2998bf630c41 100644 --- a/pkgs/servers/zigbee2mqtt/default.nix +++ b/pkgs/servers/zigbee2mqtt/default.nix @@ -3,7 +3,7 @@ let package = (import ./node.nix { inherit pkgs system; }).package; in package.override rec { - version = "1.16.0"; + version = "1.16.1"; reconstructLock = true; postInstall = '' @@ -20,7 +20,7 @@ package.override rec { owner = "Koenkk"; repo = "zigbee2mqtt"; rev = version; - sha256 = "0hahzvp3099g0i4jqbkcq6vndpjigx7b6mg1vjcs5v0wyllxdlwp"; + sha256 = "16pizkiic7m8w9q56lgzdpy3hpvnw7fwrkkmldg57wpmqmq1r3dj"; }; passthru.tests.zigbee2mqtt = nixosTests.zigbee2mqtt; diff --git a/pkgs/servers/zigbee2mqtt/node-packages.nix b/pkgs/servers/zigbee2mqtt/node-packages.nix index 89f3be7119d4..14aa9ccf5683 100644 --- a/pkgs/servers/zigbee2mqtt/node-packages.nix +++ b/pkgs/servers/zigbee2mqtt/node-packages.nix @@ -1957,6 +1957,15 @@ let sha512 = "cd+5r1VLBwUqTrmnzW+D7ABkJUM6mr7uv1dv+6jRw4Rcl7tFIFHDqHPL98LhpGFn3dbAt3gtLxtrWp4m1kFrqg=="; }; }; + "buffer-5.7.1" = { + name = "buffer"; + packageName = "buffer"; + version = "5.7.1"; + src = fetchurl { + url = "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz"; + sha512 = "EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ=="; + }; + }; "buffer-crc32-0.2.13" = { name = "buffer-crc32"; packageName = "buffer-crc32"; @@ -2299,13 +2308,13 @@ let sha1 = "d8a96bd77fd68df7793a73036a3ba0d5405d477b"; }; }; - "concat-stream-2.0.0" = { + "concat-stream-1.6.2" = { name = "concat-stream"; packageName = "concat-stream"; - version = "2.0.0"; + version = "1.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/concat-stream/-/concat-stream-2.0.0.tgz"; - sha512 = "MWufYdFw53ccGjCA+Ol7XJYpAlW6/prSMzuPOTRnJGcGzuhLn4Scrz7qf6o8bROZ514ltazcIFJZevcfbo0x7A=="; + url = "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.2.tgz"; + sha512 = "27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw=="; }; }; "console-control-strings-1.1.0" = { @@ -2398,6 +2407,15 @@ let sha512 = "AZL67abkUzIuvcHqk7c09cezpGNcxUxU4Ioi/05xHk4DQeTkWmGYftIE6ctU6AEt+Gn4n1lDStOtj7FKycP71A=="; }; }; + "d-1.0.1" = { + name = "d"; + packageName = "d"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/d/-/d-1.0.1.tgz"; + sha512 = "m62ShEObQ39CfralilEQRjH6oAMtNCV1xJyEx5LpRYUVN+EviphDgUc/F3hnYbADmkiNs67Y+3ylmlG7Lnu+FA=="; + }; + }; "dashdash-1.14.1" = { name = "dashdash"; packageName = "dashdash"; @@ -2740,6 +2758,60 @@ let sha512 = "7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g=="; }; }; + "es5-ext-0.10.53" = { + name = "es5-ext"; + packageName = "es5-ext"; + version = "0.10.53"; + src = fetchurl { + url = "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.53.tgz"; + sha512 = "Xs2Stw6NiNHWypzRTY1MtaG/uJlwCk8kH81920ma8mvN8Xq1gsfhZvpkImLQArw8AHnv8MT2I45J3c0R8slE+Q=="; + }; + }; + "es6-iterator-2.0.3" = { + name = "es6-iterator"; + packageName = "es6-iterator"; + version = "2.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/es6-iterator/-/es6-iterator-2.0.3.tgz"; + sha1 = "a7de889141a05a94b0854403b2d0a0fbfa98f3b7"; + }; + }; + "es6-map-0.1.5" = { + name = "es6-map"; + packageName = "es6-map"; + version = "0.1.5"; + src = fetchurl { + url = "https://registry.npmjs.org/es6-map/-/es6-map-0.1.5.tgz"; + sha1 = "9136e0503dcc06a301690f0bb14ff4e364e949f0"; + }; + }; + "es6-set-0.1.5" = { + name = "es6-set"; + packageName = "es6-set"; + version = "0.1.5"; + src = fetchurl { + url = "https://registry.npmjs.org/es6-set/-/es6-set-0.1.5.tgz"; + sha1 = "d2b3ec5d4d800ced818db538d28974db0a73ccb1"; + }; + }; + "es6-symbol-3.1.1" = { + name = "es6-symbol"; + packageName = "es6-symbol"; + version = "3.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.1.tgz"; + sha1 = "bf00ef4fdab6ba1b46ecb7b629b4c7ed5715cc77"; + }; + }; + "es6-symbol-3.1.3" = { + name = "es6-symbol"; + packageName = "es6-symbol"; + version = "3.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.3.tgz"; + sha512 = "NJ6Yn3FuDinBaBRWl/q5X/s4koRHBrgKAu+yGI6JCBeiu3qrcbJhwT2GeR/EXVfylRk8dpQVJoLEFhK+Mu31NA=="; + }; + }; "escalade-3.1.1" = { name = "escalade"; packageName = "escalade"; @@ -2920,6 +2992,15 @@ let sha1 = "41ae2eeb65efa62268aebfea83ac7d79299b0887"; }; }; + "event-emitter-0.3.5" = { + name = "event-emitter"; + packageName = "event-emitter"; + version = "0.3.5"; + src = fetchurl { + url = "https://registry.npmjs.org/event-emitter/-/event-emitter-0.3.5.tgz"; + sha1 = "df8c69eef1647923c7157b9ce83840610b02cc39"; + }; + }; "eventemitter3-4.0.7" = { name = "eventemitter3"; packageName = "eventemitter3"; @@ -2992,6 +3073,15 @@ let sha512 = "BRfxIBHagghMmr1D2MRY0Qv5d3Nc8HCqgbDwNXw/9izmM5eBb42a2YjLKSbsqle76ozGkAEPELQX4IdNHAKRNA=="; }; }; + "ext-1.4.0" = { + name = "ext"; + packageName = "ext"; + version = "1.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ext/-/ext-1.4.0.tgz"; + sha512 = "Key5NIsUxdqKg3vIsdw9dSuXpPCQ297y6wBjL30edxwPgt2E44WcWBZey/ZvUc6sERLTxKdyCu4gZFmUbk1Q7A=="; + }; + }; "extend-3.0.2" = { name = "extend"; packageName = "extend"; @@ -4963,13 +5053,13 @@ let sha512 = "kHmoybcPV8Sqy59DwNDY3Jefr64lK/by/da0ViFcuA4DH0vQg5Q6Ze5VimxkfQNSC+Mls/Kx53s7TjP1RhFEDQ=="; }; }; - "mqtt-4.2.4" = { + "mqtt-4.2.1" = { name = "mqtt"; packageName = "mqtt"; - version = "4.2.4"; + version = "4.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/mqtt/-/mqtt-4.2.4.tgz"; - sha512 = "g3tJt5UOS1Wqn/xntl4JhlJW51OM8CvgEmY8cwZ1zecE5G7uuwjSUUvgGeVDiEMWJ5vXCfZz2VMCQGNvKhzfEQ=="; + url = "https://registry.npmjs.org/mqtt/-/mqtt-4.2.1.tgz"; + sha512 = "Iv893r+jWlo5GkNcPOfCGwW8M49IixwHiKLFFYTociEymSibUVCORVEjPXWPGzSxhn7BdlUeHicbRmWiv0Crkg=="; }; }; "mqtt-packet-6.6.0" = { @@ -5053,6 +5143,15 @@ let sha512 = "Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw=="; }; }; + "next-tick-1.0.0" = { + name = "next-tick"; + packageName = "next-tick"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/next-tick/-/next-tick-1.0.0.tgz"; + sha1 = "ca86d1fe8828169b0120208e3dc8424b9db8342c"; + }; + }; "nice-try-1.0.5" = { name = "nice-try"; packageName = "nice-try"; @@ -6889,6 +6988,24 @@ let sha1 = "5ae68177f192d4456269d108afa93ff8743f4f64"; }; }; + "type-1.2.0" = { + name = "type"; + packageName = "type"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/type/-/type-1.2.0.tgz"; + sha512 = "+5nt5AAniqsCnu2cEQQdpzCAh33kVx8n0VoFidKpB1dVVLAN/F+bgVOqOJqOnEnrhp222clB5p3vUlD+1QAnfg=="; + }; + }; + "type-2.1.0" = { + name = "type"; + packageName = "type"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/type/-/type-2.1.0.tgz"; + sha512 = "G9absDWvhAWCV2gmF1zKud3OyC61nZDwWvBL2DApaVFogI07CprggiQAOOjvp2NRjYWFzPyu7vwtDrQFq8jeSA=="; + }; + }; "type-check-0.3.2" = { name = "type-check"; packageName = "type-check"; @@ -7523,7 +7640,7 @@ let args = { name = "zigbee2mqtt"; packageName = "zigbee2mqtt"; - version = "1.16.0"; + version = "1.16.1"; src = ./.; dependencies = [ sources."@dabh/diagnostics-2.0.2" @@ -7533,17 +7650,15 @@ let sources."balanced-match-1.0.0" sources."base64-js-1.3.1" sources."bindings-1.5.0" - sources."bl-4.0.3" - sources."brace-expansion-1.1.11" - sources."buffer-5.7.0" - sources."buffer-from-1.1.1" - (sources."callback-stream-1.1.0" // { + (sources."bl-4.0.3" // { dependencies = [ - sources."readable-stream-2.3.7" - sources."safe-buffer-5.1.2" - sources."string_decoder-1.1.1" + sources."readable-stream-3.6.0" ]; }) + sources."brace-expansion-1.1.11" + sources."buffer-5.7.1" + sources."buffer-from-1.1.1" + sources."callback-stream-1.1.0" sources."color-3.0.0" sources."color-convert-1.9.3" sources."color-name-1.1.3" @@ -7552,27 +7667,37 @@ let sources."colorspace-1.1.2" sources."commist-1.1.0" sources."concat-map-0.0.1" - sources."concat-stream-2.0.0" + sources."concat-stream-1.6.2" sources."core-util-is-1.0.2" + sources."d-1.0.1" sources."debounce-1.2.0" sources."debug-2.6.9" sources."depd-1.1.2" sources."destroy-1.0.4" - (sources."duplexify-3.7.1" // { - dependencies = [ - sources."readable-stream-2.3.7" - sources."safe-buffer-5.1.2" - sources."string_decoder-1.1.1" - ]; - }) + sources."duplexify-3.7.1" sources."ee-first-1.1.1" sources."enabled-2.0.0" sources."encodeurl-1.0.2" sources."end-of-stream-1.4.4" + sources."es5-ext-0.10.53" + sources."es6-iterator-2.0.3" + sources."es6-map-0.1.5" + (sources."es6-set-0.1.5" // { + dependencies = [ + sources."es6-symbol-3.1.1" + ]; + }) + sources."es6-symbol-3.1.3" sources."escape-html-1.0.3" sources."esprima-4.0.1" sources."etag-1.8.1" + sources."event-emitter-0.3.5" sources."eventemitter3-4.0.7" + (sources."ext-1.4.0" // { + dependencies = [ + sources."type-2.1.0" + ]; + }) sources."extend-3.0.2" sources."fast-deep-equal-3.1.3" sources."fast-json-stable-stringify-2.1.0" @@ -7587,13 +7712,7 @@ let sources."git-last-commit-1.0.0" sources."glob-7.1.6" sources."glob-parent-3.1.0" - (sources."glob-stream-6.1.0" // { - dependencies = [ - sources."readable-stream-2.3.7" - sources."safe-buffer-5.1.2" - sources."string_decoder-1.1.1" - ]; - }) + sources."glob-stream-6.1.0" sources."glossy-0.1.7" sources."help-me-1.1.0" sources."http-errors-1.7.3" @@ -7627,7 +7746,7 @@ let sources."minimist-1.2.5" sources."mkdir-recursive-0.4.0" sources."moment-2.29.1" - (sources."mqtt-4.2.4" // { + (sources."mqtt-4.2.1" // { dependencies = [ sources."debug-4.2.0" sources."ms-2.1.2" @@ -7641,17 +7760,12 @@ let }) sources."ms-2.0.0" sources."nan-2.14.2" + sources."next-tick-1.0.0" sources."object-assign-deep-0.4.0" sources."on-finished-2.3.0" sources."once-1.4.0" sources."one-time-1.0.0" - (sources."ordered-read-streams-1.0.1" // { - dependencies = [ - sources."readable-stream-2.3.7" - sources."safe-buffer-5.1.2" - sources."string_decoder-1.1.1" - ]; - }) + sources."ordered-read-streams-1.0.1" sources."parseurl-1.3.3" sources."path-dirname-1.0.2" sources."path-is-absolute-1.0.1" @@ -7664,12 +7778,12 @@ let }) sources."punycode-2.1.1" sources."range-parser-1.2.1" - sources."readable-stream-3.6.0" + sources."readable-stream-2.3.7" sources."reinterval-1.1.0" sources."remove-trailing-separator-1.1.0" sources."requires-port-1.0.0" sources."rimraf-3.0.2" - sources."safe-buffer-5.2.1" + sources."safe-buffer-5.1.2" sources."semver-7.3.2" (sources."send-0.17.1" // { dependencies = [ @@ -7679,24 +7793,23 @@ let sources."serve-static-1.14.1" sources."setprototypeof-1.1.1" sources."simple-swizzle-0.2.2" - sources."split2-3.2.2" + (sources."split2-3.2.2" // { + dependencies = [ + sources."readable-stream-3.6.0" + ]; + }) sources."sprintf-js-1.0.3" sources."stack-trace-0.0.10" sources."statuses-1.5.0" sources."stream-shift-1.0.1" - sources."string_decoder-1.3.0" + sources."string_decoder-1.1.1" sources."text-hex-1.0.0" - (sources."through2-2.0.5" // { - dependencies = [ - sources."readable-stream-2.3.7" - sources."safe-buffer-5.1.2" - sources."string_decoder-1.1.1" - ]; - }) + sources."through2-2.0.5" sources."through2-filter-3.0.0" sources."to-absolute-glob-2.0.2" sources."toidentifier-1.0.0" sources."triple-beam-1.3.0" + sources."type-1.2.0" sources."typedarray-0.0.6" sources."unc-path-regex-0.1.2" sources."unique-stream-2.3.1" @@ -7704,15 +7817,13 @@ let sources."unpipe-1.0.0" sources."uri-js-4.4.0" sources."util-deprecate-1.0.2" - sources."winston-3.3.3" - sources."winston-syslog-2.4.4" - (sources."winston-transport-4.4.0" // { + (sources."winston-3.3.3" // { dependencies = [ - sources."readable-stream-2.3.7" - sources."safe-buffer-5.1.2" - sources."string_decoder-1.1.1" + sources."readable-stream-3.6.0" ]; }) + sources."winston-syslog-2.4.4" + sources."winston-transport-4.4.0" sources."wrappy-1.0.2" sources."ws-7.3.1" sources."xtend-4.0.2" From fc6948cd478ee0506608f8513ba64c7a5e23bfe3 Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Tue, 17 Nov 2020 14:02:37 +0000 Subject: [PATCH 033/260] nixos/malloc: fix Scudo Fixes segmentation faults. https://github.com/NixOS/nixpkgs/issues/100799 --- nixos/modules/config/malloc.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/config/malloc.nix b/nixos/modules/config/malloc.nix index 31a659ee83fe..a3eb55d8a42e 100644 --- a/nixos/modules/config/malloc.nix +++ b/nixos/modules/config/malloc.nix @@ -23,7 +23,7 @@ let }; scudo = { - libPath = "${pkgs.llvmPackages.compiler-rt}/lib/linux/libclang_rt.scudo-x86_64.so"; + libPath = "${pkgs.llvmPackages_latest.compiler-rt}/lib/linux/libclang_rt.scudo-x86_64.so"; description = '' A user-mode allocator based on LLVM Sanitizer’s CombinedAllocator, which aims at providing additional mitigations against heap based From 49325a0d7f727bb23464f2d996da613cc5c758a2 Mon Sep 17 00:00:00 2001 From: Jason Lau Date: Mon, 16 Nov 2020 20:32:28 -0800 Subject: [PATCH 034/260] reattach-to-user-namespace: 2.8 -> 2.9 --- .../darwin/reattach-to-user-namespace/default.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/darwin/reattach-to-user-namespace/default.nix b/pkgs/os-specific/darwin/reattach-to-user-namespace/default.nix index 768ca6cf9c97..685837768504 100644 --- a/pkgs/os-specific/darwin/reattach-to-user-namespace/default.nix +++ b/pkgs/os-specific/darwin/reattach-to-user-namespace/default.nix @@ -1,12 +1,14 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "reattach-to-user-namespace"; - version = "2.8"; + version = "2.9"; - src = fetchurl { - url = "https://github.com/ChrisJohnsen/tmux-MacOSX-pasteboard/archive/v${version}.tar.gz"; - sha256 = "0xxxdd26rcplhpvi2vy6crxadk3d1qkq4xry10lwq6dyya2jf6wb"; + src = fetchFromGitHub { + owner = "ChrisJohnsen"; + repo = "tmux-MacOSX-pasteboard"; + rev = "v${version}"; + sha256 = "1qgimh58hcx5f646gj2kpd36ayvrdkw616ad8cb3lcm11kg0ag79"; }; buildFlags = [ "ARCHES=x86_64" ]; From 0b087b19d6011b4e337cf6737694d70e11a9a9ca Mon Sep 17 00:00:00 2001 From: Simonas Kazlauskas Date: Wed, 18 Nov 2020 03:15:15 +0200 Subject: [PATCH 035/260] tracy: 0.7.3 -> 0.7.4 --- pkgs/development/tools/tracy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/tracy/default.nix b/pkgs/development/tools/tracy/default.nix index 5839a7771d0f..4efef71f6ad0 100644 --- a/pkgs/development/tools/tracy/default.nix +++ b/pkgs/development/tools/tracy/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "tracy"; - version = "0.7.3"; + version = "0.7.4"; src = fetchFromGitHub { owner = "wolfpld"; repo = "tracy"; rev = "v${version}"; - sha256 = "06xznk7nslw9km7hia2pfb5filjqalgx6cah48skxnah148svq2y"; + sha256 = "0s39kimpc03x48kh7lyhblfs8y4mdzcz3g7f806h90x7zndsmfxj"; }; nativeBuildInputs = [ pkgconfig ]; From 4b6e4a64219c83d23182fea34864fc0b0915709f Mon Sep 17 00:00:00 2001 From: Raghav Sood Date: Wed, 18 Nov 2020 04:14:55 +0000 Subject: [PATCH 036/260] creddump: fix src --- pkgs/tools/security/creddump/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/tools/security/creddump/default.nix b/pkgs/tools/security/creddump/default.nix index d37c58a51591..ffa2fd2311c1 100644 --- a/pkgs/tools/security/creddump/default.nix +++ b/pkgs/tools/security/creddump/default.nix @@ -7,8 +7,7 @@ python2Packages.buildPythonApplication rec { src = fetchFromGitLab { owner = "kalilinux"; repo = "packages/creddump"; - # url-encoding workaround: https://github.com/NixOS/nixpkgs/issues/65796#issuecomment-517829019 - rev = "debian%2F${version}-1kali2"; # %2F = urlquote("/") + rev = "debian/${version}-1kali2"; sha256 = "0r3rs2hggsvv619l3fh3c0jli6d3ryyj30ni3hz0nz670z5smzcf"; }; From d6a09adb5fc2d515a008e7863b8e9f550d4f5570 Mon Sep 17 00:00:00 2001 From: Andrew Childs Date: Wed, 18 Nov 2020 15:02:58 +0900 Subject: [PATCH 037/260] tcpreplay: fix darwin build --- pkgs/tools/networking/tcpreplay/default.nix | 10 +++++++--- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/networking/tcpreplay/default.nix b/pkgs/tools/networking/tcpreplay/default.nix index b40df721c83e..fdf7965311d0 100644 --- a/pkgs/tools/networking/tcpreplay/default.nix +++ b/pkgs/tools/networking/tcpreplay/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libpcap, tcpdump }: +{ stdenv, fetchurl, libpcap, tcpdump, Carbon, CoreServices }: stdenv.mkDerivation rec { pname = "tcpreplay"; @@ -9,7 +9,11 @@ stdenv.mkDerivation rec { sha256 = "1plgjm3dr9rr5q71s7paqk2wgrvkihbk2yrf9g3zaks3m750497d"; }; - buildInputs = [ libpcap ]; + buildInputs = [ libpcap ] + ++ stdenv.lib.optionals stdenv.hostPlatform.isDarwin [ + Carbon CoreServices + ]; + configureFlags = [ "--disable-local-libopts" @@ -26,6 +30,6 @@ stdenv.mkDerivation rec { homepage = "http://tcpreplay.appneta.com/"; license = with licenses; [ bsd3 gpl3 ]; maintainers = with maintainers; [ eleanor ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7429bbda5b40..206cd8f77fcd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7517,7 +7517,9 @@ in tcpkali = callPackage ../applications/networking/tcpkali { }; - tcpreplay = callPackage ../tools/networking/tcpreplay { }; + tcpreplay = callPackage ../tools/networking/tcpreplay { + inherit (darwin.apple_sdk.frameworks) Carbon CoreServices; + }; tdns-cli = callPackage ../tools/networking/tdns-cli { }; From 98437b586949e642b8c157115153f50af034f320 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Wed, 18 Nov 2020 08:39:59 +0100 Subject: [PATCH 038/260] drawio: 13.9.5 -> 13.9.9 Changelog: https://github.com/jgraph/drawio-desktop/releases/tag/v13.9.9 --- pkgs/applications/graphics/drawio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/drawio/default.nix b/pkgs/applications/graphics/drawio/default.nix index 2d630c8ccbd6..892d81753e65 100644 --- a/pkgs/applications/graphics/drawio/default.nix +++ b/pkgs/applications/graphics/drawio/default.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation rec { pname = "drawio"; - version = "13.9.5"; + version = "13.9.9"; src = fetchurl { url = "https://github.com/jgraph/drawio-desktop/releases/download/v${version}/draw.io-x86_64-${version}.rpm"; - sha256 = "1glklqpbx28ssi41cdshckgvix24wkqmsw0rgf964vjc28qgfy1s"; + hash = "sha256-+rNbLHpkFnvM7gDFbZ9AItPIA2IVTmscz+gTXF8riIY="; }; nativeBuildInputs = [ From b4143113d5f560d2ae82fb829d6f51be8e5f4da3 Mon Sep 17 00:00:00 2001 From: David Terry Date: Wed, 18 Nov 2020 13:11:15 +0100 Subject: [PATCH 039/260] btc-rpc-explorer: init at 2.0.2 --- .../node-packages/node-packages.json | 1 + .../node-packages/node-packages.nix | 1537 ++++++++++++++--- 2 files changed, 1255 insertions(+), 283 deletions(-) diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json index 983a21658730..0216222136e3 100644 --- a/pkgs/development/node-packages/node-packages.json +++ b/pkgs/development/node-packages/node-packages.json @@ -16,6 +16,7 @@ , "bower" , "bower2nix" , "browserify" +, "btc-rpc-explorer" , "castnow" , "clean-css-cli" , "clubhouse-cli" diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index 8ee583536742..3782f5e8f5f4 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -2020,6 +2020,24 @@ let sha512 = "+YWCOSJi6CoBLSgktJfy8/ijQGK3WbPUmujndcxY/WPmCe+Wek6kajmxclMMuDVAjg4RFXdH/fuLwOb/abOU5g=="; }; }; + "@fast-csv/format-4.3.5" = { + name = "_at_fast-csv_slash_format"; + packageName = "@fast-csv/format"; + version = "4.3.5"; + src = fetchurl { + url = "https://registry.npmjs.org/@fast-csv/format/-/format-4.3.5.tgz"; + sha512 = "8iRn6QF3I8Ak78lNAa+Gdl5MJJBM5vRHivFtMRUWINdevNo00K7OXxS2PshawLKTejVwieIlPmK5YlLu6w4u8A=="; + }; + }; + "@fast-csv/parse-4.3.3" = { + name = "_at_fast-csv_slash_parse"; + packageName = "@fast-csv/parse"; + version = "4.3.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@fast-csv/parse/-/parse-4.3.3.tgz"; + sha512 = "mXrCmyyZxbcdW/kZ8tVMrb1DJrJMNGWxHmB4OSuEL96so/X14E1O0w5QFiyodfs+oXoNGwbku8bx2Lq2tiODAA=="; + }; + }; "@fluentui/date-time-utilities-7.9.0" = { name = "_at_fluentui_slash_date-time-utilities"; packageName = "@fluentui/date-time-utilities"; @@ -3361,13 +3379,13 @@ let sha512 = "/NdX1Ql8hKNM0vHFJnEr/bcw6BG0ULHD3HhInpniZw5ixpl+n/QIRfMEEmLCn7acedbM1zGdZvU5ZMbn9kcF5Q=="; }; }; - "@microsoft/load-themed-styles-1.10.134" = { + "@microsoft/load-themed-styles-1.10.136" = { name = "_at_microsoft_slash_load-themed-styles"; packageName = "@microsoft/load-themed-styles"; - version = "1.10.134"; + version = "1.10.136"; src = fetchurl { - url = "https://registry.npmjs.org/@microsoft/load-themed-styles/-/load-themed-styles-1.10.134.tgz"; - sha512 = "TAXG7OEkzzhKcVzoE4p0WrY/2RzdaewzrggogGU38dScLy9eUiJXXs4osIsesMXvzG5BP/v5MS6kAbtb+HM0cQ=="; + url = "https://registry.npmjs.org/@microsoft/load-themed-styles/-/load-themed-styles-1.10.136.tgz"; + sha512 = "D8wWUiW7HQKFp4Qgy5GsDvEymKew/4uK+4dSWSO/+6LfSI15kqDNS7g4Nf/VxL5FBmjwXqQV1d59ucgWiKUjJg=="; }; }; "@mozilla/readability-0.3.0" = { @@ -3541,58 +3559,58 @@ let sha512 = "xPJDEMkHnIoHk19enEbg4qiIwszXS8XOUi8UpD4YMA81GXGT0xi16Z17kOACipDG6Tmmy5Jl6pe3cKqQvM/WyQ=="; }; }; - "@node-red/editor-api-1.2.3" = { + "@node-red/editor-api-1.2.5" = { name = "_at_node-red_slash_editor-api"; packageName = "@node-red/editor-api"; - version = "1.2.3"; + version = "1.2.5"; src = fetchurl { - url = "https://registry.npmjs.org/@node-red/editor-api/-/editor-api-1.2.3.tgz"; - sha512 = "7xw02VV69E08jx4cnLkVaOaX+XrQNPlFCRSobAQyj6KKGizMbclWKbsIF6gWSnWEHJdQR/kbAuaK0Qm/F19YuA=="; + url = "https://registry.npmjs.org/@node-red/editor-api/-/editor-api-1.2.5.tgz"; + sha512 = "ZoWCBDPtuP9wxKxC/SK5hzTMTg6QQlvouoZelZ5h2nS2UGL3Mk+udsJL56FwSYrb/w4JfqG58wmG+DEsmjBKGg=="; }; }; - "@node-red/editor-client-1.2.3" = { + "@node-red/editor-client-1.2.5" = { name = "_at_node-red_slash_editor-client"; packageName = "@node-red/editor-client"; - version = "1.2.3"; + version = "1.2.5"; src = fetchurl { - url = "https://registry.npmjs.org/@node-red/editor-client/-/editor-client-1.2.3.tgz"; - sha512 = "nYmt4B2GwZOAQIAeHDj6dj85aJ2KnyXdX4nHqRkpBO3UMqfaZuG2WuhDful/TOUEhgTOXWLzXVPQwzFt3q9fRA=="; + url = "https://registry.npmjs.org/@node-red/editor-client/-/editor-client-1.2.5.tgz"; + sha512 = "pqf+JSp0mNQ3o8fnEH6NKJQNj7/QJQKAHGKjmm1uAnaOJMGpOeO7Wap6/obPKzf0o67uVteYKD81LfhsI0afgQ=="; }; }; - "@node-red/nodes-1.2.3" = { + "@node-red/nodes-1.2.5" = { name = "_at_node-red_slash_nodes"; packageName = "@node-red/nodes"; - version = "1.2.3"; + version = "1.2.5"; src = fetchurl { - url = "https://registry.npmjs.org/@node-red/nodes/-/nodes-1.2.3.tgz"; - sha512 = "HHWRtbronw4OaFGlF58CYSCFHTVzvfzT+mWmqTucP7iD14658hDHUAVPC8eFmP6E2tbo+Vy3+Rdu80djcaRyUQ=="; + url = "https://registry.npmjs.org/@node-red/nodes/-/nodes-1.2.5.tgz"; + sha512 = "4rHYyIGYrLSZWlxX/KWyOQ4+M6srPd/0i3Idw/68PMBCw9ygyn9DpcBGd6IEqbkSa4BRdcjkomOpmmGsRuCDkw=="; }; }; - "@node-red/registry-1.2.3" = { + "@node-red/registry-1.2.5" = { name = "_at_node-red_slash_registry"; packageName = "@node-red/registry"; - version = "1.2.3"; + version = "1.2.5"; src = fetchurl { - url = "https://registry.npmjs.org/@node-red/registry/-/registry-1.2.3.tgz"; - sha512 = "wGJ1KK1+NycM+Sbmib6FIL4/OwWxB0sx4IHLI5tYdGYLaf7MYSKTcNxpLvUwjsE2k0ngeiqW43oPhyFrK01Ihw=="; + url = "https://registry.npmjs.org/@node-red/registry/-/registry-1.2.5.tgz"; + sha512 = "NPF+9abbj2bF/WKgV6sC+hskAJh1AUZPUx1aM/x6xk0tCtotOqx7KRDZlbzKMqT1hKb7V1tsBYtzdIMmCdJncQ=="; }; }; - "@node-red/runtime-1.2.3" = { + "@node-red/runtime-1.2.5" = { name = "_at_node-red_slash_runtime"; packageName = "@node-red/runtime"; - version = "1.2.3"; + version = "1.2.5"; src = fetchurl { - url = "https://registry.npmjs.org/@node-red/runtime/-/runtime-1.2.3.tgz"; - sha512 = "qFEJ8Xgg5lgtlYPW/Zfi2r8HBMzTzwP+ws7f9So28fG76SGcXk8MfNnx2GTSGRnp+a9Mn1/SRlunNQqw9bQ/LA=="; + url = "https://registry.npmjs.org/@node-red/runtime/-/runtime-1.2.5.tgz"; + sha512 = "5RR90HtNAs194+hqh803MmaKZxmfUboGYHMO5dcAhv+e1Fh5SM2lDpGJDLM7j3QI4bWRqdi82qd1y2kXvLqgYA=="; }; }; - "@node-red/util-1.2.3" = { + "@node-red/util-1.2.5" = { name = "_at_node-red_slash_util"; packageName = "@node-red/util"; - version = "1.2.3"; + version = "1.2.5"; src = fetchurl { - url = "https://registry.npmjs.org/@node-red/util/-/util-1.2.3.tgz"; - sha512 = "myAbQ35tk/oIJJfwUehpQbobFcAkeLxRKmRE5FOda8S79RHJh3OJVdISSm2lgUh0QlwFl4D8fZvu+2wZ5GoB0Q=="; + url = "https://registry.npmjs.org/@node-red/util/-/util-1.2.5.tgz"; + sha512 = "V+/bWsEg8PIZemgzpjqcpq+/zcjuj/fJ3qoJNRDWFYQ+6VU24W+cGiz795z1KfmyloeMLw3LPikp7lQGikTtIw=="; }; }; "@nodelib/fs.scandir-2.1.3" = { @@ -3685,13 +3703,13 @@ let sha512 = "QyAGYo/Fbj4MXeGdJcFzZ+FkDkomfRBrPM+9QYJSg+PxgAUL+LU3FneQk37rKR2/zjqkCV1BLHccX98wRXG3Sg=="; }; }; - "@npmcli/run-script-1.7.5" = { + "@npmcli/run-script-1.8.0" = { name = "_at_npmcli_slash_run-script"; packageName = "@npmcli/run-script"; - version = "1.7.5"; + version = "1.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/@npmcli/run-script/-/run-script-1.7.5.tgz"; - sha512 = "G8taZCc0HExiLadB3Nv0/h1TWjQ9HhkqW/waaH9MNqMX26rPRyNORst1LlNXOO8QnxQF4tNdJfc/Z3TuEtiyww=="; + url = "https://registry.npmjs.org/@npmcli/run-script/-/run-script-1.8.0.tgz"; + sha512 = "ljPLRbQM5byhqacWl9kIjt/yPMee0heaTskaMBFaFvYzOXNJ64h27xV96Sr+LnjJpqR0qJejG36QzJkXILvghQ=="; }; }; "@oclif/color-0.1.2" = { @@ -5107,13 +5125,13 @@ let sha512 = "nEhsFoJurt8oUmieT8qy4nk81WRHmJynmVwn/Vts08PL9fhgIsMhk1GId5yAN643OzqEEb5S/6At2TZW7pqPDA=="; }; }; - "@stylelint/postcss-markdown-0.36.1" = { + "@stylelint/postcss-markdown-0.36.2" = { name = "_at_stylelint_slash_postcss-markdown"; packageName = "@stylelint/postcss-markdown"; - version = "0.36.1"; + version = "0.36.2"; src = fetchurl { - url = "https://registry.npmjs.org/@stylelint/postcss-markdown/-/postcss-markdown-0.36.1.tgz"; - sha512 = "iDxMBWk9nB2BPi1VFQ+Dc5+XpvODBHw2n3tYpaBZuEAFQlbtF9If0Qh5LTTwSi/XwdbJ2jt+0dis3i8omyggpw=="; + url = "https://registry.npmjs.org/@stylelint/postcss-markdown/-/postcss-markdown-0.36.2.tgz"; + sha512 = "2kGbqUVJUGE8dM+bMzXG/PYUWKkjLIkRLWNh39OaADkiabDRdw8ATFCgbMz5xdIcvwspPAluSL7uY+ZiTWdWmQ=="; }; }; "@szmarczak/http-timer-1.1.2" = { @@ -5440,6 +5458,15 @@ let sha512 = "P1bffQfhD3O4LW0ioENXUhZ9OIa0Zn+P7M+pWgkCKaT53wVLSq0mrKksCID/FGHpFhRSxRGhgrQmfhRuzwtKdg=="; }; }; + "@types/cookie-0.4.0" = { + name = "_at_types_slash_cookie"; + packageName = "@types/cookie"; + version = "0.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/cookie/-/cookie-0.4.0.tgz"; + sha512 = "y7mImlc/rNkvCRmg8gC3/lj87S7pTUIJ6QGjwHR9WQJcFs+ZMTOaoPrkdFA/YdbuqVEmEbb5RdhVxMkAcgOnpg=="; + }; + }; "@types/cookiejar-2.1.2" = { name = "_at_types_slash_cookiejar"; packageName = "@types/cookiejar"; @@ -5593,6 +5620,15 @@ let sha512 = "wLhcKh3PMlyA2cNAB9sjM1BntnhPMiM0JOBwPBqttjHev2428MLEB4AYVN+d8s2iyCVZac+o41Pflm/ZH5vLXQ=="; }; }; + "@types/express-4.17.9" = { + name = "_at_types_slash_express"; + packageName = "@types/express"; + version = "4.17.9"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/express/-/express-4.17.9.tgz"; + sha512 = "SDzEIZInC4sivGIFY4Sz1GG6J9UObPwCInYJjko2jzOf/Imx/dlpume6Xxwj1ORL82tBbmN4cPDIDkLbWHk9hw=="; + }; + }; "@types/express-serve-static-core-4.17.13" = { name = "_at_types_slash_express-serve-static-core"; packageName = "@types/express-serve-static-core"; @@ -5926,6 +5962,15 @@ let sha512 = "559S2XW9YMwHznROJ4WFhZJOerJPuxLfqOX+LIKukyLo2NbVgpULwXUsrBlCwhZ4+ACHgVAE23CC3RS52lFxwA=="; }; }; + "@types/mdast-3.0.3" = { + name = "_at_types_slash_mdast"; + packageName = "@types/mdast"; + version = "3.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/mdast/-/mdast-3.0.3.tgz"; + sha512 = "SXPBMnFVQg1s00dlMCc/jCdvPqdE4mXaMMCeRlxLDmTAEoegHT53xKtkDnzDTOcmMHUfcjyf36/YYZ6SxRdnsw=="; + }; + }; "@types/mime-2.0.3" = { name = "_at_types_slash_mime"; packageName = "@types/mime"; @@ -6016,13 +6061,22 @@ let sha512 = "1GJnq7RwuFPRicMHdT53vza5v39nep9OKIbozxNUpFXP04CydcdWrqpZQ+MlVdlLFCisWnnt09xughajjWpFsw=="; }; }; - "@types/node-10.17.44" = { + "@types/node-10.12.18" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "10.17.44"; + version = "10.12.18"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-10.17.44.tgz"; - sha512 = "vHPAyBX1ffLcy4fQHmDyIUMUb42gHZjPHU66nhvbMzAWJqHnySGZ6STwN3rwrnSd1FHB0DI/RWgGELgKSYRDmw=="; + url = "https://registry.npmjs.org/@types/node/-/node-10.12.18.tgz"; + sha512 = "fh+pAqt4xRzPfqA6eh3Z2y6fyZavRIumvjhaCL753+TVkGKGhpPeyrJG2JftD0T9q4GF00KjefsQ+PQNDdWQaQ=="; + }; + }; + "@types/node-10.17.45" = { + name = "_at_types_slash_node"; + packageName = "@types/node"; + version = "10.17.45"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/node/-/node-10.17.45.tgz"; + sha512 = "a+oe0zGtwRsSDynACia/z1e4gKPNnDhAV3G6GWY6ZNCzaujNCdKC7dE2JFkGHAlUhCRHgXNmWbh417bi9dEXBw=="; }; }; "@types/node-12.7.12" = { @@ -6034,13 +6088,13 @@ let sha512 = "KPYGmfD0/b1eXurQ59fXD1GBzhSQfz6/lKBxkaHX9dKTzjXbK68Zt7yGUxUsCS1jeTy/8aL+d9JEr+S54mpkWQ=="; }; }; - "@types/node-13.13.30" = { + "@types/node-13.13.31" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "13.13.30"; + version = "13.13.31"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-13.13.30.tgz"; - sha512 = "HmqFpNzp3TSELxU/bUuRK+xzarVOAsR00hzcvM0TXrMlt/+wcSLa5q6YhTb6/cA6wqDCZLDcfd8fSL95x5h7AA=="; + url = "https://registry.npmjs.org/@types/node/-/node-13.13.31.tgz"; + sha512 = "gBk54XbcRj8EKTi7Syo4JU4purbRJaZpkvMVs7+t+b9JaOtwsGo7vCbXdVJN3gH/wu/GyZGD8lAKo0qpQuNjOw=="; }; }; "@types/node-14.11.1" = { @@ -6052,13 +6106,13 @@ let sha512 = "oTQgnd0hblfLsJ6BvJzzSL+Inogp3lq9fGgqRkMB/ziKMgEUaFl801OncOzUmalfzt14N0oPHMK47ipl+wbTIw=="; }; }; - "@types/node-14.14.7" = { + "@types/node-14.14.8" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "14.14.7"; + version = "14.14.8"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-14.14.7.tgz"; - sha512 = "Zw1vhUSQZYw+7u5dAwNbIA9TuTotpzY/OF7sJM9FqPOF3SPjKnxrjoTktXDZgUjybf4cWVBP7O8wvKdSaGHweg=="; + url = "https://registry.npmjs.org/@types/node/-/node-14.14.8.tgz"; + sha512 = "z/5Yd59dCKI5kbxauAJgw6dLPzW+TNOItNE00PkpzNwUIEwdj/Lsqwq94H5DdYBX7C13aRA0CY32BK76+neEUA=="; }; }; "@types/node-6.14.13" = { @@ -6241,13 +6295,13 @@ let sha512 = "41qEJgBH/TWgo5NFSvBCJ1qkoi3Q6ONSF2avrHq1LVEZfYpdHmj0y9SuTK+u9ZhG1sYQKBL1AWXKyLWP4RaUoQ=="; }; }; - "@types/serve-static-1.13.7" = { + "@types/serve-static-1.13.8" = { name = "_at_types_slash_serve-static"; packageName = "@types/serve-static"; - version = "1.13.7"; + version = "1.13.8"; src = fetchurl { - url = "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.13.7.tgz"; - sha512 = "3diZWucbR+xTmbDlU+FRRxBf+31OhFew7cJXML/zh9NmvSPTNoFecAwHB66BUqFgENJtqMiyl7JAwUE/siqdLw=="; + url = "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.13.8.tgz"; + sha512 = "MoJhSQreaVoL+/hurAZzIm8wafFR6ajiTM1m4A0kv6AGeVBl4r4pOV8bGFrjjq1sGxDTnCoF8i22o0/aE5XCyA=="; }; }; "@types/sizzle-2.3.2" = { @@ -6448,13 +6502,13 @@ let sha512 = "NRqD6T4gktUrDi1o1wLH3EKC1o2caCr7/wR87ODcbVITQF106OM3sFN92ysZ++wqelOd1CTzatnOBRDYYG6wGQ=="; }; }; - "@types/yargs-15.0.9" = { + "@types/yargs-15.0.10" = { name = "_at_types_slash_yargs"; packageName = "@types/yargs"; - version = "15.0.9"; + version = "15.0.10"; src = fetchurl { - url = "https://registry.npmjs.org/@types/yargs/-/yargs-15.0.9.tgz"; - sha512 = "HmU8SeIRhZCWcnRskCs36Q1Q00KBV6Cqh/ora8WN1+22dY07AZdn6Gel8QZ3t26XYPImtcL8WV/eqjhVmMEw4g=="; + url = "https://registry.npmjs.org/@types/yargs/-/yargs-15.0.10.tgz"; + sha512 = "z8PNtlhrj7eJNLmrAivM7rjBESG6JwC5xP3RVk12i/8HVP7Xnx/sEmERnRImyEuUaJfO942X0qMOYsoupaJbZQ=="; }; }; "@types/yargs-parser-15.0.0" = { @@ -6646,6 +6700,15 @@ let sha512 = "OKI6clBZqvMBlPKbH1tv3ChmkqRcyCfB6ulHqEX+9asjN5BVXs7tH7aOi+SExCNsmCVB8uJ1ZcvjuwaHsCtUeg=="; }; }; + "@uphold/request-logger-2.0.0" = { + name = "_at_uphold_slash_request-logger"; + packageName = "@uphold/request-logger"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@uphold/request-logger/-/request-logger-2.0.0.tgz"; + sha1 = "c585c0bdb94210198945c6597e4fe23d6e63e084"; + }; + }; "@vue/cli-shared-utils-4.5.9" = { name = "_at_vue_slash_cli-shared-utils"; packageName = "@vue/cli-shared-utils"; @@ -9913,13 +9976,13 @@ let sha1 = "00f35b2d27ac91b1f0d3ef2084c98cf1d1f0adc3"; }; }; - "aws-sdk-2.793.0" = { + "aws-sdk-2.794.0" = { name = "aws-sdk"; packageName = "aws-sdk"; - version = "2.793.0"; + version = "2.794.0"; src = fetchurl { - url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.793.0.tgz"; - sha512 = "zBrDkYAUadS59+GVhhVT8f7medKv2FO/3sX3QDfgHt0ySUYi4umBwp3fXjoJU2oRG70IZ74Wclx4T4tynA+Gjg=="; + url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.794.0.tgz"; + sha512 = "Qqz8v0WfeGveaZTPo9+52nNUep/CTuo18OcdCwF4WrnNBv7bAxExUOwN9XkqhoxLjBDk/LuMmHGhOXRljFQgRw=="; }; }; "aws-sign2-0.6.0" = { @@ -10606,6 +10669,15 @@ let sha1 = "780a99c84e7d600260361511c4877613bf24f6bb"; }; }; + "base-x-3.0.8" = { + name = "base-x"; + packageName = "base-x"; + version = "3.0.8"; + src = fetchurl { + url = "https://registry.npmjs.org/base-x/-/base-x-3.0.8.tgz"; + sha512 = "Rl/1AWP4J/zRrk54hhlxH4drNxPJXYUaKffODVI53/dAsV4t9fBxyxYKAVPU1XBHxYwOWP9h9H0hM2MVw4YfJA=="; + }; + }; "base32.js-0.1.0" = { name = "base32.js"; packageName = "base32.js"; @@ -10858,6 +10930,15 @@ let sha512 = "LNVkfM7ynlAD0CvPvO9cKxW8YXt1KOCRQZlRsGZWeMyymUWVdHQpZudAzH9chaFAz6HiwAnQxwDemCKDPy6Mag=="; }; }; + "bech32-1.1.4" = { + name = "bech32"; + packageName = "bech32"; + version = "1.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/bech32/-/bech32-1.1.4.tgz"; + sha512 = "s0IrSOzLlbvX7yp4WBfPITzpAU8sqQcpsmwXDiKwrG4r491vwCO/XpejasRNl0piBMe/DvP4Tz0mIS/X1DPJBQ=="; + }; + }; "beeper-1.1.1" = { name = "beeper"; packageName = "beeper"; @@ -11011,6 +11092,15 @@ let sha512 = "vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ=="; }; }; + "bignumber.js-4.1.0" = { + name = "bignumber.js"; + packageName = "bignumber.js"; + version = "4.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/bignumber.js/-/bignumber.js-4.1.0.tgz"; + sha512 = "eJzYkFYy9L4JzXsbymsFn3p54D+llV27oTQ+ziJG7WFRheJcNZilgVXMG0LoZtlQSKBsJdWtLFqOD0u+U0jZKA=="; + }; + }; "bignumber.js-9.0.0" = { name = "bignumber.js"; packageName = "bignumber.js"; @@ -11119,6 +11209,69 @@ let sha512 = "6pm+Gc3uNiiJZEv0k8JDWqQlo9ki/o9UNAkLmr0EGm7hI5MboOJVIOlO1nw3YuDkLHWN78OPsaC4JhRkn2jMLw=="; }; }; + "bintrees-1.0.1" = { + name = "bintrees"; + packageName = "bintrees"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/bintrees/-/bintrees-1.0.1.tgz"; + sha1 = "0e655c9b9c2435eaab68bf4027226d2b55a34524"; + }; + }; + "bip174-2.0.1" = { + name = "bip174"; + packageName = "bip174"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/bip174/-/bip174-2.0.1.tgz"; + sha512 = "i3X26uKJOkDTAalYAp0Er+qGMDhrbbh2o93/xiPyAN2s25KrClSpe3VXo/7mNJoqA5qfko8rLS2l3RWZgYmjKQ=="; + }; + }; + "bip32-2.0.6" = { + name = "bip32"; + packageName = "bip32"; + version = "2.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/bip32/-/bip32-2.0.6.tgz"; + sha512 = "HpV5OMLLGTjSVblmrtYRfFFKuQB+GArM0+XP8HGWfJ5vxYBqo+DesvJwOdC2WJ3bCkZShGf0QIfoIpeomVzVdA=="; + }; + }; + "bip66-1.1.5" = { + name = "bip66"; + packageName = "bip66"; + version = "1.1.5"; + src = fetchurl { + url = "https://registry.npmjs.org/bip66/-/bip66-1.1.5.tgz"; + sha1 = "01fa8748785ca70955d5011217d1b3139969ca22"; + }; + }; + "bitcoin-core-2.3.0" = { + name = "bitcoin-core"; + packageName = "bitcoin-core"; + version = "2.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/bitcoin-core/-/bitcoin-core-2.3.0.tgz"; + sha512 = "SMbw2kFu09iBajicODSE4pn/K0tOibWyqct71TlzR8cYUBk+u7rkhqGY7US2iYz0HmP851IW7F7eXfXvz09yXA=="; + }; + }; + "bitcoin-ops-1.4.1" = { + name = "bitcoin-ops"; + packageName = "bitcoin-ops"; + version = "1.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/bitcoin-ops/-/bitcoin-ops-1.4.1.tgz"; + sha512 = "pef6gxZFztEhaE9RY9HmWVmiIHqCb2OyS4HPKkpc6CIiiOa3Qmuoylxc5P2EkU3w+5eTSifI9SEZC88idAIGow=="; + }; + }; + "bitcoinjs-lib-5.2.0" = { + name = "bitcoinjs-lib"; + packageName = "bitcoinjs-lib"; + version = "5.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/bitcoinjs-lib/-/bitcoinjs-lib-5.2.0.tgz"; + sha512 = "5DcLxGUDejgNBYcieMIUfjORtUeNWl828VWLHJGVKZCb4zIS1oOySTUr0LGmcqJBQgTBz3bGbRQla4FgrdQEIQ=="; + }; + }; "bitfield-0.1.0" = { name = "bitfield"; packageName = "bitfield"; @@ -11983,6 +12136,24 @@ let sha512 = "usjDesQqZ8ihHXOnOEQuAdymBHnJEfSd+aELFSg1jN/V3iAf12HrylHlRJwIt6DTMmXpBDQ+YBg3Q3DIYdhRgQ=="; }; }; + "bs58-4.0.1" = { + name = "bs58"; + packageName = "bs58"; + version = "4.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/bs58/-/bs58-4.0.1.tgz"; + sha1 = "be161e76c354f6f788ae4071f63f34e8c4f0a42a"; + }; + }; + "bs58check-2.1.2" = { + name = "bs58check"; + packageName = "bs58check"; + version = "2.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/bs58check/-/bs58check-2.1.2.tgz"; + sha512 = "0TS1jicxdU09dwJMNZtVAfzPi6Q6QeN0pM1Fkzrjn+XYHvzMKPU3pHVpva+769iNVSfIYWf7LJ6WR+BuuMf8cA=="; + }; + }; "bser-2.1.1" = { name = "bser"; packageName = "bser"; @@ -12874,13 +13045,13 @@ let sha512 = "bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw=="; }; }; - "caniuse-lite-1.0.30001158" = { + "caniuse-lite-1.0.30001159" = { name = "caniuse-lite"; packageName = "caniuse-lite"; - version = "1.0.30001158"; + version = "1.0.30001159"; src = fetchurl { - url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001158.tgz"; - sha512 = "s5loVYY+yKpuVA3HyW8BarzrtJvwHReuzugQXlv1iR3LKSReoFXRm86mT6hT7PEF5RxW+XQZg+6nYjlywYzQ+g=="; + url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001159.tgz"; + sha512 = "w9Ph56jOsS8RL20K9cLND3u/+5WASWdhC/PPrf+V3/HsM3uHOavWOR1Xzakbv4Puo/srmPHudkmCRWM7Aq+/UA=="; }; }; "canvas-2.6.1" = { @@ -16214,6 +16385,15 @@ let sha512 = "fz4spIh+znjO2VjL+IdhEpRJ3YN6sMzITSBijk6FK2UvTqruSQW+/cCZTSNsMiZNvUeq0CqurF+dAbyiGOY6Wg=="; }; }; + "crypto-js-3.1.9-1" = { + name = "crypto-js"; + packageName = "crypto-js"; + version = "3.1.9-1"; + src = fetchurl { + url = "https://registry.npmjs.org/crypto-js/-/crypto-js-3.1.9-1.tgz"; + sha1 = "fda19e761fc077e01ffbfdc6e9fdfc59e8806cd8"; + }; + }; "crypto-random-string-1.0.0" = { name = "crypto-random-string"; packageName = "crypto-random-string"; @@ -16394,13 +16574,13 @@ let sha512 = "DMxWJg0rnz7UgxKT0Q1HU/L9BeJI0M6ksor0OgqOnF+aRCDWg/N2641HmVyU9KVIu0OVVWOb2IpC9A+BJRnejg=="; }; }; - "css-tree-1.0.1" = { + "css-tree-1.1.0" = { name = "css-tree"; packageName = "css-tree"; - version = "1.0.1"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/css-tree/-/css-tree-1.0.1.tgz"; - sha512 = "WroX+2MvsYcRGP8QA0p+rxzOniT/zpAoQ/DTKDSJzh5T3IQKUkFHeIIfgIapm2uaP178GWY3Mime1qbk8GO/tA=="; + url = "https://registry.npmjs.org/css-tree/-/css-tree-1.1.0.tgz"; + sha512 = "SKwwAnwRPotiopzQBpK4o+W6Uu8PA759iWdJ1EXy3zkj+sSUcsdhnhvdv4dy5AtjcX0OGXxS7h73YAMXu8QXBw=="; }; }; "css-what-1.0.0" = { @@ -17663,6 +17843,15 @@ let sha1 = "aa24ffb9ac3df9a2351837cfb2d279360cd78492"; }; }; + "debugnyan-1.0.0" = { + name = "debugnyan"; + packageName = "debugnyan"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/debugnyan/-/debugnyan-1.0.0.tgz"; + sha1 = "90386d5ebc2c63588f17f272be5c2a93b7665d83"; + }; + }; "decache-4.4.0" = { name = "decache"; packageName = "decache"; @@ -19301,6 +19490,15 @@ let sha512 = "1l9K4UnQQHSfKgeHeLrxnB53AidCZqPyf9dkRL4/fZl8//NPiiDD43zHtgylw8DHlO7gvM8+O5a0UPHesNYZKw=="; }; }; + "double-ended-queue-2.1.0-0" = { + name = "double-ended-queue"; + packageName = "double-ended-queue"; + version = "2.1.0-0"; + src = fetchurl { + url = "https://registry.npmjs.org/double-ended-queue/-/double-ended-queue-2.1.0-0.tgz"; + sha1 = "103d3527fd31528f40188130c841efdd78264e5c"; + }; + }; "downgrade-root-1.2.2" = { name = "downgrade-root"; packageName = "downgrade-root"; @@ -19652,13 +19850,23 @@ let sha512 = "dldq3ZfFtgVTJMLjOe+/3sROTzALlL9E34V4/sDtUd/KlBSS0s6U1/+WPE1B4sj9CXHJpL1M6rhNJnc9Wbal9w=="; }; }; - "electron-to-chromium-1.3.597" = { + "electron-to-chromium-1.3.598" = { name = "electron-to-chromium"; packageName = "electron-to-chromium"; - version = "1.3.597"; + version = "1.3.598"; src = fetchurl { - url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.597.tgz"; - sha512 = "VJI21MucKaqyFw0oe3j9BIg+nDF4MHzUZAmUwZzrxho+s8zPCD13Fds07Rgu+MTtAadO4tYTKFdAUksKYUyIJw=="; + url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.598.tgz"; + sha512 = "G5Ztk23/ubLYVPxPXnB1uu105uzIPd4xB/D8ld8x1GaSC9+vU9NZL16nYZya8H77/7CCKKN7dArzJL3pBs8N7A=="; + }; + }; + "electrum-client-git://github.com/janoside/electrum-client" = { + name = "electrum-client"; + packageName = "electrum-client"; + version = "1.1.7"; + src = fetchgit { + url = "git://github.com/janoside/electrum-client"; + rev = "d98e929028d2b05c88a41fe37652737912bead79"; + sha256 = "d6dfc396ae69eba6efa303039d6ebb46a5cd51d1b79a293f915609057b9062be"; }; }; "elegant-spinner-1.0.1" = { @@ -19959,13 +20167,13 @@ let sha512 = "b4Q85dFkGw+TqgytGPrGgACRUhsdKc9S9ErRAXpPGy/CXKs4tYoHDkvIRdsseAF7NjfVwjRFIn6KTnbw7LwJZg=="; }; }; - "engine.io-4.0.3" = { + "engine.io-4.0.4" = { name = "engine.io"; packageName = "engine.io"; - version = "4.0.3"; + version = "4.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/engine.io/-/engine.io-4.0.3.tgz"; - sha512 = "EPA9Bbn0ZHumQvW6ibggmzUQGayR0E9gLIA4RJeoXEbZ9lJYoU8HU+dM1rtCdfyDPdbocUEFaZk4Muem33oiNA=="; + url = "https://registry.npmjs.org/engine.io/-/engine.io-4.0.4.tgz"; + sha512 = "4ggUX5pICZU17OTZNFv5+uFE/ZyoK+TIXv2SvxWWX8lwStllQ6Lvvs4lDBqvKpV9EYXNcvlNOcjKChd/mo+8Tw=="; }; }; "engine.io-client-1.3.1" = { @@ -21831,6 +22039,15 @@ let sha512 = "t8HYqkuE3YEqNcyWlAfh55479aTxO+GpYwvQvJppYqyBfSmRdNIhzY2m09FKN/MENTzq4wH6heHOIvsPyMAwvQ=="; }; }; + "fast-csv-4.3.5" = { + name = "fast-csv"; + packageName = "fast-csv"; + version = "4.3.5"; + src = fetchurl { + url = "https://registry.npmjs.org/fast-csv/-/fast-csv-4.3.5.tgz"; + sha512 = "7csO4GADMDhVcf8UI5/TPdZbNkeToUx2HaRC1KPxYNWjAZ/SAFBBRJGhzlDWg0vgKm92toH6gR7+tsMcc0Fx8Q=="; + }; + }; "fast-deep-equal-1.1.0" = { name = "fast-deep-equal"; packageName = "fast-deep-equal"; @@ -22218,6 +22435,15 @@ let sha512 = "bCg29ictuBaKUwwArK4ouCaqDgLZcysCFLmM/Yn/FDoqndh/9vNuQfXRDvTuXKLxfD/JtZQGKFT8MGcJBK644g=="; }; }; + "file-entry-cache-6.0.0" = { + name = "file-entry-cache"; + packageName = "file-entry-cache"; + version = "6.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.0.tgz"; + sha512 = "fqoO76jZ3ZnYrXLDRxBR1YvOvc0k844kcOg40bgsPrE25LAb/PDqTY+ho64Xh2c8ZXgIKldchCFHczG2UVRcWA=="; + }; + }; "file-loader-6.0.0" = { name = "file-loader"; packageName = "file-loader"; @@ -22722,6 +22948,15 @@ let sha512 = "LoQe6yDuUMDzQAEH8sgmh4Md6oZnc/7PjtwjNFSzveXqSHt6ka9fPBuso7IGf9Rz4uqnSnWiFH2B/zj24a5ReA=="; }; }; + "flat-cache-3.0.4" = { + name = "flat-cache"; + packageName = "flat-cache"; + version = "3.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/flat-cache/-/flat-cache-3.0.4.tgz"; + sha512 = "dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg=="; + }; + }; "flat-tree-1.7.0" = { name = "flat-tree"; packageName = "flat-tree"; @@ -22767,6 +23002,15 @@ let sha512 = "r5wGx7YeOwNWNlCA0wQ86zKyDLMQr+/RB8xy74M4hTphfmjlijTSSXGuH8rnvKZnfT9i+75zmd8jcKdMR4O6jA=="; }; }; + "flatted-3.1.0" = { + name = "flatted"; + packageName = "flatted"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/flatted/-/flatted-3.1.0.tgz"; + sha512 = "tW+UkmtNg/jv9CSofAKvgVcO7c2URjhTdW1ZTkcAritblu8tajiYy7YisnIflEwtKssCtOxpnBRoCB7iap0/TA=="; + }; + }; "flatten-0.0.1" = { name = "flatten"; packageName = "flatten"; @@ -26945,13 +27189,13 @@ let sha512 = "O3sR1/opvCDGLEVcvrGTMtLac8GJ5IwZC4puPrLuRj3l7ICKvkmA0vGuU9OW8mV9WIBRnaxp5GJh9IEAaNOoYg=="; }; }; - "immer-7.0.14" = { + "immer-7.0.15" = { name = "immer"; packageName = "immer"; - version = "7.0.14"; + version = "7.0.15"; src = fetchurl { - url = "https://registry.npmjs.org/immer/-/immer-7.0.14.tgz"; - sha512 = "BxCs6pJwhgSEUEOZjywW7OA8DXVzfHjkBelSEl0A+nEu0+zS4cFVdNOONvt55N4WOm8Pu4xqSPYxhm1Lv2iBBA=="; + url = "https://registry.npmjs.org/immer/-/immer-7.0.15.tgz"; + sha512 = "yM7jo9+hvYgvdCQdqvhCNRRio0SCXc8xDPzA25SvKWa7b1WVPjLwQs1VYU5JPXjcJPTqAa5NP5dqpORGYBQ2AA=="; }; }; "import-cwd-3.0.0" = { @@ -27629,6 +27873,15 @@ let sha512 = "Mb6kv78bTi4RNAIIWL8Bbre7hXOR2pNUi3j8FaQkLaitf/ZWxkq3/iIwXNYk2ACO3IMfdVdQrOkUtwZblO7uBA=="; }; }; + "ip-set-2.1.0" = { + name = "ip-set"; + packageName = "ip-set"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ip-set/-/ip-set-2.1.0.tgz"; + sha512 = "JdHz4tSMx1IeFj8yEcQU0i58qiSkOlmZXkZ8+HJ0ROV5KcgLRDO9F703oJ1GeZCvqggrcCbmagD/V7hghY62wA=="; + }; + }; "ipaddr.js-0.1.3" = { name = "ipaddr.js"; packageName = "ipaddr.js"; @@ -29798,6 +30051,15 @@ let sha512 = "OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA=="; }; }; + "json-bigint-0.2.3" = { + name = "json-bigint"; + packageName = "json-bigint"; + version = "0.2.3"; + src = fetchurl { + url = "https://registry.npmjs.org/json-bigint/-/json-bigint-0.2.3.tgz"; + sha1 = "118d7f6ff1d38659f19f94cf73e64a75a3f988a8"; + }; + }; "json-buffer-2.0.11" = { name = "json-buffer"; packageName = "json-buffer"; @@ -30266,6 +30528,15 @@ let sha1 = "ed8bf0921e2f3f1ed4d5c1a44f68709ed24722c3"; }; }; + "jstransformer-markdown-it-2.1.0" = { + name = "jstransformer-markdown-it"; + packageName = "jstransformer-markdown-it"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/jstransformer-markdown-it/-/jstransformer-markdown-it-2.1.0.tgz"; + sha1 = "69ec30ce4518bed5997b38f027648e8c285e92f7"; + }; + }; "jszip-2.6.1" = { name = "jszip"; packageName = "jszip"; @@ -30726,13 +30997,13 @@ let sha512 = "wRJ9I4az0QcsH7A4v4l0enUpkS++MBx0BnL/68KaLzJg7x1qmbjSlwEoCNol7KTYZ+pmtI7Eh2J0Nu6/2Z5J/Q=="; }; }; - "known-css-properties-0.19.0" = { + "known-css-properties-0.20.0" = { name = "known-css-properties"; packageName = "known-css-properties"; - version = "0.19.0"; + version = "0.20.0"; src = fetchurl { - url = "https://registry.npmjs.org/known-css-properties/-/known-css-properties-0.19.0.tgz"; - sha512 = "eYboRV94Vco725nKMlpkn3nV2+96p9c3gKXRsYqAJSswSENvBhN7n5L+uDhY58xQa0UukWsDMTGELzmD8Q+wTA=="; + url = "https://registry.npmjs.org/known-css-properties/-/known-css-properties-0.20.0.tgz"; + sha512 = "URvsjaA9ypfreqJ2/ylDr5MUERhJZ+DhguoWRr2xgS5C7aGCalXo+ewL+GixgKBfhT2vuL02nbIgNGqVWgTOYw=="; }; }; "known-css-properties-0.5.0" = { @@ -31491,13 +31762,13 @@ let sha512 = "8UyQoYmdRDy81Brz6aLAUhfZLwr5zV0L3taTQ4hju7m6biuwiWiJXjPhBJxbUQJA8PrkvJ/7Enqmwk2sM14soA=="; }; }; - "load-ip-set-2.1.1" = { + "load-ip-set-2.1.2" = { name = "load-ip-set"; packageName = "load-ip-set"; - version = "2.1.1"; + version = "2.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/load-ip-set/-/load-ip-set-2.1.1.tgz"; - sha512 = "LC7BWnATJOrKZa94qKNU8I/cWvVCgHPGSEMZ9hNCd3C5Th+XIUuU5lws6KhCK9QYeSD2xADnLUzkUbzYaRJ/lQ=="; + url = "https://registry.npmjs.org/load-ip-set/-/load-ip-set-2.1.2.tgz"; + sha512 = "AgO3AGwWPru+tJboq0l2+hIkFqbAE3tbG74z2SCpt+c3h0PFI3t2mHamS707OzSc3b+GBVBKjZxPFz97YZNisA=="; }; }; "load-json-file-1.1.0" = { @@ -32220,6 +32491,15 @@ let sha1 = "995ee0dc18c1b48cc92effae71a10aab5b487698"; }; }; + "lodash.escaperegexp-4.1.2" = { + name = "lodash.escaperegexp"; + packageName = "lodash.escaperegexp"; + version = "4.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.escaperegexp/-/lodash.escaperegexp-4.1.2.tgz"; + sha1 = "64762c48618082518ac3df4ccf5d5886dae20347"; + }; + }; "lodash.filter-4.6.0" = { name = "lodash.filter"; packageName = "lodash.filter"; @@ -32436,6 +32716,15 @@ let sha1 = "2cfd575c73e498ab57e319b77fa02adef13a94d1"; }; }; + "lodash.isfunction-3.0.9" = { + name = "lodash.isfunction"; + packageName = "lodash.isfunction"; + version = "3.0.9"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.isfunction/-/lodash.isfunction-3.0.9.tgz"; + sha512 = "AirXNj15uRIMMPihnkInB4i3NHeb4iBtNg9WRWuK2o31S+ePwwNmDPaTL3o7dTJ+VXNZim7rFs4rxN4YU1oUJw=="; + }; + }; "lodash.isinteger-4.0.4" = { name = "lodash.isinteger"; packageName = "lodash.isinteger"; @@ -32463,6 +32752,15 @@ let sha1 = "756cb5150ca3ba6f11085a78849645f188f85f37"; }; }; + "lodash.isnil-4.0.0" = { + name = "lodash.isnil"; + packageName = "lodash.isnil"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.isnil/-/lodash.isnil-4.0.0.tgz"; + sha1 = "49e28cd559013458c814c5479d3c663a21bfaa6c"; + }; + }; "lodash.isnumber-3.0.3" = { name = "lodash.isnumber"; packageName = "lodash.isnumber"; @@ -32508,6 +32806,15 @@ let sha1 = "d527dfb5456eca7cc9bb95d5daeaf88ba54a5451"; }; }; + "lodash.isundefined-3.0.1" = { + name = "lodash.isundefined"; + packageName = "lodash.isundefined"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.isundefined/-/lodash.isundefined-3.0.1.tgz"; + sha1 = "23ef3d9535565203a66cefd5b830f848911afb48"; + }; + }; "lodash.iteratee-4.7.0" = { name = "lodash.iteratee"; packageName = "lodash.iteratee"; @@ -34128,6 +34435,24 @@ let sha512 = "7GlnT24gEwDrdAwEHrU4Vv5lLWrEer4KOkAiKT9nYstsTad7Oc1TwqT2zIMKRdZF7cTuaf+GA1E4Kv7jJh8mPA=="; }; }; + "mdast-util-from-markdown-0.8.1" = { + name = "mdast-util-from-markdown"; + packageName = "mdast-util-from-markdown"; + version = "0.8.1"; + src = fetchurl { + url = "https://registry.npmjs.org/mdast-util-from-markdown/-/mdast-util-from-markdown-0.8.1.tgz"; + sha512 = "qJXNcFcuCSPqUF0Tb0uYcFDIq67qwB3sxo9RPdf9vG8T90ViKnksFqdB/Coq2a7sTnxL/Ify2y7aIQXDkQFH0w=="; + }; + }; + "mdast-util-to-markdown-0.5.3" = { + name = "mdast-util-to-markdown"; + packageName = "mdast-util-to-markdown"; + version = "0.5.3"; + src = fetchurl { + url = "https://registry.npmjs.org/mdast-util-to-markdown/-/mdast-util-to-markdown-0.5.3.tgz"; + sha512 = "sr8q7fQJ1xoCqZSXW6dO/MYu2Md+a4Hfk9uO+XHCfiBhVM0EgWtfAV7BuN+ff6otUeu2xDyt1o7vhZGwOG3+BA=="; + }; + }; "mdast-util-to-nlcst-4.0.1" = { name = "mdast-util-to-nlcst"; packageName = "mdast-util-to-nlcst"; @@ -34137,6 +34462,15 @@ let sha512 = "Y4ffygj85MTt70STKnEquw6k73jYWJBaYcb4ITAKgSNokZF7fH8rEHZ1GsRY/JaxqUevMaEnsDmkVv5Z9uVRdg=="; }; }; + "mdast-util-to-string-1.1.0" = { + name = "mdast-util-to-string"; + packageName = "mdast-util-to-string"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/mdast-util-to-string/-/mdast-util-to-string-1.1.0.tgz"; + sha512 = "jVU0Nr2B9X3MU4tSK7JP1CMkSvOj7X5l/GboG1tKRw52lLF1x2Ju92Ms9tNetCcbfX3hzlM73zYo2NKkWSfF/A=="; + }; + }; "mdmanifest-1.0.8" = { name = "mdmanifest"; packageName = "mdmanifest"; @@ -34155,13 +34489,13 @@ let sha512 = "yjM/OG0krZIgi+XrhJWS3CJ9UQuGM4FfjIUIt2f65er6qczkM+WjtNEv/9ZF9DxDs/2GR3SO6hDaZLplTRrrfw=="; }; }; - "mdn-data-2.0.12" = { + "mdn-data-2.0.14" = { name = "mdn-data"; packageName = "mdn-data"; - version = "2.0.12"; + version = "2.0.14"; src = fetchurl { - url = "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.12.tgz"; - sha512 = "ULbAlgzVb8IqZ0Hsxm6hHSlQl3Jckst2YEQS7fODu9ilNWy2LvcoSY7TRFIktABP2mdppBioc66va90T+NUs8Q=="; + url = "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.14.tgz"; + sha512 = "dn6wd0uw5GsdswPFfsgMp5NSB0/aDe6fK94YJV/AJDYXL6HVLWBsxeq7js7Ad+mU2K9LAlwpk6kN2D5mwCPVow=="; }; }; "mdn-data-2.0.4" = { @@ -34533,6 +34867,15 @@ let sha512 = "8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg=="; }; }; + "merkle-lib-2.0.10" = { + name = "merkle-lib"; + packageName = "merkle-lib"; + version = "2.0.10"; + src = fetchurl { + url = "https://registry.npmjs.org/merkle-lib/-/merkle-lib-2.0.10.tgz"; + sha1 = "82b8dbae75e27a7785388b73f9d7725d0f6f3326"; + }; + }; "merkle-tree-stream-3.0.3" = { name = "merkle-tree-stream"; packageName = "merkle-tree-stream"; @@ -34704,6 +35047,15 @@ let sha512 = "jo1OfR4TaEwd5HOrt5+tAZ9mqT4jmpNAusXtyfNzqVm9uiSYFZlKM1wYL4oU7azZW/PxQW53wM0S6OR1JHNa2g=="; }; }; + "micromark-2.10.1" = { + name = "micromark"; + packageName = "micromark"; + version = "2.10.1"; + src = fetchurl { + url = "https://registry.npmjs.org/micromark/-/micromark-2.10.1.tgz"; + sha512 = "fUuVF8sC1X7wsCS29SYQ2ZfIZYbTymp0EYr6sab3idFjigFFjGa5UwoniPlV9tAgntjuapW1t9U+S0yDYeGKHQ=="; + }; + }; "micromatch-2.3.11" = { name = "micromatch"; packageName = "micromatch"; @@ -35469,6 +35821,15 @@ let sha1 = "359a19ec634cda3c706c8709adda54c0329aaec4"; }; }; + "moment-duration-format-2.3.2" = { + name = "moment-duration-format"; + packageName = "moment-duration-format"; + version = "2.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/moment-duration-format/-/moment-duration-format-2.3.2.tgz"; + sha512 = "cBMXjSW+fjOb4tyaVHuaVE/A5TqkukDWiOfxxAjY+PEqmmBQlLwn+8OzwPiG3brouXKY5Un4pBjAeB6UToXHaQ=="; + }; + }; "moment-mini-2.24.0" = { name = "moment-mini"; packageName = "moment-mini"; @@ -35577,13 +35938,13 @@ let sha512 = "NOeCoW6AYc3hLi30npe7uzbD9b4FQZKH40YKABUCCvaKKL5agj6YzvHoNx8jQpDMNPgIa5bvSZQbQpWBAVD0Kw=="; }; }; - "mqtt-4.2.4" = { + "mqtt-4.2.5" = { name = "mqtt"; packageName = "mqtt"; - version = "4.2.4"; + version = "4.2.5"; src = fetchurl { - url = "https://registry.npmjs.org/mqtt/-/mqtt-4.2.4.tgz"; - sha512 = "g3tJt5UOS1Wqn/xntl4JhlJW51OM8CvgEmY8cwZ1zecE5G7uuwjSUUvgGeVDiEMWJ5vXCfZz2VMCQGNvKhzfEQ=="; + url = "https://registry.npmjs.org/mqtt/-/mqtt-4.2.5.tgz"; + sha512 = "l19iRa4en8qM19xYCsdkt2VWg/JPTQTUL0Gq//p1rRUSEBxywicylfGZQy4Ru2Pl/nN5gI0q5E66DIVybGSaRg=="; }; }; "mqtt-packet-6.6.0" = { @@ -36721,13 +37082,13 @@ let sha512 = "iEOqDAOFl6uN5jZGRj39Jdo8qALzf2HPXtpFso8+BMaDylDrUMYMwhFbfYGgxdnMlsRnxYTwv68kaXEpsHIapg=="; }; }; - "node-abi-2.19.1" = { + "node-abi-2.19.3" = { name = "node-abi"; packageName = "node-abi"; - version = "2.19.1"; + version = "2.19.3"; src = fetchurl { - url = "https://registry.npmjs.org/node-abi/-/node-abi-2.19.1.tgz"; - sha512 = "HbtmIuByq44yhAzK7b9j/FelKlHYISKQn0mtvcBrU5QBkhoCMp5bu8Hv5AI34DcKfOAcJBcOEMwLlwO62FFu9A=="; + url = "https://registry.npmjs.org/node-abi/-/node-abi-2.19.3.tgz"; + sha512 = "9xZrlyfvKhWme2EXFKQhZRp1yNWT/uI1luYPr3sFl+H4keYY4xR+1jO7mvTTijIsHf1M+QDe9uWuKeEpLInIlg=="; }; }; "node-addon-api-1.7.2" = { @@ -38514,13 +38875,13 @@ let sha512 = "TbgwwOnlatb+xSYh/XALQjrVO3dirVNXuONR6CLQHVI/i1e+nq/ubW8I5i6rlGpnFLZNZKXZ0gF7RMvjLBk8ow=="; }; }; - "openapi-framework-7.1.0" = { + "openapi-framework-7.2.0" = { name = "openapi-framework"; packageName = "openapi-framework"; - version = "7.1.0"; + version = "7.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/openapi-framework/-/openapi-framework-7.1.0.tgz"; - sha512 = "GB1TUdv51fYKdvzy0Xg3fLtsuHXJY0v0PR6XGjdSKgxLYK8PA1/dQfxtTRftzx7XVI6uMegdG8aCAPwYTsypWQ=="; + url = "https://registry.npmjs.org/openapi-framework/-/openapi-framework-7.2.0.tgz"; + sha512 = "rC4U+SIBVxoTujSIrk84PMquBwkNJfhYC7KTTDUUc7yfIyMVKRat5TOuMDyc49Ovsv+7bdkx1stf7d0N9LbtLg=="; }; }; "openapi-jsonschema-parameters-1.2.0" = { @@ -38568,13 +38929,13 @@ let sha512 = "ukdX4T8heEI2GudiqDkk8hwfZhZP7zAz8zwngTyHtI0ZRUuU76+Zix8LVfrvSTZ2RpsPClKmYU2kDU4YZqdRHg=="; }; }; - "openapi-request-validator-7.0.2" = { + "openapi-request-validator-7.2.0" = { name = "openapi-request-validator"; packageName = "openapi-request-validator"; - version = "7.0.2"; + version = "7.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/openapi-request-validator/-/openapi-request-validator-7.0.2.tgz"; - sha512 = "0JV3gdHNqJgcHwgojPj2f6RqUI02uHI5yUBcKAtLhvQ9tkrgcVTAHdengPyfoLT35NDRWhhQuc8VhS/mUtFI0g=="; + url = "https://registry.npmjs.org/openapi-request-validator/-/openapi-request-validator-7.2.0.tgz"; + sha512 = "LgXvKco6XR5SKr8QBaM6v0++QXY5MP2yvvKv0Ckutef3css9MAyIcokDsBj6DYYzNnjmFxPx4ntuY7CZTC2ZFA=="; }; }; "openapi-response-validator-4.0.0" = { @@ -41908,13 +42269,13 @@ let sha512 = "uHosRn0y+1wbnlYKrqMjBPoo/kK5LPYImLtiETszNFYfFwAD3cQdD1R2E13Mh5icBxkHj+yKtlIHozCsmVWD/Q=="; }; }; - "posthtml-render-1.3.0" = { + "posthtml-render-1.4.0" = { name = "posthtml-render"; packageName = "posthtml-render"; - version = "1.3.0"; + version = "1.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/posthtml-render/-/posthtml-render-1.3.0.tgz"; - sha512 = "km+kuwydlc2lnx4FnHmTwejGtgmfjBT2fOqu9mDTJUoNecwwMnx4soRxngfJ1Qvpa/OLu1YIqZ+/0OiJDOnCzg=="; + url = "https://registry.npmjs.org/posthtml-render/-/posthtml-render-1.4.0.tgz"; + sha512 = "W1779iVHGfq0Fvh2PROhCe2QhB8mEErgqzo1wpIt36tCgChafP+hbXIhLDOM8ePJrZcFs0vkNEtdibEWVqChqw=="; }; }; "prebuild-install-5.3.0" = { @@ -42367,6 +42728,15 @@ let sha512 = "JymvIR4IJ0qTyma7ExefBeJGp2IGaXYGWv8Z//Jq+AhrCd0uKlMPK9IWJ0LL6zbXbAN8fhLe1TL1hl1ZKOljDw=="; }; }; + "prom-client-11.5.3" = { + name = "prom-client"; + packageName = "prom-client"; + version = "11.5.3"; + src = fetchurl { + url = "https://registry.npmjs.org/prom-client/-/prom-client-11.5.3.tgz"; + sha512 = "iz22FmTbtkyL2vt0MdDFY+kWof+S9UB/NACxSn2aJcewtw+EERsen0urSkZ2WrHseNdydsvcxCTAnPcSMZZv4Q=="; + }; + }; "promiscuous-0.6.0" = { name = "promiscuous"; packageName = "promiscuous"; @@ -42844,6 +43214,15 @@ let sha512 = "GMu3M5nUL3fju4/egXwZO0XLi6fW/K3T3VTgFQ14GxNi8btlxgT5qZL//JwZFm/2Fa64J/PNS8AZeys3wiMkVA=="; }; }; + "puka-1.0.1" = { + name = "puka"; + packageName = "puka"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/puka/-/puka-1.0.1.tgz"; + sha512 = "ssjRZxBd7BT3dte1RR3VoeT2cT/ODH8x+h0rUF1rMqB0srHYf48stSDWfiYakTp5UBZMxroZhB2+ExLDHm7W3g=="; + }; + }; "pull-abortable-4.0.0" = { name = "pull-abortable"; packageName = "pull-abortable"; @@ -43465,6 +43844,15 @@ let sha512 = "pdE/OKi/jnp9DqGgNRzLY0oVHffn/8TXJmBPzv+ikdvpkeA0J//l5d7TZk1yWwZj9P0JcOIEVDOuHzhXaeBlmw=="; }; }; + "pushdata-bitcoin-1.0.1" = { + name = "pushdata-bitcoin"; + packageName = "pushdata-bitcoin"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/pushdata-bitcoin/-/pushdata-bitcoin-1.0.1.tgz"; + sha1 = "15931d3cd967ade52206f523aa7331aef7d43af7"; + }; + }; "q-0.9.7" = { name = "q"; packageName = "q"; @@ -43510,6 +43898,15 @@ let sha512 = "8YOJEHtxpySA3fFDyCRxA+UUV+fA+rTWnuWvylOK/NCjhY+b4ocCtmu8TtsWb+mYeU+GCHf/S66KZF/AsteKHg=="; }; }; + "qrcode-1.4.4" = { + name = "qrcode"; + packageName = "qrcode"; + version = "1.4.4"; + src = fetchurl { + url = "https://registry.npmjs.org/qrcode/-/qrcode-1.4.4.tgz"; + sha512 = "oLzEC5+NKFou9P0bMj5+v6Z40evexeE29Z9cummZXZ9QXyMr3lphkURzxjXgPJC5azpxcshoDWV1xE46z+/c3Q=="; + }; + }; "qrcode-terminal-0.11.0" = { name = "qrcode-terminal"; packageName = "qrcode-terminal"; @@ -44608,6 +45005,33 @@ let sha1 = "8984b5815d99cb220469c99eeeffe38913e6cc0b"; }; }; + "redis-2.8.0" = { + name = "redis"; + packageName = "redis"; + version = "2.8.0"; + src = fetchurl { + url = "https://registry.npmjs.org/redis/-/redis-2.8.0.tgz"; + sha512 = "M1OkonEQwtRmZv4tEWF2VgpG0JWJ8Fv1PhlgT5+B+uNq2cA3Rt1Yt/ryoR+vQNOQcIEgdCdfH0jr3bDpihAw1A=="; + }; + }; + "redis-commands-1.6.0" = { + name = "redis-commands"; + packageName = "redis-commands"; + version = "1.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/redis-commands/-/redis-commands-1.6.0.tgz"; + sha512 = "2jnZ0IkjZxvguITjFTrGiLyzQZcTvaw8DAaCXxZq/dsHXz7KfMQ3OUJy7Tz9vnRtZRVz6VRCPDvruvU8Ts44wQ=="; + }; + }; + "redis-parser-2.6.0" = { + name = "redis-parser"; + packageName = "redis-parser"; + version = "2.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/redis-parser/-/redis-parser-2.6.0.tgz"; + sha1 = "52ed09dacac108f1a631c07e9b69941e7a19504b"; + }; + }; "redoc-2.0.0-rc.47" = { name = "redoc"; packageName = "redoc"; @@ -44923,13 +45347,13 @@ let sha512 = "b7wGPo7o2KE/g7SqkJDDbav6zmrEeP4TK2VpITU72J/M949TLe/23y/ZHJo+pskcGM52xIfFoT9hydwmgr1AEg=="; }; }; - "remark-12.0.1" = { + "remark-13.0.0" = { name = "remark"; packageName = "remark"; - version = "12.0.1"; + version = "13.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/remark/-/remark-12.0.1.tgz"; - sha512 = "gS7HDonkdIaHmmP/+shCPejCEEW+liMp/t/QwmF0Xt47Rpuhl32lLtDV1uKWvGoq+kxr5jSgg5oAIpGuyULjUw=="; + url = "https://registry.npmjs.org/remark/-/remark-13.0.0.tgz"; + sha512 = "HDz1+IKGtOyWN+QgBiAT0kn+2s6ovOxHyPAFGKVE81VSzJ+mq7RwHFledEvB5F1p4iJvOah/LOKdFuzvRnNLCA=="; }; }; "remark-3.2.3" = { @@ -45022,6 +45446,15 @@ let sha512 = "E1K9+QLGgggHxCQtLt++uXltxEprmWzNfg+MxpfHsZlrddKzZ/hZyWHDbK3/Ap8HJQqYJRXP+jHczdL6q6i85Q=="; }; }; + "remark-parse-9.0.0" = { + name = "remark-parse"; + packageName = "remark-parse"; + version = "9.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/remark-parse/-/remark-parse-9.0.0.tgz"; + sha512 = "geKatMwSzEXKHuzBNU1z676sGcDcFoChMK38TgdHJNAYfFtsfHDQG7MoJAjs6sgYMqyLduCYWDIWZIxiPeafEw=="; + }; + }; "remark-retext-4.0.0" = { name = "remark-retext"; packageName = "remark-retext"; @@ -45049,6 +45482,15 @@ let sha512 = "q4EyPZT3PcA3Eq7vPpT6bIdokXzFGp9i85igjmhRyXWmPs0Y6/d2FYwUNotKAWyLch7g0ASZJn/KHHcHZQ163A=="; }; }; + "remark-stringify-9.0.0" = { + name = "remark-stringify"; + packageName = "remark-stringify"; + version = "9.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/remark-stringify/-/remark-stringify-9.0.0.tgz"; + sha512 = "8x29DpTbVzEc6Dwb90qhxCtbZ6hmj3BxWWDpMhA+1WM4dOEGH5U5/GFe3Be5Hns5MvPSFAr1e2KSVtKZkK5nUw=="; + }; + }; "remote-git-tags-3.0.0" = { name = "remote-git-tags"; packageName = "remote-git-tags"; @@ -45949,13 +46391,13 @@ let sha512 = "/2HA0Ec70TvQnXdzynFffkjA6XN+1e2pEv/uKS5Ulca40g2L7KuOE3riasHoNVHOsFD5KKZgDsMk1CP3Tw9s+A=="; }; }; - "rollup-2.33.2" = { + "rollup-2.33.3" = { name = "rollup"; packageName = "rollup"; - version = "2.33.2"; + version = "2.33.3"; src = fetchurl { - url = "https://registry.npmjs.org/rollup/-/rollup-2.33.2.tgz"; - sha512 = "QPQ6/fWCrzHtSXkI269rhKaC7qXGghYBwXU04b1JsDZ6ibZa3DJ9D1SFAYRMgx1inDg0DaTbb3N4Z1NK/r3fhw=="; + url = "https://registry.npmjs.org/rollup/-/rollup-2.33.3.tgz"; + sha512 = "RpayhPTe4Gu/uFGCmk7Gp5Z9Qic2VsqZ040G+KZZvsZYdcuWaJg678JeDJJvJeEQXminu24a2au+y92CUWVd+w=="; }; }; "rollup-plugin-babel-4.4.0" = { @@ -47047,13 +47489,13 @@ let sha1 = "f13bf928e42b9c3e79383e61cc3998b5d14e6cdd"; }; }; - "service-runner-2.7.8" = { + "service-runner-2.8.0" = { name = "service-runner"; packageName = "service-runner"; - version = "2.7.8"; + version = "2.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/service-runner/-/service-runner-2.7.8.tgz"; - sha512 = "YZBOj9wRzWEiBgIfrvq7OFVf9wr0u/llyeIsZjrd6tyrjJz2ywB9DiGpWb7/+MVswi970bgAw6+OUCq+9luyuw=="; + url = "https://registry.npmjs.org/service-runner/-/service-runner-2.8.0.tgz"; + sha512 = "U5hxzVsLFxZgd3hLecTgdhKNZfTsjcp0407ceICGdC5X2Qrz31pHsoMMSH1s+9/Fac+Y3NKpgd6vPvmJvl/bvw=="; }; }; "set-blocking-1.0.0" = { @@ -49459,6 +49901,15 @@ let sha1 = "51f9c6a08c146473fcd021af551c9f32ed5c7b9d"; }; }; + "standard-error-1.1.0" = { + name = "standard-error"; + packageName = "standard-error"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/standard-error/-/standard-error-1.1.0.tgz"; + sha1 = "23e5168fa1c0820189e5812701a79058510d0d34"; + }; + }; "stat-mode-0.2.2" = { name = "stat-mode"; packageName = "stat-mode"; @@ -50530,13 +50981,13 @@ let sha512 = "7GlLk9JwlElY4Y6a/rmbH2MhVlTyVmiJd1PfTCqFaIBEGMYNsrO/v3SeGTdhBThLg4Z+NbOk/qFMwCa+J+3p/g=="; }; }; - "stylelint-13.7.2" = { + "stylelint-13.8.0" = { name = "stylelint"; packageName = "stylelint"; - version = "13.7.2"; + version = "13.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/stylelint/-/stylelint-13.7.2.tgz"; - sha512 = "mmieorkfmO+ZA6CNDu1ic9qpt4tFvH2QUB7vqXgrMVHe5ENU69q7YDq0YUg/UHLuCsZOWhUAvcMcLzLDIERzSg=="; + url = "https://registry.npmjs.org/stylelint/-/stylelint-13.8.0.tgz"; + sha512 = "iHH3dv3UI23SLDrH4zMQDjLT9/dDIz/IpoFeuNxZmEx86KtfpjDOscxLTFioQyv+2vQjPlRZnK0UoJtfxLICXQ=="; }; }; "stylelint-8.4.0" = { @@ -51350,6 +51801,15 @@ let sha1 = "9450e8768c83b416fd4d1a6a9449eeccbf496c29"; }; }; + "tdigest-0.1.1" = { + name = "tdigest"; + packageName = "tdigest"; + version = "0.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/tdigest/-/tdigest-0.1.1.tgz"; + sha1 = "2e3cb2c39ea449e55d1e6cd91117accca4588021"; + }; + }; "telegraf-3.38.0" = { name = "telegraf"; packageName = "telegraf"; @@ -51989,6 +52449,15 @@ let sha512 = "pkY1fj1cKHb2seWDy0B16HeWyczlJA9/WW3u3c4z/NiWDsO3DOU5D7nhTLE9CF0yXv/QZFY7sEJmj24dK+Rrqw=="; }; }; + "tiny-secp256k1-1.1.5" = { + name = "tiny-secp256k1"; + packageName = "tiny-secp256k1"; + version = "1.1.5"; + src = fetchurl { + url = "https://registry.npmjs.org/tiny-secp256k1/-/tiny-secp256k1-1.1.5.tgz"; + sha512 = "duE2hSLSQIpHGzmK48OgRrGTi+4OTkXLC6aa86uOYQ6LLCYZSarVKIAvEtY7MoXjoL6bOXMSerEGMzrvW4SkDw=="; + }; + }; "tinycolor-0.0.1" = { name = "tinycolor"; packageName = "tinycolor"; @@ -53276,6 +53745,15 @@ let sha512 = "zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q=="; }; }; + "typeforce-1.18.0" = { + name = "typeforce"; + packageName = "typeforce"; + version = "1.18.0"; + src = fetchurl { + url = "https://registry.npmjs.org/typeforce/-/typeforce-1.18.0.tgz"; + sha512 = "7uc1O8h1M1g0rArakJdf0uLRSSgFcYexrVoKo+bzJd32gd4gDy2L/Z+8/FjPnU9ydY3pEnVPtr9FyscYY60K1g=="; + }; + }; "typescript-2.9.2" = { name = "typescript"; packageName = "typescript"; @@ -53420,15 +53898,6 @@ let sha1 = "29c5733148057bb4e1f75df35b7a9cb72e6a59dd"; }; }; - "uglify-js-3.11.4" = { - name = "uglify-js"; - packageName = "uglify-js"; - version = "3.11.4"; - src = fetchurl { - url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.11.4.tgz"; - sha512 = "FyYnoxVL1D6+jDGQpbK5jW6y/2JlVfRfEeQ67BPCUg5wfCjaKOpr2XeceE4QL+MkhxliLtf5EbrMDZgzpt2CNw=="; - }; - }; "uglify-js-3.11.6" = { name = "uglify-js"; packageName = "uglify-js"; @@ -55194,6 +55663,15 @@ let sha512 = "lKxKYG6H03yCZUpAGOPOsMcGxd1RHCu1iKvEHYDPmTyq2HueGhD73ssNBqqQWfvYs04G9iUFRvmAVLW20Jw6ow=="; }; }; + "varuint-bitcoin-1.1.2" = { + name = "varuint-bitcoin"; + packageName = "varuint-bitcoin"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/varuint-bitcoin/-/varuint-bitcoin-1.1.2.tgz"; + sha512 = "4EVb+w4rx+YfVM32HQX42AbbT7/1f5zwAYhIujKXKk8NQK+JfRVl3pqT3hjNn/L+RstigmGGKVwHA/P0wgITZw=="; + }; + }; "vary-1.1.2" = { name = "vary"; packageName = "vary"; @@ -56229,6 +56707,15 @@ let sha512 = "NlKJyGcET/ZBCCLBYIPaGo2c37R03bPYeWXozUtnjyye7+9dhlbMSODyoG2INcQf8zFmB4qhm2UOJjgYEgPCNA=="; }; }; + "vscode-languageserver-types-3.16.0-next.5" = { + name = "vscode-languageserver-types"; + packageName = "vscode-languageserver-types"; + version = "3.16.0-next.5"; + src = fetchurl { + url = "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.16.0-next.5.tgz"; + sha512 = "lf8Y1XXMtF1r2oDDAmJe+drizNXkybSRXAQQk5dPy2rYJsY9SPXYNO074L3THu9zNYepzV5fRJZUPo/V/TLBRQ=="; + }; + }; "vscode-languageserver-types-3.5.0" = { name = "vscode-languageserver-types"; packageName = "vscode-languageserver-types"; @@ -57039,6 +57526,15 @@ let sha512 = "NsmoXalsWVDMGupxZ5R08ka9flZjjiLvHVAWYOKtiKM8ujtZWr9cRffak+uSE48+Ob8ObalXpwyeUiyDD6QFgg=="; }; }; + "wif-2.0.6" = { + name = "wif"; + packageName = "wif"; + version = "2.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/wif/-/wif-2.0.6.tgz"; + sha1 = "08d3f52056c66679299726fade0d432ae74b4704"; + }; + }; "wikimedia-langconv-0.1.0" = { name = "wikimedia-langconv"; packageName = "wikimedia-langconv"; @@ -58768,6 +59264,15 @@ let sha1 = "66c6de82cc36b09734b820703776490a6fbbe624"; }; }; + "zwitch-1.0.5" = { + name = "zwitch"; + packageName = "zwitch"; + version = "1.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/zwitch/-/zwitch-1.0.5.tgz"; + sha512 = "V50KMwwzqJV0NpZIZFwfOD5/lyny3WlSzRiXgA0G7VUnRlqttta1L6UQIHzd6EuBY/cHGfwTIck7w1yH6Q5zUw=="; + }; + }; "zxcvbn-4.4.2" = { name = "zxcvbn"; packageName = "zxcvbn"; @@ -59665,7 +60170,7 @@ in sources."@types/estree-0.0.45" sources."@types/json-schema-7.0.6" sources."@types/json5-0.0.29" - sources."@types/node-14.14.7" + sources."@types/node-14.14.8" sources."@types/parse-json-4.0.0" sources."@types/source-list-map-0.1.2" sources."@types/tapable-1.0.6" @@ -59716,7 +60221,7 @@ in sources."browserslist-4.14.7" sources."buffer-from-1.1.1" sources."callsites-3.1.0" - sources."caniuse-lite-1.0.30001158" + sources."caniuse-lite-1.0.30001159" sources."chalk-3.0.0" sources."chardet-0.7.0" sources."chokidar-3.4.3" @@ -59737,7 +60242,7 @@ in sources."cross-spawn-7.0.3" sources."deepmerge-4.2.2" sources."defaults-1.0.3" - sources."electron-to-chromium-1.3.597" + sources."electron-to-chromium-1.3.598" sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" sources."enhanced-resolve-4.3.0" @@ -59980,7 +60485,7 @@ in sources."@apollo/federation-0.20.4" (sources."@apollo/protobufjs-1.0.5" // { dependencies = [ - sources."@types/node-10.17.44" + sources."@types/node-10.17.45" ]; }) sources."@apollographql/apollo-tools-0.4.8" @@ -60296,7 +60801,7 @@ in sources."@types/long-4.0.1" sources."@types/mime-2.0.3" sources."@types/minimatch-3.0.3" - sources."@types/node-14.14.7" + sources."@types/node-14.14.8" (sources."@types/node-fetch-2.5.7" // { dependencies = [ sources."form-data-3.0.0" @@ -60305,7 +60810,7 @@ in sources."@types/normalize-package-data-2.4.0" sources."@types/qs-6.9.5" sources."@types/range-parser-1.2.3" - sources."@types/serve-static-1.13.7" + sources."@types/serve-static-1.13.8" sources."@types/through-0.0.30" sources."@types/ws-7.4.0" sources."@types/zen-observable-0.8.1" @@ -60537,7 +61042,7 @@ in sources."callsites-2.0.0" sources."camel-case-4.1.1" sources."camelcase-4.1.0" - sources."caniuse-lite-1.0.30001158" + sources."caniuse-lite-1.0.30001159" sources."capital-case-1.0.3" sources."capture-stack-trace-1.0.1" sources."cardinal-2.1.1" @@ -60746,7 +61251,7 @@ in sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" sources."ejs-2.7.4" - sources."electron-to-chromium-1.3.597" + sources."electron-to-chromium-1.3.598" sources."elegant-spinner-1.0.1" sources."emoji-regex-8.0.0" sources."emojis-list-3.0.0" @@ -62159,7 +62664,7 @@ in dependencies = [ sources."@types/glob-7.1.3" sources."@types/minimatch-3.0.3" - sources."@types/node-14.14.7" + sources."@types/node-14.14.8" sources."balanced-match-1.0.0" sources."brace-expansion-1.1.11" sources."chromium-pickle-js-0.2.0" @@ -62707,6 +63212,451 @@ in bypassCache = true; reconstructLock = true; }; + btc-rpc-explorer = nodeEnv.buildNodePackage { + name = "btc-rpc-explorer"; + packageName = "btc-rpc-explorer"; + version = "2.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/btc-rpc-explorer/-/btc-rpc-explorer-2.0.2.tgz"; + sha512 = "TTdFGXzJ8HLn4PCNYRS4S7P3SgglZkBtJeNQP8r7tTjbugoameVvzDOLgVAy/zPQVoUXBuBPfnbm4Sky9VJOmw=="; + }; + dependencies = [ + sources."@types/babel-types-7.0.9" + sources."@types/babylon-6.16.5" + sources."@types/node-10.12.18" + sources."@uphold/request-logger-2.0.0" + sources."accepts-1.3.7" + sources."acorn-3.3.0" + (sources."acorn-globals-3.1.0" // { + dependencies = [ + sources."acorn-4.0.13" + ]; + }) + sources."ajv-6.12.6" + sources."align-text-0.1.4" + sources."ansi-regex-4.1.0" + sources."ansi-styles-3.2.1" + sources."argparse-1.0.10" + sources."array-find-index-1.0.2" + sources."array-flatten-1.1.1" + sources."arrify-1.0.1" + sources."asap-2.0.6" + sources."asn1-0.2.4" + sources."assert-plus-1.0.0" + sources."async-3.2.0" + sources."asynckit-0.4.0" + sources."aws-sign2-0.7.0" + sources."aws4-1.11.0" + sources."babel-runtime-6.26.0" + sources."babel-types-6.26.0" + sources."babylon-6.18.0" + sources."balanced-match-1.0.0" + sources."base-x-3.0.8" + sources."base64-js-1.5.1" + sources."basic-auth-2.0.1" + sources."bcrypt-pbkdf-1.0.2" + sources."bech32-1.1.4" + sources."bignumber.js-4.1.0" + sources."bindings-1.5.0" + sources."bip174-2.0.1" + sources."bip32-2.0.6" + sources."bip66-1.1.5" + (sources."bitcoin-core-2.3.0" // { + dependencies = [ + sources."semver-5.7.1" + ]; + }) + sources."bitcoin-ops-1.4.1" + sources."bitcoinjs-lib-5.2.0" + sources."bluebird-3.7.2" + sources."bn.js-4.11.9" + (sources."body-parser-1.19.0" // { + dependencies = [ + sources."debug-2.6.9" + ]; + }) + sources."brace-expansion-1.1.11" + sources."brorand-1.1.0" + sources."bs58-4.0.1" + sources."bs58check-2.1.2" + sources."buffer-5.7.1" + sources."buffer-alloc-1.2.0" + sources."buffer-alloc-unsafe-1.1.0" + sources."buffer-fill-1.0.0" + sources."buffer-from-1.1.1" + sources."bunyan-1.8.14" + sources."bytes-3.1.0" + sources."camelcase-4.1.0" + sources."camelcase-keys-4.2.0" + sources."caseless-0.12.0" + sources."center-align-0.1.3" + sources."character-parser-2.2.0" + sources."charenc-0.0.2" + sources."cipher-base-1.0.4" + sources."clean-css-4.2.3" + sources."cliui-2.1.0" + sources."color-convert-1.9.3" + sources."color-name-1.1.3" + sources."combined-stream-1.0.8" + sources."concat-map-0.0.1" + sources."constantinople-3.1.2" + sources."content-disposition-0.5.3" + sources."content-type-1.0.4" + sources."cookie-0.4.0" + sources."cookie-parser-1.4.5" + sources."cookie-signature-1.0.6" + sources."core-js-2.6.11" + sources."core-util-is-1.0.2" + sources."create-hash-1.2.0" + sources."create-hmac-1.1.7" + sources."crypt-0.0.2" + sources."crypto-js-3.1.9-1" + sources."csrf-3.1.0" + (sources."csurf-1.11.0" // { + dependencies = [ + sources."http-errors-1.7.3" + ]; + }) + sources."currently-unhandled-0.4.1" + sources."dashdash-1.14.1" + (sources."debug-4.1.1" // { + dependencies = [ + sources."ms-2.1.2" + ]; + }) + (sources."debugnyan-1.0.0" // { + dependencies = [ + sources."debug-2.6.9" + ]; + }) + sources."decamelize-1.2.0" + (sources."decamelize-keys-1.1.0" // { + dependencies = [ + sources."map-obj-1.0.1" + ]; + }) + sources."decimal.js-10.2.1" + sources."delayed-stream-1.0.0" + sources."depd-1.1.2" + sources."destroy-1.0.4" + sources."dijkstrajs-1.0.1" + sources."doctypes-1.1.0" + sources."dotenv-8.2.0" + sources."double-ended-queue-2.1.0-0" + sources."dtrace-provider-0.8.8" + sources."ecc-jsbn-0.1.2" + sources."ee-first-1.1.1" + sources."electrum-client-git://github.com/janoside/electrum-client" + sources."elliptic-6.5.3" + sources."emoji-regex-7.0.3" + sources."encodeurl-1.0.2" + sources."entities-1.1.2" + sources."error-ex-1.3.2" + sources."escape-html-1.0.3" + sources."esutils-2.0.3" + sources."etag-1.8.1" + (sources."express-4.17.1" // { + dependencies = [ + sources."debug-2.6.9" + ]; + }) + (sources."express-session-1.17.1" // { + dependencies = [ + sources."debug-2.6.9" + sources."depd-2.0.0" + sources."safe-buffer-5.2.0" + ]; + }) + sources."extend-3.0.2" + sources."extsprintf-1.3.0" + sources."fast-deep-equal-3.1.3" + sources."fast-json-stable-stringify-2.1.0" + sources."file-uri-to-path-1.0.0" + (sources."finalhandler-1.1.2" // { + dependencies = [ + sources."debug-2.6.9" + ]; + }) + sources."find-up-2.1.0" + sources."forever-agent-0.6.1" + sources."form-data-2.3.3" + sources."forwarded-0.1.2" + sources."fresh-0.5.2" + sources."function-bind-1.1.1" + sources."get-caller-file-2.0.5" + sources."getpass-0.1.7" + sources."glob-6.0.4" + sources."graceful-fs-4.2.4" + sources."har-schema-2.0.0" + sources."har-validator-5.1.5" + sources."has-1.0.3" + sources."has-symbols-1.0.1" + (sources."hash-base-3.1.0" // { + dependencies = [ + sources."safe-buffer-5.2.1" + ]; + }) + sources."hash.js-1.1.7" + sources."hmac-drbg-1.0.1" + sources."hosted-git-info-2.8.8" + (sources."http-errors-1.7.2" // { + dependencies = [ + sources."inherits-2.0.3" + ]; + }) + sources."http-signature-1.2.0" + sources."iconv-lite-0.4.24" + sources."ieee754-1.2.1" + sources."indent-string-3.2.0" + sources."inflight-1.0.6" + sources."inherits-2.0.4" + sources."ipaddr.js-1.9.1" + sources."is-arrayish-0.2.1" + sources."is-buffer-1.1.6" + sources."is-core-module-2.1.0" + (sources."is-expression-3.0.0" // { + dependencies = [ + sources."acorn-4.0.13" + ]; + }) + sources."is-fullwidth-code-point-2.0.0" + sources."is-plain-obj-1.1.0" + sources."is-promise-2.2.2" + sources."is-regex-1.1.1" + sources."is-typedarray-1.0.0" + sources."isarray-2.0.5" + sources."isstream-0.1.2" + sources."js-stringify-1.0.2" + sources."jsbn-0.1.1" + sources."json-bigint-0.2.3" + sources."json-parse-better-errors-1.0.2" + sources."json-schema-0.2.3" + sources."json-schema-traverse-0.4.1" + sources."json-stringify-safe-5.0.1" + sources."jsprim-1.4.1" + sources."jstransformer-1.0.0" + sources."jstransformer-markdown-it-2.1.0" + sources."kind-of-3.2.2" + sources."lazy-cache-1.0.4" + sources."linkify-it-2.2.0" + sources."load-json-file-4.0.0" + sources."locate-path-2.0.0" + sources."lodash-4.17.20" + sources."longest-1.0.1" + sources."loud-rejection-1.6.0" + sources."lru-cache-5.1.1" + sources."map-obj-2.0.0" + sources."markdown-it-8.4.2" + sources."marked-0.7.0" + sources."md5-2.3.0" + sources."md5.js-1.3.5" + sources."mdurl-1.0.1" + sources."media-typer-0.3.0" + sources."meow-5.0.0" + sources."merge-descriptors-1.0.1" + sources."merkle-lib-2.0.10" + sources."methods-1.1.2" + sources."mime-1.6.0" + sources."mime-db-1.44.0" + sources."mime-types-2.1.27" + sources."minimalistic-assert-1.0.1" + sources."minimalistic-crypto-utils-1.0.1" + sources."minimatch-3.0.4" + sources."minimist-1.2.5" + sources."minimist-options-3.0.2" + sources."mkdirp-0.5.5" + sources."moment-2.29.1" + sources."moment-duration-format-2.3.2" + (sources."morgan-1.10.0" // { + dependencies = [ + sources."debug-2.6.9" + sources."depd-2.0.0" + ]; + }) + sources."ms-2.0.0" + sources."mv-2.1.1" + sources."nan-2.14.2" + sources."ncp-2.0.0" + sources."negotiator-0.6.2" + (sources."normalize-package-data-2.5.0" // { + dependencies = [ + sources."semver-5.7.1" + ]; + }) + sources."oauth-sign-0.9.0" + sources."object-assign-4.1.1" + sources."on-finished-2.3.0" + sources."on-headers-1.0.2" + sources."once-1.4.0" + sources."p-limit-1.3.0" + sources."p-locate-2.0.0" + sources."p-try-1.0.0" + sources."parse-json-4.0.0" + sources."parseurl-1.3.3" + sources."path-exists-3.0.0" + sources."path-is-absolute-1.0.1" + sources."path-parse-1.0.6" + sources."path-to-regexp-0.1.7" + sources."path-type-3.0.0" + sources."performance-now-2.1.0" + sources."pify-3.0.0" + sources."pngjs-3.4.0" + sources."promise-7.3.1" + sources."proxy-addr-2.0.6" + sources."psl-1.8.0" + sources."pug-2.0.4" + sources."pug-attrs-2.0.4" + sources."pug-code-gen-2.0.2" + sources."pug-error-1.3.3" + sources."pug-filters-3.1.1" + sources."pug-lexer-4.1.0" + sources."pug-linker-3.0.6" + sources."pug-load-2.0.12" + sources."pug-parser-5.0.1" + sources."pug-runtime-2.0.5" + sources."pug-strip-comments-1.0.4" + sources."pug-walk-1.1.8" + sources."punycode-2.1.1" + sources."pushdata-bitcoin-1.0.1" + (sources."qrcode-1.4.4" // { + dependencies = [ + sources."camelcase-5.3.1" + sources."cliui-5.0.0" + sources."find-up-3.0.0" + sources."locate-path-3.0.0" + sources."p-limit-2.3.0" + sources."p-locate-3.0.0" + sources."p-try-2.2.0" + sources."yargs-13.3.2" + sources."yargs-parser-13.1.2" + ]; + }) + sources."qs-6.7.0" + sources."quick-lru-1.1.0" + sources."random-bytes-1.0.0" + sources."randombytes-2.1.0" + sources."range-parser-1.2.1" + sources."raw-body-2.4.0" + sources."read-pkg-3.0.0" + sources."read-pkg-up-3.0.0" + sources."readable-stream-3.6.0" + sources."redent-2.0.0" + sources."redis-2.8.0" + sources."redis-commands-1.6.0" + sources."redis-parser-2.6.0" + sources."regenerator-runtime-0.11.1" + sources."repeat-string-1.6.1" + (sources."request-2.88.2" // { + dependencies = [ + sources."qs-6.5.2" + ]; + }) + sources."require-directory-2.1.1" + sources."require-main-filename-2.0.0" + sources."resolve-1.19.0" + sources."right-align-0.1.3" + sources."rimraf-2.4.5" + sources."ripemd160-2.0.2" + sources."rndm-1.2.0" + sources."safe-buffer-5.1.2" + sources."safe-json-stringify-1.2.0" + sources."safer-buffer-2.1.2" + sources."semver-7.3.2" + (sources."send-0.17.1" // { + dependencies = [ + (sources."debug-2.6.9" // { + dependencies = [ + sources."ms-2.0.0" + ]; + }) + sources."ms-2.1.1" + ]; + }) + (sources."serve-favicon-2.5.0" // { + dependencies = [ + sources."ms-2.1.1" + sources."safe-buffer-5.1.1" + ]; + }) + sources."serve-static-1.14.1" + sources."set-blocking-2.0.0" + sources."setprototypeof-1.1.1" + sources."sha.js-2.4.11" + sources."signal-exit-3.0.3" + sources."simple-git-1.132.0" + sources."source-map-0.6.1" + sources."spdx-correct-3.1.1" + sources."spdx-exceptions-2.3.0" + sources."spdx-expression-parse-3.0.1" + sources."spdx-license-ids-3.0.6" + sources."sprintf-js-1.0.3" + sources."sshpk-1.16.1" + sources."standard-error-1.1.0" + sources."statuses-1.5.0" + sources."string-width-3.1.0" + (sources."string_decoder-1.3.0" // { + dependencies = [ + sources."safe-buffer-5.2.1" + ]; + }) + sources."strip-ansi-5.2.0" + sources."strip-bom-3.0.0" + sources."strip-indent-2.0.0" + sources."tiny-secp256k1-1.1.5" + sources."to-fast-properties-1.0.3" + sources."toidentifier-1.0.0" + sources."token-stream-0.0.1" + sources."tough-cookie-2.5.0" + sources."trim-newlines-2.0.0" + sources."tsscmp-1.0.6" + sources."tunnel-agent-0.6.0" + sources."tweetnacl-0.14.5" + sources."type-is-1.6.18" + sources."typeforce-1.18.0" + sources."uc.micro-1.0.6" + (sources."uglify-js-2.8.29" // { + dependencies = [ + sources."source-map-0.5.7" + ]; + }) + sources."uglify-to-browserify-1.0.2" + sources."uid-safe-2.1.5" + sources."unpipe-1.0.0" + sources."uri-js-4.4.0" + sources."util-deprecate-1.0.2" + sources."utils-merge-1.0.1" + sources."uuid-3.4.0" + sources."validate-npm-package-license-3.0.4" + sources."varuint-bitcoin-1.1.2" + sources."vary-1.1.2" + sources."verror-1.10.0" + sources."void-elements-2.0.1" + sources."which-module-2.0.0" + sources."wif-2.0.6" + sources."window-size-0.1.0" + sources."with-5.1.1" + sources."wordwrap-0.0.2" + sources."wrap-ansi-5.1.0" + sources."wrappy-1.0.2" + sources."y18n-4.0.0" + sources."yallist-3.1.1" + (sources."yargs-3.10.0" // { + dependencies = [ + sources."camelcase-1.2.1" + ]; + }) + sources."yargs-parser-10.1.0" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "Open-source, self-hosted Bitcoin explorer"; + homepage = "https://github.com/janoside/btc-rpc-explorer#readme"; + license = "MIT"; + }; + production = true; + bypassCache = true; + reconstructLock = true; + }; castnow = nodeEnv.buildNodePackage { name = "castnow"; packageName = "castnow"; @@ -62727,7 +63677,7 @@ in sources."@protobufjs/pool-1.1.0" sources."@protobufjs/utf8-1.1.0" sources."@types/long-4.0.1" - sources."@types/node-13.13.30" + sources."@types/node-13.13.31" sources."addr-to-ip-port-1.5.1" sources."airplay-js-0.2.16" sources."ajv-6.12.6" @@ -63777,7 +64727,7 @@ in sources."callsites-3.1.0" sources."camelcase-2.1.1" sources."camelcase-keys-2.1.0" - sources."caniuse-lite-1.0.30001158" + sources."caniuse-lite-1.0.30001159" sources."capture-stack-trace-1.0.1" sources."ccount-1.1.0" sources."chalk-2.4.2" @@ -63874,7 +64824,7 @@ in sources."domutils-1.7.0" sources."dot-prop-5.3.0" sources."duplexer3-0.1.4" - sources."electron-to-chromium-1.3.597" + sources."electron-to-chromium-1.3.598" sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" sources."entities-1.1.2" @@ -64713,10 +65663,10 @@ in coc-rust-analyzer = nodeEnv.buildNodePackage { name = "coc-rust-analyzer"; packageName = "coc-rust-analyzer"; - version = "0.15.0"; + version = "0.16.0"; src = fetchurl { - url = "https://registry.npmjs.org/coc-rust-analyzer/-/coc-rust-analyzer-0.15.0.tgz"; - sha512 = "0hSwXiDZTOVskAlCM7T5HqEixWw5FnSRnc1Uweq8slqxwBnGa6x68akVqa674MEM0KhbJi/H6TDE6q8LzUR58g=="; + url = "https://registry.npmjs.org/coc-rust-analyzer/-/coc-rust-analyzer-0.16.0.tgz"; + sha512 = "fZk7sIDnex4PCibUZX14cIkJZvMb4ibZtdLHvSF1dtQsRvxxifSPHsnUsLwvHMm/rxStFTD2q27B20ZXaFbpgg=="; }; buildInputs = globalBuildInputs; meta = { @@ -64816,7 +65766,8 @@ in sources."@nodelib/fs.stat-2.0.3" sources."@nodelib/fs.walk-1.2.4" sources."@stylelint/postcss-css-in-js-0.37.2" - sources."@stylelint/postcss-markdown-0.36.1" + sources."@stylelint/postcss-markdown-0.36.2" + sources."@types/mdast-3.0.3" sources."@types/minimist-1.2.1" sources."@types/normalize-package-data-2.4.0" sources."@types/parse-json-4.0.0" @@ -64836,8 +65787,7 @@ in sources."callsites-3.1.0" sources."camelcase-5.3.1" sources."camelcase-keys-6.2.2" - sources."caniuse-lite-1.0.30001158" - sources."ccount-1.1.0" + sources."caniuse-lite-1.0.30001159" (sources."chalk-4.1.0" // { dependencies = [ sources."ansi-styles-4.3.0" @@ -64848,11 +65798,9 @@ in ]; }) sources."character-entities-1.2.4" - sources."character-entities-html4-1.1.4" sources."character-entities-legacy-1.1.4" sources."character-reference-invalid-1.1.4" sources."clone-regexp-2.2.0" - sources."collapse-white-space-1.0.6" sources."color-convert-1.9.3" sources."color-name-1.1.3" sources."colorette-1.2.1" @@ -64877,7 +65825,7 @@ in sources."domelementtype-1.3.1" sources."domhandler-2.4.2" sources."domutils-1.7.0" - sources."electron-to-chromium-1.3.597" + sources."electron-to-chromium-1.3.598" sources."emoji-regex-8.0.0" sources."entities-1.1.2" sources."error-ex-1.3.2" @@ -64891,11 +65839,11 @@ in sources."fast-json-stable-stringify-2.1.0" sources."fastest-levenshtein-1.0.12" sources."fastq-1.9.0" - sources."file-entry-cache-5.0.1" + sources."file-entry-cache-6.0.0" sources."fill-range-7.0.1" sources."find-up-4.1.0" - sources."flat-cache-2.0.1" - sources."flatted-2.0.2" + sources."flat-cache-3.0.4" + sources."flatted-3.1.0" sources."fs.realpath-1.0.0" sources."function-bind-1.1.1" sources."gensync-1.0.0-beta.2" @@ -64911,7 +65859,7 @@ in sources."hard-rejection-2.1.0" sources."has-1.0.3" sources."has-flag-3.0.0" - sources."hosted-git-info-2.8.8" + sources."hosted-git-info-3.0.7" sources."html-tags-3.1.0" sources."htmlparser2-3.10.1" sources."ignore-5.1.8" @@ -64928,7 +65876,6 @@ in sources."inherits-2.0.4" sources."ini-1.3.5" sources."is-alphabetical-1.0.4" - sources."is-alphanumeric-1.0.0" sources."is-alphanumerical-1.0.4" sources."is-arrayish-0.2.1" sources."is-buffer-2.0.5" @@ -64942,8 +65889,6 @@ in sources."is-plain-obj-2.1.0" sources."is-regexp-2.1.0" sources."is-typedarray-1.0.0" - sources."is-whitespace-character-1.0.4" - sources."is-word-character-1.0.4" sources."isexe-2.0.0" sources."js-tokens-4.0.0" sources."jsesc-2.5.2" @@ -64951,19 +65896,21 @@ in sources."json-schema-traverse-0.4.1" sources."json5-2.1.3" sources."kind-of-6.0.3" - sources."known-css-properties-0.19.0" + sources."known-css-properties-0.20.0" sources."lines-and-columns-1.1.6" sources."locate-path-5.0.0" sources."lodash-4.17.20" sources."log-symbols-4.0.0" sources."longest-streak-2.0.4" + sources."lru-cache-6.0.0" sources."map-obj-4.1.0" - sources."markdown-escapes-1.0.4" - sources."markdown-table-2.0.0" sources."mathml-tag-names-2.1.3" - sources."mdast-util-compact-2.0.1" - sources."meow-7.1.1" + sources."mdast-util-from-markdown-0.8.1" + sources."mdast-util-to-markdown-0.5.3" + sources."mdast-util-to-string-1.1.0" + sources."meow-8.0.0" sources."merge2-1.4.1" + sources."micromark-2.10.1" sources."micromatch-4.0.2" sources."min-indent-1.0.1" sources."minimatch-3.0.4" @@ -64973,10 +65920,13 @@ in sources."is-plain-obj-1.1.0" ]; }) - sources."mkdirp-0.5.5" sources."ms-2.1.2" sources."node-releases-1.1.67" - sources."normalize-package-data-2.5.0" + (sources."normalize-package-data-3.0.0" // { + dependencies = [ + sources."semver-7.3.2" + ]; + }) sources."normalize-range-0.1.2" sources."normalize-selector-0.2.0" sources."num2fraction-1.2.2" @@ -65018,6 +65968,8 @@ in sources."quick-lru-4.0.1" (sources."read-pkg-5.2.0" // { dependencies = [ + sources."hosted-git-info-2.8.8" + sources."normalize-package-data-2.5.0" sources."type-fest-0.6.0" ]; }) @@ -65028,15 +65980,15 @@ in }) sources."readable-stream-3.6.0" sources."redent-3.0.0" - sources."remark-12.0.1" - sources."remark-parse-8.0.3" - sources."remark-stringify-8.1.1" + sources."remark-13.0.0" + sources."remark-parse-9.0.0" + sources."remark-stringify-9.0.0" sources."repeat-string-1.6.1" sources."replace-ext-1.0.0" sources."resolve-1.19.0" sources."resolve-from-5.0.0" sources."reusify-1.0.4" - sources."rimraf-2.6.3" + sources."rimraf-3.0.2" sources."run-parallel-1.1.10" sources."safe-buffer-5.1.2" sources."semver-5.7.1" @@ -65055,45 +66007,36 @@ in sources."spdx-expression-parse-3.0.1" sources."spdx-license-ids-3.0.6" sources."specificity-0.4.1" - sources."state-toggle-1.0.3" sources."string-width-4.2.0" (sources."string_decoder-1.3.0" // { dependencies = [ sources."safe-buffer-5.2.1" ]; }) - sources."stringify-entities-3.1.0" sources."strip-ansi-6.0.0" sources."strip-indent-3.0.0" sources."style-search-0.1.0" - sources."stylelint-13.7.2" + sources."stylelint-13.8.0" sources."sugarss-2.0.0" sources."supports-color-5.5.0" sources."svg-tags-1.0.0" sources."table-6.0.3" sources."to-fast-properties-2.0.0" sources."to-regex-range-5.0.1" - sources."trim-0.0.1" sources."trim-newlines-3.0.0" - sources."trim-trailing-lines-1.1.4" sources."trough-1.0.5" - sources."type-fest-0.13.1" + sources."type-fest-0.18.1" sources."typedarray-to-buffer-3.1.5" - sources."unherit-1.1.3" sources."unified-9.2.0" sources."uniq-1.0.1" sources."unist-util-find-all-after-3.0.2" sources."unist-util-is-4.0.3" - sources."unist-util-remove-position-2.0.1" sources."unist-util-stringify-position-2.0.3" - sources."unist-util-visit-2.0.3" - sources."unist-util-visit-parents-3.1.1" sources."uri-js-4.4.0" sources."util-deprecate-1.0.2" sources."v8-compile-cache-2.2.0" sources."validate-npm-package-license-3.0.4" sources."vfile-4.2.0" - sources."vfile-location-3.2.0" sources."vfile-message-2.0.4" sources."vscode-jsonrpc-5.1.0-next.1" sources."vscode-languageserver-6.2.0-next.2" @@ -65103,15 +66046,15 @@ in ]; }) sources."vscode-languageserver-textdocument-1.0.1" - sources."vscode-languageserver-types-3.16.0-next.4" + sources."vscode-languageserver-types-3.16.0-next.5" sources."vscode-uri-2.1.2" sources."which-1.3.1" sources."wrappy-1.0.2" - sources."write-1.0.3" sources."write-file-atomic-3.0.3" - sources."xtend-4.0.2" + sources."yallist-4.0.0" sources."yaml-1.10.0" - sources."yargs-parser-18.1.3" + sources."yargs-parser-20.2.4" + sources."zwitch-1.0.5" ]; buildInputs = globalBuildInputs; meta = { @@ -66176,7 +67119,7 @@ in sources."@types/glob-7.1.3" sources."@types/minimatch-3.0.3" sources."@types/minimist-1.2.1" - sources."@types/node-14.14.7" + sources."@types/node-14.14.8" sources."@types/normalize-package-data-2.4.0" sources."aggregate-error-3.1.0" sources."ansi-styles-3.2.1" @@ -66547,7 +67490,7 @@ in sources."@cycle/run-3.4.0" sources."@cycle/time-0.10.1" sources."@types/cookiejar-2.1.2" - sources."@types/node-14.14.7" + sources."@types/node-14.14.8" sources."@types/superagent-3.8.2" sources."ansi-escapes-3.2.0" sources."ansi-regex-2.1.1" @@ -67649,19 +68592,22 @@ in elasticdump = nodeEnv.buildNodePackage { name = "elasticdump"; packageName = "elasticdump"; - version = "6.41.0"; + version = "6.43.0"; src = fetchurl { - url = "https://registry.npmjs.org/elasticdump/-/elasticdump-6.41.0.tgz"; - sha512 = "fQ5zyCWQzfCGDtPGCB9/cSyUpvhfInBcFxPHnjHfq++UwHBPSWQRkVbTpOnz+VO9wUaVqkHmNogqVsGYV7drDQ=="; + url = "https://registry.npmjs.org/elasticdump/-/elasticdump-6.43.0.tgz"; + sha512 = "0xS3XRHG+6k2Si0+mbLIg1HOSmPkTR6cbzFaTS0u96QxrAPHqxHPC1FWZ2x4PcApLH7FI+KSDquU049Sja6kKw=="; }; dependencies = [ + sources."@fast-csv/format-4.3.5" + sources."@fast-csv/parse-4.3.3" + sources."@types/node-14.14.8" sources."JSONStream-1.3.5" sources."ajv-6.12.6" sources."asn1-0.2.4" sources."assert-plus-1.0.0" sources."async-2.6.3" sources."asynckit-0.4.0" - sources."aws-sdk-2.793.0" + sources."aws-sdk-2.794.0" sources."aws-sign2-0.7.0" sources."aws4-1.11.0" sources."base64-js-1.5.1" @@ -67681,6 +68627,7 @@ in sources."events-1.1.1" sources."extend-3.0.2" sources."extsprintf-1.3.0" + sources."fast-csv-4.3.5" sources."fast-deep-equal-3.1.3" sources."fast-json-stable-stringify-2.1.0" sources."forever-agent-0.6.1" @@ -67709,6 +68656,14 @@ in sources."jsonparse-1.3.1" sources."jsprim-1.4.1" sources."lodash-4.17.20" + sources."lodash.escaperegexp-4.1.2" + sources."lodash.groupby-4.6.0" + sources."lodash.isboolean-3.0.3" + sources."lodash.isequal-4.5.0" + sources."lodash.isfunction-3.0.9" + sources."lodash.isnil-4.0.0" + sources."lodash.isundefined-3.0.1" + sources."lodash.uniq-4.5.0" sources."lossless-json-1.0.4" sources."mime-db-1.44.0" sources."mime-types-2.1.27" @@ -67840,7 +68795,7 @@ in sources."@types/http-cache-semantics-4.0.0" sources."@types/keyv-3.1.1" sources."@types/minimist-1.2.1" - sources."@types/node-14.14.7" + sources."@types/node-14.14.8" sources."@types/normalize-package-data-2.4.0" sources."@types/responselike-1.0.0" sources."@types/yoga-layout-1.9.2" @@ -68179,7 +69134,7 @@ in sources."normalize-path-2.1.1" ]; }) - sources."@microsoft/load-themed-styles-1.10.134" + sources."@microsoft/load-themed-styles-1.10.136" sources."@nodelib/fs.scandir-2.1.3" sources."@nodelib/fs.stat-2.0.3" sources."@nodelib/fs.walk-1.2.4" @@ -68218,7 +69173,7 @@ in sources."form-data-2.5.1" ]; }) - sources."@types/serve-static-1.13.7" + sources."@types/serve-static-1.13.8" sources."@types/socket.io-2.1.11" sources."@types/socket.io-client-1.4.33" sources."@types/sqlite3-3.1.6" @@ -69203,10 +70158,10 @@ in sources."once-1.4.0" sources."onetime-2.0.1" sources."openapi-default-setter-7.0.1" - sources."openapi-framework-7.1.0" + sources."openapi-framework-7.2.0" sources."openapi-jsonschema-parameters-7.0.2" sources."openapi-request-coercer-7.1.0" - sources."openapi-request-validator-7.0.2" + sources."openapi-request-validator-7.2.0" sources."openapi-response-validator-7.0.1" sources."openapi-schema-validator-7.0.1" sources."openapi-security-handler-7.0.1" @@ -70462,7 +71417,7 @@ in }) sources."@npmcli/node-gyp-1.0.1" sources."@npmcli/promise-spawn-1.3.2" - sources."@npmcli/run-script-1.7.5" + sources."@npmcli/run-script-1.8.0" sources."@pmmmwh/react-refresh-webpack-plugin-0.3.3" sources."@react-native-community/cli-debugger-ui-4.9.0" (sources."@react-native-community/cli-platform-android-4.13.0" // { @@ -70550,7 +71505,7 @@ in sources."source-map-0.7.3" ]; }) - sources."@types/yargs-15.0.9" + sources."@types/yargs-15.0.10" sources."@types/yargs-parser-15.0.0" sources."@webassemblyjs/ast-1.9.0" sources."@webassemblyjs/floating-point-hex-parser-1.9.0" @@ -70787,7 +71742,7 @@ in }) sources."camelcase-5.3.1" sources."caniuse-api-3.0.0" - sources."caniuse-lite-1.0.30001158" + sources."caniuse-lite-1.0.30001159" sources."capture-stack-trace-1.0.1" sources."caseless-0.12.0" (sources."chalk-4.1.0" // { @@ -70964,8 +71919,8 @@ in sources."cssnano-util-same-parent-4.0.1" (sources."csso-4.1.1" // { dependencies = [ - sources."css-tree-1.0.1" - sources."mdn-data-2.0.12" + sources."css-tree-1.1.0" + sources."mdn-data-2.0.14" sources."source-map-0.6.1" ]; }) @@ -71046,7 +72001,7 @@ in sources."duplexify-3.7.1" sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.3.597" + sources."electron-to-chromium-1.3.598" (sources."elliptic-6.5.3" // { dependencies = [ sources."bn.js-4.11.9" @@ -72053,6 +73008,7 @@ in sources."bn.js-4.11.9" ]; }) + sources."puka-1.0.1" sources."pump-3.0.0" (sources."pumpify-1.5.1" // { dependencies = [ @@ -74835,7 +75791,7 @@ in sources."@nodelib/fs.walk-1.2.4" sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" - sources."@types/node-14.14.7" + sources."@types/node-14.14.8" sources."@types/parse-json-4.0.0" sources."@types/websocket-1.0.1" sources."aggregate-error-3.1.0" @@ -78160,7 +79116,7 @@ in sources."async-mutex-0.1.4" sources."asynckit-0.4.0" sources."atob-2.1.2" - (sources."aws-sdk-2.793.0" // { + (sources."aws-sdk-2.794.0" // { dependencies = [ sources."sax-1.2.1" sources."uuid-3.3.2" @@ -78391,7 +79347,7 @@ in ]; }) sources."image-type-3.1.0" - sources."immer-7.0.14" + sources."immer-7.0.15" sources."inflight-1.0.6" sources."inherits-2.0.4" sources."ini-1.3.5" @@ -78549,7 +79505,7 @@ in sources."needle-2.5.2" sources."nextgen-events-1.3.3" sources."no-case-2.3.2" - (sources."node-abi-2.19.1" // { + (sources."node-abi-2.19.3" // { dependencies = [ sources."semver-5.7.1" ]; @@ -80055,7 +81011,7 @@ in sources."@types/glob-7.1.3" sources."@types/minimatch-3.0.3" sources."@types/minimist-1.2.1" - sources."@types/node-14.14.7" + sources."@types/node-14.14.8" sources."@types/normalize-package-data-2.4.0" sources."@zkochan/cmd-shim-3.1.0" sources."JSONStream-1.3.5" @@ -81987,10 +82943,10 @@ in sources."@types/istanbul-lib-report-3.0.0" sources."@types/istanbul-reports-1.1.2" sources."@types/json-schema-7.0.6" - sources."@types/node-14.14.7" + sources."@types/node-14.14.8" sources."@types/normalize-package-data-2.4.0" sources."@types/resolve-0.0.8" - sources."@types/yargs-15.0.9" + sources."@types/yargs-15.0.10" sources."@types/yargs-parser-15.0.0" sources."@webassemblyjs/ast-1.9.0" sources."@webassemblyjs/floating-point-hex-parser-1.9.0" @@ -82161,7 +83117,7 @@ in sources."cached-path-relative-1.0.2" sources."call-bind-1.0.0" sources."camelcase-5.3.1" - sources."caniuse-lite-1.0.30001158" + sources."caniuse-lite-1.0.30001159" sources."capture-exit-2.0.0" sources."caseless-0.12.0" (sources."chalk-3.0.0" // { @@ -82285,7 +83241,7 @@ in sources."duplexer2-0.1.4" sources."duplexify-3.7.1" sources."ecc-jsbn-0.1.2" - sources."electron-to-chromium-1.3.597" + sources."electron-to-chromium-1.3.598" (sources."elliptic-6.5.3" // { dependencies = [ sources."bn.js-4.11.9" @@ -83478,7 +84434,7 @@ in sha512 = "X9I7gwvqKVdqVvqi9AVfUWXnHQQYjssWJ2asKfhBDAkQn0vPagKkx6EjzKcRgyIroWGXN6ZpwkQ/gMvTPFlx7g=="; }; dependencies = [ - sources."@types/node-14.14.7" + sources."@types/node-14.14.8" sources."@types/yauzl-2.9.1" sources."agent-base-5.1.1" sources."ansi-styles-4.3.0" @@ -83566,7 +84522,7 @@ in sources."@fluentui/react-focus-7.16.18" sources."@fluentui/react-window-provider-1.0.1" sources."@fluentui/theme-1.7.0" - sources."@microsoft/load-themed-styles-1.10.134" + sources."@microsoft/load-themed-styles-1.10.136" sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" sources."@uifabric/foundation-7.9.20" @@ -84403,7 +85359,7 @@ in sources."@types/istanbul-reports-1.1.2" sources."@types/minimatch-3.0.3" sources."@types/mkdirp-0.5.2" - sources."@types/node-14.14.7" + sources."@types/node-14.14.8" sources."@types/node-fetch-2.5.7" sources."@types/normalize-package-data-2.4.0" sources."@types/parse5-5.0.3" @@ -84473,7 +85429,7 @@ in sources."asynckit-0.4.0" sources."atob-2.1.2" sources."atob-lite-2.0.0" - (sources."aws-sdk-2.793.0" // { + (sources."aws-sdk-2.794.0" // { dependencies = [ sources."buffer-4.9.2" sources."ieee754-1.1.13" @@ -84552,7 +85508,7 @@ in sources."call-bind-1.0.0" sources."call-me-maybe-1.0.1" sources."camelcase-5.3.1" - sources."caniuse-lite-1.0.30001158" + sources."caniuse-lite-1.0.30001159" sources."cardinal-2.1.1" sources."caw-2.0.1" sources."ccount-1.1.0" @@ -84804,7 +85760,7 @@ in }) sources."duplexer3-0.1.4" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.3.597" + sources."electron-to-chromium-1.3.598" sources."elf-tools-1.1.2" (sources."elliptic-6.5.3" // { dependencies = [ @@ -85585,7 +86541,7 @@ in sources."reusify-1.0.4" sources."rimraf-3.0.2" sources."ripemd160-2.0.2" - sources."rollup-2.33.2" + sources."rollup-2.33.3" sources."rollup-plugin-node-builtins-2.1.2" sources."rollup-plugin-terser-7.0.2" sources."run-async-2.4.1" @@ -86480,16 +87436,16 @@ in node-red = nodeEnv.buildNodePackage { name = "node-red"; packageName = "node-red"; - version = "1.2.3"; + version = "1.2.5"; src = fetchurl { - url = "https://registry.npmjs.org/node-red/-/node-red-1.2.3.tgz"; - sha512 = "2SnJJ8YPTz0IzbRyEVpMZmDukm5DiAbNS+Nvv4g8dEtHFgOMj2Qid3OgqbSsYyRE5aH5FZ8xVLyFrBMPMRj24g=="; + url = "https://registry.npmjs.org/node-red/-/node-red-1.2.5.tgz"; + sha512 = "Z/f5ZjZVQgQSP+UU/RN5mJvTR875R3Fgb1lWd2kBxy44gVxxbtfN66ndgV9oV2S1h8nDTj0s+UhXvEXgo0PlqQ=="; }; dependencies = [ sources."@babel/runtime-7.12.5" - sources."@node-red/editor-api-1.2.3" - sources."@node-red/editor-client-1.2.3" - (sources."@node-red/nodes-1.2.3" // { + sources."@node-red/editor-api-1.2.5" + sources."@node-red/editor-client-1.2.5" + (sources."@node-red/nodes-1.2.5" // { dependencies = [ sources."cookie-0.4.1" sources."http-errors-1.7.3" @@ -86503,9 +87459,9 @@ in }) ]; }) - sources."@node-red/registry-1.2.3" - sources."@node-red/runtime-1.2.3" - sources."@node-red/util-1.2.3" + sources."@node-red/registry-1.2.5" + sources."@node-red/runtime-1.2.5" + sources."@node-red/util-1.2.5" sources."abbrev-1.1.1" sources."accepts-1.3.7" (sources."agent-base-6.0.2" // { @@ -86769,7 +87725,7 @@ in sources."mkdirp-0.5.5" sources."moment-2.29.1" sources."moment-timezone-0.5.32" - (sources."mqtt-4.2.4" // { + (sources."mqtt-4.2.5" // { dependencies = [ sources."concat-stream-2.0.0" sources."debug-4.3.0" @@ -86935,7 +87891,7 @@ in sources."tweetnacl-0.14.5" sources."type-is-1.6.18" sources."typedarray-0.0.6" - sources."uglify-js-3.11.4" + sources."uglify-js-3.11.6" sources."uid-safe-2.1.5" sources."uid2-0.0.3" sources."unc-path-regex-0.1.2" @@ -87356,7 +88312,7 @@ in sources."@npmcli/move-file-1.0.1" sources."@npmcli/node-gyp-1.0.1" sources."@npmcli/promise-spawn-1.3.2" - sources."@npmcli/run-script-1.7.5" + sources."@npmcli/run-script-1.8.0" sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" sources."@tootallnate/once-1.1.2" @@ -87585,6 +88541,7 @@ in sources."promise-retry-1.1.1" sources."prompts-2.4.0" sources."psl-1.8.0" + sources."puka-1.0.1" sources."pump-3.0.0" sources."punycode-2.1.1" sources."pupa-2.1.1" @@ -88117,7 +89074,7 @@ in sources."caller-path-2.0.0" sources."callsites-2.0.0" sources."caniuse-api-3.0.0" - sources."caniuse-lite-1.0.30001158" + sources."caniuse-lite-1.0.30001159" sources."caseless-0.12.0" sources."chalk-2.4.2" sources."chokidar-2.1.8" @@ -88192,8 +89149,8 @@ in sources."cssnano-util-same-parent-4.0.1" (sources."csso-4.1.1" // { dependencies = [ - sources."css-tree-1.0.1" - sources."mdn-data-2.0.12" + sources."css-tree-1.1.0" + sources."mdn-data-2.0.14" ]; }) sources."cssom-0.3.8" @@ -88252,7 +89209,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.597" + sources."electron-to-chromium-1.3.598" (sources."elliptic-6.5.3" // { dependencies = [ sources."bn.js-4.11.9" @@ -88613,7 +89570,7 @@ in sources."postcss-value-parser-3.3.1" sources."posthtml-0.11.6" sources."posthtml-parser-0.4.2" - sources."posthtml-render-1.3.0" + sources."posthtml-render-1.4.0" sources."prelude-ls-1.1.2" sources."process-0.11.10" sources."process-nextick-args-2.0.1" @@ -88897,6 +89854,7 @@ in sources."balanced-match-1.0.0" sources."bcrypt-pbkdf-1.0.2" sources."bindings-1.5.0" + sources."bintrees-1.0.1" sources."bl-1.2.3" sources."bluebird-3.7.2" (sources."body-parser-1.19.0" // { @@ -89050,6 +90008,7 @@ in sources."pn-1.1.0" sources."prfun-2.1.5" sources."process-nextick-args-2.0.1" + sources."prom-client-11.5.3" sources."promise-8.1.0" sources."proxy-addr-2.0.6" sources."prr-1.0.1" @@ -89091,7 +90050,7 @@ in ]; }) sources."serve-static-1.14.1" - (sources."service-runner-2.7.8" // { + (sources."service-runner-2.8.0" // { dependencies = [ sources."semver-7.3.2" sources."yargs-14.2.3" @@ -89108,6 +90067,7 @@ in sources."string-width-3.1.0" sources."string_decoder-1.1.1" sources."strip-ansi-5.2.0" + sources."tdigest-0.1.1" sources."toidentifier-1.0.0" sources."tough-cookie-2.5.0" sources."tunnel-agent-0.6.0" @@ -90410,10 +91370,10 @@ in pnpm = nodeEnv.buildNodePackage { name = "pnpm"; packageName = "pnpm"; - version = "5.12.0"; + version = "5.13.1"; src = fetchurl { - url = "https://registry.npmjs.org/pnpm/-/pnpm-5.12.0.tgz"; - sha512 = "ag+ar3N2DgYM2Tx5XMr0rCnuFteAokiEUZQRNJjuWNt091i3m68FDLxxfBTqM14ZnI6Z55S70XYWkesPo232BQ=="; + url = "https://registry.npmjs.org/pnpm/-/pnpm-5.13.1.tgz"; + sha512 = "FXdcPmd7hld2FrM+GvBwXH85T4iMQre0teZferGxm7xyzzfkCP0qkA/qaXqpCEJ4r3f24FyEgRl9WUvpxNHBEQ=="; }; buildInputs = globalBuildInputs; meta = { @@ -90428,10 +91388,10 @@ in postcss-cli = nodeEnv.buildNodePackage { name = "postcss-cli"; packageName = "postcss-cli"; - version = "8.2.0"; + version = "8.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/postcss-cli/-/postcss-cli-8.2.0.tgz"; - sha512 = "N7tgPpB/2yXk/04irc/RiImCkftVw42STaploQBeOT1xvrIkyG+YW+TsHAJ57xWwL+b0AjXnqs5/RL/1XIh2Lw=="; + url = "https://registry.npmjs.org/postcss-cli/-/postcss-cli-8.3.0.tgz"; + sha512 = "GqWohD9VmH+LCe+xsv6VCdcgNylNBmsrbxJlyXUGteGGdcmazj2YxSiJMUmQpg8pE6LRox9idtsTB7JZq5a+rw=="; }; dependencies = [ sources."@babel/code-frame-7.10.4" @@ -90920,10 +91880,10 @@ in purty = nodeEnv.buildNodePackage { name = "purty"; packageName = "purty"; - version = "6.2.1"; + version = "6.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/purty/-/purty-6.2.1.tgz"; - sha512 = "7VkL+WEp0wCpzy4DWMSEHvNbylMWKGYHycwJ90ZjvdX90lI8akp2JM4hhyL/JOAkIP9DDd996PaW+x/Nre0IDA=="; + url = "https://registry.npmjs.org/purty/-/purty-6.3.0.tgz"; + sha512 = "l70uQyz+t5GvCPzOorUbIhRX3oQW9i8Kgwr0LvS6nUq+UM4rMJdYcHazuupcLVInvNsbd290EnpjaRgAITt0dw=="; }; buildInputs = globalBuildInputs; meta = { @@ -91284,7 +92244,7 @@ in sources."@emotion/unitless-0.7.5" sources."@exodus/schemasafe-1.0.0-rc.3" sources."@redocly/react-dropdown-aria-2.0.11" - sources."@types/node-13.13.30" + sources."@types/node-13.13.31" sources."ajv-5.5.2" sources."ansi-regex-5.0.0" sources."ansi-styles-3.2.1" @@ -91598,10 +92558,10 @@ in rollup = nodeEnv.buildNodePackage { name = "rollup"; packageName = "rollup"; - version = "2.33.2"; + version = "2.33.3"; src = fetchurl { - url = "https://registry.npmjs.org/rollup/-/rollup-2.33.2.tgz"; - sha512 = "QPQ6/fWCrzHtSXkI269rhKaC7qXGghYBwXU04b1JsDZ6ibZa3DJ9D1SFAYRMgx1inDg0DaTbb3N4Z1NK/r3fhw=="; + url = "https://registry.npmjs.org/rollup/-/rollup-2.33.3.tgz"; + sha512 = "RpayhPTe4Gu/uFGCmk7Gp5Z9Qic2VsqZ040G+KZZvsZYdcuWaJg678JeDJJvJeEQXminu24a2au+y92CUWVd+w=="; }; dependencies = [ sources."fsevents-2.1.3" @@ -91880,7 +92840,7 @@ in sources."resolve-1.19.0" sources."resolve-from-4.0.0" sources."rimraf-2.6.3" - sources."rollup-2.33.2" + sources."rollup-2.33.3" sources."safe-buffer-5.2.1" sources."semver-6.3.0" sources."serialize-javascript-5.0.1" @@ -92356,7 +93316,7 @@ in sources."@types/keyv-3.1.1" sources."@types/lodash-4.14.165" sources."@types/long-4.0.1" - sources."@types/node-14.14.7" + sources."@types/node-14.14.8" sources."@types/request-2.48.5" sources."@types/request-promise-native-1.0.17" sources."@types/responselike-1.0.0" @@ -92413,7 +93373,7 @@ in sources."async-limiter-1.0.1" sources."asynckit-0.4.0" sources."at-least-node-1.0.0" - (sources."aws-sdk-2.793.0" // { + (sources."aws-sdk-2.794.0" // { dependencies = [ sources."buffer-4.9.2" sources."ieee754-1.1.13" @@ -92862,7 +93822,7 @@ in sources."nested-error-stacks-2.1.0" sources."next-tick-1.0.0" sources."nice-try-1.0.5" - (sources."node-abi-2.19.1" // { + (sources."node-abi-2.19.3" // { dependencies = [ sources."semver-5.7.1" ]; @@ -92926,7 +93886,7 @@ in sources."promise-queue-2.2.5" (sources."protobufjs-6.10.2" // { dependencies = [ - sources."@types/node-13.13.30" + sources."@types/node-13.13.31" sources."long-4.0.0" ]; }) @@ -93769,10 +94729,10 @@ in snyk = nodeEnv.buildNodePackage { name = "snyk"; packageName = "snyk"; - version = "1.427.1"; + version = "1.428.0"; src = fetchurl { - url = "https://registry.npmjs.org/snyk/-/snyk-1.427.1.tgz"; - sha512 = "JSxh4JZm/cjaAOE77Es8WwE0hnBkQLwMgWZmuqZgIpJYIxGgyQYYChygyx/FzUzx+wMM6zOFUuh4zw2V4KMO2w=="; + url = "https://registry.npmjs.org/snyk/-/snyk-1.428.0.tgz"; + sha512 = "yV1f28PPVG7sJ0c4GAMO3nhuJMIJNDagYJRQVwA0zLCr5u3UraE0qK2wRxo2j53ICkMBslp0b073EIoaB0lVkA=="; }; dependencies = [ sources."@sindresorhus/is-2.1.1" @@ -93802,7 +94762,7 @@ in sources."@types/http-cache-semantics-4.0.0" sources."@types/js-yaml-3.12.5" sources."@types/keyv-3.1.1" - sources."@types/node-14.14.7" + sources."@types/node-14.14.8" sources."@types/responselike-1.0.0" sources."@types/semver-5.5.0" sources."@yarnpkg/lockfile-1.1.0" @@ -94368,19 +95328,30 @@ in "socket.io" = nodeEnv.buildNodePackage { name = "socket.io"; packageName = "socket.io"; - version = "3.0.1"; + version = "3.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/socket.io/-/socket.io-3.0.1.tgz"; - sha512 = "oVYbCQ4sCwm4wVi+f1bsE3YFXcvd6b4JjVP8D7IZnQqBeJOKX9XrdgJWSbXqBEqUXPY3jdTqb1M3s4KFTa/IHg=="; + url = "https://registry.npmjs.org/socket.io/-/socket.io-3.0.2.tgz"; + sha512 = "CFnVFhzOy6eHOnZhElG5dtacsEC3jO45KfIWwDSoKavBuWmuK4k4j1eSMj0RymrTA9WuXG5+yD+sxxtMK8rCIA=="; }; dependencies = [ + sources."@types/body-parser-1.19.0" + sources."@types/connect-3.4.33" + sources."@types/cookie-0.4.0" + sources."@types/cors-2.8.8" + sources."@types/express-4.17.9" + sources."@types/express-serve-static-core-4.17.13" + sources."@types/mime-2.0.3" + sources."@types/node-14.14.8" + sources."@types/qs-6.9.5" + sources."@types/range-parser-1.2.3" + sources."@types/serve-static-1.13.8" sources."accepts-1.3.7" sources."base64id-2.0.0" sources."component-emitter-1.3.0" sources."cookie-0.4.1" sources."cors-2.8.5" sources."debug-4.1.1" - sources."engine.io-4.0.3" + sources."engine.io-4.0.4" sources."engine.io-parser-4.0.1" sources."mime-db-1.44.0" sources."mime-types-2.1.27" @@ -95484,7 +96455,7 @@ in sources."async-1.5.2" sources."async-limiter-1.0.1" sources."asynckit-0.4.0" - (sources."aws-sdk-2.793.0" // { + (sources."aws-sdk-2.794.0" // { dependencies = [ sources."uuid-3.3.2" ]; @@ -96282,8 +97253,8 @@ in sources."css-what-3.4.2" (sources."csso-4.1.1" // { dependencies = [ - sources."css-tree-1.0.1" - sources."mdn-data-2.0.12" + sources."css-tree-1.1.0" + sources."mdn-data-2.0.14" ]; }) sources."define-properties-1.1.3" @@ -98274,7 +99245,7 @@ in sources."@types/debug-4.1.5" sources."@types/http-cache-semantics-4.0.0" sources."@types/keyv-3.1.1" - sources."@types/node-14.14.7" + sources."@types/node-14.14.8" sources."@types/responselike-1.0.0" sources."abbrev-1.1.1" sources."abstract-logging-2.0.1" @@ -99238,7 +100209,7 @@ in sources."@primer/octicons-11.0.0" sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" - sources."@types/node-14.14.7" + sources."@types/node-14.14.8" sources."abbrev-1.1.1" sources."accepts-1.3.7" sources."after-0.8.2" @@ -101088,7 +102059,7 @@ in sources."@starptech/rehype-webparser-0.10.0" sources."@starptech/webparser-0.10.0" sources."@szmarczak/http-timer-1.1.2" - sources."@types/node-14.14.7" + sources."@types/node-14.14.8" sources."@types/unist-2.0.3" sources."@types/vfile-3.0.2" sources."@types/vfile-message-2.0.0" @@ -102030,7 +103001,7 @@ in sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" sources."@types/minimatch-3.0.3" - sources."@types/node-14.14.7" + sources."@types/node-14.14.8" sources."JSONSelect-0.2.1" sources."acorn-7.4.1" sources."acorn-jsx-5.3.1" @@ -102978,7 +103949,7 @@ in sources."@types/eslint-scope-3.7.0" sources."@types/estree-0.0.45" sources."@types/json-schema-7.0.6" - sources."@types/node-14.14.7" + sources."@types/node-14.14.8" sources."@webassemblyjs/ast-1.9.0" sources."@webassemblyjs/floating-point-hex-parser-1.9.0" sources."@webassemblyjs/helper-api-error-1.9.0" @@ -103004,11 +103975,11 @@ in sources."ajv-keywords-3.5.2" sources."browserslist-4.14.7" sources."buffer-from-1.1.1" - sources."caniuse-lite-1.0.30001158" + sources."caniuse-lite-1.0.30001159" sources."chrome-trace-event-1.0.2" sources."colorette-1.2.1" sources."commander-2.20.3" - sources."electron-to-chromium-1.3.597" + sources."electron-to-chromium-1.3.598" sources."enhanced-resolve-5.3.1" sources."escalade-3.1.1" sources."eslint-scope-5.1.1" @@ -103168,7 +104139,7 @@ in dependencies = [ sources."@types/glob-7.1.3" sources."@types/minimatch-3.0.3" - sources."@types/node-14.14.7" + sources."@types/node-14.14.8" sources."accepts-1.3.7" sources."ajv-6.12.6" sources."ajv-errors-1.0.1" @@ -103885,7 +104856,7 @@ in sources."@protobufjs/pool-1.1.0" sources."@protobufjs/utf8-1.1.0" sources."@types/long-4.0.1" - sources."@types/node-13.13.30" + sources."@types/node-13.13.31" sources."addr-to-ip-port-1.5.1" sources."airplay-js-0.3.0" sources."balanced-match-1.0.0" @@ -103999,7 +104970,7 @@ in sources."inflight-1.0.6" sources."inherits-2.0.4" sources."ip-1.1.5" - sources."ip-set-1.0.2" + sources."ip-set-2.1.0" sources."ipaddr.js-2.0.0" sources."is-ascii-1.0.0" sources."is-docker-2.1.1" @@ -104012,7 +104983,7 @@ in sources."k-rpc-5.1.0" sources."k-rpc-socket-1.11.1" sources."last-one-wins-1.0.4" - (sources."load-ip-set-2.1.1" // { + (sources."load-ip-set-2.1.2" // { dependencies = [ sources."decompress-response-6.0.0" sources."mimic-response-3.1.0" @@ -104317,7 +105288,7 @@ in sources."@sindresorhus/is-0.7.0" sources."@types/glob-7.1.3" sources."@types/minimatch-3.0.3" - sources."@types/node-14.14.7" + sources."@types/node-14.14.8" sources."@types/normalize-package-data-2.4.0" sources."JSONStream-1.3.5" sources."aggregate-error-3.1.0" From 39955760108d8825b2d704fa49c81cddcbb9b42a Mon Sep 17 00:00:00 2001 From: Raghav Sood Date: Wed, 18 Nov 2020 14:37:57 +0000 Subject: [PATCH 040/260] deskew: fix src --- pkgs/applications/graphics/deskew/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/graphics/deskew/default.nix b/pkgs/applications/graphics/deskew/default.nix index 422c7a0e15e8..6af6d93477a5 100644 --- a/pkgs/applications/graphics/deskew/default.nix +++ b/pkgs/applications/graphics/deskew/default.nix @@ -1,13 +1,13 @@ -{ stdenv, fetchFromBitbucket, libtiff, fpc }: +{ stdenv, fetchFromGitHub, libtiff, fpc }: stdenv.mkDerivation rec { pname = "deskew"; version = "1.25"; - src = fetchFromBitbucket { + src = fetchFromGitHub { owner = "galfar"; - repo = "app-deskew"; + repo = pname; rev = "v${version}"; sha256 = "0zjjj66qhgqkmfxl3q7p78dv4xl4ci918pgl4d5259pqdj1bfgc8"; }; From 0263591e4ff4b3ea6d3ea5150f8092cf9493e072 Mon Sep 17 00:00:00 2001 From: Raghav Sood Date: Wed, 18 Nov 2020 16:51:47 +0000 Subject: [PATCH 041/260] ebook2cw: 0.8.2 -> 0.8.3 --- pkgs/applications/radio/ebook2cw/Makefile.patch | 12 ++++++++++++ pkgs/applications/radio/ebook2cw/configfile.patch | 11 ----------- pkgs/applications/radio/ebook2cw/default.nix | 15 ++++++++------- 3 files changed, 20 insertions(+), 18 deletions(-) create mode 100644 pkgs/applications/radio/ebook2cw/Makefile.patch delete mode 100644 pkgs/applications/radio/ebook2cw/configfile.patch diff --git a/pkgs/applications/radio/ebook2cw/Makefile.patch b/pkgs/applications/radio/ebook2cw/Makefile.patch new file mode 100644 index 000000000000..be6c32e41470 --- /dev/null +++ b/pkgs/applications/radio/ebook2cw/Makefile.patch @@ -0,0 +1,12 @@ +diff --git a/Makefile b/Makefile +index 005d60d..f69c7fe 100644 +--- a/Makefile ++++ b/Makefile +@@ -41,6 +41,7 @@ install: + install -d -v $(DESTDIR)/bin/ + install -d -v $(DESTDIR)/share/doc/ebook2cw/ + install -d -v $(DESTDIR)/share/doc/ebook2cw/examples/ ++ install -d -v $(DESTDIR)/share/locale/de/LC_MESSAGES/ + install -s -m 0755 ebook2cw $(DESTDIR)/bin/ + install -m 0644 ebook2cw.1 $(DESTDIR)/share/man/man1/ + install -m 0644 README $(DESTDIR)/share/doc/ebook2cw/ diff --git a/pkgs/applications/radio/ebook2cw/configfile.patch b/pkgs/applications/radio/ebook2cw/configfile.patch deleted file mode 100644 index c7aafe5227a5..000000000000 --- a/pkgs/applications/radio/ebook2cw/configfile.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/ebook2cw.c 2017-11-08 19:52:58.298131348 -0700 -+++ b/ebook2cw.c 2017-11-08 19:53:02.588231067 -0700 -@@ -136,7 +136,7 @@ - char isomap[256][4]; /* by these strings */ - char utf8map[256][8]; - -- char configfile[1025]; -+ char configfile[2048]; - - char id3_author[80], - id3_title[80], diff --git a/pkgs/applications/radio/ebook2cw/default.nix b/pkgs/applications/radio/ebook2cw/default.nix index d273594f4c90..5bd9e47ab716 100644 --- a/pkgs/applications/radio/ebook2cw/default.nix +++ b/pkgs/applications/radio/ebook2cw/default.nix @@ -1,17 +1,18 @@ -{ stdenv, fetchsvn, lame, libvorbis }: +{ stdenv, fetchgit, lame, libvorbis, gettext }: stdenv.mkDerivation rec { pname = "ebook2cw"; - version = "0.8.2"; + version = "0.8.3"; - src = fetchsvn { - url = "svn://svn.fkurz.net/ebook2cw/tags/${pname}-${version}"; - sha256 = "1mvp3nz3k76v757792n9b7fcm5jm3jcwarl1k7cila9fi0c2rsiw"; + src = fetchgit { + url = "https://git.fkurz.net/dj1yfk/ebook2cw.git"; + rev = "${pname}-${version}"; + sha256 = "0jqmnjblv3wzr0ppqzndzd8wg02nlkvzg1fqw14vyyp76sdjsh46"; }; - buildInputs = [ lame libvorbis ]; + buildInputs = [ lame libvorbis gettext ]; - patches = [ ./configfile.patch ]; + patches = [ ./Makefile.patch ]; makeFlags = [ "DESTDIR=$(out)" ]; From 2caa1782b5abfe3977011a2d2475d43b71cfef43 Mon Sep 17 00:00:00 2001 From: Victor Luft Date: Wed, 18 Nov 2020 11:58:31 -0500 Subject: [PATCH 042/260] sublime-merge: 2032 -> 2039 --- .../applications/version-management/sublime-merge/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/sublime-merge/default.nix b/pkgs/applications/version-management/sublime-merge/default.nix index 773a2c3b4f51..7b01ab21f495 100644 --- a/pkgs/applications/version-management/sublime-merge/default.nix +++ b/pkgs/applications/version-management/sublime-merge/default.nix @@ -4,8 +4,8 @@ let common = opts: callPackage (import ./common.nix opts); in { sublime-merge = common { - buildVersion = "2032"; - sha256 = "b782c768383893ba7803c2cffd428b09bec46be8a65e61a5f17964bdcc2aaf7c"; + buildVersion = "2039"; + sha256 = "0l82408jli7g6nc267bnnnz0zz015lvpwva5fxj53mval32ii4i8"; } {}; sublime-merge-dev = common { From d09c7c44a1d24ebb3d11c18f9685fd2cc4f2f9b5 Mon Sep 17 00:00:00 2001 From: cmacrae Date: Wed, 18 Nov 2020 17:09:55 +0000 Subject: [PATCH 043/260] spacebar: 1.1.1 -> 1.2.1 --- pkgs/os-specific/darwin/spacebar/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/darwin/spacebar/default.nix b/pkgs/os-specific/darwin/spacebar/default.nix index 7af7e408223a..6d47499b8350 100644 --- a/pkgs/os-specific/darwin/spacebar/default.nix +++ b/pkgs/os-specific/darwin/spacebar/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "spacebar"; - version = "1.1.1"; + version = "1.2.1"; src = fetchFromGitHub { owner = "cmacrae"; repo = pname; rev = "v${version}"; - sha256 = "1x0wzm380nv81j26jqqg4y4dwanydnpdsca41ndw6xyj9zlv73f7"; + sha256 = "0f5ddn3sx13rwwh0nfl784160s8ml3m5593d5fz2b1996aznzrsx"; }; buildInputs = [ Carbon Cocoa ScriptingBridge ]; From 69d9d5d88ef6d971046714db120372993403b287 Mon Sep 17 00:00:00 2001 From: cmacrae Date: Wed, 18 Nov 2020 17:14:53 +0000 Subject: [PATCH 044/260] yabai: 3.3.3 -> 3.3.4 --- pkgs/os-specific/darwin/yabai/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/darwin/yabai/default.nix b/pkgs/os-specific/darwin/yabai/default.nix index 3c3378b323ad..d4471da4781f 100644 --- a/pkgs/os-specific/darwin/yabai/default.nix +++ b/pkgs/os-specific/darwin/yabai/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "yabai"; - version = "3.3.3"; + version = "3.3.4"; src = fetchFromGitHub { owner = "koekeishiya"; repo = pname; rev = "v${version}"; - sha256 = "0rxl0in3rhmrgg3v3l91amr497x37i2w1jqm52k0jb9my1sk67rs"; + sha256 = "1pvyjdxgy7yxxz4x87f8an0dlxvxbnmv5kya8hkzw2na453ihvab"; }; buildInputs = [ Carbon Cocoa ScriptingBridge xxd ]; From 69023bfbb2ae5ff9ecf1b7e3bb90427435750150 Mon Sep 17 00:00:00 2001 From: 06kellyjac Date: Tue, 17 Nov 2020 19:24:42 +0000 Subject: [PATCH 045/260] terragrunt: 0.26.2 -> 0.26.3 --- pkgs/applications/networking/cluster/terragrunt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terragrunt/default.nix b/pkgs/applications/networking/cluster/terragrunt/default.nix index e607a9ee75ba..895f4a36a8df 100644 --- a/pkgs/applications/networking/cluster/terragrunt/default.nix +++ b/pkgs/applications/networking/cluster/terragrunt/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "terragrunt"; - version = "0.26.2"; + version = "0.26.3"; src = fetchFromGitHub { owner = "gruntwork-io"; repo = pname; rev = "v${version}"; - sha256 = "0bp43rsnkq2ysdl0v28i9agan738m0zk5yn8zza6js28sx0y7kns"; + sha256 = "0414xmmx8lzv779zvr1k265c9kh3jlx9c5acg56hl5zzvifl774r"; }; vendorSha256 = "0l85jx02dj9qvxs8l0ln5fln8vssi0fisblm5i1scz9x4a1jqg9n"; From 68e63a27ef695191f97c6aeabb3b18dbb37dee58 Mon Sep 17 00:00:00 2001 From: 06kellyjac Date: Wed, 18 Nov 2020 17:17:05 +0000 Subject: [PATCH 046/260] terragrunt: 0.26.3 -> 0.26.4 --- pkgs/applications/networking/cluster/terragrunt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terragrunt/default.nix b/pkgs/applications/networking/cluster/terragrunt/default.nix index 895f4a36a8df..1868c3e95ac1 100644 --- a/pkgs/applications/networking/cluster/terragrunt/default.nix +++ b/pkgs/applications/networking/cluster/terragrunt/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "terragrunt"; - version = "0.26.3"; + version = "0.26.4"; src = fetchFromGitHub { owner = "gruntwork-io"; repo = pname; rev = "v${version}"; - sha256 = "0414xmmx8lzv779zvr1k265c9kh3jlx9c5acg56hl5zzvifl774r"; + sha256 = "0q1dzrjfg97bk1prknwpdgcf5vnpdi0f41wb5ni4550zzqsz3rnk"; }; vendorSha256 = "0l85jx02dj9qvxs8l0ln5fln8vssi0fisblm5i1scz9x4a1jqg9n"; From 52f5b947f6c4471de8f2e3659a9790bf7e4c777c Mon Sep 17 00:00:00 2001 From: taku0 Date: Thu, 19 Nov 2020 03:12:19 +0900 Subject: [PATCH 047/260] thunderbird-bin: 78.4.3 -> 78.5.0 --- .../thunderbird-bin/release_sources.nix | 530 +++++++++--------- 1 file changed, 265 insertions(+), 265 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix index 9a411d4a82df..b052c839534f 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix @@ -1,665 +1,665 @@ { - version = "78.4.3"; + version = "78.5.0"; sources = [ - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/af/thunderbird-78.4.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-x86_64/af/thunderbird-78.5.0.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "03d4e32b23408b003de5347b2a26d9e3e734f7c3e811510ba81114eff80e6fa3"; + sha256 = "011468ce085f2b5da8968b0622733d9fa25b47ec5e83b3bf4171323948aebb35"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/ar/thunderbird-78.4.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-x86_64/ar/thunderbird-78.5.0.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "5aefbc61f46d59de19061a0e76949642e254a13867881b40b6bac289791c281e"; + sha256 = "661b0f1981b21df20b910f9d833d86c2812b189097ad7e1affc7338abb4f0c5c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/ast/thunderbird-78.4.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-x86_64/ast/thunderbird-78.5.0.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "1e328339808efed1db23ed372841ff65f64e1bda8e1d4be81fd00039468bbb1f"; + sha256 = "c1acc2b6d5dd22adeab3106c3c6925ce0c1a434e1d38b3f699fab4ca319eab14"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/be/thunderbird-78.4.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-x86_64/be/thunderbird-78.5.0.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "f42230768f2907fb3d23a03a56fc20f14ff5ded7b4418debb3e77c4942eb7db8"; + sha256 = "6f76341164c182dd8392d2d1abbb0408a3ab773a7389dbf1eb9bb4042d49f500"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/bg/thunderbird-78.4.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-x86_64/bg/thunderbird-78.5.0.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "27a72288cbaaaaee6a24a36bb2e463a0426810e97938cbfe012dceb1a3800fd0"; + sha256 = "4e97b38383d3a145645ca518449e37e42b5b25cbb98cb72f52657b4813f2b343"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/br/thunderbird-78.4.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-x86_64/br/thunderbird-78.5.0.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "fa1b6c891e3d9d097857a08181030e1df2201240ae466c4adc6fc0be0982d002"; + sha256 = "1d5bcb706bf2eb589aa0c64589fc5b22021977947d6e1099f339a46c55a56f84"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/ca/thunderbird-78.4.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-x86_64/ca/thunderbird-78.5.0.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "6bcc123c7ecccbf42022e302b63683cdf77f6f6f2a615b12c5ea9e6a081fb900"; + sha256 = "3284b98707ee67977f148bd20d88750cc03799d9ba4aa5668c44901846fb8bcf"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/cak/thunderbird-78.4.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-x86_64/cak/thunderbird-78.5.0.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "392cc166ee9be6c5cf8294f727f97cb21b6ad7ebb77d263bba273f02cb15e661"; + sha256 = "7998d66eaf3edc4ee156dff06a30de8abae08ff66b380ea93d7ec0b827a0ea29"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/cs/thunderbird-78.4.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-x86_64/cs/thunderbird-78.5.0.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "60f5ea97e75f965ac0947e51c8cb8e709e5fa8f67ea478babe936032dee5a912"; + sha256 = "5ba37c9dd7a1fc291bcc8b24ef025432dbd5f8a45ea2a4d1273177c6a7c8f6bd"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/cy/thunderbird-78.4.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-x86_64/cy/thunderbird-78.5.0.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "93aa92633d2414ad59aedea8b1a820b158a21c042cbfaedd8abd2b5a41e31c5c"; + sha256 = "baaad2ef28f51b6f57fa6f0583e8e0125c50ea3b4c94dea5854faf9826aecad0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/da/thunderbird-78.4.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-x86_64/da/thunderbird-78.5.0.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "dc263e9d186f4ca8cd404b6e5bd13f9d2874e0e2507eaa55e99a6b5ab3b05179"; + sha256 = "6113ed3f5a36f16e64f0cc499eb683a0d7d377d0cce37882f46f203893b789d8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/de/thunderbird-78.4.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-x86_64/de/thunderbird-78.5.0.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "d9dbf07f3c57f688b08f75673074562ad9d4a9b138159f353415d63f9ccac80b"; + sha256 = "81490e8cd8110285177c27f4057ff48ed1bdb55c94c83cc78e262b9cfcbd87ea"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/dsb/thunderbird-78.4.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-x86_64/dsb/thunderbird-78.5.0.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "084ef3ef3628d003c75dea9a9fa5897424e6e564cb18fb5bca33b341c8c511cc"; + sha256 = "4c6abc365842c902ff184b403a6c271760bd8e71da9efa90d30310e032b03729"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/el/thunderbird-78.4.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-x86_64/el/thunderbird-78.5.0.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "4e91e7d21d0a3d524de7e41201ce8af58518a7e0292c11fc2961a84e9b7d04fb"; + sha256 = "d492a83d3ddaf5beead77fd90a2334ca4ed90023d4c4ad478249a360f49cd5be"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/en-CA/thunderbird-78.4.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-x86_64/en-CA/thunderbird-78.5.0.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "922220811fb0083e8dc51c7cbd703530acdfeb0e9403d1a0909ba1618db020bf"; + sha256 = "d7ddc5a22e89827067255726824e46d3355906441051c9faa04e6241cb833955"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/en-GB/thunderbird-78.4.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-x86_64/en-GB/thunderbird-78.5.0.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "090806f6ebf12efbc5c20a920451feeb0d88d1e7366a074553b79080869687c4"; + sha256 = "10ff106bb933374661e3398ea4ce02c205242d1f7a647504161e295b5e3d1e11"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/en-US/thunderbird-78.4.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-x86_64/en-US/thunderbird-78.5.0.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "7fa3769297600c47c54902bac696e718053c48fc02e54698cb05ef81a4eec873"; + sha256 = "297429aff3f10ab7c2859a37ec351b6b0a478495b8a34e8b492ae3473f052c7f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/es-AR/thunderbird-78.4.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-x86_64/es-AR/thunderbird-78.5.0.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "51be3a453bb3e3f1353b88ab31fffa3fc0c135cb91facb7807c967a9d4afa659"; + sha256 = "c8bafb3476d127d28f565ea5dd749b0c870087f395e0aabfb848a004846498e9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/es-ES/thunderbird-78.4.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-x86_64/es-ES/thunderbird-78.5.0.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "8828e5ff82e84c5f69afd60ae5dbba445d766e2a2d7fbbcd8f0dc8f255d8fc02"; + sha256 = "d8c5350627e7e6f48fbfa863bed1971254104ee299d81d1f36b99d6c6ee54313"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/et/thunderbird-78.4.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-x86_64/et/thunderbird-78.5.0.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "d58404701341bcd9b859f1afb87cb3340fc4b8334cc9490e8ea21446e3f308eb"; + sha256 = "f2a1001b0bb87965e40cd832102d2233b732273930d36715ff2db900b37c9ed2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/eu/thunderbird-78.4.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-x86_64/eu/thunderbird-78.5.0.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "5570472164329f23d3f0be51911402c2b454ea704419ef16b46b359a2c93e821"; + sha256 = "30c6da377a8fc4596f6a67b189c1c9f7a9075df96ed3a59b4da7e0e77157d950"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/fa/thunderbird-78.4.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-x86_64/fa/thunderbird-78.5.0.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha256 = "cc56e14f1fa17e8b4ec9431ae9ada10159bd90bcade39432c647ba401791e3fe"; + sha256 = "8f98dd01764a5d244c25c3c409b8dbcaa1d3daf7b3a970c60d3d37fd5ffc4294"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/fi/thunderbird-78.4.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-x86_64/fi/thunderbird-78.5.0.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "5175e312e8957490b013dd515b84fe4dfcdf57d30c6806f8bdee67caf39659f7"; + sha256 = "be5f152b28ee21d916b184999023a1a5adddd1d2c7448e7eb37bd08948f6a14c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/fr/thunderbird-78.4.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-x86_64/fr/thunderbird-78.5.0.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "5239f8a07f0f6bc4f69b3d4315570dab33c331ab775479a9df39479b71542cc7"; + sha256 = "c1b2d725c43196dfe3f9bfd291dfae84ba392151222589d80e3921e627667d59"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/fy-NL/thunderbird-78.4.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-x86_64/fy-NL/thunderbird-78.5.0.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "5747be2c7f9d5463f9c14fd02fd5e66a8f6c4c8adca3a1bf8c3b4333f1ea2adf"; + sha256 = "622c42950cc7d3889372b6e0c5833dc5c5f608ab23ca9962e0af67ce4b2f8ff5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/ga-IE/thunderbird-78.4.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-x86_64/ga-IE/thunderbird-78.5.0.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "8e15ffc9235742ad88a1ecaf587a178f5aeb0bc57e075b33f792e2d458362ab9"; + sha256 = "7293859380e07d362192cd9dcf88b8da04cde6e102f0b8d51a00021bf8fd9e98"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/gd/thunderbird-78.4.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-x86_64/gd/thunderbird-78.5.0.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "72f53918cd04e587319d59100da05657a3084f97d70acba7d1ef7b7321add6ff"; + sha256 = "f54b892150bd49d028337a88d3a0b2df896a47a6904067b381d385281d2c681e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/gl/thunderbird-78.4.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-x86_64/gl/thunderbird-78.5.0.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "28beb85fe0ea27a659e5063f7094877e906729602ef2e155f0e55e9e9f6d56ad"; + sha256 = "58c88bf739fde7e0f7e279106622abde617a0aa267f34f1c10f8d886800dc50b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/he/thunderbird-78.4.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-x86_64/he/thunderbird-78.5.0.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "718f8605fc8d418c645a0485ce86d97ae1eeded8b776a990e137ced78eb91a68"; + sha256 = "8278c7580356c360c74ad161a6ee052e9398e39a2a5b75217ac0239db28ee4cf"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/hr/thunderbird-78.4.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-x86_64/hr/thunderbird-78.5.0.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "febadac023152dc30e72026f6df203c8051b65ad4da0c4e7059a14ab0b4b5f37"; + sha256 = "b20bef1b7fab8d63c5cc6336dd59264e7c62a9a4c6f2db4232ed27624b26a3cb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/hsb/thunderbird-78.4.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-x86_64/hsb/thunderbird-78.5.0.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "faaaf4606fde4baca3216ed5801209f13cd1bbf34c9671cfc7a7648bb0ac7351"; + sha256 = "ad4797a36c713b5026a4da131fc46f341cb8b72e5ad2f07a677bfedca8401163"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/hu/thunderbird-78.4.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-x86_64/hu/thunderbird-78.5.0.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "353633956336852193510c8e77251834355c92ec503ab827a389a0dbc21c05bc"; + sha256 = "1f3dea138c4f82f91b9aaf891b9959d1cdda273f20af811d967ed55058f69064"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/hy-AM/thunderbird-78.4.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-x86_64/hy-AM/thunderbird-78.5.0.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "1b5dba6f05ecc8449522d8a54c1d4e7aa5ec7a2e26fafbaefbd754ee3ea5780f"; + sha256 = "836668531a555d9bd23fbb3c3b27cc647a327d02e6db1903248fc6b3d59c5dc1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/id/thunderbird-78.4.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-x86_64/id/thunderbird-78.5.0.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "470151868d745ce829f0f38c6377f4ead87be829d43f4383d2e5c3541b93e8d2"; + sha256 = "1d74cd88cddf7b22ef8b19ee6cfedaaade15cecf68712ec8568888d0708c9c81"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/is/thunderbird-78.4.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-x86_64/is/thunderbird-78.5.0.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "e9d6b36beb61445c3f96ffe6e11b238a8539b398d5f3911f2ded7ee96ec0766c"; + sha256 = "a6e3320211b207e9a36c6197dbf97e746d2e9e9b7bda444a8511550b5846d329"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/it/thunderbird-78.4.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-x86_64/it/thunderbird-78.5.0.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "95a02afcebb834b14986b8ccd92d5381a8ac64d3ebbba13860ffbd0313a594e1"; + sha256 = "f0e659e6888590394a652033f3d15b29ff9318b4c88faae51d6347f1441201b3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/ja/thunderbird-78.4.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-x86_64/ja/thunderbird-78.5.0.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "d1c4e2a551a5266839da96b843372e71616346ea00361dccc8e1a62628e6315f"; + sha256 = "a2ffc461e6d942222bef4229a820bf8536ef41dce83efc458d82476d5f98f5a4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/ka/thunderbird-78.4.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-x86_64/ka/thunderbird-78.5.0.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "9eb37a69a370b2619724c91c6789471b9ef579190c08363f633f320563dc4df1"; + sha256 = "6a374b791fac25bfc3f10726d93497291163dd95b1372dc09db70c098822f4f9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/kab/thunderbird-78.4.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-x86_64/kab/thunderbird-78.5.0.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "bce07886dc5251ef401141d387c926f27f61d13450f35cb9a9cbc8403b43260a"; + sha256 = "a23dc5cfef7bcbe32c32363d0048813a24cfbb19f17c3041b23fc751936dcadc"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/kk/thunderbird-78.4.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-x86_64/kk/thunderbird-78.5.0.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "222647dd8106134d46bbad6dad8638090e5441a64aa2a6725aa5b1d959a2832a"; + sha256 = "2187f7d763d34787de0d9870f746548459bd0a2ef0676286d2f9ce9bc9092ef1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/ko/thunderbird-78.4.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-x86_64/ko/thunderbird-78.5.0.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "be2346d5a48e5323d5cc8c1077adf054927d8aececd2fb45fc2f5c0a9f0b8dc2"; + sha256 = "ff88da9f6c77e8f5c1bebab542abc51266ba03d97fc5d22b86cf52a26db75e63"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/lt/thunderbird-78.4.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-x86_64/lt/thunderbird-78.5.0.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "da5cde252d5e167025fb06861a32b67a2d0f7171c767bdd8c5d2ba9fc90d7739"; + sha256 = "77531cad8587aba9c4091bd22c79e40e45d3c57083b5af3e54af3576ed45134b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/ms/thunderbird-78.4.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-x86_64/ms/thunderbird-78.5.0.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "d6ab0652184cbbfe9126a49f61c25fe8852725b88460ad92c37dc1c4d969368f"; + sha256 = "aaa346d9bcc1cbd84beedb75c9949d4a2cd8bf80496a31e2018c2493fed68339"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/nb-NO/thunderbird-78.4.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-x86_64/nb-NO/thunderbird-78.5.0.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "2485cc4df1b1dafd0c5fb7d7723e923e7fea10af1dbf9764d5d7447f38825e49"; + sha256 = "dac3f1eeef73c247f9c79a09b7ffab1498be6c96865b5f21ee28d398941430a1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/nl/thunderbird-78.4.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-x86_64/nl/thunderbird-78.5.0.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "0795d2ae4364def43056e77106ea19053c3111e2f95758dbb41875071655ba47"; + sha256 = "e0b3df7064e08e34f85b9a83d2bef990f66ad0e1bc86f764139fc57d005d1aa3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/nn-NO/thunderbird-78.4.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-x86_64/nn-NO/thunderbird-78.5.0.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "b774035d8bff615646d3b3d73228277531d50309fb5dbf3978346e2b988b2491"; + sha256 = "eb420586e8be191ffc41f4a920506336cc9dccbf229c260a7f193cbe169a6da4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/pa-IN/thunderbird-78.4.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-x86_64/pa-IN/thunderbird-78.5.0.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "2a38813c8aa0eaef3d2ec0ac379ab5c85d0b8c2df1f6a2d36ae066f7b0445447"; + sha256 = "12f7c97b130ce40dd1dcd00a16a20000113b7be33c87ab9002848439ce626abd"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/pl/thunderbird-78.4.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-x86_64/pl/thunderbird-78.5.0.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "21cdb977bff1f0c07bf913b4feab2075a429b4594760de52ac358538179d9c66"; + sha256 = "5ad96dee4b422c820da8a76ab64e62e919c21d99b01b92f346a55acada7cf8ac"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/pt-BR/thunderbird-78.4.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-x86_64/pt-BR/thunderbird-78.5.0.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "d903ccd23367c39779ac2cdd3abe636a0f9e72f8d133a567bead8a739e651589"; + sha256 = "7d6568c067796f21079a4f6bf3374a1b91807a9b30270587cf815892d86e1590"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/pt-PT/thunderbird-78.4.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-x86_64/pt-PT/thunderbird-78.5.0.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "f220a8bc90b05dd796c402aa5e79c62a8aa91a4d80dacbdf57abf77ec51d73b0"; + sha256 = "22058d65e2ba94f39ca6ada6750beacf2bacac0f296a34542fde01e897e4a4e2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/rm/thunderbird-78.4.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-x86_64/rm/thunderbird-78.5.0.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "805d08f629e9dda7d6db36bd41dbcc128defe59b4610e4b7d5d47408a07e47b8"; + sha256 = "c61ff10e4260eb2650fc1a4e0ca8df6c4e4e2e9525168ceaef86a9b8b2ddba54"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/ro/thunderbird-78.4.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-x86_64/ro/thunderbird-78.5.0.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "3b09b2c59f32a09938a45270e04740616b2a13f8b8a6f40503650d9b0f72fc35"; + sha256 = "2ec34bfd9fe4a0f0cf17f132146ab2a589c986a8b4317124f3bfc34ac48f732a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/ru/thunderbird-78.4.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-x86_64/ru/thunderbird-78.5.0.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "2022473752da127d2ebe4eef7f834ac5feafe38dedbe64ad30defb8ae69c6ebd"; + sha256 = "b835dd1757f5cdc580a2b91f01a8089c1396d9eacee665fe9976019f8523fdec"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/si/thunderbird-78.4.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-x86_64/si/thunderbird-78.5.0.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha256 = "dc5166b0b24bd0a9e98f7dfc483a6bff184a4bfffb0eff8a4007b96fe8205254"; + sha256 = "3722e47d39024c13dd799e0c89cf79a1302817605f7025388cd5f62fea15d168"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/sk/thunderbird-78.4.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-x86_64/sk/thunderbird-78.5.0.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "d30e4d3218fbf13a5c531d45f55f0f366aac10aa2d180886ced778c7459c0610"; + sha256 = "4717620562c338f533053677d8956490d2d42abfd52beb6a0d41466ba3e72a36"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/sl/thunderbird-78.4.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-x86_64/sl/thunderbird-78.5.0.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "f968618f7b13b6dc4441a09882ac5c826017a5b0ca3887b7cdca8ef6a3b3c266"; + sha256 = "d712c5b3dddfa181877353d28667d410bea3a1f3d85e92dc058a3f3ac5ff4824"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/sq/thunderbird-78.4.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-x86_64/sq/thunderbird-78.5.0.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "f4400c6e55859e07705b353cbf211e863e8c3f373490f3fff6bd3e6d360d5b7f"; + sha256 = "8443ae1161c6b3e807c9d4abc01824e894a11b6f6c9a52d3097b8301461ac0c3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/sr/thunderbird-78.4.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-x86_64/sr/thunderbird-78.5.0.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "f6437ffb64b1a98b5c5630f3b386b12866a514467c641fb02c8e86560e4b62d9"; + sha256 = "13f093880d41748efa8f1566e5884d632f2fa80d4eb4f1a8dd1dc20ea626cee8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/sv-SE/thunderbird-78.4.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-x86_64/sv-SE/thunderbird-78.5.0.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "f1af8019698347ac94bad5c33b5e094b65e8ebed9181f5fed5e740cf2029bcef"; + sha256 = "ee9d7262a8b6cd8460b2f1c4c0102b68f9a0983e1f021f2283ead172f07e3f37"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/th/thunderbird-78.4.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-x86_64/th/thunderbird-78.5.0.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "75830b637302032bbc70342b71012f391b333a2645d8fefb8f4232d432c9dde1"; + sha256 = "09cd7b862cb8caa511b6d550bb668f0fd51fdfee5b2f6a31814282785688e4de"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/tr/thunderbird-78.4.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-x86_64/tr/thunderbird-78.5.0.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "3691e5aca6b9713fab9c8a15952d1ceae50d67cc60e362eacc9513a362875dfd"; + sha256 = "0d9f63aa7b63d571d7414755bd4e8bc27b7c5fd093ee46ed0fc2db469940dcd5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/uk/thunderbird-78.4.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-x86_64/uk/thunderbird-78.5.0.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "c4aca974c3a541c312029eb66fb8fdb1c5ecd787deb67a10bda3195f0ca06263"; + sha256 = "0aa64449381edeed7c37d18e03f74dac2f5038a6c3c5de9fa6ad037b139bb5bb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/uz/thunderbird-78.4.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-x86_64/uz/thunderbird-78.5.0.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "2052c0a9a41c81a37aa23fbf28775e286b8350594b01aff629604ccbd74ae90d"; + sha256 = "eabd24b838a072cb1aa9bebf3c573b3a6e7a364b759aebd62d12b16911956a00"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/vi/thunderbird-78.4.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-x86_64/vi/thunderbird-78.5.0.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "b142f463cd953bfc423be210eb891f66e948308129de74cdfd415409d4b0cb03"; + sha256 = "ce9b5afcb60fc0f17a384a9096b26626f3d3f570222910a46872688009aee262"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/zh-CN/thunderbird-78.4.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-x86_64/zh-CN/thunderbird-78.5.0.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "0664f379ce4e464e2e6dcc3cfa749bd6ae4a597b008b7fd1c97bb6219727da6d"; + sha256 = "9d69c7ef37282a7741d2392456c9ef5f5700fa1b718889e93bf7010fa99617db"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-x86_64/zh-TW/thunderbird-78.4.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-x86_64/zh-TW/thunderbird-78.5.0.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "2ba4d49b52e6cd699f7bb1fa8f024c330f67d6b9df543a77fea7c3dc87985cc4"; + sha256 = "6001d4e74212b72b2a3583438925d2431bb28994a661b4b47e77268e7790e526"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/af/thunderbird-78.4.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-i686/af/thunderbird-78.5.0.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "60f62dc28a8433e571b894d33c0d9670c3aebc6a8c556c65f12d8d574e5edceb"; + sha256 = "e30adc9074f08e04a4477f59eff6af83bcdf22ccafa1aef5ace219a830c50f38"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/ar/thunderbird-78.4.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-i686/ar/thunderbird-78.5.0.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "cf0fc7d7af09b20dbb35364ac0e47615919ae1627a0b729acf2f13dd99198400"; + sha256 = "6d9456fd3f76de33a3f7c46d8197d83c36c832922b83de64cf4c2f5a56f7729d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/ast/thunderbird-78.4.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-i686/ast/thunderbird-78.5.0.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "cb7ed53eedb55858fa5a5aadab1ed0ae4f2f9e2714406488b211660e56785d21"; + sha256 = "1427f7741ba5c5da163ecfce3053bdab7b14c8fc2e8c046c244f7eea6d015a2e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/be/thunderbird-78.4.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-i686/be/thunderbird-78.5.0.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "b04239a6caf488d3fcb5be0373ddf83554643897d41bd197edb6dbaee15b9a4d"; + sha256 = "97258efe6425869e4710c07e880df2a3f6c14d626e6512374043cff226f141fb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/bg/thunderbird-78.4.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-i686/bg/thunderbird-78.5.0.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "fabd2c79cee02328166954d6b793b70bb94cb41162b904ecb124cdf91e5cff0d"; + sha256 = "a30496a969a954525dbcf1ec0e94d8533baea3809e61d6c1c6e299f883d9676d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/br/thunderbird-78.4.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-i686/br/thunderbird-78.5.0.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "66584e5c63c58c10cb4f2f8fb81048c4201046adbad03d58faf8f36e405a8e40"; + sha256 = "16dfc1b869bb10ce7c56f1b22981586678cd81a42e13c4075ebc1da76728258d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/ca/thunderbird-78.4.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-i686/ca/thunderbird-78.5.0.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "eca54850e9ed41a19bb4cd23de9c11d9d2851ac1573507b32b4fd33431ad7889"; + sha256 = "bd29d4b8376355090adca0185194d3c9b6124c336bec0dababaa4a214f9945fb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/cak/thunderbird-78.4.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-i686/cak/thunderbird-78.5.0.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "ff8e285bf3198c225c2b5b216678bde7f978443c1f354193e39c0c5d3d7237bd"; + sha256 = "b9723a8f8b8a61d01f09b18f1dff6529d22c89653586ad032831c87683da12b8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/cs/thunderbird-78.4.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-i686/cs/thunderbird-78.5.0.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "72a18f3ac0168478c7b9c8d2641922ba7be5d129b63b711b7f7f133ba3cb1d75"; + sha256 = "55ff98744b2f120a855c8a3bc435d39209504b7eda92560be40b8cb3fbe007f0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/cy/thunderbird-78.4.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-i686/cy/thunderbird-78.5.0.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "16fecfef3f81870befcadf833db5ecf54b7b83d587f2a211c5eaceeaf7a5796f"; + sha256 = "818a93f5a4f02e8cf7b3373c31c435dffca3fc1f86d5acc3fd4355bca21f9cf0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/da/thunderbird-78.4.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-i686/da/thunderbird-78.5.0.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "7aac88184c6e2539003905b3a7609116cb2180943a8df219449354297b323455"; + sha256 = "7df66098805f276e1498fa28c00aa7eaa8a8993b561261c54f7091a808ff6766"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/de/thunderbird-78.4.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-i686/de/thunderbird-78.5.0.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "f3f487f8852b7f50ed49b5375ae97376470282a0f5639c8fc4cb7040da30f946"; + sha256 = "194831e85294b41a4c1bcec8a2f20f337786054525d50e2fd6dfd6134385d2d8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/dsb/thunderbird-78.4.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-i686/dsb/thunderbird-78.5.0.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "842a084fc74c29d3c7573e473666cfa01f205b75fe6c1ee83acc25cca68d3666"; + sha256 = "e7344c6b2c90bca56adfca1619e1bfdc0e473f7230d4c1059d6516cee8d51759"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/el/thunderbird-78.4.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-i686/el/thunderbird-78.5.0.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "8df4c2a688b435f60fe0d5646ac5172dad33d254fdd68e35a29a6a83c4bda905"; + sha256 = "e2d4680ced58f78699f7bdc2c3493d6157cf2c9261aa697cd6092ed0687a7bbe"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/en-CA/thunderbird-78.4.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-i686/en-CA/thunderbird-78.5.0.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "8eab7a0b08e3c65eb5c373eb018d5e1df519b28f8774b06203a5b7743b146cd5"; + sha256 = "6afd7bb703c62763b787d77b7467881f07d12e73d32d07c6461642307e3b9f5f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/en-GB/thunderbird-78.4.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-i686/en-GB/thunderbird-78.5.0.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "23c819e15ca0ff1ad366f2d5fb76e934dcea0fae9cec6674b39339e14a3c4254"; + sha256 = "78114f1a1dff6c5430b148fbb8707e03cd3ec1d05af48082755190ae45e94dd4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/en-US/thunderbird-78.4.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-i686/en-US/thunderbird-78.5.0.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "5cdf4b40f337352a8e966046a2eb1a368c0feef4fb069fd4c22d4f986ea1ed3f"; + sha256 = "beb328b15c7b981b10f26cad6325a04257be20e25e819fa771f88fe5e5c98aec"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/es-AR/thunderbird-78.4.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-i686/es-AR/thunderbird-78.5.0.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "e7947542ef45cb432991ac5435523987c79811889e9bd5cb6fe4c698897a241e"; + sha256 = "3c096d5225f8fe273b6f0adc119ea419cf60e7a7723fb3a63a6dec1be6e4c3ef"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/es-ES/thunderbird-78.4.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-i686/es-ES/thunderbird-78.5.0.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "95121f74bc1389e62dfe7acb286d2a4cd60a536f28054c8e367cdfd867babde1"; + sha256 = "68796cda86944bfb70207b79c162c0b2fdb66b17511300c799204fce58d2c2b2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/et/thunderbird-78.4.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-i686/et/thunderbird-78.5.0.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "87aedd276bc54360887e81bf2e3b07c54a365b78814d7e478f7ad5ec15c1d451"; + sha256 = "6187058a289cb43e89916e484ac46c2359fc9c452d07dd4dab2e3ff8ae397c47"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/eu/thunderbird-78.4.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-i686/eu/thunderbird-78.5.0.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "66168f09ed77b7f31faaf21daff48e9a8bf75314fcab585fad67160db52471b9"; + sha256 = "ad587a3b25de553b69ab9aa61b9d99c4f4d7dd37b05672540eda7907b21f2857"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/fa/thunderbird-78.4.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-i686/fa/thunderbird-78.5.0.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha256 = "2848f0277f75dc58f371e2025bebdeca1c37d543055fa78258df67d05c67f5bc"; + sha256 = "8c06bbd83b5485b113bf4d0ca69af9ca21c7854ff38b19831eadae0c586dc606"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/fi/thunderbird-78.4.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-i686/fi/thunderbird-78.5.0.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "725f0dcd456245e188e32a32401ecd40400b7786da3a39d9f6965c1f674ee954"; + sha256 = "bac6ecf3d22f6097f8cccb7da81866941426ee7bbb690937a2333b411a305fbd"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/fr/thunderbird-78.4.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-i686/fr/thunderbird-78.5.0.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "d24ab35a8db7cb32d6098defb9f7b6b007b5c993a070c1a3a5c8991451165e37"; + sha256 = "859457a9c0bae23e4acf901d38de814858c60fe1a5e28ee897b2c2f4c86bc29a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/fy-NL/thunderbird-78.4.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-i686/fy-NL/thunderbird-78.5.0.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "ea3a88b57166b3b8f04922a5c2f6d8d9f94f1a7bb5f3a9e2d6b5f11a13528c18"; + sha256 = "d5a91d212e0c9c6c533bd7f05edca3dbea93eba0bf0d34eabd1e9ba7c7138e8b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/ga-IE/thunderbird-78.4.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-i686/ga-IE/thunderbird-78.5.0.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "763bc901967ec61e1f7f543bbf248bb03ea68b01c000677505408ec8e8c3cbb4"; + sha256 = "980e053f0bcd5096753213fd6cc252be388312980032132bf912af2d4249278a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/gd/thunderbird-78.4.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-i686/gd/thunderbird-78.5.0.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "7394f43ae2ff5816dcf9b37255fd9770dc48dd7309d685ab378bc2de8a5a39b1"; + sha256 = "7b61b433d2f55191f7ecc63e04ceabcebcc85ab211553b71de575bbf14db05ee"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/gl/thunderbird-78.4.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-i686/gl/thunderbird-78.5.0.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "7daaacf6af75b34d37d440e2c0b252ef03c3b432523f5acb8ef71f83b5d7b6cb"; + sha256 = "2dbb2021eacf17f5d42d0f8edc32a3f4d0ae3964cc8b44b0875fcee9bbd8ebbe"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/he/thunderbird-78.4.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-i686/he/thunderbird-78.5.0.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "4831ef263de0a08df6494b13a280475642c3eed7f34c7415fd7b59af192398dc"; + sha256 = "b64fdf97d7f3029ffe465bbe621735970c73682cbde03935c2ad94325a7a77cf"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/hr/thunderbird-78.4.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-i686/hr/thunderbird-78.5.0.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "6860b40fc2ba7f9b8ddedcaf50acca8ac01b6451c0895c325b36485f188b5dda"; + sha256 = "05606268efa91e8266a75f9f53dae8e8095fd70bc1095e2cc160171eb32e9a0a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/hsb/thunderbird-78.4.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-i686/hsb/thunderbird-78.5.0.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "681fc8200f6f9346e911c21d6a1c8206e5ee5ad1adfaa56ddfbc5088225fc561"; + sha256 = "8a2dd27b17cbfad0846a40b4863c72e0754137e4ae581998ff291b4428a069ef"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/hu/thunderbird-78.4.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-i686/hu/thunderbird-78.5.0.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "8909d02e58f5b333fa51b15e4ddb5df162d01e36a8052827482c479949da2cb4"; + sha256 = "01daa9ab4f5d096a9a5e138db4debeee302fb875f885e644eea88103c5c62111"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/hy-AM/thunderbird-78.4.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-i686/hy-AM/thunderbird-78.5.0.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "12dee2dbe126d2243b674bed4617ffcec7c93f850d266f6253d802c6af5b6d6d"; + sha256 = "69159084189c5700e5c8c27bf4cc0345fcafe0879b7f7cca285246a41e411578"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/id/thunderbird-78.4.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-i686/id/thunderbird-78.5.0.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "5564c24b01f9a952def885a4fb56e3246643ca30bc5066d6ffa4ed6c6982b33b"; + sha256 = "798203a12f76cb3c698363da72b235fc9abfc5a68913f3265c9b17b14318eb73"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/is/thunderbird-78.4.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-i686/is/thunderbird-78.5.0.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "fedea70297479b2c828aa19a9a4aa3090597c5490ee842a0f521d0096615d6db"; + sha256 = "19544548a0b0217f5f5256949d74897c784298dfe762174487ab2ba2557a55e7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/it/thunderbird-78.4.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-i686/it/thunderbird-78.5.0.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "8466f3dc9988270d4a9166b82dba764d8dbfa14e8c26a1931d35abe011c3160a"; + sha256 = "b1ae17f3d4533db0107ab280ec4e8ecc610db9581d44ed52d8ca87c821c37c1b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/ja/thunderbird-78.4.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-i686/ja/thunderbird-78.5.0.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "3ffe4ae508896ac961a27940a93f5955bb8b29640c88e5378a8251827b4e9ab8"; + sha256 = "c16c27372c28063a06e31fc440294a655fb72bc033efbfd797d150e99e6ebaed"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/ka/thunderbird-78.4.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-i686/ka/thunderbird-78.5.0.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "7c099596fbc4666e053bd1079f6b7c45511b2b44db73cd5c099fd392bec8e3e3"; + sha256 = "3057efd5078776f1690890d601153a73e2450051a0edb61e92d196318b644679"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/kab/thunderbird-78.4.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-i686/kab/thunderbird-78.5.0.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "5e64e5a276a6e77250ad7647f9b4ecc2b8c9dc360c486f9504b3b17b8da3e467"; + sha256 = "ce8010b362b601819fac825ce27b9efd8af8f0965f8f1cabb21bfcddb2ec7315"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/kk/thunderbird-78.4.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-i686/kk/thunderbird-78.5.0.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "4562bced5900bc447a79c53d381b250a1e13b9f076979cb9760f9adaa89c54b3"; + sha256 = "b73930d1508bdcaecfb9ce280f0d86fd5dc7a3d26160caa0eabbe47243956139"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/ko/thunderbird-78.4.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-i686/ko/thunderbird-78.5.0.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "b6cb53893d67bedb077547f1262a833a5487e49395187a49eb977659d019e7f8"; + sha256 = "24d6e557b6419bb3a512646edb6e1e4d01ce1c0e134b9bb9cc54ad5acb6a0675"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/lt/thunderbird-78.4.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-i686/lt/thunderbird-78.5.0.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "6291d36e9347729920f89a28b949c943d8c92863cba1a03624801c7136eff997"; + sha256 = "c9dc7dc77a1c1acdc1e244e6b1201ecd3305b5c10ef946ceb880fb66d57c249a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/ms/thunderbird-78.4.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-i686/ms/thunderbird-78.5.0.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "5dee2e40dbceea93fbe3b35b744d00472b89b88e745025127a1d07afc79d7df8"; + sha256 = "d3a0b9fc5b38de919515df9dc6ca696c7c70f629b192e8cae099a55432d466d3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/nb-NO/thunderbird-78.4.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-i686/nb-NO/thunderbird-78.5.0.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "491115e7ad1c4245da34dc328e179de3916291d4e42a85ee5fd4fadeae1fcdcd"; + sha256 = "80f552a61288f1d1a6346d302919fd90f63c2d349a2d33921eac9a65c341a7d9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/nl/thunderbird-78.4.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-i686/nl/thunderbird-78.5.0.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "c4631681eb3354a3093acd5a76d5c7ca5ef3e76ac2cef9f1fa4007c40c1e282d"; + sha256 = "89007857be04b59bf724a2f6c295c0948a885c8da8c7a7060922e04f616baf30"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/nn-NO/thunderbird-78.4.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-i686/nn-NO/thunderbird-78.5.0.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "aa4d383b90b7cd48ff18f098c9bba429f09fcfb72a2f2a086a992778718a3b1d"; + sha256 = "b7a8060d3138a55a29374d890b326e77105f41e809053d34c24464a892c6bdbc"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/pa-IN/thunderbird-78.4.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-i686/pa-IN/thunderbird-78.5.0.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "c5fb66455a59383494890e06559d4529c0762ecf76d17e5ad784eb413277438d"; + sha256 = "69f803555cc9b3ba7fbf638e101b76bef10a234747cd0764e906e5d2adbb9a97"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/pl/thunderbird-78.4.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-i686/pl/thunderbird-78.5.0.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "720eea0998d9934960a5dc97466f57c7e68b2048f88125a987569539a8a00579"; + sha256 = "4cd4da857d9cbdc5d89e07529d30df28a758c3c105160d2217b50206147c21e5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/pt-BR/thunderbird-78.4.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-i686/pt-BR/thunderbird-78.5.0.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "d27ab836f5d8753d740e980291a4403656735c206cedbaf7d5c13df26d327150"; + sha256 = "43fca4ac927932589b58e60f7b3b1cdcdc1d73b6f9073e0c1eb2993527afe9be"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/pt-PT/thunderbird-78.4.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-i686/pt-PT/thunderbird-78.5.0.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "2b996d07174c24df1b066c41bd92c8b24ebab82767c47d8c658f2205eeff9cb4"; + sha256 = "25591b73b7ae5d28441baeeae3fb3a5a47f36ea21db763b95782494fd8491122"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/rm/thunderbird-78.4.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-i686/rm/thunderbird-78.5.0.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "206b2bf82b88ab733bf585e11a3eba49a779c8b8fb7bb249716022fc7ee1a18a"; + sha256 = "14a0725f1083ab9c4baafe6944604cc5781cc9d3d44cbc406874b5ce01df785d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/ro/thunderbird-78.4.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-i686/ro/thunderbird-78.5.0.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "2d06d671114d70ba4e39b2c639eab1debe7ad33de11795113f30f27708d13ae4"; + sha256 = "f32af00602a13e262e6b34c8b5783b31a991dee72d82c841086d21e37d669dcd"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/ru/thunderbird-78.4.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-i686/ru/thunderbird-78.5.0.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "08e71802964c340dfbcddf963382d1ccc5b8fd2e262daa1316488cffd04f449f"; + sha256 = "367e7865f1c5d10eb912fce96a34bf6ce25ca48e4ec9209bce8af06412be7781"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/si/thunderbird-78.4.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-i686/si/thunderbird-78.5.0.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha256 = "0f59d187fa15bd08ffe0e08e643bb76954f7eb7730c3768079514385c53df5d3"; + sha256 = "da0494be7a26f0a531d108ca20a0bc9763860e44adaa6149ea059f46daabbe0c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/sk/thunderbird-78.4.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-i686/sk/thunderbird-78.5.0.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "5109939226907517fac9ae9c4e6ee96d732de9a67b9139e390d32cbdea892ef7"; + sha256 = "1c5078f413207049a35c69be32c6996cad169cadc009b3f079b3adc8a932ca22"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/sl/thunderbird-78.4.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-i686/sl/thunderbird-78.5.0.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "c56fb54ad65dd453b487813b1f0dde8d83ed6a2f7e428af55c40a80d1c9a35ca"; + sha256 = "d8a5edf78b5a87c0b3baf0199231e6e9224e1afdf4eff05780b6c9b98657c1ef"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/sq/thunderbird-78.4.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-i686/sq/thunderbird-78.5.0.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "0b3814c80014108032c9f0376a62c09864704441f36a084accba1c7c0f8156de"; + sha256 = "fefcb88c0c5f6ee62ba8224417a629d8a4f0c18b20fcb037c36af772b0d2b71c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/sr/thunderbird-78.4.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-i686/sr/thunderbird-78.5.0.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "80b01424fae7d18c98a77a0026dd4b50f1913f5f3cce2d3f85d9e56da633a537"; + sha256 = "c42818c409de6447c1aa00f8aa6422a9fbb6fa16f01d5076331937c1145a4b87"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/sv-SE/thunderbird-78.4.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-i686/sv-SE/thunderbird-78.5.0.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "ef0154595d85c13d0eac381a907a51da19e9d93d2758c7dc0f052b7b76a7f31f"; + sha256 = "c27d87cde88f38f3611358b5fb3622611c38860ee37d1d90aaabcb4db614a031"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/th/thunderbird-78.4.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-i686/th/thunderbird-78.5.0.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "939f56c4951e8dbfdff257efe7f0212e93c1bb55547ce1e934f7d908932d3116"; + sha256 = "df9b827a723675e70131d147fa6f6325f6e6a14a6b95f6f5b6fae4552501c6b0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/tr/thunderbird-78.4.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-i686/tr/thunderbird-78.5.0.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "66f4f2cb06f20fca47e59b37d52f07a9e1215b03f0bbf9320cd1436e1d1a7c35"; + sha256 = "7a9d6e1b5927c7c54b73062a59d366cd5153896a89e95005177fdf4b789eda42"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/uk/thunderbird-78.4.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-i686/uk/thunderbird-78.5.0.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "33f3b9812b442184c075056cbe7da924655729865d849856093bdaa2d7d84660"; + sha256 = "c421df09d5bbb5e4de273258757df28e5a6eba291a4eabbf28db71a50cb11da7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/uz/thunderbird-78.4.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-i686/uz/thunderbird-78.5.0.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "5abbc17bb66700093eeef5eb97bcab0a5d040ffe20ecf79d8239123248b1affb"; + sha256 = "296ca42b0c9f67ef0bb545f458334ec26e03be3327fd1e1b066d8324965704b2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/vi/thunderbird-78.4.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-i686/vi/thunderbird-78.5.0.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "de5071c3b4a5cf7494f91c69f4a7cf4678bcf57227115e1b6e50cc65a3e716dd"; + sha256 = "46579d9723f5ccc84700c2544f3d1235db338471306d87a1caa0ac4fb337c8bd"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/zh-CN/thunderbird-78.4.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-i686/zh-CN/thunderbird-78.5.0.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "07afc2b794439475d0d4db82c7b694728aa5b8e6e80ac79789bae662757ae8d2"; + sha256 = "9bf0df6568eadf611891f49591975166da95eb4e78e1191eb3354a81637907d2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.3/linux-i686/zh-TW/thunderbird-78.4.3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.0/linux-i686/zh-TW/thunderbird-78.5.0.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "70a71d0c26fd2cd18dd599374cc6f1c39d22246f3b3c8e8d17659cb7c33a5a77"; + sha256 = "8fee4fd8980d551317fc8f98f29938034f5ff90b765e73ef8cd09f8fe68f90c8"; } ]; } From 19682545d91b4589544fe2f040320dbe7e28a66f Mon Sep 17 00:00:00 2001 From: taku0 Date: Thu, 19 Nov 2020 03:12:47 +0900 Subject: [PATCH 048/260] thunderbird: 78.4.3 -> 78.5.0 --- .../networking/mailreaders/thunderbird/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/thunderbird/default.nix b/pkgs/applications/networking/mailreaders/thunderbird/default.nix index 57d12b38dcdc..8b5cb081f319 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/default.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/default.nix @@ -70,13 +70,13 @@ assert waylandSupport -> gtk3Support == true; stdenv.mkDerivation rec { pname = "thunderbird"; - version = "78.4.3"; + version = "78.5.0"; src = fetchurl { url = "mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz"; sha512 = - "0h5ddqp1z2dphyy4mjcb7v9mrrxlnjw8rwklm0yqsbvs9m96pc1yyp4clb3wmgs7kzh3wxdwi450842m3b13wdg5h0ls7rhamd1yi0c"; + "0c32dz8p7rrr0w13l2ynf9snj59ij1v2ld3s75vz1hvks4dikwgcbm44wmvmbisvgyfgzdsphafzlq3kz3j1ja30qjigl0dj709vr6s"; }; nativeBuildInputs = [ From ce815fae50d33d13c3600fd596937860015af3eb Mon Sep 17 00:00:00 2001 From: pulsation Date: Thu, 12 Nov 2020 18:54:01 +0100 Subject: [PATCH 049/260] quisk: 4.1.72 -> 4.1.73 --- pkgs/applications/radio/quisk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/radio/quisk/default.nix b/pkgs/applications/radio/quisk/default.nix index 1a032554e193..86edfadcce11 100644 --- a/pkgs/applications/radio/quisk/default.nix +++ b/pkgs/applications/radio/quisk/default.nix @@ -3,11 +3,11 @@ python38Packages.buildPythonApplication rec { pname = "quisk"; - version = "4.1.72"; + version = "4.1.73"; src = fetchPypi { inherit pname version; - sha256 = "0qw00b9d0l3ysdrmd3nr5a2zlwg9ygdil7krnk2gjp5g8bb778k7"; + sha256 = "37dfb02a32341025c086b07d66ddf1608d4ee1ae1c62fb51f87c97662f13e0d8"; }; buildInputs = [ fftw alsaLib pulseaudio ]; From e4c6febee706cc66fba28beeab8bdd3b308975cf Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Wed, 18 Nov 2020 23:06:38 +0100 Subject: [PATCH 050/260] electrum: 4.0.4 -> 4.0.5 --- pkgs/applications/misc/electrum/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/misc/electrum/default.nix b/pkgs/applications/misc/electrum/default.nix index f2d779c8a650..40ecd61304f1 100644 --- a/pkgs/applications/misc/electrum/default.nix +++ b/pkgs/applications/misc/electrum/default.nix @@ -19,7 +19,7 @@ }: let - version = "4.0.4"; + version = "4.0.5"; # electrum is not compatible with dnspython 2.0.0 yet # use the latest 1.x release instead @@ -43,7 +43,7 @@ let owner = "spesmilo"; repo = "electrum"; rev = version; - sha256 = "0bzvyfqnd0r0l8syf95hr3nsh8rmmmcs74bvc7v04v0nm5m0fmf1"; + sha256 = "0fdsgxzgsxvx6hhjag894nzzdfq989bx1d4anljzcz2ppy4ivpxg"; extraPostFetch = '' mv $out ./all @@ -58,7 +58,7 @@ py.pkgs.buildPythonApplication { src = fetchurl { url = "https://download.electrum.org/${version}/Electrum-${version}.tar.gz"; - sha256 = "03dc5jwgp18sism5v4lbqfyn2zljchng8j2yi07yf8i01ivy2mmv"; + sha256 = "06ml9lwa5k2dp56sm5s7dsl6qirqmgim7rn853cqcq9n45z41437"; }; postUnpack = '' @@ -154,6 +154,6 @@ py.pkgs.buildPythonApplication { homepage = "https://electrum.org/"; license = licenses.mit; platforms = platforms.all; - maintainers = with maintainers; [ ehmry joachifm np ]; + maintainers = with maintainers; [ ehmry joachifm np prusnak ]; }; } From 07edcc54fa931a1db968263a13ab08a86c54d6a7 Mon Sep 17 00:00:00 2001 From: Adam Scott Date: Wed, 18 Nov 2020 17:13:10 -0500 Subject: [PATCH 051/260] tilt: 0.17.2 -> 0.17.11 --- pkgs/applications/networking/cluster/tilt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/tilt/default.nix b/pkgs/applications/networking/cluster/tilt/default.nix index c3ec58df35d4..ae47545ae4e7 100644 --- a/pkgs/applications/networking/cluster/tilt/default.nix +++ b/pkgs/applications/networking/cluster/tilt/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { /* Do not use "dev" as a version. If you do, Tilt will consider itself running in development environment and try to serve assets from the source tree, which is not there once build completes. */ - version = "0.17.2"; + version = "0.17.11"; src = fetchFromGitHub { owner = "tilt-dev"; repo = pname; rev = "v${version}"; - sha256 = "0wiqnlam4f7085n3djvb5phhvw9df61bj8w6c5rcpffykg33vhmi"; + sha256 = "0ggr8l93xpfm4ljjxw0g6kbm0q64hviaamcb5r2vrx9nabz95n95"; }; vendorSha256 = null; From 259056fae4d2ddb9ab1ac5abaed31e80c931764e Mon Sep 17 00:00:00 2001 From: freezeboy Date: Wed, 18 Nov 2020 23:54:29 +0100 Subject: [PATCH 052/260] rippled: unbreak adding libnsl --- pkgs/servers/rippled/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/servers/rippled/default.nix b/pkgs/servers/rippled/default.nix index c9095339cc34..c95d043106cd 100644 --- a/pkgs/servers/rippled/default.nix +++ b/pkgs/servers/rippled/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, fetchgit, fetchurl, runCommand, git, cmake, pkgconfig -, openssl, zlib, boost, grpc, c-ares, abseil-cpp, protobuf3_8 }: +, openssl, zlib, boost, grpc, c-ares, abseil-cpp, protobuf3_8, libnsl }: let sqlite3 = fetchurl rec { @@ -9,7 +9,7 @@ let }; boostSharedStatic = boost.override { - enableShared = true; + enableShared = true; enabledStatic = true; }; @@ -130,7 +130,7 @@ in stdenv.mkDerivation rec { cmakeFlags = ["-Dstatic=OFF" "-DBoost_NO_BOOST_CMAKE=ON"]; nativeBuildInputs = [ pkgconfig cmake git ]; - buildInputs = [ openssl openssl.dev boostSharedStatic zlib grpc c-ares c-ares.cmake-config abseil-cpp protobuf3_8 ]; + buildInputs = [ openssl openssl.dev boostSharedStatic zlib grpc c-ares c-ares.cmake-config abseil-cpp protobuf3_8 libnsl ]; preConfigure = '' export HOME=$PWD @@ -146,9 +146,9 @@ in stdenv.mkDerivation rec { git config --global url."file://${google-test}".insteadOf "${google-test.url}" git config --global url."file://${date}".insteadOf "${date.url}" - substituteInPlace Builds/CMake/deps/Sqlite.cmake --replace "http://www.sqlite.org/2018/sqlite-amalgamation-3260000.zip" "" - substituteInPlace Builds/CMake/deps/Sqlite.cmake --replace "https://www2.sqlite.org/2018/sqlite-amalgamation-3260000.zip" "" - substituteInPlace Builds/CMake/deps/Sqlite.cmake --replace "http://www2.sqlite.org/2018/sqlite-amalgamation-3260000.zip" "" + substituteInPlace Builds/CMake/deps/Sqlite.cmake --replace "http://www.sqlite.org/2018/sqlite-amalgamation-3260000.zip" "" + substituteInPlace Builds/CMake/deps/Sqlite.cmake --replace "https://www2.sqlite.org/2018/sqlite-amalgamation-3260000.zip" "" + substituteInPlace Builds/CMake/deps/Sqlite.cmake --replace "http://www2.sqlite.org/2018/sqlite-amalgamation-3260000.zip" "" substituteInPlace Builds/CMake/deps/Sqlite.cmake --replace "URL ${sqlite3.url}" "URL ${sqlite3}" ''; From 56805ce709f7ed877bad29510b3e802ca55f4368 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 19 Nov 2020 04:31:34 +0000 Subject: [PATCH 053/260] mpop: 1.4.10 -> 1.4.11 --- pkgs/applications/networking/mpop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/mpop/default.nix b/pkgs/applications/networking/mpop/default.nix index f6c979b5173b..e2f1f0e828d3 100644 --- a/pkgs/applications/networking/mpop/default.nix +++ b/pkgs/applications/networking/mpop/default.nix @@ -4,11 +4,11 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "mpop"; - version = "1.4.10"; + version = "1.4.11"; src = fetchurl { url = "https://marlam.de/${pname}/releases/${pname}-${version}.tar.xz"; - sha256 = "1243hazpiwgvz2m3p48cdh0yw1019i6xjxgc7qyhmxcdy0inb6wy"; + sha256 = "1gcxvhin5y0q47svqbf90r5aip0cgywm8sq6m84ygda7km8xylwv"; }; nativeBuildInputs = [ pkgconfig ]; From 3bc05c26024f57d28bcae1ca28536869e3d5416d Mon Sep 17 00:00:00 2001 From: Colin Atkinson Date: Thu, 19 Nov 2020 00:49:00 -0500 Subject: [PATCH 054/260] cgit: strip debug symbols from cgit.cgi The debug symbols result in an unneeded runtime dependency on GCC, and properly stripping them shrinks the size of the closure significantly. --- .../version-management/git-and-tools/cgit/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/version-management/git-and-tools/cgit/default.nix b/pkgs/applications/version-management/git-and-tools/cgit/default.nix index 8debc642b457..79c118a200c1 100644 --- a/pkgs/applications/version-management/git-and-tools/cgit/default.nix +++ b/pkgs/applications/version-management/git-and-tools/cgit/default.nix @@ -69,6 +69,8 @@ stdenv.mkDerivation rec { done ''; + stripDebugList = [ "cgit" ]; + meta = { homepage = "https://git.zx2c4.com/cgit/about/"; repositories.git = "git://git.zx2c4.com/cgit"; From e62c0ade1c96be05a555a3394266b8d189f9255d Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 19 Nov 2020 07:15:50 +0000 Subject: [PATCH 055/260] mongodb-compass: 1.22.1 -> 1.23.0 --- pkgs/tools/misc/mongodb-compass/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/mongodb-compass/default.nix b/pkgs/tools/misc/mongodb-compass/default.nix index 93fca738dc40..28a1339e9a37 100644 --- a/pkgs/tools/misc/mongodb-compass/default.nix +++ b/pkgs/tools/misc/mongodb-compass/default.nix @@ -3,7 +3,7 @@ , gnome2, gdk-pixbuf, gtk3, pango, libnotify, libsecret, libuuid, libxcb, nspr, nss, systemd, xorg, wrapGAppsHook }: let - version = "1.22.1"; + version = "1.23.0"; rpath = stdenv.lib.makeLibraryPath [ alsaLib @@ -49,7 +49,7 @@ let if stdenv.hostPlatform.system == "x86_64-linux" then fetchurl { url = "https://downloads.mongodb.com/compass/mongodb-compass_${version}_amd64.deb"; - sha256 = "1wbjj2w4dii644lprvmwnlval53yqh4y0f58cad657jjw8101rd9"; + sha256 = "1kmhki4kq28z8h249p4imcpb0nz2dx5bmpv8ldhhqh3rcq5vzxsv"; } else throw "MongoDB compass is not supported on ${stdenv.hostPlatform.system}"; From 75aeb18680aa25c524d0510838bad184876275d9 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 19 Nov 2020 08:09:29 +0000 Subject: [PATCH 056/260] oil: 0.8.3 -> 0.8.4 --- 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 e1d4ff1585f8..3dbe95f35b6b 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.3"; + version = "0.8.4"; src = fetchurl { url = "https://www.oilshell.org/download/oil-${version}.tar.xz"; - sha256 = "1jrw8lbcya5wza1g65b5mgm432a2r00d8i0p1plz0kp8rl3ccy1z"; + sha256 = "0ydqwyghnkgbpsdi49vnrx2khs3y0d0bzdzcvjjr999ycmnirz88"; }; postPatch = '' From 5bd56b350df5f465323cd7ba704de536230200da Mon Sep 17 00:00:00 2001 From: Sebastian Neubauer Date: Thu, 19 Nov 2020 11:55:44 +0100 Subject: [PATCH 057/260] amdvlk: 2020.Q4.4 -> 2020.Q4.5 --- pkgs/development/libraries/amdvlk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/amdvlk/default.nix b/pkgs/development/libraries/amdvlk/default.nix index 541e15ea769f..c3e526115546 100644 --- a/pkgs/development/libraries/amdvlk/default.nix +++ b/pkgs/development/libraries/amdvlk/default.nix @@ -21,13 +21,13 @@ let in stdenv.mkDerivation rec { pname = "amdvlk"; - version = "2020.Q4.4"; + version = "2020.Q4.5"; src = fetchRepoProject { name = "${pname}-src"; manifest = "https://github.com/GPUOpen-Drivers/AMDVLK.git"; rev = "refs/tags/v-${version}"; - sha256 = "vlTmJlBHRZOiQFsziefh9VIomFPv8oUr9paagC+q6+8="; + sha256 = "1CcupEm19ZGEma0TIkGxOa0doKhlPbfXFX2S44EBNp0="; }; buildInputs = [ From 3340d4f057fa107bc603023a46fd4b129a8ea48a Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 19 Nov 2020 14:22:47 +0000 Subject: [PATCH 058/260] poedit: 2.4.1 -> 2.4.2 --- pkgs/tools/text/poedit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/text/poedit/default.nix b/pkgs/tools/text/poedit/default.nix index 05241033c6af..0fb17713e373 100644 --- a/pkgs/tools/text/poedit/default.nix +++ b/pkgs/tools/text/poedit/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "poedit"; - version = "2.4.1"; + version = "2.4.2"; src = fetchurl { url = "https://github.com/vslavik/poedit/archive/v${version}-oss.tar.gz"; - sha256 = "0pvd903j2x3h9wh38fhlcn23d0jkjlqnfbdpbvnbhy6al1ngx72w"; + sha256 = "1kry3xphrdccx8znfm9pw5872c5w0ri7cknlad4qcps54b25nnzk"; }; nativeBuildInputs = [ autoconf automake asciidoc wrapGAppsHook From ad97250bb7fb2bef9fe683e38f9d01cfc1358864 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 19 Nov 2020 15:25:26 +0000 Subject: [PATCH 059/260] projectm: 3.1.7 -> 3.1.8 --- pkgs/applications/audio/projectm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/projectm/default.nix b/pkgs/applications/audio/projectm/default.nix index d55b79ece595..845435be60eb 100644 --- a/pkgs/applications/audio/projectm/default.nix +++ b/pkgs/applications/audio/projectm/default.nix @@ -13,13 +13,13 @@ mkDerivation rec { pname = "projectm"; - version = "3.1.7"; + version = "3.1.8"; src = fetchFromGitHub { owner = "projectM-visualizer"; repo = "projectM"; rev = "v${version}"; - sha256 = "1wm5fym6c1yb972pmil7j9axinqqwrj68cwd2sc7ky8c5z2fsdna"; + sha256 = "17zyxj1q0zj17jskq8w9bn2ijn34ldvdq61wy01yf5wgngax2r4z"; }; nativeBuildInputs = [ From a1d06b98cea4c5cfd9b8db7f255758f22eaa6e56 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 19 Nov 2020 19:49:01 +0000 Subject: [PATCH 060/260] petsc: 3.14.0 -> 3.14.1 --- pkgs/development/libraries/science/math/petsc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/science/math/petsc/default.nix b/pkgs/development/libraries/science/math/petsc/default.nix index 0946f8f2f66b..608064353ca7 100644 --- a/pkgs/development/libraries/science/math/petsc/default.nix +++ b/pkgs/development/libraries/science/math/petsc/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "petsc"; - version = "3.14.0"; + version = "3.14.1"; src = fetchurl { url = "http://ftp.mcs.anl.gov/pub/petsc/release-snapshots/petsc-${version}.tar.gz"; - sha256 = "1hq3igm90bnl44vyjdbkpqmqk7496pakcswzc2vq57l8d27nhdxz"; + sha256 = "1y3fhg0l69qp9qn6vjyqdhqhhbvsa7jp8g7zcm0pwzm7gkcldqnx"; }; nativeBuildInputs = [ blas gfortran gfortran.cc.lib lapack python ]; From 9df15228fcdc53d0a6d056a90219ee20e6b0f539 Mon Sep 17 00:00:00 2001 From: Ivar Date: Mon, 2 Nov 2020 17:33:03 +0100 Subject: [PATCH 061/260] nuclear: init at 0.6.6 --- pkgs/applications/audio/nuclear/default.nix | 32 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 34 insertions(+) create mode 100644 pkgs/applications/audio/nuclear/default.nix diff --git a/pkgs/applications/audio/nuclear/default.nix b/pkgs/applications/audio/nuclear/default.nix new file mode 100644 index 000000000000..6b2a5b67122d --- /dev/null +++ b/pkgs/applications/audio/nuclear/default.nix @@ -0,0 +1,32 @@ +{ appimageTools, lib, fetchurl }: +let + pname = "nuclear"; + version = "0.6.6"; + name = "${pname}-v${version}"; + + src = fetchurl { + url = "https://github.com/nukeop/nuclear/releases/download/v${version}/${name}.AppImage"; + sha256 = "0c1335m76fv0wfbk07s8r6ln7zbmlqd66052gqfisakl8a1aafl6"; + }; + + appimageContents = appimageTools.extract { inherit name src; }; +in appimageTools.wrapType2 { + inherit name src; + + extraInstallCommands = '' + mv $out/bin/${name} $out/bin/${pname} + + install -m 444 -D ${appimageContents}/${pname}.desktop -t $out/share/applications + substituteInPlace $out/share/applications/${pname}.desktop \ + --replace 'Exec=AppRun' 'Exec=$out/bin/nuclear' + cp -r ${appimageContents}/usr/share/icons $out/share + ''; + + meta = with lib; { + description = "Streaming music player that finds free music for you"; + homepage = "https://nuclear.js.org/"; + license = licenses.agpl3Plus; + maintainers = [ maintainers.ivar ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a6825cd25c2c..37ee3b8bdc77 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19414,6 +19414,8 @@ in inherit (callPackages ../data/fonts/noto-fonts {}) noto-fonts noto-fonts-cjk noto-fonts-emoji noto-fonts-emoji-blob-bin noto-fonts-extra; + nuclear = callPackage ../applications/audio/nuclear { }; + nullmailer = callPackage ../servers/mail/nullmailer { stdenv = gccStdenv; }; From 272dcd8f9a4072abe51ba4210ae64997e8290fc7 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 18 Nov 2020 04:55:59 +0100 Subject: [PATCH 062/260] snallygaster: init at 0.0.9 --- pkgs/tools/security/snallygaster/default.nix | 38 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 ++- 2 files changed, 41 insertions(+), 1 deletion(-) create mode 100644 pkgs/tools/security/snallygaster/default.nix diff --git a/pkgs/tools/security/snallygaster/default.nix b/pkgs/tools/security/snallygaster/default.nix new file mode 100644 index 000000000000..36ea37edbb9a --- /dev/null +++ b/pkgs/tools/security/snallygaster/default.nix @@ -0,0 +1,38 @@ +{ lib +, python3Packages +, fetchFromGitHub +}: + +python3Packages.buildPythonApplication rec { + pname = "snallygaster"; + version = "0.0.9"; + + src = fetchFromGitHub { + owner = "hannob"; + repo = pname; + rev = "v${version}"; + sha256 = "1gan5asgrxdgfi9lalhxzj3vs7nkazi8nqia36bpz1qb5fz7jrx3"; + }; + + propagatedBuildInputs = with python3Packages; [ + urllib3 + beautifulsoup4 + dnspython + ]; + + checkInputs = with python3Packages; [ + pytestCheckHook + ]; + + pytestFlagsArray = [ + # we are not interested in linting the project + "--ignore=tests/test_codingstyle.py" + ]; + + meta = with lib; { + description = "Tool to scan for secret files on HTTP servers"; + homepage = "https://github.com/hannob/snallygaster"; + license = licenses.cc0; + maintainers = with maintainers; [ hexa ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7429bbda5b40..edc85b279ff1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7237,7 +7237,9 @@ in sn0int = callPackage ../tools/security/sn0int { }; - snabb = callPackage ../tools/networking/snabb { } ; + snabb = callPackage ../tools/networking/snabb { }; + + snallygaster = callPackage ../tools/security/snallygaster { }; snapcast = callPackage ../applications/audio/snapcast { }; From ad7b1987864d1feb90748b38d22436b3d9cfd76b Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 20 Nov 2020 06:29:56 +0000 Subject: [PATCH 063/260] python37Packages.dask-gateway-server: 0.8.0 -> 0.9.0 --- .../python-modules/dask-gateway-server/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dask-gateway-server/default.nix b/pkgs/development/python-modules/dask-gateway-server/default.nix index 9d28d2671917..d2f040609d32 100644 --- a/pkgs/development/python-modules/dask-gateway-server/default.nix +++ b/pkgs/development/python-modules/dask-gateway-server/default.nix @@ -12,12 +12,12 @@ buildPythonPackage rec { pname = "dask-gateway-server"; # update dask-gateway-server lock step with dask-gateway - version = "0.8.0"; + version = "0.9.0"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "272134933b7e2068cd89a17a5012c76a29fbd9e40a78164345a2b15353d4b40a"; + sha256 = "82bca8a98fc1dbda9f67c8eceac59cb92abe07db6227c120a1eb1d040ea40fda"; }; nativeBuildInputs = [ From f18d43efb5b906d53d11471be6874456b414321f Mon Sep 17 00:00:00 2001 From: cw <789@c-w.li> Date: Fri, 2 Oct 2020 11:01:19 +0200 Subject: [PATCH 064/260] rebar3: 3.12.0 -> 3.14.2 --- .../tools/build-managers/rebar3/default.nix | 109 ++++++++++-------- 1 file changed, 58 insertions(+), 51 deletions(-) diff --git a/pkgs/development/tools/build-managers/rebar3/default.nix b/pkgs/development/tools/build-managers/rebar3/default.nix index 5c0fff134a7e..bf28868d0e70 100644 --- a/pkgs/development/tools/build-managers/rebar3/default.nix +++ b/pkgs/development/tools/build-managers/rebar3/default.nix @@ -3,79 +3,85 @@ tree }: let - version = "3.12.0"; + version = "3.14.2"; + # Dependencies should match the ones in: + # https://github.com/erlang/rebar3/blob/${version}/rebar.lock + # `sha256` could also be taken from https://hex.pm - Checksum + + bbmustache = fetchHex { + pkg = "bbmustache"; + version = "1.10.0"; + sha256 = "43effa3fd4bb9523157af5a9e2276c493495b8459fc8737144aa186cb13ce2ee"; + }; + certifi = fetchHex { + pkg = "certifi"; + version = "2.5.2"; + sha256 = "3b3b5f36493004ac3455966991eaf6e768ce9884693d9968055aeeeb1e575040"; + }; + cf = fetchHex { + pkg = "cf"; + version = "0.3.1"; + sha256 = "315e8d447d3a4b02bcdbfa397ad03bbb988a6e0aa6f44d3add0f4e3c3bf97672"; + }; + cth_readable = fetchHex { + pkg = "cth_readable"; + version = "1.4.9"; + sha256 = "b4c6ababdb046c5f2fbb3c22f030b4c5a679083956dcdd29c1df0cb30b18da24"; + }; erlware_commons = fetchHex { pkg = "erlware_commons"; version = "1.3.1"; sha256 = "7aada93f368d0a0430122e39931b7fb4ac9e94dbf043cdc980ad4330fd9cd166"; }; - ssl_verify_fun = fetchHex { - pkg = "ssl_verify_fun"; - version = "1.1.3"; - sha256 = "2e120e6505d6e9ededb2836611dfe2f7028432dc280957998e154307b5ea92fe"; - }; - certifi = fetchHex { - pkg = "certifi"; - version = "2.3.1"; - sha256 = "e12d667d042c11d130594bae2b0097e63836fe8b1e6d6b2cc48f8bb7a2cf7d68"; - }; - providers = fetchHex { - pkg = "providers"; - version = "1.7.0"; - sha256 = "8be66129ca85c2fa74efd8737cdaedd31c1c1af51dd2fd601495a6def4cae4a6"; - }; - getopt = fetchHex { - pkg = "getopt"; - version = "1.0.1"; - sha256 = "53e1ab83b9ceb65c9672d3e7a35b8092e9bdc9b3ee80721471a161c10c59959c"; - }; - bbmustache = fetchHex { - pkg = "bbmustache"; - version = "1.6.0"; - sha256 = "53e02d296512a57be03a98c91541b34d2ca64930268030b2d12364a0332015df"; - }; - relx = fetchHex { - pkg = "relx"; - version = "3.28.0"; - sha256 = "8afb871c0a2a27f0063d973903fc64d2207bc705ecc3607462920683d24ac7b5"; - }; - cf = fetchHex { - pkg = "cf"; - version = "0.2.2"; - sha256 = "08cvy7skn5d2k4manlx5k3anqgjdvajjhc5jwxbaszxw34q3na28"; - }; - cth_readable = fetchHex { - pkg = "cth_readable"; - version = "1.4.3"; - sha256 = "0wr0hba6ka74s3628jrrd7ynjdh7syxigkh7ildg8fgi20ab88fd"; - }; eunit_formatters = fetchHex { pkg = "eunit_formatters"; version = "0.5.0"; sha256 = "1jb3hzb216r29x2h4pcjwfmx1k81431rgh5v0mp4x5146hhvmj6n"; }; - hex_core = fetchHex { - pkg = "hex_core"; - version = "0.4.0"; - sha256 = "8ace8c6cfa10df4cb8be876f42f7446890e124203c094cc7b4e7616fb8de5d7f"; + getopt = fetchHex { + pkg = "getopt"; + version = "1.0.1"; + sha256 = "53e1ab83b9ceb65c9672d3e7a35b8092e9bdc9b3ee80721471a161c10c59959c"; }; parse_trans = fetchHex { pkg = "parse_trans"; version = "3.3.0"; - sha256 = "0q5r871bzx1a8fa06yyxdi3xkkp7v5yqazzah03d6yl3vsmn7vqp"; + sha256 = "17ef63abde837ad30680ea7f857dd9e7ced9476cdd7b0394432af4bfc241b960"; + }; + providers = fetchHex { + pkg = "providers"; + version = "1.8.1"; + sha256 = "e45745ade9c476a9a469ea0840e418ab19360dc44f01a233304e118a44486ba0"; + }; + relx = fetchHex { + pkg = "relx"; + version = "4.1.0"; + sha256 = "b94a3f96697a479ee5217a853345e0f4977bdf40d3c040af0d3d80fadad82af4"; + }; + ssl_verify_fun = fetchHex { + pkg = "ssl_verify_fun"; + version = "1.1.6"; + sha256 = "bdb0d2471f453c88ff3908e7686f86f9be327d065cc1ec16fa4540197ea04680"; }; + hex_core = fetchHex { + pkg = "hex_core"; + version = "0.7.1"; + sha256 = "05c60411511b6dc79affcd99a93e67d71e1b9d6abcb28ba75cd4ebc8585b8d02"; + }; in stdenv.mkDerivation rec { pname = "rebar3"; inherit version erlang; + # How to obtain `sha256`: + # nix-prefetch-url --unpack https://github.com/erlang/rebar3/archive/${version}.tar.gz src = fetchFromGitHub { owner = "erlang"; repo = pname; rev = version; - sha256 = "0936ix7lfwsamssap58b265zid7x2m97azrr2qpjcln3xysd16lg"; + sha256 = "02gz6xs8j5rm14r6dndcpdm8q3rl4mcj363gnnx4y5xvvfnv9bfa"; }; bootstrapper = ./rebar3-nix-bootstrap; @@ -86,18 +92,19 @@ stdenv.mkDerivation rec { mkdir -p _checkouts mkdir -p _build/default/lib/ - cp --no-preserve=mode -R ${erlware_commons} _checkouts/erlware_commons - cp --no-preserve=mode -R ${providers} _checkouts/providers - cp --no-preserve=mode -R ${getopt} _checkouts/getopt cp --no-preserve=mode -R ${bbmustache} _checkouts/bbmustache cp --no-preserve=mode -R ${certifi} _checkouts/certifi cp --no-preserve=mode -R ${cf} _checkouts/cf cp --no-preserve=mode -R ${cth_readable} _checkouts/cth_readable + cp --no-preserve=mode -R ${erlware_commons} _checkouts/erlware_commons cp --no-preserve=mode -R ${eunit_formatters} _checkouts/eunit_formatters + cp --no-preserve=mode -R ${getopt} _checkouts/getopt + cp --no-preserve=mode -R ${parse_trans} _checkouts/parse_trans + cp --no-preserve=mode -R ${providers} _checkouts/providers cp --no-preserve=mode -R ${relx} _checkouts/relx cp --no-preserve=mode -R ${ssl_verify_fun} _checkouts/ssl_verify_fun + cp --no-preserve=mode -R ${hex_core} _checkouts/hex_core - cp --no-preserve=mode -R ${parse_trans} _checkouts/parse_trans # Bootstrap script expects the dependencies in _build/default/lib # TODO: Make it accept checkouts? From 4a0aa9fb7996d236fb7234fa814fa1ee1a222552 Mon Sep 17 00:00:00 2001 From: Michiel Leenaars Date: Fri, 20 Nov 2020 09:54:12 +0100 Subject: [PATCH 065/260] Sylk: 2.9.2 -> 2.9.3 --- pkgs/applications/networking/Sylk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/Sylk/default.nix b/pkgs/applications/networking/Sylk/default.nix index 3ba91b6abc55..9f5378d761aa 100644 --- a/pkgs/applications/networking/Sylk/default.nix +++ b/pkgs/applications/networking/Sylk/default.nix @@ -2,7 +2,7 @@ let pname = "Sylk"; - version = "2.9.2"; + version = "2.9.3"; in appimageTools.wrapType2 rec { @@ -10,7 +10,7 @@ appimageTools.wrapType2 rec { src = fetchurl { url = "http://download.ag-projects.com/Sylk/Sylk-${version}-x86_64.AppImage"; - hash = "sha256-pfzTeKxY2fs98mgvhzaI/uBbYYkxfnQ+6jQ+gTSeEkA="; + hash = "sha256-JH/TUGAYZTIb/L926CoYb5yzPtbOKVmnWRmHO6DxDyY="; }; profile = '' From 4dd5da0ad0efec7e140f77b2d8988a84f5d72f14 Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Thu, 19 Nov 2020 17:06:53 +0100 Subject: [PATCH 066/260] nixUnstable: pre20201102_550e11f -> pre20201118_79aa7d9 Co-authored-by: Eelco Dolstra --- pkgs/tools/package-management/nix/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index 2762a3df7381..54f545ea09f9 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -199,13 +199,13 @@ in rec { nixUnstable = lib.lowPrio (callPackage common rec { name = "nix-2.4${suffix}"; - suffix = "pre20201102_550e11f"; + suffix = "pre20201118_79aa7d9"; src = fetchFromGitHub { owner = "NixOS"; repo = "nix"; - rev = "550e11f077ae508abde5a33998a9d4029880e7b2"; - sha256 = "186grfxsfqg7r92wgwbma66xc7p3iywn43ff7s59m4g6bvb0qgcl"; + rev = "79aa7d95183cbe6c0d786965f0dbff414fd1aa67"; + sha256 = "0aa0xggrczylwp3da3q9m4ad9j6gzi7wpa3ph4i8a1ng36kl91c7"; }; inherit storeDir stateDir confDir boehmgc; From eecd658af06a93f2af5aa76950fddcac2bde1a9b Mon Sep 17 00:00:00 2001 From: Raghav Sood Date: Wed, 18 Nov 2020 14:00:14 +0000 Subject: [PATCH 067/260] davix: fix src --- pkgs/tools/networking/davix/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/networking/davix/default.nix b/pkgs/tools/networking/davix/default.nix index 797791e1c0b9..ca9e7b033c51 100644 --- a/pkgs/tools/networking/davix/default.nix +++ b/pkgs/tools/networking/davix/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkgconfig python3 ]; buildInputs = [ openssl libxml2 boost libuuid ]; - # using the url below since the 0.7.6 release did carry a broken CMake file, - # supposedly fixed in the next release - # https://github.com/cern-fts/davix/issues/40 + # using the url below since the github release page states + # "please ignore the GitHub-generated tarballs, as they are incomplete" + # https://github.com/cern-fts/davix/releases/tag/R_0_7_6 src = fetchurl { - url = "http://grid-deployment.web.cern.ch/grid-deployment/dms/lcgutil/tar/davix/${version}/davix-${version}.tar.gz"; + url = "https://github.com/cern-fts/${pname}/releases/download/R_${stdenv.lib.replaceStrings ["."] ["_"] version}/${pname}-${version}.tar.gz"; sha256 = "0wq66spnr616cns72f9dvr2xfvkdvfqqmc6d7dx29fpp57zzvrx2"; }; From e875f355e34b9291cbdfdf321b463ff09e410997 Mon Sep 17 00:00:00 2001 From: Raghav Sood Date: Wed, 18 Nov 2020 15:24:28 +0000 Subject: [PATCH 068/260] dsniff: fix src --- pkgs/tools/networking/dsniff/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/dsniff/default.nix b/pkgs/tools/networking/dsniff/default.nix index 7d8cf97f46d8..db9c608e931b 100644 --- a/pkgs/tools/networking/dsniff/default.nix +++ b/pkgs/tools/networking/dsniff/default.nix @@ -38,7 +38,7 @@ let inherit (openssl) name; paths = with openssl.override { static = true; }; [ out dev ]; }; -in stdenv.mkDerivation { +in stdenv.mkDerivation rec { pname = "dsniff"; version = "2.4b1"; # upstream is so old that nearly every distribution packages the beta version. @@ -49,7 +49,7 @@ in stdenv.mkDerivation { domain = "salsa.debian.org"; owner = "pkg-security-team"; repo = "dsniff"; - rev = "debian%2F2.4b1%2Bdebian-29"; # %2B = urlquote("+"), %2F = urlquote("/") + rev = "debian/${version}+debian-29"; sha256 = "10zz9krf65jsqvlcr72ycp5cd27xwr18jkc38zqp2i4j6x0caj2g"; name = "dsniff.tar.gz"; }; From fd38f3aa6b2e52a825673901976d97b3bd0c3d5e Mon Sep 17 00:00:00 2001 From: Raghav Sood Date: Wed, 18 Nov 2020 04:06:13 +0000 Subject: [PATCH 069/260] cre2: 0.3.0 -> 0.3.6 --- pkgs/development/libraries/cre2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/cre2/default.nix b/pkgs/development/libraries/cre2/default.nix index 6f101fb5d471..fa4f5d232aa3 100644 --- a/pkgs/development/libraries/cre2/default.nix +++ b/pkgs/development/libraries/cre2/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "cre2"; - version = "0.3.0"; + version = "0.3.6"; src = fetchFromGitHub { owner = "marcomaggi"; - repo = "cre2"; + repo = pname; rev = "v${version}"; sha256 = "1h9jwn6z8kjf4agla85b5xf7gfkdwncp0mfd8zwk98jkm8y2qx9q"; }; From 055e7e6f1ce7edc4637df7be8b13a4fc88cd1118 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 20 Nov 2020 16:26:39 +0000 Subject: [PATCH 070/260] you-get: 0.4.1475 -> 0.4.1488 --- pkgs/tools/misc/you-get/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/you-get/default.nix b/pkgs/tools/misc/you-get/default.nix index 155081db36a1..053d2ae59d2a 100644 --- a/pkgs/tools/misc/you-get/default.nix +++ b/pkgs/tools/misc/you-get/default.nix @@ -2,7 +2,7 @@ buildPythonApplication rec { pname = "you-get"; - version = "0.4.1475"; + version = "0.4.1488"; # Tests aren't packaged, but they all hit the real network so # probably aren't suitable for a build environment anyway. @@ -10,7 +10,7 @@ buildPythonApplication rec { src = fetchPypi { inherit pname version; - sha256 = "432c04170bb5f4881ca6af9c802b6c90e81759811487b8d7918762dcd674697f"; + sha256 = "28aec2f15e86ea1cbf9900827ade41388aa3f1ac43b4ab49999bce48f37cf9c3"; }; meta = with stdenv.lib; { From dd1afe3207da66fb72fbe1b32fa452a76739da45 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 20 Nov 2020 17:14:33 +0000 Subject: [PATCH 071/260] picard: 2.5.1 -> 2.5.2 --- pkgs/applications/audio/picard/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/picard/default.nix b/pkgs/applications/audio/picard/default.nix index 2cb4ff09803c..fb6f59d0ded7 100644 --- a/pkgs/applications/audio/picard/default.nix +++ b/pkgs/applications/audio/picard/default.nix @@ -12,13 +12,13 @@ let ; in pythonPackages.buildPythonApplication rec { pname = "picard"; - version = "2.5.1"; + version = "2.5.2"; src = fetchFromGitHub { owner = "metabrainz"; repo = pname; rev = "release-${version}"; - sha256 = "13q926iqwdba6ds5s3ir57c9bkg8gcv6dhqvhmg00fnzkq9xqk3d"; + sha256 = "193pk6fhrqar2ra8krj6xdd7sm5qfw0p708iazzwk4b8c8g0q72j"; }; nativeBuildInputs = [ gettext qt5.wrapQtAppsHook qt5.qtbase ] From 11672f2d562997f47f1fc98c439ef67d3db45081 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 20 Nov 2020 17:21:45 +0000 Subject: [PATCH 072/260] thonny: 3.2.7 -> 3.3.0 --- pkgs/applications/editors/thonny/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/thonny/default.nix b/pkgs/applications/editors/thonny/default.nix index 706d3fd71763..c3710cf5b22b 100644 --- a/pkgs/applications/editors/thonny/default.nix +++ b/pkgs/applications/editors/thonny/default.nix @@ -4,13 +4,13 @@ with python3.pkgs; buildPythonApplication rec { pname = "thonny"; - version = "3.2.7"; + version = "3.3.0"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "0gzvdgg5l4j0wgkh7lp4wjabrpxvvs5m7mnpszqixxijdffjd4cj"; + sha256 = "1k1iy01az65w463j6id7iyrbinjbjd220i100mrnxyn569dxmf34"; }; propagatedBuildInputs = with python3.pkgs; [ From 22d4da89702511c514a7ee5c45420ed3dd1faf02 Mon Sep 17 00:00:00 2001 From: Kevin Rauscher Date: Fri, 20 Nov 2020 18:25:29 +0100 Subject: [PATCH 073/260] metals: 0.9.5 -> 0.9.6 --- pkgs/development/tools/metals/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/metals/default.nix b/pkgs/development/tools/metals/default.nix index 19e666ced11a..37c99eaca857 100644 --- a/pkgs/development/tools/metals/default.nix +++ b/pkgs/development/tools/metals/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "metals"; - version = "0.9.5"; + version = "0.9.6"; deps = stdenv.mkDerivation { name = "${pname}-deps-${version}"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { ''; outputHashMode = "recursive"; outputHashAlgo = "sha256"; - outputHash = "1hcfnxxahh3yfkpz6ybfr9xsf5mx008rhn7q6p8pmfxrgkdh4c1l"; + outputHash = "0cjivkrykvp2m8bj3x9fsk7nsr5vxf87jfh4rjn24kfliljwfh2w"; }; nativeBuildInputs = [ makeWrapper ]; From 4615d67ac6ae6cf1657cf01d861caa56a29b573e Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 20 Nov 2020 17:43:07 +0000 Subject: [PATCH 074/260] mavproxy: 1.8.23 -> 1.8.24 --- pkgs/applications/science/robotics/mavproxy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/robotics/mavproxy/default.nix b/pkgs/applications/science/robotics/mavproxy/default.nix index dcc2114a4886..b245ae384ae6 100644 --- a/pkgs/applications/science/robotics/mavproxy/default.nix +++ b/pkgs/applications/science/robotics/mavproxy/default.nix @@ -3,11 +3,11 @@ buildPythonApplication rec { pname = "MAVProxy"; - version = "1.8.23"; + version = "1.8.24"; src = fetchPypi { inherit pname version; - sha256 = "46c70e013d3e465daae5523f6a1aad553e6ee0f4db137bb935a3273f7ffcc22e"; + sha256 = "768deb3c1d96ed8d734a2fe2eb7cc3877309b17fb5353e9d7036830283806885"; }; propagatedBuildInputs = [ From c16a97738623b85eaa685eb1e1b5f16182641215 Mon Sep 17 00:00:00 2001 From: Jeff Slight Date: Mon, 28 Sep 2020 14:42:57 -0700 Subject: [PATCH 075/260] gitlab: 13.0.14 -> 13.4.3 13.4.3 --- .../version-management/gitlab/data.json | 14 +- .../version-management/gitlab/default.nix | 6 +- .../version-management/gitlab/gitaly/Gemfile | 10 +- .../gitlab/gitaly/Gemfile.lock | 46 +- .../gitlab/gitaly/default.nix | 6 +- .../version-management/gitlab/gitaly/deps.nix | 12 +- .../gitlab/gitaly/fix-executable-check.patch | 10 +- .../gitlab/gitaly/gemset.nix | 68 +- .../gitlab/gitlab-shell/default.nix | 8 +- .../gitlab/gitlab-shell/deps.nix | 1288 ++++++- .../remove-hardcoded-locations.patch | 16 +- .../gitlab/gitlab-workhorse/default.nix | 4 +- .../gitlab/gitlab-workhorse/deps.nix | 932 ++++- .../gitlab/remove-hardcoded-locations.patch | 10 +- .../version-management/gitlab/rubyEnv/Gemfile | 110 +- .../gitlab/rubyEnv/Gemfile.lock | 616 ++-- .../gitlab/rubyEnv/gemset.nix | 891 +++-- .../version-management/gitlab/yarnPkgs.nix | 3008 ++++++++++------- 18 files changed, 5018 insertions(+), 2037 deletions(-) diff --git a/pkgs/applications/version-management/gitlab/data.json b/pkgs/applications/version-management/gitlab/data.json index 9389934ffc68..0c6f40550f96 100644 --- a/pkgs/applications/version-management/gitlab/data.json +++ b/pkgs/applications/version-management/gitlab/data.json @@ -1,13 +1,13 @@ { - "version": "13.0.14", - "repo_hash": "15is18x631ifsj4iwmrs1s9lc3i99hwsxxf5v42qldbmsys31l1k", + "version": "13.4.3", + "repo_hash": "19nk692ik26qcc1gcvbbrvadg6169v34gd8h7d5bwfjk12idj1id", "owner": "gitlab-org", "repo": "gitlab", - "rev": "v13.0.14-ee", + "rev": "v13.4.3-ee", "passthru": { - "GITALY_SERVER_VERSION": "13.0.14", - "GITLAB_PAGES_VERSION": "1.18.0", - "GITLAB_SHELL_VERSION": "13.2.0", - "GITLAB_WORKHORSE_VERSION": "8.31.2" + "GITALY_SERVER_VERSION": "13.4.3", + "GITLAB_PAGES_VERSION": "1.25.0", + "GITLAB_SHELL_VERSION": "13.7.0", + "GITLAB_WORKHORSE_VERSION": "8.46.0" } } \ No newline at end of file diff --git a/pkgs/applications/version-management/gitlab/default.nix b/pkgs/applications/version-management/gitlab/default.nix index 76127681bbd9..549d1a1f5601 100644 --- a/pkgs/applications/version-management/gitlab/default.nix +++ b/pkgs/applications/version-management/gitlab/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchurl, fetchFromGitLab, bundlerEnv -, ruby, tzdata, git, nettools, nixosTests, nodejs +, ruby, tzdata, git, nettools, nixosTests, nodejs, openssl , gitlabEnterprise ? false, callPackage, yarn , fixup_yarn_lock, replace }: @@ -28,6 +28,10 @@ let patches = [ ./fix-grpc-ar.patch ]; dontBuild = false; }; + # the openssl needs the openssl include files + openssl = x.openssl // { + buildInputs = [ openssl ]; + }; }; groups = [ "default" "unicorn" "ed25519" "metrics" "development" "puma" "test" "kerberos" diff --git a/pkgs/applications/version-management/gitlab/gitaly/Gemfile b/pkgs/applications/version-management/gitlab/gitaly/Gemfile index 8a35c8c3b475..cdb388b5d8df 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/Gemfile +++ b/pkgs/applications/version-management/gitlab/gitaly/Gemfile @@ -10,9 +10,9 @@ gem 'activesupport', '~> 6.0.3.1' gem 'rdoc', '~> 6.0' gem 'gitlab-gollum-lib', '~> 4.2.7.9', require: false gem 'gitlab-gollum-rugged_adapter', '~> 0.4.4.2', require: false -gem 'grpc', '~> 1.24.0' -gem 'sentry-raven', '~> 2.9.0', require: false -gem 'faraday', '~> 0.12' +gem 'grpc', '~> 1.30.2' +gem 'sentry-raven', '~> 3.0', require: false +gem 'faraday', '~> 1.0' gem 'rbtrace', require: false # Labkit provides observability functionality @@ -22,7 +22,7 @@ gem 'gitlab-labkit', '~> 0.12.0' # This version needs to be in sync with GitLab CE/EE gem 'licensee', '~> 8.9.0' -gem 'google-protobuf', '~> 3.8.0' +gem 'google-protobuf', '~> 3.12' group :development, :test do gem 'rubocop', '~> 0.69', require: false @@ -32,7 +32,7 @@ group :development, :test do gem 'factory_bot', require: false gem 'pry', '~> 0.12.2', require: false - gem 'grpc-tools', '= 1.0.1' + gem 'grpc-tools', '= 1.30.2' # gitlab-shell spec gems gem 'listen', '~> 0.5.0' diff --git a/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock b/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock index f409ebb9b414..143409eba6b5 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock +++ b/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock @@ -45,9 +45,9 @@ GEM escape_utils (1.2.1) factory_bot (5.0.2) activesupport (>= 4.2.0) - faraday (0.15.4) + faraday (1.0.1) multipart-post (>= 1.2, < 3) - ffi (1.12.2) + ffi (1.13.1) gemojione (3.3.0) json github-linguist (7.9.0) @@ -75,13 +75,13 @@ GEM opentracing (~> 0.4) redis (> 3.0.0, < 5.0.0) gitlab-markup (1.7.1) - google-protobuf (3.8.0) - googleapis-common-protos-types (1.0.4) - google-protobuf (~> 3.0) - grpc (1.24.0) - google-protobuf (~> 3.8) + google-protobuf (3.12.4) + googleapis-common-protos-types (1.0.5) + google-protobuf (~> 3.11) + grpc (1.30.2) + google-protobuf (~> 3.12) googleapis-common-protos-types (~> 1.0) - grpc-tools (1.0.1) + grpc-tools (1.30.2) hashdiff (0.3.9) i18n (1.8.2) concurrent-ruby (~> 1.0) @@ -100,20 +100,20 @@ GEM memoizable (0.4.2) thread_safe (~> 0.3, >= 0.3.1) method_source (0.9.2) - mime-types (3.2.2) + mime-types (3.3.1) mime-types-data (~> 3.2015) - mime-types-data (3.2019.0331) + mime-types-data (3.2020.0512) mini_mime (1.0.2) mini_portile2 (2.4.0) minitest (5.14.0) - msgpack (1.3.1) - multipart-post (2.0.0) - nokogiri (1.10.9) + msgpack (1.3.3) + multipart-post (2.1.1) + nokogiri (1.10.10) mini_portile2 (~> 2.4.0) nokogumbo (1.5.0) nokogiri opentracing (0.5.0) - optimist (3.0.0) + optimist (3.0.1) parallel (1.17.0) parser (2.7.0.5) ast (~> 2.4.0) @@ -135,13 +135,13 @@ GEM rails-html-sanitizer (1.3.0) loofah (~> 2.3) rainbow (3.0.0) - rbtrace (0.4.11) + rbtrace (0.4.14) ffi (>= 1.0.6) msgpack (>= 0.4.3) optimist (>= 3.0.0) rdoc (6.2.0) redis (4.1.3) - rouge (3.19.0) + rouge (3.20.0) rspec (3.8.0) rspec-core (~> 3.8.0) rspec-expectations (~> 3.8.0) @@ -175,8 +175,8 @@ GEM crass (~> 1.0.2) nokogiri (>= 1.4.4) nokogumbo (~> 1.4) - sentry-raven (2.9.0) - faraday (>= 0.7.6, < 1.0) + sentry-raven (3.0.4) + faraday (>= 1.0) simplecov (0.17.1) docile (~> 1.1) json (>= 1.8, < 3) @@ -211,15 +211,15 @@ DEPENDENCIES activesupport (~> 6.0.3.1) bundler (>= 1.17.3) factory_bot - faraday (~> 0.12) + faraday (~> 1.0) github-linguist (~> 7.9) gitlab-gollum-lib (~> 4.2.7.9) gitlab-gollum-rugged_adapter (~> 0.4.4.2) gitlab-labkit (~> 0.12.0) gitlab-markup (~> 1.7.1) - google-protobuf (~> 3.8.0) - grpc (~> 1.24.0) - grpc-tools (= 1.0.1) + google-protobuf (~> 3.12) + grpc (~> 1.30.2) + grpc-tools (= 1.30.2) licensee (~> 8.9.0) listen (~> 0.5.0) pry (~> 0.12.2) @@ -229,7 +229,7 @@ DEPENDENCIES rspec-parameterized rubocop (~> 0.69) rugged (~> 0.28) - sentry-raven (~> 2.9.0) + sentry-raven (~> 3.0) simplecov (~> 0.17.1) timecop vcr (~> 4.0.0) diff --git a/pkgs/applications/version-management/gitlab/gitaly/default.nix b/pkgs/applications/version-management/gitlab/gitaly/default.nix index 84cf1e500a22..91fbc657b2f0 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/default.nix +++ b/pkgs/applications/version-management/gitlab/gitaly/default.nix @@ -19,14 +19,14 @@ let }; }; in buildGoPackage rec { - version = "13.0.14"; + version = "13.4.3"; pname = "gitaly"; src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitaly"; rev = "v${version}"; - sha256 = "16ynkwiv0faa60msashj5w1bc4rdh7yv2qjmpcbf7dwq54gqmlbv"; + sha256 = "0gyy8l3xbdrpbq8zmdqvn7x34hxc48in4klhw5klacs1mgi3vqax"; }; # Fix a check which assumes that hook files are writeable by their @@ -44,7 +44,7 @@ in buildGoPackage rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ rubyEnv.wrappedRuby libgit2_0_27 ]; goDeps = ./deps.nix; - preBuild = "rm -r go/src/gitlab.com/gitlab-org/labkit/vendor"; + preBuild = "rm -rf go/src/gitlab.com/gitlab-org/labkit/vendor"; postInstall = '' mkdir -p $ruby diff --git a/pkgs/applications/version-management/gitlab/gitaly/deps.nix b/pkgs/applications/version-management/gitlab/gitaly/deps.nix index 221ce16163d8..95a7750efa7b 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/deps.nix +++ b/pkgs/applications/version-management/gitlab/gitaly/deps.nix @@ -1787,8 +1787,8 @@ fetch = { type = "git"; url = "https://gitlab.com/gitlab-org/gitlab-shell.git"; - rev = "716e30c55e89"; - sha256 = "0g2bgwm5rf93xfd40j3d2a5js1a212r2l2qdbds3gp7h0v73npjw"; + rev = "82ec8144fb2a"; + sha256 = "1gh3rwnd6688v7q07g2y69fdz2nyy7disjqifvbl7z1cpfw4h45b"; }; } { @@ -1796,8 +1796,8 @@ fetch = { type = "git"; url = "https://gitlab.com/gitlab-org/labkit.git"; - rev = "0149780c759d"; - sha256 = "1krp5jkwpckpdznbl9xp4yvq6cii750r24agcni3snbbs8hd8gb1"; + rev = "45895e129029"; + sha256 = "17adv1gcdg0jiy8i5lr064pm3p9ywq6s0iwh9w4q5pycp4qkmn48"; }; } { @@ -1913,8 +1913,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/text"; - rev = "v0.3.2"; - sha256 = "0flv9idw0jm5nm8lx25xqanbkqgfiym6619w575p7nrdh0riqwqh"; + rev = "v0.3.3"; + sha256 = "19pihqm3phyndmiw6i42pdv6z1rbvlqlsnhsyqf9gsnn0qnmqqlh"; }; } { diff --git a/pkgs/applications/version-management/gitlab/gitaly/fix-executable-check.patch b/pkgs/applications/version-management/gitlab/gitaly/fix-executable-check.patch index 65e130078b7f..7221377e33cd 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/fix-executable-check.patch +++ b/pkgs/applications/version-management/gitlab/gitaly/fix-executable-check.patch @@ -1,8 +1,8 @@ -diff --git a/internal/config/config.go b/internal/config/config.go -index 037c9602..3d5409dc 100644 ---- a/internal/config/config.go -+++ b/internal/config/config.go -@@ -185,7 +185,7 @@ func checkExecutable(path string) error { +diff --git a/internal/gitaly/config/config.go b/internal/gitaly/config/config.go +index 993e095d..f9bbb943 100644 +--- a/internal/gitaly/config/config.go ++++ b/internal/gitaly/config/config.go +@@ -217,7 +217,7 @@ func checkExecutable(path string) error { return err } diff --git a/pkgs/applications/version-management/gitlab/gitaly/gemset.nix b/pkgs/applications/version-management/gitlab/gitaly/gemset.nix index f693d5b4c7ba..d30b3a0a15f0 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/gemset.nix +++ b/pkgs/applications/version-management/gitlab/gitaly/gemset.nix @@ -203,20 +203,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0s72m05jvzc1pd6cw1i289chas399q0a14xrwg4rvkdwy7bgzrh0"; + sha256 = "0wwks9652xwgjm7yszcq5xr960pjypc07ivwzbjzpvy9zh2fw6iq"; type = "gem"; }; - version = "0.15.4"; + version = "1.0.1"; }; ffi = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "10lfhahnnc91v63xpvk65apn61pib086zha3z5sp1xk9acfx12h4"; + sha256 = "12lpwaw82bb0rm9f52v1498bpba8aj2l2q359mkwbxsswhpga5af"; type = "gem"; }; - version = "1.12.2"; + version = "1.13.1"; }; gemojione = { dependencies = ["json"]; @@ -294,10 +294,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0by3289irdklb9gjqw41fq6mg6yja3iyzh99dj8p8z9l4brllqn4"; + sha256 = "1m3la0yid3bqx9b30raisqbp27d0q7vdrlslazrdasf8v1vhifxj"; type = "gem"; }; - version = "3.8.0"; + version = "3.12.4"; }; googleapis-common-protos-types = { dependencies = ["google-protobuf"]; @@ -305,10 +305,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0hyr94cafiqj0k8q19hnl658pmbz2b404akikzfv4hdb1j1bwsg1"; + sha256 = "1aava1b75n056s24gn7ajrkmm6s3xa3swl62dl5q9apw4marghji"; type = "gem"; }; - version = "1.0.4"; + version = "1.0.5"; }; grpc = { dependencies = ["google-protobuf" "googleapis-common-protos-types"]; @@ -316,20 +316,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "18wikj9qd4jb4lks55cs2cf3q7fifnanm9z9ywnxhpj57vbnilpf"; + sha256 = "1rsglf7ag17n465iff7vlw83pn2rpl4kv9sb1rpf17nx6xpi7yl5"; type = "gem"; }; - version = "1.24.0"; + version = "1.30.2"; }; grpc-tools = { groups = ["development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0pjs2sm43mai2fy0jsbxl8rs9bych8f5j8hv630fjwh0323cmcc9"; + sha256 = "0k9zhsqhamp02ryzgfb4y2bbick151vlhrhj0kqbbz9lyhms0bd4"; type = "gem"; }; - version = "1.0.1"; + version = "1.30.2"; }; hashdiff = { groups = ["default" "development" "test"]; @@ -438,22 +438,24 @@ }; mime-types = { dependencies = ["mime-types-data"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0fjxy1jm52ixpnv3vg9ld9pr9f35gy0jp66i1njhqjvmnvq0iwwk"; + sha256 = "1zj12l9qk62anvk9bjvandpa6vy4xslil15wl6wlivyf51z773vh"; type = "gem"; }; - version = "3.2.2"; + version = "3.3.1"; }; mime-types-data = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1m00pg19cm47n1qlcxgl91ajh2yq0fszvn1vy8fy0s1jkrp9fw4a"; + sha256 = "1z75svngyhsglx0y2f9rnil2j08f9ab54b3l95bpgz67zq2if753"; type = "gem"; }; - version = "3.2019.0331"; + version = "3.2020.0512"; }; mini_mime = { groups = ["default"]; @@ -488,18 +490,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1qr2mkm2i3m76zarvy7qgjl9596hmvjrg7x6w42vx8cfsbf5p0y1"; + sha256 = "1lva6bkvb4mfa0m3bqn4lm4s4gi81c40jvdcsrxr6vng49q9daih"; type = "gem"; }; - version = "1.3.1"; + version = "1.3.3"; }; multipart-post = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "09k0b3cybqilk1gwrwwain95rdypixb2q9w65gd44gfzsd84xi1x"; + sha256 = "1zgw9zlwh2a6i1yvhhc4a84ry1hv824d6g2iw2chs3k5aylpmpfj"; type = "gem"; }; - version = "2.0.0"; + version = "2.1.1"; }; nokogiri = { dependencies = ["mini_portile2"]; @@ -507,10 +511,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "12j76d0bp608932xkzmfi638c7aqah57l437q8494znzbj610qnm"; + sha256 = "0xmf60nj5kg9vaj5bysy308687sgmkasgx06vbbnf94p52ih7si2"; type = "gem"; }; - version = "1.10.9"; + version = "1.10.10"; }; nokogumbo = { dependencies = ["nokogiri"]; @@ -532,12 +536,14 @@ version = "0.5.0"; }; optimist = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "05jxrp3nbn5iilc1k7ir90mfnwc5abc9h78s5rpm3qafwqxvcj4j"; + sha256 = "1vg2chy1cfmdj6c1gryl8zvjhhmb3plwgyh1jfnpq4fnfqv7asrk"; type = "gem"; }; - version = "3.0.0"; + version = "3.0.1"; }; parallel = { groups = ["default" "development" "test"]; @@ -647,12 +653,14 @@ }; rbtrace = { dependencies = ["ffi" "msgpack" "optimist"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1lwsq08i0aj8na5q5ba3gg02sx3wl58fi6m52svl5p7cy56ycdwi"; + sha256 = "0s8prj0klfgpmpfcpdzbf149qrrsdxgnb6w6kkqc9gyars4vyaqn"; type = "gem"; }; - version = "0.4.11"; + version = "0.4.14"; }; rdoc = { groups = ["default"]; @@ -679,10 +687,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "102rc07d78k5bkl0s9nd1gw6wz0w0zcvg4g5sl7z9xxi4r793c35"; + sha256 = "1r5npy9a95qh5v74lw7ir3nhaq4xrzyhfdixd7c5xy295i92nnic"; type = "gem"; }; - version = "3.19.0"; + version = "3.20.0"; }; rspec = { dependencies = ["rspec-core" "rspec-expectations" "rspec-mocks"]; @@ -803,10 +811,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1j9rwbig24ry0smgvmkzdjrzyszniaswipinvflzxzzaz52v7483"; + sha256 = "17j4br2lpnd8066d50mkg9kwk9v70hn3zfiqkvysd8p9nffmqnm0"; type = "gem"; }; - version = "2.9.0"; + version = "3.0.4"; }; simplecov = { dependencies = ["docile" "json" "simplecov-html"]; diff --git a/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix b/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix index 3e32e90a6d2a..3289697279fa 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix +++ b/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix @@ -2,12 +2,12 @@ buildGoPackage rec { pname = "gitlab-shell"; - version = "13.2.0"; + version = "13.7.0"; src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-shell"; rev = "v${version}"; - sha256 = "0drdpg4nmhzrmy8sl1f3hcd1278bpapgf0wmhi94xlyayh47j53a"; + sha256 = "1gh3rwnd6688v7q07g2y69fdz2nyy7disjqifvbl7z1cpfw4h45b"; }; buildInputs = [ ruby ]; @@ -17,6 +17,10 @@ buildGoPackage rec { goPackagePath = "gitlab.com/gitlab-org/gitlab-shell"; goDeps = ./deps.nix; + preBuild = '' + rm -rf "$NIX_BUILD_TOP/go/src/gitlab.com/gitlab-org/labkit/vendor" + ''; + postInstall = '' cp -r "$NIX_BUILD_TOP/go/src/$goPackagePath"/bin/* $out/bin cp -r "$NIX_BUILD_TOP/go/src/$goPackagePath"/{support,VERSION} $out/ diff --git a/pkgs/applications/version-management/gitlab/gitlab-shell/deps.nix b/pkgs/applications/version-management/gitlab/gitlab-shell/deps.nix index 72c0f2cdf513..43da3cd8b0b7 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-shell/deps.nix +++ b/pkgs/applications/version-management/gitlab/gitlab-shell/deps.nix @@ -14,8 +14,26 @@ fetch = { type = "git"; url = "https://github.com/googleapis/google-cloud-go"; - rev = "v0.26.0"; - sha256 = "149v3ci17g6wd2pm18mzcncq5qpl9hwdjnz3rlbn5rfidyn46la1"; + rev = "v0.50.0"; + sha256 = "0pbz5migljd5whxh6z1w79cwx93n85mcs3x1bckl27yzaa4lvqsl"; + }; + } + { + goPackagePath = "dmitri.shuralyov.com/gpu/mtl"; + fetch = { + type = "git"; + url = "https://dmitri.shuralyov.com/gpu/mtl"; + rev = "666a987793e9"; + sha256 = "1isd03hgiwcf2ld1rlp0plrnfz7r4i7c5q4kb6hkcd22axnmrv0z"; + }; + } + { + goPackagePath = "github.com/AndreasBriese/bbloom"; + fetch = { + type = "git"; + url = "https://github.com/AndreasBriese/bbloom"; + rev = "e2d15f34fcf9"; + sha256 = "05kkrsmpragy69bj6s80pxlm3pbwxrkkx7wgk0xigs6y2n6ylpds"; }; } { @@ -27,6 +45,60 @@ sha256 = "1fjdwwfzyzllgiwydknf1pwjvy49qxfsczqx5gz3y0izs7as99j6"; }; } + { + goPackagePath = "github.com/BurntSushi/xgb"; + fetch = { + type = "git"; + url = "https://github.com/BurntSushi/xgb"; + rev = "27f122750802"; + sha256 = "18lp2x8f5bljvlz0r7xn744f0c9rywjsb9ifiszqqdcpwhsa0kvj"; + }; + } + { + goPackagePath = "github.com/CloudyKit/fastprinter"; + fetch = { + type = "git"; + url = "https://github.com/CloudyKit/fastprinter"; + rev = "74b38d55f37a"; + sha256 = "07wkq3503j7sd5knsgp3lwzfdwm6sj7a3l6i71i52yb3fd8md235"; + }; + } + { + goPackagePath = "github.com/Joker/hpp"; + fetch = { + type = "git"; + url = "https://github.com/Joker/hpp"; + rev = "v1.0.0"; + sha256 = "1xnqkjkmqdj48w80qa74rwcmgar8dcilpkcrcn1f53djk45k1gq2"; + }; + } + { + goPackagePath = "github.com/Joker/jade"; + fetch = { + type = "git"; + url = "https://github.com/Joker/jade"; + rev = "d475f43051e7"; + sha256 = "0yigzvxp5qd05pai0yimzkpl2m23358a2fqqs585psrdmwsic2pn"; + }; + } + { + goPackagePath = "github.com/Shopify/goreferrer"; + fetch = { + type = "git"; + url = "https://github.com/Shopify/goreferrer"; + rev = "ec9c9a553398"; + sha256 = "0d740psj8czks1hl0nr6nlrwfbwq3nc51jj2p91d1wyhhmgn6jmn"; + }; + } + { + goPackagePath = "github.com/ajg/form"; + fetch = { + type = "git"; + url = "https://github.com/ajg/form"; + rev = "v1.5.1"; + sha256 = "1d6sxzzf9yycdf8jm5877y0khmhkmhxfw3sc4xpdcsrdlc7gqh5a"; + }; + } { goPackagePath = "github.com/alecthomas/template"; fetch = { @@ -45,6 +117,15 @@ sha256 = "1j65b91qb9sbrml9cpabfrcf07wmgzzghrl7809hjjhrmbzri5bl"; }; } + { + goPackagePath = "github.com/armon/consul-api"; + fetch = { + type = "git"; + url = "https://github.com/armon/consul-api"; + rev = "eb2c6b5be1b6"; + sha256 = "1j6fdr1sg36qy4n4xjl7brq739fpm5npq98cmvklzjc9qrx98nk9"; + }; + } { goPackagePath = "github.com/beorn7/perks"; fetch = { @@ -63,6 +144,33 @@ sha256 = "08l6lqaw83pva6fa0aafmhmy1mhb145av21772zfh3ij809a37i4"; }; } + { + goPackagePath = "github.com/chzyer/logex"; + fetch = { + type = "git"; + url = "https://github.com/chzyer/logex"; + rev = "v1.1.10"; + sha256 = "08pbjj3wx9acavlwyr055isa8a5hnmllgdv5k6ra60l5y1brmlq4"; + }; + } + { + goPackagePath = "github.com/chzyer/readline"; + fetch = { + type = "git"; + url = "https://github.com/chzyer/readline"; + rev = "2972be24d48e"; + sha256 = "104q8dazj8yf6b089jjr82fy9h1g80zyyzvp3g8b44a7d8ngjj6r"; + }; + } + { + goPackagePath = "github.com/chzyer/test"; + fetch = { + type = "git"; + url = "https://github.com/chzyer/test"; + rev = "a1ea475d72b1"; + sha256 = "0rns2aqk22i9xsgyap0pq8wi4cfaxsri4d9q6xxhhyma8jjsnj2k"; + }; + } { goPackagePath = "github.com/client9/misspell"; fetch = { @@ -72,6 +180,15 @@ sha256 = "1vwf33wsc4la25zk9nylpbp9px3svlmldkm0bha4hp56jws4q9cs"; }; } + { + goPackagePath = "github.com/client9/reopen"; + fetch = { + type = "git"; + url = "https://github.com/client9/reopen"; + rev = "v1.0.0"; + sha256 = "0f0dpdbmvk7w518c6zjhlmp65y55vvx47x4lq9pgzvcbsvjsf18s"; + }; + } { goPackagePath = "github.com/cloudflare/tableflip"; fetch = { @@ -90,6 +207,51 @@ sha256 = "1zampgfjbxy192cbwdi7g86l1idxaam96d834wncnpfdwgh5kl57"; }; } + { + goPackagePath = "github.com/codegangsta/inject"; + fetch = { + type = "git"; + url = "https://github.com/codegangsta/inject"; + rev = "33e0aa1cb7c0"; + sha256 = "1jqakr3z9l60qhcgrdzsb6rlk8ikcamisw0g2ndmrf27s0ibfcaj"; + }; + } + { + goPackagePath = "github.com/coreos/etcd"; + fetch = { + type = "git"; + url = "https://github.com/coreos/etcd"; + rev = "v3.3.10"; + sha256 = "1x2ii1hj8jraba8rbxz6dmc03y3sjxdnzipdvg6fywnlq1f3l3wl"; + }; + } + { + goPackagePath = "github.com/coreos/go-etcd"; + fetch = { + type = "git"; + url = "https://github.com/coreos/go-etcd"; + rev = "v2.0.0"; + sha256 = "1xb34hzaa1lkbq5vkzy9vcz6gqwj7hp6cdbvyack2bf28dwn33jj"; + }; + } + { + goPackagePath = "github.com/coreos/go-semver"; + fetch = { + type = "git"; + url = "https://github.com/coreos/go-semver"; + rev = "v0.2.0"; + sha256 = "1gghi5bnqj50hfxhqc1cxmynqmh2yk9ii7ab9gsm75y5cp94ymk0"; + }; + } + { + goPackagePath = "github.com/cpuguy83/go-md2man"; + fetch = { + type = "git"; + url = "https://github.com/cpuguy83/go-md2man"; + rev = "v1.0.10"; + sha256 = "1bqkf2bvy1dns9zd24k81mh2p1zxsx2nhq5cj8dz2vgkv1xkh60i"; + }; + } { goPackagePath = "github.com/davecgh/go-spew"; fetch = { @@ -99,6 +261,87 @@ sha256 = "0hka6hmyvp701adzag2g26cxdj47g21x6jz4sc6jjz1mn59d474y"; }; } + { + goPackagePath = "github.com/dgraph-io/badger"; + fetch = { + type = "git"; + url = "https://github.com/dgraph-io/badger"; + rev = "v1.6.0"; + sha256 = "1vzibjqhb10q6s2chbzlwndij2d9ybjnq7h28hx4akr119avd0d5"; + }; + } + { + goPackagePath = "github.com/dgrijalva/jwt-go"; + fetch = { + type = "git"; + url = "https://github.com/dgrijalva/jwt-go"; + rev = "v3.2.0"; + sha256 = "08m27vlms74pfy5z79w67f9lk9zkx6a9jd68k3c4msxy75ry36mp"; + }; + } + { + goPackagePath = "github.com/dgryski/go-farm"; + fetch = { + type = "git"; + url = "https://github.com/dgryski/go-farm"; + rev = "6a90982ecee2"; + sha256 = "1x3l4jgps0v1bjvd446kj4dp0ckswjckxgrng9afm275ixnf83ix"; + }; + } + { + goPackagePath = "github.com/dustin/go-humanize"; + fetch = { + type = "git"; + url = "https://github.com/dustin/go-humanize"; + rev = "v1.0.0"; + sha256 = "1kqf1kavdyvjk7f8kx62pnm7fbypn9z1vbf8v2qdh3y7z7a0cbl3"; + }; + } + { + goPackagePath = "github.com/eknkc/amber"; + fetch = { + type = "git"; + url = "https://github.com/eknkc/amber"; + rev = "cdade1c07385"; + sha256 = "152w97yckwncgw7lwjvgd8d00wy6y0nxzlvx72kl7nqqxs9vhxd9"; + }; + } + { + goPackagePath = "github.com/etcd-io/bbolt"; + fetch = { + type = "git"; + url = "https://github.com/etcd-io/bbolt"; + rev = "v1.3.3"; + sha256 = "0dn0zngks9xiz0rrrb3911f73ghl64z84jsmzai2yfmzqr7cdkqc"; + }; + } + { + goPackagePath = "github.com/fasthttp-contrib/websocket"; + fetch = { + type = "git"; + url = "https://github.com/fasthttp-contrib/websocket"; + rev = "1f3b11f56072"; + sha256 = "1yacmwmil625p0pzj800h9dnmiab6bjwfmi48p9fcrvy2yyv9b97"; + }; + } + { + goPackagePath = "github.com/fatih/structs"; + fetch = { + type = "git"; + url = "https://github.com/fatih/structs"; + rev = "v1.1.0"; + sha256 = "1wrhb8wp8zpzggl61lapb627lw8yv281abvr6vqakmf569nswa9q"; + }; + } + { + goPackagePath = "github.com/flosch/pongo2"; + fetch = { + type = "git"; + url = "https://github.com/flosch/pongo2"; + rev = "bbf5a6c351f4"; + sha256 = "0yqh58phznnxakm64w82gawrpndb0r85vsd1s7h244qqrq7w4avq"; + }; + } { goPackagePath = "github.com/fsnotify/fsnotify"; fetch = { @@ -108,6 +351,15 @@ sha256 = "07va9crci0ijlivbb7q57d2rz9h27zgn2fsm60spjsqpdbvyrx4g"; }; } + { + goPackagePath = "github.com/gavv/httpexpect"; + fetch = { + type = "git"; + url = "https://github.com/gavv/httpexpect"; + rev = "v2.0.0"; + sha256 = "0dqb7lsinciz594q6jg59hrvk4g4awbs2ybsr580j22j2xag53vs"; + }; + } { goPackagePath = "github.com/getsentry/raven-go"; fetch = { @@ -117,6 +369,60 @@ sha256 = "1dl80kar4lzdcfl3w6jssi1ld6bv0rmx6sp6bz6rzysfr9ilm02z"; }; } + { + goPackagePath = "github.com/getsentry/sentry-go"; + fetch = { + type = "git"; + url = "https://github.com/getsentry/sentry-go"; + rev = "v0.5.1"; + sha256 = "1kfn0gcb4c6amhagv04ydpl6p9cqw7f0lxas688a0rf89iwdzz89"; + }; + } + { + goPackagePath = "github.com/gin-contrib/sse"; + fetch = { + type = "git"; + url = "https://github.com/gin-contrib/sse"; + rev = "5545eab6dad3"; + sha256 = "0jhcvi66rn7c1wg3rf7q7sylrvlk7c40yk79c5lypnz1dpsdcrb5"; + }; + } + { + goPackagePath = "github.com/gin-gonic/gin"; + fetch = { + type = "git"; + url = "https://github.com/gin-gonic/gin"; + rev = "v1.4.0"; + sha256 = "19nxip48p2s8l7p1p7wpd5li2fcngi4c58rgcg71izdmsmj2iw1d"; + }; + } + { + goPackagePath = "github.com/go-check/check"; + fetch = { + type = "git"; + url = "https://github.com/go-check/check"; + rev = "788fd7840127"; + sha256 = "0v3bim0j375z81zrpr5qv42knqs0y2qv2vkjiqi5axvb78slki1a"; + }; + } + { + goPackagePath = "github.com/go-errors/errors"; + fetch = { + type = "git"; + url = "https://github.com/go-errors/errors"; + rev = "v1.0.1"; + sha256 = "0rznpknk19rxkr7li6dqs52c26pjazp69lh493l4ny4sxn5922lp"; + }; + } + { + goPackagePath = "github.com/go-gl/glfw"; + fetch = { + type = "git"; + url = "https://github.com/go-gl/glfw"; + rev = "12ad95a8df72"; + sha256 = "0ahw4a1lk7wqn6m0sjngsv2zc08kxxj259ai6g4kf11lmidszm9s"; + }; + } { goPackagePath = "github.com/go-kit/kit"; fetch = { @@ -135,6 +441,15 @@ sha256 = "1gkgh3k5w1xwb2qbjq52p6azq3h1c1rr6pfwjlwj1zrijpzn2xb9"; }; } + { + goPackagePath = "github.com/go-martini/martini"; + fetch = { + type = "git"; + url = "https://github.com/go-martini/martini"; + rev = "22fa46961aab"; + sha256 = "01ip3mwbnm5isq120ww73yrvbcn6n5944prhhbyf2ggyf6g46ylh"; + }; + } { goPackagePath = "github.com/go-stack/stack"; fetch = { @@ -144,6 +459,33 @@ sha256 = "0wk25751ryyvxclyp8jdk5c3ar0cmfr8lrjb66qbg4808x66b96v"; }; } + { + goPackagePath = "github.com/gobwas/httphead"; + fetch = { + type = "git"; + url = "https://github.com/gobwas/httphead"; + rev = "2c6c146eadee"; + sha256 = "0j7nlrf79cafl8ap69ri2c7v3psr2y133cr2wn735z7yn3dz3kss"; + }; + } + { + goPackagePath = "github.com/gobwas/pool"; + fetch = { + type = "git"; + url = "https://github.com/gobwas/pool"; + rev = "v0.2.0"; + sha256 = "1avpa8c75j1y4hs7awazrjjy7w0pjfw80l424ddn5zyizvh7s67i"; + }; + } + { + goPackagePath = "github.com/gobwas/ws"; + fetch = { + type = "git"; + url = "https://github.com/gobwas/ws"; + rev = "v1.0.2"; + sha256 = "070mfcjbfb40bglc9aw9zjvd4jb1hp3l1s12ww6mjlwbjcg0mm9s"; + }; + } { goPackagePath = "github.com/gogo/protobuf"; fetch = { @@ -162,6 +504,15 @@ sha256 = "0jb2834rw5sykfr937fxi8hxi2zy80sj2bdn9b3jb4b26ksqng30"; }; } + { + goPackagePath = "github.com/golang/groupcache"; + fetch = { + type = "git"; + url = "https://github.com/golang/groupcache"; + rev = "215e87163ea7"; + sha256 = "07555csk49ara636bhl2vbzziayls3qks8964z0q29g065zliy9j"; + }; + } { goPackagePath = "github.com/golang/lint"; fetch = { @@ -176,8 +527,8 @@ fetch = { type = "git"; url = "https://github.com/golang/mock"; - rev = "v1.1.1"; - sha256 = "0ap8wb6pdl6ccmdb43advjll2ly4sz26wsc3axw0hbrjrybybzgy"; + rev = "v1.3.1"; + sha256 = "1wnfa8njxdym1qb664dmfnkpm4pmqy22hqjlqpwaaiqhglb5g9d1"; }; } { @@ -189,13 +540,67 @@ sha256 = "1k1wb4zr0qbwgpvz9q5ws9zhlal8hq7dmq62pwxxriksayl6hzym"; }; } + { + goPackagePath = "github.com/gomodule/redigo"; + fetch = { + type = "git"; + url = "https://github.com/gomodule/redigo"; + rev = "574c33c3df38"; + sha256 = "1qpw8mq9xqj1hmpag1av941swkx39qikahsajyhn34rc2q54f4z6"; + }; + } + { + goPackagePath = "github.com/google/btree"; + fetch = { + type = "git"; + url = "https://github.com/google/btree"; + rev = "v1.0.0"; + sha256 = "0ba430m9fbnagacp57krgidsyrgp3ycw5r7dj71brgp5r52g82p6"; + }; + } { goPackagePath = "github.com/google/go-cmp"; fetch = { type = "git"; url = "https://github.com/google/go-cmp"; - rev = "v0.2.0"; - sha256 = "1fbv0x27k9sn8svafc0hjwsnckk864lv4yi7bvzrxvmd3d5hskds"; + rev = "v0.4.0"; + sha256 = "1x5pvl3fb5sbyng7i34431xycnhmx8xx94gq2n19g6p0vz68z2v2"; + }; + } + { + goPackagePath = "github.com/google/go-querystring"; + fetch = { + type = "git"; + url = "https://github.com/google/go-querystring"; + rev = "v1.0.0"; + sha256 = "0xl12bqyvmn4xcnf8p9ksj9rmnr7s40pvppsdmy8n9bzw1db0iwz"; + }; + } + { + goPackagePath = "github.com/google/martian"; + fetch = { + type = "git"; + url = "https://github.com/google/martian"; + rev = "v2.1.0"; + sha256 = "197hil6vrjk50b9wvwyzf61csid83whsjj6ik8mc9r2lryxlyyrp"; + }; + } + { + goPackagePath = "github.com/google/pprof"; + fetch = { + type = "git"; + url = "https://github.com/google/pprof"; + rev = "d4f498aebedc"; + sha256 = "1r4pn70yy5vfl38jx9v8224n7jkhcm5wg28vv48izgznlgv7h024"; + }; + } + { + goPackagePath = "github.com/google/renameio"; + fetch = { + type = "git"; + url = "https://github.com/google/renameio"; + rev = "v0.1.0"; + sha256 = "1ki2x5a9nrj17sn092d6n4zr29lfg5ydv4xz5cp58z6cw8ip43jx"; }; } { @@ -207,6 +612,33 @@ sha256 = "0hfxcf9frkb57k6q0rdkrmnfs78ms21r1qfk9fhlqga2yh5xg8zb"; }; } + { + goPackagePath = "github.com/googleapis/gax-go"; + fetch = { + type = "git"; + url = "https://github.com/googleapis/gax-go"; + rev = "v2.0.5"; + sha256 = "1lxawwngv6miaqd25s3ba0didfzylbwisd2nz7r4gmbmin6jsjrx"; + }; + } + { + goPackagePath = "github.com/gopherjs/gopherjs"; + fetch = { + type = "git"; + url = "https://github.com/gopherjs/gopherjs"; + rev = "0766667cb4d1"; + sha256 = "13pfc9sxiwjky2lm1xb3i3lcisn8p6mgjk2d927l7r92ysph8dmw"; + }; + } + { + goPackagePath = "github.com/gorilla/websocket"; + fetch = { + type = "git"; + url = "https://github.com/gorilla/websocket"; + rev = "v1.4.0"; + sha256 = "00i4vb31nsfkzzk7swvx3i75r2d960js3dri1875vypk3v2s0pzk"; + }; + } { goPackagePath = "github.com/grpc-ecosystem/go-grpc-middleware"; fetch = { @@ -225,6 +657,33 @@ sha256 = "1lzk54h7np32b3acidg1ggbn8ppbnns0m71gcg9d1qkkdh8zrijl"; }; } + { + goPackagePath = "github.com/hashicorp/go-version"; + fetch = { + type = "git"; + url = "https://github.com/hashicorp/go-version"; + rev = "v1.2.0"; + sha256 = "1bwi6y6111xq8ww8kjq0w1cmz15l1h9hb2id6596l8l0ag1vjj1z"; + }; + } + { + goPackagePath = "github.com/hashicorp/golang-lru"; + fetch = { + type = "git"; + url = "https://github.com/hashicorp/golang-lru"; + rev = "v0.5.1"; + sha256 = "13f870cvk161bzjj6x41l45r5x9i1z9r2ymwmvm7768kg08zznpy"; + }; + } + { + goPackagePath = "github.com/hashicorp/hcl"; + fetch = { + type = "git"; + url = "https://github.com/hashicorp/hcl"; + rev = "v1.0.0"; + sha256 = "0q6ml0qqs0yil76mpn4mdx4lp94id8vbv575qm60jzl1ijcl5i66"; + }; + } { goPackagePath = "github.com/hpcloud/tail"; fetch = { @@ -234,6 +693,69 @@ sha256 = "1njpzc0pi1acg5zx9y6vj9xi6ksbsc5d387rd6904hy6rh2m6kn0"; }; } + { + goPackagePath = "github.com/ianlancetaylor/demangle"; + fetch = { + type = "git"; + url = "https://github.com/ianlancetaylor/demangle"; + rev = "5e5cf60278f6"; + sha256 = "1fhjk11cip9c3jyj1byz9z77n6n2rlxmyz0xjx1zpn1da3cvri75"; + }; + } + { + goPackagePath = "github.com/imkira/go-interpol"; + fetch = { + type = "git"; + url = "https://github.com/imkira/go-interpol"; + rev = "v1.1.0"; + sha256 = "180h3pf2p0pch6hmqf45wk7wd87md83d3p122f8ll43x5nja5mph"; + }; + } + { + goPackagePath = "github.com/inconshreveable/mousetrap"; + fetch = { + type = "git"; + url = "https://github.com/inconshreveable/mousetrap"; + rev = "v1.0.0"; + sha256 = "1mn0kg48xkd74brf48qf5hzp0bc6g8cf5a77w895rl3qnlpfw152"; + }; + } + { + goPackagePath = "github.com/iris-contrib/blackfriday"; + fetch = { + type = "git"; + url = "https://github.com/iris-contrib/blackfriday"; + rev = "v2.0.0"; + sha256 = "1gkizavajqmxm79il8r6cbi0g9ls3vwdh9wr0zy89vc9sq17p3im"; + }; + } + { + goPackagePath = "github.com/iris-contrib/go.uuid"; + fetch = { + type = "git"; + url = "https://github.com/iris-contrib/go.uuid"; + rev = "v2.0.0"; + sha256 = "0nc0ggn0a6bcwdrwinnx3z6889x65c20a2dwja0n8can3xblxs35"; + }; + } + { + goPackagePath = "github.com/iris-contrib/i18n"; + fetch = { + type = "git"; + url = "https://github.com/iris-contrib/i18n"; + rev = "987a633949d0"; + sha256 = "0yslm7hmacc57v970jbys4x5c5yxgcjgff982ngivg9v1a16kifq"; + }; + } + { + goPackagePath = "github.com/iris-contrib/schema"; + fetch = { + type = "git"; + url = "https://github.com/iris-contrib/schema"; + rev = "v0.0.1"; + sha256 = "1a1lk2ll2xv3ljffmfw4q8mqqw727pj8dzs6c8g2hh0b0b050g79"; + }; + } { goPackagePath = "github.com/json-iterator/go"; fetch = { @@ -243,6 +765,51 @@ sha256 = "08caswxvdn7nvaqyj5kyny6ghpygandlbw9vxdj7l5vkp7q0s43r"; }; } + { + goPackagePath = "github.com/jstemmer/go-junit-report"; + fetch = { + type = "git"; + url = "https://github.com/jstemmer/go-junit-report"; + rev = "v0.9.1"; + sha256 = "1knip80yir1cdsjlb3rzy0a4w3kl4ljpiciaz6hjzwqlfhnv7bkw"; + }; + } + { + goPackagePath = "github.com/jtolds/gls"; + fetch = { + type = "git"; + url = "https://github.com/jtolds/gls"; + rev = "v4.20.0"; + sha256 = "1k7xd2q2ysv2xsh373qs801v6f359240kx0vrl0ydh7731lngvk6"; + }; + } + { + goPackagePath = "github.com/juju/errors"; + fetch = { + type = "git"; + url = "https://github.com/juju/errors"; + rev = "089d3ea4e4d5"; + sha256 = "056za75j1zgksky7pbf0pkjqz5ha15g3wj3p4ma10m9sywdyq79r"; + }; + } + { + goPackagePath = "github.com/juju/loggo"; + fetch = { + type = "git"; + url = "https://github.com/juju/loggo"; + rev = "584905176618"; + sha256 = "0hzi0652y74jf62wwyi9gf8bzrs7ynvhjfqc8rwr4l799d7i5gd4"; + }; + } + { + goPackagePath = "github.com/juju/testing"; + fetch = { + type = "git"; + url = "https://github.com/juju/testing"; + rev = "472a3e8b2073"; + sha256 = "05wjc2k0kwbam7anaxwnj30pl03dcdbrsz32icd70zl70ipsqsw4"; + }; + } { goPackagePath = "github.com/julienschmidt/httprouter"; fetch = { @@ -252,6 +819,51 @@ sha256 = "1k8bylc9s4vpvf5xhqh9h246dl1snxrzzz0614zz88cdh8yzs666"; }; } + { + goPackagePath = "github.com/k0kubun/colorstring"; + fetch = { + type = "git"; + url = "https://github.com/k0kubun/colorstring"; + rev = "9440f1994b88"; + sha256 = "0isskya7ky4k9znrh85crfc2pxwyfz2s8j1a5cbjb8b8zf2v0qbj"; + }; + } + { + goPackagePath = "github.com/kataras/golog"; + fetch = { + type = "git"; + url = "https://github.com/kataras/golog"; + rev = "v0.0.9"; + sha256 = "160hd3z93c9i33q9g1bhfdxmsqg1lanncnrqcsr2444dy5j6ly3i"; + }; + } + { + goPackagePath = "github.com/kataras/iris"; + fetch = { + type = "git"; + url = "https://github.com/kataras/iris"; + rev = "v12.0.1"; + sha256 = "0k1jhamvf0byx6d317gzg6r2jls7bajhhf2spvdinarl2cjnakm5"; + }; + } + { + goPackagePath = "github.com/kataras/neffos"; + fetch = { + type = "git"; + url = "https://github.com/kataras/neffos"; + rev = "v0.0.10"; + sha256 = "0mkqrxff28rcc71nw5qqsywn0fm2jz7magwp9hhvh1s01lgghjdp"; + }; + } + { + goPackagePath = "github.com/kataras/pio"; + fetch = { + type = "git"; + url = "https://github.com/kataras/pio"; + rev = "ea782b38602d"; + sha256 = "0ca29wmkpx19qwnvi4fja3avkxkzz14x9wyzmg1l9074bxbj8cgj"; + }; + } { goPackagePath = "github.com/kelseyhightower/envconfig"; fetch = { @@ -270,13 +882,31 @@ sha256 = "14af2pa0ssyp8bp2mvdw184s5wcysk6akil3wzxmr05wwy951iwn"; }; } + { + goPackagePath = "github.com/klauspost/compress"; + fetch = { + type = "git"; + url = "https://github.com/klauspost/compress"; + rev = "v1.9.0"; + sha256 = "07vndz6mdaliwagj2xq0y5c5w2zld14p9i5y7r0bkhb7klfyamfk"; + }; + } + { + goPackagePath = "github.com/klauspost/cpuid"; + fetch = { + type = "git"; + url = "https://github.com/klauspost/cpuid"; + rev = "v1.2.1"; + sha256 = "1071wchrs37bvpb99fwf19fjrpz0yaqipi2y2hjvim419flvd49x"; + }; + } { goPackagePath = "github.com/konsorten/go-windows-terminal-sequences"; fetch = { type = "git"; url = "https://github.com/konsorten/go-windows-terminal-sequences"; - rev = "v1.0.1"; - sha256 = "1lchgf27n276vma6iyxa0v1xds68n2g8lih5lavqnx5x6q5pw2ip"; + rev = "v1.0.2"; + sha256 = "09mn209ika7ciy87xf2x31dq5fnqw39jidgaljvmqxwk7ff1hnx7"; }; } { @@ -288,6 +918,51 @@ 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/labstack/echo"; + fetch = { + type = "git"; + url = "https://github.com/labstack/echo"; + rev = "v4.1.11"; + sha256 = "0b14vgwzznn7wzyjb98xdmq4wjg16l3y62njiwfz4qsm4pwzk405"; + }; + } + { + goPackagePath = "github.com/labstack/gommon"; + fetch = { + type = "git"; + url = "https://github.com/labstack/gommon"; + rev = "v0.3.0"; + sha256 = "18z7akyzm75p6anm4b8qkqgm4iivx50z07hi5wf50w1pbsvbcdi0"; + }; + } { goPackagePath = "github.com/libgit2/git2go"; fetch = { @@ -306,6 +981,33 @@ sha256 = "10n5r66g44s6rnz5kf86s4a3p1g55kc1kxqhnk7bx7mlayndgpmb"; }; } + { + goPackagePath = "github.com/magiconair/properties"; + fetch = { + type = "git"; + url = "https://github.com/magiconair/properties"; + rev = "v1.8.0"; + sha256 = "1a10362wv8a8qwb818wygn2z48lgzch940hvpv81hv8gc747ajxn"; + }; + } + { + goPackagePath = "github.com/mattn/go-colorable"; + fetch = { + type = "git"; + url = "https://github.com/mattn/go-colorable"; + rev = "v0.1.2"; + sha256 = "0512jm3wmzkkn7d99x9wflyqf48n5ri3npy1fqkq6l6adc5mni3n"; + }; + } + { + goPackagePath = "github.com/mattn/go-isatty"; + fetch = { + type = "git"; + url = "https://github.com/mattn/go-isatty"; + rev = "v0.0.9"; + sha256 = "0i3km37lajahh1y2392g4hpgvq05arcgiiv93yhzxxyv0fpqj72m"; + }; + } { goPackagePath = "github.com/mattn/go-shellwords"; fetch = { @@ -315,6 +1017,15 @@ sha256 = "08zcgr1az1n8zaxzwdd205j86hczgyc52nxfnw5avpw7rrkf7v0d"; }; } + { + goPackagePath = "github.com/mattn/goveralls"; + fetch = { + type = "git"; + url = "https://github.com/mattn/goveralls"; + rev = "v0.0.2"; + sha256 = "13ffdikvc594g1mryhi94m87skr7irwkjnpxp8ad2kprn6syfslp"; + }; + } { goPackagePath = "github.com/matttproud/golang_protobuf_extensions"; fetch = { @@ -324,6 +1035,51 @@ sha256 = "1d0c1isd2lk9pnfq2nk0aih356j30k3h1gi2w0ixsivi5csl7jya"; }; } + { + goPackagePath = "github.com/mediocregopher/mediocre-go-lib"; + fetch = { + type = "git"; + url = "https://github.com/mediocregopher/mediocre-go-lib"; + rev = "cb65787f37ed"; + sha256 = "0lg6q76fxjhxv05m80k4l6nrkj9qwzafs2mb2gbvhznxh8m0cv9j"; + }; + } + { + goPackagePath = "github.com/mediocregopher/radix"; + fetch = { + type = "git"; + url = "https://github.com/mediocregopher/radix"; + rev = "v3.3.0"; + sha256 = "0pchn5z2g4wnf87350war5fr9pqpdksia1ffvw7cphg4q9blggfx"; + }; + } + { + goPackagePath = "github.com/microcosm-cc/bluemonday"; + fetch = { + type = "git"; + url = "https://github.com/microcosm-cc/bluemonday"; + rev = "v1.0.2"; + sha256 = "0j0aylsxqjcj49w7ph8cmpaqjlpvg7mb5mrcrd9bg71dlb9z9ir2"; + }; + } + { + goPackagePath = "github.com/mitchellh/go-homedir"; + fetch = { + type = "git"; + url = "https://github.com/mitchellh/go-homedir"; + rev = "v1.1.0"; + sha256 = "0ydzkipf28hwj2bfxqmwlww47khyk6d152xax4bnyh60f4lq3nx1"; + }; + } + { + goPackagePath = "github.com/mitchellh/mapstructure"; + fetch = { + type = "git"; + url = "https://github.com/mitchellh/mapstructure"; + rev = "v1.1.2"; + sha256 = "03bpv28jz9zhn4947saqwi328ydj7f6g6pf1m2d4m5zdh5jlfkrr"; + }; + } { goPackagePath = "github.com/modern-go/concurrent"; fetch = { @@ -342,6 +1098,15 @@ sha256 = "06a3sablw53n1dqqbr2f53jyksbxdmmk8axaas4yvnhyfi55k4lf"; }; } + { + goPackagePath = "github.com/moul/http2curl"; + fetch = { + type = "git"; + url = "https://github.com/moul/http2curl"; + rev = "v1.0.0"; + sha256 = "15bpx33d3ygya8dg8hbsn24h7acpajl27006pj8lw1c0bfvbnrl0"; + }; + } { goPackagePath = "github.com/mwitkow/go-conntrack"; fetch = { @@ -351,13 +1116,40 @@ sha256 = "0nbrnpk7bkmqg9mzwsxlm0y8m7s9qd9phr1q30qlx2qmdmz7c1mf"; }; } + { + goPackagePath = "github.com/nats-io/nats.go"; + fetch = { + type = "git"; + url = "https://github.com/nats-io/nats.go"; + rev = "v1.8.1"; + sha256 = "0h9zzpjl6ac227bhf0i4ram9a5jlibq53pawv0zzxdirxrnp1vkj"; + }; + } + { + goPackagePath = "github.com/nats-io/nkeys"; + fetch = { + type = "git"; + url = "https://github.com/nats-io/nkeys"; + rev = "v0.0.2"; + sha256 = "0kibc1g60w031rssk3vs74gfick3jdl3igckn1v4k8b5grawcks1"; + }; + } + { + goPackagePath = "github.com/nats-io/nuid"; + fetch = { + type = "git"; + url = "https://github.com/nats-io/nuid"; + rev = "v1.0.1"; + sha256 = "11zbhg4kds5idsya04bwz4plj0mmiigypzppzih731ppbk2ms1zg"; + }; + } { goPackagePath = "github.com/onsi/ginkgo"; fetch = { type = "git"; url = "https://github.com/onsi/ginkgo"; - rev = "v1.7.0"; - sha256 = "14wgpdrvpc35rdz3859bz53sc1g4vpr1fysy15wy3ff9gmqs14yg"; + rev = "v1.10.3"; + sha256 = "00a40by9f5ylycnar8h3p9b4z5rcsvfvg4j3v5s5mchdqrqjv1pc"; }; } { @@ -365,8 +1157,8 @@ fetch = { type = "git"; url = "https://github.com/onsi/gomega"; - rev = "v1.4.3"; - sha256 = "1c8rqg5i2hz3snmq7s41yar1zjnzilb0fyiyhkg83v97afcfx79v"; + rev = "v1.7.1"; + sha256 = "06p3x0910cdaa64l7d44s728d4j3yhps315dlcvrbjzhljjj7mam"; }; } { @@ -387,13 +1179,31 @@ sha256 = "0xmy0kfcx48q10s040579pcjswfaxlwhv7a2z07z9r92fdrgw03k"; }; } + { + goPackagePath = "github.com/otiai10/curr"; + fetch = { + type = "git"; + url = "https://github.com/otiai10/curr"; + rev = "v1.0.0"; + sha256 = "0fpw20adq2wff7l4c87zaavj9jra4d64a8bbjixiiv3bbarim987"; + }; + } { goPackagePath = "github.com/otiai10/mint"; fetch = { type = "git"; url = "https://github.com/otiai10/mint"; - rev = "v1.2.3"; - sha256 = "00slgv9mw2m22ix5prz2a98ji6kpzr0ap6bqs568rfdmk6hm5f0k"; + rev = "v1.3.0"; + sha256 = "0kfc95jc2hfgwzcpdfa5hrxgj7s6rzx5jc0n1sn863bsngx2q1ca"; + }; + } + { + goPackagePath = "github.com/pelletier/go-toml"; + fetch = { + type = "git"; + url = "https://github.com/pelletier/go-toml"; + rev = "v1.2.0"; + sha256 = "1fjzpcjng60mc3a4b2ql5a00d5gah84wj740dabv9kq67mpg8fxy"; }; } { @@ -405,13 +1215,22 @@ sha256 = "1pg84khadh79v42y8sjsdgfb54vw2kzv7hpapxkifgj0yvcp30g2"; }; } + { + goPackagePath = "github.com/pingcap/errors"; + fetch = { + type = "git"; + url = "https://github.com/pingcap/errors"; + rev = "v0.11.4"; + sha256 = "02k6b30m42aya763fnwx3paq4r8h28yav4i2kv2z4r28r70xxcgn"; + }; + } { goPackagePath = "github.com/pkg/errors"; fetch = { type = "git"; url = "https://github.com/pkg/errors"; - rev = "v0.8.0"; - sha256 = "001i6n71ghp2l6kdl3qq1v2vmghcz3kicv9a5wgcihrzigm75pp5"; + rev = "v0.8.1"; + sha256 = "0g5qcb4d4fd96midz0zdk8b9kz8xkzwfa8kr1cliqbg8sxsy5vd1"; }; } { @@ -437,8 +1256,8 @@ fetch = { type = "git"; url = "https://github.com/prometheus/client_model"; - rev = "fd36f4220a90"; - sha256 = "1bs5d72k361llflgl94c22n0w53j30rsfh84smgk8mbjbcmjsaa5"; + rev = "14fe0d1b01d4"; + sha256 = "0zdmk6rbbx39cvfz0r59v2jg5sg9yd02b4pds5n5llgvivi99550"; }; } { @@ -459,13 +1278,139 @@ sha256 = "0s7pvs7fgnfpmym3cd0k219av321h9sf3yvdlnn3qy0ps280lg7k"; }; } + { + goPackagePath = "github.com/rogpeppe/go-internal"; + fetch = { + type = "git"; + url = "https://github.com/rogpeppe/go-internal"; + rev = "v1.3.0"; + sha256 = "0mcdh1licgnnahwml9y2iq6xy5x9xmjw5frcnds2s3wpjyqrl216"; + }; + } + { + goPackagePath = "github.com/russross/blackfriday"; + fetch = { + type = "git"; + url = "https://github.com/russross/blackfriday"; + rev = "v1.5.2"; + sha256 = "0jzbfzcywqcrnym4gxlz6nphmm1grg6wsl4f0r9x384rn83wkj7c"; + }; + } + { + goPackagePath = "github.com/ryanuber/columnize"; + fetch = { + type = "git"; + url = "https://github.com/ryanuber/columnize"; + rev = "v2.1.0"; + sha256 = "0m9jhagb1k44zfcdai76xdf9vpi3bqdl7p078ffyibmz0z9jfap6"; + }; + } + { + goPackagePath = "github.com/sebest/xff"; + fetch = { + type = "git"; + url = "https://github.com/sebest/xff"; + rev = "6c115e0ffa35"; + sha256 = "0l11d8mc870vxzgi74cc9dqr7kgxjmbfkfi53gc30rsyx877jx4h"; + }; + } + { + goPackagePath = "github.com/sergi/go-diff"; + fetch = { + type = "git"; + url = "https://github.com/sergi/go-diff"; + rev = "v1.0.0"; + sha256 = "0swiazj8wphs2zmk1qgq75xza6m19snif94h2m6fi8dqkwqdl7c7"; + }; + } + { + goPackagePath = "github.com/shurcooL/sanitized_anchor_name"; + fetch = { + type = "git"; + url = "https://github.com/shurcooL/sanitized_anchor_name"; + rev = "v1.0.0"; + sha256 = "1gv9p2nr46z80dnfjsklc6zxbgk96349sdsxjz05f3z6wb6m5l8f"; + }; + } { goPackagePath = "github.com/sirupsen/logrus"; fetch = { type = "git"; url = "https://github.com/sirupsen/logrus"; - rev = "v1.2.0"; - sha256 = "0r6334x2bls8ddznvzaldx4g88msjjns4mlks95rqrrg7h0ijigg"; + rev = "v1.3.0"; + sha256 = "0ib7k8cwxn53dyxd3af1g81z018n77n6q64pm4miznirf7c2c9gk"; + }; + } + { + goPackagePath = "github.com/smartystreets/assertions"; + fetch = { + type = "git"; + url = "https://github.com/smartystreets/assertions"; + rev = "b2de0cb4f26d"; + sha256 = "1i7ldgavgl35c7gk25p7bvdr282ckng090zr4ch9mk1705akx09y"; + }; + } + { + goPackagePath = "github.com/smartystreets/goconvey"; + fetch = { + type = "git"; + url = "https://github.com/smartystreets/goconvey"; + rev = "v1.6.4"; + sha256 = "07zjxwszayal88z1j2bwnqrsa32vg8l4nivks5yfr9j8xfsw7n6m"; + }; + } + { + goPackagePath = "github.com/spf13/afero"; + fetch = { + type = "git"; + url = "https://github.com/spf13/afero"; + rev = "v1.1.2"; + sha256 = "0miv4faf5ihjfifb1zv6aia6f6ik7h1s4954kcb8n6ixzhx9ck6k"; + }; + } + { + goPackagePath = "github.com/spf13/cast"; + fetch = { + type = "git"; + url = "https://github.com/spf13/cast"; + rev = "v1.3.0"; + sha256 = "0xq1ffqj8y8h7dcnm0m9lfrh0ga7pssnn2c1dnr09chqbpn4bdc5"; + }; + } + { + goPackagePath = "github.com/spf13/cobra"; + fetch = { + type = "git"; + url = "https://github.com/spf13/cobra"; + rev = "v0.0.5"; + sha256 = "0z4x8js65mhwg1gf6sa865pdxfgn45c3av9xlcc1l3xjvcnx32v2"; + }; + } + { + goPackagePath = "github.com/spf13/jwalterweatherman"; + fetch = { + type = "git"; + url = "https://github.com/spf13/jwalterweatherman"; + rev = "v1.0.0"; + sha256 = "093fmmvavv84pv4q84hav7ph3fmrq87bvspjj899q0qsx37yvdr8"; + }; + } + { + goPackagePath = "github.com/spf13/pflag"; + fetch = { + type = "git"; + url = "https://github.com/spf13/pflag"; + rev = "v1.0.3"; + sha256 = "1cj3cjm7d3zk0mf1xdybh0jywkbbw7a6yr3y22x9sis31scprswd"; + }; + } + { + goPackagePath = "github.com/spf13/viper"; + fetch = { + type = "git"; + url = "https://github.com/spf13/viper"; + rev = "v1.3.2"; + sha256 = "1829hvf805kda65l59r17wvid7y0vr390s23zfhf4w7vdb4wp3zh"; }; } { @@ -482,8 +1427,8 @@ fetch = { type = "git"; url = "https://github.com/stretchr/testify"; - rev = "v1.3.0"; - sha256 = "0wjchp2c8xbgcbbq32w3kvblk6q6yn533g78nxl6iskq6y95lxsy"; + rev = "v1.4.0"; + sha256 = "187i5g88sxfy4vxpm7dw1gwv29pa2qaq475lxrdh5livh69wqfjb"; }; } { @@ -522,6 +1467,132 @@ sha256 = "113fwpn80ylx970w8h7nfqnhh18dpx1jadbk7rbr8k68q4di4y0q"; }; } + { + goPackagePath = "github.com/ugorji/go"; + fetch = { + type = "git"; + url = "https://github.com/ugorji/go"; + rev = "v1.1.7"; + sha256 = "068gja55kbh2iivp03x4n9dcml0rxv0k64ivkmq06si2ar1835rm"; + }; + } + { + goPackagePath = "github.com/urfave/negroni"; + fetch = { + type = "git"; + url = "https://github.com/urfave/negroni"; + rev = "v1.0.0"; + sha256 = "1gp6j74adi1cn8fq5v3wzlzhwl4zg43n2746m4fzdcdimihk3ccp"; + }; + } + { + goPackagePath = "github.com/valyala/bytebufferpool"; + fetch = { + type = "git"; + url = "https://github.com/valyala/bytebufferpool"; + rev = "v1.0.0"; + sha256 = "01lqzjddq6kz9v41nkky7wbgk7f1cw036sa7ldz10d82g5klzl93"; + }; + } + { + goPackagePath = "github.com/valyala/fasthttp"; + fetch = { + type = "git"; + url = "https://github.com/valyala/fasthttp"; + rev = "v1.6.0"; + sha256 = "1r1hm4rv9w6x829jjg75y8xd523b76parsyyvjwyz8k2l6bm4h0b"; + }; + } + { + goPackagePath = "github.com/valyala/fasttemplate"; + fetch = { + type = "git"; + url = "https://github.com/valyala/fasttemplate"; + rev = "v1.0.1"; + sha256 = "0l131znbv8v67y20s4q361mwiww2c33zdc68mwvxchzk1gpy5ywq"; + }; + } + { + goPackagePath = "github.com/valyala/tcplisten"; + fetch = { + type = "git"; + url = "https://github.com/valyala/tcplisten"; + rev = "ceec8f93295a"; + sha256 = "0ksbj1gsdqanbnhly5w1wcc107bib4w0zpnyl00prr89zch3imnf"; + }; + } + { + goPackagePath = "github.com/xeipuuv/gojsonpointer"; + fetch = { + type = "git"; + url = "https://github.com/xeipuuv/gojsonpointer"; + rev = "4e3ac2762d5f"; + sha256 = "13y6iq2nzf9z4ls66bfgnnamj2m3438absmbpqry64bpwjfbsi9q"; + }; + } + { + goPackagePath = "github.com/xeipuuv/gojsonreference"; + fetch = { + type = "git"; + url = "https://github.com/xeipuuv/gojsonreference"; + rev = "bd5ef7bd5415"; + sha256 = "1xby79padc7bmyb8rfbad8wfnfdzpnh51b1n8c0kibch0kwc1db5"; + }; + } + { + goPackagePath = "github.com/xeipuuv/gojsonschema"; + fetch = { + type = "git"; + url = "https://github.com/xeipuuv/gojsonschema"; + rev = "v1.2.0"; + sha256 = "1mqiq0r8qw4qlfp3ls8073r6514rmzwrmdn4j33rppk3zh942i6l"; + }; + } + { + goPackagePath = "github.com/xordataexchange/crypt"; + fetch = { + type = "git"; + url = "https://github.com/xordataexchange/crypt"; + rev = "b2862e3d0a77"; + sha256 = "04q3856anpzl4gdfgmg7pbp9cx231nkz3ymq2xp27rnmmwhfxr8y"; + }; + } + { + goPackagePath = "github.com/yalp/jsonpath"; + fetch = { + type = "git"; + url = "https://github.com/yalp/jsonpath"; + rev = "5cc68e5049a0"; + sha256 = "0kkyxp1cg3kfxy5hhwzxg132jin4xb492z5jpqq94ix15v6rdf4b"; + }; + } + { + goPackagePath = "github.com/yudai/gojsondiff"; + fetch = { + type = "git"; + url = "https://github.com/yudai/gojsondiff"; + rev = "v1.0.0"; + sha256 = "0qnymi0027mb8kxm24mmd22bvjrdkc56c7f4q3lbdf93x1vxbbc2"; + }; + } + { + goPackagePath = "github.com/yudai/golcs"; + fetch = { + type = "git"; + url = "https://github.com/yudai/golcs"; + rev = "ecda9a501e82"; + sha256 = "0mx6wc5fz05yhvg03vvps93bc5mw4vnng98fhmixd47385qb29pq"; + }; + } + { + goPackagePath = "github.com/yudai/pp"; + fetch = { + type = "git"; + url = "https://github.com/yudai/pp"; + rev = "v2.0.1"; + sha256 = "18vbc7jagnjw1wpvhqjffl0np7bzzqdd9jpdcisvj5h85lbyn5gk"; + }; + } { goPackagePath = "gitlab.com/gitlab-org/gitaly"; fetch = { @@ -536,8 +1607,17 @@ fetch = { type = "git"; url = "https://gitlab.com/gitlab-org/labkit.git"; - rev = "0c3fc7cdd57c"; - sha256 = "0fpn37v7dhhdgd63v4mq9cna9wdzrsfams13qmjmps3xpdw2wr9i"; + rev = "0149780c759d"; + sha256 = "1krp5jkwpckpdznbl9xp4yvq6cii750r24agcni3snbbs8hd8gb1"; + }; + } + { + goPackagePath = "go.opencensus.io"; + fetch = { + type = "git"; + url = "https://github.com/census-instrumentation/opencensus-go"; + rev = "v0.22.2"; + sha256 = "0lz7fid63pdrcvyzk5kn7vlcva102h61igmw7pz824wvj9k3hy4q"; }; } { @@ -554,8 +1634,26 @@ fetch = { type = "git"; url = "https://go.googlesource.com/crypto"; - rev = "20be4c3c3ed5"; - sha256 = "1ph7y8v30hc95h1dwr7vrhg1nzs47a261qin6zg8mhf12g5k2lxb"; + rev = "87dc89f01550"; + sha256 = "0z4i1m2yn3f31ci7wvcm2rxkx2yiv7a78mfzklncmsz2k97rlh2g"; + }; + } + { + goPackagePath = "golang.org/x/exp"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/exp"; + rev = "da58074b4299"; + sha256 = "1pgvdbjm3n47505diw3mm2hisp9b9q2lyvgl9m6xh2wx83b0cj48"; + }; + } + { + goPackagePath = "golang.org/x/image"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/image"; + rev = "cff245a6509b"; + sha256 = "0hiznlkiaay30acwvvyq8g6bm32r7bc6gv47pygrcxqpapasbz84"; }; } { @@ -563,8 +1661,26 @@ fetch = { type = "git"; url = "https://go.googlesource.com/lint"; - rev = "d0100b6bd8b3"; - sha256 = "0b0amr9x4ji66iv9ayfx7zrfx52k1m5g66qfcxkgj80qrb1y2yn7"; + rev = "fdd1cda4f05f"; + sha256 = "0a23pc90fqar8sm1b480sls15ss20rqk13yrf63b6rnyd2c6z0x2"; + }; + } + { + goPackagePath = "golang.org/x/mobile"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/mobile"; + rev = "d2bd2a29d028"; + sha256 = "1nv6vvhnjr01nx9y06q46ww87dppdwpbqrlsfg1xf2587wxl8xiv"; + }; + } + { + goPackagePath = "golang.org/x/mod"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/mod"; + rev = "c90efee705ee"; + sha256 = "0i5md645rmcy5z5ij9ng428k9rz4g3k1kjy3blsq1264rn426gdf"; }; } { @@ -572,8 +1688,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/net"; - rev = "d28f0bde5980"; - sha256 = "18xj31h70m7xxb7gc86n9i21w6d7djbjz67zfaljm4jqskz6hxkf"; + rev = "6afb5195e5aa"; + sha256 = "1aiz41q2yxgg3dxfkn33ff54vhaxbiwcps9j3ia1xx4cqxim38zw"; }; } { @@ -581,8 +1697,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/oauth2"; - rev = "d2e6202438be"; - sha256 = "0wbn75fd10485nb93bm4kqldqifdim5xqy4v7r5sdvimvf3fyhn7"; + rev = "bf48bf16ab8d"; + sha256 = "1sirdib60zwmh93kf9qrx51r8544k1p9rs5mk0797wibz3m4mrdg"; }; } { @@ -590,8 +1706,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/sync"; - rev = "112230192c58"; - sha256 = "05i2k43j2d0llq768hg5pf3hb2yhfzp9la1w5wp0rsnnzblr0lfn"; + rev = "cd5d95a43a6e"; + sha256 = "1nqkyz2y1qvqcma52ijh02s8aiqmkfb95j08f6zcjhbga3ds6hds"; }; } { @@ -599,8 +1715,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/sys"; - rev = "953cdadca894"; - sha256 = "0gkha4whk8xkcv3isigbs250akag99isxnd3v9xmy0kl3g88hxy1"; + rev = "86b910548bc1"; + sha256 = "1z8l2wp27q0bd4nc46j31lc7cr6kiw52zi6ix3i121pd3rcyrw44"; }; } { @@ -608,8 +1724,17 @@ fetch = { type = "git"; url = "https://go.googlesource.com/text"; - rev = "v0.3.0"; - sha256 = "0r6x6zjzhr8ksqlpiwm5gdd7s209kwk5p4lw54xjvz10cs3qlq19"; + rev = "v0.3.2"; + sha256 = "0flv9idw0jm5nm8lx25xqanbkqgfiym6619w575p7nrdh0riqwqh"; + }; + } + { + goPackagePath = "golang.org/x/time"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/time"; + rev = "9d24e82272b4"; + sha256 = "1f5nkr4vys2vbd8wrwyiq2f5wcaahhpxmia85d1gshcbqjqf8dkb"; }; } { @@ -617,8 +1742,26 @@ fetch = { type = "git"; url = "https://go.googlesource.com/tools"; - rev = "2c0ae7006135"; - sha256 = "1lsi2ssxajclj3bciz2a41v1vjv768ja3v6wnbyhxy8xphwkp4fk"; + rev = "43d50277825c"; + sha256 = "1168q4da36wq9w2591iqzsfy5ymwfi2g46bv5dnyyspg155ld19k"; + }; + } + { + goPackagePath = "golang.org/x/xerrors"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/xerrors"; + rev = "9bdfabe68543"; + sha256 = "1yjfi1bk9xb81lqn85nnm13zz725wazvrx3b50hx19qmwg7a4b0c"; + }; + } + { + goPackagePath = "google.golang.org/api"; + fetch = { + type = "git"; + url = "https://github.com/googleapis/google-api-go-client"; + rev = "v0.15.0"; + sha256 = "1ljhwv5xsgsbqia70f35q19vwrsm47sh08ljbwdyfa867ff17qdh"; }; } { @@ -626,8 +1769,8 @@ fetch = { type = "git"; url = "https://github.com/golang/appengine"; - rev = "v1.1.0"; - sha256 = "1pz202zszg8f35dk5pfhwgcdi3r6dx1l4yk6x6ly7nb4j45zi96x"; + rev = "v1.6.5"; + sha256 = "05hbq4cs7bqw0zl17bx8rzdkszid3nyl92100scg3jjrg70dhm7w"; }; } { @@ -635,8 +1778,8 @@ fetch = { type = "git"; url = "https://github.com/googleapis/go-genproto"; - rev = "bd91e49a0898"; - sha256 = "1f5q04h03q6fksbfkhz13ai5849rkkb8xrmmi7cxs4lzsi6ixkg8"; + rev = "ca5a22157cba"; + sha256 = "0ldkh6f0g0wzfkp09ib15a62bmcbpsxj93saikqmc86242bcxij0"; }; } { @@ -671,8 +1814,17 @@ fetch = { type = "git"; url = "https://gopkg.in/check.v1"; - rev = "20d25e280405"; - sha256 = "0k1m83ji9l1a7ng8a7v40psbymxasmssbrrhpdv2wl4rhs0nc3np"; + rev = "788fd7840127"; + sha256 = "0v3bim0j375z81zrpr5qv42knqs0y2qv2vkjiqi5axvb78slki1a"; + }; + } + { + goPackagePath = "gopkg.in/errgo.v2"; + fetch = { + type = "git"; + url = "https://gopkg.in/errgo.v2"; + rev = "v2.1.0"; + sha256 = "065mbihiy7q67wnql0bzl9y1kkvck5ivra68254zbih52jxwrgr2"; }; } { @@ -684,6 +1836,33 @@ sha256 = "07va9crci0ijlivbb7q57d2rz9h27zgn2fsm60spjsqpdbvyrx4g"; }; } + { + goPackagePath = "gopkg.in/go-playground/assert.v1"; + fetch = { + type = "git"; + url = "https://gopkg.in/go-playground/assert.v1"; + rev = "v1.2.1"; + sha256 = "1h4amgykpa0djwi619llr3g55p75ia0mi184h9s5zdl8l4rhn9pm"; + }; + } + { + goPackagePath = "gopkg.in/go-playground/validator.v8"; + fetch = { + type = "git"; + url = "https://gopkg.in/go-playground/validator.v8"; + rev = "v8.18.2"; + sha256 = "1m2i48ph5a3kw9nlw2srx8i04v7chicds2hlzlrfm15045crga55"; + }; + } + { + goPackagePath = "gopkg.in/mgo.v2"; + fetch = { + type = "git"; + url = "https://gopkg.in/mgo.v2"; + rev = "9856a29383ce"; + sha256 = "1gfbcmvpwwf1lydxj3g42wv2g9w3pf0y02igqk4f4f21h02sazkw"; + }; + } { goPackagePath = "gopkg.in/tomb.v1"; fetch = { @@ -698,8 +1877,8 @@ fetch = { type = "git"; url = "https://gopkg.in/yaml.v2"; - rev = "v2.2.2"; - sha256 = "01wj12jzsdqlnidpyjssmj0r4yavlqy7dwrg7adqd8dicjc4ncsa"; + rev = "v2.2.4"; + sha256 = "11bwj757wi8kdrcnlgfqb8vv2d2xdhlghmyagd19i62khrkchsg2"; }; } { @@ -707,8 +1886,17 @@ fetch = { type = "git"; url = "https://github.com/dominikh/go-tools"; - rev = "ea95bdfd59fc"; - sha256 = "1763nw7pwpzkvzfnm63dgzcgbq9hwmq5l1nffchnhh77vgkaq4ic"; + rev = "v0.0.1-2019.2.3"; + sha256 = "1rwwahmbs4dwxncwjj56likir1kps9937vm2id3rygxzzla40zal"; + }; + } + { + goPackagePath = "rsc.io/binaryregexp"; + fetch = { + type = "git"; + url = "https://github.com/rsc/binaryregexp"; + rev = "v0.2.0"; + sha256 = "1kar0myy85waw418zslviwx8846zj0m9cmqkxjx0fvgjdi70nc4b"; }; } ] diff --git a/pkgs/applications/version-management/gitlab/gitlab-shell/remove-hardcoded-locations.patch b/pkgs/applications/version-management/gitlab/gitlab-shell/remove-hardcoded-locations.patch index ee00070df2d7..6c54e8884f29 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-shell/remove-hardcoded-locations.patch +++ b/pkgs/applications/version-management/gitlab/gitlab-shell/remove-hardcoded-locations.patch @@ -30,18 +30,18 @@ index 2231851..c869930 100644 func newFromFile(filename string) (*Config, error) { diff --git a/internal/keyline/key_line.go b/internal/keyline/key_line.go -index c29a320..c44b701 100644 +index e2abb82..7e9c481 100644 --- a/internal/keyline/key_line.go +++ b/internal/keyline/key_line.go -@@ -36,7 +36,7 @@ func NewPrincipalKeyLine(keyId string, principal string, rootDir string) (*KeyLi - } - +@@ -38,7 +38,7 @@ func NewPrincipalKeyLine(keyId, principal string, config *config.Config) (*KeyLi + func (k *KeyLine) ToString() string { -- command := fmt.Sprintf("%s %s-%s", path.Join(k.RootDir, executable.BinDir, executable.GitlabShell), k.Prefix, k.Id) + sslCertDirEnvVar := k.sslCertDirEnvVar() +- command := fmt.Sprintf("%s %s-%s", path.Join(k.Config.RootDir, executable.BinDir, executable.GitlabShell), k.Prefix, k.Id) + command := fmt.Sprintf("%s %s-%s", path.Join("/run/current-system/sw/bin", executable.GitlabShell), k.Prefix, k.Id) - - return fmt.Sprintf(`command="%s",%s %s`, command, SshOptions, k.Value) - } + + if sslCertDirEnvVar != "" { + sslCertDirEnvVar = fmt.Sprintf(`%s `, sslCertDirEnvVar) diff --git a/support/gitlab_config.rb b/support/gitlab_config.rb index 52ac5ee..d96baa3 100644 --- a/support/gitlab_config.rb diff --git a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix index 6386a9cc5aa7..e1b177c3b457 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix +++ b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix @@ -3,13 +3,13 @@ buildGoPackage rec { pname = "gitlab-workhorse"; - version = "8.31.2"; + version = "8.46.0"; src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-workhorse"; rev = "v${version}"; - sha256 = "0wvhhjfb490mjdrmc9xwr3qfh3941xn3b02c757ghrvzwv329wvg"; + sha256 = "1qhaln1k6vcjzphmxdqhwz1cwdx77gclyq0b2ibzgy7xg9l91n99"; }; goPackagePath = "gitlab.com/gitlab-org/gitlab-workhorse"; diff --git a/pkgs/applications/version-management/gitlab/gitlab-workhorse/deps.nix b/pkgs/applications/version-management/gitlab/gitlab-workhorse/deps.nix index 530eb073c7b5..33b122a52e28 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-workhorse/deps.nix +++ b/pkgs/applications/version-management/gitlab/gitlab-workhorse/deps.nix @@ -1,12 +1,57 @@ # file generated from go.mod using vgo2nix (https://github.com/adisbladis/vgo2nix) [ + { + goPackagePath = "bazil.org/fuse"; + fetch = { + type = "git"; + url = "https://github.com/bazil/fuse"; + rev = "65cc252bf669"; + sha256 = "0qjm9yrhc5h632wwhklqzhalid4lxcm9iwsqs3jahp303rm27vpk"; + }; + } { goPackagePath = "cloud.google.com/go"; fetch = { type = "git"; - url = "https://code.googlesource.com/gocloud"; - rev = "v0.50.0"; - sha256 = "0pbz5migljd5whxh6z1w79cwx93n85mcs3x1bckl27yzaa4lvqsl"; + url = "https://github.com/googleapis/google-cloud-go"; + rev = "v0.58.0"; + sha256 = "1mcnnvx55yqcj02y4f1hl10ril06q4y9pcsbkb27wgrwimi6fl2n"; + }; + } + { + goPackagePath = "contrib.go.opencensus.io/exporter/aws"; + fetch = { + type = "git"; + url = "https://github.com/census-ecosystem/opencensus-go-exporter-aws"; + rev = "2befc13012d0"; + sha256 = "0adnzms874ddcp67mgsgaw43r3fih4pzjn8n424bbi8fhwajsi29"; + }; + } + { + goPackagePath = "contrib.go.opencensus.io/exporter/stackdriver"; + fetch = { + type = "git"; + url = "https://github.com/census-ecosystem/opencensus-go-exporter-stackdriver"; + rev = "v0.12.1"; + sha256 = "0y0v3v97qg5yl83vq4kjzgaidnp8iraw1d7llnm9i7s5lkmydiwb"; + }; + } + { + goPackagePath = "contrib.go.opencensus.io/integrations/ocsql"; + fetch = { + type = "git"; + url = "https://github.com/opencensus-integrations/ocsql"; + rev = "v0.1.4"; + sha256 = "06w9vm8dq0gg0v7slnv3zij90i8i9qiz2fbg148jih6jdpyakqrq"; + }; + } + { + goPackagePath = "contrib.go.opencensus.io/resource"; + fetch = { + type = "git"; + url = "https://github.com/census-ecosystem/opencensus-go-resource"; + rev = "v0.1.1"; + sha256 = "1g9vjrh7w8f2k2kxjcwmmcza2dfp61wmsgaipfk6992hyyccl3sh"; }; } { @@ -18,6 +63,69 @@ sha256 = "1isd03hgiwcf2ld1rlp0plrnfz7r4i7c5q4kb6hkcd22axnmrv0z"; }; } + { + goPackagePath = "github.com/AndreasBriese/bbloom"; + fetch = { + type = "git"; + url = "https://github.com/AndreasBriese/bbloom"; + rev = "e2d15f34fcf9"; + sha256 = "05kkrsmpragy69bj6s80pxlm3pbwxrkkx7wgk0xigs6y2n6ylpds"; + }; + } + { + goPackagePath = "github.com/Azure/azure-amqp-common-go"; + fetch = { + type = "git"; + url = "https://github.com/Azure/azure-amqp-common-go"; + rev = "v3.0.0"; + sha256 = "0sxghycqkxaygwi6f85w9pqijm5ms2dk4qkz4d711dmi3b74512j"; + }; + } + { + goPackagePath = "github.com/Azure/azure-pipeline-go"; + fetch = { + type = "git"; + url = "https://github.com/Azure/azure-pipeline-go"; + rev = "v0.2.2"; + sha256 = "1agn2nzmm1dkwggm4w7h4bnrav4n5jrl0vqbqy2s49vqlr8zirn6"; + }; + } + { + goPackagePath = "github.com/Azure/azure-sdk-for-go"; + fetch = { + type = "git"; + url = "https://github.com/Azure/azure-sdk-for-go"; + rev = "v37.1.0"; + sha256 = "163ryyfg5x227013vyjnjsvww8pvi4kfc80x419d31mx88cs24ic"; + }; + } + { + goPackagePath = "github.com/Azure/azure-service-bus-go"; + fetch = { + type = "git"; + url = "https://github.com/Azure/azure-service-bus-go"; + rev = "v0.10.1"; + sha256 = "11d1b5wbv23qzp54qhmkhdwwmrmbfqnc2ddxsg9hg2m258id8hl5"; + }; + } + { + goPackagePath = "github.com/Azure/azure-storage-blob-go"; + fetch = { + type = "git"; + url = "https://github.com/Azure/azure-storage-blob-go"; + rev = "v0.10.0"; + sha256 = "1w64h4h1w4nclr115i1haigzy0b8z9dbdjfi8zsf5viqqzhlwqgm"; + }; + } + { + goPackagePath = "github.com/Azure/go-amqp"; + fetch = { + type = "git"; + url = "https://github.com/Azure/go-amqp"; + rev = "v0.12.7"; + sha256 = "0gy3kxn5lqpliwfa2ys367hgbsa2n88bsiy04i44ba3aass7m6h4"; + }; + } { goPackagePath = "github.com/BurntSushi/toml"; fetch = { @@ -36,6 +144,15 @@ sha256 = "18lp2x8f5bljvlz0r7xn744f0c9rywjsb9ifiszqqdcpwhsa0kvj"; }; } + { + goPackagePath = "github.com/CloudyKit/fastprinter"; + fetch = { + type = "git"; + url = "https://github.com/CloudyKit/fastprinter"; + rev = "74b38d55f37a"; + sha256 = "07wkq3503j7sd5knsgp3lwzfdwm6sj7a3l6i71i52yb3fd8md235"; + }; + } { goPackagePath = "github.com/FZambia/sentinel"; fetch = { @@ -45,13 +162,22 @@ sha256 = "14cfngdy0n5rg7nrvxg1ydcjd18v0s8h33jx9wkln5ms0d59kfly"; }; } + { + goPackagePath = "github.com/GoogleCloudPlatform/cloudsql-proxy"; + fetch = { + type = "git"; + url = "https://github.com/GoogleCloudPlatform/cloudsql-proxy"; + rev = "e802c2cb94ae"; + sha256 = "035z6yk7i53ba91pp0hl20ks1syjaw5f5mdx5c0kbib7k4xcgv96"; + }; + } { goPackagePath = "github.com/Joker/hpp"; fetch = { type = "git"; url = "https://github.com/Joker/hpp"; - rev = "6893e659854a"; - sha256 = "0lsx63c28rzqigv3lwzznqacpk7nr0dn6ig37v023x8lzc728ix5"; + rev = "v1.0.0"; + sha256 = "1xnqkjkmqdj48w80qa74rwcmgar8dcilpkcrcn1f53djk45k1gq2"; }; } { @@ -59,8 +185,8 @@ fetch = { type = "git"; url = "https://github.com/Joker/jade"; - rev = "v1.0.0"; - sha256 = "0k9b8dcwwhajw6rzjmakqwmhw9z192pzzdhppcvam6dy63yl4zjf"; + rev = "d475f43051e7"; + sha256 = "0yigzvxp5qd05pai0yimzkpl2m23358a2fqqs585psrdmwsic2pn"; }; } { @@ -81,6 +207,51 @@ sha256 = "1d6sxzzf9yycdf8jm5877y0khmhkmhxfw3sc4xpdcsrdlc7gqh5a"; }; } + { + goPackagePath = "github.com/alecthomas/assert"; + fetch = { + type = "git"; + url = "https://github.com/alecthomas/assert"; + rev = "405dbfeb8e38"; + sha256 = "1l567pi17k593nrd1qlbmiq8z9jy3qs60px2a16fdpzjsizwqx8l"; + }; + } + { + goPackagePath = "github.com/alecthomas/chroma"; + fetch = { + type = "git"; + url = "https://github.com/alecthomas/chroma"; + rev = "v0.7.3"; + sha256 = "0wlw1bq7gdyxjm2j5vqbkn42ma28irc5wygkz9bj5z6idah4wl8k"; + }; + } + { + goPackagePath = "github.com/alecthomas/colour"; + fetch = { + type = "git"; + url = "https://github.com/alecthomas/colour"; + rev = "60882d9e2721"; + sha256 = "0iq566534gbzkd16ixg7fk298wd766821vvs80838yifx9yml5vs"; + }; + } + { + goPackagePath = "github.com/alecthomas/kong"; + fetch = { + type = "git"; + url = "https://github.com/alecthomas/kong"; + rev = "v0.2.4"; + sha256 = "0lv8xk71p5729igwmp6slhmf9x1g5z3zmkfx1mg1y2spn2ck4q7l"; + }; + } + { + goPackagePath = "github.com/alecthomas/repr"; + fetch = { + type = "git"; + url = "https://github.com/alecthomas/repr"; + rev = "117648cd9897"; + sha256 = "05v1rgzdqc8razf702laagrvhvx68xd9yxxmzd3dyz0d6425pdrp"; + }; + } { goPackagePath = "github.com/alecthomas/template"; fetch = { @@ -100,12 +271,21 @@ }; } { - goPackagePath = "github.com/aymerick/raymond"; + goPackagePath = "github.com/armon/consul-api"; fetch = { type = "git"; - url = "https://github.com/aymerick/raymond"; - rev = "v2.0.2"; - sha256 = "1w6am4142k8lyjnwwcgx94c2d8zviflzi0a9c81gn2j0gyx475i3"; + url = "https://github.com/armon/consul-api"; + rev = "eb2c6b5be1b6"; + sha256 = "1j6fdr1sg36qy4n4xjl7brq739fpm5npq98cmvklzjc9qrx98nk9"; + }; + } + { + goPackagePath = "github.com/aws/aws-sdk-go"; + fetch = { + type = "git"; + url = "https://github.com/aws/aws-sdk-go"; + rev = "v1.31.13"; + sha256 = "170yaj7ffrkw56z9kmng06wwnyblqj16zm9x39q76fi4pdnn5rqc"; }; } { @@ -117,6 +297,24 @@ sha256 = "1i1nz1f6g55xi2y3aiaz5kqfgvknarbfl4f0sx4nyyb4s7xb1z9x"; }; } + { + goPackagePath = "github.com/boltdb/bolt"; + fetch = { + type = "git"; + url = "https://github.com/boltdb/bolt"; + rev = "v1.3.1"; + sha256 = "0z7j06lijfi4y30ggf2znak2zf2srv2m6c68ar712wd2ys44qb3r"; + }; + } + { + goPackagePath = "github.com/census-instrumentation/opencensus-proto"; + fetch = { + type = "git"; + url = "https://github.com/census-instrumentation/opencensus-proto"; + rev = "v0.2.1"; + sha256 = "19fcx3sc99i5dsklny6r073z5j20vlwn2xqm6di1q3b1xwchzqfj"; + }; + } { goPackagePath = "github.com/certifi/gocertifi"; fetch = { @@ -180,6 +378,15 @@ sha256 = "0by5hk8s0bhhl3kiw658p5g53zvc61k4q2wxnh1w64p5ghd1rfn8"; }; } + { + goPackagePath = "github.com/cncf/udpa"; + fetch = { + type = "git"; + url = "https://github.com/cncf/udpa"; + rev = "269d4d468f6f"; + sha256 = "0i1jiaw2k3hlwwmg4hap81vb4s1p25xp9kdfww37v0fbgjariccs"; + }; + } { goPackagePath = "github.com/codahale/hdrhistogram"; fetch = { @@ -198,6 +405,51 @@ sha256 = "1jqakr3z9l60qhcgrdzsb6rlk8ikcamisw0g2ndmrf27s0ibfcaj"; }; } + { + goPackagePath = "github.com/coreos/etcd"; + fetch = { + type = "git"; + url = "https://github.com/coreos/etcd"; + rev = "v3.3.10"; + sha256 = "1x2ii1hj8jraba8rbxz6dmc03y3sjxdnzipdvg6fywnlq1f3l3wl"; + }; + } + { + goPackagePath = "github.com/coreos/go-etcd"; + fetch = { + type = "git"; + url = "https://github.com/coreos/go-etcd"; + rev = "v2.0.0"; + sha256 = "1xb34hzaa1lkbq5vkzy9vcz6gqwj7hp6cdbvyack2bf28dwn33jj"; + }; + } + { + goPackagePath = "github.com/coreos/go-semver"; + fetch = { + type = "git"; + url = "https://github.com/coreos/go-semver"; + rev = "v0.2.0"; + sha256 = "1gghi5bnqj50hfxhqc1cxmynqmh2yk9ii7ab9gsm75y5cp94ymk0"; + }; + } + { + goPackagePath = "github.com/cpuguy83/go-md2man"; + fetch = { + type = "git"; + url = "https://github.com/cpuguy83/go-md2man"; + rev = "v1.0.10"; + sha256 = "1bqkf2bvy1dns9zd24k81mh2p1zxsx2nhq5cj8dz2vgkv1xkh60i"; + }; + } + { + goPackagePath = "github.com/danwakefield/fnmatch"; + fetch = { + type = "git"; + url = "https://github.com/danwakefield/fnmatch"; + rev = "cbb64ac3d964"; + sha256 = "0cbf511ppsa6hf59mdl7nbyn2b2n71y0bpkzbmfkdqjhanqh1lqz"; + }; + } { goPackagePath = "github.com/davecgh/go-spew"; fetch = { @@ -207,6 +459,24 @@ sha256 = "0hka6hmyvp701adzag2g26cxdj47g21x6jz4sc6jjz1mn59d474y"; }; } + { + goPackagePath = "github.com/devigned/tab"; + fetch = { + type = "git"; + url = "https://github.com/devigned/tab"; + rev = "v0.1.1"; + sha256 = "17r98k3bcyjkq5mz2k9i2sxbzgkq05h5pqg5mn7nyrvsf09x99g5"; + }; + } + { + goPackagePath = "github.com/dgraph-io/badger"; + fetch = { + type = "git"; + url = "https://github.com/dgraph-io/badger"; + rev = "v1.6.0"; + sha256 = "1vzibjqhb10q6s2chbzlwndij2d9ybjnq7h28hx4akr119avd0d5"; + }; + } { goPackagePath = "github.com/dgrijalva/jwt-go"; fetch = { @@ -216,6 +486,42 @@ sha256 = "08m27vlms74pfy5z79w67f9lk9zkx6a9jd68k3c4msxy75ry36mp"; }; } + { + goPackagePath = "github.com/dgryski/go-farm"; + fetch = { + type = "git"; + url = "https://github.com/dgryski/go-farm"; + rev = "6a90982ecee2"; + sha256 = "1x3l4jgps0v1bjvd446kj4dp0ckswjckxgrng9afm275ixnf83ix"; + }; + } + { + goPackagePath = "github.com/dimchansky/utfbom"; + fetch = { + type = "git"; + url = "https://github.com/dimchansky/utfbom"; + rev = "v1.1.0"; + sha256 = "06s61wwd32fad1p8qn5blqjd5791avzb13fnqflkkg993adw49ww"; + }; + } + { + goPackagePath = "github.com/dlclark/regexp2"; + fetch = { + type = "git"; + url = "https://github.com/dlclark/regexp2"; + rev = "v1.2.0"; + sha256 = "011l1prsywvhhi0yc7qmpsca1cwavmawyyld5kjzi0ff9ghvj4ng"; + }; + } + { + goPackagePath = "github.com/dustin/go-humanize"; + fetch = { + type = "git"; + url = "https://github.com/dustin/go-humanize"; + rev = "v1.0.0"; + sha256 = "1kqf1kavdyvjk7f8kx62pnm7fbypn9z1vbf8v2qdh3y7z7a0cbl3"; + }; + } { goPackagePath = "github.com/eknkc/amber"; fetch = { @@ -225,6 +531,42 @@ sha256 = "152w97yckwncgw7lwjvgd8d00wy6y0nxzlvx72kl7nqqxs9vhxd9"; }; } + { + goPackagePath = "github.com/envoyproxy/go-control-plane"; + fetch = { + type = "git"; + url = "https://github.com/envoyproxy/go-control-plane"; + rev = "v0.9.4"; + sha256 = "0m0crzx70lp7vz13v20wxb1fcfdnzp7h3mkh3bn6a8mbfz6w5asj"; + }; + } + { + goPackagePath = "github.com/envoyproxy/protoc-gen-validate"; + fetch = { + type = "git"; + url = "https://github.com/envoyproxy/protoc-gen-validate"; + rev = "v0.1.0"; + sha256 = "0kxd3wwh3xwqk0r684hsy281xq4y71cd11d4q2hspcjbnlbwh7cy"; + }; + } + { + goPackagePath = "github.com/etcd-io/bbolt"; + fetch = { + type = "git"; + url = "https://github.com/etcd-io/bbolt"; + rev = "v1.3.3"; + sha256 = "0dn0zngks9xiz0rrrb3911f73ghl64z84jsmzai2yfmzqr7cdkqc"; + }; + } + { + goPackagePath = "github.com/fasthttp-contrib/websocket"; + fetch = { + type = "git"; + url = "https://github.com/fasthttp-contrib/websocket"; + rev = "1f3b11f56072"; + sha256 = "1yacmwmil625p0pzj800h9dnmiab6bjwfmi48p9fcrvy2yyv9b97"; + }; + } { goPackagePath = "github.com/fatih/structs"; fetch = { @@ -243,6 +585,15 @@ sha256 = "0yqh58phznnxakm64w82gawrpndb0r85vsd1s7h244qqrq7w4avq"; }; } + { + goPackagePath = "github.com/fortytw2/leaktest"; + fetch = { + type = "git"; + url = "https://github.com/fortytw2/leaktest"; + rev = "v1.3.0"; + sha256 = "0487zghyxqzk6zdbhd2j074pcc2l15l4sfg5clrjqwfbql7519wx"; + }; + } { goPackagePath = "github.com/fsnotify/fsnotify"; fetch = { @@ -252,6 +603,15 @@ sha256 = "07va9crci0ijlivbb7q57d2rz9h27zgn2fsm60spjsqpdbvyrx4g"; }; } + { + goPackagePath = "github.com/gavv/httpexpect"; + fetch = { + type = "git"; + url = "https://github.com/gavv/httpexpect"; + rev = "v2.0.0"; + sha256 = "0dqb7lsinciz594q6jg59hrvk4g4awbs2ybsr580j22j2xag53vs"; + }; + } { goPackagePath = "github.com/gavv/monotime"; fetch = { @@ -275,8 +635,8 @@ fetch = { type = "git"; url = "https://github.com/getsentry/sentry-go"; - rev = "v0.3.0"; - sha256 = "1919lhvg1swcqyfa6mck6nz53c7n4df21jsz46f7x4wncb6f5il1"; + rev = "v0.5.1"; + sha256 = "1kfn0gcb4c6amhagv04ydpl6p9cqw7f0lxas688a0rf89iwdzz89"; }; } { @@ -320,8 +680,17 @@ fetch = { type = "git"; url = "https://github.com/go-gl/glfw"; - rev = "12ad95a8df72"; - sha256 = "0ahw4a1lk7wqn6m0sjngsv2zc08kxxj259ai6g4kf11lmidszm9s"; + rev = "e6da0acd62b1"; + sha256 = "0prvx5r7q8yrhqvnwibv4xz3dayjbq36yajzqvh0z4lqsh4hyhch"; + }; + } + { + goPackagePath = "github.com/go-ini/ini"; + fetch = { + type = "git"; + url = "https://github.com/go-ini/ini"; + rev = "v1.25.4"; + sha256 = "0b6cql5ripbiyrm18d6bfd1rfjnwcbskppw3d0vb80l0wy72d0c6"; }; } { @@ -351,6 +720,15 @@ sha256 = "01ip3mwbnm5isq120ww73yrvbcn6n5944prhhbyf2ggyf6g46ylh"; }; } + { + goPackagePath = "github.com/go-sql-driver/mysql"; + fetch = { + type = "git"; + url = "https://github.com/go-sql-driver/mysql"; + rev = "v1.5.0"; + sha256 = "11x0m9yf3kdnf6981182r824psgxwfaqhn3x3in4yiidp0w0hk3v"; + }; + } { goPackagePath = "github.com/go-stack/stack"; fetch = { @@ -360,6 +738,33 @@ sha256 = "0wk25751ryyvxclyp8jdk5c3ar0cmfr8lrjb66qbg4808x66b96v"; }; } + { + goPackagePath = "github.com/gobwas/httphead"; + fetch = { + type = "git"; + url = "https://github.com/gobwas/httphead"; + rev = "2c6c146eadee"; + sha256 = "0j7nlrf79cafl8ap69ri2c7v3psr2y133cr2wn735z7yn3dz3kss"; + }; + } + { + goPackagePath = "github.com/gobwas/pool"; + fetch = { + type = "git"; + url = "https://github.com/gobwas/pool"; + rev = "v0.2.0"; + sha256 = "1avpa8c75j1y4hs7awazrjjy7w0pjfw80l424ddn5zyizvh7s67i"; + }; + } + { + goPackagePath = "github.com/gobwas/ws"; + fetch = { + type = "git"; + url = "https://github.com/gobwas/ws"; + rev = "v1.0.2"; + sha256 = "070mfcjbfb40bglc9aw9zjvd4jb1hp3l1s12ww6mjlwbjcg0mm9s"; + }; + } { goPackagePath = "github.com/gogo/protobuf"; fetch = { @@ -392,8 +797,8 @@ fetch = { type = "git"; url = "https://github.com/golang/groupcache"; - rev = "215e87163ea7"; - sha256 = "07555csk49ara636bhl2vbzziayls3qks8964z0q29g065zliy9j"; + rev = "8c9f03a8e57e"; + sha256 = "0vjjr79r32icjzlb05wn02k59av7jx0rn1jijml8r4whlg7dnkfh"; }; } { @@ -410,8 +815,8 @@ fetch = { type = "git"; url = "https://github.com/golang/mock"; - rev = "v1.3.1"; - sha256 = "1wnfa8njxdym1qb664dmfnkpm4pmqy22hqjlqpwaaiqhglb5g9d1"; + rev = "v1.4.3"; + sha256 = "1p37xnja1dgq5ykx24n7wincwz2gahjh71b95p8vpw7ss2g8j8wx"; }; } { @@ -419,8 +824,8 @@ fetch = { type = "git"; url = "https://github.com/golang/protobuf"; - rev = "v1.3.2"; - sha256 = "1k1wb4zr0qbwgpvz9q5ws9zhlal8hq7dmq62pwxxriksayl6hzym"; + rev = "v1.4.2"; + sha256 = "0m5z81im4nsyfgarjhppayk4hqnrwswr3nix9mj8pff8x9jvcjqw"; }; } { @@ -446,8 +851,8 @@ fetch = { type = "git"; url = "https://github.com/google/go-cmp"; - rev = "v0.4.0"; - sha256 = "1x5pvl3fb5sbyng7i34431xycnhmx8xx94gq2n19g6p0vz68z2v2"; + rev = "v0.4.1"; + sha256 = "0l1mi8lw1nlq39hqx52v9lz0369ajfi948521cxwrcb4qwm275p6"; }; } { @@ -459,22 +864,13 @@ sha256 = "0xl12bqyvmn4xcnf8p9ksj9rmnr7s40pvppsdmy8n9bzw1db0iwz"; }; } - { - goPackagePath = "github.com/google/martian"; - fetch = { - type = "git"; - url = "https://github.com/google/martian"; - rev = "v2.1.0"; - sha256 = "197hil6vrjk50b9wvwyzf61csid83whsjj6ik8mc9r2lryxlyyrp"; - }; - } { goPackagePath = "github.com/google/pprof"; fetch = { type = "git"; url = "https://github.com/google/pprof"; - rev = "d4f498aebedc"; - sha256 = "1r4pn70yy5vfl38jx9v8224n7jkhcm5wg28vv48izgznlgv7h024"; + rev = "427632fa3b1c"; + sha256 = "065r8435mr8zzdiifkixzc948c4ivx0hhqjsppy71zcxmm9jhxgx"; }; } { @@ -486,6 +882,15 @@ sha256 = "1ki2x5a9nrj17sn092d6n4zr29lfg5ydv4xz5cp58z6cw8ip43jx"; }; } + { + goPackagePath = "github.com/google/subcommands"; + fetch = { + type = "git"; + url = "https://github.com/google/subcommands"; + rev = "v1.0.1"; + sha256 = "0rw5wwjfi0pd1kfbh09mfmyjy6h22ip7cawp0dj7v6rq4cy98ymz"; + }; + } { goPackagePath = "github.com/google/uuid"; fetch = { @@ -495,6 +900,15 @@ sha256 = "0hfxcf9frkb57k6q0rdkrmnfs78ms21r1qfk9fhlqga2yh5xg8zb"; }; } + { + goPackagePath = "github.com/google/wire"; + fetch = { + type = "git"; + url = "https://github.com/google/wire"; + rev = "v0.4.0"; + sha256 = "1z3nrccxsrhphpb6yrmc1hn4njy8qbayg3w6m9zsbi77yaiigxni"; + }; + } { goPackagePath = "github.com/googleapis/gax-go"; fetch = { @@ -549,6 +963,15 @@ sha256 = "1lzk54h7np32b3acidg1ggbn8ppbnns0m71gcg9d1qkkdh8zrijl"; }; } + { + goPackagePath = "github.com/hashicorp/go-version"; + fetch = { + type = "git"; + url = "https://github.com/hashicorp/go-version"; + rev = "v1.2.0"; + sha256 = "1bwi6y6111xq8ww8kjq0w1cmz15l1h9hb2id6596l8l0ag1vjj1z"; + }; + } { goPackagePath = "github.com/hashicorp/golang-lru"; fetch = { @@ -558,6 +981,15 @@ sha256 = "13f870cvk161bzjj6x41l45r5x9i1z9r2ymwmvm7768kg08zznpy"; }; } + { + goPackagePath = "github.com/hashicorp/hcl"; + fetch = { + type = "git"; + url = "https://github.com/hashicorp/hcl"; + rev = "v1.0.0"; + sha256 = "0q6ml0qqs0yil76mpn4mdx4lp94id8vbv575qm60jzl1ijcl5i66"; + }; + } { goPackagePath = "github.com/hpcloud/tail"; fetch = { @@ -585,6 +1017,15 @@ sha256 = "180h3pf2p0pch6hmqf45wk7wd87md83d3p122f8ll43x5nja5mph"; }; } + { + goPackagePath = "github.com/inconshreveable/mousetrap"; + fetch = { + type = "git"; + url = "https://github.com/inconshreveable/mousetrap"; + rev = "v1.0.0"; + sha256 = "1mn0kg48xkd74brf48qf5hzp0bc6g8cf5a77w895rl3qnlpfw152"; + }; + } { goPackagePath = "github.com/iris-contrib/blackfriday"; fetch = { @@ -622,12 +1063,48 @@ }; } { - goPackagePath = "github.com/jfbus/httprs"; + goPackagePath = "github.com/iris-contrib/i18n"; fetch = { type = "git"; - url = "https://github.com/jfbus/httprs"; - rev = "b0af8319bb15"; - sha256 = "05cg9a27i9g92n3bivqrrqznccl5lfadlk97sp9izmd368dl5qvc"; + url = "https://github.com/iris-contrib/i18n"; + rev = "987a633949d0"; + sha256 = "0yslm7hmacc57v970jbys4x5c5yxgcjgff982ngivg9v1a16kifq"; + }; + } + { + goPackagePath = "github.com/iris-contrib/schema"; + fetch = { + type = "git"; + url = "https://github.com/iris-contrib/schema"; + rev = "v0.0.1"; + sha256 = "1a1lk2ll2xv3ljffmfw4q8mqqw727pj8dzs6c8g2hh0b0b050g79"; + }; + } + { + goPackagePath = "github.com/jmespath/go-jmespath"; + fetch = { + type = "git"; + url = "https://github.com/jmespath/go-jmespath"; + rev = "v0.3.0"; + sha256 = "12qgp7yb7yfjxhd311kb820fcjmg7gd4hp2fc4v6x8s7121pwnjp"; + }; + } + { + goPackagePath = "github.com/johannesboyne/gofakes3"; + fetch = { + type = "git"; + url = "https://github.com/johannesboyne/gofakes3"; + rev = "02d71f533bec"; + sha256 = "0igx9andbkrmwspjbq9sa8pady2hpyvvjj4hfmghnry02kq23fwn"; + }; + } + { + goPackagePath = "github.com/joho/godotenv"; + fetch = { + type = "git"; + url = "https://github.com/joho/godotenv"; + rev = "v1.3.0"; + sha256 = "0ri8if0pc3x6jg4c3i8wr58xyfpxkwmcjk3rp8gb398a1aa3gpjm"; }; } { @@ -716,8 +1193,8 @@ fetch = { type = "git"; url = "https://github.com/kataras/golog"; - rev = "99c81de45f40"; - sha256 = "1dgrsvhzymgj7da54ldv8plkxk3n8zh3kc995qxl6mrpz65j801p"; + rev = "v0.0.9"; + sha256 = "160hd3z93c9i33q9g1bhfdxmsqg1lanncnrqcsr2444dy5j6ly3i"; }; } { @@ -725,8 +1202,17 @@ fetch = { type = "git"; url = "https://github.com/kataras/iris"; - rev = "v11.1.1"; - sha256 = "1rxpr5hdj9mji26mlfp4zic0pc6nh93akzccw24a5kynj07g68wg"; + rev = "v12.0.1"; + sha256 = "0k1jhamvf0byx6d317gzg6r2jls7bajhhf2spvdinarl2cjnakm5"; + }; + } + { + goPackagePath = "github.com/kataras/neffos"; + fetch = { + type = "git"; + url = "https://github.com/kataras/neffos"; + rev = "v0.0.10"; + sha256 = "0mkqrxff28rcc71nw5qqsywn0fm2jz7magwp9hhvh1s01lgghjdp"; }; } { @@ -761,8 +1247,8 @@ fetch = { type = "git"; url = "https://github.com/klauspost/compress"; - rev = "v1.4.0"; - sha256 = "1y7951q0ji894d111lqqbacq64cxyi2dxsni5sqi9488zsasgw8s"; + rev = "v1.9.0"; + sha256 = "07vndz6mdaliwagj2xq0y5c5w2zld14p9i5y7r0bkhb7klfyamfk"; }; } { @@ -770,8 +1256,8 @@ fetch = { type = "git"; url = "https://github.com/klauspost/cpuid"; - rev = "e7e905edc00e"; - sha256 = "0cmyv3rwv5r5iqvvfhbiwp3jsfa40c6xfm42nxbngd5lygjcwwgf"; + rev = "v1.2.1"; + sha256 = "1071wchrs37bvpb99fwf19fjrpz0yaqipi2y2hjvim419flvd49x"; }; } { @@ -824,8 +1310,8 @@ fetch = { type = "git"; url = "https://github.com/labstack/echo"; - rev = "v4.1.10"; - sha256 = "0qg9ykmhgldiv2v1w8sz8x0j0bgqf11ghzrim59fb6pxz8qgg25h"; + rev = "v4.1.11"; + sha256 = "0b14vgwzznn7wzyjb98xdmq4wjg16l3y62njiwfz4qsm4pwzk405"; }; } { @@ -837,6 +1323,15 @@ sha256 = "18z7akyzm75p6anm4b8qkqgm4iivx50z07hi5wf50w1pbsvbcdi0"; }; } + { + goPackagePath = "github.com/lib/pq"; + fetch = { + type = "git"; + url = "https://github.com/lib/pq"; + rev = "v1.1.1"; + sha256 = "0g64wlg1l1ybq4x44idksl4pgm055s58jxc6r6x4qhqm5q76h0km"; + }; + } { goPackagePath = "github.com/libgit2/git2go"; fetch = { @@ -855,13 +1350,31 @@ sha256 = "10n5r66g44s6rnz5kf86s4a3p1g55kc1kxqhnk7bx7mlayndgpmb"; }; } + { + goPackagePath = "github.com/magiconair/properties"; + fetch = { + type = "git"; + url = "https://github.com/magiconair/properties"; + rev = "v1.8.0"; + sha256 = "1a10362wv8a8qwb818wygn2z48lgzch940hvpv81hv8gc747ajxn"; + }; + } { goPackagePath = "github.com/mattn/go-colorable"; fetch = { type = "git"; url = "https://github.com/mattn/go-colorable"; - rev = "v0.1.2"; - sha256 = "0512jm3wmzkkn7d99x9wflyqf48n5ri3npy1fqkq6l6adc5mni3n"; + rev = "v0.1.6"; + sha256 = "0zv9ix7g0qf71jdhv7gbab9hjfkgbxl22kwhpz9ck1y6m4g1zxaw"; + }; + } + { + goPackagePath = "github.com/mattn/go-ieproxy"; + fetch = { + type = "git"; + url = "https://github.com/mattn/go-ieproxy"; + rev = "v0.0.1"; + sha256 = "0x1ijwwp22s20vjbca5ac7y7bx2jp6jizzqa38ks4943q7vi4w09"; }; } { @@ -869,8 +1382,8 @@ fetch = { type = "git"; url = "https://github.com/mattn/go-isatty"; - rev = "v0.0.9"; - sha256 = "0i3km37lajahh1y2392g4hpgvq05arcgiiv93yhzxxyv0fpqj72m"; + rev = "v0.0.12"; + sha256 = "1dfsh27d52wmz0nmmzm2382pfrs2fcijvh6cgir7jbb4pnigr5w4"; }; } { @@ -891,6 +1404,24 @@ sha256 = "1d0c1isd2lk9pnfq2nk0aih356j30k3h1gi2w0ixsivi5csl7jya"; }; } + { + goPackagePath = "github.com/mediocregopher/mediocre-go-lib"; + fetch = { + type = "git"; + url = "https://github.com/mediocregopher/mediocre-go-lib"; + rev = "cb65787f37ed"; + sha256 = "0lg6q76fxjhxv05m80k4l6nrkj9qwzafs2mb2gbvhznxh8m0cv9j"; + }; + } + { + goPackagePath = "github.com/mediocregopher/radix"; + fetch = { + type = "git"; + url = "https://github.com/mediocregopher/radix"; + rev = "v3.3.0"; + sha256 = "0pchn5z2g4wnf87350war5fr9pqpdksia1ffvw7cphg4q9blggfx"; + }; + } { goPackagePath = "github.com/microcosm-cc/bluemonday"; fetch = { @@ -909,6 +1440,24 @@ sha256 = "05njg92w1088v4yl0js0zdrpfq6k37i9j14mxkr3p90p5yd9rrrr"; }; } + { + goPackagePath = "github.com/mitchellh/go-homedir"; + fetch = { + type = "git"; + url = "https://github.com/mitchellh/go-homedir"; + rev = "v1.1.0"; + sha256 = "0ydzkipf28hwj2bfxqmwlww47khyk6d152xax4bnyh60f4lq3nx1"; + }; + } + { + goPackagePath = "github.com/mitchellh/mapstructure"; + fetch = { + type = "git"; + url = "https://github.com/mitchellh/mapstructure"; + rev = "v1.1.2"; + sha256 = "03bpv28jz9zhn4947saqwi328ydj7f6g6pf1m2d4m5zdh5jlfkrr"; + }; + } { goPackagePath = "github.com/mitchellh/reflectwalk"; fetch = { @@ -954,13 +1503,40 @@ sha256 = "0nbrnpk7bkmqg9mzwsxlm0y8m7s9qd9phr1q30qlx2qmdmz7c1mf"; }; } + { + goPackagePath = "github.com/nats-io/nats.go"; + fetch = { + type = "git"; + url = "https://github.com/nats-io/nats.go"; + rev = "v1.8.1"; + sha256 = "0h9zzpjl6ac227bhf0i4ram9a5jlibq53pawv0zzxdirxrnp1vkj"; + }; + } + { + goPackagePath = "github.com/nats-io/nkeys"; + fetch = { + type = "git"; + url = "https://github.com/nats-io/nkeys"; + rev = "v0.0.2"; + sha256 = "0kibc1g60w031rssk3vs74gfick3jdl3igckn1v4k8b5grawcks1"; + }; + } + { + goPackagePath = "github.com/nats-io/nuid"; + fetch = { + type = "git"; + url = "https://github.com/nats-io/nuid"; + rev = "v1.0.1"; + sha256 = "11zbhg4kds5idsya04bwz4plj0mmiigypzppzih731ppbk2ms1zg"; + }; + } { goPackagePath = "github.com/onsi/ginkgo"; fetch = { type = "git"; url = "https://github.com/onsi/ginkgo"; - rev = "v1.10.1"; - sha256 = "033a42h1wzmji57p86igg9whvsbp6nvfdsypskw738ys903n3z4d"; + rev = "v1.10.3"; + sha256 = "00a40by9f5ylycnar8h3p9b4z5rcsvfvg4j3v5s5mchdqrqjv1pc"; }; } { @@ -968,8 +1544,8 @@ fetch = { type = "git"; url = "https://github.com/onsi/gomega"; - rev = "v1.7.0"; - sha256 = "09j6wq425wgzzsbwm9ckhfgl2capv3yyqbrf45qyrjwkzm49i02y"; + rev = "v1.7.1"; + sha256 = "06p3x0910cdaa64l7d44s728d4j3yhps315dlcvrbjzhljjj7mam"; }; } { @@ -981,6 +1557,15 @@ sha256 = "0i0ghg94dg8lk05mw5n23983wq04yjvkjmdkc9z5y1f3508938h9"; }; } + { + goPackagePath = "github.com/pelletier/go-toml"; + fetch = { + type = "git"; + url = "https://github.com/pelletier/go-toml"; + rev = "v1.2.0"; + sha256 = "1fjzpcjng60mc3a4b2ql5a00d5gah84wj740dabv9kq67mpg8fxy"; + }; + } { goPackagePath = "github.com/philhofer/fwd"; fetch = { @@ -995,8 +1580,8 @@ fetch = { type = "git"; url = "https://github.com/pingcap/errors"; - rev = "v0.11.1"; - sha256 = "00wr0l4cwq0qx8jw51j0n7pbh9l7hdq2874x9rf1mz5svz1wbmcp"; + rev = "v0.11.4"; + sha256 = "02k6b30m42aya763fnwx3paq4r8h28yav4i2kv2z4r28r70xxcgn"; }; } { @@ -1004,8 +1589,8 @@ fetch = { type = "git"; url = "https://github.com/pkg/errors"; - rev = "v0.8.1"; - sha256 = "0g5qcb4d4fd96midz0zdk8b9kz8xkzwfa8kr1cliqbg8sxsy5vd1"; + rev = "v0.9.1"; + sha256 = "1761pybhc2kqr6v5fm8faj08x9bql8427yqg6vnfv6nhrasx1mwq"; }; } { @@ -1071,6 +1656,15 @@ sha256 = "0mcdh1licgnnahwml9y2iq6xy5x9xmjw5frcnds2s3wpjyqrl216"; }; } + { + goPackagePath = "github.com/russross/blackfriday"; + fetch = { + type = "git"; + url = "https://github.com/russross/blackfriday"; + rev = "v1.5.2"; + sha256 = "0jzbfzcywqcrnym4gxlz6nphmm1grg6wsl4f0r9x384rn83wkj7c"; + }; + } { goPackagePath = "github.com/ryanuber/columnize"; fetch = { @@ -1080,6 +1674,15 @@ sha256 = "0m9jhagb1k44zfcdai76xdf9vpi3bqdl7p078ffyibmz0z9jfap6"; }; } + { + goPackagePath = "github.com/ryszard/goskiplist"; + fetch = { + type = "git"; + url = "https://github.com/ryszard/goskiplist"; + rev = "2dfbae5fcf46"; + sha256 = "1135gmvcwnmk36zryxq554fmikrmg5c6y5ml00arqpagn5xhnmnl"; + }; + } { goPackagePath = "github.com/sebest/xff"; fetch = { @@ -1098,6 +1701,15 @@ sha256 = "0swiazj8wphs2zmk1qgq75xza6m19snif94h2m6fi8dqkwqdl7c7"; }; } + { + goPackagePath = "github.com/shabbyrobe/gocovmerge"; + fetch = { + type = "git"; + url = "https://github.com/shabbyrobe/gocovmerge"; + rev = "3e036491d500"; + sha256 = "1wb5xlknnmyamf7ksnd6fwyc73pip90gkjbm6qcc47flbdfdl4xg"; + }; + } { goPackagePath = "github.com/shurcooL/sanitized_anchor_name"; fetch = { @@ -1130,17 +1742,71 @@ fetch = { type = "git"; url = "https://github.com/smartystreets/goconvey"; - rev = "505e41936337"; + rev = "v1.6.4"; sha256 = "07zjxwszayal88z1j2bwnqrsa32vg8l4nivks5yfr9j8xfsw7n6m"; }; } + { + goPackagePath = "github.com/spf13/afero"; + fetch = { + type = "git"; + url = "https://github.com/spf13/afero"; + rev = "v1.2.1"; + sha256 = "14qqj0cz6a595vn4dp747vddx05fd77jdsyl85qjmf9baymaxlam"; + }; + } + { + goPackagePath = "github.com/spf13/cast"; + fetch = { + type = "git"; + url = "https://github.com/spf13/cast"; + rev = "v1.3.0"; + sha256 = "0xq1ffqj8y8h7dcnm0m9lfrh0ga7pssnn2c1dnr09chqbpn4bdc5"; + }; + } + { + goPackagePath = "github.com/spf13/cobra"; + fetch = { + type = "git"; + url = "https://github.com/spf13/cobra"; + rev = "v0.0.5"; + sha256 = "0z4x8js65mhwg1gf6sa865pdxfgn45c3av9xlcc1l3xjvcnx32v2"; + }; + } + { + goPackagePath = "github.com/spf13/jwalterweatherman"; + fetch = { + type = "git"; + url = "https://github.com/spf13/jwalterweatherman"; + rev = "v1.0.0"; + sha256 = "093fmmvavv84pv4q84hav7ph3fmrq87bvspjj899q0qsx37yvdr8"; + }; + } + { + goPackagePath = "github.com/spf13/pflag"; + fetch = { + type = "git"; + url = "https://github.com/spf13/pflag"; + rev = "v1.0.3"; + sha256 = "1cj3cjm7d3zk0mf1xdybh0jywkbbw7a6yr3y22x9sis31scprswd"; + }; + } + { + goPackagePath = "github.com/spf13/viper"; + fetch = { + type = "git"; + url = "https://github.com/spf13/viper"; + rev = "v1.3.2"; + sha256 = "1829hvf805kda65l59r17wvid7y0vr390s23zfhf4w7vdb4wp3zh"; + }; + } { goPackagePath = "github.com/stretchr/objx"; fetch = { type = "git"; url = "https://github.com/stretchr/objx"; - rev = "v0.1.1"; - sha256 = "0iph0qmpyqg4kwv8jsx6a56a7hhqq8swrazv40ycxk9rzr0s8yls"; + rev = "v0.2.0"; + sha256 = "0pcdvakxgddaiwcdj73ra4da05a3q4cgwbpm2w75ycq4kzv8ij8k"; }; } { @@ -1148,8 +1814,8 @@ fetch = { type = "git"; url = "https://github.com/stretchr/testify"; - rev = "v1.4.0"; - sha256 = "187i5g88sxfy4vxpm7dw1gwv29pa2qaq475lxrdh5livh69wqfjb"; + rev = "v1.5.1"; + sha256 = "09r89m1wy4cjv2nps1ykp00qjpi0531r07q3s34hr7m6njk4srkl"; }; } { @@ -1193,8 +1859,8 @@ fetch = { type = "git"; url = "https://github.com/ugorji/go"; - rev = "v1.1.4"; - sha256 = "0ma2qvn5wqvjidpdz74x832a813qnr1cxbx6n6n125ak9b3wbn5w"; + rev = "v1.1.7"; + sha256 = "068gja55kbh2iivp03x4n9dcml0rxv0k64ivkmq06si2ar1835rm"; }; } { @@ -1220,8 +1886,8 @@ fetch = { type = "git"; url = "https://github.com/valyala/fasthttp"; - rev = "v1.4.0"; - sha256 = "0kypc7r91n61fm6qsadza1aiy9n6byghvcxzvx7agi6yzrllk956"; + rev = "v1.6.0"; + sha256 = "1r1hm4rv9w6x829jjg75y8xd523b76parsyyvjwyz8k2l6bm4h0b"; }; } { @@ -1265,8 +1931,17 @@ fetch = { type = "git"; url = "https://github.com/xeipuuv/gojsonschema"; - rev = "v1.1.0"; - sha256 = "10gn5y4l72zknj21mff29d9vnk4pz7jnw39xnlsb373lsiih91xg"; + rev = "v1.2.0"; + sha256 = "1mqiq0r8qw4qlfp3ls8073r6514rmzwrmdn4j33rppk3zh942i6l"; + }; + } + { + goPackagePath = "github.com/xordataexchange/crypt"; + fetch = { + type = "git"; + url = "https://github.com/xordataexchange/crypt"; + rev = "b2862e3d0a77"; + sha256 = "04q3856anpzl4gdfgmg7pbp9cx231nkz3ymq2xp27rnmmwhfxr8y"; }; } { @@ -1305,6 +1980,15 @@ sha256 = "18vbc7jagnjw1wpvhqjffl0np7bzzqdd9jpdcisvj5h85lbyn5gk"; }; } + { + goPackagePath = "github.com/yuin/goldmark"; + fetch = { + type = "git"; + url = "https://github.com/yuin/goldmark"; + rev = "v1.1.27"; + sha256 = "1872cqnii0kwiqcy81yin0idvjy5mdy4zlzz0csb319lcjs3b923"; + }; + } { goPackagePath = "gitlab.com/gitlab-org/gitaly"; fetch = { @@ -1319,8 +2003,8 @@ fetch = { type = "git"; url = "https://gitlab.com/gitlab-org/labkit.git"; - rev = "fac94cb428e6"; - sha256 = "19wvfjij6zm88fxbx0cngr6ny4yh3fw469d6vlv741b37s07w3j0"; + rev = "96e583c57891"; + sha256 = "15h6yvyq5rhhblwmahz89b0kgkfvfrpg20d23jvshyxs5xjh7y8f"; }; } { @@ -1328,8 +2012,8 @@ fetch = { type = "git"; url = "https://github.com/census-instrumentation/opencensus-go"; - rev = "v0.22.2"; - sha256 = "0lz7fid63pdrcvyzk5kn7vlcva102h61igmw7pz824wvj9k3hy4q"; + rev = "v0.22.3"; + sha256 = "0xj16iq5jp26hi2py7lsd8cvqh651fgn39y05gzvjdi88d9xd3nw"; }; } { @@ -1341,13 +2025,22 @@ sha256 = "11pzvjys5ddjjgrv94pgk9pnip9yyb54z7idf33zk7p7xylpnsv6"; }; } + { + goPackagePath = "gocloud.dev"; + fetch = { + type = "git"; + url = "https://github.com/google/go-cloud"; + rev = "v0.20.0"; + sha256 = "0zmqm8k4gxvivhpq3gpdqf9lnm9qj1ryyg9nm0rh3cvman5y07ci"; + }; + } { goPackagePath = "golang.org/x/crypto"; fetch = { type = "git"; url = "https://go.googlesource.com/crypto"; - rev = "87dc89f01550"; - sha256 = "0z4i1m2yn3f31ci7wvcm2rxkx2yiv7a78mfzklncmsz2k97rlh2g"; + rev = "e9b2fee46413"; + sha256 = "18sz5426h320l9gdll9n43lzzxg2dmqv0s5fjy6sbvbkkpjs1m28"; }; } { @@ -1355,8 +2048,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/exp"; - rev = "da58074b4299"; - sha256 = "1pgvdbjm3n47505diw3mm2hisp9b9q2lyvgl9m6xh2wx83b0cj48"; + rev = "6cc2880d07d6"; + sha256 = "1iia6hiif6hcp0cg1i6nq63qg0pmvm2kq24pf2r2il3597rfmlgy"; }; } { @@ -1373,8 +2066,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/lint"; - rev = "fdd1cda4f05f"; - sha256 = "0a23pc90fqar8sm1b480sls15ss20rqk13yrf63b6rnyd2c6z0x2"; + rev = "738671d3881b"; + sha256 = "0jkiz4py59jjnkyxbxifpf7bsar11lbgmj5jiq2kic5k03shkn9c"; }; } { @@ -1391,8 +2084,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/mod"; - rev = "c90efee705ee"; - sha256 = "0i5md645rmcy5z5ij9ng428k9rz4g3k1kjy3blsq1264rn426gdf"; + rev = "v0.3.0"; + sha256 = "0ldgbx2zpprbsfn6p8pfgs4nn87gwbfcv2z0fa7n8alwsq2yw78q"; }; } { @@ -1400,8 +2093,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/net"; - rev = "6afb5195e5aa"; - sha256 = "1aiz41q2yxgg3dxfkn33ff54vhaxbiwcps9j3ia1xx4cqxim38zw"; + rev = "627f9648deb9"; + sha256 = "0ziz7i9mhz6dy2f58dsa83flkk165w1cnazm7yksql5i9m7x099z"; }; } { @@ -1418,8 +2111,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/sync"; - rev = "cd5d95a43a6e"; - sha256 = "1nqkyz2y1qvqcma52ijh02s8aiqmkfb95j08f6zcjhbga3ds6hds"; + rev = "43a5402ce75a"; + sha256 = "0j6zrrb81qjr1926kkwmn0di9a0jn8qyjd9dw614rfkihxgq1vsm"; }; } { @@ -1427,8 +2120,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/sys"; - rev = "d101bd2416d5"; - sha256 = "1ksxf37b0ym21n8j29m3wgbaiw1kcjw3hgf88kipc1ry2j13l98p"; + rev = "6fdc65e7d980"; + sha256 = "0al5gzij4qkrp11i1h8j7288pg6y716zyh2v0886pv2knha7gjvj"; }; } { @@ -1445,8 +2138,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/time"; - rev = "9d24e82272b4"; - sha256 = "1f5nkr4vys2vbd8wrwyiq2f5wcaahhpxmia85d1gshcbqjqf8dkb"; + rev = "555d28b269f0"; + sha256 = "1rhl4lyz030kwfsg63yk83yd3ivryv1afmzdz9sxbhcj84ym6h4r"; }; } { @@ -1454,8 +2147,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/tools"; - rev = "43d50277825c"; - sha256 = "1168q4da36wq9w2591iqzsfy5ymwfi2g46bv5dnyyspg155ld19k"; + rev = "1b747fd94509"; + sha256 = "0r53sxrkkycdpi0l5ljqpd9dzmcgns4csl3zgsaxdy1l0r0bfnyc"; }; } { @@ -1471,9 +2164,9 @@ goPackagePath = "google.golang.org/api"; fetch = { type = "git"; - url = "https://code.googlesource.com/google-api-go-client"; - rev = "v0.15.0"; - sha256 = "1ljhwv5xsgsbqia70f35q19vwrsm47sh08ljbwdyfa867ff17qdh"; + url = "https://github.com/googleapis/google-api-go-client"; + rev = "v0.26.0"; + sha256 = "0niqb2hkpj7sgk8q2xbpgjhbql0s4756nzbjs1msynbc94c9g7hy"; }; } { @@ -1481,17 +2174,17 @@ fetch = { type = "git"; url = "https://github.com/golang/appengine"; - rev = "v1.6.5"; - sha256 = "05hbq4cs7bqw0zl17bx8rzdkszid3nyl92100scg3jjrg70dhm7w"; + rev = "v1.6.6"; + sha256 = "15c38h6fbv06cnkr6yknygfrpibyms2mya4w0l29kaxf42jn1qi5"; }; } { goPackagePath = "google.golang.org/genproto"; fetch = { type = "git"; - url = "https://github.com/google/go-genproto"; - rev = "ca5a22157cba"; - sha256 = "0ldkh6f0g0wzfkp09ib15a62bmcbpsxj93saikqmc86242bcxij0"; + url = "https://github.com/googleapis/go-genproto"; + rev = "7c474a2e3482"; + sha256 = "00337qngl2rr45qpmlysc7wm7q27vbvjr2s36w1lc08fx7ba1wk9"; }; } { @@ -1499,8 +2192,17 @@ fetch = { type = "git"; url = "https://github.com/grpc/grpc-go"; + rev = "v1.29.1"; + sha256 = "1465947r6536si36cl2ppx7929la9zba1y6xfczfyp4kgf8988hf"; + }; + } + { + goPackagePath = "google.golang.org/protobuf"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/protobuf"; rev = "v1.24.0"; - sha256 = "0h8mwv74vzcfb7p4ai247x094skxca71vjp4wpj2wzmri0x9p4v6"; + sha256 = "0x3qyn3rizbs671gs7f8v50rmiwf9h7kbaradpivw9718mhbg1gn"; }; } { @@ -1589,8 +2291,8 @@ fetch = { type = "git"; url = "https://gopkg.in/yaml.v2"; - rev = "v2.2.2"; - sha256 = "01wj12jzsdqlnidpyjssmj0r4yavlqy7dwrg7adqd8dicjc4ncsa"; + rev = "v2.2.8"; + sha256 = "1inf7svydzscwv9fcjd2rm61a4xjk6jkswknybmns2n58shimapw"; }; } { @@ -1598,8 +2300,8 @@ fetch = { type = "git"; url = "https://github.com/dominikh/go-tools"; - rev = "v0.0.1-2019.2.3"; - sha256 = "1rwwahmbs4dwxncwjj56likir1kps9937vm2id3rygxzzla40zal"; + rev = "v0.0.1-2020.1.5"; + sha256 = "1ry3ywncc9qkmh8ihh67v6k8nmqhq2gvfyrl1ykl4z6s56b7f9za"; }; } { @@ -1611,4 +2313,22 @@ sha256 = "1kar0myy85waw418zslviwx8846zj0m9cmqkxjx0fvgjdi70nc4b"; }; } + { + goPackagePath = "rsc.io/quote"; + fetch = { + type = "git"; + url = "https://github.com/rsc/quote"; + rev = "v3.1.0"; + sha256 = "0nvv97hwwrl1mx5gzsbdm1ndnwpg3m7i2jb10ig9wily7zmvki0i"; + }; + } + { + goPackagePath = "rsc.io/sampler"; + fetch = { + type = "git"; + url = "https://github.com/rsc/sampler"; + rev = "v1.3.0"; + sha256 = "0byxk2ynba50py805kcvbvjzh59l1r308i1xgyzpw6lff4xx9xjh"; + }; + } ] diff --git a/pkgs/applications/version-management/gitlab/remove-hardcoded-locations.patch b/pkgs/applications/version-management/gitlab/remove-hardcoded-locations.patch index 846bdeff48d3..fcb954e38843 100644 --- a/pkgs/applications/version-management/gitlab/remove-hardcoded-locations.patch +++ b/pkgs/applications/version-management/gitlab/remove-hardcoded-locations.patch @@ -34,12 +34,12 @@ diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings. index 0bea8a4f4b..290248547b 100644 --- a/config/initializers/1_settings.rb +++ b/config/initializers/1_settings.rb -@@ -255,7 +255,7 @@ Settings.gitlab['user'] ||= 'git' - Settings.gitlab['user_home'] ||= begin +@@ -177,7 +177,7 @@ Settings.gitlab['ssh_user'] ||= Settings.gitlab['user'] + Settings.gitlab['user_home'] ||= begin Etc.getpwnam(Settings.gitlab['user']).dir - rescue ArgumentError # no user configured -- '/home/' + Settings.gitlab['user'] -+ '/homeless-shelter' + rescue ArgumentError # no user configured +- '/home/' + Settings.gitlab['user'] ++ '/homeless-shelter' end Settings.gitlab['time_zone'] ||= nil Settings.gitlab['signup_enabled'] ||= true if Settings.gitlab['signup_enabled'].nil? diff --git a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile index 9c8c5e8b30d7..0e28aa7a2d43 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile +++ b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile @@ -1,6 +1,6 @@ source 'https://rubygems.org' -gem 'rails', '~> 6.0.3' +gem 'rails', '~> 6.0.3.1' gem 'bootsnap', '~> 1.4.6' @@ -19,15 +19,15 @@ gem 'default_value_for', '~> 3.3.0' gem 'pg', '~> 1.1' gem 'rugged', '~> 0.28' -gem 'grape-path-helpers', '~> 1.2' +gem 'grape-path-helpers', '~> 1.3' -gem 'faraday', '~> 0.12' -gem 'marginalia', '~> 1.8.0' +gem 'faraday', '~> 1.0' +gem 'marginalia', '~> 1.9.0' # Authentication libraries gem 'devise', '~> 4.6' -gem 'doorkeeper', '~> 5.0.3' -gem 'doorkeeper-openid_connect', '~> 1.6.3' +gem 'doorkeeper', '~> 5.3.0' +gem 'doorkeeper-openid_connect', '~> 1.7.4' gem 'omniauth', '~> 1.8' gem 'omniauth-auth0', '~> 2.0.0' gem 'omniauth-azure-oauth2', '~> 0.0.9' @@ -41,11 +41,11 @@ gem 'omniauth-oauth2-generic', '~> 0.2.2' gem 'omniauth-saml', '~> 1.10' gem 'omniauth-shibboleth', '~> 1.3.0' gem 'omniauth-twitter', '~> 1.4' -gem 'omniauth_crowd', '~> 2.2.0' +gem 'omniauth_crowd', '~> 2.4.0' gem 'omniauth-authentiq', '~> 0.3.3' -gem 'omniauth_openid_connect', '~> 0.3.3' -gem "omniauth-ultraauth", '~> 0.0.2' +gem 'omniauth_openid_connect', '~> 0.3.5' gem 'omniauth-salesforce', '~> 1.0.5' +gem 'omniauth-atlassian-oauth2', '~> 0.2.0' gem 'rack-oauth2', '~> 1.9.3' gem 'jwt', '~> 2.1.0' @@ -64,13 +64,13 @@ gem 'attr_encrypted', '~> 3.1.0' gem 'u2f', '~> 0.2.1' # GitLab Pages -gem 'validates_hostname', '~> 1.0.6' +gem 'validates_hostname', '~> 1.0.10' gem 'rubyzip', '~> 2.0.0', require: 'zip' # GitLab Pages letsencrypt support -gem 'acme-client', '~> 2.0.5' +gem 'acme-client', '~> 2.0', '>= 2.0.6' # Browser detection -gem 'browser', '~> 2.5' +gem 'browser', '~> 4.2' # GPG gem 'gpgme', '~> 2.0.19' @@ -82,17 +82,19 @@ gem 'gitlab_omniauth-ldap', '~> 2.1.1', require: 'omniauth-ldap' gem 'net-ldap' # API -gem 'grape', '~> 1.1.0' +# Locked at Grape v1.4.0 until https://github.com/ruby-grape/grape/pull/2088 is merged +# Remove config/initializers/grape_patch.rb +gem 'grape', '= 1.4.0' gem 'grape-entity', '~> 0.7.1' gem 'rack-cors', '~> 1.0.6', require: 'rack/cors' # GraphQL API -gem 'graphql', '~> 1.10.5' +gem 'graphql', '~> 1.11.4' # NOTE: graphiql-rails v1.5+ doesn't work: https://gitlab.com/gitlab-org/gitlab/issues/31771 # TODO: remove app/views/graphiql/rails/editors/show.html.erb when https://github.com/rmosolgo/graphiql-rails/pull/71 is released: # https://gitlab.com/gitlab-org/gitlab/issues/31747 gem 'graphiql-rails', '~> 1.4.10' -gem 'apollo_upload_server', '~> 2.0.0.beta3' +gem 'apollo_upload_server', '~> 2.0.2' gem 'graphql-docs', '~> 1.6.0', group: [:development, :test] # Disable strong_params so that Mash does not respond to :permitted? @@ -113,14 +115,15 @@ gem 'fog-aws', '~> 3.5' # Locked until fog-google resolves https://github.com/fog/fog-google/issues/421. # Also see config/initializers/fog_core_patch.rb. gem 'fog-core', '= 2.1.0' -gem 'fog-google', '~> 1.9' +gem 'fog-google', '~> 1.10' gem 'fog-local', '~> 0.6' gem 'fog-openstack', '~> 1.0' gem 'fog-rackspace', '~> 0.1.1' gem 'fog-aliyun', '~> 0.3' +gem 'gitlab-fog-azure-rm', '~> 1.0', require: false # for Google storage -gem 'google-api-client', '~> 0.23' +gem 'google-api-client', '~> 0.33' # for aws storage gem 'unf', '~> 0.1.4' @@ -131,9 +134,11 @@ gem 'seed-fu', '~> 2.3.7' # Search gem 'elasticsearch-model', '~> 6.1' gem 'elasticsearch-rails', '~> 6.1', require: 'elasticsearch/rails/instrumentation' -gem 'elasticsearch-api', '~> 6.8' -gem 'aws-sdk' -gem 'faraday_middleware-aws-signers-v4' +gem 'elasticsearch-api', '~> 6.8.2' +gem 'aws-sdk-core', '~> 3' +gem 'aws-sdk-cloudformation', '~> 1' +gem 'aws-sdk-s3', '~> 1' +gem 'faraday_middleware-aws-sigv4', '~>0.3.0' # Markdown and HTML processing gem 'html-pipeline', '~> 2.12' @@ -141,6 +146,7 @@ gem 'deckar01-task_list', '2.3.1' gem 'gitlab-markup', '~> 1.7.1' gem 'github-markup', '~> 1.7.0', require: 'github/markup' gem 'commonmarker', '~> 0.20' +gem 'kramdown', '~> 2.3.0' gem 'RedCloth', '~> 4.3.2' gem 'rdoc', '~> 6.1.2' gem 'org-ruby', '~> 0.9.12' @@ -149,7 +155,7 @@ gem 'wikicloth', '0.8.1' gem 'asciidoctor', '~> 2.0.10' gem 'asciidoctor-include-ext', '~> 0.3.1', require: false gem 'asciidoctor-plantuml', '~> 0.0.12' -gem 'rouge', '~> 3.19.0' +gem 'rouge', '~> 3.21.0' gem 'truncato', '~> 0.7.11' gem 'bootstrap_form', '~> 4.2.0' gem 'nokogiri', '~> 1.10.9' @@ -164,6 +170,8 @@ gem 'diff_match_patch', '~> 0.1.0' # Application server gem 'rack', '~> 2.0.9' +# https://github.com/sharpstone/rack-timeout/blob/master/README.md#rails-apps-manually +gem 'rack-timeout', '~> 0.5.1', require: 'rack/timeout/base' group :unicorn do gem 'unicorn', '~> 5.5' @@ -173,7 +181,6 @@ end group :puma do gem 'gitlab-puma', '~> 4.3.3.gitlab.2', require: false gem 'gitlab-puma_worker_killer', '~> 0.1.1.gitlab.1', require: false - gem 'rack-timeout', require: false end # State machine @@ -185,7 +192,7 @@ gem 'acts-as-taggable-on', '~> 6.0' # Background jobs gem 'sidekiq', '~> 5.2.7' gem 'sidekiq-cron', '~> 1.0' -gem 'redis-namespace', '~> 1.6.0' +gem 'redis-namespace', '~> 1.7.0' gem 'gitlab-sidekiq-fetcher', '0.5.2', require: 'sidekiq-reliable-fetch' # Cron Parser @@ -211,7 +218,7 @@ gem 're2', '~> 1.2.0' gem 'version_sorter', '~> 2.2.4' # Export Ruby Regex to Javascript -gem 'js_regex', '~> 3.1' +gem 'js_regex', '~> 3.4' # User agent parsing gem 'device_detector' @@ -243,7 +250,7 @@ gem 'slack-messenger', '~> 2.3.3' gem 'hangouts-chat', '~> 0.0.5' # Asana integration -gem 'asana', '~> 0.9' +gem 'asana', '0.10.2' # FogBugz integration gem 'ruby-fogbugz', '~> 0.2.1' @@ -252,7 +259,7 @@ gem 'ruby-fogbugz', '~> 0.2.1' gem 'kubeclient', '~> 4.6.0' # Sanitize user input -gem 'sanitize', '~> 4.6' +gem 'sanitize', '~> 5.2.1' gem 'babosa', '~> 1.0.2' # Sanitizes SVG input @@ -296,19 +303,19 @@ gem "gitlab-license", "~> 1.0" gem 'rack-attack', '~> 6.3.0' # Sentry integration -gem 'sentry-raven', '~> 2.9' +gem 'sentry-raven', '~> 3.0' gem 'premailer-rails', '~> 1.10.3' # LabKit: Tracing and Correlation -gem 'gitlab-labkit', '0.12.0' +gem 'gitlab-labkit', '0.12.1' # I18n gem 'ruby_parser', '~> 3.8', require: false gem 'rails-i18n', '~> 6.0' gem 'gettext_i18n_rails', '~> 1.8.0' gem 'gettext_i18n_rails_js', '~> 1.3' -gem 'gettext', '~> 3.2.2', require: false, group: :development +gem 'gettext', '~> 3.3', require: false, group: :development gem 'batch-loader', '~> 1.4.0' @@ -320,31 +327,29 @@ gem 'snowplow-tracker', '~> 0.6.1' # Metrics group :metrics do - gem 'method_source', '~> 0.8', require: false + gem 'method_source', '~> 1.0', require: false # Prometheus - gem 'prometheus-client-mmap', '~> 0.10.0' + gem 'prometheus-client-mmap', '~> 0.11.0' gem 'raindrops', '~> 0.18' end group :development do gem 'brakeman', '~> 4.2', require: false - gem 'danger', '~> 6.0', require: false + gem 'danger', '~> 8.0', require: false gem 'letter_opener_web', '~> 1.3.4' - gem 'rblineprof', '~> 0.3.6', platform: :mri, require: false # Better errors handler - gem 'better_errors', '~> 2.5.0' - gem 'binding_of_caller', '~> 0.8.0' + gem 'better_errors', '~> 2.7.1' # thin instead webrick gem 'thin', '~> 1.7.0' end group :development, :test do - gem 'bullet', '~> 6.0.2', require: !!ENV['ENABLE_BULLET'] - gem 'pry-byebug', '~> 3.5.1', platform: :mri + gem 'bullet', '~> 6.1.0' + gem 'pry-byebug', '~> 3.9.0', platform: :mri gem 'pry-rails', '~> 0.3.9' gem 'awesome_print', require: false @@ -362,15 +367,16 @@ group :development, :test do gem 'spring', '~> 2.0.0' gem 'spring-commands-rspec', '~> 1.0.4' - gem 'gitlab-styles', '~> 3.2.0', require: false + gem 'gitlab-styles', '~> 4.3.0', require: false # Pin these dependencies, otherwise a new rule could break the CI pipelines - gem 'rubocop', '~> 0.74.0' - gem 'rubocop-performance', '~> 1.4.1' + gem 'rubocop', '~> 0.82.0' + gem 'rubocop-performance', '~> 1.5.2' gem 'rubocop-rspec', '~> 1.37.0' gem 'scss_lint', '~> 0.56.0', require: false gem 'haml_lint', '~> 0.34.0', require: false gem 'simplecov', '~> 0.18.5', require: false + gem 'simplecov-cobertura', '~> 1.3.1', require: false gem 'bundler-audit', '~> 0.6.1', require: false gem 'benchmark-ips', '~> 2.3.0', require: false @@ -384,6 +390,8 @@ group :development, :test do gem 'png_quantizator', '~> 0.2.1', require: false gem 'parallel', '~> 1.19', require: false + + gem 'rblineprof', '~> 0.3.6', platform: :mri, require: false end # Gems required in omnibus-gitlab pipeline @@ -397,17 +405,16 @@ group :test do gem 'rspec_profiling', '~> 0.0.5' gem 'rspec-parameterized', require: false - gem 'capybara', '~> 3.22.0' + gem 'capybara', '~> 3.33.0' gem 'capybara-screenshot', '~> 1.0.22' gem 'selenium-webdriver', '~> 3.142' gem 'shoulda-matchers', '~> 4.0.1', require: false gem 'email_spec', '~> 2.2.0' - gem 'json-schema', '~> 2.8.0' gem 'webmock', '~> 3.5.1' gem 'rails-controller-testing' gem 'concurrent-ruby', '~> 1.1' - gem 'test-prof', '~> 0.10.0' + gem 'test-prof', '~> 0.12.0' gem 'rspec_junit_formatter' gem 'guard-rspec' @@ -418,7 +425,7 @@ end gem 'octokit', '~> 4.15' # https://gitlab.com/gitlab-org/gitlab/issues/207207 -gem 'gitlab-mail_room', '~> 0.0.4', require: 'mail_room' +gem 'gitlab-mail_room', '~> 0.0.6', require: 'mail_room' gem 'email_reply_trimmer', '~> 0.1' gem 'html2text' @@ -434,7 +441,7 @@ gem 'activerecord-explain-analyze', '~> 0.1', require: false gem 'oauth2', '~> 1.4' # Health check -gem 'health_check', '~> 2.6.0' +gem 'health_check', '~> 3.0' # System information gem 'vmstat', '~> 2.3.0' @@ -454,11 +461,11 @@ group :ed25519 do end # Gitaly GRPC protocol definitions -gem 'gitaly', '~> 13.0.0.pre.rc1' +gem 'gitaly', '~> 13.3.0-rc1' -gem 'grpc', '~> 1.24.0' +gem 'grpc', '~> 1.30.2' -gem 'google-protobuf', '~> 3.8.0' +gem 'google-protobuf', '~> 3.12' gem 'toml-rb', '~> 1.0.0' @@ -498,3 +505,10 @@ gem 'valid_email', '~> 0.1' # JSON gem 'json', '~> 2.3.0' +gem 'json-schema', '~> 2.8.0' +gem 'json_schemer', '~> 0.2.12' +gem 'oj', '~> 3.10.6' +gem 'multi_json', '~> 1.14.1' +gem 'yajl-ruby', '~> 1.4.1', require: 'yajl' + +gem 'webauthn', '~> 2.3' diff --git a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock index e6407161f8eb..9b0b34e6ed2c 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock +++ b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock @@ -4,61 +4,61 @@ GEM RedCloth (4.3.2) abstract_type (0.0.7) ace-rails-ap (4.1.2) - acme-client (2.0.5) - faraday (~> 0.9, >= 0.9.1) - actioncable (6.0.3) - actionpack (= 6.0.3) + acme-client (2.0.6) + faraday (>= 0.17, < 2.0.0) + actioncable (6.0.3.1) + actionpack (= 6.0.3.1) nio4r (~> 2.0) websocket-driver (>= 0.6.1) - actionmailbox (6.0.3) - actionpack (= 6.0.3) - activejob (= 6.0.3) - activerecord (= 6.0.3) - activestorage (= 6.0.3) - activesupport (= 6.0.3) + actionmailbox (6.0.3.1) + actionpack (= 6.0.3.1) + activejob (= 6.0.3.1) + activerecord (= 6.0.3.1) + activestorage (= 6.0.3.1) + activesupport (= 6.0.3.1) mail (>= 2.7.1) - actionmailer (6.0.3) - actionpack (= 6.0.3) - actionview (= 6.0.3) - activejob (= 6.0.3) + actionmailer (6.0.3.1) + actionpack (= 6.0.3.1) + actionview (= 6.0.3.1) + activejob (= 6.0.3.1) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 2.0) - actionpack (6.0.3) - actionview (= 6.0.3) - activesupport (= 6.0.3) + actionpack (6.0.3.1) + actionview (= 6.0.3.1) + activesupport (= 6.0.3.1) rack (~> 2.0, >= 2.0.8) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.2.0) - actiontext (6.0.3) - actionpack (= 6.0.3) - activerecord (= 6.0.3) - activestorage (= 6.0.3) - activesupport (= 6.0.3) + actiontext (6.0.3.1) + actionpack (= 6.0.3.1) + activerecord (= 6.0.3.1) + activestorage (= 6.0.3.1) + activesupport (= 6.0.3.1) nokogiri (>= 1.8.5) - actionview (6.0.3) - activesupport (= 6.0.3) + actionview (6.0.3.1) + activesupport (= 6.0.3.1) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.1, >= 1.2.0) - activejob (6.0.3) - activesupport (= 6.0.3) + activejob (6.0.3.1) + activesupport (= 6.0.3.1) globalid (>= 0.3.6) - activemodel (6.0.3) - activesupport (= 6.0.3) - activerecord (6.0.3) - activemodel (= 6.0.3) - activesupport (= 6.0.3) + activemodel (6.0.3.1) + activesupport (= 6.0.3.1) + activerecord (6.0.3.1) + activemodel (= 6.0.3.1) + activesupport (= 6.0.3.1) activerecord-explain-analyze (0.1.0) activerecord (>= 4) pg - activestorage (6.0.3) - actionpack (= 6.0.3) - activejob (= 6.0.3) - activerecord (= 6.0.3) + activestorage (6.0.3.1) + actionpack (= 6.0.3.1) + activejob (= 6.0.3.1) + activerecord (= 6.0.3.1) marcel (~> 0.3.1) - activesupport (6.0.3) + activesupport (6.0.3.1) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 0.7, < 2) minitest (~> 5.1) @@ -73,12 +73,13 @@ GEM public_suffix (>= 2.0.2, < 5.0) aes_key_wrap (1.0.1) akismet (3.0.0) - apollo_upload_server (2.0.0.beta.3) + android_key_attestation (0.3.0) + apollo_upload_server (2.0.2) graphql (>= 1.8) rails (>= 4.2) - asana (0.9.3) - faraday (~> 0.9) - faraday_middleware (~> 0.9) + asana (0.10.2) + faraday (~> 1.0) + faraday_middleware (~> 1.0) faraday_middleware-multi_json (~> 0.0) oauth2 (~> 1.4) asciidoctor (2.0.10) @@ -93,20 +94,33 @@ GEM encryptor (~> 3.0.0) attr_required (1.0.1) awesome_print (1.8.0) - aws-eventstream (1.0.3) - aws-sdk (2.11.374) - aws-sdk-resources (= 2.11.374) - aws-sdk-core (2.11.374) - aws-sigv4 (~> 1.0) + awrence (1.1.1) + aws-eventstream (1.1.0) + aws-partitions (1.345.0) + aws-sdk-cloudformation (1.41.0) + aws-sdk-core (~> 3, >= 3.99.0) + aws-sigv4 (~> 1.1) + aws-sdk-core (3.104.3) + aws-eventstream (~> 1, >= 1.0.2) + aws-partitions (~> 1, >= 1.239.0) + aws-sigv4 (~> 1.1) jmespath (~> 1.0) - aws-sdk-resources (2.11.374) - aws-sdk-core (= 2.11.374) - aws-sigv4 (1.1.0) - aws-eventstream (~> 1.0, >= 1.0.2) - axiom-types (0.1.1) - descendants_tracker (~> 0.0.4) - ice_nine (~> 0.11.0) - thread_safe (~> 0.3, >= 0.3.1) + aws-sdk-kms (1.36.0) + aws-sdk-core (~> 3, >= 3.99.0) + aws-sigv4 (~> 1.1) + aws-sdk-s3 (1.75.0) + aws-sdk-core (~> 3, >= 3.104.1) + aws-sdk-kms (~> 1) + aws-sigv4 (~> 1.1) + aws-sigv4 (1.2.1) + aws-eventstream (~> 1, >= 1.0.2) + azure-storage-blob (2.0.0) + azure-storage-common (~> 2.0) + nokogiri (~> 1.10.4) + azure-storage-common (2.0.1) + faraday (~> 1.0) + faraday_middleware (~> 1.0.0.rc1) + nokogiri (~> 1.10.4) babosa (1.0.2) base32 (0.3.2) batch-loader (1.4.0) @@ -115,30 +129,28 @@ GEM benchmark-ips (2.3.0) benchmark-memory (0.1.2) memory_profiler (~> 0.9) - better_errors (2.5.0) + better_errors (2.7.1) coderay (>= 1.0.0) erubi (>= 1.0.0) rack (>= 0.9.0) bindata (2.4.3) binding_ninja (0.2.3) - binding_of_caller (0.8.0) - debug_inspector (>= 0.0.1) bootsnap (1.4.6) msgpack (~> 1.0) bootstrap_form (4.2.0) actionpack (>= 5.0) activemodel (>= 5.0) brakeman (4.2.1) - browser (2.5.3) + browser (4.2.0) builder (3.2.4) - bullet (6.0.2) + bullet (6.1.0) activesupport (>= 3.0.0) uniform_notifier (~> 1.11) bundler-audit (0.6.1) bundler (>= 1.2.0, < 3) thor (~> 0.18) - byebug (9.1.0) - capybara (3.22.0) + byebug (11.1.3) + capybara (3.33.0) addressable mini_mime (>= 0.1.3) nokogiri (~> 1.8) @@ -153,7 +165,8 @@ GEM activemodel (>= 4.0.0) activesupport (>= 4.0.0) mime-types (>= 1.16) - character_set (1.1.2) + cbor (0.5.9.6) + character_set (1.4.0) charlock_holmes (0.7.6) childprocess (3.0.0) chunky_png (1.3.5) @@ -163,9 +176,7 @@ GEM cork nap open4 (~> 1.3) - coderay (1.1.2) - coercible (1.0.0) - descendants_tracker (~> 0.0.1) + coderay (1.1.3) colored2 (3.1.2) commonmarker (0.20.1) ruby-enum (~> 0.5) @@ -177,6 +188,9 @@ GEM contracts (0.11.0) cork (0.3.0) colored2 (~> 3.1) + cose (1.0.0) + cbor (~> 0.5.9) + openssl-signature_algorithm (~> 0.4.0) countries (3.0.0) i18n_data (~> 0.8.0) sixarm_ruby_unaccent (~> 1.1) @@ -188,21 +202,20 @@ GEM css_parser (1.7.0) addressable daemons (1.2.6) - danger (6.0.9) + danger (8.0.5) claide (~> 1.0) claide-plugins (>= 0.9.2) colored2 (~> 3.1) cork (~> 0.1) - faraday (~> 0.9) + faraday (>= 0.9.0, < 2.0) faraday-http-cache (~> 2.0) - git (~> 1.5) - kramdown (~> 2.0) + git (~> 1.7) + kramdown (~> 2.3) kramdown-parser-gfm (~> 1.0) no_proxy_fix octokit (~> 4.7) terminal-table (~> 1) database_cleaner (1.7.0) - debug_inspector (0.0.3) debugger-ruby_core_source (1.3.8) deckar01-task_list (2.3.1) html-pipeline @@ -221,8 +234,6 @@ GEM ruby-statistics (>= 2.1) thor (>= 0.19, < 2) unicode_plot (>= 0.0.4, < 1.0.0) - descendants_tracker (0.0.4) - thread_safe (~> 0.3, >= 0.3.1) device_detector (1.0.0) devise (4.7.1) bcrypt (~> 3.0) @@ -244,24 +255,48 @@ GEM docile (1.3.2) domain_name (0.5.20180417) unf (>= 0.0.5, < 1.0.0) - doorkeeper (5.0.3) - railties (>= 4.2) - doorkeeper-openid_connect (1.6.3) - doorkeeper (>= 5.0, < 5.2) - json-jwt (~> 1.6) + doorkeeper (5.3.3) + railties (>= 5) + doorkeeper-openid_connect (1.7.4) + doorkeeper (>= 5.2, < 5.5) + json-jwt (>= 1.11.0) + dry-configurable (0.11.5) + concurrent-ruby (~> 1.0) + dry-core (~> 0.4, >= 0.4.7) + dry-equalizer (~> 0.2) + dry-container (0.7.2) + concurrent-ruby (~> 1.0) + dry-configurable (~> 0.1, >= 0.1.3) + dry-core (0.4.9) + concurrent-ruby (~> 1.0) + dry-equalizer (0.3.0) + dry-inflector (0.2.0) + dry-logic (1.0.6) + concurrent-ruby (~> 1.0) + dry-core (~> 0.2) + dry-equalizer (~> 0.2) + dry-types (1.4.0) + concurrent-ruby (~> 1.0) + dry-container (~> 0.3) + dry-core (~> 0.4, >= 0.4.4) + dry-equalizer (~> 0.3) + dry-inflector (~> 0.1, >= 0.1.2) + dry-logic (~> 1.0, >= 1.0.2) + ecma-re-validator (0.2.1) + regexp_parser (~> 1.2) ed25519 (1.2.4) - elasticsearch (6.8.0) - elasticsearch-api (= 6.8.0) - elasticsearch-transport (= 6.8.0) - elasticsearch-api (6.8.0) + elasticsearch (6.8.2) + elasticsearch-api (= 6.8.2) + elasticsearch-transport (= 6.8.2) + elasticsearch-api (6.8.2) multi_json - elasticsearch-model (6.1.0) + elasticsearch-model (6.1.1) activesupport (> 3) - elasticsearch (> 1) + elasticsearch (~> 6) hashie - elasticsearch-rails (6.1.0) - elasticsearch-transport (6.8.0) - faraday + elasticsearch-rails (6.1.1) + elasticsearch-transport (6.8.2) + faraday (~> 1) multi_json email_reply_trimmer (0.1.6) email_spec (2.2.0) @@ -286,22 +321,25 @@ GEM factory_bot_rails (5.1.0) factory_bot (~> 5.1.0) railties (>= 4.2.0) - faraday (0.15.4) + faraday (1.0.1) multipart-post (>= 1.2, < 3) - faraday-http-cache (2.0.0) - faraday (~> 0.8) - faraday_middleware (0.12.2) - faraday (>= 0.7.4, < 1.0) - faraday_middleware-aws-signers-v4 (0.1.7) - aws-sdk-resources (~> 2) - faraday (~> 0.9) + faraday-cookie_jar (0.0.7) + faraday (>= 0.8.0) + http-cookie (~> 1.0.0) + faraday-http-cache (2.2.0) + faraday (>= 0.8) + faraday_middleware (1.0.0) + faraday (~> 1.0) + faraday_middleware-aws-sigv4 (0.3.0) + aws-sigv4 (~> 1.0) + faraday (>= 0.15) faraday_middleware-multi_json (0.0.6) faraday_middleware multi_json fast_blank (1.0.0) fast_gettext (1.6.0) ffaker (2.10.0) - ffi (1.12.2) + ffi (1.13.1) ffi-compiler (1.0.1) ffi (>= 1.0.0) rake @@ -330,11 +368,11 @@ GEM excon (~> 0.58) formatador (~> 0.2) mime-types - fog-google (1.9.1) + fog-google (1.10.0) fog-core (<= 2.1.0) fog-json (~> 1.2) fog-xml (~> 0.1.0) - google-api-client (~> 0.23.0) + google-api-client (>= 0.32, < 0.34) fog-json (1.2.0) fog-core multi_json (~> 1.10) @@ -366,7 +404,7 @@ GEM json get_process_mem (0.2.5) ffi (~> 1.0) - gettext (3.2.9) + gettext (3.3.6) locale (>= 2.0.5) text (>= 1.3.0) gettext_i18n_rails (1.8.0) @@ -376,13 +414,21 @@ GEM gettext_i18n_rails (>= 0.7.1) po_to_json (>= 1.0.0) rails (>= 3.2.0) - git (1.5.0) - gitaly (13.0.0.pre.rc1) + git (1.7.0) + rchardet (~> 1.8) + gitaly (13.3.0.pre.rc2) grpc (~> 1.0) github-markup (1.7.0) gitlab-chronic (0.10.5) numerizer (~> 0.2) - gitlab-labkit (0.12.0) + gitlab-fog-azure-rm (1.0.0) + azure-storage-blob (~> 2.0) + azure-storage-common (~> 2.0) + fog-core (= 2.1.0) + fog-json (~> 1.2.0) + mime-types + ms_rest_azure (~> 0.12.0) + gitlab-labkit (0.12.1) actionpack (>= 5.0.0, < 6.1.0) activesupport (>= 5.0.0, < 6.1.0) grpc (~> 1.19) @@ -390,21 +436,21 @@ GEM opentracing (~> 0.4) redis (> 3.0.0, < 5.0.0) gitlab-license (1.0.0) - gitlab-mail_room (0.0.4) + gitlab-mail_room (0.0.6) gitlab-markup (1.7.1) gitlab-net-dns (0.9.1) - gitlab-puma (4.3.3.gitlab.2) + gitlab-puma (4.3.5.gitlab.3) nio4r (~> 2.0) gitlab-puma_worker_killer (0.1.1.gitlab.1) get_process_mem (~> 0.2) gitlab-puma (>= 2.7, < 5) gitlab-sidekiq-fetcher (0.5.2) sidekiq (~> 5) - gitlab-styles (3.2.0) - rubocop (~> 0.74.0) + gitlab-styles (4.3.0) + rubocop (~> 0.82.0) rubocop-gitlab-security (~> 0.1.0) - rubocop-performance (~> 1.4.1) - rubocop-rails (~> 2.0) + rubocop-performance (~> 1.5.2) + rubocop-rails (~> 2.5) rubocop-rspec (~> 1.36) gitlab_chronic_duration (0.10.6.2) numerizer (~> 0.2) @@ -419,38 +465,39 @@ GEM actionpack (>= 3.0) multi_json request_store (>= 1.0) - google-api-client (0.23.4) + google-api-client (0.33.2) addressable (~> 2.5, >= 2.5.1) - googleauth (>= 0.5, < 0.7.0) + googleauth (~> 0.9) httpclient (>= 2.8.1, < 3.0) - mime-types (~> 3.0) + mini_mime (~> 1.0) representable (~> 3.0) retriable (>= 2.0, < 4.0) - google-protobuf (3.8.0) - googleapis-common-protos-types (1.0.4) - google-protobuf (~> 3.0) - googleauth (0.6.6) - faraday (~> 0.12) + signet (~> 0.12) + google-protobuf (3.12.4) + googleapis-common-protos-types (1.0.5) + google-protobuf (~> 3.11) + googleauth (0.12.0) + faraday (>= 0.17.3, < 2.0) jwt (>= 1.4, < 3.0) - memoist (~> 0.12) + memoist (~> 0.16) multi_json (~> 1.11) os (>= 0.9, < 2.0) - signet (~> 0.7) + signet (~> 0.14) gpgme (2.0.20) mini_portile2 (~> 2.3) - grape (1.1.0) + grape (1.4.0) activesupport builder + dry-types (>= 1.1) mustermann-grape (~> 1.0.0) rack (>= 1.3.0) rack-accept - virtus (>= 1.0.0) grape-entity (0.7.1) activesupport (>= 4.0) multi_json (>= 1.3.2) - grape-path-helpers (1.2.0) + grape-path-helpers (1.3.0) activesupport - grape (~> 1.0) + grape (~> 1.3) rake (~> 12) grape_logging (1.8.3) grape @@ -458,7 +505,7 @@ GEM graphiql-rails (1.4.10) railties sprockets-rails - graphql (1.10.5) + graphql (1.11.4) graphql-docs (1.6.0) commonmarker (~> 0.16) escape_utils (~> 1.2) @@ -467,12 +514,12 @@ GEM graphql (~> 1.6) html-pipeline (~> 2.8) sass (~> 3.4) - grpc (1.24.0) - google-protobuf (~> 3.8) + grpc (1.30.2) + google-protobuf (~> 3.12) googleapis-common-protos-types (~> 1.0) gssapi (1.2.0) ffi (>= 1.0.1) - guard (2.15.1) + guard (2.16.2) formatador (>= 0.2.4) listen (>= 2.7, < 4.0) lumberjack (>= 1.0.12, < 2.0) @@ -498,13 +545,14 @@ GEM temple (>= 0.8.2) thor tilt + hana (1.3.6) hangouts-chat (0.0.5) hashdiff (0.3.8) hashie (3.6.0) hashie-forbidden_attributes (0.1.1) hashie (>= 3.0) - health_check (2.6.0) - rails (>= 4.0) + health_check (3.0.0) + railties (>= 5.0) heapy (0.1.4) hipchat (1.5.2) httparty @@ -529,7 +577,7 @@ GEM mime-types (~> 3.0) multi_xml (>= 0.5.2) httpclient (2.8.3) - i18n (1.8.2) + i18n (1.8.3) concurrent-ruby (~> 1.0) i18n_data (0.8.0) icalendar (2.4.1) @@ -547,9 +595,9 @@ GEM multipart-post oauth (~> 0.5, >= 0.5.0) jmespath (1.4.0) - js_regex (3.1.1) - character_set (~> 1.1) - regexp_parser (~> 1.1) + js_regex (3.4.0) + character_set (~> 1.4) + regexp_parser (~> 1.5) regexp_property_values (~> 0.3) json (2.3.0) json-jwt (1.11.0) @@ -558,6 +606,11 @@ GEM bindata json-schema (2.8.0) addressable (>= 2.4) + json_schemer (0.2.12) + ecma-re-validator (~> 0.2) + hana (~> 1.3) + regexp_parser (~> 1.5) + uri_template (~> 0.7) jwt (2.1.0) kaminari (1.2.1) activesupport (>= 4.1.0) @@ -574,7 +627,8 @@ GEM kgio (2.11.3) knapsack (1.17.0) rake - kramdown (2.1.0) + kramdown (2.3.0) + rexml kramdown-parser-gfm (1.1.0) kramdown (~> 2.0) kubeclient (4.6.0) @@ -598,13 +652,12 @@ GEM xml-simple licensee (8.9.2) rugged (~> 0.24) - listen (3.1.5) - rb-fsevent (~> 0.9, >= 0.9.4) - rb-inotify (~> 0.9, >= 0.9.7) - ruby_dep (~> 1.2) - locale (2.1.2) + listen (3.2.1) + rb-fsevent (~> 0.10, >= 0.10.3) + rb-inotify (~> 0.9, >= 0.9.10) + locale (2.1.3) lockbox (0.3.3) - lograge (0.10.0) + lograge (0.11.2) actionpack (>= 4) activesupport (>= 4) railties (>= 4) @@ -613,36 +666,46 @@ GEM crass (~> 1.0.2) nokogiri (>= 1.5.9) lru_redux (1.1.0) - lumberjack (1.0.13) + lumberjack (1.2.7) mail (2.7.1) mini_mime (>= 0.1.1) marcel (0.3.3) mimemagic (~> 0.3.2) - marginalia (1.8.0) + marginalia (1.9.0) actionpack (>= 2.3) activerecord (>= 2.3) memoist (0.16.0) memoizable (0.4.2) thread_safe (~> 0.3, >= 0.3.1) memory_profiler (0.9.14) - method_source (0.9.2) - mime-types (3.2.2) + method_source (1.0.0) + mime-types (3.3.1) mime-types-data (~> 3.2015) - mime-types-data (3.2019.0331) + mime-types-data (3.2020.0512) mimemagic (0.3.5) mini_histogram (0.1.3) mini_magick (4.9.5) mini_mime (1.0.2) mini_portile2 (2.4.0) minitest (5.11.3) - msgpack (1.3.1) + ms_rest (0.7.6) + concurrent-ruby (~> 1.0) + faraday (>= 0.9, < 2.0.0) + timeliness (~> 0.3.10) + ms_rest_azure (0.12.0) + concurrent-ruby (~> 1.0) + faraday (>= 0.9, < 2.0.0) + faraday-cookie_jar (~> 0.0.6) + ms_rest (~> 0.7.6) + msgpack (1.3.3) multi_json (1.14.1) multi_xml (0.6.0) multipart-post (2.1.1) murmurhash3 (0.1.6) - mustermann (1.0.3) - mustermann-grape (1.0.0) - mustermann (~> 1.0.0) + mustermann (1.1.1) + ruby2_keywords (~> 0.0.1) + mustermann-grape (1.0.1) + mustermann (>= 1.0.0) nakayoshi_fork (0.0.4) nap (1.1.0) nenv (0.3.0) @@ -652,17 +715,17 @@ GEM netrc (0.11.0) nio4r (2.5.2) no_proxy_fix (0.1.2) - nokogiri (1.10.9) + nokogiri (1.10.10) mini_portile2 (~> 2.4.0) - nokogumbo (1.5.0) - nokogiri + nokogumbo (2.0.2) + nokogiri (~> 1.8, >= 1.8.4) notiffany (0.1.3) nenv (~> 0.1) shellany (~> 0.0) numerizer (0.2.0) oauth (0.5.4) - oauth2 (1.4.1) - faraday (>= 0.8, < 0.16.0) + oauth2 (1.4.4) + faraday (>= 0.8, < 2.0) jwt (>= 1.0, < 3.0) multi_json (~> 1.3) multi_xml (~> 0.5) @@ -670,9 +733,13 @@ GEM octokit (4.15.0) faraday (>= 0.9) sawyer (~> 0.8.0, >= 0.5.3) + oj (3.10.6) omniauth (1.9.0) hashie (>= 3.4.6, < 3.7.0) rack (>= 1.6.2, < 3) + omniauth-atlassian-oauth2 (0.2.0) + omniauth (>= 1.1.1) + omniauth-oauth2 (>= 1.5) omniauth-auth0 (2.0.0) omniauth-oauth2 (~> 1.4) omniauth-authentiq (0.3.3) @@ -722,13 +789,11 @@ GEM omniauth-twitter (1.4.0) omniauth-oauth (~> 1.1) rack - omniauth-ultraauth (0.0.2) - omniauth_openid_connect (~> 0.3.0) - omniauth_crowd (2.2.3) + omniauth_crowd (2.4.0) activesupport nokogiri (>= 1.4.4) omniauth (~> 1.0) - omniauth_openid_connect (0.3.3) + omniauth_openid_connect (0.3.5) addressable (~> 2.5) omniauth (~> 1.9) openid_connect (~> 1.1) @@ -743,19 +808,21 @@ GEM validate_email validate_url webfinger (>= 1.0.1) + openssl (2.2.0) + openssl-signature_algorithm (0.4.0) opentracing (0.5.0) - optimist (3.0.0) + optimist (3.0.1) org-ruby (0.9.12) rubypants (~> 0.2) orm_adapter (0.5.0) os (1.0.0) parallel (1.19.1) - parser (2.7.0.4) + parser (2.7.1.2) ast (~> 2.4.0) parslet (1.8.2) peek (1.1.0) railties (>= 4.0.0) - pg (1.2.2) + pg (1.2.3) png_quantizator (0.2.1) po_to_json (1.0.1) json (>= 1.6.0) @@ -771,13 +838,13 @@ GEM parser unparser procto (0.0.3) - prometheus-client-mmap (0.10.0) - pry (0.11.3) - coderay (~> 1.1.0) - method_source (~> 0.9.0) - pry-byebug (3.5.1) - byebug (~> 9.1) - pry (~> 0.10) + prometheus-client-mmap (0.11.0) + pry (0.13.1) + coderay (~> 1.1) + method_source (~> 1.0) + pry-byebug (3.9.0) + byebug (~> 11.0) + pry (~> 0.13.0) pry-rails (0.3.9) pry (>= 0.10.4) public_suffix (4.0.3) @@ -802,21 +869,21 @@ GEM rack rack-test (1.1.0) rack (>= 1.0, < 3) - rack-timeout (0.5.1) - rails (6.0.3) - actioncable (= 6.0.3) - actionmailbox (= 6.0.3) - actionmailer (= 6.0.3) - actionpack (= 6.0.3) - actiontext (= 6.0.3) - actionview (= 6.0.3) - activejob (= 6.0.3) - activemodel (= 6.0.3) - activerecord (= 6.0.3) - activestorage (= 6.0.3) - activesupport (= 6.0.3) + rack-timeout (0.5.2) + rails (6.0.3.1) + actioncable (= 6.0.3.1) + actionmailbox (= 6.0.3.1) + actionmailer (= 6.0.3.1) + actionpack (= 6.0.3.1) + actiontext (= 6.0.3.1) + actionview (= 6.0.3.1) + activejob (= 6.0.3.1) + activemodel (= 6.0.3.1) + activerecord (= 6.0.3.1) + activestorage (= 6.0.3.1) + activesupport (= 6.0.3.1) bundler (>= 1.3.0) - railties (= 6.0.3) + railties (= 6.0.3.1) sprockets-rails (>= 2.0.0) rails-controller-testing (1.0.4) actionpack (>= 5.0.1.x) @@ -830,24 +897,25 @@ GEM rails-i18n (6.0.0) i18n (>= 0.7, < 2) railties (>= 6.0.0, < 7) - railties (6.0.3) - actionpack (= 6.0.3) - activesupport (= 6.0.3) + railties (6.0.3.1) + actionpack (= 6.0.3.1) + activesupport (= 6.0.3.1) method_source rake (>= 0.8.7) thor (>= 0.20.3, < 2.0) rainbow (3.0.0) raindrops (0.19.1) rake (12.3.3) - rb-fsevent (0.10.2) - rb-inotify (0.9.10) - ffi (>= 0.5.0, < 2) + rb-fsevent (0.10.4) + rb-inotify (0.10.1) + ffi (~> 1.0) rblineprof (0.3.6) debugger-ruby_core_source (~> 1.3) - rbtrace (0.4.11) + rbtrace (0.4.14) ffi (>= 1.0.6) msgpack (>= 0.4.3) optimist (>= 3.0.0) + rchardet (1.8.0) rdoc (6.1.2) re2 (1.2.0) recaptcha (4.13.1) @@ -861,7 +929,7 @@ GEM redis-activesupport (5.2.0) activesupport (>= 3, < 7) redis-store (>= 1.3, < 2) - redis-namespace (1.6.0) + redis-namespace (1.7.0) redis (>= 3.0.4) redis-rack (2.1.2) rack (>= 2.0.8, < 3) @@ -873,7 +941,7 @@ GEM redis-store (1.8.1) redis (>= 4, < 5) regexp_parser (1.5.1) - regexp_property_values (0.3.4) + regexp_property_values (0.3.5) representable (3.0.4) declarative (< 0.1.0) declarative-option (< 0.2.0) @@ -888,9 +956,10 @@ GEM mime-types (>= 1.16, < 4.0) netrc (~> 0.8) retriable (3.1.2) + rexml (3.2.4) rinku (2.0.0) rotp (2.1.2) - rouge (3.19.0) + rouge (3.21.0) rqrcode (0.7.0) chunky_png rqrcode-rails3 (0.1.7) @@ -931,18 +1000,20 @@ GEM pg rails sqlite3 - rubocop (0.74.0) + rubocop (0.82.0) jaro_winkler (~> 1.5.1) parallel (~> 1.10) - parser (>= 2.6) + parser (>= 2.7.0.1) rainbow (>= 2.2.2, < 4.0) + rexml ruby-progressbar (~> 1.7) - unicode-display_width (>= 1.4.0, < 1.7) + unicode-display_width (>= 1.4.0, < 2.0) rubocop-gitlab-security (0.1.1) rubocop (>= 0.51) - rubocop-performance (1.4.1) + rubocop-performance (1.5.2) rubocop (>= 0.71.0) - rubocop-rails (2.4.0) + rubocop-rails (2.5.2) + activesupport rack (>= 1.1) rubocop (>= 0.72.0) rubocop-rspec (1.37.0) @@ -956,7 +1027,7 @@ GEM ruby-saml (1.7.2) nokogiri (>= 1.5.10) ruby-statistics (2.1.2) - ruby_dep (1.5.0) + ruby2_keywords (0.0.2) ruby_parser (3.13.1) sexp_processor (~> 4.9) rubyntlm (0.6.2) @@ -964,10 +1035,12 @@ GEM rubyzip (2.0.0) rugged (0.28.4.1) safe_yaml (1.0.4) - sanitize (4.6.6) + safety_net_attestation (0.4.0) + jwt (~> 2.0) + sanitize (5.2.1) crass (~> 1.0.2) - nokogiri (>= 1.4.4) - nokogumbo (~> 1.4) + nokogiri (>= 1.8.0) + nokogumbo (~> 2.0) sass (3.5.5) sass-listen (~> 4.0.0) sass-listen (4.0.0) @@ -988,36 +1061,39 @@ GEM scss_lint (0.56.0) rake (>= 0.9, < 13) sass (~> 3.5.3) + securecompare (1.0.0) seed-fu (2.3.7) activerecord (>= 3.1) activesupport (>= 3.1) selenium-webdriver (3.142.6) childprocess (>= 0.5, < 4.0) rubyzip (>= 1.2.2) - sentry-raven (2.9.0) - faraday (>= 0.7.6, < 1.0) + sentry-raven (3.0.4) + faraday (>= 1.0) settingslogic (2.0.9) sexp_processor (4.12.0) shellany (0.0.1) shoulda-matchers (4.0.1) activesupport (>= 4.2.0) - sidekiq (5.2.7) + sidekiq (5.2.9) connection_pool (~> 2.2, >= 2.2.2) - rack (>= 1.5.0) + rack (~> 2.0) rack-protection (>= 1.5.0) - redis (>= 3.3.5, < 5) + redis (>= 3.3.5, < 4.2) sidekiq-cron (1.0.4) fugit (~> 1.1) sidekiq (>= 4.2.1) - signet (0.11.0) + signet (0.14.0) addressable (~> 2.3) - faraday (~> 0.9) + faraday (>= 0.17.3, < 2.0) jwt (>= 1.5, < 3.0) multi_json (~> 1.10) simple_po_parser (1.1.2) simplecov (0.18.5) docile (~> 1.1) simplecov-html (~> 0.11) + simplecov-cobertura (1.3.1) + simplecov (~> 0.8) simplecov-html (0.12.2) sixarm_ruby_unaccent (1.2.0) slack-messenger (2.3.3) @@ -1054,7 +1130,7 @@ GEM temple (0.8.2) terminal-table (1.8.0) unicode-display_width (~> 1.1, >= 1.1.1) - test-prof (0.10.0) + test-prof (0.12.0) text (1.3.1) thin (1.7.2) daemons (~> 1.0, >= 1.0.9) @@ -1065,11 +1141,15 @@ GEM thrift (0.11.0.0) tilt (2.0.10) timecop (0.9.1) + timeliness (0.3.10) timfel-krb5-auth (0.8.3) toml (0.2.0) parslet (~> 1.8.0) toml-rb (1.0.0) citrus (~> 3.0, > 3.0) + tpm-key_attestation (0.9.0) + bindata (~> 2.4) + openssl-signature_algorithm (~> 0.4.0) truncato (0.7.11) htmlentities (~> 4.3.1) nokogiri (>= 1.7.0, <= 2.0) @@ -1083,7 +1163,7 @@ GEM unf (0.1.4) unf_ext unf_ext (0.0.7.5) - unicode-display_width (1.6.0) + unicode-display_width (1.7.0) unicode_plot (0.0.4) enumerable-statistics (>= 2.0.1) unicode_utils (1.4.0) @@ -1104,6 +1184,7 @@ GEM equalizer (~> 0.0.9) parser (>= 2.6.5) procto (~> 0.0.2) + uri_template (0.7.0) valid_email (0.1.3) activemodel mail (>= 2.6.1) @@ -1113,18 +1194,23 @@ GEM validate_url (1.0.8) activemodel (>= 3.0.0) public_suffix - validates_hostname (1.0.6) + validates_hostname (1.0.10) activerecord (>= 3.0) activesupport (>= 3.0) version_sorter (2.2.4) - virtus (1.0.5) - axiom-types (~> 0.1) - coercible (~> 1.0) - descendants_tracker (~> 0.0, >= 0.0.3) - equalizer (~> 0.0, >= 0.0.9) vmstat (2.3.0) warden (1.2.8) rack (>= 2.0.6) + webauthn (2.3.0) + android_key_attestation (~> 0.3.0) + awrence (~> 1.1) + bindata (~> 2.4) + cbor (~> 0.5.9) + cose (~> 1.0) + openssl (~> 2.0) + safety_net_attestation (~> 0.4.0) + securecompare (~> 1.0) + tpm-key_attestation (~> 0.9.0) webfinger (1.1.0) activesupport httpclient (>= 2.4) @@ -1136,7 +1222,7 @@ GEM railties (>= 3.2.0) websocket-driver (0.7.1) websocket-extensions (>= 0.1.0) - websocket-extensions (0.1.4) + websocket-extensions (0.1.5) wikicloth (0.8.1) builder expression_parser @@ -1145,6 +1231,7 @@ GEM xml-simple (1.1.5) xpath (3.2.0) nokogiri (~> 1.8) + yajl-ruby (1.4.1) zeitwerk (2.3.0) PLATFORMS @@ -1153,35 +1240,36 @@ PLATFORMS DEPENDENCIES RedCloth (~> 4.3.2) ace-rails-ap (~> 4.1.0) - acme-client (~> 2.0.5) + acme-client (~> 2.0, >= 2.0.6) activerecord-explain-analyze (~> 0.1) acts-as-taggable-on (~> 6.0) addressable (~> 2.7) akismet (~> 3.0) - apollo_upload_server (~> 2.0.0.beta3) - asana (~> 0.9) + apollo_upload_server (~> 2.0.2) + asana (= 0.10.2) asciidoctor (~> 2.0.10) asciidoctor-include-ext (~> 0.3.1) asciidoctor-plantuml (~> 0.0.12) atlassian-jwt (~> 0.2.0) attr_encrypted (~> 3.1.0) awesome_print - aws-sdk + aws-sdk-cloudformation (~> 1) + aws-sdk-core (~> 3) + aws-sdk-s3 (~> 1) babosa (~> 1.0.2) base32 (~> 0.3.0) batch-loader (~> 1.4.0) bcrypt_pbkdf (~> 1.0) benchmark-ips (~> 2.3.0) benchmark-memory (~> 0.1) - better_errors (~> 2.5.0) - binding_of_caller (~> 0.8.0) + better_errors (~> 2.7.1) bootsnap (~> 1.4.6) bootstrap_form (~> 4.2.0) brakeman (~> 4.2) - browser (~> 2.5) - bullet (~> 6.0.2) + browser (~> 4.2) + bullet (~> 6.1.0) bundler-audit (~> 0.6.1) - capybara (~> 3.22.0) + capybara (~> 3.33.0) capybara-screenshot (~> 1.0.22) carrierwave (~> 1.3) charlock_holmes (~> 0.7.5) @@ -1190,7 +1278,7 @@ DEPENDENCIES connection_pool (~> 2.0) countries (~> 3.0) creole (~> 0.5.0) - danger (~> 6.0) + danger (~> 8.0) database_cleaner (~> 1.7.0) deckar01-task_list (= 2.3.1) default_value_for (~> 3.3.0) @@ -1201,10 +1289,10 @@ DEPENDENCIES diff_match_patch (~> 0.1.0) diffy (~> 3.3) discordrb-webhooks-blackst0ne (~> 3.3) - doorkeeper (~> 5.0.3) - doorkeeper-openid_connect (~> 1.6.3) + doorkeeper (~> 5.3.0) + doorkeeper-openid_connect (~> 1.7.4) ed25519 (~> 1.2) - elasticsearch-api (~> 6.8) + elasticsearch-api (~> 6.8.2) elasticsearch-model (~> 6.1) elasticsearch-rails (~> 6.1) email_reply_trimmer (~> 0.1) @@ -1212,8 +1300,8 @@ DEPENDENCIES erubi (~> 1.9.0) escape_utils (~> 1.1) factory_bot_rails (~> 5.1.0) - faraday (~> 0.12) - faraday_middleware-aws-signers-v4 + faraday (~> 1.0) + faraday_middleware-aws-sigv4 (~> 0.3.0) fast_blank ffaker (~> 2.10) flipper (~> 0.17.1) @@ -1223,7 +1311,7 @@ DEPENDENCIES fog-aliyun (~> 0.3) fog-aws (~> 3.5) fog-core (= 2.1.0) - fog-google (~> 1.9) + fog-google (~> 1.10) fog-local (~> 0.6) fog-openstack (~> 1.0) fog-rackspace (~> 0.1.1) @@ -1231,42 +1319,43 @@ DEPENDENCIES fugit (~> 1.2.1) fuubar (~> 2.2.0) gemojione (~> 3.3) - gettext (~> 3.2.2) + gettext (~> 3.3) gettext_i18n_rails (~> 1.8.0) gettext_i18n_rails_js (~> 1.3) - gitaly (~> 13.0.0.pre.rc1) + gitaly (~> 13.3.0.pre.rc1) github-markup (~> 1.7.0) gitlab-chronic (~> 0.10.5) - gitlab-labkit (= 0.12.0) + gitlab-fog-azure-rm (~> 1.0) + gitlab-labkit (= 0.12.1) gitlab-license (~> 1.0) - gitlab-mail_room (~> 0.0.4) + gitlab-mail_room (~> 0.0.6) gitlab-markup (~> 1.7.1) gitlab-net-dns (~> 0.9.1) gitlab-puma (~> 4.3.3.gitlab.2) gitlab-puma_worker_killer (~> 0.1.1.gitlab.1) gitlab-sidekiq-fetcher (= 0.5.2) - gitlab-styles (~> 3.2.0) + gitlab-styles (~> 4.3.0) gitlab_chronic_duration (~> 0.10.6.2) gitlab_omniauth-ldap (~> 2.1.1) gon (~> 6.2) - google-api-client (~> 0.23) - google-protobuf (~> 3.8.0) + google-api-client (~> 0.33) + google-protobuf (~> 3.12) gpgme (~> 2.0.19) - grape (~> 1.1.0) + grape (= 1.4.0) grape-entity (~> 0.7.1) - grape-path-helpers (~> 1.2) + grape-path-helpers (~> 1.3) grape_logging (~> 1.7) graphiql-rails (~> 1.4.10) - graphql (~> 1.10.5) + graphql (~> 1.11.4) graphql-docs (~> 1.6.0) - grpc (~> 1.24.0) + grpc (~> 1.30.2) gssapi guard-rspec haml_lint (~> 0.34.0) hamlit (~> 2.11.0) hangouts-chat (~> 0.0.5) hashie-forbidden_attributes - health_check (~> 2.6.0) + health_check (~> 3.0) hipchat (~> 1.5.0) html-pipeline (~> 2.12) html2text @@ -1274,12 +1363,14 @@ DEPENDENCIES icalendar invisible_captcha (~> 0.12.1) jira-ruby (~> 2.0.0) - js_regex (~> 3.1) + js_regex (~> 3.4) json (~> 2.3.0) json-schema (~> 2.8.0) + json_schemer (~> 0.2.12) jwt (~> 2.1.0) kaminari (~> 1.0) knapsack (~> 1.17) + kramdown (~> 2.3.0) kubeclient (~> 4.6.0) letter_opener_web (~> 1.3.4) license_finder (~> 5.4) @@ -1289,12 +1380,13 @@ DEPENDENCIES loofah (~> 2.2) lru_redux mail (= 2.7.1) - marginalia (~> 1.8.0) + marginalia (~> 1.9.0) memory_profiler (~> 0.9) - method_source (~> 0.8) + method_source (~> 1.0) mimemagic (~> 0.3.2) mini_magick minitest (~> 5.11.0) + multi_json (~> 1.14.1) nakayoshi_fork (~> 0.0.4) net-ldap net-ntp @@ -1302,7 +1394,9 @@ DEPENDENCIES nokogiri (~> 1.10.9) oauth2 (~> 1.4) octokit (~> 4.15) + oj (~> 3.10.6) omniauth (~> 1.8) + omniauth-atlassian-oauth2 (~> 0.2.0) omniauth-auth0 (~> 2.0.0) omniauth-authentiq (~> 0.3.3) omniauth-azure-oauth2 (~> 0.0.9) @@ -1317,25 +1411,24 @@ DEPENDENCIES omniauth-saml (~> 1.10) omniauth-shibboleth (~> 1.3.0) omniauth-twitter (~> 1.4) - omniauth-ultraauth (~> 0.0.2) - omniauth_crowd (~> 2.2.0) - omniauth_openid_connect (~> 0.3.3) + omniauth_crowd (~> 2.4.0) + omniauth_openid_connect (~> 0.3.5) org-ruby (~> 0.9.12) parallel (~> 1.19) peek (~> 1.1) pg (~> 1.1) png_quantizator (~> 0.2.1) premailer-rails (~> 1.10.3) - prometheus-client-mmap (~> 0.10.0) - pry-byebug (~> 3.5.1) + prometheus-client-mmap (~> 0.11.0) + pry-byebug (~> 3.9.0) pry-rails (~> 0.3.9) rack (~> 2.0.9) rack-attack (~> 6.3.0) rack-cors (~> 1.0.6) rack-oauth2 (~> 1.9.3) rack-proxy (~> 0.6.0) - rack-timeout - rails (~> 6.0.3) + rack-timeout (~> 0.5.1) + rails (~> 6.0.3.1) rails-controller-testing rails-i18n (~> 6.0) rainbow (~> 3.0) @@ -1346,20 +1439,20 @@ DEPENDENCIES re2 (~> 1.2.0) recaptcha (~> 4.11) redis (~> 4.0) - redis-namespace (~> 1.6.0) + redis-namespace (~> 1.7.0) redis-rails (~> 5.0.2) request_store (~> 1.5) responders (~> 3.0) retriable (~> 3.1.2) - rouge (~> 3.19.0) + rouge (~> 3.21.0) rqrcode-rails3 (~> 0.1.7) rspec-parameterized rspec-rails (~> 4.0.0) rspec-retry (~> 0.6.1) rspec_junit_formatter rspec_profiling (~> 0.0.5) - rubocop (~> 0.74.0) - rubocop-performance (~> 1.4.1) + rubocop (~> 0.82.0) + rubocop-performance (~> 1.5.2) rubocop-rspec (~> 1.37.0) ruby-fogbugz (~> 0.2.1) ruby-prof (~> 1.3.0) @@ -1367,18 +1460,19 @@ DEPENDENCIES ruby_parser (~> 3.8) rubyzip (~> 2.0.0) rugged (~> 0.28) - sanitize (~> 4.6) + sanitize (~> 5.2.1) sassc-rails (~> 2.1.0) scss_lint (~> 0.56.0) seed-fu (~> 2.3.7) selenium-webdriver (~> 3.142) - sentry-raven (~> 2.9) + sentry-raven (~> 3.0) settingslogic (~> 2.0.9) shoulda-matchers (~> 4.0.1) sidekiq (~> 5.2.7) sidekiq-cron (~> 1.0) simple_po_parser (~> 1.1.2) simplecov (~> 0.18.5) + simplecov-cobertura (~> 1.3.1) slack-messenger (~> 2.3.3) snowplow-tracker (~> 0.6.1) spring (~> 2.0.0) @@ -1388,7 +1482,7 @@ DEPENDENCIES stackprof (~> 0.2.15) state_machines-activerecord (~> 0.6.0) sys-filesystem (~> 1.1.6) - test-prof (~> 0.10.0) + test-prof (~> 0.12.0) thin (~> 1.7.0) timecop (~> 0.9.1) toml-rb (~> 1.0.0) @@ -1400,12 +1494,14 @@ DEPENDENCIES unicorn-worker-killer (~> 0.4.4) unleash (~> 0.1.5) valid_email (~> 0.1) - validates_hostname (~> 1.0.6) + validates_hostname (~> 1.0.10) version_sorter (~> 2.2.4) vmstat (~> 2.3.0) + webauthn (~> 2.3) webmock (~> 3.5.1) webpack-rails (~> 0.9.10) wikicloth (= 0.8.1) + yajl-ruby (~> 1.4.1) BUNDLED WITH 2.1.4 diff --git a/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix b/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix index 7156347be05e..7b12e9df6abc 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix +++ b/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix @@ -25,10 +25,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1k9pddds2kfw0br2c153csly4248w9rppkvslx46gncadp9gdb4n"; + sha256 = "1nwkzjamvg946xh2pv82hkwxb7vqq6gakig014gflss0cwx7bbxp"; type = "gem"; }; - version = "2.0.5"; + version = "2.0.6"; }; actioncable = { dependencies = ["actionpack" "nio4r" "websocket-driver"]; @@ -36,10 +36,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0lvbyv15j3g3xhywr8jdgv5rjn26mz7430886njjfrd12x812szy"; + sha256 = "13z4l65jjihd0cgl9ahv66wvlgx09xnivbinqfdg41i7bx8ysahc"; type = "gem"; }; - version = "6.0.3"; + version = "6.0.3.1"; }; actionmailbox = { dependencies = ["actionpack" "activejob" "activerecord" "activestorage" "activesupport" "mail"]; @@ -47,10 +47,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1nwvx83lha87052jywaiqq284nabp3h5lfq7vrb01myh6cr3ggaq"; + sha256 = "1s95rfv1i7j7dy9kvlhxbs7izvm8k371m3grchcpvim4bw73icrp"; type = "gem"; }; - version = "6.0.3"; + version = "6.0.3.1"; }; actionmailer = { dependencies = ["actionpack" "actionview" "activejob" "mail" "rails-dom-testing"]; @@ -58,10 +58,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "16d40j1hcak5p9185dbb015difw12m5f3wjfbh4mw9w8agqsc8mr"; + sha256 = "0ivgxava9wcs70vyqvv2zmkslv3zxprw0l2s77n6m2wqay6g46wl"; type = "gem"; }; - version = "6.0.3"; + version = "6.0.3.1"; }; actionpack = { dependencies = ["actionview" "activesupport" "rack" "rack-test" "rails-dom-testing" "rails-html-sanitizer"]; @@ -69,10 +69,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1v885hs35r8217py08z5k1wvgfzfml64g9wf5v3djgh8mhlf5nfn"; + sha256 = "1665r4ffqdpykxwpgdnaq7xsaz1nfswc5wjs2qr0npx8bq7g49kh"; type = "gem"; }; - version = "6.0.3"; + version = "6.0.3.1"; }; actiontext = { dependencies = ["actionpack" "activerecord" "activestorage" "activesupport" "nokogiri"]; @@ -80,10 +80,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "00w8a5vxs1rlbn0innhrwhjjavmgx0scnkz8h7k83df9l1s7f70j"; + sha256 = "0kjjd506y50byjms9cmingx3ls5qxfgfys6bhf5rgcir9bjj2b1k"; type = "gem"; }; - version = "6.0.3"; + version = "6.0.3.1"; }; actionview = { dependencies = ["activesupport" "builder" "erubi" "rails-dom-testing" "rails-html-sanitizer"]; @@ -91,10 +91,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0s6fr50l714rvzr9vavg1ckgx5xjj5zz7dca42xxjp4jkr7jva7q"; + sha256 = "1n21pswh3k7m33vzhxyrbi5lj64b1138yqv34jjhkhlq3474b4rh"; type = "gem"; }; - version = "6.0.3"; + version = "6.0.3.1"; }; activejob = { dependencies = ["activesupport" "globalid"]; @@ -102,10 +102,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1qr5p1sijan8k2m39w602s1mn3bwwsl7jm14drsgdhvdx5ilwg7b"; + sha256 = "0skanrib6cdxlxipzm07gb5zl930ws9pg1q1dbg1v5br0g8j818l"; type = "gem"; }; - version = "6.0.3"; + version = "6.0.3.1"; }; activemodel = { dependencies = ["activesupport"]; @@ -113,10 +113,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0pi9waxcvb8gxwp4i4wmxszyqhr28gn9jzbq1ivy84g1q658lmqz"; + sha256 = "12kqqjzpmdx0dspvfj8my2acmmk94xz1q9iyvvvq2wkw8l11h1yv"; type = "gem"; }; - version = "6.0.3"; + version = "6.0.3.1"; }; activerecord = { dependencies = ["activemodel" "activesupport"]; @@ -124,10 +124,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1wkm8741i00l5cq88wl9nr131wh955x4cjg2q2d60m3qhpqbxirv"; + sha256 = "1rw3kpb0mpvj73chp6m011955sgmngnlavnf7gkm1305s9s5gfc8"; type = "gem"; }; - version = "6.0.3"; + version = "6.0.3.1"; }; activerecord-explain-analyze = { dependencies = ["activerecord" "pg"]; @@ -146,10 +146,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1yy832p0q7gxp1vbncb677y35y112d2f6mvf131n0m2w35ig9m4f"; + sha256 = "1x13z9hvwbz2vj55mwzx7pws3ccvgrf9k5m1474k71iksn6zlgvc"; type = "gem"; }; - version = "6.0.3"; + version = "6.0.3.1"; }; activesupport = { dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo" "zeitwerk"]; @@ -157,10 +157,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0shh34xx9ygxb57s8mag8l22klvjfnk1c4jbjvchk16r6z0ps326"; + sha256 = "1l29n9n38c9lpy5smh26r7fy7jp2bpjqlzhxgsr79cv7xpwlrbhs"; type = "gem"; }; - version = "6.0.3"; + version = "6.0.3.1"; }; acts-as-taggable-on = { dependencies = ["activerecord"]; @@ -215,16 +215,26 @@ }; version = "3.0.0"; }; + android_key_attestation = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "02spc1sh7zsljl02v9d5rdb717b628vw2k7jkkplifyjk4db0zj6"; + type = "gem"; + }; + version = "0.3.0"; + }; apollo_upload_server = { dependencies = ["graphql" "rails"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0riijpyicbkqsr46w4mfhh3pq2yrmakkz8mmgbrfjhzbyzac25na"; + sha256 = "0xk54h9mmzhrbgbmk33v38pavb8w6421mx2yrgsdarkfl9fr90y3"; type = "gem"; }; - version = "2.0.0.beta.3"; + version = "2.0.2"; }; asana = { dependencies = ["faraday" "faraday_middleware" "faraday_middleware-multi_json" "oauth2"]; @@ -232,10 +242,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "19yr6ibz481jizvx0cjfvql142v8izi474c4vmwy9qzksyq2xhdj"; + sha256 = "0c8n8i3jb2q09l6rgcw0lb4sq85jzz6vywqlrd0ivq989zh3sq2l"; type = "gem"; }; - version = "0.9.3"; + version = "0.10.2"; }; asciidoctor = { groups = ["default"]; @@ -321,48 +331,79 @@ }; version = "1.8.0"; }; + awrence = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "15zwdli370jfsj6jypv7vrqf4vv4ac4784faw7ar5v88fk4q9rcv"; + type = "gem"; + }; + version = "1.1.1"; + }; aws-eventstream = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "100g77a5ixg4p5zwq77f28n2pdkk0y481f7v83qrlmnj22318qq6"; + sha256 = "0r0pn66yqrdkrfdin7qdim0yj2x75miyg4wp6mijckhzhrjb7cv5"; type = "gem"; }; - version = "1.0.3"; + version = "1.1.0"; }; - aws-sdk = { - dependencies = ["aws-sdk-resources"]; + aws-partitions = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1yvl9bxzaxgcyzix2yw46cgll9nl0xfg5qx1j6y3xc1i78rk7vy0"; + sha256 = "12q3swh4f44iqlq2md9lphg8csi0hd35jhgmkkkji9n0mgay4ggh"; type = "gem"; }; - version = "2.11.374"; + version = "1.345.0"; + }; + aws-sdk-cloudformation = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "09kb3k5vpymg846gajc5d3wznww63yiv3ygdf4v42d4pf4wpbr1i"; + type = "gem"; + }; + version = "1.41.0"; }; aws-sdk-core = { - dependencies = ["aws-sigv4" "jmespath"]; + dependencies = ["aws-eventstream" "aws-partitions" "aws-sigv4" "jmespath"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1d7nw1jihv7rglcmkd3hhidjflbzq5ik63n43q27pmx8ki108rd9"; + sha256 = "1xfv8nfz8n700z29di51mcyyrnmbpq7flff4hx9mm92avnly1ysy"; type = "gem"; }; - version = "2.11.374"; + version = "3.104.3"; }; - aws-sdk-resources = { - dependencies = ["aws-sdk-core"]; + aws-sdk-kms = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0qx2a67vsw8rz1y0m04f97p1q4zx7miy06a5ck78hm77nvsigjj4"; + sha256 = "0rpwpj4f4q9wdrbgiqngzwfdaaqyz0iif8sv16z6z0mm6y3cb06q"; type = "gem"; }; - version = "2.11.374"; + version = "1.36.0"; + }; + aws-sdk-s3 = { + dependencies = ["aws-sdk-core" "aws-sdk-kms" "aws-sigv4"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "068xx6wp86wkmikdzg4wqxmg570hc3ydp8211j02g13djjr3k28n"; + type = "gem"; + }; + version = "1.75.0"; }; aws-sigv4 = { dependencies = ["aws-eventstream"]; @@ -370,21 +411,32 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1dfc8i5cxjwlvi4b665lbpbwvks8a6wfy3vfmwr3pjdmxwdmc2cs"; + sha256 = "0aknh3q37rq3ixxa84x2p26g8a15zmiig2rm1pmailsb9vqhfh3j"; type = "gem"; }; - version = "1.1.0"; + version = "1.2.1"; }; - axiom-types = { - dependencies = ["descendants_tracker" "ice_nine" "thread_safe"]; + azure-storage-blob = { + dependencies = ["azure-storage-common" "nokogiri"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "10q3k04pll041mkgy0m5fn2b1lazm6ly1drdbcczl5p57lzi3zy1"; + sha256 = "0qpvjyaq8478hw4cxcf8lr303wn8g9mhrfmvihyzn3zn9hll4zvd"; type = "gem"; }; - version = "0.1.1"; + version = "2.0.0"; + }; + azure-storage-common = { + dependencies = ["faraday" "faraday_middleware" "nokogiri"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0nhjw77r65xrkdn2h6cd76mglgx676hyr58igyfb9f7zbgvjp69s"; + type = "gem"; + }; + version = "2.0.1"; }; babosa = { groups = ["default"]; @@ -463,10 +515,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1pqnxxsqqs7vnqvamk5bzs84dv584g9s0qaf2vqb1v2aj5dabcg7"; + sha256 = "0kn7rv81i2r462k56v29i3s8abcmfcpfj9axia736mwjvv0app2k"; type = "gem"; }; - version = "2.5.0"; + version = "2.7.1"; }; bindata = { groups = ["default"]; @@ -488,17 +540,6 @@ }; version = "0.2.3"; }; - binding_of_caller = { - dependencies = ["debug_inspector"]; - groups = ["development"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "05syqlks7463zsy1jdfbbdravdhj9hpj5pv2m74blqpv8bq4vv5g"; - type = "gem"; - }; - version = "0.8.0"; - }; bootsnap = { dependencies = ["msgpack"]; groups = ["default"]; @@ -536,10 +577,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0sdx0ny34i6vqxdsc7sy9g0nafdbrw8kvvb5xh9m18x1bzpqk92f"; + sha256 = "0q1yzvbqp0mykswipq3w00ljw9fgkhjfrij3hkwi7cx85r14n6gw"; type = "gem"; }; - version = "2.5.3"; + version = "4.2.0"; }; builder = { groups = ["default" "development" "test"]; @@ -557,10 +598,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1h16vrqblcdlizgbidk7bgmhcfb96a9y5jw117my5yhs07yp0i3s"; + sha256 = "18ifwnvn13755qkfigapyj5bflpby3phxzbb7x5336d0kzv5k7d9"; type = "gem"; }; - version = "6.0.2"; + version = "6.1.0"; }; bundler-audit = { dependencies = ["thor"]; @@ -582,21 +623,21 @@ }]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1vv7s88w8jb1qg4qz3jrs3x3y5d9jfyyl7wfiz78b5x95ydvx41q"; + sha256 = "0nx3yjf4xzdgb8jkmk2344081gqr22pgjqnmjg2q64mj5d6r9194"; type = "gem"; }; - version = "9.1.0"; + version = "11.1.3"; }; capybara = { dependencies = ["addressable" "mini_mime" "nokogiri" "rack" "rack-test" "regexp_parser" "xpath"]; - groups = ["development" "test"]; + groups = ["test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1y7ncfji4s3h3wdr2hwsrd32k0va92a6lyx2x8w6a3vkbc94kpch"; + sha256 = "0ji9kyb01dpnjbvpyb0c481cpnisd6wx6div6rywi9fihk66627w"; type = "gem"; }; - version = "3.22.0"; + version = "3.33.0"; }; capybara-screenshot = { dependencies = ["capybara" "launchy"]; @@ -620,15 +661,25 @@ }; version = "1.3.1"; }; + cbor = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0511idr8xps9625nh3kxr68sdy6l3xy2kcz7r57g47fxb1v18jj3"; + type = "gem"; + }; + version = "0.5.9.6"; + }; character_set = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "114npdbw1ivyx4vnid8ncnjw4wnjcipf2lvihlg3ibbh7an0m9s9"; + sha256 = "0affq9n77vwy897ri2zhmfinfagf37hcwwimrccy1bcxan9mj3h3"; type = "gem"; }; - version = "1.1.2"; + version = "1.4.0"; }; charlock_holmes = { groups = ["default"]; @@ -700,21 +751,10 @@ }]; source = { remotes = ["https://rubygems.org"]; - sha256 = "15vav4bhcc2x3jmi3izb11l4d9f3xv8hp2fszb7iqmpsccv1pz4y"; + sha256 = "0jvxqxzply1lwp7ysn94zjhh57vc14mcshw1ygw14ib8lhc00lyw"; type = "gem"; }; - version = "1.1.2"; - }; - coercible = { - dependencies = ["descendants_tracker"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1p5azydlsz0nkxmcq0i1gzmcfq02lgxc4as7wmf47j1c6ljav0ah"; - type = "gem"; - }; - version = "1.0.0"; + version = "1.1.3"; }; colored2 = { groups = ["default" "development"]; @@ -789,6 +829,17 @@ }; version = "0.3.0"; }; + cose = { + dependencies = ["cbor" "openssl-signature_algorithm"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1h1vcirk1vpr992xmnwf5z77fpizjwn4xzq2vrrjhvdmjynvl3jj"; + type = "gem"; + }; + version = "1.0.0"; + }; countries = { dependencies = ["i18n_data" "sixarm_ruby_unaccent" "unicode_utils"]; groups = ["default"]; @@ -858,10 +909,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0gyxfs7pkcg90llhpl2nwfqqcqi0qngqhk8gpyrffj6m0lm1m6wl"; + sha256 = "1qishwv7mixfl4v7mdmwai3rhf94hpzj6hmj20vb4mvk7gk0y2la"; type = "gem"; }; - version = "6.0.9"; + version = "8.0.5"; }; database_cleaner = { groups = ["development" "test"]; @@ -873,16 +924,6 @@ }; version = "1.7.0"; }; - debug_inspector = { - groups = ["default" "development"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0vxr0xa1mfbkfcrn71n7c4f2dj7la5hvphn904vh20j3x4j5lrx0"; - type = "gem"; - }; - version = "0.0.3"; - }; debugger-ruby_core_source = { groups = ["default" "development"]; platforms = [{ @@ -950,17 +991,6 @@ }; version = "1.7.0"; }; - descendants_tracker = { - dependencies = ["thread_safe"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "15q8g3fcqyb41qixn6cky0k3p86291y7xsh1jfd851dvrza1vi79"; - type = "gem"; - }; - version = "0.0.4"; - }; device_detector = { groups = ["default"]; platforms = []; @@ -1061,10 +1091,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0w554smil33j64h50w29xavgg4k7172r0c2rrygfbp5p4ap9py9c"; + sha256 = "01scvhvrw44ksv1aaywpp9kfm4c8qs4gwnnha40r5mq0vpc0qrny"; type = "gem"; }; - version = "5.0.3"; + version = "5.3.3"; }; doorkeeper-openid_connect = { dependencies = ["doorkeeper" "json-jwt"]; @@ -1072,10 +1102,96 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1qcl11dw9b0si45id7sqwv19g8am4i221sqkigimnvhc1cci2yfw"; + sha256 = "1yylcg4j7msxma0s8rx8990bfgr0c414a7vafs3gpgmbwy47wq45"; type = "gem"; }; - version = "1.6.3"; + version = "1.7.4"; + }; + dry-configurable = { + dependencies = ["concurrent-ruby" "dry-core" "dry-equalizer"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "033x4gvynfm33pchmpd5iw9n4c9q46j8vbwbcdmvb8b2r0gpzfdn"; + type = "gem"; + }; + version = "0.11.5"; + }; + dry-container = { + dependencies = ["concurrent-ruby" "dry-configurable"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1npnhs3x2xcwwijpys5c8rpcvymrlab0y8806nr4h425ld5q4wd0"; + type = "gem"; + }; + version = "0.7.2"; + }; + dry-core = { + dependencies = ["concurrent-ruby"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0k9ff2sr4ymiwzg4mchzv66mn6rdsgjlinm6s4x5x91yhd0h4vpk"; + type = "gem"; + }; + version = "0.4.9"; + }; + dry-equalizer = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0rsqpk0gjja6j6pjm0whx2px06cxr3h197vrwxp6k042p52r4v46"; + type = "gem"; + }; + version = "0.3.0"; + }; + dry-inflector = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "17mkdwglqsd9fg272y3zms7rixjgkb1km1xcb88ir5lxvk1jkky7"; + type = "gem"; + }; + version = "0.2.0"; + }; + dry-logic = { + dependencies = ["concurrent-ruby" "dry-core" "dry-equalizer"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1cqvylwv71sm9zrb0lpxmghn20zxnjswxwyhaj8y2wfniffyjgkc"; + type = "gem"; + }; + version = "1.0.6"; + }; + dry-types = { + dependencies = ["concurrent-ruby" "dry-container" "dry-core" "dry-equalizer" "dry-inflector" "dry-logic"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1px1r5khlf4lw32gsrnnnsx7dvl2d94axx3h0b6zwxrhvfq3n038"; + type = "gem"; + }; + version = "1.4.0"; + }; + ecma-re-validator = { + dependencies = ["regexp_parser"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1hjnd6phkhwmd846hqkzbiiyf7n6v9s85agizkxrkha1z0g3q5fc"; + type = "gem"; + }; + version = "0.2.1"; }; ed25519 = { groups = ["ed25519"]; @@ -1093,10 +1209,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1jp7amblk18dag3w0yrzdzkhkbfap2d6xpbyv9314parxw98mgq0"; + sha256 = "152z76sp2ymyaqrbm8c6y0p1ydkckwrr6iif66mdsc5s0433va3f"; type = "gem"; }; - version = "6.8.0"; + version = "6.8.2"; }; elasticsearch-api = { dependencies = ["multi_json"]; @@ -1104,10 +1220,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0kq6ljssd5nd2fjaznbnyf4bhkk5q17ava5rq3bjfvjh1wyzagca"; + sha256 = "12rjfamnqspvkjs90bvpa5zs7g0nlr9pvlvj228mj71k5pym1x8p"; type = "gem"; }; - version = "6.8.0"; + version = "6.8.2"; }; elasticsearch-model = { dependencies = ["activesupport" "elasticsearch" "hashie"]; @@ -1115,20 +1231,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ifm8vh8nr9r1wnpnfa6kjm7v54jwsgvpg060r08haydqcv5lbsy"; + sha256 = "1q66mp28696qnr6xgsl1dym2l5wk4j2ifd673r09yi70hn9y5ji8"; type = "gem"; }; - version = "6.1.0"; + version = "6.1.1"; }; elasticsearch-rails = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0zxqj7pgb0b32qda84jlg6kay4b9qbpjlfk2b0m23hxnkbbmf1bd"; + sha256 = "06k97w4xdkdj982b2mgz4bv0gvkpbscn4wxsrqj6kr1x7dxia394"; type = "gem"; }; - version = "6.1.0"; + version = "6.1.1"; }; elasticsearch-transport = { dependencies = ["faraday" "multi_json"]; @@ -1136,10 +1252,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0c1scz8l4z84x7g3iwf9kmvrpgjjq0gaxaswviiy9zg3csn720mc"; + sha256 = "02z7b26vl0wmvkzy10qp530vx5c7pdv2ynfsd7mc5qmz6m0z5pxp"; type = "gem"; }; - version = "6.8.0"; + version = "6.8.2"; }; email_reply_trimmer = { groups = ["default"]; @@ -1302,10 +1418,21 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0s72m05jvzc1pd6cw1i289chas399q0a14xrwg4rvkdwy7bgzrh0"; + sha256 = "0wwks9652xwgjm7yszcq5xr960pjypc07ivwzbjzpvy9zh2fw6iq"; type = "gem"; }; - version = "0.15.4"; + version = "1.0.1"; + }; + faraday-cookie_jar = { + dependencies = ["faraday" "http-cookie"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "00hligx26w9wdnpgsrf0qdnqld4rdccy8ym6027h5m735mpvxjzk"; + type = "gem"; + }; + version = "0.0.7"; }; faraday-http-cache = { dependencies = ["faraday"]; @@ -1313,10 +1440,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "08j86fgcwl7z792qyijdsq680arzpfiydqd24ja405z2rbm7r2i0"; + sha256 = "0lhfwlk4mhmw9pdlgdsl2bq4x45w7s51jkxjryf18wym8iiw36g7"; type = "gem"; }; - version = "2.0.0"; + version = "2.2.0"; }; faraday_middleware = { dependencies = ["faraday"]; @@ -1324,21 +1451,21 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1p7icfl28nvl8qqdsngryz1snqic9l8x6bk0dxd7ygn230y0k41d"; + sha256 = "0jik2kgfinwnfi6fpp512vlvs0mlggign3gkbpkg5fw1jr9his0r"; type = "gem"; }; - version = "0.12.2"; + version = "1.0.0"; }; - faraday_middleware-aws-signers-v4 = { - dependencies = ["aws-sdk-resources" "faraday"]; + faraday_middleware-aws-sigv4 = { + dependencies = ["aws-sigv4" "faraday"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0y88xcbq8k2ijhsqdava5493p26k49agvnzca6vkl3qwfv3ambhp"; + sha256 = "1gk2qakcvvbgfvvfd8cgf13sligv5mp816ykmra9llqmbfym8ikl"; type = "gem"; }; - version = "0.1.7"; + version = "0.3.0"; }; faraday_middleware-multi_json = { dependencies = ["faraday_middleware" "multi_json"]; @@ -1386,10 +1513,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "10lfhahnnc91v63xpvk65apn61pib086zha3z5sp1xk9acfx12h4"; + sha256 = "12lpwaw82bb0rm9f52v1498bpba8aj2l2q359mkwbxsswhpga5af"; type = "gem"; }; - version = "1.12.2"; + version = "1.13.1"; }; ffi-compiler = { dependencies = ["ffi" "rake"]; @@ -1484,10 +1611,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1784xynmgvj1x9phy42nbd3fcgj040zps6wn7msi6vnj1sg4wpfy"; + sha256 = "10gwq4lz09386wdl4y9sqkdwy16phs439bfii7vz47s64fvg9gn5"; type = "gem"; }; - version = "1.9.1"; + version = "1.10.0"; }; fog-json = { dependencies = ["fog-core" "multi_json"]; @@ -1625,10 +1752,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0764vj7gacn0aypm2bf6m46dzjzwzrjlmbyx6qwwwzbmi94r40wr"; + sha256 = "04xlj00sm4mbgvyq0qkbxim75i7cpyn6iylpfwnyagl35wdvsszf"; type = "gem"; }; - version = "3.2.9"; + version = "3.3.6"; }; gettext_i18n_rails = { dependencies = ["fast_gettext"]; @@ -1653,14 +1780,15 @@ version = "1.3.0"; }; git = { + dependencies = ["rchardet"]; groups = ["default" "development"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0bf83icwypi3p3pd97vlqbnp3hvf31ncd440m9kh9y7x6yk74wyh"; + sha256 = "0y8n1m2kys3q79b9kp8bs4803isshpf0f401a2hfy4iyh5jwzx11"; type = "gem"; }; - version = "1.5.0"; + version = "1.7.0"; }; gitaly = { dependencies = ["grpc"]; @@ -1668,10 +1796,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "01ki2isvqyhfw503z3ahksbfb0s0m3psi4din9azdpgcqyv1pxlh"; + sha256 = "06l4c4a7ngq250m1y5i2asl6a63h0jix9rmz47xzj32qg6nlylak"; type = "gem"; }; - version = "13.0.0.pre.rc1"; + version = "13.3.0.pre.rc2"; }; github-markup = { groups = ["default"]; @@ -1694,16 +1822,27 @@ }; version = "0.10.5"; }; + gitlab-fog-azure-rm = { + dependencies = ["azure-storage-blob" "azure-storage-common" "fog-core" "fog-json" "mime-types" "ms_rest_azure"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "04l7ps0vvrqq8i25q7ic2zy2n8f8f1l7sn1shf5wccy1cbyj9pig"; + type = "gem"; + }; + version = "1.0.0"; + }; gitlab-labkit = { dependencies = ["actionpack" "activesupport" "grpc" "jaeger-client" "opentracing" "redis"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0a63zgjll83b25hiq8m4sk75jci2rj8z46lss0j3bc6zi3pxnzax"; + sha256 = "1zpprxxis0aziy0vmig0jpc6bxj05xfv25i1aisliiyd7dsjdqrh"; type = "gem"; }; - version = "0.12.0"; + version = "0.12.1"; }; gitlab-license = { groups = ["default"]; @@ -1720,10 +1859,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "10ajr3l8vasy4zkc0p481m806g7k7idnw7mi6rlkmx4gkgb0z46j"; + sha256 = "0kjxw7fq0slihawxz6nwvikdzp8xc0nydbsvjlz80m936cykmk9h"; type = "gem"; }; - version = "0.0.4"; + version = "0.0.6"; }; gitlab-markup = { groups = ["default"]; @@ -1751,10 +1890,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0i1gv7mgjpa46v6jr97rjk0zv3jny3gc3q3bq8wd6rv59lv5s4wi"; + sha256 = "05hazn3cq079zynj0viagly6bgh4x7pb2vqki9rgf2k39ljwrmld"; type = "gem"; }; - version = "4.3.3.gitlab.2"; + version = "4.3.5.gitlab.3"; }; gitlab-puma_worker_killer = { dependencies = ["get_process_mem" "gitlab-puma"]; @@ -1784,10 +1923,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1il4jqvz7b2l6pcxw6pfjvljpngn92mghfm47g0mfickih1i2r55"; + sha256 = "1vw4kbmxiccq7r1ijgccq35cqf34bvy2l5p9chxr2g8hlx5rd4kw"; type = "gem"; }; - version = "3.2.0"; + version = "4.3.0"; }; gitlab_chronic_duration = { dependencies = ["numerizer"]; @@ -1834,25 +1973,25 @@ version = "6.2.0"; }; google-api-client = { - dependencies = ["addressable" "googleauth" "httpclient" "mime-types" "representable" "retriable"]; + dependencies = ["addressable" "googleauth" "httpclient" "mini_mime" "representable" "retriable" "signet"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "05h2lca9b334ayabgs3h0mzc2wg3csvkqv1lv3iirpgf90ypbk1k"; + sha256 = "13y6xara8w211y88pxa8bcbg6y40vkidqk854zl7z4csmgfnplxq"; type = "gem"; }; - version = "0.23.4"; + version = "0.33.2"; }; google-protobuf = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0by3289irdklb9gjqw41fq6mg6yja3iyzh99dj8p8z9l4brllqn4"; + sha256 = "1m3la0yid3bqx9b30raisqbp27d0q7vdrlslazrdasf8v1vhifxj"; type = "gem"; }; - version = "3.8.0"; + version = "3.12.4"; }; googleapis-common-protos-types = { dependencies = ["google-protobuf"]; @@ -1860,10 +1999,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0hyr94cafiqj0k8q19hnl658pmbz2b404akikzfv4hdb1j1bwsg1"; + sha256 = "1aava1b75n056s24gn7ajrkmm6s3xa3swl62dl5q9apw4marghji"; type = "gem"; }; - version = "1.0.4"; + version = "1.0.5"; }; googleauth = { dependencies = ["faraday" "jwt" "memoist" "multi_json" "os" "signet"]; @@ -1871,10 +2010,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1747p1dhpvz76i98xnjrvaj785y1232svm0nc8g9by6pz835gp2l"; + sha256 = "0rsk471ld98pxhvzig3lnw9i13454c9nschvzxvq6vjqnn9ip0yh"; type = "gem"; }; - version = "0.6.6"; + version = "0.12.0"; }; gpgme = { dependencies = ["mini_portile2"]; @@ -1888,15 +2027,15 @@ version = "2.0.20"; }; grape = { - dependencies = ["activesupport" "builder" "mustermann-grape" "rack" "rack-accept" "virtus"]; + dependencies = ["activesupport" "builder" "dry-types" "mustermann-grape" "rack" "rack-accept"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "04bam0iq9sad1df361317zz4knwci905yig502khl8gm1lp1168c"; + sha256 = "03ylzpn9mng9kwk472xbsfnqcbnm0qcjjlscp17hijvpvafd8a09"; type = "gem"; }; - version = "1.1.0"; + version = "1.4.0"; }; grape-entity = { dependencies = ["activesupport" "multi_json"]; @@ -1915,10 +2054,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "170aw6yvr8l5srlfjz1yqpxr7klr8jypr4i0gj41gn6v4iamyl79"; + sha256 = "1zgifvvdh1dyhxl4ywspkvpy6srhlqliihfprp09k35kikxlmjqc"; type = "gem"; }; - version = "1.2.0"; + version = "1.3.0"; }; grape_logging = { dependencies = ["grape" "rack"]; @@ -1947,10 +2086,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0zj729kxig2klhm4naqsgrfi4xgba4vh2pazvvi7iaikaa3vfh48"; + sha256 = "01ldxhn59lfg5ivxc9m11v1qhw29ql95qcvwwcap49n0z7d1i3k5"; type = "gem"; }; - version = "1.10.5"; + version = "1.11.4"; }; graphql-docs = { dependencies = ["commonmarker" "escape_utils" "extended-markdown-filter" "gemoji" "graphql" "html-pipeline" "sass"]; @@ -1969,10 +2108,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "18wikj9qd4jb4lks55cs2cf3q7fifnanm9z9ywnxhpj57vbnilpf"; + sha256 = "1rsglf7ag17n465iff7vlw83pn2rpl4kv9sb1rpf17nx6xpi7yl5"; type = "gem"; }; - version = "1.24.0"; + version = "1.30.2"; }; gssapi = { dependencies = ["ffi"]; @@ -1991,10 +2130,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "000hn5cdqz3wl99b245q958c5byi2dlsqi814q5gmyljv7i47zwf"; + sha256 = "1fwgvkmrg97xfswwgfrfcl1nc937yxwazfvpmf8vxj7cvnx7mfki"; type = "gem"; }; - version = "2.15.1"; + version = "2.16.2"; }; guard-compat = { groups = ["default" "test"]; @@ -2050,6 +2189,16 @@ }; version = "2.11.0"; }; + hana = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0ij5clmkfl5ij9wdzr62b0w7j2qg7pb65mhvxa6mf1kv1xp6l585"; + type = "gem"; + }; + version = "1.3.6"; + }; hangouts-chat = { groups = ["default"]; platforms = []; @@ -2092,15 +2241,15 @@ version = "0.1.1"; }; health_check = { - dependencies = ["rails"]; + dependencies = ["railties"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1mfa180nyzz1j0abfihm5nm3lmzq99362ibcphky6rh5vwhckvm8"; + sha256 = "07wrbfsfsprfmykc0qbkkgxpf8vlx4a8sp77acqrjsh395f6qcqv"; type = "gem"; }; - version = "2.6.0"; + version = "3.0.0"; }; heapy = { groups = ["default"]; @@ -2225,10 +2374,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0jwrd1l4mxz06iyx6053lr6hz2zy7ah2k3ranfzisvych5q19kwm"; + sha256 = "10nq1xjqvkhngiygji831qx9bryjwws95r4vrnlq9142bzkg670s"; type = "gem"; }; - version = "1.8.2"; + version = "1.8.3"; }; i18n_data = { groups = ["default"]; @@ -2329,10 +2478,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0wi4h4f3knb0yp4zq2spks3dpmdzz9wa54d6xk88md0h4v2x33cq"; + sha256 = "1zia0pxa2lrybwv51xzhj26rf3gx8zwg1cghbdk640rbsyr8sf9a"; type = "gem"; }; - version = "3.1.1"; + version = "3.4.0"; }; json = { groups = ["default"]; @@ -2366,6 +2515,17 @@ }; version = "2.8.0"; }; + json_schemer = { + dependencies = ["ecma-re-validator" "hana" "regexp_parser" "uri_template"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "194898b70ylkjqg7vhy4lps4a5g31n7xxb3vfacwfs40azkn83zm"; + type = "gem"; + }; + version = "0.2.12"; + }; jwt = { groups = ["default"]; platforms = []; @@ -2441,14 +2601,15 @@ version = "1.17.0"; }; kramdown = { + dependencies = ["rexml"]; groups = ["default" "development"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1dl840bvx8d9nq6lg3mxqyvbiqnr6lk3jfsm6r8zhz7p5srmd688"; + sha256 = "1vmw752c26ny2jwl0npn0gbyqwgz4hdmlpxnsld9qi9xhk5b1qh7"; type = "gem"; }; - version = "2.1.0"; + version = "2.3.0"; }; kramdown-parser-gfm = { dependencies = ["kramdown"]; @@ -2528,25 +2689,25 @@ version = "8.9.2"; }; listen = { - dependencies = ["rb-fsevent" "rb-inotify" "ruby_dep"]; + dependencies = ["rb-fsevent" "rb-inotify"]; groups = ["default" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "01v5mrnfqm6sgm8xn2v5swxsn1wlmq7rzh2i48d4jzjsc7qvb6mx"; + sha256 = "1w923wmdi3gyiky0asqdw5dnh3gcjs2xyn82ajvjfjwh6sn0clgi"; type = "gem"; }; - version = "3.1.5"; + version = "3.2.1"; }; locale = { groups = ["default" "development"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1sls9bq4krx0fmnzmlbn64dw23c4d6pz46ynjzrn9k8zyassdd0x"; + sha256 = "0997465kxvpxm92fiwc2b16l49mngk7b68g5k35ify0m3q0yxpdn"; type = "gem"; }; - version = "2.1.2"; + version = "2.1.3"; }; lockbox = { groups = ["default"]; @@ -2564,10 +2725,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "00lcn7s3slfn32di4qwlx2yj5f9r2pcnd0naxrvqqwypcg1z2sdd"; + sha256 = "1vrjm4yqn5l6q5gsl72fmk95fl6j9z1a05gzbrwmsm3gp1a1bgac"; type = "gem"; }; - version = "0.10.0"; + version = "0.11.2"; }; loofah = { dependencies = ["crass" "nokogiri"]; @@ -2595,10 +2756,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "06im7gcg42x77yhz2w5da2ly9xz0n0c36y5ks7xs53v0l9g0vf5n"; + sha256 = "07rvqrizmqzbjzhdsh4l4fyif26a7czb506dvch18kr3nkkamim5"; type = "gem"; }; - version = "1.0.13"; + version = "1.2.7"; }; mail = { dependencies = ["mini_mime"]; @@ -2628,10 +2789,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1akbiibmg64liw8ya6xzf9lavh2n2707hxsnf9sfslsk36iwx0yn"; + sha256 = "0n870r50z859dkcjz6dqvbvm895rpzw047basvbbfv9gi22rlxlv"; type = "gem"; }; - version = "1.8.0"; + version = "1.9.0"; }; memoist = { groups = ["default"]; @@ -2673,10 +2834,10 @@ }]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1pviwzvdqd90gn6y7illcdd9adapw8fczml933p5vl739dkvl3lq"; + sha256 = "1pnyh44qycnf9mzi1j6fywd5fkskv3x7nmsqrrws0rjn5dd4ayfp"; type = "gem"; }; - version = "0.9.2"; + version = "1.0.0"; }; mime-types = { dependencies = ["mime-types-data"]; @@ -2684,20 +2845,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0fjxy1jm52ixpnv3vg9ld9pr9f35gy0jp66i1njhqjvmnvq0iwwk"; + sha256 = "1zj12l9qk62anvk9bjvandpa6vy4xslil15wl6wlivyf51z773vh"; type = "gem"; }; - version = "3.2.2"; + version = "3.3.1"; }; mime-types-data = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1m00pg19cm47n1qlcxgl91ajh2yq0fszvn1vy8fy0s1jkrp9fw4a"; + sha256 = "1z75svngyhsglx0y2f9rnil2j08f9ab54b3l95bpgz67zq2if753"; type = "gem"; }; - version = "3.2019.0331"; + version = "3.2020.0512"; }; mimemagic = { groups = ["default" "test"]; @@ -2759,15 +2920,37 @@ }; version = "5.11.3"; }; + ms_rest = { + dependencies = ["concurrent-ruby" "faraday" "timeliness"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1jiha1bda5knpjqjymwik6i41n69gb0phcrgvmgc5icl4mcisai7"; + type = "gem"; + }; + version = "0.7.6"; + }; + ms_rest_azure = { + dependencies = ["concurrent-ruby" "faraday" "faraday-cookie_jar" "ms_rest"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "06i37b84r2q206kfm5vsi9s1qiiy09091vhvc5pzb7320h0hc1ih"; + type = "gem"; + }; + version = "0.12.0"; + }; msgpack = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1qr2mkm2i3m76zarvy7qgjl9596hmvjrg7x6w42vx8cfsbf5p0y1"; + sha256 = "1lva6bkvb4mfa0m3bqn4lm4s4gi81c40jvdcsrxr6vng49q9daih"; type = "gem"; }; - version = "1.3.1"; + version = "1.3.3"; }; multi_json = { groups = ["default"]; @@ -2810,14 +2993,15 @@ version = "0.1.6"; }; mustermann = { + dependencies = ["ruby2_keywords"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0lycgkmnyy0bf29nnd2zql5a6pcf8sp69g9v4xw0gcfcxgpwp7i1"; + sha256 = "0ccm54qgshr1lq3pr1dfh7gphkilc19dp63rw6fcx7460pjwy88a"; type = "gem"; }; - version = "1.0.3"; + version = "1.1.1"; }; mustermann-grape = { dependencies = ["mustermann"]; @@ -2825,10 +3009,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "10xdggddjl8nraq7pbli31lwgrzxzz8gp558i811lsv71fqbmhzr"; + sha256 = "0djlbi7nh161a5mwjdm1ya4hc6lyzc493ah48gn37gk6vyri5kh0"; type = "gem"; }; - version = "1.0.0"; + version = "1.0.1"; }; nakayoshi_fork = { groups = ["default"]; @@ -2926,10 +3110,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "12j76d0bp608932xkzmfi638c7aqah57l437q8494znzbj610qnm"; + sha256 = "0xmf60nj5kg9vaj5bysy308687sgmkasgx06vbbnf94p52ih7si2"; type = "gem"; }; - version = "1.10.9"; + version = "1.10.10"; }; nokogumbo = { dependencies = ["nokogiri"]; @@ -2937,10 +3121,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "09qc1c7acv9qm48vk2kzvnrq4ij8jrql1cv33nmv2nwmlggy0jyj"; + sha256 = "0sxjnpjvrn10gdmfw2dimhch861lz00f28hvkkz0b1gc2rb65k9s"; type = "gem"; }; - version = "1.5.0"; + version = "2.0.2"; }; notiffany = { dependencies = ["nenv" "shellany"]; @@ -2979,10 +3163,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0av6nlb5y2sm6m8fx669ywrqa9858yqaqfqzny75nqp3anag89qh"; + sha256 = "1bhakjh30vi8scqwnhd1c9qkac9r8hh2lr0dbs5ynwmrc5djxknm"; type = "gem"; }; - version = "1.4.1"; + version = "1.4.4"; }; octokit = { dependencies = ["faraday" "sawyer"]; @@ -2995,6 +3179,16 @@ }; version = "4.15.0"; }; + oj = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1zik71a9dj2c0cnbqxjfzgrg6r2l3f7584813z6asl50nfdbf7jw"; + type = "gem"; + }; + version = "3.10.6"; + }; omniauth = { dependencies = ["hashie" "rack"]; groups = ["default" "kerberos"]; @@ -3006,6 +3200,17 @@ }; version = "1.9.0"; }; + omniauth-atlassian-oauth2 = { + dependencies = ["omniauth" "omniauth-oauth2"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1jbnbp0pnasyrf0mgyig72hx8bdwhv78na6ffqrs1f4a3155f1zb"; + type = "gem"; + }; + version = "0.2.0"; + }; omniauth-auth0 = { dependencies = ["omniauth-oauth2"]; groups = ["default"]; @@ -3193,27 +3398,16 @@ }; version = "1.4.0"; }; - omniauth-ultraauth = { - dependencies = ["omniauth_openid_connect"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1z8gz8ql4vb8y5n4lr67afnjmp23bpqi18dmda5psigvd2jddyn8"; - type = "gem"; - }; - version = "0.0.2"; - }; omniauth_crowd = { dependencies = ["activesupport" "nokogiri" "omniauth"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "12g5ck05h6kr9mnp870x8pkxsadg81ca70hg8n3k8xx007lfw2q7"; + sha256 = "1wiq1vnwjddzw2qzkpr3nqzx6glmcz5pfylw10pc7vkzdcmkpy37"; type = "gem"; }; - version = "2.2.3"; + version = "2.4.0"; }; omniauth_openid_connect = { dependencies = ["addressable" "omniauth" "openid_connect"]; @@ -3221,10 +3415,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0awybp2jnai0w2qfgqnr3f478g3nbg5r0vcm6pa5g8k5f4rs19qr"; + sha256 = "1wxf52yggvwmyg6f9fiykh1sk51xx34i6x6m8f06ia56npslc4aw"; type = "gem"; }; - version = "0.3.3"; + version = "0.3.5"; }; open4 = { groups = ["default" "development"]; @@ -3247,6 +3441,26 @@ }; version = "1.1.8"; }; + openssl = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "03wbynzkhay7l1x76srjkg91q48mxl575vrxb3blfxlpqwsvvp0w"; + type = "gem"; + }; + version = "2.2.0"; + }; + openssl-signature_algorithm = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "14d95jr5z6dgvpwf52p7ckjf3w3cihin2k6g9599711pfxdj4fp5"; + type = "gem"; + }; + version = "0.4.0"; + }; opentracing = { groups = ["default"]; platforms = []; @@ -3262,10 +3476,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "05jxrp3nbn5iilc1k7ir90mfnwc5abc9h78s5rpm3qafwqxvcj4j"; + sha256 = "1vg2chy1cfmdj6c1gryl8zvjhhmb3plwgyh1jfnpq4fnfqv7asrk"; type = "gem"; }; - version = "3.0.0"; + version = "3.0.1"; }; org-ruby = { dependencies = ["rubypants"]; @@ -3314,10 +3528,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "19nxgcl6fbnr6da958hyvnycv441ryp2dw4ccmldah5bm8885z39"; + sha256 = "1xgsl3dvmidvr1y4lp63m5avjxykl2gradgav8xfp5z86rfqhpr0"; type = "gem"; }; - version = "2.7.0.4"; + version = "2.7.1.2"; }; parslet = { groups = ["default" "development" "test"]; @@ -3345,10 +3559,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1r01bqqhnk272dsyhg3cqx6j0aiwbcdnrwp7vxzc969mb5dgnnrl"; + sha256 = "13mfrysrdrh8cka1d96zm0lnfs59i5x2g6ps49r2kz5p3q81xrzj"; type = "gem"; }; - version = "1.2.2"; + version = "1.2.3"; }; png_quantizator = { groups = ["development" "test"]; @@ -3419,10 +3633,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "00d2c79xhz5k3fcclarjr1ffxbrvc6236f4rrvriad9kwqr7c1mp"; + sha256 = "0plfcsscg0nagi8srzh4n4g0riqzivsm5rwrn18k73ajaxbqpwc6"; type = "gem"; }; - version = "0.10.0"; + version = "0.11.0"; }; pry = { dependencies = ["coderay" "method_source"]; @@ -3434,10 +3648,10 @@ }]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1mh312k3y94sj0pi160wpia0ps8f4kmzvm505i6bvwynfdh7v30g"; + sha256 = "0iyw4q4an2wmk8v5rn2ghfy2jaz9vmw2nk8415nnpx2s866934qk"; type = "gem"; }; - version = "0.11.3"; + version = "0.13.1"; }; pry-byebug = { dependencies = ["byebug" "pry"]; @@ -3449,10 +3663,10 @@ }]; source = { remotes = ["https://rubygems.org"]; - sha256 = "1f9kj1qp14qb8crg2rdzf22pr6ngxvy4n6ipymla8q1yjr842625"; + sha256 = "096y5vmzpyy4x9h4ky4cs4y7d19vdq9vbwwrqafbh5gagzwhifiv"; type = "gem"; }; - version = "3.5.1"; + version = "3.9.0"; }; pry-rails = { dependencies = ["pry"]; @@ -3583,14 +3797,14 @@ version = "1.1.0"; }; rack-timeout = { - groups = ["puma"]; + groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "15xph8h6v0lvq9pxm3bc9i9pnk2k68rgdr1mp0dw4l7v1xvhs78a"; + sha256 = "0d4dgbf8rgqx03lwsm8j6i20lzawk1bsvzfj5bhzrsycfyfk25aj"; type = "gem"; }; - version = "0.5.1"; + version = "0.5.2"; }; rails = { dependencies = ["actioncable" "actionmailbox" "actionmailer" "actionpack" "actiontext" "actionview" "activejob" "activemodel" "activerecord" "activestorage" "activesupport" "railties" "sprockets-rails"]; @@ -3598,10 +3812,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1rvkzj2hn1rlxc0ndn742mgbdpq0l38i6pjhhwgpaq519jpkk41r"; + sha256 = "1cka2c0g9qd02i7xl0hnhkbf4vjrjlax1vwpillpi4x0zc30ssl4"; type = "gem"; }; - version = "6.0.3"; + version = "6.0.3.1"; }; rails-controller-testing = { dependencies = ["actionpack" "actionview" "activesupport"]; @@ -3653,10 +3867,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "01h2ifvvmlzmq8dmpqkhrrmj704v79r1vkcrnvmrqhf4a9bbyqsi"; + sha256 = "1drghlbjchn889ssiv1rzq6psp0469brf2838kfm4kzz1fhmbh2d"; type = "gem"; }; - version = "6.0.3"; + version = "6.0.3.1"; }; rainbow = { groups = ["default" "development" "test"]; @@ -3693,10 +3907,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1fbpmjypwxkb8r7y1kmhmyp6gawa4byw0yb3jc3dn9ly4ld9lizf"; + sha256 = "1k9bsj7ni0g2fd7scyyy1sk9dy2pg9akniahab0iznvjmhn54h87"; type = "gem"; }; - version = "0.10.2"; + version = "0.10.4"; }; rb-inotify = { dependencies = ["ffi"]; @@ -3704,10 +3918,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0yfsgw5n7pkpyky6a9wkf1g9jafxb0ja7gz0qw0y14fd2jnzfh71"; + sha256 = "1jm76h8f8hji38z3ggf4bzi8vps6p7sagxn3ab57qc0xyga64005"; type = "gem"; }; - version = "0.9.10"; + version = "0.10.1"; }; rblineprof = { dependencies = ["debugger-ruby_core_source"]; @@ -3730,10 +3944,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1lwsq08i0aj8na5q5ba3gg02sx3wl58fi6m52svl5p7cy56ycdwi"; + sha256 = "0s8prj0klfgpmpfcpdzbf149qrrsdxgnb6w6kkqc9gyars4vyaqn"; type = "gem"; }; - version = "0.4.11"; + version = "0.4.14"; + }; + rchardet = { + groups = ["default" "development"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1isj1b3ywgg2m1vdlnr41lpvpm3dbyarf1lla4dfibfmad9csfk9"; + type = "gem"; + }; + version = "1.8.0"; }; rdoc = { groups = ["default"]; @@ -3824,10 +4048,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0r7daagrjjribn098dxwbv9zivrbq2rsffbkj2ccxyn9lmjjbgah"; + sha256 = "1wb4x8bg2d0plv3izpmi1sd7nd1ix8nxw7b43hd9bac08f4w62mx"; type = "gem"; }; - version = "1.6.0"; + version = "1.7.0"; }; redis-rack = { dependencies = ["rack" "redis-store"]; @@ -3877,10 +4101,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "05ka0bkhghs9b9pv6q443k8y1c5xalmm0vylj9zd450ksncxj1yr"; + sha256 = "1iwapp91sbvafqp12cq834rgy1ydrmrsh5w1a0wfsk4scdxcdwlb"; type = "gem"; }; - version = "0.3.4"; + version = "0.3.5"; }; representable = { dependencies = ["declarative" "declarative-option" "uber"]; @@ -3936,6 +4160,16 @@ }; version = "3.1.2"; }; + rexml = { + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1mkvkcw9fhpaizrhca0pdgjcrbns48rlz4g6lavl5gjjq3rk2sq3"; + type = "gem"; + }; + version = "3.2.4"; + }; rinku = { groups = ["default"]; platforms = []; @@ -3961,10 +4195,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "102rc07d78k5bkl0s9nd1gw6wz0w0zcvg4g5sl7z9xxi4r793c35"; + sha256 = "1agrrmj88k9jkk36ra1ml2c1jffpp595pkxmcla74ac9ia09vn3s"; type = "gem"; }; - version = "3.19.0"; + version = "3.21.0"; }; rqrcode = { dependencies = ["chunky_png"]; @@ -4098,15 +4332,15 @@ version = "0.0.5"; }; rubocop = { - dependencies = ["jaro_winkler" "parallel" "parser" "rainbow" "ruby-progressbar" "unicode-display_width"]; + dependencies = ["jaro_winkler" "parallel" "parser" "rainbow" "rexml" "ruby-progressbar" "unicode-display_width"]; groups = ["development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0wpyass9qb2wvq8zsc7wdzix5xy2ldiv66wnx8mwwprz2dcvzayk"; + sha256 = "0pyjx2lbai93p6q3w57cxdhlcwhxfvm299xqicgarhdrv73mnv1d"; type = "gem"; }; - version = "0.74.0"; + version = "0.82.0"; }; rubocop-gitlab-security = { dependencies = ["rubocop"]; @@ -4125,21 +4359,21 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1ssizdnyai2hxdp6nd4b9hqyrc4gwhjlznhrdliz8wj4p8cvas44"; + sha256 = "1fk9nd3b24avgsqp726hy2pl1iyfjrh6jni97wkky6kqy0lq6zq2"; type = "gem"; }; - version = "1.4.1"; + version = "1.5.2"; }; rubocop-rails = { - dependencies = ["rack" "rubocop"]; + dependencies = ["activesupport" "rack" "rubocop"]; groups = ["default" "development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0vvrwcxzbqiqdjxakxmjg4c3dcrlpb00i1d3i0s1gdk0ch79byag"; + sha256 = "087fwq48n9k10c6npp7n5vbpx34nmaq3xkhw9n0v75m3l9rn8s34"; type = "gem"; }; - version = "2.4.0"; + version = "2.5.2"; }; rubocop-rspec = { dependencies = ["rubocop"]; @@ -4215,15 +4449,15 @@ }; version = "2.1.2"; }; - ruby_dep = { - groups = ["default" "test"]; + ruby2_keywords = { + groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1c1bkl97i9mkcvkn1jks346ksnvnnp84cs22gwl0vd7radybrgy5"; + sha256 = "17pcc0wgvh3ikrkr7bm3nx0qhyiqwidd13ij0fa50k7gsbnr2p0l"; type = "gem"; }; - version = "1.5.0"; + version = "0.0.2"; }; ruby_parser = { dependencies = ["sexp_processor"]; @@ -4286,16 +4520,27 @@ }; version = "1.0.4"; }; + safety_net_attestation = { + dependencies = ["jwt"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1khq0y5w7lf2b9a220298hphf3pakd216jc9a4x4a9pdwxs2vgln"; + type = "gem"; + }; + version = "0.4.0"; + }; sanitize = { dependencies = ["crass" "nokogiri" "nokogumbo"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0j4j2a2mkk1a70vbx959pvx0gvr1zb9snjwvsppwj28bp0p0b2bv"; + sha256 = "18m3zcf207gcrmghx288w3n2kpphc22lbmbc1wdx1nzcn8g2yddh"; type = "gem"; }; - version = "4.6.6"; + version = "5.2.1"; }; sass = { dependencies = ["sass-listen"]; @@ -4363,6 +4608,16 @@ }; version = "0.56.0"; }; + securecompare = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0ay65wba4i7bvfqyvf5i4r48q6g70s5m724diz9gdvdavscna36b"; + type = "gem"; + }; + version = "1.0.0"; + }; seed-fu = { dependencies = ["activerecord" "activesupport"]; groups = ["default"]; @@ -4391,10 +4646,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1j9rwbig24ry0smgvmkzdjrzyszniaswipinvflzxzzaz52v7483"; + sha256 = "17j4br2lpnd8066d50mkg9kwk9v70hn3zfiqkvysd8p9nffmqnm0"; type = "gem"; }; - version = "2.9.0"; + version = "3.0.4"; }; settingslogic = { groups = ["default"]; @@ -4443,10 +4698,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "131zv8i341bkacxx7n1id2cmblkbs379farnibqg8c7bycd1iajq"; + sha256 = "0kw4z9mr8h1rddx6f81gf7glw9pf90w0kvgc2fx4g9hspgh9xh7y"; type = "gem"; }; - version = "5.2.7"; + version = "5.2.9"; }; sidekiq-cron = { dependencies = ["fugit" "sidekiq"]; @@ -4465,10 +4720,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1f5d3bz5bjc4b0r2jmqd15qf07lgsqkgd25f0h46jihrf9l5fsi4"; + sha256 = "10g2667fvxnc50hcd1aywgsbf8j7nrckg3n7zjvywmyz82pwmpqp"; type = "gem"; }; - version = "0.11.0"; + version = "0.14.0"; }; simple_po_parser = { groups = ["development" "test"]; @@ -4491,6 +4746,17 @@ }; version = "0.18.5"; }; + simplecov-cobertura = { + dependencies = ["simplecov"]; + groups = ["development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "07ikl2y382g6ibzfflsamh13qlsr2769bx09kxdcs894cl882wwv"; + type = "gem"; + }; + version = "1.3.1"; + }; simplecov-html = { groups = ["default" "development" "test"]; platforms = []; @@ -4696,10 +4962,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ag33hv8ky8nxpsra9jkam9npi1jjwb7f7zmvi2najci5mdr10nr"; + sha256 = "1pdb0szrj4mbczhlx2inszpj54rgnayvy2f2fff4q7jll2iz61i0"; type = "gem"; }; - version = "0.10.0"; + version = "0.12.0"; }; text = { groups = ["default" "development"]; @@ -4772,6 +5038,16 @@ }; version = "0.9.1"; }; + timeliness = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0gvp9b7yn4pykn794cibylc9ys1lw7fzv7djx1433icxw4y26my3"; + type = "gem"; + }; + version = "0.3.10"; + }; timfel-krb5-auth = { groups = ["default" "kerberos"]; platforms = []; @@ -4804,6 +5080,17 @@ }; version = "1.0.0"; }; + tpm-key_attestation = { + dependencies = ["bindata" "openssl-signature_algorithm"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1kdqyanz211wmxjzfiz2wg17gj6p4431qvjr0i6sp3d6268sssg4"; + type = "gem"; + }; + version = "0.9.0"; + }; truncato = { dependencies = ["htmlentities" "nokogiri"]; groups = ["default"]; @@ -4883,10 +5170,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "08kfiniak1pvg3gn5k6snpigzvhvhyg7slmm0s2qx5zkj62c1z2w"; + sha256 = "06i3id27s60141x6fdnjn5rar1cywdwy64ilc59cz937303q3mna"; type = "gem"; }; - version = "1.6.0"; + version = "1.7.0"; }; unicode_plot = { dependencies = ["enumerable-statistics"]; @@ -4963,6 +5250,16 @@ }; version = "0.4.7"; }; + uri_template = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0p8qbxlpmg3msw0ihny6a3gsn0yvydx9ksh5knn8dnq06zhqyb1i"; + type = "gem"; + }; + version = "0.7.0"; + }; valid_email = { dependencies = ["activemodel" "mail"]; groups = ["default"]; @@ -5002,10 +5299,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "04p1l0v98j4ffvaks1ig9mygx5grpbpdgz7haq3mygva9iy8ykja"; + sha256 = "066hkh3ihzhrp5a9knjgqqfi5dyv4z5hfrpdj4fpgxjkvkfaxivy"; type = "gem"; }; - version = "1.0.6"; + version = "1.0.10"; }; version_sorter = { groups = ["default"]; @@ -5017,17 +5314,6 @@ }; version = "2.2.4"; }; - virtus = { - dependencies = ["axiom-types" "coercible" "descendants_tracker" "equalizer"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "06iphwi3c4f7y9i2rvhvaizfswqbaflilziz4dxqngrdysgkn1fk"; - type = "gem"; - }; - version = "1.0.5"; - }; vmstat = { groups = ["default"]; platforms = []; @@ -5049,6 +5335,17 @@ }; version = "1.2.8"; }; + webauthn = { + dependencies = ["android_key_attestation" "awrence" "bindata" "cbor" "cose" "openssl" "safety_net_attestation" "securecompare" "tpm-key_attestation"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "17nqmi6n4s3i6pmcd7myf7w49q9xd5xlcvz9vbqijlm4yicyxywn"; + type = "gem"; + }; + version = "2.3.0"; + }; webfinger = { dependencies = ["activesupport" "httpclient"]; groups = ["default"]; @@ -5098,10 +5395,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "00i624ng1nvkz1yckj3f8yxxp6hi7xaqf40qh9q3hj2n1l9i8g6m"; + sha256 = "0hc2g9qps8lmhibl5baa91b4qx8wqw872rgwagml78ydj8qacsqw"; type = "gem"; }; - version = "0.1.4"; + version = "0.1.5"; }; wikicloth = { dependencies = ["builder" "expression_parser" "rinku"]; @@ -5145,6 +5442,16 @@ }; version = "3.2.0"; }; + yajl-ruby = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "16v0w5749qjp13xhjgr2gcsvjv6mf35br7iqwycix1n2h7kfcckf"; + type = "gem"; + }; + version = "1.4.1"; + }; zeitwerk = { groups = ["default" "development" "test"]; platforms = []; diff --git a/pkgs/applications/version-management/gitlab/yarnPkgs.nix b/pkgs/applications/version-management/gitlab/yarnPkgs.nix index 797329c613e4..484ce7203d26 100644 --- a/pkgs/applications/version-management/gitlab/yarnPkgs.nix +++ b/pkgs/applications/version-management/gitlab/yarnPkgs.nix @@ -2,315 +2,323 @@ offline_cache = linkFarm "offline" packages; packages = [ { - name = "_babel_code_frame___code_frame_7.8.3.tgz"; + name = "_babel_code_frame___code_frame_7.10.1.tgz"; path = fetchurl { - name = "_babel_code_frame___code_frame_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.8.3.tgz"; - sha1 = "33e25903d7481181534e12ec0a25f16b6fcf419e"; + name = "_babel_code_frame___code_frame_7.10.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.10.1.tgz"; + sha1 = "d5481c5095daa1c57e16e54c6f9198443afb49ff"; }; } { - name = "_babel_compat_data___compat_data_7.8.5.tgz"; + name = "_babel_compat_data___compat_data_7.10.1.tgz"; path = fetchurl { - name = "_babel_compat_data___compat_data_7.8.5.tgz"; - url = "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.8.5.tgz"; - sha1 = "d28ce872778c23551cbb9432fc68d28495b613b9"; + name = "_babel_compat_data___compat_data_7.10.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.10.1.tgz"; + sha1 = "b1085ffe72cd17bf2c0ee790fc09f9626011b2db"; }; } { - name = "_babel_core___core_7.8.4.tgz"; + name = "_babel_core___core_7.10.2.tgz"; path = fetchurl { - name = "_babel_core___core_7.8.4.tgz"; - url = "https://registry.yarnpkg.com/@babel/core/-/core-7.8.4.tgz"; - sha1 = "d496799e5c12195b3602d0fddd77294e3e38e80e"; + name = "_babel_core___core_7.10.2.tgz"; + url = "https://registry.yarnpkg.com/@babel/core/-/core-7.10.2.tgz"; + sha1 = "bd6786046668a925ac2bd2fd95b579b92a23b36a"; }; } { - name = "_babel_generator___generator_7.8.4.tgz"; + name = "_babel_generator___generator_7.10.2.tgz"; path = fetchurl { - name = "_babel_generator___generator_7.8.4.tgz"; - url = "https://registry.yarnpkg.com/@babel/generator/-/generator-7.8.4.tgz"; - sha1 = "35bbc74486956fe4251829f9f6c48330e8d0985e"; + name = "_babel_generator___generator_7.10.2.tgz"; + url = "https://registry.yarnpkg.com/@babel/generator/-/generator-7.10.2.tgz"; + sha1 = "0fa5b5b2389db8bfdfcc3492b551ee20f5dd69a9"; }; } { - name = "_babel_helper_annotate_as_pure___helper_annotate_as_pure_7.8.3.tgz"; + name = "_babel_helper_annotate_as_pure___helper_annotate_as_pure_7.10.1.tgz"; path = fetchurl { - name = "_babel_helper_annotate_as_pure___helper_annotate_as_pure_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.8.3.tgz"; - sha1 = "60bc0bc657f63a0924ff9a4b4a0b24a13cf4deee"; + name = "_babel_helper_annotate_as_pure___helper_annotate_as_pure_7.10.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.10.1.tgz"; + sha1 = "f6d08acc6f70bbd59b436262553fb2e259a1a268"; }; } { - name = "_babel_helper_builder_binary_assignment_operator_visitor___helper_builder_binary_assignment_operator_visitor_7.8.3.tgz"; + name = "_babel_helper_builder_binary_assignment_operator_visitor___helper_builder_binary_assignment_operator_visitor_7.10.1.tgz"; path = fetchurl { - name = "_babel_helper_builder_binary_assignment_operator_visitor___helper_builder_binary_assignment_operator_visitor_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.8.3.tgz"; - sha1 = "c84097a427a061ac56a1c30ebf54b7b22d241503"; + name = "_babel_helper_builder_binary_assignment_operator_visitor___helper_builder_binary_assignment_operator_visitor_7.10.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.10.1.tgz"; + sha1 = "0ec7d9be8174934532661f87783eb18d72290059"; }; } { - name = "_babel_helper_call_delegate___helper_call_delegate_7.8.3.tgz"; + name = "_babel_helper_compilation_targets___helper_compilation_targets_7.10.2.tgz"; path = fetchurl { - name = "_babel_helper_call_delegate___helper_call_delegate_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-call-delegate/-/helper-call-delegate-7.8.3.tgz"; - sha1 = "de82619898aa605d409c42be6ffb8d7204579692"; + name = "_babel_helper_compilation_targets___helper_compilation_targets_7.10.2.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.10.2.tgz"; + sha1 = "a17d9723b6e2c750299d2a14d4637c76936d8285"; }; } { - name = "_babel_helper_compilation_targets___helper_compilation_targets_7.8.4.tgz"; + name = "_babel_helper_create_class_features_plugin___helper_create_class_features_plugin_7.10.2.tgz"; path = fetchurl { - name = "_babel_helper_compilation_targets___helper_compilation_targets_7.8.4.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.8.4.tgz"; - sha1 = "03d7ecd454b7ebe19a254f76617e61770aed2c88"; + name = "_babel_helper_create_class_features_plugin___helper_create_class_features_plugin_7.10.2.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.10.2.tgz"; + sha1 = "7474295770f217dbcf288bf7572eb213db46ee67"; }; } { - name = "_babel_helper_create_class_features_plugin___helper_create_class_features_plugin_7.8.3.tgz"; + name = "_babel_helper_create_regexp_features_plugin___helper_create_regexp_features_plugin_7.10.1.tgz"; path = fetchurl { - name = "_babel_helper_create_class_features_plugin___helper_create_class_features_plugin_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.8.3.tgz"; - sha1 = "5b94be88c255f140fd2c10dd151e7f98f4bff397"; + name = "_babel_helper_create_regexp_features_plugin___helper_create_regexp_features_plugin_7.10.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.10.1.tgz"; + sha1 = "1b8feeab1594cbcfbf3ab5a3bbcabac0468efdbd"; }; } { - name = "_babel_helper_create_regexp_features_plugin___helper_create_regexp_features_plugin_7.8.3.tgz"; + name = "_babel_helper_define_map___helper_define_map_7.10.1.tgz"; path = fetchurl { - name = "_babel_helper_create_regexp_features_plugin___helper_create_regexp_features_plugin_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.8.3.tgz"; - sha1 = "c774268c95ec07ee92476a3862b75cc2839beb79"; + name = "_babel_helper_define_map___helper_define_map_7.10.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-define-map/-/helper-define-map-7.10.1.tgz"; + sha1 = "5e69ee8308648470dd7900d159c044c10285221d"; }; } { - name = "_babel_helper_define_map___helper_define_map_7.8.3.tgz"; + name = "_babel_helper_explode_assignable_expression___helper_explode_assignable_expression_7.10.1.tgz"; path = fetchurl { - name = "_babel_helper_define_map___helper_define_map_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-define-map/-/helper-define-map-7.8.3.tgz"; - sha1 = "a0655cad5451c3760b726eba875f1cd8faa02c15"; + name = "_babel_helper_explode_assignable_expression___helper_explode_assignable_expression_7.10.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.10.1.tgz"; + sha1 = "e9d76305ee1162ca467357ae25df94f179af2b7e"; }; } { - name = "_babel_helper_explode_assignable_expression___helper_explode_assignable_expression_7.8.3.tgz"; + name = "_babel_helper_function_name___helper_function_name_7.10.1.tgz"; path = fetchurl { - name = "_babel_helper_explode_assignable_expression___helper_explode_assignable_expression_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.8.3.tgz"; - sha1 = "a728dc5b4e89e30fc2dfc7d04fa28a930653f982"; + name = "_babel_helper_function_name___helper_function_name_7.10.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.10.1.tgz"; + sha1 = "92bd63829bfc9215aca9d9defa85f56b539454f4"; }; } { - name = "_babel_helper_function_name___helper_function_name_7.8.3.tgz"; + name = "_babel_helper_get_function_arity___helper_get_function_arity_7.10.1.tgz"; path = fetchurl { - name = "_babel_helper_function_name___helper_function_name_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.8.3.tgz"; - sha1 = "eeeb665a01b1f11068e9fb86ad56a1cb1a824cca"; + name = "_babel_helper_get_function_arity___helper_get_function_arity_7.10.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.10.1.tgz"; + sha1 = "7303390a81ba7cb59613895a192b93850e373f7d"; }; } { - name = "_babel_helper_get_function_arity___helper_get_function_arity_7.8.3.tgz"; + name = "_babel_helper_hoist_variables___helper_hoist_variables_7.10.1.tgz"; path = fetchurl { - name = "_babel_helper_get_function_arity___helper_get_function_arity_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.8.3.tgz"; - sha1 = "b894b947bd004381ce63ea1db9f08547e920abd5"; + name = "_babel_helper_hoist_variables___helper_hoist_variables_7.10.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.10.1.tgz"; + sha1 = "7e77c82e5dcae1ebf123174c385aaadbf787d077"; }; } { - name = "_babel_helper_hoist_variables___helper_hoist_variables_7.8.3.tgz"; + name = "_babel_helper_member_expression_to_functions___helper_member_expression_to_functions_7.10.1.tgz"; path = fetchurl { - name = "_babel_helper_hoist_variables___helper_hoist_variables_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.8.3.tgz"; - sha1 = "1dbe9b6b55d78c9b4183fc8cdc6e30ceb83b7134"; + name = "_babel_helper_member_expression_to_functions___helper_member_expression_to_functions_7.10.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.10.1.tgz"; + sha1 = "432967fd7e12a4afef66c4687d4ca22bc0456f15"; }; } { - name = "_babel_helper_member_expression_to_functions___helper_member_expression_to_functions_7.8.3.tgz"; + name = "_babel_helper_module_imports___helper_module_imports_7.10.1.tgz"; path = fetchurl { - name = "_babel_helper_member_expression_to_functions___helper_member_expression_to_functions_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.8.3.tgz"; - sha1 = "659b710498ea6c1d9907e0c73f206eee7dadc24c"; + name = "_babel_helper_module_imports___helper_module_imports_7.10.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.10.1.tgz"; + sha1 = "dd331bd45bccc566ce77004e9d05fe17add13876"; }; } { - name = "_babel_helper_module_imports___helper_module_imports_7.8.3.tgz"; + name = "_babel_helper_module_transforms___helper_module_transforms_7.10.1.tgz"; path = fetchurl { - name = "_babel_helper_module_imports___helper_module_imports_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.8.3.tgz"; - sha1 = "7fe39589b39c016331b6b8c3f441e8f0b1419498"; + name = "_babel_helper_module_transforms___helper_module_transforms_7.10.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.10.1.tgz"; + sha1 = "24e2f08ee6832c60b157bb0936c86bef7210c622"; }; } { - name = "_babel_helper_module_transforms___helper_module_transforms_7.8.3.tgz"; + name = "_babel_helper_optimise_call_expression___helper_optimise_call_expression_7.10.1.tgz"; path = fetchurl { - name = "_babel_helper_module_transforms___helper_module_transforms_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.8.3.tgz"; - sha1 = "d305e35d02bee720fbc2c3c3623aa0c316c01590"; + name = "_babel_helper_optimise_call_expression___helper_optimise_call_expression_7.10.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.10.1.tgz"; + sha1 = "b4a1f2561870ce1247ceddb02a3860fa96d72543"; }; } { - name = "_babel_helper_optimise_call_expression___helper_optimise_call_expression_7.8.3.tgz"; + name = "_babel_helper_plugin_utils___helper_plugin_utils_7.10.1.tgz"; path = fetchurl { - name = "_babel_helper_optimise_call_expression___helper_optimise_call_expression_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.8.3.tgz"; - sha1 = "7ed071813d09c75298ef4f208956006b6111ecb9"; + name = "_babel_helper_plugin_utils___helper_plugin_utils_7.10.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.1.tgz"; + sha1 = "ec5a5cf0eec925b66c60580328b122c01230a127"; }; } { - name = "_babel_helper_plugin_utils___helper_plugin_utils_7.8.3.tgz"; + name = "_babel_helper_regex___helper_regex_7.10.1.tgz"; path = fetchurl { - name = "_babel_helper_plugin_utils___helper_plugin_utils_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.8.3.tgz"; - sha1 = "9ea293be19babc0f52ff8ca88b34c3611b208670"; + name = "_babel_helper_regex___helper_regex_7.10.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-regex/-/helper-regex-7.10.1.tgz"; + sha1 = "021cf1a7ba99822f993222a001cc3fec83255b96"; }; } { - name = "_babel_helper_regex___helper_regex_7.8.3.tgz"; + name = "_babel_helper_remap_async_to_generator___helper_remap_async_to_generator_7.10.1.tgz"; path = fetchurl { - name = "_babel_helper_regex___helper_regex_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-regex/-/helper-regex-7.8.3.tgz"; - sha1 = "139772607d51b93f23effe72105b319d2a4c6965"; + name = "_babel_helper_remap_async_to_generator___helper_remap_async_to_generator_7.10.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.10.1.tgz"; + sha1 = "bad6aaa4ff39ce8d4b82ccaae0bfe0f7dbb5f432"; }; } { - name = "_babel_helper_remap_async_to_generator___helper_remap_async_to_generator_7.8.3.tgz"; + name = "_babel_helper_replace_supers___helper_replace_supers_7.10.1.tgz"; path = fetchurl { - name = "_babel_helper_remap_async_to_generator___helper_remap_async_to_generator_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.8.3.tgz"; - sha1 = "273c600d8b9bf5006142c1e35887d555c12edd86"; + name = "_babel_helper_replace_supers___helper_replace_supers_7.10.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.10.1.tgz"; + sha1 = "ec6859d20c5d8087f6a2dc4e014db7228975f13d"; }; } { - name = "_babel_helper_replace_supers___helper_replace_supers_7.8.3.tgz"; + name = "_babel_helper_simple_access___helper_simple_access_7.10.1.tgz"; path = fetchurl { - name = "_babel_helper_replace_supers___helper_replace_supers_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.8.3.tgz"; - sha1 = "91192d25f6abbcd41da8a989d4492574fb1530bc"; + name = "_babel_helper_simple_access___helper_simple_access_7.10.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.10.1.tgz"; + sha1 = "08fb7e22ace9eb8326f7e3920a1c2052f13d851e"; }; } { - name = "_babel_helper_simple_access___helper_simple_access_7.8.3.tgz"; + name = "_babel_helper_split_export_declaration___helper_split_export_declaration_7.10.1.tgz"; path = fetchurl { - name = "_babel_helper_simple_access___helper_simple_access_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.8.3.tgz"; - sha1 = "7f8109928b4dab4654076986af575231deb639ae"; + name = "_babel_helper_split_export_declaration___helper_split_export_declaration_7.10.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.10.1.tgz"; + sha1 = "c6f4be1cbc15e3a868e4c64a17d5d31d754da35f"; }; } { - name = "_babel_helper_split_export_declaration___helper_split_export_declaration_7.8.3.tgz"; + name = "_babel_helper_validator_identifier___helper_validator_identifier_7.10.1.tgz"; path = fetchurl { - name = "_babel_helper_split_export_declaration___helper_split_export_declaration_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.8.3.tgz"; - sha1 = "31a9f30070f91368a7182cf05f831781065fc7a9"; + name = "_babel_helper_validator_identifier___helper_validator_identifier_7.10.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.1.tgz"; + sha1 = "5770b0c1a826c4f53f5ede5e153163e0318e94b5"; }; } { - name = "_babel_helper_wrap_function___helper_wrap_function_7.8.3.tgz"; + name = "_babel_helper_wrap_function___helper_wrap_function_7.10.1.tgz"; path = fetchurl { - name = "_babel_helper_wrap_function___helper_wrap_function_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.8.3.tgz"; - sha1 = "9dbdb2bb55ef14aaa01fe8c99b629bd5352d8610"; + name = "_babel_helper_wrap_function___helper_wrap_function_7.10.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.10.1.tgz"; + sha1 = "956d1310d6696257a7afd47e4c42dfda5dfcedc9"; }; } { - name = "_babel_helpers___helpers_7.8.4.tgz"; + name = "_babel_helpers___helpers_7.10.1.tgz"; path = fetchurl { - name = "_babel_helpers___helpers_7.8.4.tgz"; - url = "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.8.4.tgz"; - sha1 = "754eb3ee727c165e0a240d6c207de7c455f36f73"; + name = "_babel_helpers___helpers_7.10.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.10.1.tgz"; + sha1 = "a6827b7cb975c9d9cef5fd61d919f60d8844a973"; }; } { - name = "_babel_highlight___highlight_7.8.3.tgz"; + name = "_babel_highlight___highlight_7.10.1.tgz"; path = fetchurl { - name = "_babel_highlight___highlight_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.8.3.tgz"; - sha1 = "28f173d04223eaaa59bc1d439a3836e6d1265797"; + name = "_babel_highlight___highlight_7.10.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.10.1.tgz"; + sha1 = "841d098ba613ba1a427a2b383d79e35552c38ae0"; }; } { - name = "_babel_parser___parser_7.8.4.tgz"; + name = "_babel_parser___parser_7.10.2.tgz"; path = fetchurl { - name = "_babel_parser___parser_7.8.4.tgz"; - url = "https://registry.yarnpkg.com/@babel/parser/-/parser-7.8.4.tgz"; - sha1 = "d1dbe64691d60358a974295fa53da074dd2ce8e8"; + name = "_babel_parser___parser_7.10.2.tgz"; + url = "https://registry.yarnpkg.com/@babel/parser/-/parser-7.10.2.tgz"; + sha1 = "871807f10442b92ff97e4783b9b54f6a0ca812d0"; }; } { - name = "_babel_plugin_proposal_async_generator_functions___plugin_proposal_async_generator_functions_7.8.3.tgz"; + name = "_babel_plugin_proposal_async_generator_functions___plugin_proposal_async_generator_functions_7.10.1.tgz"; path = fetchurl { - name = "_babel_plugin_proposal_async_generator_functions___plugin_proposal_async_generator_functions_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.8.3.tgz"; - sha1 = "bad329c670b382589721b27540c7d288601c6e6f"; + name = "_babel_plugin_proposal_async_generator_functions___plugin_proposal_async_generator_functions_7.10.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.10.1.tgz"; + sha1 = "6911af5ba2e615c4ff3c497fe2f47b35bf6d7e55"; }; } { - name = "_babel_plugin_proposal_class_properties___plugin_proposal_class_properties_7.8.3.tgz"; + name = "_babel_plugin_proposal_class_properties___plugin_proposal_class_properties_7.10.1.tgz"; path = fetchurl { - name = "_babel_plugin_proposal_class_properties___plugin_proposal_class_properties_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.8.3.tgz"; - sha1 = "5e06654af5cd04b608915aada9b2a6788004464e"; + name = "_babel_plugin_proposal_class_properties___plugin_proposal_class_properties_7.10.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.10.1.tgz"; + sha1 = "046bc7f6550bb08d9bd1d4f060f5f5a4f1087e01"; }; } { - name = "_babel_plugin_proposal_dynamic_import___plugin_proposal_dynamic_import_7.8.3.tgz"; + name = "_babel_plugin_proposal_dynamic_import___plugin_proposal_dynamic_import_7.10.1.tgz"; path = fetchurl { - name = "_babel_plugin_proposal_dynamic_import___plugin_proposal_dynamic_import_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.8.3.tgz"; - sha1 = "38c4fe555744826e97e2ae930b0fb4cc07e66054"; + name = "_babel_plugin_proposal_dynamic_import___plugin_proposal_dynamic_import_7.10.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.10.1.tgz"; + sha1 = "e36979dc1dc3b73f6d6816fc4951da2363488ef0"; }; } { - name = "_babel_plugin_proposal_json_strings___plugin_proposal_json_strings_7.8.3.tgz"; + name = "_babel_plugin_proposal_json_strings___plugin_proposal_json_strings_7.10.1.tgz"; path = fetchurl { - name = "_babel_plugin_proposal_json_strings___plugin_proposal_json_strings_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.8.3.tgz"; - sha1 = "da5216b238a98b58a1e05d6852104b10f9a70d6b"; + name = "_babel_plugin_proposal_json_strings___plugin_proposal_json_strings_7.10.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.10.1.tgz"; + sha1 = "b1e691ee24c651b5a5e32213222b2379734aff09"; }; } { - name = "_babel_plugin_proposal_nullish_coalescing_operator___plugin_proposal_nullish_coalescing_operator_7.8.3.tgz"; + name = "_babel_plugin_proposal_nullish_coalescing_operator___plugin_proposal_nullish_coalescing_operator_7.10.1.tgz"; path = fetchurl { - name = "_babel_plugin_proposal_nullish_coalescing_operator___plugin_proposal_nullish_coalescing_operator_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.8.3.tgz"; - sha1 = "e4572253fdeed65cddeecfdab3f928afeb2fd5d2"; + name = "_babel_plugin_proposal_nullish_coalescing_operator___plugin_proposal_nullish_coalescing_operator_7.10.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.10.1.tgz"; + sha1 = "02dca21673842ff2fe763ac253777f235e9bbf78"; }; } { - name = "_babel_plugin_proposal_object_rest_spread___plugin_proposal_object_rest_spread_7.8.3.tgz"; + name = "_babel_plugin_proposal_numeric_separator___plugin_proposal_numeric_separator_7.10.1.tgz"; path = fetchurl { - name = "_babel_plugin_proposal_object_rest_spread___plugin_proposal_object_rest_spread_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.8.3.tgz"; - sha1 = "eb5ae366118ddca67bed583b53d7554cad9951bb"; + name = "_babel_plugin_proposal_numeric_separator___plugin_proposal_numeric_separator_7.10.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.10.1.tgz"; + sha1 = "a9a38bc34f78bdfd981e791c27c6fdcec478c123"; }; } { - name = "_babel_plugin_proposal_optional_catch_binding___plugin_proposal_optional_catch_binding_7.8.3.tgz"; + name = "_babel_plugin_proposal_object_rest_spread___plugin_proposal_object_rest_spread_7.10.1.tgz"; path = fetchurl { - name = "_babel_plugin_proposal_optional_catch_binding___plugin_proposal_optional_catch_binding_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.8.3.tgz"; - sha1 = "9dee96ab1650eed88646ae9734ca167ac4a9c5c9"; + name = "_babel_plugin_proposal_object_rest_spread___plugin_proposal_object_rest_spread_7.10.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.10.1.tgz"; + sha1 = "cba44908ac9f142650b4a65b8aa06bf3478d5fb6"; }; } { - name = "_babel_plugin_proposal_optional_chaining___plugin_proposal_optional_chaining_7.8.3.tgz"; + name = "_babel_plugin_proposal_optional_catch_binding___plugin_proposal_optional_catch_binding_7.10.1.tgz"; path = fetchurl { - name = "_babel_plugin_proposal_optional_chaining___plugin_proposal_optional_chaining_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.8.3.tgz"; - sha1 = "ae10b3214cb25f7adb1f3bc87ba42ca10b7e2543"; + name = "_babel_plugin_proposal_optional_catch_binding___plugin_proposal_optional_catch_binding_7.10.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.10.1.tgz"; + sha1 = "c9f86d99305f9fa531b568ff5ab8c964b8b223d2"; }; } { - name = "_babel_plugin_proposal_private_methods___plugin_proposal_private_methods_7.8.3.tgz"; + name = "_babel_plugin_proposal_optional_chaining___plugin_proposal_optional_chaining_7.10.1.tgz"; path = fetchurl { - name = "_babel_plugin_proposal_private_methods___plugin_proposal_private_methods_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.8.3.tgz"; - sha1 = "01248c6c8dc292116b3b4ebd746150f4f0728bab"; + name = "_babel_plugin_proposal_optional_chaining___plugin_proposal_optional_chaining_7.10.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.10.1.tgz"; + sha1 = "15f5d6d22708629451a91be28f8facc55b0e818c"; }; } { - name = "_babel_plugin_proposal_unicode_property_regex___plugin_proposal_unicode_property_regex_7.8.3.tgz"; + name = "_babel_plugin_proposal_private_methods___plugin_proposal_private_methods_7.10.1.tgz"; path = fetchurl { - name = "_babel_plugin_proposal_unicode_property_regex___plugin_proposal_unicode_property_regex_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.8.3.tgz"; - sha1 = "b646c3adea5f98800c9ab45105ac34d06cd4a47f"; + name = "_babel_plugin_proposal_private_methods___plugin_proposal_private_methods_7.10.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.10.1.tgz"; + sha1 = "ed85e8058ab0fe309c3f448e5e1b73ca89cdb598"; + }; + } + { + name = "_babel_plugin_proposal_unicode_property_regex___plugin_proposal_unicode_property_regex_7.10.1.tgz"; + path = fetchurl { + name = "_babel_plugin_proposal_unicode_property_regex___plugin_proposal_unicode_property_regex_7.10.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.10.1.tgz"; + sha1 = "dc04feb25e2dd70c12b05d680190e138fa2c0c6f"; }; } { @@ -321,6 +329,14 @@ sha1 = "a983fb1aeb2ec3f6ed042a210f640e90e786fe0d"; }; } + { + name = "_babel_plugin_syntax_class_properties___plugin_syntax_class_properties_7.10.1.tgz"; + path = fetchurl { + name = "_babel_plugin_syntax_class_properties___plugin_syntax_class_properties_7.10.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.10.1.tgz"; + sha1 = "d5bc0645913df5b17ad7eda0fa2308330bde34c5"; + }; + } { name = "_babel_plugin_syntax_dynamic_import___plugin_syntax_dynamic_import_7.8.3.tgz"; path = fetchurl { @@ -330,11 +346,11 @@ }; } { - name = "_babel_plugin_syntax_import_meta___plugin_syntax_import_meta_7.8.3.tgz"; + name = "_babel_plugin_syntax_import_meta___plugin_syntax_import_meta_7.10.1.tgz"; path = fetchurl { - name = "_babel_plugin_syntax_import_meta___plugin_syntax_import_meta_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-syntax-import-meta/-/plugin-syntax-import-meta-7.8.3.tgz"; - sha1 = "230afff79d3ccc215b5944b438e4e266daf3d84d"; + name = "_babel_plugin_syntax_import_meta___plugin_syntax_import_meta_7.10.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-syntax-import-meta/-/plugin-syntax-import-meta-7.10.1.tgz"; + sha1 = "3e59120ed8b3c2ccc5abb1cfc7aaa3ea01cd36b6"; }; } { @@ -353,6 +369,14 @@ sha1 = "167ed70368886081f74b5c36c65a88c03b66d1a9"; }; } + { + name = "_babel_plugin_syntax_numeric_separator___plugin_syntax_numeric_separator_7.10.1.tgz"; + path = fetchurl { + name = "_babel_plugin_syntax_numeric_separator___plugin_syntax_numeric_separator_7.10.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.1.tgz"; + sha1 = "25761ee7410bc8cf97327ba741ee94e4a61b7d99"; + }; + } { name = "_babel_plugin_syntax_object_rest_spread___plugin_syntax_object_rest_spread_7.8.3.tgz"; path = fetchurl { @@ -378,155 +402,155 @@ }; } { - name = "_babel_plugin_syntax_top_level_await___plugin_syntax_top_level_await_7.8.3.tgz"; + name = "_babel_plugin_syntax_top_level_await___plugin_syntax_top_level_await_7.10.1.tgz"; path = fetchurl { - name = "_babel_plugin_syntax_top_level_await___plugin_syntax_top_level_await_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.8.3.tgz"; - sha1 = "3acdece695e6b13aaf57fc291d1a800950c71391"; + name = "_babel_plugin_syntax_top_level_await___plugin_syntax_top_level_await_7.10.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.10.1.tgz"; + sha1 = "8b8733f8c57397b3eaa47ddba8841586dcaef362"; }; } { - name = "_babel_plugin_transform_arrow_functions___plugin_transform_arrow_functions_7.8.3.tgz"; + name = "_babel_plugin_transform_arrow_functions___plugin_transform_arrow_functions_7.10.1.tgz"; path = fetchurl { - name = "_babel_plugin_transform_arrow_functions___plugin_transform_arrow_functions_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.8.3.tgz"; - sha1 = "82776c2ed0cd9e1a49956daeb896024c9473b8b6"; + name = "_babel_plugin_transform_arrow_functions___plugin_transform_arrow_functions_7.10.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.10.1.tgz"; + sha1 = "cb5ee3a36f0863c06ead0b409b4cc43a889b295b"; }; } { - name = "_babel_plugin_transform_async_to_generator___plugin_transform_async_to_generator_7.8.3.tgz"; + name = "_babel_plugin_transform_async_to_generator___plugin_transform_async_to_generator_7.10.1.tgz"; path = fetchurl { - name = "_babel_plugin_transform_async_to_generator___plugin_transform_async_to_generator_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.8.3.tgz"; - sha1 = "4308fad0d9409d71eafb9b1a6ee35f9d64b64086"; + name = "_babel_plugin_transform_async_to_generator___plugin_transform_async_to_generator_7.10.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.10.1.tgz"; + sha1 = "e5153eb1a3e028f79194ed8a7a4bf55f862b2062"; }; } { - name = "_babel_plugin_transform_block_scoped_functions___plugin_transform_block_scoped_functions_7.8.3.tgz"; + name = "_babel_plugin_transform_block_scoped_functions___plugin_transform_block_scoped_functions_7.10.1.tgz"; path = fetchurl { - name = "_babel_plugin_transform_block_scoped_functions___plugin_transform_block_scoped_functions_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.8.3.tgz"; - sha1 = "437eec5b799b5852072084b3ae5ef66e8349e8a3"; + name = "_babel_plugin_transform_block_scoped_functions___plugin_transform_block_scoped_functions_7.10.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.10.1.tgz"; + sha1 = "146856e756d54b20fff14b819456b3e01820b85d"; }; } { - name = "_babel_plugin_transform_block_scoping___plugin_transform_block_scoping_7.8.3.tgz"; + name = "_babel_plugin_transform_block_scoping___plugin_transform_block_scoping_7.10.1.tgz"; path = fetchurl { - name = "_babel_plugin_transform_block_scoping___plugin_transform_block_scoping_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.8.3.tgz"; - sha1 = "97d35dab66857a437c166358b91d09050c868f3a"; + name = "_babel_plugin_transform_block_scoping___plugin_transform_block_scoping_7.10.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.10.1.tgz"; + sha1 = "47092d89ca345811451cd0dc5d91605982705d5e"; }; } { - name = "_babel_plugin_transform_classes___plugin_transform_classes_7.8.3.tgz"; + name = "_babel_plugin_transform_classes___plugin_transform_classes_7.10.1.tgz"; path = fetchurl { - name = "_babel_plugin_transform_classes___plugin_transform_classes_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.8.3.tgz"; - sha1 = "46fd7a9d2bb9ea89ce88720477979fe0d71b21b8"; + name = "_babel_plugin_transform_classes___plugin_transform_classes_7.10.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.10.1.tgz"; + sha1 = "6e11dd6c4dfae70f540480a4702477ed766d733f"; }; } { - name = "_babel_plugin_transform_computed_properties___plugin_transform_computed_properties_7.8.3.tgz"; + name = "_babel_plugin_transform_computed_properties___plugin_transform_computed_properties_7.10.1.tgz"; path = fetchurl { - name = "_babel_plugin_transform_computed_properties___plugin_transform_computed_properties_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.8.3.tgz"; - sha1 = "96d0d28b7f7ce4eb5b120bb2e0e943343c86f81b"; + name = "_babel_plugin_transform_computed_properties___plugin_transform_computed_properties_7.10.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.10.1.tgz"; + sha1 = "59aa399064429d64dce5cf76ef9b90b7245ebd07"; }; } { - name = "_babel_plugin_transform_destructuring___plugin_transform_destructuring_7.8.3.tgz"; + name = "_babel_plugin_transform_destructuring___plugin_transform_destructuring_7.10.1.tgz"; path = fetchurl { - name = "_babel_plugin_transform_destructuring___plugin_transform_destructuring_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.8.3.tgz"; - sha1 = "20ddfbd9e4676906b1056ee60af88590cc7aaa0b"; + name = "_babel_plugin_transform_destructuring___plugin_transform_destructuring_7.10.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.10.1.tgz"; + sha1 = "abd58e51337815ca3a22a336b85f62b998e71907"; }; } { - name = "_babel_plugin_transform_dotall_regex___plugin_transform_dotall_regex_7.8.3.tgz"; + name = "_babel_plugin_transform_dotall_regex___plugin_transform_dotall_regex_7.10.1.tgz"; path = fetchurl { - name = "_babel_plugin_transform_dotall_regex___plugin_transform_dotall_regex_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.8.3.tgz"; - sha1 = "c3c6ec5ee6125c6993c5cbca20dc8621a9ea7a6e"; + name = "_babel_plugin_transform_dotall_regex___plugin_transform_dotall_regex_7.10.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.10.1.tgz"; + sha1 = "920b9fec2d78bb57ebb64a644d5c2ba67cc104ee"; }; } { - name = "_babel_plugin_transform_duplicate_keys___plugin_transform_duplicate_keys_7.8.3.tgz"; + name = "_babel_plugin_transform_duplicate_keys___plugin_transform_duplicate_keys_7.10.1.tgz"; path = fetchurl { - name = "_babel_plugin_transform_duplicate_keys___plugin_transform_duplicate_keys_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.8.3.tgz"; - sha1 = "8d12df309aa537f272899c565ea1768e286e21f1"; + name = "_babel_plugin_transform_duplicate_keys___plugin_transform_duplicate_keys_7.10.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.10.1.tgz"; + sha1 = "c900a793beb096bc9d4d0a9d0cde19518ffc83b9"; }; } { - name = "_babel_plugin_transform_exponentiation_operator___plugin_transform_exponentiation_operator_7.8.3.tgz"; + name = "_babel_plugin_transform_exponentiation_operator___plugin_transform_exponentiation_operator_7.10.1.tgz"; path = fetchurl { - name = "_babel_plugin_transform_exponentiation_operator___plugin_transform_exponentiation_operator_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.8.3.tgz"; - sha1 = "581a6d7f56970e06bf51560cd64f5e947b70d7b7"; + name = "_babel_plugin_transform_exponentiation_operator___plugin_transform_exponentiation_operator_7.10.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.10.1.tgz"; + sha1 = "279c3116756a60dd6e6f5e488ba7957db9c59eb3"; }; } { - name = "_babel_plugin_transform_for_of___plugin_transform_for_of_7.8.4.tgz"; + name = "_babel_plugin_transform_for_of___plugin_transform_for_of_7.10.1.tgz"; path = fetchurl { - name = "_babel_plugin_transform_for_of___plugin_transform_for_of_7.8.4.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.8.4.tgz"; - sha1 = "6fe8eae5d6875086ee185dd0b098a8513783b47d"; + name = "_babel_plugin_transform_for_of___plugin_transform_for_of_7.10.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.10.1.tgz"; + sha1 = "ff01119784eb0ee32258e8646157ba2501fcfda5"; }; } { - name = "_babel_plugin_transform_function_name___plugin_transform_function_name_7.8.3.tgz"; + name = "_babel_plugin_transform_function_name___plugin_transform_function_name_7.10.1.tgz"; path = fetchurl { - name = "_babel_plugin_transform_function_name___plugin_transform_function_name_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.8.3.tgz"; - sha1 = "279373cb27322aaad67c2683e776dfc47196ed8b"; + name = "_babel_plugin_transform_function_name___plugin_transform_function_name_7.10.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.10.1.tgz"; + sha1 = "4ed46fd6e1d8fde2a2ec7b03c66d853d2c92427d"; }; } { - name = "_babel_plugin_transform_literals___plugin_transform_literals_7.8.3.tgz"; + name = "_babel_plugin_transform_literals___plugin_transform_literals_7.10.1.tgz"; path = fetchurl { - name = "_babel_plugin_transform_literals___plugin_transform_literals_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.8.3.tgz"; - sha1 = "aef239823d91994ec7b68e55193525d76dbd5dc1"; + name = "_babel_plugin_transform_literals___plugin_transform_literals_7.10.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.10.1.tgz"; + sha1 = "5794f8da82846b22e4e6631ea1658bce708eb46a"; }; } { - name = "_babel_plugin_transform_member_expression_literals___plugin_transform_member_expression_literals_7.8.3.tgz"; + name = "_babel_plugin_transform_member_expression_literals___plugin_transform_member_expression_literals_7.10.1.tgz"; path = fetchurl { - name = "_babel_plugin_transform_member_expression_literals___plugin_transform_member_expression_literals_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.8.3.tgz"; - sha1 = "963fed4b620ac7cbf6029c755424029fa3a40410"; + name = "_babel_plugin_transform_member_expression_literals___plugin_transform_member_expression_literals_7.10.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.10.1.tgz"; + sha1 = "90347cba31bca6f394b3f7bd95d2bbfd9fce2f39"; }; } { - name = "_babel_plugin_transform_modules_amd___plugin_transform_modules_amd_7.8.3.tgz"; + name = "_babel_plugin_transform_modules_amd___plugin_transform_modules_amd_7.10.1.tgz"; path = fetchurl { - name = "_babel_plugin_transform_modules_amd___plugin_transform_modules_amd_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.8.3.tgz"; - sha1 = "65606d44616b50225e76f5578f33c568a0b876a5"; + name = "_babel_plugin_transform_modules_amd___plugin_transform_modules_amd_7.10.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.10.1.tgz"; + sha1 = "65950e8e05797ebd2fe532b96e19fc5482a1d52a"; }; } { - name = "_babel_plugin_transform_modules_commonjs___plugin_transform_modules_commonjs_7.8.3.tgz"; + name = "_babel_plugin_transform_modules_commonjs___plugin_transform_modules_commonjs_7.10.1.tgz"; path = fetchurl { - name = "_babel_plugin_transform_modules_commonjs___plugin_transform_modules_commonjs_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.8.3.tgz"; - sha1 = "df251706ec331bd058a34bdd72613915f82928a5"; + name = "_babel_plugin_transform_modules_commonjs___plugin_transform_modules_commonjs_7.10.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.10.1.tgz"; + sha1 = "d5ff4b4413ed97ffded99961056e1fb980fb9301"; }; } { - name = "_babel_plugin_transform_modules_systemjs___plugin_transform_modules_systemjs_7.8.3.tgz"; + name = "_babel_plugin_transform_modules_systemjs___plugin_transform_modules_systemjs_7.10.1.tgz"; path = fetchurl { - name = "_babel_plugin_transform_modules_systemjs___plugin_transform_modules_systemjs_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.8.3.tgz"; - sha1 = "d8bbf222c1dbe3661f440f2f00c16e9bb7d0d420"; + name = "_babel_plugin_transform_modules_systemjs___plugin_transform_modules_systemjs_7.10.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.10.1.tgz"; + sha1 = "9962e4b0ac6aaf2e20431ada3d8ec72082cbffb6"; }; } { - name = "_babel_plugin_transform_modules_umd___plugin_transform_modules_umd_7.8.3.tgz"; + name = "_babel_plugin_transform_modules_umd___plugin_transform_modules_umd_7.10.1.tgz"; path = fetchurl { - name = "_babel_plugin_transform_modules_umd___plugin_transform_modules_umd_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.8.3.tgz"; - sha1 = "592d578ce06c52f5b98b02f913d653ffe972661a"; + name = "_babel_plugin_transform_modules_umd___plugin_transform_modules_umd_7.10.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.10.1.tgz"; + sha1 = "ea080911ffc6eb21840a5197a39ede4ee67b1595"; }; } { @@ -538,139 +562,171 @@ }; } { - name = "_babel_plugin_transform_new_target___plugin_transform_new_target_7.8.3.tgz"; + name = "_babel_plugin_transform_new_target___plugin_transform_new_target_7.10.1.tgz"; path = fetchurl { - name = "_babel_plugin_transform_new_target___plugin_transform_new_target_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.8.3.tgz"; - sha1 = "60cc2ae66d85c95ab540eb34babb6434d4c70c43"; + name = "_babel_plugin_transform_new_target___plugin_transform_new_target_7.10.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.10.1.tgz"; + sha1 = "6ee41a5e648da7632e22b6fb54012e87f612f324"; }; } { - name = "_babel_plugin_transform_object_super___plugin_transform_object_super_7.8.3.tgz"; + name = "_babel_plugin_transform_object_super___plugin_transform_object_super_7.10.1.tgz"; path = fetchurl { - name = "_babel_plugin_transform_object_super___plugin_transform_object_super_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.8.3.tgz"; - sha1 = "ebb6a1e7a86ffa96858bd6ac0102d65944261725"; + name = "_babel_plugin_transform_object_super___plugin_transform_object_super_7.10.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.10.1.tgz"; + sha1 = "2e3016b0adbf262983bf0d5121d676a5ed9c4fde"; }; } { - name = "_babel_plugin_transform_parameters___plugin_transform_parameters_7.8.4.tgz"; + name = "_babel_plugin_transform_parameters___plugin_transform_parameters_7.10.1.tgz"; path = fetchurl { - name = "_babel_plugin_transform_parameters___plugin_transform_parameters_7.8.4.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.8.4.tgz"; - sha1 = "1d5155de0b65db0ccf9971165745d3bb990d77d3"; + name = "_babel_plugin_transform_parameters___plugin_transform_parameters_7.10.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.10.1.tgz"; + sha1 = "b25938a3c5fae0354144a720b07b32766f683ddd"; }; } { - name = "_babel_plugin_transform_property_literals___plugin_transform_property_literals_7.8.3.tgz"; + name = "_babel_plugin_transform_property_literals___plugin_transform_property_literals_7.10.1.tgz"; path = fetchurl { - name = "_babel_plugin_transform_property_literals___plugin_transform_property_literals_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.8.3.tgz"; - sha1 = "33194300d8539c1ed28c62ad5087ba3807b98263"; + name = "_babel_plugin_transform_property_literals___plugin_transform_property_literals_7.10.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.10.1.tgz"; + sha1 = "cffc7315219230ed81dc53e4625bf86815b6050d"; }; } { - name = "_babel_plugin_transform_regenerator___plugin_transform_regenerator_7.8.3.tgz"; + name = "_babel_plugin_transform_regenerator___plugin_transform_regenerator_7.10.1.tgz"; path = fetchurl { - name = "_babel_plugin_transform_regenerator___plugin_transform_regenerator_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.8.3.tgz"; - sha1 = "b31031e8059c07495bf23614c97f3d9698bc6ec8"; + name = "_babel_plugin_transform_regenerator___plugin_transform_regenerator_7.10.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.10.1.tgz"; + sha1 = "10e175cbe7bdb63cc9b39f9b3f823c5c7c5c5490"; }; } { - name = "_babel_plugin_transform_reserved_words___plugin_transform_reserved_words_7.8.3.tgz"; + name = "_babel_plugin_transform_reserved_words___plugin_transform_reserved_words_7.10.1.tgz"; path = fetchurl { - name = "_babel_plugin_transform_reserved_words___plugin_transform_reserved_words_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.8.3.tgz"; - sha1 = "9a0635ac4e665d29b162837dd3cc50745dfdf1f5"; + name = "_babel_plugin_transform_reserved_words___plugin_transform_reserved_words_7.10.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.10.1.tgz"; + sha1 = "0fc1027312b4d1c3276a57890c8ae3bcc0b64a86"; }; } { - name = "_babel_plugin_transform_shorthand_properties___plugin_transform_shorthand_properties_7.8.3.tgz"; + name = "_babel_plugin_transform_shorthand_properties___plugin_transform_shorthand_properties_7.10.1.tgz"; path = fetchurl { - name = "_babel_plugin_transform_shorthand_properties___plugin_transform_shorthand_properties_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.8.3.tgz"; - sha1 = "28545216e023a832d4d3a1185ed492bcfeac08c8"; + name = "_babel_plugin_transform_shorthand_properties___plugin_transform_shorthand_properties_7.10.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.10.1.tgz"; + sha1 = "e8b54f238a1ccbae482c4dce946180ae7b3143f3"; }; } { - name = "_babel_plugin_transform_spread___plugin_transform_spread_7.8.3.tgz"; + name = "_babel_plugin_transform_spread___plugin_transform_spread_7.10.1.tgz"; path = fetchurl { - name = "_babel_plugin_transform_spread___plugin_transform_spread_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.8.3.tgz"; - sha1 = "9c8ffe8170fdfb88b114ecb920b82fb6e95fe5e8"; + name = "_babel_plugin_transform_spread___plugin_transform_spread_7.10.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.10.1.tgz"; + sha1 = "0c6d618a0c4461a274418460a28c9ccf5239a7c8"; }; } { - name = "_babel_plugin_transform_sticky_regex___plugin_transform_sticky_regex_7.8.3.tgz"; + name = "_babel_plugin_transform_sticky_regex___plugin_transform_sticky_regex_7.10.1.tgz"; path = fetchurl { - name = "_babel_plugin_transform_sticky_regex___plugin_transform_sticky_regex_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.8.3.tgz"; - sha1 = "be7a1290f81dae767475452199e1f76d6175b100"; + name = "_babel_plugin_transform_sticky_regex___plugin_transform_sticky_regex_7.10.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.10.1.tgz"; + sha1 = "90fc89b7526228bed9842cff3588270a7a393b00"; }; } { - name = "_babel_plugin_transform_template_literals___plugin_transform_template_literals_7.8.3.tgz"; + name = "_babel_plugin_transform_template_literals___plugin_transform_template_literals_7.10.1.tgz"; path = fetchurl { - name = "_babel_plugin_transform_template_literals___plugin_transform_template_literals_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.8.3.tgz"; - sha1 = "7bfa4732b455ea6a43130adc0ba767ec0e402a80"; + name = "_babel_plugin_transform_template_literals___plugin_transform_template_literals_7.10.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.10.1.tgz"; + sha1 = "914c7b7f4752c570ea00553b4284dad8070e8628"; }; } { - name = "_babel_plugin_transform_typeof_symbol___plugin_transform_typeof_symbol_7.8.4.tgz"; + name = "_babel_plugin_transform_typeof_symbol___plugin_transform_typeof_symbol_7.10.1.tgz"; path = fetchurl { - name = "_babel_plugin_transform_typeof_symbol___plugin_transform_typeof_symbol_7.8.4.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.8.4.tgz"; - sha1 = "ede4062315ce0aaf8a657a920858f1a2f35fc412"; + name = "_babel_plugin_transform_typeof_symbol___plugin_transform_typeof_symbol_7.10.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.10.1.tgz"; + sha1 = "60c0239b69965d166b80a84de7315c1bc7e0bb0e"; }; } { - name = "_babel_plugin_transform_unicode_regex___plugin_transform_unicode_regex_7.8.3.tgz"; + name = "_babel_plugin_transform_unicode_escapes___plugin_transform_unicode_escapes_7.10.1.tgz"; path = fetchurl { - name = "_babel_plugin_transform_unicode_regex___plugin_transform_unicode_regex_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.8.3.tgz"; - sha1 = "0cef36e3ba73e5c57273effb182f46b91a1ecaad"; + name = "_babel_plugin_transform_unicode_escapes___plugin_transform_unicode_escapes_7.10.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.10.1.tgz"; + sha1 = "add0f8483dab60570d9e03cecef6c023aa8c9940"; }; } { - name = "_babel_preset_env___preset_env_7.8.4.tgz"; + name = "_babel_plugin_transform_unicode_regex___plugin_transform_unicode_regex_7.10.1.tgz"; path = fetchurl { - name = "_babel_preset_env___preset_env_7.8.4.tgz"; - url = "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.8.4.tgz"; - sha1 = "9dac6df5f423015d3d49b6e9e5fa3413e4a72c4e"; + name = "_babel_plugin_transform_unicode_regex___plugin_transform_unicode_regex_7.10.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.10.1.tgz"; + sha1 = "6b58f2aea7b68df37ac5025d9c88752443a6b43f"; }; } { - name = "_babel_standalone___standalone_7.8.3.tgz"; + name = "_babel_preset_env___preset_env_7.10.2.tgz"; path = fetchurl { - name = "_babel_standalone___standalone_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/standalone/-/standalone-7.8.3.tgz"; - sha1 = "0674730a8c5fbb9352de5342bf0c0c040d658380"; + name = "_babel_preset_env___preset_env_7.10.2.tgz"; + url = "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.10.2.tgz"; + sha1 = "715930f2cf8573b0928005ee562bed52fb65fdfb"; }; } { - name = "_babel_template___template_7.8.3.tgz"; + name = "_babel_preset_modules___preset_modules_0.1.3.tgz"; path = fetchurl { - name = "_babel_template___template_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/template/-/template-7.8.3.tgz"; - sha1 = "e02ad04fe262a657809327f578056ca15fd4d1b8"; + name = "_babel_preset_modules___preset_modules_0.1.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/preset-modules/-/preset-modules-0.1.3.tgz"; + sha1 = "13242b53b5ef8c883c3cf7dddd55b36ce80fbc72"; }; } { - name = "_babel_traverse___traverse_7.8.4.tgz"; + name = "_babel_runtime_corejs3___runtime_corejs3_7.10.2.tgz"; path = fetchurl { - name = "_babel_traverse___traverse_7.8.4.tgz"; - url = "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.8.4.tgz"; - sha1 = "f0845822365f9d5b0e312ed3959d3f827f869e3c"; + name = "_babel_runtime_corejs3___runtime_corejs3_7.10.2.tgz"; + url = "https://registry.yarnpkg.com/@babel/runtime-corejs3/-/runtime-corejs3-7.10.2.tgz"; + sha1 = "3511797ddf9a3d6f3ce46b99cc835184817eaa4e"; }; } { - name = "_babel_types___types_7.8.3.tgz"; + name = "_babel_runtime___runtime_7.10.4.tgz"; path = fetchurl { - name = "_babel_types___types_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/types/-/types-7.8.3.tgz"; - sha1 = "5a383dffa5416db1b73dedffd311ffd0788fb31c"; + name = "_babel_runtime___runtime_7.10.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.10.4.tgz"; + sha1 = "a6724f1a6b8d2f6ea5236dbfe58c7d7ea9c5eb99"; + }; + } + { + name = "_babel_standalone___standalone_7.10.2.tgz"; + path = fetchurl { + name = "_babel_standalone___standalone_7.10.2.tgz"; + url = "https://registry.yarnpkg.com/@babel/standalone/-/standalone-7.10.2.tgz"; + sha1 = "49dbbadcbc4b199df064d7d8b3e21c915b84abdb"; + }; + } + { + name = "_babel_template___template_7.10.1.tgz"; + path = fetchurl { + name = "_babel_template___template_7.10.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/template/-/template-7.10.1.tgz"; + sha1 = "e167154a94cb5f14b28dc58f5356d2162f539811"; + }; + } + { + name = "_babel_traverse___traverse_7.10.1.tgz"; + path = fetchurl { + name = "_babel_traverse___traverse_7.10.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.10.1.tgz"; + sha1 = "bbcef3031e4152a6c0b50147f4958df54ca0dd27"; + }; + } + { + name = "_babel_types___types_7.10.2.tgz"; + path = fetchurl { + name = "_babel_types___types_7.10.2.tgz"; + url = "https://registry.yarnpkg.com/@babel/types/-/types-7.10.2.tgz"; + sha1 = "30283be31cad0dbf6fb00bd40641ca0ea675172d"; }; } { @@ -698,27 +754,27 @@ }; } { - name = "_gitlab_eslint_plugin___eslint_plugin_3.1.0.tgz"; + name = "_gitlab_eslint_plugin___eslint_plugin_4.0.0.tgz"; path = fetchurl { - name = "_gitlab_eslint_plugin___eslint_plugin_3.1.0.tgz"; - url = "https://registry.yarnpkg.com/@gitlab/eslint-plugin/-/eslint-plugin-3.1.0.tgz"; - sha1 = "18e03630d10788defbb4c2d746620aec09517295"; + name = "_gitlab_eslint_plugin___eslint_plugin_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/@gitlab/eslint-plugin/-/eslint-plugin-4.0.0.tgz"; + sha1 = "7beba53dea74f458d92040a8b2652e4fd60a6cc7"; }; } { - name = "_gitlab_svgs___svgs_1.127.0.tgz"; + name = "_gitlab_svgs___svgs_1.164.0.tgz"; path = fetchurl { - name = "_gitlab_svgs___svgs_1.127.0.tgz"; - url = "https://registry.yarnpkg.com/@gitlab/svgs/-/svgs-1.127.0.tgz"; - sha1 = "1f7ffdffe44d6a82b372535f93d78f3a895d1960"; + name = "_gitlab_svgs___svgs_1.164.0.tgz"; + url = "https://registry.yarnpkg.com/@gitlab/svgs/-/svgs-1.164.0.tgz"; + sha1 = "6cefad871c45f945ef92b99015d0f510b1d2de4a"; }; } { - name = "_gitlab_ui___ui_14.10.0.tgz"; + name = "_gitlab_ui___ui_21.3.1.tgz"; path = fetchurl { - name = "_gitlab_ui___ui_14.10.0.tgz"; - url = "https://registry.yarnpkg.com/@gitlab/ui/-/ui-14.10.0.tgz"; - sha1 = "39c04d62c914fcefe96c7ec32fdf31b1f98f1119"; + name = "_gitlab_ui___ui_21.3.1.tgz"; + url = "https://registry.yarnpkg.com/@gitlab/ui/-/ui-21.3.1.tgz"; + sha1 = "027b767804540539da73d4874370895d7398adea"; }; } { @@ -769,6 +825,14 @@ sha1 = "2e5b80a4f78f284bcb4bd5714b8e10dd36a8d3d1"; }; } + { + name = "_jest_fake_timers___fake_timers_25.5.0.tgz"; + path = fetchurl { + name = "_jest_fake_timers___fake_timers_25.5.0.tgz"; + url = "https://registry.yarnpkg.com/@jest/fake-timers/-/fake-timers-25.5.0.tgz"; + sha1 = "46352e00533c024c90c2bc2ad9f2959f7f114185"; + }; + } { name = "_jest_reporters___reporters_24.8.0.tgz"; path = fetchurl { @@ -817,6 +881,22 @@ sha1 = "f31e25948c58f0abd8c845ae26fcea1491dea7ad"; }; } + { + name = "_jest_types___types_25.5.0.tgz"; + path = fetchurl { + name = "_jest_types___types_25.5.0.tgz"; + url = "https://registry.yarnpkg.com/@jest/types/-/types-25.5.0.tgz"; + sha1 = "4d6a4793f7b9599fc3680877b856a97dbccf2a9d"; + }; + } + { + name = "_miragejs_pretender_node_polyfill___pretender_node_polyfill_0.1.2.tgz"; + path = fetchurl { + name = "_miragejs_pretender_node_polyfill___pretender_node_polyfill_0.1.2.tgz"; + url = "https://registry.yarnpkg.com/@miragejs/pretender-node-polyfill/-/pretender-node-polyfill-0.1.2.tgz"; + sha1 = "d26b6b7483fb70cd62189d05c95d2f67153e43f2"; + }; + } { name = "_mrmlnc_readdir_enhanced___readdir_enhanced_2.2.1.tgz"; path = fetchurl { @@ -842,91 +922,115 @@ }; } { - name = "_rails_actioncable___actioncable_6.0.3.tgz"; + name = "_rails_actioncable___actioncable_6.0.3_1.tgz"; path = fetchurl { - name = "_rails_actioncable___actioncable_6.0.3.tgz"; - url = "https://registry.yarnpkg.com/@rails/actioncable/-/actioncable-6.0.3.tgz"; - sha1 = "722b4b639936129307ddbab3a390f6bcacf3e7bc"; + name = "_rails_actioncable___actioncable_6.0.3_1.tgz"; + url = "https://registry.yarnpkg.com/@rails/actioncable/-/actioncable-6.0.3-1.tgz"; + sha1 = "9b9eb8858a6507162911007d355d9a206e1c5caa"; }; } { - name = "_sentry_browser___browser_5.10.2.tgz"; + name = "_sentry_browser___browser_5.22.3.tgz"; path = fetchurl { - name = "_sentry_browser___browser_5.10.2.tgz"; - url = "https://registry.yarnpkg.com/@sentry/browser/-/browser-5.10.2.tgz"; - sha1 = "0bbb05505c58ea998c833cffec3f922fe4b4fa58"; + name = "_sentry_browser___browser_5.22.3.tgz"; + url = "https://registry.yarnpkg.com/@sentry/browser/-/browser-5.22.3.tgz"; + sha1 = "7a64bd1cf01bf393741a3e4bf35f82aa927f5b4e"; }; } { - name = "_sentry_core___core_5.10.2.tgz"; + name = "_sentry_core___core_5.22.3.tgz"; path = fetchurl { - name = "_sentry_core___core_5.10.2.tgz"; - url = "https://registry.yarnpkg.com/@sentry/core/-/core-5.10.2.tgz"; - sha1 = "1cb64489e6f8363c3249415b49d3f1289814825f"; + name = "_sentry_core___core_5.22.3.tgz"; + url = "https://registry.yarnpkg.com/@sentry/core/-/core-5.22.3.tgz"; + sha1 = "030f435f2b518f282ba8bd954dac90cd70888bd7"; }; } { - name = "_sentry_hub___hub_5.10.2.tgz"; + name = "_sentry_hub___hub_5.22.3.tgz"; path = fetchurl { - name = "_sentry_hub___hub_5.10.2.tgz"; - url = "https://registry.yarnpkg.com/@sentry/hub/-/hub-5.10.2.tgz"; - sha1 = "25d9f36b8f7c5cb65cf486737fa61dc9bf69b7e3"; + name = "_sentry_hub___hub_5.22.3.tgz"; + url = "https://registry.yarnpkg.com/@sentry/hub/-/hub-5.22.3.tgz"; + sha1 = "08309a70d2ea8d5e313d05840c1711f34f2fffe5"; }; } { - name = "_sentry_minimal___minimal_5.10.2.tgz"; + name = "_sentry_minimal___minimal_5.22.3.tgz"; path = fetchurl { - name = "_sentry_minimal___minimal_5.10.2.tgz"; - url = "https://registry.yarnpkg.com/@sentry/minimal/-/minimal-5.10.2.tgz"; - sha1 = "267c2f3aa6877a0fe7a86971942e83f3ee616580"; + name = "_sentry_minimal___minimal_5.22.3.tgz"; + url = "https://registry.yarnpkg.com/@sentry/minimal/-/minimal-5.22.3.tgz"; + sha1 = "706e4029ae5494123d3875c658ba8911aa5cc440"; }; } { - name = "_sentry_types___types_5.10.0.tgz"; + name = "_sentry_types___types_5.22.3.tgz"; path = fetchurl { - name = "_sentry_types___types_5.10.0.tgz"; - url = "https://registry.yarnpkg.com/@sentry/types/-/types-5.10.0.tgz"; - sha1 = "4f0ba31b6e4d5371112c38279f11f66c73b43746"; + name = "_sentry_types___types_5.22.3.tgz"; + url = "https://registry.yarnpkg.com/@sentry/types/-/types-5.22.3.tgz"; + sha1 = "d1d547b30ee8bd7771fa893af74c4f3d71f0fd18"; }; } { - name = "_sentry_utils___utils_5.10.2.tgz"; + name = "_sentry_utils___utils_5.22.3.tgz"; path = fetchurl { - name = "_sentry_utils___utils_5.10.2.tgz"; - url = "https://registry.yarnpkg.com/@sentry/utils/-/utils-5.10.2.tgz"; - sha1 = "261f575079d30aaf604e59f5f4de0aa21db22252"; + name = "_sentry_utils___utils_5.22.3.tgz"; + url = "https://registry.yarnpkg.com/@sentry/utils/-/utils-5.22.3.tgz"; + sha1 = "e3bda3e789239eb16d436f768daa12829f33d18f"; }; } { - name = "_sourcegraph_code_host_integration___code_host_integration_0.0.46.tgz"; + name = "_sindresorhus_is___is_0.14.0.tgz"; path = fetchurl { - name = "_sourcegraph_code_host_integration___code_host_integration_0.0.46.tgz"; - url = "https://registry.yarnpkg.com/@sourcegraph/code-host-integration/-/code-host-integration-0.0.46.tgz"; - sha1 = "05e4cda671ed00450be12461e6a3caff473675aa"; + name = "_sindresorhus_is___is_0.14.0.tgz"; + url = "https://registry.yarnpkg.com/@sindresorhus/is/-/is-0.14.0.tgz"; + sha1 = "9fb3a3cf3132328151f353de4632e01e52102bea"; }; } { - name = "_toast_ui_editor___editor_2.0.1.tgz"; + name = "_sinonjs_commons___commons_1.8.0.tgz"; path = fetchurl { - name = "_toast_ui_editor___editor_2.0.1.tgz"; - url = "https://registry.yarnpkg.com/@toast-ui/editor/-/editor-2.0.1.tgz"; - sha1 = "749e5be1f02f42ded51488d1575ab1c19ca59952"; + name = "_sinonjs_commons___commons_1.8.0.tgz"; + url = "https://registry.yarnpkg.com/@sinonjs/commons/-/commons-1.8.0.tgz"; + sha1 = "c8d68821a854c555bba172f3b06959a0039b236d"; }; } { - name = "_toast_ui_vue_editor___vue_editor_2.0.1.tgz"; + name = "_sourcegraph_code_host_integration___code_host_integration_0.0.50.tgz"; path = fetchurl { - name = "_toast_ui_vue_editor___vue_editor_2.0.1.tgz"; - url = "https://registry.yarnpkg.com/@toast-ui/vue-editor/-/vue-editor-2.0.1.tgz"; - sha1 = "c9c8c8da4c0a67b9fbc4240464388c67d72a0c22"; + name = "_sourcegraph_code_host_integration___code_host_integration_0.0.50.tgz"; + url = "https://registry.yarnpkg.com/@sourcegraph/code-host-integration/-/code-host-integration-0.0.50.tgz"; + sha1 = "3f91be4c1b117efbf3d49c73033a6b1880db1c70"; }; } { - name = "_types_anymatch___anymatch_1.3.0.tgz"; + name = "_szmarczak_http_timer___http_timer_1.1.2.tgz"; path = fetchurl { - name = "_types_anymatch___anymatch_1.3.0.tgz"; - url = "https://registry.yarnpkg.com/@types/anymatch/-/anymatch-1.3.0.tgz"; - sha1 = "d1d55958d1fccc5527d4aba29fc9c4b942f563ff"; + name = "_szmarczak_http_timer___http_timer_1.1.2.tgz"; + url = "https://registry.yarnpkg.com/@szmarczak/http-timer/-/http-timer-1.1.2.tgz"; + sha1 = "b1665e2c461a2cd92f4c1bbf50d5454de0d4b421"; + }; + } + { + name = "_testing_library_dom___dom_7.16.2.tgz"; + path = fetchurl { + name = "_testing_library_dom___dom_7.16.2.tgz"; + url = "https://registry.yarnpkg.com/@testing-library/dom/-/dom-7.16.2.tgz"; + sha1 = "f7a20b5548817e5c7ed26077913372d977be90af"; + }; + } + { + name = "_toast_ui_editor___editor_2.4.0.tgz"; + path = fetchurl { + name = "_toast_ui_editor___editor_2.4.0.tgz"; + url = "https://registry.yarnpkg.com/@toast-ui/editor/-/editor-2.4.0.tgz"; + sha1 = "0ed082da7e0160162dbc8f69d00ad3ab2adf81bc"; + }; + } + { + name = "_toast_ui_vue_editor___vue_editor_2.4.0.tgz"; + path = fetchurl { + name = "_toast_ui_vue_editor___vue_editor_2.4.0.tgz"; + url = "https://registry.yarnpkg.com/@toast-ui/vue-editor/-/vue-editor-2.4.0.tgz"; + sha1 = "18b6629006f2dac5bfef4a26388499931d5fa869"; }; } { @@ -969,6 +1073,14 @@ sha1 = "861f1bcb3100c0a064567c5400f2981cf4ae8ca7"; }; } + { + name = "_types_color_name___color_name_1.1.1.tgz"; + path = fetchurl { + name = "_types_color_name___color_name_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/@types/color-name/-/color-name-1.1.1.tgz"; + sha1 = "1c1261bbeaa10a8055bbc5d8ab84b7b2afc846a0"; + }; + } { name = "_types_estree___estree_0.0.44.tgz"; path = fetchurl { @@ -1057,14 +1169,6 @@ sha1 = "0a851d3bd96498fa25c33ab7278ed3bd65f06c3e"; }; } - { - name = "_types_tapable___tapable_1.0.4.tgz"; - path = fetchurl { - name = "_types_tapable___tapable_1.0.4.tgz"; - url = "https://registry.yarnpkg.com/@types/tapable/-/tapable-1.0.4.tgz"; - sha1 = "b4ffc7dc97b498c969b360a41eee247f82616370"; - }; - } { name = "_types_tern___tern_0.23.3.tgz"; path = fetchurl { @@ -1073,14 +1177,6 @@ sha1 = "4b54538f04a88c9ff79de1f6f94f575a7f339460"; }; } - { - name = "_types_uglify_js___uglify_js_3.0.4.tgz"; - path = fetchurl { - name = "_types_uglify_js___uglify_js_3.0.4.tgz"; - url = "https://registry.yarnpkg.com/@types/uglify-js/-/uglify-js-3.0.4.tgz"; - sha1 = "96beae23df6f561862a830b4288a49e86baac082"; - }; - } { name = "_types_unist___unist_2.0.3.tgz"; path = fetchurl { @@ -1106,11 +1202,11 @@ }; } { - name = "_types_webpack___webpack_4.4.23.tgz"; + name = "_types_yargs_parser___yargs_parser_15.0.0.tgz"; path = fetchurl { - name = "_types_webpack___webpack_4.4.23.tgz"; - url = "https://registry.yarnpkg.com/@types/webpack/-/webpack-4.4.23.tgz"; - sha1 = "059d6f4598cfd65ddee0e2db38317ef989696712"; + name = "_types_yargs_parser___yargs_parser_15.0.0.tgz"; + url = "https://registry.yarnpkg.com/@types/yargs-parser/-/yargs-parser-15.0.0.tgz"; + sha1 = "cb3f9f741869e20cce330ffbeb9271590483882d"; }; } { @@ -1121,6 +1217,14 @@ sha1 = "45dd1d0638e8c8f153e87d296907659296873916"; }; } + { + name = "_types_yargs___yargs_15.0.5.tgz"; + path = fetchurl { + name = "_types_yargs___yargs_15.0.5.tgz"; + url = "https://registry.yarnpkg.com/@types/yargs/-/yargs-15.0.5.tgz"; + sha1 = "947e9a6561483bdee9adffc983e91a6902af8b79"; + }; + } { name = "_types_zen_observable___zen_observable_0.8.0.tgz"; path = fetchurl { @@ -1354,11 +1458,11 @@ }; } { - name = "abab___abab_2.0.0.tgz"; + name = "abab___abab_2.0.3.tgz"; path = fetchurl { - name = "abab___abab_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/abab/-/abab-2.0.0.tgz"; - sha1 = "aba0ab4c5eee2d4c79d3487d85450fb2376ebb0f"; + name = "abab___abab_2.0.3.tgz"; + url = "https://registry.yarnpkg.com/abab/-/abab-2.0.3.tgz"; + sha1 = "623e2075e02eb2d3f2475e49f99c91846467907a"; }; } { @@ -1385,6 +1489,14 @@ sha1 = "e3b6f8da3c1552a95ae627571f7dd6923bb54103"; }; } + { + name = "acorn_globals___acorn_globals_6.0.0.tgz"; + path = fetchurl { + name = "acorn_globals___acorn_globals_6.0.0.tgz"; + url = "https://registry.yarnpkg.com/acorn-globals/-/acorn-globals-6.0.0.tgz"; + sha1 = "46cdd39f0f8ff08a876619b55f5ac8a6dc770b45"; + }; + } { name = "acorn_jsx___acorn_jsx_5.1.0.tgz"; path = fetchurl { @@ -1401,6 +1513,14 @@ sha1 = "123cb8f3b84c2171f1f7fb252615b1c78a6b1a8c"; }; } + { + name = "acorn_walk___acorn_walk_7.1.1.tgz"; + path = fetchurl { + name = "acorn_walk___acorn_walk_7.1.1.tgz"; + url = "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-7.1.1.tgz"; + sha1 = "345f0dffad5c735e7373d2fec9a1023e6a44b83e"; + }; + } { name = "acorn___acorn_5.7.3.tgz"; path = fetchurl { @@ -1418,11 +1538,11 @@ }; } { - name = "acorn___acorn_7.1.0.tgz"; + name = "acorn___acorn_7.2.0.tgz"; path = fetchurl { - name = "acorn___acorn_7.1.0.tgz"; - url = "https://registry.yarnpkg.com/acorn/-/acorn-7.1.0.tgz"; - sha1 = "949d36f2c292535da602283586c2477c57eb2d6c"; + name = "acorn___acorn_7.2.0.tgz"; + url = "https://registry.yarnpkg.com/acorn/-/acorn-7.2.0.tgz"; + sha1 = "17ea7e40d7c8640ff54a694c889c26f31704effe"; }; } { @@ -1474,11 +1594,11 @@ }; } { - name = "ansi_align___ansi_align_2.0.0.tgz"; + name = "ansi_align___ansi_align_3.0.0.tgz"; path = fetchurl { - name = "ansi_align___ansi_align_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/ansi-align/-/ansi-align-2.0.0.tgz"; - sha1 = "c36aeccba563b89ceb556f3690f0b1d9e3547f7f"; + name = "ansi_align___ansi_align_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/ansi-align/-/ansi-align-3.0.0.tgz"; + sha1 = "b536b371cf687caaef236c18d3e21fe3797467cb"; }; } { @@ -1537,6 +1657,14 @@ sha1 = "8b9f8f08cf1acb843756a839ca8c7e3168c51997"; }; } + { + name = "ansi_regex___ansi_regex_5.0.0.tgz"; + path = fetchurl { + name = "ansi_regex___ansi_regex_5.0.0.tgz"; + url = "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.0.tgz"; + sha1 = "388539f55179bf39339c81af30a654d69f87cb75"; + }; + } { name = "ansi_styles___ansi_styles_2.2.1.tgz"; path = fetchurl { @@ -1553,6 +1681,14 @@ sha1 = "41fbb20243e50b12be0f04b8dedbf07520ce841d"; }; } + { + name = "ansi_styles___ansi_styles_4.2.1.tgz"; + path = fetchurl { + name = "ansi_styles___ansi_styles_4.2.1.tgz"; + url = "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.2.1.tgz"; + sha1 = "90ae75c424d008d2624c5bf29ead3177ebfcf359"; + }; + } { name = "anymatch___anymatch_2.0.0.tgz"; path = fetchurl { @@ -1562,83 +1698,83 @@ }; } { - name = "anymatch___anymatch_3.0.3.tgz"; + name = "anymatch___anymatch_3.1.1.tgz"; path = fetchurl { - name = "anymatch___anymatch_3.0.3.tgz"; - url = "https://registry.yarnpkg.com/anymatch/-/anymatch-3.0.3.tgz"; - sha1 = "2fb624fe0e84bccab00afee3d0006ed310f22f09"; + name = "anymatch___anymatch_3.1.1.tgz"; + url = "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.1.tgz"; + sha1 = "c55ecf02185e2469259399310c173ce31233b142"; }; } { - name = "apollo_cache_inmemory___apollo_cache_inmemory_1.6.3.tgz"; + name = "apollo_cache_inmemory___apollo_cache_inmemory_1.6.6.tgz"; path = fetchurl { - name = "apollo_cache_inmemory___apollo_cache_inmemory_1.6.3.tgz"; - url = "https://registry.yarnpkg.com/apollo-cache-inmemory/-/apollo-cache-inmemory-1.6.3.tgz"; - sha1 = "826861d20baca4abc45f7ca7a874105905b8525d"; + name = "apollo_cache_inmemory___apollo_cache_inmemory_1.6.6.tgz"; + url = "https://registry.yarnpkg.com/apollo-cache-inmemory/-/apollo-cache-inmemory-1.6.6.tgz"; + sha1 = "56d1f2a463a6b9db32e9fa990af16d2a008206fd"; }; } { - name = "apollo_cache___apollo_cache_1.3.2.tgz"; + name = "apollo_cache___apollo_cache_1.3.5.tgz"; path = fetchurl { - name = "apollo_cache___apollo_cache_1.3.2.tgz"; - url = "https://registry.yarnpkg.com/apollo-cache/-/apollo-cache-1.3.2.tgz"; - sha1 = "df4dce56240d6c95c613510d7e409f7214e6d26a"; + name = "apollo_cache___apollo_cache_1.3.5.tgz"; + url = "https://registry.yarnpkg.com/apollo-cache/-/apollo-cache-1.3.5.tgz"; + sha1 = "9dbebfc8dbe8fe7f97ba568a224bca2c5d81f461"; }; } { - name = "apollo_client___apollo_client_2.6.4.tgz"; + name = "apollo_client___apollo_client_2.6.10.tgz"; path = fetchurl { - name = "apollo_client___apollo_client_2.6.4.tgz"; - url = "https://registry.yarnpkg.com/apollo-client/-/apollo-client-2.6.4.tgz"; - sha1 = "872c32927263a0d34655c5ef8a8949fbb20b6140"; + name = "apollo_client___apollo_client_2.6.10.tgz"; + url = "https://registry.yarnpkg.com/apollo-client/-/apollo-client-2.6.10.tgz"; + sha1 = "86637047b51d940c8eaa771a4ce1b02df16bea6a"; }; } { - name = "apollo_link_batch_http___apollo_link_batch_http_1.2.11.tgz"; + name = "apollo_link_batch_http___apollo_link_batch_http_1.2.14.tgz"; path = fetchurl { - name = "apollo_link_batch_http___apollo_link_batch_http_1.2.11.tgz"; - url = "https://registry.yarnpkg.com/apollo-link-batch-http/-/apollo-link-batch-http-1.2.11.tgz"; - sha1 = "ae42dbcc02820658e1e267d05bf2aae7ac208088"; + name = "apollo_link_batch_http___apollo_link_batch_http_1.2.14.tgz"; + url = "https://registry.yarnpkg.com/apollo-link-batch-http/-/apollo-link-batch-http-1.2.14.tgz"; + sha1 = "4502109d3f32a94d88eabd3a89274ae3a6e2f56f"; }; } { - name = "apollo_link_batch___apollo_link_batch_1.1.12.tgz"; + name = "apollo_link_batch___apollo_link_batch_1.1.15.tgz"; path = fetchurl { - name = "apollo_link_batch___apollo_link_batch_1.1.12.tgz"; - url = "https://registry.yarnpkg.com/apollo-link-batch/-/apollo-link-batch-1.1.12.tgz"; - sha1 = "64eb231082f182b0395ef7ab903600627f6c7fe8"; + name = "apollo_link_batch___apollo_link_batch_1.1.15.tgz"; + url = "https://registry.yarnpkg.com/apollo-link-batch/-/apollo-link-batch-1.1.15.tgz"; + sha1 = "3a5b8c7d9cf1b7840ce630238249b95070e75e54"; }; } { - name = "apollo_link_http_common___apollo_link_http_common_0.2.13.tgz"; + name = "apollo_link_http_common___apollo_link_http_common_0.2.16.tgz"; path = fetchurl { - name = "apollo_link_http_common___apollo_link_http_common_0.2.13.tgz"; - url = "https://registry.yarnpkg.com/apollo-link-http-common/-/apollo-link-http-common-0.2.13.tgz"; - sha1 = "c688f6baaffdc7b269b2db7ae89dae7c58b5b350"; + name = "apollo_link_http_common___apollo_link_http_common_0.2.16.tgz"; + url = "https://registry.yarnpkg.com/apollo-link-http-common/-/apollo-link-http-common-0.2.16.tgz"; + sha1 = "756749dafc732792c8ca0923f9a40564b7c59ecc"; }; } { - name = "apollo_link___apollo_link_1.2.11.tgz"; + name = "apollo_link___apollo_link_1.2.14.tgz"; path = fetchurl { - name = "apollo_link___apollo_link_1.2.11.tgz"; - url = "https://registry.yarnpkg.com/apollo-link/-/apollo-link-1.2.11.tgz"; - sha1 = "493293b747ad3237114ccd22e9f559e5e24a194d"; + name = "apollo_link___apollo_link_1.2.14.tgz"; + url = "https://registry.yarnpkg.com/apollo-link/-/apollo-link-1.2.14.tgz"; + sha1 = "3feda4b47f9ebba7f4160bef8b977ba725b684d9"; }; } { - name = "apollo_upload_client___apollo_upload_client_10.0.0.tgz"; + name = "apollo_upload_client___apollo_upload_client_13.0.0.tgz"; path = fetchurl { - name = "apollo_upload_client___apollo_upload_client_10.0.0.tgz"; - url = "https://registry.yarnpkg.com/apollo-upload-client/-/apollo-upload-client-10.0.0.tgz"; - sha1 = "6cc3d0ea2aef40bc237b655f5042809cacee1859"; + name = "apollo_upload_client___apollo_upload_client_13.0.0.tgz"; + url = "https://registry.yarnpkg.com/apollo-upload-client/-/apollo-upload-client-13.0.0.tgz"; + sha1 = "146d1ddd85d711fcac8ca97a72d3ca6787f2b71b"; }; } { - name = "apollo_utilities___apollo_utilities_1.3.2.tgz"; + name = "apollo_utilities___apollo_utilities_1.3.4.tgz"; path = fetchurl { - name = "apollo_utilities___apollo_utilities_1.3.2.tgz"; - url = "https://registry.yarnpkg.com/apollo-utilities/-/apollo-utilities-1.3.2.tgz"; - sha1 = "8cbdcf8b012f664cd6cb5767f6130f5aed9115c9"; + name = "apollo_utilities___apollo_utilities_1.3.4.tgz"; + url = "https://registry.yarnpkg.com/apollo-utilities/-/apollo-utilities-1.3.4.tgz"; + sha1 = "6129e438e8be201b6c55b0f13ce49d2c7175c9cf"; }; } { @@ -1673,6 +1809,14 @@ sha1 = "bcd6791ea5ae09725e17e5ad988134cd40b3d911"; }; } + { + name = "aria_query___aria_query_4.2.0.tgz"; + path = fetchurl { + name = "aria_query___aria_query_4.2.0.tgz"; + url = "https://registry.yarnpkg.com/aria-query/-/aria-query-4.2.0.tgz"; + sha1 = "3774158e138a84c4790b58afc17e09711071d888"; + }; + } { name = "arr_diff___arr_diff_4.0.0.tgz"; path = fetchurl { @@ -1841,14 +1985,6 @@ sha1 = "6c8c3fb827dd43ee3918f27b82782ab7658a6fd9"; }; } - { - name = "async_each___async_each_1.0.3.tgz"; - path = fetchurl { - name = "async_each___async_each_1.0.3.tgz"; - url = "https://registry.yarnpkg.com/async-each/-/async-each-1.0.3.tgz"; - sha1 = "b727dbf87d7651602f06f4d4ac387f47d91b0cbf"; - }; - } { name = "async_foreach___async_foreach_0.1.3.tgz"; path = fetchurl { @@ -1938,11 +2074,11 @@ }; } { - name = "axios___axios_0.19.0.tgz"; + name = "axios___axios_0.20.0.tgz"; path = fetchurl { - name = "axios___axios_0.19.0.tgz"; - url = "https://registry.yarnpkg.com/axios/-/axios-0.19.0.tgz"; - sha1 = "8e09bff3d9122e133f7b8101c8fbdd00ed3d2ab8"; + name = "axios___axios_0.20.0.tgz"; + url = "https://registry.yarnpkg.com/axios/-/axios-0.20.0.tgz"; + sha1 = "057ba30f04884694993a8cd07fa394cff11c50bd"; }; } { @@ -1970,11 +2106,11 @@ }; } { - name = "babel_plugin_dynamic_import_node___babel_plugin_dynamic_import_node_2.3.0.tgz"; + name = "babel_plugin_dynamic_import_node___babel_plugin_dynamic_import_node_2.3.3.tgz"; path = fetchurl { - name = "babel_plugin_dynamic_import_node___babel_plugin_dynamic_import_node_2.3.0.tgz"; - url = "https://registry.yarnpkg.com/babel-plugin-dynamic-import-node/-/babel-plugin-dynamic-import-node-2.3.0.tgz"; - sha1 = "f00f507bdaa3c3e3ff6e7e5e98d90a7acab96f7f"; + name = "babel_plugin_dynamic_import_node___babel_plugin_dynamic_import_node_2.3.3.tgz"; + url = "https://registry.yarnpkg.com/babel-plugin-dynamic-import-node/-/babel-plugin-dynamic-import-node-2.3.3.tgz"; + sha1 = "84fda19c976ec5c6defef57f9427b3def66e17a3"; }; } { @@ -2001,14 +2137,6 @@ sha1 = "4f6844358a1340baed182adbeffa8df9967bc196"; }; } - { - name = "babel_plugin_rewire___babel_plugin_rewire_1.2.0.tgz"; - path = fetchurl { - name = "babel_plugin_rewire___babel_plugin_rewire_1.2.0.tgz"; - url = "https://registry.yarnpkg.com/babel-plugin-rewire/-/babel-plugin-rewire-1.2.0.tgz"; - sha1 = "822562d72ed2c84e47c0f95ee232c920853e9d89"; - }; - } { name = "babel_preset_jest___babel_preset_jest_24.6.0.tgz"; path = fetchurl { @@ -2121,14 +2249,6 @@ sha1 = "65f0af382f578bcdc742bd9c281e9cb2d7768328"; }; } - { - name = "binary_extensions___binary_extensions_1.11.0.tgz"; - path = fetchurl { - name = "binary_extensions___binary_extensions_1.11.0.tgz"; - url = "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-1.11.0.tgz"; - sha1 = "46aa1751fb6a2f93ee5e689bb1087d4b14c6c205"; - }; - } { name = "binary_extensions___binary_extensions_2.0.0.tgz"; path = fetchurl { @@ -2145,6 +2265,14 @@ sha1 = "3209a51ca4a4ad541a3b8d3d6a6d5b83a2485935"; }; } + { + name = "bindings___bindings_1.5.0.tgz"; + path = fetchurl { + name = "bindings___bindings_1.5.0.tgz"; + url = "https://registry.yarnpkg.com/bindings/-/bindings-1.5.0.tgz"; + sha1 = "10353c9e945334bc0511a6d90b38fbc7c9c504df"; + }; + } { name = "blob___blob_0.0.4.tgz"; path = fetchurl { @@ -2194,27 +2322,27 @@ }; } { - name = "bootstrap_vue___bootstrap_vue_2.1.0.tgz"; + name = "bootstrap_vue___bootstrap_vue_2.13.1.tgz"; path = fetchurl { - name = "bootstrap_vue___bootstrap_vue_2.1.0.tgz"; - url = "https://registry.yarnpkg.com/bootstrap-vue/-/bootstrap-vue-2.1.0.tgz"; - sha1 = "41c0cd265a6cea14ffe29eeea71543ec396d1789"; + name = "bootstrap_vue___bootstrap_vue_2.13.1.tgz"; + url = "https://registry.yarnpkg.com/bootstrap-vue/-/bootstrap-vue-2.13.1.tgz"; + sha1 = "dcefca78f2b0345508fbb85adb0a9897cce65fa1"; }; } { - name = "bootstrap___bootstrap_4.3.1.tgz"; + name = "bootstrap___bootstrap_4.4.1.tgz"; path = fetchurl { - name = "bootstrap___bootstrap_4.3.1.tgz"; - url = "https://registry.yarnpkg.com/bootstrap/-/bootstrap-4.3.1.tgz"; - sha1 = "280ca8f610504d99d7b6b4bfc4b68cec601704ac"; + name = "bootstrap___bootstrap_4.4.1.tgz"; + url = "https://registry.yarnpkg.com/bootstrap/-/bootstrap-4.4.1.tgz"; + sha1 = "8582960eea0c5cd2bede84d8b0baf3789c3e8b01"; }; } { - name = "boxen___boxen_1.3.0.tgz"; + name = "boxen___boxen_4.2.0.tgz"; path = fetchurl { - name = "boxen___boxen_1.3.0.tgz"; - url = "https://registry.yarnpkg.com/boxen/-/boxen-1.3.0.tgz"; - sha1 = "55c6c39a8ba58d9c61ad22cd877532deb665a20b"; + name = "boxen___boxen_4.2.0.tgz"; + url = "https://registry.yarnpkg.com/boxen/-/boxen-4.2.0.tgz"; + sha1 = "e411b62357d6d6d36587c8ac3d5d974daa070e64"; }; } { @@ -2250,11 +2378,11 @@ }; } { - name = "browser_process_hrtime___browser_process_hrtime_0.1.3.tgz"; + name = "browser_process_hrtime___browser_process_hrtime_1.0.0.tgz"; path = fetchurl { - name = "browser_process_hrtime___browser_process_hrtime_0.1.3.tgz"; - url = "https://registry.yarnpkg.com/browser-process-hrtime/-/browser-process-hrtime-0.1.3.tgz"; - sha1 = "616f00faef1df7ec1b5bf9cfe2bdc3170f26c7b4"; + name = "browser_process_hrtime___browser_process_hrtime_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/browser-process-hrtime/-/browser-process-hrtime-1.0.0.tgz"; + sha1 = "3c9b4b7d782c8121e56f10106d84c0d0ffc94626"; }; } { @@ -2314,11 +2442,11 @@ }; } { - name = "browserslist___browserslist_4.8.7.tgz"; + name = "browserslist___browserslist_4.12.0.tgz"; path = fetchurl { - name = "browserslist___browserslist_4.8.7.tgz"; - url = "https://registry.yarnpkg.com/browserslist/-/browserslist-4.8.7.tgz"; - sha1 = "ec8301ff415e6a42c949d0e66b405eb539c532d0"; + name = "browserslist___browserslist_4.12.0.tgz"; + url = "https://registry.yarnpkg.com/browserslist/-/browserslist-4.12.0.tgz"; + sha1 = "06c6d5715a1ede6c51fc39ff67fd647f740b656d"; }; } { @@ -2433,6 +2561,14 @@ sha1 = "9948cae353aec0a1fcb1eafda2300816ec85387e"; }; } + { + name = "cacheable_request___cacheable_request_6.1.0.tgz"; + path = fetchurl { + name = "cacheable_request___cacheable_request_6.1.0.tgz"; + url = "https://registry.yarnpkg.com/cacheable-request/-/cacheable-request-6.1.0.tgz"; + sha1 = "20ffb8bd162ba4be11e9567d823db651052ca912"; + }; + } { name = "call_me_maybe___call_me_maybe_1.0.1.tgz"; path = fetchurl { @@ -2538,11 +2674,11 @@ }; } { - name = "caniuse_lite___caniuse_lite_1.0.30001030.tgz"; + name = "caniuse_lite___caniuse_lite_1.0.30001081.tgz"; path = fetchurl { - name = "caniuse_lite___caniuse_lite_1.0.30001030.tgz"; - url = "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001030.tgz"; - sha1 = "78076c4c6d67d3e41d6eb9399853fb27fe6e44ee"; + name = "caniuse_lite___caniuse_lite_1.0.30001081.tgz"; + url = "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001081.tgz"; + sha1 = "40615a3c416a047c5a4d45673e5257bf128eb3b5"; }; } { @@ -2553,14 +2689,6 @@ sha1 = "fb953bfaebeb781f62898239dabb426d08a509a4"; }; } - { - name = "capture_stack_trace___capture_stack_trace_1.0.0.tgz"; - path = fetchurl { - name = "capture_stack_trace___capture_stack_trace_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/capture-stack-trace/-/capture-stack-trace-1.0.0.tgz"; - sha1 = "4a6fa07399c26bba47f0b2496b4d0fb408c5550d"; - }; - } { name = "caseless___caseless_0.12.0.tgz"; path = fetchurl { @@ -2601,6 +2729,14 @@ sha1 = "a8115c55e4a702fe4d150abd3872822a7e09fc98"; }; } + { + name = "chalk___chalk_3.0.0.tgz"; + path = fetchurl { + name = "chalk___chalk_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/chalk/-/chalk-3.0.0.tgz"; + sha1 = "3f73c2bf526591f574cc492c51e2456349f844e4"; + }; + } { name = "character_entities_html4___character_entities_html4_1.1.2.tgz"; path = fetchurl { @@ -2649,30 +2785,6 @@ sha1 = "c0a1d2f3a7092e03774bfa83f14c0fc5790a8667"; }; } - { - name = "chart.js___chart.js_2.7.2.tgz"; - path = fetchurl { - name = "chart.js___chart.js_2.7.2.tgz"; - url = "https://registry.yarnpkg.com/chart.js/-/chart.js-2.7.2.tgz"; - sha1 = "3c9fde4dc5b95608211bdefeda7e5d33dffa5714"; - }; - } - { - name = "chartjs_color_string___chartjs_color_string_0.5.0.tgz"; - path = fetchurl { - name = "chartjs_color_string___chartjs_color_string_0.5.0.tgz"; - url = "https://registry.yarnpkg.com/chartjs-color-string/-/chartjs-color-string-0.5.0.tgz"; - sha1 = "8d3752d8581d86687c35bfe2cb80ac5213ceb8c1"; - }; - } - { - name = "chartjs_color___chartjs_color_2.2.0.tgz"; - path = fetchurl { - name = "chartjs_color___chartjs_color_2.2.0.tgz"; - url = "https://registry.yarnpkg.com/chartjs-color/-/chartjs-color-2.2.0.tgz"; - sha1 = "84a2fb755787ed85c39dd6dd8c7b1d88429baeae"; - }; - } { name = "check_types___check_types_7.3.0.tgz"; path = fetchurl { @@ -2682,19 +2794,11 @@ }; } { - name = "chokidar___chokidar_2.1.8.tgz"; + name = "chokidar___chokidar_3.4.0.tgz"; path = fetchurl { - name = "chokidar___chokidar_2.1.8.tgz"; - url = "https://registry.yarnpkg.com/chokidar/-/chokidar-2.1.8.tgz"; - sha1 = "804b3a7b6a99358c3c5c61e71d8728f041cff917"; - }; - } - { - name = "chokidar___chokidar_3.0.2.tgz"; - path = fetchurl { - name = "chokidar___chokidar_3.0.2.tgz"; - url = "https://registry.yarnpkg.com/chokidar/-/chokidar-3.0.2.tgz"; - sha1 = "0d1cd6d04eb2df0327446188cd13736a3367d681"; + name = "chokidar___chokidar_3.4.0.tgz"; + url = "https://registry.yarnpkg.com/chokidar/-/chokidar-3.4.0.tgz"; + sha1 = "b30611423ce376357c765b9b8f904b9fba3c0be8"; }; } { @@ -2713,14 +2817,6 @@ sha1 = "234090ee97c7d4ad1a2c4beae27505deffc608a4"; }; } - { - name = "ci_info___ci_info_1.6.0.tgz"; - path = fetchurl { - name = "ci_info___ci_info_1.6.0.tgz"; - url = "https://registry.yarnpkg.com/ci-info/-/ci-info-1.6.0.tgz"; - sha1 = "2ca20dbb9ceb32d4524a683303313f0304b1e497"; - }; - } { name = "ci_info___ci_info_2.0.0.tgz"; path = fetchurl { @@ -2745,14 +2841,6 @@ sha1 = "f93369ae8b9a7ce02fd41faad0ca83033190c463"; }; } - { - name = "classlist_polyfill___classlist_polyfill_1.2.0.tgz"; - path = fetchurl { - name = "classlist_polyfill___classlist_polyfill_1.2.0.tgz"; - url = "https://registry.yarnpkg.com/classlist-polyfill/-/classlist-polyfill-1.2.0.tgz"; - sha1 = "935bc2dfd9458a876b279617514638bcaa964a2e"; - }; - } { name = "clean_css___clean_css_4.2.1.tgz"; path = fetchurl { @@ -2770,11 +2858,11 @@ }; } { - name = "cli_boxes___cli_boxes_1.0.0.tgz"; + name = "cli_boxes___cli_boxes_2.2.0.tgz"; path = fetchurl { - name = "cli_boxes___cli_boxes_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/cli-boxes/-/cli-boxes-1.0.0.tgz"; - sha1 = "4fa917c3e59c94a004cd61f8ee509da651687143"; + name = "cli_boxes___cli_boxes_2.2.0.tgz"; + url = "https://registry.yarnpkg.com/cli-boxes/-/cli-boxes-2.2.0.tgz"; + sha1 = "538ecae8f9c6ca508e3c3c95b453fe93cb4c168d"; }; } { @@ -2801,6 +2889,14 @@ sha1 = "360d6d6946e99a7a1fef395e42ba92b5e9b5a16b"; }; } + { + name = "clipboard___clipboard_2.0.6.tgz"; + path = fetchurl { + name = "clipboard___clipboard_2.0.6.tgz"; + url = "https://registry.yarnpkg.com/clipboard/-/clipboard-2.0.6.tgz"; + sha1 = "52921296eec0fdf77ead1749421b21c968647376"; + }; + } { name = "cliui___cliui_3.2.0.tgz"; path = fetchurl { @@ -2841,6 +2937,14 @@ sha1 = "7d65e00885cd8796405c35a737e7a86b7429e36f"; }; } + { + name = "clone_response___clone_response_1.0.2.tgz"; + path = fetchurl { + name = "clone_response___clone_response_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/clone-response/-/clone-response-1.0.2.tgz"; + sha1 = "d1dc973920314df67fbeb94223b4ee350239e96b"; + }; + } { name = "co___co_4.6.0.tgz"; path = fetchurl { @@ -2905,14 +3009,6 @@ sha1 = "4bc0373c164bc3291b4d368c829cf1a80a59dca0"; }; } - { - name = "color_convert___color_convert_0.5.3.tgz"; - path = fetchurl { - name = "color_convert___color_convert_0.5.3.tgz"; - url = "https://registry.yarnpkg.com/color-convert/-/color-convert-0.5.3.tgz"; - sha1 = "bdb6c69ce660fadffe0b0007cc447e1b9f7282bd"; - }; - } { name = "color_convert___color_convert_1.9.3.tgz"; path = fetchurl { @@ -2921,6 +3017,22 @@ sha1 = "bb71850690e1f136567de629d2d5471deda4c1e8"; }; } + { + name = "color_convert___color_convert_2.0.1.tgz"; + path = fetchurl { + name = "color_convert___color_convert_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/color-convert/-/color-convert-2.0.1.tgz"; + sha1 = "72d3a68d598c9bdb3af2ad1e84f21d896abd4de3"; + }; + } + { + name = "color_convert___color_convert_0.5.3.tgz"; + path = fetchurl { + name = "color_convert___color_convert_0.5.3.tgz"; + url = "https://registry.yarnpkg.com/color-convert/-/color-convert-0.5.3.tgz"; + sha1 = "bdb6c69ce660fadffe0b0007cc447e1b9f7282bd"; + }; + } { name = "color_name___color_name_1.1.3.tgz"; path = fetchurl { @@ -2929,6 +3041,14 @@ sha1 = "a7d0558bd89c42f795dd42328f740831ca53bc25"; }; } + { + name = "color_name___color_name_1.1.4.tgz"; + path = fetchurl { + name = "color_name___color_name_1.1.4.tgz"; + url = "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz"; + sha1 = "c2a09a87acbde69543de6f63fa3995c826c536a2"; + }; + } { name = "colors___colors_1.3.3.tgz"; path = fetchurl { @@ -3058,11 +3178,11 @@ }; } { - name = "configstore___configstore_3.1.1.tgz"; + name = "configstore___configstore_5.0.1.tgz"; path = fetchurl { - name = "configstore___configstore_3.1.1.tgz"; - url = "https://registry.yarnpkg.com/configstore/-/configstore-3.1.1.tgz"; - sha1 = "094ee662ab83fad9917678de114faaea8fcdca90"; + name = "configstore___configstore_5.0.1.tgz"; + url = "https://registry.yarnpkg.com/configstore/-/configstore-5.0.1.tgz"; + sha1 = "d365021b5df4b98cdd187d6a3b0e3f6a7cc5ed96"; }; } { @@ -3225,6 +3345,14 @@ sha1 = "938476569ebb6cda80d339bcf199fae4f16fff17"; }; } + { + name = "core_js_pure___core_js_pure_3.6.5.tgz"; + path = fetchurl { + name = "core_js_pure___core_js_pure_3.6.5.tgz"; + url = "https://registry.yarnpkg.com/core-js-pure/-/core-js-pure-3.6.5.tgz"; + sha1 = "c79e75f5e38dbc85a662d91eea52b8256d53b813"; + }; + } { name = "core_js___core_js_3.6.4.tgz"; path = fetchurl { @@ -3265,14 +3393,6 @@ sha1 = "888c723596cdf7612f6498233eebd7a35301737d"; }; } - { - name = "create_error_class___create_error_class_3.0.2.tgz"; - path = fetchurl { - name = "create_error_class___create_error_class_3.0.2.tgz"; - url = "https://registry.yarnpkg.com/create-error-class/-/create-error-class-3.0.2.tgz"; - sha1 = "06be7abef947a3f14a30fd610671d401bca8b7b6"; - }; - } { name = "create_hash___create_hash_1.1.3.tgz"; path = fetchurl { @@ -3289,6 +3409,14 @@ sha1 = "acb9e221a4e17bdb076e90657c42b93e3726cf06"; }; } + { + name = "cron_validator___cron_validator_1.1.1.tgz"; + path = fetchurl { + name = "cron_validator___cron_validator_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/cron-validator/-/cron-validator-1.1.1.tgz"; + sha1 = "0a27bb75508c7bc03c8b840d2d9f170eeacb5615"; + }; + } { name = "cropper___cropper_2.3.0.tgz"; path = fetchurl { @@ -3313,14 +3441,6 @@ sha1 = "1256037ecb9f0c5f79e3d6ef135e30770184b982"; }; } - { - name = "cross_spawn___cross_spawn_5.1.0.tgz"; - path = fetchurl { - name = "cross_spawn___cross_spawn_5.1.0.tgz"; - url = "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-5.1.0.tgz"; - sha1 = "e8bd0efee58fcff6f8f94510a0a554bbfa235449"; - }; - } { name = "crypt___crypt_0.0.2.tgz"; path = fetchurl { @@ -3338,11 +3458,11 @@ }; } { - name = "crypto_random_string___crypto_random_string_1.0.0.tgz"; + name = "crypto_random_string___crypto_random_string_2.0.0.tgz"; path = fetchurl { - name = "crypto_random_string___crypto_random_string_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/crypto-random-string/-/crypto-random-string-1.0.0.tgz"; - sha1 = "a230f64f568310e1498009940790ec99545bca7e"; + name = "crypto_random_string___crypto_random_string_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/crypto-random-string/-/crypto-random-string-2.0.0.tgz"; + sha1 = "ef2a7a966ec11083388369baa02ebead229b30d5"; }; } { @@ -3410,11 +3530,19 @@ }; } { - name = "cssom___cssom_0.3.4.tgz"; + name = "cssom___cssom_0.3.8.tgz"; path = fetchurl { - name = "cssom___cssom_0.3.4.tgz"; - url = "https://registry.yarnpkg.com/cssom/-/cssom-0.3.4.tgz"; - sha1 = "8cd52e8a3acfd68d3aed38ee0a640177d2f9d797"; + name = "cssom___cssom_0.3.8.tgz"; + url = "https://registry.yarnpkg.com/cssom/-/cssom-0.3.8.tgz"; + sha1 = "9f1276f5b2b463f2114d3f2c75250af8c1a36f4a"; + }; + } + { + name = "cssom___cssom_0.4.4.tgz"; + path = fetchurl { + name = "cssom___cssom_0.4.4.tgz"; + url = "https://registry.yarnpkg.com/cssom/-/cssom-0.4.4.tgz"; + sha1 = "5a66cf93d2d0b661d80bf6a44fb65f5c2e4e0a10"; }; } { @@ -3425,6 +3553,14 @@ sha1 = "18b038a9c44d65f7a8e428a653b9f6fe42faf5fb"; }; } + { + name = "cssstyle___cssstyle_2.3.0.tgz"; + path = fetchurl { + name = "cssstyle___cssstyle_2.3.0.tgz"; + url = "https://registry.yarnpkg.com/cssstyle/-/cssstyle-2.3.0.tgz"; + sha1 = "ff665a0ddbdc31864b09647f34163443d90b0852"; + }; + } { name = "currently_unhandled___currently_unhandled_0.4.1.tgz"; path = fetchurl { @@ -3625,6 +3761,14 @@ sha1 = "6642e506c6fa3a648595d2b2469788a8d12529d3"; }; } + { + name = "d3_sankey___d3_sankey_0.12.3.tgz"; + path = fetchurl { + name = "d3_sankey___d3_sankey_0.12.3.tgz"; + url = "https://registry.yarnpkg.com/d3-sankey/-/d3-sankey-0.12.3.tgz"; + sha1 = "b3c268627bd72e5d80336e8de6acbfec9d15d01d"; + }; + } { name = "d3_scale_chromatic___d3_scale_chromatic_1.3.3.tgz"; path = fetchurl { @@ -3650,11 +3794,11 @@ }; } { - name = "d3_shape___d3_shape_1.2.0.tgz"; + name = "d3_shape___d3_shape_1.3.7.tgz"; path = fetchurl { - name = "d3_shape___d3_shape_1.2.0.tgz"; - url = "https://registry.yarnpkg.com/d3-shape/-/d3-shape-1.2.0.tgz"; - sha1 = "45d01538f064bafd05ea3d6d2cb748fd8c41f777"; + name = "d3_shape___d3_shape_1.3.7.tgz"; + url = "https://registry.yarnpkg.com/d3-shape/-/d3-shape-1.3.7.tgz"; + sha1 = "df63801be07bc986bc54f63789b4fe502992b5d7"; }; } { @@ -3706,11 +3850,11 @@ }; } { - name = "d3___d3_5.15.0.tgz"; + name = "d3___d3_5.16.0.tgz"; path = fetchurl { - name = "d3___d3_5.15.0.tgz"; - url = "https://registry.yarnpkg.com/d3/-/d3-5.15.0.tgz"; - sha1 = "ffd44958e6a3cb8a59a84429c45429b8bca5677a"; + name = "d3___d3_5.16.0.tgz"; + url = "https://registry.yarnpkg.com/d3/-/d3-5.16.0.tgz"; + sha1 = "9c5e8d3b56403c79d4ed42fbd62f6113f199c877"; }; } { @@ -3745,6 +3889,14 @@ sha1 = "15ee0582baa5e22bb59c77140da8f9c76963bbfe"; }; } + { + name = "data_urls___data_urls_2.0.0.tgz"; + path = fetchurl { + name = "data_urls___data_urls_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/data-urls/-/data-urls-2.0.0.tgz"; + sha1 = "156485a72963a970f5d5821aaf642bef2bf2db9b"; + }; + } { name = "date_format___date_format_2.1.0.tgz"; path = fetchurl { @@ -3785,14 +3937,6 @@ sha1 = "5d128515df134ff327e90a4c93f4e077a536341f"; }; } - { - name = "debug___debug_3.1.0.tgz"; - path = fetchurl { - name = "debug___debug_3.1.0.tgz"; - url = "https://registry.yarnpkg.com/debug/-/debug-3.1.0.tgz"; - sha1 = "5bb5a0672628b64149566ba16819e61518c67261"; - }; - } { name = "debug___debug_3.2.6.tgz"; path = fetchurl { @@ -3809,6 +3953,14 @@ sha1 = "3b72260255109c6b589cee050f1d516139664791"; }; } + { + name = "debug___debug_3.1.0.tgz"; + path = fetchurl { + name = "debug___debug_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/debug/-/debug-3.1.0.tgz"; + sha1 = "5bb5a0672628b64149566ba16819e61518c67261"; + }; + } { name = "decamelize_keys___decamelize_keys_1.1.0.tgz"; path = fetchurl { @@ -3825,6 +3977,14 @@ sha1 = "f6534d15148269b20352e7bee26f501f9a191290"; }; } + { + name = "decimal.js___decimal.js_10.2.0.tgz"; + path = fetchurl { + name = "decimal.js___decimal.js_10.2.0.tgz"; + url = "https://registry.yarnpkg.com/decimal.js/-/decimal.js-10.2.0.tgz"; + sha1 = "39466113a9e036111d02f82489b5fd6b0b5ed231"; + }; + } { name = "deckar01_task_list___deckar01_task_list_2.3.1.tgz"; path = fetchurl { @@ -3841,6 +4001,14 @@ sha1 = "eb3913333458775cb84cd1a1fae062106bb87545"; }; } + { + name = "decompress_response___decompress_response_3.3.0.tgz"; + path = fetchurl { + name = "decompress_response___decompress_response_3.3.0.tgz"; + url = "https://registry.yarnpkg.com/decompress-response/-/decompress-response-3.3.0.tgz"; + sha1 = "80a4dd323748384bfa248083622aedec982adff3"; + }; + } { name = "deep_equal___deep_equal_1.0.1.tgz"; path = fetchurl { @@ -3889,6 +4057,14 @@ sha1 = "f5f8fbb18a7d6d50b21f641f649ebb522cfe24f7"; }; } + { + name = "defer_to_connect___defer_to_connect_1.1.3.tgz"; + path = fetchurl { + name = "defer_to_connect___defer_to_connect_1.1.3.tgz"; + url = "https://registry.yarnpkg.com/defer-to-connect/-/defer-to-connect-1.1.3.tgz"; + sha1 = "331ae050c08dcf789f8c83a7b81f0ed94f4ac591"; + }; + } { name = "define_properties___define_properties_1.1.3.tgz"; path = fetchurl { @@ -3993,14 +4169,6 @@ sha1 = "f0d66d03672a825cb1b73bdb3fe62310c8e552b7"; }; } - { - name = "detect_libc___detect_libc_1.0.3.tgz"; - path = fetchurl { - name = "detect_libc___detect_libc_1.0.3.tgz"; - url = "https://registry.yarnpkg.com/detect-libc/-/detect-libc-1.0.3.tgz"; - sha1 = "fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b"; - }; - } { name = "detect_newline___detect_newline_2.1.0.tgz"; path = fetchurl { @@ -4113,6 +4281,14 @@ sha1 = "3335d4578df6a1536a34595b91cca36dd5db61d7"; }; } + { + name = "dom_accessibility_api___dom_accessibility_api_0.4.5.tgz"; + path = fetchurl { + name = "dom_accessibility_api___dom_accessibility_api_0.4.5.tgz"; + url = "https://registry.yarnpkg.com/dom-accessibility-api/-/dom-accessibility-api-0.4.5.tgz"; + sha1 = "d9c1cefa89f509d8cf132ab5d250004d755e76e3"; + }; + } { name = "dom_event_types___dom_event_types_1.0.0.tgz"; path = fetchurl { @@ -4137,6 +4313,14 @@ sha1 = "1afb81f533717175d478655debc5e332d9f9bb51"; }; } + { + name = "dom_walk___dom_walk_0.1.2.tgz"; + path = fetchurl { + name = "dom_walk___dom_walk_0.1.2.tgz"; + url = "https://registry.yarnpkg.com/dom-walk/-/dom-walk-0.1.2.tgz"; + sha1 = "0c548bef048f4d1f2a97249002236060daa3fd84"; + }; + } { name = "domain_browser___domain_browser_1.1.7.tgz"; path = fetchurl { @@ -4169,6 +4353,14 @@ sha1 = "937442644ca6a31261ef36e3ec677fe805582c90"; }; } + { + name = "domexception___domexception_2.0.1.tgz"; + path = fetchurl { + name = "domexception___domexception_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/domexception/-/domexception-2.0.1.tgz"; + sha1 = "fb44aefba793e1574b0af6aed2801d057529f304"; + }; + } { name = "domhandler___domhandler_2.4.1.tgz"; path = fetchurl { @@ -4178,11 +4370,11 @@ }; } { - name = "domhandler___domhandler_3.0.0.tgz"; + name = "dompurify___dompurify_2.0.12.tgz"; path = fetchurl { - name = "domhandler___domhandler_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/domhandler/-/domhandler-3.0.0.tgz"; - sha1 = "51cd13efca31da95bbb0c5bee3a48300e333b3e9"; + name = "dompurify___dompurify_2.0.12.tgz"; + url = "https://registry.yarnpkg.com/dompurify/-/dompurify-2.0.12.tgz"; + sha1 = "284a2b041e1c60b8e72d7b4d2fadad36141254ae"; }; } { @@ -4193,14 +4385,6 @@ sha1 = "1958cc0b4c9426e9ed367fb1c8e854891b0fa3ff"; }; } - { - name = "domutils___domutils_2.0.0.tgz"; - path = fetchurl { - name = "domutils___domutils_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/domutils/-/domutils-2.0.0.tgz"; - sha1 = "15b8278e37bfa8468d157478c58c367718133c08"; - }; - } { name = "dot_prop___dot_prop_4.2.0.tgz"; path = fetchurl { @@ -4209,6 +4393,14 @@ sha1 = "1f19e0c2e1aa0e32797c49799f2837ac6af69c57"; }; } + { + name = "dot_prop___dot_prop_5.2.0.tgz"; + path = fetchurl { + name = "dot_prop___dot_prop_5.2.0.tgz"; + url = "https://registry.yarnpkg.com/dot-prop/-/dot-prop-5.2.0.tgz"; + sha1 = "c34ecc29556dc45f1f4c22697b6f4904e0cc4fcb"; + }; + } { name = "dropzone___dropzone_4.2.0.tgz"; path = fetchurl { @@ -4290,11 +4482,11 @@ }; } { - name = "electron_to_chromium___electron_to_chromium_1.3.360.tgz"; + name = "electron_to_chromium___electron_to_chromium_1.3.466.tgz"; path = fetchurl { - name = "electron_to_chromium___electron_to_chromium_1.3.360.tgz"; - url = "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.360.tgz"; - sha1 = "1db9cb8d43f4c772546d94ea9be8b677a8ecb483"; + name = "electron_to_chromium___electron_to_chromium_1.3.466.tgz"; + url = "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.466.tgz"; + sha1 = "89f716db3afc4bb482ea2aaaa16c4808f89f762a"; }; } { @@ -4418,11 +4610,19 @@ }; } { - name = "entities___entities_2.0.0.tgz"; + name = "entities___entities_2.0.3.tgz"; path = fetchurl { - name = "entities___entities_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/entities/-/entities-2.0.0.tgz"; - sha1 = "68d6084cab1b079767540d80e56a39b423e4abf4"; + name = "entities___entities_2.0.3.tgz"; + url = "https://registry.yarnpkg.com/entities/-/entities-2.0.3.tgz"; + sha1 = "5c487e5742ab93c15abb5da22759b8590ec03b7f"; + }; + } + { + name = "entity_decode___entity_decode_2.0.2.tgz"; + path = fetchurl { + name = "entity_decode___entity_decode_2.0.2.tgz"; + url = "https://registry.yarnpkg.com/entity-decode/-/entity-decode-2.0.2.tgz"; + sha1 = "e4f807e52c3294246e9347d1f2b02b07fd5f92e7"; }; } { @@ -4465,6 +4665,14 @@ sha1 = "010d5858423a5f118979665f46486a95c6ee2bb6"; }; } + { + name = "escape_goat___escape_goat_2.1.1.tgz"; + path = fetchurl { + name = "escape_goat___escape_goat_2.1.1.tgz"; + url = "https://registry.yarnpkg.com/escape-goat/-/escape-goat-2.1.1.tgz"; + sha1 = "1b2dc77003676c457ec760b2dc68edb648188675"; + }; + } { name = "escape_html___escape_html_1.0.3.tgz"; path = fetchurl { @@ -4490,11 +4698,11 @@ }; } { - name = "escodegen___escodegen_1.11.0.tgz"; + name = "escodegen___escodegen_1.14.2.tgz"; path = fetchurl { - name = "escodegen___escodegen_1.11.0.tgz"; - url = "https://registry.yarnpkg.com/escodegen/-/escodegen-1.11.0.tgz"; - sha1 = "b27a9389481d5bfd5bec76f7bb1eb3f8f4556589"; + name = "escodegen___escodegen_1.14.2.tgz"; + url = "https://registry.yarnpkg.com/escodegen/-/escodegen-1.14.2.tgz"; + sha1 = "14ab71bf5026c2aa08173afba22c6f3173284a84"; }; } { @@ -4673,14 +4881,6 @@ sha1 = "6c272650932b4f91c3714e5e7b5f5e2ecf47262d"; }; } - { - name = "esprima___esprima_3.1.3.tgz"; - path = fetchurl { - name = "esprima___esprima_3.1.3.tgz"; - url = "https://registry.yarnpkg.com/esprima/-/esprima-3.1.3.tgz"; - sha1 = "fdca51cee6133895e3c88d535ce49dbff62a4633"; - }; - } { name = "esprima___esprima_4.0.1.tgz"; path = fetchurl { @@ -4785,14 +4985,6 @@ sha1 = "6738de2eb7c8e671d0366aea0b0db8c6f7d7391b"; }; } - { - name = "execa___execa_0.7.0.tgz"; - path = fetchurl { - name = "execa___execa_0.7.0.tgz"; - url = "https://registry.yarnpkg.com/execa/-/execa-0.7.0.tgz"; - sha1 = "944becd34cc41ee32a63a9faf27ad5a65fc59777"; - }; - } { name = "execa___execa_1.0.0.tgz"; path = fetchurl { @@ -4898,11 +5090,11 @@ }; } { - name = "extract_files___extract_files_5.0.1.tgz"; + name = "extract_files___extract_files_8.1.0.tgz"; path = fetchurl { - name = "extract_files___extract_files_5.0.1.tgz"; - url = "https://registry.yarnpkg.com/extract-files/-/extract-files-5.0.1.tgz"; - sha1 = "c9492a8410be643e260a376f0151361993d5f659"; + name = "extract_files___extract_files_8.1.0.tgz"; + url = "https://registry.yarnpkg.com/extract-files/-/extract-files-8.1.0.tgz"; + sha1 = "46a0690d0fe77411a2e3804852adeaa65cd59288"; }; } { @@ -4921,6 +5113,14 @@ sha1 = "96918440e3041a7a414f8c52e3c574eb3c3e1e05"; }; } + { + name = "fake_xml_http_request___fake_xml_http_request_2.1.1.tgz"; + path = fetchurl { + name = "fake_xml_http_request___fake_xml_http_request_2.1.1.tgz"; + url = "https://registry.yarnpkg.com/fake-xml-http-request/-/fake-xml-http-request-2.1.1.tgz"; + sha1 = "279fdac235840d7a4dff77d98ec44bce9fc690a6"; + }; + } { name = "fast_deep_equal___fast_deep_equal_3.1.1.tgz"; path = fetchurl { @@ -5017,6 +5217,14 @@ sha1 = "cb56c070efc0e40666424309bd0d9e45ac6f2bb8"; }; } + { + name = "file_uri_to_path___file_uri_to_path_1.0.0.tgz"; + path = fetchurl { + name = "file_uri_to_path___file_uri_to_path_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz"; + sha1 = "553a7b8446ff6f684359c445f1e37a05dacc33dd"; + }; + } { name = "fileset___fileset_2.0.3.tgz"; path = fetchurl { @@ -5154,11 +5362,19 @@ }; } { - name = "follow_redirects___follow_redirects_1.5.10.tgz"; + name = "follow_redirects___follow_redirects_1.13.0.tgz"; path = fetchurl { - name = "follow_redirects___follow_redirects_1.5.10.tgz"; - url = "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.5.10.tgz"; - sha1 = "7b7a9f9aea2fdff36786a94ff643ed07f4ff5e2a"; + name = "follow_redirects___follow_redirects_1.13.0.tgz"; + url = "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.13.0.tgz"; + sha1 = "b42e8d93a2a7eea5ed88633676d6597bc8e384db"; + }; + } + { + name = "font_awesome___font_awesome_4.7.0.tgz"; + path = fetchurl { + name = "font_awesome___font_awesome_4.7.0.tgz"; + url = "https://registry.yarnpkg.com/font-awesome/-/font-awesome-4.7.0.tgz"; + sha1 = "8fa8cf0411a1a31afd07b06d2902bb9fc815a133"; }; } { @@ -5193,14 +5409,6 @@ sha1 = "d6170107e9efdc4ed30c9dc39016df942b5cb58b"; }; } - { - name = "formdata_polyfill___formdata_polyfill_3.0.19.tgz"; - path = fetchurl { - name = "formdata_polyfill___formdata_polyfill_3.0.19.tgz"; - url = "https://registry.yarnpkg.com/formdata-polyfill/-/formdata-polyfill-3.0.19.tgz"; - sha1 = "72f517db3a646a5dd8c31af0edf111fd8f1e4cee"; - }; - } { name = "forwarded___forwarded_0.1.2.tgz"; path = fetchurl { @@ -5241,14 +5449,6 @@ sha1 = "4f189c44aa123b895f722804f55ea23eadc348e9"; }; } - { - name = "fs_minipass___fs_minipass_1.2.6.tgz"; - path = fetchurl { - name = "fs_minipass___fs_minipass_1.2.6.tgz"; - url = "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-1.2.6.tgz"; - sha1 = "2c5cc30ded81282bfe8a0d7c7c1853ddeb102c07"; - }; - } { name = "fs_minipass___fs_minipass_2.0.0.tgz"; path = fetchurl { @@ -5274,19 +5474,19 @@ }; } { - name = "fsevents___fsevents_1.2.9.tgz"; + name = "fsevents___fsevents_1.2.13.tgz"; path = fetchurl { - name = "fsevents___fsevents_1.2.9.tgz"; - url = "https://registry.yarnpkg.com/fsevents/-/fsevents-1.2.9.tgz"; - sha1 = "3f5ed66583ccd6f400b5a00db6f7e861363e388f"; + name = "fsevents___fsevents_1.2.13.tgz"; + url = "https://registry.yarnpkg.com/fsevents/-/fsevents-1.2.13.tgz"; + sha1 = "f325cb0455592428bcf11b383370ef70e3bfcc38"; }; } { - name = "fsevents___fsevents_2.0.7.tgz"; + name = "fsevents___fsevents_2.1.3.tgz"; path = fetchurl { - name = "fsevents___fsevents_2.0.7.tgz"; - url = "https://registry.yarnpkg.com/fsevents/-/fsevents-2.0.7.tgz"; - sha1 = "382c9b443c6cbac4c57187cdda23aa3bf1ccfc2a"; + name = "fsevents___fsevents_2.1.3.tgz"; + url = "https://registry.yarnpkg.com/fsevents/-/fsevents-2.1.3.tgz"; + sha1 = "fb738703ae8d2f9fe900c33836ddebee8b97f23e"; }; } { @@ -5393,14 +5593,6 @@ sha1 = "122e161591e21ff4c52530305693f20e6393a398"; }; } - { - name = "get_stream___get_stream_3.0.0.tgz"; - path = fetchurl { - name = "get_stream___get_stream_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/get-stream/-/get-stream-3.0.0.tgz"; - sha1 = "8e943d1358dc37555054ecbe2edb05aa174ede14"; - }; - } { name = "get_stream___get_stream_4.1.0.tgz"; path = fetchurl { @@ -5409,6 +5601,14 @@ sha1 = "c1b255575f3dc21d59bfc79cd3d2b46b1c3a54b5"; }; } + { + name = "get_stream___get_stream_5.1.0.tgz"; + path = fetchurl { + name = "get_stream___get_stream_5.1.0.tgz"; + url = "https://registry.yarnpkg.com/get-stream/-/get-stream-5.1.0.tgz"; + sha1 = "01203cdc92597f9b909067c3e656cc1f4d3c4dc9"; + }; + } { name = "get_value___get_value_2.0.6.tgz"; path = fetchurl { @@ -5450,11 +5650,11 @@ }; } { - name = "glob_parent___glob_parent_5.0.0.tgz"; + name = "glob_parent___glob_parent_5.1.1.tgz"; path = fetchurl { - name = "glob_parent___glob_parent_5.0.0.tgz"; - url = "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.0.0.tgz"; - sha1 = "1dc99f0f39b006d3e92c2c284068382f0c20e954"; + name = "glob_parent___glob_parent_5.1.1.tgz"; + url = "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.1.tgz"; + sha1 = "b6c1ef417c4e5663ea498f1c45afac6916bbc229"; }; } { @@ -5482,11 +5682,11 @@ }; } { - name = "global_dirs___global_dirs_0.1.1.tgz"; + name = "global_dirs___global_dirs_2.0.1.tgz"; path = fetchurl { - name = "global_dirs___global_dirs_0.1.1.tgz"; - url = "https://registry.yarnpkg.com/global-dirs/-/global-dirs-0.1.1.tgz"; - sha1 = "b319c0dd4607f353f3be9cca4c72fc148c49f445"; + name = "global_dirs___global_dirs_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/global-dirs/-/global-dirs-2.0.1.tgz"; + sha1 = "acdf3bb6685bcd55cb35e8a052266569e9469201"; }; } { @@ -5521,6 +5721,14 @@ sha1 = "fc85f73064df69f50421f47f883fe5b913ba9b97"; }; } + { + name = "global___global_4.4.0.tgz"; + path = fetchurl { + name = "global___global_4.4.0.tgz"; + url = "https://registry.yarnpkg.com/global/-/global-4.4.0.tgz"; + sha1 = "3e7b105179006a323ed71aafca3e9c57a5cc6406"; + }; + } { name = "globals___globals_11.12.0.tgz"; path = fetchurl { @@ -5594,19 +5802,19 @@ }; } { - name = "got___got_6.7.1.tgz"; + name = "got___got_9.6.0.tgz"; path = fetchurl { - name = "got___got_6.7.1.tgz"; - url = "https://registry.yarnpkg.com/got/-/got-6.7.1.tgz"; - sha1 = "240cd05785a9a18e561dc1b44b41c763ef1e8db0"; + name = "got___got_9.6.0.tgz"; + url = "https://registry.yarnpkg.com/got/-/got-9.6.0.tgz"; + sha1 = "edf45e7d67f99545705de1f7bbeeeb121765ed85"; }; } { - name = "graceful_fs___graceful_fs_4.2.3.tgz"; + name = "graceful_fs___graceful_fs_4.2.4.tgz"; path = fetchurl { - name = "graceful_fs___graceful_fs_4.2.3.tgz"; - url = "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.3.tgz"; - sha1 = "4a12ff1b60376ef09862c2093edd908328be8423"; + name = "graceful_fs___graceful_fs_4.2.4.tgz"; + url = "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.4.tgz"; + sha1 = "2256bde14d3632958c465ebc96dc467ca07a29fb"; }; } { @@ -5634,11 +5842,19 @@ }; } { - name = "graphql___graphql_14.0.2.tgz"; + name = "graphql___graphql_14.7.0.tgz"; path = fetchurl { - name = "graphql___graphql_14.0.2.tgz"; - url = "https://registry.yarnpkg.com/graphql/-/graphql-14.0.2.tgz"; - sha1 = "7dded337a4c3fd2d075692323384034b357f5650"; + name = "graphql___graphql_14.7.0.tgz"; + url = "https://registry.yarnpkg.com/graphql/-/graphql-14.7.0.tgz"; + sha1 = "7fa79a80a69be4a31c27dda824dc04dac2035a72"; + }; + } + { + name = "gray_matter___gray_matter_4.0.2.tgz"; + path = fetchurl { + name = "gray_matter___gray_matter_4.0.2.tgz"; + url = "https://registry.yarnpkg.com/gray-matter/-/gray-matter-4.0.2.tgz"; + sha1 = "9aa379e3acaf421193fce7d2a28cebd4518ac454"; }; } { @@ -5777,6 +5993,14 @@ sha1 = "95b0b63fec2146619a6fe57fe75628d5a39efe4f"; }; } + { + name = "has_yarn___has_yarn_2.1.0.tgz"; + path = fetchurl { + name = "has_yarn___has_yarn_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/has-yarn/-/has-yarn-2.1.0.tgz"; + sha1 = "137e11354a7b5bf11aa5cb649cf0c6f3ff2b2e77"; + }; + } { name = "has___has_1.0.3.tgz"; path = fetchurl { @@ -5881,6 +6105,14 @@ sha1 = "e70d84b94da53aa375e11fe3a351be6642ca46f8"; }; } + { + name = "html_encoding_sniffer___html_encoding_sniffer_2.0.1.tgz"; + path = fetchurl { + name = "html_encoding_sniffer___html_encoding_sniffer_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/html-encoding-sniffer/-/html-encoding-sniffer-2.0.1.tgz"; + sha1 = "42a6dc4fd33f00281176e8b23759ca4e4fa185f3"; + }; + } { name = "html_entities___html_entities_1.2.1.tgz"; path = fetchurl { @@ -5922,11 +6154,11 @@ }; } { - name = "htmlparser2___htmlparser2_4.1.0.tgz"; + name = "http_cache_semantics___http_cache_semantics_4.1.0.tgz"; path = fetchurl { - name = "htmlparser2___htmlparser2_4.1.0.tgz"; - url = "https://registry.yarnpkg.com/htmlparser2/-/htmlparser2-4.1.0.tgz"; - sha1 = "9a4ef161f2e4625ebf7dfbe6c0a2f52d18a59e78"; + name = "http_cache_semantics___http_cache_semantics_4.1.0.tgz"; + url = "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-4.1.0.tgz"; + sha1 = "49e91c5cbf36c9b94bcfcd71c23d5249ec74e390"; }; } { @@ -6033,14 +6265,6 @@ sha1 = "48ca6d72f6c6a3af00a9ad4ae6876be3889e2b09"; }; } - { - name = "ignore_walk___ignore_walk_3.0.1.tgz"; - path = fetchurl { - name = "ignore_walk___ignore_walk_3.0.1.tgz"; - url = "https://registry.yarnpkg.com/ignore-walk/-/ignore-walk-3.0.1.tgz"; - sha1 = "a83e62e7d272ac0e3b551aaa82831a19b69f82f8"; - }; - } { name = "ignore___ignore_3.3.10.tgz"; path = fetchurl { @@ -6058,11 +6282,11 @@ }; } { - name = "ignore___ignore_5.1.2.tgz"; + name = "ignore___ignore_5.1.8.tgz"; path = fetchurl { - name = "ignore___ignore_5.1.2.tgz"; - url = "https://registry.yarnpkg.com/ignore/-/ignore-5.1.2.tgz"; - sha1 = "e28e584d43ad7e92f96995019cc43b9e1ac49558"; + name = "ignore___ignore_5.1.8.tgz"; + url = "https://registry.yarnpkg.com/ignore/-/ignore-5.1.8.tgz"; + sha1 = "f150a8b50a34289b33e22f5889abd4d8016f0e57"; }; } { @@ -6074,11 +6298,11 @@ }; } { - name = "immer___immer_5.2.1.tgz"; + name = "immer___immer_7.0.7.tgz"; path = fetchurl { - name = "immer___immer_5.2.1.tgz"; - url = "https://registry.yarnpkg.com/immer/-/immer-5.2.1.tgz"; - sha1 = "7d4f74c242178e87151d595f48db1b5c51580485"; + name = "immer___immer_7.0.7.tgz"; + url = "https://registry.yarnpkg.com/immer/-/immer-7.0.7.tgz"; + sha1 = "9dfe713d49bf871cc59aedfce59b1992fa37a977"; }; } { @@ -6193,6 +6417,14 @@ sha1 = "c4cefcaa8e51051c2a40ba2ce8a3d27295af9467"; }; } + { + name = "inflected___inflected_2.0.4.tgz"; + path = fetchurl { + name = "inflected___inflected_2.0.4.tgz"; + url = "https://registry.yarnpkg.com/inflected/-/inflected-2.0.4.tgz"; + sha1 = "323770961ccbe992a98ea930512e9a82d3d3ef77"; + }; + } { name = "inflight___inflight_1.0.6.tgz"; path = fetchurl { @@ -6297,6 +6529,14 @@ sha1 = "37df74e430a0e47550fe54a2defe30d8acd95f65"; }; } + { + name = "ipaddr.js___ipaddr.js_1.9.1.tgz"; + path = fetchurl { + name = "ipaddr.js___ipaddr.js_1.9.1.tgz"; + url = "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.9.1.tgz"; + sha1 = "bff38543eeb8984825079ff3a2a8e6cbd46781b3"; + }; + } { name = "is_absolute_url___is_absolute_url_3.0.3.tgz"; path = fetchurl { @@ -6353,14 +6593,6 @@ sha1 = "77c99840527aa8ecb1a8ba697b80645a7a926a9d"; }; } - { - name = "is_binary_path___is_binary_path_1.0.1.tgz"; - path = fetchurl { - name = "is_binary_path___is_binary_path_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/is-binary-path/-/is-binary-path-1.0.1.tgz"; - sha1 = "75f16642b480f187a711c814161fd3a4a7655898"; - }; - } { name = "is_binary_path___is_binary_path_2.1.0.tgz"; path = fetchurl { @@ -6393,14 +6625,6 @@ sha1 = "f7e46b596890456db74e7f6e976cb3273d06faab"; }; } - { - name = "is_ci___is_ci_1.2.1.tgz"; - path = fetchurl { - name = "is_ci___is_ci_1.2.1.tgz"; - url = "https://registry.yarnpkg.com/is-ci/-/is-ci-1.2.1.tgz"; - sha1 = "e3779c8ee17fccf428488f6e281187f2e632841c"; - }; - } { name = "is_ci___is_ci_2.0.0.tgz"; path = fetchurl { @@ -6554,19 +6778,19 @@ }; } { - name = "is_installed_globally___is_installed_globally_0.1.0.tgz"; + name = "is_installed_globally___is_installed_globally_0.3.2.tgz"; path = fetchurl { - name = "is_installed_globally___is_installed_globally_0.1.0.tgz"; - url = "https://registry.yarnpkg.com/is-installed-globally/-/is-installed-globally-0.1.0.tgz"; - sha1 = "0dfd98f5a9111716dd535dda6492f67bf3d25a80"; + name = "is_installed_globally___is_installed_globally_0.3.2.tgz"; + url = "https://registry.yarnpkg.com/is-installed-globally/-/is-installed-globally-0.3.2.tgz"; + sha1 = "fd3efa79ee670d1187233182d5b0a1dd00313141"; }; } { - name = "is_npm___is_npm_1.0.0.tgz"; + name = "is_npm___is_npm_4.0.0.tgz"; path = fetchurl { - name = "is_npm___is_npm_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/is-npm/-/is-npm-1.0.0.tgz"; - sha1 = "f2fb63a65e4905b406c86072765a1a4dc793b9f4"; + name = "is_npm___is_npm_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/is-npm/-/is-npm-4.0.0.tgz"; + sha1 = "c90dd8380696df87a7a6d823c20d0b12bbe3c84d"; }; } { @@ -6593,6 +6817,14 @@ sha1 = "3e4729ac1f5fde025cd7d83a896dab9f4f67db0f"; }; } + { + name = "is_obj___is_obj_2.0.0.tgz"; + path = fetchurl { + name = "is_obj___is_obj_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/is-obj/-/is-obj-2.0.0.tgz"; + sha1 = "473fb05d973705e3fd9620545018ca8e22ef4982"; + }; + } { name = "is_path_cwd___is_path_cwd_2.2.0.tgz"; path = fetchurl { @@ -6609,14 +6841,6 @@ sha1 = "bfe2dca26c69f397265a4009963602935a053acb"; }; } - { - name = "is_path_inside___is_path_inside_1.0.0.tgz"; - path = fetchurl { - name = "is_path_inside___is_path_inside_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-1.0.0.tgz"; - sha1 = "fc06e5a1683fbda13de667aff717bbc10a48f37f"; - }; - } { name = "is_path_inside___is_path_inside_2.1.0.tgz"; path = fetchurl { @@ -6625,6 +6849,14 @@ sha1 = "7c9810587d659a40d27bcdb4d5616eab059494b2"; }; } + { + name = "is_path_inside___is_path_inside_3.0.2.tgz"; + path = fetchurl { + name = "is_path_inside___is_path_inside_3.0.2.tgz"; + url = "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-3.0.2.tgz"; + sha1 = "f5220fc82a3e233757291dddc9c5877f2a1f3017"; + }; + } { name = "is_plain_obj___is_plain_obj_1.1.0.tgz"; path = fetchurl { @@ -6641,6 +6873,14 @@ sha1 = "2c163b3fafb1b606d9d17928f05c2a1c38e07677"; }; } + { + name = "is_potential_custom_element_name___is_potential_custom_element_name_1.0.0.tgz"; + path = fetchurl { + name = "is_potential_custom_element_name___is_potential_custom_element_name_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.0.tgz"; + sha1 = "0c52e54bcca391bb2c494b21e8626d7336c6e397"; + }; + } { name = "is_promise___is_promise_2.1.0.tgz"; path = fetchurl { @@ -6649,14 +6889,6 @@ sha1 = "79a2a9ece7f096e80f36d2b2f3bc16c1ff4bf3fa"; }; } - { - name = "is_redirect___is_redirect_1.0.0.tgz"; - path = fetchurl { - name = "is_redirect___is_redirect_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/is-redirect/-/is-redirect-1.0.0.tgz"; - sha1 = "1d03dded53bd8db0f30c26e4f95d36fc7c87dc24"; - }; - } { name = "is_regex___is_regex_1.0.5.tgz"; path = fetchurl { @@ -6681,14 +6913,6 @@ sha1 = "cd734a56864e23b956bf4e7c66c396a4c0b22c2d"; }; } - { - name = "is_retry_allowed___is_retry_allowed_1.1.0.tgz"; - path = fetchurl { - name = "is_retry_allowed___is_retry_allowed_1.1.0.tgz"; - url = "https://registry.yarnpkg.com/is-retry-allowed/-/is-retry-allowed-1.1.0.tgz"; - sha1 = "11a060568b67339444033d0125a61a20d564fb34"; - }; - } { name = "is_stream___is_stream_1.1.0.tgz"; path = fetchurl { @@ -6761,6 +6985,14 @@ sha1 = "1f16e4aa22b04d1336b66188a66af3c600c3a66d"; }; } + { + name = "is_yarn_global___is_yarn_global_0.3.0.tgz"; + path = fetchurl { + name = "is_yarn_global___is_yarn_global_0.3.0.tgz"; + url = "https://registry.yarnpkg.com/is-yarn-global/-/is-yarn-global-0.3.0.tgz"; + sha1 = "d502d3382590ea3004893746754c89139973e232"; + }; + } { name = "isarray___isarray_1.0.0.tgz"; path = fetchurl { @@ -7001,6 +7233,14 @@ sha1 = "a05fd2bf94ddc0b1da66c6d13ec2457f35e52775"; }; } + { + name = "jest_environment_jsdom_sixteen___jest_environment_jsdom_sixteen_1.0.3.tgz"; + path = fetchurl { + name = "jest_environment_jsdom_sixteen___jest_environment_jsdom_sixteen_1.0.3.tgz"; + url = "https://registry.yarnpkg.com/jest-environment-jsdom-sixteen/-/jest-environment-jsdom-sixteen-1.0.3.tgz"; + sha1 = "e222228fac537ef15cca5ad470b19b47d9690165"; + }; + } { name = "jest_environment_jsdom___jest_environment_jsdom_24.8.0.tgz"; path = fetchurl { @@ -7073,6 +7313,14 @@ sha1 = "0d6891e72a4beacc0292b638685df42e28d6218b"; }; } + { + name = "jest_message_util___jest_message_util_25.5.0.tgz"; + path = fetchurl { + name = "jest_message_util___jest_message_util_25.5.0.tgz"; + url = "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-25.5.0.tgz"; + sha1 = "ea11d93204cc7ae97456e1d8716251185b8880ea"; + }; + } { name = "jest_mock___jest_mock_24.8.0.tgz"; path = fetchurl { @@ -7081,6 +7329,14 @@ sha1 = "2f9d14d37699e863f1febf4e4d5a33b7fdbbde56"; }; } + { + name = "jest_mock___jest_mock_25.5.0.tgz"; + path = fetchurl { + name = "jest_mock___jest_mock_25.5.0.tgz"; + url = "https://registry.yarnpkg.com/jest-mock/-/jest-mock-25.5.0.tgz"; + sha1 = "a91a54dabd14e37ecd61665d6b6e06360a55387a"; + }; + } { name = "jest_pnp_resolver___jest_pnp_resolver_1.2.1.tgz"; path = fetchurl { @@ -7161,6 +7417,14 @@ sha1 = "41f0e945da11df44cc76d64ffb915d0716f46cd1"; }; } + { + name = "jest_util___jest_util_25.5.0.tgz"; + path = fetchurl { + name = "jest_util___jest_util_25.5.0.tgz"; + url = "https://registry.yarnpkg.com/jest-util/-/jest-util-25.5.0.tgz"; + sha1 = "31c63b5d6e901274d264a4fec849230aa3fa35b0"; + }; + } { name = "jest_validate___jest_validate_24.8.0.tgz"; path = fetchurl { @@ -7226,11 +7490,11 @@ }; } { - name = "jquery___jquery_3.4.1.tgz"; + name = "jquery___jquery_3.5.1.tgz"; path = fetchurl { - name = "jquery___jquery_3.4.1.tgz"; - url = "https://registry.yarnpkg.com/jquery/-/jquery-3.4.1.tgz"; - sha1 = "714f1f8d9dde4bdfa55764ba37ef214630d80ef2"; + name = "jquery___jquery_3.5.1.tgz"; + url = "https://registry.yarnpkg.com/jquery/-/jquery-3.5.1.tgz"; + sha1 = "d7b4d08e1bfdb86ad2f1a3d039ea17304717abb5"; }; } { @@ -7313,6 +7577,14 @@ sha1 = "1a80d40ddd378a1de59656e9e6dc5a3ba8657bc8"; }; } + { + name = "jsdom___jsdom_16.2.2.tgz"; + path = fetchurl { + name = "jsdom___jsdom_16.2.2.tgz"; + url = "https://registry.yarnpkg.com/jsdom/-/jsdom-16.2.2.tgz"; + sha1 = "76f2f7541646beb46a938f5dc476b88705bedf2b"; + }; + } { name = "jsesc___jsesc_2.5.2.tgz"; path = fetchurl { @@ -7329,6 +7601,14 @@ sha1 = "e7dee66e35d6fc16f710fe91d5cf69f70f08911d"; }; } + { + name = "json_buffer___json_buffer_3.0.0.tgz"; + path = fetchurl { + name = "json_buffer___json_buffer_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/json-buffer/-/json-buffer-3.0.0.tgz"; + sha1 = "5b1f397afc75d677bde8bcfc0e47e1f9a3d9a898"; + }; + } { name = "json_parse_better_errors___json_parse_better_errors_1.0.2.tgz"; path = fetchurl { @@ -7378,11 +7658,11 @@ }; } { - name = "json5___json5_2.1.0.tgz"; + name = "json5___json5_2.1.3.tgz"; path = fetchurl { - name = "json5___json5_2.1.0.tgz"; - url = "https://registry.yarnpkg.com/json5/-/json5-2.1.0.tgz"; - sha1 = "e7a0c62c48285c628d20a10b85c89bb807c32850"; + name = "json5___json5_2.1.3.tgz"; + url = "https://registry.yarnpkg.com/json5/-/json5-2.1.3.tgz"; + sha1 = "c9b0f7fa9233bfe5807fe66fcf3a5617ed597d43"; }; } { @@ -7393,6 +7673,14 @@ sha1 = "779fb0018604fa854eacbf6252180d83543e3dbe"; }; } + { + name = "jsonc_parser___jsonc_parser_2.2.1.tgz"; + path = fetchurl { + name = "jsonc_parser___jsonc_parser_2.2.1.tgz"; + url = "https://registry.yarnpkg.com/jsonc-parser/-/jsonc-parser-2.2.1.tgz"; + sha1 = "db73cd59d78cce28723199466b2a03d1be1df2bc"; + }; + } { name = "jsonfile___jsonfile_4.0.0.tgz"; path = fetchurl { @@ -7497,6 +7785,14 @@ sha1 = "da562e5d0d5cc3aa602e27af8a9b8710bfbce765"; }; } + { + name = "keyv___keyv_3.1.0.tgz"; + path = fetchurl { + name = "keyv___keyv_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/keyv/-/keyv-3.1.0.tgz"; + sha1 = "ecc228486f69991e49e9476485a5be1e8fc5c4d9"; + }; + } { name = "killable___killable_1.0.1.tgz"; path = fetchurl { @@ -7562,11 +7858,11 @@ }; } { - name = "latest_version___latest_version_3.1.0.tgz"; + name = "latest_version___latest_version_5.1.0.tgz"; path = fetchurl { - name = "latest_version___latest_version_3.1.0.tgz"; - url = "https://registry.yarnpkg.com/latest-version/-/latest-version-3.1.0.tgz"; - sha1 = "a205383fea322b33b5ae3b18abee0dc2f356ee15"; + name = "latest_version___latest_version_5.1.0.tgz"; + url = "https://registry.yarnpkg.com/latest-version/-/latest-version-5.1.0.tgz"; + sha1 = "119dfe908fe38d15dfa43ecd13fa12ec8832face"; }; } { @@ -7721,6 +8017,14 @@ sha1 = "1afba396afd676a6d42504d0a67a3a7eb9f62aa0"; }; } + { + name = "lodash.assign___lodash.assign_4.2.0.tgz"; + path = fetchurl { + name = "lodash.assign___lodash.assign_4.2.0.tgz"; + url = "https://registry.yarnpkg.com/lodash.assign/-/lodash.assign-4.2.0.tgz"; + sha1 = "0d99f3ccd7a6d261d19bdaeb9245005d285808e7"; + }; + } { name = "lodash.camelcase___lodash.camelcase_4.3.0.tgz"; path = fetchurl { @@ -7737,6 +8041,14 @@ sha1 = "e23f3f9c4f8fbdde872529c1071857a086e5ccef"; }; } + { + name = "lodash.compact___lodash.compact_3.0.1.tgz"; + path = fetchurl { + name = "lodash.compact___lodash.compact_3.0.1.tgz"; + url = "https://registry.yarnpkg.com/lodash.compact/-/lodash.compact-3.0.1.tgz"; + sha1 = "540ce3837745975807471e16b4a2ba21e7256ca5"; + }; + } { name = "lodash.differencewith___lodash.differencewith_4.5.0.tgz"; path = fetchurl { @@ -7746,11 +8058,11 @@ }; } { - name = "lodash.escaperegexp___lodash.escaperegexp_4.1.2.tgz"; + name = "lodash.find___lodash.find_4.6.0.tgz"; path = fetchurl { - name = "lodash.escaperegexp___lodash.escaperegexp_4.1.2.tgz"; - url = "https://registry.yarnpkg.com/lodash.escaperegexp/-/lodash.escaperegexp-4.1.2.tgz"; - sha1 = "64762c48618082518ac3df4ccf5d5886dae20347"; + name = "lodash.find___lodash.find_4.6.0.tgz"; + url = "https://registry.yarnpkg.com/lodash.find/-/lodash.find-4.6.0.tgz"; + sha1 = "cb0704d47ab71789ffa0de8b97dd926fb88b13b1"; }; } { @@ -7761,6 +8073,46 @@ sha1 = "f31c22225a9632d2bbf8e4addbef240aa765a61f"; }; } + { + name = "lodash.forin___lodash.forin_4.4.0.tgz"; + path = fetchurl { + name = "lodash.forin___lodash.forin_4.4.0.tgz"; + url = "https://registry.yarnpkg.com/lodash.forin/-/lodash.forin-4.4.0.tgz"; + sha1 = "5d3f20ae564011fbe88381f7d98949c9c9519731"; + }; + } + { + name = "lodash.get___lodash.get_4.4.2.tgz"; + path = fetchurl { + name = "lodash.get___lodash.get_4.4.2.tgz"; + url = "https://registry.yarnpkg.com/lodash.get/-/lodash.get-4.4.2.tgz"; + sha1 = "2d177f652fa31e939b4438d5341499dfa3825e99"; + }; + } + { + name = "lodash.has___lodash.has_4.5.2.tgz"; + path = fetchurl { + name = "lodash.has___lodash.has_4.5.2.tgz"; + url = "https://registry.yarnpkg.com/lodash.has/-/lodash.has-4.5.2.tgz"; + sha1 = "d19f4dc1095058cccbe2b0cdf4ee0fe4aa37c862"; + }; + } + { + name = "lodash.invokemap___lodash.invokemap_4.6.0.tgz"; + path = fetchurl { + name = "lodash.invokemap___lodash.invokemap_4.6.0.tgz"; + url = "https://registry.yarnpkg.com/lodash.invokemap/-/lodash.invokemap-4.6.0.tgz"; + sha1 = "1748cda5d8b0ef8369c4eb3ec54c21feba1f2d62"; + }; + } + { + name = "lodash.isempty___lodash.isempty_4.4.0.tgz"; + path = fetchurl { + name = "lodash.isempty___lodash.isempty_4.4.0.tgz"; + url = "https://registry.yarnpkg.com/lodash.isempty/-/lodash.isempty-4.4.0.tgz"; + sha1 = "6f86cbedd8be4ec987be9aaf33c9684db1b31e7e"; + }; + } { name = "lodash.isequal___lodash.isequal_4.5.0.tgz"; path = fetchurl { @@ -7769,6 +8121,22 @@ sha1 = "415c4478f2bcc30120c22ce10ed3226f7d3e18e0"; }; } + { + name = "lodash.isfunction___lodash.isfunction_3.0.9.tgz"; + path = fetchurl { + name = "lodash.isfunction___lodash.isfunction_3.0.9.tgz"; + url = "https://registry.yarnpkg.com/lodash.isfunction/-/lodash.isfunction-3.0.9.tgz"; + sha1 = "06de25df4db327ac931981d1bdb067e5af68d051"; + }; + } + { + name = "lodash.isinteger___lodash.isinteger_4.0.4.tgz"; + path = fetchurl { + name = "lodash.isinteger___lodash.isinteger_4.0.4.tgz"; + url = "https://registry.yarnpkg.com/lodash.isinteger/-/lodash.isinteger-4.0.4.tgz"; + sha1 = "619c0af3d03f8b04c31f5882840b77b11cd68343"; + }; + } { name = "lodash.isplainobject___lodash.isplainobject_4.0.6.tgz"; path = fetchurl { @@ -7777,14 +8145,6 @@ sha1 = "7c526a52d89b45c45cc690b88163be0497f550cb"; }; } - { - name = "lodash.isstring___lodash.isstring_4.0.1.tgz"; - path = fetchurl { - name = "lodash.isstring___lodash.isstring_4.0.1.tgz"; - url = "https://registry.yarnpkg.com/lodash.isstring/-/lodash.isstring-4.0.1.tgz"; - sha1 = "d527dfb5456eca7cc9bb95d5daeaf88ba54a5451"; - }; - } { name = "lodash.kebabcase___lodash.kebabcase_4.1.1.tgz"; path = fetchurl { @@ -7794,11 +8154,35 @@ }; } { - name = "lodash.mergewith___lodash.mergewith_4.6.2.tgz"; + name = "lodash.lowerfirst___lodash.lowerfirst_4.3.1.tgz"; path = fetchurl { - name = "lodash.mergewith___lodash.mergewith_4.6.2.tgz"; - url = "https://registry.yarnpkg.com/lodash.mergewith/-/lodash.mergewith-4.6.2.tgz"; - sha1 = "617121f89ac55f59047c7aec1ccd6654c6590f55"; + name = "lodash.lowerfirst___lodash.lowerfirst_4.3.1.tgz"; + url = "https://registry.yarnpkg.com/lodash.lowerfirst/-/lodash.lowerfirst-4.3.1.tgz"; + sha1 = "de3c7b12e02c6524a0059c2f6cb7c5c52655a13d"; + }; + } + { + name = "lodash.map___lodash.map_4.6.0.tgz"; + path = fetchurl { + name = "lodash.map___lodash.map_4.6.0.tgz"; + url = "https://registry.yarnpkg.com/lodash.map/-/lodash.map-4.6.0.tgz"; + sha1 = "771ec7839e3473d9c4cde28b19394c3562f4f6d3"; + }; + } + { + name = "lodash.mapvalues___lodash.mapvalues_4.6.0.tgz"; + path = fetchurl { + name = "lodash.mapvalues___lodash.mapvalues_4.6.0.tgz"; + url = "https://registry.yarnpkg.com/lodash.mapvalues/-/lodash.mapvalues-4.6.0.tgz"; + sha1 = "1bafa5005de9dd6f4f26668c30ca37230cc9689c"; + }; + } + { + name = "lodash.pick___lodash.pick_4.4.0.tgz"; + path = fetchurl { + name = "lodash.pick___lodash.pick_4.4.0.tgz"; + url = "https://registry.yarnpkg.com/lodash.pick/-/lodash.pick-4.4.0.tgz"; + sha1 = "52f05610fff9ded422611441ed1fc123a03001b3"; }; } { @@ -7817,6 +8201,22 @@ sha1 = "edd14c824e2cc9c1e0b0a1b42bb5210516a42438"; }; } + { + name = "lodash.uniq___lodash.uniq_4.5.0.tgz"; + path = fetchurl { + name = "lodash.uniq___lodash.uniq_4.5.0.tgz"; + url = "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz"; + sha1 = "d0225373aeb652adc1bc82e4945339a842754773"; + }; + } + { + name = "lodash.uniqby___lodash.uniqby_4.7.0.tgz"; + path = fetchurl { + name = "lodash.uniqby___lodash.uniqby_4.7.0.tgz"; + url = "https://registry.yarnpkg.com/lodash.uniqby/-/lodash.uniqby-4.7.0.tgz"; + sha1 = "d99c07a669e9e6d24e1362dfe266c67616af1302"; + }; + } { name = "lodash.upperfirst___lodash.upperfirst_4.3.1.tgz"; path = fetchurl { @@ -7826,11 +8226,19 @@ }; } { - name = "lodash___lodash_4.17.15.tgz"; + name = "lodash.values___lodash.values_4.3.0.tgz"; path = fetchurl { - name = "lodash___lodash_4.17.15.tgz"; - url = "https://registry.yarnpkg.com/lodash/-/lodash-4.17.15.tgz"; - sha1 = "b447f6670a0455bbfeedd11392eff330ea097548"; + name = "lodash.values___lodash.values_4.3.0.tgz"; + url = "https://registry.yarnpkg.com/lodash.values/-/lodash.values-4.3.0.tgz"; + sha1 = "a3a6c2b0ebecc5c2cba1c17e6e620fe81b53d347"; + }; + } + { + name = "lodash___lodash_4.17.20.tgz"; + path = fetchurl { + name = "lodash___lodash_4.17.20.tgz"; + url = "https://registry.yarnpkg.com/lodash/-/lodash-4.17.20.tgz"; + sha1 = "b44a9b6297bcb698f1c51a3545a2b3b368d59c52"; }; } { @@ -7865,6 +8273,14 @@ sha1 = "b3e034233188c68b889f5b862415306f565e2c56"; }; } + { + name = "lolex___lolex_5.1.2.tgz"; + path = fetchurl { + name = "lolex___lolex_5.1.2.tgz"; + url = "https://registry.yarnpkg.com/lolex/-/lolex-5.1.2.tgz"; + sha1 = "953694d098ce7c07bc5ed6d0e42bc6c0c6d5a367"; + }; + } { name = "longest_streak___longest_streak_2.0.2.tgz"; path = fetchurl { @@ -7898,11 +8314,19 @@ }; } { - name = "lowercase_keys___lowercase_keys_1.0.0.tgz"; + name = "lowercase_keys___lowercase_keys_1.0.1.tgz"; path = fetchurl { - name = "lowercase_keys___lowercase_keys_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-1.0.0.tgz"; - sha1 = "4e3366b39e7f5457e35f1324bdf6f88d0bfc7306"; + name = "lowercase_keys___lowercase_keys_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-1.0.1.tgz"; + sha1 = "6f9e30b47084d971a7c820ff15a6c5167b74c26f"; + }; + } + { + name = "lowercase_keys___lowercase_keys_2.0.0.tgz"; + path = fetchurl { + name = "lowercase_keys___lowercase_keys_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-2.0.0.tgz"; + sha1 = "2603e78b7b4b0006cbca2fbcc8a3202558ac9479"; }; } { @@ -7937,14 +8361,6 @@ sha1 = "c0d8eaf36059f705796e1e344811cf4c498d3a26"; }; } - { - name = "make_dir___make_dir_1.3.0.tgz"; - path = fetchurl { - name = "make_dir___make_dir_1.3.0.tgz"; - url = "https://registry.yarnpkg.com/make-dir/-/make-dir-1.3.0.tgz"; - sha1 = "79c1033b80515bd6d24ec9933e860ca75ee27f0c"; - }; - } { name = "make_dir___make_dir_2.1.0.tgz"; path = fetchurl { @@ -8034,11 +8450,11 @@ }; } { - name = "markdown_it___markdown_it_9.0.1.tgz"; + name = "markdown_it___markdown_it_10.0.0.tgz"; path = fetchurl { - name = "markdown_it___markdown_it_9.0.1.tgz"; - url = "https://registry.yarnpkg.com/markdown-it/-/markdown-it-9.0.1.tgz"; - sha1 = "aafe363c43718720b6575fd10625cde6e4ff2d47"; + name = "markdown_it___markdown_it_10.0.0.tgz"; + url = "https://registry.yarnpkg.com/markdown-it/-/markdown-it-10.0.0.tgz"; + sha1 = "abfc64f141b1722d663402044e43927f1f50a8dc"; }; } { @@ -8058,19 +8474,27 @@ }; } { - name = "markdownlint_cli___markdownlint_cli_0.18.0.tgz"; + name = "markdownlint_cli___markdownlint_cli_0.23.2.tgz"; path = fetchurl { - name = "markdownlint_cli___markdownlint_cli_0.18.0.tgz"; - url = "https://registry.yarnpkg.com/markdownlint-cli/-/markdownlint-cli-0.18.0.tgz"; - sha1 = "bd1cee72739049d42dcea5f6db0c0f57c6eb8096"; + name = "markdownlint_cli___markdownlint_cli_0.23.2.tgz"; + url = "https://registry.yarnpkg.com/markdownlint-cli/-/markdownlint-cli-0.23.2.tgz"; + sha1 = "43f0a96e2699542b74fb5e6188c025e4934357fc"; }; } { - name = "markdownlint___markdownlint_0.16.0.tgz"; + name = "markdownlint_rule_helpers___markdownlint_rule_helpers_0.11.0.tgz"; path = fetchurl { - name = "markdownlint___markdownlint_0.16.0.tgz"; - url = "https://registry.yarnpkg.com/markdownlint/-/markdownlint-0.16.0.tgz"; - sha1 = "69f73cc755a44231fbe5dc7c37a5909cedc0ac6e"; + name = "markdownlint_rule_helpers___markdownlint_rule_helpers_0.11.0.tgz"; + url = "https://registry.yarnpkg.com/markdownlint-rule-helpers/-/markdownlint-rule-helpers-0.11.0.tgz"; + sha1 = "faaaae4337771c7d88ca38ef6265afb4fbe0fb3f"; + }; + } + { + name = "markdownlint___markdownlint_0.20.4.tgz"; + path = fetchurl { + name = "markdownlint___markdownlint_0.20.4.tgz"; + url = "https://registry.yarnpkg.com/markdownlint/-/markdownlint-0.20.4.tgz"; + sha1 = "3b34681494cdad174e14a27182b5cdefaa537823"; }; } { @@ -8202,11 +8626,19 @@ }; } { - name = "mermaid___mermaid_8.4.8.tgz"; + name = "mermaid___mermaid_8.5.2.tgz"; path = fetchurl { - name = "mermaid___mermaid_8.4.8.tgz"; - url = "https://registry.yarnpkg.com/mermaid/-/mermaid-8.4.8.tgz"; - sha1 = "8adcfdbc505d6bca52df167cff690427c9727b60"; + name = "mermaid___mermaid_8.5.2.tgz"; + url = "https://registry.yarnpkg.com/mermaid/-/mermaid-8.5.2.tgz"; + sha1 = "0f1914cda53d4ea5377380e5ce07a38bef2ea7e8"; + }; + } + { + name = "mersenne_twister___mersenne_twister_1.1.0.tgz"; + path = fetchurl { + name = "mersenne_twister___mersenne_twister_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/mersenne-twister/-/mersenne-twister-1.1.0.tgz"; + sha1 = "f916618ee43d7179efcf641bec4531eb9670978a"; }; } { @@ -8281,6 +8713,22 @@ sha1 = "7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b"; }; } + { + name = "mimic_response___mimic_response_1.0.1.tgz"; + path = fetchurl { + name = "mimic_response___mimic_response_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/mimic-response/-/mimic-response-1.0.1.tgz"; + sha1 = "4923538878eef42063cb8a3e3b0798781487ab1b"; + }; + } + { + name = "min_document___min_document_2.19.0.tgz"; + path = fetchurl { + name = "min_document___min_document_2.19.0.tgz"; + url = "https://registry.yarnpkg.com/min-document/-/min-document-2.19.0.tgz"; + sha1 = "7bd282e3f5842ed295bb748cdd9f1ffa2c824685"; + }; + } { name = "minify___minify_4.1.2.tgz"; path = fetchurl { @@ -8338,11 +8786,11 @@ }; } { - name = "minimist___minimist_1.2.0.tgz"; + name = "minimist___minimist_1.2.5.tgz"; path = fetchurl { - name = "minimist___minimist_1.2.0.tgz"; - url = "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz"; - sha1 = "a35008b20f41383eec1fb914f4cd5df79a264284"; + name = "minimist___minimist_1.2.5.tgz"; + url = "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz"; + sha1 = "67d66014b66a6a8aaa0c083c5fd58df4e4e97602"; }; } { @@ -8369,14 +8817,6 @@ sha1 = "3dcb6bb4a546e32969c7ad710f2c79a86abba93a"; }; } - { - name = "minipass___minipass_2.3.5.tgz"; - path = fetchurl { - name = "minipass___minipass_2.3.5.tgz"; - url = "https://registry.yarnpkg.com/minipass/-/minipass-2.3.5.tgz"; - sha1 = "cacebe492022497f656b0f0f51e2682a9ed2d848"; - }; - } { name = "minipass___minipass_3.1.1.tgz"; path = fetchurl { @@ -8386,11 +8826,11 @@ }; } { - name = "minizlib___minizlib_1.2.1.tgz"; + name = "miragejs___miragejs_0.1.40.tgz"; path = fetchurl { - name = "minizlib___minizlib_1.2.1.tgz"; - url = "https://registry.yarnpkg.com/minizlib/-/minizlib-1.2.1.tgz"; - sha1 = "dd27ea6136243c7c880684e8672bb3a45fd9b614"; + name = "miragejs___miragejs_0.1.40.tgz"; + url = "https://registry.yarnpkg.com/miragejs/-/miragejs-0.1.40.tgz"; + sha1 = "5bcba7634312c012748ae7f294e1516b74b37182"; }; } { @@ -8401,14 +8841,6 @@ sha1 = "ea0a3291f97e0b5e8776b363d5f0a12d94c67022"; }; } - { - name = "mitt___mitt_1.2.0.tgz"; - path = fetchurl { - name = "mitt___mitt_1.2.0.tgz"; - url = "https://registry.yarnpkg.com/mitt/-/mitt-1.2.0.tgz"; - sha1 = "cb24e6569c806e31bd4e3995787fe38a04fdf90d"; - }; - } { name = "mixin_deep___mixin_deep_1.3.2.tgz"; path = fetchurl { @@ -8425,6 +8857,14 @@ sha1 = "30057438eac6cf7f8c4767f38648d6697d75c903"; }; } + { + name = "mock_apollo_client___mock_apollo_client_0.4.0.tgz"; + path = fetchurl { + name = "mock_apollo_client___mock_apollo_client_0.4.0.tgz"; + url = "https://registry.yarnpkg.com/mock-apollo-client/-/mock-apollo-client-0.4.0.tgz"; + sha1 = "556a6090b1816dbf07e51093b652aca84aee979e"; + }; + } { name = "moment_mini___moment_mini_2.22.1.tgz"; path = fetchurl { @@ -8434,35 +8874,35 @@ }; } { - name = "moment___moment_2.24.0.tgz"; + name = "monaco_editor_webpack_plugin___monaco_editor_webpack_plugin_1.9.0.tgz"; path = fetchurl { - name = "moment___moment_2.24.0.tgz"; - url = "https://registry.yarnpkg.com/moment/-/moment-2.24.0.tgz"; - sha1 = "0d055d53f5052aa653c9f6eb68bb5d12bf5c2b5b"; + name = "monaco_editor_webpack_plugin___monaco_editor_webpack_plugin_1.9.0.tgz"; + url = "https://registry.yarnpkg.com/monaco-editor-webpack-plugin/-/monaco-editor-webpack-plugin-1.9.0.tgz"; + sha1 = "5b547281b9f404057dc5d8c5722390df9ac90be6"; }; } { - name = "monaco_editor_webpack_plugin___monaco_editor_webpack_plugin_1.7.0.tgz"; + name = "monaco_editor___monaco_editor_0.20.0.tgz"; path = fetchurl { - name = "monaco_editor_webpack_plugin___monaco_editor_webpack_plugin_1.7.0.tgz"; - url = "https://registry.yarnpkg.com/monaco-editor-webpack-plugin/-/monaco-editor-webpack-plugin-1.7.0.tgz"; - sha1 = "920cbeecca25f15d70d568a7e11b0ba4daf1ae83"; + name = "monaco_editor___monaco_editor_0.20.0.tgz"; + url = "https://registry.yarnpkg.com/monaco-editor/-/monaco-editor-0.20.0.tgz"; + sha1 = "5d5009343a550124426cb4d965a4d27a348b4dea"; }; } { - name = "monaco_editor___monaco_editor_0.18.1.tgz"; + name = "monaco_yaml___monaco_yaml_2.4.1.tgz"; path = fetchurl { - name = "monaco_editor___monaco_editor_0.18.1.tgz"; - url = "https://registry.yarnpkg.com/monaco-editor/-/monaco-editor-0.18.1.tgz"; - sha1 = "ced7c305a23109875feeaf395a504b91f6358cfc"; + name = "monaco_yaml___monaco_yaml_2.4.1.tgz"; + url = "https://registry.yarnpkg.com/monaco-yaml/-/monaco-yaml-2.4.1.tgz"; + sha1 = "f0d3384b1f10cc7af2b60e3a30b0adc6683b728a"; }; } { - name = "mousetrap___mousetrap_1.4.6.tgz"; + name = "mousetrap___mousetrap_1.6.5.tgz"; path = fetchurl { - name = "mousetrap___mousetrap_1.4.6.tgz"; - url = "https://registry.yarnpkg.com/mousetrap/-/mousetrap-1.4.6.tgz"; - sha1 = "eaca72e22e56d5b769b7555873b688c3332e390a"; + name = "mousetrap___mousetrap_1.6.5.tgz"; + url = "https://registry.yarnpkg.com/mousetrap/-/mousetrap-1.6.5.tgz"; + sha1 = "8a766d8c272b08393d5f56074e0b5ec183485bf9"; }; } { @@ -8514,11 +8954,11 @@ }; } { - name = "nan___nan_2.14.0.tgz"; + name = "nan___nan_2.14.1.tgz"; path = fetchurl { - name = "nan___nan_2.14.0.tgz"; - url = "https://registry.yarnpkg.com/nan/-/nan-2.14.0.tgz"; - sha1 = "7818f722027b2459a86f0295d434d1fc2336c52c"; + name = "nan___nan_2.14.1.tgz"; + url = "https://registry.yarnpkg.com/nan/-/nan-2.14.1.tgz"; + sha1 = "d7be34dfa3105b91494c3147089315eff8874b01"; }; } { @@ -8537,14 +8977,6 @@ sha1 = "4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7"; }; } - { - name = "needle___needle_2.4.0.tgz"; - path = fetchurl { - name = "needle___needle_2.4.0.tgz"; - url = "https://registry.yarnpkg.com/needle/-/needle-2.4.0.tgz"; - sha1 = "6833e74975c444642590e15a750288c5f939b57c"; - }; - } { name = "negotiator___negotiator_0.6.2.tgz"; path = fetchurl { @@ -8642,19 +9074,11 @@ }; } { - name = "node_pre_gyp___node_pre_gyp_0.12.0.tgz"; + name = "node_releases___node_releases_1.1.58.tgz"; path = fetchurl { - name = "node_pre_gyp___node_pre_gyp_0.12.0.tgz"; - url = "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.12.0.tgz"; - sha1 = "39ba4bb1439da030295f899e3b520b7785766149"; - }; - } - { - name = "node_releases___node_releases_1.1.50.tgz"; - path = fetchurl { - name = "node_releases___node_releases_1.1.50.tgz"; - url = "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.50.tgz"; - sha1 = "803c40d2c45db172d0410e4efec83aa8c6ad0592"; + name = "node_releases___node_releases_1.1.58.tgz"; + url = "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.58.tgz"; + sha1 = "8ee20eef30fa60e52755fcc0942def5a734fe935"; }; } { @@ -8666,11 +9090,11 @@ }; } { - name = "nodemon___nodemon_1.18.9.tgz"; + name = "nodemon___nodemon_2.0.4.tgz"; path = fetchurl { - name = "nodemon___nodemon_1.18.9.tgz"; - url = "https://registry.yarnpkg.com/nodemon/-/nodemon-1.18.9.tgz"; - sha1 = "90b467efd3b3c81b9453380aeb2a2cba535d0ead"; + name = "nodemon___nodemon_2.0.4.tgz"; + url = "https://registry.yarnpkg.com/nodemon/-/nodemon-2.0.4.tgz"; + sha1 = "55b09319eb488d6394aa9818148c0c2d1c04c416"; }; } { @@ -8681,14 +9105,6 @@ sha1 = "c6465dbf08abcd4db359317f79ac68a646b28ff9"; }; } - { - name = "nopt___nopt_4.0.1.tgz"; - path = fetchurl { - name = "nopt___nopt_4.0.1.tgz"; - url = "https://registry.yarnpkg.com/nopt/-/nopt-4.0.1.tgz"; - sha1 = "d0d4685afd5415193c8c7505602d0d17cd64474d"; - }; - } { name = "nopt___nopt_1.0.10.tgz"; path = fetchurl { @@ -8697,6 +9113,14 @@ sha1 = "6ddd21bd2a31417b92727dd585f8a6f37608ebee"; }; } + { + name = "nopt___nopt_4.0.1.tgz"; + path = fetchurl { + name = "nopt___nopt_4.0.1.tgz"; + url = "https://registry.yarnpkg.com/nopt/-/nopt-4.0.1.tgz"; + sha1 = "d0d4685afd5415193c8c7505602d0d17cd64474d"; + }; + } { name = "normalize_package_data___normalize_package_data_2.5.0.tgz"; path = fetchurl { @@ -8738,19 +9162,11 @@ }; } { - name = "npm_bundled___npm_bundled_1.0.6.tgz"; + name = "normalize_url___normalize_url_4.5.0.tgz"; path = fetchurl { - name = "npm_bundled___npm_bundled_1.0.6.tgz"; - url = "https://registry.yarnpkg.com/npm-bundled/-/npm-bundled-1.0.6.tgz"; - sha1 = "e7ba9aadcef962bb61248f91721cd932b3fe6bdd"; - }; - } - { - name = "npm_packlist___npm_packlist_1.4.1.tgz"; - path = fetchurl { - name = "npm_packlist___npm_packlist_1.4.1.tgz"; - url = "https://registry.yarnpkg.com/npm-packlist/-/npm-packlist-1.4.1.tgz"; - sha1 = "19064cdf988da80ea3cee45533879d90192bbfbc"; + name = "normalize_url___normalize_url_4.5.0.tgz"; + url = "https://registry.yarnpkg.com/normalize-url/-/normalize-url-4.5.0.tgz"; + sha1 = "453354087e6ca96957bd8f5baf753f5982142129"; }; } { @@ -8786,11 +9202,11 @@ }; } { - name = "nwsapi___nwsapi_2.0.9.tgz"; + name = "nwsapi___nwsapi_2.2.0.tgz"; path = fetchurl { - name = "nwsapi___nwsapi_2.0.9.tgz"; - url = "https://registry.yarnpkg.com/nwsapi/-/nwsapi-2.0.9.tgz"; - sha1 = "77ac0cdfdcad52b6a1151a84e73254edc33ed016"; + name = "nwsapi___nwsapi_2.2.0.tgz"; + url = "https://registry.yarnpkg.com/nwsapi/-/nwsapi-2.2.0.tgz"; + sha1 = "204879a9e3d068ff2a55139c2c772780681a38b7"; }; } { @@ -9033,6 +9449,14 @@ sha1 = "85cdfafaeb28e8677f416e287592b5f3f49ea410"; }; } + { + name = "p_cancelable___p_cancelable_1.1.0.tgz"; + path = fetchurl { + name = "p_cancelable___p_cancelable_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/p-cancelable/-/p-cancelable-1.1.0.tgz"; + sha1 = "d078d15a3af409220c886f1d9a0ca2e441ab26cc"; + }; + } { name = "p_defer___p_defer_1.0.0.tgz"; path = fetchurl { @@ -9154,11 +9578,11 @@ }; } { - name = "package_json___package_json_4.0.1.tgz"; + name = "package_json___package_json_6.5.0.tgz"; path = fetchurl { - name = "package_json___package_json_4.0.1.tgz"; - url = "https://registry.yarnpkg.com/package-json/-/package-json-4.0.1.tgz"; - sha1 = "8869a0401253661c4c4ca3da6c2121ed555f5eed"; + name = "package_json___package_json_6.5.0.tgz"; + url = "https://registry.yarnpkg.com/package-json/-/package-json-6.5.0.tgz"; + sha1 = "6feedaca35e75725876d0b0e64974697fed145b0"; }; } { @@ -9250,11 +9674,11 @@ }; } { - name = "parse5___parse5_5.0.0.tgz"; + name = "parse5___parse5_5.1.1.tgz"; path = fetchurl { - name = "parse5___parse5_5.0.0.tgz"; - url = "https://registry.yarnpkg.com/parse5/-/parse5-5.0.0.tgz"; - sha1 = "4d02710d44f3c3846197a11e205d4ef17842b81a"; + name = "parse5___parse5_5.1.1.tgz"; + url = "https://registry.yarnpkg.com/parse5/-/parse5-5.1.1.tgz"; + sha1 = "f68e4e5ba1852ac2cadc00f4555fff6c2abb6178"; }; } { @@ -9418,11 +9842,11 @@ }; } { - name = "picomatch___picomatch_2.0.7.tgz"; + name = "picomatch___picomatch_2.2.2.tgz"; path = fetchurl { - name = "picomatch___picomatch_2.0.7.tgz"; - url = "https://registry.yarnpkg.com/picomatch/-/picomatch-2.0.7.tgz"; - sha1 = "514169d8c7cd0bdbeecc8a2609e34a7163de69f6"; + name = "picomatch___picomatch_2.2.2.tgz"; + url = "https://registry.yarnpkg.com/picomatch/-/picomatch-2.2.2.tgz"; + sha1 = "21f333e9b6b8eaff02468f5146ea406d345f4dad"; }; } { @@ -9513,6 +9937,14 @@ sha1 = "f099133df7ede422e81d1d8448270eeb3e4261f3"; }; } + { + name = "pkg_up___pkg_up_2.0.0.tgz"; + path = fetchurl { + name = "pkg_up___pkg_up_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/pkg-up/-/pkg-up-2.0.0.tgz"; + sha1 = "c819ac728059a461cab1c3889a2be3c49a004d7f"; + }; + } { name = "pn___pn_1.1.0.tgz"; path = fetchurl { @@ -9546,11 +9978,11 @@ }; } { - name = "portal_vue___portal_vue_2.1.6.tgz"; + name = "portal_vue___portal_vue_2.1.7.tgz"; path = fetchurl { - name = "portal_vue___portal_vue_2.1.6.tgz"; - url = "https://registry.yarnpkg.com/portal-vue/-/portal-vue-2.1.6.tgz"; - sha1 = "a7d4790b14a79af7fd159a60ec88c30cddc6c639"; + name = "portal_vue___portal_vue_2.1.7.tgz"; + url = "https://registry.yarnpkg.com/portal-vue/-/portal-vue-2.1.7.tgz"; + sha1 = "ea08069b25b640ca08a5b86f67c612f15f4e4ad4"; }; } { @@ -9729,14 +10161,6 @@ sha1 = "99a983d365f7b2ad8d0f9b8c3094926eab4b936d"; }; } - { - name = "postcss___postcss_7.0.27.tgz"; - path = fetchurl { - name = "postcss___postcss_7.0.27.tgz"; - url = "https://registry.yarnpkg.com/postcss/-/postcss-7.0.27.tgz"; - sha1 = "cc67cdc6b0daa375105b7c424a85567345fc54d9"; - }; - } { name = "postcss___postcss_7.0.30.tgz"; path = fetchurl { @@ -9754,11 +10178,19 @@ }; } { - name = "prepend_http___prepend_http_1.0.4.tgz"; + name = "prepend_http___prepend_http_2.0.0.tgz"; path = fetchurl { - name = "prepend_http___prepend_http_1.0.4.tgz"; - url = "https://registry.yarnpkg.com/prepend-http/-/prepend-http-1.0.4.tgz"; - sha1 = "d4f4562b0ce3696e41ac52d0e002e57a635dc6dc"; + name = "prepend_http___prepend_http_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/prepend-http/-/prepend-http-2.0.0.tgz"; + sha1 = "e92434bfa5ea8c19f41cdfd401d741a3c819d897"; + }; + } + { + name = "pretender___pretender_3.4.3.tgz"; + path = fetchurl { + name = "pretender___pretender_3.4.3.tgz"; + url = "https://registry.yarnpkg.com/pretender/-/pretender-3.4.3.tgz"; + sha1 = "a3b4160516007075d29127262f3a0063d19896e9"; }; } { @@ -9777,6 +10209,14 @@ sha1 = "6823e7c5900017b4bd3acf46fe9ac4b4d7bda9ea"; }; } + { + name = "prettier___prettier_1.19.1.tgz"; + path = fetchurl { + name = "prettier___prettier_1.19.1.tgz"; + url = "https://registry.yarnpkg.com/prettier/-/prettier-1.19.1.tgz"; + sha1 = "f7d7f5ff8a9cd872a7be4ca142095956a60797cb"; + }; + } { name = "pretty_format___pretty_format_24.8.0.tgz"; path = fetchurl { @@ -9785,6 +10225,14 @@ sha1 = "8dae7044f58db7cb8be245383b565a963e3c27f2"; }; } + { + name = "pretty_format___pretty_format_25.5.0.tgz"; + path = fetchurl { + name = "pretty_format___pretty_format_25.5.0.tgz"; + url = "https://registry.yarnpkg.com/pretty-format/-/pretty-format-25.5.0.tgz"; + sha1 = "7873c1d774f682c34b8d48b6743a2bf2ac55791a"; + }; + } { name = "pretty___pretty_2.0.0.tgz"; path = fetchurl { @@ -9794,11 +10242,11 @@ }; } { - name = "prismjs___prismjs_1.6.0.tgz"; + name = "prismjs___prismjs_1.21.0.tgz"; path = fetchurl { - name = "prismjs___prismjs_1.6.0.tgz"; - url = "https://registry.yarnpkg.com/prismjs/-/prismjs-1.6.0.tgz"; - sha1 = "118d95fb7a66dba2272e343b345f5236659db365"; + name = "prismjs___prismjs_1.21.0.tgz"; + url = "https://registry.yarnpkg.com/prismjs/-/prismjs-1.21.0.tgz"; + sha1 = "36c086ec36b45319ec4218ee164c110f9fc015a3"; }; } { @@ -10002,19 +10450,19 @@ }; } { - name = "psl___psl_1.1.29.tgz"; + name = "psl___psl_1.8.0.tgz"; path = fetchurl { - name = "psl___psl_1.1.29.tgz"; - url = "https://registry.yarnpkg.com/psl/-/psl-1.1.29.tgz"; - sha1 = "60f580d360170bb722a797cc704411e6da850c67"; + name = "psl___psl_1.8.0.tgz"; + url = "https://registry.yarnpkg.com/psl/-/psl-1.8.0.tgz"; + sha1 = "9326f8bcfb013adcc005fdff056acce020e51c24"; }; } { - name = "pstree.remy___pstree.remy_1.1.6.tgz"; + name = "pstree.remy___pstree.remy_1.1.8.tgz"; path = fetchurl { - name = "pstree.remy___pstree.remy_1.1.6.tgz"; - url = "https://registry.yarnpkg.com/pstree.remy/-/pstree.remy-1.1.6.tgz"; - sha1 = "73a55aad9e2d95814927131fbf4dc1b62d259f47"; + name = "pstree.remy___pstree.remy_1.1.8.tgz"; + url = "https://registry.yarnpkg.com/pstree.remy/-/pstree.remy-1.1.8.tgz"; + sha1 = "c242224f4a67c21f686839bbdb4ac282b8373d3a"; }; } { @@ -10057,14 +10505,6 @@ sha1 = "9653a036fb7c1ee42342f2325cceefea3926c48d"; }; } - { - name = "punycode___punycode_1.4.1.tgz"; - path = fetchurl { - name = "punycode___punycode_1.4.1.tgz"; - url = "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz"; - sha1 = "c0d5a63b2718800ad8e1eb0fa5269c84dd41845e"; - }; - } { name = "punycode___punycode_2.1.1.tgz"; path = fetchurl { @@ -10073,6 +10513,14 @@ sha1 = "b58b010ac40c22c5657616c8d2c2c02c7bf479ec"; }; } + { + name = "pupa___pupa_2.0.1.tgz"; + path = fetchurl { + name = "pupa___pupa_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/pupa/-/pupa-2.0.1.tgz"; + sha1 = "dbdc9ff48ffbea4a26a069b6f9f7abb051008726"; + }; + } { name = "qjobs___qjobs_1.2.0.tgz"; path = fetchurl { @@ -10186,11 +10634,11 @@ }; } { - name = "react_is___react_is_16.8.6.tgz"; + name = "react_is___react_is_16.13.1.tgz"; path = fetchurl { - name = "react_is___react_is_16.8.6.tgz"; - url = "https://registry.yarnpkg.com/react-is/-/react-is-16.8.6.tgz"; - sha1 = "5bbc1e2d29141c9fbdfed456343fe2bc430a6a16"; + name = "react_is___react_is_16.13.1.tgz"; + url = "https://registry.yarnpkg.com/react-is/-/react-is-16.13.1.tgz"; + sha1 = "789729a4dc36de2999dc156dd6c1d9c18cea56a4"; }; } { @@ -10282,19 +10730,11 @@ }; } { - name = "readdirp___readdirp_2.2.1.tgz"; + name = "readdirp___readdirp_3.4.0.tgz"; path = fetchurl { - name = "readdirp___readdirp_2.2.1.tgz"; - url = "https://registry.yarnpkg.com/readdirp/-/readdirp-2.2.1.tgz"; - sha1 = "0e87622a3325aa33e892285caf8b4e846529a525"; - }; - } - { - name = "readdirp___readdirp_3.1.1.tgz"; - path = fetchurl { - name = "readdirp___readdirp_3.1.1.tgz"; - url = "https://registry.yarnpkg.com/readdirp/-/readdirp-3.1.1.tgz"; - sha1 = "b158123ac343c8b0f31d65680269cc0fc1025db1"; + name = "readdirp___readdirp_3.4.0.tgz"; + url = "https://registry.yarnpkg.com/readdirp/-/readdirp-3.4.0.tgz"; + sha1 = "9fdccdf9e9155805449221ac645e8303ab5b9ada"; }; } { @@ -10322,11 +10762,11 @@ }; } { - name = "regenerate_unicode_properties___regenerate_unicode_properties_8.1.0.tgz"; + name = "regenerate_unicode_properties___regenerate_unicode_properties_8.2.0.tgz"; path = fetchurl { - name = "regenerate_unicode_properties___regenerate_unicode_properties_8.1.0.tgz"; - url = "https://registry.yarnpkg.com/regenerate-unicode-properties/-/regenerate-unicode-properties-8.1.0.tgz"; - sha1 = "ef51e0f0ea4ad424b77bf7cb41f3e015c70a3f0e"; + name = "regenerate_unicode_properties___regenerate_unicode_properties_8.2.0.tgz"; + url = "https://registry.yarnpkg.com/regenerate-unicode-properties/-/regenerate-unicode-properties-8.2.0.tgz"; + sha1 = "e5de7111d655e7ba60c057dbe9ff37c87e65cdec"; }; } { @@ -10338,11 +10778,19 @@ }; } { - name = "regenerator_transform___regenerator_transform_0.14.1.tgz"; + name = "regenerator_runtime___regenerator_runtime_0.13.5.tgz"; path = fetchurl { - name = "regenerator_transform___regenerator_transform_0.14.1.tgz"; - url = "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.14.1.tgz"; - sha1 = "3b2fce4e1ab7732c08f665dfdb314749c7ddd2fb"; + name = "regenerator_runtime___regenerator_runtime_0.13.5.tgz"; + url = "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.5.tgz"; + sha1 = "d878a1d094b4306d10b9096484b33ebd55e26697"; + }; + } + { + name = "regenerator_transform___regenerator_transform_0.14.4.tgz"; + path = fetchurl { + name = "regenerator_transform___regenerator_transform_0.14.4.tgz"; + url = "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.14.4.tgz"; + sha1 = "5266857896518d1616a78a0479337a30ea974cc7"; }; } { @@ -10362,43 +10810,43 @@ }; } { - name = "regexpu_core___regexpu_core_4.6.0.tgz"; + name = "regexpu_core___regexpu_core_4.7.0.tgz"; path = fetchurl { - name = "regexpu_core___regexpu_core_4.6.0.tgz"; - url = "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-4.6.0.tgz"; - sha1 = "2037c18b327cfce8a6fea2a4ec441f2432afb8b6"; + name = "regexpu_core___regexpu_core_4.7.0.tgz"; + url = "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-4.7.0.tgz"; + sha1 = "fcbf458c50431b0bb7b45d6967b8192d91f3d938"; }; } { - name = "registry_auth_token___registry_auth_token_3.3.2.tgz"; + name = "registry_auth_token___registry_auth_token_4.1.1.tgz"; path = fetchurl { - name = "registry_auth_token___registry_auth_token_3.3.2.tgz"; - url = "https://registry.yarnpkg.com/registry-auth-token/-/registry-auth-token-3.3.2.tgz"; - sha1 = "851fd49038eecb586911115af845260eec983f20"; + name = "registry_auth_token___registry_auth_token_4.1.1.tgz"; + url = "https://registry.yarnpkg.com/registry-auth-token/-/registry-auth-token-4.1.1.tgz"; + sha1 = "40a33be1e82539460f94328b0f7f0f84c16d9479"; }; } { - name = "registry_url___registry_url_3.1.0.tgz"; + name = "registry_url___registry_url_5.1.0.tgz"; path = fetchurl { - name = "registry_url___registry_url_3.1.0.tgz"; - url = "https://registry.yarnpkg.com/registry-url/-/registry-url-3.1.0.tgz"; - sha1 = "3d4ef870f73dde1d77f0cf9a381432444e174942"; + name = "registry_url___registry_url_5.1.0.tgz"; + url = "https://registry.yarnpkg.com/registry-url/-/registry-url-5.1.0.tgz"; + sha1 = "e98334b50d5434b81136b44ec638d9c2009c5009"; }; } { - name = "regjsgen___regjsgen_0.5.0.tgz"; + name = "regjsgen___regjsgen_0.5.2.tgz"; path = fetchurl { - name = "regjsgen___regjsgen_0.5.0.tgz"; - url = "https://registry.yarnpkg.com/regjsgen/-/regjsgen-0.5.0.tgz"; - sha1 = "a7634dc08f89209c2049adda3525711fb97265dd"; + name = "regjsgen___regjsgen_0.5.2.tgz"; + url = "https://registry.yarnpkg.com/regjsgen/-/regjsgen-0.5.2.tgz"; + sha1 = "92ff295fb1deecbf6ecdab2543d207e91aa33733"; }; } { - name = "regjsparser___regjsparser_0.6.0.tgz"; + name = "regjsparser___regjsparser_0.6.4.tgz"; path = fetchurl { - name = "regjsparser___regjsparser_0.6.0.tgz"; - url = "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.6.0.tgz"; - sha1 = "f1e6ae8b7da2bae96c99399b868cd6c933a2ba9c"; + name = "regjsparser___regjsparser_0.6.4.tgz"; + url = "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.6.4.tgz"; + sha1 = "a769f8684308401a66e9b529d2436ff4d0666272"; }; } { @@ -10474,27 +10922,27 @@ }; } { - name = "request_promise_core___request_promise_core_1.1.1.tgz"; + name = "request_promise_core___request_promise_core_1.1.3.tgz"; path = fetchurl { - name = "request_promise_core___request_promise_core_1.1.1.tgz"; - url = "https://registry.yarnpkg.com/request-promise-core/-/request-promise-core-1.1.1.tgz"; - sha1 = "3eee00b2c5aa83239cfb04c5700da36f81cd08b6"; + name = "request_promise_core___request_promise_core_1.1.3.tgz"; + url = "https://registry.yarnpkg.com/request-promise-core/-/request-promise-core-1.1.3.tgz"; + sha1 = "e9a3c081b51380dfea677336061fea879a829ee9"; }; } { - name = "request_promise_native___request_promise_native_1.0.5.tgz"; + name = "request_promise_native___request_promise_native_1.0.8.tgz"; path = fetchurl { - name = "request_promise_native___request_promise_native_1.0.5.tgz"; - url = "https://registry.yarnpkg.com/request-promise-native/-/request-promise-native-1.0.5.tgz"; - sha1 = "5281770f68e0c9719e5163fd3fab482215f4fda5"; + name = "request_promise_native___request_promise_native_1.0.8.tgz"; + url = "https://registry.yarnpkg.com/request-promise-native/-/request-promise-native-1.0.8.tgz"; + sha1 = "a455b960b826e44e2bf8999af64dff2bfe58cb36"; }; } { - name = "request___request_2.88.0.tgz"; + name = "request___request_2.88.2.tgz"; path = fetchurl { - name = "request___request_2.88.0.tgz"; - url = "https://registry.yarnpkg.com/request/-/request-2.88.0.tgz"; - sha1 = "9c2fca4f7d35b592efe57c7f0a55e81052124fef"; + name = "request___request_2.88.2.tgz"; + url = "https://registry.yarnpkg.com/request/-/request-2.88.2.tgz"; + sha1 = "d73c918731cb5a87da047e207234146f664d12b3"; }; } { @@ -10617,6 +11065,14 @@ sha1 = "1b7ca96073ebb52e741ffd799f6b39ea462c67f5"; }; } + { + name = "responselike___responselike_1.0.2.tgz"; + path = fetchurl { + name = "responselike___responselike_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/responselike/-/responselike-1.0.2.tgz"; + sha1 = "918720ef3b631c5642be068f15ade5a46f4ba1e7"; + }; + } { name = "restore_cursor___restore_cursor_3.1.0.tgz"; path = fetchurl { @@ -10681,6 +11137,14 @@ sha1 = "49c4e5c2f54a48e990b050926771e2871bcb31ce"; }; } + { + name = "route_recognizer___route_recognizer_0.3.4.tgz"; + path = fetchurl { + name = "route_recognizer___route_recognizer_0.3.4.tgz"; + url = "https://registry.yarnpkg.com/route-recognizer/-/route-recognizer-0.3.4.tgz"; + sha1 = "39ab1ffbce1c59e6d2bdca416f0932611e4f3ca3"; + }; + } { name = "rsvp___rsvp_4.8.4.tgz"; path = fetchurl { @@ -10753,14 +11217,6 @@ sha1 = "ed881fd922733a6c461bc189dc2b6c006f3ffded"; }; } - { - name = "sanitize_html___sanitize_html_1.22.0.tgz"; - path = fetchurl { - name = "sanitize_html___sanitize_html_1.22.0.tgz"; - url = "https://registry.yarnpkg.com/sanitize-html/-/sanitize-html-1.22.0.tgz"; - sha1 = "9df779c53cf5755adb2322943c21c1c1dffca7bf"; - }; - } { name = "sass_graph___sass_graph_2.2.4.tgz"; path = fetchurl { @@ -10785,6 +11241,14 @@ sha1 = "2816234e2378bddc4e5354fab5caa895df7100d9"; }; } + { + name = "saxes___saxes_5.0.1.tgz"; + path = fetchurl { + name = "saxes___saxes_5.0.1.tgz"; + url = "https://registry.yarnpkg.com/saxes/-/saxes-5.0.1.tgz"; + sha1 = "eebab953fa3b7608dbe94e5dadb15c888fa6696d"; + }; + } { name = "schema_utils___schema_utils_0.4.5.tgz"; path = fetchurl { @@ -10825,6 +11289,14 @@ sha1 = "8eb06db9a9723333824d3f5530641149847ce5d1"; }; } + { + name = "section_matter___section_matter_1.0.0.tgz"; + path = fetchurl { + name = "section_matter___section_matter_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/section-matter/-/section-matter-1.0.0.tgz"; + sha1 = "e9041953506780ec01d59f292a19c7b850b84167"; + }; + } { name = "select_hose___select_hose_2.0.0.tgz"; path = fetchurl { @@ -10858,11 +11330,11 @@ }; } { - name = "semver_diff___semver_diff_2.1.0.tgz"; + name = "semver_diff___semver_diff_3.1.1.tgz"; path = fetchurl { - name = "semver_diff___semver_diff_2.1.0.tgz"; - url = "https://registry.yarnpkg.com/semver-diff/-/semver-diff-2.1.0.tgz"; - sha1 = "4bbb8437c8d37e4b0cf1a68fd726ec6d645d6d36"; + name = "semver_diff___semver_diff_3.1.1.tgz"; + url = "https://registry.yarnpkg.com/semver-diff/-/semver-diff-3.1.1.tgz"; + sha1 = "05f77ce59f325e00e2706afd67bb506ddb1ca32b"; }; } { @@ -11305,14 +11777,6 @@ sha1 = "23be9635520eb0ff43a741e7e830397266e88445"; }; } - { - name = "srcset___srcset_2.0.1.tgz"; - path = fetchurl { - name = "srcset___srcset_2.0.1.tgz"; - url = "https://registry.yarnpkg.com/srcset/-/srcset-2.0.1.tgz"; - sha1 = "8f842d357487eb797f413d9c309de7a5149df5ac"; - }; - } { name = "sshpk___sshpk_1.15.2.tgz"; path = fetchurl { @@ -11441,6 +11905,14 @@ sha1 = "8167d8496ed9f19f05ee4b158d9611321b8cacd9"; }; } + { + name = "string_hash___string_hash_1.1.3.tgz"; + path = fetchurl { + name = "string_hash___string_hash_1.1.3.tgz"; + url = "https://registry.yarnpkg.com/string-hash/-/string-hash-1.1.3.tgz"; + sha1 = "e8aafc0ac1855b4666929ed7dd1275df5d6c811b"; + }; + } { name = "string_length___string_length_2.0.0.tgz"; path = fetchurl { @@ -11474,11 +11946,11 @@ }; } { - name = "string_width___string_width_4.1.0.tgz"; + name = "string_width___string_width_4.2.0.tgz"; path = fetchurl { - name = "string_width___string_width_4.1.0.tgz"; - url = "https://registry.yarnpkg.com/string-width/-/string-width-4.1.0.tgz"; - sha1 = "ba846d1daa97c3c596155308063e075ed1c99aff"; + name = "string_width___string_width_4.2.0.tgz"; + url = "https://registry.yarnpkg.com/string-width/-/string-width-4.2.0.tgz"; + sha1 = "952182c46cc7b2c313d1596e623992bd163b72b5"; }; } { @@ -11545,6 +12017,22 @@ sha1 = "8c9a536feb6afc962bdfa5b104a5091c1ad9c0ae"; }; } + { + name = "strip_ansi___strip_ansi_6.0.0.tgz"; + path = fetchurl { + name = "strip_ansi___strip_ansi_6.0.0.tgz"; + url = "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.0.tgz"; + sha1 = "0b1571dd7669ccd4f3e06e14ef1eed26225ae532"; + }; + } + { + name = "strip_bom_string___strip_bom_string_1.0.0.tgz"; + path = fetchurl { + name = "strip_bom_string___strip_bom_string_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/strip-bom-string/-/strip-bom-string-1.0.0.tgz"; + sha1 = "e5211e9224369fbb81d633a2f00044dc8cedad92"; + }; + } { name = "strip_bom___strip_bom_2.0.0.tgz"; path = fetchurl { @@ -11698,19 +12186,11 @@ }; } { - name = "svg4everybody___svg4everybody_2.1.9.tgz"; + name = "swagger_ui_dist___swagger_ui_dist_3.32.4.tgz"; path = fetchurl { - name = "svg4everybody___svg4everybody_2.1.9.tgz"; - url = "https://registry.yarnpkg.com/svg4everybody/-/svg4everybody-2.1.9.tgz"; - sha1 = "5bd9f6defc133859a044646d4743fabc28db7e2d"; - }; - } - { - name = "swagger_ui_dist___swagger_ui_dist_3.26.2.tgz"; - path = fetchurl { - name = "swagger_ui_dist___swagger_ui_dist_3.26.2.tgz"; - url = "https://registry.yarnpkg.com/swagger-ui-dist/-/swagger-ui-dist-3.26.2.tgz"; - sha1 = "22c700906c8911b1c9956da6c3fca371dba6219f"; + name = "swagger_ui_dist___swagger_ui_dist_3.32.4.tgz"; + url = "https://registry.yarnpkg.com/swagger-ui-dist/-/swagger-ui-dist-3.32.4.tgz"; + sha1 = "6fa920a99e38eaaf129580ac158cf730494a2190"; }; } { @@ -11722,11 +12202,11 @@ }; } { - name = "symbol_tree___symbol_tree_3.2.2.tgz"; + name = "symbol_tree___symbol_tree_3.2.4.tgz"; path = fetchurl { - name = "symbol_tree___symbol_tree_3.2.2.tgz"; - url = "https://registry.yarnpkg.com/symbol-tree/-/symbol-tree-3.2.2.tgz"; - sha1 = "ae27db38f660a7ae2e1c3b7d1bc290819b8519e6"; + name = "symbol_tree___symbol_tree_3.2.4.tgz"; + url = "https://registry.yarnpkg.com/symbol-tree/-/symbol-tree-3.2.4.tgz"; + sha1 = "430637d248ba77e078883951fb9aa0eed7c63fa2"; }; } { @@ -11770,19 +12250,11 @@ }; } { - name = "tar___tar_4.4.8.tgz"; + name = "term_size___term_size_2.2.0.tgz"; path = fetchurl { - name = "tar___tar_4.4.8.tgz"; - url = "https://registry.yarnpkg.com/tar/-/tar-4.4.8.tgz"; - sha1 = "b19eec3fde2a96e64666df9fdb40c5ca1bc3747d"; - }; - } - { - name = "term_size___term_size_1.2.0.tgz"; - path = fetchurl { - name = "term_size___term_size_1.2.0.tgz"; - url = "https://registry.yarnpkg.com/term-size/-/term-size-1.2.0.tgz"; - sha1 = "458b83887f288fc56d6fffbfad262e26638efa69"; + name = "term_size___term_size_2.2.0.tgz"; + url = "https://registry.yarnpkg.com/term-size/-/term-size-2.2.0.tgz"; + sha1 = "1f16adedfe9bdc18800e1776821734086fcc6753"; }; } { @@ -11897,14 +12369,6 @@ sha1 = "724e8c8833e3490676c7bb0a75f5daf20e558028"; }; } - { - name = "timed_out___timed_out_4.0.1.tgz"; - path = fetchurl { - name = "timed_out___timed_out_4.0.1.tgz"; - url = "https://registry.yarnpkg.com/timed-out/-/timed-out-4.0.1.tgz"; - sha1 = "f32eacac5a175bea25d7fab565ab3ed8741ef56f"; - }; - } { name = "timers_browserify___timers_browserify_2.0.10.tgz"; path = fetchurl { @@ -12009,6 +12473,14 @@ sha1 = "297588b7b0e7e0ac08e04e672f85c1f4999e17af"; }; } + { + name = "to_readable_stream___to_readable_stream_1.0.0.tgz"; + path = fetchurl { + name = "to_readable_stream___to_readable_stream_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/to-readable-stream/-/to-readable-stream-1.0.0.tgz"; + sha1 = "ce0aa0c2f3df6adf852efb404a783e77c0475771"; + }; + } { name = "to_regex_range___to_regex_range_2.1.1.tgz"; path = fetchurl { @@ -12058,11 +12530,19 @@ }; } { - name = "tough_cookie___tough_cookie_2.4.3.tgz"; + name = "tough_cookie___tough_cookie_2.5.0.tgz"; path = fetchurl { - name = "tough_cookie___tough_cookie_2.4.3.tgz"; - url = "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.4.3.tgz"; - sha1 = "53f36da3f47783b0925afa06ff9f3b165280f781"; + name = "tough_cookie___tough_cookie_2.5.0.tgz"; + url = "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.5.0.tgz"; + sha1 = "cd9fb2a0aa1d5a12b473bd9fb96fa3dcff65ade2"; + }; + } + { + name = "tough_cookie___tough_cookie_3.0.1.tgz"; + path = fetchurl { + name = "tough_cookie___tough_cookie_3.0.1.tgz"; + url = "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-3.0.1.tgz"; + sha1 = "9df4f57e739c26930a018184887f4adb7dca73b2"; }; } { @@ -12074,11 +12554,19 @@ }; } { - name = "tributejs___tributejs_4.1.3.tgz"; + name = "tr46___tr46_2.0.2.tgz"; path = fetchurl { - name = "tributejs___tributejs_4.1.3.tgz"; - url = "https://registry.yarnpkg.com/tributejs/-/tributejs-4.1.3.tgz"; - sha1 = "2e1be7d9a1e403ed4c394f91d859812267e4691c"; + name = "tr46___tr46_2.0.2.tgz"; + url = "https://registry.yarnpkg.com/tr46/-/tr46-2.0.2.tgz"; + sha1 = "03273586def1595ae08fedb38d7733cee91d2479"; + }; + } + { + name = "tributejs___tributejs_5.1.3.tgz"; + path = fetchurl { + name = "tributejs___tributejs_5.1.3.tgz"; + url = "https://registry.yarnpkg.com/tributejs/-/tributejs-5.1.3.tgz"; + sha1 = "980600fc72865be5868893078b4bfde721129eae"; }; } { @@ -12153,14 +12641,6 @@ sha1 = "027b69fa823225e551cace3ef03b11f6ab37c1d7"; }; } - { - name = "ts_invariant___ts_invariant_0.3.2.tgz"; - path = fetchurl { - name = "ts_invariant___ts_invariant_0.3.2.tgz"; - url = "https://registry.yarnpkg.com/ts-invariant/-/ts-invariant-0.3.2.tgz"; - sha1 = "89a2ffeb70879b777258df1df1c59383c35209b0"; - }; - } { name = "ts_invariant___ts_invariant_0.4.4.tgz"; path = fetchurl { @@ -12178,11 +12658,11 @@ }; } { - name = "tslib___tslib_1.11.1.tgz"; + name = "tslib___tslib_1.13.0.tgz"; path = fetchurl { - name = "tslib___tslib_1.11.1.tgz"; - url = "https://registry.yarnpkg.com/tslib/-/tslib-1.11.1.tgz"; - sha1 = "eb15d128827fbee2841549e171f45ed338ac7e35"; + name = "tslib___tslib_1.13.0.tgz"; + url = "https://registry.yarnpkg.com/tslib/-/tslib-1.13.0.tgz"; + sha1 = "c881e13cc7015894ed914862d276436fa9a47043"; }; } { @@ -12225,6 +12705,14 @@ sha1 = "5884cab512cf1d355e3fb784f30804b2b520db72"; }; } + { + name = "type_detect___type_detect_4.0.8.tgz"; + path = fetchurl { + name = "type_detect___type_detect_4.0.8.tgz"; + url = "https://registry.yarnpkg.com/type-detect/-/type-detect-4.0.8.tgz"; + sha1 = "7646fb5f18871cfbb7749e69bd39a6388eb7450c"; + }; + } { name = "type_fest___type_fest_0.5.2.tgz"; path = fetchurl { @@ -12249,6 +12737,14 @@ sha1 = "4e552cd05df09467dcbc4ef739de89f2cf37c131"; }; } + { + name = "typedarray_to_buffer___typedarray_to_buffer_3.1.5.tgz"; + path = fetchurl { + name = "typedarray_to_buffer___typedarray_to_buffer_3.1.5.tgz"; + url = "https://registry.yarnpkg.com/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz"; + sha1 = "a97ee7a9ff42691b9f783ff1bc5112fe3fca9080"; + }; + } { name = "typedarray___typedarray_0.0.6.tgz"; path = fetchurl { @@ -12321,14 +12817,6 @@ sha1 = "4f3fb53b106e6097fcf9cb4109f2a5e9bdfa5022"; }; } - { - name = "unfetch___unfetch_4.1.0.tgz"; - path = fetchurl { - name = "unfetch___unfetch_4.1.0.tgz"; - url = "https://registry.yarnpkg.com/unfetch/-/unfetch-4.1.0.tgz"; - sha1 = "6ec2dd0de887e58a4dee83a050ded80ffc4137db"; - }; - } { name = "unherit___unherit_1.1.1.tgz"; path = fetchurl { @@ -12354,11 +12842,11 @@ }; } { - name = "unicode_match_property_value_ecmascript___unicode_match_property_value_ecmascript_1.1.0.tgz"; + name = "unicode_match_property_value_ecmascript___unicode_match_property_value_ecmascript_1.2.0.tgz"; path = fetchurl { - name = "unicode_match_property_value_ecmascript___unicode_match_property_value_ecmascript_1.1.0.tgz"; - url = "https://registry.yarnpkg.com/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-1.1.0.tgz"; - sha1 = "5b4b426e08d13a80365e0d657ac7a6c1ec46a277"; + name = "unicode_match_property_value_ecmascript___unicode_match_property_value_ecmascript_1.2.0.tgz"; + url = "https://registry.yarnpkg.com/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-1.2.0.tgz"; + sha1 = "0d91f600eeeb3096aa962b1d6fc88876e64ea531"; }; } { @@ -12410,11 +12898,11 @@ }; } { - name = "unique_string___unique_string_1.0.0.tgz"; + name = "unique_string___unique_string_2.0.0.tgz"; path = fetchurl { - name = "unique_string___unique_string_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/unique-string/-/unique-string-1.0.0.tgz"; - sha1 = "9e1057cca851abb93398f8b33ae187b99caec11a"; + name = "unique_string___unique_string_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/unique-string/-/unique-string-2.0.0.tgz"; + sha1 = "39c6451f81afb2749de2b233e3f7c5e8843bd89d"; }; } { @@ -12490,27 +12978,11 @@ }; } { - name = "unzip_response___unzip_response_2.0.1.tgz"; + name = "update_notifier___update_notifier_4.1.0.tgz"; path = fetchurl { - name = "unzip_response___unzip_response_2.0.1.tgz"; - url = "https://registry.yarnpkg.com/unzip-response/-/unzip-response-2.0.1.tgz"; - sha1 = "d2f0f737d16b0615e72a6935ed04214572d56f97"; - }; - } - { - name = "upath___upath_1.2.0.tgz"; - path = fetchurl { - name = "upath___upath_1.2.0.tgz"; - url = "https://registry.yarnpkg.com/upath/-/upath-1.2.0.tgz"; - sha1 = "8f66dbcd55a883acdae4408af8b035a5044c1894"; - }; - } - { - name = "update_notifier___update_notifier_2.5.0.tgz"; - path = fetchurl { - name = "update_notifier___update_notifier_2.5.0.tgz"; - url = "https://registry.yarnpkg.com/update-notifier/-/update-notifier-2.5.0.tgz"; - sha1 = "d0744593e13f161e406acb1d9408b72cad08aff6"; + name = "update_notifier___update_notifier_4.1.0.tgz"; + url = "https://registry.yarnpkg.com/update-notifier/-/update-notifier-4.1.0.tgz"; + sha1 = "4866b98c3bc5b5473c020b1250583628f9a328f3"; }; } { @@ -12546,11 +13018,11 @@ }; } { - name = "url_parse_lax___url_parse_lax_1.0.0.tgz"; + name = "url_parse_lax___url_parse_lax_3.0.0.tgz"; path = fetchurl { - name = "url_parse_lax___url_parse_lax_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/url-parse-lax/-/url-parse-lax-1.0.0.tgz"; - sha1 = "7af8f303645e9bd79a272e7a14ac68bc0609da73"; + name = "url_parse_lax___url_parse_lax_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/url-parse-lax/-/url-parse-lax-3.0.0.tgz"; + sha1 = "16b5cafc07dbe3676c1b1999177823d6503acb0c"; }; } { @@ -12649,6 +13121,14 @@ sha1 = "1b4af4955eb3077c501c23872fc6513811587131"; }; } + { + name = "uuid___uuid_8.1.0.tgz"; + path = fetchurl { + name = "uuid___uuid_8.1.0.tgz"; + url = "https://registry.yarnpkg.com/uuid/-/uuid-8.1.0.tgz"; + sha1 = "6f1536eb43249f473abc6bd58ff983da1ca30d8d"; + }; + } { name = "v8_compile_cache___v8_compile_cache_2.0.3.tgz"; path = fetchurl { @@ -12729,6 +13209,86 @@ sha1 = "c066afb582bb1cb4128d60ea92392e94d5e9dbec"; }; } + { + name = "vscode_json_languageservice___vscode_json_languageservice_3.7.0.tgz"; + path = fetchurl { + name = "vscode_json_languageservice___vscode_json_languageservice_3.7.0.tgz"; + url = "https://registry.yarnpkg.com/vscode-json-languageservice/-/vscode-json-languageservice-3.7.0.tgz"; + sha1 = "0174417f139cf41dd60c84538fd052385bfb46f6"; + }; + } + { + name = "vscode_jsonrpc___vscode_jsonrpc_4.0.0.tgz"; + path = fetchurl { + name = "vscode_jsonrpc___vscode_jsonrpc_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/vscode-jsonrpc/-/vscode-jsonrpc-4.0.0.tgz"; + sha1 = "a7bf74ef3254d0a0c272fab15c82128e378b3be9"; + }; + } + { + name = "vscode_languageserver_protocol___vscode_languageserver_protocol_3.14.1.tgz"; + path = fetchurl { + name = "vscode_languageserver_protocol___vscode_languageserver_protocol_3.14.1.tgz"; + url = "https://registry.yarnpkg.com/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.14.1.tgz"; + sha1 = "b8aab6afae2849c84a8983d39a1cf742417afe2f"; + }; + } + { + name = "vscode_languageserver_textdocument___vscode_languageserver_textdocument_1.0.1.tgz"; + path = fetchurl { + name = "vscode_languageserver_textdocument___vscode_languageserver_textdocument_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/vscode-languageserver-textdocument/-/vscode-languageserver-textdocument-1.0.1.tgz"; + sha1 = "178168e87efad6171b372add1dea34f53e5d330f"; + }; + } + { + name = "vscode_languageserver_types___vscode_languageserver_types_3.14.0.tgz"; + path = fetchurl { + name = "vscode_languageserver_types___vscode_languageserver_types_3.14.0.tgz"; + url = "https://registry.yarnpkg.com/vscode-languageserver-types/-/vscode-languageserver-types-3.14.0.tgz"; + sha1 = "d3b5952246d30e5241592b6dde8280e03942e743"; + }; + } + { + name = "vscode_languageserver_types___vscode_languageserver_types_3.15.1.tgz"; + path = fetchurl { + name = "vscode_languageserver_types___vscode_languageserver_types_3.15.1.tgz"; + url = "https://registry.yarnpkg.com/vscode-languageserver-types/-/vscode-languageserver-types-3.15.1.tgz"; + sha1 = "17be71d78d2f6236d414f0001ce1ef4d23e6b6de"; + }; + } + { + name = "vscode_languageserver___vscode_languageserver_5.2.1.tgz"; + path = fetchurl { + name = "vscode_languageserver___vscode_languageserver_5.2.1.tgz"; + url = "https://registry.yarnpkg.com/vscode-languageserver/-/vscode-languageserver-5.2.1.tgz"; + sha1 = "0d2feddd33f92aadf5da32450df498d52f6f14eb"; + }; + } + { + name = "vscode_nls___vscode_nls_4.1.2.tgz"; + path = fetchurl { + name = "vscode_nls___vscode_nls_4.1.2.tgz"; + url = "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-4.1.2.tgz"; + sha1 = "ca8bf8bb82a0987b32801f9fddfdd2fb9fd3c167"; + }; + } + { + name = "vscode_uri___vscode_uri_1.0.8.tgz"; + path = fetchurl { + name = "vscode_uri___vscode_uri_1.0.8.tgz"; + url = "https://registry.yarnpkg.com/vscode-uri/-/vscode-uri-1.0.8.tgz"; + sha1 = "9769aaececae4026fb6e22359cb38946580ded59"; + }; + } + { + name = "vscode_uri___vscode_uri_2.1.2.tgz"; + path = fetchurl { + name = "vscode_uri___vscode_uri_2.1.2.tgz"; + url = "https://registry.yarnpkg.com/vscode-uri/-/vscode-uri-2.1.2.tgz"; + sha1 = "c8d40de93eb57af31f3c715dd650e2ca2c096f1c"; + }; + } { name = "vue_apollo___vue_apollo_3.0.3.tgz"; path = fetchurl { @@ -12778,11 +13338,11 @@ }; } { - name = "vue_router___vue_router_3.0.2.tgz"; + name = "vue_router___vue_router_3.4.3.tgz"; path = fetchurl { - name = "vue_router___vue_router_3.0.2.tgz"; - url = "https://registry.yarnpkg.com/vue-router/-/vue-router-3.0.2.tgz"; - sha1 = "dedc67afe6c4e2bc25682c8b1c2a8c0d7c7e56be"; + name = "vue_router___vue_router_3.4.3.tgz"; + url = "https://registry.yarnpkg.com/vue-router/-/vue-router-3.4.3.tgz"; + sha1 = "fa93768616ee338aa174f160ac965167fa572ffa"; }; } { @@ -12842,19 +13402,19 @@ }; } { - name = "vuex___vuex_3.1.0.tgz"; + name = "vuex___vuex_3.5.1.tgz"; path = fetchurl { - name = "vuex___vuex_3.1.0.tgz"; - url = "https://registry.yarnpkg.com/vuex/-/vuex-3.1.0.tgz"; - sha1 = "634b81515cf0cfe976bd1ffe9601755e51f843b9"; + name = "vuex___vuex_3.5.1.tgz"; + url = "https://registry.yarnpkg.com/vuex/-/vuex-3.5.1.tgz"; + sha1 = "f1b8dcea649bc25254cf4f4358081dbf5da18b3d"; }; } { - name = "w3c_hr_time___w3c_hr_time_1.0.1.tgz"; + name = "w3c_hr_time___w3c_hr_time_1.0.2.tgz"; path = fetchurl { - name = "w3c_hr_time___w3c_hr_time_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/w3c-hr-time/-/w3c-hr-time-1.0.1.tgz"; - sha1 = "82ac2bff63d950ea9e3189a58a65625fedf19045"; + name = "w3c_hr_time___w3c_hr_time_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/w3c-hr-time/-/w3c-hr-time-1.0.2.tgz"; + sha1 = "0a89cdf5cc15822df9c360543676963e0cc308cd"; }; } { @@ -12865,6 +13425,14 @@ sha1 = "4e2219663760fd6535b7a1550f1552d71fc9372c"; }; } + { + name = "w3c_xmlserializer___w3c_xmlserializer_2.0.0.tgz"; + path = fetchurl { + name = "w3c_xmlserializer___w3c_xmlserializer_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/w3c-xmlserializer/-/w3c-xmlserializer-2.0.0.tgz"; + sha1 = "3e7104a05b75146cc60f564380b7f683acf1020a"; + }; + } { name = "walker___walker_1.0.7.tgz"; path = fetchurl { @@ -12874,11 +13442,19 @@ }; } { - name = "watchpack___watchpack_1.6.0.tgz"; + name = "watchpack_chokidar2___watchpack_chokidar2_2.0.0.tgz"; path = fetchurl { - name = "watchpack___watchpack_1.6.0.tgz"; - url = "https://registry.yarnpkg.com/watchpack/-/watchpack-1.6.0.tgz"; - sha1 = "4bc12c2ebe8aa277a71f1d3f14d685c7b446cd00"; + name = "watchpack_chokidar2___watchpack_chokidar2_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/watchpack-chokidar2/-/watchpack-chokidar2-2.0.0.tgz"; + sha1 = "9948a1866cbbd6cb824dea13a7ed691f6c8ddff0"; + }; + } + { + name = "watchpack___watchpack_1.7.2.tgz"; + path = fetchurl { + name = "watchpack___watchpack_1.7.2.tgz"; + url = "https://registry.yarnpkg.com/watchpack/-/watchpack-1.7.2.tgz"; + sha1 = "c02e4d4d49913c3e7e122c3325365af9d331e9aa"; }; } { @@ -12889,6 +13465,14 @@ sha1 = "c1d8d149316d3ea852848895cb6a0bfe887b87df"; }; } + { + name = "web_vitals___web_vitals_0.2.4.tgz"; + path = fetchurl { + name = "web_vitals___web_vitals_0.2.4.tgz"; + url = "https://registry.yarnpkg.com/web-vitals/-/web-vitals-0.2.4.tgz"; + sha1 = "ec3df43c834a207fd7cdefd732b2987896e08511"; + }; + } { name = "webidl_conversions___webidl_conversions_4.0.2.tgz"; path = fetchurl { @@ -12897,6 +13481,22 @@ sha1 = "a855980b1f0b6b359ba1d5d9fb39ae941faa63ad"; }; } + { + name = "webidl_conversions___webidl_conversions_5.0.0.tgz"; + path = fetchurl { + name = "webidl_conversions___webidl_conversions_5.0.0.tgz"; + url = "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-5.0.0.tgz"; + sha1 = "ae59c8a00b121543a2acc65c0434f57b0fc11aff"; + }; + } + { + name = "webidl_conversions___webidl_conversions_6.1.0.tgz"; + path = fetchurl { + name = "webidl_conversions___webidl_conversions_6.1.0.tgz"; + url = "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-6.1.0.tgz"; + sha1 = "9111b4d7ea80acd40f5270d666621afa78b69514"; + }; + } { name = "webpack_bundle_analyzer___webpack_bundle_analyzer_3.6.0.tgz"; path = fetchurl { @@ -13009,6 +13609,14 @@ sha1 = "fde926fa54a599f3adf82dff25a9f7be02dc6edd"; }; } + { + name = "whatwg_url___whatwg_url_8.1.0.tgz"; + path = fetchurl { + name = "whatwg_url___whatwg_url_8.1.0.tgz"; + url = "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-8.1.0.tgz"; + sha1 = "c628acdcf45b82274ce7281ee31dd3c839791771"; + }; + } { name = "which_module___which_module_1.0.0.tgz"; path = fetchurl { @@ -13042,11 +13650,11 @@ }; } { - name = "widest_line___widest_line_2.0.0.tgz"; + name = "widest_line___widest_line_3.1.0.tgz"; path = fetchurl { - name = "widest_line___widest_line_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/widest-line/-/widest-line-2.0.0.tgz"; - sha1 = "0142a4e8a243f8882c0233aa0e0281aa76152273"; + name = "widest_line___widest_line_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/widest-line/-/widest-line-3.1.0.tgz"; + sha1 = "8292333bbf66cb45ff0de1603b136b7ae1496eca"; }; } { @@ -13113,6 +13721,14 @@ sha1 = "d0b05463c188ae804396fd5ab2a370062af87529"; }; } + { + name = "write_file_atomic___write_file_atomic_3.0.3.tgz"; + path = fetchurl { + name = "write_file_atomic___write_file_atomic_3.0.3.tgz"; + url = "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-3.0.3.tgz"; + sha1 = "56bd5c5a5c70481cd19c571bd39ab965a5de56e8"; + }; + } { name = "write___write_1.0.3.tgz"; path = fetchurl { @@ -13137,6 +13753,14 @@ sha1 = "442fdf0a47ed64f59b6a5d8ff130f4748ed524fb"; }; } + { + name = "ws___ws_7.3.0.tgz"; + path = fetchurl { + name = "ws___ws_7.3.0.tgz"; + url = "https://registry.yarnpkg.com/ws/-/ws-7.3.0.tgz"; + sha1 = "4b2f7f219b3d3737bc1a2fbf145d825b94d38ffd"; + }; + } { name = "ws___ws_3.3.3.tgz"; path = fetchurl { @@ -13154,11 +13778,19 @@ }; } { - name = "xdg_basedir___xdg_basedir_3.0.0.tgz"; + name = "xdg_basedir___xdg_basedir_4.0.0.tgz"; path = fetchurl { - name = "xdg_basedir___xdg_basedir_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/xdg-basedir/-/xdg-basedir-3.0.0.tgz"; - sha1 = "496b2cc109eca8dbacfe2dc72b603c17c5870ad4"; + name = "xdg_basedir___xdg_basedir_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/xdg-basedir/-/xdg-basedir-4.0.0.tgz"; + sha1 = "4bc8d9984403696225ef83a1573cbbcb4e79db13"; + }; + } + { + name = "xhr_mock___xhr_mock_2.5.1.tgz"; + path = fetchurl { + name = "xhr_mock___xhr_mock_2.5.1.tgz"; + url = "https://registry.yarnpkg.com/xhr-mock/-/xhr-mock-2.5.1.tgz"; + sha1 = "c591498a8269cc1ce5fefac20d590357affd348b"; }; } { @@ -13201,6 +13833,14 @@ sha1 = "132ee63d2ec5565c557e20f4c22df9aca686b10d"; }; } + { + name = "xmlchars___xmlchars_2.2.0.tgz"; + path = fetchurl { + name = "xmlchars___xmlchars_2.2.0.tgz"; + url = "https://registry.yarnpkg.com/xmlchars/-/xmlchars-2.2.0.tgz"; + sha1 = "060fe1bcb7f9c76fe2a17db86a9bc3ab894210cb"; + }; + } { name = "xmlcreate___xmlcreate_1.0.2.tgz"; path = fetchurl { @@ -13354,11 +13994,11 @@ }; } { - name = "zen_observable_ts___zen_observable_ts_0.8.18.tgz"; + name = "zen_observable_ts___zen_observable_ts_0.8.21.tgz"; path = fetchurl { - name = "zen_observable_ts___zen_observable_ts_0.8.18.tgz"; - url = "https://registry.yarnpkg.com/zen-observable-ts/-/zen-observable-ts-0.8.18.tgz"; - sha1 = "ade44b1060cc4a800627856ec10b9c67f5f639c8"; + name = "zen_observable_ts___zen_observable_ts_0.8.21.tgz"; + url = "https://registry.yarnpkg.com/zen-observable-ts/-/zen-observable-ts-0.8.21.tgz"; + sha1 = "85d0031fbbde1eba3cd07d3ba90da241215f421d"; }; } { From f98a6322e6c91aabb56f909d961b0977b221c290 Mon Sep 17 00:00:00 2001 From: Jeff Slight Date: Mon, 28 Sep 2020 17:41:25 -0700 Subject: [PATCH 076/260] nixos/gitlab: add changes for gitlab 13.4.x --- nixos/modules/services/misc/gitlab.nix | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/misc/gitlab.nix b/nixos/modules/services/misc/gitlab.nix index 122bc3000b41..56fd89c61232 100644 --- a/nixos/modules/services/misc/gitlab.nix +++ b/nixos/modules/services/misc/gitlab.nix @@ -43,9 +43,13 @@ let [gitlab-shell] dir = "${cfg.packages.gitlab-shell}" + + [gitlab] secret_file = "${cfg.statePath}/gitlab_shell_secret" - gitlab_url = "http+unix://${pathUrlQuote gitlabSocket}" - http_settings = { self_signed_cert = false } + url = "http+unix://${pathUrlQuote gitlabSocket}" + + [gitlab.http-settings] + self_signed_cert = false ${concatStringsSep "\n" (attrValues (mapAttrs (k: v: '' [[storage]] @@ -119,6 +123,7 @@ let receive_pack = true; }; workhorse.secret_file = "${cfg.statePath}/.gitlab_workhorse_secret"; + gitlab_kas.secret_file = "${cfg.statePath}/.gitlab_kas_secret"; git.bin_path = "git"; monitoring = { ip_whitelist = [ "127.0.0.0/8" "::1/128" ]; @@ -668,6 +673,7 @@ in { rm "${config.services.postgresql.dataDir}/.reassigning_${cfg.databaseName}" fi $PSQL '${cfg.databaseName}' -tAc "CREATE EXTENSION IF NOT EXISTS pg_trgm" + $PSQL '${cfg.databaseName}' -tAc "CREATE EXTENSION IF NOT EXISTS btree_gist;" ''; serviceConfig = { From 2cf524c825855b22c9870bb273f38424172af968 Mon Sep 17 00:00:00 2001 From: Jeff Slight Date: Tue, 29 Sep 2020 13:39:23 -0700 Subject: [PATCH 077/260] gitlab: add new line to end of data.json file --- pkgs/applications/version-management/gitlab/data.json | 2 +- pkgs/applications/version-management/gitlab/update.py | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/version-management/gitlab/data.json b/pkgs/applications/version-management/gitlab/data.json index 0c6f40550f96..ca7ea78e4f7c 100644 --- a/pkgs/applications/version-management/gitlab/data.json +++ b/pkgs/applications/version-management/gitlab/data.json @@ -10,4 +10,4 @@ "GITLAB_SHELL_VERSION": "13.7.0", "GITLAB_WORKHORSE_VERSION": "8.46.0" } -} \ No newline at end of file +} diff --git a/pkgs/applications/version-management/gitlab/update.py b/pkgs/applications/version-management/gitlab/update.py index 3db5099598a7..98d994f00038 100755 --- a/pkgs/applications/version-management/gitlab/update.py +++ b/pkgs/applications/version-management/gitlab/update.py @@ -117,6 +117,7 @@ def update_data(rev: str): with open(data_file_path.as_posix(), 'w') as f: json.dump(data, f, indent=2) + f.write("\n") @cli.command('update-rubyenv') From 4555a26b06d5861cefb2c7fd13053f0bcbbde6e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Milan=20P=C3=A4ssler?= Date: Thu, 22 Oct 2020 13:04:51 +0200 Subject: [PATCH 078/260] gitlab: 13.4.3 -> 13.5.1 --- .../version-management/gitlab/data.json | 14 +- .../version-management/gitlab/default.nix | 3 +- .../version-management/gitlab/gitaly/Gemfile | 4 +- .../gitlab/gitaly/Gemfile.lock | 59 +- .../gitlab/gitaly/default.nix | 4 +- .../version-management/gitlab/gitaly/deps.nix | 223 +- .../gitlab/gitaly/gemset.nix | 119 +- .../gitlab/gitlab-shell/default.nix | 4 +- .../gitlab/gitlab-shell/deps.nix | 253 +- .../remove-hardcoded-locations.patch | 21 +- .../gitlab/gitlab-workhorse/default.nix | 14 +- .../gitlab/gitlab-workhorse/deps.nix | 331 ++- .../version-management/gitlab/rubyEnv/Gemfile | 46 +- .../gitlab/rubyEnv/Gemfile.lock | 230 +- .../gitlab/rubyEnv/gemset.nix | 256 +- .../version-management/gitlab/yarnPkgs.nix | 2128 +++++++++-------- 16 files changed, 2178 insertions(+), 1531 deletions(-) diff --git a/pkgs/applications/version-management/gitlab/data.json b/pkgs/applications/version-management/gitlab/data.json index ca7ea78e4f7c..a235462ce545 100644 --- a/pkgs/applications/version-management/gitlab/data.json +++ b/pkgs/applications/version-management/gitlab/data.json @@ -1,13 +1,13 @@ { - "version": "13.4.3", - "repo_hash": "19nk692ik26qcc1gcvbbrvadg6169v34gd8h7d5bwfjk12idj1id", + "version": "13.5.1", + "repo_hash": "1mb2kyyf5bczm93qn4nj3fqjgncsq98rr3414wx52lhcf4gl5w00", "owner": "gitlab-org", "repo": "gitlab", - "rev": "v13.4.3-ee", + "rev": "v13.5.1-ee", "passthru": { - "GITALY_SERVER_VERSION": "13.4.3", - "GITLAB_PAGES_VERSION": "1.25.0", - "GITLAB_SHELL_VERSION": "13.7.0", - "GITLAB_WORKHORSE_VERSION": "8.46.0" + "GITALY_SERVER_VERSION": "13.5.1", + "GITLAB_PAGES_VERSION": "1.28.0", + "GITLAB_SHELL_VERSION": "13.11.0", + "GITLAB_WORKHORSE_VERSION": "8.51.0" } } diff --git a/pkgs/applications/version-management/gitlab/default.nix b/pkgs/applications/version-management/gitlab/default.nix index 549d1a1f5601..ee6c8201fa3f 100644 --- a/pkgs/applications/version-management/gitlab/default.nix +++ b/pkgs/applications/version-management/gitlab/default.nix @@ -93,8 +93,9 @@ let bundle exec rake gettext:po_to_json RAILS_ENV=production NODE_ENV=production bundle exec rake rake:assets:precompile RAILS_ENV=production NODE_ENV=production - bundle exec rake webpack:compile RAILS_ENV=production NODE_ENV=production NODE_OPTIONS="--max_old_space_size=3072" + bundle exec rake gitlab:assets:compile_webpack_if_needed RAILS_ENV=production NODE_ENV=production bundle exec rake gitlab:assets:fix_urls RAILS_ENV=production NODE_ENV=production + bundle exec rake gitlab:assets:check_page_bundle_mixins_css_for_sideeffects RAILS_ENV=production NODE_ENV=production runHook postBuild ''; diff --git a/pkgs/applications/version-management/gitlab/gitaly/Gemfile b/pkgs/applications/version-management/gitlab/gitaly/Gemfile index cdb388b5d8df..9016a64a0873 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/Gemfile +++ b/pkgs/applications/version-management/gitlab/gitaly/Gemfile @@ -4,9 +4,9 @@ source 'https://rubygems.org' gem 'bundler', '>= 1.17.3' gem 'rugged', '~> 0.28' -gem 'github-linguist', '~> 7.9', require: 'linguist' +gem 'github-linguist', '~> 7.11', require: 'linguist' gem 'gitlab-markup', '~> 1.7.1' -gem 'activesupport', '~> 6.0.3.1' +gem 'activesupport', '~> 6.0.3.3' gem 'rdoc', '~> 6.0' gem 'gitlab-gollum-lib', '~> 4.2.7.9', require: false gem 'gitlab-gollum-rugged_adapter', '~> 0.4.4.2', require: false diff --git a/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock b/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock index 143409eba6b5..451150f0eb3a 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock +++ b/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock @@ -2,20 +2,20 @@ GEM remote: https://rubygems.org/ specs: abstract_type (0.0.7) - actionpack (6.0.3.1) - actionview (= 6.0.3.1) - activesupport (= 6.0.3.1) + actionpack (6.0.3.3) + actionview (= 6.0.3.3) + activesupport (= 6.0.3.3) rack (~> 2.0, >= 2.0.8) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.2.0) - actionview (6.0.3.1) - activesupport (= 6.0.3.1) + actionview (6.0.3.3) + activesupport (= 6.0.3.3) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.1, >= 1.2.0) - activesupport (6.0.3.1) + activesupport (6.0.3.3) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 0.7, < 2) minitest (~> 5.1) @@ -29,12 +29,12 @@ GEM ast (2.4.0) binding_ninja (0.2.3) builder (3.2.4) - charlock_holmes (0.7.6) + charlock_holmes (0.7.7) coderay (1.1.2) concord (0.1.5) adamantium (~> 0.2.0) equalizer (~> 0.0.9) - concurrent-ruby (1.1.6) + concurrent-ruby (1.1.7) crack (0.4.3) safe_yaml (~> 1.0.0) crass (1.0.6) @@ -50,8 +50,8 @@ GEM ffi (1.13.1) gemojione (3.3.0) json - github-linguist (7.9.0) - charlock_holmes (~> 0.7.6) + github-linguist (7.11.0) + charlock_holmes (~> 0.7.7) escape_utils (~> 1.2.0) mini_mime (~> 1.0) rugged (>= 0.25.1) @@ -83,18 +83,17 @@ GEM googleapis-common-protos-types (~> 1.0) grpc-tools (1.30.2) hashdiff (0.3.9) - i18n (1.8.2) + i18n (1.8.5) concurrent-ruby (~> 1.0) ice_nine (0.11.2) jaeger-client (0.10.0) opentracing (~> 0.3) thrift - jaro_winkler (1.5.2) - json (2.2.0) + json (2.3.1) licensee (8.9.2) rugged (~> 0.24) listen (0.5.3) - loofah (2.5.0) + loofah (2.7.0) crass (~> 1.0.2) nokogiri (>= 1.5.9) memoizable (0.4.2) @@ -105,7 +104,7 @@ GEM mime-types-data (3.2020.0512) mini_mime (1.0.2) mini_portile2 (2.4.0) - minitest (5.14.0) + minitest (5.14.2) msgpack (1.3.3) multipart-post (2.1.1) nokogiri (1.10.10) @@ -114,7 +113,7 @@ GEM nokogiri opentracing (0.5.0) optimist (3.0.1) - parallel (1.17.0) + parallel (1.19.2) parser (2.7.0.5) ast (~> 2.4.0) proc_to_ast (0.1.0) @@ -126,7 +125,7 @@ GEM coderay (~> 1.1.0) method_source (~> 0.9.0) public_suffix (3.0.3) - rack (2.1.2) + rack (2.2.3) rack-test (1.1.0) rack (>= 1.0, < 3) rails-dom-testing (2.0.3) @@ -141,7 +140,9 @@ GEM optimist (>= 3.0.0) rdoc (6.2.0) redis (4.1.3) - rouge (3.20.0) + regexp_parser (1.8.1) + rexml (3.2.4) + rouge (3.24.0) rspec (3.8.0) rspec-core (~> 3.8.0) rspec-expectations (~> 3.8.0) @@ -161,14 +162,18 @@ GEM rspec (>= 2.13, < 4) unparser rspec-support (3.8.0) - rubocop (0.69.0) - jaro_winkler (~> 1.5.1) + rubocop (0.86.0) parallel (~> 1.10) - parser (>= 2.6) + parser (>= 2.7.0.1) rainbow (>= 2.2.2, < 4.0) + regexp_parser (>= 1.7) + rexml + rubocop-ast (>= 0.0.3, < 1.0) ruby-progressbar (~> 1.7) - unicode-display_width (>= 1.4.0, < 1.7) - ruby-progressbar (1.10.0) + unicode-display_width (>= 1.4.0, < 2.0) + rubocop-ast (0.2.0) + parser (>= 2.7.0.1) + ruby-progressbar (1.10.1) rugged (0.28.4.1) safe_yaml (1.0.5) sanitize (4.6.6) @@ -188,7 +193,7 @@ GEM timecop (0.9.1) tzinfo (1.2.7) thread_safe (~> 0.1) - unicode-display_width (1.6.0) + unicode-display_width (1.7.0) unparser (0.4.7) abstract_type (~> 0.0.7) adamantium (~> 0.2.0) @@ -202,17 +207,17 @@ GEM addressable (>= 2.3.6) crack (>= 0.3.2) hashdiff - zeitwerk (2.3.0) + zeitwerk (2.4.0) PLATFORMS ruby DEPENDENCIES - activesupport (~> 6.0.3.1) + activesupport (~> 6.0.3.3) bundler (>= 1.17.3) factory_bot faraday (~> 1.0) - github-linguist (~> 7.9) + github-linguist (~> 7.11) gitlab-gollum-lib (~> 4.2.7.9) gitlab-gollum-rugged_adapter (~> 0.4.4.2) gitlab-labkit (~> 0.12.0) diff --git a/pkgs/applications/version-management/gitlab/gitaly/default.nix b/pkgs/applications/version-management/gitlab/gitaly/default.nix index 91fbc657b2f0..0b1774e440a7 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/default.nix +++ b/pkgs/applications/version-management/gitlab/gitaly/default.nix @@ -19,14 +19,14 @@ let }; }; in buildGoPackage rec { - version = "13.4.3"; + version = "13.5.1"; pname = "gitaly"; src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitaly"; rev = "v${version}"; - sha256 = "0gyy8l3xbdrpbq8zmdqvn7x34hxc48in4klhw5klacs1mgi3vqax"; + sha256 = "1vkifmp56lkgj178na7pqd5h9yxffcy78yaz7ykd4rmgi4c8ayk8"; }; # Fix a check which assumes that hook files are writeable by their diff --git a/pkgs/applications/version-management/gitlab/gitaly/deps.nix b/pkgs/applications/version-management/gitlab/gitaly/deps.nix index 95a7750efa7b..3aec5d10186f 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/deps.nix +++ b/pkgs/applications/version-management/gitlab/gitaly/deps.nix @@ -117,6 +117,15 @@ sha256 = "1j65b91qb9sbrml9cpabfrcf07wmgzzghrl7809hjjhrmbzri5bl"; }; } + { + goPackagePath = "github.com/alexbrainman/sspi"; + fetch = { + type = "git"; + url = "https://github.com/alexbrainman/sspi"; + rev = "4729b3d4d858"; + sha256 = "12xy7gi9v48z8akm6h33qjk3m06f5nw1q15a6y2r61pd404bkdyc"; + }; + } { goPackagePath = "github.com/armon/consul-api"; fetch = { @@ -135,6 +144,15 @@ sha256 = "0y8chspn14n9xpsfb9gxnnf819rfpriaz64v81p7873a42kkhxb4"; }; } + { + goPackagePath = "github.com/avast/retry-go"; + fetch = { + type = "git"; + url = "https://github.com/avast/retry-go"; + rev = "v2.4.2"; + sha256 = "0hb4b1668516a4gv8avmflr565b6c1h93phdb068hcjxxj8767ba"; + }; + } { goPackagePath = "github.com/beorn7/perks"; fetch = { @@ -315,6 +333,15 @@ sha256 = "1x3l4jgps0v1bjvd446kj4dp0ckswjckxgrng9afm275ixnf83ix"; }; } + { + goPackagePath = "github.com/dpotapov/go-spnego"; + fetch = { + type = "git"; + url = "https://github.com/dpotapov/go-spnego"; + rev = "c2c609116ad0"; + sha256 = "1ba14j1y8sjlagx7rfjmvdwlyc90qblpplfb0p3zwsj8chqaijgf"; + }; + } { goPackagePath = "github.com/dustin/go-humanize"; fetch = { @@ -432,6 +459,51 @@ sha256 = "19nxip48p2s8l7p1p7wpd5li2fcngi4c58rgcg71izdmsmj2iw1d"; }; } + { + goPackagePath = "github.com/git-lfs/git-lfs"; + fetch = { + type = "git"; + url = "https://github.com/git-lfs/git-lfs"; + rev = "9ea4eed5b112"; + sha256 = "02xx8iw48zyccfxm30kc3r3hgwhc64yfrcy7c2bv4b1hqn09wwnz"; + }; + } + { + goPackagePath = "github.com/git-lfs/gitobj"; + fetch = { + type = "git"; + url = "https://github.com/git-lfs/gitobj"; + rev = "v2.0.0"; + sha256 = "15x3q3ad50jyi6rjjw4siw6gxcp1ppwwhmzq3916vs186b0rqdyv"; + }; + } + { + goPackagePath = "github.com/git-lfs/go-netrc"; + fetch = { + type = "git"; + url = "https://github.com/git-lfs/go-netrc"; + rev = "e0e9ca483a18"; + sha256 = "16djli5hasqm4js2d72msk32ym0y5jmk3a4634nrgbncjksnfihi"; + }; + } + { + goPackagePath = "github.com/git-lfs/go-ntlm"; + fetch = { + type = "git"; + url = "https://github.com/git-lfs/go-ntlm"; + rev = "c5056e7fa066"; + sha256 = "1wrv3aczz0g4wqxjw5pvyy9z1cvj2b33q84h5mprik0f1hwyfwnh"; + }; + } + { + goPackagePath = "github.com/git-lfs/wildmatch"; + fetch = { + type = "git"; + url = "https://github.com/git-lfs/wildmatch"; + rev = "v1.0.4"; + sha256 = "19k8a9j9l0ddlv3asxnn7bblryz674fpm9dg8ds0s74fhix6a5dr"; + }; + } { goPackagePath = "github.com/go-check/check"; fetch = { @@ -572,8 +644,8 @@ fetch = { type = "git"; url = "https://github.com/gogo/protobuf"; - rev = "v1.1.1"; - sha256 = "1525pq7r6h3s8dncvq8gxi893p2nq8dxpzvq0nfl5b4p6mq0v1c2"; + rev = "v1.2.1"; + sha256 = "06yqa6h0kw3gr5pc3qmas7f7435a96zf7iw7p0l00r2hqf6fqq6m"; }; } { @@ -765,6 +837,15 @@ sha256 = "00nyn8llqzbfm8aflr9kwsvpzi4kv8v45c141v88xskxp5xf6z49"; }; } + { + goPackagePath = "github.com/hashicorp/go-uuid"; + fetch = { + type = "git"; + url = "https://github.com/hashicorp/go-uuid"; + rev = "v1.0.2"; + sha256 = "1azjn5a03cv0bdab3clmkfz8g9807nxxjwy9i7dy73p7d4sikhja"; + }; + } { goPackagePath = "github.com/hashicorp/go-version"; fetch = { @@ -864,6 +945,15 @@ sha256 = "1a1lk2ll2xv3ljffmfw4q8mqqw727pj8dzs6c8g2hh0b0b050g79"; }; } + { + goPackagePath = "github.com/jcmturner/gofork"; + fetch = { + type = "git"; + url = "https://github.com/jcmturner/gofork"; + rev = "v1.0.0"; + sha256 = "0xzsnjqv3d59w9pgqzf6550wdwaqnac7zcdgqfd25w65yhcffzhr"; + }; + } { goPackagePath = "github.com/joho/godotenv"; fetch = { @@ -990,6 +1080,15 @@ sha256 = "1zcq480ig7wbg4378qcfxznp2gzqmk7x6rbxizflvg9v2f376vrw"; }; } + { + goPackagePath = "github.com/kisielk/errcheck"; + fetch = { + type = "git"; + url = "https://github.com/kisielk/errcheck"; + rev = "v1.1.0"; + sha256 = "19vd4rxmqbk5lpiav3pf7df3yjlz0l0dwx9mn0gjq5f998iyhy6y"; + }; + } { goPackagePath = "github.com/kisielk/gotool"; fetch = { @@ -1022,8 +1121,8 @@ fetch = { type = "git"; url = "https://github.com/konsorten/go-windows-terminal-sequences"; - rev = "v1.0.2"; - sha256 = "09mn209ika7ciy87xf2x31dq5fnqw39jidgaljvmqxwk7ff1hnx7"; + rev = "v1.0.3"; + sha256 = "1yrsd4s8vhjnxhwbigirymz89dn6qfjnhn28i33vvvdgf96j6ypl"; }; } { @@ -1130,8 +1229,8 @@ fetch = { type = "git"; url = "https://github.com/mattn/go-isatty"; - rev = "v0.0.9"; - sha256 = "0i3km37lajahh1y2392g4hpgvq05arcgiiv93yhzxxyv0fpqj72m"; + rev = "v0.0.12"; + sha256 = "1dfsh27d52wmz0nmmzm2382pfrs2fcijvh6cgir7jbb4pnigr5w4"; }; } { @@ -1305,6 +1404,15 @@ sha256 = "1f4mwdh501p8105nfxayprlj5ld14fwzyyy2wbc04xk3wrm1wzlf"; }; } + { + goPackagePath = "github.com/olekukonko/ts"; + fetch = { + type = "git"; + url = "https://github.com/olekukonko/ts"; + rev = "78ecb04241c0"; + sha256 = "0k88n5rvs5k5zalbfa7c71jkjb8dhpk83s425z728qn6aq49c978"; + }; + } { goPackagePath = "github.com/onsi/ginkgo"; fetch = { @@ -1364,8 +1472,8 @@ fetch = { type = "git"; url = "https://github.com/pelletier/go-toml"; - rev = "v1.2.0"; - sha256 = "1fjzpcjng60mc3a4b2ql5a00d5gah84wj740dabv9kq67mpg8fxy"; + rev = "v1.8.1"; + sha256 = "1pi1r9ds0vxjza4qrbk52y98wxrzh1ghwzc9c2v1w6i02pdwdcz9"; }; } { @@ -1467,6 +1575,15 @@ sha256 = "0z7y7vsnzjswx51g9hlawnzmwnb8c7rks6ljzf6m1xbimhi4n3kz"; }; } + { + goPackagePath = "github.com/rubyist/tracerx"; + fetch = { + type = "git"; + url = "https://github.com/rubyist/tracerx"; + rev = "787959303086"; + sha256 = "1xj5213r00zjhb7d2l6wlwv62g6mss50jwjpf7g8fk8djv3l29zz"; + }; + } { goPackagePath = "github.com/russross/blackfriday"; fetch = { @@ -1517,8 +1634,8 @@ fetch = { type = "git"; url = "https://github.com/sirupsen/logrus"; - rev = "v1.4.2"; - sha256 = "087k2lxrr9p9dh68yw71d05h5g9p5v26zbwd6j7lghinjfaw334x"; + rev = "v1.6.0"; + sha256 = "1zf9is1yxxnna0d1pyag2m9ziy3l27zb2j92p9msm1gx5jjrvzzj"; }; } { @@ -1593,6 +1710,15 @@ sha256 = "1829hvf805kda65l59r17wvid7y0vr390s23zfhf4w7vdb4wp3zh"; }; } + { + goPackagePath = "github.com/ssgelm/cookiejarparser"; + fetch = { + type = "git"; + url = "https://github.com/ssgelm/cookiejarparser"; + rev = "v1.0.1"; + sha256 = "0fnm53br0cg3iwzniil0lh9w4xd6xpzfypwfpdiammfqavlqgcw4"; + }; + } { goPackagePath = "github.com/stretchr/objx"; fetch = { @@ -1607,8 +1733,8 @@ fetch = { type = "git"; url = "https://github.com/stretchr/testify"; - rev = "v1.4.0"; - sha256 = "187i5g88sxfy4vxpm7dw1gwv29pa2qaq475lxrdh5livh69wqfjb"; + rev = "v1.5.1"; + sha256 = "09r89m1wy4cjv2nps1ykp00qjpi0531r07q3s34hr7m6njk4srkl"; }; } { @@ -1787,8 +1913,8 @@ fetch = { type = "git"; url = "https://gitlab.com/gitlab-org/gitlab-shell.git"; - rev = "82ec8144fb2a"; - sha256 = "1gh3rwnd6688v7q07g2y69fdz2nyy7disjqifvbl7z1cpfw4h45b"; + rev = "1a2bfecd2f0e"; + sha256 = "197b3yn7lp6dbzcgxrj3ns2a839adcfmcwi3h53i1sr6952ciayx"; }; } { @@ -1814,8 +1940,8 @@ fetch = { type = "git"; url = "https://github.com/uber-go/atomic"; - rev = "v1.3.2"; - sha256 = "11pzvjys5ddjjgrv94pgk9pnip9yyb54z7idf33zk7p7xylpnsv6"; + rev = "v1.4.0"; + sha256 = "0c6yzx15c20719xii3dm0vyjd8i9jx45m0wh5yp1zf29b0gbljcy"; }; } { @@ -1823,8 +1949,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/crypto"; - rev = "87dc89f01550"; - sha256 = "0z4i1m2yn3f31ci7wvcm2rxkx2yiv7a78mfzklncmsz2k97rlh2g"; + rev = "5c72a883971a"; + sha256 = "1cimmqpajys001x6yq8ycklc4w34y7iwrksv7ayv7m7fgzhcjn3d"; }; } { @@ -1877,8 +2003,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/net"; - rev = "6afb5195e5aa"; - sha256 = "1aiz41q2yxgg3dxfkn33ff54vhaxbiwcps9j3ia1xx4cqxim38zw"; + rev = "62affa334b73"; + sha256 = "0v88xr36220wawwck914f90n9zvvc6lcx33ak3iplkwq0xkgw5fr"; }; } { @@ -1895,8 +2021,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/sync"; - rev = "cd5d95a43a6e"; - sha256 = "1nqkyz2y1qvqcma52ijh02s8aiqmkfb95j08f6zcjhbga3ds6hds"; + rev = "6e8e738ad208"; + sha256 = "1avk27pszd5l5df6ff7j78wgla46ir1hhy2jwfl9a3c0ys602yx9"; }; } { @@ -1904,8 +2030,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/sys"; - rev = "86b910548bc1"; - sha256 = "1z8l2wp27q0bd4nc46j31lc7cr6kiw52zi6ix3i121pd3rcyrw44"; + rev = "af09f7315aff"; + sha256 = "0kr94lzr8ngrc6913j5xh6g4r7g087dbdgnpzi6rjcl0bf8nsr22"; }; } { @@ -2052,6 +2178,51 @@ sha256 = "0zwkq4cv71vp7cmpfcs54908g1amr0cdxv1b8h1icf64jjawb1lb"; }; } + { + goPackagePath = "gopkg.in/jcmturner/aescts.v1"; + fetch = { + type = "git"; + url = "https://gopkg.in/jcmturner/aescts.v1"; + rev = "v1.0.1"; + sha256 = "0rbq4zf3db48xa2gqdp2swws7wizmbwagigqkr1zxzd1ramps6rv"; + }; + } + { + goPackagePath = "gopkg.in/jcmturner/dnsutils.v1"; + fetch = { + type = "git"; + url = "https://gopkg.in/jcmturner/dnsutils.v1"; + rev = "v1.0.1"; + sha256 = "0l543c64pyzbnrc00jspg21672l3a0kjjw9pbdxwna93w8d8m927"; + }; + } + { + goPackagePath = "gopkg.in/jcmturner/goidentity.v2"; + fetch = { + type = "git"; + url = "https://gopkg.in/jcmturner/goidentity.v2"; + rev = "v2.0.0"; + sha256 = "0sfkxrx57dmjlzz4sxfmbsfaxkm32wg6ymjhaga2ggkixlzdd4d7"; + }; + } + { + goPackagePath = "gopkg.in/jcmturner/gokrb5.v5"; + fetch = { + type = "git"; + url = "https://gopkg.in/jcmturner/gokrb5.v5"; + rev = "v5.3.0"; + sha256 = "0jynpkncifdd2ib2pc9qhh0r8q7ab7yw0ygzpzgisdzv8ars1diq"; + }; + } + { + goPackagePath = "gopkg.in/jcmturner/rpc.v0"; + fetch = { + type = "git"; + url = "https://gopkg.in/jcmturner/rpc.v0"; + rev = "v0.0.2"; + sha256 = "0hivgq52gwxsqs5x1my2047k7nqh7wx3yi0llsj3lc3h2mjy4yhd"; + }; + } { goPackagePath = "gopkg.in/mgo.v2"; fetch = { @@ -2075,8 +2246,8 @@ fetch = { type = "git"; url = "https://gopkg.in/yaml.v2"; - rev = "v2.2.8"; - sha256 = "1inf7svydzscwv9fcjd2rm61a4xjk6jkswknybmns2n58shimapw"; + rev = "v2.3.0"; + sha256 = "1md0hlyd9s6myv3663i9l59y74n4xjazifmmyxn43g86fgkc5lzj"; }; } { diff --git a/pkgs/applications/version-management/gitlab/gitaly/gemset.nix b/pkgs/applications/version-management/gitlab/gitaly/gemset.nix index d30b3a0a15f0..d09532187203 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/gemset.nix +++ b/pkgs/applications/version-management/gitlab/gitaly/gemset.nix @@ -13,10 +13,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1665r4ffqdpykxwpgdnaq7xsaz1nfswc5wjs2qr0npx8bq7g49kh"; + sha256 = "1p873nqwmpsvmkb5n86d70wndx1qhy15pc9mbcd1mc8sj174578b"; type = "gem"; }; - version = "6.0.3.1"; + version = "6.0.3.3"; }; actionview = { dependencies = ["activesupport" "builder" "erubi" "rails-dom-testing" "rails-html-sanitizer"]; @@ -24,10 +24,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1n21pswh3k7m33vzhxyrbi5lj64b1138yqv34jjhkhlq3474b4rh"; + sha256 = "08pvmjddlw01q5r9zdfgddwp4csndpf5i2w47677z5r36jznz36q"; type = "gem"; }; - version = "6.0.3.1"; + version = "6.0.3.3"; }; activesupport = { dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo" "zeitwerk"]; @@ -35,10 +35,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1l29n9n38c9lpy5smh26r7fy7jp2bpjqlzhxgsr79cv7xpwlrbhs"; + sha256 = "1dmkqbvndbz011a1byg6f990936vfadbnwjwjw9vjzr4kd8bxk96"; type = "gem"; }; - version = "6.0.3.1"; + version = "6.0.3.3"; }; adamantium = { dependencies = ["ice_nine" "memoizable"]; @@ -89,12 +89,14 @@ version = "3.2.4"; }; charlock_holmes = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1nf1l31n10yaark2rrg5qzyzcx9w80681449s3j09qmnipsl8rl5"; + sha256 = "0hybw8jw9ryvz5zrki3gc9r88jqy373m6v46ynxsdzv1ysiyr40p"; type = "gem"; }; - version = "0.7.6"; + version = "0.7.7"; }; coderay = { source = { @@ -118,10 +120,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "094387x4yasb797mv07cs3g6f08y56virc2rjcpb1k79rzaj3nhl"; + sha256 = "1vnxrbhi7cq3p4y2v9iwd10v1c7l15is4var14hwnb2jip4fyjzz"; type = "gem"; }; - version = "1.1.6"; + version = "1.1.7"; }; crack = { dependencies = ["safe_yaml"]; @@ -233,10 +235,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0rhw05d88l928g6y2bngvmr66565b2z822hyynmb13b7khf07y1a"; + sha256 = "12vwx6msqqdyf10zrrp2zdwr8ixrb82phriyin16rsmndb93cijv"; type = "gem"; }; - version = "7.9.0"; + version = "7.11.0"; }; github-markup = { source = { @@ -347,10 +349,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0jwrd1l4mxz06iyx6053lr6hz2zy7ah2k3ranfzisvych5q19kwm"; + sha256 = "153sx77p16vawrs4qpkv7qlzf9v5fks4g7xqcj1dwk40i6g7rfzk"; type = "gem"; }; - version = "1.8.2"; + version = "1.8.5"; }; ice_nine = { source = { @@ -371,25 +373,15 @@ }; version = "0.10.0"; }; - jaro_winkler = { + json = { groups = ["default" "development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1zz27z88qznix4r65gd9h56gl177snlfpgv10b0s69vi8qpl909l"; + sha256 = "158fawfwmv2sq4whqqaksfykkiad2xxrrj0nmpnc6vnlzi1bp7iz"; type = "gem"; }; - version = "1.5.2"; - }; - json = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0sx97bm9by389rbzv8r1f43h06xcz8vwi3h5jv074gvparql7lcx"; - type = "gem"; - }; - version = "2.2.0"; + version = "2.3.1"; }; licensee = { dependencies = ["rugged"]; @@ -414,10 +406,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0jk9fgn5ayzbqvzqm11gbkqvas77zdbpkvynlylyiwynclgrn040"; + sha256 = "1alz1x6rkhbw10qpszr384299rf52rcyasn0619a9p50vzs8vczq"; type = "gem"; }; - version = "2.5.0"; + version = "2.7.0"; }; memoizable = { dependencies = ["thread_safe"]; @@ -480,10 +472,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0g73x65hmjph8dg1h3rkzfg7ys3ffxm35hj35grw75fixmq53qyz"; + sha256 = "170y2cvx51gm3cm3nhdf7j36sxnkh6vv8ls36p90ric7w8w16h4v"; type = "gem"; }; - version = "5.14.0"; + version = "5.14.2"; }; msgpack = { groups = ["default"]; @@ -550,10 +542,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1x1gzgjrdlkm1aw0hfpyphsxcx90qgs3y4gmp9km3dvf4hc4qm8r"; + sha256 = "17b127xxmm2yqdz146qwbs57046kn0js1h8synv01dwqz2z1kp2l"; type = "gem"; }; - version = "1.17.0"; + version = "1.19.2"; }; parser = { dependencies = ["ast"]; @@ -605,10 +597,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "04qa0ry26hxfwkmvhi0fjlvbm8irzg66ahnpx2pp3bl6qbdc0i8w"; + sha256 = "0i5vs0dph9i5jn8dfc6aqd6njcafmb20rwqngrf759c9cvmyff16"; type = "gem"; }; - version = "2.1.2"; + version = "2.2.3"; }; rack-test = { dependencies = ["rack"]; @@ -682,15 +674,35 @@ }; version = "4.1.3"; }; + regexp_parser = { + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0n9d14ppshnx71i3mi1pnm3hwhcbb6m6vsc0b0dqgsab8r2rs96n"; + type = "gem"; + }; + version = "1.8.1"; + }; + rexml = { + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1mkvkcw9fhpaizrhca0pdgjcrbns48rlz4g6lavl5gjjq3rk2sq3"; + type = "gem"; + }; + version = "3.2.4"; + }; rouge = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1r5npy9a95qh5v74lw7ir3nhaq4xrzyhfdixd7c5xy295i92nnic"; + sha256 = "1igl00gk0vaq4xxk44m7yflqdzsblgxlzcxj8saz96bmx7mg7392"; type = "gem"; }; - version = "3.20.0"; + version = "3.24.0"; }; rspec = { dependencies = ["rspec-core" "rspec-expectations" "rspec-mocks"]; @@ -758,23 +770,36 @@ version = "3.8.0"; }; rubocop = { - dependencies = ["jaro_winkler" "parallel" "parser" "rainbow" "ruby-progressbar" "unicode-display_width"]; + dependencies = ["parallel" "parser" "rainbow" "regexp_parser" "rexml" "rubocop-ast" "ruby-progressbar" "unicode-display_width"]; groups = ["development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1cmw8ajaiidvrzjcsljh47f4l3lmcazqrzljgalj3szkr8ibkk5i"; + sha256 = "1jl3ghxw1bpj272s5s3gl07l2rbd1vwr9z9jmlxxaa2faldn9gms"; type = "gem"; }; - version = "0.69.0"; + version = "0.86.0"; }; - ruby-progressbar = { + rubocop-ast = { + dependencies = ["parser"]; + groups = ["default" "development" "test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1cv2ym3rl09svw8940ny67bav7b2db4ms39i4raaqzkf59jmhglk"; + sha256 = "1w5rjkwxaxkr2jr1sl5wz0nffal27ik6b1qfzx5skl43vfk2jz97"; type = "gem"; }; - version = "1.10.0"; + version = "0.2.0"; + }; + ruby-progressbar = { + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1k77i0d4wsn23ggdd2msrcwfy0i376cglfqypkk2q77r2l3408zf"; + type = "gem"; + }; + version = "1.10.1"; }; rugged = { groups = ["default"]; @@ -889,10 +914,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "08kfiniak1pvg3gn5k6snpigzvhvhyg7slmm0s2qx5zkj62c1z2w"; + sha256 = "06i3id27s60141x6fdnjn5rar1cywdwy64ilc59cz937303q3mna"; type = "gem"; }; - version = "1.6.0"; + version = "1.7.0"; }; unparser = { dependencies = ["abstract_type" "adamantium" "concord" "diff-lcs" "equalizer" "parser" "procto"]; @@ -927,9 +952,9 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1akpm3pwvyiack2zk6giv9yn3cqb8pw6g40p4394pdc3xmy3s4k0"; + sha256 = "0jvn50k76kl14fpymk4hdsf9sk00jl84yxzl783xhnw4dicp0m0k"; type = "gem"; }; - version = "2.3.0"; + version = "2.4.0"; }; } \ No newline at end of file diff --git a/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix b/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix index 3289697279fa..f918bfb1cab6 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix +++ b/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix @@ -2,12 +2,12 @@ buildGoPackage rec { pname = "gitlab-shell"; - version = "13.7.0"; + version = "13.11.0"; src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-shell"; rev = "v${version}"; - sha256 = "1gh3rwnd6688v7q07g2y69fdz2nyy7disjqifvbl7z1cpfw4h45b"; + sha256 = "1m18v5qax14qz0a0ifpl96i4p5caysls33hg93q1x83x1xryxd54"; }; buildInputs = [ ruby ]; diff --git a/pkgs/applications/version-management/gitlab/gitlab-shell/deps.nix b/pkgs/applications/version-management/gitlab/gitlab-shell/deps.nix index 43da3cd8b0b7..4f841c5fff09 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-shell/deps.nix +++ b/pkgs/applications/version-management/gitlab/gitlab-shell/deps.nix @@ -126,13 +126,31 @@ sha256 = "1j6fdr1sg36qy4n4xjl7brq739fpm5npq98cmvklzjc9qrx98nk9"; }; } + { + goPackagePath = "github.com/armon/go-radix"; + fetch = { + type = "git"; + url = "https://github.com/armon/go-radix"; + rev = "7fddfc383310"; + sha256 = "0y8chspn14n9xpsfb9gxnnf819rfpriaz64v81p7873a42kkhxb4"; + }; + } { goPackagePath = "github.com/beorn7/perks"; fetch = { type = "git"; url = "https://github.com/beorn7/perks"; - rev = "v1.0.0"; - sha256 = "1i1nz1f6g55xi2y3aiaz5kqfgvknarbfl4f0sx4nyyb4s7xb1z9x"; + rev = "v1.0.1"; + sha256 = "17n4yygjxa6p499dj3yaqzfww2g7528165cl13haj97hlx94dgl7"; + }; + } + { + goPackagePath = "github.com/bgentry/speakeasy"; + fetch = { + type = "git"; + url = "https://github.com/bgentry/speakeasy"; + rev = "v0.1.0"; + sha256 = "02dfrj0wyphd3db9zn2mixqxwiz1ivnyc5xc7gkz58l5l27nzp8s"; }; } { @@ -194,8 +212,8 @@ fetch = { type = "git"; url = "https://github.com/cloudflare/tableflip"; - rev = "8392f1641731"; - sha256 = "0by5hk8s0bhhl3kiw658p5g53zvc61k4q2wxnh1w64p5ghd1rfn8"; + rev = "4baec9811f2b"; + sha256 = "095xb5gfz7dglljp91nh68dnscddvlf7q5ivvz972fq86r3ypq6q"; }; } { @@ -261,6 +279,15 @@ sha256 = "0hka6hmyvp701adzag2g26cxdj47g21x6jz4sc6jjz1mn59d474y"; }; } + { + goPackagePath = "github.com/denisenkom/go-mssqldb"; + fetch = { + type = "git"; + url = "https://github.com/denisenkom/go-mssqldb"; + rev = "cfbb681360f0"; + sha256 = "0mr4y9vppiyl7mvad74k3zk4sc1jdkmc0lcd6lhm70iziw2xpncs"; + }; + } { goPackagePath = "github.com/dgraph-io/badger"; fetch = { @@ -324,6 +351,15 @@ sha256 = "1yacmwmil625p0pzj800h9dnmiab6bjwfmi48p9fcrvy2yyv9b97"; }; } + { + goPackagePath = "github.com/fatih/color"; + fetch = { + type = "git"; + url = "https://github.com/fatih/color"; + rev = "v1.7.0"; + sha256 = "0v8msvg38r8d1iiq2i5r4xyfx0invhc941kjrsg5gzwvagv55inv"; + }; + } { goPackagePath = "github.com/fatih/structs"; fetch = { @@ -365,7 +401,7 @@ fetch = { type = "git"; url = "https://github.com/getsentry/raven-go"; - rev = "v0.1.2"; + rev = "v0.1.0"; sha256 = "1dl80kar4lzdcfl3w6jssi1ld6bv0rmx6sp6bz6rzysfr9ilm02z"; }; } @@ -450,6 +486,15 @@ sha256 = "01ip3mwbnm5isq120ww73yrvbcn6n5944prhhbyf2ggyf6g46ylh"; }; } + { + goPackagePath = "github.com/go-sql-driver/mysql"; + fetch = { + type = "git"; + url = "https://github.com/go-sql-driver/mysql"; + rev = "v1.4.1"; + sha256 = "1fvsvwc1v2i0gqn01mynvi1shp5xm0xaym6xng09fcbqb56lbjx1"; + }; + } { goPackagePath = "github.com/go-stack/stack"; fetch = { @@ -459,6 +504,42 @@ sha256 = "0wk25751ryyvxclyp8jdk5c3ar0cmfr8lrjb66qbg4808x66b96v"; }; } + { + goPackagePath = "github.com/gobuffalo/envy"; + fetch = { + type = "git"; + url = "https://github.com/gobuffalo/envy"; + rev = "v1.7.1"; + sha256 = "1s1f05cgpkhgcs2qfh04ixxm1ggk8ms3fpwsxhb0mx7nfrcm106d"; + }; + } + { + goPackagePath = "github.com/gobuffalo/logger"; + fetch = { + type = "git"; + url = "https://github.com/gobuffalo/logger"; + rev = "v1.0.1"; + sha256 = "1w6rkz0xwq3xj3giwzjkfnai69a0cgg09zx01z7s8r5z450cish3"; + }; + } + { + goPackagePath = "github.com/gobuffalo/packd"; + fetch = { + type = "git"; + url = "https://github.com/gobuffalo/packd"; + rev = "v0.3.0"; + sha256 = "02sg33jkp219g0z3yf2fn9xm2zds1qxzdznx5mh8vffh4njjg1x8"; + }; + } + { + goPackagePath = "github.com/gobuffalo/packr"; + fetch = { + type = "git"; + url = "https://github.com/gobuffalo/packr"; + rev = "v2.7.1"; + sha256 = "0m5kl2fq8gf1v4vllgag2xl8fd382sdgqrcdb8f5alsnrdn08kb9"; + }; + } { goPackagePath = "github.com/gobwas/httphead"; fetch = { @@ -495,6 +576,15 @@ sha256 = "1525pq7r6h3s8dncvq8gxi893p2nq8dxpzvq0nfl5b4p6mq0v1c2"; }; } + { + goPackagePath = "github.com/golang-sql/civil"; + fetch = { + type = "git"; + url = "https://github.com/golang-sql/civil"; + rev = "cb61b32ac6fe"; + sha256 = "0yadfbvi0w06lg3sxw0daji02jxd3vv2in26yfmwpl4vd4vm9zay"; + }; + } { goPackagePath = "github.com/golang/glog"; fetch = { @@ -513,15 +603,6 @@ sha256 = "07555csk49ara636bhl2vbzziayls3qks8964z0q29g065zliy9j"; }; } - { - goPackagePath = "github.com/golang/lint"; - fetch = { - type = "git"; - url = "https://github.com/golang/lint"; - rev = "06c8688daad7"; - sha256 = "0xi94dwvz50a66bq1hp9fyqkym5mcpdxdb1hrfvicldgjf37lc47"; - }; - } { goPackagePath = "github.com/golang/mock"; fetch = { @@ -657,6 +738,24 @@ sha256 = "1lzk54h7np32b3acidg1ggbn8ppbnns0m71gcg9d1qkkdh8zrijl"; }; } + { + goPackagePath = "github.com/hashicorp/errwrap"; + fetch = { + type = "git"; + url = "https://github.com/hashicorp/errwrap"; + rev = "v1.0.0"; + sha256 = "0slfb6w3b61xz04r32bi0a1bygc82rjzhqkxj2si2074wynqnr1c"; + }; + } + { + goPackagePath = "github.com/hashicorp/go-multierror"; + fetch = { + type = "git"; + url = "https://github.com/hashicorp/go-multierror"; + rev = "v1.0.0"; + sha256 = "00nyn8llqzbfm8aflr9kwsvpzi4kv8v45c141v88xskxp5xf6z49"; + }; + } { goPackagePath = "github.com/hashicorp/go-version"; fetch = { @@ -756,6 +855,15 @@ sha256 = "1a1lk2ll2xv3ljffmfw4q8mqqw727pj8dzs6c8g2hh0b0b050g79"; }; } + { + goPackagePath = "github.com/joho/godotenv"; + fetch = { + type = "git"; + url = "https://github.com/joho/godotenv"; + rev = "v1.3.0"; + sha256 = "0ri8if0pc3x6jg4c3i8wr58xyfpxkwmcjk3rp8gb398a1aa3gpjm"; + }; + } { goPackagePath = "github.com/json-iterator/go"; fetch = { @@ -905,8 +1013,8 @@ fetch = { type = "git"; url = "https://github.com/konsorten/go-windows-terminal-sequences"; - rev = "v1.0.2"; - sha256 = "09mn209ika7ciy87xf2x31dq5fnqw39jidgaljvmqxwk7ff1hnx7"; + rev = "v1.0.3"; + sha256 = "1yrsd4s8vhjnxhwbigirymz89dn6qfjnhn28i33vvvdgf96j6ypl"; }; } { @@ -963,13 +1071,22 @@ sha256 = "18z7akyzm75p6anm4b8qkqgm4iivx50z07hi5wf50w1pbsvbcdi0"; }; } + { + goPackagePath = "github.com/lib/pq"; + fetch = { + type = "git"; + url = "https://github.com/lib/pq"; + rev = "v1.2.0"; + sha256 = "08j1smm6rassdssdks4yh9aspa1dv1g5nvwimmknspvhx8a7waqz"; + }; + } { goPackagePath = "github.com/libgit2/git2go"; fetch = { type = "git"; url = "https://github.com/libgit2/git2go"; - rev = "ecaeb7a21d47"; - sha256 = "14r7ryff93r49g94f6kg66xc0y6rwb31lj22s3qmzmlgywk0pgvr"; + rev = "v30.0.5"; + sha256 = "13jk4r8x8rb9lar35dxvh3g7hnzclq95jbpg88y4xklmh48yy3sk"; }; } { @@ -1008,6 +1125,15 @@ sha256 = "0i3km37lajahh1y2392g4hpgvq05arcgiiv93yhzxxyv0fpqj72m"; }; } + { + goPackagePath = "github.com/mattn/go-runewidth"; + fetch = { + type = "git"; + url = "https://github.com/mattn/go-runewidth"; + rev = "v0.0.4"; + sha256 = "00b3ssm7wiqln3k54z2wcnxr3k3c7m1ybyhb9h8ixzbzspld0qzs"; + }; + } { goPackagePath = "github.com/mattn/go-shellwords"; fetch = { @@ -1017,6 +1143,15 @@ sha256 = "08zcgr1az1n8zaxzwdd205j86hczgyc52nxfnw5avpw7rrkf7v0d"; }; } + { + goPackagePath = "github.com/mattn/go-sqlite3"; + fetch = { + type = "git"; + url = "https://github.com/mattn/go-sqlite3"; + rev = "v1.12.0"; + sha256 = "0di8zy6202sbs0p9kx8lpii77ir5jwjhg6z0796y3nfvw87wk9iv"; + }; + } { goPackagePath = "github.com/mattn/goveralls"; fetch = { @@ -1062,6 +1197,15 @@ sha256 = "0j0aylsxqjcj49w7ph8cmpaqjlpvg7mb5mrcrd9bg71dlb9z9ir2"; }; } + { + goPackagePath = "github.com/mitchellh/cli"; + fetch = { + type = "git"; + url = "https://github.com/mitchellh/cli"; + rev = "v1.0.0"; + sha256 = "1i9kmr7rcf10d2hji8h4247hmc0nbairv7a0q51393aw2h1bnwg2"; + }; + } { goPackagePath = "github.com/mitchellh/go-homedir"; fetch = { @@ -1143,6 +1287,15 @@ sha256 = "11zbhg4kds5idsya04bwz4plj0mmiigypzppzih731ppbk2ms1zg"; }; } + { + goPackagePath = "github.com/olekukonko/tablewriter"; + fetch = { + type = "git"; + url = "https://github.com/olekukonko/tablewriter"; + rev = "v0.0.2"; + sha256 = "1f4mwdh501p8105nfxayprlj5ld14fwzyyy2wbc04xk3wrm1wzlf"; + }; + } { goPackagePath = "github.com/onsi/ginkgo"; fetch = { @@ -1242,6 +1395,15 @@ sha256 = "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw"; }; } + { + goPackagePath = "github.com/posener/complete"; + fetch = { + type = "git"; + url = "https://github.com/posener/complete"; + rev = "v1.1.1"; + sha256 = "1nbdiybjizbaxbf5q0xwbq0cjqw4bl6jggvsjzrpif0w86fcjda2"; + }; + } { goPackagePath = "github.com/prometheus/client_golang"; fetch = { @@ -1274,8 +1436,8 @@ fetch = { type = "git"; url = "https://github.com/prometheus/procfs"; - rev = "v0.0.2"; - sha256 = "0s7pvs7fgnfpmym3cd0k219av321h9sf3yvdlnn3qy0ps280lg7k"; + rev = "v0.0.3"; + sha256 = "18c4m795fwng8f8qa395f3crvamlbk5y5afk8b5rzyisnmjq774y"; }; } { @@ -1283,8 +1445,17 @@ fetch = { type = "git"; url = "https://github.com/rogpeppe/go-internal"; - rev = "v1.3.0"; - sha256 = "0mcdh1licgnnahwml9y2iq6xy5x9xmjw5frcnds2s3wpjyqrl216"; + rev = "v1.4.0"; + sha256 = "17wisy8bapx5ki0gpissm8dvv7x0lmdnrl1fka75g05kpbyv6g2n"; + }; + } + { + goPackagePath = "github.com/rubenv/sql-migrate"; + fetch = { + type = "git"; + url = "https://github.com/rubenv/sql-migrate"; + rev = "06338513c237"; + sha256 = "0z7y7vsnzjswx51g9hlawnzmwnb8c7rks6ljzf6m1xbimhi4n3kz"; }; } { @@ -1337,8 +1508,8 @@ fetch = { type = "git"; url = "https://github.com/sirupsen/logrus"; - rev = "v1.3.0"; - sha256 = "0ib7k8cwxn53dyxd3af1g81z018n77n6q64pm4miznirf7c2c9gk"; + rev = "v1.6.0"; + sha256 = "1zf9is1yxxnna0d1pyag2m9ziy3l27zb2j92p9msm1gx5jjrvzzj"; }; } { @@ -1436,8 +1607,8 @@ fetch = { type = "git"; url = "https://github.com/tinylib/msgp"; - rev = "v1.1.0"; - sha256 = "08ha23sn14071ywrgxlyj7r523vzdwx1i83dcp1mqa830glgqaff"; + rev = "v1.0.2"; + sha256 = "0pypfknghg1hcjjrqz3f1riaylk6hcxn9h0qyzynb74rp0qmlxjc"; }; } { @@ -1593,6 +1764,15 @@ sha256 = "18vbc7jagnjw1wpvhqjffl0np7bzzqdd9jpdcisvj5h85lbyn5gk"; }; } + { + goPackagePath = "github.com/ziutek/mymysql"; + fetch = { + type = "git"; + url = "https://github.com/ziutek/mymysql"; + rev = "v1.5.4"; + sha256 = "172s7sv5bgc40x81k18hypf9c4n8hn9v5w5zwyr4mi5prbavqcci"; + }; + } { goPackagePath = "gitlab.com/gitlab-org/gitaly"; fetch = { @@ -1607,8 +1787,8 @@ fetch = { type = "git"; url = "https://gitlab.com/gitlab-org/labkit.git"; - rev = "0149780c759d"; - sha256 = "1krp5jkwpckpdznbl9xp4yvq6cii750r24agcni3snbbs8hd8gb1"; + rev = "45895e129029"; + sha256 = "17adv1gcdg0jiy8i5lr064pm3p9ywq6s0iwh9w4q5pycp4qkmn48"; }; } { @@ -1724,8 +1904,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/text"; - rev = "v0.3.2"; - sha256 = "0flv9idw0jm5nm8lx25xqanbkqgfiym6619w575p7nrdh0riqwqh"; + rev = "v0.3.3"; + sha256 = "19pihqm3phyndmiw6i42pdv6z1rbvlqlsnhsyqf9gsnn0qnmqqlh"; }; } { @@ -1854,6 +2034,15 @@ sha256 = "1m2i48ph5a3kw9nlw2srx8i04v7chicds2hlzlrfm15045crga55"; }; } + { + goPackagePath = "gopkg.in/gorp.v1"; + fetch = { + type = "git"; + url = "https://gopkg.in/gorp.v1"; + rev = "v1.7.2"; + sha256 = "0zwkq4cv71vp7cmpfcs54908g1amr0cdxv1b8h1icf64jjawb1lb"; + }; + } { goPackagePath = "gopkg.in/mgo.v2"; fetch = { @@ -1877,8 +2066,8 @@ fetch = { type = "git"; url = "https://gopkg.in/yaml.v2"; - rev = "v2.2.4"; - sha256 = "11bwj757wi8kdrcnlgfqb8vv2d2xdhlghmyagd19i62khrkchsg2"; + rev = "v2.2.8"; + sha256 = "1inf7svydzscwv9fcjd2rm61a4xjk6jkswknybmns2n58shimapw"; }; } { diff --git a/pkgs/applications/version-management/gitlab/gitlab-shell/remove-hardcoded-locations.patch b/pkgs/applications/version-management/gitlab/gitlab-shell/remove-hardcoded-locations.patch index 6c54e8884f29..888994adc927 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-shell/remove-hardcoded-locations.patch +++ b/pkgs/applications/version-management/gitlab/gitlab-shell/remove-hardcoded-locations.patch @@ -1,5 +1,5 @@ diff --git a/internal/config/config.go b/internal/config/config.go -index 2231851..c869930 100644 +index 79c2a36..12ba31e 100644 --- a/internal/config/config.go +++ b/internal/config/config.go @@ -3,7 +3,6 @@ package config @@ -10,7 +10,7 @@ index 2231851..c869930 100644 "path" "path/filepath" -@@ -38,16 +37,13 @@ type Config struct { +@@ -59,16 +58,13 @@ func (c *Config) GetHttpClient() *client.HttpClient { } func New() (*Config, error) { @@ -30,18 +30,18 @@ index 2231851..c869930 100644 func newFromFile(filename string) (*Config, error) { diff --git a/internal/keyline/key_line.go b/internal/keyline/key_line.go -index e2abb82..7e9c481 100644 +index c6f2422..fb0426b 100644 --- a/internal/keyline/key_line.go +++ b/internal/keyline/key_line.go -@@ -38,7 +38,7 @@ func NewPrincipalKeyLine(keyId, principal string, config *config.Config) (*KeyLi - +@@ -37,7 +37,7 @@ func NewPrincipalKeyLine(keyId, principal string, config *config.Config) (*KeyLi + } + func (k *KeyLine) ToString() string { - sslCertDirEnvVar := k.sslCertDirEnvVar() - command := fmt.Sprintf("%s %s-%s", path.Join(k.Config.RootDir, executable.BinDir, executable.GitlabShell), k.Prefix, k.Id) + command := fmt.Sprintf("%s %s-%s", path.Join("/run/current-system/sw/bin", executable.GitlabShell), k.Prefix, k.Id) - - if sslCertDirEnvVar != "" { - sslCertDirEnvVar = fmt.Sprintf(`%s `, sslCertDirEnvVar) + + return fmt.Sprintf(`command="%s",%s %s`, command, SshOptions, k.Value) + } diff --git a/support/gitlab_config.rb b/support/gitlab_config.rb index 52ac5ee..d96baa3 100644 --- a/support/gitlab_config.rb @@ -55,3 +55,6 @@ index 52ac5ee..d96baa3 100644 end def auth_file +-- +2.28.0 + diff --git a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix index e1b177c3b457..f6d633af2c47 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix +++ b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix @@ -3,13 +3,13 @@ buildGoPackage rec { pname = "gitlab-workhorse"; - version = "8.46.0"; + version = "8.51.0"; src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-workhorse"; rev = "v${version}"; - sha256 = "1qhaln1k6vcjzphmxdqhwz1cwdx77gclyq0b2ibzgy7xg9l91n99"; + sha256 = "012xbnd4lqfv478bbd2r9jhnb2f162gsa5y77z3by0kqqpsglgl5"; }; goPackagePath = "gitlab.com/gitlab-org/gitlab-workhorse"; @@ -17,16 +17,6 @@ buildGoPackage rec { buildInputs = [ git ]; buildFlagsArray = "-ldflags=-X main.Version=${version}"; - # gitlab-workhorse depends on an older version of labkit which - # contains old, vendored versions of some packages; gitlab-workhorse - # also explicitly depends on newer versions of these libraries, - # but buildGoPackage exposes the vendored versions instead, - # leading to compilation errors. Since the vendored libraries - # aren't used here anyway, we'll just remove them. - postConfigure = '' - rm -r "$NIX_BUILD_TOP/go/src/gitlab.com/gitlab-org/labkit/vendor" - ''; - meta = with stdenv.lib; { homepage = "http://www.gitlab.com/"; platforms = platforms.linux; diff --git a/pkgs/applications/version-management/gitlab/gitlab-workhorse/deps.nix b/pkgs/applications/version-management/gitlab/gitlab-workhorse/deps.nix index 33b122a52e28..d8433778ae20 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-workhorse/deps.nix +++ b/pkgs/applications/version-management/gitlab/gitlab-workhorse/deps.nix @@ -9,6 +9,15 @@ sha256 = "0qjm9yrhc5h632wwhklqzhalid4lxcm9iwsqs3jahp303rm27vpk"; }; } + { + goPackagePath = "bou.ke/monkey"; + fetch = { + type = "git"; + url = "https://github.com/bouk/monkey"; + rev = "v1.0.1"; + sha256 = "050y07pwx5zk7fchp0lhf35w417sml7lxkkzly8f932fy25rydz5"; + }; + } { goPackagePath = "cloud.google.com/go"; fetch = { @@ -279,6 +288,15 @@ sha256 = "1j6fdr1sg36qy4n4xjl7brq739fpm5npq98cmvklzjc9qrx98nk9"; }; } + { + goPackagePath = "github.com/armon/go-radix"; + fetch = { + type = "git"; + url = "https://github.com/armon/go-radix"; + rev = "7fddfc383310"; + sha256 = "0y8chspn14n9xpsfb9gxnnf819rfpriaz64v81p7873a42kkhxb4"; + }; + } { goPackagePath = "github.com/aws/aws-sdk-go"; fetch = { @@ -293,8 +311,17 @@ fetch = { type = "git"; url = "https://github.com/beorn7/perks"; - rev = "v1.0.0"; - sha256 = "1i1nz1f6g55xi2y3aiaz5kqfgvknarbfl4f0sx4nyyb4s7xb1z9x"; + rev = "v1.0.1"; + sha256 = "17n4yygjxa6p499dj3yaqzfww2g7528165cl13haj97hlx94dgl7"; + }; + } + { + goPackagePath = "github.com/bgentry/speakeasy"; + fetch = { + type = "git"; + url = "https://github.com/bgentry/speakeasy"; + rev = "v0.1.0"; + sha256 = "02dfrj0wyphd3db9zn2mixqxwiz1ivnyc5xc7gkz58l5l27nzp8s"; }; } { @@ -374,8 +401,8 @@ fetch = { type = "git"; url = "https://github.com/cloudflare/tableflip"; - rev = "8392f1641731"; - sha256 = "0by5hk8s0bhhl3kiw658p5g53zvc61k4q2wxnh1w64p5ghd1rfn8"; + rev = "4baec9811f2b"; + sha256 = "095xb5gfz7dglljp91nh68dnscddvlf7q5ivvz972fq86r3ypq6q"; }; } { @@ -459,6 +486,15 @@ sha256 = "0hka6hmyvp701adzag2g26cxdj47g21x6jz4sc6jjz1mn59d474y"; }; } + { + goPackagePath = "github.com/denisenkom/go-mssqldb"; + fetch = { + type = "git"; + url = "https://github.com/denisenkom/go-mssqldb"; + rev = "cfbb681360f0"; + sha256 = "0mr4y9vppiyl7mvad74k3zk4sc1jdkmc0lcd6lhm70iziw2xpncs"; + }; + } { goPackagePath = "github.com/devigned/tab"; fetch = { @@ -504,6 +540,15 @@ sha256 = "06s61wwd32fad1p8qn5blqjd5791avzb13fnqflkkg993adw49ww"; }; } + { + goPackagePath = "github.com/disintegration/imaging"; + fetch = { + type = "git"; + url = "https://github.com/disintegration/imaging"; + rev = "v1.6.2"; + sha256 = "1sl201nmk601h0aii4234sycn4v2b0rjxf8yhrnik4yjzd68q9x5"; + }; + } { goPackagePath = "github.com/dlclark/regexp2"; fetch = { @@ -567,6 +612,15 @@ sha256 = "1yacmwmil625p0pzj800h9dnmiab6bjwfmi48p9fcrvy2yyv9b97"; }; } + { + goPackagePath = "github.com/fatih/color"; + fetch = { + type = "git"; + url = "https://github.com/fatih/color"; + rev = "v1.7.0"; + sha256 = "0v8msvg38r8d1iiq2i5r4xyfx0invhc941kjrsg5gzwvagv55inv"; + }; + } { goPackagePath = "github.com/fatih/structs"; fetch = { @@ -612,15 +666,6 @@ sha256 = "0dqb7lsinciz594q6jg59hrvk4g4awbs2ybsr580j22j2xag53vs"; }; } - { - goPackagePath = "github.com/gavv/monotime"; - fetch = { - type = "git"; - url = "https://github.com/gavv/monotime"; - rev = "30dba4353424"; - sha256 = "0w67yyc9y11dp7lp4b712dkcgbiln1qmgfx1nbbrw3mfkzr61d7g"; - }; - } { goPackagePath = "github.com/getsentry/raven-go"; fetch = { @@ -738,6 +783,42 @@ sha256 = "0wk25751ryyvxclyp8jdk5c3ar0cmfr8lrjb66qbg4808x66b96v"; }; } + { + goPackagePath = "github.com/gobuffalo/envy"; + fetch = { + type = "git"; + url = "https://github.com/gobuffalo/envy"; + rev = "v1.7.1"; + sha256 = "1s1f05cgpkhgcs2qfh04ixxm1ggk8ms3fpwsxhb0mx7nfrcm106d"; + }; + } + { + goPackagePath = "github.com/gobuffalo/logger"; + fetch = { + type = "git"; + url = "https://github.com/gobuffalo/logger"; + rev = "v1.0.1"; + sha256 = "1w6rkz0xwq3xj3giwzjkfnai69a0cgg09zx01z7s8r5z450cish3"; + }; + } + { + goPackagePath = "github.com/gobuffalo/packd"; + fetch = { + type = "git"; + url = "https://github.com/gobuffalo/packd"; + rev = "v0.3.0"; + sha256 = "02sg33jkp219g0z3yf2fn9xm2zds1qxzdznx5mh8vffh4njjg1x8"; + }; + } + { + goPackagePath = "github.com/gobuffalo/packr"; + fetch = { + type = "git"; + url = "https://github.com/gobuffalo/packr"; + rev = "v2.7.1"; + sha256 = "0m5kl2fq8gf1v4vllgag2xl8fd382sdgqrcdb8f5alsnrdn08kb9"; + }; + } { goPackagePath = "github.com/gobwas/httphead"; fetch = { @@ -774,6 +855,15 @@ sha256 = "1525pq7r6h3s8dncvq8gxi893p2nq8dxpzvq0nfl5b4p6mq0v1c2"; }; } + { + goPackagePath = "github.com/golang-sql/civil"; + fetch = { + type = "git"; + url = "https://github.com/golang-sql/civil"; + rev = "cb61b32ac6fe"; + sha256 = "0yadfbvi0w06lg3sxw0daji02jxd3vv2in26yfmwpl4vd4vm9zay"; + }; + } { goPackagePath = "github.com/golang/gddo"; fetch = { @@ -801,15 +891,6 @@ sha256 = "0vjjr79r32icjzlb05wn02k59av7jx0rn1jijml8r4whlg7dnkfh"; }; } - { - goPackagePath = "github.com/golang/lint"; - fetch = { - type = "git"; - url = "https://github.com/golang/lint"; - rev = "06c8688daad7"; - sha256 = "0xi94dwvz50a66bq1hp9fyqkym5mcpdxdb1hrfvicldgjf37lc47"; - }; - } { goPackagePath = "github.com/golang/mock"; fetch = { @@ -927,15 +1008,6 @@ sha256 = "13pfc9sxiwjky2lm1xb3i3lcisn8p6mgjk2d927l7r92ysph8dmw"; }; } - { - goPackagePath = "github.com/gorilla/schema"; - fetch = { - type = "git"; - url = "https://github.com/gorilla/schema"; - rev = "v1.1.0"; - sha256 = "14d31i3h6bg83r7ncmwm2pirab66z9hza38in18l89pbazxyh2n9"; - }; - } { goPackagePath = "github.com/gorilla/websocket"; fetch = { @@ -963,6 +1035,24 @@ sha256 = "1lzk54h7np32b3acidg1ggbn8ppbnns0m71gcg9d1qkkdh8zrijl"; }; } + { + goPackagePath = "github.com/hashicorp/errwrap"; + fetch = { + type = "git"; + url = "https://github.com/hashicorp/errwrap"; + rev = "v1.0.0"; + sha256 = "0slfb6w3b61xz04r32bi0a1bygc82rjzhqkxj2si2074wynqnr1c"; + }; + } + { + goPackagePath = "github.com/hashicorp/go-multierror"; + fetch = { + type = "git"; + url = "https://github.com/hashicorp/go-multierror"; + rev = "v1.0.0"; + sha256 = "00nyn8llqzbfm8aflr9kwsvpzi4kv8v45c141v88xskxp5xf6z49"; + }; + } { goPackagePath = "github.com/hashicorp/go-version"; fetch = { @@ -1035,15 +1125,6 @@ sha256 = "1gkizavajqmxm79il8r6cbi0g9ls3vwdh9wr0zy89vc9sq17p3im"; }; } - { - goPackagePath = "github.com/iris-contrib/formBinder"; - fetch = { - type = "git"; - url = "https://github.com/iris-contrib/formBinder"; - rev = "v5.0.0"; - sha256 = "0mqk6j7a9d3y28ad4ylqc7z5w4hmn1ws5wwnyll918xn1wkzr5rg"; - }; - } { goPackagePath = "github.com/iris-contrib/go.uuid"; fetch = { @@ -1053,15 +1134,6 @@ sha256 = "0nc0ggn0a6bcwdrwinnx3z6889x65c20a2dwja0n8can3xblxs35"; }; } - { - goPackagePath = "github.com/iris-contrib/httpexpect"; - fetch = { - type = "git"; - url = "https://github.com/iris-contrib/httpexpect"; - rev = "ebe99fcebbce"; - sha256 = "126c50c6r5l2gdn60jirpb54pqwswxag3wgrv6wcn998h9w9gv8c"; - }; - } { goPackagePath = "github.com/iris-contrib/i18n"; fetch = { @@ -1265,8 +1337,8 @@ fetch = { type = "git"; url = "https://github.com/konsorten/go-windows-terminal-sequences"; - rev = "v1.0.2"; - sha256 = "09mn209ika7ciy87xf2x31dq5fnqw39jidgaljvmqxwk7ff1hnx7"; + rev = "v1.0.3"; + sha256 = "1yrsd4s8vhjnxhwbigirymz89dn6qfjnhn28i33vvvdgf96j6ypl"; }; } { @@ -1328,8 +1400,8 @@ fetch = { type = "git"; url = "https://github.com/lib/pq"; - rev = "v1.1.1"; - sha256 = "0g64wlg1l1ybq4x44idksl4pgm055s58jxc6r6x4qhqm5q76h0km"; + rev = "v1.2.0"; + sha256 = "08j1smm6rassdssdks4yh9aspa1dv1g5nvwimmknspvhx8a7waqz"; }; } { @@ -1337,8 +1409,8 @@ fetch = { type = "git"; url = "https://github.com/libgit2/git2go"; - rev = "ecaeb7a21d47"; - sha256 = "14r7ryff93r49g94f6kg66xc0y6rwb31lj22s3qmzmlgywk0pgvr"; + rev = "v30.0.5"; + sha256 = "13jk4r8x8rb9lar35dxvh3g7hnzclq95jbpg88y4xklmh48yy3sk"; }; } { @@ -1386,6 +1458,33 @@ sha256 = "1dfsh27d52wmz0nmmzm2382pfrs2fcijvh6cgir7jbb4pnigr5w4"; }; } + { + goPackagePath = "github.com/mattn/go-runewidth"; + fetch = { + type = "git"; + url = "https://github.com/mattn/go-runewidth"; + rev = "v0.0.4"; + sha256 = "00b3ssm7wiqln3k54z2wcnxr3k3c7m1ybyhb9h8ixzbzspld0qzs"; + }; + } + { + goPackagePath = "github.com/mattn/go-shellwords"; + fetch = { + type = "git"; + url = "https://github.com/mattn/go-shellwords"; + rev = "2444a32a19f4"; + sha256 = "08zcgr1az1n8zaxzwdd205j86hczgyc52nxfnw5avpw7rrkf7v0d"; + }; + } + { + goPackagePath = "github.com/mattn/go-sqlite3"; + fetch = { + type = "git"; + url = "https://github.com/mattn/go-sqlite3"; + rev = "v1.12.0"; + sha256 = "0di8zy6202sbs0p9kx8lpii77ir5jwjhg6z0796y3nfvw87wk9iv"; + }; + } { goPackagePath = "github.com/mattn/goveralls"; fetch = { @@ -1431,6 +1530,15 @@ sha256 = "0j0aylsxqjcj49w7ph8cmpaqjlpvg7mb5mrcrd9bg71dlb9z9ir2"; }; } + { + goPackagePath = "github.com/mitchellh/cli"; + fetch = { + type = "git"; + url = "https://github.com/mitchellh/cli"; + rev = "v1.0.0"; + sha256 = "1i9kmr7rcf10d2hji8h4247hmc0nbairv7a0q51393aw2h1bnwg2"; + }; + } { goPackagePath = "github.com/mitchellh/copystructure"; fetch = { @@ -1530,6 +1638,15 @@ sha256 = "11zbhg4kds5idsya04bwz4plj0mmiigypzppzih731ppbk2ms1zg"; }; } + { + goPackagePath = "github.com/olekukonko/tablewriter"; + fetch = { + type = "git"; + url = "https://github.com/olekukonko/tablewriter"; + rev = "v0.0.2"; + sha256 = "1f4mwdh501p8105nfxayprlj5ld14fwzyyy2wbc04xk3wrm1wzlf"; + }; + } { goPackagePath = "github.com/onsi/ginkgo"; fetch = { @@ -1557,6 +1674,33 @@ sha256 = "0i0ghg94dg8lk05mw5n23983wq04yjvkjmdkc9z5y1f3508938h9"; }; } + { + goPackagePath = "github.com/otiai10/copy"; + fetch = { + type = "git"; + url = "https://github.com/otiai10/copy"; + rev = "v1.0.1"; + sha256 = "0xmy0kfcx48q10s040579pcjswfaxlwhv7a2z07z9r92fdrgw03k"; + }; + } + { + goPackagePath = "github.com/otiai10/curr"; + fetch = { + type = "git"; + url = "https://github.com/otiai10/curr"; + rev = "v1.0.0"; + sha256 = "0fpw20adq2wff7l4c87zaavj9jra4d64a8bbjixiiv3bbarim987"; + }; + } + { + goPackagePath = "github.com/otiai10/mint"; + fetch = { + type = "git"; + url = "https://github.com/otiai10/mint"; + rev = "v1.3.0"; + sha256 = "0kfc95jc2hfgwzcpdfa5hrxgj7s6rzx5jc0n1sn863bsngx2q1ca"; + }; + } { goPackagePath = "github.com/pelletier/go-toml"; fetch = { @@ -1602,6 +1746,15 @@ sha256 = "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw"; }; } + { + goPackagePath = "github.com/posener/complete"; + fetch = { + type = "git"; + url = "https://github.com/posener/complete"; + rev = "v1.1.1"; + sha256 = "1nbdiybjizbaxbf5q0xwbq0cjqw4bl6jggvsjzrpif0w86fcjda2"; + }; + } { goPackagePath = "github.com/prometheus/client_golang"; fetch = { @@ -1634,8 +1787,8 @@ fetch = { type = "git"; url = "https://github.com/prometheus/procfs"; - rev = "v0.0.2"; - sha256 = "0s7pvs7fgnfpmym3cd0k219av321h9sf3yvdlnn3qy0ps280lg7k"; + rev = "v0.0.3"; + sha256 = "18c4m795fwng8f8qa395f3crvamlbk5y5afk8b5rzyisnmjq774y"; }; } { @@ -1652,8 +1805,17 @@ fetch = { type = "git"; url = "https://github.com/rogpeppe/go-internal"; - rev = "v1.3.0"; - sha256 = "0mcdh1licgnnahwml9y2iq6xy5x9xmjw5frcnds2s3wpjyqrl216"; + rev = "v1.4.0"; + sha256 = "17wisy8bapx5ki0gpissm8dvv7x0lmdnrl1fka75g05kpbyv6g2n"; + }; + } + { + goPackagePath = "github.com/rubenv/sql-migrate"; + fetch = { + type = "git"; + url = "https://github.com/rubenv/sql-migrate"; + rev = "06338513c237"; + sha256 = "0z7y7vsnzjswx51g9hlawnzmwnb8c7rks6ljzf6m1xbimhi4n3kz"; }; } { @@ -1724,8 +1886,8 @@ fetch = { type = "git"; url = "https://github.com/sirupsen/logrus"; - rev = "v1.3.0"; - sha256 = "0ib7k8cwxn53dyxd3af1g81z018n77n6q64pm4miznirf7c2c9gk"; + rev = "v1.6.0"; + sha256 = "1zf9is1yxxnna0d1pyag2m9ziy3l27zb2j92p9msm1gx5jjrvzzj"; }; } { @@ -1823,8 +1985,8 @@ fetch = { type = "git"; url = "https://github.com/tinylib/msgp"; - rev = "v1.1.0"; - sha256 = "08ha23sn14071ywrgxlyj7r523vzdwx1i83dcp1mqa830glgqaff"; + rev = "v1.0.2"; + sha256 = "0pypfknghg1hcjjrqz3f1riaylk6hcxn9h0qyzynb74rp0qmlxjc"; }; } { @@ -1913,8 +2075,8 @@ fetch = { type = "git"; url = "https://github.com/xeipuuv/gojsonpointer"; - rev = "df4f5c81cb3b"; - sha256 = "0dfwc66z5gq75m3z7va80c10c22ijiq99bahq86l26ki71g286xn"; + rev = "4e3ac2762d5f"; + sha256 = "13y6iq2nzf9z4ls66bfgnnamj2m3438absmbpqry64bpwjfbsi9q"; }; } { @@ -1989,6 +2151,15 @@ sha256 = "1872cqnii0kwiqcy81yin0idvjy5mdy4zlzz0csb319lcjs3b923"; }; } + { + goPackagePath = "github.com/ziutek/mymysql"; + fetch = { + type = "git"; + url = "https://github.com/ziutek/mymysql"; + rev = "v1.5.4"; + sha256 = "172s7sv5bgc40x81k18hypf9c4n8hn9v5w5zwyr4mi5prbavqcci"; + }; + } { goPackagePath = "gitlab.com/gitlab-org/gitaly"; fetch = { @@ -1998,13 +2169,22 @@ sha256 = "1gmrpzm4ijw8g1xj8b3vmvg4cmis7shvwxp5vl2r47a8mh2ql5pd"; }; } + { + goPackagePath = "gitlab.com/gitlab-org/gitlab-shell"; + fetch = { + type = "git"; + url = "https://gitlab.com/gitlab-org/gitlab-shell.git"; + rev = "1a2bfecd2f0e"; + sha256 = "197b3yn7lp6dbzcgxrj3ns2a839adcfmcwi3h53i1sr6952ciayx"; + }; + } { goPackagePath = "gitlab.com/gitlab-org/labkit"; fetch = { type = "git"; url = "https://gitlab.com/gitlab-org/labkit.git"; - rev = "96e583c57891"; - sha256 = "15h6yvyq5rhhblwmahz89b0kgkfvfrpg20d23jvshyxs5xjh7y8f"; + rev = "45895e129029"; + sha256 = "17adv1gcdg0jiy8i5lr064pm3p9ywq6s0iwh9w4q5pycp4qkmn48"; }; } { @@ -2057,8 +2237,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/image"; - rev = "cff245a6509b"; - sha256 = "0hiznlkiaay30acwvvyq8g6bm32r7bc6gv47pygrcxqpapasbz84"; + rev = "e7c1f5e7dbb8"; + sha256 = "0czp897aicqw1dgybj0hc2zzwb20rhqkdqm7siqci3yk7yk9cymf"; }; } { @@ -2129,8 +2309,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/text"; - rev = "v0.3.2"; - sha256 = "0flv9idw0jm5nm8lx25xqanbkqgfiym6619w575p7nrdh0riqwqh"; + rev = "v0.3.3"; + sha256 = "19pihqm3phyndmiw6i42pdv6z1rbvlqlsnhsyqf9gsnn0qnmqqlh"; }; } { @@ -2268,6 +2448,15 @@ sha256 = "1m2i48ph5a3kw9nlw2srx8i04v7chicds2hlzlrfm15045crga55"; }; } + { + goPackagePath = "gopkg.in/gorp.v1"; + fetch = { + type = "git"; + url = "https://gopkg.in/gorp.v1"; + rev = "v1.7.2"; + sha256 = "0zwkq4cv71vp7cmpfcs54908g1amr0cdxv1b8h1icf64jjawb1lb"; + }; + } { goPackagePath = "gopkg.in/mgo.v2"; fetch = { diff --git a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile index 0e28aa7a2d43..51f9d36cef90 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile +++ b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile @@ -19,13 +19,15 @@ gem 'default_value_for', '~> 3.3.0' gem 'pg', '~> 1.1' gem 'rugged', '~> 0.28' -gem 'grape-path-helpers', '~> 1.3' +gem 'grape-path-helpers', '~> 1.4' gem 'faraday', '~> 1.0' gem 'marginalia', '~> 1.9.0' # Authentication libraries -gem 'devise', '~> 4.6' +gem 'devise', '~> 4.7.2' +# TODO: verify ARM compile issue on 3.1.13+ version (see https://gitlab.com/gitlab-org/gitlab/-/merge_requests/18828) +gem 'bcrypt', '3.1.12' gem 'doorkeeper', '~> 5.3.0' gem 'doorkeeper-openid_connect', '~> 1.7.4' gem 'omniauth', '~> 1.8' @@ -97,6 +99,7 @@ gem 'graphiql-rails', '~> 1.4.10' gem 'apollo_upload_server', '~> 2.0.2' gem 'graphql-docs', '~> 1.6.0', group: [:development, :test] +gem 'hashie' # Disable strong_params so that Mash does not respond to :permitted? gem 'hashie-forbidden_attributes' @@ -108,7 +111,7 @@ gem 'hamlit', '~> 2.11.0' # Files attachments gem 'carrierwave', '~> 1.3' -gem 'mini_magick' +gem 'mini_magick', '~> 4.10.1' # for backups gem 'fog-aws', '~> 3.5' @@ -155,7 +158,7 @@ gem 'wikicloth', '0.8.1' gem 'asciidoctor', '~> 2.0.10' gem 'asciidoctor-include-ext', '~> 0.3.1', require: false gem 'asciidoctor-plantuml', '~> 0.0.12' -gem 'rouge', '~> 3.21.0' +gem 'rouge', '~> 3.24.0' gem 'truncato', '~> 0.7.11' gem 'bootstrap_form', '~> 4.2.0' gem 'nokogiri', '~> 1.10.9' @@ -169,7 +172,7 @@ gem 'diffy', '~> 3.3' gem 'diff_match_patch', '~> 0.1.0' # Application server -gem 'rack', '~> 2.0.9' +gem 'rack', '~> 2.1.4' # https://github.com/sharpstone/rack-timeout/blob/master/README.md#rails-apps-manually gem 'rack-timeout', '~> 0.5.1', require: 'rack/timeout/base' @@ -244,7 +247,7 @@ gem 'atlassian-jwt', '~> 0.2.0' gem 'flowdock', '~> 0.7' # Slack integration -gem 'slack-messenger', '~> 2.3.3' +gem 'slack-messenger', '~> 2.3.4' # Hangouts Chat integration gem 'hangouts-chat', '~> 0.0.5' @@ -256,7 +259,7 @@ gem 'asana', '0.10.2' gem 'ruby-fogbugz', '~> 0.2.1' # Kubernetes integration -gem 'kubeclient', '~> 4.6.0' +gem 'kubeclient', '~> 4.9.1' # Sanitize user input gem 'sanitize', '~> 5.2.1' @@ -272,7 +275,7 @@ gem 'licensee', '~> 8.9' gem 'ace-rails-ap', '~> 4.1.0' # Detect and convert string character encoding -gem 'charlock_holmes', '~> 0.7.5' +gem 'charlock_holmes', '~> 0.7.7' # Detect mime content type from content gem 'mimemagic', '~> 0.3.2' @@ -284,11 +287,10 @@ gem 'fast_blank' gem 'gitlab-chronic', '~> 0.10.5' gem 'gitlab_chronic_duration', '~> 0.10.6.2' -gem 'webpack-rails', '~> 0.9.10' gem 'rack-proxy', '~> 0.6.0' gem 'sassc-rails', '~> 2.1.0' -gem 'uglifier', '~> 2.7.2' +gem 'terser', '1.0.2' gem 'addressable', '~> 2.7' gem 'font-awesome-rails', '~> 4.7' @@ -308,7 +310,7 @@ gem 'sentry-raven', '~> 3.0' gem 'premailer-rails', '~> 1.10.3' # LabKit: Tracing and Correlation -gem 'gitlab-labkit', '0.12.1' +gem 'gitlab-labkit', '0.12.2' # I18n gem 'ruby_parser', '~> 3.8', require: false @@ -330,13 +332,13 @@ group :metrics do gem 'method_source', '~> 1.0', require: false # Prometheus - gem 'prometheus-client-mmap', '~> 0.11.0' + gem 'prometheus-client-mmap', '~> 0.12.0' gem 'raindrops', '~> 0.18' end group :development do gem 'brakeman', '~> 4.2', require: false - gem 'danger', '~> 8.0', require: false + gem 'danger', '~> 8.0.6', require: false gem 'letter_opener_web', '~> 1.3.4' @@ -375,8 +377,6 @@ group :development, :test do gem 'scss_lint', '~> 0.56.0', require: false gem 'haml_lint', '~> 0.34.0', require: false - gem 'simplecov', '~> 0.18.5', require: false - gem 'simplecov-cobertura', '~> 1.3.1', require: false gem 'bundler-audit', '~> 0.6.1', require: false gem 'benchmark-ips', '~> 2.3.0', require: false @@ -394,9 +394,14 @@ group :development, :test do gem 'rblineprof', '~> 0.3.6', platform: :mri, require: false end +group :development, :test, :coverage do + gem 'simplecov', '~> 0.18.5', require: false + gem 'simplecov-cobertura', '~> 1.3.1', require: false +end + # Gems required in omnibus-gitlab pipeline group :development, :test, :omnibus do - gem 'license_finder', '~> 5.4', require: false + gem 'license_finder', '~> 6.0', require: false end group :test do @@ -411,7 +416,7 @@ group :test do gem 'shoulda-matchers', '~> 4.0.1', require: false gem 'email_spec', '~> 2.2.0' - gem 'webmock', '~> 3.5.1' + gem 'webmock', '~> 3.9.1' gem 'rails-controller-testing' gem 'concurrent-ruby', '~> 1.1' gem 'test-prof', '~> 0.12.0' @@ -425,7 +430,7 @@ end gem 'octokit', '~> 4.15' # https://gitlab.com/gitlab-org/gitlab/issues/207207 -gem 'gitlab-mail_room', '~> 0.0.6', require: 'mail_room' +gem 'gitlab-mail_room', '~> 0.0.7', require: 'mail_room' gem 'email_reply_trimmer', '~> 0.1' gem 'html2text' @@ -461,7 +466,7 @@ group :ed25519 do end # Gitaly GRPC protocol definitions -gem 'gitaly', '~> 13.3.0-rc1' +gem 'gitaly', '~> 13.5.0-rc2' gem 'grpc', '~> 1.30.2' @@ -512,3 +517,6 @@ gem 'multi_json', '~> 1.14.1' gem 'yajl-ruby', '~> 1.4.1', require: 'yajl' gem 'webauthn', '~> 2.3' + +# IPAddress utilities +gem 'ipaddress', '~> 0.8.3' diff --git a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock index 9b0b34e6ed2c..2ad66f6e6c0d 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock +++ b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock @@ -6,59 +6,59 @@ GEM ace-rails-ap (4.1.2) acme-client (2.0.6) faraday (>= 0.17, < 2.0.0) - actioncable (6.0.3.1) - actionpack (= 6.0.3.1) + actioncable (6.0.3.3) + actionpack (= 6.0.3.3) nio4r (~> 2.0) websocket-driver (>= 0.6.1) - actionmailbox (6.0.3.1) - actionpack (= 6.0.3.1) - activejob (= 6.0.3.1) - activerecord (= 6.0.3.1) - activestorage (= 6.0.3.1) - activesupport (= 6.0.3.1) + actionmailbox (6.0.3.3) + actionpack (= 6.0.3.3) + activejob (= 6.0.3.3) + activerecord (= 6.0.3.3) + activestorage (= 6.0.3.3) + activesupport (= 6.0.3.3) mail (>= 2.7.1) - actionmailer (6.0.3.1) - actionpack (= 6.0.3.1) - actionview (= 6.0.3.1) - activejob (= 6.0.3.1) + actionmailer (6.0.3.3) + actionpack (= 6.0.3.3) + actionview (= 6.0.3.3) + activejob (= 6.0.3.3) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 2.0) - actionpack (6.0.3.1) - actionview (= 6.0.3.1) - activesupport (= 6.0.3.1) + actionpack (6.0.3.3) + actionview (= 6.0.3.3) + activesupport (= 6.0.3.3) rack (~> 2.0, >= 2.0.8) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.2.0) - actiontext (6.0.3.1) - actionpack (= 6.0.3.1) - activerecord (= 6.0.3.1) - activestorage (= 6.0.3.1) - activesupport (= 6.0.3.1) + actiontext (6.0.3.3) + actionpack (= 6.0.3.3) + activerecord (= 6.0.3.3) + activestorage (= 6.0.3.3) + activesupport (= 6.0.3.3) nokogiri (>= 1.8.5) - actionview (6.0.3.1) - activesupport (= 6.0.3.1) + actionview (6.0.3.3) + activesupport (= 6.0.3.3) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.1, >= 1.2.0) - activejob (6.0.3.1) - activesupport (= 6.0.3.1) + activejob (6.0.3.3) + activesupport (= 6.0.3.3) globalid (>= 0.3.6) - activemodel (6.0.3.1) - activesupport (= 6.0.3.1) - activerecord (6.0.3.1) - activemodel (= 6.0.3.1) - activesupport (= 6.0.3.1) + activemodel (6.0.3.3) + activesupport (= 6.0.3.3) + activerecord (6.0.3.3) + activemodel (= 6.0.3.3) + activesupport (= 6.0.3.3) activerecord-explain-analyze (0.1.0) activerecord (>= 4) pg - activestorage (6.0.3.1) - actionpack (= 6.0.3.1) - activejob (= 6.0.3.1) - activerecord (= 6.0.3.1) + activestorage (6.0.3.3) + actionpack (= 6.0.3.3) + activejob (= 6.0.3.3) + activerecord (= 6.0.3.3) marcel (~> 0.3.1) - activesupport (6.0.3.1) + activesupport (6.0.3.3) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 0.7, < 2) minitest (~> 5.1) @@ -167,7 +167,7 @@ GEM mime-types (>= 1.16) cbor (0.5.9.6) character_set (1.4.0) - charlock_holmes (0.7.6) + charlock_holmes (0.7.7) childprocess (3.0.0) chunky_png (1.3.5) citrus (3.0.2) @@ -183,7 +183,7 @@ GEM concord (0.1.5) adamantium (~> 0.2.0) equalizer (~> 0.0.9) - concurrent-ruby (1.1.6) + concurrent-ruby (1.1.7) connection_pool (2.2.2) contracts (0.11.0) cork (0.3.0) @@ -202,7 +202,7 @@ GEM css_parser (1.7.0) addressable daemons (1.2.6) - danger (8.0.5) + danger (8.0.6) claide (~> 1.0) claide-plugins (>= 0.9.2) colored2 (~> 3.1) @@ -235,7 +235,7 @@ GEM thor (>= 0.19, < 2) unicode_plot (>= 0.0.4, < 1.0.0) device_detector (1.0.0) - devise (4.7.1) + devise (4.7.3) bcrypt (~> 3.0) orm_adapter (~> 0.1) railties (>= 4.1.0) @@ -253,7 +253,7 @@ GEM discordrb-webhooks-blackst0ne (3.3.0) rest-client (~> 2.0) docile (1.3.2) - domain_name (0.5.20180417) + domain_name (0.5.20190701) unf (>= 0.0.5, < 1.0.0) doorkeeper (5.3.3) railties (>= 5) @@ -312,7 +312,7 @@ GEM tzinfo eventmachine (1.2.7) excon (0.71.1) - execjs (2.6.0) + execjs (2.7.0) expression_parser (0.9.0) extended-markdown-filter (0.6.0) html-pipeline (~> 2.0) @@ -416,7 +416,7 @@ GEM rails (>= 3.2.0) git (1.7.0) rchardet (~> 1.8) - gitaly (13.3.0.pre.rc2) + gitaly (13.5.0.pre.rc2) grpc (~> 1.0) github-markup (1.7.0) gitlab-chronic (0.10.5) @@ -428,7 +428,7 @@ GEM fog-json (~> 1.2.0) mime-types ms_rest_azure (~> 0.12.0) - gitlab-labkit (0.12.1) + gitlab-labkit (0.12.2) actionpack (>= 5.0.0, < 6.1.0) activesupport (>= 5.0.0, < 6.1.0) grpc (~> 1.19) @@ -436,7 +436,7 @@ GEM opentracing (~> 0.4) redis (> 3.0.0, < 5.0.0) gitlab-license (1.0.0) - gitlab-mail_room (0.0.6) + gitlab-mail_room (0.0.7) gitlab-markup (1.7.1) gitlab-net-dns (0.9.1) gitlab-puma (4.3.5.gitlab.3) @@ -495,7 +495,7 @@ GEM grape-entity (0.7.1) activesupport (>= 4.0) multi_json (>= 1.3.2) - grape-path-helpers (1.3.0) + grape-path-helpers (1.4.0) activesupport grape (~> 1.3) rake (~> 12) @@ -547,7 +547,7 @@ GEM tilt hana (1.3.6) hangouts-chat (0.0.5) - hashdiff (0.3.8) + hashdiff (1.0.1) hashie (3.6.0) hashie-forbidden_attributes (0.1.1) hashie (>= 3.0) @@ -563,21 +563,22 @@ GEM html2text (0.2.0) nokogiri (~> 1.6) htmlentities (4.3.4) - http (4.2.0) + http (4.4.1) addressable (~> 2.3) http-cookie (~> 1.0) - http-form_data (~> 2.0) + http-form_data (~> 2.2) http-parser (~> 1.2.0) + http-accept (1.7.0) http-cookie (1.0.3) domain_name (~> 0.5) - http-form_data (2.1.1) + http-form_data (2.3.0) http-parser (1.2.1) ffi-compiler (>= 1.0, < 2.0) httparty (0.16.4) mime-types (~> 3.0) multi_xml (>= 0.5.2) httpclient (2.8.3) - i18n (1.8.3) + i18n (1.8.5) concurrent-ruby (~> 1.0) i18n_data (0.8.0) icalendar (2.4.1) @@ -611,6 +612,9 @@ GEM hana (~> 1.3) regexp_parser (~> 1.5) uri_template (~> 0.7) + jsonpath (1.0.5) + multi_json + to_regexp (~> 0.2.1) jwt (2.1.0) kaminari (1.2.1) activesupport (>= 4.1.0) @@ -631,9 +635,10 @@ GEM rexml kramdown-parser-gfm (1.1.0) kramdown (~> 2.0) - kubeclient (4.6.0) + kubeclient (4.9.1) http (>= 3.0, < 5.0) - recursive-open-struct (~> 1.0, >= 1.0.4) + jsonpath (~> 1.0) + recursive-open-struct (~> 1.1, >= 1.1.1) rest-client (~> 2.0) launchy (2.4.3) addressable (~> 2.3) @@ -643,9 +648,9 @@ GEM actionmailer (>= 3.2) letter_opener (~> 1.0) railties (>= 3.2) - license_finder (5.4.0) + license_finder (6.0.0) bundler - rubyzip + rubyzip (>= 1, < 3) thor toml (= 0.2.0) with_env (= 1.1.0) @@ -662,7 +667,7 @@ GEM activesupport (>= 4) railties (>= 4) request_store (~> 1.0) - loofah (2.5.0) + loofah (2.7.0) crass (~> 1.0.2) nokogiri (>= 1.5.9) lru_redux (1.1.0) @@ -684,7 +689,7 @@ GEM mime-types-data (3.2020.0512) mimemagic (0.3.5) mini_histogram (0.1.3) - mini_magick (4.9.5) + mini_magick (4.10.1) mini_mime (1.0.2) mini_portile2 (2.4.0) minitest (5.11.3) @@ -713,7 +718,7 @@ GEM net-ntp (2.1.3) net-ssh (6.0.0) netrc (0.11.0) - nio4r (2.5.2) + nio4r (2.5.4) no_proxy_fix (0.1.2) nokogiri (1.10.10) mini_portile2 (~> 2.4.0) @@ -838,7 +843,7 @@ GEM parser unparser procto (0.0.3) - prometheus-client-mmap (0.11.0) + prometheus-client-mmap (0.12.0) pry (0.13.1) coderay (~> 1.1) method_source (~> 1.0) @@ -847,10 +852,10 @@ GEM pry (~> 0.13.0) pry-rails (0.3.9) pry (>= 0.10.4) - public_suffix (4.0.3) + public_suffix (4.0.6) pyu-ruby-sasl (0.0.3.3) raabro (1.1.6) - rack (2.0.9) + rack (2.1.4) rack-accept (0.4.5) rack (>= 0.4) rack-attack (6.3.0) @@ -870,25 +875,25 @@ GEM rack-test (1.1.0) rack (>= 1.0, < 3) rack-timeout (0.5.2) - rails (6.0.3.1) - actioncable (= 6.0.3.1) - actionmailbox (= 6.0.3.1) - actionmailer (= 6.0.3.1) - actionpack (= 6.0.3.1) - actiontext (= 6.0.3.1) - actionview (= 6.0.3.1) - activejob (= 6.0.3.1) - activemodel (= 6.0.3.1) - activerecord (= 6.0.3.1) - activestorage (= 6.0.3.1) - activesupport (= 6.0.3.1) + rails (6.0.3.3) + actioncable (= 6.0.3.3) + actionmailbox (= 6.0.3.3) + actionmailer (= 6.0.3.3) + actionpack (= 6.0.3.3) + actiontext (= 6.0.3.3) + actionview (= 6.0.3.3) + activejob (= 6.0.3.3) + activemodel (= 6.0.3.3) + activerecord (= 6.0.3.3) + activestorage (= 6.0.3.3) + activesupport (= 6.0.3.3) bundler (>= 1.3.0) - railties (= 6.0.3.1) + railties (= 6.0.3.3) sprockets-rails (>= 2.0.0) - rails-controller-testing (1.0.4) - actionpack (>= 5.0.1.x) - actionview (>= 5.0.1.x) - activesupport (>= 5.0.1.x) + rails-controller-testing (1.0.5) + actionpack (>= 5.0.1.rc1) + actionview (>= 5.0.1.rc1) + activesupport (>= 5.0.1.rc1) rails-dom-testing (2.0.3) activesupport (>= 4.2.0) nokogiri (>= 1.6) @@ -897,9 +902,9 @@ GEM rails-i18n (6.0.0) i18n (>= 0.7, < 2) railties (>= 6.0.0, < 7) - railties (6.0.3.1) - actionpack (= 6.0.3.1) - activesupport (= 6.0.3.1) + railties (6.0.3.3) + actionpack (= 6.0.3.3) + activesupport (= 6.0.3.3) method_source rake (>= 0.8.7) thor (>= 0.20.3, < 2.0) @@ -920,7 +925,7 @@ GEM re2 (1.2.0) recaptcha (4.13.1) json - recursive-open-struct (1.1.1) + recursive-open-struct (1.1.2) redis (4.1.3) redis-actionpack (5.2.0) actionpack (>= 5, < 7) @@ -951,7 +956,8 @@ GEM responders (3.0.0) actionpack (>= 5.0) railties (>= 5.0) - rest-client (2.0.2) + rest-client (2.1.0) + http-accept (>= 1.7.0, < 2.0) http-cookie (>= 1.0.2, < 2.0) mime-types (>= 1.16, < 4.0) netrc (~> 0.8) @@ -959,7 +965,7 @@ GEM rexml (3.2.4) rinku (2.0.0) rotp (2.1.2) - rouge (3.21.0) + rouge (3.24.0) rqrcode (0.7.0) chunky_png rqrcode-rails3 (0.1.7) @@ -1065,7 +1071,7 @@ GEM seed-fu (2.3.7) activerecord (>= 3.1) activesupport (>= 3.1) - selenium-webdriver (3.142.6) + selenium-webdriver (3.142.7) childprocess (>= 0.5, < 4.0) rubyzip (>= 1.2.2) sentry-raven (3.0.4) @@ -1096,7 +1102,7 @@ GEM simplecov (~> 0.8) simplecov-html (0.12.2) sixarm_ruby_unaccent (1.2.0) - slack-messenger (2.3.3) + slack-messenger (2.3.4) snowplow-tracker (0.6.1) contracts (~> 0.7, <= 0.11) spring (2.0.2) @@ -1106,7 +1112,7 @@ GEM sprockets (3.7.2) concurrent-ruby (~> 1.0) rack (> 1, < 3) - sprockets-rails (3.2.1) + sprockets-rails (3.2.2) actionpack (>= 4.0) activesupport (>= 4.0) sprockets (>= 3.0.0) @@ -1130,6 +1136,8 @@ GEM temple (0.8.2) terminal-table (1.8.0) unicode-display_width (~> 1.1, >= 1.1.1) + terser (1.0.2) + execjs (>= 0.3.0, < 3) test-prof (0.12.0) text (1.3.1) thin (1.7.2) @@ -1143,6 +1151,7 @@ GEM timecop (0.9.1) timeliness (0.3.10) timfel-krb5-auth (0.8.3) + to_regexp (0.2.1) toml (0.2.0) parslet (~> 1.8.0) toml-rb (1.0.0) @@ -1157,12 +1166,9 @@ GEM thread_safe (~> 0.1) u2f (0.2.1) uber (0.1.0) - uglifier (2.7.2) - execjs (>= 0.3.0) - json (>= 1.8.0) unf (0.1.4) unf_ext - unf_ext (0.0.7.5) + unf_ext (0.0.7.7) unicode-display_width (1.7.0) unicode_plot (0.0.4) enumerable-statistics (>= 2.0.1) @@ -1214,13 +1220,11 @@ GEM webfinger (1.1.0) activesupport httpclient (>= 2.4) - webmock (3.5.1) + webmock (3.9.1) addressable (>= 2.3.6) crack (>= 0.3.2) - hashdiff - webpack-rails (0.9.11) - railties (>= 3.2.0) - websocket-driver (0.7.1) + hashdiff (>= 0.4.0, < 2.0.0) + websocket-driver (0.7.3) websocket-extensions (>= 0.1.0) websocket-extensions (0.1.5) wikicloth (0.8.1) @@ -1232,7 +1236,7 @@ GEM xpath (3.2.0) nokogiri (~> 1.8) yajl-ruby (1.4.1) - zeitwerk (2.3.0) + zeitwerk (2.4.0) PLATFORMS ruby @@ -1259,6 +1263,7 @@ DEPENDENCIES babosa (~> 1.0.2) base32 (~> 0.3.0) batch-loader (~> 1.4.0) + bcrypt (= 3.1.12) bcrypt_pbkdf (~> 1.0) benchmark-ips (~> 2.3.0) benchmark-memory (~> 0.1) @@ -1272,19 +1277,19 @@ DEPENDENCIES capybara (~> 3.33.0) capybara-screenshot (~> 1.0.22) carrierwave (~> 1.3) - charlock_holmes (~> 0.7.5) + charlock_holmes (~> 0.7.7) commonmarker (~> 0.20) concurrent-ruby (~> 1.1) connection_pool (~> 2.0) countries (~> 3.0) creole (~> 0.5.0) - danger (~> 8.0) + danger (~> 8.0.6) database_cleaner (~> 1.7.0) deckar01-task_list (= 2.3.1) default_value_for (~> 3.3.0) derailed_benchmarks device_detector - devise (~> 4.6) + devise (~> 4.7.2) devise-two-factor (~> 3.1.0) diff_match_patch (~> 0.1.0) diffy (~> 3.3) @@ -1322,13 +1327,13 @@ DEPENDENCIES gettext (~> 3.3) gettext_i18n_rails (~> 1.8.0) gettext_i18n_rails_js (~> 1.3) - gitaly (~> 13.3.0.pre.rc1) + gitaly (~> 13.5.0.pre.rc2) github-markup (~> 1.7.0) gitlab-chronic (~> 0.10.5) gitlab-fog-azure-rm (~> 1.0) - gitlab-labkit (= 0.12.1) + gitlab-labkit (= 0.12.2) gitlab-license (~> 1.0) - gitlab-mail_room (~> 0.0.6) + gitlab-mail_room (~> 0.0.7) gitlab-markup (~> 1.7.1) gitlab-net-dns (~> 0.9.1) gitlab-puma (~> 4.3.3.gitlab.2) @@ -1343,7 +1348,7 @@ DEPENDENCIES gpgme (~> 2.0.19) grape (= 1.4.0) grape-entity (~> 0.7.1) - grape-path-helpers (~> 1.3) + grape-path-helpers (~> 1.4) grape_logging (~> 1.7) graphiql-rails (~> 1.4.10) graphql (~> 1.11.4) @@ -1354,6 +1359,7 @@ DEPENDENCIES haml_lint (~> 0.34.0) hamlit (~> 2.11.0) hangouts-chat (~> 0.0.5) + hashie hashie-forbidden_attributes health_check (~> 3.0) hipchat (~> 1.5.0) @@ -1362,6 +1368,7 @@ DEPENDENCIES httparty (~> 0.16.4) icalendar invisible_captcha (~> 0.12.1) + ipaddress (~> 0.8.3) jira-ruby (~> 2.0.0) js_regex (~> 3.4) json (~> 2.3.0) @@ -1371,9 +1378,9 @@ DEPENDENCIES kaminari (~> 1.0) knapsack (~> 1.17) kramdown (~> 2.3.0) - kubeclient (~> 4.6.0) + kubeclient (~> 4.9.1) letter_opener_web (~> 1.3.4) - license_finder (~> 5.4) + license_finder (~> 6.0) licensee (~> 8.9) lockbox (~> 0.3.3) lograge (~> 0.5) @@ -1384,7 +1391,7 @@ DEPENDENCIES memory_profiler (~> 0.9) method_source (~> 1.0) mimemagic (~> 0.3.2) - mini_magick + mini_magick (~> 4.10.1) minitest (~> 5.11.0) multi_json (~> 1.14.1) nakayoshi_fork (~> 0.0.4) @@ -1419,10 +1426,10 @@ DEPENDENCIES pg (~> 1.1) png_quantizator (~> 0.2.1) premailer-rails (~> 1.10.3) - prometheus-client-mmap (~> 0.11.0) + prometheus-client-mmap (~> 0.12.0) pry-byebug (~> 3.9.0) pry-rails (~> 0.3.9) - rack (~> 2.0.9) + rack (~> 2.1.4) rack-attack (~> 6.3.0) rack-cors (~> 1.0.6) rack-oauth2 (~> 1.9.3) @@ -1444,7 +1451,7 @@ DEPENDENCIES request_store (~> 1.5) responders (~> 3.0) retriable (~> 3.1.2) - rouge (~> 3.21.0) + rouge (~> 3.24.0) rqrcode-rails3 (~> 0.1.7) rspec-parameterized rspec-rails (~> 4.0.0) @@ -1473,7 +1480,7 @@ DEPENDENCIES simple_po_parser (~> 1.1.2) simplecov (~> 0.18.5) simplecov-cobertura (~> 1.3.1) - slack-messenger (~> 2.3.3) + slack-messenger (~> 2.3.4) snowplow-tracker (~> 0.6.1) spring (~> 2.0.0) spring-commands-rspec (~> 1.0.4) @@ -1482,13 +1489,13 @@ DEPENDENCIES stackprof (~> 0.2.15) state_machines-activerecord (~> 0.6.0) sys-filesystem (~> 1.1.6) + terser (= 1.0.2) test-prof (~> 0.12.0) thin (~> 1.7.0) timecop (~> 0.9.1) toml-rb (~> 1.0.0) truncato (~> 0.7.11) u2f (~> 0.2.1) - uglifier (~> 2.7.2) unf (~> 0.1.4) unicorn (~> 5.5) unicorn-worker-killer (~> 0.4.4) @@ -1498,8 +1505,7 @@ DEPENDENCIES version_sorter (~> 2.2.4) vmstat (~> 2.3.0) webauthn (~> 2.3) - webmock (~> 3.5.1) - webpack-rails (~> 0.9.10) + webmock (~> 3.9.1) wikicloth (= 0.8.1) yajl-ruby (~> 1.4.1) diff --git a/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix b/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix index 7b12e9df6abc..c6425f3389c3 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix +++ b/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix @@ -36,10 +36,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "13z4l65jjihd0cgl9ahv66wvlgx09xnivbinqfdg41i7bx8ysahc"; + sha256 = "1wpmxbprsqclna9xpa6b7sspjb89p6jqfxalasa9f984hx77dx27"; type = "gem"; }; - version = "6.0.3.1"; + version = "6.0.3.3"; }; actionmailbox = { dependencies = ["actionpack" "activejob" "activerecord" "activestorage" "activesupport" "mail"]; @@ -47,10 +47,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1s95rfv1i7j7dy9kvlhxbs7izvm8k371m3grchcpvim4bw73icrp"; + sha256 = "0smcxpn3glnmid3v2pk04sb3bdifbw7ad1c7fq6wfijkrpih8jiw"; type = "gem"; }; - version = "6.0.3.1"; + version = "6.0.3.3"; }; actionmailer = { dependencies = ["actionpack" "actionview" "activejob" "mail" "rails-dom-testing"]; @@ -58,10 +58,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ivgxava9wcs70vyqvv2zmkslv3zxprw0l2s77n6m2wqay6g46wl"; + sha256 = "1spq0dbfn0qkqg9sq0rsjn360b4j36zly8hawaivkrwr3rsvyz75"; type = "gem"; }; - version = "6.0.3.1"; + version = "6.0.3.3"; }; actionpack = { dependencies = ["actionview" "activesupport" "rack" "rack-test" "rails-dom-testing" "rails-html-sanitizer"]; @@ -69,10 +69,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1665r4ffqdpykxwpgdnaq7xsaz1nfswc5wjs2qr0npx8bq7g49kh"; + sha256 = "1p873nqwmpsvmkb5n86d70wndx1qhy15pc9mbcd1mc8sj174578b"; type = "gem"; }; - version = "6.0.3.1"; + version = "6.0.3.3"; }; actiontext = { dependencies = ["actionpack" "activerecord" "activestorage" "activesupport" "nokogiri"]; @@ -80,10 +80,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0kjjd506y50byjms9cmingx3ls5qxfgfys6bhf5rgcir9bjj2b1k"; + sha256 = "05ysfz9dwnncdx0g452by7jdr35yryz6lmcrbb4r5wgjm57b4n25"; type = "gem"; }; - version = "6.0.3.1"; + version = "6.0.3.3"; }; actionview = { dependencies = ["activesupport" "builder" "erubi" "rails-dom-testing" "rails-html-sanitizer"]; @@ -91,10 +91,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1n21pswh3k7m33vzhxyrbi5lj64b1138yqv34jjhkhlq3474b4rh"; + sha256 = "08pvmjddlw01q5r9zdfgddwp4csndpf5i2w47677z5r36jznz36q"; type = "gem"; }; - version = "6.0.3.1"; + version = "6.0.3.3"; }; activejob = { dependencies = ["activesupport" "globalid"]; @@ -102,10 +102,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0skanrib6cdxlxipzm07gb5zl930ws9pg1q1dbg1v5br0g8j818l"; + sha256 = "0w54ckvc229iaax879hkhyc93j7z8p0v7acp6mk3h8xjfvmwy5jp"; type = "gem"; }; - version = "6.0.3.1"; + version = "6.0.3.3"; }; activemodel = { dependencies = ["activesupport"]; @@ -113,10 +113,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "12kqqjzpmdx0dspvfj8my2acmmk94xz1q9iyvvvq2wkw8l11h1yv"; + sha256 = "166jlx6kbby01vr37srh081a9fykgsz873yg5i9gl2ar3vw9gs56"; type = "gem"; }; - version = "6.0.3.1"; + version = "6.0.3.3"; }; activerecord = { dependencies = ["activemodel" "activesupport"]; @@ -124,10 +124,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1rw3kpb0mpvj73chp6m011955sgmngnlavnf7gkm1305s9s5gfc8"; + sha256 = "0y2a4ss6ld6yrhpcbcb3kjn5gj6zk9qklp2aq5rl1awl8vbdbdb7"; type = "gem"; }; - version = "6.0.3.1"; + version = "6.0.3.3"; }; activerecord-explain-analyze = { dependencies = ["activerecord" "pg"]; @@ -146,10 +146,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1x13z9hvwbz2vj55mwzx7pws3ccvgrf9k5m1474k71iksn6zlgvc"; + sha256 = "0nvfjkq979m1h4mk1ys7m4irwpswn4l9arb9yi06ffqpi1lpfl31"; type = "gem"; }; - version = "6.0.3.1"; + version = "6.0.3.3"; }; activesupport = { dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo" "zeitwerk"]; @@ -157,10 +157,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1l29n9n38c9lpy5smh26r7fy7jp2bpjqlzhxgsr79cv7xpwlrbhs"; + sha256 = "1dmkqbvndbz011a1byg6f990936vfadbnwjwjw9vjzr4kd8bxk96"; type = "gem"; }; - version = "6.0.3.1"; + version = "6.0.3.3"; }; acts-as-taggable-on = { dependencies = ["activerecord"]; @@ -686,10 +686,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1nf1l31n10yaark2rrg5qzyzcx9w80681449s3j09qmnipsl8rl5"; + sha256 = "0hybw8jw9ryvz5zrki3gc9r88jqy373m6v46ynxsdzv1ysiyr40p"; type = "gem"; }; - version = "0.7.6"; + version = "0.7.7"; }; childprocess = { groups = ["default" "test"]; @@ -793,10 +793,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "094387x4yasb797mv07cs3g6f08y56virc2rjcpb1k79rzaj3nhl"; + sha256 = "1vnxrbhi7cq3p4y2v9iwd10v1c7l15is4var14hwnb2jip4fyjzz"; type = "gem"; }; - version = "1.1.6"; + version = "1.1.7"; }; connection_pool = { groups = ["default"]; @@ -909,10 +909,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1qishwv7mixfl4v7mdmwai3rhf94hpzj6hmj20vb4mvk7gk0y2la"; + sha256 = "0lrifb0kbjk9033pzjnp8qqqkg2z212h8dgj71k15c6wb6rycqa7"; type = "gem"; }; - version = "8.0.5"; + version = "8.0.6"; }; database_cleaner = { groups = ["development" "test"]; @@ -1007,10 +1007,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0a64xq0dj6p0firpg4mrrfmlakpv17hky5yfrjhchs2sybmymr9i"; + sha256 = "0syqkh0q9mcdgj68m2cf1innpxb8fv6xsayk1kgsdmq539rkv3ic"; type = "gem"; }; - version = "4.7.1"; + version = "4.7.3"; }; devise-two-factor = { dependencies = ["activesupport" "attr_encrypted" "devise" "railties" "rotp"]; @@ -1080,10 +1080,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0abdlwb64ns7ssmiqhdwgl27ly40x2l27l8hs8hn0z4kb3zd2x3v"; + sha256 = "0lcqjsmixjp52bnlgzh4lg9ppsk52x9hpwdjd53k8jnbah2602h0"; type = "gem"; }; - version = "0.5.20180417"; + version = "0.5.20190701"; }; doorkeeper = { dependencies = ["railties"]; @@ -1364,10 +1364,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0grlxwiccbnflxs30r3h7g23xnps5knav1jyqkk3anvm8363ifjw"; + sha256 = "1yz55sf2nd3l666ms6xr18sm2aggcvmb8qr3v53lr4rir32y1yp1"; type = "gem"; }; - version = "2.6.0"; + version = "2.7.0"; }; expression_parser = { groups = ["default"]; @@ -1796,10 +1796,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "06l4c4a7ngq250m1y5i2asl6a63h0jix9rmz47xzj32qg6nlylak"; + sha256 = "1q1l0c1yjnhr451jj845h2vd9s00grjiyj2w9r1b9y3bscsyzs0m"; type = "gem"; }; - version = "13.3.0.pre.rc2"; + version = "13.5.0.pre.rc2"; }; github-markup = { groups = ["default"]; @@ -1839,10 +1839,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1zpprxxis0aziy0vmig0jpc6bxj05xfv25i1aisliiyd7dsjdqrh"; + sha256 = "0k9f3a82727bhhhk8sjyjndpx4p5lwk3x03m06h4w59bpxa917sw"; type = "gem"; }; - version = "0.12.1"; + version = "0.12.2"; }; gitlab-license = { groups = ["default"]; @@ -1859,10 +1859,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0kjxw7fq0slihawxz6nwvikdzp8xc0nydbsvjlz80m936cykmk9h"; + sha256 = "14785l38sqrgf06y45ayhj3nhfqdar8vrsxna764vdsw01dngmin"; type = "gem"; }; - version = "0.0.6"; + version = "0.0.7"; }; gitlab-markup = { groups = ["default"]; @@ -2054,10 +2054,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1zgifvvdh1dyhxl4ywspkvpy6srhlqliihfprp09k35kikxlmjqc"; + sha256 = "175a07vv77k1kyilrgkhpr1vdswcywymgrmr4mmp434w17w0hlrg"; type = "gem"; }; - version = "1.3.0"; + version = "1.4.0"; }; grape_logging = { dependencies = ["grape" "rack"]; @@ -2214,10 +2214,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "19ykg5pax8798nh1yv71adkx0zzs7gn2rxjj86v7nsw0jba5lask"; + sha256 = "1nynpl0xbj0nphqx1qlmyggq58ms1phf5i03hk64wcc0a17x1m1c"; type = "gem"; }; - version = "0.3.8"; + version = "1.0.1"; }; hashie = { groups = ["default" "kerberos"]; @@ -2310,10 +2310,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1gsn0jmri7cavw1pv3pbynq6nldsff0r5dr6pa0mxz0rkpjsgjwl"; + sha256 = "0z8vmvnkrllkpzsxi94284di9r63g9v561a16an35izwak8g245y"; type = "gem"; }; - version = "4.2.0"; + version = "4.4.1"; + }; + http-accept = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "09m1facypsdjynfwrcv19xcb1mqg8z6kk31g8r33pfxzh838c9n6"; + type = "gem"; + }; + version = "1.7.0"; }; http-cookie = { dependencies = ["domain_name"]; @@ -2331,10 +2341,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "15lpn604byf7cyxnw949xz4rvpcknqp7a48q73nm630gqxsa76f3"; + sha256 = "1wx591jdhy84901pklh1n9sgh74gnvq1qyqxwchni1yrc49ynknc"; type = "gem"; }; - version = "2.1.1"; + version = "2.3.0"; }; http-parser = { dependencies = ["ffi-compiler"]; @@ -2374,10 +2384,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "10nq1xjqvkhngiygji831qx9bryjwws95r4vrnlq9142bzkg670s"; + sha256 = "153sx77p16vawrs4qpkv7qlzf9v5fks4g7xqcj1dwk40i6g7rfzk"; type = "gem"; }; - version = "1.8.3"; + version = "1.8.5"; }; i18n_data = { groups = ["default"]; @@ -2526,6 +2536,17 @@ }; version = "0.2.12"; }; + jsonpath = { + dependencies = ["multi_json" "to_regexp"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1bwgk17dwraaf6grv6v99xjjy3ds1sqsf1v49fnlyfjkniy6ap8q"; + type = "gem"; + }; + version = "1.0.5"; + }; jwt = { groups = ["default"]; platforms = []; @@ -2623,15 +2644,15 @@ version = "1.1.0"; }; kubeclient = { - dependencies = ["http" "recursive-open-struct" "rest-client"]; + dependencies = ["http" "jsonpath" "recursive-open-struct" "rest-client"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1djf4zll2alrwv7wg4wk9v504wbri717wqaq773i1azg7cbisbw6"; + sha256 = "07ygwvdrdhqmvqj3g7hsrgwimr1xcphk9d6qjdxr0iynqaahn0l7"; type = "gem"; }; - version = "4.6.0"; + version = "4.9.1"; }; launchy = { dependencies = ["addressable"]; @@ -2668,14 +2689,14 @@ }; license_finder = { dependencies = ["rubyzip" "thor" "toml" "with_env" "xml-simple"]; - groups = ["development" "test"]; + groups = ["development" "omnibus" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "01rhqm5m3m22gq6q9f1x9fh3x3wrf9khnnsycblj0xg5frdjv77v"; + sha256 = "0kc4bkaxy6mm6kpbpg8hdjsqpzybh7cy5b45qydc7bfa9c35vr93"; type = "gem"; }; - version = "5.4.0"; + version = "6.0.0"; }; licensee = { dependencies = ["rugged"]; @@ -2736,10 +2757,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0jk9fgn5ayzbqvzqm11gbkqvas77zdbpkvynlylyiwynclgrn040"; + sha256 = "1alz1x6rkhbw10qpszr384299rf52rcyasn0619a9p50vzs8vczq"; type = "gem"; }; - version = "2.5.0"; + version = "2.7.0"; }; lru_redux = { groups = ["default"]; @@ -2885,10 +2906,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0qy09qrd5bwh8mkbj514n5vcw9ni73218h9s3zmvbpmdwrnzi8j4"; + sha256 = "0lpq12z70n10c1qshcddd5nib2pkcbkwzvmiqqzj60l01k3x4fg9"; type = "gem"; }; - version = "4.9.5"; + version = "4.10.1"; }; mini_mime = { groups = ["default" "development" "test"]; @@ -3089,10 +3110,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0gnmvbryr521r135yz5bv8354m7xn6miiapfgpg1bnwsvxz8xj6c"; + sha256 = "1cbwp1kbv6b2qfxv8sarv0d0ilb257jihlvdqj8f5pdm0ksq1sgk"; type = "gem"; }; - version = "2.5.2"; + version = "2.5.4"; }; no_proxy_fix = { groups = ["default" "development"]; @@ -3633,10 +3654,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0plfcsscg0nagi8srzh4n4g0riqzivsm5rwrn18k73ajaxbqpwc6"; + sha256 = "1i0h9ixdvxw1n9ynxsrbc1lkx3dvd6r78iiwgwnqfz3fap6jgd9p"; type = "gem"; }; - version = "0.11.0"; + version = "0.12.0"; }; pry = { dependencies = ["coderay" "method_source"]; @@ -3684,10 +3705,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1c6kq6s13idl2036b5lch8r7390f8w82cal8hcp4ml76fm2vdac7"; + sha256 = "1xqcgkl7bwws1qrlnmxgh8g4g9m10vg60bhlw40fplninb3ng6d9"; type = "gem"; }; - version = "4.0.3"; + version = "4.0.6"; }; pyu-ruby-sasl = { groups = ["default"]; @@ -3714,10 +3735,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1mxzk12xylrz6d4n9jj5jasfscbf1pbk4idrb0nlf327lx9rwfkk"; + sha256 = "1x72abm2snhk664s9g642pxjyk911y39qck8n9hbnqmb7ba1zbmz"; type = "gem"; }; - version = "2.0.9"; + version = "2.1.4"; }; rack-accept = { dependencies = ["rack"]; @@ -3812,10 +3833,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1cka2c0g9qd02i7xl0hnhkbf4vjrjlax1vwpillpi4x0zc30ssl4"; + sha256 = "1qqsiwsb13sxkvxj54aybjhbxqi45fyiykaz5isc1y9frm2yyw64"; type = "gem"; }; - version = "6.0.3.1"; + version = "6.0.3.3"; }; rails-controller-testing = { dependencies = ["actionpack" "actionview" "activesupport"]; @@ -3823,10 +3844,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1m1rklj6pvzi4fydxcmcv4q0xd7913hhhw1hw530nfz1wkl7vjlf"; + sha256 = "151f303jcvs8s149mhx2g5mn67487x0blrf9dzl76q1nb7dlh53l"; type = "gem"; }; - version = "1.0.4"; + version = "1.0.5"; }; rails-dom-testing = { dependencies = ["activesupport" "nokogiri"]; @@ -3867,10 +3888,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1drghlbjchn889ssiv1rzq6psp0469brf2838kfm4kzz1fhmbh2d"; + sha256 = "05b79r0ms8jrs91zml1190qfxmnmks90g0sd820ks9msyr8xdp7j"; type = "gem"; }; - version = "6.0.3.1"; + version = "6.0.3.3"; }; rainbow = { groups = ["default" "development" "test"]; @@ -3995,10 +4016,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0acrxff186sn6sxdfiy7nacjgwak5cqd7jha9v3kshpf3sfr7qd1"; + sha256 = "12manni00r5qn50z8w316pnm8mqn858i5kj6s9sr9sfl8qx8ws5g"; type = "gem"; }; - version = "1.1.1"; + version = "1.1.2"; }; RedCloth = { groups = ["default"]; @@ -4140,15 +4161,15 @@ version = "3.0.0"; }; rest-client = { - dependencies = ["http-cookie" "mime-types" "netrc"]; + dependencies = ["http-accept" "http-cookie" "mime-types" "netrc"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1hzcs2r7b5bjkf2x2z3n8z6082maz0j8vqjiciwgg3hzb63f958j"; + sha256 = "1qs74yzl58agzx9dgjhcpgmzfn61fqkk33k1js2y5yhlvc5l19im"; type = "gem"; }; - version = "2.0.2"; + version = "2.1.0"; }; retriable = { groups = ["default"]; @@ -4195,10 +4216,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1agrrmj88k9jkk36ra1ml2c1jffpp595pkxmcla74ac9ia09vn3s"; + sha256 = "1igl00gk0vaq4xxk44m7yflqdzsblgxlzcxj8saz96bmx7mg7392"; type = "gem"; }; - version = "3.21.0"; + version = "3.24.0"; }; rqrcode = { dependencies = ["chunky_png"]; @@ -4635,10 +4656,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "11abil34dr8p1kw7hlaqd6kr430v4srmhzf72zzqvhcimlfvm4yb"; + sha256 = "0adcvp86dinaqq3nhf8p3m0rl2g6q0a4h52k0i7kdnsg1qz9k86y"; type = "gem"; }; - version = "3.142.6"; + version = "3.142.7"; }; sentry-raven = { dependencies = ["faraday"]; @@ -4782,10 +4803,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1s2bff13nd21r28528vfb2ly5718r812izww2g0vxksjq7xgr2c7"; + sha256 = "1h89asinyyyq88v89fdc3nw0g74vq2f7p59s18jrq3svpv913ij9"; type = "gem"; }; - version = "2.3.3"; + version = "2.3.4"; }; snowplow-tracker = { dependencies = ["contracts"]; @@ -4833,14 +4854,14 @@ }; sprockets-rails = { dependencies = ["actionpack" "activesupport" "sprockets"]; - groups = ["default" "development" "test"]; + groups = ["default" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ab42pm8p5zxpv3sfraq45b9lj39cz9mrpdirm30vywzrwwkm5p1"; + sha256 = "0mwmz36265646xqfyczgr1mhkm1hfxgxxvgdgr4xfcbf2g72p1k2"; type = "gem"; }; - version = "3.2.1"; + version = "3.2.2"; }; sqlite3 = { groups = ["default" "development" "test"]; @@ -4957,6 +4978,17 @@ }; version = "1.8.0"; }; + terser = { + dependencies = ["execjs"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "13mj7ds6kwl1z5dp8zg6b9l3vq9012g8yr99hlpf3d1dgsyf1hl0"; + type = "gem"; + }; + version = "1.0.2"; + }; test-prof = { groups = ["test"]; platforms = []; @@ -5058,6 +5090,16 @@ }; version = "0.8.3"; }; + to_regexp = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1rgabfhnql6l4fx09mmj5d0vza924iczqf2blmn82l782b6qqi9v"; + type = "gem"; + }; + version = "0.2.1"; + }; toml = { dependencies = ["parslet"]; groups = ["default" "development" "test"]; @@ -5133,17 +5175,6 @@ }; version = "0.1.0"; }; - uglifier = { - dependencies = ["execjs" "json"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0mzs64z3m1b98rh6ssxpqfz9sc87f6ml6906b0m57vydzfgrh1cz"; - type = "gem"; - }; - version = "2.7.2"; - }; unf = { dependencies = ["unf_ext"]; groups = ["default"]; @@ -5160,10 +5191,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "06p1i6qhy34bpb8q8ms88y6f2kz86azwm098yvcc0nyqk9y729j1"; + sha256 = "0wc47r23h063l8ysws8sy24gzh74mks81cak3lkzlrw4qkqb3sg4"; type = "gem"; }; - version = "0.0.7.5"; + version = "0.0.7.7"; }; unicode-display_width = { groups = ["default" "development" "test"]; @@ -5363,21 +5394,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0gg0c2sxq7rni0b93w47h7p7cn590xdhf5va7ska48inpipwlgxp"; + sha256 = "0z9k677j9f6jrsj6nkxl2h969q0zyfzqj2ibxldznd5jaqj85xmw"; type = "gem"; }; - version = "3.5.1"; - }; - webpack-rails = { - dependencies = ["railties"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0fsjxw730bh4k1dfnbjm645fgjyqrh830l1z7brqbsm6306ig1rr"; - type = "gem"; - }; - version = "0.9.11"; + version = "3.9.1"; }; websocket-driver = { dependencies = ["websocket-extensions"]; @@ -5385,10 +5405,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1bxamwqldmy98hxs5pqby3andws14hl36ch78g0s81gaz9b91nj2"; + sha256 = "1i3rs4kcj0jba8idxla3s6xd1xfln3k8b4cb1dik2lda3ifnp3dh"; type = "gem"; }; - version = "0.7.1"; + version = "0.7.3"; }; websocket-extensions = { groups = ["default" "test"]; @@ -5457,9 +5477,9 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1akpm3pwvyiack2zk6giv9yn3cqb8pw6g40p4394pdc3xmy3s4k0"; + sha256 = "0jvn50k76kl14fpymk4hdsf9sk00jl84yxzl783xhnw4dicp0m0k"; type = "gem"; }; - version = "2.3.0"; + version = "2.4.0"; }; } \ No newline at end of file diff --git a/pkgs/applications/version-management/gitlab/yarnPkgs.nix b/pkgs/applications/version-management/gitlab/yarnPkgs.nix index 484ce7203d26..899888ee2f1b 100644 --- a/pkgs/applications/version-management/gitlab/yarnPkgs.nix +++ b/pkgs/applications/version-management/gitlab/yarnPkgs.nix @@ -2,11 +2,11 @@ offline_cache = linkFarm "offline" packages; packages = [ { - name = "_babel_code_frame___code_frame_7.10.1.tgz"; + name = "_babel_code_frame___code_frame_7.10.4.tgz"; path = fetchurl { - name = "_babel_code_frame___code_frame_7.10.1.tgz"; - url = "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.10.1.tgz"; - sha1 = "d5481c5095daa1c57e16e54c6f9198443afb49ff"; + name = "_babel_code_frame___code_frame_7.10.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.10.4.tgz"; + sha1 = "168da1a36e90da68ae8d49c0f1b48c7c6249213a"; }; } { @@ -26,11 +26,11 @@ }; } { - name = "_babel_generator___generator_7.10.2.tgz"; + name = "_babel_generator___generator_7.11.6.tgz"; path = fetchurl { - name = "_babel_generator___generator_7.10.2.tgz"; - url = "https://registry.yarnpkg.com/@babel/generator/-/generator-7.10.2.tgz"; - sha1 = "0fa5b5b2389db8bfdfcc3492b551ee20f5dd69a9"; + name = "_babel_generator___generator_7.11.6.tgz"; + url = "https://registry.yarnpkg.com/@babel/generator/-/generator-7.11.6.tgz"; + sha1 = "b868900f81b163b4d464ea24545c61cbac4dc620"; }; } { @@ -90,19 +90,19 @@ }; } { - name = "_babel_helper_function_name___helper_function_name_7.10.1.tgz"; + name = "_babel_helper_function_name___helper_function_name_7.10.4.tgz"; path = fetchurl { - name = "_babel_helper_function_name___helper_function_name_7.10.1.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.10.1.tgz"; - sha1 = "92bd63829bfc9215aca9d9defa85f56b539454f4"; + name = "_babel_helper_function_name___helper_function_name_7.10.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.10.4.tgz"; + sha1 = "d2d3b20c59ad8c47112fa7d2a94bc09d5ef82f1a"; }; } { - name = "_babel_helper_get_function_arity___helper_get_function_arity_7.10.1.tgz"; + name = "_babel_helper_get_function_arity___helper_get_function_arity_7.10.4.tgz"; path = fetchurl { - name = "_babel_helper_get_function_arity___helper_get_function_arity_7.10.1.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.10.1.tgz"; - sha1 = "7303390a81ba7cb59613895a192b93850e373f7d"; + name = "_babel_helper_get_function_arity___helper_get_function_arity_7.10.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.10.4.tgz"; + sha1 = "98c1cbea0e2332f33f9a4661b8ce1505b2c19ba2"; }; } { @@ -114,43 +114,43 @@ }; } { - name = "_babel_helper_member_expression_to_functions___helper_member_expression_to_functions_7.10.1.tgz"; + name = "_babel_helper_member_expression_to_functions___helper_member_expression_to_functions_7.11.0.tgz"; path = fetchurl { - name = "_babel_helper_member_expression_to_functions___helper_member_expression_to_functions_7.10.1.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.10.1.tgz"; - sha1 = "432967fd7e12a4afef66c4687d4ca22bc0456f15"; + name = "_babel_helper_member_expression_to_functions___helper_member_expression_to_functions_7.11.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.11.0.tgz"; + sha1 = "ae69c83d84ee82f4b42f96e2a09410935a8f26df"; }; } { - name = "_babel_helper_module_imports___helper_module_imports_7.10.1.tgz"; + name = "_babel_helper_module_imports___helper_module_imports_7.10.4.tgz"; path = fetchurl { - name = "_babel_helper_module_imports___helper_module_imports_7.10.1.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.10.1.tgz"; - sha1 = "dd331bd45bccc566ce77004e9d05fe17add13876"; + name = "_babel_helper_module_imports___helper_module_imports_7.10.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.10.4.tgz"; + sha1 = "4c5c54be04bd31670a7382797d75b9fa2e5b5620"; }; } { - name = "_babel_helper_module_transforms___helper_module_transforms_7.10.1.tgz"; + name = "_babel_helper_module_transforms___helper_module_transforms_7.11.0.tgz"; path = fetchurl { - name = "_babel_helper_module_transforms___helper_module_transforms_7.10.1.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.10.1.tgz"; - sha1 = "24e2f08ee6832c60b157bb0936c86bef7210c622"; + name = "_babel_helper_module_transforms___helper_module_transforms_7.11.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.11.0.tgz"; + sha1 = "b16f250229e47211abdd84b34b64737c2ab2d359"; }; } { - name = "_babel_helper_optimise_call_expression___helper_optimise_call_expression_7.10.1.tgz"; + name = "_babel_helper_optimise_call_expression___helper_optimise_call_expression_7.10.4.tgz"; path = fetchurl { - name = "_babel_helper_optimise_call_expression___helper_optimise_call_expression_7.10.1.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.10.1.tgz"; - sha1 = "b4a1f2561870ce1247ceddb02a3860fa96d72543"; + name = "_babel_helper_optimise_call_expression___helper_optimise_call_expression_7.10.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.10.4.tgz"; + sha1 = "50dc96413d594f995a77905905b05893cd779673"; }; } { - name = "_babel_helper_plugin_utils___helper_plugin_utils_7.10.1.tgz"; + name = "_babel_helper_plugin_utils___helper_plugin_utils_7.10.4.tgz"; path = fetchurl { - name = "_babel_helper_plugin_utils___helper_plugin_utils_7.10.1.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.1.tgz"; - sha1 = "ec5a5cf0eec925b66c60580328b122c01230a127"; + name = "_babel_helper_plugin_utils___helper_plugin_utils_7.10.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.4.tgz"; + sha1 = "2f75a831269d4f677de49986dff59927533cf375"; }; } { @@ -170,35 +170,35 @@ }; } { - name = "_babel_helper_replace_supers___helper_replace_supers_7.10.1.tgz"; + name = "_babel_helper_replace_supers___helper_replace_supers_7.10.4.tgz"; path = fetchurl { - name = "_babel_helper_replace_supers___helper_replace_supers_7.10.1.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.10.1.tgz"; - sha1 = "ec6859d20c5d8087f6a2dc4e014db7228975f13d"; + name = "_babel_helper_replace_supers___helper_replace_supers_7.10.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.10.4.tgz"; + sha1 = "d585cd9388ea06e6031e4cd44b6713cbead9e6cf"; }; } { - name = "_babel_helper_simple_access___helper_simple_access_7.10.1.tgz"; + name = "_babel_helper_simple_access___helper_simple_access_7.10.4.tgz"; path = fetchurl { - name = "_babel_helper_simple_access___helper_simple_access_7.10.1.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.10.1.tgz"; - sha1 = "08fb7e22ace9eb8326f7e3920a1c2052f13d851e"; + name = "_babel_helper_simple_access___helper_simple_access_7.10.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.10.4.tgz"; + sha1 = "0f5ccda2945277a2a7a2d3a821e15395edcf3461"; }; } { - name = "_babel_helper_split_export_declaration___helper_split_export_declaration_7.10.1.tgz"; + name = "_babel_helper_split_export_declaration___helper_split_export_declaration_7.11.0.tgz"; path = fetchurl { - name = "_babel_helper_split_export_declaration___helper_split_export_declaration_7.10.1.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.10.1.tgz"; - sha1 = "c6f4be1cbc15e3a868e4c64a17d5d31d754da35f"; + name = "_babel_helper_split_export_declaration___helper_split_export_declaration_7.11.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.11.0.tgz"; + sha1 = "f8a491244acf6a676158ac42072911ba83ad099f"; }; } { - name = "_babel_helper_validator_identifier___helper_validator_identifier_7.10.1.tgz"; + name = "_babel_helper_validator_identifier___helper_validator_identifier_7.10.4.tgz"; path = fetchurl { - name = "_babel_helper_validator_identifier___helper_validator_identifier_7.10.1.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.1.tgz"; - sha1 = "5770b0c1a826c4f53f5ede5e153163e0318e94b5"; + name = "_babel_helper_validator_identifier___helper_validator_identifier_7.10.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.4.tgz"; + sha1 = "a78c7a7251e01f616512d31b10adcf52ada5e0d2"; }; } { @@ -218,19 +218,19 @@ }; } { - name = "_babel_highlight___highlight_7.10.1.tgz"; + name = "_babel_highlight___highlight_7.10.4.tgz"; path = fetchurl { - name = "_babel_highlight___highlight_7.10.1.tgz"; - url = "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.10.1.tgz"; - sha1 = "841d098ba613ba1a427a2b383d79e35552c38ae0"; + name = "_babel_highlight___highlight_7.10.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.10.4.tgz"; + sha1 = "7d1bdfd65753538fabe6c38596cdb76d9ac60143"; }; } { - name = "_babel_parser___parser_7.10.2.tgz"; + name = "_babel_parser___parser_7.11.5.tgz"; path = fetchurl { - name = "_babel_parser___parser_7.10.2.tgz"; - url = "https://registry.yarnpkg.com/@babel/parser/-/parser-7.10.2.tgz"; - sha1 = "871807f10442b92ff97e4783b9b54f6a0ca812d0"; + name = "_babel_parser___parser_7.11.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/parser/-/parser-7.11.5.tgz"; + sha1 = "c7ff6303df71080ec7a4f5b8c003c58f1cf51037"; }; } { @@ -329,6 +329,14 @@ sha1 = "a983fb1aeb2ec3f6ed042a210f640e90e786fe0d"; }; } + { + name = "_babel_plugin_syntax_bigint___plugin_syntax_bigint_7.8.3.tgz"; + path = fetchurl { + name = "_babel_plugin_syntax_bigint___plugin_syntax_bigint_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-syntax-bigint/-/plugin-syntax-bigint-7.8.3.tgz"; + sha1 = "4c9a6f669f5d0cdf1b90a1671e9a146be5300cea"; + }; + } { name = "_babel_plugin_syntax_class_properties___plugin_syntax_class_properties_7.10.1.tgz"; path = fetchurl { @@ -346,11 +354,11 @@ }; } { - name = "_babel_plugin_syntax_import_meta___plugin_syntax_import_meta_7.10.1.tgz"; + name = "_babel_plugin_syntax_import_meta___plugin_syntax_import_meta_7.10.4.tgz"; path = fetchurl { - name = "_babel_plugin_syntax_import_meta___plugin_syntax_import_meta_7.10.1.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-syntax-import-meta/-/plugin-syntax-import-meta-7.10.1.tgz"; - sha1 = "3e59120ed8b3c2ccc5abb1cfc7aaa3ea01cd36b6"; + name = "_babel_plugin_syntax_import_meta___plugin_syntax_import_meta_7.10.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-syntax-import-meta/-/plugin-syntax-import-meta-7.10.4.tgz"; + sha1 = "ee601348c370fa334d2207be158777496521fd51"; }; } { @@ -361,6 +369,14 @@ sha1 = "01ca21b668cd8218c9e640cb6dd88c5412b2c96a"; }; } + { + name = "_babel_plugin_syntax_logical_assignment_operators___plugin_syntax_logical_assignment_operators_7.10.1.tgz"; + path = fetchurl { + name = "_babel_plugin_syntax_logical_assignment_operators___plugin_syntax_logical_assignment_operators_7.10.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.1.tgz"; + sha1 = "fffee77b4934ce77f3b427649ecdddbec1958550"; + }; + } { name = "_babel_plugin_syntax_nullish_coalescing_operator___plugin_syntax_nullish_coalescing_operator_7.8.3.tgz"; path = fetchurl { @@ -530,11 +546,11 @@ }; } { - name = "_babel_plugin_transform_modules_commonjs___plugin_transform_modules_commonjs_7.10.1.tgz"; + name = "_babel_plugin_transform_modules_commonjs___plugin_transform_modules_commonjs_7.10.4.tgz"; path = fetchurl { - name = "_babel_plugin_transform_modules_commonjs___plugin_transform_modules_commonjs_7.10.1.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.10.1.tgz"; - sha1 = "d5ff4b4413ed97ffded99961056e1fb980fb9301"; + name = "_babel_plugin_transform_modules_commonjs___plugin_transform_modules_commonjs_7.10.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.10.4.tgz"; + sha1 = "66667c3eeda1ebf7896d41f1f16b17105a2fbca0"; }; } { @@ -690,11 +706,11 @@ }; } { - name = "_babel_runtime___runtime_7.10.4.tgz"; + name = "_babel_runtime___runtime_7.11.2.tgz"; path = fetchurl { - name = "_babel_runtime___runtime_7.10.4.tgz"; - url = "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.10.4.tgz"; - sha1 = "a6724f1a6b8d2f6ea5236dbfe58c7d7ea9c5eb99"; + name = "_babel_runtime___runtime_7.11.2.tgz"; + url = "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.11.2.tgz"; + sha1 = "f549c13c754cc40b87644b9fa9f09a6a95fe0736"; }; } { @@ -706,27 +722,35 @@ }; } { - name = "_babel_template___template_7.10.1.tgz"; + name = "_babel_template___template_7.10.4.tgz"; path = fetchurl { - name = "_babel_template___template_7.10.1.tgz"; - url = "https://registry.yarnpkg.com/@babel/template/-/template-7.10.1.tgz"; - sha1 = "e167154a94cb5f14b28dc58f5356d2162f539811"; + name = "_babel_template___template_7.10.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/template/-/template-7.10.4.tgz"; + sha1 = "3251996c4200ebc71d1a8fc405fba940f36ba278"; }; } { - name = "_babel_traverse___traverse_7.10.1.tgz"; + name = "_babel_traverse___traverse_7.11.5.tgz"; path = fetchurl { - name = "_babel_traverse___traverse_7.10.1.tgz"; - url = "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.10.1.tgz"; - sha1 = "bbcef3031e4152a6c0b50147f4958df54ca0dd27"; + name = "_babel_traverse___traverse_7.11.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.11.5.tgz"; + sha1 = "be777b93b518eb6d76ee2e1ea1d143daa11e61c3"; }; } { - name = "_babel_types___types_7.10.2.tgz"; + name = "_babel_types___types_7.11.5.tgz"; path = fetchurl { - name = "_babel_types___types_7.10.2.tgz"; - url = "https://registry.yarnpkg.com/@babel/types/-/types-7.10.2.tgz"; - sha1 = "30283be31cad0dbf6fb00bd40641ca0ea675172d"; + name = "_babel_types___types_7.11.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/types/-/types-7.11.5.tgz"; + sha1 = "d9de577d01252d77c6800cee039ee64faf75662d"; + }; + } + { + name = "_bcoe_v8_coverage___v8_coverage_0.2.3.tgz"; + path = fetchurl { + name = "_bcoe_v8_coverage___v8_coverage_0.2.3.tgz"; + url = "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz"; + sha1 = "75a2e8b51cb758a7553d6804a5932d7aace75c39"; }; } { @@ -738,11 +762,11 @@ }; } { - name = "_cnakazawa_watch___watch_1.0.3.tgz"; + name = "_cnakazawa_watch___watch_1.0.4.tgz"; path = fetchurl { - name = "_cnakazawa_watch___watch_1.0.3.tgz"; - url = "https://registry.yarnpkg.com/@cnakazawa/watch/-/watch-1.0.3.tgz"; - sha1 = "099139eaec7ebf07a27c1786a3ff64f39464d2ef"; + name = "_cnakazawa_watch___watch_1.0.4.tgz"; + url = "https://registry.yarnpkg.com/@cnakazawa/watch/-/watch-1.0.4.tgz"; + sha1 = "f864ae85004d0fcab6f50be9141c4da368d1656a"; }; } { @@ -762,19 +786,19 @@ }; } { - name = "_gitlab_svgs___svgs_1.164.0.tgz"; + name = "_gitlab_svgs___svgs_1.171.0.tgz"; path = fetchurl { - name = "_gitlab_svgs___svgs_1.164.0.tgz"; - url = "https://registry.yarnpkg.com/@gitlab/svgs/-/svgs-1.164.0.tgz"; - sha1 = "6cefad871c45f945ef92b99015d0f510b1d2de4a"; + name = "_gitlab_svgs___svgs_1.171.0.tgz"; + url = "https://registry.yarnpkg.com/@gitlab/svgs/-/svgs-1.171.0.tgz"; + sha1 = "abc3092bf804f0898301626130e0f3231834924a"; }; } { - name = "_gitlab_ui___ui_21.3.1.tgz"; + name = "_gitlab_ui___ui_21.33.0.tgz"; path = fetchurl { - name = "_gitlab_ui___ui_21.3.1.tgz"; - url = "https://registry.yarnpkg.com/@gitlab/ui/-/ui-21.3.1.tgz"; - sha1 = "027b767804540539da73d4874370895d7398adea"; + name = "_gitlab_ui___ui_21.33.0.tgz"; + url = "https://registry.yarnpkg.com/@gitlab/ui/-/ui-21.33.0.tgz"; + sha1 = "83dd7e4d65557f7b82ce1f9d7d6e7a1c54cb3dbc"; }; } { @@ -794,91 +818,99 @@ }; } { - name = "_jest_console___console_24.7.1.tgz"; + name = "_istanbuljs_load_nyc_config___load_nyc_config_1.1.0.tgz"; path = fetchurl { - name = "_jest_console___console_24.7.1.tgz"; - url = "https://registry.yarnpkg.com/@jest/console/-/console-24.7.1.tgz"; - sha1 = "32a9e42535a97aedfe037e725bd67e954b459545"; + name = "_istanbuljs_load_nyc_config___load_nyc_config_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz"; + sha1 = "fd3db1d59ecf7cf121e80650bb86712f9b55eced"; }; } { - name = "_jest_core___core_24.8.0.tgz"; + name = "_istanbuljs_schema___schema_0.1.2.tgz"; path = fetchurl { - name = "_jest_core___core_24.8.0.tgz"; - url = "https://registry.yarnpkg.com/@jest/core/-/core-24.8.0.tgz"; - sha1 = "fbbdcd42a41d0d39cddbc9f520c8bab0c33eed5b"; + name = "_istanbuljs_schema___schema_0.1.2.tgz"; + url = "https://registry.yarnpkg.com/@istanbuljs/schema/-/schema-0.1.2.tgz"; + sha1 = "26520bf09abe4a5644cd5414e37125a8954241dd"; }; } { - name = "_jest_environment___environment_24.8.0.tgz"; + name = "_jest_console___console_26.5.2.tgz"; path = fetchurl { - name = "_jest_environment___environment_24.8.0.tgz"; - url = "https://registry.yarnpkg.com/@jest/environment/-/environment-24.8.0.tgz"; - sha1 = "0342261383c776bdd652168f68065ef144af0eac"; + name = "_jest_console___console_26.5.2.tgz"; + url = "https://registry.yarnpkg.com/@jest/console/-/console-26.5.2.tgz"; + sha1 = "94fc4865b1abed7c352b5e21e6c57be4b95604a6"; }; } { - name = "_jest_fake_timers___fake_timers_24.8.0.tgz"; + name = "_jest_core___core_26.5.2.tgz"; path = fetchurl { - name = "_jest_fake_timers___fake_timers_24.8.0.tgz"; - url = "https://registry.yarnpkg.com/@jest/fake-timers/-/fake-timers-24.8.0.tgz"; - sha1 = "2e5b80a4f78f284bcb4bd5714b8e10dd36a8d3d1"; + name = "_jest_core___core_26.5.2.tgz"; + url = "https://registry.yarnpkg.com/@jest/core/-/core-26.5.2.tgz"; + sha1 = "e39f14676f4ba4632ecabfdc374071ab22131f22"; }; } { - name = "_jest_fake_timers___fake_timers_25.5.0.tgz"; + name = "_jest_environment___environment_26.5.2.tgz"; path = fetchurl { - name = "_jest_fake_timers___fake_timers_25.5.0.tgz"; - url = "https://registry.yarnpkg.com/@jest/fake-timers/-/fake-timers-25.5.0.tgz"; - sha1 = "46352e00533c024c90c2bc2ad9f2959f7f114185"; + name = "_jest_environment___environment_26.5.2.tgz"; + url = "https://registry.yarnpkg.com/@jest/environment/-/environment-26.5.2.tgz"; + sha1 = "eba3cfc698f6e03739628f699c28e8a07f5e65fe"; }; } { - name = "_jest_reporters___reporters_24.8.0.tgz"; + name = "_jest_fake_timers___fake_timers_26.5.2.tgz"; path = fetchurl { - name = "_jest_reporters___reporters_24.8.0.tgz"; - url = "https://registry.yarnpkg.com/@jest/reporters/-/reporters-24.8.0.tgz"; - sha1 = "075169cd029bddec54b8f2c0fc489fd0b9e05729"; + name = "_jest_fake_timers___fake_timers_26.5.2.tgz"; + url = "https://registry.yarnpkg.com/@jest/fake-timers/-/fake-timers-26.5.2.tgz"; + sha1 = "1291ac81680ceb0dc7daa1f92c059307eea6400a"; }; } { - name = "_jest_source_map___source_map_24.3.0.tgz"; + name = "_jest_globals___globals_26.5.2.tgz"; path = fetchurl { - name = "_jest_source_map___source_map_24.3.0.tgz"; - url = "https://registry.yarnpkg.com/@jest/source-map/-/source-map-24.3.0.tgz"; - sha1 = "563be3aa4d224caf65ff77edc95cd1ca4da67f28"; + name = "_jest_globals___globals_26.5.2.tgz"; + url = "https://registry.yarnpkg.com/@jest/globals/-/globals-26.5.2.tgz"; + sha1 = "c333f82c29e19ecb609a75d1a532915a5c956c59"; }; } { - name = "_jest_test_result___test_result_24.8.0.tgz"; + name = "_jest_reporters___reporters_26.5.2.tgz"; path = fetchurl { - name = "_jest_test_result___test_result_24.8.0.tgz"; - url = "https://registry.yarnpkg.com/@jest/test-result/-/test-result-24.8.0.tgz"; - sha1 = "7675d0aaf9d2484caa65e048d9b467d160f8e9d3"; + name = "_jest_reporters___reporters_26.5.2.tgz"; + url = "https://registry.yarnpkg.com/@jest/reporters/-/reporters-26.5.2.tgz"; + sha1 = "0f1c900c6af712b46853d9d486c9c0382e4050f6"; }; } { - name = "_jest_test_sequencer___test_sequencer_24.8.0.tgz"; + name = "_jest_source_map___source_map_26.5.0.tgz"; path = fetchurl { - name = "_jest_test_sequencer___test_sequencer_24.8.0.tgz"; - url = "https://registry.yarnpkg.com/@jest/test-sequencer/-/test-sequencer-24.8.0.tgz"; - sha1 = "2f993bcf6ef5eb4e65e8233a95a3320248cf994b"; + name = "_jest_source_map___source_map_26.5.0.tgz"; + url = "https://registry.yarnpkg.com/@jest/source-map/-/source-map-26.5.0.tgz"; + sha1 = "98792457c85bdd902365cd2847b58fff05d96367"; }; } { - name = "_jest_transform___transform_24.8.0.tgz"; + name = "_jest_test_result___test_result_26.5.2.tgz"; path = fetchurl { - name = "_jest_transform___transform_24.8.0.tgz"; - url = "https://registry.yarnpkg.com/@jest/transform/-/transform-24.8.0.tgz"; - sha1 = "628fb99dce4f9d254c6fd9341e3eea262e06fef5"; + name = "_jest_test_result___test_result_26.5.2.tgz"; + url = "https://registry.yarnpkg.com/@jest/test-result/-/test-result-26.5.2.tgz"; + sha1 = "cc1a44cfd4db2ecee3fb0bc4e9fe087aa54b5230"; }; } { - name = "_jest_types___types_24.8.0.tgz"; + name = "_jest_test_sequencer___test_sequencer_26.5.2.tgz"; path = fetchurl { - name = "_jest_types___types_24.8.0.tgz"; - url = "https://registry.yarnpkg.com/@jest/types/-/types-24.8.0.tgz"; - sha1 = "f31e25948c58f0abd8c845ae26fcea1491dea7ad"; + name = "_jest_test_sequencer___test_sequencer_26.5.2.tgz"; + url = "https://registry.yarnpkg.com/@jest/test-sequencer/-/test-sequencer-26.5.2.tgz"; + sha1 = "c4559c7e134b27b020317303ee5399bf62917a4b"; + }; + } + { + name = "_jest_transform___transform_26.5.2.tgz"; + path = fetchurl { + name = "_jest_transform___transform_26.5.2.tgz"; + url = "https://registry.yarnpkg.com/@jest/transform/-/transform-26.5.2.tgz"; + sha1 = "6a0033a1d24316a1c75184d010d864f2c681bef5"; }; } { @@ -889,6 +921,14 @@ sha1 = "4d6a4793f7b9599fc3680877b856a97dbccf2a9d"; }; } + { + name = "_jest_types___types_26.5.2.tgz"; + path = fetchurl { + name = "_jest_types___types_26.5.2.tgz"; + url = "https://registry.yarnpkg.com/@jest/types/-/types-26.5.2.tgz"; + sha1 = "44c24f30c8ee6c7f492ead9ec3f3c62a5289756d"; + }; + } { name = "_miragejs_pretender_node_polyfill___pretender_node_polyfill_0.1.2.tgz"; path = fetchurl { @@ -922,59 +962,19 @@ }; } { - name = "_rails_actioncable___actioncable_6.0.3_1.tgz"; + name = "_rails_actioncable___actioncable_6.0.3_3.tgz"; path = fetchurl { - name = "_rails_actioncable___actioncable_6.0.3_1.tgz"; - url = "https://registry.yarnpkg.com/@rails/actioncable/-/actioncable-6.0.3-1.tgz"; - sha1 = "9b9eb8858a6507162911007d355d9a206e1c5caa"; + name = "_rails_actioncable___actioncable_6.0.3_3.tgz"; + url = "https://registry.yarnpkg.com/@rails/actioncable/-/actioncable-6.0.3-3.tgz"; + sha1 = "fb1a46d3d353512764d5fa3cea2f492391601b7a"; }; } { - name = "_sentry_browser___browser_5.22.3.tgz"; + name = "_rails_ujs___ujs_6.0.3_2.tgz"; path = fetchurl { - name = "_sentry_browser___browser_5.22.3.tgz"; - url = "https://registry.yarnpkg.com/@sentry/browser/-/browser-5.22.3.tgz"; - sha1 = "7a64bd1cf01bf393741a3e4bf35f82aa927f5b4e"; - }; - } - { - name = "_sentry_core___core_5.22.3.tgz"; - path = fetchurl { - name = "_sentry_core___core_5.22.3.tgz"; - url = "https://registry.yarnpkg.com/@sentry/core/-/core-5.22.3.tgz"; - sha1 = "030f435f2b518f282ba8bd954dac90cd70888bd7"; - }; - } - { - name = "_sentry_hub___hub_5.22.3.tgz"; - path = fetchurl { - name = "_sentry_hub___hub_5.22.3.tgz"; - url = "https://registry.yarnpkg.com/@sentry/hub/-/hub-5.22.3.tgz"; - sha1 = "08309a70d2ea8d5e313d05840c1711f34f2fffe5"; - }; - } - { - name = "_sentry_minimal___minimal_5.22.3.tgz"; - path = fetchurl { - name = "_sentry_minimal___minimal_5.22.3.tgz"; - url = "https://registry.yarnpkg.com/@sentry/minimal/-/minimal-5.22.3.tgz"; - sha1 = "706e4029ae5494123d3875c658ba8911aa5cc440"; - }; - } - { - name = "_sentry_types___types_5.22.3.tgz"; - path = fetchurl { - name = "_sentry_types___types_5.22.3.tgz"; - url = "https://registry.yarnpkg.com/@sentry/types/-/types-5.22.3.tgz"; - sha1 = "d1d547b30ee8bd7771fa893af74c4f3d71f0fd18"; - }; - } - { - name = "_sentry_utils___utils_5.22.3.tgz"; - path = fetchurl { - name = "_sentry_utils___utils_5.22.3.tgz"; - url = "https://registry.yarnpkg.com/@sentry/utils/-/utils-5.22.3.tgz"; - sha1 = "e3bda3e789239eb16d436f768daa12829f33d18f"; + name = "_rails_ujs___ujs_6.0.3_2.tgz"; + url = "https://registry.yarnpkg.com/@rails/ujs/-/ujs-6.0.3-2.tgz"; + sha1 = "e14c1f29086858215ce7ccd9ad6d8888c458b4a3"; }; } { @@ -986,11 +986,19 @@ }; } { - name = "_sinonjs_commons___commons_1.8.0.tgz"; + name = "_sinonjs_commons___commons_1.8.1.tgz"; path = fetchurl { - name = "_sinonjs_commons___commons_1.8.0.tgz"; - url = "https://registry.yarnpkg.com/@sinonjs/commons/-/commons-1.8.0.tgz"; - sha1 = "c8d68821a854c555bba172f3b06959a0039b236d"; + name = "_sinonjs_commons___commons_1.8.1.tgz"; + url = "https://registry.yarnpkg.com/@sinonjs/commons/-/commons-1.8.1.tgz"; + sha1 = "e7df00f98a203324f6dc7cc606cad9d4a8ab2217"; + }; + } + { + name = "_sinonjs_fake_timers___fake_timers_6.0.1.tgz"; + path = fetchurl { + name = "_sinonjs_fake_timers___fake_timers_6.0.1.tgz"; + url = "https://registry.yarnpkg.com/@sinonjs/fake-timers/-/fake-timers-6.0.1.tgz"; + sha1 = "293674fccb3262ac782c7aadfdeca86b10c75c40"; }; } { @@ -1010,11 +1018,11 @@ }; } { - name = "_testing_library_dom___dom_7.16.2.tgz"; + name = "_testing_library_dom___dom_7.24.5.tgz"; path = fetchurl { - name = "_testing_library_dom___dom_7.16.2.tgz"; - url = "https://registry.yarnpkg.com/@testing-library/dom/-/dom-7.16.2.tgz"; - sha1 = "f7a20b5548817e5c7ed26077913372d977be90af"; + name = "_testing_library_dom___dom_7.24.5.tgz"; + url = "https://registry.yarnpkg.com/@testing-library/dom/-/dom-7.24.5.tgz"; + sha1 = "862124eec8c37ad184716379f09742476b23815d"; }; } { @@ -1034,11 +1042,19 @@ }; } { - name = "_types_babel__core___babel__core_7.1.2.tgz"; + name = "_types_aria_query___aria_query_4.2.0.tgz"; path = fetchurl { - name = "_types_babel__core___babel__core_7.1.2.tgz"; - url = "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.1.2.tgz"; - sha1 = "608c74f55928033fce18b99b213c16be4b3d114f"; + name = "_types_aria_query___aria_query_4.2.0.tgz"; + url = "https://registry.yarnpkg.com/@types/aria-query/-/aria-query-4.2.0.tgz"; + sha1 = "14264692a9d6e2fa4db3df5e56e94b5e25647ac0"; + }; + } + { + name = "_types_babel__core___babel__core_7.1.9.tgz"; + path = fetchurl { + name = "_types_babel__core___babel__core_7.1.9.tgz"; + url = "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.1.9.tgz"; + sha1 = "77e59d438522a6fb898fa43dc3455c6e72f3963d"; }; } { @@ -1058,11 +1074,11 @@ }; } { - name = "_types_babel__traverse___babel__traverse_7.0.6.tgz"; + name = "_types_babel__traverse___babel__traverse_7.0.15.tgz"; path = fetchurl { - name = "_types_babel__traverse___babel__traverse_7.0.6.tgz"; - url = "https://registry.yarnpkg.com/@types/babel__traverse/-/babel__traverse-7.0.6.tgz"; - sha1 = "328dd1a8fc4cfe3c8458be9477b219ea158fd7b2"; + name = "_types_babel__traverse___babel__traverse_7.0.15.tgz"; + url = "https://registry.yarnpkg.com/@types/babel__traverse/-/babel__traverse-7.0.15.tgz"; + sha1 = "db9e4238931eb69ef8aab0ad6523d4d4caa39d03"; }; } { @@ -1106,11 +1122,19 @@ }; } { - name = "_types_istanbul_lib_coverage___istanbul_lib_coverage_2.0.1.tgz"; + name = "_types_graceful_fs___graceful_fs_4.1.3.tgz"; path = fetchurl { - name = "_types_istanbul_lib_coverage___istanbul_lib_coverage_2.0.1.tgz"; - url = "https://registry.yarnpkg.com/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.1.tgz"; - sha1 = "42995b446db9a48a11a07ec083499a860e9138ff"; + name = "_types_graceful_fs___graceful_fs_4.1.3.tgz"; + url = "https://registry.yarnpkg.com/@types/graceful-fs/-/graceful-fs-4.1.3.tgz"; + sha1 = "039af35fe26bec35003e8d86d2ee9c586354348f"; + }; + } + { + name = "_types_istanbul_lib_coverage___istanbul_lib_coverage_2.0.2.tgz"; + path = fetchurl { + name = "_types_istanbul_lib_coverage___istanbul_lib_coverage_2.0.2.tgz"; + url = "https://registry.yarnpkg.com/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.2.tgz"; + sha1 = "79d7a78bad4219f4c03d6557a1c72d9ca6ba62d5"; }; } { @@ -1129,6 +1153,22 @@ sha1 = "7a8cbf6a406f36c8add871625b278eaf0b0d255a"; }; } + { + name = "_types_istanbul_reports___istanbul_reports_3.0.0.tgz"; + path = fetchurl { + name = "_types_istanbul_reports___istanbul_reports_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/@types/istanbul-reports/-/istanbul-reports-3.0.0.tgz"; + sha1 = "508b13aa344fa4976234e75dddcc34925737d821"; + }; + } + { + name = "_types_jest___jest_26.0.14.tgz"; + path = fetchurl { + name = "_types_jest___jest_26.0.14.tgz"; + url = "https://registry.yarnpkg.com/@types/jest/-/jest-26.0.14.tgz"; + sha1 = "078695f8f65cb55c5a98450d65083b2b73e5a3f3"; + }; + } { name = "_types_json_schema___json_schema_7.0.4.tgz"; path = fetchurl { @@ -1153,6 +1193,14 @@ sha1 = "a07bfa74331471e1dc22a47eb72026843f7b95c8"; }; } + { + name = "_types_normalize_package_data___normalize_package_data_2.4.0.tgz"; + path = fetchurl { + name = "_types_normalize_package_data___normalize_package_data_2.4.0.tgz"; + url = "https://registry.yarnpkg.com/@types/normalize-package-data/-/normalize-package-data-2.4.0.tgz"; + sha1 = "e486d0d97396d79beedd0a6e33f4534ff6b4973e"; + }; + } { name = "_types_parse5___parse5_5.0.0.tgz"; path = fetchurl { @@ -1162,11 +1210,19 @@ }; } { - name = "_types_stack_utils___stack_utils_1.0.1.tgz"; + name = "_types_prettier___prettier_2.0.2.tgz"; path = fetchurl { - name = "_types_stack_utils___stack_utils_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/@types/stack-utils/-/stack-utils-1.0.1.tgz"; - sha1 = "0a851d3bd96498fa25c33ab7278ed3bd65f06c3e"; + name = "_types_prettier___prettier_2.0.2.tgz"; + url = "https://registry.yarnpkg.com/@types/prettier/-/prettier-2.0.2.tgz"; + sha1 = "5bb52ee68d0f8efa9cc0099920e56be6cc4e37f3"; + }; + } + { + name = "_types_stack_utils___stack_utils_2.0.0.tgz"; + path = fetchurl { + name = "_types_stack_utils___stack_utils_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/@types/stack-utils/-/stack-utils-2.0.0.tgz"; + sha1 = "7036640b4e21cc2f259ae826ce843d277dad8cff"; }; } { @@ -1209,14 +1265,6 @@ sha1 = "cb3f9f741869e20cce330ffbeb9271590483882d"; }; } - { - name = "_types_yargs___yargs_12.0.12.tgz"; - path = fetchurl { - name = "_types_yargs___yargs_12.0.12.tgz"; - url = "https://registry.yarnpkg.com/@types/yargs/-/yargs-12.0.12.tgz"; - sha1 = "45dd1d0638e8c8f153e87d296907659296873916"; - }; - } { name = "_types_yargs___yargs_15.0.5.tgz"; path = fetchurl { @@ -1249,14 +1297,6 @@ sha1 = "1b8e848b55144270255ffbfe4c63291f8f766615"; }; } - { - name = "_vue_component_compiler_utils___component_compiler_utils_2.6.0.tgz"; - path = fetchurl { - name = "_vue_component_compiler_utils___component_compiler_utils_2.6.0.tgz"; - url = "https://registry.yarnpkg.com/@vue/component-compiler-utils/-/component-compiler-utils-2.6.0.tgz"; - sha1 = "aa46d2a6f7647440b0b8932434d22f12371e543b"; - }; - } { name = "_vue_component_compiler_utils___component_compiler_utils_3.1.1.tgz"; path = fetchurl { @@ -1458,19 +1498,19 @@ }; } { - name = "abab___abab_2.0.3.tgz"; + name = "abab___abab_2.0.5.tgz"; path = fetchurl { - name = "abab___abab_2.0.3.tgz"; - url = "https://registry.yarnpkg.com/abab/-/abab-2.0.3.tgz"; - sha1 = "623e2075e02eb2d3f2475e49f99c91846467907a"; + name = "abab___abab_2.0.5.tgz"; + url = "https://registry.yarnpkg.com/abab/-/abab-2.0.5.tgz"; + sha1 = "c0b678fb32d60fc1219c784d6a826fe385aeb79a"; }; } { - name = "abbrev___abbrev_1.0.9.tgz"; + name = "abbrev___abbrev_1.1.1.tgz"; path = fetchurl { - name = "abbrev___abbrev_1.0.9.tgz"; - url = "https://registry.yarnpkg.com/abbrev/-/abbrev-1.0.9.tgz"; - sha1 = "91b4792588a7738c25f35dd6f63752a2f8776135"; + name = "abbrev___abbrev_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz"; + sha1 = "f8f2c887ad10bf67f634f005b6987fed3179aac8"; }; } { @@ -1481,14 +1521,6 @@ sha1 = "531bc726517a3b2b41f850021c6cc15eaab507cd"; }; } - { - name = "acorn_globals___acorn_globals_4.3.0.tgz"; - path = fetchurl { - name = "acorn_globals___acorn_globals_4.3.0.tgz"; - url = "https://registry.yarnpkg.com/acorn-globals/-/acorn-globals-4.3.0.tgz"; - sha1 = "e3b6f8da3c1552a95ae627571f7dd6923bb54103"; - }; - } { name = "acorn_globals___acorn_globals_6.0.0.tgz"; path = fetchurl { @@ -1514,19 +1546,11 @@ }; } { - name = "acorn_walk___acorn_walk_7.1.1.tgz"; + name = "acorn_walk___acorn_walk_7.2.0.tgz"; path = fetchurl { - name = "acorn_walk___acorn_walk_7.1.1.tgz"; - url = "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-7.1.1.tgz"; - sha1 = "345f0dffad5c735e7373d2fec9a1023e6a44b83e"; - }; - } - { - name = "acorn___acorn_5.7.3.tgz"; - path = fetchurl { - name = "acorn___acorn_5.7.3.tgz"; - url = "https://registry.yarnpkg.com/acorn/-/acorn-5.7.3.tgz"; - sha1 = "67aa231bf8812974b85235a96771eb6bd07ea279"; + name = "acorn_walk___acorn_walk_7.2.0.tgz"; + url = "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-7.2.0.tgz"; + sha1 = "0de889a601203909b0fbe07b8938dc21d2e967bc"; }; } { @@ -1538,11 +1562,11 @@ }; } { - name = "acorn___acorn_7.2.0.tgz"; + name = "acorn___acorn_7.4.1.tgz"; path = fetchurl { - name = "acorn___acorn_7.2.0.tgz"; - url = "https://registry.yarnpkg.com/acorn/-/acorn-7.2.0.tgz"; - sha1 = "17ea7e40d7c8640ff54a694c889c26f31704effe"; + name = "acorn___acorn_7.4.1.tgz"; + url = "https://registry.yarnpkg.com/acorn/-/acorn-7.4.1.tgz"; + sha1 = "feaed255973d2e77555b83dbc08851a6c63520fa"; }; } { @@ -1578,11 +1602,11 @@ }; } { - name = "ajv___ajv_6.11.0.tgz"; + name = "ajv___ajv_6.12.5.tgz"; path = fetchurl { - name = "ajv___ajv_6.11.0.tgz"; - url = "https://registry.yarnpkg.com/ajv/-/ajv-6.11.0.tgz"; - sha1 = "c3607cbc8ae392d8a5a536f25b21f8e5f3f87fe9"; + name = "ajv___ajv_6.12.5.tgz"; + url = "https://registry.yarnpkg.com/ajv/-/ajv-6.12.5.tgz"; + sha1 = "19b0e8bae8f476e5ba666300387775fb1a00a4da"; }; } { @@ -1609,14 +1633,6 @@ sha1 = "e3a3da4bfbae6c86a9c285625de124a234026fbf"; }; } - { - name = "ansi_escapes___ansi_escapes_3.2.0.tgz"; - path = fetchurl { - name = "ansi_escapes___ansi_escapes_3.2.0.tgz"; - url = "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-3.2.0.tgz"; - sha1 = "8780b98ff9dbf5638152d1f1fe5c1d7b4442976b"; - }; - } { name = "ansi_escapes___ansi_escapes_4.3.0.tgz"; path = fetchurl { @@ -1810,11 +1826,11 @@ }; } { - name = "aria_query___aria_query_4.2.0.tgz"; + name = "aria_query___aria_query_4.2.2.tgz"; path = fetchurl { - name = "aria_query___aria_query_4.2.0.tgz"; - url = "https://registry.yarnpkg.com/aria-query/-/aria-query-4.2.0.tgz"; - sha1 = "3774158e138a84c4790b58afc17e09711071d888"; + name = "aria_query___aria_query_4.2.2.tgz"; + url = "https://registry.yarnpkg.com/aria-query/-/aria-query-4.2.2.tgz"; + sha1 = "0d2ca6c9aceb56b8977e9fed6aed7e15bbd2f83b"; }; } { @@ -1841,14 +1857,6 @@ sha1 = "e39b09aea9def866a8f206e288af63919bae39c4"; }; } - { - name = "array_equal___array_equal_1.0.0.tgz"; - path = fetchurl { - name = "array_equal___array_equal_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/array-equal/-/array-equal-1.0.0.tgz"; - sha1 = "8c2a5ef2472fd9ea742b04c77a75093ba2757c93"; - }; - } { name = "array_find_index___array_find_index_1.0.2.tgz"; path = fetchurl { @@ -2058,11 +2066,11 @@ }; } { - name = "aws4___aws4_1.8.0.tgz"; + name = "aws4___aws4_1.10.1.tgz"; path = fetchurl { - name = "aws4___aws4_1.8.0.tgz"; - url = "https://registry.yarnpkg.com/aws4/-/aws4-1.8.0.tgz"; - sha1 = "f0e003d9ca9e7f59c7a508945d7b2ef9a04a542f"; + name = "aws4___aws4_1.10.1.tgz"; + url = "https://registry.yarnpkg.com/aws4/-/aws4-1.10.1.tgz"; + sha1 = "e1e82e4f3e999e2cfd61b161280d16a111f86428"; }; } { @@ -2090,11 +2098,11 @@ }; } { - name = "babel_jest___babel_jest_24.8.0.tgz"; + name = "babel_jest___babel_jest_26.5.2.tgz"; path = fetchurl { - name = "babel_jest___babel_jest_24.8.0.tgz"; - url = "https://registry.yarnpkg.com/babel-jest/-/babel-jest-24.8.0.tgz"; - sha1 = "5c15ff2b28e20b0f45df43fe6b7f2aae93dba589"; + name = "babel_jest___babel_jest_26.5.2.tgz"; + url = "https://registry.yarnpkg.com/babel-jest/-/babel-jest-26.5.2.tgz"; + sha1 = "164f367a35946c6cf54eaccde8762dec50422250"; }; } { @@ -2114,19 +2122,19 @@ }; } { - name = "babel_plugin_istanbul___babel_plugin_istanbul_5.1.0.tgz"; + name = "babel_plugin_istanbul___babel_plugin_istanbul_6.0.0.tgz"; path = fetchurl { - name = "babel_plugin_istanbul___babel_plugin_istanbul_5.1.0.tgz"; - url = "https://registry.yarnpkg.com/babel-plugin-istanbul/-/babel-plugin-istanbul-5.1.0.tgz"; - sha1 = "6892f529eff65a3e2d33d87dc5888ffa2ecd4a30"; + name = "babel_plugin_istanbul___babel_plugin_istanbul_6.0.0.tgz"; + url = "https://registry.yarnpkg.com/babel-plugin-istanbul/-/babel-plugin-istanbul-6.0.0.tgz"; + sha1 = "e159ccdc9af95e0b570c75b4573b7c34d671d765"; }; } { - name = "babel_plugin_jest_hoist___babel_plugin_jest_hoist_24.6.0.tgz"; + name = "babel_plugin_jest_hoist___babel_plugin_jest_hoist_26.5.0.tgz"; path = fetchurl { - name = "babel_plugin_jest_hoist___babel_plugin_jest_hoist_24.6.0.tgz"; - url = "https://registry.yarnpkg.com/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-24.6.0.tgz"; - sha1 = "f7f7f7ad150ee96d7a5e8e2c5da8319579e78019"; + name = "babel_plugin_jest_hoist___babel_plugin_jest_hoist_26.5.0.tgz"; + url = "https://registry.yarnpkg.com/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-26.5.0.tgz"; + sha1 = "3916b3a28129c29528de91e5784a44680db46385"; }; } { @@ -2138,11 +2146,19 @@ }; } { - name = "babel_preset_jest___babel_preset_jest_24.6.0.tgz"; + name = "babel_preset_current_node_syntax___babel_preset_current_node_syntax_0.1.4.tgz"; path = fetchurl { - name = "babel_preset_jest___babel_preset_jest_24.6.0.tgz"; - url = "https://registry.yarnpkg.com/babel-preset-jest/-/babel-preset-jest-24.6.0.tgz"; - sha1 = "66f06136eefce87797539c0d63f1769cc3915984"; + name = "babel_preset_current_node_syntax___babel_preset_current_node_syntax_0.1.4.tgz"; + url = "https://registry.yarnpkg.com/babel-preset-current-node-syntax/-/babel-preset-current-node-syntax-0.1.4.tgz"; + sha1 = "826f1f8e7245ad534714ba001f84f7e906c3b615"; + }; + } + { + name = "babel_preset_jest___babel_preset_jest_26.5.0.tgz"; + path = fetchurl { + name = "babel_preset_jest___babel_preset_jest_26.5.0.tgz"; + url = "https://registry.yarnpkg.com/babel-preset-jest/-/babel-preset-jest-26.5.0.tgz"; + sha1 = "f1b166045cd21437d1188d29f7fba470d5bdb0e7"; }; } { @@ -2265,14 +2281,6 @@ sha1 = "3209a51ca4a4ad541a3b8d3d6a6d5b83a2485935"; }; } - { - name = "bindings___bindings_1.5.0.tgz"; - path = fetchurl { - name = "bindings___bindings_1.5.0.tgz"; - url = "https://registry.yarnpkg.com/bindings/-/bindings-1.5.0.tgz"; - sha1 = "10353c9e945334bc0511a6d90b38fbc7c9c504df"; - }; - } { name = "blob___blob_0.0.4.tgz"; path = fetchurl { @@ -2385,14 +2393,6 @@ sha1 = "3c9b4b7d782c8121e56f10106d84c0d0ffc94626"; }; } - { - name = "browser_resolve___browser_resolve_1.11.3.tgz"; - path = fetchurl { - name = "browser_resolve___browser_resolve_1.11.3.tgz"; - url = "https://registry.yarnpkg.com/browser-resolve/-/browser-resolve-1.11.3.tgz"; - sha1 = "9b7cbb3d0f510e4cb86bdbd796124d28b5890af6"; - }; - } { name = "browserify_aes___browserify_aes_1.1.1.tgz"; path = fetchurl { @@ -2458,11 +2458,11 @@ }; } { - name = "bser___bser_2.0.0.tgz"; + name = "bser___bser_2.1.1.tgz"; path = fetchurl { - name = "bser___bser_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/bser/-/bser-2.0.0.tgz"; - sha1 = "9ac78d3ed5d915804fd87acb158bc797147a1719"; + name = "bser___bser_2.1.1.tgz"; + url = "https://registry.yarnpkg.com/bser/-/bser-2.1.1.tgz"; + sha1 = "e6787da20ece9d07998533cfd9de6f5c38f4bc05"; }; } { @@ -2649,14 +2649,6 @@ sha1 = "7c1d16d679a1bbe59ca02cacecfb011e201f5a1f"; }; } - { - name = "camelcase___camelcase_3.0.0.tgz"; - path = fetchurl { - name = "camelcase___camelcase_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/camelcase/-/camelcase-3.0.0.tgz"; - sha1 = "32fc4b9fcdaf845fcdf7e73bb97cac2261f0ab0a"; - }; - } { name = "camelcase___camelcase_4.1.0.tgz"; path = fetchurl { @@ -2673,6 +2665,14 @@ sha1 = "e3c9b31569e106811df242f715725a1f4c494320"; }; } + { + name = "camelcase___camelcase_6.0.0.tgz"; + path = fetchurl { + name = "camelcase___camelcase_6.0.0.tgz"; + url = "https://registry.yarnpkg.com/camelcase/-/camelcase-6.0.0.tgz"; + sha1 = "5259f7c30e35e278f1bdc2a4d91230b37cad981e"; + }; + } { name = "caniuse_lite___caniuse_lite_1.0.30001081.tgz"; path = fetchurl { @@ -2737,6 +2737,22 @@ sha1 = "3f73c2bf526591f574cc492c51e2456349f844e4"; }; } + { + name = "chalk___chalk_4.1.0.tgz"; + path = fetchurl { + name = "chalk___chalk_4.1.0.tgz"; + url = "https://registry.yarnpkg.com/chalk/-/chalk-4.1.0.tgz"; + sha1 = "4e14870a618d9e2edd97dd8345fd9d9dc315646a"; + }; + } + { + name = "char_regex___char_regex_1.0.2.tgz"; + path = fetchurl { + name = "char_regex___char_regex_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/char-regex/-/char-regex-1.0.2.tgz"; + sha1 = "d744358226217f981ed58f479b1d6bcc29545dcf"; + }; + } { name = "character_entities_html4___character_entities_html4_1.1.2.tgz"; path = fetchurl { @@ -2897,14 +2913,6 @@ sha1 = "52921296eec0fdf77ead1749421b21c968647376"; }; } - { - name = "cliui___cliui_3.2.0.tgz"; - path = fetchurl { - name = "cliui___cliui_3.2.0.tgz"; - url = "https://registry.yarnpkg.com/cliui/-/cliui-3.2.0.tgz"; - sha1 = "120601537a916d29940f934da3b48d585a39213d"; - }; - } { name = "cliui___cliui_4.1.0.tgz"; path = fetchurl { @@ -2921,6 +2929,14 @@ sha1 = "deefcfdb2e800784aa34f46fa08e06851c7bbbc5"; }; } + { + name = "cliui___cliui_6.0.0.tgz"; + path = fetchurl { + name = "cliui___cliui_6.0.0.tgz"; + url = "https://registry.yarnpkg.com/cliui/-/cliui-6.0.0.tgz"; + sha1 = "511d702c0c4e41ca156d7d0e96021f23e13225b1"; + }; + } { name = "clone_deep___clone_deep_4.0.1.tgz"; path = fetchurl { @@ -3001,6 +3017,14 @@ sha1 = "c2495b699ab1ed380d29a1091e01063e75dbbe3a"; }; } + { + name = "collect_v8_coverage___collect_v8_coverage_1.0.1.tgz"; + path = fetchurl { + name = "collect_v8_coverage___collect_v8_coverage_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/collect-v8-coverage/-/collect-v8-coverage-1.0.1.tgz"; + sha1 = "cc2c8e94fc18bbdffe64d6534570c8a673b27f59"; + }; + } { name = "collection_visit___collection_visit_1.0.0.tgz"; path = fetchurl { @@ -3058,11 +3082,11 @@ }; } { - name = "combined_stream___combined_stream_1.0.7.tgz"; + name = "combined_stream___combined_stream_1.0.8.tgz"; path = fetchurl { - name = "combined_stream___combined_stream_1.0.7.tgz"; - url = "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.7.tgz"; - sha1 = "2d1d24317afb8abe95d6d2c0b07b57813539d828"; + name = "combined_stream___combined_stream_1.0.8.tgz"; + url = "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.8.tgz"; + sha1 = "c3d45a8b34fd730631a110a8a2520682b31d5a7f"; }; } { @@ -3441,6 +3465,14 @@ sha1 = "1256037ecb9f0c5f79e3d6ef135e30770184b982"; }; } + { + name = "cross_spawn___cross_spawn_7.0.3.tgz"; + path = fetchurl { + name = "cross_spawn___cross_spawn_7.0.3.tgz"; + url = "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz"; + sha1 = "f73a85b9d5d41d045551c177e2882d4ac85728a6"; + }; + } { name = "crypt___crypt_0.0.2.tgz"; path = fetchurl { @@ -3505,14 +3537,6 @@ sha1 = "c646755c73971f2bba6a601e2cf2fd71b1298929"; }; } - { - name = "cssesc___cssesc_2.0.0.tgz"; - path = fetchurl { - name = "cssesc___cssesc_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/cssesc/-/cssesc-2.0.0.tgz"; - sha1 = "3b13bd1bb1cb36e1bcb5a4dcd27f54c5dcb35703"; - }; - } { name = "cssesc___cssesc_3.0.0.tgz"; path = fetchurl { @@ -3529,14 +3553,6 @@ sha1 = "f4022fc8f9700c68029d542084afbaf425a3f3e3"; }; } - { - name = "cssom___cssom_0.3.8.tgz"; - path = fetchurl { - name = "cssom___cssom_0.3.8.tgz"; - url = "https://registry.yarnpkg.com/cssom/-/cssom-0.3.8.tgz"; - sha1 = "9f1276f5b2b463f2114d3f2c75250af8c1a36f4a"; - }; - } { name = "cssom___cssom_0.4.4.tgz"; path = fetchurl { @@ -3546,11 +3562,11 @@ }; } { - name = "cssstyle___cssstyle_1.1.1.tgz"; + name = "cssom___cssom_0.3.8.tgz"; path = fetchurl { - name = "cssstyle___cssstyle_1.1.1.tgz"; - url = "https://registry.yarnpkg.com/cssstyle/-/cssstyle-1.1.1.tgz"; - sha1 = "18b038a9c44d65f7a8e428a653b9f6fe42faf5fb"; + name = "cssom___cssom_0.3.8.tgz"; + url = "https://registry.yarnpkg.com/cssom/-/cssom-0.3.8.tgz"; + sha1 = "9f1276f5b2b463f2114d3f2c75250af8c1a36f4a"; }; } { @@ -3881,14 +3897,6 @@ sha1 = "853cfa0f7cbe2fed5de20326b8dd581035f6e2f0"; }; } - { - name = "data_urls___data_urls_1.1.0.tgz"; - path = fetchurl { - name = "data_urls___data_urls_1.1.0.tgz"; - url = "https://registry.yarnpkg.com/data-urls/-/data-urls-1.1.0.tgz"; - sha1 = "15ee0582baa5e22bb59c77140da8f9c76963bbfe"; - }; - } { name = "data_urls___data_urls_2.0.0.tgz"; path = fetchurl { @@ -3978,11 +3986,11 @@ }; } { - name = "decimal.js___decimal.js_10.2.0.tgz"; + name = "decimal.js___decimal.js_10.2.1.tgz"; path = fetchurl { - name = "decimal.js___decimal.js_10.2.0.tgz"; - url = "https://registry.yarnpkg.com/decimal.js/-/decimal.js-10.2.0.tgz"; - sha1 = "39466113a9e036111d02f82489b5fd6b0b5ed231"; + name = "decimal.js___decimal.js_10.2.1.tgz"; + url = "https://registry.yarnpkg.com/decimal.js/-/decimal.js-10.2.1.tgz"; + sha1 = "238ae7b0f0c793d3e3cea410108b35a2c01426a3"; }; } { @@ -4041,6 +4049,14 @@ sha1 = "b369d6fb5dbc13eecf524f91b070feedc357cf34"; }; } + { + name = "deepmerge___deepmerge_4.2.2.tgz"; + path = fetchurl { + name = "deepmerge___deepmerge_4.2.2.tgz"; + url = "https://registry.yarnpkg.com/deepmerge/-/deepmerge-4.2.2.tgz"; + sha1 = "44d2ea3679b8f4d4ffba33f03d865fc1e7bf4955"; + }; + } { name = "default_gateway___default_gateway_4.2.0.tgz"; path = fetchurl { @@ -4170,11 +4186,11 @@ }; } { - name = "detect_newline___detect_newline_2.1.0.tgz"; + name = "detect_newline___detect_newline_3.1.0.tgz"; path = fetchurl { - name = "detect_newline___detect_newline_2.1.0.tgz"; - url = "https://registry.yarnpkg.com/detect-newline/-/detect-newline-2.1.0.tgz"; - sha1 = "f41f1c10be4b00e87b5f13da680759f2c5bfd3e2"; + name = "detect_newline___detect_newline_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/detect-newline/-/detect-newline-3.1.0.tgz"; + sha1 = "576f5dfc63ae1a192ff192d8ad3af6308991b651"; }; } { @@ -4194,11 +4210,19 @@ }; } { - name = "diff_sequences___diff_sequences_24.3.0.tgz"; + name = "diff_sequences___diff_sequences_25.2.6.tgz"; path = fetchurl { - name = "diff_sequences___diff_sequences_24.3.0.tgz"; - url = "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-24.3.0.tgz"; - sha1 = "0f20e8a1df1abddaf4d9c226680952e64118b975"; + name = "diff_sequences___diff_sequences_25.2.6.tgz"; + url = "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-25.2.6.tgz"; + sha1 = "5f467c00edd35352b7bca46d7927d60e687a76dd"; + }; + } + { + name = "diff_sequences___diff_sequences_26.5.0.tgz"; + path = fetchurl { + name = "diff_sequences___diff_sequences_26.5.0.tgz"; + url = "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-26.5.0.tgz"; + sha1 = "ef766cf09d43ed40406611f11c6d8d9dd8b2fefd"; }; } { @@ -4282,11 +4306,11 @@ }; } { - name = "dom_accessibility_api___dom_accessibility_api_0.4.5.tgz"; + name = "dom_accessibility_api___dom_accessibility_api_0.5.3.tgz"; path = fetchurl { - name = "dom_accessibility_api___dom_accessibility_api_0.4.5.tgz"; - url = "https://registry.yarnpkg.com/dom-accessibility-api/-/dom-accessibility-api-0.4.5.tgz"; - sha1 = "d9c1cefa89f509d8cf132ab5d250004d755e76e3"; + name = "dom_accessibility_api___dom_accessibility_api_0.5.3.tgz"; + url = "https://registry.yarnpkg.com/dom-accessibility-api/-/dom-accessibility-api-0.5.3.tgz"; + sha1 = "0ea493c924d4070dfbf531c4aaca3d7a2c601aab"; }; } { @@ -4345,14 +4369,6 @@ sha1 = "1f8bdfe91f5a78063274e803b4bdcedf6e94f94d"; }; } - { - name = "domexception___domexception_1.0.1.tgz"; - path = fetchurl { - name = "domexception___domexception_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/domexception/-/domexception-1.0.1.tgz"; - sha1 = "937442644ca6a31261ef36e3ec677fe805582c90"; - }; - } { name = "domexception___domexception_2.0.1.tgz"; path = fetchurl { @@ -4370,11 +4386,11 @@ }; } { - name = "dompurify___dompurify_2.0.12.tgz"; + name = "dompurify___dompurify_2.1.1.tgz"; path = fetchurl { - name = "dompurify___dompurify_2.0.12.tgz"; - url = "https://registry.yarnpkg.com/dompurify/-/dompurify-2.0.12.tgz"; - sha1 = "284a2b041e1c60b8e72d7b4d2fadad36141254ae"; + name = "dompurify___dompurify_2.1.1.tgz"; + url = "https://registry.yarnpkg.com/dompurify/-/dompurify-2.1.1.tgz"; + sha1 = "b5aa988676b093a9c836d8b855680a8598af25fe"; }; } { @@ -4497,6 +4513,14 @@ sha1 = "cac9af8762c85836187003c8dfe193e5e2eae5df"; }; } + { + name = "emittery___emittery_0.7.1.tgz"; + path = fetchurl { + name = "emittery___emittery_0.7.1.tgz"; + url = "https://registry.yarnpkg.com/emittery/-/emittery-0.7.1.tgz"; + sha1 = "c02375a927a40948c0345cc903072597f5270451"; + }; + } { name = "emoji_regex___emoji_regex_7.0.3.tgz"; path = fetchurl { @@ -4689,6 +4713,14 @@ sha1 = "1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"; }; } + { + name = "escape_string_regexp___escape_string_regexp_2.0.0.tgz"; + path = fetchurl { + name = "escape_string_regexp___escape_string_regexp_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz"; + sha1 = "a30304e99daa32e23b2fd20f51babd07cffca344"; + }; + } { name = "escaper___escaper_2.5.3.tgz"; path = fetchurl { @@ -4698,11 +4730,11 @@ }; } { - name = "escodegen___escodegen_1.14.2.tgz"; + name = "escodegen___escodegen_1.14.3.tgz"; path = fetchurl { - name = "escodegen___escodegen_1.14.2.tgz"; - url = "https://registry.yarnpkg.com/escodegen/-/escodegen-1.14.2.tgz"; - sha1 = "14ab71bf5026c2aa08173afba22c6f3173284a84"; + name = "escodegen___escodegen_1.14.3.tgz"; + url = "https://registry.yarnpkg.com/escodegen/-/escodegen-1.14.3.tgz"; + sha1 = "4e7b81fba61581dc97582ed78cab7f0e8d63f503"; }; } { @@ -4906,11 +4938,11 @@ }; } { - name = "estraverse___estraverse_4.2.0.tgz"; + name = "estraverse___estraverse_4.3.0.tgz"; path = fetchurl { - name = "estraverse___estraverse_4.2.0.tgz"; - url = "https://registry.yarnpkg.com/estraverse/-/estraverse-4.2.0.tgz"; - sha1 = "0dee3fed31fcd469618ce7342099fc1afa0bdb13"; + name = "estraverse___estraverse_4.3.0.tgz"; + url = "https://registry.yarnpkg.com/estraverse/-/estraverse-4.3.0.tgz"; + sha1 = "398ad3f3c5a24948be7725e83d11a7de28cdbd1d"; }; } { @@ -4978,11 +5010,11 @@ }; } { - name = "exec_sh___exec_sh_0.3.2.tgz"; + name = "exec_sh___exec_sh_0.3.4.tgz"; path = fetchurl { - name = "exec_sh___exec_sh_0.3.2.tgz"; - url = "https://registry.yarnpkg.com/exec-sh/-/exec-sh-0.3.2.tgz"; - sha1 = "6738de2eb7c8e671d0366aea0b0db8c6f7d7391b"; + name = "exec_sh___exec_sh_0.3.4.tgz"; + url = "https://registry.yarnpkg.com/exec-sh/-/exec-sh-0.3.4.tgz"; + sha1 = "3a018ceb526cc6f6df2bb504b2bfe8e3a4934ec5"; }; } { @@ -4993,6 +5025,14 @@ sha1 = "c6236a5bb4df6d6f15e88e7f017798216749ddd8"; }; } + { + name = "execa___execa_4.0.3.tgz"; + path = fetchurl { + name = "execa___execa_4.0.3.tgz"; + url = "https://registry.yarnpkg.com/execa/-/execa-4.0.3.tgz"; + sha1 = "0a34dabbad6d66100bd6f2c576c8669403f317f2"; + }; + } { name = "execall___execall_2.0.0.tgz"; path = fetchurl { @@ -5026,11 +5066,11 @@ }; } { - name = "expect___expect_24.8.0.tgz"; + name = "expect___expect_26.5.2.tgz"; path = fetchurl { - name = "expect___expect_24.8.0.tgz"; - url = "https://registry.yarnpkg.com/expect/-/expect-24.8.0.tgz"; - sha1 = "471f8ec256b7b6129ca2524b2a62f030df38718d"; + name = "expect___expect_26.5.2.tgz"; + url = "https://registry.yarnpkg.com/expect/-/expect-26.5.2.tgz"; + sha1 = "3e0631c4a657a83dbec769ad246a2998953a55a6"; }; } { @@ -5122,11 +5162,11 @@ }; } { - name = "fast_deep_equal___fast_deep_equal_3.1.1.tgz"; + name = "fast_deep_equal___fast_deep_equal_3.1.3.tgz"; path = fetchurl { - name = "fast_deep_equal___fast_deep_equal_3.1.1.tgz"; - url = "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.1.tgz"; - sha1 = "545145077c501491e33b15ec408c294376e94ae4"; + name = "fast_deep_equal___fast_deep_equal_3.1.3.tgz"; + url = "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz"; + sha1 = "3a7d56b559d6cbc3eb512325244e619a65c6c525"; }; } { @@ -5138,11 +5178,11 @@ }; } { - name = "fast_json_stable_stringify___fast_json_stable_stringify_2.0.0.tgz"; + name = "fast_json_stable_stringify___fast_json_stable_stringify_2.1.0.tgz"; path = fetchurl { - name = "fast_json_stable_stringify___fast_json_stable_stringify_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz"; - sha1 = "d5142c0caee6b1189f87d3a76111064f86c8bbf2"; + name = "fast_json_stable_stringify___fast_json_stable_stringify_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz"; + sha1 = "874bf69c6f404c2b5d99c481341399fd55892633"; }; } { @@ -5178,11 +5218,11 @@ }; } { - name = "fb_watchman___fb_watchman_2.0.0.tgz"; + name = "fb_watchman___fb_watchman_2.0.1.tgz"; path = fetchurl { - name = "fb_watchman___fb_watchman_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/fb-watchman/-/fb-watchman-2.0.0.tgz"; - sha1 = "54e9abf7dfa2f26cd9b1636c588c1afc05de5d58"; + name = "fb_watchman___fb_watchman_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/fb-watchman/-/fb-watchman-2.0.1.tgz"; + sha1 = "fc84fb39d2709cf3ff6d743706157bb5708a8a85"; }; } { @@ -5217,14 +5257,6 @@ sha1 = "cb56c070efc0e40666424309bd0d9e45ac6f2bb8"; }; } - { - name = "file_uri_to_path___file_uri_to_path_1.0.0.tgz"; - path = fetchurl { - name = "file_uri_to_path___file_uri_to_path_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz"; - sha1 = "553a7b8446ff6f684359c445f1e37a05dacc33dd"; - }; - } { name = "fileset___fileset_2.0.3.tgz"; path = fetchurl { @@ -5473,14 +5505,6 @@ sha1 = "1504ad2523158caa40db4a2787cb01411994ea4f"; }; } - { - name = "fsevents___fsevents_1.2.13.tgz"; - path = fetchurl { - name = "fsevents___fsevents_1.2.13.tgz"; - url = "https://registry.yarnpkg.com/fsevents/-/fsevents-1.2.13.tgz"; - sha1 = "f325cb0455592428bcf11b383370ef70e3bfcc38"; - }; - } { name = "fsevents___fsevents_2.1.3.tgz"; path = fetchurl { @@ -5561,6 +5585,14 @@ sha1 = "4f94412a82db32f36e3b0b9741f8a97feb031f7e"; }; } + { + name = "get_package_type___get_package_type_0.1.0.tgz"; + path = fetchurl { + name = "get_package_type___get_package_type_0.1.0.tgz"; + url = "https://registry.yarnpkg.com/get-package-type/-/get-package-type-0.1.0.tgz"; + sha1 = "8de2d803cff44df3bc6c456e6668b36c3926e11a"; + }; + } { name = "get_stdin___get_stdin_4.0.1.tgz"; path = fetchurl { @@ -5602,11 +5634,11 @@ }; } { - name = "get_stream___get_stream_5.1.0.tgz"; + name = "get_stream___get_stream_5.2.0.tgz"; path = fetchurl { - name = "get_stream___get_stream_5.1.0.tgz"; - url = "https://registry.yarnpkg.com/get-stream/-/get-stream-5.1.0.tgz"; - sha1 = "01203cdc92597f9b909067c3e656cc1f4d3c4dc9"; + name = "get_stream___get_stream_5.2.0.tgz"; + url = "https://registry.yarnpkg.com/get-stream/-/get-stream-5.2.0.tgz"; + sha1 = "4966a1795ee5ace65e706c4b7beb71257d6e22d3"; }; } { @@ -5778,11 +5810,11 @@ }; } { - name = "globule___globule_1.2.1.tgz"; + name = "globule___globule_1.3.2.tgz"; path = fetchurl { - name = "globule___globule_1.2.1.tgz"; - url = "https://registry.yarnpkg.com/globule/-/globule-1.2.1.tgz"; - sha1 = "5dffb1b191f22d20797a9369b49eab4e9839696d"; + name = "globule___globule_1.3.2.tgz"; + url = "https://registry.yarnpkg.com/globule/-/globule-1.3.2.tgz"; + sha1 = "d8bdd9e9e4eef8f96e245999a5dee7eb5d8529c4"; }; } { @@ -5849,14 +5881,6 @@ sha1 = "7fa79a80a69be4a31c27dda824dc04dac2035a72"; }; } - { - name = "gray_matter___gray_matter_4.0.2.tgz"; - path = fetchurl { - name = "gray_matter___gray_matter_4.0.2.tgz"; - url = "https://registry.yarnpkg.com/gray-matter/-/gray-matter-4.0.2.tgz"; - sha1 = "9aa379e3acaf421193fce7d2a28cebd4518ac454"; - }; - } { name = "growly___growly_1.3.0.tgz"; path = fetchurl { @@ -5898,11 +5922,11 @@ }; } { - name = "har_validator___har_validator_5.1.3.tgz"; + name = "har_validator___har_validator_5.1.5.tgz"; path = fetchurl { - name = "har_validator___har_validator_5.1.3.tgz"; - url = "https://registry.yarnpkg.com/har-validator/-/har-validator-5.1.3.tgz"; - sha1 = "1ef89ebd3e4996557675eed9893110dc350fa080"; + name = "har_validator___har_validator_5.1.5.tgz"; + url = "https://registry.yarnpkg.com/har-validator/-/har-validator-5.1.5.tgz"; + sha1 = "1f0803b9f8cb20c0fa13822df1ecddb36bde1efd"; }; } { @@ -6082,11 +6106,11 @@ }; } { - name = "hosted_git_info___hosted_git_info_2.2.0.tgz"; + name = "hosted_git_info___hosted_git_info_2.8.8.tgz"; path = fetchurl { - name = "hosted_git_info___hosted_git_info_2.2.0.tgz"; - url = "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.2.0.tgz"; - sha1 = "7a0d097863d886c0fabbdcd37bf1758d8becf8a5"; + name = "hosted_git_info___hosted_git_info_2.8.8.tgz"; + url = "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.8.tgz"; + sha1 = "7539bd4bc1e0e0a895815a2e0262420b12858488"; }; } { @@ -6097,14 +6121,6 @@ sha1 = "87774c0949e513f42e84575b3c45681fade2a0b2"; }; } - { - name = "html_encoding_sniffer___html_encoding_sniffer_1.0.2.tgz"; - path = fetchurl { - name = "html_encoding_sniffer___html_encoding_sniffer_1.0.2.tgz"; - url = "https://registry.yarnpkg.com/html-encoding-sniffer/-/html-encoding-sniffer-1.0.2.tgz"; - sha1 = "e70d84b94da53aa375e11fe3a351be6642ca46f8"; - }; - } { name = "html_encoding_sniffer___html_encoding_sniffer_2.0.1.tgz"; path = fetchurl { @@ -6217,6 +6233,14 @@ sha1 = "ec06c10e0a34c0f2faf199f7fd7fc78fffd03c73"; }; } + { + name = "human_signals___human_signals_1.1.1.tgz"; + path = fetchurl { + name = "human_signals___human_signals_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/human-signals/-/human-signals-1.1.1.tgz"; + sha1 = "c5b1cd14f50aeae09ab6c59fe63ba3395fe4dfa3"; + }; + } { name = "iconv_lite___iconv_lite_0.4.24.tgz"; path = fetchurl { @@ -6345,6 +6369,14 @@ sha1 = "55070be38a5993cf18ef6db7e961f5bee5c5a09d"; }; } + { + name = "import_local___import_local_3.0.2.tgz"; + path = fetchurl { + name = "import_local___import_local_3.0.2.tgz"; + url = "https://registry.yarnpkg.com/import-local/-/import-local-3.0.2.tgz"; + sha1 = "a8cfd0431d1de4a2199703d003e3e62364fa6db6"; + }; + } { name = "imports_loader___imports_loader_0.8.0.tgz"; path = fetchurl { @@ -6362,11 +6394,11 @@ }; } { - name = "in_publish___in_publish_2.0.0.tgz"; + name = "in_publish___in_publish_2.0.1.tgz"; path = fetchurl { - name = "in_publish___in_publish_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/in-publish/-/in-publish-2.0.0.tgz"; - sha1 = "e20ff5e3a2afc2690320b6dc552682a9c7fadf51"; + name = "in_publish___in_publish_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/in-publish/-/in-publish-2.0.1.tgz"; + sha1 = "948b1a535c8030561cea522f73f78f4be357e00c"; }; } { @@ -6489,14 +6521,6 @@ sha1 = "610f3c92c9359ce1db616e538008d23ff35158e6"; }; } - { - name = "invert_kv___invert_kv_1.0.0.tgz"; - path = fetchurl { - name = "invert_kv___invert_kv_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/invert-kv/-/invert-kv-1.0.0.tgz"; - sha1 = "104a8e4aaca6d3d8cd157a8ef8bfab2d7a3ffdb6"; - }; - } { name = "invert_kv___invert_kv_2.0.0.tgz"; path = fetchurl { @@ -6689,6 +6713,14 @@ sha1 = "61339b6f2475fc772fd9c9d83f5c8575dc154ae1"; }; } + { + name = "is_docker___is_docker_2.1.1.tgz"; + path = fetchurl { + name = "is_docker___is_docker_2.1.1.tgz"; + url = "https://registry.yarnpkg.com/is-docker/-/is-docker-2.1.1.tgz"; + sha1 = "4125a88e44e450d384e09047ede71adc2d144156"; + }; + } { name = "is_extendable___is_extendable_0.1.1.tgz"; path = fetchurl { @@ -6714,11 +6746,11 @@ }; } { - name = "is_finite___is_finite_1.0.2.tgz"; + name = "is_finite___is_finite_1.1.0.tgz"; path = fetchurl { - name = "is_finite___is_finite_1.0.2.tgz"; - url = "https://registry.yarnpkg.com/is-finite/-/is-finite-1.0.2.tgz"; - sha1 = "cc6677695602be550ef11e8b4aa6305342b6d0aa"; + name = "is_finite___is_finite_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/is-finite/-/is-finite-1.1.0.tgz"; + sha1 = "904135c77fb42c0641d6aa1bcdbc4daa8da082f3"; }; } { @@ -6921,6 +6953,14 @@ sha1 = "12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44"; }; } + { + name = "is_stream___is_stream_2.0.0.tgz"; + path = fetchurl { + name = "is_stream___is_stream_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/is-stream/-/is-stream-2.0.0.tgz"; + sha1 = "bde9c32680d6fae04129d6ac9d921ce7815f78e3"; + }; + } { name = "is_symbol___is_symbol_1.0.2.tgz"; path = fetchurl { @@ -6985,6 +7025,14 @@ sha1 = "1f16e4aa22b04d1336b66188a66af3c600c3a66d"; }; } + { + name = "is_wsl___is_wsl_2.2.0.tgz"; + path = fetchurl { + name = "is_wsl___is_wsl_2.2.0.tgz"; + url = "https://registry.yarnpkg.com/is-wsl/-/is-wsl-2.2.0.tgz"; + sha1 = "74a4c76e77ca9fd3f932f290c17ea326cd157271"; + }; + } { name = "is_yarn_global___is_yarn_global_0.3.0.tgz"; path = fetchurl { @@ -7089,6 +7137,14 @@ sha1 = "a5f63d91f0bbc0c3e479ef4c5de027335ec6d630"; }; } + { + name = "istanbul_lib_instrument___istanbul_lib_instrument_4.0.3.tgz"; + path = fetchurl { + name = "istanbul_lib_instrument___istanbul_lib_instrument_4.0.3.tgz"; + url = "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-4.0.3.tgz"; + sha1 = "873c6fff897450118222774696a3f28902d77c1d"; + }; + } { name = "istanbul_lib_report___istanbul_lib_report_2.0.8.tgz"; path = fetchurl { @@ -7113,6 +7169,14 @@ sha1 = "284997c48211752ec486253da97e3879defba8c8"; }; } + { + name = "istanbul_lib_source_maps___istanbul_lib_source_maps_4.0.0.tgz"; + path = fetchurl { + name = "istanbul_lib_source_maps___istanbul_lib_source_maps_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/istanbul-lib-source-maps/-/istanbul-lib-source-maps-4.0.0.tgz"; + sha1 = "75743ce6d96bb86dc7ee4352cf6366a23f0b1ad9"; + }; + } { name = "istanbul_reports___istanbul_reports_2.2.6.tgz"; path = fetchurl { @@ -7122,11 +7186,11 @@ }; } { - name = "istanbul_reports___istanbul_reports_3.0.0.tgz"; + name = "istanbul_reports___istanbul_reports_3.0.2.tgz"; path = fetchurl { - name = "istanbul_reports___istanbul_reports_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/istanbul-reports/-/istanbul-reports-3.0.0.tgz"; - sha1 = "d4d16d035db99581b6194e119bbf36c963c5eb70"; + name = "istanbul_reports___istanbul_reports_3.0.2.tgz"; + url = "https://registry.yarnpkg.com/istanbul-reports/-/istanbul-reports-3.0.2.tgz"; + sha1 = "d593210e5000683750cb09fc0644e4b6e27fd53b"; }; } { @@ -7186,219 +7250,211 @@ }; } { - name = "jest_changed_files___jest_changed_files_24.8.0.tgz"; + name = "jest_changed_files___jest_changed_files_26.5.2.tgz"; path = fetchurl { - name = "jest_changed_files___jest_changed_files_24.8.0.tgz"; - url = "https://registry.yarnpkg.com/jest-changed-files/-/jest-changed-files-24.8.0.tgz"; - sha1 = "7e7eb21cf687587a85e50f3d249d1327e15b157b"; + name = "jest_changed_files___jest_changed_files_26.5.2.tgz"; + url = "https://registry.yarnpkg.com/jest-changed-files/-/jest-changed-files-26.5.2.tgz"; + sha1 = "330232c6a5c09a7f040a5870e8f0a9c6abcdbed5"; }; } { - name = "jest_cli___jest_cli_24.8.0.tgz"; + name = "jest_cli___jest_cli_26.5.2.tgz"; path = fetchurl { - name = "jest_cli___jest_cli_24.8.0.tgz"; - url = "https://registry.yarnpkg.com/jest-cli/-/jest-cli-24.8.0.tgz"; - sha1 = "b075ac914492ed114fa338ade7362a301693e989"; + name = "jest_cli___jest_cli_26.5.2.tgz"; + url = "https://registry.yarnpkg.com/jest-cli/-/jest-cli-26.5.2.tgz"; + sha1 = "0df114399b4036a3f046f0a9f25c50372c76b3a2"; }; } { - name = "jest_config___jest_config_24.8.0.tgz"; + name = "jest_config___jest_config_26.5.2.tgz"; path = fetchurl { - name = "jest_config___jest_config_24.8.0.tgz"; - url = "https://registry.yarnpkg.com/jest-config/-/jest-config-24.8.0.tgz"; - sha1 = "77db3d265a6f726294687cbbccc36f8a76ee0f4f"; + name = "jest_config___jest_config_26.5.2.tgz"; + url = "https://registry.yarnpkg.com/jest-config/-/jest-config-26.5.2.tgz"; + sha1 = "6e828e25f10124433dd008fbd83348636de0972a"; }; } { - name = "jest_diff___jest_diff_24.8.0.tgz"; + name = "jest_diff___jest_diff_25.5.0.tgz"; path = fetchurl { - name = "jest_diff___jest_diff_24.8.0.tgz"; - url = "https://registry.yarnpkg.com/jest-diff/-/jest-diff-24.8.0.tgz"; - sha1 = "146435e7d1e3ffdf293d53ff97e193f1d1546172"; + name = "jest_diff___jest_diff_25.5.0.tgz"; + url = "https://registry.yarnpkg.com/jest-diff/-/jest-diff-25.5.0.tgz"; + sha1 = "1dd26ed64f96667c068cef026b677dfa01afcfa9"; }; } { - name = "jest_docblock___jest_docblock_24.3.0.tgz"; + name = "jest_diff___jest_diff_26.5.2.tgz"; path = fetchurl { - name = "jest_docblock___jest_docblock_24.3.0.tgz"; - url = "https://registry.yarnpkg.com/jest-docblock/-/jest-docblock-24.3.0.tgz"; - sha1 = "b9c32dac70f72e4464520d2ba4aec02ab14db5dd"; + name = "jest_diff___jest_diff_26.5.2.tgz"; + url = "https://registry.yarnpkg.com/jest-diff/-/jest-diff-26.5.2.tgz"; + sha1 = "8e26cb32dc598e8b8a1b9deff55316f8313c8053"; }; } { - name = "jest_each___jest_each_24.8.0.tgz"; + name = "jest_docblock___jest_docblock_26.0.0.tgz"; path = fetchurl { - name = "jest_each___jest_each_24.8.0.tgz"; - url = "https://registry.yarnpkg.com/jest-each/-/jest-each-24.8.0.tgz"; - sha1 = "a05fd2bf94ddc0b1da66c6d13ec2457f35e52775"; + name = "jest_docblock___jest_docblock_26.0.0.tgz"; + url = "https://registry.yarnpkg.com/jest-docblock/-/jest-docblock-26.0.0.tgz"; + sha1 = "3e2fa20899fc928cb13bd0ff68bd3711a36889b5"; }; } { - name = "jest_environment_jsdom_sixteen___jest_environment_jsdom_sixteen_1.0.3.tgz"; + name = "jest_each___jest_each_26.5.2.tgz"; path = fetchurl { - name = "jest_environment_jsdom_sixteen___jest_environment_jsdom_sixteen_1.0.3.tgz"; - url = "https://registry.yarnpkg.com/jest-environment-jsdom-sixteen/-/jest-environment-jsdom-sixteen-1.0.3.tgz"; - sha1 = "e222228fac537ef15cca5ad470b19b47d9690165"; + name = "jest_each___jest_each_26.5.2.tgz"; + url = "https://registry.yarnpkg.com/jest-each/-/jest-each-26.5.2.tgz"; + sha1 = "35e68d6906a7f826d3ca5803cfe91d17a5a34c31"; }; } { - name = "jest_environment_jsdom___jest_environment_jsdom_24.8.0.tgz"; + name = "jest_environment_jsdom___jest_environment_jsdom_26.5.2.tgz"; path = fetchurl { - name = "jest_environment_jsdom___jest_environment_jsdom_24.8.0.tgz"; - url = "https://registry.yarnpkg.com/jest-environment-jsdom/-/jest-environment-jsdom-24.8.0.tgz"; - sha1 = "300f6949a146cabe1c9357ad9e9ecf9f43f38857"; + name = "jest_environment_jsdom___jest_environment_jsdom_26.5.2.tgz"; + url = "https://registry.yarnpkg.com/jest-environment-jsdom/-/jest-environment-jsdom-26.5.2.tgz"; + sha1 = "5feab05b828fd3e4b96bee5e0493464ddd2bb4bc"; }; } { - name = "jest_environment_node___jest_environment_node_24.8.0.tgz"; + name = "jest_environment_node___jest_environment_node_26.5.2.tgz"; path = fetchurl { - name = "jest_environment_node___jest_environment_node_24.8.0.tgz"; - url = "https://registry.yarnpkg.com/jest-environment-node/-/jest-environment-node-24.8.0.tgz"; - sha1 = "d3f726ba8bc53087a60e7a84ca08883a4c892231"; + name = "jest_environment_node___jest_environment_node_26.5.2.tgz"; + url = "https://registry.yarnpkg.com/jest-environment-node/-/jest-environment-node-26.5.2.tgz"; + sha1 = "275a0f01b5e47447056f1541a15ed4da14acca03"; }; } { - name = "jest_get_type___jest_get_type_24.8.0.tgz"; + name = "jest_get_type___jest_get_type_25.2.6.tgz"; path = fetchurl { - name = "jest_get_type___jest_get_type_24.8.0.tgz"; - url = "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-24.8.0.tgz"; - sha1 = "a7440de30b651f5a70ea3ed7ff073a32dfe646fc"; + name = "jest_get_type___jest_get_type_25.2.6.tgz"; + url = "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-25.2.6.tgz"; + sha1 = "0b0a32fab8908b44d508be81681487dbabb8d877"; }; } { - name = "jest_haste_map___jest_haste_map_24.8.0.tgz"; + name = "jest_get_type___jest_get_type_26.3.0.tgz"; path = fetchurl { - name = "jest_haste_map___jest_haste_map_24.8.0.tgz"; - url = "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-24.8.0.tgz"; - sha1 = "51794182d877b3ddfd6e6d23920e3fe72f305800"; + name = "jest_get_type___jest_get_type_26.3.0.tgz"; + url = "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-26.3.0.tgz"; + sha1 = "e97dc3c3f53c2b406ca7afaed4493b1d099199e0"; }; } { - name = "jest_jasmine2___jest_jasmine2_24.8.0.tgz"; + name = "jest_haste_map___jest_haste_map_26.5.2.tgz"; path = fetchurl { - name = "jest_jasmine2___jest_jasmine2_24.8.0.tgz"; - url = "https://registry.yarnpkg.com/jest-jasmine2/-/jest-jasmine2-24.8.0.tgz"; - sha1 = "a9c7e14c83dd77d8b15e820549ce8987cc8cd898"; + name = "jest_haste_map___jest_haste_map_26.5.2.tgz"; + url = "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-26.5.2.tgz"; + sha1 = "a15008abfc502c18aa56e4919ed8c96304ceb23d"; }; } { - name = "jest_junit___jest_junit_6.3.0.tgz"; + name = "jest_jasmine2___jest_jasmine2_26.5.2.tgz"; path = fetchurl { - name = "jest_junit___jest_junit_6.3.0.tgz"; - url = "https://registry.yarnpkg.com/jest-junit/-/jest-junit-6.3.0.tgz"; - sha1 = "99e64ebc54eddcb21238f0cc49f5820c89a8c785"; + name = "jest_jasmine2___jest_jasmine2_26.5.2.tgz"; + url = "https://registry.yarnpkg.com/jest-jasmine2/-/jest-jasmine2-26.5.2.tgz"; + sha1 = "0e33819d31b1f2aab5efd1e02ce502209c0e64a2"; }; } { - name = "jest_leak_detector___jest_leak_detector_24.8.0.tgz"; + name = "jest_junit___jest_junit_12.0.0.tgz"; path = fetchurl { - name = "jest_leak_detector___jest_leak_detector_24.8.0.tgz"; - url = "https://registry.yarnpkg.com/jest-leak-detector/-/jest-leak-detector-24.8.0.tgz"; - sha1 = "c0086384e1f650c2d8348095df769f29b48e6980"; + name = "jest_junit___jest_junit_12.0.0.tgz"; + url = "https://registry.yarnpkg.com/jest-junit/-/jest-junit-12.0.0.tgz"; + sha1 = "3ebd4a6a84b50c4ab18323a8f7d9cceb9d845df6"; }; } { - name = "jest_matcher_utils___jest_matcher_utils_24.8.0.tgz"; + name = "jest_leak_detector___jest_leak_detector_26.5.2.tgz"; path = fetchurl { - name = "jest_matcher_utils___jest_matcher_utils_24.8.0.tgz"; - url = "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-24.8.0.tgz"; - sha1 = "2bce42204c9af12bde46f83dc839efe8be832495"; + name = "jest_leak_detector___jest_leak_detector_26.5.2.tgz"; + url = "https://registry.yarnpkg.com/jest-leak-detector/-/jest-leak-detector-26.5.2.tgz"; + sha1 = "83fcf9a4a6ef157549552cb4f32ca1d6221eea69"; }; } { - name = "jest_message_util___jest_message_util_24.8.0.tgz"; + name = "jest_matcher_utils___jest_matcher_utils_26.5.2.tgz"; path = fetchurl { - name = "jest_message_util___jest_message_util_24.8.0.tgz"; - url = "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-24.8.0.tgz"; - sha1 = "0d6891e72a4beacc0292b638685df42e28d6218b"; + name = "jest_matcher_utils___jest_matcher_utils_26.5.2.tgz"; + url = "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-26.5.2.tgz"; + sha1 = "6aa2c76ce8b9c33e66f8856ff3a52bab59e6c85a"; }; } { - name = "jest_message_util___jest_message_util_25.5.0.tgz"; + name = "jest_message_util___jest_message_util_26.5.2.tgz"; path = fetchurl { - name = "jest_message_util___jest_message_util_25.5.0.tgz"; - url = "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-25.5.0.tgz"; - sha1 = "ea11d93204cc7ae97456e1d8716251185b8880ea"; + name = "jest_message_util___jest_message_util_26.5.2.tgz"; + url = "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-26.5.2.tgz"; + sha1 = "6c4c4c46dcfbabb47cd1ba2f6351559729bc11bb"; }; } { - name = "jest_mock___jest_mock_24.8.0.tgz"; + name = "jest_mock___jest_mock_26.5.2.tgz"; path = fetchurl { - name = "jest_mock___jest_mock_24.8.0.tgz"; - url = "https://registry.yarnpkg.com/jest-mock/-/jest-mock-24.8.0.tgz"; - sha1 = "2f9d14d37699e863f1febf4e4d5a33b7fdbbde56"; + name = "jest_mock___jest_mock_26.5.2.tgz"; + url = "https://registry.yarnpkg.com/jest-mock/-/jest-mock-26.5.2.tgz"; + sha1 = "c9302e8ef807f2bfc749ee52e65ad11166a1b6a1"; }; } { - name = "jest_mock___jest_mock_25.5.0.tgz"; + name = "jest_pnp_resolver___jest_pnp_resolver_1.2.2.tgz"; path = fetchurl { - name = "jest_mock___jest_mock_25.5.0.tgz"; - url = "https://registry.yarnpkg.com/jest-mock/-/jest-mock-25.5.0.tgz"; - sha1 = "a91a54dabd14e37ecd61665d6b6e06360a55387a"; + name = "jest_pnp_resolver___jest_pnp_resolver_1.2.2.tgz"; + url = "https://registry.yarnpkg.com/jest-pnp-resolver/-/jest-pnp-resolver-1.2.2.tgz"; + sha1 = "b704ac0ae028a89108a4d040b3f919dfddc8e33c"; }; } { - name = "jest_pnp_resolver___jest_pnp_resolver_1.2.1.tgz"; + name = "jest_regex_util___jest_regex_util_26.0.0.tgz"; path = fetchurl { - name = "jest_pnp_resolver___jest_pnp_resolver_1.2.1.tgz"; - url = "https://registry.yarnpkg.com/jest-pnp-resolver/-/jest-pnp-resolver-1.2.1.tgz"; - sha1 = "ecdae604c077a7fbc70defb6d517c3c1c898923a"; + name = "jest_regex_util___jest_regex_util_26.0.0.tgz"; + url = "https://registry.yarnpkg.com/jest-regex-util/-/jest-regex-util-26.0.0.tgz"; + sha1 = "d25e7184b36e39fd466c3bc41be0971e821fee28"; }; } { - name = "jest_regex_util___jest_regex_util_24.3.0.tgz"; + name = "jest_resolve_dependencies___jest_resolve_dependencies_26.5.2.tgz"; path = fetchurl { - name = "jest_regex_util___jest_regex_util_24.3.0.tgz"; - url = "https://registry.yarnpkg.com/jest-regex-util/-/jest-regex-util-24.3.0.tgz"; - sha1 = "d5a65f60be1ae3e310d5214a0307581995227b36"; + name = "jest_resolve_dependencies___jest_resolve_dependencies_26.5.2.tgz"; + url = "https://registry.yarnpkg.com/jest-resolve-dependencies/-/jest-resolve-dependencies-26.5.2.tgz"; + sha1 = "ee30b7cfea81c81bf5e195a9287d7ec07f893170"; }; } { - name = "jest_resolve_dependencies___jest_resolve_dependencies_24.8.0.tgz"; + name = "jest_resolve___jest_resolve_26.5.2.tgz"; path = fetchurl { - name = "jest_resolve_dependencies___jest_resolve_dependencies_24.8.0.tgz"; - url = "https://registry.yarnpkg.com/jest-resolve-dependencies/-/jest-resolve-dependencies-24.8.0.tgz"; - sha1 = "19eec3241f2045d3f990dba331d0d7526acff8e0"; + name = "jest_resolve___jest_resolve_26.5.2.tgz"; + url = "https://registry.yarnpkg.com/jest-resolve/-/jest-resolve-26.5.2.tgz"; + sha1 = "0d719144f61944a428657b755a0e5c6af4fc8602"; }; } { - name = "jest_resolve___jest_resolve_24.8.0.tgz"; + name = "jest_runner___jest_runner_26.5.2.tgz"; path = fetchurl { - name = "jest_resolve___jest_resolve_24.8.0.tgz"; - url = "https://registry.yarnpkg.com/jest-resolve/-/jest-resolve-24.8.0.tgz"; - sha1 = "84b8e5408c1f6a11539793e2b5feb1b6e722439f"; + name = "jest_runner___jest_runner_26.5.2.tgz"; + url = "https://registry.yarnpkg.com/jest-runner/-/jest-runner-26.5.2.tgz"; + sha1 = "4f9e6b0bb7eb4710c209a9e145b8a10894f4c19f"; }; } { - name = "jest_runner___jest_runner_24.8.0.tgz"; + name = "jest_runtime___jest_runtime_26.5.2.tgz"; path = fetchurl { - name = "jest_runner___jest_runner_24.8.0.tgz"; - url = "https://registry.yarnpkg.com/jest-runner/-/jest-runner-24.8.0.tgz"; - sha1 = "4f9ae07b767db27b740d7deffad0cf67ccb4c5bb"; + name = "jest_runtime___jest_runtime_26.5.2.tgz"; + url = "https://registry.yarnpkg.com/jest-runtime/-/jest-runtime-26.5.2.tgz"; + sha1 = "b72f5f79eb2fe0c46bfef4cdb9c1e01d1c69ba41"; }; } { - name = "jest_runtime___jest_runtime_24.8.0.tgz"; + name = "jest_serializer___jest_serializer_26.5.0.tgz"; path = fetchurl { - name = "jest_runtime___jest_runtime_24.8.0.tgz"; - url = "https://registry.yarnpkg.com/jest-runtime/-/jest-runtime-24.8.0.tgz"; - sha1 = "05f94d5b05c21f6dc54e427cd2e4980923350620"; + name = "jest_serializer___jest_serializer_26.5.0.tgz"; + url = "https://registry.yarnpkg.com/jest-serializer/-/jest-serializer-26.5.0.tgz"; + sha1 = "f5425cc4c5f6b4b355f854b5f0f23ec6b962bc13"; }; } { - name = "jest_serializer___jest_serializer_24.4.0.tgz"; + name = "jest_snapshot___jest_snapshot_26.5.2.tgz"; path = fetchurl { - name = "jest_serializer___jest_serializer_24.4.0.tgz"; - url = "https://registry.yarnpkg.com/jest-serializer/-/jest-serializer-24.4.0.tgz"; - sha1 = "f70c5918c8ea9235ccb1276d232e459080588db3"; - }; - } - { - name = "jest_snapshot___jest_snapshot_24.8.0.tgz"; - path = fetchurl { - name = "jest_snapshot___jest_snapshot_24.8.0.tgz"; - url = "https://registry.yarnpkg.com/jest-snapshot/-/jest-snapshot-24.8.0.tgz"; - sha1 = "3bec6a59da2ff7bc7d097a853fb67f9d415cb7c6"; + name = "jest_snapshot___jest_snapshot_26.5.2.tgz"; + url = "https://registry.yarnpkg.com/jest-snapshot/-/jest-snapshot-26.5.2.tgz"; + sha1 = "0cf7642eaf8e8d2736bd443f619959bf237f9ccf"; }; } { @@ -7410,51 +7466,43 @@ }; } { - name = "jest_util___jest_util_24.8.0.tgz"; + name = "jest_util___jest_util_26.5.2.tgz"; path = fetchurl { - name = "jest_util___jest_util_24.8.0.tgz"; - url = "https://registry.yarnpkg.com/jest-util/-/jest-util-24.8.0.tgz"; - sha1 = "41f0e945da11df44cc76d64ffb915d0716f46cd1"; + name = "jest_util___jest_util_26.5.2.tgz"; + url = "https://registry.yarnpkg.com/jest-util/-/jest-util-26.5.2.tgz"; + sha1 = "8403f75677902cc52a1b2140f568e91f8ed4f4d7"; }; } { - name = "jest_util___jest_util_25.5.0.tgz"; + name = "jest_validate___jest_validate_26.5.2.tgz"; path = fetchurl { - name = "jest_util___jest_util_25.5.0.tgz"; - url = "https://registry.yarnpkg.com/jest-util/-/jest-util-25.5.0.tgz"; - sha1 = "31c63b5d6e901274d264a4fec849230aa3fa35b0"; + name = "jest_validate___jest_validate_26.5.2.tgz"; + url = "https://registry.yarnpkg.com/jest-validate/-/jest-validate-26.5.2.tgz"; + sha1 = "7ea266700b64234cd1c0cee982490c5a80e9b0f0"; }; } { - name = "jest_validate___jest_validate_24.8.0.tgz"; + name = "jest_watcher___jest_watcher_26.5.2.tgz"; path = fetchurl { - name = "jest_validate___jest_validate_24.8.0.tgz"; - url = "https://registry.yarnpkg.com/jest-validate/-/jest-validate-24.8.0.tgz"; - sha1 = "624c41533e6dfe356ffadc6e2423a35c2d3b4849"; + name = "jest_watcher___jest_watcher_26.5.2.tgz"; + url = "https://registry.yarnpkg.com/jest-watcher/-/jest-watcher-26.5.2.tgz"; + sha1 = "2957f4461007e0769d74b537379ecf6b7c696916"; }; } { - name = "jest_watcher___jest_watcher_24.8.0.tgz"; + name = "jest_worker___jest_worker_26.5.0.tgz"; path = fetchurl { - name = "jest_watcher___jest_watcher_24.8.0.tgz"; - url = "https://registry.yarnpkg.com/jest-watcher/-/jest-watcher-24.8.0.tgz"; - sha1 = "58d49915ceddd2de85e238f6213cef1c93715de4"; + name = "jest_worker___jest_worker_26.5.0.tgz"; + url = "https://registry.yarnpkg.com/jest-worker/-/jest-worker-26.5.0.tgz"; + sha1 = "87deee86dbbc5f98d9919e0dadf2c40e3152fa30"; }; } { - name = "jest_worker___jest_worker_24.6.0.tgz"; + name = "jest___jest_26.5.2.tgz"; path = fetchurl { - name = "jest_worker___jest_worker_24.6.0.tgz"; - url = "https://registry.yarnpkg.com/jest-worker/-/jest-worker-24.6.0.tgz"; - sha1 = "7f81ceae34b7cde0c9827a6980c35b7cdc0161b3"; - }; - } - { - name = "jest___jest_24.8.0.tgz"; - path = fetchurl { - name = "jest___jest_24.8.0.tgz"; - url = "https://registry.yarnpkg.com/jest/-/jest-24.8.0.tgz"; - sha1 = "d5dff1984d0d1002196e9b7f12f75af1b2809081"; + name = "jest___jest_26.5.2.tgz"; + url = "https://registry.yarnpkg.com/jest/-/jest-26.5.2.tgz"; + sha1 = "c6791642b331fe7abd2f993b0a74aa546f7be0fb"; }; } { @@ -7465,14 +7513,6 @@ sha1 = "a3f222a9aae9f966f5d27c796510e28091764217"; }; } - { - name = "jquery_ujs___jquery_ujs_1.2.2.tgz"; - path = fetchurl { - name = "jquery_ujs___jquery_ujs_1.2.2.tgz"; - url = "https://registry.yarnpkg.com/jquery-ujs/-/jquery-ujs-1.2.2.tgz"; - sha1 = "6a8ef1020e6b6dda385b90a4bddc128c21c56397"; - }; - } { name = "jquery.caret___jquery.caret_0.3.1.tgz"; path = fetchurl { @@ -7498,19 +7538,19 @@ }; } { - name = "js_base64___js_base64_2.5.1.tgz"; + name = "js_base64___js_base64_2.6.4.tgz"; path = fetchurl { - name = "js_base64___js_base64_2.5.1.tgz"; - url = "https://registry.yarnpkg.com/js-base64/-/js-base64-2.5.1.tgz"; - sha1 = "1efa39ef2c5f7980bb1784ade4a8af2de3291121"; + name = "js_base64___js_base64_2.6.4.tgz"; + url = "https://registry.yarnpkg.com/js-base64/-/js-base64-2.6.4.tgz"; + sha1 = "f4e686c5de1ea1f867dbcad3d46d969428df98c4"; }; } { - name = "js_beautify___js_beautify_1.10.3.tgz"; + name = "js_beautify___js_beautify_1.11.0.tgz"; path = fetchurl { - name = "js_beautify___js_beautify_1.10.3.tgz"; - url = "https://registry.yarnpkg.com/js-beautify/-/js-beautify-1.10.3.tgz"; - sha1 = "c73fa10cf69d3dfa52d8ed624f23c64c0a6a94c1"; + name = "js_beautify___js_beautify_1.11.0.tgz"; + url = "https://registry.yarnpkg.com/js-beautify/-/js-beautify-1.11.0.tgz"; + sha1 = "afb873dc47d58986360093dcb69951e8bcd5ded2"; }; } { @@ -7570,19 +7610,11 @@ }; } { - name = "jsdom___jsdom_11.12.0.tgz"; + name = "jsdom___jsdom_16.4.0.tgz"; path = fetchurl { - name = "jsdom___jsdom_11.12.0.tgz"; - url = "https://registry.yarnpkg.com/jsdom/-/jsdom-11.12.0.tgz"; - sha1 = "1a80d40ddd378a1de59656e9e6dc5a3ba8657bc8"; - }; - } - { - name = "jsdom___jsdom_16.2.2.tgz"; - path = fetchurl { - name = "jsdom___jsdom_16.2.2.tgz"; - url = "https://registry.yarnpkg.com/jsdom/-/jsdom-16.2.2.tgz"; - sha1 = "76f2f7541646beb46a938f5dc476b88705bedf2b"; + name = "jsdom___jsdom_16.4.0.tgz"; + url = "https://registry.yarnpkg.com/jsdom/-/jsdom-16.4.0.tgz"; + sha1 = "36005bde2d136f73eee1a830c6d45e55408edddb"; }; } { @@ -7617,6 +7649,14 @@ sha1 = "bb867cfb3450e69107c131d1c514bab3dc8bcaa9"; }; } + { + name = "json_parse_even_better_errors___json_parse_even_better_errors_2.3.1.tgz"; + path = fetchurl { + name = "json_parse_even_better_errors___json_parse_even_better_errors_2.3.1.tgz"; + url = "https://registry.yarnpkg.com/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz"; + sha1 = "7c47805a94319928e05777405dc12e1f7a4ee02d"; + }; + } { name = "json_schema_traverse___json_schema_traverse_0.4.1.tgz"; path = fetchurl { @@ -7865,14 +7905,6 @@ sha1 = "119dfe908fe38d15dfa43ecd13fa12ec8832face"; }; } - { - name = "lcid___lcid_1.0.0.tgz"; - path = fetchurl { - name = "lcid___lcid_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/lcid/-/lcid-1.0.0.tgz"; - sha1 = "308accafa0bc483a3867b4b6f2b9506251d1b835"; - }; - } { name = "lcid___lcid_2.0.0.tgz"; path = fetchurl { @@ -7881,22 +7913,6 @@ sha1 = "6ef5d2df60e52f82eb228a4c373e8d1f397253cf"; }; } - { - name = "left_pad___left_pad_1.3.0.tgz"; - path = fetchurl { - name = "left_pad___left_pad_1.3.0.tgz"; - url = "https://registry.yarnpkg.com/left-pad/-/left-pad-1.3.0.tgz"; - sha1 = "5b8a3a7765dfe001261dde915589e782f8c94d1e"; - }; - } - { - name = "leven___leven_2.1.0.tgz"; - path = fetchurl { - name = "leven___leven_2.1.0.tgz"; - url = "https://registry.yarnpkg.com/leven/-/leven-2.1.0.tgz"; - sha1 = "c2e7a9f772094dee9d34202ae8acce4687875580"; - }; - } { name = "leven___leven_3.1.0.tgz"; path = fetchurl { @@ -7937,6 +7953,14 @@ sha1 = "1f07638642ec645d70bdb69ab2777676f35a28f0"; }; } + { + name = "lines_and_columns___lines_and_columns_1.1.6.tgz"; + path = fetchurl { + name = "lines_and_columns___lines_and_columns_1.1.6.tgz"; + url = "https://registry.yarnpkg.com/lines-and-columns/-/lines-and-columns-1.1.6.tgz"; + sha1 = "1c00c743b433cd0a4e80758f7b64a57440d9ff00"; + }; + } { name = "linkify_it___linkify_it_2.1.0.tgz"; path = fetchurl { @@ -8177,6 +8201,14 @@ sha1 = "1bafa5005de9dd6f4f26668c30ca37230cc9689c"; }; } + { + name = "lodash.memoize___lodash.memoize_4.1.2.tgz"; + path = fetchurl { + name = "lodash.memoize___lodash.memoize_4.1.2.tgz"; + url = "https://registry.yarnpkg.com/lodash.memoize/-/lodash.memoize-4.1.2.tgz"; + sha1 = "bcc6c49a42a2840ed997f323eada5ecd182e0bfe"; + }; + } { name = "lodash.pick___lodash.pick_4.4.0.tgz"; path = fetchurl { @@ -8273,14 +8305,6 @@ sha1 = "b3e034233188c68b889f5b862415306f565e2c56"; }; } - { - name = "lolex___lolex_5.1.2.tgz"; - path = fetchurl { - name = "lolex___lolex_5.1.2.tgz"; - url = "https://registry.yarnpkg.com/lolex/-/lolex-5.1.2.tgz"; - sha1 = "953694d098ce7c07bc5ed6d0e42bc6c0c6d5a367"; - }; - } { name = "longest_streak___longest_streak_2.0.2.tgz"; path = fetchurl { @@ -8378,11 +8402,11 @@ }; } { - name = "make_error___make_error_1.3.5.tgz"; + name = "make_error___make_error_1.3.6.tgz"; path = fetchurl { - name = "make_error___make_error_1.3.5.tgz"; - url = "https://registry.yarnpkg.com/make-error/-/make-error-1.3.5.tgz"; - sha1 = "efe4e81f6db28cadd605c70f29c831b58ef776c8"; + name = "make_error___make_error_1.3.6.tgz"; + url = "https://registry.yarnpkg.com/make-error/-/make-error-1.3.6.tgz"; + sha1 = "2eb2e37ea9b67c4891f684a1394799af484cf7a2"; }; } { @@ -8610,11 +8634,11 @@ }; } { - name = "merge_stream___merge_stream_1.0.1.tgz"; + name = "merge_stream___merge_stream_2.0.0.tgz"; path = fetchurl { - name = "merge_stream___merge_stream_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/merge-stream/-/merge-stream-1.0.1.tgz"; - sha1 = "4041202d508a342ba00174008df0c251b8c135e1"; + name = "merge_stream___merge_stream_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/merge-stream/-/merge-stream-2.0.0.tgz"; + sha1 = "52823629a14dd00c9770fb6ad47dc6310f2c1f60"; }; } { @@ -8674,19 +8698,19 @@ }; } { - name = "mime_db___mime_db_1.40.0.tgz"; + name = "mime_db___mime_db_1.44.0.tgz"; path = fetchurl { - name = "mime_db___mime_db_1.40.0.tgz"; - url = "https://registry.yarnpkg.com/mime-db/-/mime-db-1.40.0.tgz"; - sha1 = "a65057e998db090f732a68f6c276d387d4126c32"; + name = "mime_db___mime_db_1.44.0.tgz"; + url = "https://registry.yarnpkg.com/mime-db/-/mime-db-1.44.0.tgz"; + sha1 = "fa11c5eb0aca1334b4233cb4d52f10c5a6272f92"; }; } { - name = "mime_types___mime_types_2.1.24.tgz"; + name = "mime_types___mime_types_2.1.27.tgz"; path = fetchurl { - name = "mime_types___mime_types_2.1.24.tgz"; - url = "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.24.tgz"; - sha1 = "b6f8d0b3e951efb77dedeca194cff6d16f676f81"; + name = "mime_types___mime_types_2.1.27.tgz"; + url = "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.27.tgz"; + sha1 = "47949f98e279ea53119f5722e0f34e529bec009f"; }; } { @@ -8849,6 +8873,14 @@ sha1 = "1120b43dc359a785dce65b55b82e257ccf479566"; }; } + { + name = "mkdirp___mkdirp_1.0.4.tgz"; + path = fetchurl { + name = "mkdirp___mkdirp_1.0.4.tgz"; + url = "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz"; + sha1 = "3eb5ed62622756d79a5f0e2a221dfebad75c2f7e"; + }; + } { name = "https___registry.npmjs.org_mkdirp___mkdirp_0.5.1.tgz"; path = fetchurl { @@ -9066,11 +9098,11 @@ }; } { - name = "node_notifier___node_notifier_5.4.0.tgz"; + name = "node_notifier___node_notifier_8.0.0.tgz"; path = fetchurl { - name = "node_notifier___node_notifier_5.4.0.tgz"; - url = "https://registry.yarnpkg.com/node-notifier/-/node-notifier-5.4.0.tgz"; - sha1 = "7b455fdce9f7de0c63538297354f3db468426e6a"; + name = "node_notifier___node_notifier_8.0.0.tgz"; + url = "https://registry.yarnpkg.com/node-notifier/-/node-notifier-8.0.0.tgz"; + sha1 = "a7eee2d51da6d0f7ff5094bc7108c911240c1620"; }; } { @@ -9082,11 +9114,11 @@ }; } { - name = "node_sass___node_sass_4.12.0.tgz"; + name = "node_sass___node_sass_4.14.1.tgz"; path = fetchurl { - name = "node_sass___node_sass_4.12.0.tgz"; - url = "https://registry.yarnpkg.com/node-sass/-/node-sass-4.12.0.tgz"; - sha1 = "0914f531932380114a30cc5fa4fa63233a25f017"; + name = "node_sass___node_sass_4.14.1.tgz"; + url = "https://registry.yarnpkg.com/node-sass/-/node-sass-4.14.1.tgz"; + sha1 = "99c87ec2efb7047ed638fb4c9db7f3a42e2217b5"; }; } { @@ -9105,6 +9137,14 @@ sha1 = "c6465dbf08abcd4db359317f79ac68a646b28ff9"; }; } + { + name = "nopt___nopt_4.0.3.tgz"; + path = fetchurl { + name = "nopt___nopt_4.0.3.tgz"; + url = "https://registry.yarnpkg.com/nopt/-/nopt-4.0.3.tgz"; + sha1 = "a375cad9d02fd921278d954c2254d5aa57e15e48"; + }; + } { name = "nopt___nopt_1.0.10.tgz"; path = fetchurl { @@ -9113,14 +9153,6 @@ sha1 = "6ddd21bd2a31417b92727dd585f8a6f37608ebee"; }; } - { - name = "nopt___nopt_4.0.1.tgz"; - path = fetchurl { - name = "nopt___nopt_4.0.1.tgz"; - url = "https://registry.yarnpkg.com/nopt/-/nopt-4.0.1.tgz"; - sha1 = "d0d4685afd5415193c8c7505602d0d17cd64474d"; - }; - } { name = "normalize_package_data___normalize_package_data_2.5.0.tgz"; path = fetchurl { @@ -9177,6 +9209,14 @@ sha1 = "35a9232dfa35d7067b4cb2ddf2357b1871536c5f"; }; } + { + name = "npm_run_path___npm_run_path_4.0.1.tgz"; + path = fetchurl { + name = "npm_run_path___npm_run_path_4.0.1.tgz"; + url = "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-4.0.1.tgz"; + sha1 = "b7ecd1e5ed53da8e37a55e1c2269e0b97ed748ea"; + }; + } { name = "npmlog___npmlog_4.1.2.tgz"; path = fetchurl { @@ -9281,14 +9321,6 @@ sha1 = "ee1cf04153de02bb093fec33683900f57ce5399b"; }; } - { - name = "object.getownpropertydescriptors___object.getownpropertydescriptors_2.0.3.tgz"; - path = fetchurl { - name = "object.getownpropertydescriptors___object.getownpropertydescriptors_2.0.3.tgz"; - url = "https://registry.yarnpkg.com/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.0.3.tgz"; - sha1 = "8758c846f5b407adab0f236e0986f14b051caa16"; - }; - } { name = "object.pick___object.pick_1.3.0.tgz"; path = fetchurl { @@ -9417,14 +9449,6 @@ sha1 = "ffbc4988336e0e833de0c168c7ef152121aa7fb3"; }; } - { - name = "os_locale___os_locale_1.4.0.tgz"; - path = fetchurl { - name = "os_locale___os_locale_1.4.0.tgz"; - url = "https://registry.yarnpkg.com/os-locale/-/os-locale-1.4.0.tgz"; - sha1 = "20f9f17ae29ed345e8bde583b13d2009803c14d9"; - }; - } { name = "os_locale___os_locale_3.1.0.tgz"; path = fetchurl { @@ -9466,11 +9490,11 @@ }; } { - name = "p_each_series___p_each_series_1.0.0.tgz"; + name = "p_each_series___p_each_series_2.1.0.tgz"; path = fetchurl { - name = "p_each_series___p_each_series_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/p-each-series/-/p-each-series-1.0.0.tgz"; - sha1 = "930f3d12dd1f50e7434457a22cd6f04ac6ad7f71"; + name = "p_each_series___p_each_series_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/p-each-series/-/p-each-series-2.1.0.tgz"; + sha1 = "961c8dd3f195ea96c747e636b262b800a6b1af48"; }; } { @@ -9545,14 +9569,6 @@ sha1 = "d704d9af8a2ba684e2600d9a215983d4141a979d"; }; } - { - name = "p_reduce___p_reduce_1.0.0.tgz"; - path = fetchurl { - name = "p_reduce___p_reduce_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/p-reduce/-/p-reduce-1.0.0.tgz"; - sha1 = "18c2b0dd936a4690a529f8231f58a0fdb6a47dfa"; - }; - } { name = "p_retry___p_retry_3.0.1.tgz"; path = fetchurl { @@ -9657,6 +9673,14 @@ sha1 = "be35f5425be1f7f6c747184f98a788cb99477ee0"; }; } + { + name = "parse_json___parse_json_5.1.0.tgz"; + path = fetchurl { + name = "parse_json___parse_json_5.1.0.tgz"; + url = "https://registry.yarnpkg.com/parse-json/-/parse-json-5.1.0.tgz"; + sha1 = "f96088cdf24a8faa9aea9a009f2d9d942c999646"; + }; + } { name = "parse_passwd___parse_passwd_1.0.0.tgz"; path = fetchurl { @@ -9665,14 +9689,6 @@ sha1 = "6d5b934a456993b23d37f40a382d6f1666a8e5c6"; }; } - { - name = "parse5___parse5_4.0.0.tgz"; - path = fetchurl { - name = "parse5___parse5_4.0.0.tgz"; - url = "https://registry.yarnpkg.com/parse5/-/parse5-4.0.0.tgz"; - sha1 = "6d78656e3da8d78b4ec0b906f7c08ef1dfe3f608"; - }; - } { name = "parse5___parse5_5.1.1.tgz"; path = fetchurl { @@ -9777,6 +9793,14 @@ sha1 = "411cadb574c5a140d3a4b1910d40d80cc9f40b40"; }; } + { + name = "path_key___path_key_3.1.1.tgz"; + path = fetchurl { + name = "path_key___path_key_3.1.1.tgz"; + url = "https://registry.yarnpkg.com/path-key/-/path-key-3.1.1.tgz"; + sha1 = "581f6ade658cbba65a0d3380de7753295054f375"; + }; + } { name = "path_parse___path_parse_1.0.6.tgz"; path = fetchurl { @@ -9945,14 +9969,6 @@ sha1 = "c819ac728059a461cab1c3889a2be3c49a004d7f"; }; } - { - name = "pn___pn_1.1.0.tgz"; - path = fetchurl { - name = "pn___pn_1.1.0.tgz"; - url = "https://registry.yarnpkg.com/pn/-/pn-1.1.0.tgz"; - sha1 = "e2f4cef0e219f463c179ab37463e4e1ecdccbafb"; - }; - } { name = "pngjs___pngjs_3.3.3.tgz"; path = fetchurl { @@ -10121,14 +10137,6 @@ sha1 = "4f875f4afb0c96573d5cf4d74011aee250a7e865"; }; } - { - name = "postcss_selector_parser___postcss_selector_parser_5.0.0.tgz"; - path = fetchurl { - name = "postcss_selector_parser___postcss_selector_parser_5.0.0.tgz"; - url = "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-5.0.0.tgz"; - sha1 = "249044356697b33b64f1a8f7c80922dddee7195c"; - }; - } { name = "postcss_selector_parser___postcss_selector_parser_6.0.2.tgz"; path = fetchurl { @@ -10193,14 +10201,6 @@ sha1 = "a3b4160516007075d29127262f3a0063d19896e9"; }; } - { - name = "prettier___prettier_1.16.3.tgz"; - path = fetchurl { - name = "prettier___prettier_1.16.3.tgz"; - url = "https://registry.yarnpkg.com/prettier/-/prettier-1.16.3.tgz"; - sha1 = "8c62168453badef702f34b45b6ee899574a6a65d"; - }; - } { name = "prettier___prettier_1.18.2.tgz"; path = fetchurl { @@ -10217,14 +10217,6 @@ sha1 = "f7d7f5ff8a9cd872a7be4ca142095956a60797cb"; }; } - { - name = "pretty_format___pretty_format_24.8.0.tgz"; - path = fetchurl { - name = "pretty_format___pretty_format_24.8.0.tgz"; - url = "https://registry.yarnpkg.com/pretty-format/-/pretty-format-24.8.0.tgz"; - sha1 = "8dae7044f58db7cb8be245383b565a963e3c27f2"; - }; - } { name = "pretty_format___pretty_format_25.5.0.tgz"; path = fetchurl { @@ -10233,6 +10225,14 @@ sha1 = "7873c1d774f682c34b8d48b6743a2bf2ac55791a"; }; } + { + name = "pretty_format___pretty_format_26.5.2.tgz"; + path = fetchurl { + name = "pretty_format___pretty_format_26.5.2.tgz"; + url = "https://registry.yarnpkg.com/pretty-format/-/pretty-format-26.5.2.tgz"; + sha1 = "5d896acfdaa09210683d34b6dc0e6e21423cd3e1"; + }; + } { name = "pretty___pretty_2.0.0.tgz"; path = fetchurl { @@ -10298,11 +10298,11 @@ }; } { - name = "prompts___prompts_2.1.0.tgz"; + name = "prompts___prompts_2.3.2.tgz"; path = fetchurl { - name = "prompts___prompts_2.1.0.tgz"; - url = "https://registry.yarnpkg.com/prompts/-/prompts-2.1.0.tgz"; - sha1 = "bf90bc71f6065d255ea2bdc0fe6520485c1b45db"; + name = "prompts___prompts_2.3.2.tgz"; + url = "https://registry.yarnpkg.com/prompts/-/prompts-2.3.2.tgz"; + sha1 = "480572d89ecf39566d2bd3fe2c9fccb7c4c0b068"; }; } { @@ -10666,11 +10666,11 @@ }; } { - name = "read_pkg_up___read_pkg_up_4.0.0.tgz"; + name = "read_pkg_up___read_pkg_up_7.0.1.tgz"; path = fetchurl { - name = "read_pkg_up___read_pkg_up_4.0.0.tgz"; - url = "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-4.0.0.tgz"; - sha1 = "1b221c6088ba7799601c808f91161c66e58f8978"; + name = "read_pkg_up___read_pkg_up_7.0.1.tgz"; + url = "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-7.0.1.tgz"; + sha1 = "f3a6135758459733ae2b95638056e1854e7ef507"; }; } { @@ -10698,11 +10698,19 @@ }; } { - name = "readable_stream___readable_stream_2.3.6.tgz"; + name = "read_pkg___read_pkg_5.2.0.tgz"; path = fetchurl { - name = "readable_stream___readable_stream_2.3.6.tgz"; - url = "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.6.tgz"; - sha1 = "b11c27d88b8ff1fbe070643cf94b0c79ae1b0aaf"; + name = "read_pkg___read_pkg_5.2.0.tgz"; + url = "https://registry.yarnpkg.com/read-pkg/-/read-pkg-5.2.0.tgz"; + sha1 = "7bf295438ca5a33e56cd30e053b34ee7250c93cc"; + }; + } + { + name = "readable_stream___readable_stream_2.3.7.tgz"; + path = fetchurl { + name = "readable_stream___readable_stream_2.3.7.tgz"; + url = "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.7.tgz"; + sha1 = "1eca1cf711aef814c04f62252a36a62f6cb23b57"; }; } { @@ -10737,14 +10745,6 @@ sha1 = "9fdccdf9e9155805449221ac645e8303ab5b9ada"; }; } - { - name = "realpath_native___realpath_native_1.1.0.tgz"; - path = fetchurl { - name = "realpath_native___realpath_native_1.1.0.tgz"; - url = "https://registry.yarnpkg.com/realpath-native/-/realpath-native-1.1.0.tgz"; - sha1 = "2003294fea23fb0672f2476ebe22fcf498a2d65c"; - }; - } { name = "redent___redent_1.0.0.tgz"; path = fetchurl { @@ -10922,19 +10922,19 @@ }; } { - name = "request_promise_core___request_promise_core_1.1.3.tgz"; + name = "request_promise_core___request_promise_core_1.1.4.tgz"; path = fetchurl { - name = "request_promise_core___request_promise_core_1.1.3.tgz"; - url = "https://registry.yarnpkg.com/request-promise-core/-/request-promise-core-1.1.3.tgz"; - sha1 = "e9a3c081b51380dfea677336061fea879a829ee9"; + name = "request_promise_core___request_promise_core_1.1.4.tgz"; + url = "https://registry.yarnpkg.com/request-promise-core/-/request-promise-core-1.1.4.tgz"; + sha1 = "3eedd4223208d419867b78ce815167d10593a22f"; }; } { - name = "request_promise_native___request_promise_native_1.0.8.tgz"; + name = "request_promise_native___request_promise_native_1.0.9.tgz"; path = fetchurl { - name = "request_promise_native___request_promise_native_1.0.8.tgz"; - url = "https://registry.yarnpkg.com/request-promise-native/-/request-promise-native-1.0.8.tgz"; - sha1 = "a455b960b826e44e2bf8999af64dff2bfe58cb36"; + name = "request_promise_native___request_promise_native_1.0.9.tgz"; + url = "https://registry.yarnpkg.com/request-promise-native/-/request-promise-native-1.0.9.tgz"; + sha1 = "e407120526a5efdc9a39b28a5679bf47b9d9dc28"; }; } { @@ -11009,6 +11009,14 @@ sha1 = "00a9f7387556e27038eae232caa372a6a59b665a"; }; } + { + name = "resolve_cwd___resolve_cwd_3.0.0.tgz"; + path = fetchurl { + name = "resolve_cwd___resolve_cwd_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/resolve-cwd/-/resolve-cwd-3.0.0.tgz"; + sha1 = "0f0075f1bb2544766cf73ba6a6e2adfebcb13f2d"; + }; + } { name = "resolve_dir___resolve_dir_1.0.1.tgz"; path = fetchurl { @@ -11050,19 +11058,11 @@ }; } { - name = "resolve___resolve_1.1.7.tgz"; + name = "resolve___resolve_1.17.0.tgz"; path = fetchurl { - name = "resolve___resolve_1.1.7.tgz"; - url = "https://registry.yarnpkg.com/resolve/-/resolve-1.1.7.tgz"; - sha1 = "203114d82ad2c5ed9e8e0411b3932875e889e97b"; - }; - } - { - name = "resolve___resolve_1.15.0.tgz"; - path = fetchurl { - name = "resolve___resolve_1.15.0.tgz"; - url = "https://registry.yarnpkg.com/resolve/-/resolve-1.15.0.tgz"; - sha1 = "1b7ca96073ebb52e741ffd799f6b39ea462c67f5"; + name = "resolve___resolve_1.17.0.tgz"; + url = "https://registry.yarnpkg.com/resolve/-/resolve-1.17.0.tgz"; + sha1 = "b25941b54968231cc2d1bb76a79cb7f2c0bf8444"; }; } { @@ -11121,6 +11121,14 @@ sha1 = "b2d104fe0d8fb27cf9e0a1cda8262dd3833c6cab"; }; } + { + name = "rimraf___rimraf_3.0.2.tgz"; + path = fetchurl { + name = "rimraf___rimraf_3.0.2.tgz"; + url = "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.2.tgz"; + sha1 = "f1a5402ba6220ad52cc1282bac1ae3aa49fd061a"; + }; + } { name = "ripemd160___ripemd160_2.0.1.tgz"; path = fetchurl { @@ -11218,11 +11226,11 @@ }; } { - name = "sass_graph___sass_graph_2.2.4.tgz"; + name = "sass_graph___sass_graph_2.2.5.tgz"; path = fetchurl { - name = "sass_graph___sass_graph_2.2.4.tgz"; - url = "https://registry.yarnpkg.com/sass-graph/-/sass-graph-2.2.4.tgz"; - sha1 = "13fbd63cd1caf0908b9fd93476ad43a51d1e0b49"; + name = "sass_graph___sass_graph_2.2.5.tgz"; + url = "https://registry.yarnpkg.com/sass-graph/-/sass-graph-2.2.5.tgz"; + sha1 = "a981c87446b8319d96dce0671e487879bd24c2e8"; }; } { @@ -11233,14 +11241,6 @@ sha1 = "7b8e656190b228e81a66aea748480d828cd2d37a"; }; } - { - name = "sax___sax_1.2.4.tgz"; - path = fetchurl { - name = "sax___sax_1.2.4.tgz"; - url = "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz"; - sha1 = "2816234e2378bddc4e5354fab5caa895df7100d9"; - }; - } { name = "saxes___saxes_5.0.1.tgz"; path = fetchurl { @@ -11289,14 +11289,6 @@ sha1 = "8eb06db9a9723333824d3f5530641149847ce5d1"; }; } - { - name = "section_matter___section_matter_1.0.0.tgz"; - path = fetchurl { - name = "section_matter___section_matter_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/section-matter/-/section-matter-1.0.0.tgz"; - sha1 = "e9041953506780ec01d59f292a19c7b850b84167"; - }; - } { name = "select_hose___select_hose_2.0.0.tgz"; path = fetchurl { @@ -11353,6 +11345,14 @@ sha1 = "5f3ca35761e47e05b206c6daff2cf814f0316b8e"; }; } + { + name = "semver___semver_7.3.2.tgz"; + path = fetchurl { + name = "semver___semver_7.3.2.tgz"; + url = "https://registry.yarnpkg.com/semver/-/semver-7.3.2.tgz"; + sha1 = "604962b052b81ed0786aae84389ffba70ffd3938"; + }; + } { name = "semver___semver_6.3.0.tgz"; path = fetchurl { @@ -11465,6 +11465,14 @@ sha1 = "44aac65b695b03398968c39f363fee5deafdf1ea"; }; } + { + name = "shebang_command___shebang_command_2.0.0.tgz"; + path = fetchurl { + name = "shebang_command___shebang_command_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/shebang-command/-/shebang-command-2.0.0.tgz"; + sha1 = "ccd0af4f8835fbdc265b82461aaf0c36663f34ea"; + }; + } { name = "shebang_regex___shebang_regex_1.0.0.tgz"; path = fetchurl { @@ -11473,6 +11481,14 @@ sha1 = "da42f49740c0b42db2ca9728571cb190c98efea3"; }; } + { + name = "shebang_regex___shebang_regex_3.0.0.tgz"; + path = fetchurl { + name = "shebang_regex___shebang_regex_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-3.0.0.tgz"; + sha1 = "ae16f1644d873ecad843b0307b143362d4c42172"; + }; + } { name = "shellwords___shellwords_0.1.1.tgz"; path = fetchurl { @@ -11490,19 +11506,19 @@ }; } { - name = "signal_exit___signal_exit_3.0.2.tgz"; + name = "signal_exit___signal_exit_3.0.3.tgz"; path = fetchurl { - name = "signal_exit___signal_exit_3.0.2.tgz"; - url = "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.2.tgz"; - sha1 = "b5fdc08f1287ea1178628e415e25132b73646c6d"; + name = "signal_exit___signal_exit_3.0.3.tgz"; + url = "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.3.tgz"; + sha1 = "a1410c2edd8f077b08b4e253c8eacfcaf057461c"; }; } { - name = "sisteransi___sisteransi_1.0.0.tgz"; + name = "sisteransi___sisteransi_1.0.5.tgz"; path = fetchurl { - name = "sisteransi___sisteransi_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/sisteransi/-/sisteransi-1.0.0.tgz"; - sha1 = "77d9622ff909080f1c19e5f4a1df0c1b0a27b88c"; + name = "sisteransi___sisteransi_1.0.5.tgz"; + url = "https://registry.yarnpkg.com/sisteransi/-/sisteransi-1.0.5.tgz"; + sha1 = "134d681297756437cc05ca01370d3a7a571075ed"; }; } { @@ -11642,19 +11658,19 @@ }; } { - name = "source_map_resolve___source_map_resolve_0.5.2.tgz"; + name = "source_map_resolve___source_map_resolve_0.5.3.tgz"; path = fetchurl { - name = "source_map_resolve___source_map_resolve_0.5.2.tgz"; - url = "https://registry.yarnpkg.com/source-map-resolve/-/source-map-resolve-0.5.2.tgz"; - sha1 = "72e2cc34095543e43b2c62b2c4c10d4a9054f259"; + name = "source_map_resolve___source_map_resolve_0.5.3.tgz"; + url = "https://registry.yarnpkg.com/source-map-resolve/-/source-map-resolve-0.5.3.tgz"; + sha1 = "190866bece7553e1f8f267a2ee82c606b5509a1a"; }; } { - name = "source_map_support___source_map_support_0.5.13.tgz"; + name = "source_map_support___source_map_support_0.5.19.tgz"; path = fetchurl { - name = "source_map_support___source_map_support_0.5.13.tgz"; - url = "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.13.tgz"; - sha1 = "31b24a9c2e73c2de85066c0feb7d44767ed52932"; + name = "source_map_support___source_map_support_0.5.19.tgz"; + url = "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.19.tgz"; + sha1 = "a98b62f86dcaf4f67399648c085291ab9e8fed61"; }; } { @@ -11673,6 +11689,14 @@ sha1 = "0fe96503ac86a5adb5de63f4e412ae4872cdbe86"; }; } + { + name = "source_map___source_map_0.5.6.tgz"; + path = fetchurl { + name = "source_map___source_map_0.5.6.tgz"; + url = "https://registry.yarnpkg.com/source-map/-/source-map-0.5.6.tgz"; + sha1 = "75ce38f52bf0733c5a7f0c118d81334a2bb5f412"; + }; + } { name = "source_map___source_map_0.4.4.tgz"; path = fetchurl { @@ -11681,14 +11705,6 @@ sha1 = "eba4f5da9c0dc999de68032d8b4f76173652036b"; }; } - { - name = "source_map___source_map_0.5.7.tgz"; - path = fetchurl { - name = "source_map___source_map_0.5.7.tgz"; - url = "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz"; - sha1 = "8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"; - }; - } { name = "source_map___source_map_0.6.1.tgz"; path = fetchurl { @@ -11706,27 +11722,35 @@ }; } { - name = "spdx_correct___spdx_correct_1.0.2.tgz"; + name = "spdx_correct___spdx_correct_3.1.1.tgz"; path = fetchurl { - name = "spdx_correct___spdx_correct_1.0.2.tgz"; - url = "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-1.0.2.tgz"; - sha1 = "4b3073d933ff51f3912f03ac5519498a4150db40"; + name = "spdx_correct___spdx_correct_3.1.1.tgz"; + url = "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-3.1.1.tgz"; + sha1 = "dece81ac9c1e6713e5f7d1b6f17d468fa53d89a9"; }; } { - name = "spdx_expression_parse___spdx_expression_parse_1.0.4.tgz"; + name = "spdx_exceptions___spdx_exceptions_2.3.0.tgz"; path = fetchurl { - name = "spdx_expression_parse___spdx_expression_parse_1.0.4.tgz"; - url = "https://registry.yarnpkg.com/spdx-expression-parse/-/spdx-expression-parse-1.0.4.tgz"; - sha1 = "9bdf2f20e1f40ed447fbe273266191fced51626c"; + name = "spdx_exceptions___spdx_exceptions_2.3.0.tgz"; + url = "https://registry.yarnpkg.com/spdx-exceptions/-/spdx-exceptions-2.3.0.tgz"; + sha1 = "3f28ce1a77a00372683eade4a433183527a2163d"; }; } { - name = "spdx_license_ids___spdx_license_ids_1.2.2.tgz"; + name = "spdx_expression_parse___spdx_expression_parse_3.0.1.tgz"; path = fetchurl { - name = "spdx_license_ids___spdx_license_ids_1.2.2.tgz"; - url = "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-1.2.2.tgz"; - sha1 = "c9df7a3424594ade6bd11900d596696dc06bac57"; + name = "spdx_expression_parse___spdx_expression_parse_3.0.1.tgz"; + url = "https://registry.yarnpkg.com/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz"; + sha1 = "cf70f50482eefdc98e3ce0a6833e4a53ceeba679"; + }; + } + { + name = "spdx_license_ids___spdx_license_ids_3.0.6.tgz"; + path = fetchurl { + name = "spdx_license_ids___spdx_license_ids_3.0.6.tgz"; + url = "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.6.tgz"; + sha1 = "c80757383c28abf7296744998cbc106ae8b854ce"; }; } { @@ -11778,11 +11802,11 @@ }; } { - name = "sshpk___sshpk_1.15.2.tgz"; + name = "sshpk___sshpk_1.16.1.tgz"; path = fetchurl { - name = "sshpk___sshpk_1.15.2.tgz"; - url = "https://registry.yarnpkg.com/sshpk/-/sshpk-1.15.2.tgz"; - sha1 = "c946d6bd9b1a39d0e8635763f5242d6ed6dcb629"; + name = "sshpk___sshpk_1.16.1.tgz"; + url = "https://registry.yarnpkg.com/sshpk/-/sshpk-1.16.1.tgz"; + sha1 = "fb661c0bef29b39db40769ee39fa70093d6f6877"; }; } { @@ -11802,11 +11826,11 @@ }; } { - name = "stack_utils___stack_utils_1.0.2.tgz"; + name = "stack_utils___stack_utils_2.0.2.tgz"; path = fetchurl { - name = "stack_utils___stack_utils_1.0.2.tgz"; - url = "https://registry.yarnpkg.com/stack-utils/-/stack-utils-1.0.2.tgz"; - sha1 = "33eba3897788558bebfc2db059dc158ec36cebb8"; + name = "stack_utils___stack_utils_2.0.2.tgz"; + url = "https://registry.yarnpkg.com/stack-utils/-/stack-utils-2.0.2.tgz"; + sha1 = "5cf48b4557becb4638d0bc4f21d23f5d19586593"; }; } { @@ -11914,11 +11938,11 @@ }; } { - name = "string_length___string_length_2.0.0.tgz"; + name = "string_length___string_length_4.0.1.tgz"; path = fetchurl { - name = "string_length___string_length_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/string-length/-/string-length-2.0.0.tgz"; - sha1 = "d40dbb686a3ace960c1cffca562bf2c45f8363ed"; + name = "string_length___string_length_4.0.1.tgz"; + url = "https://registry.yarnpkg.com/string-length/-/string-length-4.0.1.tgz"; + sha1 = "4a973bf31ef77c4edbceadd6af2611996985f8a1"; }; } { @@ -12025,14 +12049,6 @@ sha1 = "0b1571dd7669ccd4f3e06e14ef1eed26225ae532"; }; } - { - name = "strip_bom_string___strip_bom_string_1.0.0.tgz"; - path = fetchurl { - name = "strip_bom_string___strip_bom_string_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/strip-bom-string/-/strip-bom-string-1.0.0.tgz"; - sha1 = "e5211e9224369fbb81d633a2f00044dc8cedad92"; - }; - } { name = "strip_bom___strip_bom_2.0.0.tgz"; path = fetchurl { @@ -12049,6 +12065,14 @@ sha1 = "2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3"; }; } + { + name = "strip_bom___strip_bom_4.0.0.tgz"; + path = fetchurl { + name = "strip_bom___strip_bom_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/strip-bom/-/strip-bom-4.0.0.tgz"; + sha1 = "9c3505c1db45bcedca3d9cf7a16f5c5aa3901878"; + }; + } { name = "strip_css_comments___strip_css_comments_3.0.0.tgz"; path = fetchurl { @@ -12065,6 +12089,14 @@ sha1 = "bb43ff5598a6eb05d89b59fcd129c983313606bf"; }; } + { + name = "strip_final_newline___strip_final_newline_2.0.0.tgz"; + path = fetchurl { + name = "strip_final_newline___strip_final_newline_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/strip-final-newline/-/strip-final-newline-2.0.0.tgz"; + sha1 = "89b852fb2fcbe936f6f4b3187afb0a12c1ab58ad"; + }; + } { name = "strip_indent___strip_indent_1.0.1.tgz"; path = fetchurl { @@ -12170,11 +12202,19 @@ }; } { - name = "supports_color___supports_color_7.1.0.tgz"; + name = "supports_color___supports_color_7.2.0.tgz"; path = fetchurl { - name = "supports_color___supports_color_7.1.0.tgz"; - url = "https://registry.yarnpkg.com/supports-color/-/supports-color-7.1.0.tgz"; - sha1 = "68e32591df73e25ad1c4b49108a2ec507962bfd1"; + name = "supports_color___supports_color_7.2.0.tgz"; + url = "https://registry.yarnpkg.com/supports-color/-/supports-color-7.2.0.tgz"; + sha1 = "1b7dcdcb32b8138801b3e478ba6a51caa89648da"; + }; + } + { + name = "supports_hyperlinks___supports_hyperlinks_2.1.0.tgz"; + path = fetchurl { + name = "supports_hyperlinks___supports_hyperlinks_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/supports-hyperlinks/-/supports-hyperlinks-2.1.0.tgz"; + sha1 = "f663df252af5f37c5d49bbd7eeefa9e0b9e59e47"; }; } { @@ -12257,6 +12297,14 @@ sha1 = "1f16adedfe9bdc18800e1776821734086fcc6753"; }; } + { + name = "terminal_link___terminal_link_2.1.1.tgz"; + path = fetchurl { + name = "terminal_link___terminal_link_2.1.1.tgz"; + url = "https://registry.yarnpkg.com/terminal-link/-/terminal-link-2.1.1.tgz"; + sha1 = "14a64a27ab3c0df933ea546fba55f2d078edc994"; + }; + } { name = "terser_webpack_plugin___terser_webpack_plugin_1.4.3.tgz"; path = fetchurl { @@ -12274,11 +12322,11 @@ }; } { - name = "test_exclude___test_exclude_5.0.0.tgz"; + name = "test_exclude___test_exclude_6.0.0.tgz"; path = fetchurl { - name = "test_exclude___test_exclude_5.0.0.tgz"; - url = "https://registry.yarnpkg.com/test-exclude/-/test-exclude-5.0.0.tgz"; - sha1 = "cdce7cece785e0e829cd5c2b27baf18bc583cfb7"; + name = "test_exclude___test_exclude_6.0.0.tgz"; + url = "https://registry.yarnpkg.com/test-exclude/-/test-exclude-6.0.0.tgz"; + sha1 = "04a8698661d805ea6fa293b6cb9e63ac044ef15e"; }; } { @@ -12322,11 +12370,11 @@ }; } { - name = "throat___throat_4.1.0.tgz"; + name = "throat___throat_5.0.0.tgz"; path = fetchurl { - name = "throat___throat_4.1.0.tgz"; - url = "https://registry.yarnpkg.com/throat/-/throat-4.1.0.tgz"; - sha1 = "89037cbc92c56ab18926e6ba4cbb200e15672a6a"; + name = "throat___throat_5.0.0.tgz"; + url = "https://registry.yarnpkg.com/throat/-/throat-5.0.0.tgz"; + sha1 = "c5199235803aad18754a667d659b5e72ce16764b"; }; } { @@ -12545,14 +12593,6 @@ sha1 = "9df4f57e739c26930a018184887f4adb7dca73b2"; }; } - { - name = "tr46___tr46_1.0.1.tgz"; - path = fetchurl { - name = "tr46___tr46_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/tr46/-/tr46-1.0.1.tgz"; - sha1 = "a8b13fd6bfd2489519674ccde55ba3693b706d09"; - }; - } { name = "tr46___tr46_2.0.2.tgz"; path = fetchurl { @@ -12650,11 +12690,11 @@ }; } { - name = "ts_jest___ts_jest_24.0.0.tgz"; + name = "ts_jest___ts_jest_26.4.1.tgz"; path = fetchurl { - name = "ts_jest___ts_jest_24.0.0.tgz"; - url = "https://registry.yarnpkg.com/ts-jest/-/ts-jest-24.0.0.tgz"; - sha1 = "3f26bf2ec1fa584863a5a9c29bd8717d549efbf6"; + name = "ts_jest___ts_jest_26.4.1.tgz"; + url = "https://registry.yarnpkg.com/ts-jest/-/ts-jest-26.4.1.tgz"; + sha1 = "08ec0d3fc2c3a39e4a46eae5610b69fafa6babd0"; }; } { @@ -12721,6 +12761,14 @@ sha1 = "d6ef42a0356c6cd45f49485c3b6281fc148e48a2"; }; } + { + name = "type_fest___type_fest_0.6.0.tgz"; + path = fetchurl { + name = "type_fest___type_fest_0.6.0.tgz"; + url = "https://registry.yarnpkg.com/type-fest/-/type-fest-0.6.0.tgz"; + sha1 = "8d2a2370d3df886eb5c90ada1c5bf6188acf838b"; + }; + } { name = "type_fest___type_fest_0.8.1.tgz"; path = fetchurl { @@ -12754,11 +12802,11 @@ }; } { - name = "typescript___typescript_3.3.4000.tgz"; + name = "typescript___typescript_3.9.7.tgz"; path = fetchurl { - name = "typescript___typescript_3.3.4000.tgz"; - url = "https://registry.yarnpkg.com/typescript/-/typescript-3.3.4000.tgz"; - sha1 = "76b0f89cfdbf97827e1112d64f283f1151d6adf0"; + name = "typescript___typescript_3.9.7.tgz"; + url = "https://registry.yarnpkg.com/typescript/-/typescript-3.9.7.tgz"; + sha1 = "98d600a5ebdc38f40cb277522f12dc800e9e25fa"; }; } { @@ -12994,11 +13042,11 @@ }; } { - name = "uri_js___uri_js_4.2.2.tgz"; + name = "uri_js___uri_js_4.4.0.tgz"; path = fetchurl { - name = "uri_js___uri_js_4.2.2.tgz"; - url = "https://registry.yarnpkg.com/uri-js/-/uri-js-4.2.2.tgz"; - sha1 = "94c540e1ff772956e2299507c010aea6c8838eb0"; + name = "uri_js___uri_js_4.4.0.tgz"; + url = "https://registry.yarnpkg.com/uri-js/-/uri-js-4.4.0.tgz"; + sha1 = "aa714261de793e8a82347a7bcc9ce74e86f28602"; }; } { @@ -13081,14 +13129,6 @@ sha1 = "450d4dc9fa70de732762fbd2d4a28981419a0ccf"; }; } - { - name = "util.promisify___util.promisify_1.0.0.tgz"; - path = fetchurl { - name = "util.promisify___util.promisify_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/util.promisify/-/util.promisify-1.0.0.tgz"; - sha1 = "440f7165a459c9a16dc145eb8e72f35687097030"; - }; - } { name = "util___util_0.10.3.tgz"; path = fetchurl { @@ -13129,6 +13169,22 @@ sha1 = "6f1536eb43249f473abc6bd58ff983da1ca30d8d"; }; } + { + name = "uuid___uuid_3.4.0.tgz"; + path = fetchurl { + name = "uuid___uuid_3.4.0.tgz"; + url = "https://registry.yarnpkg.com/uuid/-/uuid-3.4.0.tgz"; + sha1 = "b23e4358afa8a202fe7a100af1f5f883f02007ee"; + }; + } + { + name = "uuid___uuid_8.3.1.tgz"; + path = fetchurl { + name = "uuid___uuid_8.3.1.tgz"; + url = "https://registry.yarnpkg.com/uuid/-/uuid-8.3.1.tgz"; + sha1 = "2ba2e6ca000da60fce5a196954ab241131e05a31"; + }; + } { name = "v8_compile_cache___v8_compile_cache_2.0.3.tgz"; path = fetchurl { @@ -13138,11 +13194,19 @@ }; } { - name = "validate_npm_package_license___validate_npm_package_license_3.0.1.tgz"; + name = "v8_to_istanbul___v8_to_istanbul_5.0.1.tgz"; path = fetchurl { - name = "validate_npm_package_license___validate_npm_package_license_3.0.1.tgz"; - url = "https://registry.yarnpkg.com/validate-npm-package-license/-/validate-npm-package-license-3.0.1.tgz"; - sha1 = "2804babe712ad3379459acfbe24746ab2c303fbc"; + name = "v8_to_istanbul___v8_to_istanbul_5.0.1.tgz"; + url = "https://registry.yarnpkg.com/v8-to-istanbul/-/v8-to-istanbul-5.0.1.tgz"; + sha1 = "0608f5b49a481458625edb058488607f25498ba5"; + }; + } + { + name = "validate_npm_package_license___validate_npm_package_license_3.0.4.tgz"; + path = fetchurl { + name = "validate_npm_package_license___validate_npm_package_license_3.0.4.tgz"; + url = "https://registry.yarnpkg.com/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz"; + sha1 = "fc91f6b9c7ba15c857f4cb2c5defeec39d4f410a"; }; } { @@ -13322,27 +13386,27 @@ }; } { - name = "vue_jest___vue_jest_4.0.0_beta.2.tgz"; + name = "vue_jest___vue_jest_4.0.0_rc.0.tgz"; path = fetchurl { - name = "vue_jest___vue_jest_4.0.0_beta.2.tgz"; - url = "https://registry.yarnpkg.com/vue-jest/-/vue-jest-4.0.0-beta.2.tgz"; - sha1 = "f2120ea9d24224aad3a100c2010b0760d47ee6fe"; + name = "vue_jest___vue_jest_4.0.0_rc.0.tgz"; + url = "https://registry.yarnpkg.com/vue-jest/-/vue-jest-4.0.0-rc.0.tgz"; + sha1 = "0ce263c7f923441d0eeb99841620e8e9470336f4"; }; } { - name = "vue_loader___vue_loader_15.9.0.tgz"; + name = "vue_loader___vue_loader_15.9.3.tgz"; path = fetchurl { - name = "vue_loader___vue_loader_15.9.0.tgz"; - url = "https://registry.yarnpkg.com/vue-loader/-/vue-loader-15.9.0.tgz"; - sha1 = "5d4b0378a4606188fc83e587ed23c94bc3a10998"; + name = "vue_loader___vue_loader_15.9.3.tgz"; + url = "https://registry.yarnpkg.com/vue-loader/-/vue-loader-15.9.3.tgz"; + sha1 = "0de35d9e555d3ed53969516cac5ce25531299dda"; }; } { - name = "vue_router___vue_router_3.4.3.tgz"; + name = "vue_router___vue_router_3.4.7.tgz"; path = fetchurl { - name = "vue_router___vue_router_3.4.3.tgz"; - url = "https://registry.yarnpkg.com/vue-router/-/vue-router-3.4.3.tgz"; - sha1 = "fa93768616ee338aa174f160ac965167fa572ffa"; + name = "vue_router___vue_router_3.4.7.tgz"; + url = "https://registry.yarnpkg.com/vue-router/-/vue-router-3.4.7.tgz"; + sha1 = "bf189bafd16f4e4ef783c4a6250a3090f2c1fa1b"; }; } { @@ -13362,11 +13426,11 @@ }; } { - name = "vue_template_compiler___vue_template_compiler_2.6.10.tgz"; + name = "vue_template_compiler___vue_template_compiler_2.6.12.tgz"; path = fetchurl { - name = "vue_template_compiler___vue_template_compiler_2.6.10.tgz"; - url = "https://registry.yarnpkg.com/vue-template-compiler/-/vue-template-compiler-2.6.10.tgz"; - sha1 = "323b4f3495f04faa3503337a82f5d6507799c9cc"; + name = "vue_template_compiler___vue_template_compiler_2.6.12.tgz"; + url = "https://registry.yarnpkg.com/vue-template-compiler/-/vue-template-compiler-2.6.12.tgz"; + sha1 = "947ed7196744c8a5285ebe1233fe960437fcc57e"; }; } { @@ -13386,11 +13450,11 @@ }; } { - name = "vue___vue_2.6.10.tgz"; + name = "vue___vue_2.6.12.tgz"; path = fetchurl { - name = "vue___vue_2.6.10.tgz"; - url = "https://registry.yarnpkg.com/vue/-/vue-2.6.10.tgz"; - sha1 = "a72b1a42a4d82a721ea438d1b6bf55e66195c637"; + name = "vue___vue_2.6.12.tgz"; + url = "https://registry.yarnpkg.com/vue/-/vue-2.6.12.tgz"; + sha1 = "f5ebd4fa6bd2869403e29a896aed4904456c9123"; }; } { @@ -13473,14 +13537,6 @@ sha1 = "ec3df43c834a207fd7cdefd732b2987896e08511"; }; } - { - name = "webidl_conversions___webidl_conversions_4.0.2.tgz"; - path = fetchurl { - name = "webidl_conversions___webidl_conversions_4.0.2.tgz"; - url = "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-4.0.2.tgz"; - sha1 = "a855980b1f0b6b359ba1d5d9fb39ae941faa63ad"; - }; - } { name = "webidl_conversions___webidl_conversions_5.0.0.tgz"; path = fetchurl { @@ -13593,22 +13649,6 @@ sha1 = "3d4b1e0312d2079879f826aff18dbeeca5960fbf"; }; } - { - name = "whatwg_url___whatwg_url_6.5.0.tgz"; - path = fetchurl { - name = "whatwg_url___whatwg_url_6.5.0.tgz"; - url = "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-6.5.0.tgz"; - sha1 = "f2df02bff176fd65070df74ad5ccbb5a199965a8"; - }; - } - { - name = "whatwg_url___whatwg_url_7.0.0.tgz"; - path = fetchurl { - name = "whatwg_url___whatwg_url_7.0.0.tgz"; - url = "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-7.0.0.tgz"; - sha1 = "fde926fa54a599f3adf82dff25a9f7be02dc6edd"; - }; - } { name = "whatwg_url___whatwg_url_8.1.0.tgz"; path = fetchurl { @@ -13617,14 +13657,6 @@ sha1 = "c628acdcf45b82274ce7281ee31dd3c839791771"; }; } - { - name = "which_module___which_module_1.0.0.tgz"; - path = fetchurl { - name = "which_module___which_module_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/which-module/-/which-module-1.0.0.tgz"; - sha1 = "bba63ca861948994ff307736089e3b96026c2a4f"; - }; - } { name = "which_module___which_module_2.0.0.tgz"; path = fetchurl { @@ -13641,6 +13673,14 @@ sha1 = "a45043d54f5805316da8d62f9f50918d3da70b0a"; }; } + { + name = "which___which_2.0.2.tgz"; + path = fetchurl { + name = "which___which_2.0.2.tgz"; + url = "https://registry.yarnpkg.com/which/-/which-2.0.2.tgz"; + sha1 = "7c6a8dd0a636a0327e10b59c9286eee93f3f51b1"; + }; + } { name = "wide_align___wide_align_1.1.3.tgz"; path = fetchurl { @@ -13705,6 +13745,14 @@ sha1 = "1fd1f67235d5b6d0fee781056001bfb694c03b09"; }; } + { + name = "wrap_ansi___wrap_ansi_6.2.0.tgz"; + path = fetchurl { + name = "wrap_ansi___wrap_ansi_6.2.0.tgz"; + url = "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-6.2.0.tgz"; + sha1 = "e9393ba07102e6c91a3b221478f0257cd2856e53"; + }; + } { name = "wrappy___wrappy_1.0.2.tgz"; path = fetchurl { @@ -13713,14 +13761,6 @@ sha1 = "b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"; }; } - { - name = "write_file_atomic___write_file_atomic_2.4.1.tgz"; - path = fetchurl { - name = "write_file_atomic___write_file_atomic_2.4.1.tgz"; - url = "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-2.4.1.tgz"; - sha1 = "d0b05463c188ae804396fd5ab2a370062af87529"; - }; - } { name = "write_file_atomic___write_file_atomic_3.0.3.tgz"; path = fetchurl { @@ -13737,14 +13777,6 @@ sha1 = "0800e14523b923a387e415123c865616aae0f5c3"; }; } - { - name = "ws___ws_5.2.2.tgz"; - path = fetchurl { - name = "ws___ws_5.2.2.tgz"; - url = "https://registry.yarnpkg.com/ws/-/ws-5.2.2.tgz"; - sha1 = "dffef14866b8e8dc9133582514d1befaf96e980f"; - }; - } { name = "ws___ws_6.2.1.tgz"; path = fetchurl { @@ -13873,14 +13905,6 @@ sha1 = "c9d14e48be6873aa46fb429f22f2165557fd2dea"; }; } - { - name = "y18n___y18n_3.2.1.tgz"; - path = fetchurl { - name = "y18n___y18n_3.2.1.tgz"; - url = "https://registry.yarnpkg.com/y18n/-/y18n-3.2.1.tgz"; - sha1 = "6d15fba884c08679c0d77e88e7759e811e07fa41"; - }; - } { name = "y18n___y18n_4.0.0.tgz"; path = fetchurl { @@ -13913,6 +13937,14 @@ sha1 = "9bb92790d9c0effec63be73519e11a35019a3a72"; }; } + { + name = "yargs_parser___yargs_parser_20.2.1.tgz"; + path = fetchurl { + name = "yargs_parser___yargs_parser_20.2.1.tgz"; + url = "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.1.tgz"; + sha1 = "28f3773c546cdd8a69ddae68116b48a5da328e77"; + }; + } { name = "yargs_parser___yargs_parser_10.1.0.tgz"; path = fetchurl { @@ -13930,19 +13962,19 @@ }; } { - name = "yargs_parser___yargs_parser_13.1.1.tgz"; + name = "yargs_parser___yargs_parser_13.1.2.tgz"; path = fetchurl { - name = "yargs_parser___yargs_parser_13.1.1.tgz"; - url = "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-13.1.1.tgz"; - sha1 = "d26058532aa06d365fe091f6a1fc06b2f7e5eca0"; + name = "yargs_parser___yargs_parser_13.1.2.tgz"; + url = "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-13.1.2.tgz"; + sha1 = "130f09702ebaeef2650d54ce6e3e5706f7a4fb38"; }; } { - name = "yargs_parser___yargs_parser_5.0.0.tgz"; + name = "yargs_parser___yargs_parser_18.1.3.tgz"; path = fetchurl { - name = "yargs_parser___yargs_parser_5.0.0.tgz"; - url = "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-5.0.0.tgz"; - sha1 = "275ecf0d7ffe05c77e64e7c86e4cd94bf0e1228a"; + name = "yargs_parser___yargs_parser_18.1.3.tgz"; + url = "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-18.1.3.tgz"; + sha1 = "be68c4975c6b2abf469236b0c870362fab09a7b0"; }; } { @@ -13962,11 +13994,19 @@ }; } { - name = "yargs___yargs_7.1.0.tgz"; + name = "yargs___yargs_13.3.2.tgz"; path = fetchurl { - name = "yargs___yargs_7.1.0.tgz"; - url = "https://registry.yarnpkg.com/yargs/-/yargs-7.1.0.tgz"; - sha1 = "6ba318eb16961727f5d284f8ea003e8d6154d0c8"; + name = "yargs___yargs_13.3.2.tgz"; + url = "https://registry.yarnpkg.com/yargs/-/yargs-13.3.2.tgz"; + sha1 = "ad7ffefec1aa59565ac915f82dccb38a9c31a2dd"; + }; + } + { + name = "yargs___yargs_15.4.1.tgz"; + path = fetchurl { + name = "yargs___yargs_15.4.1.tgz"; + url = "https://registry.yarnpkg.com/yargs/-/yargs-15.4.1.tgz"; + sha1 = "0d87a16de01aee9d8bec2bfbf74f67851730f4f8"; }; } { From 0f82bd767b16daa7e228464593bcf6b7dd4baae4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Milan=20P=C3=A4ssler?= Date: Fri, 20 Nov 2020 21:15:42 +0100 Subject: [PATCH 079/260] nixos/gitlab: start gitaly after gitlab --- nixos/modules/services/misc/gitlab.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/misc/gitlab.nix b/nixos/modules/services/misc/gitlab.nix index 56fd89c61232..c4037b49e7e2 100644 --- a/nixos/modules/services/misc/gitlab.nix +++ b/nixos/modules/services/misc/gitlab.nix @@ -756,7 +756,8 @@ in { }; systemd.services.gitaly = { - after = [ "network.target" ]; + after = [ "network.target" "gitlab.service" ]; + requires = [ "gitlab.service" ]; wantedBy = [ "multi-user.target" ]; path = with pkgs; [ openssh @@ -845,7 +846,7 @@ in { }; systemd.services.gitlab = { - after = [ "gitlab-workhorse.service" "gitaly.service" "network.target" "gitlab-postgresql.service" "redis.service" ]; + after = [ "gitlab-workhorse.service" "network.target" "gitlab-postgresql.service" "redis.service" ]; requires = [ "gitlab-sidekiq.service" ]; wantedBy = [ "multi-user.target" ]; environment = gitlabEnv; From 2429d5a307198b2349dcc2b69dec63359622e222 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Milan=20P=C3=A4ssler?= Date: Fri, 20 Nov 2020 21:02:55 +0100 Subject: [PATCH 080/260] gitlab: 13.5.1 -> 13.6.0 Changed ruby version to 2.7.x to match upstream. Added a gem config for gitlab-pg_query as it tries to download a source tarball during the build process. Also removed a patch for gitaly that has become obsolete by upstream fix [here](https://gitlab.com/gitlab-org/gitaly/-/commit/de04077c25cc23b001317d2efdf5a9ead0bc86b9). --- .../version-management/gitlab/data.json | 14 +- .../version-management/gitlab/gitaly/Gemfile | 11 +- .../gitlab/gitaly/Gemfile.lock | 38 +-- .../gitlab/gitaly/default.nix | 12 +- .../version-management/gitlab/gitaly/deps.nix | 59 ++-- .../gitlab/gitaly/fix-executable-check.patch | 13 - .../gitlab/gitaly/gemset.nix | 120 +------- .../gitlab/gitlab-shell/default.nix | 4 +- .../gitlab/gitlab-workhorse/default.nix | 4 +- .../gitlab/gitlab-workhorse/deps.nix | 8 +- .../version-management/gitlab/rubyEnv/Gemfile | 36 ++- .../gitlab/rubyEnv/Gemfile.lock | 146 +++++----- .../gitlab/rubyEnv/gemset.nix | 222 +++++++++------ .../version-management/gitlab/update.py | 6 +- .../version-management/gitlab/yarnPkgs.nix | 256 ++++++++++++------ .../ruby-modules/gem-config/default.nix | 10 + pkgs/top-level/all-packages.nix | 17 +- 17 files changed, 505 insertions(+), 471 deletions(-) delete mode 100644 pkgs/applications/version-management/gitlab/gitaly/fix-executable-check.patch diff --git a/pkgs/applications/version-management/gitlab/data.json b/pkgs/applications/version-management/gitlab/data.json index a235462ce545..40e9fc5234e1 100644 --- a/pkgs/applications/version-management/gitlab/data.json +++ b/pkgs/applications/version-management/gitlab/data.json @@ -1,13 +1,13 @@ { - "version": "13.5.1", - "repo_hash": "1mb2kyyf5bczm93qn4nj3fqjgncsq98rr3414wx52lhcf4gl5w00", + "version": "13.6.0", + "repo_hash": "1flri1cgx8drwf46x4sja366aiiif0ww807xrrcxa05pxj0mx8k5", "owner": "gitlab-org", "repo": "gitlab", - "rev": "v13.5.1-ee", + "rev": "v13.6.0-ee", "passthru": { - "GITALY_SERVER_VERSION": "13.5.1", - "GITLAB_PAGES_VERSION": "1.28.0", - "GITLAB_SHELL_VERSION": "13.11.0", - "GITLAB_WORKHORSE_VERSION": "8.51.0" + "GITALY_SERVER_VERSION": "13.6.0", + "GITLAB_PAGES_VERSION": "1.30.0", + "GITLAB_SHELL_VERSION": "13.13.0", + "GITLAB_WORKHORSE_VERSION": "8.54.0" } } diff --git a/pkgs/applications/version-management/gitlab/gitaly/Gemfile b/pkgs/applications/version-management/gitlab/gitaly/Gemfile index 9016a64a0873..d8564dca8779 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/Gemfile +++ b/pkgs/applications/version-management/gitlab/gitaly/Gemfile @@ -1,8 +1,5 @@ source 'https://rubygems.org' -# Require bundler >= 1.16.5 to avoid this bug: https://github.com/bundler/bundler/issues/6537 -gem 'bundler', '>= 1.17.3' - gem 'rugged', '~> 0.28' gem 'github-linguist', '~> 7.11', require: 'linguist' gem 'gitlab-markup', '~> 1.7.1' @@ -16,7 +13,7 @@ gem 'faraday', '~> 1.0' gem 'rbtrace', require: false # Labkit provides observability functionality -gem 'gitlab-labkit', '~> 0.12.0' +gem 'gitlab-labkit', '~> 0.13.2' # Detects the open source license the repository includes # This version needs to be in sync with GitLab CE/EE @@ -33,10 +30,4 @@ group :development, :test do gem 'pry', '~> 0.12.2', require: false gem 'grpc-tools', '= 1.30.2' - - # gitlab-shell spec gems - gem 'listen', '~> 0.5.0' - gem 'simplecov', '~> 0.17.1', require: false - gem 'vcr', '~> 4.0.0' - gem 'webmock', '~> 3.4.0' end diff --git a/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock b/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock index 451150f0eb3a..a633e067f0d9 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock +++ b/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock @@ -24,9 +24,7 @@ GEM adamantium (0.2.0) ice_nine (~> 0.11.0) memoizable (~> 0.4.0) - addressable (2.6.0) - public_suffix (>= 2.0.2, < 4.0) - ast (2.4.0) + ast (2.4.1) binding_ninja (0.2.3) builder (3.2.4) charlock_holmes (0.7.7) @@ -35,11 +33,8 @@ GEM adamantium (~> 0.2.0) equalizer (~> 0.0.9) concurrent-ruby (1.1.7) - crack (0.4.3) - safe_yaml (~> 1.0.0) crass (1.0.6) diff-lcs (1.3) - docile (1.3.2) equalizer (0.0.11) erubi (1.9.0) escape_utils (1.2.1) @@ -67,11 +62,11 @@ GEM gitlab-gollum-rugged_adapter (0.4.4.2) mime-types (>= 1.15) rugged (~> 0.25) - gitlab-labkit (0.12.0) + gitlab-labkit (0.13.2) actionpack (>= 5.0.0, < 6.1.0) activesupport (>= 5.0.0, < 6.1.0) grpc (~> 1.19) - jaeger-client (~> 0.10) + jaeger-client (~> 1.1) opentracing (~> 0.4) redis (> 3.0.0, < 5.0.0) gitlab-markup (1.7.1) @@ -82,17 +77,15 @@ GEM google-protobuf (~> 3.12) googleapis-common-protos-types (~> 1.0) grpc-tools (1.30.2) - hashdiff (0.3.9) i18n (1.8.5) concurrent-ruby (~> 1.0) ice_nine (0.11.2) - jaeger-client (0.10.0) + jaeger-client (1.1.0) opentracing (~> 0.3) thrift json (2.3.1) licensee (8.9.2) rugged (~> 0.24) - listen (0.5.3) loofah (2.7.0) crass (~> 1.0.2) nokogiri (>= 1.5.9) @@ -114,8 +107,8 @@ GEM opentracing (0.5.0) optimist (3.0.1) parallel (1.19.2) - parser (2.7.0.5) - ast (~> 2.4.0) + parser (2.7.2.0) + ast (~> 2.4.1) proc_to_ast (0.1.0) coderay parser @@ -124,7 +117,6 @@ GEM pry (0.12.2) coderay (~> 1.1.0) method_source (~> 0.9.0) - public_suffix (3.0.3) rack (2.2.3) rack-test (1.1.0) rack (>= 1.0, < 3) @@ -175,18 +167,12 @@ GEM parser (>= 2.7.0.1) ruby-progressbar (1.10.1) rugged (0.28.4.1) - safe_yaml (1.0.5) sanitize (4.6.6) crass (~> 1.0.2) nokogiri (>= 1.4.4) nokogumbo (~> 1.4) sentry-raven (3.0.4) faraday (>= 1.0) - simplecov (0.17.1) - docile (~> 1.1) - json (>= 1.8, < 3) - simplecov-html (~> 0.10.0) - simplecov-html (0.10.2) stringex (2.8.5) thread_safe (0.3.6) thrift (0.11.0.0) @@ -202,11 +188,6 @@ GEM equalizer (~> 0.0.9) parser (>= 2.6.5) procto (~> 0.0.2) - vcr (4.0.0) - webmock (3.4.2) - addressable (>= 2.3.6) - crack (>= 0.3.2) - hashdiff zeitwerk (2.4.0) PLATFORMS @@ -214,19 +195,17 @@ PLATFORMS DEPENDENCIES activesupport (~> 6.0.3.3) - bundler (>= 1.17.3) factory_bot faraday (~> 1.0) github-linguist (~> 7.11) gitlab-gollum-lib (~> 4.2.7.9) gitlab-gollum-rugged_adapter (~> 0.4.4.2) - gitlab-labkit (~> 0.12.0) + gitlab-labkit (~> 0.13.2) gitlab-markup (~> 1.7.1) google-protobuf (~> 3.12) grpc (~> 1.30.2) grpc-tools (= 1.30.2) licensee (~> 8.9.0) - listen (~> 0.5.0) pry (~> 0.12.2) rbtrace rdoc (~> 6.0) @@ -235,10 +214,7 @@ DEPENDENCIES rubocop (~> 0.69) rugged (~> 0.28) sentry-raven (~> 3.0) - simplecov (~> 0.17.1) timecop - vcr (~> 4.0.0) - webmock (~> 3.4.0) BUNDLED WITH 2.1.4 diff --git a/pkgs/applications/version-management/gitlab/gitaly/default.nix b/pkgs/applications/version-management/gitlab/gitaly/default.nix index 0b1774e440a7..51818072d396 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/default.nix +++ b/pkgs/applications/version-management/gitlab/gitaly/default.nix @@ -19,22 +19,16 @@ let }; }; in buildGoPackage rec { - version = "13.5.1"; + version = "13.6.0"; pname = "gitaly"; src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitaly"; rev = "v${version}"; - sha256 = "1vkifmp56lkgj178na7pqd5h9yxffcy78yaz7ykd4rmgi4c8ayk8"; + sha256 = "1b3vjg5sxrg8cfxn1nh8j26h847kxrfnn2chbb5v3ivhp1kp6zh2"; }; - # Fix a check which assumes that hook files are writeable by their - # owner. - patches = [ - ./fix-executable-check.patch - ]; - goPackagePath = "gitlab.com/gitlab-org/gitaly"; passthru = { @@ -48,7 +42,7 @@ in buildGoPackage rec { postInstall = '' mkdir -p $ruby - cp -rv $src/ruby/{bin,lib,proto,git-hooks,gitlab-shell} $ruby + cp -rv $src/ruby/{bin,lib,proto,git-hooks} $ruby ''; outputs = [ "out" "ruby" ]; diff --git a/pkgs/applications/version-management/gitlab/gitaly/deps.nix b/pkgs/applications/version-management/gitlab/gitaly/deps.nix index 3aec5d10186f..532fc9faa89d 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/deps.nix +++ b/pkgs/applications/version-management/gitlab/gitaly/deps.nix @@ -428,8 +428,8 @@ fetch = { type = "git"; url = "https://github.com/getsentry/raven-go"; - rev = "v0.1.2"; - sha256 = "1dl80kar4lzdcfl3w6jssi1ld6bv0rmx6sp6bz6rzysfr9ilm02z"; + rev = "v0.2.0"; + sha256 = "0imfwmsb72168fqandf2lxhzhngf2flxhzaar8hcnnfjv2a291lf"; }; } { @@ -437,8 +437,8 @@ fetch = { type = "git"; url = "https://github.com/getsentry/sentry-go"; - rev = "v0.5.1"; - sha256 = "1kfn0gcb4c6amhagv04ydpl6p9cqw7f0lxas688a0rf89iwdzz89"; + rev = "v0.7.0"; + sha256 = "13n9r7845wsq9z61rbvlqjjjg4aifplc74v3kv0i1lys2fw8a5k9"; }; } { @@ -1395,6 +1395,15 @@ sha256 = "11zbhg4kds5idsya04bwz4plj0mmiigypzppzih731ppbk2ms1zg"; }; } + { + goPackagePath = "github.com/oklog/ulid"; + fetch = { + type = "git"; + url = "https://github.com/oklog/ulid"; + rev = "v2.0.2"; + sha256 = "1apm4r23kxsm0c9hlxsr7xh6xwrk2cjqylbpxd4ffxbl6bwflja0"; + }; + } { goPackagePath = "github.com/olekukonko/tablewriter"; fetch = { @@ -1436,8 +1445,8 @@ fetch = { type = "git"; url = "https://github.com/opentracing/opentracing-go"; - rev = "v1.0.2"; - sha256 = "0i0ghg94dg8lk05mw5n23983wq04yjvkjmdkc9z5y1f3508938h9"; + rev = "v1.2.0"; + sha256 = "04rgdwl29kimp2wnm4dycnzp7941hvpj6wym85x23c6fclacm94h"; }; } { @@ -1467,6 +1476,15 @@ sha256 = "0kfc95jc2hfgwzcpdfa5hrxgj7s6rzx5jc0n1sn863bsngx2q1ca"; }; } + { + goPackagePath = "github.com/pborman/getopt"; + fetch = { + type = "git"; + url = "https://github.com/pborman/getopt"; + rev = "7148bc3a4c30"; + sha256 = "0zhvvmv671r1fbdd5hbv3flx8k2rb60giqx115w0553c56qkqfpj"; + }; + } { goPackagePath = "github.com/pelletier/go-toml"; fetch = { @@ -1634,8 +1652,8 @@ fetch = { type = "git"; url = "https://github.com/sirupsen/logrus"; - rev = "v1.6.0"; - sha256 = "1zf9is1yxxnna0d1pyag2m9ziy3l27zb2j92p9msm1gx5jjrvzzj"; + rev = "v1.7.0"; + sha256 = "1a59pw7zimvm8k423iq9l4f4qjj1ia1xc6pkmhwl2mxc46y2n442"; }; } { @@ -1733,8 +1751,8 @@ fetch = { type = "git"; url = "https://github.com/stretchr/testify"; - rev = "v1.5.1"; - sha256 = "09r89m1wy4cjv2nps1ykp00qjpi0531r07q3s34hr7m6njk4srkl"; + rev = "v1.6.1"; + sha256 = "1yhiqqzjvi63pf01rgzx68gqkkvjx03fvl5wk30br5l6s81s090l"; }; } { @@ -1913,8 +1931,8 @@ fetch = { type = "git"; url = "https://gitlab.com/gitlab-org/gitlab-shell.git"; - rev = "1a2bfecd2f0e"; - sha256 = "197b3yn7lp6dbzcgxrj3ns2a839adcfmcwi3h53i1sr6952ciayx"; + rev = "3f9890ef73dc"; + sha256 = "1zx7x3g18xzw7fs7cayd20llxabv5r93m2mp6ixgr99ksvi6zix7"; }; } { @@ -1922,8 +1940,8 @@ fetch = { type = "git"; url = "https://gitlab.com/gitlab-org/labkit.git"; - rev = "45895e129029"; - sha256 = "17adv1gcdg0jiy8i5lr064pm3p9ywq6s0iwh9w4q5pycp4qkmn48"; + rev = "40dcf811328c"; + sha256 = "1x22iz53wjg1qps0bnr4lniik09szmy99ny2kb6smjpv9cr6klw7"; }; } { @@ -2030,8 +2048,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/sys"; - rev = "af09f7315aff"; - sha256 = "0kr94lzr8ngrc6913j5xh6g4r7g087dbdgnpzi6rjcl0bf8nsr22"; + rev = "e3ed0017c211"; + sha256 = "0nz91nxgfcbcxirscdrxcq5a97z5pyz0g0k2chjxx228dz59aw1i"; }; } { @@ -2250,6 +2268,15 @@ sha256 = "1md0hlyd9s6myv3663i9l59y74n4xjazifmmyxn43g86fgkc5lzj"; }; } + { + goPackagePath = "gopkg.in/yaml.v3"; + fetch = { + type = "git"; + url = "https://gopkg.in/yaml.v3"; + rev = "9f266ea9e77c"; + sha256 = "1bbai3lzb50m0x2vwsdbagrbhvfylj9k1m32hgbqwldqx4p9ay35"; + }; + } { goPackagePath = "honnef.co/go/tools"; fetch = { diff --git a/pkgs/applications/version-management/gitlab/gitaly/fix-executable-check.patch b/pkgs/applications/version-management/gitlab/gitaly/fix-executable-check.patch deleted file mode 100644 index 7221377e33cd..000000000000 --- a/pkgs/applications/version-management/gitlab/gitaly/fix-executable-check.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/internal/gitaly/config/config.go b/internal/gitaly/config/config.go -index 993e095d..f9bbb943 100644 ---- a/internal/gitaly/config/config.go -+++ b/internal/gitaly/config/config.go -@@ -217,7 +217,7 @@ func checkExecutable(path string) error { - return err - } - -- if fi.Mode()&0755 < 0755 { -+ if fi.Mode()&0555 < 0555 { - return fmt.Errorf("not executable: %v", path) - } - diff --git a/pkgs/applications/version-management/gitlab/gitaly/gemset.nix b/pkgs/applications/version-management/gitlab/gitaly/gemset.nix index d09532187203..9cdadec5d4fb 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/gemset.nix +++ b/pkgs/applications/version-management/gitlab/gitaly/gemset.nix @@ -49,24 +49,15 @@ }; version = "0.2.0"; }; - addressable = { - dependencies = ["public_suffix"]; + ast = { groups = ["default" "development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0bcm2hchn897xjhqj9zzsxf3n9xhddymj4lsclz508f4vw3av46l"; + sha256 = "1l3468czzjmxl93ap40hp7z94yxp4nbag0bxqs789bm30md90m2a"; type = "gem"; }; - version = "2.6.0"; - }; - ast = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "184ssy3w93nkajlz2c70ifm79jp3j737294kbc5fjw69v1w0n9x7"; - type = "gem"; - }; - version = "2.4.0"; + version = "2.4.1"; }; binding_ninja = { groups = ["default" "development" "test"]; @@ -125,15 +116,6 @@ }; version = "1.1.7"; }; - crack = { - dependencies = ["safe_yaml"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0abb0fvgw00akyik1zxnq7yv391va148151qxdghnzngv66bl62k"; - type = "gem"; - }; - version = "0.4.3"; - }; crass = { groups = ["default"]; platforms = []; @@ -152,16 +134,6 @@ }; version = "1.3"; }; - docile = { - groups = ["default" "development" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0qrwiyagxzl8zlx3dafb0ay8l14ib7imb2rsmx70i5cp420v8gif"; - type = "gem"; - }; - version = "1.3.2"; - }; equalizer = { source = { remotes = ["https://rubygems.org"]; @@ -276,10 +248,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0a63zgjll83b25hiq8m4sk75jci2rj8z46lss0j3bc6zi3pxnzax"; + sha256 = "0vgd61xdclihifcdivddfs1gipxy1ql0kf9q47k9h0xisscyjhd2"; type = "gem"; }; - version = "0.12.0"; + version = "0.13.2"; }; gitlab-markup = { groups = ["default"]; @@ -333,16 +305,6 @@ }; version = "1.30.2"; }; - hashdiff = { - groups = ["default" "development" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1qji49afni3c90zws617x514xi7ik70g2iwngj9skq68mjcq6y4x"; - type = "gem"; - }; - version = "0.3.9"; - }; i18n = { dependencies = ["concurrent-ruby"]; groups = ["default" "development" "test"]; @@ -368,10 +330,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "198m72c9w3wfwr1mq22dcjjm7d4jd0bci4lrq6zq2zvlzhi04n8l"; + sha256 = "1a2qlkc1hkr5hkj2574l1a63sm04bdx98gfhh9m8vvp6psdrnpnb"; type = "gem"; }; - version = "0.10.0"; + version = "1.1.0"; }; json = { groups = ["default" "development" "test"]; @@ -392,14 +354,6 @@ }; version = "8.9.2"; }; - listen = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0inlw7vix61170vjr87h9izhjm5dbby8rbfrf1iryiv7b3kyvkxl"; - type = "gem"; - }; - version = "0.5.3"; - }; loofah = { dependencies = ["crass" "nokogiri"]; groups = ["default"]; @@ -553,10 +507,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0iirjc36irgwpfb58jdf9gli382cj893y9caqhxas8anpzzlikgc"; + sha256 = "1f7gmm60yla325wlnd3qkxs59qm2y0aan8ljpg6k18rwzrrfil6z"; type = "gem"; }; - version = "2.7.0.5"; + version = "2.7.2.0"; }; proc_to_ast = { dependencies = ["coderay" "parser" "unparser"]; @@ -584,14 +538,6 @@ }; version = "0.12.2"; }; - public_suffix = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "08q64b5br692dd3v0a9wq9q5dvycc6kmiqmjbdxkxbfizggsvx6l"; - type = "gem"; - }; - version = "3.0.3"; - }; rack = { groups = ["default"]; platforms = []; @@ -811,16 +757,6 @@ }; version = "0.28.4.1"; }; - safe_yaml = { - groups = ["default" "development" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0j7qv63p0vqcd838i2iy2f76c3dgwzkiz1d1xkg7n0pbnxj2vb56"; - type = "gem"; - }; - version = "1.0.5"; - }; sanitize = { dependencies = ["crass" "nokogiri" "nokogumbo"]; source = { @@ -841,27 +777,6 @@ }; version = "3.0.4"; }; - simplecov = { - dependencies = ["docile" "json" "simplecov-html"]; - groups = ["development" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1135k46nik05sdab30yxb8264lqiz01c8v000g16cl9pjc4mxrdw"; - type = "gem"; - }; - version = "0.17.1"; - }; - simplecov-html = { - groups = ["default" "development" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1lihraa4rgxk8wbfl77fy9sf0ypk31iivly8vl3w04srd7i0clzn"; - type = "gem"; - }; - version = "0.10.2"; - }; stringex = { groups = ["default"]; platforms = []; @@ -930,23 +845,6 @@ }; version = "0.4.7"; }; - vcr = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0qh7lkj9b0shph84dw1wsrlaprl0jn1i4339fpsfy99402290zrr"; - type = "gem"; - }; - version = "4.0.0"; - }; - webmock = { - dependencies = ["addressable" "crack" "hashdiff"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "03994dxs4xayvkxqp01dd1ivhg4xxx7z35f7cxw7y2mwj3xn24ib"; - type = "gem"; - }; - version = "3.4.2"; - }; zeitwerk = { groups = ["default" "development" "test"]; platforms = []; diff --git a/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix b/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix index f918bfb1cab6..1e48b569c650 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix +++ b/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix @@ -2,12 +2,12 @@ buildGoPackage rec { pname = "gitlab-shell"; - version = "13.11.0"; + version = "13.13.0"; src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-shell"; rev = "v${version}"; - sha256 = "1m18v5qax14qz0a0ifpl96i4p5caysls33hg93q1x83x1xryxd54"; + sha256 = "1zx7x3g18xzw7fs7cayd20llxabv5r93m2mp6ixgr99ksvi6zix7"; }; buildInputs = [ ruby ]; diff --git a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix index f6d633af2c47..0ec96a8f9eaf 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix +++ b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix @@ -3,13 +3,13 @@ buildGoPackage rec { pname = "gitlab-workhorse"; - version = "8.51.0"; + version = "8.54.0"; src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-workhorse"; rev = "v${version}"; - sha256 = "012xbnd4lqfv478bbd2r9jhnb2f162gsa5y77z3by0kqqpsglgl5"; + sha256 = "0fz00sl9q4d3vbslh7y9nsnhjshgfg0x7mv7b7a9sc3mxmabp7gz"; }; goPackagePath = "gitlab.com/gitlab-org/gitlab-workhorse"; diff --git a/pkgs/applications/version-management/gitlab/gitlab-workhorse/deps.nix b/pkgs/applications/version-management/gitlab/gitlab-workhorse/deps.nix index d8433778ae20..987970917d53 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-workhorse/deps.nix +++ b/pkgs/applications/version-management/gitlab/gitlab-workhorse/deps.nix @@ -347,8 +347,8 @@ fetch = { type = "git"; url = "https://github.com/certifi/gocertifi"; - rev = "ee1a9a0726d2"; - sha256 = "08l6lqaw83pva6fa0aafmhmy1mhb145av21772zfh3ij809a37i4"; + rev = "2c3bb06c6054"; + sha256 = "00g5jy613nkm96k6ylbcwdwpdhm84mvw2gqr3gmj5mhwmsc8x97p"; }; } { @@ -671,8 +671,8 @@ fetch = { type = "git"; url = "https://github.com/getsentry/raven-go"; - rev = "v0.1.2"; - sha256 = "1dl80kar4lzdcfl3w6jssi1ld6bv0rmx6sp6bz6rzysfr9ilm02z"; + rev = "v0.2.0"; + sha256 = "0imfwmsb72168fqandf2lxhzhngf2flxhzaar8hcnnfjv2a291lf"; }; } { diff --git a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile index 51f9d36cef90..d60fefe29dca 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile +++ b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile @@ -19,7 +19,7 @@ gem 'default_value_for', '~> 3.3.0' gem 'pg', '~> 1.1' gem 'rugged', '~> 0.28' -gem 'grape-path-helpers', '~> 1.4' +gem 'grape-path-helpers', '~> 1.5' gem 'faraday', '~> 1.0' gem 'marginalia', '~> 1.9.0' @@ -48,7 +48,7 @@ gem 'omniauth-authentiq', '~> 0.3.3' gem 'omniauth_openid_connect', '~> 0.3.5' gem 'omniauth-salesforce', '~> 1.0.5' gem 'omniauth-atlassian-oauth2', '~> 0.2.0' -gem 'rack-oauth2', '~> 1.9.3' +gem 'rack-oauth2', '~> 1.16.0' gem 'jwt', '~> 2.1.0' # Kerberos authentication. EE-only @@ -98,6 +98,7 @@ gem 'graphql', '~> 1.11.4' gem 'graphiql-rails', '~> 1.4.10' gem 'apollo_upload_server', '~> 2.0.2' gem 'graphql-docs', '~> 1.6.0', group: [:development, :test] +gem 'graphlient', '~> 0.4.0' # Used by BulkImport feature (group::import) gem 'hashie' # Disable strong_params so that Mash does not respond to :permitted? @@ -118,7 +119,7 @@ gem 'fog-aws', '~> 3.5' # Locked until fog-google resolves https://github.com/fog/fog-google/issues/421. # Also see config/initializers/fog_core_patch.rb. gem 'fog-core', '= 2.1.0' -gem 'fog-google', '~> 1.10' +gem 'fog-google', '~> 1.11' gem 'fog-local', '~> 0.6' gem 'fog-openstack', '~> 1.0' gem 'fog-rackspace', '~> 0.1.1' @@ -158,7 +159,7 @@ gem 'wikicloth', '0.8.1' gem 'asciidoctor', '~> 2.0.10' gem 'asciidoctor-include-ext', '~> 0.3.1', require: false gem 'asciidoctor-plantuml', '~> 0.0.12' -gem 'rouge', '~> 3.24.0' +gem 'rouge', '~> 3.25.0' gem 'truncato', '~> 0.7.11' gem 'bootstrap_form', '~> 4.2.0' gem 'nokogiri', '~> 1.10.9' @@ -172,7 +173,7 @@ gem 'diffy', '~> 3.3' gem 'diff_match_patch', '~> 0.1.0' # Application server -gem 'rack', '~> 2.1.4' +gem 'rack', '~> 2.2.3' # https://github.com/sharpstone/rack-timeout/blob/master/README.md#rails-apps-manually gem 'rack-timeout', '~> 0.5.1', require: 'rack/timeout/base' @@ -271,9 +272,6 @@ gem 'loofah', '~> 2.2' # Working with license gem 'licensee', '~> 8.9' -# Ace editor -gem 'ace-rails-ap', '~> 4.1.0' - # Detect and convert string character encoding gem 'charlock_holmes', '~> 0.7.7' @@ -307,13 +305,16 @@ gem 'rack-attack', '~> 6.3.0' # Sentry integration gem 'sentry-raven', '~> 3.0' +# PostgreSQL query parsing +gem 'gitlab-pg_query', '~> 1.3', require: 'pg_query' + gem 'premailer-rails', '~> 1.10.3' # LabKit: Tracing and Correlation -gem 'gitlab-labkit', '0.12.2' +gem 'gitlab-labkit', '0.13.1' # I18n -gem 'ruby_parser', '~> 3.8', require: false +gem 'ruby_parser', '~> 3.15', require: false gem 'rails-i18n', '~> 6.0' gem 'gettext_i18n_rails', '~> 1.8.0' gem 'gettext_i18n_rails_js', '~> 1.3' @@ -366,22 +367,19 @@ group :development, :test do # Generate Fake data gem 'ffaker', '~> 2.10' - gem 'spring', '~> 2.0.0' + gem 'spring', '~> 2.1.0' gem 'spring-commands-rspec', '~> 1.0.4' - gem 'gitlab-styles', '~> 4.3.0', require: false - # Pin these dependencies, otherwise a new rule could break the CI pipelines - gem 'rubocop', '~> 0.82.0' - gem 'rubocop-performance', '~> 1.5.2' - gem 'rubocop-rspec', '~> 1.37.0' + gem 'gitlab-styles', '~> 5.1.0', require: false - gem 'scss_lint', '~> 0.56.0', require: false - gem 'haml_lint', '~> 0.34.0', require: false + gem 'scss_lint', '~> 0.59.0', require: false + gem 'haml_lint', '~> 0.36.0', require: false gem 'bundler-audit', '~> 0.6.1', require: false gem 'benchmark-ips', '~> 2.3.0', require: false gem 'knapsack', '~> 1.17' + gem 'crystalball', '~> 0.7.0', require: false gem 'simple_po_parser', '~> 1.1.2', require: false @@ -407,7 +405,7 @@ end group :test do gem 'fuubar', '~> 2.2.0' gem 'rspec-retry', '~> 0.6.1' - gem 'rspec_profiling', '~> 0.0.5' + gem 'rspec_profiling', '~> 0.0.6' gem 'rspec-parameterized', require: false gem 'capybara', '~> 3.33.0' diff --git a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock index 2ad66f6e6c0d..64179847dd8c 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock +++ b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock @@ -3,7 +3,6 @@ GEM specs: RedCloth (4.3.2) abstract_type (0.0.7) - ace-rails-ap (4.1.2) acme-client (2.0.6) faraday (>= 0.17, < 2.0.0) actioncable (6.0.3.3) @@ -71,7 +70,7 @@ GEM memoizable (~> 0.4.0) addressable (2.7.0) public_suffix (>= 2.0.2, < 5.0) - aes_key_wrap (1.0.1) + aes_key_wrap (1.1.0) akismet (3.0.0) android_key_attestation (0.3.0) apollo_upload_server (2.0.2) @@ -87,7 +86,7 @@ GEM asciidoctor (>= 1.5.6, < 3.0.0) asciidoctor-plantuml (0.0.12) asciidoctor (>= 1.5.6, < 3.0.0) - ast (2.4.0) + ast (2.4.1) atlassian-jwt (0.2.0) jwt (~> 2.1.0) attr_encrypted (3.1.0) @@ -133,7 +132,7 @@ GEM coderay (>= 1.0.0) erubi (>= 1.0.0) rack (>= 0.9.0) - bindata (2.4.3) + bindata (2.4.8) binding_ninja (0.2.3) bootsnap (1.4.6) msgpack (~> 1.0) @@ -199,6 +198,8 @@ GEM safe_yaml (~> 1.0.0) crass (1.0.6) creole (0.5.0) + crystalball (0.7.0) + git css_parser (1.7.0) addressable daemons (1.2.6) @@ -368,11 +369,12 @@ GEM excon (~> 0.58) formatador (~> 0.2) mime-types - fog-google (1.10.0) + fog-google (1.11.0) fog-core (<= 2.1.0) fog-json (~> 1.2) fog-xml (~> 0.1.0) google-api-client (>= 0.32, < 0.34) + google-cloud-env (~> 1.2) fog-json (1.2.0) fog-core multi_json (~> 1.10) @@ -428,17 +430,18 @@ GEM fog-json (~> 1.2.0) mime-types ms_rest_azure (~> 0.12.0) - gitlab-labkit (0.12.2) + gitlab-labkit (0.13.1) actionpack (>= 5.0.0, < 6.1.0) activesupport (>= 5.0.0, < 6.1.0) grpc (~> 1.19) - jaeger-client (~> 0.10) + jaeger-client (~> 1.1) opentracing (~> 0.4) redis (> 3.0.0, < 5.0.0) gitlab-license (1.0.0) gitlab-mail_room (0.0.7) gitlab-markup (1.7.1) gitlab-net-dns (0.9.1) + gitlab-pg_query (1.3.0) gitlab-puma (4.3.5.gitlab.3) nio4r (~> 2.0) gitlab-puma_worker_killer (0.1.1.gitlab.1) @@ -446,12 +449,12 @@ GEM gitlab-puma (>= 2.7, < 5) gitlab-sidekiq-fetcher (0.5.2) sidekiq (~> 5) - gitlab-styles (4.3.0) - rubocop (~> 0.82.0) + gitlab-styles (5.1.0) + rubocop (~> 0.89.1) rubocop-gitlab-security (~> 0.1.0) - rubocop-performance (~> 1.5.2) - rubocop-rails (~> 2.5) - rubocop-rspec (~> 1.36) + rubocop-performance (~> 1.8.1) + rubocop-rails (~> 2.8) + rubocop-rspec (~> 1.44) gitlab_chronic_duration (0.10.6.2) numerizer (~> 0.2) gitlab_omniauth-ldap (2.1.1) @@ -473,6 +476,8 @@ GEM representable (~> 3.0) retriable (>= 2.0, < 4.0) signet (~> 0.12) + google-cloud-env (1.4.0) + faraday (>= 0.17.3, < 2.0) google-protobuf (3.12.4) googleapis-common-protos-types (1.0.5) google-protobuf (~> 3.11) @@ -495,17 +500,24 @@ GEM grape-entity (0.7.1) activesupport (>= 4.0) multi_json (>= 1.3.2) - grape-path-helpers (1.4.0) + grape-path-helpers (1.5.0) activesupport grape (~> 1.3) - rake (~> 12) + rake (> 12) grape_logging (1.8.3) grape rack graphiql-rails (1.4.10) railties sprockets-rails + graphlient (0.4.0) + faraday (>= 1.0) + faraday_middleware + graphql-client graphql (1.11.4) + graphql-client (0.16.0) + activesupport (>= 3.0) + graphql (~> 1.8) graphql-docs (1.6.0) commonmarker (~> 0.16) escape_utils (~> 1.2) @@ -536,8 +548,9 @@ GEM haml (5.1.2) temple (>= 0.8.0) tilt - haml_lint (0.34.0) - haml (>= 4.0, < 5.2) + haml_lint (0.36.0) + haml (>= 4.0, < 5.3) + parallel (~> 1.10) rainbow rubocop (>= 0.50.0) sysexits (~> 1.1) @@ -586,10 +599,9 @@ GEM invisible_captcha (0.12.1) rails (>= 3.2.0) ipaddress (0.8.3) - jaeger-client (0.10.0) + jaeger-client (1.1.0) opentracing (~> 0.3) thrift - jaro_winkler (1.5.4) jira-ruby (2.0.0) activesupport atlassian-jwt @@ -601,7 +613,7 @@ GEM regexp_parser (~> 1.5) regexp_property_values (~> 0.3) json (2.3.0) - json-jwt (1.11.0) + json-jwt (1.13.0) activesupport (>= 4.2) aes_key_wrap bindata @@ -821,9 +833,9 @@ GEM rubypants (~> 0.2) orm_adapter (0.5.0) os (1.0.0) - parallel (1.19.1) - parser (2.7.1.2) - ast (~> 2.4.0) + parallel (1.19.2) + parser (2.7.2.0) + ast (~> 2.4.1) parslet (1.8.2) peek (1.1.0) railties (>= 4.0.0) @@ -855,19 +867,19 @@ GEM public_suffix (4.0.6) pyu-ruby-sasl (0.0.3.3) raabro (1.1.6) - rack (2.1.4) + rack (2.2.3) rack-accept (0.4.5) rack (>= 0.4) rack-attack (6.3.0) rack (>= 1.0, < 3) rack-cors (1.0.6) rack (>= 1.6.0) - rack-oauth2 (1.9.3) + rack-oauth2 (1.16.0) activesupport attr_required httpclient - json-jwt (>= 1.9.0) - rack + json-jwt (>= 1.11.0) + rack (>= 2.1.0) rack-protection (2.0.5) rack rack-proxy (0.6.0) @@ -910,7 +922,7 @@ GEM thor (>= 0.20.3, < 2.0) rainbow (3.0.0) raindrops (0.19.1) - rake (12.3.3) + rake (13.0.1) rb-fsevent (0.10.4) rb-inotify (0.10.1) ffi (~> 1.0) @@ -945,7 +957,7 @@ GEM redis-store (>= 1.2, < 2) redis-store (1.8.1) redis (>= 4, < 5) - regexp_parser (1.5.1) + regexp_parser (1.8.2) regexp_property_values (0.3.5) representable (3.0.4) declarative (< 0.1.0) @@ -965,7 +977,7 @@ GEM rexml (3.2.4) rinku (2.0.0) rotp (2.1.2) - rouge (3.24.0) + rouge (3.25.0) rqrcode (0.7.0) chunky_png rqrcode-rails3 (0.1.7) @@ -1001,29 +1013,34 @@ GEM rspec-support (3.9.2) rspec_junit_formatter (0.4.1) rspec-core (>= 2, < 4, != 2.12.0) - rspec_profiling (0.0.5) + rspec_profiling (0.0.6) activerecord pg rails sqlite3 - rubocop (0.82.0) - jaro_winkler (~> 1.5.1) + rubocop (0.89.1) parallel (~> 1.10) - parser (>= 2.7.0.1) + parser (>= 2.7.1.1) rainbow (>= 2.2.2, < 4.0) + regexp_parser (>= 1.7) rexml + rubocop-ast (>= 0.3.0, < 1.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 1.4.0, < 2.0) + rubocop-ast (0.8.0) + parser (>= 2.7.1.5) rubocop-gitlab-security (0.1.1) rubocop (>= 0.51) - rubocop-performance (1.5.2) - rubocop (>= 0.71.0) - rubocop-rails (2.5.2) - activesupport + rubocop-performance (1.8.1) + rubocop (>= 0.87.0) + rubocop-ast (>= 0.4.0) + rubocop-rails (2.8.1) + activesupport (>= 4.2.0) rack (>= 1.1) - rubocop (>= 0.72.0) - rubocop-rspec (1.37.0) - rubocop (>= 0.68.1) + rubocop (>= 0.87.0) + rubocop-rspec (1.44.1) + rubocop (~> 0.87) + rubocop-ast (>= 0.7.1) ruby-enum (0.7.2) i18n ruby-fogbugz (0.2.1) @@ -1034,7 +1051,7 @@ GEM nokogiri (>= 1.5.10) ruby-statistics (2.1.2) ruby2_keywords (0.0.2) - ruby_parser (3.13.1) + ruby_parser (3.15.0) sexp_processor (~> 4.9) rubyntlm (0.6.2) rubypants (0.2.0) @@ -1064,9 +1081,8 @@ GEM sawyer (0.8.2) addressable (>= 2.3.5) faraday (> 0.8, < 2.0) - scss_lint (0.56.0) - rake (>= 0.9, < 13) - sass (~> 3.5.3) + scss_lint (0.59.0) + sass (~> 3.5, >= 3.5.5) securecompare (1.0.0) seed-fu (2.3.7) activerecord (>= 3.1) @@ -1077,7 +1093,7 @@ GEM sentry-raven (3.0.4) faraday (>= 1.0) settingslogic (2.0.9) - sexp_processor (4.12.0) + sexp_processor (4.15.1) shellany (0.0.1) shoulda-matchers (4.0.1) activesupport (>= 4.2.0) @@ -1105,8 +1121,7 @@ GEM slack-messenger (2.3.4) snowplow-tracker (0.6.1) contracts (~> 0.7, <= 0.11) - spring (2.0.2) - activesupport (>= 4.2) + spring (2.1.1) spring-commands-rspec (1.0.4) spring (>= 0.9.1) sprockets (3.7.2) @@ -1146,7 +1161,7 @@ GEM rack (>= 1, < 3) thor (0.20.3) thread_safe (0.3.6) - thrift (0.11.0.0) + thrift (0.13.0) tilt (2.0.10) timecop (0.9.1) timeliness (0.3.10) @@ -1162,7 +1177,7 @@ GEM truncato (0.7.11) htmlentities (~> 4.3.1) nokogiri (>= 1.7.0, <= 2.0) - tzinfo (1.2.7) + tzinfo (1.2.8) thread_safe (~> 0.1) u2f (0.2.1) uber (0.1.0) @@ -1236,14 +1251,13 @@ GEM xpath (3.2.0) nokogiri (~> 1.8) yajl-ruby (1.4.1) - zeitwerk (2.4.0) + zeitwerk (2.4.1) PLATFORMS ruby DEPENDENCIES RedCloth (~> 4.3.2) - ace-rails-ap (~> 4.1.0) acme-client (~> 2.0, >= 2.0.6) activerecord-explain-analyze (~> 0.1) acts-as-taggable-on (~> 6.0) @@ -1283,6 +1297,7 @@ DEPENDENCIES connection_pool (~> 2.0) countries (~> 3.0) creole (~> 0.5.0) + crystalball (~> 0.7.0) danger (~> 8.0.6) database_cleaner (~> 1.7.0) deckar01-task_list (= 2.3.1) @@ -1316,7 +1331,7 @@ DEPENDENCIES fog-aliyun (~> 0.3) fog-aws (~> 3.5) fog-core (= 2.1.0) - fog-google (~> 1.10) + fog-google (~> 1.11) fog-local (~> 0.6) fog-openstack (~> 1.0) fog-rackspace (~> 0.1.1) @@ -1331,15 +1346,16 @@ DEPENDENCIES github-markup (~> 1.7.0) gitlab-chronic (~> 0.10.5) gitlab-fog-azure-rm (~> 1.0) - gitlab-labkit (= 0.12.2) + gitlab-labkit (= 0.13.1) gitlab-license (~> 1.0) gitlab-mail_room (~> 0.0.7) gitlab-markup (~> 1.7.1) gitlab-net-dns (~> 0.9.1) + gitlab-pg_query (~> 1.3) gitlab-puma (~> 4.3.3.gitlab.2) gitlab-puma_worker_killer (~> 0.1.1.gitlab.1) gitlab-sidekiq-fetcher (= 0.5.2) - gitlab-styles (~> 4.3.0) + gitlab-styles (~> 5.1.0) gitlab_chronic_duration (~> 0.10.6.2) gitlab_omniauth-ldap (~> 2.1.1) gon (~> 6.2) @@ -1348,15 +1364,16 @@ DEPENDENCIES gpgme (~> 2.0.19) grape (= 1.4.0) grape-entity (~> 0.7.1) - grape-path-helpers (~> 1.4) + grape-path-helpers (~> 1.5) grape_logging (~> 1.7) graphiql-rails (~> 1.4.10) + graphlient (~> 0.4.0) graphql (~> 1.11.4) graphql-docs (~> 1.6.0) grpc (~> 1.30.2) gssapi guard-rspec - haml_lint (~> 0.34.0) + haml_lint (~> 0.36.0) hamlit (~> 2.11.0) hangouts-chat (~> 0.0.5) hashie @@ -1429,10 +1446,10 @@ DEPENDENCIES prometheus-client-mmap (~> 0.12.0) pry-byebug (~> 3.9.0) pry-rails (~> 0.3.9) - rack (~> 2.1.4) + rack (~> 2.2.3) rack-attack (~> 6.3.0) rack-cors (~> 1.0.6) - rack-oauth2 (~> 1.9.3) + rack-oauth2 (~> 1.16.0) rack-proxy (~> 0.6.0) rack-timeout (~> 0.5.1) rails (~> 6.0.3.1) @@ -1451,25 +1468,22 @@ DEPENDENCIES request_store (~> 1.5) responders (~> 3.0) retriable (~> 3.1.2) - rouge (~> 3.24.0) + rouge (~> 3.25.0) rqrcode-rails3 (~> 0.1.7) rspec-parameterized rspec-rails (~> 4.0.0) rspec-retry (~> 0.6.1) rspec_junit_formatter - rspec_profiling (~> 0.0.5) - rubocop (~> 0.82.0) - rubocop-performance (~> 1.5.2) - rubocop-rspec (~> 1.37.0) + rspec_profiling (~> 0.0.6) ruby-fogbugz (~> 0.2.1) ruby-prof (~> 1.3.0) ruby-progressbar - ruby_parser (~> 3.8) + ruby_parser (~> 3.15) rubyzip (~> 2.0.0) rugged (~> 0.28) sanitize (~> 5.2.1) sassc-rails (~> 2.1.0) - scss_lint (~> 0.56.0) + scss_lint (~> 0.59.0) seed-fu (~> 2.3.7) selenium-webdriver (~> 3.142) sentry-raven (~> 3.0) @@ -1482,7 +1496,7 @@ DEPENDENCIES simplecov-cobertura (~> 1.3.1) slack-messenger (~> 2.3.4) snowplow-tracker (~> 0.6.1) - spring (~> 2.0.0) + spring (~> 2.1.0) spring-commands-rspec (~> 1.0.4) sprockets (~> 3.7.0) sshkey (~> 2.0) diff --git a/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix b/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix index c6425f3389c3..651b418234c4 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix +++ b/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix @@ -9,16 +9,6 @@ }; version = "0.0.7"; }; - ace-rails-ap = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "14wj9gsiy7rm0lvs27ffsrh92wndjksj6rlfj3n7jhv1v77w9v2h"; - type = "gem"; - }; - version = "4.1.2"; - }; acme-client = { dependencies = ["faraday"]; groups = ["default"]; @@ -200,10 +190,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0li86k0g812jkzrppb2fvqngvzp09nygywjpn81nx90s01wxqw07"; + sha256 = "19bn0y70qm6mfj4y1m0j3s8ggh6dvxwrwrj5vfamhdrpddsz8ddr"; type = "gem"; }; - version = "1.0.1"; + version = "1.1.0"; }; akismet = { groups = ["default"]; @@ -284,10 +274,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "184ssy3w93nkajlz2c70ifm79jp3j737294kbc5fjw69v1w0n9x7"; + sha256 = "1l3468czzjmxl93ap40hp7z94yxp4nbag0bxqs789bm30md90m2a"; type = "gem"; }; - version = "2.4.0"; + version = "2.4.1"; }; atlassian-jwt = { dependencies = ["jwt"]; @@ -525,10 +515,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0kxy917xyxckifmnawff65j7g6yb3wh2s45npjq9lqjbi1p86lsr"; + sha256 = "1bmlqjb5h1ry6wm2d903d6yxibpqzzxwqczvlicsqv0vilaca5ic"; type = "gem"; }; - version = "2.4.3"; + version = "2.4.8"; }; binding_ninja = { groups = ["default" "development" "test"]; @@ -882,6 +872,17 @@ }; version = "0.5.0"; }; + crystalball = { + dependencies = ["git"]; + groups = ["development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1why2py76hv2m7i3a1im3zi5zcjcvz2l1nvshzndlwah58vrywkf"; + type = "gem"; + }; + version = "0.7.0"; + }; css_parser = { dependencies = ["addressable"]; groups = ["default"]; @@ -1606,15 +1607,15 @@ version = "2.1.0"; }; fog-google = { - dependencies = ["fog-core" "fog-json" "fog-xml" "google-api-client"]; + dependencies = ["fog-core" "fog-json" "fog-xml" "google-api-client" "google-cloud-env"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "10gwq4lz09386wdl4y9sqkdwy16phs439bfii7vz47s64fvg9gn5"; + sha256 = "1h9apmm2pyb157pbnrqk37wfs2d9f35navsgzs3kclrxhyl2qm5f"; type = "gem"; }; - version = "1.10.0"; + version = "1.11.0"; }; fog-json = { dependencies = ["fog-core" "multi_json"]; @@ -1839,10 +1840,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0k9f3a82727bhhhk8sjyjndpx4p5lwk3x03m06h4w59bpxa917sw"; + sha256 = "0cnrpqswicawhpvd4dh4jcma9d4haznc4gyl37ssvj1jkfhc4w40"; type = "gem"; }; - version = "0.12.2"; + version = "0.13.1"; }; gitlab-license = { groups = ["default"]; @@ -1884,6 +1885,16 @@ }; version = "0.9.1"; }; + gitlab-pg_query = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0xvzs8gy6vbddzf9kin92lqb99vzwljikfgqvxbxqm7hzl16dilq"; + type = "gem"; + }; + version = "1.3.0"; + }; gitlab-puma = { dependencies = ["nio4r"]; groups = ["puma"]; @@ -1923,10 +1934,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1vw4kbmxiccq7r1ijgccq35cqf34bvy2l5p9chxr2g8hlx5rd4kw"; + sha256 = "0l24vgcmvval1apqk99c3ifcwlg1fh60vf02ggnc20f65dka81p3"; type = "gem"; }; - version = "4.3.0"; + version = "5.1.0"; }; gitlab_chronic_duration = { dependencies = ["numerizer"]; @@ -1983,6 +1994,17 @@ }; version = "0.33.2"; }; + google-cloud-env = { + dependencies = ["faraday"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0bjgxyvagy6hjj8yg7fqq24rwdjxb6hx7fdd1bmn4mwd846lci2i"; + type = "gem"; + }; + version = "1.4.0"; + }; google-protobuf = { groups = ["default"]; platforms = []; @@ -2054,10 +2076,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "175a07vv77k1kyilrgkhpr1vdswcywymgrmr4mmp434w17w0hlrg"; + sha256 = "131s6a0xa0fj7w5d6xb2p2z3404w6rxbc33v7fcg50jrjgqphrjz"; type = "gem"; }; - version = "1.4.0"; + version = "1.5.0"; }; grape_logging = { dependencies = ["grape" "rack"]; @@ -2081,6 +2103,17 @@ }; version = "1.4.10"; }; + graphlient = { + dependencies = ["faraday" "faraday_middleware" "graphql-client"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "04c32rcn3j4d8sh039lkdfzn8xpifsbpsp7f90vlp2s531wbs16a"; + type = "gem"; + }; + version = "0.4.0"; + }; graphql = { groups = ["default" "development" "test"]; platforms = []; @@ -2091,6 +2124,17 @@ }; version = "1.11.4"; }; + graphql-client = { + dependencies = ["activesupport" "graphql"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0g971rccyrs3rk8812r6az54p28g66m4ngdcbszg31mvddjaqkr4"; + type = "gem"; + }; + version = "0.16.0"; + }; graphql-docs = { dependencies = ["commonmarker" "escape_utils" "extended-markdown-filter" "gemoji" "graphql" "html-pipeline" "sass"]; groups = ["development" "test"]; @@ -2168,15 +2212,15 @@ version = "5.1.2"; }; haml_lint = { - dependencies = ["haml" "rainbow" "rubocop" "sysexits"]; + dependencies = ["haml" "parallel" "rainbow" "rubocop" "sysexits"]; groups = ["development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1iaaa5as4nlblnbvy6pxj8z9k3jqspbh4f43il519f28lgi0llsn"; + sha256 = "0imdiwxqyca1i158yrqkdv6fa8sdfk8wwx2kaq6ad9i7k7jj365a"; type = "gem"; }; - version = "0.34.0"; + version = "0.36.0"; }; hamlit = { dependencies = ["temple" "thor" "tilt"]; @@ -2446,20 +2490,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "198m72c9w3wfwr1mq22dcjjm7d4jd0bci4lrq6zq2zvlzhi04n8l"; + sha256 = "1a2qlkc1hkr5hkj2574l1a63sm04bdx98gfhh9m8vvp6psdrnpnb"; type = "gem"; }; - version = "0.10.0"; - }; - jaro_winkler = { - groups = ["default" "development" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1y8l6k34svmdyqxya3iahpwbpvmn3fswhwsvrz0nk1wyb8yfihsh"; - type = "gem"; - }; - version = "1.5.4"; + version = "1.1.0"; }; jira-ruby = { dependencies = ["activesupport" "atlassian-jwt" "multipart-post" "oauth"]; @@ -2509,10 +2543,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "18rf9v20i0dk5dblr7m22di959xpch2h7gsx0cl585cryr7apwp3"; + sha256 = "0nzbk1mrbf9mnvjpn3bxy8a85rjf94qmfdnvk78mjzk8pa0fvgdr"; type = "gem"; }; - version = "1.11.0"; + version = "1.13.0"; }; json-schema = { dependencies = ["addressable"]; @@ -3538,10 +3572,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "12jijkap4akzdv11lm08dglsc8jmc87xcgq6947i1s3qb69f4zn2"; + sha256 = "17b127xxmm2yqdz146qwbs57046kn0js1h8synv01dwqz2z1kp2l"; type = "gem"; }; - version = "1.19.1"; + version = "1.19.2"; }; parser = { dependencies = ["ast"]; @@ -3549,10 +3583,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1xgsl3dvmidvr1y4lp63m5avjxykl2gradgav8xfp5z86rfqhpr0"; + sha256 = "1f7gmm60yla325wlnd3qkxs59qm2y0aan8ljpg6k18rwzrrfil6z"; type = "gem"; }; - version = "2.7.1.2"; + version = "2.7.2.0"; }; parslet = { groups = ["default" "development" "test"]; @@ -3735,10 +3769,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1x72abm2snhk664s9g642pxjyk911y39qck8n9hbnqmb7ba1zbmz"; + sha256 = "0i5vs0dph9i5jn8dfc6aqd6njcafmb20rwqngrf759c9cvmyff16"; type = "gem"; }; - version = "2.1.4"; + version = "2.2.3"; }; rack-accept = { dependencies = ["rack"]; @@ -3779,10 +3813,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0kmxj9hbjhhcs3yyb433s82hkpmzb536m0mwfadjiaisganx1cii"; + sha256 = "1b0h0rlfl0p0drymwfc71g87fp66ck3205pl32z89xsgh0lzw25k"; type = "gem"; }; - version = "1.9.3"; + version = "1.16.0"; }; rack-protection = { dependencies = ["rack"]; @@ -3918,10 +3952,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1cvaqarr1m84mhc006g3l1vw7sa5qpkcw0138lsxlf769zdllsgp"; + sha256 = "0w6qza25bq1s825faaglkx1k6d59aiyjjk3yw3ip5sb463mhhai9"; type = "gem"; }; - version = "12.3.3"; + version = "13.0.1"; }; rb-fsevent = { groups = ["default" "development" "test"]; @@ -4112,10 +4146,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0dsgjb3kszk6a82s6gl0h6a8vncjrxmcbk0r4mcxcdcad2b7vb2d"; + sha256 = "0x4s82lgf0l71y3xc9gp4qxkrgx1kv8f6avdqd68l46ijbyvicdm"; type = "gem"; }; - version = "1.5.1"; + version = "1.8.2"; }; regexp_property_values = { groups = ["default"]; @@ -4216,10 +4250,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1igl00gk0vaq4xxk44m7yflqdzsblgxlzcxj8saz96bmx7mg7392"; + sha256 = "0yvcv901lrh5rfnk1h4h56hf2m6n9pd6w8n96vag74aakgz3gaxn"; type = "gem"; }; - version = "3.24.0"; + version = "3.25.0"; }; rqrcode = { dependencies = ["chunky_png"]; @@ -4343,25 +4377,36 @@ }; rspec_profiling = { dependencies = ["activerecord" "pg" "rails" "sqlite3"]; - groups = ["development" "test"]; + groups = ["test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1g7q7gav26bpiprx4dhlvdh4zdrhwiky9jbmsp14gyfiabqdz4sz"; + sha256 = "0vkfizrwxgs029s9imz8g3p55ggncls709hf98brmv6wg5znjibs"; type = "gem"; }; - version = "0.0.5"; + version = "0.0.6"; }; rubocop = { - dependencies = ["jaro_winkler" "parallel" "parser" "rainbow" "rexml" "ruby-progressbar" "unicode-display_width"]; - groups = ["development" "test"]; + dependencies = ["parallel" "parser" "rainbow" "regexp_parser" "rexml" "rubocop-ast" "ruby-progressbar" "unicode-display_width"]; + groups = ["default" "development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0pyjx2lbai93p6q3w57cxdhlcwhxfvm299xqicgarhdrv73mnv1d"; + sha256 = "1yh71v5d7aw6jz7505d2sv0n0ldf3wh0ly3lphdanjl0n8b42y9h"; type = "gem"; }; - version = "0.82.0"; + version = "0.89.1"; + }; + rubocop-ast = { + dependencies = ["parser"]; + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "165ws2vwnw33nlqgzvzzjjp1zhkc712a92lbpbjx8j83g44dmdy4"; + type = "gem"; + }; + version = "0.8.0"; }; rubocop-gitlab-security = { dependencies = ["rubocop"]; @@ -4375,15 +4420,15 @@ version = "0.1.1"; }; rubocop-performance = { - dependencies = ["rubocop"]; - groups = ["development" "test"]; + dependencies = ["rubocop" "rubocop-ast"]; + groups = ["default" "development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1fk9nd3b24avgsqp726hy2pl1iyfjrh6jni97wkky6kqy0lq6zq2"; + sha256 = "13v66wi5l56bvp97nlmyxscq8ipkzfha1g7nlhcrbikvmrm3h5kf"; type = "gem"; }; - version = "1.5.2"; + version = "1.8.1"; }; rubocop-rails = { dependencies = ["activesupport" "rack" "rubocop"]; @@ -4391,21 +4436,21 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "087fwq48n9k10c6npp7n5vbpx34nmaq3xkhw9n0v75m3l9rn8s34"; + sha256 = "14g703lv0cbqw504cdjsv0yydrsnm61rwg0n0mql4zl5hw1n7lfh"; type = "gem"; }; - version = "2.5.2"; + version = "2.8.1"; }; rubocop-rspec = { - dependencies = ["rubocop"]; - groups = ["development" "test"]; + dependencies = ["rubocop" "rubocop-ast"]; + groups = ["default" "development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1dypzxzrm8lh1gip9pn93p1nwamzkqsljy6mcv2ngw9zqsial233"; + sha256 = "0albi9zn8zrz1bb105xkcn5xdv6q7i7r34h9m4jsj5ygsvkkh8kv"; type = "gem"; }; - version = "1.37.0"; + version = "1.44.1"; }; ruby-enum = { dependencies = ["i18n"]; @@ -4486,10 +4531,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0s3hsccsmrirc2hy3r51kl8g9cfmcn7jxaa0asadg1kn78h1sgr7"; + sha256 = "0b6l5bxbamaplp904i7f088j806v0pqi0kvhb8xx81v4whl40y2k"; type = "gem"; }; - version = "3.13.1"; + version = "3.15.0"; }; rubyntlm = { groups = ["default"]; @@ -4619,15 +4664,15 @@ version = "0.8.2"; }; scss_lint = { - dependencies = ["rake" "sass"]; + dependencies = ["sass"]; groups = ["development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "01bfkrjn1i0hfg1ifwn1rs7vqwdbdw158krwr5fm6iasd9zgl10g"; + sha256 = "1s6dzk4n9pnmqciliggwpiny43vc3cx3n2d5gqa9aqng77ff7yv7"; type = "gem"; }; - version = "0.56.0"; + version = "0.59.0"; }; securecompare = { groups = ["default"]; @@ -4687,10 +4732,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0w24rgmyjf7yz0xr2qhbr8z48h4m6gvbggr8nc1pldwn9rbi04b7"; + sha256 = "0p0jj2la8bhb7kgqmqbksaq7idnpgjv6asgfd18d2l3z4kra14cj"; type = "gem"; }; - version = "4.12.0"; + version = "4.15.1"; }; shellany = { groups = ["default" "test"]; @@ -4820,15 +4865,14 @@ version = "0.6.1"; }; spring = { - dependencies = ["activesupport"]; groups = ["development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "168yz9c1fv21wc5i8q7n43b9nk33ivg3ws1fn6x0afgryz3ssx75"; + sha256 = "1x2wz1y2b0kp7mlk9k8zkl39rddk2l3x34b7dar3bh3axd1cs30d"; type = "gem"; }; - version = "2.0.2"; + version = "2.1.1"; }; spring-commands-rspec = { dependencies = ["spring"]; @@ -5045,10 +5089,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "02p107kwx7jnkh6fpdgvaji0xdg6xkaarngkqjml6s4zny4m8slv"; + sha256 = "08076cmdx0g51yrkd7dlxlr45nflink3jhdiq7006ljc2pc3212q"; type = "gem"; }; - version = "0.11.0.0"; + version = "0.13.0"; }; tilt = { groups = ["default" "development" "test"]; @@ -5150,10 +5194,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1i3jh086w1kbdj3k5l60lc3nwbanmzdf8yjj3mlrx9b2gjjxhi9r"; + sha256 = "0skr6ih9cr3pwp8l84f0z7fy3q9kiq8hw0sg3zqw0hpbbyj05743"; type = "gem"; }; - version = "1.2.7"; + version = "1.2.8"; }; u2f = { groups = ["default"]; @@ -5477,9 +5521,9 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0jvn50k76kl14fpymk4hdsf9sk00jl84yxzl783xhnw4dicp0m0k"; + sha256 = "12n0hiawqayzchi0yga5n19hi63b2snd49fv3n23n2i4pp05jzrp"; type = "gem"; }; - version = "2.4.0"; + version = "2.4.1"; }; } \ No newline at end of file diff --git a/pkgs/applications/version-management/gitlab/update.py b/pkgs/applications/version-management/gitlab/update.py index 98d994f00038..0f215370e184 100755 --- a/pkgs/applications/version-management/gitlab/update.py +++ b/pkgs/applications/version-management/gitlab/update.py @@ -1,5 +1,5 @@ #!/usr/bin/env nix-shell -#! nix-shell -i python3 -p bundix bundler common-updater-scripts nix nix-prefetch-git python3 python3Packages.requests python3Packages.click python3Packages.click-log vgo2nix yarn2nix +#! nix-shell -i python3 -p bundix bundler common-updater-scripts nix nix-universal-prefetch python3 python3Packages.requests python3Packages.click python3Packages.click-log vgo2nix yarn2nix import click import click_log @@ -40,9 +40,7 @@ class GitLabRepo: return versions def get_git_hash(self, rev: str): - out = subprocess.check_output(['nix-prefetch-git', self.url, rev]) - j = json.loads(out) - return j['sha256'] + return subprocess.check_output(['nix-universal-prefetch', 'fetchFromGitLab', '--owner', self.owner, '--repo', self.repo, '--rev', rev]).decode('utf-8').strip() @staticmethod def rev2version(tag: str) -> str: diff --git a/pkgs/applications/version-management/gitlab/yarnPkgs.nix b/pkgs/applications/version-management/gitlab/yarnPkgs.nix index 899888ee2f1b..ca504fc231e9 100644 --- a/pkgs/applications/version-management/gitlab/yarnPkgs.nix +++ b/pkgs/applications/version-management/gitlab/yarnPkgs.nix @@ -778,27 +778,27 @@ }; } { - name = "_gitlab_eslint_plugin___eslint_plugin_4.0.0.tgz"; + name = "_gitlab_eslint_plugin___eslint_plugin_5.0.0.tgz"; path = fetchurl { - name = "_gitlab_eslint_plugin___eslint_plugin_4.0.0.tgz"; - url = "https://registry.yarnpkg.com/@gitlab/eslint-plugin/-/eslint-plugin-4.0.0.tgz"; - sha1 = "7beba53dea74f458d92040a8b2652e4fd60a6cc7"; + name = "_gitlab_eslint_plugin___eslint_plugin_5.0.0.tgz"; + url = "https://registry.yarnpkg.com/@gitlab/eslint-plugin/-/eslint-plugin-5.0.0.tgz"; + sha1 = "502eb2bccb55d65d6310ce9ef2da76035b6fc319"; }; } { - name = "_gitlab_svgs___svgs_1.171.0.tgz"; + name = "_gitlab_svgs___svgs_1.175.0.tgz"; path = fetchurl { - name = "_gitlab_svgs___svgs_1.171.0.tgz"; - url = "https://registry.yarnpkg.com/@gitlab/svgs/-/svgs-1.171.0.tgz"; - sha1 = "abc3092bf804f0898301626130e0f3231834924a"; + name = "_gitlab_svgs___svgs_1.175.0.tgz"; + url = "https://registry.yarnpkg.com/@gitlab/svgs/-/svgs-1.175.0.tgz"; + sha1 = "734f341784af1cd1d62d160a17bcdfb61ff7b04d"; }; } { - name = "_gitlab_ui___ui_21.33.0.tgz"; + name = "_gitlab_ui___ui_23.9.0.tgz"; path = fetchurl { - name = "_gitlab_ui___ui_21.33.0.tgz"; - url = "https://registry.yarnpkg.com/@gitlab/ui/-/ui-21.33.0.tgz"; - sha1 = "83dd7e4d65557f7b82ce1f9d7d6e7a1c54cb3dbc"; + name = "_gitlab_ui___ui_23.9.0.tgz"; + url = "https://registry.yarnpkg.com/@gitlab/ui/-/ui-23.9.0.tgz"; + sha1 = "e21966130b41e624dbe4505911a79afb731c2d6b"; }; } { @@ -1002,11 +1002,11 @@ }; } { - name = "_sourcegraph_code_host_integration___code_host_integration_0.0.50.tgz"; + name = "_sourcegraph_code_host_integration___code_host_integration_0.0.52.tgz"; path = fetchurl { - name = "_sourcegraph_code_host_integration___code_host_integration_0.0.50.tgz"; - url = "https://registry.yarnpkg.com/@sourcegraph/code-host-integration/-/code-host-integration-0.0.50.tgz"; - sha1 = "3f91be4c1b117efbf3d49c73033a6b1880db1c70"; + name = "_sourcegraph_code_host_integration___code_host_integration_0.0.52.tgz"; + url = "https://registry.yarnpkg.com/@sourcegraph/code-host-integration/-/code-host-integration-0.0.52.tgz"; + sha1 = "3668364647b9248a0c43d738f7b046c551311338"; }; } { @@ -1026,19 +1026,19 @@ }; } { - name = "_toast_ui_editor___editor_2.4.0.tgz"; + name = "_toast_ui_editor___editor_2.5.0.tgz"; path = fetchurl { - name = "_toast_ui_editor___editor_2.4.0.tgz"; - url = "https://registry.yarnpkg.com/@toast-ui/editor/-/editor-2.4.0.tgz"; - sha1 = "0ed082da7e0160162dbc8f69d00ad3ab2adf81bc"; + name = "_toast_ui_editor___editor_2.5.0.tgz"; + url = "https://registry.yarnpkg.com/@toast-ui/editor/-/editor-2.5.0.tgz"; + sha1 = "02779b119eaa6dd7601249d75ca031e0b98400f1"; }; } { - name = "_toast_ui_vue_editor___vue_editor_2.4.0.tgz"; + name = "_toast_ui_vue_editor___vue_editor_2.5.0.tgz"; path = fetchurl { - name = "_toast_ui_vue_editor___vue_editor_2.4.0.tgz"; - url = "https://registry.yarnpkg.com/@toast-ui/vue-editor/-/vue-editor-2.4.0.tgz"; - sha1 = "18b6629006f2dac5bfef4a26388499931d5fa869"; + name = "_toast_ui_vue_editor___vue_editor_2.5.0.tgz"; + url = "https://registry.yarnpkg.com/@toast-ui/vue-editor/-/vue-editor-2.5.0.tgz"; + sha1 = "8094136588b0f726241b5f89d0754a7169f2ffee"; }; } { @@ -1577,6 +1577,14 @@ sha1 = "fedb394f9f0e02aa9768e702bda23b505fae7e1f"; }; } + { + name = "agent_base___agent_base_4.3.0.tgz"; + path = fetchurl { + name = "agent_base___agent_base_4.3.0.tgz"; + url = "https://registry.yarnpkg.com/agent-base/-/agent-base-4.3.0.tgz"; + sha1 = "8165f01c436009bccad0b1d122f05ed770efc6ee"; + }; + } { name = "aggregate_error___aggregate_error_3.0.1.tgz"; path = fetchurl { @@ -3945,6 +3953,14 @@ sha1 = "5d128515df134ff327e90a4c93f4e077a536341f"; }; } + { + name = "debug___debug_3.1.0.tgz"; + path = fetchurl { + name = "debug___debug_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/debug/-/debug-3.1.0.tgz"; + sha1 = "5bb5a0672628b64149566ba16819e61518c67261"; + }; + } { name = "debug___debug_3.2.6.tgz"; path = fetchurl { @@ -3961,14 +3977,6 @@ sha1 = "3b72260255109c6b589cee050f1d516139664791"; }; } - { - name = "debug___debug_3.1.0.tgz"; - path = fetchurl { - name = "debug___debug_3.1.0.tgz"; - url = "https://registry.yarnpkg.com/debug/-/debug-3.1.0.tgz"; - sha1 = "5bb5a0672628b64149566ba16819e61518c67261"; - }; - } { name = "decamelize_keys___decamelize_keys_1.1.0.tgz"; path = fetchurl { @@ -4386,11 +4394,11 @@ }; } { - name = "dompurify___dompurify_2.1.1.tgz"; + name = "dompurify___dompurify_2.2.2.tgz"; path = fetchurl { - name = "dompurify___dompurify_2.1.1.tgz"; - url = "https://registry.yarnpkg.com/dompurify/-/dompurify-2.1.1.tgz"; - sha1 = "b5aa988676b093a9c836d8b855680a8598af25fe"; + name = "dompurify___dompurify_2.2.2.tgz"; + url = "https://registry.yarnpkg.com/dompurify/-/dompurify-2.2.2.tgz"; + sha1 = "cb8c2b1a2f3c8a0b565127504ae4eedec176a972"; }; } { @@ -4681,6 +4689,14 @@ sha1 = "e55cd4c9cdc188bcefb03b366c736323fc5c898a"; }; } + { + name = "es6_promise___es6_promise_4.2.8.tgz"; + path = fetchurl { + name = "es6_promise___es6_promise_4.2.8.tgz"; + url = "https://registry.yarnpkg.com/es6-promise/-/es6-promise-4.2.8.tgz"; + sha1 = "4eb21594c972bc40553d276e510539143db53e0a"; + }; + } { name = "es6_promise___es6_promise_3.0.2.tgz"; path = fetchurl { @@ -4689,6 +4705,14 @@ sha1 = "010d5858423a5f118979665f46486a95c6ee2bb6"; }; } + { + name = "es6_promisify___es6_promisify_5.0.0.tgz"; + path = fetchurl { + name = "es6_promisify___es6_promisify_5.0.0.tgz"; + url = "https://registry.yarnpkg.com/es6-promisify/-/es6-promisify-5.0.0.tgz"; + sha1 = "5109d62f3e56ea967c4b63505aef08291c8a5203"; + }; + } { name = "escape_goat___escape_goat_2.1.1.tgz"; path = fetchurl { @@ -5866,19 +5890,19 @@ }; } { - name = "graphql_tag___graphql_tag_2.10.3.tgz"; + name = "graphql_tag___graphql_tag_2.11.0.tgz"; path = fetchurl { - name = "graphql_tag___graphql_tag_2.10.3.tgz"; - url = "https://registry.yarnpkg.com/graphql-tag/-/graphql-tag-2.10.3.tgz"; - sha1 = "ea1baba5eb8fc6339e4c4cf049dabe522b0edf03"; + name = "graphql_tag___graphql_tag_2.11.0.tgz"; + url = "https://registry.yarnpkg.com/graphql-tag/-/graphql-tag-2.11.0.tgz"; + sha1 = "1deb53a01c46a7eb401d6cb59dec86fa1cccbffd"; }; } { - name = "graphql___graphql_14.7.0.tgz"; + name = "graphql___graphql_15.4.0.tgz"; path = fetchurl { - name = "graphql___graphql_14.7.0.tgz"; - url = "https://registry.yarnpkg.com/graphql/-/graphql-14.7.0.tgz"; - sha1 = "7fa79a80a69be4a31c27dda824dc04dac2035a72"; + name = "graphql___graphql_15.4.0.tgz"; + url = "https://registry.yarnpkg.com/graphql/-/graphql-15.4.0.tgz"; + sha1 = "e459dea1150da5a106486ba7276518b5295a4347"; }; } { @@ -6201,6 +6225,14 @@ sha1 = "0a002cc85707192a7e7946ceedc11155f60ec736"; }; } + { + name = "http_proxy_agent___http_proxy_agent_2.1.0.tgz"; + path = fetchurl { + name = "http_proxy_agent___http_proxy_agent_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-2.1.0.tgz"; + sha1 = "e4821beef5b2142a2026bd73926fe537631c5405"; + }; + } { name = "http_proxy_middleware___http_proxy_middleware_0.19.1.tgz"; path = fetchurl { @@ -6233,6 +6265,14 @@ sha1 = "ec06c10e0a34c0f2faf199f7fd7fc78fffd03c73"; }; } + { + name = "https_proxy_agent___https_proxy_agent_2.2.4.tgz"; + path = fetchurl { + name = "https_proxy_agent___https_proxy_agent_2.2.4.tgz"; + url = "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-2.2.4.tgz"; + sha1 = "4ee7a737abd92678a293d9b34a1af4d0d08c787b"; + }; + } { name = "human_signals___human_signals_1.1.1.tgz"; path = fetchurl { @@ -7201,14 +7241,6 @@ sha1 = "a5231a08ef6dd22b268d0895084cf8d58b5bec53"; }; } - { - name = "iterall___iterall_1.2.2.tgz"; - path = fetchurl { - name = "iterall___iterall_1.2.2.tgz"; - url = "https://registry.yarnpkg.com/iterall/-/iterall-1.2.2.tgz"; - sha1 = "92d70deb8028e0c39ff3164fdbf4d8b088130cd7"; - }; - } { name = "jasmine_core___jasmine_core_2.9.0.tgz"; path = fetchurl { @@ -7713,6 +7745,14 @@ sha1 = "779fb0018604fa854eacbf6252180d83543e3dbe"; }; } + { + name = "jsonc_parser___jsonc_parser_2.3.1.tgz"; + path = fetchurl { + name = "jsonc_parser___jsonc_parser_2.3.1.tgz"; + url = "https://registry.yarnpkg.com/jsonc-parser/-/jsonc-parser-2.3.1.tgz"; + sha1 = "59549150b133f2efacca48fe9ce1ec0659af2342"; + }; + } { name = "jsonc_parser___jsonc_parser_2.2.1.tgz"; path = fetchurl { @@ -7969,6 +8009,14 @@ sha1 = "c4caf38a6cd7ac2212ef3c7d2bde30a91561f9db"; }; } + { + name = "linkify_it___linkify_it_3.0.2.tgz"; + path = fetchurl { + name = "linkify_it___linkify_it_3.0.2.tgz"; + url = "https://registry.yarnpkg.com/linkify-it/-/linkify-it-3.0.2.tgz"; + sha1 = "f55eeb8bc1d3ae754049e124ab3bb56d97797fb8"; + }; + } { name = "load_json_file___load_json_file_1.1.0.tgz"; path = fetchurl { @@ -8474,11 +8522,11 @@ }; } { - name = "markdown_it___markdown_it_10.0.0.tgz"; + name = "markdown_it___markdown_it_11.0.0.tgz"; path = fetchurl { - name = "markdown_it___markdown_it_10.0.0.tgz"; - url = "https://registry.yarnpkg.com/markdown-it/-/markdown-it-10.0.0.tgz"; - sha1 = "abfc64f141b1722d663402044e43927f1f50a8dc"; + name = "markdown_it___markdown_it_11.0.0.tgz"; + url = "https://registry.yarnpkg.com/markdown-it/-/markdown-it-11.0.0.tgz"; + sha1 = "dbfc30363e43d756ebc52c38586b91b90046b876"; }; } { @@ -8498,27 +8546,27 @@ }; } { - name = "markdownlint_cli___markdownlint_cli_0.23.2.tgz"; + name = "markdownlint_cli___markdownlint_cli_0.24.0.tgz"; path = fetchurl { - name = "markdownlint_cli___markdownlint_cli_0.23.2.tgz"; - url = "https://registry.yarnpkg.com/markdownlint-cli/-/markdownlint-cli-0.23.2.tgz"; - sha1 = "43f0a96e2699542b74fb5e6188c025e4934357fc"; + name = "markdownlint_cli___markdownlint_cli_0.24.0.tgz"; + url = "https://registry.yarnpkg.com/markdownlint-cli/-/markdownlint-cli-0.24.0.tgz"; + sha1 = "d1c1d43cd53b87aaec93035b3234eef7097139a8"; }; } { - name = "markdownlint_rule_helpers___markdownlint_rule_helpers_0.11.0.tgz"; + name = "markdownlint_rule_helpers___markdownlint_rule_helpers_0.12.0.tgz"; path = fetchurl { - name = "markdownlint_rule_helpers___markdownlint_rule_helpers_0.11.0.tgz"; - url = "https://registry.yarnpkg.com/markdownlint-rule-helpers/-/markdownlint-rule-helpers-0.11.0.tgz"; - sha1 = "faaaae4337771c7d88ca38ef6265afb4fbe0fb3f"; + name = "markdownlint_rule_helpers___markdownlint_rule_helpers_0.12.0.tgz"; + url = "https://registry.yarnpkg.com/markdownlint-rule-helpers/-/markdownlint-rule-helpers-0.12.0.tgz"; + sha1 = "c41d9b990c50911572e8eb2fba3e6975a5514b7e"; }; } { - name = "markdownlint___markdownlint_0.20.4.tgz"; + name = "markdownlint___markdownlint_0.21.1.tgz"; path = fetchurl { - name = "markdownlint___markdownlint_0.20.4.tgz"; - url = "https://registry.yarnpkg.com/markdownlint/-/markdownlint-0.20.4.tgz"; - sha1 = "3b34681494cdad174e14a27182b5cdefaa537823"; + name = "markdownlint___markdownlint_0.21.1.tgz"; + url = "https://registry.yarnpkg.com/markdownlint/-/markdownlint-0.21.1.tgz"; + sha1 = "9442afcf12bf65ce9d613212028cf85741677421"; }; } { @@ -8922,11 +8970,11 @@ }; } { - name = "monaco_yaml___monaco_yaml_2.4.1.tgz"; + name = "monaco_yaml___monaco_yaml_2.5.1.tgz"; path = fetchurl { - name = "monaco_yaml___monaco_yaml_2.4.1.tgz"; - url = "https://registry.yarnpkg.com/monaco-yaml/-/monaco-yaml-2.4.1.tgz"; - sha1 = "f0d3384b1f10cc7af2b60e3a30b0adc6683b728a"; + name = "monaco_yaml___monaco_yaml_2.5.1.tgz"; + url = "https://registry.yarnpkg.com/monaco-yaml/-/monaco-yaml-2.5.1.tgz"; + sha1 = "af9303a4aa6e3b94db62b8a8659362f31944590d"; }; } { @@ -10210,11 +10258,11 @@ }; } { - name = "prettier___prettier_1.19.1.tgz"; + name = "prettier___prettier_2.0.5.tgz"; path = fetchurl { - name = "prettier___prettier_1.19.1.tgz"; - url = "https://registry.yarnpkg.com/prettier/-/prettier-1.19.1.tgz"; - sha1 = "f7d7f5ff8a9cd872a7be4ca142095956a60797cb"; + name = "prettier___prettier_2.0.5.tgz"; + url = "https://registry.yarnpkg.com/prettier/-/prettier-2.0.5.tgz"; + sha1 = "d6d56282455243f2f92cc1716692c08aa31522d4"; }; } { @@ -10921,6 +10969,14 @@ sha1 = "de63128373fcbf7c3ccfa4de5a480c45a67958eb"; }; } + { + name = "request_light___request_light_0.2.5.tgz"; + path = fetchurl { + name = "request_light___request_light_0.2.5.tgz"; + url = "https://registry.yarnpkg.com/request-light/-/request-light-0.2.5.tgz"; + sha1 = "38a3da7b2e56f7af8cbba57e8a94930ee2380746"; + }; + } { name = "request_promise_core___request_promise_core_1.1.4.tgz"; path = fetchurl { @@ -13274,11 +13330,11 @@ }; } { - name = "vscode_json_languageservice___vscode_json_languageservice_3.7.0.tgz"; + name = "vscode_json_languageservice___vscode_json_languageservice_3.9.1.tgz"; path = fetchurl { - name = "vscode_json_languageservice___vscode_json_languageservice_3.7.0.tgz"; - url = "https://registry.yarnpkg.com/vscode-json-languageservice/-/vscode-json-languageservice-3.7.0.tgz"; - sha1 = "0174417f139cf41dd60c84538fd052385bfb46f6"; + name = "vscode_json_languageservice___vscode_json_languageservice_3.9.1.tgz"; + url = "https://registry.yarnpkg.com/vscode-json-languageservice/-/vscode-json-languageservice-3.9.1.tgz"; + sha1 = "f72b581f8cd2bd9b47445ccf8b0ddcde6aba7483"; }; } { @@ -13313,6 +13369,14 @@ sha1 = "d3b5952246d30e5241592b6dde8280e03942e743"; }; } + { + name = "vscode_languageserver_types___vscode_languageserver_types_3.16.0_next.2.tgz"; + path = fetchurl { + name = "vscode_languageserver_types___vscode_languageserver_types_3.16.0_next.2.tgz"; + url = "https://registry.yarnpkg.com/vscode-languageserver-types/-/vscode-languageserver-types-3.16.0-next.2.tgz"; + sha1 = "940bd15c992295a65eae8ab6b8568a1e8daa3083"; + }; + } { name = "vscode_languageserver_types___vscode_languageserver_types_3.15.1.tgz"; path = fetchurl { @@ -13337,6 +13401,14 @@ sha1 = "ca8bf8bb82a0987b32801f9fddfdd2fb9fd3c167"; }; } + { + name = "vscode_nls___vscode_nls_5.0.0.tgz"; + path = fetchurl { + name = "vscode_nls___vscode_nls_5.0.0.tgz"; + url = "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-5.0.0.tgz"; + sha1 = "99f0da0bd9ea7cda44e565a74c54b1f2bc257840"; + }; + } { name = "vscode_uri___vscode_uri_1.0.8.tgz"; path = fetchurl { @@ -13402,11 +13474,11 @@ }; } { - name = "vue_router___vue_router_3.4.7.tgz"; + name = "vue_router___vue_router_3.4.5.tgz"; path = fetchurl { - name = "vue_router___vue_router_3.4.7.tgz"; - url = "https://registry.yarnpkg.com/vue-router/-/vue-router-3.4.7.tgz"; - sha1 = "bf189bafd16f4e4ef783c4a6250a3090f2c1fa1b"; + name = "vue_router___vue_router_3.4.5.tgz"; + url = "https://registry.yarnpkg.com/vue-router/-/vue-router-3.4.5.tgz"; + sha1 = "d396ec037b35931bdd1e9b7edd86f9788dc15175"; }; } { @@ -13937,6 +14009,22 @@ sha1 = "9bb92790d9c0effec63be73519e11a35019a3a72"; }; } + { + name = "yaml_ast_parser_custom_tags___yaml_ast_parser_custom_tags_0.0.43.tgz"; + path = fetchurl { + name = "yaml_ast_parser_custom_tags___yaml_ast_parser_custom_tags_0.0.43.tgz"; + url = "https://registry.yarnpkg.com/yaml-ast-parser-custom-tags/-/yaml-ast-parser-custom-tags-0.0.43.tgz"; + sha1 = "46968145ce4e24cb03c3312057f0f141b93a7d02"; + }; + } + { + name = "yaml_language_server___yaml_language_server_0.11.1.tgz"; + path = fetchurl { + name = "yaml_language_server___yaml_language_server_0.11.1.tgz"; + url = "https://registry.yarnpkg.com/yaml-language-server/-/yaml-language-server-0.11.1.tgz"; + sha1 = "4ddc72eb9a6dd7dc41f31af2a8f5c72cce456cc9"; + }; + } { name = "yargs_parser___yargs_parser_20.2.1.tgz"; path = fetchurl { diff --git a/pkgs/development/ruby-modules/gem-config/default.nix b/pkgs/development/ruby-modules/gem-config/default.nix index 9ccc369429df..04370a46b908 100644 --- a/pkgs/development/ruby-modules/gem-config/default.nix +++ b/pkgs/development/ruby-modules/gem-config/default.nix @@ -201,6 +201,16 @@ in gitlab-markup = attrs: { meta.priority = 1; }; + gitlab-pg_query = attrs: lib.optionalAttrs (attrs.version == "1.3.0") { + dontBuild = false; + postPatch = '' + sed -i 's;"https://gitlab.com.*";"${fetchurl { + url = "https://gitlab.com/gitlab-org/libpg_query/-/archive/gitlab-10-1.0.3/libpg_query-gitlab-10-1.0.3.tar.gz"; + sha256 = "1519x4v6wrk189mjg4hlfah0f7hjy3syg8kk8b6g644gdspzs26j"; + }}";' ext/pg_query/extconf.rb + ''; + }; + glib2 = attrs: { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ gtk2 pcre ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 45bff7bd1890..11bad994a144 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4140,18 +4140,27 @@ in gitkraken = callPackage ../applications/version-management/gitkraken { }; - gitlab = callPackage ../applications/version-management/gitlab { }; - gitlab-ee = callPackage ../applications/version-management/gitlab { gitlabEnterprise = true; }; + gitlab = callPackage ../applications/version-management/gitlab { + ruby = ruby_2_7; + }; + gitlab-ee = callPackage ../applications/version-management/gitlab { + ruby = ruby_2_7; + gitlabEnterprise = true; + }; gitlab-runner = callPackage ../development/tools/continuous-integration/gitlab-runner { }; - gitlab-shell = callPackage ../applications/version-management/gitlab/gitlab-shell { }; + gitlab-shell = callPackage ../applications/version-management/gitlab/gitlab-shell { + ruby = ruby_2_7; + }; gitlab-triage = callPackage ../applications/version-management/gitlab-triage { }; gitlab-workhorse = callPackage ../applications/version-management/gitlab/gitlab-workhorse { }; - gitaly = callPackage ../applications/version-management/gitlab/gitaly { }; + gitaly = callPackage ../applications/version-management/gitlab/gitaly { + ruby = ruby_2_7; + }; gitstats = callPackage ../applications/version-management/gitstats { }; From d6e0d38b84a00b2ab05324b69e3253d956bb5be7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Milan=20P=C3=A4ssler?= Date: Sat, 21 Nov 2020 01:36:53 +0100 Subject: [PATCH 081/260] nixos/tests/gitlab: add 32 byte secrets --- nixos/tests/gitlab.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/nixos/tests/gitlab.nix b/nixos/tests/gitlab.nix index 7e4e8bcef92d..1214cddd0937 100644 --- a/nixos/tests/gitlab.nix +++ b/nixos/tests/gitlab.nix @@ -33,9 +33,9 @@ import ./make-test-python.nix ({ pkgs, lib, ...} : with lib; { initialRootPasswordFile = pkgs.writeText "rootPassword" initialRootPassword; smtp.enable = true; secrets = { - secretFile = pkgs.writeText "secret" "Aig5zaic"; - otpFile = pkgs.writeText "otpsecret" "Riew9mue"; - dbFile = pkgs.writeText "dbsecret" "we2quaeZ"; + secretFile = pkgs.writeText "secret" "r8X9keSKynU7p4aKlh4GO1Bo77g5a7vj"; + otpFile = pkgs.writeText "otpsecret" "Zu5hGx3YvQx40DvI8WoZJQpX2paSDOlG"; + dbFile = pkgs.writeText "dbsecret" "lsGltKWTejOf6JxCVa7nLDenzkO9wPLR"; jwsFile = pkgs.runCommand "oidcKeyBase" {} "${pkgs.openssl}/bin/openssl genrsa 2048 > $out"; }; }; From c07e9507ef4aa6ed5e53389055db29645327858f Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 21 Nov 2020 01:29:55 +0000 Subject: [PATCH 082/260] python37Packages.gtts: 2.1.2 -> 2.2.1 --- pkgs/development/python-modules/gtts/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/gtts/default.nix b/pkgs/development/python-modules/gtts/default.nix index a8b6d7199bcd..0fc9d43dc2ce 100644 --- a/pkgs/development/python-modules/gtts/default.nix +++ b/pkgs/development/python-modules/gtts/default.nix @@ -15,13 +15,13 @@ buildPythonPackage rec { pname = "gtts"; - version = "2.1.2"; + version = "2.2.1"; src = fetchFromGitHub { owner = "pndurette"; repo = "gTTS"; rev = "v${version}"; - sha256 = "1vcsxzqzl61h50lm934hd7q5nl7l10wwymgq1mcynmqxbm1s4rnl"; + sha256 = "1a984691kfin1n896p5l7y8ggjzx19ynih2cw040smfms0azhp4w"; }; propagatedBuildInputs = [ From 49c563e8a9f37ff6b64c787aa77c57c2ea5d1fbc Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 21 Nov 2020 02:52:45 +0000 Subject: [PATCH 083/260] python37Packages.google_api_python_client: 1.12.5 -> 1.12.8 --- .../python-modules/google-api-python-client/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-api-python-client/default.nix b/pkgs/development/python-modules/google-api-python-client/default.nix index b074774f6253..b14276b0a1a2 100644 --- a/pkgs/development/python-modules/google-api-python-client/default.nix +++ b/pkgs/development/python-modules/google-api-python-client/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "google-api-python-client"; - version = "1.12.5"; + version = "1.12.8"; src = fetchPypi { inherit pname version; - sha256 = "0a989wynp0m1pj8qpa0mr8v8zxhazasc738nyb15wkhn1m4wv4hq"; + sha256 = "f3b9684442eec2cfe9f9bb48e796ef919456b82142c7528c5fd527e5224f08bb"; }; # No tests included in archive From 91340f2aee4a1fe2dc4444fddc23eac17c6400b9 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 21 Nov 2020 04:20:00 +0000 Subject: [PATCH 084/260] vault: 1.5.5 -> 1.6.0 --- pkgs/tools/security/vault/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/vault/default.nix b/pkgs/tools/security/vault/default.nix index b51542a8edde..4b460e74024b 100644 --- a/pkgs/tools/security/vault/default.nix +++ b/pkgs/tools/security/vault/default.nix @@ -2,13 +2,13 @@ buildGoPackage rec { pname = "vault"; - version = "1.5.5"; + version = "1.6.0"; src = fetchFromGitHub { owner = "hashicorp"; repo = "vault"; rev = "v${version}"; - sha256 = "144v7vmp2amv29y6d50jzc21zrcw0g6qlwks16mvqy2hnbsnzdwa"; + sha256 = "13fasdiijxy87m33wfyd8gylyz556i0bdd7xp706ip2fcckrmz7a"; }; goPackagePath = "github.com/hashicorp/vault"; @@ -29,6 +29,7 @@ buildGoPackage rec { meta = with stdenv.lib; { homepage = "https://www.vaultproject.io/"; description = "A tool for managing secrets"; + changelog = "https://github.com/hashicorp/vault/blob/v${version}/CHANGELOG.md"; platforms = platforms.linux ++ platforms.darwin; license = licenses.mpl20; maintainers = with maintainers; [ rushmorem lnl7 offline pradeepchhetri ]; From 4152fca69e6ea7e7edb6cec58f4e4b1684c2a961 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 21 Nov 2020 04:20:00 +0000 Subject: [PATCH 085/260] vault-bin: 1.5.5 -> 1.6.0 --- pkgs/tools/security/vault/vault-bin.nix | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/pkgs/tools/security/vault/vault-bin.nix b/pkgs/tools/security/vault/vault-bin.nix index 4960fe8fb018..580f6fc7b8ed 100644 --- a/pkgs/tools/security/vault/vault-bin.nix +++ b/pkgs/tools/security/vault/vault-bin.nix @@ -1,30 +1,26 @@ { stdenv, fetchurl, unzip, nixosTests }: let - version = "1.5.5"; + version = "1.6.0"; sources = let base = "https://releases.hashicorp.com/vault/${version}"; in { x86_64-linux = fetchurl { url = "${base}/vault_${version}_linux_amd64.zip"; - sha256 = "1vg1c34d2ck2a96p800gblq06jakg29yzrczaa6nsmnnr3k5hs9a"; + sha256 = "0fay6bw31x9kxmc52sh5qp63nfkwji74fbnlx8pj3smz3qnqw143"; }; i686-linux = fetchurl { url = "${base}/vault_${version}_linux_386.zip"; - sha256 = "1hf46mm7shvq9gpi50b6hcp2cydhzbkwigqcnl527y4cvc9iv7in"; + sha256 = "0bjks9lpgl39cq55c9cyc0glhmyxzs37a2an8ynzza94gv5mgcxa"; }; x86_64-darwin = fetchurl { url = "${base}/vault_${version}_darwin_amd64.zip"; - sha256 = "1jna9rmdhqi7j8p67y9dzq716dv8fn4rjsn76mbvlgc5wylky6gz"; - }; - i686-darwin = fetchurl { - url = "${base}/vault_${version}_darwin_386.zip"; - sha256 = "1qv02zd5dwaw1i52pnbyshbd8cy0x5nr3f2s9l3p9ci5rzad4rjn"; + sha256 = "0hl1k35x78y0hi3y5xjnzby1ygisqjyvdak7s61m9f363nsr1shh"; }; aarch64-linux = fetchurl { url = "${base}/vault_${version}_linux_arm64.zip"; - sha256 = "1y4i62qq5cx2bv18dnbgys2qa5xx0acn8j3hdh0dbsw0zyms4qv7"; + sha256 = "018a5i14x6phhx1axvx0bvqn4ggsimfizs48xbmykgiyfmzkrwgz"; }; }; @@ -49,7 +45,7 @@ in stdenv.mkDerivation { meta = with stdenv.lib; { homepage = "https://www.vaultproject.io"; description = "A tool for managing secrets, this binary includes the UI"; - platforms = [ "x86_64-linux" "i686-linux" "x86_64-darwin" "aarch64-linux" "i686-darwin" ]; + platforms = [ "x86_64-linux" "i686-linux" "x86_64-darwin" "aarch64-linux" ]; license = licenses.mpl20; maintainers = with maintainers; [ offline psyanticy mkaito ]; }; From 45ab7143b04c87ba799bd984d9321263f5d50360 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 21 Nov 2020 04:20:00 +0000 Subject: [PATCH 086/260] postgresqlPackages.postgis: 3.0.2 -> 3.0.3 --- pkgs/servers/sql/postgresql/ext/postgis.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sql/postgresql/ext/postgis.nix b/pkgs/servers/sql/postgresql/ext/postgis.nix index 9feb45d311a0..912d848e1a75 100644 --- a/pkgs/servers/sql/postgresql/ext/postgis.nix +++ b/pkgs/servers/sql/postgresql/ext/postgis.nix @@ -14,13 +14,13 @@ }: stdenv.mkDerivation rec { pname = "postgis"; - version = "3.0.2"; + version = "3.0.3"; outputs = [ "out" "doc" ]; src = fetchurl { url = "https://download.osgeo.org/postgis/source/postgis-${version}.tar.gz"; - sha256 = "1jmji8i2wjabkrzqil683lypnmimigdmn64a10j3kj3kzlfn98d3"; + sha256 = "05s8cx1rlysiq7dd44kf7cid0la61a4p895j9g95bvfb8v8dpzh7"; }; buildInputs = [ libxml2 postgresql geos proj gdal json_c protobufc ] From 535ef433a6e54495c662ecfc7a7e8f79746992db Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 21 Nov 2020 04:20:00 +0000 Subject: [PATCH 087/260] rclone: 1.53.2 -> 1.53.3 https://forum.rclone.org/t/rclone-1-53-3-release/20569 --- pkgs/applications/networking/sync/rclone/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/sync/rclone/default.nix b/pkgs/applications/networking/sync/rclone/default.nix index bf9be1b103d7..2f0a9a044f24 100644 --- a/pkgs/applications/networking/sync/rclone/default.nix +++ b/pkgs/applications/networking/sync/rclone/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "rclone"; - version = "1.53.2"; + version = "1.53.3"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "0ns55b6s4zdw94jlialps3knclghj9xqx84ff8hyrl9ksq02kd3w"; + sha256 = "10nimrq8nmpmfk2d4fx0yp916wk5q027m283izpshrbwvx7l6xx0"; }; vendorSha256 = "1l4iz31k1pylvf0zrp4nhxna70s1ma4981x6q1s3dhszjxil5c88"; From 9a65981c2d57cc578f3fa23fa6672e311c51afe8 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 21 Nov 2020 04:20:00 +0000 Subject: [PATCH 088/260] vault-bin: remove passthru.tests nixosTests.vault uses the `vault` package --- pkgs/tools/security/vault/vault-bin.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/tools/security/vault/vault-bin.nix b/pkgs/tools/security/vault/vault-bin.nix index 580f6fc7b8ed..805afe89d31a 100644 --- a/pkgs/tools/security/vault/vault-bin.nix +++ b/pkgs/tools/security/vault/vault-bin.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, unzip, nixosTests }: +{ stdenv, fetchurl, unzip }: let version = "1.6.0"; @@ -40,8 +40,6 @@ in stdenv.mkDerivation { echo "complete -C $out/bin/vault vault" > $out/share/bash-completion/completions/vault ''; - passthru.tests.vault = nixosTests.vault; - meta = with stdenv.lib; { homepage = "https://www.vaultproject.io"; description = "A tool for managing secrets, this binary includes the UI"; From 2a23c7cfd54b81132ca506d5c9a79979c2145d2c Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 21 Nov 2020 04:20:00 +0000 Subject: [PATCH 089/260] postgresqlPackages.postgis: add passthru.tests --- pkgs/servers/sql/postgresql/ext/postgis.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/servers/sql/postgresql/ext/postgis.nix b/pkgs/servers/sql/postgresql/ext/postgis.nix index 912d848e1a75..0d6176d85971 100644 --- a/pkgs/servers/sql/postgresql/ext/postgis.nix +++ b/pkgs/servers/sql/postgresql/ext/postgis.nix @@ -11,6 +11,7 @@ , file , protobufc , libiconv +, nixosTests }: stdenv.mkDerivation rec { pname = "postgis"; @@ -65,6 +66,8 @@ stdenv.mkDerivation rec { mv doc/* $doc/share/doc/postgis/ ''; + passthru.tests.postgis = nixosTests.postgis; + meta = with stdenv.lib; { description = "Geographic Objects for PostgreSQL"; homepage = "https://postgis.net/"; From 0dd8d4d878e157dc331b118f6ae607ae4082169a Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 21 Nov 2020 04:20:00 +0000 Subject: [PATCH 090/260] postgresqlPackages.pgrouting: 3.1.0 -> 3.1.1 https://github.com/pgRouting/pgrouting/releases/tag/v3.1.1 --- pkgs/servers/sql/postgresql/ext/pgrouting.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sql/postgresql/ext/pgrouting.nix b/pkgs/servers/sql/postgresql/ext/pgrouting.nix index 674aa29daec7..9863b2276d11 100644 --- a/pkgs/servers/sql/postgresql/ext/pgrouting.nix +++ b/pkgs/servers/sql/postgresql/ext/pgrouting.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "pgrouting"; - version = "3.1.0"; + version = "3.1.1"; nativeBuildInputs = [ cmake perl ]; buildInputs = [ postgresql boost ]; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { owner = "pgRouting"; repo = pname; rev = "v${version}"; - sha256 = "0sdyq0a98snmcq6g6mgmadlz6cgvacivv34943azhnzspa3iy409"; + sha256 = "1wj583c4iipsss75czww176aqa8sncsvcx1i0d6cb41v03iq5acf"; }; installPhase = '' @@ -23,6 +23,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A PostgreSQL/PostGIS extension that provides geospatial routing functionality"; homepage = "https://pgrouting.org/"; + changelog = "https://github.com/pgRouting/pgrouting/releases/tag/v${version}"; maintainers = [ maintainers.steve-chavez ]; platforms = postgresql.meta.platforms; license = licenses.gpl2; From 5000221a79ec5dd4336489c13b3b5928f4035b89 Mon Sep 17 00:00:00 2001 From: Dave Gallant Date: Fri, 20 Nov 2020 23:54:37 -0500 Subject: [PATCH 091/260] awscli2: 2.0.54 -> 2.1.3 --- pkgs/tools/admin/awscli2/default.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/admin/awscli2/default.nix b/pkgs/tools/admin/awscli2/default.nix index e89df04e3bd1..13847a950a5d 100644 --- a/pkgs/tools/admin/awscli2/default.nix +++ b/pkgs/tools/admin/awscli2/default.nix @@ -8,12 +8,13 @@ let py = python3.override { packageOverrides = self: super: { botocore = super.botocore.overridePythonAttrs (oldAttrs: rec { - version = "2.0.0dev58"; + version = "2.0.0dev71"; src = fetchFromGitHub { owner = "boto"; repo = "botocore"; - rev = "2d65a1bdf85d24b40a40bc681b44d167ce1cc8cb"; - hash = "sha256-HPeNWLhNFjRoD4TZ54ZGgJPp8fsnh8Rt6DMJ8Q0nPkY="; + rev = "f8b31e2a01a8797f8331c6af2c93a26ff82b2b4b"; + hash = "sha256-25WV64RPXpGlq9mZYxUVKUdUjU+e1UnuVTLf9Z9I8Tc= +"; }; }); prompt_toolkit = super.prompt_toolkit.overridePythonAttrs (oldAttrs: rec { @@ -29,16 +30,17 @@ let in with py.pkgs; buildPythonApplication rec { pname = "awscli2"; - version = "2.0.54"; # N.B: if you change this, change botocore to a matching version too + version = "2.1.3"; # N.B: if you change this, change botocore to a matching version too src = fetchFromGitHub { owner = "aws"; repo = "aws-cli"; rev = version; - hash = "sha256-RVF9/2s5oy3Re6hdvbhwPf0nXSoizBDwOgtXCc7cwgc="; + hash = "sha256-7klM8jLNptaMyOjKkrsldUdw10vABgIc+Fs3Kj/z0V0="; }; postPatch = '' + substituteInPlace setup.py --replace "colorama>=0.2.5,<0.4.4" "colorama>=0.2.5" substituteInPlace setup.py --replace "cryptography>=2.8.0,<=2.9.0" "cryptography>=2.8.0" substituteInPlace setup.py --replace "docutils>=0.10,<0.16" "docutils>=0.10" substituteInPlace setup.py --replace "ruamel.yaml>=0.15.0,<0.16.0" "ruamel.yaml>=0.15.0" From 8019f085a98603290074cfceb9dadf54250b0c22 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 21 Nov 2020 08:05:39 +0000 Subject: [PATCH 092/260] python37Packages.aioextensions: 20.11.1517005 -> 20.11.1621472 --- pkgs/development/python-modules/aioextensions/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aioextensions/default.nix b/pkgs/development/python-modules/aioextensions/default.nix index 62a6b90e9f8d..3fee1af2f176 100644 --- a/pkgs/development/python-modules/aioextensions/default.nix +++ b/pkgs/development/python-modules/aioextensions/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "aioextensions"; - version = "20.11.1517005"; + version = "20.11.1621472"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "10b8ddhd77ixxi2i8mw86m388smp324f7rr0mdpkwdb0ra99ra8m"; + sha256 = "abfb2a27590f20b04808192e6c9c5f93298656c013546850c4505b5070a8cc82"; }; propagatedBuildInputs = [ uvloop ]; From 4f85c0a7643794ec677e5f9197cfec990bc89d35 Mon Sep 17 00:00:00 2001 From: Thomas Marchand Date: Sat, 21 Nov 2020 09:32:55 +0100 Subject: [PATCH 093/260] termius: 6.4.1 -> 7.1.0 --- pkgs/applications/networking/termius/default.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/networking/termius/default.nix b/pkgs/applications/networking/termius/default.nix index 66856264f345..3c1af7dba311 100644 --- a/pkgs/applications/networking/termius/default.nix +++ b/pkgs/applications/networking/termius/default.nix @@ -12,11 +12,11 @@ stdenv.mkDerivation rec { pname = "termius"; - version = "6.4.1"; + version = "7.1.0"; src = fetchurl { url = "https://deb.termius.com/pool/main/t/termius-app/termius-app_${version}_amd64.deb"; - sha256 = "0vc4nz5yndg11zhs92xj496jqzlhy9g0vqlfqrmg8zpf9ciygbqz"; + sha256 = "801579b931ca0ad5340085df8863042336e2b609dd1cd6771260c873f3d2bb73"; }; desktopItem = makeDesktopItem { @@ -45,7 +45,6 @@ stdenv.mkDerivation rec { cp -R "opt" "$out" cp -R "usr/share" "$out/share" chmod -R g-w "$out" - # Desktop file mkdir -p "$out/share/applications" cp "${desktopItem}/share/applications/"* "$out/share/applications" @@ -63,7 +62,7 @@ stdenv.mkDerivation rec { homepage = "https://termius.com/"; downloadPage = "https://termius.com/linux/"; license = licenses.unfree; - maintainers = with maintainers; [ Br1ght0ne ]; + maintainers = with maintainers; [ Br1ght0ne th0rgal ]; platforms = [ "x86_64-linux" ]; }; -} +} \ No newline at end of file From 6c5c0fc1a85dfed840fff481c03452425de364be Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Sat, 21 Nov 2020 10:39:02 +0200 Subject: [PATCH 094/260] xmlsec: 1.2.30 -> 1.2.31 --- pkgs/development/libraries/xmlsec/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/xmlsec/default.nix b/pkgs/development/libraries/xmlsec/default.nix index 6b3468e5d57c..a52c85f1899a 100644 --- a/pkgs/development/libraries/xmlsec/default.nix +++ b/pkgs/development/libraries/xmlsec/default.nix @@ -3,7 +3,7 @@ lib.fix (self: let - version = "1.2.30"; + version = "1.2.31"; in stdenv.mkDerivation { pname = "xmlsec"; @@ -11,7 +11,7 @@ stdenv.mkDerivation { src = fetchurl { url = "https://www.aleksey.com/xmlsec/download/xmlsec1-${version}.tar.gz"; - sha256 = "1j5bf7ni45jghyrbf7a14wx2pvfara557zyry7g7h8840c5kd11d"; + sha256 = "mxC8Uswx5PdhYuOXXlDbJrcatJxXHYELMRymJr5aCyY="; }; patches = [ From ea9cada455617c926403be72fb1d645fcd394d0b Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Sat, 21 Nov 2020 10:39:52 +0200 Subject: [PATCH 095/260] xmlsec: use nss_3_53 Otherwise the build fails the tests. Probably a regression since the update of nss to 3.59. --- pkgs/development/libraries/xmlsec/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/xmlsec/default.nix b/pkgs/development/libraries/xmlsec/default.nix index a52c85f1899a..18ee99804d3c 100644 --- a/pkgs/development/libraries/xmlsec/default.nix +++ b/pkgs/development/libraries/xmlsec/default.nix @@ -1,5 +1,7 @@ { stdenv, fetchurl, libxml2, gnutls, libxslt, pkgconfig, libgcrypt, libtool -, openssl, nss, lib, runCommandCC, writeText }: +# nss_3_53 is used instead of the latest due to a number of issues: +# https://github.com/lsh123/xmlsec/issues?q=is%3Aissue+is%3Aopen+nss +, openssl, nss_3_53, lib, runCommandCC, writeText }: lib.fix (self: let @@ -25,11 +27,11 @@ stdenv.mkDerivation { nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ libxml2 gnutls libxslt libgcrypt libtool openssl nss ]; + buildInputs = [ libxml2 gnutls libxslt libgcrypt libtool openssl nss_3_53 ]; enableParallelBuilding = true; doCheck = true; - checkInputs = [ nss.tools ]; + checkInputs = [ nss_3_53.tools ]; # enable deprecated soap headers required by lasso # https://dev.entrouvert.org/issues/18771 From f36b838e2ac553d0b6bfa080e31cbb12f4a42286 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 21 Nov 2020 09:50:03 +0100 Subject: [PATCH 096/260] nixos test-driver: fix single line docstrings, fixes #104467 Single line docstrings should have the """ on a single line according to PEP 8. It seems support for this landed in the latest version of Black. --- nixos/lib/test-driver/test-driver.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/nixos/lib/test-driver/test-driver.py b/nixos/lib/test-driver/test-driver.py index 68bd35dd98e9..96b75a49928f 100644 --- a/nixos/lib/test-driver/test-driver.py +++ b/nixos/lib/test-driver/test-driver.py @@ -634,8 +634,7 @@ class Machine: shutil.copy(intermediate, abs_target) def dump_tty_contents(self, tty: str) -> None: - """Debugging: Dump the contents of the TTY - """ + """Debugging: Dump the contents of the TTY""" self.execute("fold -w 80 /dev/vcs{} | systemd-cat".format(tty)) def get_screen_text(self) -> str: @@ -860,8 +859,7 @@ class Machine: self.send_monitor_command("set_link virtio-net-pci.1 off") def unblock(self) -> None: - """Make the machine reachable. - """ + """Make the machine reachable.""" self.send_monitor_command("set_link virtio-net-pci.1 on") From e6c0c51ce8cce525094687ab9d1dfb374055615a Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 21 Nov 2020 10:10:45 +0100 Subject: [PATCH 097/260] Revert "Revert "cachix: drop the build from the release jobset"" Reverting again because of an evaluation error. https://github.com/NixOS/nixpkgs/issues/104475 This reverts commit f75c8753d80959f6bf63237748e799849c74179f. --- pkgs/top-level/release.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index cacc77fea30d..20eaffaf84ac 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -62,7 +62,7 @@ let # jobs.stack.x86_64-darwin jobs.stdenv.x86_64-darwin jobs.vim.x86_64-darwin - jobs.cachix.x86_64-darwin + # jobs.cachix.x86_64-darwin # UI apps # jobs.firefox-unwrapped.x86_64-darwin @@ -105,7 +105,7 @@ let jobs.nix-info-tested.x86_64-linux # Ensure that X11/GTK are in order. jobs.thunderbird.x86_64-linux - jobs.cachix.x86_64-linux + # jobs.cachix.x86_64-linux /* jobs.tests.cc-wrapper.x86_64-linux From 2a5e8ce636e80f4cd7a3def1b1f1816a26c4153d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sat, 21 Nov 2020 09:39:46 +0100 Subject: [PATCH 098/260] gmic: upgrade opencv --- pkgs/tools/graphics/gmic/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/graphics/gmic/default.nix b/pkgs/tools/graphics/gmic/default.nix index 435cafe001d1..6787ff2e8f8d 100644 --- a/pkgs/tools/graphics/gmic/default.nix +++ b/pkgs/tools/graphics/gmic/default.nix @@ -3,7 +3,7 @@ , cmake , ninja , pkg-config -, opencv3 +, opencv , openexr , graphicsmagick , fftw @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { libjpeg libtiff libpng - opencv3 + opencv openexr graphicsmagick ]; From dae00908a862208bbc299bd775e9101397f9cc24 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sat, 21 Nov 2020 09:41:50 +0100 Subject: [PATCH 099/260] digikam: update opencv --- pkgs/applications/graphics/digikam/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/graphics/digikam/default.nix b/pkgs/applications/graphics/digikam/default.nix index 0654a2ed1a8d..1e4b397db231 100644 --- a/pkgs/applications/graphics/digikam/default.nix +++ b/pkgs/applications/graphics/digikam/default.nix @@ -39,7 +39,7 @@ , marble , libGL , libGLU -, opencv3 +, opencv , pcre , threadweaver , x265 @@ -83,7 +83,7 @@ mkDerivation rec { libusb1 libGL libGLU - opencv3 + opencv pcre x265 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a7cff959dcfe..ba0fe1ac3bd1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -25218,9 +25218,7 @@ in dhewm3 = callPackage ../games/dhewm3 {}; - digikam = libsForQt514.callPackage ../applications/graphics/digikam { - opencv3 = opencv3WithoutCuda; - }; + digikam = libsForQt514.callPackage ../applications/graphics/digikam {}; displaycal = callPackage ../applications/graphics/displaycal {}; From f5b1a0ae1a9833058ab9ff7afe2baf3e1d9ea156 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sat, 21 Nov 2020 08:47:38 +0100 Subject: [PATCH 100/260] freeoffice: 978 -> 980 --- pkgs/applications/office/softmaker/freeoffice.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/office/softmaker/freeoffice.nix b/pkgs/applications/office/softmaker/freeoffice.nix index 2e12e6d3d43d..bdd90fecb8ee 100644 --- a/pkgs/applications/office/softmaker/freeoffice.nix +++ b/pkgs/applications/office/softmaker/freeoffice.nix @@ -5,9 +5,9 @@ # overridable. This is useful when the upstream archive was replaced # and nixpkgs is not in sync yet. , officeVersion ? { - version = "978"; + version = "980"; edition = "2018"; - sha256 = "1c5div1kbyyj48f89wkhc1i1759n70bsbp3w4a42cr0jmllyl60v"; + sha256 = "19pgil86aagiz6z4kx22gd4cxbbmrx42ix42arkfb6p6hav1plby"; } , ... } @ args: From 8be3b7c1057d3cbc790c674b6f63d8a6019c1052 Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Fri, 20 Nov 2020 21:00:57 -0600 Subject: [PATCH 101/260] picat: enable on aarch64-linux Signed-off-by: Austin Seipp --- pkgs/development/compilers/picat/default.nix | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/pkgs/development/compilers/picat/default.nix b/pkgs/development/compilers/picat/default.nix index 8fe3031e6b35..4898f991079c 100644 --- a/pkgs/development/compilers/picat/default.nix +++ b/pkgs/development/compilers/picat/default.nix @@ -1,5 +1,12 @@ { stdenv, fetchurl, zlib }: +let + ARCH = { + i686-linux = "linux32"; + x86_64-linux = "linux64"; + aarch64-linux = "linux64"; + }."${stdenv.hostPlatform.system}" or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); +in stdenv.mkDerivation { pname = "picat"; version = "3.0p3"; @@ -11,19 +18,13 @@ stdenv.mkDerivation { buildInputs = [ zlib ]; - ARCH = if stdenv.hostPlatform.system == "i686-linux" then "linux32" - else if stdenv.hostPlatform.system == "x86_64-linux" then "linux64" - else throw "Unsupported system"; + inherit ARCH; hardeningDisable = [ "format" ]; enableParallelBuilding = true; buildPhase = "cd emu && make -j $NIX_BUILD_CORES -f Makefile.$ARCH"; - - installPhase = '' - mkdir -p $out/bin - cp picat $out/bin/picat - ''; + installPhase = "mkdir -p $out/bin && cp picat $out/bin/picat"; meta = with stdenv.lib; { description = "Logic-based programming langage"; From ef90af465a341c63fdf0cebe816f182597375ea3 Mon Sep 17 00:00:00 2001 From: kfollesdal Date: Mon, 16 Nov 2020 14:43:45 +0100 Subject: [PATCH 102/260] pythonPackage.python-crontab: init at 2.5.1 --- .../python-modules/python-crontab/default.nix | 27 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 29 insertions(+) create mode 100644 pkgs/development/python-modules/python-crontab/default.nix diff --git a/pkgs/development/python-modules/python-crontab/default.nix b/pkgs/development/python-modules/python-crontab/default.nix new file mode 100644 index 000000000000..f5e368de0372 --- /dev/null +++ b/pkgs/development/python-modules/python-crontab/default.nix @@ -0,0 +1,27 @@ +{ lib, buildPythonPackage, fetchPypi, python-dateutil, pytestCheckHook }: + +buildPythonPackage rec { + pname = "python-crontab"; + version = "2.5.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "4bbe7e720753a132ca4ca9d4094915f40e9d9dc8a807a4564007651018ce8c31"; + }; + + checkInputs = [ pytestCheckHook ]; + disabledTests = [ "test_07_non_posix_shell"]; + + propagatedBuildInputs = [ python-dateutil ]; + + meta = with lib; { + description = "Python API for crontab"; + longDescription = '' + Crontab module for reading and writing crontab files + and accessing the system cron automatically and simply using a direct API. + ''; + homepage = "https://pypi.org/project/python-crontab/"; + license = licenses.lgpl3Plus; + maintainers = with maintainers; [ kfollesdal ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index f2dcb3e7971b..a96a31b5a699 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5788,6 +5788,8 @@ in { python-constraint = callPackage ../development/python-modules/python-constraint { }; + python-crontab = callPackage ../development/python-modules/python-crontab { }; + python-ctags3 = callPackage ../development/python-modules/python-ctags3 { }; python-daemon = callPackage ../development/python-modules/python-daemon { }; From e705042600a2a3e91caa7c8588b3b68e8273a0cf Mon Sep 17 00:00:00 2001 From: Timo Kaufmann Date: Sat, 21 Nov 2020 10:29:55 +0100 Subject: [PATCH 103/260] maintainers: add raskin to the sage team Meant to do that in b7319d2d35e5f50e777723b3b1c448ad05dc9e9a, but didn't stage the changes in the actual maintainers list. --- maintainers/team-list.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix index 9f56686e24f2..598393582ab8 100644 --- a/maintainers/team-list.nix +++ b/maintainers/team-list.nix @@ -113,6 +113,7 @@ with lib.maintainers; { members = [ timokau omasanori + raskin ]; scope = "Maintain SageMath and the dependencies that are likely to break it."; }; From 4d8e0f9b770dbe5187ec4b64590531c30cab237d Mon Sep 17 00:00:00 2001 From: Francesco Gazzetta Date: Mon, 19 Oct 2020 19:54:53 +0200 Subject: [PATCH 104/260] common-updater-scripts: add --rev to update-source-version Adds a --rev= parameter to the script that makes it possible to explicitly specify a new revision. Useful to update unstable packages, where the version and revision may be independent. --- .../scripts/update-source-version | 21 ++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/pkgs/common-updater/scripts/update-source-version b/pkgs/common-updater/scripts/update-source-version index ba628fd2a445..181561242fc3 100755 --- a/pkgs/common-updater/scripts/update-source-version +++ b/pkgs/common-updater/scripts/update-source-version @@ -10,7 +10,7 @@ die() { usage() { echo "Usage: $scriptName [] []" - echo " [--version-key=] [--system=] [--file=]" + echo " [--version-key=] [--system=] [--file=] [--rev=]" echo " [--ignore-same-hash] [--print-changes]" } @@ -30,6 +30,9 @@ for arg in "$@"; do die "Could not find provided file $nixFile" fi ;; + --rev=*) + newRevision="${arg#*=}" + ;; --ignore-same-hash) ignoreSameHash="true" ;; @@ -111,6 +114,13 @@ if [[ "$oldVersion" = "$newVersion" ]]; then exit 0 fi +if [[ -n "$newRevision" ]]; then + oldRevision=$(nix-instantiate $systemArg --eval -E "with import ./. {}; $attr.src.rev" | tr -d '"') + if [[ -z "$oldRevision" ]]; then + die "Couldn't evaluate source revision from '$attr.src'!" + fi +fi + # Escape regex metacharacter that are allowed in store path names oldVersionEscaped=$(echo "$oldVersion" | sed -re 's|[.+]|\\&|g') oldUrlEscaped=$(echo "$oldUrl" | sed -re 's|[${}.+]|\\&|g') @@ -174,6 +184,15 @@ if cmp -s "$nixFile" "$nixFile.bak"; then die "Failed to replace source hash of '$attr' to a temporary hash!" fi +# Replace new revision, if given +if [[ -n "$newRevision" ]]; then + sed -i "$nixFile" -re "s|\"$oldRevision\"|\"$newRevision\"|" + + if cmp -s "$nixFile" "$nixFile.bak"; then + die "Failed to replace source revision '$oldRevision' to '$newRevision' in '$attr'!" + fi +fi + # If new hash not given on the command line, recalculate it ourselves. if [[ -z "$newHash" ]]; then nix-build $systemArg --no-out-link -A "$attr.src" 2>"$attr.fetchlog" >/dev/null || true From 3f20319cd19cfb0583df5c02be9b1dcae3b6e65f Mon Sep 17 00:00:00 2001 From: Francesco Gazzetta Date: Mon, 19 Oct 2020 19:57:12 +0200 Subject: [PATCH 105/260] unstableUpdater: init --- pkgs/common-updater/unstable-updater.nix | 44 ++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 46 insertions(+) create mode 100644 pkgs/common-updater/unstable-updater.nix diff --git a/pkgs/common-updater/unstable-updater.nix b/pkgs/common-updater/unstable-updater.nix new file mode 100644 index 000000000000..94cd33b9a26b --- /dev/null +++ b/pkgs/common-updater/unstable-updater.nix @@ -0,0 +1,44 @@ +{ stdenv +, writeShellScript +, coreutils +, git +, nix +, common-updater-scripts +}: + +# This is an updater for unstable packages that should always use the latest +# commit. +{ url ? null # The git url, if empty it will be set to src.url +}: + +let + updateScript = writeShellScript "unstable-update-script.sh" '' + set -ex + + url="$1" + + # By default we set url to src.url + if [[ -z "$url" ]]; then + url="$(${nix}/bin/nix-instantiate $systemArg --eval -E \ + "with import ./. {}; $UPDATE_NIX_ATTR_PATH.src.url" \ + | tr -d '"')" + fi + + # Get info about HEAD from a shallow git clone + tmpdir="$(${coreutils}/bin/mktemp -d)" + ${git}/bin/git clone --bare --depth=1 "$url" "$tmpdir" + pushd "$tmpdir" + commit_date="$(${git}/bin/git show -s --pretty='format:%cs')" + commit_sha="$(${git}/bin/git show -s --pretty='format:%H')" + popd + ${coreutils}/bin/rm -rf "$tmpdir" + + # update the nix expression + ${common-updater-scripts}/bin/update-source-version \ + "$UPDATE_NIX_ATTR_PATH" \ + "unstable-$commit_date" \ + --rev="$commit_sha" + ''; + +in [ updateScript url ] + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 956e6d30e4c5..40f3ec4b206e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -94,6 +94,8 @@ in genericUpdater = callPackage ../common-updater/generic-updater.nix { }; + unstableGitUpdater = callPackage ../common-updater/unstable-updater.nix { }; + nix-update-script = callPackage ../common-updater/nix-update.nix { }; ### Push NixOS tests inside the fixed point From 97e5fc3dc61a4273d5679a9bcf37ef7bd3111199 Mon Sep 17 00:00:00 2001 From: Francesco Gazzetta Date: Mon, 19 Oct 2020 19:58:45 +0200 Subject: [PATCH 106/260] qbe: use unstableUpdater --- pkgs/development/compilers/qbe/default.nix | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/qbe/default.nix b/pkgs/development/compilers/qbe/default.nix index 8926fced482d..871707496561 100644 --- a/pkgs/development/compilers/qbe/default.nix +++ b/pkgs/development/compilers/qbe/default.nix @@ -1,6 +1,9 @@ -{ stdenv, fetchgit }: +{ stdenv +, fetchgit +, unstableGitUpdater +}: -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "qbe"; version = "unstable-2019-07-11"; @@ -11,6 +14,9 @@ stdenv.mkDerivation { }; makeFlags = [ "PREFIX=$(out)" ]; + + passthru.updateScript = unstableGitUpdater { }; + meta = with stdenv.lib; { homepage = "https://c9x.me/compile/"; description = "A small compiler backend written in C"; From 39acab635852079f9a144de0e0f3f6cf9e6a5f1d Mon Sep 17 00:00:00 2001 From: tbenst Date: Tue, 29 Sep 2020 17:02:13 -0700 Subject: [PATCH 107/260] opencv: allow other blas/lapack --- pkgs/development/libraries/opencv/4.x.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/development/libraries/opencv/4.x.nix b/pkgs/development/libraries/opencv/4.x.nix index adeab6b44948..a723ded6bb69 100644 --- a/pkgs/development/libraries/opencv/4.x.nix +++ b/pkgs/development/libraries/opencv/4.x.nix @@ -34,8 +34,6 @@ , AVFoundation, Cocoa, VideoDecodeAcceleration, CoreMedia, MediaToolbox, bzip2 }: -assert blas.implementation == "openblas" && lapack.implementation == "openblas"; - let version = "4.3.0"; From 7798a4e19cc843874e6329e0a980de7515945923 Mon Sep 17 00:00:00 2001 From: Thibault Polge Date: Sat, 14 Nov 2020 10:55:17 +0100 Subject: [PATCH 108/260] eduke32: 20190330 -> 20200907 --- pkgs/games/eduke32/default.nix | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/pkgs/games/eduke32/default.nix b/pkgs/games/eduke32/default.nix index 53baac79eed6..51d0c713753b 100644 --- a/pkgs/games/eduke32/default.nix +++ b/pkgs/games/eduke32/default.nix @@ -1,10 +1,11 @@ { stdenv, fetchurl, makeWrapper, pkgconfig, nasm, makeDesktopItem -, flac, gtk2, libvorbis, libvpx, libGLU, libGL +, alsaLib, flac, gtk2, libvorbis, libvpx, libGLU, libGL , SDL2, SDL2_mixer }: let - version = "20190330"; - rev = "7470"; + version = "20200907"; + rev = "9527"; + revExtra = "93f62bbad"; desktopItem = makeDesktopItem { name = "eduke32"; @@ -22,11 +23,12 @@ in stdenv.mkDerivation { inherit version; src = fetchurl { - url = "http://dukeworld.duke4.net/eduke32/synthesis/latest/eduke32_src_${version}-${rev}.tar.xz"; - sha256 = "09a7l23i6sygicc82w1in9hjw0jvivlf7q0vw8kcx9j98lm23mkn"; + url = "http://dukeworld.duke4.net/eduke32/synthesis/latest/eduke32_src_20200907-9257-93f62bbad.tar.xz"; # Good + # url = "http://dukeworld.duke4.net/eduke32/synthesis/latest/eduke32_src_${version}-${rev}-${revExtra}.tar.xz"; + sha256 = "972630059be61ef9564a241b84ef2ee4f69fc85c19ee36ce46052ff2f1ce3bf9"; }; - buildInputs = [ flac gtk2 libvorbis libvpx libGL libGLU SDL2 SDL2_mixer ]; + buildInputs = [ alsaLib flac gtk2 libvorbis libvpx libGL libGLU SDL2 SDL2_mixer ]; nativeBuildInputs = [ makeWrapper pkgconfig ] ++ stdenv.lib.optional (stdenv.hostPlatform.system == "i686-linux") nasm; From 6a907b33af7808093a43e41a1a48e57314ec8995 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 21 Nov 2020 12:10:56 +0000 Subject: [PATCH 109/260] python37Packages.oauthenticator: 0.12.0 -> 0.12.1 --- pkgs/development/python-modules/oauthenticator/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/oauthenticator/default.nix b/pkgs/development/python-modules/oauthenticator/default.nix index 6caaacd963bf..6fc9f24a63a7 100644 --- a/pkgs/development/python-modules/oauthenticator/default.nix +++ b/pkgs/development/python-modules/oauthenticator/default.nix @@ -16,11 +16,11 @@ buildPythonPackage rec { pname = "oauthenticator"; - version = "0.12.0"; + version = "0.12.1"; src = fetchPypi { inherit pname version; - sha256 = "0bc5a4a0ee22689a863090993e0054485030847d0e9884afa1592ca388cccf4a"; + sha256 = "f4a048e329766a6023768c9fefd77c859a9726bdf2029c62ec78de410ec876cd"; }; checkPhase = '' From 8d5a58fcfb06e2c1ae5c53902dfc064d848d9db0 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 20 Nov 2020 06:15:54 +0000 Subject: [PATCH 110/260] python37Packages.bravia-tv: 1.0.7 -> 1.0.8 --- pkgs/development/python-modules/bravia-tv/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/bravia-tv/default.nix b/pkgs/development/python-modules/bravia-tv/default.nix index cfb30a926d58..15f292953b67 100644 --- a/pkgs/development/python-modules/bravia-tv/default.nix +++ b/pkgs/development/python-modules/bravia-tv/default.nix @@ -2,14 +2,14 @@ buildPythonPackage rec { pname = "bravia-tv"; - version = "1.0.7"; + version = "1.0.8"; disabled = isPy27; src = fetchFromGitHub { owner = "dcnielsen90"; repo = "python-bravia-tv"; rev = "v${version}"; - sha256 = "0bg33nilybh46s6yz3x7a7x8biwbvy5scqdrl4didhn7vjd4w5fn"; + sha256 = "0djwy4z1y173q3mnbngp754yrwzmm6h3x0rshvrvd64b78x1bsmp"; }; propagatedBuildInputs = [ requests ]; From 941b77d6bac9bd9a9681f550f04cc7047b44801c Mon Sep 17 00:00:00 2001 From: David Terry Date: Sat, 21 Nov 2020 14:26:53 +0100 Subject: [PATCH 111/260] turbo-geth: 2020.11.02 -> 2020.11.03 --- pkgs/applications/blockchains/turbo-geth.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/blockchains/turbo-geth.nix b/pkgs/applications/blockchains/turbo-geth.nix index eae1b812a3d9..59fd1e936d08 100644 --- a/pkgs/applications/blockchains/turbo-geth.nix +++ b/pkgs/applications/blockchains/turbo-geth.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "turbo-geth"; - version = "2020.11.02"; + version = "2020.11.03"; src = fetchFromGitHub { owner = "ledgerwatch"; repo = pname; rev = "v${version}"; - sha256 = "1bfywbg6mm3q4wd0mslcv5sj779277izzlqawqvqy3yxnpb6cwj5"; + sha256 = "0fhfrk0k8w1mx4kf81kyirdpa91fm4g5pnvhr9cybrvygc4yx1f7"; }; vendorSha256 = "16vawkky612zf45d8dhipjmhrprmi28z9wdcnjy07x3bxdyfbhfr"; From 3d230b7caa23ce7a753e938e7a035f7f285573ef Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 21 Nov 2020 02:28:23 +0000 Subject: [PATCH 112/260] python37Packages.pyexcel: 0.6.5 -> 0.6.6 --- pkgs/development/python-modules/pyexcel/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyexcel/default.nix b/pkgs/development/python-modules/pyexcel/default.nix index d62302c9c234..ca562ca5586b 100644 --- a/pkgs/development/python-modules/pyexcel/default.nix +++ b/pkgs/development/python-modules/pyexcel/default.nix @@ -10,13 +10,13 @@ buildPythonPackage rec { pname = "pyexcel"; - version = "0.6.5"; + version = "0.6.6"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "36588573ccb1c86e1a8869e1e9f6b31975a38c13803f015a197c18efd2e685ad"; + sha256 = "39b0bb8f033d9b5523b126cf5a5259d1990ea82b8a23c8eab7aa5e23116803df"; }; propagatedBuildInputs = [ From 1fde3c35619bd445357077d816c72b0e589e0775 Mon Sep 17 00:00:00 2001 From: Kai Wohlfahrt Date: Sun, 2 Aug 2020 23:52:37 +0100 Subject: [PATCH 113/260] nixos/openldap: switch to slapd.d configuration The old slapd.conf is deprecated. Replace with slapd.d, and use this opportunity to write some structured settings. Incidentally, this fixes the fact that openldap is reported up before any checks have completed, by using forking mode. --- nixos/modules/misc/ids.nix | 4 +- nixos/modules/services/databases/openldap.nix | 371 ++++++++++++++---- nixos/tests/openldap.nix | 163 ++++++-- 3 files changed, 431 insertions(+), 107 deletions(-) diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix index bafa22250400..cf0198d7b93d 100644 --- a/nixos/modules/misc/ids.nix +++ b/nixos/modules/misc/ids.nix @@ -135,7 +135,7 @@ in #keys = 96; # unused #haproxy = 97; # dynamically allocated as of 2020-03-11 mongodb = 98; - openldap = 99; + #openldap = 99; # dynamically allocated as of PR#94610 #users = 100; # unused cgminer = 101; munin = 102; @@ -451,7 +451,7 @@ in keys = 96; #haproxy = 97; # dynamically allocated as of 2020-03-11 #mongodb = 98; # unused - openldap = 99; + #openldap = 99; # dynamically allocated as of PR#94610 munin = 102; #logcheck = 103; # unused #nix-ssh = 104; # unused diff --git a/nixos/modules/services/databases/openldap.nix b/nixos/modules/services/databases/openldap.nix index 7472538b887e..afe24597e03f 100644 --- a/nixos/modules/services/databases/openldap.nix +++ b/nixos/modules/services/databases/openldap.nix @@ -1,20 +1,19 @@ { config, lib, pkgs, ... }: with lib; - let - cfg = config.services.openldap; openldap = cfg.package; dataFile = pkgs.writeText "ldap-contents.ldif" cfg.declarativeContents; - configFile = pkgs.writeText "slapd.conf" ((optionalString cfg.defaultSchemas '' - include ${openldap.out}/etc/schema/core.schema - include ${openldap.out}/etc/schema/cosine.schema - include ${openldap.out}/etc/schema/inetorgperson.schema - include ${openldap.out}/etc/schema/nis.schema + configFile = pkgs.writeText "slapd.conf" ((optionalString (cfg.defaultSchemas != null && cfg.defaultSchemas) '' + include ${openldap}/etc/schema/core.schema + include ${openldap}/etc/schema/cosine.schema + include ${openldap}/etc/schema/inetorgperson.schema + include ${openldap}/etc/schema/nis.schema '') + '' - ${cfg.extraConfig} + pidfile /run/slapd/slapd.pid + ${if cfg.extraConfig != null then cfg.extraConfig else ""} database ${cfg.database} suffix ${cfg.suffix} rootdn ${cfg.rootdn} @@ -24,20 +23,79 @@ let include ${cfg.rootpwFile} ''} directory ${cfg.dataDir} - ${cfg.extraDatabaseConfig} + ${if cfg.extraDatabaseConfig != null then cfg.extraDatabaseConfig else ""} ''); - configOpts = if cfg.configDir == null then "-f ${configFile}" - else "-F ${cfg.configDir}"; -in -{ + configDir = if cfg.configDir != null then cfg.configDir else "/etc/openldap/slapd.d"; - ###### interface + ldapValueType = let + singleLdapValueType = types.either types.str (types.submodule { + options = { + path = mkOption { + type = types.path; + description = '' + A path containing the LDAP attribute. This is included at run-time, so + is recommended for storing secrets. + ''; + }; + }; + }); + in types.either singleLdapValueType (types.listOf singleLdapValueType); + ldapAttrsType = + let + options = { + attrs = mkOption { + type = types.attrsOf ldapValueType; + default = {}; + description = "Attributes of the parent entry."; + }; + children = mkOption { + # Hide the child attributes, to avoid infinite recursion in e.g. documentation + # Actual Nix evaluation is lazy, so this is not an issue there + type = let + hiddenOptions = lib.mapAttrs (name: attr: attr // { visible = false; }) options; + in types.attrsOf (types.submodule { options = hiddenOptions; }); + default = {}; + description = "Child entries of the current entry, with recursively the same structure."; + example = lib.literalExample '' + { + "cn=schema" = { + # The attribute used in the DN must be defined + attrs = { cn = "schema"; }; + children = { + # This entry's DN is expanded to "cn=foo,cn=schema" + "cn=foo" = { ... }; + }; + # These includes are inserted after "cn=schema", but before "cn=foo,cn=schema" + includes = [ ... ]; + }; + } + ''; + }; + includes = mkOption { + type = types.listOf types.path; + default = []; + description = '' + LDIF files to include after the parent's attributes but before its children. + ''; + }; + }; + in types.submodule { inherit options; }; + + valueToLdif = attr: values: let + singleValueToLdif = value: if lib.isAttrs value then "${attr}:< file://${value.path}" else "${attr}: ${value}"; + in if lib.isList values then map singleValueToLdif values else [ (singleValueToLdif values) ]; + + attrsToLdif = dn: { attrs, children, includes, ... }: ['' + dn: ${dn} + ${lib.concatStringsSep "\n" (lib.flatten (lib.mapAttrsToList valueToLdif attrs))} + ''] ++ (map (path: "include: file://${path}\n") includes) ++ ( + lib.flatten (lib.mapAttrsToList (name: value: attrsToLdif "${name},${dn}" value) children) + ); +in { options = { - services.openldap = { - enable = mkOption { type = types.bool; default = false; @@ -77,47 +135,91 @@ in example = [ "ldaps:///" ]; }; + settings = mkOption { + type = ldapAttrsType; + description = "Configuration for OpenLDAP, in OLC format"; + example = lib.literalExample '' + { + attrs.olcLogLevel = [ "stats" ]; + children = { + "cn=schema".includes = [ + "\${pkgs.openldap}/etc/schema/core.ldif" + "\${pkgs.openldap}/etc/schema/cosine.ldif" + "\${pkgs.openldap}/etc/schema/inetorgperson.ldif" + ]; + "olcDatabase={-1}frontend" = { + attrs = { + objectClass = "olcDatabaseConfig"; + olcDatabase = "{-1}frontend"; + olcAccess = [ "{0}to * by dn.exact=uidNumber=0+gidNumber=0,cn=peercred,cn=external,cn=auth manage stop by * none stop" ]; + }; + }; + "olcDatabase={0}config" = { + attrs = { + objectClass = "olcDatabaseConfig"; + olcDatabase = "{0}config"; + olcAccess = [ "{0}to * by * none break" ]; + }; + }; + "olcDatabase={1}mdb" = { + attrs = { + objectClass = [ "olcDatabaseConfig" "olcMdbConfig" ]; + olcDatabase = "{1}mdb"; + olcDbDirectory = "/var/db/ldap"; + olcDbIndex = [ + "objectClass eq" + "cn pres,eq" + "uid pres,eq" + "sn pres,eq,subany" + ]; + olcSuffix = "dc=example,dc=com"; + olcAccess = [ "{0}to * by * read break" ]; + }; + }; + }; + }; + ''; + }; + + # These options are translated into settings dataDir = mkOption { - type = types.path; + type = types.nullOr types.path; default = "/var/db/openldap"; description = "The database directory."; }; defaultSchemas = mkOption { - type = types.bool; + type = types.nullOr types.bool; default = true; + description = '' Include the default schemas core, cosine, inetorgperson and nis. - This setting will be ignored if configDir is set. ''; }; database = mkOption { - type = types.str; + type = types.nullOr types.str; default = "mdb"; - description = '' - Database type to use for the LDAP. - This setting will be ignored if configDir is set. - ''; + description = "Backend to use for the first database."; }; suffix = mkOption { - type = types.str; + type = types.nullOr types.str; + default = null; example = "dc=example,dc=org"; description = '' - Specify the DN suffix of queries that will be passed to this backend - database. - This setting will be ignored if configDir is set. + Specify the DN suffix of queries that will be passed to the first + database database. ''; }; rootdn = mkOption { - type = types.str; + type = types.nullOr types.str; + default = null; example = "cn=admin,dc=example,dc=org"; description = '' Specify the distinguished name that is not subject to access control or administrative limit restrictions for operations on this database. - This setting will be ignored if configDir is set. ''; }; @@ -125,10 +227,9 @@ in type = types.nullOr types.str; default = null; description = '' - Password for the root user. - This setting will be ignored if configDir is set. - Using this option will store the root password in plain text in the - world-readable nix store. To avoid this the rootpwFile can be used. + Password for the root user.Using this option will store the root + password in plain text in the world-readable nix store. To avoid this + the rootpwFile can be used. ''; }; @@ -137,25 +238,36 @@ in default = null; description = '' Password file for the root user. - The file should contain the string rootpw followed by the password. - e.g.: rootpw mysecurepassword + + If the deprecated extraConfig or + extraDatabaseConfig options are set, this should + contain rootpw followed by the password + (e.g. rootpw thePasswordHere). + + Otherwise the file should contain only the password (no trailing + newline or leading rootpw). ''; }; logLevel = mkOption { - type = types.str; - default = "0"; - example = "acl trace"; - description = "The log level selector of slapd."; + type = types.nullOr (types.listOf types.str); + default = null; + example = literalExample "[ \"acl\" \"trace\" ]"; + description = "The log level."; }; + # This option overrides settings configDir = mkOption { type = types.nullOr types.path; default = null; - description = "Use this optional config directory instead of using slapd.conf"; + description = '' + Use this optional config directory instead of generating one from the + settings option. + ''; example = "/var/db/slapd.d"; }; + # These options are deprecated extraConfig = mkOption { type = types.lines; default = ""; @@ -164,10 +276,10 @@ in "; example = literalExample '' ''' - include ${openldap.out}/etc/schema/core.schema - include ${openldap.out}/etc/schema/cosine.schema - include ${openldap.out}/etc/schema/inetorgperson.schema - include ${openldap.out}/etc/schema/nis.schema + include ${openldap}/etc/schema/core.schema + include ${openldap}/etc/schema/cosine.schema + include ${openldap}/etc/schema/inetorgperson.schema + include ${openldap}/etc/schema/nis.schema database bdb suffix dc=example,dc=org @@ -244,57 +356,156 @@ in }; meta = { - maintainers = [ lib.maintainers.mic92 ]; + maintainers = with lib.maintainters; [ mic92 kwohlfahrt ]; }; - - ###### implementation - config = mkIf cfg.enable { - assertions = [ - { - assertion = cfg.configDir != null || cfg.rootpwFile != null || cfg.rootpw != null; - message = "services.openldap: Unless configDir is set, either rootpw or rootpwFile must be set"; - } - ]; + warnings = let + deprecations = [ + { old = "logLevel"; new = "attrs.olcLogLevel"; } + { old = "defaultSchemas"; + new = "children.\"cn=schema\".includes"; + newValue = "[\n ${lib.concatStringsSep "\n " [ + "\${pkgs.openldap}/etc/schema/core.ldif" + "\${pkgs.openldap}/etc/schema/cosine.ldif" + "\${pkgs.openldap}/etc/schema/inetorgperson.ldif" + "\${pkgs.openldap}/etc/schema/nis.ldif" + ]}\n ]"; } + { old = "database"; new = "children.\"cn={1}${cfg.database}\""; newValue = "{ }"; } + { old = "suffix"; new = "children.\"cn={1}${cfg.database}\".attrs.olcSuffix"; } + { old = "dataDir"; new = "children.\"cn={1}${cfg.database}\".attrs.olcDbDirectory"; } + { old = "rootdn"; new = "children.\"cn={1}${cfg.database}\".attrs.olcRootDN"; } + { old = "rootpw"; new = "children.\"cn={1}${cfg.database}\".attrs.olcRootPW"; } + { old = "rootpwFile"; + new = "children.\"cn={1}${cfg.database}\".attrs.olcRootPW"; + newValue = "{ path = \"${cfg.rootpwFile}\"; }"; + note = "The file should contain only the password (without \"rootpw \" as before)"; } + ]; + in (optional (cfg.extraConfig != "" || cfg.extraDatabaseConfig != "") '' + The options `extraConfig` and `extraDatabaseConfig` of `services.openldap` + are deprecated. This is due to the deprecation of `slapd.conf` + upstream. Please migrate to `services.openldap.settings`. + + After deploying this configuration, you can run: + slapcat -F ${configDir} -n0 -H 'ldap:///???(!(objectClass=olcSchemaConfig))' + on the same host to print your current configuration in LDIF format, + which should be straightforward to convert into Nix settings. + '') ++ (flatten (map (args@{old, new, ...}: lib.optional ((lib.hasAttr old cfg) && (lib.getAttr old cfg) != null) '' + The attribute `services.openldap.${old}` is deprecated. Please set it to + `null` and use the following option instead: + + services.openldap.settings.${new} = ${args.newValue or ( + let oldValue = (getAttr old cfg); + in if (isList oldValue) then "[ ${concatStringsSep " " oldValue} ]" else oldValue + )} + '') deprecations)) ++ (optional (cfg.configDir != null && (versionOlder config.system.stateVersion "20.09")) '' + The attribute `services.openldap.settings` now exists, and may be more + useful than `services.openldap.configDir`. If you continue to use + `configDir`, ensure that `olcPidFile` is set to "/run/slapd/slapd.pid". + + Set `system.stateVersion` to "20.09" or greater to silence this message. + ''); + + assertions = [{ + assertion = !(cfg.rootpwFile != null && cfg.rootpw != null); + message = "services.openldap: at most one of rootpw or rootpwFile must be set"; + }]; environment.systemPackages = [ openldap ]; + # Literal attributes must always be set (even if other top-level attributres are deprecated) + services.openldap.settings = { + attrs = { + objectClass = "olcGlobal"; + cn = "config"; + olcPidFile = "/run/slapd/slapd.pid"; + } // (lib.optionalAttrs (cfg.logLevel != null) { + olcLogLevel = cfg.logLevel; + }); + children = { + "cn=schema" = { + attrs = { + cn = "schema"; + objectClass = "olcSchemaConfig"; + }; + includes = lib.optionals (cfg.defaultSchemas != null && cfg.defaultSchemas) [ + "${openldap}/etc/schema/core.ldif" + "${openldap}/etc/schema/cosine.ldif" + "${openldap}/etc/schema/inetorgperson.ldif" + "${openldap}/etc/schema/nis.ldif" + ]; + }; + } // (lib.optionalAttrs (cfg.database != null) { + "olcDatabase={1}${cfg.database}".attrs = { + # objectClass is case-insensitive, so don't need to capitalize ${database} + objectClass = [ "olcdatabaseconfig" "olc${cfg.database}config" ]; + olcDatabase = "{1}${cfg.database}"; + } // (lib.optionalAttrs (cfg.suffix != null) { + olcSuffix = cfg.suffix; + }) // (lib.optionalAttrs (cfg.dataDir != null) { + olcDbDirectory = cfg.dataDir; + }) // (lib.optionalAttrs (cfg.rootdn != null) { + olcRootDN = cfg.rootdn; # TODO: Optional + }) // (lib.optionalAttrs (cfg.rootpw != null || cfg.rootpwFile != null) { + olcRootPW = (if cfg.rootpwFile != null then { path = cfg.rootpwFile; } else cfg.rootpw); # TODO: Optional + }); + }); + }; + systemd.services.openldap = { description = "LDAP server"; wantedBy = [ "multi-user.target" ]; after = [ "network.target" ]; - preStart = '' + preStart = let + dbSettings = lib.filterAttrs (name: value: lib.hasPrefix "olcDatabase=" name) cfg.settings.children; + dataDirs = lib.mapAttrsToList (name: value: value.attrs.olcDbDirectory) dbSettings; + settingsFile = pkgs.writeText "config.ldif" (lib.concatStringsSep "\n" (attrsToLdif "cn=config" cfg.settings)); + in '' mkdir -p /run/slapd chown -R "${cfg.user}:${cfg.group}" /run/slapd - ${optionalString (cfg.declarativeContents != null) '' - rm -Rf "${cfg.dataDir}" - ''} - mkdir -p "${cfg.dataDir}" - ${optionalString (cfg.declarativeContents != null) '' - ${openldap.out}/bin/slapadd ${configOpts} -l ${dataFile} - ''} - chown -R "${cfg.user}:${cfg.group}" "${cfg.dataDir}" - ${openldap}/bin/slaptest ${configOpts} + mkdir -p '${configDir}' ${lib.escapeShellArgs dataDirs} + chown "${cfg.user}:${cfg.group}" '${configDir}' ${lib.escapeShellArgs dataDirs} + + ${lib.optionalString (cfg.configDir == null) ( + if (cfg.extraConfig != "" || cfg.extraDatabaseConfig != "") then '' + rm -Rf '${configDir}'/* + # -u disables config generation, so just ignore the return code + ${openldap}/bin/slaptest -f ${configFile} -F ${configDir} || true + '' else '' + rm -Rf '${configDir}'/* + ${openldap}/bin/slapadd -F ${configDir} -n0 -l ${settingsFile} + '' + )} + chown -R "${cfg.user}:${cfg.group}" '${configDir}' + + ${optionalString (cfg.declarativeContents != null) '' + rm -Rf '${lib.head dataDirs}'/* + ${openldap}/bin/slapadd -F ${configDir} -n1 -l ${dataFile} + chown -R "${cfg.user}:${cfg.group}" ${lib.escapeShellArgs dataDirs} + ''} + + ${openldap}/bin/slaptest -u -F ${configDir} ''; - serviceConfig.ExecStart = - "${openldap.out}/libexec/slapd -d '${cfg.logLevel}' " + - "-u '${cfg.user}' -g '${cfg.group}' " + - "-h '${concatStringsSep " " cfg.urlList}' " + - "${configOpts}"; + serviceConfig = { + ExecStart = lib.concatStringsSep " " [ + "${openldap}/libexec/slapd" + "-u '${cfg.user}'" + "-g '${cfg.group}'" + "-h '${concatStringsSep " " cfg.urlList}'" + "-F ${configDir}" + ]; + Type = "forking"; + PIDFile = cfg.settings.attrs.olcPidFile; + }; }; - users.users.openldap = - { name = cfg.user; - group = cfg.group; - uid = config.ids.uids.openldap; - }; - - users.groups.openldap = - { name = cfg.group; - gid = config.ids.gids.openldap; - }; + users.users = lib.optionalAttrs (cfg.user == "openldap") { + openldap = { group = cfg.group; }; + }; + users.groups = lib.optionalAttrs (cfg.group == "openldap") { + openldap = {}; + }; }; } diff --git a/nixos/tests/openldap.nix b/nixos/tests/openldap.nix index f8321a2c522d..33b7b7f6608a 100644 --- a/nixos/tests/openldap.nix +++ b/nixos/tests/openldap.nix @@ -1,33 +1,146 @@ -import ./make-test-python.nix { - name = "openldap"; - - machine = { pkgs, ... }: { - services.openldap = { - enable = true; - suffix = "dc=example"; - rootdn = "cn=root,dc=example"; - rootpw = "notapassword"; - database = "bdb"; - extraDatabaseConfig = '' - directory /var/db/openldap - ''; - declarativeContents = '' - dn: dc=example - objectClass: domain - dc: example - - dn: ou=users,dc=example - objectClass: organizationalUnit - ou: users - ''; - }; - }; +{ pkgs, system ? builtins.currentSystem, ... }: let + declarativeContents = '' + dn: dc=example + objectClass: domain + dc: example + dn: ou=users,dc=example + objectClass: organizationalUnit + ou: users + ''; testScript = '' machine.wait_for_unit("openldap.service") machine.succeed( - "systemctl status openldap.service", 'ldapsearch -LLL -D "cn=root,dc=example" -w notapassword -b "dc=example"', ) ''; +in { + # New-style configuration + current = import ./make-test-python.nix { + inherit testScript; + name = "openldap"; + + machine = { pkgs, ... }: { + services.openldap = { + inherit declarativeContents; + enable = true; + defaultSchemas = null; + dataDir = null; + database = null; + settings = { + children = { + "cn=schema" = { + includes = [ + "${pkgs.openldap}/etc/schema/core.ldif" + "${pkgs.openldap}/etc/schema/cosine.ldif" + "${pkgs.openldap}/etc/schema/inetorgperson.ldif" + "${pkgs.openldap}/etc/schema/nis.ldif" + ]; + }; + "olcDatabase={1}mdb" = { + attrs = { + objectClass = [ "olcDatabaseConfig" "olcMdbConfig" ]; + olcDatabase = "{1}mdb"; + olcDbDirectory = "/var/db/openldap"; + olcSuffix = "dc=example"; + olcRootDN = "cn=root,dc=example"; + olcRootPW = "notapassword"; + }; + }; + }; + }; + }; + }; + }; + + # Old-style configuration + shortOptions = import ./make-test-python.nix { + inherit testScript; + name = "openldap"; + + machine = { pkgs, ... }: { + services.openldap = { + inherit declarativeContents; + enable = true; + suffix = "dc=example"; + rootdn = "cn=root,dc=example"; + rootpw = "notapassword"; + }; + }; + }; + + # Manually managed configDir, for example if dynamic config is essential + manualConfigDir = import ./make-test-python.nix { + name = "openldap"; + + machine = { pkgs, ... }: { + services.openldap = { + enable = true; + configDir = "/var/db/slapd.d"; + # Silence warnings + defaultSchemas = null; + dataDir = null; + database = null; + }; + }; + + testScript = let + contents = pkgs.writeText "data.ldif" declarativeContents; + config = pkgs.writeText "config.ldif" '' + dn: cn=config + cn: config + objectClass: olcGlobal + olcLogLevel: stats + olcPidFile: /run/slapd/slapd.pid + + dn: cn=schema,cn=config + cn: schema + objectClass: olcSchemaConfig + + include: file://${pkgs.openldap}/etc/schema/core.ldif + include: file://${pkgs.openldap}/etc/schema/cosine.ldif + include: file://${pkgs.openldap}/etc/schema/inetorgperson.ldif + + dn: olcDatabase={1}mdb,cn=config + objectClass: olcDatabaseConfig + objectClass: olcMdbConfig + olcDatabase: {1}mdb + olcDbDirectory: /var/db/openldap + olcDbIndex: objectClass eq + olcSuffix: dc=example + olcRootDN: cn=root,dc=example + olcRootPW: notapassword + ''; + in '' + machine.succeed( + "mkdir -p /var/db/slapd.d /var/db/openldap", + "slapadd -F /var/db/slapd.d -n0 -l ${config}", + "slapadd -F /var/db/slapd.d -n1 -l ${contents}", + "chown -R openldap:openldap /var/db/slapd.d /var/db/openldap", + "systemctl restart openldap", + ) + '' + testScript; + }; + + # extraConfig forces use of slapd.conf, test this until that option is removed + legacyConfig = import ./make-test-python.nix { + inherit testScript; + name = "openldap"; + + machine = { pkgs, ... }: { + services.openldap = { + inherit declarativeContents; + enable = true; + suffix = "dc=example"; + rootdn = "cn=root,dc=example"; + rootpw = "notapassword"; + extraConfig = '' + # No-op + ''; + extraDatabaseConfig = '' + # No-op + ''; + }; + }; + }; } From 057cb570beb9226b610dffa00cffd98b007a0686 Mon Sep 17 00:00:00 2001 From: Kai Wohlfahrt Date: Sun, 16 Aug 2020 20:17:06 +0100 Subject: [PATCH 114/260] nixos/openldap: Add delcarativeConfig by suffix Adding by index could be an issue if the user wanted the data to be added to a DB other than the first. --- nixos/modules/services/databases/openldap.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/databases/openldap.nix b/nixos/modules/services/databases/openldap.nix index afe24597e03f..d03c8cd7cfd3 100644 --- a/nixos/modules/services/databases/openldap.nix +++ b/nixos/modules/services/databases/openldap.nix @@ -474,14 +474,14 @@ in { ${openldap}/bin/slaptest -f ${configFile} -F ${configDir} || true '' else '' rm -Rf '${configDir}'/* - ${openldap}/bin/slapadd -F ${configDir} -n0 -l ${settingsFile} + ${openldap}/bin/slapadd -F ${configDir} -bcn=config -l ${settingsFile} '' )} chown -R "${cfg.user}:${cfg.group}" '${configDir}' ${optionalString (cfg.declarativeContents != null) '' rm -Rf '${lib.head dataDirs}'/* - ${openldap}/bin/slapadd -F ${configDir} -n1 -l ${dataFile} + ${openldap}/bin/slapadd -F ${configDir} -b${cfg.suffix} -l ${dataFile} chown -R "${cfg.user}:${cfg.group}" ${lib.escapeShellArgs dataDirs} ''} From 9528faf1829bbf77fa693e8700cf8b27eb0b869e Mon Sep 17 00:00:00 2001 From: Kai Wohlfahrt Date: Mon, 24 Aug 2020 00:07:24 +0100 Subject: [PATCH 115/260] nixos/openldap: Allow declarativeContents for multiple databases --- nixos/modules/services/databases/openldap.nix | 50 ++++++++++++------- nixos/tests/openldap.nix | 10 ++-- 2 files changed, 38 insertions(+), 22 deletions(-) diff --git a/nixos/modules/services/databases/openldap.nix b/nixos/modules/services/databases/openldap.nix index d03c8cd7cfd3..c3a8e03c880b 100644 --- a/nixos/modules/services/databases/openldap.nix +++ b/nixos/modules/services/databases/openldap.nix @@ -5,7 +5,6 @@ let cfg = config.services.openldap; openldap = cfg.package; - dataFile = pkgs.writeText "ldap-contents.ldif" cfg.declarativeContents; configFile = pkgs.writeText "slapd.conf" ((optionalString (cfg.defaultSchemas != null && cfg.defaultSchemas) '' include ${openldap}/etc/schema/core.schema include ${openldap}/etc/schema/cosine.schema @@ -26,7 +25,7 @@ let ${if cfg.extraDatabaseConfig != null then cfg.extraDatabaseConfig else ""} ''); - configDir = if cfg.configDir != null then cfg.configDir else "/etc/openldap/slapd.d"; + configDir = lib.escapeShellArg (if cfg.configDir != null then cfg.configDir else "/etc/openldap/slapd.d"); ldapValueType = let singleLdapValueType = types.either types.str (types.submodule { @@ -209,7 +208,7 @@ in { example = "dc=example,dc=org"; description = '' Specify the DN suffix of queries that will be passed to the first - database database. + backend database. ''; }; @@ -292,10 +291,10 @@ in { }; declarativeContents = mkOption { - type = with types; nullOr lines; - default = null; + type = with types; either lines (attrsOf lines); + default = {}; description = '' - Declarative contents for the LDAP database, in LDIF format. + Declarative contents for the first LDAP database, in LDIF format. Note a few facts when using it. First, the database must be stored in the directory defined by @@ -359,6 +358,10 @@ in { maintainers = with lib.maintainters; [ mic92 kwohlfahrt ]; }; + # TODO: Check that dataDir/declarativeContents/configDir all match + # - deprecate declarativeContents = ''...''; + # - no declarativeContents = ''...'' if dataDir == null; + # - no declarativeContents = { ... } if configDir != null config = mkIf cfg.enable { warnings = let deprecations = [ @@ -458,32 +461,45 @@ in { after = [ "network.target" ]; preStart = let dbSettings = lib.filterAttrs (name: value: lib.hasPrefix "olcDatabase=" name) cfg.settings.children; - dataDirs = lib.mapAttrsToList (name: value: value.attrs.olcDbDirectory) dbSettings; + dataDirs = lib.mapAttrs' (name: value: lib.nameValuePair value.attrs.olcSuffix value.attrs.olcDbDirectory) + (lib.filterAttrs (_: value: value.attrs ? olcDbDirectory) dbSettings); settingsFile = pkgs.writeText "config.ldif" (lib.concatStringsSep "\n" (attrsToLdif "cn=config" cfg.settings)); in '' mkdir -p /run/slapd chown -R "${cfg.user}:${cfg.group}" /run/slapd - mkdir -p '${configDir}' ${lib.escapeShellArgs dataDirs} - chown "${cfg.user}:${cfg.group}" '${configDir}' ${lib.escapeShellArgs dataDirs} + mkdir -p ${configDir} ${lib.escapeShellArgs (lib.attrValues dataDirs)} + chown "${cfg.user}:${cfg.group}" ${configDir} ${lib.escapeShellArgs (lib.attrValues dataDirs)} ${lib.optionalString (cfg.configDir == null) ( if (cfg.extraConfig != "" || cfg.extraDatabaseConfig != "") then '' - rm -Rf '${configDir}'/* + rm -Rf ${configDir}/* # -u disables config generation, so just ignore the return code ${openldap}/bin/slaptest -f ${configFile} -F ${configDir} || true '' else '' - rm -Rf '${configDir}'/* + rm -Rf ${configDir}/* ${openldap}/bin/slapadd -F ${configDir} -bcn=config -l ${settingsFile} '' )} - chown -R "${cfg.user}:${cfg.group}" '${configDir}' + chown -R "${cfg.user}:${cfg.group}" ${configDir} - ${optionalString (cfg.declarativeContents != null) '' - rm -Rf '${lib.head dataDirs}'/* - ${openldap}/bin/slapadd -F ${configDir} -b${cfg.suffix} -l ${dataFile} - chown -R "${cfg.user}:${cfg.group}" ${lib.escapeShellArgs dataDirs} - ''} + ${if types.lines.check cfg.declarativeContents then (let + dataFile = pkgs.writeText "ldap-contents.ldif" cfg.declarativeContents; + in '' + rm -rf ${lib.escapeShellArg cfg.dataDir}/* + ${openldap}/bin/slapadd -F ${configDir} -l ${dataFile} + chown -R "${cfg.user}:${cfg.group}" ${lib.escapeShellArg cfg.dataDir} + '') else (let + dataFiles = lib.mapAttrs (dn: contents: pkgs.writeText "${dn}.ldif" contents) cfg.declarativeContents; + in '' + ${lib.concatStrings (lib.mapAttrsToList (dn: file: let + dataDir = lib.escapeShellArg (getAttr dn dataDirs); + in '' + rm -rf ${dataDir}/* + ${openldap}/bin/slapadd -F ${configDir} -b ${dn} -l ${file} + chown -R "${cfg.user}:${cfg.group}" ${dataDir} + '') dataFiles)} + '')} ${openldap}/bin/slaptest -u -F ${configDir} ''; diff --git a/nixos/tests/openldap.nix b/nixos/tests/openldap.nix index 33b7b7f6608a..0c40073735eb 100644 --- a/nixos/tests/openldap.nix +++ b/nixos/tests/openldap.nix @@ -1,5 +1,5 @@ { pkgs, system ? builtins.currentSystem, ... }: let - declarativeContents = '' + dbContents = '' dn: dc=example objectClass: domain dc: example @@ -22,7 +22,6 @@ in { machine = { pkgs, ... }: { services.openldap = { - inherit declarativeContents; enable = true; defaultSchemas = null; dataDir = null; @@ -49,6 +48,7 @@ in { }; }; }; + declarativeContents."dc=example" = dbContents; }; }; }; @@ -60,11 +60,11 @@ in { machine = { pkgs, ... }: { services.openldap = { - inherit declarativeContents; enable = true; suffix = "dc=example"; rootdn = "cn=root,dc=example"; rootpw = "notapassword"; + declarativeContents = dbContents; }; }; }; @@ -85,7 +85,7 @@ in { }; testScript = let - contents = pkgs.writeText "data.ldif" declarativeContents; + contents = pkgs.writeText "data.ldif" dbContents; config = pkgs.writeText "config.ldif" '' dn: cn=config cn: config @@ -129,7 +129,6 @@ in { machine = { pkgs, ... }: { services.openldap = { - inherit declarativeContents; enable = true; suffix = "dc=example"; rootdn = "cn=root,dc=example"; @@ -140,6 +139,7 @@ in { extraDatabaseConfig = '' # No-op ''; + declarativeContents = dbContents; }; }; }; From d05061c5cdd5662157591c75f45113c483443f4a Mon Sep 17 00:00:00 2001 From: Kai Wohlfahrt Date: Mon, 24 Aug 2020 00:19:35 +0100 Subject: [PATCH 116/260] nixos/openldap: Pick some PR nits --- nixos/modules/services/databases/openldap.nix | 32 +++++++++---------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/nixos/modules/services/databases/openldap.nix b/nixos/modules/services/databases/openldap.nix index c3a8e03c880b..0def1e8c34de 100644 --- a/nixos/modules/services/databases/openldap.nix +++ b/nixos/modules/services/databases/openldap.nix @@ -25,7 +25,7 @@ let ${if cfg.extraDatabaseConfig != null then cfg.extraDatabaseConfig else ""} ''); - configDir = lib.escapeShellArg (if cfg.configDir != null then cfg.configDir else "/etc/openldap/slapd.d"); + configDir = if cfg.configDir != null then cfg.configDir else "/etc/openldap/slapd.d"; ldapValueType = let singleLdapValueType = types.either types.str (types.submodule { @@ -249,7 +249,7 @@ in { }; logLevel = mkOption { - type = types.nullOr (types.listOf types.str); + type = types.nullOr (types.coercedTo types.str (lib.splitString " ") (types.listOf types.str)); default = null; example = literalExample "[ \"acl\" \"trace\" ]"; description = "The log level."; @@ -468,8 +468,8 @@ in { mkdir -p /run/slapd chown -R "${cfg.user}:${cfg.group}" /run/slapd - mkdir -p ${configDir} ${lib.escapeShellArgs (lib.attrValues dataDirs)} - chown "${cfg.user}:${cfg.group}" ${configDir} ${lib.escapeShellArgs (lib.attrValues dataDirs)} + mkdir -p ${lib.escapeShellArg configDir} ${lib.escapeShellArgs (lib.attrValues dataDirs)} + chown "${cfg.user}:${cfg.group}" ${lib.escapeShellArg configDir} ${lib.escapeShellArgs (lib.attrValues dataDirs)} ${lib.optionalString (cfg.configDir == null) ( if (cfg.extraConfig != "" || cfg.extraDatabaseConfig != "") then '' @@ -481,13 +481,13 @@ in { ${openldap}/bin/slapadd -F ${configDir} -bcn=config -l ${settingsFile} '' )} - chown -R "${cfg.user}:${cfg.group}" ${configDir} + chown -R "${cfg.user}:${cfg.group}" ${lib.escapeShellArg configDir} ${if types.lines.check cfg.declarativeContents then (let dataFile = pkgs.writeText "ldap-contents.ldif" cfg.declarativeContents; in '' rm -rf ${lib.escapeShellArg cfg.dataDir}/* - ${openldap}/bin/slapadd -F ${configDir} -l ${dataFile} + ${openldap}/bin/slapadd -F ${lib.escapeShellArg configDir} -l ${dataFile} chown -R "${cfg.user}:${cfg.group}" ${lib.escapeShellArg cfg.dataDir} '') else (let dataFiles = lib.mapAttrs (dn: contents: pkgs.writeText "${dn}.ldif" contents) cfg.declarativeContents; @@ -496,28 +496,28 @@ in { dataDir = lib.escapeShellArg (getAttr dn dataDirs); in '' rm -rf ${dataDir}/* - ${openldap}/bin/slapadd -F ${configDir} -b ${dn} -l ${file} + ${openldap}/bin/slapadd -F ${lib.escapeShellArg configDir} -b ${dn} -l ${file} chown -R "${cfg.user}:${cfg.group}" ${dataDir} '') dataFiles)} '')} - ${openldap}/bin/slaptest -u -F ${configDir} + ${openldap}/bin/slaptest -u -F ${lib.escapeShellArg configDir} ''; serviceConfig = { - ExecStart = lib.concatStringsSep " " [ - "${openldap}/libexec/slapd" - "-u '${cfg.user}'" - "-g '${cfg.group}'" - "-h '${concatStringsSep " " cfg.urlList}'" - "-F ${configDir}" - ]; + ExecStart = lib.escapeShellArgs ([ + "${openldap}/libexec/slapd" "-u" cfg.user "-g" cfg.group "-F" configDir + "-h" (lib.concatStringsSep " " cfg.urlList) + ]); Type = "forking"; PIDFile = cfg.settings.attrs.olcPidFile; }; }; users.users = lib.optionalAttrs (cfg.user == "openldap") { - openldap = { group = cfg.group; }; + openldap = { + group = cfg.group; + isSystemUser = true; + }; }; users.groups = lib.optionalAttrs (cfg.group == "openldap") { From adda7e62d0c2a80aa85e0c22ad806874812f9f54 Mon Sep 17 00:00:00 2001 From: Kai Wohlfahrt Date: Sun, 13 Sep 2020 22:42:14 +0100 Subject: [PATCH 117/260] nixos/openldap: Add support for base64 values --- nixos/modules/services/databases/openldap.nix | 44 ++++++++++++++----- 1 file changed, 32 insertions(+), 12 deletions(-) diff --git a/nixos/modules/services/databases/openldap.nix b/nixos/modules/services/databases/openldap.nix index 0def1e8c34de..cb51a3cc575c 100644 --- a/nixos/modules/services/databases/openldap.nix +++ b/nixos/modules/services/databases/openldap.nix @@ -28,17 +28,31 @@ let configDir = if cfg.configDir != null then cfg.configDir else "/etc/openldap/slapd.d"; ldapValueType = let - singleLdapValueType = types.either types.str (types.submodule { - options = { - path = mkOption { - type = types.path; - description = '' - A path containing the LDAP attribute. This is included at run-time, so - is recommended for storing secrets. - ''; + singleLdapValueType = types.oneOf [ + types.str + (types.submodule { + options = { + path = mkOption { + type = types.path; + description = '' + A path containing the LDAP attribute. This is included at run-time, so + is recommended for storing secrets. + ''; + }; }; - }; - }); + }) + (types.submodule { + options = { + base64 = mkOption { + type = types.str; + description = '' + A base64-encoded LDAP attribute. Useful for storing values which + contain special characters (e.g. newlines) in LDIF files. + ''; + }; + }; + }) + ]; in types.either singleLdapValueType (types.listOf singleLdapValueType); ldapAttrsType = @@ -83,8 +97,14 @@ let in types.submodule { inherit options; }; valueToLdif = attr: values: let - singleValueToLdif = value: if lib.isAttrs value then "${attr}:< file://${value.path}" else "${attr}: ${value}"; - in if lib.isList values then map singleValueToLdif values else [ (singleValueToLdif values) ]; + listValues = if lib.isList values then values else lib.singleton values; + in map (value: + if lib.isAttrs value then + if lib.hasAttr "path" value + then "${attr}:< file://${value.path}" + else "${attr}:: ${value.base64}" + else "${attr}: ${lib.replaceStrings [ "\n" ] [ "\n " ] value}" + ) listValues; attrsToLdif = dn: { attrs, children, includes, ... }: ['' dn: ${dn} From 5fafbee87a3ecce798df55bbaaabcead43fc17b6 Mon Sep 17 00:00:00 2001 From: Kai Wohlfahrt Date: Sun, 13 Sep 2020 22:42:54 +0100 Subject: [PATCH 118/260] nixos/openldap: Add release-notes for OLC config --- nixos/doc/manual/release-notes/rl-2103.xml | 8 ++++++++ nixos/modules/services/databases/openldap.nix | 8 +------- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/nixos/doc/manual/release-notes/rl-2103.xml b/nixos/doc/manual/release-notes/rl-2103.xml index 10d5cda77464..845aa8415040 100644 --- a/nixos/doc/manual/release-notes/rl-2103.xml +++ b/nixos/doc/manual/release-notes/rl-2103.xml @@ -185,6 +185,14 @@ which is the new stable release. OpenAFS 1.6 was removed. + + + The openldap module now has support for OLC-style + configuration, users of the configDir option may wish + to migrate. If you continue to use configDir, ensure that + olcPidFile is set to /run/slapd/slapd.pid. + + diff --git a/nixos/modules/services/databases/openldap.nix b/nixos/modules/services/databases/openldap.nix index cb51a3cc575c..f9355201602c 100644 --- a/nixos/modules/services/databases/openldap.nix +++ b/nixos/modules/services/databases/openldap.nix @@ -421,13 +421,7 @@ in { let oldValue = (getAttr old cfg); in if (isList oldValue) then "[ ${concatStringsSep " " oldValue} ]" else oldValue )} - '') deprecations)) ++ (optional (cfg.configDir != null && (versionOlder config.system.stateVersion "20.09")) '' - The attribute `services.openldap.settings` now exists, and may be more - useful than `services.openldap.configDir`. If you continue to use - `configDir`, ensure that `olcPidFile` is set to "/run/slapd/slapd.pid". - - Set `system.stateVersion` to "20.09" or greater to silence this message. - ''); + '') deprecations)); assertions = [{ assertion = !(cfg.rootpwFile != null && cfg.rootpw != null); From 2050376caee44dd52e7aaa00a9bfac6b644e5bff Mon Sep 17 00:00:00 2001 From: Kai Wohlfahrt Date: Sun, 13 Sep 2020 22:43:11 +0100 Subject: [PATCH 119/260] nixos/openldap: Mention schemas in migration hint --- nixos/modules/services/databases/openldap.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/databases/openldap.nix b/nixos/modules/services/databases/openldap.nix index f9355201602c..9de4c7fa41be 100644 --- a/nixos/modules/services/databases/openldap.nix +++ b/nixos/modules/services/databases/openldap.nix @@ -411,8 +411,10 @@ in { After deploying this configuration, you can run: slapcat -F ${configDir} -n0 -H 'ldap:///???(!(objectClass=olcSchemaConfig))' - on the same host to print your current configuration in LDIF format, - which should be straightforward to convert into Nix settings. + on the same host to print your current configuration in LDIF format, which + should be straightforward to convert into Nix settings. This does not show + your schema configuration (as this is unnecessarily verbose users of the + default schemas), so be sure to migrate that as well. '') ++ (flatten (map (args@{old, new, ...}: lib.optional ((lib.hasAttr old cfg) && (lib.getAttr old cfg) != null) '' The attribute `services.openldap.${old}` is deprecated. Please set it to `null` and use the following option instead: From 3f892c2174d3e215be2e12d6dacede3cd4db392c Mon Sep 17 00:00:00 2001 From: Kai Wohlfahrt Date: Sun, 13 Sep 2020 23:20:23 +0100 Subject: [PATCH 120/260] nixos/openldap: Remove extraConfig options Instead of deprecating, as per PR feedback --- nixos/doc/manual/release-notes/rl-2103.xml | 18 +++ nixos/modules/services/databases/openldap.nix | 152 ++++-------------- nixos/tests/openldap.nix | 22 --- 3 files changed, 51 insertions(+), 141 deletions(-) diff --git a/nixos/doc/manual/release-notes/rl-2103.xml b/nixos/doc/manual/release-notes/rl-2103.xml index 845aa8415040..55c1229a164d 100644 --- a/nixos/doc/manual/release-notes/rl-2103.xml +++ b/nixos/doc/manual/release-notes/rl-2103.xml @@ -192,6 +192,24 @@ to migrate. If you continue to use configDir, ensure that olcPidFile is set to /run/slapd/slapd.pid. + + As a result, extraConfig and extraDatabaseConfig + are removed. To help with migration, you can convert your slapd.conf + file to OLC configuration with the following script (find the location of this + configuration file by running systemctl status openldap, it is the + -f option. + + + TMPDIR=$(mktemp -d) + slaptest -f /path/to/slapd.conf $TMPDIR + slapcat -F $TMPDIR -n0 -H 'ldap:///???(!(objectClass=olcSchemaConfig))' + + + This will dump your current configuration in LDIF format, which should be + straightforward to convert into Nix settings. This does not show your schema + configuration, as this is unnecessarily verbose for users of the default schemas + and slaptest is buggy with schemas directly in the config file. + diff --git a/nixos/modules/services/databases/openldap.nix b/nixos/modules/services/databases/openldap.nix index 9de4c7fa41be..fb043df9d60f 100644 --- a/nixos/modules/services/databases/openldap.nix +++ b/nixos/modules/services/databases/openldap.nix @@ -4,27 +4,6 @@ with lib; let cfg = config.services.openldap; openldap = cfg.package; - - configFile = pkgs.writeText "slapd.conf" ((optionalString (cfg.defaultSchemas != null && cfg.defaultSchemas) '' - include ${openldap}/etc/schema/core.schema - include ${openldap}/etc/schema/cosine.schema - include ${openldap}/etc/schema/inetorgperson.schema - include ${openldap}/etc/schema/nis.schema - '') + '' - pidfile /run/slapd/slapd.pid - ${if cfg.extraConfig != null then cfg.extraConfig else ""} - database ${cfg.database} - suffix ${cfg.suffix} - rootdn ${cfg.rootdn} - ${if (cfg.rootpw != null) then '' - rootpw ${cfg.rootpw} - '' else '' - include ${cfg.rootpwFile} - ''} - directory ${cfg.dataDir} - ${if cfg.extraDatabaseConfig != null then cfg.extraDatabaseConfig else ""} - ''); - configDir = if cfg.configDir != null then cfg.configDir else "/etc/openldap/slapd.d"; ldapValueType = let @@ -113,6 +92,12 @@ let lib.flatten (lib.mapAttrsToList (name: value: attrsToLdif "${name},${dn}" value) children) ); in { + imports = let + deprecationNote = "This option is removed due to the deprecation of `slapd.conf` upstream. Please migrate to `services.openldap.settings`, see the release notes for advice with this process."; + in [ + (lib.mkRemovedOptionModule [ "services" "openldap" "extraConfig" ] deprecationNote) + (lib.mkRemovedOptionModule [ "services" "openldap" "extraDatabaseConfig" ] deprecationNote) + ]; options = { services.openldap = { enable = mkOption { @@ -280,36 +265,13 @@ in { type = types.nullOr types.path; default = null; description = '' - Use this optional config directory instead of generating one from the - settings option. + Use this config directory instead of generating one from the + settings option. Overrides all NixOS settings. If + you use this option,ensure `olcPidFile` is set to `/run/slapd/slapd.conf`. ''; example = "/var/db/slapd.d"; }; - # These options are deprecated - extraConfig = mkOption { - type = types.lines; - default = ""; - description = " - slapd.conf configuration - "; - example = literalExample '' - ''' - include ${openldap}/etc/schema/core.schema - include ${openldap}/etc/schema/cosine.schema - include ${openldap}/etc/schema/inetorgperson.schema - include ${openldap}/etc/schema/nis.schema - - database bdb - suffix dc=example,dc=org - rootdn cn=admin,dc=example,dc=org - # NOTE: change after first start - rootpw secret - directory /var/db/openldap - ''' - ''; - }; - declarativeContents = mkOption { type = with types; either lines (attrsOf lines); default = {}; @@ -337,41 +299,7 @@ in { # ... ''; }; - - extraDatabaseConfig = mkOption { - type = types.lines; - default = ""; - description = '' - slapd.conf configuration after the database option. - This setting will be ignored if configDir is set. - ''; - example = '' - # Indices to maintain for this directory - # unique id so equality match only - index uid eq - # allows general searching on commonname, givenname and email - index cn,gn,mail eq,sub - # allows multiple variants on surname searching - index sn eq,sub - # sub above includes subintial,subany,subfinal - # optimise department searches - index ou eq - # if searches will include objectClass uncomment following - # index objectClass eq - # shows use of default index parameter - index default eq,sub - # indices missing - uses default eq,sub - index telephonenumber - - # other database parameters - # read more in slapd.conf reference section - cachesize 10000 - checkpoint 128 15 - ''; - }; - }; - }; meta = { @@ -404,18 +332,7 @@ in { newValue = "{ path = \"${cfg.rootpwFile}\"; }"; note = "The file should contain only the password (without \"rootpw \" as before)"; } ]; - in (optional (cfg.extraConfig != "" || cfg.extraDatabaseConfig != "") '' - The options `extraConfig` and `extraDatabaseConfig` of `services.openldap` - are deprecated. This is due to the deprecation of `slapd.conf` - upstream. Please migrate to `services.openldap.settings`. - - After deploying this configuration, you can run: - slapcat -F ${configDir} -n0 -H 'ldap:///???(!(objectClass=olcSchemaConfig))' - on the same host to print your current configuration in LDIF format, which - should be straightforward to convert into Nix settings. This does not show - your schema configuration (as this is unnecessarily verbose users of the - default schemas), so be sure to migrate that as well. - '') ++ (flatten (map (args@{old, new, ...}: lib.optional ((lib.hasAttr old cfg) && (lib.getAttr old cfg) != null) '' + in (flatten (map (args@{old, new, ...}: lib.optional ((lib.hasAttr old cfg) && (lib.getAttr old cfg) != null) '' The attribute `services.openldap.${old}` is deprecated. Please set it to `null` and use the following option instead: @@ -487,35 +404,32 @@ in { mkdir -p ${lib.escapeShellArg configDir} ${lib.escapeShellArgs (lib.attrValues dataDirs)} chown "${cfg.user}:${cfg.group}" ${lib.escapeShellArg configDir} ${lib.escapeShellArgs (lib.attrValues dataDirs)} - ${lib.optionalString (cfg.configDir == null) ( - if (cfg.extraConfig != "" || cfg.extraDatabaseConfig != "") then '' - rm -Rf ${configDir}/* - # -u disables config generation, so just ignore the return code - ${openldap}/bin/slaptest -f ${configFile} -F ${configDir} || true - '' else '' - rm -Rf ${configDir}/* - ${openldap}/bin/slapadd -F ${configDir} -bcn=config -l ${settingsFile} - '' - )} + ${lib.optionalString (cfg.configDir == null) ('' + rm -Rf ${configDir}/* + ${openldap}/bin/slapadd -F ${configDir} -bcn=config -l ${settingsFile} + '')} chown -R "${cfg.user}:${cfg.group}" ${lib.escapeShellArg configDir} - ${if types.lines.check cfg.declarativeContents then (let - dataFile = pkgs.writeText "ldap-contents.ldif" cfg.declarativeContents; - in '' - rm -rf ${lib.escapeShellArg cfg.dataDir}/* - ${openldap}/bin/slapadd -F ${lib.escapeShellArg configDir} -l ${dataFile} - chown -R "${cfg.user}:${cfg.group}" ${lib.escapeShellArg cfg.dataDir} - '') else (let - dataFiles = lib.mapAttrs (dn: contents: pkgs.writeText "${dn}.ldif" contents) cfg.declarativeContents; - in '' - ${lib.concatStrings (lib.mapAttrsToList (dn: file: let - dataDir = lib.escapeShellArg (getAttr dn dataDirs); + ${if types.lines.check cfg.declarativeContents + then (let + dataFile = pkgs.writeText "ldap-contents.ldif" cfg.declarativeContents; in '' - rm -rf ${dataDir}/* - ${openldap}/bin/slapadd -F ${lib.escapeShellArg configDir} -b ${dn} -l ${file} - chown -R "${cfg.user}:${cfg.group}" ${dataDir} - '') dataFiles)} - '')} + rm -rf ${lib.escapeShellArg cfg.dataDir}/* + ${openldap}/bin/slapadd -F ${lib.escapeShellArg configDir} -l ${dataFile} + chown -R "${cfg.user}:${cfg.group}" ${lib.escapeShellArg cfg.dataDir} + '') + else (let + dataFiles = lib.mapAttrs (dn: contents: pkgs.writeText "${dn}.ldif" contents) cfg.declarativeContents; + in '' + ${lib.concatStrings (lib.mapAttrsToList (dn: file: let + dataDir = lib.escapeShellArg (getAttr dn dataDirs); + in '' + rm -rf ${dataDir}/* + ${openldap}/bin/slapadd -F ${lib.escapeShellArg configDir} -b ${dn} -l ${file} + chown -R "${cfg.user}:${cfg.group}" ${dataDir} + '') dataFiles)} + '') + } ${openldap}/bin/slaptest -u -F ${lib.escapeShellArg configDir} ''; diff --git a/nixos/tests/openldap.nix b/nixos/tests/openldap.nix index 0c40073735eb..b6dd8f573d5d 100644 --- a/nixos/tests/openldap.nix +++ b/nixos/tests/openldap.nix @@ -121,26 +121,4 @@ in { ) '' + testScript; }; - - # extraConfig forces use of slapd.conf, test this until that option is removed - legacyConfig = import ./make-test-python.nix { - inherit testScript; - name = "openldap"; - - machine = { pkgs, ... }: { - services.openldap = { - enable = true; - suffix = "dc=example"; - rootdn = "cn=root,dc=example"; - rootpw = "notapassword"; - extraConfig = '' - # No-op - ''; - extraDatabaseConfig = '' - # No-op - ''; - declarativeContents = dbContents; - }; - }; - }; } From b2ebffe18634e5038fe911b3bd2c74d26e7a7ab9 Mon Sep 17 00:00:00 2001 From: Kai Wohlfahrt Date: Sun, 27 Sep 2020 17:10:13 +0100 Subject: [PATCH 121/260] nixos/openldap: Fix indentation --- nixos/modules/services/databases/openldap.nix | 30 +++++++++---------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/nixos/modules/services/databases/openldap.nix b/nixos/modules/services/databases/openldap.nix index fb043df9d60f..6f1ac3ed7172 100644 --- a/nixos/modules/services/databases/openldap.nix +++ b/nixos/modules/services/databases/openldap.nix @@ -51,26 +51,26 @@ let default = {}; description = "Child entries of the current entry, with recursively the same structure."; example = lib.literalExample '' - { - "cn=schema" = { - # The attribute used in the DN must be defined - attrs = { cn = "schema"; }; - children = { - # This entry's DN is expanded to "cn=foo,cn=schema" - "cn=foo" = { ... }; - }; - # These includes are inserted after "cn=schema", but before "cn=foo,cn=schema" - includes = [ ... ]; - }; - } - ''; + { + "cn=schema" = { + # The attribute used in the DN must be defined + attrs = { cn = "schema"; }; + children = { + # This entry's DN is expanded to "cn=foo,cn=schema" + "cn=foo" = { ... }; + }; + # These includes are inserted after "cn=schema", but before "cn=foo,cn=schema" + includes = [ ... ]; + }; + } + ''; }; includes = mkOption { type = types.listOf types.path; default = []; description = '' - LDIF files to include after the parent's attributes but before its children. - ''; + LDIF files to include after the parent's attributes but before its children. + ''; }; }; in types.submodule { inherit options; }; From ce1acd97a7162094accfb764cb1d33159dc5165f Mon Sep 17 00:00:00 2001 From: Kai Wohlfahrt Date: Sun, 27 Sep 2020 18:03:40 +0100 Subject: [PATCH 122/260] nixos/openldap: fix path + base64 value types --- nixos/modules/services/databases/openldap.nix | 33 +++++-------------- nixos/tests/openldap.nix | 11 +++++-- 2 files changed, 17 insertions(+), 27 deletions(-) diff --git a/nixos/modules/services/databases/openldap.nix b/nixos/modules/services/databases/openldap.nix index 6f1ac3ed7172..c333f817d031 100644 --- a/nixos/modules/services/databases/openldap.nix +++ b/nixos/modules/services/databases/openldap.nix @@ -7,31 +7,14 @@ let configDir = if cfg.configDir != null then cfg.configDir else "/etc/openldap/slapd.d"; ldapValueType = let - singleLdapValueType = types.oneOf [ - types.str - (types.submodule { - options = { - path = mkOption { - type = types.path; - description = '' - A path containing the LDAP attribute. This is included at run-time, so - is recommended for storing secrets. - ''; - }; - }; - }) - (types.submodule { - options = { - base64 = mkOption { - type = types.str; - description = '' - A base64-encoded LDAP attribute. Useful for storing values which - contain special characters (e.g. newlines) in LDIF files. - ''; - }; - }; - }) - ]; + # Can't do types.either with multiple non-overlapping submodules, so define our own + singleLdapValueType = lib.mkOptionType rec { + name = "LDAP"; + description = "LDAP value"; + check = x: lib.isString x || (lib.isAttrs x && (x ? "path" || x ? "base64")); + merge = lib.mergeEqualOption; + }; + # We don't coerce to lists of single values, as some values must be unique in types.either singleLdapValueType (types.listOf singleLdapValueType); ldapAttrsType = diff --git a/nixos/tests/openldap.nix b/nixos/tests/openldap.nix index b6dd8f573d5d..beaff9164744 100644 --- a/nixos/tests/openldap.nix +++ b/nixos/tests/openldap.nix @@ -21,6 +21,7 @@ in { name = "openldap"; machine = { pkgs, ... }: { + environment.etc."openldap/root_password".text = "notapassword"; services.openldap = { enable = true; defaultSchemas = null; @@ -37,13 +38,19 @@ in { ]; }; "olcDatabase={1}mdb" = { + # This tests string, base64 and path values, as well as lists of string values attrs = { objectClass = [ "olcDatabaseConfig" "olcMdbConfig" ]; olcDatabase = "{1}mdb"; olcDbDirectory = "/var/db/openldap"; olcSuffix = "dc=example"; - olcRootDN = "cn=root,dc=example"; - olcRootPW = "notapassword"; + olcRootDN = { + # cn=root,dc=example + base64 = "Y249cm9vdCxkYz1leGFtcGxl"; + }; + olcRootPW = { + path = "/etc/openldap/root_password"; + }; }; }; }; From fefc26f8449aba4d66a70f600932c9306f4db60b Mon Sep 17 00:00:00 2001 From: Kai Wohlfahrt Date: Sun, 27 Sep 2020 21:50:25 +0100 Subject: [PATCH 123/260] nixos/openldap: use mkRenamedOptionModule This offers less helpful warnings, but makes the implementation considerably more straightforward. --- nixos/modules/services/databases/openldap.nix | 247 +++++------------- nixos/tests/openldap.nix | 15 +- 2 files changed, 73 insertions(+), 189 deletions(-) diff --git a/nixos/modules/services/databases/openldap.nix b/nixos/modules/services/databases/openldap.nix index c333f817d031..aedf3873b049 100644 --- a/nixos/modules/services/databases/openldap.nix +++ b/nixos/modules/services/databases/openldap.nix @@ -11,7 +11,7 @@ let singleLdapValueType = lib.mkOptionType rec { name = "LDAP"; description = "LDAP value"; - check = x: lib.isString x || (lib.isAttrs x && (x ? "path" || x ? "base64")); + check = x: lib.isString x || (lib.isAttrs x && (x ? path || x ? base64)); merge = lib.mergeEqualOption; }; # We don't coerce to lists of single values, as some values must be unique @@ -80,6 +80,34 @@ in { in [ (lib.mkRemovedOptionModule [ "services" "openldap" "extraConfig" ] deprecationNote) (lib.mkRemovedOptionModule [ "services" "openldap" "extraDatabaseConfig" ] deprecationNote) + + (lib.mkChangedOptionModule [ "services" "openldap" "logLevel" ] [ "services" "openldap" "settings" "attrs" "olcLogLevel" ] + (config: lib.splitString " " (lib.getAttrFromPath [ "services" "openldap" "logLevel" ] config))) + (lib.mkChangedOptionModule [ "services" "openldap" "defaultSchemas" ] [ "services" "openldap" "settings" "children" "cn=schema" "includes"] + (config: lib.optionals (lib.getAttrFromPath [ "services" "openldap" "defaultSchemas" ] config) ( + map (schema: "${pkgs.openldap}/etc/schema/${schema}.ldif") [ "core" "cosine" "inetorgperson" "nis" ]))) + + (lib.mkChangedOptionModule [ "services" "openldap" "database" ] [ "services" "openldap" "settings" "children" ] + (config: let + database = lib.getAttrFromPath [ "services" "openldap" "database" ] config; + in { + "olcDatabase={1}${database}".attrs = { + # objectClass is case-insensitive, so don't need to capitalize ${database} + objectClass = [ "olcdatabaseconfig" "olc${database}config" ]; + olcDatabase = "{1}${database}"; + olcDbDirectory = lib.mkDefault "/var/db/openldap"; + }; + })) + (lib.mkRenamedOptionModule [ "services" "openldap" "rootpwFile" ] + [ "services" "openldap" "settings" "children" "olcDatabase={1}${cfg.database}" "attrs" "olcRootPW" "path"]) + (lib.mkRenamedOptionModule [ "services" "openldap" "suffix" ] + [ "services" "openldap" "settings" "children" "olcDatabase={1}${cfg.database}" "attrs" "olcSuffix"]) + (lib.mkRenamedOptionModule [ "services" "openldap" "dataDir" ] + [ "services" "openldap" "settings" "children" "olcDatabase={1}${cfg.database}" "attrs" "olcDbDirectory"]) + (lib.mkRenamedOptionModule [ "services" "openldap" "rootdn" ] + [ "services" "openldap" "settings" "children" "olcDatabase={1}${cfg.database}" "attrs" "olcRootDN"]) + (lib.mkRenamedOptionModule [ "services" "openldap" "rootpw" ] + [ "services" "openldap" "settings" "children" "olcDatabase={1}${cfg.database}" "attrs" "olcRootPW"]) ]; options = { services.openldap = { @@ -168,81 +196,6 @@ in { ''; }; - # These options are translated into settings - dataDir = mkOption { - type = types.nullOr types.path; - default = "/var/db/openldap"; - description = "The database directory."; - }; - - defaultSchemas = mkOption { - type = types.nullOr types.bool; - default = true; - - description = '' - Include the default schemas core, cosine, inetorgperson and nis. - ''; - }; - - database = mkOption { - type = types.nullOr types.str; - default = "mdb"; - description = "Backend to use for the first database."; - }; - - suffix = mkOption { - type = types.nullOr types.str; - default = null; - example = "dc=example,dc=org"; - description = '' - Specify the DN suffix of queries that will be passed to the first - backend database. - ''; - }; - - rootdn = mkOption { - type = types.nullOr types.str; - default = null; - example = "cn=admin,dc=example,dc=org"; - description = '' - Specify the distinguished name that is not subject to access control - or administrative limit restrictions for operations on this database. - ''; - }; - - rootpw = mkOption { - type = types.nullOr types.str; - default = null; - description = '' - Password for the root user.Using this option will store the root - password in plain text in the world-readable nix store. To avoid this - the rootpwFile can be used. - ''; - }; - - rootpwFile = mkOption { - type = types.nullOr types.str; - default = null; - description = '' - Password file for the root user. - - If the deprecated extraConfig or - extraDatabaseConfig options are set, this should - contain rootpw followed by the password - (e.g. rootpw thePasswordHere). - - Otherwise the file should contain only the password (no trailing - newline or leading rootpw). - ''; - }; - - logLevel = mkOption { - type = types.nullOr (types.coercedTo types.str (lib.splitString " ") (types.listOf types.str)); - default = null; - example = literalExample "[ \"acl\" \"trace\" ]"; - description = "The log level."; - }; - # This option overrides settings configDir = mkOption { type = types.nullOr types.path; @@ -256,119 +209,64 @@ in { }; declarativeContents = mkOption { - type = with types; either lines (attrsOf lines); + type = with types; attrsOf lines; default = {}; description = '' - Declarative contents for the first LDAP database, in LDIF format. + Declarative contents for the LDAP database, in LDIF format by suffix. - Note a few facts when using it. First, the database - must be stored in the directory defined by - dataDir. Second, all dataDir will be erased - when starting the LDAP server. Third, modifications to the database - are not prevented, they are just dropped on the next reboot of the - server. Finally, performance-wise the database and indexes are rebuilt - on each server startup, so this will slow down server startup, + All data will be erased when starting the LDAP server. Modifications + to the database are not prevented, they are just dropped on the next + reboot of the server. Performance-wise the database and indexes are + rebuilt on each server startup, so this will slow down server startup, especially with large databases. ''; - example = '' - dn: dc=example,dc=org - objectClass: domain - dc: example + example = lib.literalExample '' + { + "dc=example,dc=org" = ''' + dn= dn: dc=example,dc=org + objectClass: domain + dc: example - dn: ou=users,dc=example,dc=org - objectClass = organizationalUnit - ou: users + dn: ou=users,dc=example,dc=org + objectClass = organizationalUnit + ou: users - # ... + # ... + '''; + } ''; }; }; }; - meta = { - maintainers = with lib.maintainters; [ mic92 kwohlfahrt ]; - }; + meta.maintainers = with lib.maintainters; [ mic92 kwohlfahrt ]; - # TODO: Check that dataDir/declarativeContents/configDir all match - # - deprecate declarativeContents = ''...''; - # - no declarativeContents = ''...'' if dataDir == null; - # - no declarativeContents = { ... } if configDir != null config = mkIf cfg.enable { - warnings = let - deprecations = [ - { old = "logLevel"; new = "attrs.olcLogLevel"; } - { old = "defaultSchemas"; - new = "children.\"cn=schema\".includes"; - newValue = "[\n ${lib.concatStringsSep "\n " [ - "\${pkgs.openldap}/etc/schema/core.ldif" - "\${pkgs.openldap}/etc/schema/cosine.ldif" - "\${pkgs.openldap}/etc/schema/inetorgperson.ldif" - "\${pkgs.openldap}/etc/schema/nis.ldif" - ]}\n ]"; } - { old = "database"; new = "children.\"cn={1}${cfg.database}\""; newValue = "{ }"; } - { old = "suffix"; new = "children.\"cn={1}${cfg.database}\".attrs.olcSuffix"; } - { old = "dataDir"; new = "children.\"cn={1}${cfg.database}\".attrs.olcDbDirectory"; } - { old = "rootdn"; new = "children.\"cn={1}${cfg.database}\".attrs.olcRootDN"; } - { old = "rootpw"; new = "children.\"cn={1}${cfg.database}\".attrs.olcRootPW"; } - { old = "rootpwFile"; - new = "children.\"cn={1}${cfg.database}\".attrs.olcRootPW"; - newValue = "{ path = \"${cfg.rootpwFile}\"; }"; - note = "The file should contain only the password (without \"rootpw \" as before)"; } - ]; - in (flatten (map (args@{old, new, ...}: lib.optional ((lib.hasAttr old cfg) && (lib.getAttr old cfg) != null) '' - The attribute `services.openldap.${old}` is deprecated. Please set it to - `null` and use the following option instead: - - services.openldap.settings.${new} = ${args.newValue or ( - let oldValue = (getAttr old cfg); - in if (isList oldValue) then "[ ${concatStringsSep " " oldValue} ]" else oldValue - )} - '') deprecations)); - assertions = [{ - assertion = !(cfg.rootpwFile != null && cfg.rootpw != null); - message = "services.openldap: at most one of rootpw or rootpwFile must be set"; + assertion = lib.length (lib.attrNames cfg.settings.children) >= 2 || cfg ? database; + message = '' + No OpenLDAP database is defined. Configure one with `services.openldap.settings` + or `services.openldap.database` (legacy). + ''; }]; environment.systemPackages = [ openldap ]; - # Literal attributes must always be set (even if other top-level attributres are deprecated) + # Literal attributes must always be set services.openldap.settings = { attrs = { objectClass = "olcGlobal"; cn = "config"; olcPidFile = "/run/slapd/slapd.pid"; - } // (lib.optionalAttrs (cfg.logLevel != null) { - olcLogLevel = cfg.logLevel; - }); + }; children = { "cn=schema" = { attrs = { cn = "schema"; objectClass = "olcSchemaConfig"; }; - includes = lib.optionals (cfg.defaultSchemas != null && cfg.defaultSchemas) [ - "${openldap}/etc/schema/core.ldif" - "${openldap}/etc/schema/cosine.ldif" - "${openldap}/etc/schema/inetorgperson.ldif" - "${openldap}/etc/schema/nis.ldif" - ]; }; - } // (lib.optionalAttrs (cfg.database != null) { - "olcDatabase={1}${cfg.database}".attrs = { - # objectClass is case-insensitive, so don't need to capitalize ${database} - objectClass = [ "olcdatabaseconfig" "olc${cfg.database}config" ]; - olcDatabase = "{1}${cfg.database}"; - } // (lib.optionalAttrs (cfg.suffix != null) { - olcSuffix = cfg.suffix; - }) // (lib.optionalAttrs (cfg.dataDir != null) { - olcDbDirectory = cfg.dataDir; - }) // (lib.optionalAttrs (cfg.rootdn != null) { - olcRootDN = cfg.rootdn; # TODO: Optional - }) // (lib.optionalAttrs (cfg.rootpw != null || cfg.rootpwFile != null) { - olcRootPW = (if cfg.rootpwFile != null then { path = cfg.rootpwFile; } else cfg.rootpw); # TODO: Optional - }); - }); + }; }; systemd.services.openldap = { @@ -376,10 +274,19 @@ in { wantedBy = [ "multi-user.target" ]; after = [ "network.target" ]; preStart = let + settingsFile = pkgs.writeText "config.ldif" (lib.concatStringsSep "\n" (attrsToLdif "cn=config" cfg.settings)); + dbSettings = lib.filterAttrs (name: value: lib.hasPrefix "olcDatabase=" name) cfg.settings.children; dataDirs = lib.mapAttrs' (name: value: lib.nameValuePair value.attrs.olcSuffix value.attrs.olcDbDirectory) (lib.filterAttrs (_: value: value.attrs ? olcDbDirectory) dbSettings); - settingsFile = pkgs.writeText "config.ldif" (lib.concatStringsSep "\n" (attrsToLdif "cn=config" cfg.settings)); + dataFiles = lib.mapAttrs (dn: contents: pkgs.writeText "${dn}.ldif" contents) cfg.declarativeContents; + mkLoadScript = dn: let + dataDir = lib.escapeShellArg (getAttr dn dataDirs); + in '' + rm -rf ${dataDir}/* + ${openldap}/bin/slapadd -F ${lib.escapeShellArg configDir} -b ${dn} -l ${getAttr dn dataFiles} + chown -R "${cfg.user}:${cfg.group}" ${dataDir} + ''; in '' mkdir -p /run/slapd chown -R "${cfg.user}:${cfg.group}" /run/slapd @@ -393,27 +300,7 @@ in { '')} chown -R "${cfg.user}:${cfg.group}" ${lib.escapeShellArg configDir} - ${if types.lines.check cfg.declarativeContents - then (let - dataFile = pkgs.writeText "ldap-contents.ldif" cfg.declarativeContents; - in '' - rm -rf ${lib.escapeShellArg cfg.dataDir}/* - ${openldap}/bin/slapadd -F ${lib.escapeShellArg configDir} -l ${dataFile} - chown -R "${cfg.user}:${cfg.group}" ${lib.escapeShellArg cfg.dataDir} - '') - else (let - dataFiles = lib.mapAttrs (dn: contents: pkgs.writeText "${dn}.ldif" contents) cfg.declarativeContents; - in '' - ${lib.concatStrings (lib.mapAttrsToList (dn: file: let - dataDir = lib.escapeShellArg (getAttr dn dataDirs); - in '' - rm -rf ${dataDir}/* - ${openldap}/bin/slapadd -F ${lib.escapeShellArg configDir} -b ${dn} -l ${file} - chown -R "${cfg.user}:${cfg.group}" ${dataDir} - '') dataFiles)} - '') - } - + ${lib.concatStrings (map mkLoadScript (lib.attrNames cfg.declarativeContents))} ${openldap}/bin/slaptest -u -F ${lib.escapeShellArg configDir} ''; serviceConfig = { diff --git a/nixos/tests/openldap.nix b/nixos/tests/openldap.nix index beaff9164744..ac1e1a7596f2 100644 --- a/nixos/tests/openldap.nix +++ b/nixos/tests/openldap.nix @@ -24,9 +24,6 @@ in { environment.etc."openldap/root_password".text = "notapassword"; services.openldap = { enable = true; - defaultSchemas = null; - dataDir = null; - database = null; settings = { children = { "cn=schema" = { @@ -61,17 +58,21 @@ in { }; # Old-style configuration - shortOptions = import ./make-test-python.nix { + oldOptions = import ./make-test-python.nix { inherit testScript; name = "openldap"; machine = { pkgs, ... }: { services.openldap = { enable = true; + logLevel = "stats acl"; + defaultSchemas = true; + database = "mdb"; suffix = "dc=example"; rootdn = "cn=root,dc=example"; rootpw = "notapassword"; - declarativeContents = dbContents; + dataDir = "/var/db/openldap"; + declarativeContents."dc=example" = dbContents; }; }; }; @@ -84,10 +85,6 @@ in { services.openldap = { enable = true; configDir = "/var/db/slapd.d"; - # Silence warnings - defaultSchemas = null; - dataDir = null; - database = null; }; }; From db5bb4e26bb1cdc8a79dd639c2585722fdf2ce18 Mon Sep 17 00:00:00 2001 From: Kai Wohlfahrt Date: Sun, 27 Sep 2020 23:19:01 +0100 Subject: [PATCH 124/260] nixos/openldap: Fix sssd-ldap test Use this as a test of the migration warnings/functionality. --- nixos/modules/services/databases/openldap.nix | 49 ++++++++--------- nixos/tests/openldap.nix | 1 - nixos/tests/sssd-ldap.nix | 52 ++++++++++--------- 3 files changed, 50 insertions(+), 52 deletions(-) diff --git a/nixos/modules/services/databases/openldap.nix b/nixos/modules/services/databases/openldap.nix index aedf3873b049..94a5c573768b 100644 --- a/nixos/modules/services/databases/openldap.nix +++ b/nixos/modules/services/databases/openldap.nix @@ -3,6 +3,7 @@ with lib; let cfg = config.services.openldap; + legacyOptions = [ "rootpwFile" "suffix" "dataDir" "rootdn" "rootpw" ]; openldap = cfg.package; configDir = if cfg.configDir != null then cfg.configDir else "/etc/openldap/slapd.d"; @@ -77,6 +78,12 @@ let in { imports = let deprecationNote = "This option is removed due to the deprecation of `slapd.conf` upstream. Please migrate to `services.openldap.settings`, see the release notes for advice with this process."; + mkDatabaseOption = old: new: + lib.mkChangedOptionModule [ "services" "openldap" old ] [ "services" "openldap" "settings" "children" ] + (config: let + database = lib.getAttrFromPath [ "services" "openldap" "database" ] config; + value = lib.getAttrFromPath [ "services" "openldap" old ] config; + in lib.setAttrByPath ([ "olcDatabase={1}${database}" "attrs" ] ++ new) value); in [ (lib.mkRemovedOptionModule [ "services" "openldap" "extraConfig" ] deprecationNote) (lib.mkRemovedOptionModule [ "services" "openldap" "extraDatabaseConfig" ] deprecationNote) @@ -85,7 +92,7 @@ in { (config: lib.splitString " " (lib.getAttrFromPath [ "services" "openldap" "logLevel" ] config))) (lib.mkChangedOptionModule [ "services" "openldap" "defaultSchemas" ] [ "services" "openldap" "settings" "children" "cn=schema" "includes"] (config: lib.optionals (lib.getAttrFromPath [ "services" "openldap" "defaultSchemas" ] config) ( - map (schema: "${pkgs.openldap}/etc/schema/${schema}.ldif") [ "core" "cosine" "inetorgperson" "nis" ]))) + map (schema: "${openldap}/etc/schema/${schema}.ldif") [ "core" "cosine" "inetorgperson" "nis" ]))) (lib.mkChangedOptionModule [ "services" "openldap" "database" ] [ "services" "openldap" "settings" "children" ] (config: let @@ -97,17 +104,15 @@ in { olcDatabase = "{1}${database}"; olcDbDirectory = lib.mkDefault "/var/db/openldap"; }; + "cn=schema".includes = lib.mkDefault ( + map (schema: "${openldap}/etc/schema/${schema}.ldif") [ "core" "cosine" "inetorgperson" "nis" ] + ); })) - (lib.mkRenamedOptionModule [ "services" "openldap" "rootpwFile" ] - [ "services" "openldap" "settings" "children" "olcDatabase={1}${cfg.database}" "attrs" "olcRootPW" "path"]) - (lib.mkRenamedOptionModule [ "services" "openldap" "suffix" ] - [ "services" "openldap" "settings" "children" "olcDatabase={1}${cfg.database}" "attrs" "olcSuffix"]) - (lib.mkRenamedOptionModule [ "services" "openldap" "dataDir" ] - [ "services" "openldap" "settings" "children" "olcDatabase={1}${cfg.database}" "attrs" "olcDbDirectory"]) - (lib.mkRenamedOptionModule [ "services" "openldap" "rootdn" ] - [ "services" "openldap" "settings" "children" "olcDatabase={1}${cfg.database}" "attrs" "olcRootDN"]) - (lib.mkRenamedOptionModule [ "services" "openldap" "rootpw" ] - [ "services" "openldap" "settings" "children" "olcDatabase={1}${cfg.database}" "attrs" "olcRootPW"]) + (mkDatabaseOption "rootpwFile" [ "olcRootPW" "path" ]) + (mkDatabaseOption "suffix" [ "olcSuffix" ]) + (mkDatabaseOption "dataDir" [ "olcDbDirectory" ]) + (mkDatabaseOption "rootdn" [ "olcRootDN" ]) + (mkDatabaseOption "rootpw" [ "olcRootPW" ]) ]; options = { services.openldap = { @@ -242,14 +247,10 @@ in { meta.maintainers = with lib.maintainters; [ mic92 kwohlfahrt ]; config = mkIf cfg.enable { - assertions = [{ - assertion = lib.length (lib.attrNames cfg.settings.children) >= 2 || cfg ? database; - message = '' - No OpenLDAP database is defined. Configure one with `services.openldap.settings` - or `services.openldap.database` (legacy). - ''; - }]; - + assertions = map (opt: { + assertion = ((getAttr opt cfg) != "_mkMergedOptionModule") -> (cfg.database != "_mkMergedOptionModule"); + message = "Legacy OpenLDAP option `services.openldap.${opt}` requires `services.openldap.database` (use value \"mdb\" if unsure)"; + }) legacyOptions; environment.systemPackages = [ openldap ]; # Literal attributes must always be set @@ -259,13 +260,9 @@ in { cn = "config"; olcPidFile = "/run/slapd/slapd.pid"; }; - children = { - "cn=schema" = { - attrs = { - cn = "schema"; - objectClass = "olcSchemaConfig"; - }; - }; + children."cn=schema".attrs = { + cn = "schema"; + objectClass = "olcSchemaConfig"; }; }; diff --git a/nixos/tests/openldap.nix b/nixos/tests/openldap.nix index ac1e1a7596f2..e9339523ca9f 100644 --- a/nixos/tests/openldap.nix +++ b/nixos/tests/openldap.nix @@ -71,7 +71,6 @@ in { suffix = "dc=example"; rootdn = "cn=root,dc=example"; rootpw = "notapassword"; - dataDir = "/var/db/openldap"; declarativeContents."dc=example" = dbContents; }; }; diff --git a/nixos/tests/sssd-ldap.nix b/nixos/tests/sssd-ldap.nix index b68403a0102a..8cb398d0e170 100644 --- a/nixos/tests/sssd-ldap.nix +++ b/nixos/tests/sssd-ldap.nix @@ -1,4 +1,4 @@ -import ./make-test-python.nix ({ pkgs, ... }: +({ pkgs, ... }: let dbDomain = "example.org"; dbSuffix = "dc=example,dc=org"; @@ -7,8 +7,7 @@ import ./make-test-python.nix ({ pkgs, ... }: ldapRootPassword = "foobar"; testUser = "alice"; - in - { + in import ./make-test-python.nix { name = "sssd-ldap"; meta = with pkgs.stdenv.lib.maintainers; { @@ -18,34 +17,37 @@ import ./make-test-python.nix ({ pkgs, ... }: machine = { pkgs, ... }: { services.openldap = { enable = true; + database = "mdb"; rootdn = "cn=${ldapRootUser},${dbSuffix}"; rootpw = ldapRootPassword; suffix = dbSuffix; - declarativeContents = '' - dn: ${dbSuffix} - objectClass: top - objectClass: dcObject - objectClass: organization - o: ${dbDomain} + declarativeContents = { + ${dbSuffix} = '' + dn: ${dbSuffix} + objectClass: top + objectClass: dcObject + objectClass: organization + o: ${dbDomain} - dn: ou=posix,${dbSuffix} - objectClass: top - objectClass: organizationalUnit + dn: ou=posix,${dbSuffix} + objectClass: top + objectClass: organizationalUnit - dn: ou=accounts,ou=posix,${dbSuffix} - objectClass: top - objectClass: organizationalUnit + dn: ou=accounts,ou=posix,${dbSuffix} + objectClass: top + objectClass: organizationalUnit - dn: uid=${testUser},ou=accounts,ou=posix,${dbSuffix} - objectClass: person - objectClass: posixAccount - # userPassword: somePasswordHash - homeDirectory: /home/${testUser} - uidNumber: 1234 - gidNumber: 1234 - cn: "" - sn: "" - ''; + dn: uid=${testUser},ou=accounts,ou=posix,${dbSuffix} + objectClass: person + objectClass: posixAccount + # userPassword: somePasswordHash + homeDirectory: /home/${testUser} + uidNumber: 1234 + gidNumber: 1234 + cn: "" + sn: "" + ''; + }; }; services.sssd = { From c96f18feee69f1bd621ba4ddeb180e95d4278f27 Mon Sep 17 00:00:00 2001 From: Kai Wohlfahrt Date: Sun, 27 Sep 2020 23:23:31 +0100 Subject: [PATCH 125/260] nixos/openldap: migrate sssd-ldap to new settings --- nixos/tests/openldap.nix | 14 ++++++-------- nixos/tests/sssd-ldap.nix | 24 ++++++++++++++++++++---- 2 files changed, 26 insertions(+), 12 deletions(-) diff --git a/nixos/tests/openldap.nix b/nixos/tests/openldap.nix index e9339523ca9f..392fae243467 100644 --- a/nixos/tests/openldap.nix +++ b/nixos/tests/openldap.nix @@ -26,14 +26,12 @@ in { enable = true; settings = { children = { - "cn=schema" = { - includes = [ - "${pkgs.openldap}/etc/schema/core.ldif" - "${pkgs.openldap}/etc/schema/cosine.ldif" - "${pkgs.openldap}/etc/schema/inetorgperson.ldif" - "${pkgs.openldap}/etc/schema/nis.ldif" - ]; - }; + "cn=schema".includes = [ + "${pkgs.openldap}/etc/schema/core.ldif" + "${pkgs.openldap}/etc/schema/cosine.ldif" + "${pkgs.openldap}/etc/schema/inetorgperson.ldif" + "${pkgs.openldap}/etc/schema/nis.ldif" + ]; "olcDatabase={1}mdb" = { # This tests string, base64 and path values, as well as lists of string values attrs = { diff --git a/nixos/tests/sssd-ldap.nix b/nixos/tests/sssd-ldap.nix index 8cb398d0e170..4831eaa4ba20 100644 --- a/nixos/tests/sssd-ldap.nix +++ b/nixos/tests/sssd-ldap.nix @@ -17,10 +17,26 @@ machine = { pkgs, ... }: { services.openldap = { enable = true; - database = "mdb"; - rootdn = "cn=${ldapRootUser},${dbSuffix}"; - rootpw = ldapRootPassword; - suffix = dbSuffix; + settings = { + children = { + "cn=schema".includes = [ + "${pkgs.openldap}/etc/schema/core.ldif" + "${pkgs.openldap}/etc/schema/cosine.ldif" + "${pkgs.openldap}/etc/schema/inetorgperson.ldif" + "${pkgs.openldap}/etc/schema/nis.ldif" + ]; + "olcDatabase={1}mdb" = { + attrs = { + objectClass = [ "olcDatabaseConfig" "olcMdbConfig" ]; + olcDatabase = "{1}mdb"; + olcDbDirectory = "/var/db/openldap"; + olcSuffix = dbSuffix; + olcRootDN = "cn=${ldapRootUser},${dbSuffix}"; + olcRootPW = ldapRootPassword; + }; + }; + }; + }; declarativeContents = { ${dbSuffix} = '' dn: ${dbSuffix} From e6295fafa9f96f1df1010a8afeddc4d8fc97fa68 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Sat, 21 Nov 2020 17:33:21 +0100 Subject: [PATCH 126/260] haskellPackages.{http-media,servant-auth-client}: fix builds --- pkgs/development/haskell-modules/configuration-common.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index afe26660d084..a85687fb8155 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -937,8 +937,9 @@ self: super: { # Test suite depends on cabal-install doctest = dontCheck super.doctest; - # https://github.com/haskell-servant/servant-auth/issues/113 - servant-auth-client = dontCheck super.servant-auth-client; + # dontCheck: https://github.com/haskell-servant/servant-auth/issues/113 + # doJailbreak: waiting on revision 1 to hit hackage + servant-auth-client = doJailbreak (dontCheck super.servant-auth-client); # Generate cli completions for dhall. dhall = generateOptparseApplicativeCompletion "dhall" super.dhall; @@ -1479,6 +1480,9 @@ self: super: { # Tests disabled because of: https://github.com/kowainik/stan/issues/409 stan = doJailbreak (dontCheck super.stan); + # Due to tests restricting base in 0.8.0.0 release + http-media = doJailbreak super.http-media; + # 2020-11-19: Disabling tests with this issue: https://github.com/cchalmers/pcg-random/issues/10 # Issue has been fixed in 0.1.3.7, we can enable tests again, once stackage bumps the version pcg-random = assert super.pcg-random.version == "0.1.3.6"; dontCheck super.pcg-random; From 74f76447710d7ddd21cfdf303d3d9543c78e6428 Mon Sep 17 00:00:00 2001 From: Malte Brandy Date: Sat, 21 Nov 2020 16:01:50 +0100 Subject: [PATCH 127/260] Revert "Revert "Revert "cachix: drop the build from the release jobset""" This reverts commit e6c0c51ce8cce525094687ab9d1dfb374055615a. --- pkgs/top-level/release.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index 20eaffaf84ac..cacc77fea30d 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -62,7 +62,7 @@ let # jobs.stack.x86_64-darwin jobs.stdenv.x86_64-darwin jobs.vim.x86_64-darwin - # jobs.cachix.x86_64-darwin + jobs.cachix.x86_64-darwin # UI apps # jobs.firefox-unwrapped.x86_64-darwin @@ -105,7 +105,7 @@ let jobs.nix-info-tested.x86_64-linux # Ensure that X11/GTK are in order. jobs.thunderbird.x86_64-linux - # jobs.cachix.x86_64-linux + jobs.cachix.x86_64-linux /* jobs.tests.cc-wrapper.x86_64-linux From 264250f6e1e284d473797ac61ff4d5f09d379ed7 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 21 Nov 2020 17:26:57 +0000 Subject: [PATCH 128/260] cargo-udeps: 0.1.15 -> 0.1.16 --- pkgs/development/tools/rust/cargo-udeps/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-udeps/default.nix b/pkgs/development/tools/rust/cargo-udeps/default.nix index cc3aa00b27d0..840f2ae27c3c 100644 --- a/pkgs/development/tools/rust/cargo-udeps/default.nix +++ b/pkgs/development/tools/rust/cargo-udeps/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-udeps"; - version = "0.1.15"; + version = "0.1.16"; src = fetchFromGitHub { owner = "est31"; repo = pname; rev = "v${version}"; - sha256 = "0qnmz7sxbwnjdsl17h876szxd04z0q9arbl1ib45b6346x7mq8n4"; + sha256 = "1h89xq91gbnbagfmvig5lkxyl08qwgdaf9vr55p599pmv190xq8s"; }; - cargoSha256 = "1jnbf0a3bggjf0wapr9xdj9hwfpgki2csg7rhg5maqavm8m0mirm"; + cargoSha256 = "17931z5nbigfzvvhr6k64s2j9p1sp9nvmy5fyf92j3ci02dplm5c"; nativeBuildInputs = [ pkgconfig ]; From 2c0a127cd691c661ff44e1b08f07225dbd272ca5 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 21 Nov 2020 17:43:49 +0000 Subject: [PATCH 129/260] cc65: 2.18 -> 2.19 --- pkgs/development/compilers/cc65/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/cc65/default.nix b/pkgs/development/compilers/cc65/default.nix index 944e0f729002..1b5011365cf2 100644 --- a/pkgs/development/compilers/cc65/default.nix +++ b/pkgs/development/compilers/cc65/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "cc65"; - version = "2.18"; + version = "2.19"; src = fetchFromGitHub { owner = "cc65"; repo = pname; rev = "V${version}"; - sha256 = "sha256-XRGhukYite1GtPkO9clmkwvvU62OnYphO8V1Rrr7yMg="; + sha256 = "01a15yvs455qp20hri2pbg2wqvcip0d50kb7dibi9427hqk9cnj4"; }; makeFlags = [ "PREFIX=${placeholder "out"}"]; From bd0ffc390c7b1a60eb4ed67c8a90e72d2b56656f Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 21 Nov 2020 17:52:32 +0000 Subject: [PATCH 130/260] chezmoi: 1.8.8 -> 1.8.9 --- pkgs/tools/misc/chezmoi/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/chezmoi/default.nix b/pkgs/tools/misc/chezmoi/default.nix index 95e1f0592eef..0722fca4370b 100644 --- a/pkgs/tools/misc/chezmoi/default.nix +++ b/pkgs/tools/misc/chezmoi/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "chezmoi"; - version = "1.8.8"; + version = "1.8.9"; src = fetchFromGitHub { owner = "twpayne"; repo = "chezmoi"; rev = "v${version}"; - sha256 = "1ax0rq341k8mi7lghw1rkmlg802fd22zpql5v3g6lhgy6s1xq9wk"; + sha256 = "07jsakihci98ww1hgppilq942raz05c5xi2pzq632vq5i11fi0nj"; }; - vendorSha256 = "08x81r9y2x1xcld1s6maspq94wr817w9aqjdv226058ran0492s8"; + vendorSha256 = "0adva7crl6dachbf76920aniki3zcq9chdjjrzssasm89zqgwicf"; doCheck = false; From 86b1a89d8243aa7c4de71e029f3fab091e0ebe3f Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 21 Nov 2020 17:59:39 +0000 Subject: [PATCH 131/260] circleci-cli: 0.1.11458 -> 0.1.11508 --- pkgs/development/tools/misc/circleci-cli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/circleci-cli/default.nix b/pkgs/development/tools/misc/circleci-cli/default.nix index 27fdb76cf82a..ac8a4c8bb7c9 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.11458"; + version = "0.1.11508"; src = fetchFromGitHub { owner = "CircleCI-Public"; repo = pname; rev = "v${version}"; - sha256 = "028qm25vhqp2a1jpvy4csgzqy5ijmsnzyh9696x660glrk5q2r1i"; + sha256 = "1m0jy7h9mksgj85r4jcpb5nabcs9vrfbrky31acwbibzjxxw9afg"; }; vendorSha256 = "15l9f87vgspdsxhwqdm56z3dvrspc8k1bbyvhhhnvqf3fkiki2bw"; From 7275aa56ca44409da7d46707ee419eb6caef91e4 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 21 Nov 2020 18:16:18 +0000 Subject: [PATCH 132/260] clash: 1.2.0 -> 1.3.0 --- pkgs/tools/networking/clash/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/clash/default.nix b/pkgs/tools/networking/clash/default.nix index 3a37f345c969..502a4b4bbd42 100644 --- a/pkgs/tools/networking/clash/default.nix +++ b/pkgs/tools/networking/clash/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "clash"; - version = "1.2.0"; + version = "1.3.0"; src = fetchFromGitHub { owner = "Dreamacro"; repo = pname; rev = "v${version}"; - sha256 = "16dgpq67bcy9z5lqwykwh61kwxi164khxqc78i6a3dc9xyivwfya"; + sha256 = "1y0im2xs6pibbfri2k7g9jqbzm90jd9a5lghrzasxmkzjfcimrnf"; }; - vendorSha256 = "0gmyq54h9zb4ry2p24nsp8ybqrmaq69zlyp220w16kamx790j07j"; + vendorSha256 = "0lljm594xgcv7ylz7qn170r9526k9d1lh77m9f9zcnhdd2qw4rw1"; doCheck = false; From b3671eb6c5d495b84ab4f2c007193a41479d876e Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 21 Nov 2020 18:27:27 +0000 Subject: [PATCH 133/260] cloudflared: 2020.11.5 -> 2020.11.10 --- pkgs/applications/networking/cloudflared/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cloudflared/default.nix b/pkgs/applications/networking/cloudflared/default.nix index 738917f37991..7bacb182a59b 100644 --- a/pkgs/applications/networking/cloudflared/default.nix +++ b/pkgs/applications/networking/cloudflared/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "cloudflared"; - version = "2020.11.5"; + version = "2020.11.10"; src = fetchFromGitHub { owner = "cloudflare"; repo = "cloudflared"; rev = version; - sha256 = "09bjqcrz7s40m7afb80dpx7jncp5prn2p6bksspv5wqc84l2nn5d"; + sha256 = "1jajjfbwbqvkr2cc9y4ryn8z1sh19hwydxidfdpgmq794ci8v4np"; }; vendorSha256 = null; From e83b3f6866943cfd2c4e829c7c705babece47cfa Mon Sep 17 00:00:00 2001 From: Max Wittig Date: Sat, 21 Nov 2020 19:32:45 +0100 Subject: [PATCH 134/260] gitlab-runner: 13.5.0 -> 13.6.0 (#104498) --- .../continuous-integration/gitlab-runner/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix index 3547da41f079..db2d228ce454 100644 --- a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix +++ b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix @@ -1,16 +1,16 @@ { lib, buildGoPackage, fetchFromGitLab, fetchurl }: let - version = "13.5.0"; + version = "13.6.0"; # Gitlab runner embeds some docker images these are prebuilt for arm and x86_64 docker_x86_64 = fetchurl { url = "https://gitlab-runner-downloads.s3.amazonaws.com/v${version}/helper-images/prebuilt-x86_64.tar.xz"; - sha256 = "1cahv98hhwcc0czg7c86sqk0r6kw3gxnx8j6mqp1zm19aa30sabk"; + sha256 = "0q1f4dmdkqrdzs3mb5wk6k6x50li4c7js0blzfcz3f3n8gm925jw"; }; docker_arm = fetchurl { url = "https://gitlab-runner-downloads.s3.amazonaws.com/v${version}/helper-images/prebuilt-arm.tar.xz"; - sha256 = "1wk7xn8jap8699cpgqkpgxmd908qjxlsfjswknrha1n8y2c5bjgx"; + sha256 = "1hxjqk4in1a2abcyxj7556fcscxq4cfy24cgcmh1qhvirnm5j6mc"; }; in buildGoPackage rec { @@ -30,7 +30,7 @@ buildGoPackage rec { owner = "gitlab-org"; repo = "gitlab-runner"; rev = "v${version}"; - sha256 = "0qfzdbhj68lq5pa1hvb703yx9grh3hvnnw6jb4bj4fckncd3avgm"; + sha256 = "0vwky4hdkh1qvd61zdf2avbbnn3ya6pdicqggh2fx7k04pnp05mh"; }; patches = [ ./fix-shell-path.patch ]; From 417f02b1b83eea17f7aec86a55597d1f3504f737 Mon Sep 17 00:00:00 2001 From: JesusMtnez Date: Sat, 21 Nov 2020 19:51:16 +0100 Subject: [PATCH 135/260] vscode-extensions.scalameta.metals: 1.9.6 -> 1.9.7 --- pkgs/misc/vscode-extensions/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/vscode-extensions/default.nix b/pkgs/misc/vscode-extensions/default.nix index d523e334018c..0228ee9a1e98 100644 --- a/pkgs/misc/vscode-extensions/default.nix +++ b/pkgs/misc/vscode-extensions/default.nix @@ -191,8 +191,8 @@ let mktplcRef = { name = "metals"; publisher = "scalameta"; - version = "1.9.6"; - sha256 = "12sjzk64kz7z8zqh3zg1dyb3v4c5xxgi1ain1jvw8hwf0hicqlgi"; + version = "1.9.7"; + sha256 = "0v599yssvk358gxfxnyzzkyk0y5krsbp8n4rkp9wb2ncxqsqladr"; }; meta = { license = stdenv.lib.licenses.asl20; From 8a58e4efe8867b7e77e1da7ba41fbd1a3afe2c9d Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 21 Nov 2020 18:53:08 +0000 Subject: [PATCH 136/260] croc: 8.6.5 -> 8.6.6 --- pkgs/tools/networking/croc/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/croc/default.nix b/pkgs/tools/networking/croc/default.nix index 6d6c08a1efe0..08eb3d69128b 100644 --- a/pkgs/tools/networking/croc/default.nix +++ b/pkgs/tools/networking/croc/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "croc"; - version = "8.6.5"; + version = "8.6.6"; src = fetchFromGitHub { owner = "schollz"; repo = pname; rev = "v${version}"; - sha256 = "1lzprv4qbmv2jjjp02z87819k54wdlsf8i6zvl3vchkqvygdkk6v"; + sha256 = "0bd7q3j2i0r3v4liv2xpqlvx4nrixpdhr1yy1c579bls7y4myv61"; }; - vendorSha256 = "02mai9bp9pizbq6b8dj05rngxp3lfm9gh37zs8jknx56gas90j9i"; + vendorSha256 = "06hqb5r9p67zh0v5whdsb3rvax6461y2n6jkhjwmn6zzswpgkg7y"; doCheck = false; From 00593bdb64989e20d10f3ef62c0b02efe2644a72 Mon Sep 17 00:00:00 2001 From: Malte Brandy Date: Sat, 21 Nov 2020 16:04:08 +0100 Subject: [PATCH 137/260] cachix: Build from 8.10.2, fix build and activate on hydra This removes the broken flag from everything depending on servant so it can get a new chance to build following the servant fix. --- .../haskell-modules/configuration-common.nix | 17 ++ .../configuration-ghc-8.8.x.nix | 14 - .../configuration-hackage2nix.yaml | 134 --------- .../haskell-modules/hackage-packages.nix | 268 ------------------ pkgs/top-level/all-packages.nix | 2 +- 5 files changed, 18 insertions(+), 417 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index a85687fb8155..aa1d0be1bb3b 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1500,4 +1500,21 @@ self: super: { # 2020-11-19: Jailbreaking until: https://github.com/snapframework/snap/pull/219 snap = doJailbreak super.snap; + # 2020-11-21: cachix + chachix-api needs a patch for ghc 8.10 compat. Can be removed once released + # https://github.com/cachix/cachix/pull/331 + cachix-api = appendPatch super.cachix-api (pkgs.fetchpatch { + url = https://github.com/cachix/cachix/commit/bfeec151a03afad72401815fe8bbb1b0d5d63b0d.patch; + sha256 = "0rglyd77g4j72l5g0sj9zpq2hy3v992bm6nhj58pmj4j2aj67y74"; + stripLen = 2; + extraPrefix = ""; + includes = [ "src/Cachix/Types/Session.hs" "src/Cachix/API/Signing.hs" ]; + }); + cachix = appendPatch super.cachix (pkgs.fetchpatch { + url = https://github.com/cachix/cachix/commit/bfeec151a03afad72401815fe8bbb1b0d5d63b0d.patch; + sha256 = "06jmpz8l5vh9cch5aqdbrln7bm3fghxsicwy1m93avli320kp8pp"; + stripLen = 2; + extraPrefix = ""; + excludes = [ "stack.yaml" "sources.json" "src/Cachix/Types/Session.hs" "src/Cachix/API/Signing.hs" "cachix-api.cabal" "workflows/test.yml" ]; + }); + } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix index 60a361250332..d1099c56b2c8 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix @@ -86,20 +86,6 @@ self: super: { foundation = dontCheck super.foundation; vault = dontHaddock super.vault; - servant = unmarkBroken super.servant; - servant-auth = unmarkBroken super.servant-auth; - servant-conduit = unmarkBroken super.servant-conduit; - servant-auth-client = unmarkBroken super.servant-auth-client; - servant-client = unmarkBroken super.servant-client; - servant-client-core = unmarkBroken super.servant-client-core; - servant-auth-server = unmarkBroken super.servant-auth-server; - servant-auth-swagger = unmarkBroken super.servant-auth-swagger; - servant-swagger = unmarkBroken super.servant-swagger; - servant-blaze = unmarkBroken super.servant-blaze; - servant-swagger-ui-core = unmarkBroken super.servant-swagger-ui-core; - swagger2 = unmarkBroken super.swagger2; - cachix-api = unmarkBroken super.cachix-api; - # https://github.com/snapframework/snap-core/issues/288 snap-core = overrideCabal super.snap-core (drv: { prePatch = "substituteInPlace src/Snap/Internal/Core.hs --replace 'fail = Fail.fail' ''"; }); diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index ca1e6b198b8b..ca49b17ee900 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -3722,8 +3722,6 @@ broken-packages: - cache-polysemy - cached - caching - - cachix - - cachix-api - cacophony - cafeteria-prelude - caffegraph @@ -6151,7 +6149,6 @@ broken-packages: - hedgehog-gen-json - hedgehog-generic - hedgehog-golden - - hedgehog-servant - Hedi - hedis-config - hedis-pile @@ -6699,7 +6696,6 @@ broken-packages: - http-io-streams - http-kinder - http-listen - - http-media - http-monad - http-pony - http-pony-serve-wai @@ -8009,7 +8005,6 @@ broken-packages: - mu-protobuf - mu-rpc - mu-schema - - mu-servant-server - mu-tracing - MuCheck - MuCheck-Hspec @@ -8093,9 +8088,6 @@ broken-packages: - nagios-plugin-ekg - nakadi-client - named-lock - - named-servant - - named-servant-client - - named-servant-server - named-sop - namelist - namespace @@ -9131,7 +9123,6 @@ broken-packages: - rclient - rdioh - react-flux - - react-flux-servant - react-haskell - react-tutorial-haskell-server - reaction-logic @@ -9341,7 +9332,6 @@ broken-packages: - rfc-prelude - rfc-psql - rfc-redis - - rfc-servant - rg - rhythm-game-tutorial - rib @@ -9379,7 +9369,6 @@ broken-packages: - rncryptor - rob - robin - - roboservant - robots-txt - roc-cluster - roc-cluster-demo @@ -9607,124 +9596,6 @@ broken-packages: - serpentine - serv - serv-wai - - servant - - servant-aeson-specs - - servant-auth - - servant-auth-client - - servant-auth-cookie - - servant-auth-docs - - servant-auth-hmac - - servant-auth-server - - servant-auth-swagger - - servant-auth-token - - servant-auth-token-acid - - servant-auth-token-api - - servant-auth-token-leveldb - - servant-auth-token-persistent - - servant-auth-token-rocksdb - - servant-auth-wordpress - - servant-avro - - servant-blaze - - servant-cassava - - servant-checked-exceptions - - servant-checked-exceptions-core - - servant-cli - - servant-client - - servant-client-core - - servant-client-js - - servant-client-namedargs - - servant-conduit - - servant-csharp - - servant-db - - servant-db-postgresql - - servant-dhall - - servant-docs - - servant-docs-simple - - servant-ede - - servant-ekg - - servant-elm - - servant-errors - - servant-examples - - servant-exceptions - - servant-fiat-content - - servant-flatten - - servant-foreign - - servant-generate - - servant-generic - - servant-github - - servant-github-webhook - - servant-haxl-client - - servant-hmac-auth - - servant-http-streams - - servant-http2-client - - servant-iCalendar - - servant-jquery - - servant-js - - servant-jsonrpc - - servant-jsonrpc-client - - servant-jsonrpc-server - - servant-JuicyPixels - - servant-kotlin - - servant-lucid - - servant-machines - - servant-match - - servant-matrix-param - - servant-mock - - servant-multipart - - servant-named - - servant-namedargs - - servant-nix - - servant-openapi3 - - servant-options - - servant-pagination - - servant-pandoc - - servant-pipes - - servant-pool - - servant-postgresql - - servant-proto-lens - - servant-purescript - - servant-pushbullet-client - - servant-py - - servant-quickcheck - - servant-rawm - - servant-rawm-client - - servant-rawm-docs - - servant-rawm-server - - servant-reason - - servant-reflex - - servant-router - - servant-ruby - - servant-scotty - - servant-seo - - servant-serf - - servant-server - - servant-server-namedargs - - servant-smsc-ru - - servant-snap - - servant-stache - - servant-static-th - - servant-streaming - - servant-streaming-client - - servant-streaming-docs - - servant-streaming-server - - servant-subscriber - - servant-swagger - - servant-swagger-tags - - servant-swagger-ui - - servant-swagger-ui-core - - servant-swagger-ui-jensoleg - - servant-swagger-ui-redoc - - servant-to-elm - - servant-tracing - - servant-waargonaut - - servant-wasm - - servant-websockets - - servant-xml - - servant-yaml - - servant-zeppelin - - servant-zeppelin-client - - servant-zeppelin-server - - servant-zeppelin-swagger - server-generic - serversession-backend-acid-state - serversession-backend-persistent @@ -10291,7 +10162,6 @@ broken-packages: - svndump - swagger-petstore - swagger-test - - swagger2 - swapper - swearjure - sweet-egison @@ -10625,7 +10495,6 @@ broken-packages: - tomato-rubato-openal - toml - tonatona-google-server-api - - tonatona-servant - too-many-cells - toodles - top @@ -10850,7 +10719,6 @@ broken-packages: - uniquely-represented-sets - units-attoparsec - unittyped - - unitym-servant - unitym-yesod - universal-binary - universe-th @@ -10998,7 +10866,6 @@ broken-packages: - verilog - verismith - versioning - - versioning-servant - vflow-types - vfr-waypoints - vgrep @@ -11335,7 +11202,6 @@ broken-packages: - yam-datasource - yam-logger - yam-redis - - yam-servant - yam-transaction - yam-transaction-odbc - yam-web diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 07f6321760f1..694ba6935b04 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -49158,8 +49158,6 @@ self: { ]; description = "Command line client for Nix binary cache hosting https://cachix.org"; license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {inherit (pkgs) boost; inherit (pkgs) nix;}; "cachix-api" = callPackage @@ -49192,8 +49190,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "Servant HTTP API specification for https://cachix.org"; license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "cacophony" = callPackage @@ -122425,8 +122421,6 @@ self: { ]; description = "Hedgehog property testing for Servant APIs"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "hedis" = callPackage @@ -137361,8 +137355,6 @@ self: { ]; description = "Processing HTTP Content-Type and Accept headers"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "http-mock" = callPackage @@ -176283,8 +176275,6 @@ self: { ]; description = "Servant servers for Mu definitions"; license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "mu-tracing" = callPackage @@ -178746,8 +178736,6 @@ self: { sha256 = "0ixpm43sgir02a9y8i7rvalxh6h7vlcwgi2hmis0lq0w8pmw5m53"; libraryHaskellDepends = [ base named servant ]; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "named-servant-client" = callPackage @@ -178763,8 +178751,6 @@ self: { ]; description = "client support for named-servant"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "named-servant-server" = callPackage @@ -178780,8 +178766,6 @@ self: { ]; description = "server support for named-servant"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "named-sop" = callPackage @@ -211492,8 +211476,6 @@ self: { libraryHaskellDepends = [ aeson base react-flux servant text ]; description = "Allow react-flux stores to send requests to a servant server"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "react-haskell" = callPackage @@ -217605,8 +217587,6 @@ self: { ]; description = "The Servant extensions from the Robert Fischer Commons"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "rfc1413-server" = callPackage @@ -218659,8 +218639,6 @@ self: { ]; description = "Automatic session-aware servant testing"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "robot" = callPackage @@ -225447,8 +225425,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "A family of combinators for defining webservices APIs"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "servant-JuicyPixels" = callPackage @@ -225469,8 +225445,6 @@ self: { ]; description = "Servant support for JuicyPixels"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "servant-aeson-specs" = callPackage @@ -225496,8 +225470,6 @@ self: { ]; description = "generic tests for aeson serialization in servant"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "servant-auth" = callPackage @@ -225513,8 +225485,6 @@ self: { ]; description = "Authentication combinators for servant"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "servant-auth-client" = callPackage @@ -225539,8 +225509,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "servant-client/servant-auth compatibility"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "servant-auth-cookie" = callPackage @@ -225571,8 +225539,6 @@ self: { ]; description = "Authentication via encrypted cookies"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "servant-auth-docs" = callPackage @@ -225597,8 +225563,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "servant-docs/servant-auth compatibility"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "servant-auth-hmac" = callPackage @@ -225634,8 +225598,6 @@ self: { ]; description = "Authentication via HMAC"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "servant-auth-server" = callPackage @@ -225664,8 +225626,6 @@ self: { testToolDepends = [ hspec-discover markdown-unlit ]; description = "servant-server/servant-auth compatibility"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "servant-auth-swagger" = callPackage @@ -225686,8 +225646,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "servant-swagger/servant-auth compatibility"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "servant-auth-token" = callPackage @@ -225707,8 +225665,6 @@ self: { ]; description = "Servant based API and server for token based authorisation"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "servant-auth-token-acid" = callPackage @@ -225730,8 +225686,6 @@ self: { ]; description = "Acid-state backend for servant-auth-token server"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "servant-auth-token-api" = callPackage @@ -225748,8 +225702,6 @@ self: { ]; description = "Servant based API for token based authorisation"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "servant-auth-token-leveldb" = callPackage @@ -225771,8 +225723,6 @@ self: { ]; description = "Leveldb backend for servant-auth-token server"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "servant-auth-token-persistent" = callPackage @@ -225792,8 +225742,6 @@ self: { ]; description = "Persistent backend for servant-auth-token server"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "servant-auth-token-rocksdb" = callPackage @@ -225816,8 +225764,6 @@ self: { ]; description = "RocksDB backend for servant-auth-token server"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "servant-auth-wordpress" = callPackage @@ -225833,8 +225779,6 @@ self: { ]; description = "Authenticate Routes Using Wordpress Cookies"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "servant-avro" = callPackage @@ -225852,8 +225796,6 @@ self: { ]; description = "Avro content type for Servant"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "servant-blaze" = callPackage @@ -225868,8 +225810,6 @@ self: { testHaskellDepends = [ base blaze-html servant-server wai warp ]; description = "Blaze-html support for servant"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "servant-cassava" = callPackage @@ -225891,8 +225831,6 @@ self: { ]; description = "Servant CSV content-type for cassava"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "servant-checked-exceptions" = callPackage @@ -225917,8 +225855,6 @@ self: { ]; description = "Checked exceptions for Servant APIs"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "servant-checked-exceptions-core" = callPackage @@ -225940,8 +225876,6 @@ self: { testHaskellDepends = [ base doctest Glob ]; description = "Checked exceptions for Servant APIs"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "servant-cli" = callPackage @@ -225969,8 +225903,6 @@ self: { ]; description = "Command line interface for Servant API clients"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "servant-client" = callPackage @@ -226003,8 +225935,6 @@ self: { testToolDepends = [ hspec-discover markdown-unlit ]; description = "Automatic derivation of querying functions for servant"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "servant-client-core" = callPackage @@ -226028,8 +225958,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "Core functionality and class for client function generation for servant APIs"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "servant-client-js" = callPackage @@ -226049,8 +225977,6 @@ self: { ]; description = "A servant client for frontend JavaScript"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "servant-client-namedargs" = callPackage @@ -226072,8 +225998,6 @@ self: { ]; description = "Automatically derive API client functions with named and optional parameters"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "servant-conduit" = callPackage @@ -226094,8 +226018,6 @@ self: { ]; description = "Servant Stream support for conduit"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "servant-csharp" = callPackage @@ -226115,8 +226037,6 @@ self: { ]; description = "Generate servant client library for C#"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "servant-db" = callPackage @@ -226128,8 +226048,6 @@ self: { libraryHaskellDepends = [ base servant ]; description = "Servant types for defining API with relational DBs"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "servant-db-postgresql" = callPackage @@ -226155,8 +226073,6 @@ self: { ]; description = "Derive a postgres client to database API specified by servant-db"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "servant-dhall" = callPackage @@ -226178,8 +226094,6 @@ self: { ]; description = "Servant Dhall content-type"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "servant-docs" = callPackage @@ -226208,8 +226122,6 @@ self: { ]; description = "generate API docs for your servant webservice"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "servant-docs-simple" = callPackage @@ -226232,8 +226144,6 @@ self: { ]; description = "Generate endpoints overview for Servant API"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "servant-ede" = callPackage @@ -226257,8 +226167,6 @@ self: { ]; description = "Combinators for rendering EDE templates in servant web applications"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "servant-ekg" = callPackage @@ -226285,8 +226193,6 @@ self: { ]; description = "Helpers for using ekg with servant"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "servant-elm" = callPackage @@ -226309,8 +226215,6 @@ self: { ]; description = "Automatically derive Elm functions to query servant webservices"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "servant-errors" = callPackage @@ -226334,8 +226238,6 @@ self: { testToolDepends = [ markdown-unlit ]; description = "Servant Errors wai-middlware"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "servant-examples" = callPackage @@ -226358,8 +226260,6 @@ self: { ]; description = "Example programs for servant"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "servant-exceptions" = callPackage @@ -226380,8 +226280,6 @@ self: { aeson base exceptions http-types servant-server text warp ]; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "servant-fiat-content" = callPackage @@ -226395,8 +226293,6 @@ self: { ]; description = "Fiat content types"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "servant-flatten" = callPackage @@ -226408,8 +226304,6 @@ self: { libraryHaskellDepends = [ base servant ]; description = "Utilities for flattening servant API types"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "servant-foreign" = callPackage @@ -226427,8 +226321,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "Helpers for generating clients for servant APIs in any programming language"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "servant-generate" = callPackage @@ -226442,8 +226334,6 @@ self: { libraryHaskellDepends = [ base servant servant-server ]; description = "Utilities for generating mock server implementations"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "servant-generic" = callPackage @@ -226460,8 +226350,6 @@ self: { ]; description = "Specify Servant APIs with records"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "servant-github" = callPackage @@ -226485,8 +226373,6 @@ self: { testHaskellDepends = [ base hspec QuickCheck ]; description = "Bindings to GitHub API using servant"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "servant-github-webhook" = callPackage @@ -226509,8 +226395,6 @@ self: { ]; description = "Servant combinators to facilitate writing GitHub webhooks"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "servant-haxl-client" = callPackage @@ -226538,8 +226422,6 @@ self: { ]; description = "automatical derivation of querying functions for servant webservices"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "servant-hmac-auth" = callPackage @@ -226566,8 +226448,6 @@ self: { testHaskellDepends = [ base ]; description = "Servant authentication with HMAC"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "servant-http-streams" = callPackage @@ -226603,8 +226483,6 @@ self: { testToolDepends = [ hspec-discover markdown-unlit ]; description = "Automatic derivation of querying functions for servant"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "servant-http2-client" = callPackage @@ -226629,8 +226507,6 @@ self: { ]; description = "Generate HTTP2 clients from Servant API descriptions"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "servant-iCalendar" = callPackage @@ -226647,8 +226523,6 @@ self: { ]; description = "Servant support for iCalendar"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "servant-jquery" = callPackage @@ -226667,8 +226541,6 @@ self: { ]; description = "Automatically derive (jquery) javascript functions to query servant webservices"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "servant-js" = callPackage @@ -226692,8 +226564,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "Automatically derive javascript functions to query servant webservices"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "servant-jsonrpc" = callPackage @@ -226705,8 +226575,6 @@ self: { libraryHaskellDepends = [ aeson base servant ]; description = "JSON-RPC messages and endpoints"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "servant-jsonrpc-client" = callPackage @@ -226722,8 +226590,6 @@ self: { ]; description = "Generate JSON-RPC servant clients"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "servant-jsonrpc-server" = callPackage @@ -226739,8 +226605,6 @@ self: { ]; description = "JSON-RPC servant servers"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "servant-kotlin" = callPackage @@ -226766,8 +226630,6 @@ self: { ]; description = "Automatically derive Kotlin class to query servant webservices"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "servant-lucid" = callPackage @@ -226782,8 +226644,6 @@ self: { testHaskellDepends = [ base lucid servant-server wai warp ]; description = "Servant support for lucid"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "servant-machines" = callPackage @@ -226802,8 +226662,6 @@ self: { ]; description = "Servant Stream support for machines"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "servant-match" = callPackage @@ -226820,8 +226678,6 @@ self: { testHaskellDepends = [ base hspec network-uri servant text ]; description = "Standalone implementation of servant’s dispatching mechanism"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "servant-matrix-param" = callPackage @@ -226842,8 +226698,6 @@ self: { ]; description = "Matrix parameter combinator for servant"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "servant-mock" = callPackage @@ -226872,8 +226726,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "Derive a mock server for free from your servant API types"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "servant-multipart" = callPackage @@ -226906,8 +226758,6 @@ self: { ]; description = "multipart/form-data (e.g file upload) support for servant"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "servant-named" = callPackage @@ -226926,8 +226776,6 @@ self: { ]; description = "Add named endpoints to servant"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "servant-namedargs" = callPackage @@ -226940,8 +226788,6 @@ self: { testHaskellDepends = [ base hspec named QuickCheck servant ]; description = "Combinators for servant providing named parameters"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "servant-nix" = callPackage @@ -226963,8 +226809,6 @@ self: { ]; description = "Servant Nix content-type"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "servant-openapi3" = callPackage @@ -226993,8 +226837,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "Generate a Swagger/OpenAPI/OAS 3.0 specification for your servant API."; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "servant-options" = callPackage @@ -227010,8 +226852,6 @@ self: { ]; description = "Provide responses to OPTIONS requests for Servant applications"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "servant-pagination" = callPackage @@ -227030,8 +226870,6 @@ self: { testHaskellDepends = [ base hspec QuickCheck servant-server text ]; description = "Type-safe pagination for Servant APIs"; license = stdenv.lib.licenses.lgpl3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "servant-pandoc" = callPackage @@ -227049,8 +226887,6 @@ self: { ]; description = "Use Pandoc to render servant API documentation"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "servant-pipes" = callPackage @@ -227072,8 +226908,6 @@ self: { ]; description = "Servant Stream support for pipes"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "servant-pool" = callPackage @@ -227087,8 +226921,6 @@ self: { libraryHaskellDepends = [ base resource-pool servant time ]; description = "Utility functions for creating servant 'Context's with \"context/connection pooling\" support"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "servant-postgresql" = callPackage @@ -227105,8 +226937,6 @@ self: { ]; description = "Useful functions and instances for using servant with a PostgreSQL context"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "servant-proto-lens" = callPackage @@ -227129,8 +226959,6 @@ self: { ]; description = "Servant Content-Type for proto-lens protobuf modules"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "servant-purescript" = callPackage @@ -227154,8 +226982,6 @@ self: { ]; description = "Generate PureScript accessor functions for you servant API"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "servant-pushbullet-client" = callPackage @@ -227175,8 +227001,6 @@ self: { ]; description = "Bindings to the Pushbullet API using servant-client"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "servant-py" = callPackage @@ -227198,8 +227022,6 @@ self: { ]; description = "Automatically derive python functions to query servant webservices"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "servant-quickcheck" = callPackage @@ -227228,8 +227050,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "QuickCheck entire APIs"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "servant-rawm" = callPackage @@ -227241,8 +227061,6 @@ self: { libraryHaskellDepends = [ base servant ]; description = "Embed a raw 'Application' in a Servant API"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "servant-rawm-client" = callPackage @@ -227254,8 +227072,6 @@ self: { libraryHaskellDepends = [ base servant-client-core servant-rawm ]; description = "The client implementation of servant-rawm"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "servant-rawm-docs" = callPackage @@ -227271,8 +227087,6 @@ self: { ]; description = "Documentation generator for 'RawM' endpoints"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "servant-rawm-server" = callPackage @@ -227289,8 +227103,6 @@ self: { ]; description = "The server implementation of servant-rawm"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "servant-reason" = callPackage @@ -227311,8 +227123,6 @@ self: { ]; description = "Derive Reason types to interact with a Haskell backend"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "servant-reflex" = callPackage @@ -227335,8 +227145,6 @@ self: { ]; description = "servant API generator for reflex apps"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "servant-response" = callPackage @@ -227369,8 +227177,6 @@ self: { ]; description = "Servant router for non-server applications"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "servant-ruby" = callPackage @@ -227385,8 +227191,6 @@ self: { testHaskellDepends = [ base doctest QuickCheck ]; description = "Generate a Ruby client from a Servant API with Net::HTTP"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "servant-scotty" = callPackage @@ -227405,8 +227209,6 @@ self: { ]; description = "Generate a web service for servant 'Resource's using scotty and JSON"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "servant-seo" = callPackage @@ -227429,8 +227231,6 @@ self: { ]; description = "Generate Robots.txt and Sitemap.xml specification for your servant API."; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "servant-serf" = callPackage @@ -227450,8 +227250,6 @@ self: { doHaddock = false; description = "Generates a servant API module"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "servant-server" = callPackage @@ -227489,8 +227287,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "A family of combinators for defining webservices APIs and serving them"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "servant-server-namedargs" = callPackage @@ -227508,8 +227304,6 @@ self: { ]; description = "Automatically derive API server functions with named and optional parameters"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "servant-smsc-ru" = callPackage @@ -227532,8 +227326,6 @@ self: { ]; description = "Servant client for smsc.ru service for sending SMS to cell phones"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "servant-snap" = callPackage @@ -227571,8 +227363,6 @@ self: { ]; description = "A family of combinators for defining webservices APIs and serving them"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "servant-stache" = callPackage @@ -227595,8 +227385,6 @@ self: { ]; description = "Content-Types for rendering Mustache in servant"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "servant-static-th" = callPackage @@ -227623,8 +227411,6 @@ self: { ]; description = "Embed a directory of static files in your Servant server"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "servant-streaming" = callPackage @@ -227639,8 +227425,6 @@ self: { testHaskellDepends = [ base hspec http-types QuickCheck servant ]; description = "Servant combinators for the 'streaming' package"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "servant-streaming-client" = callPackage @@ -227666,8 +227450,6 @@ self: { ]; description = "Client instances for the 'servant-streaming' package"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "servant-streaming-docs" = callPackage @@ -227685,8 +227467,6 @@ self: { ]; description = "Client instances for the 'servant-docs' package"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "servant-streaming-server" = callPackage @@ -227713,8 +227493,6 @@ self: { ]; description = "Server instances for the 'servant-streaming' package"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "servant-subscriber" = callPackage @@ -227741,8 +227519,6 @@ self: { executableHaskellDepends = [ base purescript-bridge ]; description = "When REST is not enough ..."; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "servant-swagger" = callPackage @@ -227771,8 +227547,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "Generate a Swagger/OpenAPI/OAS 2.0 specification for your servant API."; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "servant-swagger-tags" = callPackage @@ -227789,8 +227563,6 @@ self: { ]; description = "Swagger Tags for Servant"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "servant-swagger-ui" = callPackage @@ -227807,8 +227579,6 @@ self: { ]; description = "Servant swagger ui"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "servant-swagger-ui-core" = callPackage @@ -227829,8 +227599,6 @@ self: { ]; description = "Servant swagger ui core components"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "servant-swagger-ui-jensoleg" = callPackage @@ -227849,8 +227617,6 @@ self: { ]; description = "Servant swagger ui: Jens-Ole Graulund theme"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "servant-swagger-ui-redoc" = callPackage @@ -227869,8 +227635,6 @@ self: { ]; description = "Servant swagger ui: ReDoc theme"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "servant-to-elm" = callPackage @@ -227893,8 +227657,6 @@ self: { ]; description = "Automatically generate Elm clients for Servant APIs"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "servant-tracing" = callPackage @@ -227925,8 +227687,6 @@ self: { transformers ]; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "servant-waargonaut" = callPackage @@ -227951,8 +227711,6 @@ self: { ]; description = "Servant Integration for Waargonaut JSON Package"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "servant-wasm" = callPackage @@ -227971,8 +227729,6 @@ self: { ]; description = "Servant support for delivering WebAssembly"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "servant-websockets" = callPackage @@ -227995,8 +227751,6 @@ self: { ]; description = "Small library providing WebSocket endpoints for servant"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "servant-xml" = callPackage @@ -228012,8 +227766,6 @@ self: { ]; description = "Servant support for the XML Content-Type"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "servant-yaml" = callPackage @@ -228035,8 +227787,6 @@ self: { ]; description = "Servant support for yaml"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "servant-zeppelin" = callPackage @@ -228048,8 +227798,6 @@ self: { libraryHaskellDepends = [ base singletons ]; description = "Types and definitions of servant-zeppelin combinators"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "servant-zeppelin-client" = callPackage @@ -228073,8 +227821,6 @@ self: { ]; description = "Client library for servant-zeppelin combinators"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "servant-zeppelin-server" = callPackage @@ -228098,8 +227844,6 @@ self: { ]; description = "Server library for servant-zeppelin combinators"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "servant-zeppelin-swagger" = callPackage @@ -228121,8 +227865,6 @@ self: { ]; description = "Swagger instances for servant-zeppelin combinators"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "server-generic" = callPackage @@ -245167,8 +244909,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "Swagger 2.0 data model"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "swapper" = callPackage @@ -256380,8 +256120,6 @@ self: { ]; description = "tonatona plugin for servant"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "too-many-cells" = callPackage @@ -263368,8 +263106,6 @@ self: { ]; description = "Implementaation of unitym for Servant servers"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "unitym-yesod" = callPackage @@ -267676,8 +267412,6 @@ self: { ]; description = "Servant combinators for the versioning library"; license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "versions" = callPackage @@ -277887,8 +277621,6 @@ self: { servant-swagger-ui swagger2 text wai wai-extra warp yam-app yam-job ]; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "yam-transaction" = callPackage diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4fa36d3fa40f..258f4642d2ed 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12301,7 +12301,7 @@ in c-blosc = callPackage ../development/libraries/c-blosc { }; # justStaticExecutables is needed due to https://github.com/NixOS/nix/issues/2990 - cachix = haskell.lib.justStaticExecutables (haskell.lib.unmarkBroken haskell.packages.ghc883.cachix); + cachix = haskell.lib.justStaticExecutables haskellPackages.cachix; hercules-ci-agent = callPackage ../development/tools/continuous-integration/hercules-ci-agent { }; From 2bfa21205afc1cf75271b4bcf32bb209b6e19bff Mon Sep 17 00:00:00 2001 From: Andreas Rammhold Date: Sat, 21 Nov 2020 15:54:30 +0100 Subject: [PATCH 138/260] packet-sd: init at 0.0.3 This is currently being used as part of the NixOS.org infrastructure [1] and should probably be included here and not just "downstream" (in the nixops configs). [1] https://github.com/NixOS/nixos-org-configurations/blob/26105e7afac604d3e02f68e3985830dce21c405d/delft/prometheus/packet-sd.nix --- pkgs/development/tools/packet-sd/default.nix | 24 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 26 insertions(+) create mode 100644 pkgs/development/tools/packet-sd/default.nix diff --git a/pkgs/development/tools/packet-sd/default.nix b/pkgs/development/tools/packet-sd/default.nix new file mode 100644 index 000000000000..33d61eca718a --- /dev/null +++ b/pkgs/development/tools/packet-sd/default.nix @@ -0,0 +1,24 @@ +{ buildGoModule, fetchFromGitHub, lib }: +buildGoModule rec { + pname = "prometheus-packet-sd"; + version = "0.0.3"; + + src = fetchFromGitHub { + owner = "packethost"; + repo = "prometheus-packet-sd"; + rev = "v${version}"; + sha256 = "sha256-2k8AsmyhQNNZCzpVt6JdgvI8IFb5pRi4ic6Yn2NqHMM="; + }; + + vendorSha256 = null; + + subPackages = [ "." ]; + + meta = with lib; { + description = "Prometheus service discovery for Equinix Metal"; + homepage = "https://github.com/packethost/prometheus-packet-sd"; + license = licenses.asl20; + platforms = platforms.linux; + maintainers = [ maintainers.andir ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f9dfa61291ae..e73e0dd05b5e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22978,6 +22978,8 @@ julia_15 = callPackage ../development/compilers/julia/1.5.nix { packet = callPackage ../development/tools/packet { }; + packet-sd = callPackage ../development/tools/packet-sd { }; + packet-cli = callPackage ../development/tools/packet-cli { }; pb_cli = callPackage ../tools/misc/pb_cli {}; From de641a9dc4f8e49ea01bf702d5a267ae7a520d7d Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 21 Nov 2020 19:43:54 +0000 Subject: [PATCH 139/260] dua: 2.10.3 -> 2.10.5 --- pkgs/tools/misc/dua/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/dua/default.nix b/pkgs/tools/misc/dua/default.nix index 0fdd73ff552c..a2f3938adec1 100644 --- a/pkgs/tools/misc/dua/default.nix +++ b/pkgs/tools/misc/dua/default.nix @@ -2,13 +2,13 @@ rustPlatform.buildRustPackage rec { pname = "dua"; - version = "2.10.3"; + version = "2.10.5"; src = fetchFromGitHub { owner = "Byron"; repo = "dua-cli"; rev = "v${version}"; - sha256 = "0zzansnbry73h7b2i4rz4rxc86xiw037n7f3va5gkz0pfdfa9mzi"; + sha256 = "0imf9ngmyhyj5jdr99g1xc3vqzr61fnz32bxhmy63n1szylig5zq"; # Remove unicode file names which leads to different checksums on HFS+ # vs. other filesystems because of unicode normalisation. extraPostFetch = '' @@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec { ''; }; - cargoSha256 = "0wky0b9sv4hsj56s001m5gh16r8ms421l7h7xjh117fs87aaj42w"; + cargoSha256 = "1czc0jma5k6idv463kn5qrirq8apgfrcxwv2yjk0pxy6vkji6154"; doCheck = false; From 4904246f7dabd9d3847ba29aba5d28bc2e9e5b83 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 21 Nov 2020 20:04:18 +0000 Subject: [PATCH 140/260] emplace: 0.3.8 -> 0.3.9 --- pkgs/tools/package-management/emplace/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/package-management/emplace/default.nix b/pkgs/tools/package-management/emplace/default.nix index a214c327fe6f..b00155028651 100644 --- a/pkgs/tools/package-management/emplace/default.nix +++ b/pkgs/tools/package-management/emplace/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "emplace"; - version = "0.3.8"; + version = "0.3.9"; src = fetchFromGitHub { owner = "tversteeg"; repo = pname; rev = "v${version}"; - sha256 = "1g7xrsw0ji3nbrj1a2hywxwy7f33fgbvzp7k4l9ls2icg0xsw9a3"; + sha256 = "173nj6fx2l15shy7s4dngnfqsa10m7qwhi2ia2rr421l7b24ixqq"; }; - cargoSha256 = "1phr0k05dxwdhj1i71v8lr91qanjvp2zgi9wjpppzixpnpcsrbrb"; + cargoSha256 = "0bjw3fvc430b1jxla25clr75c94p2ms7d94j72d8mirxsiklgsp9"; meta = with lib; { description = "Mirror installed software on multiple machines"; From 0e5158fa9da6ebc4ad4d2872eb43b78b3bbaba6e Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Sat, 21 Nov 2020 21:29:11 +0100 Subject: [PATCH 141/260] pipewire: Fix screen sharing with Chromium (#104504) See https://gitlab.freedesktop.org/pipewire/pipewire/-/issues/270. E.g. Fedora and Arch have already backported that patch. This avoids errors like: Chromium: [E][module-protocol-native.c:562 on_remote_data()] protocol-native 0x33df5483c780: got connection error pipewire[1168]: [E][000002106.051912][module-protocol-native.c:305 connection_data()] protocol-native 0x1b96900: client 0x1d084f0 error -22 (Invalid argument) I've successfully tested screen sharing with Chromium 87.0.4280.66. cc https://github.com/NixOS/nixpkgs/issues/91218 --- pkgs/development/libraries/pipewire/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/libraries/pipewire/default.nix b/pkgs/development/libraries/pipewire/default.nix index 858f2f94db2a..c4b766b70930 100644 --- a/pkgs/development/libraries/pipewire/default.nix +++ b/pkgs/development/libraries/pipewire/default.nix @@ -65,6 +65,11 @@ stdenv.mkDerivation rec { ./alsa-profiles-use-libdir.patch # Move installed tests into their own output. ./installed-tests-path.patch + # Fix older clients (e.g. Chrome/Chromium): + (fetchpatch { # protocol-native: do version check on HELLO + url = "https://gitlab.freedesktop.org/pipewire/pipewire/-/commit/b8c7b36d3b8be16593f554964cf2f852c21b5c2c.patch"; + sha256 = "18461grisrgqbad6bfa1bm17mslddgfmjfprc9vjvab2mmpsjss9"; + }) ]; nativeBuildInputs = [ From edc784b9d532c475a0613a84b35b54fa67382aec Mon Sep 17 00:00:00 2001 From: Flakebi Date: Sat, 21 Nov 2020 21:44:05 +0100 Subject: [PATCH 142/260] salt: 3002.1 -> 3002.2 --- pkgs/tools/admin/salt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/admin/salt/default.nix b/pkgs/tools/admin/salt/default.nix index b66911c9325b..ad0cae6ecde6 100644 --- a/pkgs/tools/admin/salt/default.nix +++ b/pkgs/tools/admin/salt/default.nix @@ -7,11 +7,11 @@ }: python3.pkgs.buildPythonApplication rec { pname = "salt"; - version = "3002.1"; + version = "3002.2"; src = python3.pkgs.fetchPypi { inherit pname version; - sha256 = "0pp7qcfwsvg4419hzfka1180pw3saa9mrhl0z9951zn9fw2nllsc"; + sha256 = "vW0pYhzo4JlBJ3fNOWrzVHSqESuwmZtdqAQ4fYcpAHU="; }; propagatedBuildInputs = with python3.pkgs; [ From 783b1c491a6ccc54d11359dad189909415a35a0d Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 21 Nov 2020 20:50:42 +0000 Subject: [PATCH 143/260] flyctl: 0.0.149 -> 0.0.150 --- pkgs/development/web/flyctl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/web/flyctl/default.nix b/pkgs/development/web/flyctl/default.nix index 0ba7784ab2ff..9ac8a2cc2a31 100644 --- a/pkgs/development/web/flyctl/default.nix +++ b/pkgs/development/web/flyctl/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "flyctl"; - version = "0.0.149"; + version = "0.0.150"; src = fetchFromGitHub { owner = "superfly"; repo = "flyctl"; rev = "v${version}"; - sha256 = "0wscyakl415504yzqb93mysi2n4gqrbfzg20mdj316r9krqcbzpg"; + sha256 = "1wj3l32f9xpmqq91nzlxy8zgh1zkx4ckhc9r487agmv80bfjnzj2"; }; preBuild = '' From 1a15a0b02d9018fa2dc1d81203ef7356bb17bc78 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 21 Nov 2020 20:56:52 +0000 Subject: [PATCH 144/260] fmt: 7.0.3 -> 7.1.2 --- pkgs/development/libraries/fmt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/fmt/default.nix b/pkgs/development/libraries/fmt/default.nix index 3b2a061153f2..40922bae47b2 100644 --- a/pkgs/development/libraries/fmt/default.nix +++ b/pkgs/development/libraries/fmt/default.nix @@ -42,7 +42,7 @@ let in { fmt_7 = generic { - version = "7.0.3"; - sha256 = "17q2fdzakk5p0s3fx3724gs5k2b5ylp8f1d6j2m3wgvlfldx9k9a"; + version = "7.1.2"; + sha256 = "1ixwkqdbm01rcmqni15z4jj2rzhb3w7nlhkw2w4dzc4m101vr6yz"; }; } From e92d758368c334630c5b0138376d328f1f2b2d82 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Sun, 22 Nov 2020 07:52:49 +1000 Subject: [PATCH 145/260] youtube-dl: 2020.11.19 -> 2020.11.21.1 https://github.com/ytdl-org/youtube-dl/releases/tag/2020.11.21 https://github.com/ytdl-org/youtube-dl/releases/tag/2020.11.21.1 --- pkgs/tools/misc/youtube-dl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix index a2a316a575cf..c56862e5f09f 100644 --- a/pkgs/tools/misc/youtube-dl/default.nix +++ b/pkgs/tools/misc/youtube-dl/default.nix @@ -18,11 +18,11 @@ buildPythonPackage rec { # The websites youtube-dl deals with are a very moving target. That means that # downloads break constantly. Because of that, updates should always be backported # to the latest stable release. - version = "2020.11.19"; + version = "2020.11.21.1"; src = fetchurl { url = "https://yt-dl.org/downloads/${version}/${pname}-${version}.tar.gz"; - sha256 = "17my2k6ksj2gch2j85laa5y8c448j4n6zfg85ljfg3zxnag4vhgq"; + sha256 = "0a9livib328z5j3kfndxys2193dvfs4hh38krx0idg0k26xp7cfl"; }; nativeBuildInputs = [ installShellFiles makeWrapper ]; From 1276d49e9fbc27ea842f14c871d093e16c95d404 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 21 Nov 2020 21:57:14 +0000 Subject: [PATCH 146/260] frp: 0.34.2 -> 0.34.3 --- pkgs/tools/networking/frp/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/frp/default.nix b/pkgs/tools/networking/frp/default.nix index fd454c3d7763..7ba943e338d1 100644 --- a/pkgs/tools/networking/frp/default.nix +++ b/pkgs/tools/networking/frp/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "frp"; - version = "0.34.2"; + version = "0.34.3"; src = fetchFromGitHub { owner = "fatedier"; repo = pname; rev = "v${version}"; - sha256 = "0r7bp99kbp5nh5kqrxc4fb7pblpmcksbq67c6z922hvynpgnycj0"; + sha256 = "1c5337yv7m4ad1mr73a38lbxg6b7sk8pxqkzws01jxrry2jahb35"; }; - vendorSha256 = "18d9478ndzywwmh0jsxcb4i2rqyn3vzrgwflqrsv7krijalknsc9"; + vendorSha256 = "0srkvd1kvjabf3r391n6spv5n77r7dw4y982ynqsv5grp5f4zmm1"; doCheck = false; From 55da35fc61493c976f7a1807e3283cd0694ef9b8 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 21 Nov 2020 22:04:52 +0000 Subject: [PATCH 147/260] fselect: 0.7.1 -> 0.7.2 --- pkgs/tools/misc/fselect/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/fselect/default.nix b/pkgs/tools/misc/fselect/default.nix index 4c30dc4b785c..587483f4ac41 100644 --- a/pkgs/tools/misc/fselect/default.nix +++ b/pkgs/tools/misc/fselect/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "fselect"; - version = "0.7.1"; + version = "0.7.2"; src = fetchFromGitHub { owner = "jhspetersson"; repo = "fselect"; rev = version; - sha256 = "1q7y5agsi6wjb1dnyvdhm4qmdhpv30cx5a8m1blks8is9z2bblz0"; + sha256 = "1cqa52n5y6g087w4yzc273jpxhzpinwkqd32azg03dkczbgx5b2v"; }; - cargoSha256 = "0r2zj0dvf6h4ph3b75z2rdlqwzkdjrjj2iad4dbf9nsr63giwd9n"; + cargoSha256 = "00yhp2b74plrbi944apbxpkw2y6nbgf81sinfchw44ww1i58mfhj"; nativeBuildInputs = [ installShellFiles ]; From 080ad2b0c87fcdba9a9eb2bbbba8b2441391cb66 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 21 Nov 2020 22:10:54 +0000 Subject: [PATCH 148/260] ft2-clone: 1.40 -> 1.41_fix --- pkgs/applications/audio/ft2-clone/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/ft2-clone/default.nix b/pkgs/applications/audio/ft2-clone/default.nix index 05f24d84e353..24bc34089823 100644 --- a/pkgs/applications/audio/ft2-clone/default.nix +++ b/pkgs/applications/audio/ft2-clone/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "ft2-clone"; - version = "1.40"; + version = "1.41_fix"; src = fetchFromGitHub { owner = "8bitbubsy"; repo = "ft2-clone"; rev = "v${version}"; - sha256 = "0qc3hai6fhn4amk5ixmxx3yswsi25qpax0r9nvvnyhbcb6crqcs1"; + sha256 = "0c7jli79ckachl5n2rbhc4yzml8nc36pl9yzxcwgaz544q8pzmaa"; }; nativeBuildInputs = [ cmake ]; From e489a8bcfe974bf7ac19b33c953f9e644eba76fc Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 21 Nov 2020 22:43:54 +0000 Subject: [PATCH 149/260] goconst: 1.3.2 -> 1.4.0 --- pkgs/development/tools/goconst/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/goconst/default.nix b/pkgs/development/tools/goconst/default.nix index 50574923e49a..987a3285f8be 100644 --- a/pkgs/development/tools/goconst/default.nix +++ b/pkgs/development/tools/goconst/default.nix @@ -5,7 +5,7 @@ buildGoPackage rec { pname = "goconst"; - version = "1.3.2"; + version = "1.4.0"; goPackagePath = "github.com/jgautheron/goconst"; @@ -15,7 +15,7 @@ buildGoPackage rec { owner = "jgautheron"; repo = "goconst"; rev = version; - sha256 = "0bfiblp1498ic5jbdsm6mnc8s9drhasbqsw0asi6kmcz2kmslp9s"; + sha256 = "0jp9vg5l4wcvnf653h3d8ay2n7y717l9z34rls1vrsaf0qdf1r6v"; }; meta = with lib; { From fe4a7e365e4c220c74354989d7c70884c53f99ca Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 21 Nov 2020 23:02:44 +0000 Subject: [PATCH 150/260] gping: 0.1.6 -> 0.1.7 --- pkgs/tools/networking/gping/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/gping/default.nix b/pkgs/tools/networking/gping/default.nix index 76fdecf5e14c..56fe9b14687d 100644 --- a/pkgs/tools/networking/gping/default.nix +++ b/pkgs/tools/networking/gping/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "gping"; - version = "0.1.6"; + version = "0.1.7"; src = fetchFromGitHub { owner = "orf"; repo = "gping"; rev = "v${version}"; - sha256 = "1scwwrrj30ff9yr776gpn4jyl3lbrx2s2dv0pc8b1zj7mvwp3as2"; + sha256 = "0sdv6mf7mrgsdinv94mhai5jaw04s6r9cq0wxkph9b4hhywi0lys"; }; - cargoSha256 = "1dsfrl5cajl9nmzl6p43j7j50xn1z7dymqaz8kqs7zalj9zadm8k"; + cargoSha256 = "0rrqjlyn7k8f7ndzra16a9k4l6mjfim84lfi886q3irbn234b1va"; meta = with lib; { description = "Ping, but with a graph"; From 4e332057618f75e3e29ca1a8d495f4fe7e97c241 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 21 Nov 2020 23:08:48 +0000 Subject: [PATCH 151/260] gpx: 2.5.2 -> 2.6.7 --- pkgs/applications/misc/gpx/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/gpx/default.nix b/pkgs/applications/misc/gpx/default.nix index dcf022fc4453..70ff26784a86 100644 --- a/pkgs/applications/misc/gpx/default.nix +++ b/pkgs/applications/misc/gpx/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "gpx"; - version = "2.5.2"; + version = "2.6.7"; nativeBuildInputs = [ autoreconfHook ]; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { owner = "markwal"; repo = "GPX"; rev = version; - sha256 = "1yab269x8qyf7rd04vaxyqyjv4pzz9lp4sc4dwh927k23avr3rw5"; + sha256 = "1dl5vlsx05ipy10h18xigicb3k7m33sa9hfyd46hkpr2glx7jh4p"; }; meta = { From 73786c3f6c79547551344a562b3d243670f15617 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 21 Nov 2020 23:39:06 +0000 Subject: [PATCH 152/260] helmfile: 0.134.1 -> 0.135.0 --- pkgs/applications/networking/cluster/helmfile/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/helmfile/default.nix b/pkgs/applications/networking/cluster/helmfile/default.nix index fe68d90dd920..2516370430e3 100644 --- a/pkgs/applications/networking/cluster/helmfile/default.nix +++ b/pkgs/applications/networking/cluster/helmfile/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "helmfile"; - version = "0.134.1"; + version = "0.135.0"; src = fetchFromGitHub { owner = "roboll"; repo = "helmfile"; rev = "v${version}"; - sha256 = "14qlz6b4iddc5qxm4w4pvhkbzv60qzymn3bkyrpbx189b2yfvh6c"; + sha256 = "1ky9mh5n6n84g77ax1dn1cisgxjwyrhnapaikyj4q53zcbyai3ng"; }; - vendorSha256 = "0nk2f38qjmhy45pw9yz53acmsdy2fdxswqnasvbmfzrb85b0fnfq"; + vendorSha256 = "0dycngvk4nymcrkn6pn2q2h2zfvhc69m1zs2pspl58sa0mkakk2p"; doCheck = false; From 233e7d1a0f57a4f9bcbca0dc710b8357035a742e Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 21 Nov 2020 23:55:27 +0000 Subject: [PATCH 153/260] hstr: 2.2 -> 2.3 --- pkgs/applications/misc/hstr/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/hstr/default.nix b/pkgs/applications/misc/hstr/default.nix index 81f931b11f8e..421d02e97b91 100644 --- a/pkgs/applications/misc/hstr/default.nix +++ b/pkgs/applications/misc/hstr/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "hstr"; - version = "2.2"; + version = "2.3"; src = fetchFromGitHub { owner = "dvorka"; repo = "hstr"; rev = version; - sha256 = "07fkilqlkpygvf9kvxyvl58g3lfq0bwwdp3wczy4hk8qlbhmgihn"; + sha256 = "1chmfdi1dwg3sarzd01nqa82g65q7wdr6hrnj96l75vikwsg986y"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; From 9d98d8ae2e8d7d614d25416cad96249357a39949 Mon Sep 17 00:00:00 2001 From: Maxwell L-T Date: Sat, 21 Nov 2020 19:20:47 -0500 Subject: [PATCH 154/260] mullvad-vpn: 2020.6 -> 2020.7 --- pkgs/applications/networking/mullvad-vpn/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/mullvad-vpn/default.nix b/pkgs/applications/networking/mullvad-vpn/default.nix index da49ece4c68f..e6f5d6ac4ea2 100644 --- a/pkgs/applications/networking/mullvad-vpn/default.nix +++ b/pkgs/applications/networking/mullvad-vpn/default.nix @@ -41,11 +41,11 @@ in stdenv.mkDerivation rec { pname = "mullvad-vpn"; - version = "2020.6"; + version = "2020.7"; src = fetchurl { url = "https://www.mullvad.net/media/app/MullvadVPN-${version}_amd64.deb"; - sha256 = "0d9rv874avx86jppl1dky0nfq1633as0z8yz3h3f69nhmcbwhlr3"; + sha256 = "07vryz1nq8r4m5y9ry0d0v62ykz1cnnsv628x34yvwiyazbav4ri"; }; nativeBuildInputs = [ From f8c3027812718db56b0cbdad137881f44bc1264a Mon Sep 17 00:00:00 2001 From: Jack Kelly Date: Sat, 21 Nov 2020 10:53:32 +1000 Subject: [PATCH 155/260] openstack-metadata-fetcher: stop lying in log message --- nixos/modules/virtualisation/openstack-metadata-fetcher.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/virtualisation/openstack-metadata-fetcher.nix b/nixos/modules/virtualisation/openstack-metadata-fetcher.nix index b531787c31a2..b8f78efb98ab 100644 --- a/nixos/modules/virtualisation/openstack-metadata-fetcher.nix +++ b/nixos/modules/virtualisation/openstack-metadata-fetcher.nix @@ -3,7 +3,7 @@ metaDir=${targetRoot}etc/ec2-metadata mkdir -m 0755 -p "$metaDir" - echo "getting EC2 instance metadata..." + echo "getting instance metadata..." if ! [ -e "$metaDir/ami-manifest-path" ]; then wget ${wgetExtraOptions} -O "$metaDir/ami-manifest-path" http://169.254.169.254/1.0/meta-data/ami-manifest-path From 8c39655de3f0ae5adbbfb3b9c5be412c4c3801d6 Mon Sep 17 00:00:00 2001 From: Jack Kelly Date: Sat, 21 Nov 2020 11:40:38 +1000 Subject: [PATCH 156/260] {ec2,openstack}-metadata-fetcher: introduce wget_imds function --- .../modules/virtualisation/ec2-metadata-fetcher.nix | 12 ++++++++---- .../virtualisation/openstack-metadata-fetcher.nix | 12 ++++++++---- 2 files changed, 16 insertions(+), 8 deletions(-) diff --git a/nixos/modules/virtualisation/ec2-metadata-fetcher.nix b/nixos/modules/virtualisation/ec2-metadata-fetcher.nix index 812e93ec4aab..0b110d375a41 100644 --- a/nixos/modules/virtualisation/ec2-metadata-fetcher.nix +++ b/nixos/modules/virtualisation/ec2-metadata-fetcher.nix @@ -61,19 +61,23 @@ echo "getting EC2 instance metadata..." + wget_imds() { + wget ${wgetExtraOptions} --header "X-aws-ec2-metadata-token: $IMDS_TOKEN" "$@"; + } + if ! [ -e "$metaDir/ami-manifest-path" ]; then - wget ${wgetExtraOptions} --header "X-aws-ec2-metadata-token: $IMDS_TOKEN" -O "$metaDir/ami-manifest-path" http://169.254.169.254/1.0/meta-data/ami-manifest-path + wget_imds -O "$metaDir/ami-manifest-path" http://169.254.169.254/1.0/meta-data/ami-manifest-path fi if ! [ -e "$metaDir/user-data" ]; then - wget ${wgetExtraOptions} --header "X-aws-ec2-metadata-token: $IMDS_TOKEN" -O "$metaDir/user-data" http://169.254.169.254/1.0/user-data && chmod 600 "$metaDir/user-data" + wget_imds -O "$metaDir/user-data" http://169.254.169.254/1.0/user-data && chmod 600 "$metaDir/user-data" fi if ! [ -e "$metaDir/hostname" ]; then - wget ${wgetExtraOptions} --header "X-aws-ec2-metadata-token: $IMDS_TOKEN" -O "$metaDir/hostname" http://169.254.169.254/1.0/meta-data/hostname + wget_imds -O "$metaDir/hostname" http://169.254.169.254/1.0/meta-data/hostname fi if ! [ -e "$metaDir/public-keys-0-openssh-key" ]; then - wget ${wgetExtraOptions} --header "X-aws-ec2-metadata-token: $IMDS_TOKEN" -O "$metaDir/public-keys-0-openssh-key" http://169.254.169.254/1.0/meta-data/public-keys/0/openssh-key + wget_imds -O "$metaDir/public-keys-0-openssh-key" http://169.254.169.254/1.0/meta-data/public-keys/0/openssh-key fi '' diff --git a/nixos/modules/virtualisation/openstack-metadata-fetcher.nix b/nixos/modules/virtualisation/openstack-metadata-fetcher.nix index b8f78efb98ab..2aff8ccd2c26 100644 --- a/nixos/modules/virtualisation/openstack-metadata-fetcher.nix +++ b/nixos/modules/virtualisation/openstack-metadata-fetcher.nix @@ -5,19 +5,23 @@ echo "getting instance metadata..." + wget_imds() { + wget ${wgetExtraOptions} "$@" + } + if ! [ -e "$metaDir/ami-manifest-path" ]; then - wget ${wgetExtraOptions} -O "$metaDir/ami-manifest-path" http://169.254.169.254/1.0/meta-data/ami-manifest-path + wget_imds -O "$metaDir/ami-manifest-path" http://169.254.169.254/1.0/meta-data/ami-manifest-path fi if ! [ -e "$metaDir/user-data" ]; then - wget ${wgetExtraOptions} -O "$metaDir/user-data" http://169.254.169.254/1.0/user-data && chmod 600 "$metaDir/user-data" + wget_imds -O "$metaDir/user-data" http://169.254.169.254/1.0/user-data && chmod 600 "$metaDir/user-data" fi if ! [ -e "$metaDir/hostname" ]; then - wget ${wgetExtraOptions} -O "$metaDir/hostname" http://169.254.169.254/1.0/meta-data/hostname + wget_imds -O "$metaDir/hostname" http://169.254.169.254/1.0/meta-data/hostname fi if ! [ -e "$metaDir/public-keys-0-openssh-key" ]; then - wget ${wgetExtraOptions} -O "$metaDir/public-keys-0-openssh-key" http://169.254.169.254/1.0/meta-data/public-keys/0/openssh-key + wget_imds -O "$metaDir/public-keys-0-openssh-key" http://169.254.169.254/1.0/meta-data/public-keys/0/openssh-key fi '' From 43bfd7e5b1a70fe4be9b9c077eccb15fd50f6edc Mon Sep 17 00:00:00 2001 From: Jack Kelly Date: Sat, 21 Nov 2020 11:44:25 +1000 Subject: [PATCH 157/260] {ec2,openstack}-metadata-fetcher: unconditionally fetch metadata The metadata fetcher scripts run each time an instance starts, and it is not safe to assume that responses from the instance metadata service (IMDS) will be as they were on first boot. Example: an EC2 instance can have its user data changed while the instance is stopped. When the instance is restarted, we want to see the new user data applied. --- .../virtualisation/ec2-metadata-fetcher.nix | 24 +++++++------------ .../openstack-metadata-fetcher.nix | 24 +++++++------------ 2 files changed, 18 insertions(+), 30 deletions(-) diff --git a/nixos/modules/virtualisation/ec2-metadata-fetcher.nix b/nixos/modules/virtualisation/ec2-metadata-fetcher.nix index 0b110d375a41..dca5c2abd4e0 100644 --- a/nixos/modules/virtualisation/ec2-metadata-fetcher.nix +++ b/nixos/modules/virtualisation/ec2-metadata-fetcher.nix @@ -8,9 +8,14 @@ # Make sure that every package you depend on here is already listed as # a channel blocker for both the full-sized and small channels. # Otherwise, we risk breaking user deploys in released channels. +# +# Also note: OpenStack's metadata service for its instances aims to be +# compatible with the EC2 IMDS. Where possible, try to keep the set of +# fetched metadata in sync with ./openstack-metadata-fetcher.nix . '' metaDir=${targetRoot}etc/ec2-metadata mkdir -m 0755 -p "$metaDir" + rm -f "$metaDir/*" get_imds_token() { # retry-delay of 1 selected to give the system a second to get going, @@ -65,19 +70,8 @@ wget ${wgetExtraOptions} --header "X-aws-ec2-metadata-token: $IMDS_TOKEN" "$@"; } - if ! [ -e "$metaDir/ami-manifest-path" ]; then - wget_imds -O "$metaDir/ami-manifest-path" http://169.254.169.254/1.0/meta-data/ami-manifest-path - fi - - if ! [ -e "$metaDir/user-data" ]; then - wget_imds -O "$metaDir/user-data" http://169.254.169.254/1.0/user-data && chmod 600 "$metaDir/user-data" - fi - - if ! [ -e "$metaDir/hostname" ]; then - wget_imds -O "$metaDir/hostname" http://169.254.169.254/1.0/meta-data/hostname - fi - - if ! [ -e "$metaDir/public-keys-0-openssh-key" ]; then - wget_imds -O "$metaDir/public-keys-0-openssh-key" http://169.254.169.254/1.0/meta-data/public-keys/0/openssh-key - fi + wget_imds -O "$metaDir/ami-manifest-path" http://169.254.169.254/1.0/meta-data/ami-manifest-path + wget_imds -O "$metaDir/user-data" http://169.254.169.254/1.0/user-data && chmod 600 "$metaDir/user-data" + wget_imds -O "$metaDir/hostname" http://169.254.169.254/1.0/meta-data/hostname + wget_imds -O "$metaDir/public-keys-0-openssh-key" http://169.254.169.254/1.0/meta-data/public-keys/0/openssh-key '' diff --git a/nixos/modules/virtualisation/openstack-metadata-fetcher.nix b/nixos/modules/virtualisation/openstack-metadata-fetcher.nix index 2aff8ccd2c26..8c191397cf9a 100644 --- a/nixos/modules/virtualisation/openstack-metadata-fetcher.nix +++ b/nixos/modules/virtualisation/openstack-metadata-fetcher.nix @@ -1,7 +1,12 @@ { targetRoot, wgetExtraOptions }: + +# OpenStack's metadata service aims to be EC2-compatible. Where +# possible, try to keep the set of fetched metadata in sync with +# ./ec2-metadata-fetcher.nix . '' metaDir=${targetRoot}etc/ec2-metadata mkdir -m 0755 -p "$metaDir" + rm -f "$metaDir/*" echo "getting instance metadata..." @@ -9,19 +14,8 @@ wget ${wgetExtraOptions} "$@" } - if ! [ -e "$metaDir/ami-manifest-path" ]; then - wget_imds -O "$metaDir/ami-manifest-path" http://169.254.169.254/1.0/meta-data/ami-manifest-path - fi - - if ! [ -e "$metaDir/user-data" ]; then - wget_imds -O "$metaDir/user-data" http://169.254.169.254/1.0/user-data && chmod 600 "$metaDir/user-data" - fi - - if ! [ -e "$metaDir/hostname" ]; then - wget_imds -O "$metaDir/hostname" http://169.254.169.254/1.0/meta-data/hostname - fi - - if ! [ -e "$metaDir/public-keys-0-openssh-key" ]; then - wget_imds -O "$metaDir/public-keys-0-openssh-key" http://169.254.169.254/1.0/meta-data/public-keys/0/openssh-key - fi + wget_imds -O "$metaDir/ami-manifest-path" http://169.254.169.254/1.0/meta-data/ami-manifest-path + wget_imds -O "$metaDir/user-data" http://169.254.169.254/1.0/user-data && chmod 600 "$metaDir/user-data" + wget_imds -O "$metaDir/hostname" http://169.254.169.254/1.0/meta-data/hostname + wget_imds -O "$metaDir/public-keys-0-openssh-key" http://169.254.169.254/1.0/meta-data/public-keys/0/openssh-key '' From 2ab76856e4934fc75aa13139d64e9986f8f34d5f Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 22 Nov 2020 01:23:01 +0000 Subject: [PATCH 158/260] istioctl: 1.7.4 -> 1.7.5 --- pkgs/applications/networking/cluster/istioctl/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/istioctl/default.nix b/pkgs/applications/networking/cluster/istioctl/default.nix index 053035e629ea..19fc90ca9e46 100644 --- a/pkgs/applications/networking/cluster/istioctl/default.nix +++ b/pkgs/applications/networking/cluster/istioctl/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "istioctl"; - version = "1.7.4"; + version = "1.7.5"; src = fetchFromGitHub { owner = "istio"; repo = "istio"; rev = version; - sha256 = "1vy6y6gk7ljnrb7cxxaa60i4ycylsrd2yszbly1aaz5vnh1vsfz9"; + sha256 = "10h2ak3s74xb1rjvc6bc5yiyq2k8qbv07wxnshiqp5cnd6pjni0w"; }; - vendorSha256 = "0f2n8mwnj9i4qifs0f63jrgr61mjs3c1arxnny723i5pialj3zdl"; + vendorSha256 = "1xj77w2h7qg808v6ll8hm5nvnb2lwky789aikgxli2k6m0cy0c5k"; doCheck = false; From 5ee945ba3df146a4459594aff20c2bd2d2d3b908 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 21 Nov 2020 17:35:04 -0800 Subject: [PATCH 159/260] argocd: 1.7.8 -> 1.7.10 (#104505) --- pkgs/applications/networking/cluster/argocd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/argocd/default.nix b/pkgs/applications/networking/cluster/argocd/default.nix index 2f884970fc1a..981e555462a3 100644 --- a/pkgs/applications/networking/cluster/argocd/default.nix +++ b/pkgs/applications/networking/cluster/argocd/default.nix @@ -2,14 +2,14 @@ buildGoModule rec { pname = "argocd"; - version = "1.7.8"; + version = "1.7.10"; commit = "ef5010c3a0b5e027fd642732d03c5b0391b1e574"; src = fetchFromGitHub { owner = "argoproj"; repo = "argo-cd"; rev = "v${version}"; - sha256 = "1pwk6mzmlsx43c75wl5lglpxgc2jkgzra4443hwp6n0wfgzajfp4"; + sha256 = "1vkdny88lmxkm3iw8qv5rrl0g5xwi16hfm2f6dga8i8xl555m78c"; }; vendorSha256 = "0c5gykijwjrq3cx9qg9hm5j7axccngc1kp5qj3429a2ilw80l8pl"; From 634225b7befa19e7fbaee52fe7a4474921f345d7 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 21 Nov 2020 17:39:08 -0800 Subject: [PATCH 160/260] bazel-kazel: 0.1.2 -> 0.1.3 (#103850) --- pkgs/development/tools/bazel-kazel/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/bazel-kazel/default.nix b/pkgs/development/tools/bazel-kazel/default.nix index 516ad2a64a09..c8127256a612 100644 --- a/pkgs/development/tools/bazel-kazel/default.nix +++ b/pkgs/development/tools/bazel-kazel/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "bazel-kazel"; - version = "0.1.2"; + version = "0.1.3"; src = fetchFromGitHub { owner = "kubernetes"; repo = "repo-infra"; rev = "v${version}"; - sha256 = "1fn6ppyjgg3v80n9rc9712xms5yq3xkkd95zyd64l5gh9mshjn86"; + sha256 = "1mmla4j30ka368gsf4v8h23f32rsc4fpyrqswafw98x07xngmmqr"; }; vendorSha256 = "1pzkjh4n9ai8yqi98bkdhicjdr2l8j3fckl5n90c2gdcwqyxvgkf"; From 6fd871dec4dba27611e6eade68f1d160af837dda Mon Sep 17 00:00:00 2001 From: Jack Kelly Date: Sat, 21 Nov 2020 11:59:30 +1000 Subject: [PATCH 161/260] rl-21.03: describe EC2 instance user/meta data reloading --- nixos/doc/manual/release-notes/rl-2103.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/nixos/doc/manual/release-notes/rl-2103.xml b/nixos/doc/manual/release-notes/rl-2103.xml index 55c1229a164d..5bdc44365ed5 100644 --- a/nixos/doc/manual/release-notes/rl-2103.xml +++ b/nixos/doc/manual/release-notes/rl-2103.xml @@ -211,6 +211,22 @@ and slaptest is buggy with schemas directly in the config file. + + + Amazon EC2 and OpenStack Compute (nova) images now re-fetch instance meta data and user data from the instance + metadata service (IMDS) on each boot. For example: stopping an EC2 instance, changing its user data, and + restarting the instance will now cause it to fetch and apply the new user data. + + + + Specifically, /etc/ec2-metadata is re-populated on each boot. Some NixOS scripts that read + from this directory are guarded to only run if the files they want to manipulate do not already exist, and so + will not re-apply their changes if the IMDS response changes. Examples: root's SSH key is + only added if /root/.ssh/authorized_keys does not exist, and SSH host keys are only set from + user data if they do not exist in /etc/ssh. + + + From 23195511fdb2e501983cc6084aad411bf13d7f8b Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 22 Nov 2020 02:55:32 +0000 Subject: [PATCH 162/260] mackerel-agent: 0.69.3 -> 0.70.2 --- pkgs/servers/monitoring/mackerel-agent/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/monitoring/mackerel-agent/default.nix b/pkgs/servers/monitoring/mackerel-agent/default.nix index c5548fafd348..143db9e01b6c 100644 --- a/pkgs/servers/monitoring/mackerel-agent/default.nix +++ b/pkgs/servers/monitoring/mackerel-agent/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "mackerel-agent"; - version = "0.69.3"; + version = "0.70.2"; src = fetchFromGitHub { owner = "mackerelio"; repo = pname; rev = "v${version}"; - sha256 = "0jkvqqzk6wyjsdsmn2l2cdw8pjqzswlqb9p492czhgrfy065lrqp"; + sha256 = "1c0smbyzwc101v7akaj21r7w0jpf1xcbikf1ljfa8f515ql5hs9r"; }; nativeBuildInputs = [ makeWrapper ]; From 82ca111efba63590c65e23019db1c1a6bb7f4bbd Mon Sep 17 00:00:00 2001 From: Kira Bruneau Date: Fri, 20 Nov 2020 15:58:33 -0500 Subject: [PATCH 163/260] ccache: 3.7.12 -> 4.0 Additional changes: - Added myself as a maintainer - Generalized ccacheStdenv to allow overriding stdenv --- .../development/tools/misc/ccache/default.nix | 60 ++++++++++++++++--- .../misc/ccache/force-objdump-on-darwin.patch | 31 ++++++++++ pkgs/top-level/all-packages.nix | 27 +++++++-- 3 files changed, 103 insertions(+), 15 deletions(-) create mode 100644 pkgs/development/tools/misc/ccache/force-objdump-on-darwin.patch diff --git a/pkgs/development/tools/misc/ccache/default.nix b/pkgs/development/tools/misc/ccache/default.nix index d87de2e648ab..3d1c21c25baf 100644 --- a/pkgs/development/tools/misc/ccache/default.nix +++ b/pkgs/development/tools/misc/ccache/default.nix @@ -1,23 +1,64 @@ -{ stdenv, fetchFromGitHub, asciidoc-full, gperf, perl, autoreconfHook, zlib, makeWrapper }: +{ lib +, stdenv +, fetchFromGitHub +, fetchpatch +, substituteAll +, binutils +, asciidoc +, cmake +, perl +, zstd +, xcodebuild +, makeWrapper +}: let ccache = stdenv.mkDerivation rec { pname = "ccache"; - version = "3.7.12"; + version = "4.0"; src = fetchFromGitHub { - owner = "ccache"; - repo = "ccache"; + owner = pname; + repo = pname; rev = "v${version}"; - sha256 = "1xnv4g4n1jk1i98sa53k8w6q7hbwbw62svs30lssppysbrv8x3gz"; + sha256 = "1frcplrv61m2iwc6jwycpbcz1101xl6s4sh8p87prdj98l60lyrx"; }; - nativeBuildInputs = [ asciidoc-full autoreconfHook gperf perl ]; + # TODO: Remove patches from upstream in next release + patches = [ + # Fix badly named man page filename + (fetchpatch { + url = "https://github.com/ccache/ccache/commit/223e706fb24ce86eb0ad86079a97e6f345b9ef40.patch"; + sha256 = "1h7amp3ka45a79zwlxh8qnzx6n371gnfpfgijcqljps7skhl5gjg"; + }) + # Build and install man page by default + (fetchpatch { + url = "https://github.com/ccache/ccache/commit/294ff2face26448afa68e3ef7b68bf4898d6dc77.patch"; + sha256 = "0rx69qn41bgksc4m3p59nk5d6rz72rwnfska9mh5j62pzfm8axja"; + }) + # Fixes use of undeclared identifier 'CLONE_NOOWNERCOPY' on darwin + (fetchpatch { + url = "https://github.com/ccache/ccache/commit/411c010c3a5ee690cd42b23ffcf026ae009e2897.patch"; + sha256 = "062s424d0d0psp6wjhmfnfn1s5dsrz403hdid5drm6l2san0jhq0"; + }) + ] ++ lib.optional stdenv.isDarwin (substituteAll { + src = ./force-objdump-on-darwin.patch; + objdump = "${binutils.bintools}/bin/objdump"; + }); - buildInputs = [ zlib ]; + nativeBuildInputs = [ asciidoc cmake perl ]; + + buildInputs = [ zstd ]; outputs = [ "out" "man" ]; - doCheck = !stdenv.isDarwin; + doCheck = true; + checkInputs = lib.optional stdenv.isDarwin xcodebuild; + checkPhase = '' + export HOME=$(mktemp -d) + ctest --output-on-failure ${lib.optionalString stdenv.isDarwin '' + -E '^(test.nocpp2|test.modules)$' + ''} + ''; passthru = { # A derivation that provides gcc and g++ commands, but that @@ -63,9 +104,10 @@ let ccache = stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Compiler cache for fast recompilation of C/C++ code"; - homepage = "https://ccache.dev/"; + homepage = "https://ccache.dev"; downloadPage = "https://ccache.dev/download.html"; license = licenses.gpl3Plus; + maintainers = with maintainers; [ metadark r-burns ]; platforms = platforms.unix; }; }; diff --git a/pkgs/development/tools/misc/ccache/force-objdump-on-darwin.patch b/pkgs/development/tools/misc/ccache/force-objdump-on-darwin.patch new file mode 100644 index 000000000000..81a4f27ab736 --- /dev/null +++ b/pkgs/development/tools/misc/ccache/force-objdump-on-darwin.patch @@ -0,0 +1,31 @@ +diff --git a/test/run b/test/run +index 9623e49d..3df1c5a8 100755 +--- a/test/run ++++ b/test/run +@@ -126,23 +126,17 @@ file_size() { + objdump_cmd() { + local file="$1" + +- if $HOST_OS_APPLE; then +- xcrun dwarfdump -r 0 "$file" +- elif $HOST_OS_WINDOWS || $HOST_OS_CYGWIN; then ++ if $HOST_OS_WINDOWS || $HOST_OS_CYGWIN; then + # For some reason objdump only shows the basename of the file, so fall + # back to brute force and ignorance. + strings "$1" + else +- objdump -W "$file" ++ @objdump@ -W "$file" + fi + } + + objdump_grep_cmd() { +- if $HOST_OS_APPLE; then +- fgrep -q "\"$1\"" +- else +- fgrep -q ": $1" +- fi ++ fgrep -q ": $1" + } + + expect_stat() { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 45bff7bd1890..ad9d4c43f9c7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10972,7 +10972,9 @@ in cc-tool = callPackage ../development/tools/misc/cc-tool { }; - ccache = callPackage ../development/tools/misc/ccache { }; + ccache = callPackage ../development/tools/misc/ccache { + asciidoc = asciidoc-full; + }; # Wrapper that works as gcc or g++ # It can be used by setting in nixpkgs config like this, for example: @@ -10994,12 +10996,25 @@ in # }; # You can use a different directory, but whichever directory you choose # should be owned by user root, group nixbld with permissions 0770. - ccacheWrapper = makeOverridable ({ extraConfig ? "", cc ? stdenv.cc }: - cc.override { cc = ccache.links { + ccacheWrapper = makeOverridable ({ extraConfig, cc }: + cc.override { + cc = ccache.links { + inherit extraConfig; + unwrappedCC = cc.cc; + }; + }) { + extraConfig = ""; + inherit (stdenv) cc; + }; + + ccacheStdenv = lowPrio (makeOverridable ({ extraConfig, stdenv }: + overrideCC stdenv (buildPackages.ccacheWrapper.override { inherit extraConfig; - unwrappedCC = cc.cc; - }; }) {}; - ccacheStdenv = lowPrio (overrideCC stdenv buildPackages.ccacheWrapper); + inherit (stdenv) cc; + })) { + extraConfig = ""; + inherit stdenv; + }); cccc = callPackage ../development/tools/analysis/cccc { }; From 11e1f2ee791f3bdb2f02ad5251328ac9b33d3450 Mon Sep 17 00:00:00 2001 From: Kira Bruneau Date: Fri, 20 Nov 2020 16:51:36 -0500 Subject: [PATCH 164/260] baresip: removed ccache ccache build is disabled with CCACHE_DISABLE=1, so it's unnecessary --- .../networking/instant-messengers/baresip/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/baresip/default.nix b/pkgs/applications/networking/instant-messengers/baresip/default.nix index 37d8adceae1c..c3479d1ee698 100644 --- a/pkgs/applications/networking/instant-messengers/baresip/default.nix +++ b/pkgs/applications/networking/instant-messengers/baresip/default.nix @@ -1,6 +1,6 @@ {stdenv, fetchurl, zlib, openssl, libre, librem, pkgconfig, gst_all_1 , cairo, mpg123, alsaLib, SDL, libv4l, celt, libsndfile, srtp, ffmpeg_3 -, gsm, speex, portaudio, spandsp, libuuid, ccache, libvpx +, gsm, speex, portaudio, spandsp, libuuid, libvpx }: stdenv.mkDerivation rec { version = "0.6.5"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [zlib openssl libre librem cairo mpg123 alsaLib SDL libv4l celt libsndfile srtp ffmpeg_3 gsm speex portaudio spandsp libuuid - ccache libvpx + libvpx ] ++ (with gst_all_1; [ gstreamer gst-libav gst-plugins-base gst-plugins-bad gst-plugins-good ]); makeFlags = [ "LIBRE_MK=${libre}/share/re/re.mk" From 6495c439f693d8e29841ae33ba467542425d7af6 Mon Sep 17 00:00:00 2001 From: Kira Bruneau Date: Fri, 20 Nov 2020 16:57:19 -0500 Subject: [PATCH 165/260] webbrowser: removed ccache ccache just adds unnecessary overhead when building in a sandboxed environment --- .../networking/browsers/webbrowser/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/browsers/webbrowser/default.nix b/pkgs/applications/networking/browsers/webbrowser/default.nix index d10758170784..5190f1a7b534 100644 --- a/pkgs/applications/networking/browsers/webbrowser/default.nix +++ b/pkgs/applications/networking/browsers/webbrowser/default.nix @@ -1,6 +1,6 @@ { stdenv, lib, fetchgit, makeDesktopItem, pkgconfig, makeWrapper # Build -, python2, autoconf213, yasm, perl, ccache +, python2, autoconf213, yasm, perl , unzip, gnome2, gnum4 # Runtime @@ -41,7 +41,7 @@ in stdenv.mkDerivation rec { }; nativeBuildInputs = [ - gnum4 makeWrapper perl pkgconfig python2 ccache + gnum4 makeWrapper perl pkgconfig python2 ]; buildInputs = [ @@ -54,7 +54,6 @@ in stdenv.mkDerivation rec { configurePhase = '' export MOZCONFIG=$PWD/.mozconfig export MOZ_NOSPAM=1 - export HOME=$PWD # Needed by ccache cp $src/doc/mozconfig.example $MOZCONFIG # Need to modify it @@ -65,7 +64,8 @@ in stdenv.mkDerivation rec { --replace "mk_add_options AUTOCONF=/usr/bin/autoconf-2.13" "mk_add_options AUTOCONF=${autoconf213}/bin/autoconf" \ --replace 'mk_add_options MOZ_OBJDIR=$HOME/build/wbobjects/' "" \ --replace "ac_add_options --x-libraries=/usr/lib64" "ac_add_options --x-libraries=${lib.makeLibraryPath [ xorg.libX11 ]}" \ - --replace "_BUILD_64=1" "_BUILD_64=${lib.optionalString stdenv.hostPlatform.is64bit "1"}" + --replace "_BUILD_64=1" "_BUILD_64=${lib.optionalString stdenv.hostPlatform.is64bit "1"}" \ + --replace "--enable-ccache" "--disable-ccache" echo >> $MOZCONFIG ' # From c281582aebd8881891ee8b5014f8b0257a79e341 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 22 Nov 2020 03:36:17 +0000 Subject: [PATCH 166/260] minikube: 1.15.0 -> 1.15.1 --- pkgs/applications/networking/cluster/minikube/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/minikube/default.nix b/pkgs/applications/networking/cluster/minikube/default.nix index 6281d652d0c3..bd71f2f5c5ba 100644 --- a/pkgs/applications/networking/cluster/minikube/default.nix +++ b/pkgs/applications/networking/cluster/minikube/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { pname = "minikube"; - version = "1.15.0"; + version = "1.15.1"; vendorSha256 = "1xkk4f8qjqx5x878iniclni3jm2f7ka47va756vc3vk8p5s6vpdk"; @@ -21,7 +21,7 @@ buildGoModule rec { owner = "kubernetes"; repo = "minikube"; rev = "v${version}"; - sha256 = "1n1jhsa0lrfpqvl7m5il37l3f22ffgg4zv8g42xq24cgna951a1z"; + sha256 = "03knkc8z3vri73j1aa9ry6p1rxql3d75kphd429x5am856mpnn6g"; }; nativeBuildInputs = [ go-bindata installShellFiles pkg-config which ]; From 888b9587edc4dca6c45a1c58e3aa8806bed4e62c Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sun, 22 Nov 2020 04:20:00 +0000 Subject: [PATCH 167/260] haskellPackages.ghc8102: add patch to allow Block.h compile with c++ compilers --- pkgs/development/compilers/ghc/8.10.2.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/development/compilers/ghc/8.10.2.nix b/pkgs/development/compilers/ghc/8.10.2.nix index 41aa5e16ba14..fac12099d5db 100644 --- a/pkgs/development/compilers/ghc/8.10.2.nix +++ b/pkgs/development/compilers/ghc/8.10.2.nix @@ -2,7 +2,7 @@ # build-tools , bootPkgs -, autoconf, automake, coreutils, fetchurl, perl, python3, m4, sphinx +, autoconf, automake, coreutils, fetchpatch, fetchurl, perl, python3, m4, sphinx , bash , libiconv ? null, ncurses @@ -110,6 +110,12 @@ stdenv.mkDerivation (rec { # https://gitlab.haskell.org/ghc/ghc/-/issues/18549 patches = [ ./issue-18549.patch + ] ++ stdenv.lib.optionals stdenv.isDarwin [ + # Make Block.h compile with c++ compilers. Remove with the next release + (fetchpatch { + url = "https://gitlab.haskell.org/ghc/ghc/-/commit/97d0b0a367e4c6a52a17c3299439ac7de129da24.patch"; + sha256 = "0r4zjj0bv1x1m2dgxp3adsf2xkr94fjnyj1igsivd9ilbs5ja0b5"; + }) ]; postPatch = "patchShebangs ."; From c9d1aefbabbed970371322ef91d813a00aeee616 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 22 Nov 2020 04:22:31 +0000 Subject: [PATCH 168/260] mtprotoproxy: 1.0.9 -> 1.1.0 --- pkgs/servers/mtprotoproxy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/mtprotoproxy/default.nix b/pkgs/servers/mtprotoproxy/default.nix index 9faa7ec56bf2..e8782050eeea 100644 --- a/pkgs/servers/mtprotoproxy/default.nix +++ b/pkgs/servers/mtprotoproxy/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "mtprotoproxy"; - version = "1.0.9"; + version = "1.1.0"; src = fetchFromGitHub { owner = "alexbers"; repo = "mtprotoproxy"; rev = "v${version}"; - sha256 = "16f9hzh4h41qb5962lxx04653ncar83znh872g2qh564b6f922z2"; + sha256 = "15svvramxzl8q8xzs8g62gg8czdn46fjy6jhs5hqf5p83ycxsygz"; }; nativeBuildInputs = [ wrapPython ]; From 4555075d9ded3056e1e797e862e8951e562f1751 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 22 Nov 2020 04:46:27 +0000 Subject: [PATCH 169/260] nfdump: 1.6.21 -> 1.6.22 --- pkgs/tools/networking/nfdump/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/nfdump/default.nix b/pkgs/tools/networking/nfdump/default.nix index 11ba442393dd..0c9bc41099f2 100644 --- a/pkgs/tools/networking/nfdump/default.nix +++ b/pkgs/tools/networking/nfdump/default.nix @@ -2,7 +2,7 @@ , autoconf, automake, libtool, pkg-config , bzip2, libpcap, flex, yacc }: -let version = "1.6.21"; in +let version = "1.6.22"; in stdenv.mkDerivation { pname = "nfdump"; @@ -12,7 +12,7 @@ stdenv.mkDerivation { owner = "phaag"; repo = "nfdump"; rev = "v${version}"; - sha256 = "1ifxnpyzyn8nd6n44pjcw0rwck392nzj1gwa4zzqvvgzj477m6ha"; + sha256 = "14x2k85ard1kp99hhd90zsmvyw24g03m84rn13gb4grm9gjggzrj"; }; nativeBuildInputs = [ autoconf automake flex libtool pkg-config yacc ]; From 69dfe8d67a962a38c358f053f993a6539a23d3bf Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 22 Nov 2020 06:23:37 +0000 Subject: [PATCH 170/260] openlibm: 0.7.2 -> 0.7.3 --- pkgs/development/libraries/science/math/openlibm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/science/math/openlibm/default.nix b/pkgs/development/libraries/science/math/openlibm/default.nix index 3553833443f7..8c3b03bd7c67 100644 --- a/pkgs/development/libraries/science/math/openlibm/default.nix +++ b/pkgs/development/libraries/science/math/openlibm/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "openlibm"; - version = "0.7.2"; + version = "0.7.3"; src = fetchurl { url = "https://github.com/JuliaLang/openlibm/archive/v${version}.tar.gz"; - sha256 = "09fl7ij0p0js2sydjvmm9k4d0c83iwpb2sad9d9hin8sjdfyp4vp"; + sha256 = "0m3khv7qidhfly634bf5w0ci5qnvndmihc4a836a0cy047pw9g6k"; }; makeFlags = [ "prefix=$(out)" ]; From 5eb3722b8b5492050b8b51fb154abc4f96cbc34f Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sun, 15 Nov 2020 06:04:36 +0100 Subject: [PATCH 171/260] ocamlPackages.tsort: use Dune 2 --- pkgs/development/ocaml-modules/tsort/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/ocaml-modules/tsort/default.nix b/pkgs/development/ocaml-modules/tsort/default.nix index d47236ba96b8..fdfe7a650e55 100644 --- a/pkgs/development/ocaml-modules/tsort/default.nix +++ b/pkgs/development/ocaml-modules/tsort/default.nix @@ -2,6 +2,7 @@ buildDunePackage rec { pname = "tsort"; + useDune2 = true; version = "2.0.0"; src = fetchFromGitHub { owner = "dmbaturin"; From e286f0cf3bcffd5c0f006bb1831563d63b281fb2 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sun, 15 Nov 2020 06:04:44 +0100 Subject: [PATCH 172/260] =?UTF-8?q?ocamlPackages.containers:=203.0=20?= =?UTF-8?q?=E2=86=92=203.0.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/ocaml-modules/containers/data.nix | 4 +++- pkgs/development/ocaml-modules/containers/default.nix | 8 ++++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/pkgs/development/ocaml-modules/containers/data.nix b/pkgs/development/ocaml-modules/containers/data.nix index 9cbaabd9cf1e..3694a7b2941b 100644 --- a/pkgs/development/ocaml-modules/containers/data.nix +++ b/pkgs/development/ocaml-modules/containers/data.nix @@ -1,12 +1,14 @@ { buildDunePackage, containers +, dune-configurator , gen, iter, qcheck }: buildDunePackage { pname = "containers-data"; - inherit (containers) src version; + inherit (containers) src version useDune2; + buildInputs = [ dune-configurator ]; doCheck = true; checkInputs = [ gen iter qcheck ]; diff --git a/pkgs/development/ocaml-modules/containers/default.nix b/pkgs/development/ocaml-modules/containers/default.nix index 970122dd79f3..c3847acb9594 100644 --- a/pkgs/development/ocaml-modules/containers/default.nix +++ b/pkgs/development/ocaml-modules/containers/default.nix @@ -1,19 +1,23 @@ { lib, fetchFromGitHub, buildDunePackage, ocaml +, dune-configurator , seq , gen, iter, ounit, qcheck, uutf }: buildDunePackage rec { - version = "3.0"; + version = "3.0.1"; pname = "containers"; + useDune2 = true; + src = fetchFromGitHub { owner = "c-cube"; repo = "ocaml-containers"; rev = "v${version}"; - sha256 = "0c75d5csgc68qqbsdz4279nlin111zrjbg4d47k32ska28myvpqn"; + sha256 = "1m19cfcwks3xcj16nqldfb49dg0vdc7by1q1j8bpac3z2mjvks0l"; }; + buildInputs = [ dune-configurator ]; propagatedBuildInputs = [ seq ]; checkInputs = [ gen iter ounit qcheck uutf ]; From f663f258c6c4a77d8c9422bf9beef4daa5dc61b7 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 22 Nov 2020 07:54:18 +0000 Subject: [PATCH 173/260] pistol: 0.1.7 -> 0.1.8 --- pkgs/tools/misc/pistol/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/pistol/default.nix b/pkgs/tools/misc/pistol/default.nix index d5061d61f57b..fa3a9d01f312 100644 --- a/pkgs/tools/misc/pistol/default.nix +++ b/pkgs/tools/misc/pistol/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "pistol"; - version = "0.1.7"; + version = "0.1.8"; src = fetchFromGitHub { owner = "doronbehar"; repo = pname; rev = "v${version}"; - sha256 = "0kspix7ac4fb0gblrlhnf8hi2ijc997qqkhmy47jibmj6120lmqk"; + sha256 = "00vpl43m0zw6vqw8yjkaa7dnis9g169jfb48g2mr0hgyhsjr7jbj"; }; - vendorSha256 = "08fjavadx5mwibzc130mlhp4zph6iwv15xnd4rsniw6zldkzmczy"; + vendorSha256 = "1rkyvcyrjnrgd3b05gjd4sv95j1b99q641f3n36kgf3sc3hp31ws"; doCheck = false; From 0f6a111e36843882236a22a0a74e046e5ab1970d Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 22 Nov 2020 08:14:42 +0000 Subject: [PATCH 174/260] powershell: 7.0.3 -> 7.1.0 --- pkgs/shells/powershell/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/shells/powershell/default.nix b/pkgs/shells/powershell/default.nix index 3d412a30afb2..d776e64fa49d 100644 --- a/pkgs/shells/powershell/default.nix +++ b/pkgs/shells/powershell/default.nix @@ -5,7 +5,7 @@ let platformString = if stdenv.isDarwin then "osx" else if stdenv.isLinux then "linux" else throw "unsupported platform"; platformSha = if stdenv.isDarwin then "0zv02h3njphrs8kgmicy7w40mmhmigdfl38f2dpwrs6z67f8vrm2" - else if stdenv.isLinux then "1zgdah397az0n3db6132h4bql0xzri7j98q5wg3s57sp4irlwx9w" + else if stdenv.isLinux then "0dka2q8ijg3ryzwmxapf8aq55d0sgaj6jj0rzj2738in9g4w2hbh" else throw "unsupported platform"; platformLdLibraryPath = if stdenv.isDarwin then "DYLD_FALLBACK_LIBRARY_PATH" else if stdenv.isLinux then "LD_LIBRARY_PATH" @@ -15,7 +15,7 @@ let platformString = if stdenv.isDarwin then "osx" in stdenv.mkDerivation rec { pname = "powershell"; - version = "7.0.3"; + version = "7.1.0"; src = fetchzip { url = "https://github.com/PowerShell/PowerShell/releases/download/v${version}/powershell-${version}-${platformString}-x64.tar.gz"; From 4d9367330e0c1c2278c3171a9b28efe1424d03bc Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 22 Nov 2020 09:06:19 +0000 Subject: [PATCH 175/260] ptcollab: 0.3.5 -> 0.3.5.1 --- pkgs/applications/audio/ptcollab/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/ptcollab/default.nix b/pkgs/applications/audio/ptcollab/default.nix index da4db5f159a5..ff190fdcdd36 100644 --- a/pkgs/applications/audio/ptcollab/default.nix +++ b/pkgs/applications/audio/ptcollab/default.nix @@ -9,13 +9,13 @@ mkDerivation rec { pname = "ptcollab"; - version = "0.3.5"; + version = "0.3.5.1"; src = fetchFromGitHub { owner = "yuxshao"; repo = "ptcollab"; rev = "v${version}"; - sha256 = "0mgn7lkpgj72hsybnnj0kpfyls4aha1qvv4nhdyclqdfbb6mldxg"; + sha256 = "1ahfxjm1chz8k65rs7rgn4s2bgippq58fjcxl8fr21pzn718wqf1"; }; nativeBuildInputs = [ qmake ]; From d7a8da0e46dc870d0a6d839831a0f31fd1908cae Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 22 Nov 2020 09:31:01 +0000 Subject: [PATCH 176/260] qogir-theme: 2020-02-26 -> 2020-11-16 --- pkgs/data/themes/qogir/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/themes/qogir/default.nix b/pkgs/data/themes/qogir/default.nix index 23afcf5ece22..44bb220d404d 100644 --- a/pkgs/data/themes/qogir/default.nix +++ b/pkgs/data/themes/qogir/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "qogir-theme"; - version = "2020-02-26"; + version = "2020-11-16"; src = fetchFromGitHub { owner = "vinceliuice"; repo = pname; rev = version; - sha256 = "1s14knj0ral5a62ymwbg5k5g94v8cq0acq0kyam8ay0rfi7wycdm"; + sha256 = "0qp65py1p93f5bxbf0jgc1d2lwrjhb7d0vzkivm73haji197l9p5"; }; buildInputs = [ gdk-pixbuf librsvg ]; From 6a7992fbc844613cbc0138dba864399e457560af Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Fri, 20 Nov 2020 12:36:11 +0100 Subject: [PATCH 177/260] ocamlPackages.mirage-clock: 3.0.1 -> 3.1.0 --- pkgs/development/ocaml-modules/mirage-clock/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/ocaml-modules/mirage-clock/default.nix b/pkgs/development/ocaml-modules/mirage-clock/default.nix index c5f0b1fc93c1..77d6b4ef7788 100644 --- a/pkgs/development/ocaml-modules/mirage-clock/default.nix +++ b/pkgs/development/ocaml-modules/mirage-clock/default.nix @@ -2,11 +2,11 @@ buildDunePackage rec { pname = "mirage-clock"; - version = "3.0.1"; + version = "3.1.0"; src = fetchurl { url = "https://github.com/mirage/mirage-clock/releases/download/v${version}/mirage-clock-v${version}.tbz"; - sha256 = "12m2dph69r843clrbcgfjj2gcxmq2kdb7g5d91kfj16g13b0vsa3"; + sha256 = "0cqa07aqkamw0dvis1fl46brvk81zvb92iy5076ik62gv9n5a0mn"; }; meta = { From 1c7ce1827b8387023c76af3965768a7e19dfe071 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 22 Nov 2020 11:02:06 +0000 Subject: [PATCH 178/260] sd-local: 1.0.12 -> 1.0.13 --- pkgs/development/tools/sd-local/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/sd-local/default.nix b/pkgs/development/tools/sd-local/default.nix index 54200c157153..b3dbd91c0ccb 100644 --- a/pkgs/development/tools/sd-local/default.nix +++ b/pkgs/development/tools/sd-local/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "sd-local"; - version = "1.0.12"; + version = "1.0.13"; src = fetchFromGitHub { owner = "screwdriver-cd"; repo = pname; rev = "v${version}"; - sha256 = "1amj5qsnxf6ya2l5rigjia5qis8i7q0qnd9ci74r721nj95m9jvr"; + sha256 = "1pgzxy9l1zh2qwq20ycqlxp9yj1mfchwc9179zd2v13rlraa8yph"; }; vendorSha256 = "1y4nyw7rpgipblxqaps2zsd07cin8d0i0g9gvsnc3vifi6g29s8z"; From c72d3b9afbf4af0785dd6ee970ebe51e9d0b39d2 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 22 Nov 2020 12:12:13 +0000 Subject: [PATCH 179/260] stripe-cli: 1.5.4 -> 1.5.5 --- pkgs/tools/admin/stripe-cli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/admin/stripe-cli/default.nix b/pkgs/tools/admin/stripe-cli/default.nix index 51f6499f8e36..f675e7518f58 100644 --- a/pkgs/tools/admin/stripe-cli/default.nix +++ b/pkgs/tools/admin/stripe-cli/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "stripe-cli"; - version = "1.5.4"; + version = "1.5.5"; src = fetchFromGitHub { owner = "stripe"; repo = pname; rev = "v${version}"; - sha256 = "1gb9xk40drj7z6sw6a2hva4kvim508q4f3cfjpmr7yjzspqy32p0"; + sha256 = "0r0szzw3xl9cn5vcqgn6sc4wbk2j17r1rhg14qgix835lzp9wpdv"; }; vendorSha256 = "05cyn9cgmijj6dl075slwm5qc6fj6m5sm414wqm50xz2fjs0400r"; From ffeb2af9209b25c367fd39a7f693188e3715e51b Mon Sep 17 00:00:00 2001 From: snicket2100 <57048005+snicket2100@users.noreply.github.com> Date: Sat, 21 Nov 2020 13:16:51 +0100 Subject: [PATCH 180/260] firejail: fixing the 'xdg-dbus-proxy' dependency xdg-dbus-proxy path is hardcoded in the common.h file in the firejail source code. if this binary is not found, dbus filtering capabilities of firejail get limited i.e. you can only entirely disable or entirely enable dbus communication. --- pkgs/os-specific/linux/firejail/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/firejail/default.nix b/pkgs/os-specific/linux/firejail/default.nix index 497314a6d44a..fadf5df7140a 100644 --- a/pkgs/os-specific/linux/firejail/default.nix +++ b/pkgs/os-specific/linux/firejail/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, fetchpatch, which, nixosTests}: +{stdenv, fetchurl, fetchpatch, which, xdg-dbus-proxy, nixosTests}: let s = # Generated upstream information rec { @@ -25,6 +25,10 @@ stdenv.mkDerivation { substituteInPlace etc/firejail.config --replace \ '# follow-symlink-as-user yes' \ 'follow-symlink-as-user no' + + # Fix the path to 'xdg-dbus-proxy' hardcoded in the 'common.h' file + substituteInPlace src/include/common.h \ + --replace '/usr/bin/xdg-dbus-proxy' '${xdg-dbus-proxy}/bin/xdg-dbus-proxy' ''; preConfigure = '' From 938335142e1157514098662c92689771f20cf711 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Fri, 20 Nov 2020 15:05:19 +0800 Subject: [PATCH 181/260] nodePackages.poor-mans-t-sql-formatter-cli: init at 1.6.10 --- .../node-packages/node-packages.json | 1 + .../node-packages/node-packages.nix | 55 +++++++++++++++++++ 2 files changed, 56 insertions(+) diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json index 0216222136e3..045418f787ce 100644 --- a/pkgs/development/node-packages/node-packages.json +++ b/pkgs/development/node-packages/node-packages.json @@ -156,6 +156,7 @@ , "peerflix-server" , "pm2" , "pnpm" +, "poor-mans-t-sql-formatter-cli" , "postcss-cli" , "prettier" , "pscid" diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index 3782f5e8f5f4..5c9621809c99 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -22453,6 +22453,15 @@ let sha512 = "/aMOAYEFXDdjG0wytpTL5YQLfZnnTmLNjn+AIrJ/6HVnTfDqLsVKUUwkDf4I4kgex36BvjuXEn/TX9B/1ESyqQ=="; }; }; + "file-or-stdin-1.0.2" = { + name = "file-or-stdin"; + packageName = "file-or-stdin"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/file-or-stdin/-/file-or-stdin-1.0.2.tgz"; + sha1 = "48d578b93b8a8cc9c163d950cc9636e3fc8acc1c"; + }; + }; "file-size-0.0.5" = { name = "file-size"; packageName = "file-size"; @@ -27702,6 +27711,15 @@ let sha512 = "LgjHkRl9W6bj2n+kWrAOgvCYPTYt+LanE4rtd/vKNq6yEb+SvVV7UTLzoSPpDX6/U1cAz7VfqPr+lPAIz7wHaQ=="; }; }; + "inspect-with-kind-1.0.5" = { + name = "inspect-with-kind"; + packageName = "inspect-with-kind"; + version = "1.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/inspect-with-kind/-/inspect-with-kind-1.0.5.tgz"; + sha512 = "MAQUJuIo7Xqk8EVNP+6d3CKq9c80hi4tjIbIAT6lmGW9W6WzlHiu9PS8uSuUYU+Do+j1baiFp3H25XEVxDIG2g=="; + }; + }; "int53-1.0.0" = { name = "int53"; packageName = "int53"; @@ -41593,6 +41611,15 @@ let sha512 = "b4OViUOihwV0icb9PHmWbR+vPqaSzSAEbgLskvb7ANPATVXGiYv/TQFHQo65S53WU9i5EQ1I03YDOJW7K0bmYg=="; }; }; + "poor-mans-t-sql-formatter-1.6.10" = { + name = "poor-mans-t-sql-formatter"; + packageName = "poor-mans-t-sql-formatter"; + version = "1.6.10"; + src = fetchurl { + url = "https://registry.npmjs.org/poor-mans-t-sql-formatter/-/poor-mans-t-sql-formatter-1.6.10.tgz"; + sha1 = "a93683ba41dc82fffccccb1c859ae40921f98229"; + }; + }; "portfinder-1.0.28" = { name = "portfinder"; packageName = "portfinder"; @@ -91385,6 +91412,34 @@ in bypassCache = true; reconstructLock = true; }; + poor-mans-t-sql-formatter-cli = nodeEnv.buildNodePackage { + name = "poor-mans-t-sql-formatter-cli"; + packageName = "poor-mans-t-sql-formatter-cli"; + version = "1.6.10"; + src = fetchurl { + url = "https://registry.npmjs.org/poor-mans-t-sql-formatter-cli/-/poor-mans-t-sql-formatter-cli-1.6.10.tgz"; + sha1 = "472f6172a1e969a6793ea6fd5ad698b448946d77"; + }; + dependencies = [ + sources."commander-2.11.0" + sources."file-or-stdin-1.0.2" + sources."get-stdin-5.0.1" + sources."graceful-fs-4.2.4" + sources."inspect-with-kind-1.0.5" + sources."kind-of-6.0.3" + sources."poor-mans-t-sql-formatter-1.6.10" + sources."strip-bom-3.0.0" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "A T-SQL formatting utility in JS, transpiled from the C# library of the same name."; + homepage = "https://github.com/TaoK/poor-mans-t-sql-formatter-npm-cli#readme"; + license = "AGPL-3.0"; + }; + production = true; + bypassCache = true; + reconstructLock = true; + }; postcss-cli = nodeEnv.buildNodePackage { name = "postcss-cli"; packageName = "postcss-cli"; From 31cf796be6026d5abe83d2431483fa553715986a Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Fri, 6 Nov 2020 22:19:57 +0800 Subject: [PATCH 182/260] openvpn: 2.4.9 -> 2.5.0 --- pkgs/tools/networking/openvpn/default.nix | 118 +++++++++++++--------- pkgs/top-level/all-packages.nix | 4 +- 2 files changed, 76 insertions(+), 46 deletions(-) diff --git a/pkgs/tools/networking/openvpn/default.nix b/pkgs/tools/networking/openvpn/default.nix index c5a15c2f87a8..1df6260a09c7 100644 --- a/pkgs/tools/networking/openvpn/default.nix +++ b/pkgs/tools/networking/openvpn/default.nix @@ -1,14 +1,23 @@ -{ stdenv, fetchurl, fetchpatch, pkgconfig, makeWrapper -, iproute, lzo, openssl, pam -, useSystemd ? stdenv.isLinux, systemd ? null, utillinux ? null -, pkcs11Support ? false, pkcs11helper ? null, +{ stdenv +, fetchurl +, pkg-config +, makeWrapper +, runtimeShell +, iproute ? null +, lzo +, openssl +, pam +, useSystemd ? stdenv.isLinux +, systemd ? null +, utillinux ? null +, pkcs11Support ? false +, pkcs11helper ? null }: assert useSystemd -> (systemd != null); assert pkcs11Support -> (pkcs11helper != null); with stdenv.lib; - let # Check if the script needs to have other binaries wrapped when changing this. update-resolved = fetchurl { @@ -16,49 +25,68 @@ let sha256 = "021qzv1k0zxgv1rmyfpqj3zlzqr28xa7zff1n7vrbjk36ijylpsc"; }; -in stdenv.mkDerivation rec { - pname = "openvpn"; - version = "2.4.9"; + generic = { version, sha256 }: + let + withIpRoute = stdenv.isLinux && (versionOlder version "2.5"); + in + stdenv.mkDerivation + rec { + pname = "openvpn"; + inherit version; - src = fetchurl { - url = "https://swupdate.openvpn.net/community/releases/${pname}-${version}.tar.xz"; + src = fetchurl { + url = "https://swupdate.openvpn.net/community/releases/${pname}-${version}.tar.xz"; + inherit sha256; + }; + + nativeBuildInputs = [ makeWrapper pkg-config ]; + + buildInputs = [ lzo openssl ] + ++ optional stdenv.isLinux pam + ++ optional withIpRoute iproute + ++ optional useSystemd systemd + ++ optional pkcs11Support pkcs11helper; + + configureFlags = optionals withIpRoute [ + "--enable-iproute2" + "IPROUTE=${iproute}/sbin/ip" + ] + ++ optional useSystemd "--enable-systemd" + ++ optional pkcs11Support "--enable-pkcs11" + ++ optional stdenv.isDarwin "--disable-plugin-auth-pam"; + + postInstall = '' + mkdir -p $out/share/doc/openvpn/examples + cp -r sample/sample-config-files/ $out/share/doc/openvpn/examples + cp -r sample/sample-keys/ $out/share/doc/openvpn/examples + cp -r sample/sample-scripts/ $out/share/doc/openvpn/examples + '' + optionalString useSystemd '' + install -Dm555 ${update-resolved} $out/libexec/update-systemd-resolved + wrapProgram $out/libexec/update-systemd-resolved \ + --prefix PATH : ${makeBinPath [ runtimeShell iproute systemd utillinux ]} + ''; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + description = "A robust and highly flexible tunneling application"; + downloadPage = "https://openvpn.net/community-downloads/"; + homepage = "https://openvpn.net/"; + license = licenses.gpl2; + maintainers = with maintainers; [ viric peterhoeg ]; + platforms = platforms.unix; + }; + }; + +in +{ + openvpn_24 = generic { + version = "2.4.9"; sha256 = "1qpbllwlha7cffsd5dlddb8rl22g9rar5zflkz1wrcllhvfkl7v4"; }; - nativeBuildInputs = [ makeWrapper pkgconfig ]; - - buildInputs = [ lzo openssl ] - ++ optionals stdenv.isLinux [ pam iproute ] - ++ optional useSystemd systemd - ++ optional pkcs11Support pkcs11helper; - - configureFlags = optionals stdenv.isLinux [ - "--enable-iproute2" - "IPROUTE=${iproute}/sbin/ip" ] - ++ optional useSystemd "--enable-systemd" - ++ optional pkcs11Support "--enable-pkcs11" - ++ optional stdenv.isDarwin "--disable-plugin-auth-pam"; - - postInstall = '' - mkdir -p $out/share/doc/openvpn/examples - cp -r sample/sample-config-files/ $out/share/doc/openvpn/examples - cp -r sample/sample-keys/ $out/share/doc/openvpn/examples - cp -r sample/sample-scripts/ $out/share/doc/openvpn/examples - '' + optionalString useSystemd '' - install -Dm555 ${update-resolved} $out/libexec/update-systemd-resolved - wrapProgram $out/libexec/update-systemd-resolved \ - --prefix PATH : ${makeBinPath [ stdenv.shell iproute systemd utillinux ]} - ''; - - enableParallelBuilding = true; - - meta = with stdenv.lib; { - description = "A robust and highly flexible tunneling application"; - downloadPage = "https://openvpn.net/community-downloads/"; - homepage = "https://openvpn.net/"; - license = licenses.gpl2; - maintainers = with maintainers; [ viric ]; - platforms = platforms.unix; - updateWalker = true; + openvpn = generic { + version = "2.5.0"; + sha256 = "sha256-AppCbkTWVstOEYkxnJX+b8mGQkdyT1WZ2Z35xMNHj70="; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 22db2f6cfeed..2b0603007c41 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6209,7 +6209,9 @@ in opentsdb = callPackage ../tools/misc/opentsdb {}; - openvpn = callPackage ../tools/networking/openvpn {}; + inherit (callPackages ../tools/networking/openvpn {}) + openvpn_24 + openvpn; openvpn_learnaddress = callPackage ../tools/networking/openvpn/openvpn_learnaddress.nix { }; From 3c8c57dc33cc45ae7695dd8e6846a78b5550abaf Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 22 Nov 2020 12:04:21 +0000 Subject: [PATCH 183/260] strawberry: 0.8.3 -> 0.8.4 --- pkgs/applications/audio/strawberry/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/strawberry/default.nix b/pkgs/applications/audio/strawberry/default.nix index 9243bc66544e..712a3e37a476 100644 --- a/pkgs/applications/audio/strawberry/default.nix +++ b/pkgs/applications/audio/strawberry/default.nix @@ -35,13 +35,13 @@ mkDerivation rec { pname = "strawberry"; - version = "0.8.3"; + version = "0.8.4"; src = fetchFromGitHub { owner = "jonaski"; repo = pname; rev = version; - sha256 = "0v3rbpaz6pqkam0cj86ydq8gc2rhas8mhwgvy31djvxng9nv3h5j"; + sha256 = "145djlfvbkx2b1wqipk51mz82dhm27vmh9x00lkn24q1xz1y6h5n"; }; buildInputs = [ From 82abdf481fbbac7c3683c60fdb03967b8da332d6 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 22 Nov 2020 12:57:45 +0000 Subject: [PATCH 184/260] tendermint: 0.33.8 -> 0.34.0 --- pkgs/tools/networking/tendermint/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/tendermint/default.nix b/pkgs/tools/networking/tendermint/default.nix index 4ca5529bdc60..2fedae4b7a79 100644 --- a/pkgs/tools/networking/tendermint/default.nix +++ b/pkgs/tools/networking/tendermint/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "tendermint"; - version = "0.33.8"; + version = "0.34.0"; src = fetchFromGitHub { owner = "tendermint"; repo = pname; rev = "v${version}"; - sha256 = "1dcr60gmbkb6833n49mjmlr082ahlv7alaqycl8g3d4f93kdm5c3"; + sha256 = "1fnykdk35937ld8dyzjs571klz187jr8wlj8ljn78pajx1cd84k6"; }; - vendorSha256 = "0i0n89lal99fqnzva51kp9f7wzqsfmncpshwxhq26kvykp7ji7sw"; + vendorSha256 = "19qx7ab6ar609cxxdsb9i2c3h7icqgf5bhi28lnsdk3bdjxr27vz"; doCheck = false; From 4b453515f1c1bd00f8f86c18fdb14896888826cb Mon Sep 17 00:00:00 2001 From: Vladyslav M Date: Sun, 22 Nov 2020 15:27:10 +0200 Subject: [PATCH 185/260] pijul: 1.0.0-alpha.3 -> 1.0.0-alpha.5 --- pkgs/applications/version-management/pijul/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/version-management/pijul/default.nix b/pkgs/applications/version-management/pijul/default.nix index 43890c92039a..fa7583a1e559 100644 --- a/pkgs/applications/version-management/pijul/default.nix +++ b/pkgs/applications/version-management/pijul/default.nix @@ -15,14 +15,14 @@ rustPlatform.buildRustPackage rec { pname = "pijul"; - version = "1.0.0-alpha.3"; + version = "1.0.0-alpha.5"; src = fetchCrate { inherit version pname; - sha256 = "0bz38vvzjrplb2mgcypg2p4kq33v6m58yivg15s2ghr7ly9k5ybx"; + sha256 = "150hm3kim8cszmycbr4rdpy2g3bfhghsya8hnnfkglzi8sprb5d8"; }; - cargoSha256 = "0p9djvdjzyjzsn3fyw6f74fix39s3y92246cgzcqhc1qlwwz67rl"; + cargoSha256 = "0398bwjc2ib32nhbg4gjzwq6zwxql7llq8igl51nyr229m917im6"; cargoBuildFlags = stdenv.lib.optional gitImportSupport "--features=git"; LIBCLANG_PATH = "${libclang}/lib"; From bf3a700c5b906a57c2b23ef108c0ffa695c1b115 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 22 Nov 2020 13:33:52 +0000 Subject: [PATCH 186/260] tiled: 1.4.2 -> 1.4.3 --- pkgs/applications/editors/tiled/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/tiled/default.nix b/pkgs/applications/editors/tiled/default.nix index 4b032d48ebf4..10c0ed9ea79b 100644 --- a/pkgs/applications/editors/tiled/default.nix +++ b/pkgs/applications/editors/tiled/default.nix @@ -3,13 +3,13 @@ mkDerivation rec { pname = "tiled"; - version = "1.4.2"; + version = "1.4.3"; src = fetchFromGitHub { owner = "bjorn"; repo = pname; rev = "v${version}"; - sha256 = "0b3xjcc86vs9lfxr7xann9d43dz3v3x1g7j1mcn31sy2n68a1wx3"; + sha256 = "0n8p7bp5pqq72c65av3v7wbazwphh78pw27nqvpiyp9y8k5w4pg0"; }; nativeBuildInputs = [ pkgconfig qmake ]; From ae782eea9553f5ac57fb2eac0cfdfb823c72cf39 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 22 Nov 2020 13:43:03 +0000 Subject: [PATCH 187/260] tiledb: 2.1.2 -> 2.1.3 --- pkgs/development/libraries/tiledb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/tiledb/default.nix b/pkgs/development/libraries/tiledb/default.nix index 5fe6b57f0444..eb65d07b2837 100644 --- a/pkgs/development/libraries/tiledb/default.nix +++ b/pkgs/development/libraries/tiledb/default.nix @@ -21,13 +21,13 @@ stdenv.mkDerivation rec { pname = "tiledb"; - version = "2.1.2"; + version = "2.1.3"; src = fetchFromGitHub { owner = "TileDB-Inc"; repo = "TileDB"; rev = version; - sha256 = "12f3jvb9b6ji5w2n2k3sjn156ikaf06mriwbqlc54ii1zznaw43r"; + sha256 = "1ia00bk6dc1176arf84lx08x4c7c74q7ycn7dqjnmyxkg3kmr21g"; }; # (bundled) blosc headers have a warning on some archs that it will be using From f9d14ca7b44b2b38e367fd5ab57a9b700cf10446 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 22 Nov 2020 14:16:36 +0000 Subject: [PATCH 188/260] tpm2-tss: 3.0.1 -> 3.0.2 --- pkgs/development/libraries/tpm2-tss/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/tpm2-tss/default.nix b/pkgs/development/libraries/tpm2-tss/default.nix index c9160083d60f..6b83b5c051d6 100644 --- a/pkgs/development/libraries/tpm2-tss/default.nix +++ b/pkgs/development/libraries/tpm2-tss/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "tpm2-tss"; - version = "3.0.1"; + version = "3.0.2"; src = fetchFromGitHub { owner = "tpm2-software"; repo = pname; rev = version; - sha256 = "10wayqk7h1v3hdyd09rkjjs9989r968dpgf8m0xjqgn7q3y78n61"; + sha256 = "07yz459xnj7cs99mfhnq8wr9cvkrnbd479scqyxz55nlimrg8dc9"; }; nativeBuildInputs = [ From d0d86fc5dd8afdc2165ade3bf0bb1f2558d0c6f8 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 22 Nov 2020 14:32:32 +0000 Subject: [PATCH 189/260] traefik: 2.3.2 -> 2.3.3 --- pkgs/servers/traefik/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/traefik/default.nix b/pkgs/servers/traefik/default.nix index dffb92326b88..dbc59e982d8f 100644 --- a/pkgs/servers/traefik/default.nix +++ b/pkgs/servers/traefik/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "traefik"; - version = "2.3.2"; + version = "2.3.3"; src = fetchzip { url = "https://github.com/traefik/traefik/releases/download/v${version}/traefik-v${version}.src.tar.gz"; - sha256 = "1h8wflkzjzz0nr81d99f8vksihqa6q4vmkqq40170a8js06fgizx"; + sha256 = "0hzw4ahwl8hjd1qzv8fzls9m8pivyzrdcmchbqpjlwn83r8ywm0l"; stripRoot = false; }; - vendorSha256 = "16y6cyw4xipadwz7wlzl55sn81by9hc37crf143dfb4c3kmwb581"; + vendorSha256 = "0y0yw648a6wm0da5x58xwa7k95ff3iddqhfwshhlb5phlnsiqllj"; doCheck = false; From 84b4bd65d7736dfacf17c851669bfe736c6435e7 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 22 Nov 2020 14:57:37 +0000 Subject: [PATCH 190/260] ugrep: 3.0.4 -> 3.0.5 --- pkgs/tools/text/ugrep/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/text/ugrep/default.nix b/pkgs/tools/text/ugrep/default.nix index 40266a5440bb..06c8b0d3d6a9 100644 --- a/pkgs/tools/text/ugrep/default.nix +++ b/pkgs/tools/text/ugrep/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "ugrep"; - version = "3.0.4"; + version = "3.0.5"; src = fetchFromGitHub { owner = "Genivia"; repo = pname; rev = "v${version}"; - sha256 = "0z3l6dm7v5fdki70nmz2qzrzqmkj3lngiwpswqmyygm7v8gvmimv"; + sha256 = "17yrlgn18kkx7m03dr0hamv0jny6z4x6sk6an41l807i1xaqjyg6"; }; buildInputs = [ boost bzip2 lz4 pcre2 xz zlib ]; From ddbd25e593280d4afb1c316022c7b8dca284355c Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 22 Nov 2020 15:12:39 +0000 Subject: [PATCH 191/260] vale: 2.6.1 -> 2.6.2 --- pkgs/tools/text/vale/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/text/vale/default.nix b/pkgs/tools/text/vale/default.nix index 5ae858d79db7..9a394a986945 100644 --- a/pkgs/tools/text/vale/default.nix +++ b/pkgs/tools/text/vale/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "vale"; - version = "2.6.1"; + version = "2.6.2"; subPackages = [ "." ]; outputs = [ "out" "data" ]; @@ -11,7 +11,7 @@ buildGoModule rec { owner = "errata-ai"; repo = "vale"; rev = "v${version}"; - sha256 = "1xn3i1d8z2zlnykcz0z779naashn92kd7fnnssamjqblclr8dsp8"; + sha256 = "0hsazxspszljf34i1v247ll8144dq7s1mfs67w8ppscs575ndf05"; }; vendorSha256 = null; From b91a67a33ed8472b930544bf606f2c8ac83a5f2a Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 22 Nov 2020 15:22:01 +0000 Subject: [PATCH 192/260] vultr-cli: 0.4.0 -> 1.0.0 --- pkgs/development/tools/vultr-cli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/vultr-cli/default.nix b/pkgs/development/tools/vultr-cli/default.nix index 41f1524536e1..ef98d5603d0a 100644 --- a/pkgs/development/tools/vultr-cli/default.nix +++ b/pkgs/development/tools/vultr-cli/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "vultr-cli"; - version = "0.4.0"; + version = "1.0.0"; src = fetchFromGitHub { owner = "vultr"; repo = pname; rev = "v${version}"; - sha256 = "0gp1v62iqh3hk46cc5sh8a1nw5nf98m969fdhgxdppwr5dhj9isp"; + sha256 = "1604l36y6pggk72x4avdijq7c90w0as7xamh634a68ymjnd10jv4"; }; vendorSha256 = null; From 08364dfbd50351020e536fcc3699324f04624791 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 22 Nov 2020 15:51:58 +0000 Subject: [PATCH 193/260] xmrig: 6.2.2 -> 6.5.3 --- pkgs/applications/misc/xmrig/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/xmrig/default.nix b/pkgs/applications/misc/xmrig/default.nix index 99afc44d2b4d..16aa4f2f7303 100644 --- a/pkgs/applications/misc/xmrig/default.nix +++ b/pkgs/applications/misc/xmrig/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "xmrig"; - version = "6.2.2"; + version = "6.5.3"; src = fetchFromGitHub { owner = "xmrig"; repo = "xmrig"; rev = "v${version}"; - sha256 = "0ph9mrg8i6cv2xjx79118hlm1gcynfavcmp0x2mvvlraxmghfp7a"; + sha256 = "0hywdb6zzkmiik93bnsw6pzir7189mnm46brg4v8fyn56vxskfmi"; }; nativeBuildInputs = [ cmake ]; From 97c0e0768b785dd6271d07d76d52767dd8881b36 Mon Sep 17 00:00:00 2001 From: Nicolas Martin Date: Sun, 22 Nov 2020 16:54:09 +0100 Subject: [PATCH 194/260] glow: 1.1.0 -> 1.2.0 --- pkgs/applications/editors/glow/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/glow/default.nix b/pkgs/applications/editors/glow/default.nix index 0ba13c996712..b9ec218b93ec 100644 --- a/pkgs/applications/editors/glow/default.nix +++ b/pkgs/applications/editors/glow/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "glow"; - version = "1.1.0"; + version = "1.2.0"; src = fetchFromGitHub { owner = "charmbracelet"; repo = "glow"; rev = "v${version}"; - sha256 = "016psbm93ni81k87i9gx3cjr59j1fmpq5x8vz0ydabczzdshd1py"; + sha256 = "0gwzf2p67s0nsb7my5njcz4znlfl62s9gg7x9ywbk9jzsr9avkhv"; }; - vendorSha256 = "0gvlbj8b5sqk93ahg4b2krwrmr8ljz7cah77fxaxcd98apap0pw6"; + vendorSha256 = "1p50qr7hbc8vyifa23z7xr43b4fpmwdzg7hqs503c124kpbpk45z"; doCheck = false; From 7620d4c67bbe10ccac3ba6db41d17e4e56d06e31 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 22 Nov 2020 16:23:39 +0000 Subject: [PATCH 195/260] zef: 0.9.1 -> 0.9.4 --- pkgs/development/interpreters/rakudo/zef.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/rakudo/zef.nix b/pkgs/development/interpreters/rakudo/zef.nix index c72eaedef9d6..b2cea4ad473b 100644 --- a/pkgs/development/interpreters/rakudo/zef.nix +++ b/pkgs/development/interpreters/rakudo/zef.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "zef"; - version = "0.9.1"; + version = "0.9.4"; src = fetchFromGitHub { owner = "ugexe"; repo = "zef"; rev = "v${version}"; - sha256 = "1qw8g809gnr0s6hmj4qsd81g1dhsacml6n1fdgk4q45l1mxjfdmv"; + sha256 = "0h3lbznzxqmsv2816vr6y244sfdchj13yhbav86zy2m79p8b5lgq"; }; buildInputs = [ rakudo makeWrapper ]; From 82cb429ee7769a28fbf222db835359ed38f0afb1 Mon Sep 17 00:00:00 2001 From: sevenfourk Date: Sun, 22 Nov 2020 18:31:03 +0200 Subject: [PATCH 196/260] terraform-providers.kubernetes: 1.11.3 -> 1.13.2 --- .../cluster/terraform-providers/providers.json | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 3136529baed4..a31df93c1efd 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -468,11 +468,12 @@ "version": "1.0.0" }, "kubernetes": { - "owner": "terraform-providers", + "owner": "hashicorp", + "provider-source-address": "registry.terraform.io/hashicorp/kubernetes", "repo": "terraform-provider-kubernetes", - "rev": "v1.11.3", - "sha256": "13j4xwibjgiqpzwbwd0d3z1idv0lwz78ip38khhmhwa78mjjb4zz", - "version": "1.11.3" + "rev": "v1.13.3", + "sha256": "01hkbb81r3k630s3ww6379p66h1fsd5cd1dz14jm833nsr142c0i", + "version": "1.13.3" }, "kubernetes-alpha": { "owner": "hashicorp", From 348a86a7239f22fbc424fcbbc8ad5b8209cb43d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sun, 22 Nov 2020 07:12:17 +0100 Subject: [PATCH 197/260] pythonPackages.hidapi: Fix compilation on darwin --- pkgs/development/python-modules/hidapi/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/hidapi/default.nix b/pkgs/development/python-modules/hidapi/default.nix index 070ad57c4f11..05557b096df7 100644 --- a/pkgs/development/python-modules/hidapi/default.nix +++ b/pkgs/development/python-modules/hidapi/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { propagatedBuildInputs = stdenv.lib.optionals stdenv.isLinux [ libusb1 udev ] ++ - stdenv.lib.optionals stdenv.isDarwin [ darwin.IOKit darwin.apple_sdk.frameworks.CoreFoundation ] ++ + stdenv.lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ AppKit CoreFoundation IOKit ]) ++ [ cython ]; # Fix the USB backend library lookup From 74c4a55e1076ecd93b2e44f44f402b8980cff464 Mon Sep 17 00:00:00 2001 From: Atemu Date: Sun, 20 Sep 2020 17:02:08 +0200 Subject: [PATCH 198/260] buildFHSUserEnvBubblewrap: use arrays for constructing argument list Generally a cleaner way of doing it and prevents issues with spaces in paths Used to fix #97234 but #101967 already didt this with a smaller scope --- .../build-fhs-userenv-bubblewrap/default.nix | 39 ++++++++++--------- 1 file changed, 21 insertions(+), 18 deletions(-) diff --git a/pkgs/build-support/build-fhs-userenv-bubblewrap/default.nix b/pkgs/build-support/build-fhs-userenv-bubblewrap/default.nix index 83d5d371b397..3a3c9e932fdb 100644 --- a/pkgs/build-support/build-fhs-userenv-bubblewrap/default.nix +++ b/pkgs/build-support/build-fhs-userenv-bubblewrap/default.nix @@ -50,7 +50,7 @@ let "ssl/certs" "pki" ]; - in concatStringsSep " \\\n " + in concatStringsSep "\n " (map (file: "--ro-bind-try /etc/${file} /etc/${file}") files); init = run: writeShellScriptBin "${name}-init" '' @@ -59,21 +59,21 @@ let ''; bwrapCmd = { initArgs ? "" }: '' - blacklist="/nix /dev /proc /etc" - ro_mounts="" + blacklist=(/nix /dev /proc /etc) + ro_mounts=() for i in ${env}/*; do path="/''${i##*/}" if [[ $path == '/etc' ]]; then continue fi - ro_mounts="$ro_mounts --ro-bind $i $path" - blacklist="$blacklist $path" + ro_mounts+=(--ro-bind "$i" "$path") + blacklist+=("$path") done if [[ -d ${env}/etc ]]; then for i in ${env}/etc/*; do path="/''${i##*/}" - ro_mounts="$ro_mounts --ro-bind $i /etc$path" + ro_mounts+=(--ro-bind "$i" "/etc$path") done fi @@ -81,24 +81,27 @@ let # loop through all directories in the root for dir in /*; do # if it is a directory and it is not in the blacklist - if [[ -d "$dir" ]] && grep -v "$dir" <<< "$blacklist" >/dev/null; then + if [[ -d "$dir" ]] && [[ ! "''${blacklist[@]}" =~ "$dir" ]]; then # add it to the mount list auto_mounts+=(--bind "$dir" "$dir") fi done - exec ${bubblewrap}/bin/bwrap \ - --dev-bind /dev /dev \ - --proc /proc \ - --chdir "$(pwd)" \ - --unshare-all \ - --share-net \ - --die-with-parent \ - --ro-bind /nix /nix \ - ${etcBindFlags} \ - $ro_mounts \ - "''${auto_mounts[@]}" \ + cmd=( + ${bubblewrap}/bin/bwrap + --dev-bind /dev /dev + --proc /proc + --chdir "$(pwd)" + --unshare-all + --share-net + --die-with-parent + --ro-bind /nix /nix + ${etcBindFlags} + "''${ro_mounts[@]}" + "''${auto_mounts[@]}" ${init runScript}/bin/${name}-init ${initArgs} + ) + exec "''${cmd[@]}" ''; bin = writeShellScriptBin name (bwrapCmd { initArgs = ''"$@"''; }); From 636df97496026ef4ce7ae49f53d78fdf72677a31 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 22 Nov 2020 18:55:28 +0000 Subject: [PATCH 199/260] argo: 2.11.7 -> 2.11.8 --- pkgs/applications/networking/cluster/argo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/argo/default.nix b/pkgs/applications/networking/cluster/argo/default.nix index 6f2344bd3e75..4009bf96cd4f 100644 --- a/pkgs/applications/networking/cluster/argo/default.nix +++ b/pkgs/applications/networking/cluster/argo/default.nix @@ -19,13 +19,13 @@ let in buildGoModule rec { pname = "argo"; - version = "2.11.7"; + version = "2.11.8"; src = fetchFromGitHub { owner = "argoproj"; repo = "argo"; rev = "v${version}"; - sha256 = "1i7qgghnb39bibnk07f47k64qpkb1k8mi3bbfnx6mxl0jlq335af"; + sha256 = "19nkkj69506759qjfrz6d7j57z8rqjslgfrdrkx01ri68cil4mfh"; }; vendorSha256 = "1ca0ssvbi4vrsn9ljc783hnh9bmf5p8nr1lz5wm8g3gbrrrf1ray"; From 8a4cf08d411858636df8053a4768ed717bc6ad18 Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Sun, 22 Nov 2020 16:19:25 +0700 Subject: [PATCH 200/260] u9fs: 20110513 -> unstable-2020-11-21 --- pkgs/servers/u9fs/default.nix | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/pkgs/servers/u9fs/default.nix b/pkgs/servers/u9fs/default.nix index 3dea897971aa..97745b77ad2f 100644 --- a/pkgs/servers/u9fs/default.nix +++ b/pkgs/servers/u9fs/default.nix @@ -1,24 +1,26 @@ { stdenv, fetchhg }: stdenv.mkDerivation { - name = "u9fs-20110513"; + pname = "u9fs"; + version = "unstable-2020-11-21"; + src = fetchhg { - url = "https://bitbucket.org/plan9-from-bell-labs/u9fs"; - rev = "9474edb23b11"; + url = "https://code.9front.org/hg/plan9front"; + rev = "6eef4d6a9bce"; sha256 = "0irwyk8vnvx0fmz8lmbdb2jrlvas8imr61jr76a1pkwi9wpf2wv6"; }; - installPhase = - '' + installPhase = '' mkdir -p $out/bin $out/share/man4 - cp u9fs $out/bin; cp u9fs.man $out/share/man4 + cp u9fs.man $out/share/man4 + cp u9fs $out/bin ''; - meta = with stdenv.lib; - { description = "Serve 9P from Unix"; - homepage = "http://plan9.bell-labs.com/magic/man2html/4/u9fs"; - license = licenses.free; - maintainers = [ maintainers.ehmry ]; - platforms = platforms.unix; - }; + meta = with stdenv.lib; { + description = "Serve 9P from Unix"; + homepage = "http://plan9.bell-labs.com/magic/man2html/4/u9fs"; + license = licenses.free; + maintainers = [ maintainers.ehmry ]; + platforms = platforms.unix; + }; } From 87976cd2ef363a8fb1afc44fda6426fd10317a89 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 22 Nov 2020 20:29:30 +0000 Subject: [PATCH 201/260] autorandr: 1.10.1 -> 1.11 --- pkgs/tools/misc/autorandr/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/autorandr/default.nix b/pkgs/tools/misc/autorandr/default.nix index b2bbb161f289..5a2387358d55 100644 --- a/pkgs/tools/misc/autorandr/default.nix +++ b/pkgs/tools/misc/autorandr/default.nix @@ -6,7 +6,7 @@ let python = python3Packages.python; - version = "1.10.1"; + version = "1.11"; in stdenv.mkDerivation { pname = "autorandr"; @@ -49,7 +49,7 @@ in owner = "phillipberndt"; repo = "autorandr"; rev = version; - sha256 = "0msw9b1hdy3gbq9w5d04mfizhyirz1c648x84mlcbzl8salm7vpg"; + sha256 = "0rmnqk2bi6bbd2if1rll37mlzlqxzmnazfffdhcpzskxwyaj4yn5"; }; meta = with stdenv.lib; { From 31c770d065fe4fce58131998e3a62000655332bc Mon Sep 17 00:00:00 2001 From: Ryan Mulligan Date: Sun, 22 Nov 2020 13:18:38 -0800 Subject: [PATCH 202/260] rage: 0.4.0 -> 0.5.0 * Upgrades to latest version * Moves darwin security access into derivation, simplifying all-packages.nix * Add RyanTM as maintainer --- pkgs/tools/security/rage/default.nix | 14 +++++++------- pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/pkgs/tools/security/rage/default.nix b/pkgs/tools/security/rage/default.nix index 26ae27dff6b2..1e0164e10cf4 100644 --- a/pkgs/tools/security/rage/default.nix +++ b/pkgs/tools/security/rage/default.nix @@ -1,21 +1,21 @@ -{ stdenv, rustPlatform, fetchFromGitHub, installShellFiles, Security }: +{ stdenv, rustPlatform, fetchFromGitHub, installShellFiles, darwin }: rustPlatform.buildRustPackage rec { pname = "rage"; - version = "0.4.0"; + version = "0.5.0"; src = fetchFromGitHub { owner = "str4d"; repo = pname; rev = "v${version}"; - sha256 = "1wwndzy4xxbar9r67z8g7pp0s1xsxk5xaarh4h6hc0kh411zglrq"; + sha256 = "sha256-XSDfAsXfwSoe5JMdJtZlC324Sra+4fVJhE3/k2TthEc="; }; - cargoSha256 = "08njl8irkqkfxj54pz4sx3l9aqb40h10wxb82zza52pqd4zapgn6"; + cargoSha256 = "sha256-GPr5zxeODAjD+ynp/nned9gZUiReYcdzosuEbLIKZSs="; nativeBuildInputs = [ installShellFiles ]; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ]; postBuild = '' cargo run --example generate-docs @@ -31,7 +31,7 @@ rustPlatform.buildRustPackage rec { description = "A simple, secure and modern encryption tool with small explicit keys, no config options, and UNIX-style composability"; homepage = "https://github.com/str4d/rage"; changelog = "https://github.com/str4d/rage/releases/tag/v${version}"; - license = licenses.asl20; - maintainers = [ maintainers.marsam ]; + license = with licenses; [ asl20 mit ]; # either at your option + maintainers = with maintainers; [ marsam ryantm ]; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f25a6df78ede..5a4e623d213d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3510,9 +3510,7 @@ in inherit (darwin.apple_sdk.frameworks) Security; }; - rage = callPackage ../tools/security/rage { - inherit (darwin.apple_sdk.frameworks) Security; - }; + rage = callPackage ../tools/security/rage { }; rar2fs = callPackage ../tools/filesystems/rar2fs { }; From bbcbaeb54d1d08783771f886e04cf8e8afc82651 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Sun, 22 Nov 2020 17:17:08 +1000 Subject: [PATCH 203/260] nixos/tests/fctix: remove trailing whitespace --- nixos/tests/fcitx/default.nix | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/nixos/tests/fcitx/default.nix b/nixos/tests/fcitx/default.nix index d28a5801f97f..cbeb95d33b0c 100644 --- a/nixos/tests/fcitx/default.nix +++ b/nixos/tests/fcitx/default.nix @@ -1,15 +1,15 @@ -import ../make-test-python.nix ( +import ../make-test-python.nix ( { pkgs, ... - }: + }: # copy_from_host works only for store paths rec { name = "fcitx"; - machine = - { - pkgs, - ... - }: + machine = + { + pkgs, + ... + }: { virtualisation.memorySize = 1024; @@ -19,11 +19,11 @@ import ../make-test-python.nix ( environment.systemPackages = [ # To avoid clashing with xfce4-terminal - pkgs.alacritty + pkgs.alacritty ]; - services.xserver = + services.xserver = { enable = true; @@ -37,7 +37,7 @@ import ../make-test-python.nix ( desktopManager.xfce.enable = true; }; - + i18n = { inputMethod = { enabled = "fcitx"; @@ -50,14 +50,14 @@ import ../make-test-python.nix ( } ; - testScript = { nodes, ... }: - let + testScript = { nodes, ... }: + let user = nodes.machine.config.users.users.alice; userName = user.name; userHome = user.home; xauth = "${userHome}/.Xauthority"; fcitx_confdir = "${userHome}/.config/fcitx"; - in + in '' # We need config files before login session # So copy first thing @@ -92,7 +92,7 @@ import ../make-test-python.nix ( machine.send_key("ctrl-alt-shift-u") machine.sleep(5) machine.sleep(1) - + ### Search for smiling face machine.send_chars("smil") machine.sleep(1) From dbbd289982ba87aea30453b1e6fb37f33e6bdb72 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Sun, 22 Nov 2020 17:23:53 +1000 Subject: [PATCH 204/260] nixos/*: fix indentation --- .../services/databases/foundationdb.nix | 2 +- nixos/modules/services/mail/rspamd.nix | 2 +- nixos/modules/services/misc/siproxd.nix | 18 +++++++-------- nixos/modules/services/misc/svnserve.nix | 2 +- .../services/network-filesystems/netatalk.nix | 12 +++++----- nixos/modules/services/networking/morty.nix | 16 ++++++++------ .../strongswan-swanctl/swanctl-params.nix | 18 +++++++-------- .../services/networking/wasabibackend.nix | 2 +- .../services/security/oauth2_proxy.nix | 4 ++-- .../services/x11/window-managers/evilwm.nix | 4 ++-- .../virtualisation/nixos-containers.nix | 22 +++++++++---------- nixos/tests/morty.nix | 6 ++--- nixos/tests/quorum.nix | 2 +- nixos/tests/rspamd.nix | 2 +- 14 files changed, 57 insertions(+), 55 deletions(-) diff --git a/nixos/modules/services/databases/foundationdb.nix b/nixos/modules/services/databases/foundationdb.nix index 18727acc7c75..e22127403e91 100644 --- a/nixos/modules/services/databases/foundationdb.nix +++ b/nixos/modules/services/databases/foundationdb.nix @@ -233,7 +233,7 @@ in type = types.str; default = "Check.Valid=1,Check.Unexpired=1"; description = '' - "Peer verification string". This may be used to adjust which TLS + "Peer verification string". This may be used to adjust which TLS client certificates a server will accept, as a form of user authorization; for example, it may only accept TLS clients who offer a certificate abiding by some locality or organization name. diff --git a/nixos/modules/services/mail/rspamd.nix b/nixos/modules/services/mail/rspamd.nix index 86a3f52107d5..a6c19a2af73e 100644 --- a/nixos/modules/services/mail/rspamd.nix +++ b/nixos/modules/services/mail/rspamd.nix @@ -408,7 +408,7 @@ in }; imports = [ (mkRemovedOptionModule [ "services" "rspamd" "socketActivation" ] - "Socket activation never worked correctly and could at this time not be fixed and so was removed") + "Socket activation never worked correctly and could at this time not be fixed and so was removed") (mkRenamedOptionModule [ "services" "rspamd" "bindSocket" ] [ "services" "rspamd" "workers" "normal" "bindSockets" ]) (mkRenamedOptionModule [ "services" "rspamd" "bindUISocket" ] [ "services" "rspamd" "workers" "controller" "bindSockets" ]) (mkRemovedOptionModule [ "services" "rmilter" ] "Use services.rspamd.* instead to set up milter service") diff --git a/nixos/modules/services/misc/siproxd.nix b/nixos/modules/services/misc/siproxd.nix index 0e87fc461d3f..20fe0793b84b 100644 --- a/nixos/modules/services/misc/siproxd.nix +++ b/nixos/modules/services/misc/siproxd.nix @@ -39,7 +39,7 @@ in default = false; description = '' Whether to enable the Siproxd SIP - proxy/masquerading daemon. + proxy/masquerading daemon. ''; }; @@ -57,29 +57,29 @@ in hostsAllowReg = mkOption { type = types.listOf types.str; - default = [ ]; + default = [ ]; example = [ "192.168.1.0/24" "192.168.2.0/24" ]; - description = '' + description = '' Acess control list for incoming SIP registrations. ''; }; hostsAllowSip = mkOption { type = types.listOf types.str; - default = [ ]; + default = [ ]; example = [ "123.45.0.0/16" "123.46.0.0/16" ]; - description = '' + description = '' Acess control list for incoming SIP traffic. ''; }; hostsDenySip = mkOption { type = types.listOf types.str; - default = [ ]; + default = [ ]; example = [ "10.0.0.0/8" "11.0.0.0/8" ]; - description = '' + description = '' Acess control list for denying incoming - SIP registrations and traffic. + SIP registrations and traffic. ''; }; @@ -87,7 +87,7 @@ in type = types.int; default = 5060; description = '' - Port to listen for incoming SIP messages. + Port to listen for incoming SIP messages. ''; }; diff --git a/nixos/modules/services/misc/svnserve.nix b/nixos/modules/services/misc/svnserve.nix index 3335ed09d40e..f70e3ca7fef0 100644 --- a/nixos/modules/services/misc/svnserve.nix +++ b/nixos/modules/services/misc/svnserve.nix @@ -25,7 +25,7 @@ in svnBaseDir = mkOption { default = "/repos"; - description = "Base directory from which Subversion repositories are accessed."; + description = "Base directory from which Subversion repositories are accessed."; }; }; diff --git a/nixos/modules/services/network-filesystems/netatalk.nix b/nixos/modules/services/network-filesystems/netatalk.nix index 7674c8f7fa8d..ca9d32311f5f 100644 --- a/nixos/modules/services/network-filesystems/netatalk.nix +++ b/nixos/modules/services/network-filesystems/netatalk.nix @@ -108,10 +108,10 @@ in extmap = mkOption { type = types.lines; - default = ""; - description = '' - File name extension mappings. - See man extmap.conf for more information. + default = ""; + description = '' + File name extension mappings. + See man extmap.conf for more information. ''; }; @@ -132,10 +132,10 @@ in Type = "forking"; GuessMainPID = "no"; PIDFile = "/run/lock/netatalk"; - ExecStartPre = "${pkgs.coreutils}/bin/mkdir -m 0755 -p /var/lib/netatalk/CNID"; + ExecStartPre = "${pkgs.coreutils}/bin/mkdir -m 0755 -p /var/lib/netatalk/CNID"; ExecStart = "${pkgs.netatalk}/sbin/netatalk -F ${afpConfFile}"; ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; - ExecStop = "${pkgs.coreutils}/bin/kill -TERM $MAINPID"; + ExecStop = "${pkgs.coreutils}/bin/kill -TERM $MAINPID"; Restart = "always"; RestartSec = 1; }; diff --git a/nixos/modules/services/networking/morty.nix b/nixos/modules/services/networking/morty.nix index e3a6444c1163..e110a5c86101 100644 --- a/nixos/modules/services/networking/morty.nix +++ b/nixos/modules/services/networking/morty.nix @@ -29,9 +29,11 @@ in key = mkOption { type = types.str; default = ""; - description = "HMAC url validation key (hexadecimal encoded). - Leave blank to disable. Without validation key, anyone can - submit proxy requests. Leave blank to disable."; + description = '' + HMAC url validation key (hexadecimal encoded). + Leave blank to disable. Without validation key, anyone can + submit proxy requests. Leave blank to disable. + ''; defaultText = "No HMAC url validation. Generate with echo -n somevalue | openssl dgst -sha1 -hmac somekey"; }; @@ -85,10 +87,10 @@ in serviceConfig = { User = "morty"; ExecStart = ''${cfg.package}/bin/morty \ - -listen ${cfg.listenAddress}:${toString cfg.port} \ - ${optionalString cfg.ipv6 "-ipv6"} \ - ${optionalString (cfg.key != "") "-key " + cfg.key} \ - ''; + -listen ${cfg.listenAddress}:${toString cfg.port} \ + ${optionalString cfg.ipv6 "-ipv6"} \ + ${optionalString (cfg.key != "") "-key " + cfg.key} \ + ''; }; }; environment.systemPackages = [ cfg.package ]; diff --git a/nixos/modules/services/networking/strongswan-swanctl/swanctl-params.nix b/nixos/modules/services/networking/strongswan-swanctl/swanctl-params.nix index 808cb863a9cf..1d1e0bd1ca19 100644 --- a/nixos/modules/services/networking/strongswan-swanctl/swanctl-params.nix +++ b/nixos/modules/services/networking/strongswan-swanctl/swanctl-params.nix @@ -1173,20 +1173,20 @@ in { ppk = mkPrefixedAttrsOfParams { secret = mkOptionalStrParam '' - Value of the PPK. It may either be an ASCII string, a hex encoded string - if it has a 0x prefix or a Base64 encoded string if - it has a 0s prefix in its value. Should have at least - 256 bits of entropy for 128-bit security. + Value of the PPK. It may either be an ASCII string, a hex encoded string + if it has a 0x prefix or a Base64 encoded string if + it has a 0s prefix in its value. Should have at least + 256 bits of entropy for 128-bit security. ''; id = mkPrefixedAttrsOfParam (mkOptionalStrParam "") '' - PPK identity the PPK belongs to. Multiple unique identities may be - specified, each having an id prefix, if a secret is - shared between multiple peers. + PPK identity the PPK belongs to. Multiple unique identities may be + specified, each having an id prefix, if a secret is + shared between multiple peers. ''; } '' - Postquantum Preshared Key (PPK) section for a specific secret. Each PPK is - defined in a unique section having the ppk prefix. + Postquantum Preshared Key (PPK) section for a specific secret. Each PPK is + defined in a unique section having the ppk prefix. ''; private = mkPrefixedAttrsOfParams { diff --git a/nixos/modules/services/networking/wasabibackend.nix b/nixos/modules/services/networking/wasabibackend.nix index 6eacffe709b0..8482823e197f 100644 --- a/nixos/modules/services/networking/wasabibackend.nix +++ b/nixos/modules/services/networking/wasabibackend.nix @@ -21,7 +21,7 @@ let RegTestBitcoinCoreRpcEndPoint = "${cfg.rpc.ip}:${toString cfg.rpc.port}"; }; - configFile = pkgs.writeText "wasabibackend.conf" (builtins.toJSON confOptions); + configFile = pkgs.writeText "wasabibackend.conf" (builtins.toJSON confOptions); in { diff --git a/nixos/modules/services/security/oauth2_proxy.nix b/nixos/modules/services/security/oauth2_proxy.nix index 2f9e94bd77ba..486f3ab05386 100644 --- a/nixos/modules/services/security/oauth2_proxy.nix +++ b/nixos/modules/services/security/oauth2_proxy.nix @@ -448,7 +448,7 @@ in default = false; description = '' In case when running behind a reverse proxy, controls whether headers - like X-Real-Ip are accepted. Usage behind a reverse + like X-Real-Ip are accepted. Usage behind a reverse proxy will require this flag to be set to avoid logging the reverse proxy IP address. ''; @@ -524,7 +524,7 @@ in type = types.nullOr types.str; default = null; description = '' - Profile access endpoint. + Profile access endpoint. ''; }; diff --git a/nixos/modules/services/x11/window-managers/evilwm.nix b/nixos/modules/services/x11/window-managers/evilwm.nix index 6e19e3572c79..6f1db2110f87 100644 --- a/nixos/modules/services/x11/window-managers/evilwm.nix +++ b/nixos/modules/services/x11/window-managers/evilwm.nix @@ -16,8 +16,8 @@ in services.xserver.windowManager.session = singleton { name = "evilwm"; start = '' - ${pkgs.evilwm}/bin/evilwm & - waitPID=$! + ${pkgs.evilwm}/bin/evilwm & + waitPID=$! ''; }; environment.systemPackages = [ pkgs.evilwm ]; diff --git a/nixos/modules/virtualisation/nixos-containers.nix b/nixos/modules/virtualisation/nixos-containers.nix index 8fbb4efd2019..26398afb3cf5 100644 --- a/nixos/modules/virtualisation/nixos-containers.nix +++ b/nixos/modules/virtualisation/nixos-containers.nix @@ -614,17 +614,17 @@ in ''; }; - timeoutStartSec = mkOption { - type = types.str; - default = "1min"; - description = '' - Time for the container to start. In case of a timeout, - the container processes get killed. - See systemd.time - 7 - for more information about the format. - ''; - }; + timeoutStartSec = mkOption { + type = types.str; + default = "1min"; + description = '' + Time for the container to start. In case of a timeout, + the container processes get killed. + See systemd.time + 7 + for more information about the format. + ''; + }; bindMounts = mkOption { type = with types; attrsOf (submodule bindMountOpts); diff --git a/nixos/tests/morty.nix b/nixos/tests/morty.nix index ff30b7c072bb..924dce2717e3 100644 --- a/nixos/tests/morty.nix +++ b/nixos/tests/morty.nix @@ -12,9 +12,9 @@ import ./make-test-python.nix ({ pkgs, ... }: { ... }: { services.morty = { enable = true; - key = "78a9cd0cfee20c672f78427efb2a2a96036027f0"; - port = 3001; - }; + key = "78a9cd0cfee20c672f78427efb2a2a96036027f0"; + port = 3001; + }; }; }; diff --git a/nixos/tests/quorum.nix b/nixos/tests/quorum.nix index 846d2a930188..d5906806a0a2 100644 --- a/nixos/tests/quorum.nix +++ b/nixos/tests/quorum.nix @@ -55,7 +55,7 @@ import ./make-test-python.nix ({ pkgs, ... }: { parentHash = "0x0000000000000000000000000000000000000000000000000000000000000000"; timestamp = "0x5cffc201"; - }; + }; }; }; }; diff --git a/nixos/tests/rspamd.nix b/nixos/tests/rspamd.nix index bf3f0de62044..6eaa02ef4291 100644 --- a/nixos/tests/rspamd.nix +++ b/nixos/tests/rspamd.nix @@ -209,7 +209,7 @@ in return false end, score = 5.0, - description = 'Allow no cows', + description = 'Allow no cows', group = "cows", } rspamd_logger.infox(rspamd_config, 'Work dammit!!!') From fe78178e097126bdb4f919c487c8399c2a4ccf8e Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Sun, 22 Nov 2020 10:59:08 +1000 Subject: [PATCH 205/260] containerd: add passthru.tests --- pkgs/applications/virtualization/containerd/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/virtualization/containerd/default.nix b/pkgs/applications/virtualization/containerd/default.nix index eded437a62db..f3bcefcf1739 100644 --- a/pkgs/applications/virtualization/containerd/default.nix +++ b/pkgs/applications/virtualization/containerd/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, buildGoPackage, btrfs-progs, go-md2man, installShellFiles, utillinux }: +{ lib, fetchFromGitHub, buildGoPackage, btrfs-progs, go-md2man, installShellFiles, utillinux, nixosTests }: with lib; @@ -42,6 +42,8 @@ buildGoPackage rec { installManPage man/*.[1-9] ''; + passthru.tests = { inherit (nixosTests) docker; }; + meta = { homepage = "https://containerd.io/"; description = "A daemon to control runC"; From cdf6ffdf2e8917c167b8201fac29687b5fa88d34 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Sun, 22 Nov 2020 10:59:08 +1000 Subject: [PATCH 206/260] docker: add passthru.tests --- pkgs/applications/virtualization/docker/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix index dad5b43e5b05..d3200bba928c 100644 --- a/pkgs/applications/virtualization/docker/default.nix +++ b/pkgs/applications/virtualization/docker/default.nix @@ -4,6 +4,7 @@ , sqlite, iproute, lvm2, systemd , btrfs-progs, iptables, e2fsprogs, xz, utillinux, xfsprogs, git , procps, libseccomp +, nixosTests }: with lib; @@ -184,6 +185,8 @@ rec { installManPage man/*/*.[1-9] ''; + passthru.tests = { inherit (nixosTests) docker; }; + meta = { homepage = "https://www.docker.com/"; description = "An open source project to pack, ship and run any application as a lightweight container"; From a82d8ca64df883bdad18cb20029faf87ac49e48f Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Sun, 22 Nov 2020 10:59:08 +1000 Subject: [PATCH 207/260] runc: add docker to passthru.tests --- pkgs/applications/virtualization/runc/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/virtualization/runc/default.nix b/pkgs/applications/virtualization/runc/default.nix index fd3d914af662..1a7935dcf7d5 100644 --- a/pkgs/applications/virtualization/runc/default.nix +++ b/pkgs/applications/virtualization/runc/default.nix @@ -45,7 +45,7 @@ buildGoPackage rec { installManPage man/*/*.[1-9] ''; - passthru.tests = { inherit (nixosTests) cri-o podman; }; + passthru.tests = { inherit (nixosTests) cri-o docker podman; }; meta = with lib; { homepage = "https://github.com/opencontainers/runc"; From 60d2f1a232c7a9c7cd5b1cc938aab74b45a11778 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 22 Nov 2020 22:43:37 +0000 Subject: [PATCH 208/260] clinfo: 2.2.18.04.06 -> 3.0.20.11.20 --- pkgs/tools/system/clinfo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/system/clinfo/default.nix b/pkgs/tools/system/clinfo/default.nix index c50bfe4a0d04..9e9b4df80880 100644 --- a/pkgs/tools/system/clinfo/default.nix +++ b/pkgs/tools/system/clinfo/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "clinfo"; - version = "2.2.18.04.06"; + version = "3.0.20.11.20"; src = fetchFromGitHub { owner = "Oblomov"; repo = "clinfo"; rev = version; - sha256 = "0y2q0lz5yzxy970b7w7340vp4fl25vndahsyvvrywcrn51ipgplx"; + sha256 = "052xfkbmgfpalmhfwn0dj5114x2mzwz29y37qqhhsdpaxsz0y422"; }; buildInputs = [ ocl-icd opencl-headers ]; From 221f8ae3a311592d9930af4ac8e5ca1ad4c0768b Mon Sep 17 00:00:00 2001 From: Pierre Bourdon Date: Sun, 22 Nov 2020 23:44:46 +0100 Subject: [PATCH 209/260] navidrome: 0.29.0 -> 0.38.0 --- pkgs/servers/misc/navidrome/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/misc/navidrome/default.nix b/pkgs/servers/misc/navidrome/default.nix index a14a5039721d..a31d7a9c6d88 100644 --- a/pkgs/servers/misc/navidrome/default.nix +++ b/pkgs/servers/misc/navidrome/default.nix @@ -4,11 +4,11 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "navidrome"; - version = "0.29.0"; + version = "0.38.0"; src = fetchurl { url = "https://github.com/deluan/navidrome/releases/download/v${version}/navidrome_${version}_Linux_x86_64.tar.gz"; - sha256 = "0dpv68wvrslgfgh18mb8ficji6k1i9jiid9bfw786andf4rwghyc"; + sha256 = "01fkzsvdz1b43m8glxl01vw7d19w5fglk9x1rj5bab8fgrx149w8"; }; nativeBuildInputs = [ makeWrapper ]; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { wrapProgram $out/bin/navidrome \ --prefix PATH : ${makeBinPath (optional ffmpegSupport ffmpeg)} ''; - + meta = { description = "Navidrome Music Server and Streamer compatible with Subsonic/Airsonic"; homepage = "https://www.navidrome.org/"; From bfba7b9ca7be1e926871169248c7f05e8c81363a Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Mon, 23 Nov 2020 00:07:45 +0100 Subject: [PATCH 210/260] vagrant: 2.2.13 -> 2.2.14 https://github.com/hashicorp/vagrant/blob/v2.2.14/CHANGELOG.md#2214-november-20-2020 --- pkgs/development/tools/vagrant/default.nix | 4 ++-- pkgs/development/tools/vagrant/gemset.nix | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/development/tools/vagrant/default.nix b/pkgs/development/tools/vagrant/default.nix index 3d5fe88bfccd..b3f1bf1a5b8f 100644 --- a/pkgs/development/tools/vagrant/default.nix +++ b/pkgs/development/tools/vagrant/default.nix @@ -5,9 +5,9 @@ let # NOTE: bumping the version and updating the hash is insufficient; # you must use bundix to generate a new gemset.nix in the Vagrant source. - version = "2.2.13"; + version = "2.2.14"; url = "https://github.com/hashicorp/vagrant/archive/v${version}.tar.gz"; - sha256 = "sha256-NN+8t08yycINbtxOjhOWU96nJ0fZKDAopEr3WyAeG8U="; + sha256 = "sha256-vsb7RFjT9l4N6BzwIvVLcRtA4n/c8jk20B6RUMkyhJs="; deps = bundlerEnv rec { name = "${pname}-${version}"; diff --git a/pkgs/development/tools/vagrant/gemset.nix b/pkgs/development/tools/vagrant/gemset.nix index c18b9818f33a..169c3533efcb 100644 --- a/pkgs/development/tools/vagrant/gemset.nix +++ b/pkgs/development/tools/vagrant/gemset.nix @@ -54,10 +54,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1nwzxnqhr31fn7nbqmffcysvxjdfl3bhxi0bld5qqhcnfc1xd13x"; + sha256 = "09l8lz3j00m898li0yfsnb6ihc63rdvhw3k5xczna5zrjk104f2l"; type = "gem"; }; - version = "1.9.0"; + version = "1.10.0"; }; excon = { groups = ["default"]; @@ -138,10 +138,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "07q48aca4r782jh53znqq7ams4pcf1dhmq21dwhyxzjqfclcb48g"; + sha256 = "0028p1fss6pvw4mlpjqdmxfzsm8ww79irsadbibrr7f23qfn8ykr"; type = "gem"; }; - version = "3.3.0"; + version = "3.3.1"; }; little-plugger = { groups = ["default"]; @@ -347,10 +347,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0savhyfry7ii9axcmprvbzhrz4sd9byd8wifn74bd7y78asrbpdq"; + sha256 = "1lmlaii8qapn84wxdg5d82gbailracgk67d0qsnbdnffcg8kswzd"; type = "gem"; }; - version = "1.2.2"; + version = "1.2.3"; }; winrm-fs = { dependencies = ["erubi" "logging" "rubyzip" "winrm"]; From 2ea951480d629e6b329a30c14ea0b92be1ab5039 Mon Sep 17 00:00:00 2001 From: Nejc Zupan Date: Sun, 22 Nov 2020 13:08:47 +0000 Subject: [PATCH 211/260] pgweb: init at 0.11.7 Add pgweb, a light and fast web-based PostgreSQL database browser --- maintainers/maintainer-list.nix | 6 +++++ .../tools/database/pgweb/default.nix | 26 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 34 insertions(+) create mode 100644 pkgs/development/tools/database/pgweb/default.nix diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index f2e33938e051..c686510142c5 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -9998,4 +9998,10 @@ github = "pulsation"; githubId = 1838397; }; + zupo = { + name = "Nejc Zupan"; + email = "nejczupan+nix@gmail.com"; + github = "zupo"; + githubId = 311580; + }; } diff --git a/pkgs/development/tools/database/pgweb/default.nix b/pkgs/development/tools/database/pgweb/default.nix new file mode 100644 index 000000000000..de9d0847f8b6 --- /dev/null +++ b/pkgs/development/tools/database/pgweb/default.nix @@ -0,0 +1,26 @@ +{ buildGoPackage, fetchFromGitHub, lib }: + +buildGoPackage rec { + pname = "pgweb"; + version = "0.11.7"; + + src = fetchFromGitHub { + owner = "sosedoff"; + repo = pname; + rev = "v${version}"; + sha256 = "1df3vixxca80i040apbim80nqni94q882ykn3cglyccyl0iz59ix"; + }; + + goPackagePath = "github.com/sosedoff/pgweb"; + + meta = with lib; { + description = "A web-based database browser for PostgreSQL"; + longDescription = '' + A simple postgres browser that runs as a web server. You can view data, + run queries and examine tables and indexes. + ''; + homepage = "https://sosedoff.github.io/pgweb/"; + license = licenses.mit; + maintainers = with maintainers; [ zupo ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2b0603007c41..e44b25615596 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13051,6 +13051,8 @@ in pgpkeyserver-lite = callPackage ../servers/web-apps/pgpkeyserver-lite {}; + pgweb = callPackage ../development/tools/database/pgweb { }; + gpgstats = callPackage ../tools/security/gpgstats { }; gpshell = callPackage ../development/tools/misc/gpshell { }; From 408236cd6a508f7f8990c247ada494cf0dcc82f3 Mon Sep 17 00:00:00 2001 From: Stig Palmquist Date: Fri, 20 Nov 2020 18:18:05 +0100 Subject: [PATCH 212/260] perldevel: 5.33.3 -> 5.33.4 dependencies: perl-cross: 65e06e238ccb949e8399bdebc6d7fd798c34127b -> 6c115604fcbf01ceb3c6d7c13206a7590abf6c21 --- pkgs/development/interpreters/perl/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/interpreters/perl/default.nix b/pkgs/development/interpreters/perl/default.nix index 77dc53cf8b32..ac41a63cef77 100644 --- a/pkgs/development/interpreters/perl/default.nix +++ b/pkgs/development/interpreters/perl/default.nix @@ -174,11 +174,11 @@ let priority = 6; # in `buildEnv' (including the one inside `perl.withPackages') the library files will have priority over files in `perl` }; } // optionalAttrs (stdenv.buildPlatform != stdenv.hostPlatform) rec { - crossVersion = "65e06e238ccb949e8399bdebc6d7fd798c34127b"; # Oct 21, 2020 + crossVersion = "6c115604fcbf01ceb3c6d7c13206a7590abf6c21"; # Nov 22, 2020 perl-cross-src = fetchurl { url = "https://github.com/arsv/perl-cross/archive/${crossVersion}.tar.gz"; - sha256 = "1rk9kbvkj7cl3bvv6cph20f0hcb6y9ijgcd4rxj7aq98fxzvyhxx"; + sha256 = "1xb3krm7m3f7lhq774pf48czyfa8378jahg1q0kkcz8alrl270w1"; }; depsBuildBuild = [ buildPackages.stdenv.cc makeWrapper ]; @@ -214,7 +214,7 @@ in { perldevel = common { perl = pkgs.perldevel; buildPerl = buildPackages.perldevel; - version = "5.33.3"; - sha256 = "1k9pyy8d3wx8cpp5ss7hjwf9sxgga5gd0x2nq3vnqblkxfna0jsg"; + version = "5.33.4"; + sha256 = "02r8d0wrwaj0vgqbbqidhqgck2xp5k9g49aslj9faqcmgpsj5kcz"; }; } From a9f8357e2e9a3a203243a2be924c374b700a77e0 Mon Sep 17 00:00:00 2001 From: Sandro Date: Mon, 23 Nov 2020 03:52:47 +0100 Subject: [PATCH 213/260] MIDIVisualizer: 5.1 -> 5.2 (#101006) --- pkgs/applications/audio/midi-visualizer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/midi-visualizer/default.nix b/pkgs/applications/audio/midi-visualizer/default.nix index c66771be1c9d..64c0cae7a648 100644 --- a/pkgs/applications/audio/midi-visualizer/default.nix +++ b/pkgs/applications/audio/midi-visualizer/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "MIDIVisualizer"; - version = "5.1"; + version = "5.2"; src = fetchFromGitHub { owner = "kosua20"; repo = pname; rev = "v${version}"; - sha256 = "1fjlfa0qjpnjxl3bx5cq3dkswv9wihxmgfpkjijqp7kvf3q127rq"; + sha256 = "19z8m6clirz8kwfjp0z1j69fjfna8ar7hkgqnlm3lrc84gyx2rpf"; }; nativeBuildInputs = [ cmake pkg-config makeWrapper]; From b61ca0219b28c07f2dd6d33f92ac9481f65ae8dd Mon Sep 17 00:00:00 2001 From: Kira Bruneau Date: Sun, 22 Nov 2020 23:16:23 -0500 Subject: [PATCH 214/260] ccache: 4.0 -> 4.1 --- .../development/tools/misc/ccache/default.nix | 24 +++---------------- 1 file changed, 3 insertions(+), 21 deletions(-) diff --git a/pkgs/development/tools/misc/ccache/default.nix b/pkgs/development/tools/misc/ccache/default.nix index 3d1c21c25baf..f9254b2cf15e 100644 --- a/pkgs/development/tools/misc/ccache/default.nix +++ b/pkgs/development/tools/misc/ccache/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , substituteAll , binutils , asciidoc @@ -14,33 +13,16 @@ let ccache = stdenv.mkDerivation rec { pname = "ccache"; - version = "4.0"; + version = "4.1"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "1frcplrv61m2iwc6jwycpbcz1101xl6s4sh8p87prdj98l60lyrx"; + sha256 = "1az11q3wmr8wc7alx9l70wq9am41cm0y17g5gsaqmahws3dxfi8m"; }; - # TODO: Remove patches from upstream in next release - patches = [ - # Fix badly named man page filename - (fetchpatch { - url = "https://github.com/ccache/ccache/commit/223e706fb24ce86eb0ad86079a97e6f345b9ef40.patch"; - sha256 = "1h7amp3ka45a79zwlxh8qnzx6n371gnfpfgijcqljps7skhl5gjg"; - }) - # Build and install man page by default - (fetchpatch { - url = "https://github.com/ccache/ccache/commit/294ff2face26448afa68e3ef7b68bf4898d6dc77.patch"; - sha256 = "0rx69qn41bgksc4m3p59nk5d6rz72rwnfska9mh5j62pzfm8axja"; - }) - # Fixes use of undeclared identifier 'CLONE_NOOWNERCOPY' on darwin - (fetchpatch { - url = "https://github.com/ccache/ccache/commit/411c010c3a5ee690cd42b23ffcf026ae009e2897.patch"; - sha256 = "062s424d0d0psp6wjhmfnfn1s5dsrz403hdid5drm6l2san0jhq0"; - }) - ] ++ lib.optional stdenv.isDarwin (substituteAll { + patches = lib.optional stdenv.isDarwin (substituteAll { src = ./force-objdump-on-darwin.patch; objdump = "${binutils.bintools}/bin/objdump"; }); From 8582f5dbc9b5cb4d70c099f7d6c9b45d5b9275cb Mon Sep 17 00:00:00 2001 From: Quentin Revel Date: Fri, 13 Nov 2020 16:44:16 +0100 Subject: [PATCH 215/260] awscli2: fix completion Generate index file for shell completion Fix #103709 See-also: https://github.com/Homebrew/homebrew-core/pull/57547/files --- pkgs/tools/admin/awscli2/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/tools/admin/awscli2/default.nix b/pkgs/tools/admin/awscli2/default.nix index 6a1c6d25983a..06e1487cfe94 100644 --- a/pkgs/tools/admin/awscli2/default.nix +++ b/pkgs/tools/admin/awscli2/default.nix @@ -69,6 +69,9 @@ with py.pkgs; buildPythonApplication rec { ]; postInstall = '' + mkdir -p $out/${python3.sitePackages}/awscli/data + ${python3.interpreter} scripts/gen-ac-index --index-location $out/${python3.sitePackages}/awscli/data/ac.index + mkdir -p $out/share/bash-completion/completions echo "complete -C $out/bin/aws_completer aws" > $out/share/bash-completion/completions/awscli From c476262dcd9109168c99f3de2e9e94504807c7c5 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sun, 22 Nov 2020 09:25:35 +0100 Subject: [PATCH 216/260] =?UTF-8?q?ocamlPackages.faraday:=200.7.0=20?= =?UTF-8?q?=E2=86=92=200.7.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/ocaml-modules/faraday/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/development/ocaml-modules/faraday/default.nix b/pkgs/development/ocaml-modules/faraday/default.nix index 0c3eb5459cb2..48a6a82a738c 100644 --- a/pkgs/development/ocaml-modules/faraday/default.nix +++ b/pkgs/development/ocaml-modules/faraday/default.nix @@ -2,7 +2,9 @@ buildDunePackage rec { pname = "faraday"; - version = "0.7.0"; + version = "0.7.2"; + + useDune2 = true; minimumOCamlVersion = "4.02"; @@ -10,12 +12,12 @@ buildDunePackage rec { owner = "inhabitedtype"; repo = pname; rev = version; - sha256 = "0z6ikwlqad91iac0q5z88p3wzq5k15y86ckzmhdq1aqwrcm14bq2"; + sha256 = "0gdysszzk6b6npic4nhpdnz2nbq7rma6aml0rbn113bfh0rmb36x"; }; - checkInputs = lib.optional doCheck alcotest; + checkInputs = [ alcotest ]; propagatedBuildInputs = [ bigstringaf ]; - doCheck = lib.versions.majorMinor ocaml.version != "4.07"; + doCheck = lib.versionAtLeast ocaml.version "4.05"; meta = { description = "Serialization library built for speed and memory efficiency"; From 3a6b2726c52d1c3329a5679ee222dc163db0af72 Mon Sep 17 00:00:00 2001 From: Raghav Sood Date: Mon, 23 Nov 2020 05:20:38 +0000 Subject: [PATCH 217/260] codeowners: Add RaghavSood to blockchains --- .github/CODEOWNERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 3762b2eaf8f5..20668760d2d4 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -213,7 +213,7 @@ /doc/builders/images/dockertools.xml @roberth # Blockchains -/pkgs/applications/blockchains @mmahut +/pkgs/applications/blockchains @mmahut @RaghavSood # Go /pkgs/development/compilers/go @kalbasit @Mic92 @zowoq From f94ed4e9689dc84714889791ccee660be761b875 Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Fri, 2 Oct 2020 22:25:16 +0200 Subject: [PATCH 218/260] luppp: 1.2.0 -> 1.2.1 drop upstreamed patch --- .../audio/luppp/build-install.patch | 16 -------------- pkgs/applications/audio/luppp/default.nix | 21 ++++++++++++------- 2 files changed, 14 insertions(+), 23 deletions(-) delete mode 100644 pkgs/applications/audio/luppp/build-install.patch diff --git a/pkgs/applications/audio/luppp/build-install.patch b/pkgs/applications/audio/luppp/build-install.patch deleted file mode 100644 index 4dae65438cb5..000000000000 --- a/pkgs/applications/audio/luppp/build-install.patch +++ /dev/null @@ -1,16 +0,0 @@ -commit 4ec09e6f6e00e40622a5207ed24dc657da9a9090 -Author: Pavol Rusnak -Date: Tue Dec 4 12:06:22 2018 +0100 - - build: add install: true to executable in meson.build - -diff --git a/meson.build b/meson.build -index 050e1b1..9224ed5 100644 ---- a/meson.build -+++ b/meson.build -@@ -39,4 +39,5 @@ endforeach - - # compile the main project - executable('luppp', luppp_src + [version_hxx], -+ install: true, - dependencies: deps) diff --git a/pkgs/applications/audio/luppp/default.nix b/pkgs/applications/audio/luppp/default.nix index c1494ffc3334..6cf2575b8e5f 100644 --- a/pkgs/applications/audio/luppp/default.nix +++ b/pkgs/applications/audio/luppp/default.nix @@ -1,4 +1,5 @@ -{ stdenv, fetchFromGitHub +{ stdenv +, fetchFromGitHub , meson , ninja , pkgconfig @@ -12,26 +13,32 @@ stdenv.mkDerivation rec { pname = "luppp"; - version = "1.2.0"; - patches = [ ./build-install.patch ]; + version = "1.2.1"; src = fetchFromGitHub { owner = "openAVproductions"; repo = "openAV-Luppp"; rev = "release-${version}"; - sha256 = "194yq0lqc2psq9vyxmzif40ccawcvd9jndcn18mkz4f8h5w5rc1a"; + sha256 = "1ncbn099fyfnr7jw2bp3wf2g9k738lw53m6ssw6wji2wxwmghv78"; }; nativeBuildInputs = [ - meson ninja pkgconfig + meson + ninja + pkgconfig ]; buildInputs = [ - jack2 cairo liblo libsndfile libsamplerate ntk + jack2 + cairo + liblo + libsndfile + libsamplerate + ntk ]; meta = with stdenv.lib; { - homepage = "http://openavproductions.com/luppp/"; + homepage = "http://openavproductions.com/luppp/"; # https does not work description = "A music creation tool, intended for live use"; license = licenses.gpl3Plus; maintainers = with maintainers; [ prusnak ]; From 8eea9bd9238734592b824cb68053a871f21597ee Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Sat, 3 Oct 2020 22:19:33 +0200 Subject: [PATCH 219/260] pioneers: 15.4 -> 15.6 --- pkgs/games/pioneers/default.nix | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/pkgs/games/pioneers/default.nix b/pkgs/games/pioneers/default.nix index a3a80d896c15..882303ab0232 100644 --- a/pkgs/games/pioneers/default.nix +++ b/pkgs/games/pioneers/default.nix @@ -1,20 +1,30 @@ -{stdenv, fetchurl, gtk3, pkgconfig, intltool } : +{ stdenv +, fetchurl +, pkg-config +, intltool +, itstool +, gtk3 +, libxml2 +}: stdenv.mkDerivation rec { - name = "pioneers-15.4"; + pname = "pioneers"; + version = "15.6"; + src = fetchurl { - url = "mirror://sourceforge/pio/${name}.tar.gz"; - sha256 = "1p1d18hrfmqcnghip3shkzcs5qkz6j99jvkdkqfi7pqdvjc323cs"; + url = "mirror://sourceforge/pio/${pname}-${version}.tar.gz"; + sha256 = "07b3xdd81n8ybsb4fzc5lx0813y9crzp1hj69khncf4faj48sdcs"; }; - nativeBuildInputs = [ pkgconfig intltool ]; - buildInputs = [ gtk3 ]; + nativeBuildInputs = [ pkg-config intltool itstool ]; - meta = { - homepage = "http://pio.sourceforge.net/"; - license = stdenv.lib.licenses.gpl2Plus; + buildInputs = [ gtk3 libxml2 ]; + + meta = with stdenv.lib; { description = "Addicting game based on The Settlers of Catan"; - maintainers = with stdenv.lib.maintainers; [viric]; - platforms = with stdenv.lib.platforms; linux; + homepage = "http://pio.sourceforge.net/"; # https does not work + license = licenses.gpl2Plus; + maintainers = with maintainers; [ viric ]; + platforms = platforms.linux; }; } From 9ecc70c5f8e5a105ec0f354837e9f5bdff0e44a3 Mon Sep 17 00:00:00 2001 From: Raghav Sood Date: Mon, 23 Nov 2020 08:41:42 +0000 Subject: [PATCH 220/260] xteddy: fix src --- pkgs/applications/misc/xteddy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/xteddy/default.nix b/pkgs/applications/misc/xteddy/default.nix index 856ddb8ff50c..34ec17b0b9a5 100644 --- a/pkgs/applications/misc/xteddy/default.nix +++ b/pkgs/applications/misc/xteddy/default.nix @@ -6,8 +6,8 @@ stdenv.mkDerivation rec { src = fetchFromGitLab { domain = "salsa.debian.org"; owner = "games-team"; - repo = "xteddy"; - rev = "debian%2F${version}"; # %2F = urlquote("/"); + repo = pname; + rev = "debian/${version}"; sha256 = "0rm7w78d6qajq4fvi4agyqm0c70f3c1i0cy2jdb6kqql2k8w78qy"; }; From e346aa39086424a65fdad9d761b1e3d8bea00e9d Mon Sep 17 00:00:00 2001 From: 06kellyjac Date: Mon, 23 Nov 2020 09:13:33 +0000 Subject: [PATCH 221/260] trivy: 0.12.0 -> 0.13.0 --- pkgs/tools/admin/trivy/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/admin/trivy/default.nix b/pkgs/tools/admin/trivy/default.nix index 7af02e567c3d..df3aa7bd945e 100644 --- a/pkgs/tools/admin/trivy/default.nix +++ b/pkgs/tools/admin/trivy/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "trivy"; - version = "0.12.0"; + version = "0.13.0"; src = fetchFromGitHub { owner = "aquasecurity"; repo = pname; rev = "v${version}"; - sha256 = "0vgir7sc14lb0wqwr786sq77pda6rw7svwr6hxklckkn20d9z7z0"; + sha256 = "0d9lb1wzvxywg88fy85bicixd8wipvbhnwfckwl3p8shh0s9sr22"; }; - vendorSha256 = "0k6n73im14gaayl8rday2fhhizsv3klza146gx0dqm0694rqph0r"; + vendorSha256 = "0sashi3x3hccqm27dg6hjlvpgvx42jdxpgzigzm81md58zhk509x"; subPackages = [ "cmd/trivy" ]; From 8579a8cbd1a3836754684333e66ad12be0e958ae Mon Sep 17 00:00:00 2001 From: Bart Brouns Date: Mon, 23 Nov 2020 11:48:56 +0100 Subject: [PATCH 222/260] mamba: 1.7 -> 1.8 --- pkgs/applications/audio/mamba/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/mamba/default.nix b/pkgs/applications/audio/mamba/default.nix index b8c5fe13a3f4..dc8620fdd4e1 100644 --- a/pkgs/applications/audio/mamba/default.nix +++ b/pkgs/applications/audio/mamba/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "mamba"; - version = "1.7"; + version = "1.8"; src = fetchFromGitHub { owner = "brummer10"; repo = "Mamba"; rev = "v${version}"; - sha256 = "1i78snpyxap2r4899967nyfr8hg20k45nsbshs9h6hdxbfwhikbc"; + sha256 = "049gvdvvv3hkh1b47h0bia02g1p71agwh6g7q0n4yxz4d81b8kha"; fetchSubmodules = true; }; From d17400d335689b765b53ab79509a402343dd261f Mon Sep 17 00:00:00 2001 From: Stig Palmquist Date: Mon, 23 Nov 2020 12:38:23 +0100 Subject: [PATCH 223/260] perlPackages.IOAIO: init at 4.72 --- pkgs/top-level/perl-packages.nix | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index e81149f88649..bf3e7d3ac3ca 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -9941,6 +9941,25 @@ let }; }; + IOAIO = buildPerlPackage { + pname = "IO-AIO"; + version = "4.72"; + src = fetchurl { + url = "mirror://cpan/authors/id/M/ML/MLEHMANN/IO-AIO-4.72.tar.gz"; + sha256 = "17vfbqagpab8lsbf5nmp2frvxw7hvsyy2i87dpid8djzr615wnvf"; + }; + buildInputs = [ CanaryStability ]; + propagatedBuildInputs = [ commonsense ]; + nativeBuildInputs = stdenv.lib.optional stdenv.isDarwin shortenPerlShebang; + postInstall = stdenv.lib.optionalString stdenv.isDarwin '' + shortenPerlShebang $out/bin/treescan + ''; + meta = { + description = "Asynchronous/Advanced Input/Output"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + IOAll = buildPerlPackage { pname = "IO-All"; version = "0.87"; From a9f18c5783106ade605f8b5b2c87167f372c9914 Mon Sep 17 00:00:00 2001 From: Stig Palmquist Date: Mon, 23 Nov 2020 12:38:42 +0100 Subject: [PATCH 224/260] perlPackages.AnyEventAIO: init at 1.1 --- pkgs/top-level/perl-packages.nix | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index bf3e7d3ac3ca..7df0d7add393 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -332,6 +332,20 @@ let }; }; + AnyEventAIO = buildPerlPackage { + pname ="AnyEvent-AIO"; + version = "1.1"; + src = fetchurl { + url = "mirror://cpan/authors/id/M/ML/MLEHMANN/AnyEvent-AIO-1.1.tar.gz"; + sha256 = "0svh0mlp17g0ypq8bgs3h3axg8v7h0z45hryacgn6q8mcj65n43b"; + }; + propagatedBuildInputs = [ AnyEvent IOAIO ]; + meta = { + description = "Truly asynchronous file and directory I/O"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + AnyEventCacheDNS = buildPerlModule { pname = "AnyEvent-CacheDNS"; version = "0.08"; From 18f5b1c663ee8c53671a95b94e712ea7575fcab5 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 21 Nov 2020 05:45:36 +0000 Subject: [PATCH 225/260] python37Packages.flask-httpauth: 4.1.0 -> 4.2.0 --- pkgs/development/python-modules/flask-httpauth/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/flask-httpauth/default.nix b/pkgs/development/python-modules/flask-httpauth/default.nix index ad3e42876d0f..e5d55a2b9b5f 100644 --- a/pkgs/development/python-modules/flask-httpauth/default.nix +++ b/pkgs/development/python-modules/flask-httpauth/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "Flask-HTTPAuth"; - version = "4.1.0"; + version = "4.2.0"; src = fetchPypi { inherit pname version; - sha256 = "9e028e4375039a49031eb9ecc40be4761f0540476040f6eff329a31dabd4d000"; + sha256 = "8c7e49e53ce7dc14e66fe39b9334e4b7ceb8d0b99a6ba1c3562bb528ef9da84a"; }; propagatedBuildInputs = [ flask ]; From 645a14016804af2860344d40864f098e0a21f5de Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 21 Nov 2020 06:49:06 +0000 Subject: [PATCH 226/260] python37Packages.mongoengine: 0.20.0 -> 0.21.0 --- pkgs/development/python-modules/mongoengine/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mongoengine/default.nix b/pkgs/development/python-modules/mongoengine/default.nix index a47438d5a700..3ac24f7430d9 100644 --- a/pkgs/development/python-modules/mongoengine/default.nix +++ b/pkgs/development/python-modules/mongoengine/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "mongoengine"; - version = "0.20.0"; + version = "0.21.0"; disabled = isPy27; src = fetchFromGitHub { owner = "MongoEngine"; repo = pname; rev = "v${version}"; - sha256 = "0wc0cvjanlszn09n61jj38pq9wdlphkjgrp3c8hvd16754is3n7f"; + sha256 = "02amfdirdw3nc0kgiyax7yndk5b65g83kbjvwwxbgnlcrb9vjzcd"; }; propagatedBuildInputs = [ From c2c3c2eaa28e152aa3cc059a44b8720d422796e1 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 21 Nov 2020 01:57:47 +0000 Subject: [PATCH 227/260] python37Packages.google_cloud_bigtable: 1.5.1 -> 1.6.0 --- .../python-modules/google_cloud_bigtable/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google_cloud_bigtable/default.nix b/pkgs/development/python-modules/google_cloud_bigtable/default.nix index 310663df3505..0ce4209857a6 100644 --- a/pkgs/development/python-modules/google_cloud_bigtable/default.nix +++ b/pkgs/development/python-modules/google_cloud_bigtable/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "google-cloud-bigtable"; - version = "1.5.1"; + version = "1.6.0"; src = fetchPypi { inherit pname version; - sha256 = "25b869bb20ad6ee9f6e7fc3c95d973011ade8176af9197468686335e216c088e"; + sha256 = "e9b904ebe651c4699829f7379706a4cd00b19b6d72b24e78a4dca9bba3bb52ad"; }; checkInputs = [ pytest mock ]; From 4f322b7ef56ed760bd49833fdf09dabc596b4880 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 21 Nov 2020 01:43:16 +0000 Subject: [PATCH 228/260] python37Packages.gidgethub: 4.1.1 -> 4.2.0 --- pkgs/development/python-modules/gidgethub/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/gidgethub/default.nix b/pkgs/development/python-modules/gidgethub/default.nix index f3b3c8d5df3d..a28bcfb0ec1b 100644 --- a/pkgs/development/python-modules/gidgethub/default.nix +++ b/pkgs/development/python-modules/gidgethub/default.nix @@ -16,13 +16,13 @@ buildPythonPackage rec { pname = "gidgethub"; - version = "4.1.1"; + version = "4.2.0"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "cfabfa696d422ee91eaf1e3f01ea75e576721233cc3ea8badc7d86c30061df8e"; + sha256 = "5526cc2a06bfad707d10ec118393e0d33c2aa524605255d96958c22c93e8e7aa"; }; nativeBuildInputs = [ setuptools pytestrunner ]; From eaf730c4f86eea68d0ef17d7912df078adef78e5 Mon Sep 17 00:00:00 2001 From: freezeboy Date: Sat, 31 Oct 2020 22:46:56 +0100 Subject: [PATCH 229/260] python3Packages.nocaselist: init at 1.0.3 --- .../python-modules/nocaselist/default.nix | 28 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 30 insertions(+) create mode 100644 pkgs/development/python-modules/nocaselist/default.nix diff --git a/pkgs/development/python-modules/nocaselist/default.nix b/pkgs/development/python-modules/nocaselist/default.nix new file mode 100644 index 000000000000..055b55da45d3 --- /dev/null +++ b/pkgs/development/python-modules/nocaselist/default.nix @@ -0,0 +1,28 @@ +{ lib, buildPythonPackage, fetchPypi +, pytest +}: + +buildPythonPackage rec { + pname = "nocaselist"; + version = "1.0.3"; + + src = fetchPypi { + inherit pname version; + sha256 = "fm3st9hVY7kESRPJCH70tpG8PaTXrR2IlozepAlVMyY="; + }; + + checkInputs = [ + pytest + ]; + + pythonImportsCheck = [ + "nocaselist" + ]; + + meta = with lib; { + description = "A case-insensitive list for Python"; + homepage = "https://github.com/pywbem/nocaselist"; + license = licenses.lgpl21Plus; + maintainers = with maintainers; [ freezeboy ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index f4bd5bd3f631..dd0cd1342bd2 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4105,6 +4105,8 @@ in { nmigen-soc = callPackage ../development/python-modules/nmigen-soc { }; + nocaselist = callPackage ../development/python-modules/nocaselist { }; + nodeenv = callPackage ../development/python-modules/nodeenv { }; node-semver = callPackage ../development/python-modules/node-semver { }; From 33c26604ae82618074b7122e0c0fc0e033c7cab5 Mon Sep 17 00:00:00 2001 From: freezeboy Date: Sat, 31 Oct 2020 22:47:43 +0100 Subject: [PATCH 230/260] python3Packages.nocasedict: init at 1.0.1 --- .../python-modules/nocasedict/default.nix | 28 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 30 insertions(+) create mode 100644 pkgs/development/python-modules/nocasedict/default.nix diff --git a/pkgs/development/python-modules/nocasedict/default.nix b/pkgs/development/python-modules/nocasedict/default.nix new file mode 100644 index 000000000000..ffa761f206e3 --- /dev/null +++ b/pkgs/development/python-modules/nocasedict/default.nix @@ -0,0 +1,28 @@ +{ lib, buildPythonPackage, fetchPypi +, pytest +}: + +buildPythonPackage rec { + pname = "nocasedict"; + version = "1.0.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "bl1b0R3jP5PSJUXZ7SOguY+EDyzawNdJ0vqkYXrcd3I="; + }; + + checkInputs = [ + pytest + ]; + + pythonImportsCheck = [ + "nocasedict" + ]; + + meta = with lib; { + description = "A case-insensitive ordered dictionary for Python"; + homepage = "https://github.com/pywbem/nocasedict"; + license = licenses.lgpl21Plus; + maintainers = with maintainers; [ freezeboy ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index dd0cd1342bd2..1be929c37dd5 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4105,6 +4105,8 @@ in { nmigen-soc = callPackage ../development/python-modules/nmigen-soc { }; + nocasedict = callPackage ../development/python-modules/nocasedict { }; + nocaselist = callPackage ../development/python-modules/nocaselist { }; nodeenv = callPackage ../development/python-modules/nodeenv { }; From 891863830d87316f53a7bae581a53361df78d39f Mon Sep 17 00:00:00 2001 From: freezeboy Date: Sat, 31 Oct 2020 22:49:02 +0100 Subject: [PATCH 231/260] python3Packages.yamlloader: init at 0.5.5 --- .../python-modules/yamlloader/default.nix | 33 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 35 insertions(+) create mode 100644 pkgs/development/python-modules/yamlloader/default.nix diff --git a/pkgs/development/python-modules/yamlloader/default.nix b/pkgs/development/python-modules/yamlloader/default.nix new file mode 100644 index 000000000000..c8b2d5949cbf --- /dev/null +++ b/pkgs/development/python-modules/yamlloader/default.nix @@ -0,0 +1,33 @@ +{ lib, buildPythonPackage, fetchPypi +, pytest, pyyaml +}: + +buildPythonPackage rec { + pname = "yamlloader"; + version = "0.5.5"; + + src = fetchPypi { + inherit pname version; + sha256 = "3KtfFrObsD0Q3aTNTzDJQ2dexMd3GAf8Z+fxuzGb9Mg="; + }; + + propagatedBuildInputs = [ + pyyaml + ]; + + checkInputs = [ + pytest + ]; + + pythonImportsCheck = [ + "yaml" + "yamlloader" + ]; + + meta = with lib; { + description = "A case-insensitive list for Python"; + homepage = "https://github.com/Phynix/yamlloader"; + license = licenses.mit; + maintainers = with maintainers; [ freezeboy ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 1be929c37dd5..ba7eadea2b79 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7826,6 +7826,8 @@ in { yamllint = callPackage ../development/python-modules/yamllint { }; + yamlloader = callPackage ../development/python-modules/yamlloader { }; + yamlordereddictloader = callPackage ../development/python-modules/yamlordereddictloader { }; yanc = callPackage ../development/python-modules/yanc { }; From b8ba234c8c931ab437dbb8262e119ddee054139a Mon Sep 17 00:00:00 2001 From: freezeboy Date: Sat, 31 Oct 2020 22:50:16 +0100 Subject: [PATCH 232/260] python3Packages.pywbem: 1.0.2 at 1.1.1 --- .../python-modules/pywbem/default.nix | 31 +++++++------------ 1 file changed, 11 insertions(+), 20 deletions(-) diff --git a/pkgs/development/python-modules/pywbem/default.nix b/pkgs/development/python-modules/pywbem/default.nix index e944f693503e..698e4ef94ca3 100644 --- a/pkgs/development/python-modules/pywbem/default.nix +++ b/pkgs/development/python-modules/pywbem/default.nix @@ -1,53 +1,44 @@ { lib, buildPythonPackage, fetchPypi, libxml2 , m2crypto, ply, pyyaml, six, pbr, pythonOlder, isPy37 +, nocasedict, nocaselist, yamlloader, requests-mock , httpretty, lxml, mock, pytest, requests, decorator, unittest2 +, FormEncode, testfixtures, pytz }: buildPythonPackage rec { pname = "pywbem"; - version = "1.0.3"; - - # Support added in master https://github.com/pywbem/pywbem/commit/b2f2f1a151a30355bbc6652dca69a7b30bfe941e awaiting release - disabled = isPy37; + version = "1.1.2"; src = fetchPypi { inherit pname version; - sha256 = "a6c53d9426326e0e722a5b1af3a1d55810259cb3afa92ca5e4029a6d533cab37"; + sha256 = "9GpxbgNsXZJj2M5MvosNnEe+9pY+Qz64RD/7ZIDqmII="; }; propagatedBuildInputs = [ mock + nocasedict + nocaselist pbr ply pyyaml six + yamlloader ] ++ lib.optionals (pythonOlder "3.0") [ m2crypto ]; checkInputs = [ decorator + FormEncode httpretty libxml2 lxml pytest + pytz requests + requests-mock + testfixtures unittest2 ]; - postPatch = '' - # Uses deprecated library yamlordereddictloader - rm testsuite/test_client.py - - # Wants `wbemcli` in PATH - rm testsuite/test_wbemcli.py - - # Disables tests that use testfixtures which is currently broken by nonbuilding zope_component - rm testsuite/{test_logging,test_recorder,test_wbemconnection_mock}.* - ''; - - checkPhase = '' - pytest testsuite/ - ''; - meta = with lib; { description = "Support for the WBEM standard for systems management"; homepage = "https://pywbem.github.io"; From b29a031ca6ce51970d6114d2f8211441f2cd1af3 Mon Sep 17 00:00:00 2001 From: freezeboy Date: Sat, 31 Oct 2020 22:51:43 +0100 Subject: [PATCH 233/260] check-esxi-hardware: 20181001 -> 20200710 --- pkgs/servers/monitoring/plugins/esxi.nix | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/pkgs/servers/monitoring/plugins/esxi.nix b/pkgs/servers/monitoring/plugins/esxi.nix index 897d6395f95a..2dc355ecac3d 100644 --- a/pkgs/servers/monitoring/plugins/esxi.nix +++ b/pkgs/servers/monitoring/plugins/esxi.nix @@ -1,18 +1,17 @@ -{ stdenv, fetchFromGitHub, python2Packages }: +{ stdenv, fetchFromGitHub, python3Packages }: let bName = "check_esxi_hardware"; - pName = stdenv.lib.replaceStrings [ "_" ] [ "-" ] bName; -in python2Packages.buildPythonApplication rec { - name = "${pName}-${version}"; - version = "20181001"; +in python3Packages.buildPythonApplication rec { + pname = stdenv.lib.replaceStrings [ "_" ] [ "-" ] bName; + version = "20200710"; src = fetchFromGitHub { owner = "Napsty"; repo = bName; rev = version; - sha256 = "0azfacxcnnxxfqzrhh29k8cnjyr88gz35bi6h8fq931fl3plv10l"; + sha256 = "EC6np/01S+5SA2H9z5psJ9Pq/YoEyGdHL9wHUKKsNas="; }; dontBuild = true; @@ -21,13 +20,13 @@ in python2Packages.buildPythonApplication rec { installPhase = '' runHook preInstall - install -Dm755 -t $out/bin ${bName}.py - install -Dm644 -t $out/share/doc/${pName} README.md + install -Dm755 ${bName}.py $out/bin/${bName} + install -Dm644 -t $out/share/doc/${pname} README.md runHook postInstall ''; - propagatedBuildInputs = with python2Packages; [ pywbem ]; + propagatedBuildInputs = with python3Packages; [ pywbem requests setuptools ]; meta = with stdenv.lib; { homepage = "https://www.claudiokuenzler.com/nagios-plugins/"; From 6f6f2f2050ea1cbe22899053caa7f22077127d4d Mon Sep 17 00:00:00 2001 From: Artur Cygan Date: Wed, 19 Aug 2020 14:42:25 +0200 Subject: [PATCH 234/260] secp256k1: 2017-12-18 -> 2020-08-16 --- pkgs/tools/security/secp256k1/default.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/security/secp256k1/default.nix b/pkgs/tools/security/secp256k1/default.nix index b5e92a354541..d3b43d6adf69 100644 --- a/pkgs/tools/security/secp256k1/default.nix +++ b/pkgs/tools/security/secp256k1/default.nix @@ -20,13 +20,13 @@ stdenv.mkDerivation { # I can't find any version numbers, so we're just using the date of the # last commit. - version = "2017-12-18"; + version = "2020-08-16"; src = fetchFromGitHub { owner = "bitcoin-core"; repo = "secp256k1"; - rev = "f54c6c5083307b18224c953cf5870ea7ffce070b"; - sha256 = "0bxqmimm627g9klalg1vdbspmn52588v4a6cli3p8bn84ibsnzbm"; + rev = "670cdd3f8be25f81472b2d16dcd228b0d24a5c45"; + sha256 = "0ak2hrr0wznl5d9s905qwn5yds7k22i28d2jp957l4a8yf8cqv3s"; }; buildInputs = optionals enableJNI [ jdk ]; @@ -34,11 +34,14 @@ stdenv.mkDerivation { nativeBuildInputs = [ autoreconfHook ]; configureFlags = - [ "--enable-benchmark=no" "--enable-tests=no" "--enable-exhaustive-tests=no" ] ++ + [ "--enable-benchmark=no" "--enable-tests=yes" "--enable-exhaustive-tests=no" ] ++ optionals enableECDH [ "--enable-module-ecdh" "--enable-experimental" ] ++ optionals enableRecovery [ "--enable-module-recovery" ] ++ optionals enableJNI [ "--enable-jni" ]; + doCheck = true; + checkPhase = "./tests"; + meta = with stdenv.lib; { description = "Optimized C library for EC operations on curve secp256k1"; longDescription = '' From a3ab7a351893814f39c75d98a81208f2044f059d Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Fri, 20 Nov 2020 13:00:02 -0800 Subject: [PATCH 235/260] python3Packages.astropy: fix build --- pkgs/development/python-modules/astropy/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/astropy/default.nix b/pkgs/development/python-modules/astropy/default.nix index 1affa4b50538..2658ba99b1f9 100644 --- a/pkgs/development/python-modules/astropy/default.nix +++ b/pkgs/development/python-modules/astropy/default.nix @@ -2,6 +2,8 @@ , fetchPypi , buildPythonPackage , isPy3k +, cython +, jinja2 , numpy , pytest , pytest-astropy @@ -19,7 +21,7 @@ buildPythonPackage rec { sha256 = "cf69d1a3f140ca8fe1664202072201395495a73c334a69fc965fab6a6e1d281a"; }; - nativeBuildInputs = [ astropy-helpers ]; + nativeBuildInputs = [ astropy-helpers cython jinja2 ]; propagatedBuildInputs = [ numpy pytest ]; # yes it really has pytest in install_requires From 9f2cc6f478aa7ad57450fee9fd1bc84535b3b6bd Mon Sep 17 00:00:00 2001 From: georgewhewell Date: Thu, 19 Nov 2020 18:38:33 +0000 Subject: [PATCH 236/260] pythonPackages.pyro-api: init at 0.1.1 --- .../python-modules/pyro-api/default.nix | 23 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 25 insertions(+) create mode 100644 pkgs/development/python-modules/pyro-api/default.nix diff --git a/pkgs/development/python-modules/pyro-api/default.nix b/pkgs/development/python-modules/pyro-api/default.nix new file mode 100644 index 000000000000..78804941532a --- /dev/null +++ b/pkgs/development/python-modules/pyro-api/default.nix @@ -0,0 +1,23 @@ +{ buildPythonPackage, fetchPypi, lib }: + +buildPythonPackage rec { + version = "0.1.1"; + pname = "pyro-api"; + + src = fetchPypi { + inherit version pname; + sha256 = "0rhd7p61pf2vvflbdixp7sygblvvl9qbqavxj27910lr79vl4fdz"; + }; + + pythonImportsCheck = [ "pyroapi" ]; + + # tests require pyro-ppl which depends on this package + doCheck = false; + + meta = { + description = "Generic API for dispatch to Pyro backends."; + homepage = "http://pyro.ai"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ georgewhewell ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ba7eadea2b79..099fd106d2a3 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5460,6 +5460,8 @@ in { pyroma = callPackage ../development/python-modules/pyroma { }; + pyro-api = callPackage ../development/python-modules/pyro-api { }; + pyro-ppl = callPackage ../development/python-modules/pyro-ppl { }; pyroute2 = callPackage ../development/python-modules/pyroute2 { }; From 5ee22cefe238a8b52d87946c796b45c2265898a8 Mon Sep 17 00:00:00 2001 From: georgewhewell Date: Thu, 19 Nov 2020 18:38:44 +0000 Subject: [PATCH 237/260] pythonPackages.pyro-ppl: fix build, unmark as broken --- .../python-modules/pyro-ppl/default.nix | 25 +++++++++++-------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/pkgs/development/python-modules/pyro-ppl/default.nix b/pkgs/development/python-modules/pyro-ppl/default.nix index c3157c3d301c..54c2155a51b5 100644 --- a/pkgs/development/python-modules/pyro-ppl/default.nix +++ b/pkgs/development/python-modules/pyro-ppl/default.nix @@ -1,15 +1,17 @@ { buildPythonPackage, fetchPypi, lib, pytorch, contextlib2 -, graphviz, networkx, six, opt-einsum, tqdm }: +, graphviz, networkx, six, opt-einsum, tqdm, pyro-api }: + buildPythonPackage rec { - version = "1.4.0"; + version = "1.5.1"; pname = "pyro-ppl"; src = fetchPypi { inherit version pname; - sha256 = "e863321bee141fb8d20d621aedc5925c472e06c08988447490115f54a31487ad"; + sha256 = "00mprgf8pf9jq3kanxjldj00cg3nbfkb5yg0mdfbdi0b1rx3vnsa"; }; propagatedBuildInputs = [ + pyro-api pytorch contextlib2 # TODO(tom): graphviz pulls in a lot of dependencies - make @@ -22,18 +24,19 @@ buildPythonPackage rec { ]; # pyro not shipping tests do simple smoke test instead - checkPhase = '' - python -c "import pyro" - python -c "import pyro.distributions" - python -c "import pyro.infer" - python -c "import pyro.optim" - ''; + pythonImportsCheck = [ + "pyro" + "pyro.distributions" + "pyro.infer" + "pyro.optim" + ]; + + doCheck = false; meta = { description = "A Python library for probabilistic modeling and inference"; homepage = "http://pyro.ai"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ teh ]; - broken = true; + maintainers = with lib.maintainers; [ teh georgewhewell ]; }; } From cfba07ba0443be90375ed70c46b4a358de3ced96 Mon Sep 17 00:00:00 2001 From: freezeboy Date: Sat, 21 Nov 2020 00:19:13 +0100 Subject: [PATCH 238/260] supercollider: 3.11.0 -> 3.11.2 --- pkgs/development/interpreters/supercollider/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/interpreters/supercollider/default.nix b/pkgs/development/interpreters/supercollider/default.nix index eed0bdc5807e..acdffba8d72b 100644 --- a/pkgs/development/interpreters/supercollider/default.nix +++ b/pkgs/development/interpreters/supercollider/default.nix @@ -9,12 +9,12 @@ in mkDerivation rec { pname = "supercollider"; - version = "3.11.0"; + version = "3.11.2"; src = fetchurl { url = "https://github.com/supercollider/supercollider/releases/download/Version-${version}/SuperCollider-${version}-Source.tar.bz2"; - sha256 = "0l5j7sqrjlm85ql91ybcrvdykfkkwfqd7w3m4llbymw720r2ln9p"; + sha256 = "wiwyxrxIJnHU+49RZy33Etl6amJ3I1xNojEpEDA6BQY="; }; hardeningDisable = [ "stackprotector" ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ccc5cdc5ec8d..eec0cc87b3a7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10638,7 +10638,7 @@ in ssm-agent = callPackage ../applications/networking/cluster/ssm-agent { }; ssm-session-manager-plugin = callPackage ../applications/networking/cluster/ssm-session-manager-plugin { }; - supercollider = libsForQt514.callPackage ../development/interpreters/supercollider { + supercollider = libsForQt5.callPackage ../development/interpreters/supercollider { fftw = fftwSinglePrec; }; From a4a1d546ae3072d236d79b106f9f4d7f22ff6915 Mon Sep 17 00:00:00 2001 From: freezeboy Date: Thu, 19 Nov 2020 00:45:01 +0100 Subject: [PATCH 239/260] python3Packages.zha-quirks: 0.0.45 -> 0.0.46 Also unbreak the tests --- .../python-modules/zha-quirks/default.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/zha-quirks/default.nix b/pkgs/development/python-modules/zha-quirks/default.nix index 959e7f9c0d83..4554ffa58e2f 100644 --- a/pkgs/development/python-modules/zha-quirks/default.nix +++ b/pkgs/development/python-modules/zha-quirks/default.nix @@ -1,20 +1,20 @@ -{ stdenv, buildPythonPackage, fetchPypi -, aiohttp, zigpy -, pytest }: +{ lib, buildPythonPackage, fetchPypi +, aiohttp, zigpy, conftest, asynctest +, pytestCheckHook }: buildPythonPackage rec { pname = "zha-quirks"; - version = "0.0.45"; + version = "0.0.46"; - nativeBuildInputs = [ pytest ]; - buildInputs = [ aiohttp zigpy ]; + propagatedBuildInputs = [ aiohttp zigpy ]; + checkInputs = [ pytestCheckHook conftest asynctest ]; src = fetchPypi { inherit pname version; - sha256 = "9f0640d2844939118c631d88df18d78adfa17d01cac3e04d7156e5f99e41bc7d"; + sha256 = "OpkOMvxiPBCVagSv8Jxvth3gwVv4idFSlKoBaOO5JVg="; }; - meta = with stdenv.lib; { + meta = with lib; { description = "ZHA Device Handlers are custom quirks implementations for Zigpy"; homepage = "https://github.com/dmulcahey/zha-device-handlers"; license = licenses.asl20; From b11ca24578739b5446a8271b82097e65b980fdd8 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Mon, 23 Nov 2020 15:55:04 +0100 Subject: [PATCH 240/260] EmptyEpsilon: 2020.08.25 -> 2020.11.23 https://github.com/daid/SeriousProton/releases/tag/EE-2020.11.23 --- pkgs/games/empty-epsilon/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/games/empty-epsilon/default.nix b/pkgs/games/empty-epsilon/default.nix index c006adcb2719..dc761fb7d7a2 100644 --- a/pkgs/games/empty-epsilon/default.nix +++ b/pkgs/games/empty-epsilon/default.nix @@ -3,8 +3,8 @@ let major = "2020"; - minor = "08"; - patch = "25"; + minor = "11"; + patch = "23"; version = "${major}.${minor}.${patch}"; @@ -16,7 +16,7 @@ let owner = "daid"; repo = "SeriousProton"; rev = "EE-${version}"; - sha256 = "sha256-LiMEgsUpNBtduFO85ct6NYr/Smbzd8yE8Vce3voErLY="; + sha256 = "sha256-/gwJPlvvOCv5XIsiVgZ8Eb/7vgwG/V+s/soGVCfYrwo="; }; nativeBuildInputs = [ cmake ]; @@ -42,7 +42,7 @@ stdenv.mkDerivation { owner = "daid"; repo = "EmptyEpsilon"; rev = "EE-${version}"; - sha256 = "sha256-3QREWTq1Jq9T/FtGFVU4MidZeUQvRSVChn9JKxv2SiQ="; + sha256 = "sha256-HbF6xThR+ogNHbAcXF03DaBhwVhNEr5BJO7jeeVZH/o="; }; nativeBuildInputs = [ cmake ]; From e82c3b68e166fa71818ff8d5a16b4472cfdb2253 Mon Sep 17 00:00:00 2001 From: Max Wilson Date: Thu, 19 Nov 2020 22:02:01 -0500 Subject: [PATCH 241/260] steam: http -> https --- pkgs/games/steam/steam.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/games/steam/steam.nix b/pkgs/games/steam/steam.nix index 830c97b2fb7d..20ccba641e4a 100644 --- a/pkgs/games/steam/steam.nix +++ b/pkgs/games/steam/steam.nix @@ -9,7 +9,7 @@ in stdenv.mkDerivation { inherit version; src = fetchurl { - url = "http://repo.steampowered.com/steam/pool/steam/s/steam/steam_${version}.tar.gz"; + url = "https://repo.steampowered.com/steam/pool/steam/s/steam/steam_${version}.tar.gz"; sha256 = "0c5xy57gwr14vp3wy3jpqi5dl6y7n01p2dy4jlgl9bf9x7616r6n"; }; From 97178a01ed55d05dfc1396a719b4a8d4645323ee Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Fri, 20 Nov 2020 12:38:40 -0800 Subject: [PATCH 242/260] amoeba: fix build --- pkgs/games/amoeba/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/amoeba/default.nix b/pkgs/games/amoeba/default.nix index 0475a6b50b5a..945a9e8df212 100644 --- a/pkgs/games/amoeba/default.nix +++ b/pkgs/games/amoeba/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, amoeba-data, alsaLib, expat, freetype, gtk2, libvorbis, libGLU, pkgconfig }: +{ stdenv, fetchurl, amoeba-data, alsaLib, expat, freetype, gtk2, libvorbis, libGLU, xlibs, pkgconfig }: stdenv.mkDerivation rec { name = "amoeba-${version}-${debver}"; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { ''; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ alsaLib expat freetype gtk2 libvorbis libGLU ]; + buildInputs = [ alsaLib expat freetype gtk2 libvorbis libGLU xlibs.libXxf86vm ]; installPhase = '' mkdir -p $out/bin $out/share/man/man1/ From b543ade35062a3455b24dfcf2b15ef9a3638306c Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Fri, 20 Nov 2020 16:39:31 -0800 Subject: [PATCH 243/260] pythonPackages.psycopg2cffi: init at 2.8.1 --- .../python-modules/psycopg2cffi/default.nix | 39 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 41 insertions(+) create mode 100644 pkgs/development/python-modules/psycopg2cffi/default.nix diff --git a/pkgs/development/python-modules/psycopg2cffi/default.nix b/pkgs/development/python-modules/psycopg2cffi/default.nix new file mode 100644 index 000000000000..71c9017380ad --- /dev/null +++ b/pkgs/development/python-modules/psycopg2cffi/default.nix @@ -0,0 +1,39 @@ +{ buildPythonPackage, cffi, fetchFromGitHub, lib, postgresql, pytestCheckHook, six }: + +buildPythonPackage rec { + pname = "psycopg2cffi"; + version = "2.8.1"; + + # NB: This is a fork. + # The original repo exists at https://github.com/chtd/psycopg2cffi, however + # this is mostly unmaintained and does not build for PyPy. Given that the + # whole point of this cffi alternative to psycopg2 is to use it with PyPy, I + # chose to use a working fork instead, which was linked in the relevant issue: + # https://github.com/chtd/psycopg2cffi/issues/113#issuecomment-730548574 + # + # If/when these changes get merged back upstream we should revert to using the + # original source as opposed to the fork. + src = fetchFromGitHub { + owner = "Omegapol"; + repo = pname; + rev = "c202b25cd861d5e8f0f55c329764ff1da9f020c0"; + sha256 = "09hsnjkix1c0vlhmfvrp8pchpnz2ya4xrchyq15czj527nx2dmy2"; + }; + + nativeBuildInputs = [ postgresql ]; + propagatedBuildInputs = [ six cffi ]; + checkInputs = [ pytestCheckHook ]; + + # NB: The tests need a postgres instance running to test against, and so we + # disable them. + doCheck = false; + + pythonImportsCheck = [ "psycopg2cffi" ]; + + meta = with lib; { + description = "An implementation of the psycopg2 module using cffi"; + homepage = "https://pypi.org/project/psycopg2cffi/"; + license = with licenses; [ lgpl3Plus ]; + maintainers = with maintainers; [ lovesegfault ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 099fd106d2a3..125c27dcde8e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4779,6 +4779,8 @@ in { psycopg2 = callPackage ../development/python-modules/psycopg2 { }; + psycopg2cffi = callPackage ../development/python-modules/psycopg2cffi { }; + ptable = callPackage ../development/python-modules/ptable { }; ptest = callPackage ../development/python-modules/ptest { }; From fb3f81ba12ac1b5db9b2a30b873d3663dfeb8574 Mon Sep 17 00:00:00 2001 From: 06kellyjac Date: Fri, 13 Nov 2020 21:46:24 +0000 Subject: [PATCH 244/260] starboard-octant-plugin: init at 0.4.0 --- .../plugins/starboard-octant-plugin.nix | 26 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 1 + 2 files changed, 27 insertions(+) create mode 100644 pkgs/applications/networking/cluster/octant/plugins/starboard-octant-plugin.nix diff --git a/pkgs/applications/networking/cluster/octant/plugins/starboard-octant-plugin.nix b/pkgs/applications/networking/cluster/octant/plugins/starboard-octant-plugin.nix new file mode 100644 index 000000000000..df3821744a4b --- /dev/null +++ b/pkgs/applications/networking/cluster/octant/plugins/starboard-octant-plugin.nix @@ -0,0 +1,26 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "starboard-octant-plugin"; + version = "0.4.0"; + + src = fetchFromGitHub { + owner = "aquasecurity"; + repo = pname; + rev = "v${version}"; + sha256 = "0rqlks2f7cwx14xynaq95dxlzh18rsdz1w8a2ia24lvfwf8b95rf"; + }; + + vendorSha256 = "1fxb97wf69phhqwqg86wcx4dkzh67snzl1xfmj4wvfq16b9xj11j"; + + meta = with lib; { + description = "Octant plugin for viewing Starboard security information"; + longDescription = '' + This is an Octant plugin for Starboard which provides visibility into vulnerability assessment reports for + Kubernetes workloads stored as custom security resources. + ''; + homepage = src.meta.homepage; + license = licenses.asl20; + maintainers = with maintainers; [ jk ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index eec0cc87b3a7..4a582107395b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -482,6 +482,7 @@ in ociTools = callPackage ../build-support/oci-tools { }; octant = callPackage ../applications/networking/cluster/octant { }; + starboard-octant-plugin = callPackage ../applications/networking/cluster/octant/plugins/starboard-octant-plugin.nix { }; pathsFromGraph = ../build-support/kernel/paths-from-graph.pl; From d4de778e5b720acd6d2e5f14438f2bf35c500088 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Mon, 23 Nov 2020 15:26:35 +0000 Subject: [PATCH 245/260] =?UTF-8?q?sbt:=201.4.3=20=E2=86=92=201.4.4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/tools/build-managers/sbt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/build-managers/sbt/default.nix b/pkgs/development/tools/build-managers/sbt/default.nix index ec97ba4acb74..ebcae9e63eea 100644 --- a/pkgs/development/tools/build-managers/sbt/default.nix +++ b/pkgs/development/tools/build-managers/sbt/default.nix @@ -3,12 +3,12 @@ stdenv.mkDerivation rec { pname = "sbt"; - version = "1.4.3"; + version = "1.4.4"; src = fetchurl { url = "https://github.com/sbt/sbt/releases/download/v${version}/sbt-${version}.tgz"; - sha256 = "17h1lqnas276515y49fvpcysf8hkkrqq60kwbvyz68yvdrs5rrwr"; + sha256 = "0ibdq8g2bcanc7gcjslia89khlccn11inqmkx3y7pbqrc63y1yif"; }; patchPhase = '' From e0e4c2281c7aa9fa923d6b0c5a8f804ac9f222fe Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Mon, 23 Nov 2020 15:26:40 +0000 Subject: [PATCH 246/260] =?UTF-8?q?oh-my-zsh:=202020-11-20=20=E2=86=92=202?= =?UTF-8?q?020-11-22?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 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 f9cf4f54aad9..8a2a9902599a 100644 --- a/pkgs/shells/zsh/oh-my-zsh/default.nix +++ b/pkgs/shells/zsh/oh-my-zsh/default.nix @@ -5,15 +5,15 @@ , nix, nixfmt, jq, coreutils, gnused, curl, cacert }: stdenv.mkDerivation rec { - version = "2020-11-20"; + version = "2020-11-22"; pname = "oh-my-zsh"; - rev = "d57131dc49500a056c5b78b0fb444c7cb1ca83cd"; + rev = "7a76afd61e5daab6fb33f955930efa7f4cf16021"; src = fetchFromGitHub { inherit rev; owner = "ohmyzsh"; repo = "ohmyzsh"; - sha256 = "073c6ni7a74gvb98y9z7xsc4x0i6p1r2sxp6bwdv3z8lsj8mfbd7"; + sha256 = "0zcy8ydyk6ba497q7m0l24wqy8ri616304w76mcxmpv7hh6yfnqa"; }; installPhase = '' From 5ba4b41db68ef4bc74af5bbcca14eee2bbcbfef6 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Mon, 23 Nov 2020 15:26:42 +0000 Subject: [PATCH 247/260] =?UTF-8?q?sbt-extras:=202020-11-20=20=E2=86=92=20?= =?UTF-8?q?2020-11-23?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../development/tools/build-managers/sbt-extras/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/build-managers/sbt-extras/default.nix b/pkgs/development/tools/build-managers/sbt-extras/default.nix index c4228602871d..3b433ea5e77a 100644 --- a/pkgs/development/tools/build-managers/sbt-extras/default.nix +++ b/pkgs/development/tools/build-managers/sbt-extras/default.nix @@ -4,14 +4,14 @@ stdenv.mkDerivation rec { pname = "sbt-extras"; - rev = "42d33338e52cee115cebc3e4ee2acc1ca766f319"; - version = "2020-11-20"; + rev = "be2f5d98f13884a18eaf5205458f985575dbe13a"; + version = "2020-11-23"; src = fetchFromGitHub { owner = "paulp"; repo = "sbt-extras"; inherit rev; - sha256 = "0k0n8q8695rdy1vas9n9m9819rpmf38d3bbkffnn7mf7qa01mxq1"; + sha256 = "00acnj357fcwx7w25axaj0l5ync97ixsixg8s55r7hwibkxn0fa7"; }; dontBuild = true; From 5cfb696a1a14330f2e13995636b28ad68be1cc7d Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Mon, 23 Nov 2020 10:33:07 -0500 Subject: [PATCH 248/260] linux: 4.14.207 -> 4.14.208 --- pkgs/os-specific/linux/kernel/linux-4.14.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.14.nix b/pkgs/os-specific/linux/kernel/linux-4.14.nix index 2ab56a3c9302..b464ff04a62e 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.14.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.14.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "4.14.207"; + version = "4.14.208"; # 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/v4.x/linux-${version}.tar.xz"; - sha256 = "0a804hwh7cwbdd2gnr5n9i32b4s6gppd8iqihah4sn4q1nbm79vq"; + sha256 = "0vzn5kprjlgpgnjr1drjq97x9xbyfgigpgs42xsfw61h2qjy3b1q"; }; } // (args.argsOverride or {})) From 187e3bfa481a1486075e3aa2116e055f3bf1f7e6 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Mon, 23 Nov 2020 10:33:15 -0500 Subject: [PATCH 249/260] linux: 4.19.158 -> 4.19.159 --- pkgs/os-specific/linux/kernel/linux-4.19.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.19.nix b/pkgs/os-specific/linux/kernel/linux-4.19.nix index 1d3a837b1f14..c646387d4f15 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.19.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.19.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "4.19.158"; + version = "4.19.159"; # 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/v4.x/linux-${version}.tar.xz"; - sha256 = "0p5pim9izcscnk1a1kdlxbvyvxnnq9lqr1kwl86kfskr7yqy8n6n"; + sha256 = "195hlvr9zsa2km80rk71na1gl0222r2mk76rsqx0cxpgg7dhpjv0"; }; } // (args.argsOverride or {})) From 5ba51e7343777b659451de8f4ae5754ad5c8bace Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Mon, 23 Nov 2020 10:33:22 -0500 Subject: [PATCH 250/260] linux: 4.4.244 -> 4.4.245 --- pkgs/os-specific/linux/kernel/linux-4.4.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.4.nix b/pkgs/os-specific/linux/kernel/linux-4.4.nix index 67a5fcd341b7..38a89bcc091e 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.4.nix @@ -1,11 +1,11 @@ { stdenv, buildPackages, fetchurl, perl, buildLinux, ... } @ args: buildLinux (args // rec { - version = "4.4.244"; + version = "4.4.245"; extraMeta.branch = "4.4"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0brdj6z7flchig80ja0dhzcrpl743lh74s4r4r6prbgkksif9ahp"; + sha256 = "0g1cnis8496kp1ln922gxa7skfr096mdvv89la6676yw7dd4lhyi"; }; } // (args.argsOverride or {})) From 856d7ae12bf3c99567e1636c1329f8048dd9b626 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Mon, 23 Nov 2020 10:33:32 -0500 Subject: [PATCH 251/260] linux: 4.9.244 -> 4.9.245 --- pkgs/os-specific/linux/kernel/linux-4.9.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.9.nix b/pkgs/os-specific/linux/kernel/linux-4.9.nix index ecedd3dc59f6..60d9a9c0244c 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.9.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.9.nix @@ -1,11 +1,11 @@ { stdenv, buildPackages, fetchurl, perl, buildLinux, ... } @ args: buildLinux (args // rec { - version = "4.9.244"; + version = "4.9.245"; extraMeta.branch = "4.9"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "02givxp0y04qma5nlqbpyxdcl7xdb41p3gw7kgj2rmwdanhzaylr"; + sha256 = "1vxsd3g96vbykrmfnj9qali0p868h678qzcqvf4yrhya47k6pnnb"; }; } // (args.argsOverride or {})) From 716283fa3a9ed0d368d5bfff01702a98f3135ec0 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Mon, 23 Nov 2020 10:33:40 -0500 Subject: [PATCH 252/260] linux: 5.4.78 -> 5.4.79 --- 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 25a5c05d8387..4c076a77cc9a 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.78"; + version = "5.4.79"; # 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 = "0z8skj0w9jfrz9pfxaqfzqh82l13bz5lhza2wjsxk02cyhhnm226"; + sha256 = "09ffj66wlp27vx799lnixq4zdkin3y4pqaw4lx2a6rpz13xr3455"; }; } // (args.argsOverride or {})) From ca4d1602d767258b9c1be0187d4f872678d02fdc Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Mon, 23 Nov 2020 10:33:48 -0500 Subject: [PATCH 253/260] linux: 5.9.9 -> 5.9.10 --- pkgs/os-specific/linux/kernel/linux-5.9.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-5.9.nix b/pkgs/os-specific/linux/kernel/linux-5.9.nix index 95bb00a01427..9ac96d141149 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.9.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.9.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "5.9.9"; + version = "5.9.10"; # 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 = "1b8zysy0br131ydhc7ycxhh8d88r44xrmkf2q2lffy0jmy3d60m3"; + sha256 = "0c7hcqn1ld0axlipzpwmjr1jwizrhz5w6bdfbk9npbirx7rb54gm"; }; } // (args.argsOverride or {})) From 62531fd4e2684657b54105d47a747d9a0a1ecc46 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Mon, 23 Nov 2020 10:34:14 -0500 Subject: [PATCH 254/260] linux/hardened/patches/4.14: 4.14.207.a -> 4.14.208.a --- pkgs/os-specific/linux/kernel/hardened/patches.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index 59dc1a61d425..3c6dc4e3f5b6 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -1,8 +1,8 @@ { "4.14": { - "name": "linux-hardened-4.14.207.a.patch", - "sha256": "0rkpsp3hs8wypg8pgz804hgrncdchv2xmzy5ji7mkkjnasa6nr4w", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.207.a/linux-hardened-4.14.207.a.patch" + "name": "linux-hardened-4.14.208.a.patch", + "sha256": "09lmbfp6d4wpr2l7x1njq8q3sdiqz3rrjzkh6dqsdgwd9sdammb3", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.208.a/linux-hardened-4.14.208.a.patch" }, "4.19": { "name": "linux-hardened-4.19.158.a.patch", From dd721fc7b0f35c99399228a64d9d32b681d680f3 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Mon, 23 Nov 2020 10:34:16 -0500 Subject: [PATCH 255/260] linux/hardened/patches/4.19: 4.19.158.a -> 4.19.159.a --- pkgs/os-specific/linux/kernel/hardened/patches.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index 3c6dc4e3f5b6..0688aa35fec6 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -5,9 +5,9 @@ "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.208.a/linux-hardened-4.14.208.a.patch" }, "4.19": { - "name": "linux-hardened-4.19.158.a.patch", - "sha256": "0qjqnw3i6i6q80clfyrpid2gxg4r7vgskpxf1wk7x5wmfz9qahyn", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.158.a/linux-hardened-4.19.158.a.patch" + "name": "linux-hardened-4.19.159.a.patch", + "sha256": "0ma4lf97l625474xha5pfb8kph2lm3892g6z63fwd5s1vmva6ni6", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.159.a/linux-hardened-4.19.159.a.patch" }, "5.4": { "name": "linux-hardened-5.4.78.a.patch", From 640a842d578b33493a5108c23e2df864a0ef68b9 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Mon, 23 Nov 2020 10:34:18 -0500 Subject: [PATCH 256/260] linux/hardened/patches/5.4: 5.4.78.a -> 5.4.79.a --- pkgs/os-specific/linux/kernel/hardened/patches.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index 0688aa35fec6..0fabc3a9f332 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -10,9 +10,9 @@ "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.159.a/linux-hardened-4.19.159.a.patch" }, "5.4": { - "name": "linux-hardened-5.4.78.a.patch", - "sha256": "1k98c9ija8s1ggs7jq1r02l7y1g276hrqdvx6sn66ldkspkx4vmr", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.78.a/linux-hardened-5.4.78.a.patch" + "name": "linux-hardened-5.4.79.a.patch", + "sha256": "154i6ggj27qgsw562jcd93abcd54b4jllkr87h4k2ia6c0mfq4yb", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.79.a/linux-hardened-5.4.79.a.patch" }, "5.8": { "name": "linux-hardened-5.8.18.a.patch", From fa6abb2b612d06540ceb12352f59e8a81ef00569 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Mon, 23 Nov 2020 10:34:20 -0500 Subject: [PATCH 257/260] linux/hardened/patches/5.9: 5.9.9.a -> 5.9.10.a --- pkgs/os-specific/linux/kernel/hardened/patches.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index 0fabc3a9f332..c07c65d9be3f 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -20,8 +20,8 @@ "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.8.18.a/linux-hardened-5.8.18.a.patch" }, "5.9": { - "name": "linux-hardened-5.9.9.a.patch", - "sha256": "0qm4rs22rcclhcw691adwy939ch28ibq4ncngzp2x0wlvb2zggy2", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.9.9.a/linux-hardened-5.9.9.a.patch" + "name": "linux-hardened-5.9.10.a.patch", + "sha256": "08gdr5sq156lap08nirw4gjq26vr8k65kbjh4js2ndrb0v49f2lk", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.9.10.a/linux-hardened-5.9.10.a.patch" } } From d0225fcdae37b0f4822cce7ed64f9ae0b32d853e Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Mon, 23 Nov 2020 11:31:31 -0500 Subject: [PATCH 258/260] linux: 5.10-rc4 -> 5.10-rc5 --- pkgs/os-specific/linux/kernel/linux-testing.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix index 959d0f33d009..50c69deeb073 100644 --- a/pkgs/os-specific/linux/kernel/linux-testing.nix +++ b/pkgs/os-specific/linux/kernel/linux-testing.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "5.10-rc4"; + version = "5.10-rc5"; extraMeta.branch = "5.10"; # modDirVersion needs to be x.y.z, will always add .0 @@ -11,7 +11,7 @@ buildLinux (args // rec { src = fetchurl { url = "https://git.kernel.org/torvalds/t/linux-${version}.tar.gz"; - sha256 = "1fc68lka76n1dygyn914c4vhxqzwv951pp4kdkrr0jv5nvdnyplb"; + sha256 = "117yvvzdbf8garx484zdp75qgldj8xhr2sqk6mza6lgv4h7v3f4g"; }; # Should the testing kernels ever be built on Hydra? From ca021e9c32644142abcf2b1d9cfbae4829f20e1a Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Mon, 23 Nov 2020 17:37:32 +0100 Subject: [PATCH 259/260] html-proofer: 3.17.0 -> 3.17.2 --- pkgs/tools/misc/html-proofer/Gemfile.lock | 6 +++--- pkgs/tools/misc/html-proofer/gemset.nix | 12 ++++++------ 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/tools/misc/html-proofer/Gemfile.lock b/pkgs/tools/misc/html-proofer/Gemfile.lock index c918577fded7..88e3eada9161 100644 --- a/pkgs/tools/misc/html-proofer/Gemfile.lock +++ b/pkgs/tools/misc/html-proofer/Gemfile.lock @@ -6,7 +6,7 @@ GEM ethon (0.12.0) ffi (>= 1.3.0) ffi (1.13.1) - html-proofer (3.17.0) + html-proofer (3.17.2) addressable (~> 2.3) mercenary (~> 0.3) nokogumbo (~> 2.0) @@ -18,9 +18,9 @@ GEM mini_portile2 (2.4.0) nokogiri (1.10.10) mini_portile2 (~> 2.4.0) - nokogumbo (2.0.2) + nokogumbo (2.0.3) nokogiri (~> 1.8, >= 1.8.4) - parallel (1.20.0) + parallel (1.20.1) public_suffix (4.0.6) rainbow (3.0.0) typhoeus (1.4.0) diff --git a/pkgs/tools/misc/html-proofer/gemset.nix b/pkgs/tools/misc/html-proofer/gemset.nix index b617ebe7b0e5..c4974af034df 100644 --- a/pkgs/tools/misc/html-proofer/gemset.nix +++ b/pkgs/tools/misc/html-proofer/gemset.nix @@ -37,10 +37,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0vjy9r9lwr0rfxxadj4rfkl94b2rz6avgq4h54g6b7x1jmx6b3sd"; + sha256 = "05h3liirjx6wvh97vdl59hmwzgji1ih61xq1w5nl87cmhpsxaqsf"; type = "gem"; }; - version = "3.17.0"; + version = "3.17.2"; }; mercenary = { groups = ["default"]; @@ -79,20 +79,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0sxjnpjvrn10gdmfw2dimhch861lz00f28hvkkz0b1gc2rb65k9s"; + sha256 = "1nif9bn7zlizfcsk464b8n5gvspdim34hl7ldw2y7w4lcnwgg4zg"; type = "gem"; }; - version = "2.0.2"; + version = "2.0.3"; }; parallel = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1wci3dimgrap91nw5vnq4qa2vfmxga27m6sfmn8caskhzwxwv1dg"; + sha256 = "0055br0mibnqz0j8wvy20zry548dhkakws681bhj3ycb972awkzd"; type = "gem"; }; - version = "1.20.0"; + version = "1.20.1"; }; public_suffix = { groups = ["default"]; From 2c721183f7a840247ac3da37bc0575f70b223393 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20P=C3=A4tzel?= Date: Mon, 23 Nov 2020 15:57:45 +0100 Subject: [PATCH 260/260] pythonPackages.mesa: unstable-2019-12-09 -> 0.8.7 --- pkgs/development/python-modules/mesa/default.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/mesa/default.nix b/pkgs/development/python-modules/mesa/default.nix index f8fc43808fb3..78c0f1656a3c 100644 --- a/pkgs/development/python-modules/mesa/default.nix +++ b/pkgs/development/python-modules/mesa/default.nix @@ -4,8 +4,7 @@ buildPythonPackage rec { pname = "mesa"; - # contains several fixes for networkx 2.4 bump - version = "unstable-2019-12-09"; + version = "0.8.7"; # According to their docs, this library is for Python 3+. disabled = isPy27; @@ -13,8 +12,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "projectmesa"; repo = "mesa"; - rev = "86b343b42630e94d939029ff2cc609ff04ed40e9"; - sha256 = "1y41s1vd89vcsm4aia18ayfff4w2af98lwn5l9fcwp157li985vw"; + rev = "v${version}"; + sha256 = "0i1bpdqjrx4avgrzyqxpwxx86j11yhrq1j4kca854xahvhmwis19"; }; checkInputs = [ pytest ];