diff options
Diffstat (limited to 'nixpkgs/pkgs/applications/networking')
273 files changed, 8229 insertions, 5848 deletions
diff --git a/nixpkgs/pkgs/applications/networking/aether/default.nix b/nixpkgs/pkgs/applications/networking/aether/default.nix index ddb137137cf3..5682091237b4 100644 --- a/nixpkgs/pkgs/applications/networking/aether/default.nix +++ b/nixpkgs/pkgs/applications/networking/aether/default.nix @@ -9,31 +9,27 @@ let binaryName = "AetherP2P"; + aether-app-git = fetchFromGitHub { + owner = "aethereans"; + repo = "aether-app"; + rev = "53b6c8b2a9253cbf056ea3ebb077e0e08cbc5b1d"; + sha256 = "1kgkzh7ih2q9dsckdkinh5dbzvr7gdykf8yz6h8pyhvzyjhk1v0r"; + }; in stdenv.mkDerivation rec { pname = "aether"; version = "2.0.0-dev.15"; - srcs = [ - (fetchurl { - url = "https://static.getaether.net/Releases/Aether-${version}/2011262249.19338c93/linux/Aether-${version}%2B2011262249.19338c93.tar.gz"; - sha256 = "1hi8w83zal3ciyzg2m62shkbyh6hj7gwsidg3dn88mhfy68himf7"; - # % in the url / canonical filename causes an error - name = "aether-tarball.tar.gz"; - }) - (fetchFromGitHub { - owner = "aethereans"; - repo = "aether-app"; - rev = "53b6c8b2a9253cbf056ea3ebb077e0e08cbc5b1d"; - sha256 = "1kgkzh7ih2q9dsckdkinh5dbzvr7gdykf8yz6h8pyhvzyjhk1v0r"; - }) - ]; - - sourceRoot = "Aether-${version}+2011262249.19338c93"; + src = fetchurl { + url = "https://static.getaether.net/Releases/Aether-${version}/2011262249.19338c93/linux/Aether-${version}%2B2011262249.19338c93.tar.gz"; + sha256 = "1hi8w83zal3ciyzg2m62shkbyh6hj7gwsidg3dn88mhfy68himf7"; + # % in the url / canonical filename causes an error + name = "aether-tarball.tar.gz"; + }; # there is no logo in the tarball so we grab it from github and convert it in the build phase buildPhase = '' - convert ../source/aether-core/aether/client/src/app/ext_dep/images/Linux-Windows-App-Icon.png -resize 512x512 aether.png + convert ${aether-app-git}/aether-core/aether/client/src/app/ext_dep/images/Linux-Windows-App-Icon.png -resize 512x512 aether.png ''; dontWrapGApps = true; diff --git a/nixpkgs/pkgs/applications/networking/appgate-sdp/default.nix b/nixpkgs/pkgs/applications/networking/appgate-sdp/default.nix index e795e71554ef..987f6e0c1ca2 100644 --- a/nixpkgs/pkgs/applications/networking/appgate-sdp/default.nix +++ b/nixpkgs/pkgs/applications/networking/appgate-sdp/default.nix @@ -87,11 +87,11 @@ let in stdenv.mkDerivation rec { pname = "appgate-sdp"; - version = "5.5.1"; + version = "5.5.3"; src = fetchurl { url = "https://bin.appgate-sdp.com/${versions.majorMinor version}/client/appgate-sdp_${version}_amd64.deb"; - sha256 = "sha256-gN9UAdn61qUZBJLi/9QiHjNRohbQQDV1uVHgcpuXq+Y="; + sha256 = "sha256-qSo4JX/Jj+JkeetZIMw88MK7SzOgT8aNbQby2kJ91oo="; }; # just patch interpreter diff --git a/nixpkgs/pkgs/applications/networking/bee/bee.nix b/nixpkgs/pkgs/applications/networking/bee/bee.nix index 0e269bf9ab3f..d2f1740a573d 100644 --- a/nixpkgs/pkgs/applications/networking/bee/bee.nix +++ b/nixpkgs/pkgs/applications/networking/bee/bee.nix @@ -62,7 +62,7 @@ buildGoModule { ''; meta = with lib; { - homepage = "https://swarm.ethereum.org/"; + homepage = "https://github.com/ethersphere/bee"; description = "Ethereum Swarm Bee"; longDescription = '' A decentralised storage and communication system for a sovereign digital society. diff --git a/nixpkgs/pkgs/applications/networking/blocky/default.nix b/nixpkgs/pkgs/applications/networking/blocky/default.nix new file mode 100644 index 000000000000..842cbe30309d --- /dev/null +++ b/nixpkgs/pkgs/applications/networking/blocky/default.nix @@ -0,0 +1,33 @@ +{ buildGoModule +, fetchFromGitHub +, lib +, nixosTests +}: + +buildGoModule rec { + pname = "blocky"; + version = "0.17"; + + src = fetchFromGitHub { + owner = "0xERR0R"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-vG6QAI8gBI2nLRQ0nOFWQHihyzgmJu69rgkWlg3iW3E="; + }; + + # needs network connection and fails at + # https://github.com/0xERR0R/blocky/blob/development/resolver/upstream_resolver_test.go + doCheck = false; + + vendorSha256 = "sha256-+mpNPDejK9Trhw41SUXJPL/OX5wQR0QfA2+BXSlE0Jk="; + + meta = with lib; { + description = "Fast and lightweight DNS proxy as ad-blocker for local network with many features."; + homepage = "https://0xerr0r.github.io/blocky"; + changelog = "https://github.com/0xERR0R/blocky/releases"; + license = licenses.asl20; + maintainers = with maintainers; [ ratsclub ]; + }; + + passthru.tests = { inherit (nixosTests) blocky; }; +} diff --git a/nixpkgs/pkgs/applications/networking/breitbandmessung/default.nix b/nixpkgs/pkgs/applications/networking/breitbandmessung/default.nix new file mode 100644 index 000000000000..31f33be38670 --- /dev/null +++ b/nixpkgs/pkgs/applications/networking/breitbandmessung/default.nix @@ -0,0 +1,153 @@ +{ lib +, stdenv +, alsa-lib +, at-spi2-atk +, at-spi2-core +, atk +, autoPatchelfHook +, cairo +, cups +, dbus +, dpkg +, expat +, fetchurl +, gdk-pixbuf +, glib +, gtk3 +, libdrm +, libxkbcommon +, makeWrapper +, mesa +, nixosTests +, nspr +, nss +, pango +, pciutils +, systemd +, undmg +, writeShellScriptBin +, xorg +}: + +let + inherit (stdenv.hostPlatform) system; + + version = "3.1.0"; + + # At first start, the program checks for supported operating systems by calling `lsb_release -a` + # and only runs when it finds Debian/Ubuntu. So we present us as Debian an make it happy. + fake-lsb-release = writeShellScriptBin "lsb_release" '' + echo "Distributor ID: Debian" + echo "Description: Debian GNU/Linux 10 (buster)" + echo "Release: 10" + echo "Codename: buster" + ''; + + binPath = lib.makeBinPath [ + fake-lsb-release + ]; + + systemArgs = rec { + x86_64-linux = rec { + src = fetchurl { + url = "https://download.breitbandmessung.de/bbm/Breitbandmessung-${version}-linux.deb"; + sha256 = "sha256-jSP+H9ej9Wd+swBZSy9uMi2ExSTZ191FGZhqaocTl7w="; + }; + + dontUnpack = true; + + nativeBuildInputs = [ + autoPatchelfHook + dpkg + makeWrapper + ]; + + buildInputs = runtimeDependencies; + + runtimeDependencies = [ + alsa-lib + at-spi2-atk + at-spi2-core + atk + cairo + cups + dbus + expat + gdk-pixbuf + glib + gtk3 + libdrm + libxkbcommon + mesa + nspr + nss + pango + pciutils + systemd + xorg.libX11 + xorg.libXcomposite + xorg.libXdamage + xorg.libXext + xorg.libXfixes + xorg.libXrandr + xorg.libxcb + xorg.libxshmfence + ]; + + installPhase = '' + dpkg-deb -x $src $out + mkdir -p $out/bin + + chmod -R g-w $out + + addAutoPatchelfSearchPath --no-recurse $out/opt/Breitbandmessung + autoPatchelfFile $out/opt/Breitbandmessung/breitbandmessung + + makeWrapper $out/opt/Breitbandmessung/breitbandmessung $out/bin/breitbandmessung \ + --prefix PATH : ${binPath} + + mv $out/usr/share $out/share + rmdir $out/usr + + # Fix the desktop link + substituteInPlace $out/share/applications/breitbandmessung.desktop \ + --replace /opt/Breitbandmessung $out/bin + ''; + + dontAutoPatchelf = true; + dontPatchELF = true; + }; + + x86_64-darwin = { + src = fetchurl { + url = "https://download.breitbandmessung.de/bbm/Breitbandmessung-${version}-mac.dmg"; + sha256 = "sha256-2c8mDKJuHDSw7p52EKnJO5vr2kNTLU6r9pmGPANjE20="; + }; + + nativeBuildInputs = [ undmg ]; + + installPhase = '' + runHook preInstall + mkdir -p $out/Applications/Breitbandmessung.app + cp -R . $out/Applications/Breitbandmessung.app + runHook postInstall + ''; + }; + + aarch64-darwin = x86_64-darwin; + }.${system} or { src = throw "Unsupported system: ${system}"; }; +in +stdenv.mkDerivation ({ + pname = "breitbandmessung"; + inherit version; + + passthru.tests = { inherit (nixosTests) breitbandmessung; }; + + meta = with lib; { + description = "Broadband internet speed test app from the german Bundesnetzagentur"; + homepage = "https://www.breitbandmessung.de"; + license = licenses.unfree; + maintainers = with maintainers; [ b4dm4n ]; + platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-darwin" ]; + }; +} // systemArgs) diff --git a/nixpkgs/pkgs/applications/networking/browsers/brave/default.nix b/nixpkgs/pkgs/applications/networking/browsers/brave/default.nix index 464085d2116d..6fb29619ab9d 100644 --- a/nixpkgs/pkgs/applications/networking/browsers/brave/default.nix +++ b/nixpkgs/pkgs/applications/networking/browsers/brave/default.nix @@ -12,7 +12,6 @@ , freetype , gdk-pixbuf , glib -, gnome2 , gnome , gsettings-desktop-schemas , gtk3 @@ -60,7 +59,6 @@ rpath = lib.makeLibraryPath [ freetype gdk-pixbuf glib - gnome2.GConf gtk3 libdrm libpulseaudio @@ -93,11 +91,11 @@ in stdenv.mkDerivation rec { pname = "brave"; - version = "1.33.106"; + version = "1.35.103"; src = fetchurl { url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb"; - sha256 = "XSqlQyc6gJthchfmq29d5+OVVSaxYG7zpVZNFZpl67s="; + sha256 = "UgperKruN2quKdFTf/iTa+dd2GB57nt+mu6KBe4VvYk="; }; dontConfigure = true; @@ -174,7 +172,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://brave.com/"; description = "Privacy-oriented browser for Desktop and Laptop computers"; - changelog = "https://github.com/brave/brave-browser/blob/master/CHANGELOG_DESKTOP.md"; + changelog = "https://github.com/brave/brave-browser/blob/master/CHANGELOG_DESKTOP.md#" + lib.replaceStrings [ "." ] [ "" ] version; longDescription = '' Brave browser blocks the ads and trackers that slow you down, chew up your bandwidth, and invade your privacy. Brave lets you diff --git a/nixpkgs/pkgs/applications/networking/browsers/chromium/common.nix b/nixpkgs/pkgs/applications/networking/browsers/chromium/common.nix index 7edec1f5a625..0f021b207508 100644 --- a/nixpkgs/pkgs/applications/networking/browsers/chromium/common.nix +++ b/nixpkgs/pkgs/applications/networking/browsers/chromium/common.nix @@ -266,7 +266,7 @@ let google_api_key = "AIzaSyDGi15Zwl11UNe6Y-5XW_upsfyw31qwZPI"; # Optional features: - use_gio = gnomeSupport; + use_gio = gnomeSupport || chromiumVersionAtLeast "99"; use_gnome_keyring = gnomeKeyringSupport; use_cups = cupsSupport; @@ -292,7 +292,6 @@ let enable_hangout_services_extension = false; enable_js_type_check = false; enable_mdns = false; - enable_nacl_nonsfi = false; enable_one_click_signin = false; enable_reading_list = false; enable_remoting = false; diff --git a/nixpkgs/pkgs/applications/networking/browsers/chromium/default.nix b/nixpkgs/pkgs/applications/networking/browsers/chromium/default.nix index c4521c89caa6..b3738ed8c1dd 100644 --- a/nixpkgs/pkgs/applications/networking/browsers/chromium/default.nix +++ b/nixpkgs/pkgs/applications/networking/browsers/chromium/default.nix @@ -182,8 +182,9 @@ in stdenv.mkDerivation { in with lib; '' mkdir -p "$out/bin" - eval makeWrapper "${browserBinary}" "$out/bin/chromium" \ - --add-flags ${escapeShellArg (escapeShellArg commandLineArgs)} + makeWrapper "${browserBinary}" "$out/bin/chromium" \ + --add-flags ${escapeShellArg commandLineArgs} \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--enable-features=UseOzonePlatform --ozone-platform=wayland}}" ed -v -s "$out/bin/chromium" << EOF 2i diff --git a/nixpkgs/pkgs/applications/networking/browsers/chromium/get-commit-message.py b/nixpkgs/pkgs/applications/networking/browsers/chromium/get-commit-message.py index b0fbe20db8ef..85ebb8a7b935 100755 --- a/nixpkgs/pkgs/applications/networking/browsers/chromium/get-commit-message.py +++ b/nixpkgs/pkgs/applications/networking/browsers/chromium/get-commit-message.py @@ -39,7 +39,7 @@ for entry in feed.entries: print('chromium: TODO -> ' + version + '\n') print(url) if fixes := re.search(r'This update includes .+ security fixes\.', content).group(0): - zero_days = re.search(r'Google is aware( of reports)? that .+ in the wild\.', content) + zero_days = re.search(r'Google is aware( of reports)? th(e|at) .+ in the wild\.', content) if zero_days: fixes += " " + zero_days.group(0) print('\n' + '\n'.join(textwrap.wrap(fixes, width=72))) diff --git a/nixpkgs/pkgs/applications/networking/browsers/chromium/upstream-info.json b/nixpkgs/pkgs/applications/networking/browsers/chromium/upstream-info.json index e373fac57915..d5af18534863 100644 --- a/nixpkgs/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/nixpkgs/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -1,63 +1,63 @@ { "stable": { - "version": "96.0.4664.110", - "sha256": "1s3ilq0ik36qgqp7l88gfd1yx97zscn8yr2kprsrjfp9q8lrva9n", - "sha256bin64": "17cyj1jx47fz6y26f196xhlngrw5gnjgcvapvgkgswlwd7y67jcb", + "version": "98.0.4758.102", + "sha256": "0gpk13k8pfk65vinlmkg3p7mm0qb8z35psajkxzx0v3n2bllfns1", + "sha256bin64": "0pfrakkfqw6ni96s2d0z50mpd63maic9rsc64zd85vh2jkmzskw6", "deps": { "gn": { - "version": "2021-09-24", + "version": "2021-12-07", "url": "https://gn.googlesource.com/gn", - "rev": "0153d369bbccc908f4da4993b1ba82728055926a", - "sha256": "0y4414h8jqsbz5af6pn91c0vkfp4s281s85g992xfyl785c5zbsi" + "rev": "fc295f3ac7ca4fe7acc6cb5fb052d22909ef3a8f", + "sha256": "02bx3bp85kkis704gndb6jvjph7gv3ij746bq4anl30kfrkpcifh" } }, "chromedriver": { - "version": "96.0.4664.45", - "sha256_linux": "15wybxlh38sw7f2bzalf9ivfp8262cpcvhq08nw9d2cj3j39f13m", - "sha256_darwin": "0r3b8wgbd8xjb09f4vc402gp77y2aqjk9hpqvvr6xgdr7nqym20f", - "sha256_darwin_aarch64": "1yynw8ngs2655blnf1s6r9flbxlwgaybdvgl6r6h7ppl974dl7rm" + "version": "98.0.4758.102", + "sha256_linux": "054qm8agzj6axvasa7b10cz4jz8zfmmblvvifdnyhn4p3zqx74im", + "sha256_darwin": "1m6slaw7lqhlhmjjyaam7c21yyahpi34fv9vldqhra07b5r88dny", + "sha256_darwin_aarch64": "0n0lsk75dxv94b2zv25yqysyfbvbqhfql3bbp9abl1jcp00m8s3l" } }, "beta": { - "version": "97.0.4692.71", - "sha256": "0z7ximvm4a78kxyp4j0i2jzklxazpw6jcqi9jkaf8bvq9ga8kqca", - "sha256bin64": "18wr4pgzfcvvdpvvxhpd4as2qnyggq9f8z90ikdz8yj8i71l5wnc", + "version": "99.0.4844.35", + "sha256": "085vsfp08y4vmv73z37ncynvax645qm302h883skx9xk4yyjkynj", + "sha256bin64": "18kys3f0zjkrp1x2vkcc9vx6vhj5yfrpb88lli7ql6q9b0ijjjn4", "deps": { "gn": { - "version": "2021-11-03", + "version": "2022-01-10", "url": "https://gn.googlesource.com/gn", - "rev": "90294ccdcf9334ed25a76ac9b67689468e506342", - "sha256": "0n0jml8s00ayy186jzrf207hbz70pxiq426znxwxd4gjcp60scsa" + "rev": "80a40b07305373617eba2d5878d353532af77da3", + "sha256": "1103lf38h7412949j6nrk48m2vv2rrxacn42sjg33lg88nyv7skv" } } }, "dev": { - "version": "98.0.4758.9", - "sha256": "1sq6v2hdhpk12w37sz7jf5vwkn72ydcqzcxysf7hs2flcfgscydj", - "sha256bin64": "1jfj08jpxji2q890zbvpvmgf5bjqgvigkr1hg8ch8vaaybs5wr04", + "version": "100.0.4892.0", + "sha256": "03f003prk0vqxac7l0sp3nfhh3adlrdx60dklm74v504ykdw84yn", + "sha256bin64": "00033b2iq3aw5pvgm5nbh99sz8mj98rj32h1m6iw2xxwqaij06qw", "deps": { "gn": { - "version": "2021-12-07", + "version": "2022-01-21", "url": "https://gn.googlesource.com/gn", - "rev": "fc295f3ac7ca4fe7acc6cb5fb052d22909ef3a8f", - "sha256": "02bx3bp85kkis704gndb6jvjph7gv3ij746bq4anl30kfrkpcifh" + "rev": "0725d7827575b239594fbc8fd5192873a1d62f44", + "sha256": "1dzdvcn2r5c9giknvasf3y5y4901kav7igivjvrpww66ywsj8fzr" } } }, "ungoogled-chromium": { - "version": "96.0.4664.110", - "sha256": "1s3ilq0ik36qgqp7l88gfd1yx97zscn8yr2kprsrjfp9q8lrva9n", - "sha256bin64": "17cyj1jx47fz6y26f196xhlngrw5gnjgcvapvgkgswlwd7y67jcb", + "version": "98.0.4758.102", + "sha256": "0gpk13k8pfk65vinlmkg3p7mm0qb8z35psajkxzx0v3n2bllfns1", + "sha256bin64": "0pfrakkfqw6ni96s2d0z50mpd63maic9rsc64zd85vh2jkmzskw6", "deps": { "gn": { - "version": "2021-09-24", + "version": "2021-12-07", "url": "https://gn.googlesource.com/gn", - "rev": "0153d369bbccc908f4da4993b1ba82728055926a", - "sha256": "0y4414h8jqsbz5af6pn91c0vkfp4s281s85g992xfyl785c5zbsi" + "rev": "fc295f3ac7ca4fe7acc6cb5fb052d22909ef3a8f", + "sha256": "02bx3bp85kkis704gndb6jvjph7gv3ij746bq4anl30kfrkpcifh" }, "ungoogled-patches": { - "rev": "96.0.4664.110-1", - "sha256": "098mfcd1lr2hhlic0i1l5gxsq71axvqnn4gayr4r9j6nbj9byf4h" + "rev": "98.0.4758.102-1", + "sha256": "0baz90fnzpldw0wwibhmh4pmki7vlpci9b9vvifa0rj5cwckl8a0" } } } diff --git a/nixpkgs/pkgs/applications/networking/browsers/falkon/default.nix b/nixpkgs/pkgs/applications/networking/browsers/falkon/default.nix index f39ae2f16691..6b525fbca9f7 100644 --- a/nixpkgs/pkgs/applications/networking/browsers/falkon/default.nix +++ b/nixpkgs/pkgs/applications/networking/browsers/falkon/default.nix @@ -8,23 +8,15 @@ mkDerivation rec { pname = "falkon"; - version = "3.1.0"; + version = "3.2.0"; src = fetchFromGitHub { owner = "KDE"; repo = "falkon"; rev = "v${version}"; - sha256 = "1w64slh9wpcfi4v7ds9wci1zvwh0dh787ndpi6hd4kmdgnswvsw7"; + sha256 = "sha256-esi9YWd1PtQpDBhI1NtWEjZIoMoNUpAF+kQad67mLzE="; }; - patches = [ - # fixes build with qt5 5.14 - (fetchpatch { - url = "https://github.com/KDE/falkon/commit/bbde5c6955c43bc744ed2c4024598495de908f2a.diff"; - sha256 = "0f7qcddvvdnij3di0acg7jwvwfwyd0xizlav4wccclbj8x7qp5ld"; - }) - ]; - preConfigure = '' export NONBLOCK_JS_DIALOGS=true export KDE_INTEGRATION=true diff --git a/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix b/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix index 5a38d9d8d7a0..7fa0ae18549f 100644 --- a/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix +++ b/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix @@ -1,985 +1,985 @@ { - version = "96.0b3"; + version = "98.0b5"; sources = [ - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/ach/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/ach/firefox-98.0b5.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha256 = "780a8e746a4a638ab9cfb69b1dca27135cdf64809883551c0e79e0409487660a"; + sha256 = "d572a56bbdaf004ff33ca5ea1079680a2af9b5b8ba9ca3989b34ba6d5d34abbb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/af/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/af/firefox-98.0b5.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "44b86759ab9a5bb675d9d05029cef6e0be17eecbe140ad1ce5d0fc554a8dcf36"; + sha256 = "ac544b28cf44236f1d1e46ee5e1b3484c97cf732bc857eeae3682b501ccd9867"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/an/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/an/firefox-98.0b5.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha256 = "e4d73a06f2a918395c0428c4190cc080dd03a29a74f1677f297b6bd65ad488b3"; + sha256 = "18eff485b959812f916f6925d4adf32a30e1fd3b82040db1ffb1c03aa9e76a5e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/ar/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/ar/firefox-98.0b5.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "256f2b6d21cccddcaed24b511f71ca4bafdfc08ce989ad1eef45ab9bc009611f"; + sha256 = "cb33eedbc186386dbe5bd96d294a202a3f4d43e72affcf62b2f5608580262902"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/ast/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/ast/firefox-98.0b5.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "bba26f8b77d27c03a969e08d8974ec9f7a85e0237ca3acacc884f945a9b18832"; + sha256 = "34461a0d3e89768cf951f7a1d12a61732a66b38cc7f4493b028b1c49f810e265"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/az/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/az/firefox-98.0b5.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha256 = "da1c22e87189c991ce27929abe2172ccce6f4a25c44e836ee865550e259e6218"; + sha256 = "6a7084f81c269b572f4d8b19ac686a97187be217e1a8e1a6d993470f60374d1b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/be/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/be/firefox-98.0b5.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "183bce430aa7ed98b72eb4492c5a9cf76a2e9961069140f272e438a5d20debc3"; + sha256 = "85b951a4c3a9f73f74cf4374b142fe86306e26480461e665fee92d4d920fa716"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/bg/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/bg/firefox-98.0b5.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "145c856566f9063ba861ade8220071623df793b279bf2a3821742f9e0023af74"; + sha256 = "03de393f231f1b54babb254a139e71a051861656f050f31605a8351f2a33507b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/bn/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/bn/firefox-98.0b5.tar.bz2"; locale = "bn"; arch = "linux-x86_64"; - sha256 = "dce9827d70a5a7d182316d7286bc6cb4b5442d65bb5c3573d04b235b4a18616a"; + sha256 = "ba3b9743502aeb38f510873854dd054ba21250394097f12b2f3ff8883c6c1e97"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/br/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/br/firefox-98.0b5.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "0df80c30b78cde55015fab74763c7606f75eff72804166b5095eb321b51fa4da"; + sha256 = "56478d56ef1a6e4340262eff9f5f64925aa62bea4774e41cfe97069760dc3505"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/bs/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/bs/firefox-98.0b5.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha256 = "1df386c5001327bea3f5675acd52946dab3d0d8ff0bbcf65f8b291ac26a565d0"; + sha256 = "b76eb84e8c2282a7ca11cd3208aa4445b52ff24fd06e0f4a2445b326c71b42c3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/ca-valencia/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/ca-valencia/firefox-98.0b5.tar.bz2"; locale = "ca-valencia"; arch = "linux-x86_64"; - sha256 = "c271c6d047c4dee3ea806caec31e2719acaa55aaa608ad86283de45e22cd05f5"; + sha256 = "4f9325f1d1fbaa28a5be6599e2db4f55e69e5e10b0f11496e1c36e83c50ceced"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/ca/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/ca/firefox-98.0b5.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "30a2deb4dd1bb82406731f71001950d01ffbb9aa7a24f333e8f322fb23032f6a"; + sha256 = "1f110c78565cace8c1def9c0343c0d4b2a0632d25a03fc0cda9462daa8292d41"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/cak/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/cak/firefox-98.0b5.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "cbf31b80937ae4a425f4d5507a7f654958e7e93a6c12683c08982a3d14d2ba9a"; + sha256 = "843ef97f99c5d0396485e9821a0600a2f2a724ff76b147c7883c3b05c89c34ef"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/cs/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/cs/firefox-98.0b5.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "72c098b2512a40ce3437f7d329b46e648e4fd6e2d2b7ecdd1e3478b090cd50fc"; + sha256 = "52394ebc3694fefedf33a65626020bf78610bd8d8fd732605f254d0532f3e804"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/cy/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/cy/firefox-98.0b5.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "0c05717640e8ff2e0fb52a510dcf3a35db34b911cbc85d2721e7e7e6307f0083"; + sha256 = "5952065bc634b3a008798ac329172e68eafb9c18c84e99520465ffeadd36ebae"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/da/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/da/firefox-98.0b5.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "c29f815b19cc03e7d628fef8c86e4f06862e268b760e230cc7bdd04c2618a852"; + sha256 = "7346203ba006416b010c05ba217792caa53fe5472b1239450100d0d75b2be301"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/de/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/de/firefox-98.0b5.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "6968c6d591a3b43e169dca16628eb4675b8803b90aaa8f605ae35f2115a75d3e"; + sha256 = "272d56431cae04275648d25cb9b85c0d555cb839eed6bcd9bb8c088ba4983d58"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/dsb/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/dsb/firefox-98.0b5.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "47a8cac44c7d813f23ce263e698dad6dad44181c570055973879e57beeb82ee1"; + sha256 = "5ce9c6d56b286aacf049580ca971cc5737498f62b6a9c177aa7634bec8ad13e7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/el/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/el/firefox-98.0b5.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "476fcbf047743ea61d6e68d37a1bf1203d239667faf98abf5192f15e1b13b927"; + sha256 = "2624a40add509da75dc22e8438147b7556fab463dd44793b918bd91826a5a3f7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/en-CA/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/en-CA/firefox-98.0b5.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "26abc7c1e8aeef3e4898e1dcd120651dd30400a6da9a1c2af5ff02b1b406573d"; + sha256 = "bb91268d5bdd7ca82642363c33af05223375596c4b2d4cf51195d1478985ec5b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/en-GB/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/en-GB/firefox-98.0b5.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "66b299656f71875f59287c8da5a3c2b0bca53fb69ca9b0f7a0402ad1eeb1aa87"; + sha256 = "5c9e84e4116e2d65f87a8959bf384b51e9e1edbaab165d506c9e8051813bc767"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/en-US/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/en-US/firefox-98.0b5.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "37c37849f3d7125da14e3a71c8a9fa522b8756fea7e3e3f8a5792ef7c3285466"; + sha256 = "389b11d44e6b50684e309b89bbc7baca1e86a2be26c3809b490b77fc3ccdb48a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/eo/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/eo/firefox-98.0b5.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha256 = "cd3ea6fbcbc947acbe1767be78a14fdce4c03b0b44d53e3670a0ffc5ba14dc68"; + sha256 = "fd1a3ec9000492ddd64eaa2fb60bcbbd2a7af8b4fccbe78690378eb9ac365c07"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/es-AR/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/es-AR/firefox-98.0b5.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "f661d48a11f66fc326e86126aa5c0de37311042a454719cc609a1c7ff102e423"; + sha256 = "788018660eaf7b02a5e0279447e508863ebb75fed18299d4ae0279cb36f842a2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/es-CL/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/es-CL/firefox-98.0b5.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha256 = "056f25729222d95316034f0365679ff449a58e4d77624687cf9417e10b52085f"; + sha256 = "3556d494d08f129aec339642a28dcae9f051cb0baef4344cf5bcec7326186f26"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/es-ES/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/es-ES/firefox-98.0b5.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "64da785531a3e2f4b8179f3e9b551723bcce4c1210e184a03c98ec3e2ff1e220"; + sha256 = "15a3d9d872d3e2e3ef2a795767b64a495f4b992aa72a80558d67b8f294d5b959"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/es-MX/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/es-MX/firefox-98.0b5.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha256 = "34af4d1a91b7e09e80d2f89730851c508521d6518b0aa2d3ff1924a34f7efba6"; + sha256 = "9bcc96e62902977cb2f5f10fad4ada00c19a453d4c598787e92ce4e54e6adfdf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/et/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/et/firefox-98.0b5.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "a1b50e3ba15ae806ffd89ef22e12ee85ceda1eb17f458fb7e8abd6c4355a75d3"; + sha256 = "b0cbbc22406961bd076d0a8792e7a166280a52e29804129db8c39f5f24248fe3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/eu/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/eu/firefox-98.0b5.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "90ec59ce7774bade28052f4f8b5861476e3fb52878e48c8909d250fb6b6e17ad"; + sha256 = "d82729e8551f3d4e9782d70c30e0aac3d1033acd57c0bb61c3073dfc7d1e8642"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/fa/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/fa/firefox-98.0b5.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha256 = "3f09ea9568982a451798dece61a8f19131c4c88e98e2c03b1808503051873e73"; + sha256 = "66de45bf96a23242566ef04ae6e402e08b35964e42c704e4f4350171f28e3b74"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/ff/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/ff/firefox-98.0b5.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha256 = "a483b0aaf523fe404a6b3ec07611812a5160cf8a5c05b0fee1afa6838e1949a6"; + sha256 = "851ab51c00f3e59439dd7f482fa3361634600e5c2b63be5784472df912288b86"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/fi/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/fi/firefox-98.0b5.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "12e17583c8932cfa6622ff68490e29d9e09d6862e8443ee1cd1d72f21f6516a7"; + sha256 = "b1857154f9a49ac0acf8e99bf2491af4dd84cab2b1f1965acdd321311305c7a1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/fr/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/fr/firefox-98.0b5.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "ac3809a3344ac239183a68551eebe5689c53c11c0a399ff4a94452a35ad86c81"; + sha256 = "59e4d31c6532096215b223f41a3a5e59c29db0e9007d8b26260997878223efe7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/fy-NL/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/fy-NL/firefox-98.0b5.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "9385c2bed2d3aa9b65651f396d9a2c6f8762dc4295319757f949fc9f04a6c717"; + sha256 = "56707c16711c7c90cadd66eaf3084498769827fdacf6fb73b4eca60185c1b2d6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/ga-IE/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/ga-IE/firefox-98.0b5.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "f65df6f4d93a39b5bbb1c4c7827eb094a632dff7255b78affc7cc9794a28d3fa"; + sha256 = "afd4b994549beb079ec0d04669824904d7f16e9ddd9cf323095ce32277d7865a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/gd/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/gd/firefox-98.0b5.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "3cbbd914559e96205e665ad46cd9ba193428cd8d83df90c4fd4849cc11db13be"; + sha256 = "1e96751aeee49e229afc0715d2d1b93f216b159a716075b6481d59add59c8e35"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/gl/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/gl/firefox-98.0b5.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "7b27f83190cdb84d2d9fca9bcb37bd1128086adfe772e676141fd9960c0de872"; + sha256 = "2950aed5bf345de03873a8a0ab35885aa766a88776213d5f58798235e8130094"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/gn/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/gn/firefox-98.0b5.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha256 = "0194000216bb517390d301166c37228e2128f3b15280cf21629fe13de5f536da"; + sha256 = "6f4afd656511c8cfbb933b8680ddee2bbf3ff584021193058e7eacabd152cf03"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/gu-IN/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/gu-IN/firefox-98.0b5.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha256 = "24c92df984f7eff4f294e27324420b0350c4069acade0a304a3e433ea11fadd7"; + sha256 = "0b9cd7febe314aed67e85fba904b000dccd97d983e944a093699d80eb53134b0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/he/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/he/firefox-98.0b5.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "5a006adead9f8e647eaebbef8ca56a47116ad2fd1c308c4986aa81bf7618f815"; + sha256 = "6a122b779d99bc42ddbdd85e97649953185f472c97d352d4e0f0cf96198bcca8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/hi-IN/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/hi-IN/firefox-98.0b5.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha256 = "e8d87a8ad9033793e0c25c8954ddc4f405274468a572f46af494847481bedf11"; + sha256 = "551b20cc433c045a4e28628498548f6cc114998158386062be926238b674239d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/hr/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/hr/firefox-98.0b5.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "47964a5caec7f8ef0546ecba49e0d995dc9f67947fbcaafaa02789bdaa75e6c2"; + sha256 = "15f1814fb99544f7b093ba6cf6de98be069696175d9ccd93db049b8e0a723a78"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/hsb/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/hsb/firefox-98.0b5.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "67f89985f60d21b04a9a20449d38d673c45e74e82a1d5762d82713c02d3e63b2"; + sha256 = "bc89304cd1f68d18de7d8711f334a14d972c35eb4a779e212ff470157b15525c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/hu/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/hu/firefox-98.0b5.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "2716ce5bcfaac25456a144eeff6e6b173600d08016574812abbb315a4d001ca1"; + sha256 = "f7a85d9d1d529f245d456eab76ad26cecb6a1d58a5da15b5b6d20544af989772"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/hy-AM/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/hy-AM/firefox-98.0b5.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "c028cfa29f0ea60f284d749dc9818772c074efe3d295590a34a3d6a4548a8f7f"; + sha256 = "f5b6c4ea7c8817f9b8740aa0954c74c7cedf30e659bdeec4b9b468ac7430ae25"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/ia/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/ia/firefox-98.0b5.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha256 = "5bd24eff8a4d95f27ff8df44d014d007c943a54fd1b5689435a1ce14b7f61375"; + sha256 = "24d68a73da9e817f02233a4c39e1a6d56aa26d15b17a964de0d10cd65ff8f6aa"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/id/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/id/firefox-98.0b5.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "0483ce90f8702febedb73674d3cc23348a4e7ef62445084430636f0c4c1fb287"; + sha256 = "86f7e09688943b242a83bda19b770f4720aa495c9f8503a79d22abb8a24793a0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/is/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/is/firefox-98.0b5.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "d7b41cb2cd6ae22547d2c4d04dcadd5c4c05a4abf2b51d495baa749d4a2158b6"; + sha256 = "52cbbd83f54f4e93b08d874f7f68cdaa168bb663c10c4a3534918bfef4812793"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/it/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/it/firefox-98.0b5.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "f5a5a825787fef1f8c4f2a0f0c013e8d39bf1a08c4523d79069c5fb335c0e5a0"; + sha256 = "aeb7529d9a7dc88a23094589fd30c04f2d1366e5dae9a92bb16a7c9bbaf476ba"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/ja/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/ja/firefox-98.0b5.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "64d8c649de837049c2f0f73736a74f141de5bf426e11d19f4e0a5553cba6412e"; + sha256 = "9cf3e5bf609bd86f7cea748df34279fb9f421e76a3e3935e33e5af1b3ba32f06"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/ka/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/ka/firefox-98.0b5.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "01ba137970e9b538bc09195dc3da66927b56fab6204bcab60a85e03055c80a0d"; + sha256 = "c6d6d9524aeafef73aed12d2757520903a53deff32ddf55873e038f1a1b3e37b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/kab/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/kab/firefox-98.0b5.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "3a6b4e12f88226b0f19dc066a0f11cadf5a47d87f38540cbcc9f34e82c54290e"; + sha256 = "c238bd3d49236ccc80d85b8ea9a5bfe95f7a93bdd9fc82f09dde2de314412027"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/kk/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/kk/firefox-98.0b5.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "ecb9e0e63eb778892ce15d5df03e50bca8948a6e8dc3369b030cb716b172789a"; + sha256 = "b34c10751ef34dbc41157711fc4f02c5c9d26104be971b1c9001704c2e695e3e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/km/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/km/firefox-98.0b5.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha256 = "31968f898a8916705c67e71bc5010cea11bb43e544f27febad644a624b32c773"; + sha256 = "859629828f358f3b7933f98292f3df0047fa012cfdbc4db652eea0fcebd944a8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/kn/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/kn/firefox-98.0b5.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha256 = "105f4f83a1e0ed15e568a218d49fe5108462db67cda228e088cde3679dd48e04"; + sha256 = "ae70facbaecd4b11d8e39eb6b40615c63e37eb9020933b443326c3ec6849277a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/ko/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/ko/firefox-98.0b5.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "37932385223cebf7a3f59c362c2abfca321bfab0fd6e5e3da6daa0ec76257784"; + sha256 = "63b939612cb311aa31b9f2293e82cd0aafb1a857318db2f8cb022cd0d868324c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/lij/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/lij/firefox-98.0b5.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha256 = "ae5c8fbc88f15edf60fa1830ca19d32ca3277194c0669717360659da5ad07b68"; + sha256 = "85c8edd159ad5b2843673a9beda883a349bebf1133ad64fef2685a61bbbb8d4e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/lt/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/lt/firefox-98.0b5.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "104cdce0099e51d71d3ae3b8fd4ec40a256d893450c8fc905035480be5d675d9"; + sha256 = "fa5d9116fbb25a8c1b816357de21aa8e376ee0983c12ae6c842c0a015071829e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/lv/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/lv/firefox-98.0b5.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "d2e0055207f62681e4cc9c11ae1cd986179af1581af0252604762eed6637e726"; + sha256 = "e744ece030a07f84c9cbf8a952c5dc2ab8fc3cb3889405978f79665917ab62a5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/mk/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/mk/firefox-98.0b5.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha256 = "8b03198b1d6424a1cd024fe17ce62a99c8b1b8c41798b0e229f802752a3b4551"; + sha256 = "466d376a9f0caf60242aa0abb945b8899ac9d80080da3c4546c74d9e2e6c131c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/mr/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/mr/firefox-98.0b5.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha256 = "5f5b132f3292cc0938e28f2c483a03b8ec76a95a306d3a928f2a2bde03f3af76"; + sha256 = "c3077f608d9a5f655b50a0a14c024f5f8bca2dd6ab75901915fc379ec5e31311"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/ms/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/ms/firefox-98.0b5.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "9ba3cbfd2061d15356ebee861bad6d78be0cb5f4ea0ad9a13170ecdad67981a7"; + sha256 = "de64870f7300f66ec653af11f4d38320c1b63f6ac2bcda3b7d21610ab83598e0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/my/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/my/firefox-98.0b5.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha256 = "700d224adc519fad23798afe919538ae54d53cfad4a74974ecabdf254afcffba"; + sha256 = "91ecbb951fe4d987b226b40a9bb7efec4119cb43371fb57c98deecb538704ae6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/nb-NO/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/nb-NO/firefox-98.0b5.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "a75fa004af0cef3548238264f7997ad60bcb46d415e3e91ff6e9b16bb86a4a9a"; + sha256 = "bcccecd3ae6b89c6972a24d41967d20b487d55da6d0d489de0e69da6d9e95c0d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/ne-NP/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/ne-NP/firefox-98.0b5.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha256 = "614d82dbc762f0ef2f565d95e5bff8d4212f8fa8174f294877e0ce155d75fb09"; + sha256 = "808f5583b067f74ed584804ea4a32ca86bab336f808944ee5877c7a964bc84d6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/nl/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/nl/firefox-98.0b5.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "a6b8f0c827443f32c25c478aa11981d714a57fbf752891c2f018fa9542820e6a"; + sha256 = "2bdd1003f0a77b0c2d3703fcf952aa82dc8e0e56801945810fbe2343ff45c4f4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/nn-NO/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/nn-NO/firefox-98.0b5.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "6227882b432684768b739058e7f1aa15e92157348e19b36053e70255172f0b04"; + sha256 = "c31423b965a44848021ab8b148ebef815451c706c0ed21e2272cc4d9a6404fa0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/oc/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/oc/firefox-98.0b5.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha256 = "3b2590ff70bf7cf8998dda933506c86515ebdb81b031fb15f925b02d5cf88f04"; + sha256 = "ce8dac45e0643307e3664f529fd8f22a80e3089bb17593febd730bdd554920a9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/pa-IN/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/pa-IN/firefox-98.0b5.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "09bbea80b952af6eb5358b2afbc785afbf04ee44a27b38f2f72dc6fa49417086"; + sha256 = "1dbcb8f8a7097cfc9d52ae1702bb29995f1585a0e817a0bfc587dfb0779cf975"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/pl/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/pl/firefox-98.0b5.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "f0ef3e5e72fcf72ff49a5b631bb9216363fb01440da41d939e4b653e84527694"; + sha256 = "3549823c524d86ef0b60174425c49c6fd91bfbd8e7f8dce371eea882d0e09fea"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/pt-BR/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/pt-BR/firefox-98.0b5.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "dfe183f6a40d50e3871f632ec79f397e302fd130c43af2c26c6b24acc114c4fb"; + sha256 = "67b85d1b5229e7dcc0207ece3fcee3e5b3b086086103ceecfe34c80333d4c2c9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/pt-PT/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/pt-PT/firefox-98.0b5.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "c12fb2fb918a38a39655f3350676f290151e2fd6e44acff88379f3c4752743cd"; + sha256 = "b7ebf1834baed814479bc2471ebd1090fe9f662b80cf177542cb0cf118f82774"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/rm/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/rm/firefox-98.0b5.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "14d1ad150edaa100c535c9b007fccd3bbfc0afe09d3035ada361c202ab31cbf8"; + sha256 = "bb19bcd207a6823c6ca304f13acbd7640aba4bb9fac14a4ce4fe5a3280823091"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/ro/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/ro/firefox-98.0b5.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "cd99ae37b4e8552cae7911c86f430900d8d21c96264dc2940c335cc050b8a62f"; + sha256 = "f22e4c6b8024e724dc2bf09bc1f7d66109551a07acf9c2c638165ecc6e9280fb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/ru/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/ru/firefox-98.0b5.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "0cf0c23c90f24ef417b460f57b566b87e06ad11df178ed3e7006a7a7a8acf7f7"; + sha256 = "7896e4fb06f0566f07069f724a0e1e96f9532eabf76108efa92738a92a6ae8d8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/sco/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/sco/firefox-98.0b5.tar.bz2"; locale = "sco"; arch = "linux-x86_64"; - sha256 = "58bc7ea18c851d5a88c047bd41b836e9beab1f04289d0fc33e0b1d9fd7e55b3f"; + sha256 = "3ab3b8ccdbba37af17943df1d5f5b070a1c3826a55fbbba0c71a1a3f2342a3ec"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/si/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/si/firefox-98.0b5.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha256 = "13914c46edc3e5da87c394468cfe83f0811359b2d30d6572b1c3c9726af45c3b"; + sha256 = "4dd9bbca09dab4c57edc9a3def8fe768888f698e01186a5154a9b5fdcf68cda9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/sk/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/sk/firefox-98.0b5.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "818fd12a70a50061c507c8e06d7118ea7d1062ac905f8b70d31010710df642f3"; + sha256 = "8db73e84467ef07a82f75224e36d4038fb29bb3d6246624cebab9c645a65d1a1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/sl/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/sl/firefox-98.0b5.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "1d70241ed0cc861c79165a770a73b580496fbbbb6a2530701c02073c9995fc4f"; + sha256 = "eab61eb7a5d353ae33573be8eb37c141820e545945229ab9db248263b7033c17"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/son/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/son/firefox-98.0b5.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha256 = "3b906867dc5a0ecf4dfb0e034c8e97a3fc39e5d0531ea483c8a408b32df860bc"; + sha256 = "41d282f7d6ebd9e0a084c4a4e8e7f6b59a9433feb4c006c5ada699a4e4d2e19d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/sq/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/sq/firefox-98.0b5.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "b23189c437535a4fad78bab37b81d95e3fe5774a8c3c4c6bd6d77d7f785d2e30"; + sha256 = "8213721fa3601bc529f5fc2a97f7f64adf544b994c607947e94e104d5ff5c96b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/sr/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/sr/firefox-98.0b5.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "08dde33689c92e2c23971b0aeec581ba420b502a118c45799e35d52087113055"; + sha256 = "f8ed04bae5dd80366ed92be6437b01887310d914b306b172e303da78a878df0f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/sv-SE/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/sv-SE/firefox-98.0b5.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "3a099e8247e4f15879233624489f4df971493bde2019f47a18da3523e0ba142c"; + sha256 = "a9dfbc40e42b55ae876cb44499ed2b245c184acc4299b358fe6844c6f80092e7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/szl/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/szl/firefox-98.0b5.tar.bz2"; locale = "szl"; arch = "linux-x86_64"; - sha256 = "94497a259e974c3c13bf2a74a4a91180710b57402fa47bdead77cece66696b32"; + sha256 = "8f2f3fcfef222377dce579308736948dbfdf29e7a0aff42a8b553990238bbb4b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/ta/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/ta/firefox-98.0b5.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha256 = "006458ee81bd21b2cd3acd5b7893e90cc97233a3507b2247355b183164771502"; + sha256 = "900de26055afc2ddf81d4480deab7711f0232ce034fde90f01e7314526866eb7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/te/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/te/firefox-98.0b5.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha256 = "a1173235bd09193a5fb6081db6af934ac5cea619bcf612c244423cdfaef75861"; + sha256 = "f1b34ccfe1a28f7c3f9ccb1700ec91c2c8c0eab45b074dc38386818969c1d945"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/th/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/th/firefox-98.0b5.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "ce6a04ad52b0ab49fd4db6724fe43c1f054fec37fe2434536985642fba1999db"; + sha256 = "7458224a8dfcfa1480ea95a4dcf6dfdb62d1e9576838820855cb23baba23bb94"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/tl/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/tl/firefox-98.0b5.tar.bz2"; locale = "tl"; arch = "linux-x86_64"; - sha256 = "10f31d9636f9124aefd213ecb06da9be7ddfe70e2413ce66a1c1f84407f33319"; + sha256 = "6441f1bd46807575c11b209a35b9f5003d418c7ea439ffa8c7abd18355635bc9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/tr/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/tr/firefox-98.0b5.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "c83e8170ef55f271fb9c933505cf66d4e42eb8973d6e1751c903ecda3bc92cd6"; + sha256 = "c65364bcb6078efc0e856bac29ee758bceb016e838cf74723768de3872e57e71"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/trs/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/trs/firefox-98.0b5.tar.bz2"; locale = "trs"; arch = "linux-x86_64"; - sha256 = "484905693e9e952a56627561f10ab429e7ddd2df5b534252f60aebe52ed41b95"; + sha256 = "3ae90a452b99a039e4d9590d92d4c58ce5684c6237c1d3bf7679ff3b422c99ac"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/uk/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/uk/firefox-98.0b5.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "e17d15802c8d94770c6368aac7d46585483353053968c66f40f326dac00587d0"; + sha256 = "4dfffaf009936d7dfd6614c496fca8884076293122cae401255ef34304176bde"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/ur/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/ur/firefox-98.0b5.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha256 = "e03b1c472787bf1ccf33568435b7873a4d6e8f43a0b82a01751995e8ccebda9d"; + sha256 = "7fb0f40583398617a3469c1a0ba5a83443857b872b9b6b0deeda957b3796ae02"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/uz/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/uz/firefox-98.0b5.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "1952bac0df8fb98273d0a4310f3141e928e6718eb1a91baed6d692088f041171"; + sha256 = "4b943e4439c8f07d3de7f9ac9e17b2af3a1d2a29bd4b917fd11664e1ea249e76"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/vi/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/vi/firefox-98.0b5.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "4d3a70f4cff2d11dccfeabe15c30ed99b74bf5058ad8f8c795d9bfd2db1dc11c"; + sha256 = "08dd3aea42b2589fa141aab23d5f9c925d57cbf45619fc9b7b2d64ec13e29dc4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/xh/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/xh/firefox-98.0b5.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha256 = "dd1c33d8a1769f2d4efa39eeb248a7cb6e2993f4b3bee38884fd997d7f20e026"; + sha256 = "b1130919b88f96d866dd54938dfb63250df118a6861e8a0eb8b32943c027ca33"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/zh-CN/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/zh-CN/firefox-98.0b5.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "623926088fa86ff736832cb35044d7d134ad1f4ff31666ba7dcbc31619c3a07d"; + sha256 = "9f1186860c19e4f6301ab0bdf39c2824038bb14b225dd8b8e43cca5b838ca92c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-x86_64/zh-TW/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-x86_64/zh-TW/firefox-98.0b5.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "6276f0e417d45cad209e0f57ac0276f52854f5172f7829684e4c8a49c0e78fde"; + sha256 = "70e66f4edb9e6c39b404205094eed21e8df186571c581f67f8176c78d5a41098"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/ach/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/ach/firefox-98.0b5.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha256 = "0412368189b73bf54d5679c22271ca82f47c10ca1288431fdd16a42d51cbfb21"; + sha256 = "7a133f4f6ed1b67715ace63839dc2d4a1dd79537ff168177ad5a329d4c482292"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/af/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/af/firefox-98.0b5.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "67060ebdf9d7ce14c45db9edd588f99fe0485971674f791691766127a656575e"; + sha256 = "b8b214903b2aca2b0e5d4de1f152e67c5a71ac6917903d92f2000629b51aae97"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/an/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/an/firefox-98.0b5.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha256 = "2c79a9307bfee1727a19cd212fed10ba02d31ef49bd68a51cf0ca0a7faccf2ea"; + sha256 = "884696456c121f511b0661bf9972492e01a23d3e106b00c219c598855df7557f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/ar/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/ar/firefox-98.0b5.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "a6ce4fdcb3716e2f70fb83502fa9e9e90489ac58d26a25627eae7b8402a0562f"; + sha256 = "676ac6c717cc21496baa6135d18bc7cb625e58c3e12c261bdac2a99401c38ec8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/ast/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/ast/firefox-98.0b5.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "21e4519d0403bf3e158eefe6c79d8283f2cc1e0875d91acdb995c0e83c56a9a9"; + sha256 = "c86f2615962a16d7766ae21598f82caf77f0cea341e0b931dc1b9ed90a9c2f02"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/az/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/az/firefox-98.0b5.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha256 = "0c1eaca5b928c2a1cc5a60a2dbbd624280ed2b55f10446bc886158e95af39199"; + sha256 = "14875cec0478392c2dc4c79de855f1c338e7737132f6a4522e65e02478072d4a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/be/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/be/firefox-98.0b5.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "e7716acc8417dbee838710d3efe670e081712ed3facb26bfa43864a574463ff0"; + sha256 = "9aa8bf0ada8766019bf9c6aaec64c005239c3d9d82c494e81ddede4f822b0bc8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/bg/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/bg/firefox-98.0b5.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "a90e61e0b5a31ffb7cebe747e8a6512e68baba210f234913af1ab8e90c79206c"; + sha256 = "a822d9daaa748c6f64628dd7f4fa2cd0b8bdbf57a77710bab2cce990aa052874"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/bn/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/bn/firefox-98.0b5.tar.bz2"; locale = "bn"; arch = "linux-i686"; - sha256 = "e75ccfcac893ac7d54d8cf849044385ed0749de77dd53be7a1b1686949a4699d"; + sha256 = "209a83d4d7372b7f2ab578622c3e77110929bc4a1d572c2b3d084e5c2b183d90"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/br/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/br/firefox-98.0b5.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "9c2286f7cf0d5052e44ac9aacf139e2c8abe9d212407960663819a8aa8436bd4"; + sha256 = "20258167e5f470435d01fea08faaa1854872d5bde35c3a48e4028e8a61e5e894"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/bs/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/bs/firefox-98.0b5.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha256 = "ceb98c5fb103e80488f8821027144b0d7124d0f76d360b6139308763a1ca33c4"; + sha256 = "948ed50f652aa1f0d16de7923b29d6c4ae1e9f87a16cf4d6e195a94e7c0bb196"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/ca-valencia/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/ca-valencia/firefox-98.0b5.tar.bz2"; locale = "ca-valencia"; arch = "linux-i686"; - sha256 = "f648e363da8ec8caa13ccfcc4d586efe0ac4e0b0d3574d295c95ac81dda937e0"; + sha256 = "65eb92ee9f63176db9efb700ce8b26c2f9d1d4a4ce2d66ce2b12bf0a083f0db4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/ca/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/ca/firefox-98.0b5.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "06b61c45238b90f8bb838193fb5035dc63c48fba416f16b7ab9463597bb92ab2"; + sha256 = "ff3d52f5060ce6b69a52ab54baf53ff767a6a948fc5385b38452ff1ddd32d10a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/cak/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/cak/firefox-98.0b5.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "ae0ce800b1455aa4c607123ead63edf228a55f4bdac14c267746cbb640f60418"; + sha256 = "d8dedf187004a64a6484657230796066be8819be188b6c73edf23a2e516015aa"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/cs/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/cs/firefox-98.0b5.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "1d7f47bdc98efaeda62dc2f3d1d16949a8cf3de96dcf87fdc30015ac7fdbbee5"; + sha256 = "5f6e10610a2f3431ea75f36b5abe3a79ae2a877fc912733be7b7ded63c2d0434"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/cy/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/cy/firefox-98.0b5.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "4a24c3368e2f88f75f81af2e17050e41160d99b27720517cc34a7772533ddcc6"; + sha256 = "c6bfdb386e2dbef46666582b97057dc4d87da0a3da708f0834cbfb46f01553d4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/da/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/da/firefox-98.0b5.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "5282d6c566361c74d5fb8c8d0f992ba5e929f2183b3abb9d479d7f1d53470dbc"; + sha256 = "d657648c3bd243d005b7b8ae9b720c3dd14ebd7fab10a5aeda332abec34adae7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/de/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/de/firefox-98.0b5.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "f88988016fc2a8fa5543822d6fb1ad84c57f8f0d8ed2bafcc63552efb2361085"; + sha256 = "653c7ac40b697418ef9335b5d84b4791126a4d88499c7643b8691ec7f7f2674d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/dsb/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/dsb/firefox-98.0b5.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "252a9f2b5b99100abcf4ccaaad9982d48ebf903a7761d36e2aef766985fc0ec6"; + sha256 = "caf1f6164adc422f9b6d15998acace1644b3b7422cc049302151e3edf060c8c4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/el/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/el/firefox-98.0b5.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "8e67fef2d4e2cf87a2961c7deebd244a1dfc7863e8474510aa196d54e199b4bb"; + sha256 = "a500f80b351209b849689cea6eb558f039c2ccfa2f88544473c9e6b6592d5d73"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/en-CA/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/en-CA/firefox-98.0b5.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "a687d4abfeece55bdc35bb000a802ac6a67bad8af6cdcf88802b7d42c486789a"; + sha256 = "4c3c78cdaa65537de0577889eaf2029981e57b70a079111f26a53cc28ed234c8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/en-GB/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/en-GB/firefox-98.0b5.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "27819a8e87dbce94ca4bb2b3465153c6ab974c52bb81b2517fc685b2089548f2"; + sha256 = "5ad92e4c565807f377900c3c588b2e7090335259bb529b71af45b37b9a081067"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/en-US/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/en-US/firefox-98.0b5.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "21cb440725cf0378021b4a6a858fa3d344b39292a61e4a774d065e9e41668e24"; + sha256 = "c5dd205aa822a311fcda06018ba79fec68ee8c2b05d5ecad1d2dcb103da87509"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/eo/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/eo/firefox-98.0b5.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha256 = "ed0bb4aef9a5ff6790bc36f3ec45bf140ff23343a36716bc59fbdf4cb31c0976"; + sha256 = "613140f6f288290d93a0a41811372a46debcf9de05dd1858dcc5a97e242bd657"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/es-AR/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/es-AR/firefox-98.0b5.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "436ae41521b50068bb5fc9768936c4a4b77bb0a37f48ddb84cf8946a4a7ea76b"; + sha256 = "ab6cd6c4e09cf5dce87a5f072068b7c49c203296a5ce0c32fe41fad4d4fec495"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/es-CL/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/es-CL/firefox-98.0b5.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha256 = "dc354dba3016dbe13ce744fcf654b292254c8fc0f53e55218952c6fbb961fcaa"; + sha256 = "93349da0b0a1529e8b5855519175f61e064445572b9acbdaac68695f7157ef14"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/es-ES/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/es-ES/firefox-98.0b5.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "87bdfeab9856f13736ead5c3157d05a5d0b73c27a2ad0d7537bb63d994cf9703"; + sha256 = "e5d6800770146e6c1e4cc4d91202ca4749b6d922ee5965bd82a6acf7448f2677"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/es-MX/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/es-MX/firefox-98.0b5.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha256 = "6dd1f7fcf13e9c651d3359eadb1b8b2c13aca121e294ee5856f663a712438ebb"; + sha256 = "22aa961e8d40f0d4bface131a19ff0cc0f88b9f66bc9b63c3038ae2b878cadcb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/et/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/et/firefox-98.0b5.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "fa5e600d2cddd4c93596baa0bce310cdfee9eef12df808968972382bee32f57e"; + sha256 = "722ba0c78b51491d8943823e0aa972147c0504d7c65dd7c5eea29377abcfc571"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/eu/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/eu/firefox-98.0b5.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "1b277fc9646ea8d060c1bb554ca04e42b0099c70a44e697990ac4289712eb12d"; + sha256 = "96b12801ae70101cbf4620e1fbc8e4cc074e4f07017179586cbc5ab208fe9f0d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/fa/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/fa/firefox-98.0b5.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha256 = "370329076e609bcccdda5f472b334cb8dfe3df0e8eb696d22aadaa44f8b0b539"; + sha256 = "cc97cd08c428bc52616f6db25e9dd50f9162c29758d6c44160ebdfe745211d0e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/ff/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/ff/firefox-98.0b5.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha256 = "9b9e685fc94652195b00b5a959e48d81142b7589e0ac9d163c39f07cecadf27d"; + sha256 = "982fab751bf71de830c9f5866943962f3095e70c4918f65201f8f51c99070898"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/fi/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/fi/firefox-98.0b5.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "f4b851f9a39fcdfea9034edf0f4930632da04d9a3b949c65b682e30dac63cb45"; + sha256 = "c5e9739a2b8f60d578a8a1f22f947d25e8eb14049ffdf57a3948a50e34400156"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/fr/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/fr/firefox-98.0b5.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "e72943c2f034282b73aa136b272dc7e7e9d2bdda5b2c2db045029f05a0e8b14a"; + sha256 = "7441aeda63c2e90a26a342c80846a4ea0a48d4d4807aa2fe39337401d9002a54"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/fy-NL/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/fy-NL/firefox-98.0b5.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "e2451341887d6dc51f3aee8c8b9a7dc65277e3cc9df9e2fafacdf67da838e48a"; + sha256 = "83d26111f5d82644ba1601df382aa57da851f69284cc4fcb88d943a79fa5709d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/ga-IE/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/ga-IE/firefox-98.0b5.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "01a03a21f479475d224fa7559a5b4e98bf978f61f4e472a58b1d1d272cf5fb24"; + sha256 = "1c845264e89286cf8a5171f372930189455b3e2e0b959f8e271799c4bb00b074"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/gd/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/gd/firefox-98.0b5.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "b64c925beb57420c5c76c4c4ac78282beabe4a6ad7fee19bd6bd4a9af2153422"; + sha256 = "a8e7e5e6cc3da1aae7c016dcfd28bebf35b4f5ef9a4687fdc48175126dfd1043"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/gl/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/gl/firefox-98.0b5.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "250ac76432b7312bc1173ee34a32d0e658c0ea658664eb296b7c5dc2c1fb6ca2"; + sha256 = "20b081e9f5443f247520f6b78283666c695c574fe3113384b81c8bc1b6e100c8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/gn/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/gn/firefox-98.0b5.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha256 = "bc3a716efd7cdb0538714ba3469a5303a9496b0b1f81d43a41b55434c047c991"; + sha256 = "6dab96866f64e882c8b7a42c6b66146b9c6f34e0934304dd192aed28692acd05"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/gu-IN/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/gu-IN/firefox-98.0b5.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha256 = "c6d2e017c5269064a5716d54f5df9f2e2dfe621f9f24e7d2a9dd3bfd6b47983e"; + sha256 = "a81691a57dc6d64c425254688baedbe16589887e99a88328efa391d7c22a7cd2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/he/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/he/firefox-98.0b5.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "0f3e2947b7e03ab0197af6817774a7e0bb11fd5dcf13df23ad3cb2899da49cba"; + sha256 = "e22bfd17a291bf7e890f80b054a9a608a8b7537a401c2fba0ea97bfda531a06a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/hi-IN/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/hi-IN/firefox-98.0b5.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha256 = "161d898a2d74fbb709fb3d19c7444c9892e035c2876f66384c920ae3f76e21f0"; + sha256 = "ff107e3b42e93ccea47c0f4b6fac05fec1904333e1173cfd193028b1c7a02ed4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/hr/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/hr/firefox-98.0b5.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "8bf24778507063352156caa82fdbaadfde5c840f2637196d87cd314ee89a3833"; + sha256 = "50f460b541ae13cd78699642e0853bd198d9c2604c74e1894b716a7226a82b17"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/hsb/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/hsb/firefox-98.0b5.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "77f1a913c4e2973593edf6982eaa767185ba4b8ae91c16b967e8f3c7e82d72df"; + sha256 = "13acea425da7fe917fec2f7daeea24f7705c6af770f02918097cf795dca4f4f3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/hu/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/hu/firefox-98.0b5.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "f4ae877d906e7427703df3f219c0c95abffdb995328a80de3b069cbc5eba4a42"; + sha256 = "f0ca828539b50b41c478b1c48ad96c3db25bf2dcc3eef5924e55b477b01a7339"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/hy-AM/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/hy-AM/firefox-98.0b5.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "0d3371fe5359ec1d23dc58e00151ee81838c18a8e9fb665d48c3276ffa34809d"; + sha256 = "93b756eefb43ec5ccb8c2da88804ceff1388db4cee07cdc1e4d9e745b5b8c971"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/ia/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/ia/firefox-98.0b5.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha256 = "7194d571e3cd92afbb8e19c5ecfe15e0c0ed4af28961008efeaf5e475ed8c1a9"; + sha256 = "5b4a364a9e288e9b83b0c99ffba35ebfeb37984e0d1b4fbdb9003f5eeb490bb2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/id/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/id/firefox-98.0b5.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "79a5a4d97a106dafb9ff6ede0e853dbbf24aafbc3f654f5b8244ba2a09ac6ff9"; + sha256 = "5b6438b6e2d27ed1e5b3139b707610f21b977b3080b83e5cec1375482124895a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/is/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/is/firefox-98.0b5.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "fbc2bd2dc236706d1e6599d32a6aef5b4dea0b2dbac4a0d59854205dc66c6958"; + sha256 = "882246ace511dc8b8daf9370d134002cca9c470c2420c7110325813c86ef17a3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/it/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/it/firefox-98.0b5.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "5d1b79b6be89b593f79982460bc10d160f8914c4544a802045562547b59ba364"; + sha256 = "d49c6a19ab9538bb731ea4b0bf272dd35aca39bac41cba5e440d9aa3b61497fe"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/ja/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/ja/firefox-98.0b5.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "c55511e3e8546d31230e8735a85e9c2745d3358567e424324bbc850c8f9399b2"; + sha256 = "da3e2b86437ccebe811b1b0f7c79d8a875a9f682596cafc3a30d216b584d3412"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/ka/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/ka/firefox-98.0b5.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "009a89d79b2020f8e86a9d61b21b5751afd3aae053ce0c037b3cf303f528cec0"; + sha256 = "7a6889b3e6859ae3af55a5df7c7d13d7b52be3a8b0643ff9b14b7ebd436cf2a0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/kab/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/kab/firefox-98.0b5.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "06b51518cb8a3ef97c084f1cafaab34a8175b7efab66e16d3f4f1f7d72aa9df4"; + sha256 = "1a7942f57ed945628815b3ee536b892acec11a7d4a5c7ecb31bfb6c61fd05996"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/kk/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/kk/firefox-98.0b5.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "560b8a7cc248639361ba08996a477d2ef7eab0482f41bba67f0371c841ca490e"; + sha256 = "7eb32c26f0e4551abe340567558644a41c101edea66042eeffef299b35f53959"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/km/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/km/firefox-98.0b5.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha256 = "cc0a12c6e2feab652d08d28a27b79a9481209f4c3869372b37f1cc5e27ff8e70"; + sha256 = "608e5e80d8e5bd48e327f1b827835ae0ddb2dcfb2921d33c1e9bb895da695641"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/kn/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/kn/firefox-98.0b5.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha256 = "25541e2722cdf1621dc42ad529447c31c0e9e8ccf7300f87d89f2e1f91240fd9"; + sha256 = "9b9eb2dea61ac0dd76252321caa2afaa98a3c0b64faf3d1f354e9b9cf02b1761"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/ko/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/ko/firefox-98.0b5.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "cde1314a8135543aa98a9c28c083e3f57700be9990ba2ef780f6dce4a8de6dd3"; + sha256 = "58217c4383dcd7720c7362839c9326c93e8cdf0982fefc4844b2c6ba66ea0360"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/lij/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/lij/firefox-98.0b5.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha256 = "f85d1f85763fac8e748662d1b493cd06dbdac37960785cee0e8946daab10fae6"; + sha256 = "89f99e044b69d89219974772d385f5d86b64c9f12ba1ac9a2790dd61ccfd44b5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/lt/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/lt/firefox-98.0b5.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "34ff1895eac6fda351b210ae65b2edbf837ca8a5a5592caa33750ccdf529c6bb"; + sha256 = "303ebd0555d448182167b9bff79f72dd7fa247c1fd259c3af0d1ee3f0f4e339f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/lv/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/lv/firefox-98.0b5.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha256 = "9769e7039a980ae239d242fd6ed4438e7b90e1fd91f7d9ceafd52e8183bde1a5"; + sha256 = "f89d9021207399c9ba56db03add2ed8e10fca3b8273f2cc4ef79814730af9cde"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/mk/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/mk/firefox-98.0b5.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha256 = "1217469bc4707454ece2ccb422e99e85724845760a4a78205753c07354a2d6aa"; + sha256 = "12d5492f712b993df46a2083fd2d3958da8d5bcde7e11ef83482b3d6c0c0e5ea"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/mr/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/mr/firefox-98.0b5.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha256 = "e70d4bb799117c0343a17f57adc733dac1cdbacf30dcfe0ebc195da3de091408"; + sha256 = "26937f627cd4c14bc354c9e39378e56ef06ea18519f5b6344ca6ebcbe1ffbe1e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/ms/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/ms/firefox-98.0b5.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "91bff99d4326c16466ae3c4d1646f14cc8d341cf93c71db6dec117ae24dda154"; + sha256 = "2de70b33a112c662a158493a14e05ca45904a0ba9ca71d2416ba59ce81bf4192"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/my/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/my/firefox-98.0b5.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha256 = "4efb3b03955ab8cae4925704fef1a1d1ebc20c3bbdbb9332d1be31c2aa0f16a9"; + sha256 = "dd3b9ec61dca822106c3b88df842f0380a75c1262bef82be1aef6040df308e1c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/nb-NO/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/nb-NO/firefox-98.0b5.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "9c01453ebeaa772eb1ad092400ff6da05d6a36d901fe4f9ca9d98bf4c41d2d40"; + sha256 = "997a5202f5da86b665595b7f0a4c793527428c1d78c60831ac6b52961ee466bf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/ne-NP/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/ne-NP/firefox-98.0b5.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha256 = "697bf0266fd4cb19e42619054795bacf4e9a065dfd976086b074be47038f86ac"; + sha256 = "80577c41032e229cba1c2130ef66a428daa0ce238a12f15e1815460c02f0fa93"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/nl/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/nl/firefox-98.0b5.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "7314cfcd476f18054775d03d96787afd4572437c507b0387fe3104e272e66f32"; + sha256 = "15d92dd24481329ca8f742bd71ffa6a5dd20a4c6362dde813f4dcba663da65c2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/nn-NO/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/nn-NO/firefox-98.0b5.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "3fc8dc069fb41aca43581f3551a485f4659a760a275beac5087f479eba0b4605"; + sha256 = "59d49f04138c120b6f9e4ea8d9b902f90dad86fcc16ff82af47bc198635f5747"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/oc/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/oc/firefox-98.0b5.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha256 = "22ea3193fbdddec8deb897ad5551fd94ceb659cd8493a04db51525c29ffae0c5"; + sha256 = "3b82478ace0de50b1e9e60715da1e90f97e6e938577c75d2be44d313354291cf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/pa-IN/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/pa-IN/firefox-98.0b5.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "2f3dad5c917a28b41fc1ca3365316a281c6e6560283d2002364c2bddad5d7a52"; + sha256 = "62eeb120929b980e1b0c30a38054a84e821b3895f73be938274f52cb19791038"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/pl/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/pl/firefox-98.0b5.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "6334e79bb84d78fad334d9298c8104472ce7297c17d80f28144cf0751c42ac80"; + sha256 = "a5a304bc7671a16ce9e41158ad34ac7e49406740d22decddab2c5a004a76a8f6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/pt-BR/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/pt-BR/firefox-98.0b5.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "8fa05c175f271723e107ecce6d2a7d6b8e5afef5578ead1d6c8ece920d4b0a91"; + sha256 = "ed8e69b18fa20ff70effd6417d3e457ce4e820907bf550d9f8aca5ab135e12a5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/pt-PT/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/pt-PT/firefox-98.0b5.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "7b6751f8883c439f1fefa3b1c220093299f1dbd27b8a49c467113e8200849a72"; + sha256 = "c5d3904f8f09309b0c75f80676f156261dd63bc37817283bc21f577c99c900f1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/rm/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/rm/firefox-98.0b5.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "81dced560a8048a4113c3a99ef72137174de6bff64a0ef4f0bd669f3d7f6d89f"; + sha256 = "e7b96b422b949121511e4cb289958c9efa96f0d0e3808e20a97aa03b4c441529"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/ro/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/ro/firefox-98.0b5.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "692746c7919b64f23bc92c00a7e7ba60f54152430887b608b84bcc105a436a33"; + sha256 = "6333056941db9f5ae7679c3aa4213570f1add3f60fbf67729a97b7210788744b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/ru/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/ru/firefox-98.0b5.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "52f4b321e3e149fa0317d610f85b4637b464c79b1b2046ceb9dfe2f4e56b6c6f"; + sha256 = "05c050f50704b62324aa699856c3a6cb57e2d5bce783f9e39861a3cb92c7eeff"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/sco/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/sco/firefox-98.0b5.tar.bz2"; locale = "sco"; arch = "linux-i686"; - sha256 = "3297b5b0d67381d1b7f9c4f76b767c6a5f76388d473afe5e9bf0df94a7bce0d9"; + sha256 = "6519d91cf5798d4b14ea3743ab4b1ce547031b346926b8504c16aaad61a9f023"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/si/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/si/firefox-98.0b5.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha256 = "bc1eae9950eb6bc6a79fd185835aaf7b3c9394c7d19bfb78348a1f4987315636"; + sha256 = "7abbf189b2229f911a0aec5fc294ac0efd9e7ac9d657aae08e7f867cd0128179"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/sk/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/sk/firefox-98.0b5.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "fdef69d9e24c00616b177dba71e2c5db29f8c945cdba4c3dfbb39753b1f01a72"; + sha256 = "b02a4906ca96a545af361f5aa29437d3d4c873c3ca29db4ebb36fa2128b3a540"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/sl/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/sl/firefox-98.0b5.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "7225b70db5b568634792f18f0f6ddca4ab94e00b225942c6a4f5c4741ac9858c"; + sha256 = "b1cf1ce7d68359b1d18059434c0aa13ef9871a82cd3c3e81fe5bb9c3ed7249df"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/son/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/son/firefox-98.0b5.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha256 = "2c7f228dadbb2b3ecd424ab2e80a532e17e861f92095e5de5ded2006e79e9dc6"; + sha256 = "6eb2146f30a6e4b73f5d5ccff0b6a9483753ec135cafb9d16ee7d693de26f9dc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/sq/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/sq/firefox-98.0b5.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "63fec6dfd214dbce4b344ed347eeda9adb489707e06e6a4e1ad6fa828e0da7ff"; + sha256 = "ac7c65f8569531fecb469e37ae8728fe42ef0ab7d542be4051cef398c2db0fe3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/sr/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/sr/firefox-98.0b5.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "8d584d48c4e35bd7ff1438c7a80e0b353bb4871ba946119c36f1fb3bd135518c"; + sha256 = "acce4ec2bbf346fa76c5d40a8bf3ee3696484b8de4e57135678a3a60ca5c3857"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/sv-SE/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/sv-SE/firefox-98.0b5.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "d5e7514a67a288e755d7ae30f2dd680e2138e50666fa15c1b710d0a454a51730"; + sha256 = "7260ac1017a5b4452b5aec0de30894c6619c5f480aa6f1df67a9e876ac83fcde"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/szl/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/szl/firefox-98.0b5.tar.bz2"; locale = "szl"; arch = "linux-i686"; - sha256 = "1557cd8173d79820d852d99c0cbb07249c2bf17bb778670e437c4d408329fbc3"; + sha256 = "b9327040072808ef614944b659304ce14c6aeceac82afcfd45454d610ec9d019"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/ta/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/ta/firefox-98.0b5.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha256 = "2001ea5bb925d5a1e845844d03c441c2cea9a61b042df518d16e484a3a7901ba"; + sha256 = "a4c5d9b87878d269be2b6314c1347093e04c8d21300344e3435288da0e325cea"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/te/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/te/firefox-98.0b5.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha256 = "c9994fe1e9212281fc007ba8f6b703856693deccbc083e17dc94b6da8ed29a72"; + sha256 = "4d0f8b73c3cc034604330787a4d8fcc914eaf4cf7a3187041bf924b6a450d62b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/th/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/th/firefox-98.0b5.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "8c6b207b23fe66c7506da96df7de25270218ce9ca61bbedd693fc6f69c970d53"; + sha256 = "c152c0e843a69e6c099995707d838b1540b58b9c74f42241926ff2415321c63d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/tl/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/tl/firefox-98.0b5.tar.bz2"; locale = "tl"; arch = "linux-i686"; - sha256 = "c9c7cd8c6195588bfbe1c812425f94e7b2727fa0ab73e247b543cf85ea09b171"; + sha256 = "da96cd06713a231bfeb10a1c077586579aef855ffeab88de13e9508cceef0661"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/tr/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/tr/firefox-98.0b5.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "9b7688be959e16f4ed652ddef4cde0bd5b3df391b8c43c33b6234ae5ba404987"; + sha256 = "b7789d13580a7149f7c3c03a234d40e56f95782654e0c7b24078d95106a316e5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/trs/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/trs/firefox-98.0b5.tar.bz2"; locale = "trs"; arch = "linux-i686"; - sha256 = "470596584e9bbf2795624b5baf878955229472450fa7178c9e4612408452b170"; + sha256 = "1c6fc47bf87316ccb5cb767d0a42aa685cc2d75a923138803897d0aee0035c24"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/uk/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/uk/firefox-98.0b5.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "814e5c7e9609b6ae72d2c4c0e012d503394ee6c669e777a0e3b4e4dcb4c7612d"; + sha256 = "647f29a9cffaf16abdf8be253503fee7df5b54cfe90e311a7d1f978bfe53243f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/ur/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/ur/firefox-98.0b5.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha256 = "2113a0313ed3d675bf1adecd574bd0112fa5c03d23f670e522928adea6c97265"; + sha256 = "2451a832ef04df012d6114c6a9bb6f99a2dfd673f4d5a1ae5fd2b048fda3ea2c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/uz/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/uz/firefox-98.0b5.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "4e759986facde4229324402963e0442d1592147c8f4bdfdcec5ec067e2d0b123"; + sha256 = "c8b0f6dce66303ff77c33d33516f41070ad470d04ea7a159d8a2407e072b4617"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/vi/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/vi/firefox-98.0b5.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "c77990635980e56d3856b3793f186a61aaa6da43ee0e0970e7ab06953596f85e"; + sha256 = "fd08bf4e07e05535c39469307bf423f64d16df910e3dbe29f608818eaf63b5b8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/xh/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/xh/firefox-98.0b5.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha256 = "b4a725703b13e230f84c3a5aa1b9532a7755888a2bf7516b5a0c3a79f70f1ff0"; + sha256 = "b1b07960637d5bcc3c540ecd3ea91c9aae6d602506416093afeb68ffc9a84e37"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/zh-CN/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/zh-CN/firefox-98.0b5.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "fed127eedb2d7bf82977c9aa3311e40eca083b7fdd6a7e58f44b315e209c3267"; + sha256 = "b21137ca94f8426338635c2173be59474f07fe7d6eae7bdbd062311a5593dc3c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/96.0b3/linux-i686/zh-TW/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/98.0b5/linux-i686/zh-TW/firefox-98.0b5.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "d29db983e9791aea1dba8f483cf9399ca032fe081e6e8cbb08d9fac3d644c582"; + sha256 = "652c5ce25e695ccf5cb8145f1c71660bf39e6bd9b2a951f468cd1d1967811f2b"; } ]; } diff --git a/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/default.nix b/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/default.nix index 29a506dd1b03..8df80ab526a6 100644 --- a/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/default.nix +++ b/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/default.nix @@ -190,6 +190,8 @@ stdenv.mkDerivation { ln -s ${policiesJson} "$out/lib/firefox-bin-${version}/distribution/policies.json"; ''; + passthru.applicationName = "firefox"; + passthru.libName = "firefox-bin-${version}"; passthru.execdir = "/bin"; passthru.ffmpegSupport = true; passthru.gssSupport = true; diff --git a/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix b/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix index eab96830a8de..c3d034cd5a1e 100644 --- a/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix +++ b/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix @@ -1,985 +1,985 @@ { - version = "96.0b3"; + version = "98.0b5"; sources = [ - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/ach/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/ach/firefox-98.0b5.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha256 = "dd41bff1f1401eb376a3ab26154a42cdc35e409cdde24435737d753b15435fa6"; + sha256 = "75ed4180a84010f7bb509f9f8107e303c6243008071f0ab925313aab0e4dea60"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/af/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/af/firefox-98.0b5.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "963103d54c26d76abeebbc86480836408f8eb7eeee96178ce53d6fc269029603"; + sha256 = "b4c380c4d73ecb913a1ffcf0dc0d3dd771240f1188204f728464df8a65671013"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/an/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/an/firefox-98.0b5.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha256 = "51862a663ea34d9bb1ae78bcf7846f6148dd8004cbdc6ed49c1252590262afe8"; + sha256 = "247918ac04cdef6ad1452f1d7cb0754f48c70cdffc2e20a3187901c72a023f30"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/ar/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/ar/firefox-98.0b5.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "24857b772fc0a7b018c0ceb51913b1a76df59ef3a95fd41f464e1c51b5201e6a"; + sha256 = "68514334b54f4a626d7eb37f563bb39f418d6be4b980c7d3d31f417153d51482"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/ast/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/ast/firefox-98.0b5.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "44c45ef6d101d0bf6f57d663ae6943a7d3bce248eb8feb35dacde292b2c3fcf1"; + sha256 = "cf6a2ade0caaed45038a1237d4881c2e07867d1ba283432e7464ffee5c84258d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/az/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/az/firefox-98.0b5.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha256 = "c196437bfc3aa231859ebdd2f335eea4991c4eae6bd3cf9c64f4eb195704b1e3"; + sha256 = "5c481ca36bb79dbfa5f4e6b83c76a0746b6f4f3fb69200642315a9226ec04809"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/be/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/be/firefox-98.0b5.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "a1d1eb29a51a84c2c779bd2090a7a064d1b7d290e0389672351821d414fdd35d"; + sha256 = "676169af51ba1089aeeedc1c57fc19bf383fbeff03df5b13ef401b63ec9aa249"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/bg/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/bg/firefox-98.0b5.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "1f78b12ceb1951ca0e354ee04ff6a7893fc7596480b9df1c9eb443800778e033"; + sha256 = "5e030aeb833b356b145c8ee624ec18facd95c16dbed374d1f2e90c4c14427404"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/bn/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/bn/firefox-98.0b5.tar.bz2"; locale = "bn"; arch = "linux-x86_64"; - sha256 = "b010759c37cafaa3e296b2b71ab19d2850ed62043c3a04e80b21c4d9e9acd235"; + sha256 = "7211a76921bb81307bb14bb57c5e062fde21de58fa61ef4f676652cc2c5d365f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/br/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/br/firefox-98.0b5.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "5d58e3ad0cf8de459d68b60653af865bc1e11a1b69a6decca9e630675405885c"; + sha256 = "a2a6dcaba8188b205207bbf815b899a8413a494af1e87060b1da73cda1a8ca0f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/bs/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/bs/firefox-98.0b5.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha256 = "d3f1ce059e17f6a14cad30ef2609cffe61bc3495bef3ada1a2941bfd8bbc440f"; + sha256 = "fd0bfad035287c35a809c1fbeff9b00e78f6c5a067e8b301c30b76ef37922dc2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/ca-valencia/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/ca-valencia/firefox-98.0b5.tar.bz2"; locale = "ca-valencia"; arch = "linux-x86_64"; - sha256 = "e06cf1c020f3f65e99c4816b054c9f79da55f892dde27d8acde17ebc24fbc840"; + sha256 = "ab4d58c4640a4b0e65d824e62a898aa19674d37929c1748a27e4aed8e5be0e97"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/ca/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/ca/firefox-98.0b5.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "0f9644f78246459e2d7b0c8c1dabc5c33d5d20d2c6d517cee20fb540db501cd6"; + sha256 = "0429ac4f1050234a28ac1cb3fea8eeef0a763e4c316154e6f02452fde434d968"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/cak/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/cak/firefox-98.0b5.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "9b78dc607de8f66352a778c05186806b0fed9afa8474fc4f2f9346c4298d0be6"; + sha256 = "c69d5c22998d097213fc0016a344c967064193e81fdf45b2bfd5f1687883690d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/cs/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/cs/firefox-98.0b5.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "cdc96bf52e2d9d463e1caca4eb567ec723311678233db59d1cb57a2e7e16c593"; + sha256 = "7d06915a6b86c9bc8bf408fabbb2db73f56c3f0dc3a81d7c11324b564bde3d51"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/cy/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/cy/firefox-98.0b5.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "91c833ce44c24d3fa7b90bab56d0994c930649ae39403c6888a85c2e22fda7c8"; + sha256 = "3e7ea4aebf641697f182c1ed5cd8848a4aac239f1fd7082f5deaf7911ca99f5f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/da/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/da/firefox-98.0b5.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "e8602e1cf72f9b98dceb23694eaeef70a82bf2704cefb4dfa9db380a31eda03d"; + sha256 = "b151987307e07fdc86ee14a9c0487c3be73b954d28c5beffd9b00ee05740da15"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/de/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/de/firefox-98.0b5.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "4d7ab6dfbc168e1edcf7b06b9da65e88b805cde7adc14519e2139fc811188b24"; + sha256 = "433edd8dc45eee166d14d1340453637985f8e606d635ebffed09f20c93cf851e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/dsb/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/dsb/firefox-98.0b5.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "e0288172d3e7fd5f9d8631cb36a7f69118aed0b3daea8ca6d4bda0eee53a2353"; + sha256 = "46b731e6ebac3d2e729e69a2d671b5980f6a2d8ccf83c1e6828feab93bff73ce"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/el/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/el/firefox-98.0b5.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "eccb1283cee2fa9d6b35ed0cf30f789f422094cf2fb17966b9a406026bfea2d5"; + sha256 = "a6f5e1ce2b6333468a250c1a28bdcb7e44539315ecaf3da09091f7cf3c08f3db"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/en-CA/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/en-CA/firefox-98.0b5.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "7769bc1d977fec4e0b5362fdfeb0b0f52bab1d0b12b012c90ff2b096209bc7c4"; + sha256 = "bc56c9b18f7d8ecbbdb6f3d4b56607bcf9355156174d537e0e85d41f32876be4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/en-GB/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/en-GB/firefox-98.0b5.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "71e3b186ceb1333f4b95429e63abb1c0807a7f1df2c0e8da26b5af866ad077b7"; + sha256 = "35b574db65cd0f4511d745892690dd2e64fa4c0ca1eeb2be56ad2259b45f48c5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/en-US/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/en-US/firefox-98.0b5.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "cb4602feead2f7e7b407e83594ad2edd9de856d334a7f9cfd392a7764adfbbc2"; + sha256 = "2968f69125d5a203c2edb96bdb9a922d26064c7f903d5d1b9d7f5d0f7a4aef8e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/eo/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/eo/firefox-98.0b5.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha256 = "36ad536374a186e2d9ff4c2894749ae43c512555ce2fcd5f67b0ee76949a764f"; + sha256 = "7f5abde625cf25801bede74f74cdc1413c3dee3a4288eaf75d5e967ce133a88a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/es-AR/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/es-AR/firefox-98.0b5.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "8f4c854834fe8bffc682f8c29ee674771f70f78d28173cff3beaab13ae637c54"; + sha256 = "1626c5996088df57740cd8907d61210c8081bb0a2a1b19d8bc9129c14fbd6dfe"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/es-CL/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/es-CL/firefox-98.0b5.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha256 = "3381fa208df76553b85a53cfbd4ced059cfccaea1a8e246a5d0d1c54efed8e8f"; + sha256 = "5bed3b64b239ded8424a27b01a8456248e317b8e2b8ee92ef50c9462574189b5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/es-ES/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/es-ES/firefox-98.0b5.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "e98d88c0e6350e477404ef14fc7348ee79f25fc9e31ed2031c93b79298fc37fa"; + sha256 = "cf79cade9876dede8e6a4886875181d153169ca4f8ae5bfa9958c48f2abdcdf2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/es-MX/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/es-MX/firefox-98.0b5.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha256 = "26b84f335c5ba6238d69a7537686141188226859d17b0a64c71a1ca0ac9e9d70"; + sha256 = "544ec72d7f304ba702c134d1325f6589e30354d3d4b03d641451bc2f560446cc"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/et/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/et/firefox-98.0b5.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "9371d5111ee591ea4179c4932e03d1686b4f8555c5b6b1dc110382b43dc046f8"; + sha256 = "5a5775bc02aa61edf7d218ffc9506e70ca2dfb781f0abf5e4aabc288328deb1d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/eu/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/eu/firefox-98.0b5.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "56336434a3be39e71459a3ae990f3dbf826fc53ddd33410b0208e4104fb9948a"; + sha256 = "27bdd41a21e159e19bc9ef1464f1f76ac48126decd2942b4a18d4ea0777db743"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/fa/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/fa/firefox-98.0b5.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha256 = "75105b2ec1f269e044332dfd1736edf0919141d3ce7ab979da06ac6a47c361f8"; + sha256 = "7e3d58ae913c919aab4f716308a9fdc6cfb590538b0dd0b90aad3dc099caead9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/ff/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/ff/firefox-98.0b5.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha256 = "86439e96051f460ac42154274401cf4f50102f89590e67e78024a7e0928a2dcd"; + sha256 = "553b4b1025749f374f82acac4e529799d9e555754e63ae4a8bdf016ac8ed620e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/fi/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/fi/firefox-98.0b5.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "e94714ca233a274a0229bfd6c9e5daceaecd2cab30b8314464b766ac79c1fc2f"; + sha256 = "7514590c9dc0d9181ae439a637640ee1dee40e00e9283008a54ac3a07ec8256a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/fr/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/fr/firefox-98.0b5.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "4b88a49838eb6f479feccbdf3109e3ae7ffb1215a433233d0200fe8713475344"; + sha256 = "ffd7579cdb4e6c8f5e1e66b26e3b064362292d93776313b9ded9da4a3b764cb0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/fy-NL/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/fy-NL/firefox-98.0b5.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "216868ae9bf52b914063b154015efb07ca384f5a722064ce9ce2ef2191722c80"; + sha256 = "1f8457a73eb013abd48669f4cf1e109d307f307881e1d9b46ba9aafb09ecaebb"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/ga-IE/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/ga-IE/firefox-98.0b5.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "38fb2079928d7fbe4e8181a14f7c7d955d41fd14f0c73f0122d91c9eb1ef7929"; + sha256 = "6e9798462e2c2c0c50927276595c42539880cee4f58d00808cdfc5113aba9399"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/gd/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/gd/firefox-98.0b5.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "bd70c4241e3e8233458b7ff6bc2893de43e5917284222146a585fce47f785a5c"; + sha256 = "95f41bc7fb4c6fa19851827e0712bc8d7c9344eddc3c341172478fea583265ad"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/gl/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/gl/firefox-98.0b5.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "edac88def8dbbcff4cb4b5c33ab77f48d6b96a8ee1765649913028cd92d4b4a1"; + sha256 = "b785913074c6d311380b382b63d57c2eae45dffee759d1aa0cd2d0c12f736e1b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/gn/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/gn/firefox-98.0b5.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha256 = "1dcb25e73b9dd759cba339bd24b769c279c9eac1a4d2b47338ceac82d9e45bb2"; + sha256 = "1b7b37e1569244fdb6a11fa1d8d371d01756150bf376662b2b0246a4f08bfb37"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/gu-IN/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/gu-IN/firefox-98.0b5.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha256 = "122331ecadf4b63319988f781c819f11f905d685f4a549cb08454a9d8478029e"; + sha256 = "8623a915fcc694e5c8295bc1b95b4c6a37aacd0aed505f91239a2ab48fba8d72"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/he/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/he/firefox-98.0b5.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "45f8c33eff249c9373dcf558648475b171be65db5fefa873f7553ba1ce77f2d3"; + sha256 = "52cf134be5f9981534a93d454cd7a893fd605026ad814a7257ba0e59f4cbbe1c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/hi-IN/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/hi-IN/firefox-98.0b5.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha256 = "9480b304d5c9ec6a10dfd480484dbd01dc41ea1cacee4b05b962d4a5bced4427"; + sha256 = "e06f6fc47a98f4564a65d236f8c322e5eaaedb98d049171dfa1fafaaec8bb690"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/hr/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/hr/firefox-98.0b5.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "a287cf31defa7923a7004451fb2cf72018ee507cfc167a67899624f7b8375d97"; + sha256 = "a93e7425c0cbcd7579fb4de0a7ece495d77c01eb2ce2a11a9413bc6a8baae3a3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/hsb/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/hsb/firefox-98.0b5.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "792b12bc891d6d6b4e0c14f745641f54e9c50ecc10222ee679a206a4348d0c9c"; + sha256 = "66b42537cbd4d2338fd6a07b86c52c44f1210124f4c3572518c5bf7f0be217a5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/hu/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/hu/firefox-98.0b5.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "958a2569663fed2f45205ddb744e4c1a62210b678bae94e2717e8d4a66161788"; + sha256 = "637e898fc7bec9727fa489498abf1e6989a32e5f8b92340d0f645aa1150885c5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/hy-AM/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/hy-AM/firefox-98.0b5.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "0bd1b2ab4b063faab90a1c2158d9d0d0fc96f7fc81389f06190af39c9247dc21"; + sha256 = "b1b6b24039321e322f0b7d1fd2c59de13029aa56017e48e5211c18838744e9e5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/ia/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/ia/firefox-98.0b5.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha256 = "09523f090a020e658e14eaeaafe65a6db0793d389c8dbf0671f9f6d3b291482a"; + sha256 = "5ad069400e47bae81e7e8581e81763905b3334ca5146672317e2986fde7fbfbe"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/id/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/id/firefox-98.0b5.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "39460a0d21b63c39c5aed3467a2177441e23f15222abbc44535b96ca2ac869db"; + sha256 = "0c80a2786e149afb12de10a49584d6017980e3b52fa1c411d9db289ee537290f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/is/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/is/firefox-98.0b5.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "7dc87ec09c0fc046a42c583c6ec84d5116ae71ccce466abdfdf8d88578d4fbf2"; + sha256 = "39ebabcb230336731e5be1d4024add0d639b3ef0c9d9d94a9b59b5bcf00c6263"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/it/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/it/firefox-98.0b5.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "bbc73998584297e0eed998927c574eec7d81aa37530be11e0b68d1b89fdf31fb"; + sha256 = "8646c156daf2b9e76f1cc93bda605186c8041114bcafa8b67aa27c767297a830"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/ja/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/ja/firefox-98.0b5.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "6d4c0748a49fe3b14ea9906088ca99e1865002af3bd3fbf1121a67409018a51e"; + sha256 = "ac9284b3b994f9e3505808cc94391e04e62fc70a75a7ec4919dec56b79a63f84"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/ka/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/ka/firefox-98.0b5.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "595cb5d60786e691078ae1aa8e76ede002f2895fbfac3d9519467f382ddbbbf4"; + sha256 = "3627584688564c9fbaab025f1fc97eb988dc8b5c4eed58bd55f3fa1cb08bcd12"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/kab/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/kab/firefox-98.0b5.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "59b28149d3724582a5b4c0b4898bda5818d762020eccc4f40d4054cc6752fc62"; + sha256 = "b0a8e54764b3f0d947894d0daf2a5031d43a65e19fd3bfcda7f0499ff065441b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/kk/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/kk/firefox-98.0b5.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "13278da244a1cf7342235d75eaca237402432e73835d944dc9d5bdb9c5e967d7"; + sha256 = "b6cc1c4cbe1cae43a45f5fe1b2ea1ca6c3d0de7cf2d085b7e5536232c9213bf8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/km/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/km/firefox-98.0b5.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha256 = "de8d8b310cb4b90e40d15e3a991810eee5f7d5418ce1d2b8ae1490c040c9b2f5"; + sha256 = "069f7428b290da1db567a21ae0a5dc54a0cea3ab0012248658d3a273c9b45abb"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/kn/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/kn/firefox-98.0b5.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha256 = "8f400d8effab470e0823ccfa2fe1ba9f49422faebc576d9775a8194957b4d97a"; + sha256 = "a7ba3abc8eaa5348b47b287b98961506e87c40740c25b88e0da611153e95f992"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/ko/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/ko/firefox-98.0b5.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "de78ebc094faedbb79b8b3c050dddd8d89cded9d7f5b8cacf96a8ae0741ed5f0"; + sha256 = "ec46b6e6f2c852272dc5247053a55797468ba911dad70d4b1d927465ddd6ba5b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/lij/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/lij/firefox-98.0b5.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha256 = "7b46ed0c449eabbed031a6c944c725e20eff8560adaf579afc386728a6aa078b"; + sha256 = "c401224b42efadc03055787bc20df523cfbde82b65d1b885a0ef6ff23bed9a21"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/lt/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/lt/firefox-98.0b5.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "2d51003f43ec3ee6a4891f65d9b1c248bae86da174c997d5cd47b779c403ac3a"; + sha256 = "323f765f5db4ceb5dcd167ccb4c997bfe820498aa2249a1fa2557285a1f2ad5f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/lv/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/lv/firefox-98.0b5.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "18a3afd1e3799ae4af17ca288b3ca2811437d752851e3043b6b2d506db2e1c95"; + sha256 = "053e095300c9c1ccb3d8fff574aff799c40215482cb977087255d69dabf9362e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/mk/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/mk/firefox-98.0b5.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha256 = "62acd5a8e0eefed468022331f217cebb7e59e629ca8b26010cdd345fcfd3d50a"; + sha256 = "946d5de91994de14941bbd9a4a1ded228b97eb76d503c8aeb164d1a718758257"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/mr/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/mr/firefox-98.0b5.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha256 = "4e0ee6d697fafe9b855f3112ce745bab71b53c383a181b94dece0a66589604e7"; + sha256 = "ed084fcb7285e047548c0969914bc43fa3572cbbb5faae91dc85688e2de77a7b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/ms/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/ms/firefox-98.0b5.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "1a6ae8edf5732a766c584bc89b7d51b97ad491abccf59cc649db8f250908ea0e"; + sha256 = "58fcdd5fc46f80aef8a736dab07ffce340175ef07845a3c09da0f7056b30df3a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/my/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/my/firefox-98.0b5.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha256 = "f9a53290d295b9be23338bb7b2e6427f75e048f04d0614451a8a23352c286264"; + sha256 = "3049e29781a51f1e9c1f5da7ffccdcc52b71ffd5e7e068a17b364d7b71b91982"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/nb-NO/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/nb-NO/firefox-98.0b5.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "99261f267895a39fd7ddd376c87fe1a0dafd1c18467e5fefe17419c9a1ae058f"; + sha256 = "10c4764716f879429754d9665f439c2b23dab89c9a1d159ed229569b987ccb26"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/ne-NP/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/ne-NP/firefox-98.0b5.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha256 = "4c3d5200221d7d7bea5e9263329dc216bf74d9f2c822e1b626f8c051262aafaf"; + sha256 = "a46fbe8f8058d9280d28412bac9e3172d9554f0da6c5f5bfc97258e15bb1a5b6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/nl/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/nl/firefox-98.0b5.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "16a4857eda94f8f561fe482f9e21ea53c8a84404d1cf7d3c01ed62a6215aa95f"; + sha256 = "a99eadaf1d78c5afab26f951f3ee69d49326bac0db27132ac931651a2fa7eb39"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/nn-NO/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/nn-NO/firefox-98.0b5.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "12171700aab404bf48914952564a0bf862c816eff294885dd441ca5f68a48bb7"; + sha256 = "b7da10f47cc22661606c3e2d7ce1885a4b6a5aea42ef7e17ec80766d9c5d92fb"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/oc/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/oc/firefox-98.0b5.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha256 = "636950ca09f5a406581c1605370c85c610a6f53bd2e8adb4987e4ed7dabfed7c"; + sha256 = "653bc3cbcc3145ed8b93f3835486f2756c51318c74c8ce3006fec19420b771e3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/pa-IN/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/pa-IN/firefox-98.0b5.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "c7ba5162bbd16ad181d19ea42d34d6182c9972b208c98a009b301bb27c865357"; + sha256 = "efc1573dd48edebe52a4ef241132715db0a41b75db7e857f3abd0631fc2e5d02"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/pl/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/pl/firefox-98.0b5.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "e0cf100f60f73cb96c4ef942240375034c792036608e646a0412fb18179b4316"; + sha256 = "a856f24cfdc51898dcad5e2ccd9f9bb406622d33daaf03362fbabfa11893b413"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/pt-BR/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/pt-BR/firefox-98.0b5.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "4e2c43ff8dd482691190cdbee40cce73540f066b777e3c345acbb4b1622eb166"; + sha256 = "1cdfb66a7616eefe00025f70f1e5fd317890a141e5495066971fc53e3102106d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/pt-PT/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/pt-PT/firefox-98.0b5.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "de92cff3604a82952e49e04777a098cbe7e0fb991a5253e90c66df68f02a598e"; + sha256 = "c8a127fd0bc4edb0eaad1b06e32e050ffe1df11ef657e05d89de3ec97f8fe607"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/rm/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/rm/firefox-98.0b5.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "a88e3919ea3c8c29b1050e7dec608e62d986411fd4ae3fa8dd38ba55f9dab1f3"; + sha256 = "6c4f66d3b22cf226ff9fbfd05e0ce463d80044bccf8228721b5b8cc5476e8d1b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/ro/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/ro/firefox-98.0b5.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "e8a37f0ed391cd8b7a5bda1b4a492a5fa0201e06521c3c4863df8536c4c2da0a"; + sha256 = "08d7eab6ce8f18abde13feab2ceaabcc3e23652730a3ee7dc98d8c9234043b0b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/ru/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/ru/firefox-98.0b5.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "284a8064fb0a41aff769af21194fa2359a951dbe2134d6415d40a41d4a5636f0"; + sha256 = "e6fa1e2b5b3d0ce7586fba3c0d2f9c34514c767bae4a5066052df2bfb511907d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/sco/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/sco/firefox-98.0b5.tar.bz2"; locale = "sco"; arch = "linux-x86_64"; - sha256 = "01ac969a91b8d778ed08bb2f58faac842c1c28dda40ce8c0b90b40575658ace9"; + sha256 = "2c6e9d6804839a525925ad29adfafdda06ecdac1ccf034a2afbcffd5d13dfa66"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/si/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/si/firefox-98.0b5.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha256 = "4348f3da5b2b6ac1fb2fe370d2a4c820933c5100baf3c529fcde1814e32f1fc0"; + sha256 = "f3172fa7c4655496565322f717f176d908ad60d97c99692a92bfb948186d17a9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/sk/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/sk/firefox-98.0b5.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "e55e104417153e939c20be42e6307dc36fec843e9170441a3bd6f7d205111f5e"; + sha256 = "78f88185772cf164bf548d134b00d602cc9cbfe88a5b29e9c4a0c93f3de74efc"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/sl/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/sl/firefox-98.0b5.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "73be90dd466c418f0f1e7cd231234823c9aec4b37c73d419c272d5f0c6549408"; + sha256 = "15f31bf52e10de228b50be002deddc1cc89ee6a882def6420d1055f021f75b6a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/son/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/son/firefox-98.0b5.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha256 = "e310eb44e199a44f5c6dc938c5278e0cf5a57b0eca9afe93947caf124499a512"; + sha256 = "b4412fe101e6de2ca6f66d818823e48e337f06490645bd58455c6e4f9aa6723d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/sq/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/sq/firefox-98.0b5.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "a878f821fe66613200a69619d26bebeb5abd6e7a512f687dfd939ea7b055117d"; + sha256 = "420aaf8816745afabe98906716a8b23d0e0f84de677538a102ebc290c0f57154"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/sr/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/sr/firefox-98.0b5.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "a485ef9d3785f4dc8c9ce88287f597c550a489901b8c48ca9f760d8984c6c385"; + sha256 = "573aedef6185562efcb03d11e0fe2c19f28f16d593f598b529eab5c80648d91f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/sv-SE/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/sv-SE/firefox-98.0b5.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "0ecc83a16278aefd627e50e317ad426d8bfe7b68f4633941e6bdbb20e0f1e043"; + sha256 = "13a4fb70bf63f3f99321998e6e01a1eebe745eeefb33848b345c2020c0e8befd"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/szl/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/szl/firefox-98.0b5.tar.bz2"; locale = "szl"; arch = "linux-x86_64"; - sha256 = "0de3848f27c6be45f54429cd9679b19a661b79e857eac8c4852b511857a25395"; + sha256 = "8daa190aa592e6e11fefed3558c3f91cbcee630e20c3a452ff88d333b483885b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/ta/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/ta/firefox-98.0b5.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha256 = "ebff08a86bfdb646c02add5e9226cc3f09e096d684247c1c67b9ca6faa48f33c"; + sha256 = "21cff7fb1234defe7732e4e933e24cacfe27b782c37c447f079662ddb6a58d85"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/te/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/te/firefox-98.0b5.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha256 = "8221220edc9041f76a493feb7ac3199d93590c2a4145fc1d7e62e961188b3f3e"; + sha256 = "4f9fb449f2524d47994fa17e8a561b8706f48b36566cf36c39b590a26b04ec55"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/th/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/th/firefox-98.0b5.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "6f0b612c589ea43323dc8534111808cc1588dcc8dbda09cd4c8326ee513af2c4"; + sha256 = "f9fedd16f2ddf56c8be38579b29ae2c09b4e62228674decb88475be72eed93a1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/tl/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/tl/firefox-98.0b5.tar.bz2"; locale = "tl"; arch = "linux-x86_64"; - sha256 = "d21cb5dcbb5a6a290d83f96ab8fd171254f54cc8586b0513689d30fa059a7555"; + sha256 = "b62e425beec561b02a273e2a432eec4e857683ad83295376e902852245ee7b27"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/tr/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/tr/firefox-98.0b5.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "3cf9572b76b5bc627130e27105ce39bc51e55ba0446b4ea867593d7c36b546dc"; + sha256 = "ce56109695065dbbc78251d436d490bccc895a1a668c3507d6231f71a1046ada"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/trs/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/trs/firefox-98.0b5.tar.bz2"; locale = "trs"; arch = "linux-x86_64"; - sha256 = "269d9c9b50acc393ca9daf4f19404cf63e2e792028c26c03afb992f67628bd3e"; + sha256 = "38451517de283d29f3147b41b1438c99a74eecc3fe56c042637344585bb4d8e7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/uk/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/uk/firefox-98.0b5.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "c1d304b0b4a7b5c463c07ccb982b16a0265cb1fc114ade7bc4b39f8e9158f5a3"; + sha256 = "ab9d0993bf83de703245b62fac86453c091ca46f2b0bb3e96c8cd1be30fba295"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/ur/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/ur/firefox-98.0b5.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha256 = "17ccb256c21e7f7a0851a980952cd5cb006a9d29176b40f420b0002017748da4"; + sha256 = "8d5d39a0c363817c4d728c6d6d9cf215d136e60ea989a0578cf76930f5caac5e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/uz/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/uz/firefox-98.0b5.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "1ecd6d4a20e74d1b3116602a4661b6ea1d1e70f786c88e1452a61230125d4ca0"; + sha256 = "e1b4738410bec169f0947c2d6df5048c3c1ca51f632a2a94233be51963bb0947"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/vi/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/vi/firefox-98.0b5.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "681857e16b6767b0d66e8d51423b360cfeb8d107839ad52cbeecf1e7003d66ec"; + sha256 = "b950e0e6fbb707f4c0dd70b491b100f890255077ab756af92d419e0d0518cf27"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/xh/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/xh/firefox-98.0b5.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha256 = "3122fcb6638c00f489c6540c3cca4312dbdc5de5cc16351746e83c68d02a45ac"; + sha256 = "e01cb86ff2b60435d5717dca42e522c5a4824c09486067574cedf8de09d98064"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/zh-CN/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/zh-CN/firefox-98.0b5.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "5e4be58a4891d7b1363d57fcb9ad67e5d1379401cc3df49a5f9ea4fdf71495fa"; + sha256 = "e388cf188ed66903c46c0694aac5725ae1f2015ba3faba4645277d6456719721"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-x86_64/zh-TW/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-x86_64/zh-TW/firefox-98.0b5.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "e904a8e65e8637d01376a08908bba94f437f952eba13a68b81b0a40936044e14"; + sha256 = "b6cdace1499535a36e4573914b49a2c3e4ce9cffbad250438bbaab78f3dbe4fc"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/ach/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/ach/firefox-98.0b5.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha256 = "f5e383bd0268098f82791079324eb1457298d95431d497adbd6023f12c762932"; + sha256 = "d269fe06dfb496fdb6b9ce50d7ea4c9064e8070bbc2a47e6e6641aa79a13e772"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/af/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/af/firefox-98.0b5.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "ae99c4ccebc0b938ebf2c20758a815fdeebae0b81715db79d8385d6a649bb6c9"; + sha256 = "0c6a0ddb0937c59ff5b88d09ef291e685cb29f8435b4fb6227eb0c12b82d20b5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/an/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/an/firefox-98.0b5.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha256 = "ef7ab3d8b6b51d22f0f30b836024212332aec6989684b9a22a4f045662da6080"; + sha256 = "efd0afc4e2ce06b094a2c1fb005c246bf8dad02fa9b8e2a0037e6f88f0fccb19"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/ar/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/ar/firefox-98.0b5.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "b3728cabcbb46393796b5b948daeb5821b70ae29a8571fb5295faa40d9a8e592"; + sha256 = "29ef8698f0026dedf638fa32a2ed32d0014e131f41500969d271ca62c38f5cc2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/ast/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/ast/firefox-98.0b5.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "ecfcfa573fe215d94e48933bfb276f6dbd573c92a062f4f3ec1ed83ef0da83a7"; + sha256 = "244697199ae0e2895f242c64bd6f23d641deb124950ded7a0c0e8d1e18017636"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/az/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/az/firefox-98.0b5.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha256 = "37558cf0fdf41c728b2a22fc2b8142af011ef7beeb924e08de2400f29b2dede7"; + sha256 = "77bf85d57fb887f5f1e0073daf09807286e2e5d835ecd9400f698dcf0108a949"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/be/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/be/firefox-98.0b5.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "29a156bac1d7ffe10d05690fa3a82820cf246450ef1a77697e4f7f346c9eda13"; + sha256 = "6e18fb3773dea1a99c9ea383868a9db07e2bf2a0ba30b9acd283107a3b557b17"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/bg/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/bg/firefox-98.0b5.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "631e34ca2499d6767a1fdc7b944f08841bdcd9e3c248f1e4f0572465797e819c"; + sha256 = "1be4cc0e4a2b9c4cd00813cade9b09db97f3cec3087d103c0204cfb64bceee12"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/bn/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/bn/firefox-98.0b5.tar.bz2"; locale = "bn"; arch = "linux-i686"; - sha256 = "3500810a58a0cd5192982fc5536902e377458589faf0e8c978425ac2fffb19ee"; + sha256 = "c18cf7a7dd09718fd59457e8eb7153229061e4962e29abde5e83add456e2f086"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/br/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/br/firefox-98.0b5.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "979342ef754af3751a5466a5d54b40291f87dc8f084173330b2e337aec84c516"; + sha256 = "d6ac7e4e279ce4858f77cf3613c05b4d6dc0ac0be4cfd66aa880b5761f9dbd02"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/bs/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/bs/firefox-98.0b5.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha256 = "55fe1b0bdac8f8dc37acf3159ccbef78e4054c499ac8df550b215826eeeeec6d"; + sha256 = "b785f4a680031be8ab963a66df4d61dbc54510fcd400d7e061c54e4bff554dd9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/ca-valencia/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/ca-valencia/firefox-98.0b5.tar.bz2"; locale = "ca-valencia"; arch = "linux-i686"; - sha256 = "ff090da1c4a6d6dfb12d1750dfbf1f37fe57e2f5f93250d30851da215f6daefc"; + sha256 = "69ccaf431b505db72245a8a6bce287dff88993055cfa3bdafbb31ef9783598bc"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/ca/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/ca/firefox-98.0b5.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "67027d0efa86c8fea2d27821a99a30e3878a9c478d9f26af3ecfcbdce336f896"; + sha256 = "d779e8ca6fcf77cd4c5e0edb4883d0d28dcba2eba456de9cd4216d96e7aedb03"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/cak/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/cak/firefox-98.0b5.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "e7c2dd2447f157a2541540ea24d0732dfa0dd84b116824d87d7bae53a572883e"; + sha256 = "dcedaaaaf1d9acac61fdedaf893d288052df18a925f8853722934ef54e92a71f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/cs/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/cs/firefox-98.0b5.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "bd7dc68d840a6a53a525a8a1229e0abca8aa2af14bee6c5f7198d877f3ecab1c"; + sha256 = "b761e7d712a9ad951a00ee73f36eb5a764faa1285ce22af168e4dbe1516edfbf"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/cy/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/cy/firefox-98.0b5.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "4a21599535668ffe96f3adb56801aa3c8b5aef40ce2998fde430e34cbb4898e0"; + sha256 = "f640b0ffc029f473c3638ec8e08884997533d087cc8590a35458571403b5396d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/da/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/da/firefox-98.0b5.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "5f47de337347f65ba478c48c373d12befcde1b86b99102feb0c921d149541d2a"; + sha256 = "0e56091cf2787215884df9c1dc0e2c208021fa99088d0dce18324b18b0b57aa5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/de/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/de/firefox-98.0b5.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "4f11bf8857f65091d43835c4c1d16097189e184e72abd2dde6807e8b22370f8e"; + sha256 = "39d1c2ee79f1434f263ff804122d9dc20744c8c050513c95c75d7c424a5325c1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/dsb/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/dsb/firefox-98.0b5.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "6b426096f9a652e1eca190320fb485c5573c94d7f7558dc70f58b6c49508e5bb"; + sha256 = "09544d8f51134e5f74c5d90b98844e49ee5b0be7ed5c63e2fa9753a08cfd2600"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/el/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/el/firefox-98.0b5.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "f374d64f64529238f867b76e7e894065a32b75b2d669787f1f7285f23ffb653a"; + sha256 = "c76d10c0f9036b33e5e0048fafa7b4d8571af5e27f25d7dc92c336ffac2726da"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/en-CA/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/en-CA/firefox-98.0b5.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "0806aa2abdc643eed084e7764acae24ee7da7e01c8482b35de5af0cbd809b9e0"; + sha256 = "c85152d5ba80dc5a843312da61aed21834257bede5019b1042353a7955ef0e35"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/en-GB/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/en-GB/firefox-98.0b5.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "b41a39b046956ba4971c4ef163d9da6f7ea6b70f2dd419fdc278995bdc300723"; + sha256 = "52696aed9eaf8be1994c88ed50925cc32f8139aa92ed9f9e1ed91d8c01468e44"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/en-US/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/en-US/firefox-98.0b5.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "8869e2fadeeca2c22c7732f22cd9709d8da9b435b6e4f9c9d384f67405f0fc76"; + sha256 = "e60a2d3079cb76ce879cda5d9c67ca33938d501c3ceb517fd69b58e6f932bf2c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/eo/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/eo/firefox-98.0b5.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha256 = "3d339e3dcfe1ff4273d0a35f1177f580c8158b6457add582cc23f67c00676e56"; + sha256 = "0f27a6f422d03c65879233a22cf469cf287d24d7c250dcea2bf8d845af303bd7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/es-AR/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/es-AR/firefox-98.0b5.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "ed129dc3258a62a6e1f02b881d78b2d6348b95b99c2011005644ba484968e3f9"; + sha256 = "639027a3d48570d8bc98965802f9b7661d545ece751ad1d734e7e303f8649962"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/es-CL/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/es-CL/firefox-98.0b5.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha256 = "0691ef7be86c09cc92fbebc431668d1eee722ed85179a068ab3c548cb6f50058"; + sha256 = "44f2a552486e6f22b111e793d0e69a67e635929f02f6f3da814dd2daf22210c2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/es-ES/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/es-ES/firefox-98.0b5.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "86629f77d8092ccc4ddfbbfd2613535e1fb3a76e70c10fab46081a87cecaffd8"; + sha256 = "02e56e76df00d39b0a8fd68038a9e8c956ceb512867d453f47209cdb9ce65597"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/es-MX/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/es-MX/firefox-98.0b5.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha256 = "5225e99833460c3098057602b82be9e0e52f2b00c060c29c1ca7310e2dec8384"; + sha256 = "2386378b0917c770b419ea6561823ab0cfebe36c28a36e7747c47fe68201f95d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/et/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/et/firefox-98.0b5.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "0d97b86b2b6834ae518820e83a0f4af5318f3eb8848ca69ad4e3cf2dbbc56e6c"; + sha256 = "382c77faf5501c3f03c626b1a8c99bbbd0d60cff39ab1b0ed33c7a3903866d03"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/eu/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/eu/firefox-98.0b5.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "d44a9db9a6638a6c69c7b4ffba024d5b5028407533eeab387c2c442f73078d47"; + sha256 = "9db254a521cb2185c82522121ba5f7d75a819298abb3c301b6a8b06007d242da"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/fa/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/fa/firefox-98.0b5.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha256 = "df47ebeaf3e3eccfa2b483e46ffc4f7106299d62337923964249c2a7ee070a4d"; + sha256 = "16576d6924c772e5d05285a8a9367e3cfbe407f26f96c499fd829529bfd3db4e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/ff/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/ff/firefox-98.0b5.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha256 = "4be5b5876f032e09d87c90efb9da8f168f722b46f71adc0ec036c4a1840a2795"; + sha256 = "e26dd072353546dab184c4fd527525bb23201a8ed05c3c2bb672cf5a3da2e776"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/fi/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/fi/firefox-98.0b5.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "8ecb3ec4e9387647d3361345a420574887c74ca8bd38f723bea6d8ba4b2f4c81"; + sha256 = "e785cc2e7c9abefcf9b4114f778def4789635e1bd0f354082ba1040435d9c4f1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/fr/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/fr/firefox-98.0b5.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "15483453905eb6aff243af3c536e6d73a88dcaeee4363e829c30fa3e2e9bcf1b"; + sha256 = "7debe05c2c0128f6a125c627b26e441547d4da485ab263c5b5190cf5cc04b3a5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/fy-NL/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/fy-NL/firefox-98.0b5.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "991445513ebb294c2bc8e5833e7631b791cbcc72ccd501ee883665b3b0b62ba1"; + sha256 = "6da5b56b5df3fda1f8ac8f35ed80a0150e66809ab4ae18af8e114a7e45bd10a6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/ga-IE/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/ga-IE/firefox-98.0b5.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "036e8d167fc43d940d19ac8b90f4e136f264f16fe7d012fb1827b10dd47d8442"; + sha256 = "e145c6ec469038e9cc2e195770fd5eb467bc3859c465d9c570df06e1af0d9532"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/gd/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/gd/firefox-98.0b5.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "056ee174fe2a43aa714abe4e59521d2f040fc326cd9d4d36b8ab2676fefba24f"; + sha256 = "d95b7f7aad0d343bdfd8814f38ea59ebc277ea85426fb447173b0a1b4efd9a74"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/gl/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/gl/firefox-98.0b5.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "6f30edc15658ae9395037751fab17c115391f22d4e2560945cbee436344aae92"; + sha256 = "def309ff0f7916df41f34ffe9ec2260a0738da4a2657020641d6d03ee2faed93"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/gn/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/gn/firefox-98.0b5.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha256 = "d3cab8f98f1011b94c8b887db82ee3b64051f03879f83594113a0534fb7a730a"; + sha256 = "1dfb7e8a36039e5bb434f1273cf9356a3826444f0f6b058897d16d4b9b0d8676"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/gu-IN/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/gu-IN/firefox-98.0b5.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha256 = "969d9e3ddd308b96fe6475b04e0eaab162aa89f98daa9f921b52a2602e95c93e"; + sha256 = "1c3e77637bba527e9a229665fc4a4921f0b26e05c14e5257a0b28507db34f08d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/he/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/he/firefox-98.0b5.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "874a5cacf1f6025889a4fc0961b8c26f78a56b403e76af8e84cd6bc54de3455b"; + sha256 = "d54c2e3377e75dea8400d9b5486259f9be1158e44f520439912052bc2097624a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/hi-IN/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/hi-IN/firefox-98.0b5.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha256 = "4d369daaffdaf1a28d940f98f3f3d4c3936c5ccb3f913c3c1f0233b4ee448da5"; + sha256 = "a91f89a416dc77cda507aa9a1bea653f48249f55ba4655489a4376ea92cf066c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/hr/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/hr/firefox-98.0b5.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "f5138a6569f4c8779c90462b3165fb7bb2351d48e9a81daa88d909e475eef2df"; + sha256 = "ce38b5bc0b04a1bd86e2f5cf345c25718103d347803eb72d46f1cb90553695be"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/hsb/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/hsb/firefox-98.0b5.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "f410a1786eda2f9b7bc27e30c438f4e0a090b436b871c0614f6fd871f4eaa2fd"; + sha256 = "201ec9e0bb4058d7183024545af8eefe0cd3505fe557b2d541d8a7330c2797fa"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/hu/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/hu/firefox-98.0b5.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "60aa12adff74ff46ef37141293acc39b4592d61512c9db0a3745a8a41858ce67"; + sha256 = "997a9884e4669e6e883703934e4d747f784f38fb374ee43c7d30f82b9462bb2c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/hy-AM/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/hy-AM/firefox-98.0b5.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "2187efe8640a541ab3b9c11583d09c977cf3af44c280887b03c5f4ed05239439"; + sha256 = "fb97cbf935b6ae92c8c17be640820e4be73fed59d385bdeb2435ac2253c66651"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/ia/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/ia/firefox-98.0b5.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha256 = "1d3a3f28c0a99d56dccd1fc354a56cc1374f4f87a76760b410b616d0128f83fd"; + sha256 = "d999259f970084c684cf543460efc6faa3677eb839c67e9743af24232d81ecc9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/id/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/id/firefox-98.0b5.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "b2e0853123208160486936e98ba978a7d509d8d4e0500c89bbe522ea69a4ff67"; + sha256 = "d9bcf799f9d744ba94197900e2032cbc42e4eb3f5ee2d429ede4e2ca47c45d63"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/is/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/is/firefox-98.0b5.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "43e9ca38b6ef601d7834b2b951b4a14394a6442d0da1d5045b83a5ccbf7bad40"; + sha256 = "69e55dfe9e542f9c4e0cdcd75e24c346ac565012b2214ad99534ff643d5b1a9e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/it/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/it/firefox-98.0b5.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "ef20972394355ce52307056b94af6dea64a3f6b1cf1887b3796505baf4645fde"; + sha256 = "b10c9af0a38a7cc456d7392dbb4a01a964e68fcaf963868011ba104a01c10f59"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/ja/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/ja/firefox-98.0b5.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "ec106d9e5ebf26c698106c0b751a54b1af77959a39ef47ef124433a3b610f146"; + sha256 = "114df4baff98d81d046a069b6a3271f3cd385cafff9681bb1bdd988a4b806eb3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/ka/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/ka/firefox-98.0b5.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "19b20479c0df3f63a0d516bfa4521f0c7cb81e7fb9873ad801a6f662bc7558ab"; + sha256 = "79cbe62f30dc117fb656db52ba61895dc830f2f53b8f02edb69809a8fdfe4722"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/kab/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/kab/firefox-98.0b5.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "200b9ec8da001ef900fa77ba7954ad67f68504e29ddc78a389847f076d9812db"; + sha256 = "babe5ff8170ac703bc95db0c9b54e6c05c12e198dcdd42f0fce9eb2b2a366606"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/kk/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/kk/firefox-98.0b5.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "8400fb463705221d80015a7b69388478f851231618bd3be0d9fffcc6b35783ec"; + sha256 = "a4e3648681178444d8527539523fcd177741ca74a11cf608ae7cfe9608ff46d0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/km/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/km/firefox-98.0b5.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha256 = "4fee1c00876e71f6d8fe8194ac48dc56bb8ca6da2e5ad41488e1a99e3c65a32c"; + sha256 = "42dd57a33216a86ccfaf915dbc2513b6ff9441ff5820cf51b0a97bdaecf1c00c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/kn/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/kn/firefox-98.0b5.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha256 = "c7aaaffd7539351180240837e1930b8303b1eb9d199a1937940f80041aca1632"; + sha256 = "8b296ec5f02e7135209f83c53bb4d18c652336a4068b17db99b10dc9d3500744"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/ko/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/ko/firefox-98.0b5.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "f54d11032e4b929e0d283223744aec809c46d66a875dfa9e07fc2a9237c5edbc"; + sha256 = "85829c8e7d52e7e5879d52897ffee0763f3aa03b754647a4d4c0e2d59cfad230"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/lij/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/lij/firefox-98.0b5.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha256 = "c7e1da38ea4886454f252c656bc1fd9809cbbdbf06b159cc40674e9e03ce0275"; + sha256 = "89f0205a14d7b97c635382d3e2ea045103eda9df9f0b7184e7655626b34e39f6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/lt/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/lt/firefox-98.0b5.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "5177db2a4e0ca4bbdbd9d7e3fe5aa5785f995df15df4ac4213bc22c2f9380a59"; + sha256 = "f9f88f5d24d5edcd157a030b482c50175bda9a9d4d95499b668227438045b6a0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/lv/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/lv/firefox-98.0b5.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha256 = "0e5d27dbb6e1ed3bf87a60bf62bc90beeb1c503fcc545b4a22767fda0e8e695c"; + sha256 = "7da0fd946c235948ce659947e53f389955e12a10251d2ad564ba6808e13aee76"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/mk/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/mk/firefox-98.0b5.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha256 = "54250e1742ebd3cd0db36ac68f5790fcb803a4b63d77293905727922379c84f5"; + sha256 = "9ffa05fc839c67e5c709b6203627b75b7bf7765e5e52e7151561ae0ff36d43f8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/mr/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/mr/firefox-98.0b5.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha256 = "887c2cf008099abfd6cae59203f660e71618ad63d8492f0f1de072debab84450"; + sha256 = "ff45d74bd695b8677ba76ab1cf6a7726ac08d7ea0c6ed6f705dfedc536df8112"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/ms/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/ms/firefox-98.0b5.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "c34caded0c323906ff15538694b37e3c91a00c731d7f4017434027882f160086"; + sha256 = "9494973f7facf05b5636bce50a39151596b827a3444ce80a601c66e55b488af0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/my/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/my/firefox-98.0b5.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha256 = "f66ebec1bc3783cef6c57436a3f9764b52942f2466195fea8e5435275a276411"; + sha256 = "ef0b115274304dd0925d643903f15ac7d6c26281ad5ec57c6b73a0a0beb97486"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/nb-NO/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/nb-NO/firefox-98.0b5.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "6ac73b95d650bd7f8454345a041d7f9a294aed2cf249d09ab726eff5c6df0036"; + sha256 = "79c7211ec24d7855f890cd83a65411302f0ad4296ed19fecb86969e62ab6c01a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/ne-NP/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/ne-NP/firefox-98.0b5.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha256 = "9f436cf3504f2629cbec87051539e00782c9942aeef4a03fc4fd44000dfd1b93"; + sha256 = "b4fd3ba21a5c906cdeab13d4db78c4d8c43dae758211d8edb6570d49561b9f26"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/nl/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/nl/firefox-98.0b5.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "8759bcafc09fd00beda7f9795b49675d2dcc153d96020198c9c4117c30fe9c0c"; + sha256 = "cfbfaffe54246e4ced8a35edd67b5e28567d9d61ed4fe867f11fc479864e8a6d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/nn-NO/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/nn-NO/firefox-98.0b5.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "2c5fc7af589d06e2bda4de52b6a079b4c8ac9287b71b8d86a6462dd63f64f62c"; + sha256 = "74487e82d428166a870b0593ea7be3de9b912132542ff98bd3276e1b9091fc21"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/oc/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/oc/firefox-98.0b5.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha256 = "0f96f8938af715461ab1267713d57beeafbca389aa291931c1712cfee375dcac"; + sha256 = "004d5e020a627f95572f2c52bcdbd0ef52b66134c5ad64328c810ba2a910cfba"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/pa-IN/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/pa-IN/firefox-98.0b5.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "1a8f36abd3b638cb4aa82e66e4dcbb13a56c0fe967ae3187686217ffac0c37f0"; + sha256 = "4102b176aa98362b3ea6bca76bc5ad3fee3849b833f192d55c02ec72bbd7fcd5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/pl/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/pl/firefox-98.0b5.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "01b349d1656b2cc480e22d1a1a4eb376ae3b0be65a4b64d1cfb95e29b8e3a7c0"; + sha256 = "acc2990be46dde74e93acc0e20d5c59acd2ec9b0ca2d3db1bc641eba9e17dd6d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/pt-BR/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/pt-BR/firefox-98.0b5.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "4db2f4df874ebd5914ac143c9963e108d45c9822474b43d32b7a417d9a0c14ec"; + sha256 = "c1a286c4369f13a6df8dbbeb9ef60dea11d36d38e1403d8e9bb8387fac2226d8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/pt-PT/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/pt-PT/firefox-98.0b5.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "fb4f87a2f1c735fc19da371872990a4dcc76ceee2a0f6776e55b06780795589f"; + sha256 = "35805803b8487ed6f28bf8cf6ffba764c479cf0eb11bd418ae2613831ede598a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/rm/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/rm/firefox-98.0b5.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "a9292aa129c8dc538014481865f046b8dbd069138a4ef73743137ad609656174"; + sha256 = "deb2e23159d458e4e2b030678075d793a0d68e87fad38473267e7e7d57939715"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/ro/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/ro/firefox-98.0b5.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "4da6f323d2cddfd0a6f85f61c75cae777668cfe4a88a9fae3ed6297702604e35"; + sha256 = "bb0c6227d2903080645a7c7ed0665db6922beda6438d7b82060d890b9ace2a64"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/ru/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/ru/firefox-98.0b5.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "44eddd02a18b8e419d44bae127a4f37eda740f63fb7524891f3a435a6430f64b"; + sha256 = "b06680a771d8a347c25b65a56cf76bbfa1294fc8c7a2a303bf92175aec1e952e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/sco/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/sco/firefox-98.0b5.tar.bz2"; locale = "sco"; arch = "linux-i686"; - sha256 = "aabcfc84e1a06d901e29b571628905871248a3148fdfa9ebe1b26995db92fb81"; + sha256 = "0519564a5e34f3c9c9ae9605f520da542bd69f20f9410c47739e30ed290ac5f5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/si/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/si/firefox-98.0b5.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha256 = "8a8b0fe064719cfb088ac61e412c7b1f2d6d66ea523d7f6742efbb54cf53f0d2"; + sha256 = "8a5d4685384eaec411a278f92aa2c09f667df430cb65920dbf4f2a22ab749b22"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/sk/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/sk/firefox-98.0b5.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "0bba256df30a3deeeaf5edb946fa535b762cdb42232f8e15f3d1ce49743c121f"; + sha256 = "6083bdf468dae23a0cd69506e04615f7312dfce6ee0fad744432f316001b23b0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/sl/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/sl/firefox-98.0b5.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "5ed15767967d579d6809fdc0fae86f0f42b9f8ec2e024bd40aa151147528ccec"; + sha256 = "42ae9e4a00b8a939a934505e5b4898dfc5edf2ef7c63451784770ae8e942dc3e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/son/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/son/firefox-98.0b5.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha256 = "5e6f78700f74229fb3dfea3b408a5ac78f18892c6ec407bd85017467a5687ba6"; + sha256 = "2d808b21afc4b1af9ea72880acac4c017566e74d7a6635d0a3e9302159961f2d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/sq/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/sq/firefox-98.0b5.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "5eb1de045ee119d67e0251be6223f7efb3fd26d8cebc5f372f4513d0928c8a51"; + sha256 = "799099d98be61d2ef50988e4a0dcc910a3d089c8b1b156c340bc6f306f0c05bf"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/sr/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/sr/firefox-98.0b5.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "78b467f1ceda9ef4d181d5549855241ed37381dc08d4e282bdfdf0db3b0625a3"; + sha256 = "0627104342fa014aa267b4874d88592aad131b8b71ae9da4864233217dac9fcd"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/sv-SE/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/sv-SE/firefox-98.0b5.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "a708c94b51ee31a40532970d59b2d570c87aedeed24454aace5f6870eaccfa5f"; + sha256 = "cf22010a41298f31839c61c749b7f643f92b792050d62060305284d77fc21b35"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/szl/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/szl/firefox-98.0b5.tar.bz2"; locale = "szl"; arch = "linux-i686"; - sha256 = "0095fd3dc0eb4eb46c55ae3b2ccc65bea69127aed00d6fac446fb9c9274f4302"; + sha256 = "588fed1f0dc77c8d5a18ddb33d04c5570efe80adf3e96895b1b0243e82e92535"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/ta/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/ta/firefox-98.0b5.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha256 = "c8f052d0275c803da20f62172976b44357861ccd8599d9d70eba9a2c96594824"; + sha256 = "6d10537d9268c509fed6bfd86eb53351b772ea2ba96c0f386d589765b0f1153c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/te/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/te/firefox-98.0b5.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha256 = "efad15e6aeb3ad1287cc3d0e3d0daa389faa7f348a002cb5c7f52f812eda8c33"; + sha256 = "4ececc1167184b3a531f8176f4282b34b2f5e2c98f329af7dc67ac5be5efefe7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/th/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/th/firefox-98.0b5.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "dfff091b8e2f6b19842335da51f4cc7107401268b91c1bee55bb473ab5f245bc"; + sha256 = "2860a9bf015972a38b1a15bfb532b87c65e2edb7b9ea8ed2db8ee6ab03d4e281"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/tl/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/tl/firefox-98.0b5.tar.bz2"; locale = "tl"; arch = "linux-i686"; - sha256 = "35f3b8459096105e29d87645ebfba3a93fb23412ac7fcc30357f2ebbce658f2a"; + sha256 = "97134e6fc0b07c910f8a2ca263943724e3f5790d62b4f0d2fc697c3d5a15a6ec"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/tr/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/tr/firefox-98.0b5.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "3727440d1c3fac9b5761e3f79e46658dfeb5bee2f3ed17ec78697d869be7a7c0"; + sha256 = "5b38cc44c7d8aa425e70903f192f2ccf8cf4dbcd40952d0014a6f16c81ec66fa"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/trs/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/trs/firefox-98.0b5.tar.bz2"; locale = "trs"; arch = "linux-i686"; - sha256 = "91808cdc62ff8f8670d3c22acb6c203832471ade8e24fd606a2c00312fc39d7d"; + sha256 = "e5e7db1ca4c8bff1623bd2b78b1d66617510419a893f324af8092de1a9476a51"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/uk/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/uk/firefox-98.0b5.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "947f2cb2572e17d04263e5ebebd897a6900d22dbc85196826e316706a8622aa6"; + sha256 = "357410778b50cd6da76d178dbc88efe9bdf01e71895699e1616ef4dff253aae1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/ur/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/ur/firefox-98.0b5.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha256 = "d5baa22518ee5f189f780d159aef432591c7d4855cce7f1dc4c67d48c69d5780"; + sha256 = "f38359d87aa018b4bd8fee63829a04e7d552c928b945f74c3f2e0ec21524ea03"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/uz/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/uz/firefox-98.0b5.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "25b19eac0ad6491c7285633ad61dab8f8d2833ba011b7aaa8dd1a2d0eca2b6da"; + sha256 = "b23c4436a5fe3edb954c2ddc16ff16756d672a89afed91e0753b6f9c7018e9d9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/vi/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/vi/firefox-98.0b5.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "ad284426be9590e9a118c5f151c478d15e6d964beb46312fe7172347783e9162"; + sha256 = "7156717a71e9fcc8d98eb0fd544b5a3bcd8ade7e805e7a2806b3b3ac363e2402"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/xh/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/xh/firefox-98.0b5.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha256 = "ee90ff4921848363791e0486fc8810d892bf07c448c576bc4c0ea09a6bea8e55"; + sha256 = "5e5b2764b860bf45e5cc738c1d6ce989a6f85b226ebd4ab59d236295ef596a51"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/zh-CN/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/zh-CN/firefox-98.0b5.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "9cc4ec8d6ac780a0fa8ad01b5b16438a0bcb290da79691e7dbf993033bd919f0"; + sha256 = "74fbfe561438450fc28539c6d88e16e89abcfabcb025dc57aef87bb2aa64bee0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/96.0b3/linux-i686/zh-TW/firefox-96.0b3.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/98.0b5/linux-i686/zh-TW/firefox-98.0b5.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "6018bca3d3963b3b6dbed521ae068d15f659b6779240e8ed1f9c3c66ec75b932"; + sha256 = "12467aa41392d7429a91d01e35894fe5bf3d18cfc4091e349490f063e4b69247"; } ]; } diff --git a/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix b/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix index 0a7d185d59b2..25ae29459f03 100644 --- a/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix +++ b/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix @@ -1,985 +1,985 @@ { - version = "95.0.2"; + version = "97.0.1"; sources = [ - { url = "http://archive.mozilla.org/pub/firefox/releases/95.0.2/linux-x86_64/ach/firefox-95.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/ach/firefox-97.0.1.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha256 = "30c3158285d010145b154249c1182a2a705881b18194166bbbf72d6f2fae45ce"; + sha256 = "a10737964c66f46a15ca60c29575a837340e9b967c849809717c7009c3a01c20"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/95.0.2/linux-x86_64/af/firefox-95.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/af/firefox-97.0.1.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "293b4f0d6ca7bb1ab8f51acb8a97894e81ef6ff36832a84b05f4789856001654"; + sha256 = "a6ef82107f918234c84da51b49bc2018910e855ac4e7e5cc3a0e71f3583140b6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/95.0.2/linux-x86_64/an/firefox-95.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/an/firefox-97.0.1.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha256 = "27a437c1a44594e7b6c7b2200031635cb5c10d529337b764d97e7c5529c9e82b"; + sha256 = "34f5a0461707feffce732749958f508efd729ecedd8567dbe1387bde5e335a66"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/95.0.2/linux-x86_64/ar/firefox-95.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/ar/firefox-97.0.1.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "f40e52d8c0012a87153291f55b3418fa6a9569f370b394b86b0d48a80935bcec"; + sha256 = "5e126bcfa03c79e9ad777d76389a23e109dd852fc98698efc714d37125656f84"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/95.0.2/linux-x86_64/ast/firefox-95.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/ast/firefox-97.0.1.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "5ad7e850cca208ae3125c3e628a0ed9bd9b5a7393d6e25b88a83cffa6dc9c7f0"; + sha256 = "931ae804e75fa4b039eb373a38b2f6fa8dffb852e418789d559d9a9c0612c54e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/95.0.2/linux-x86_64/az/firefox-95.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/az/firefox-97.0.1.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha256 = "3953a2a6f71ccabcbc6811e92baa7e86d548fa5935f5b149c54ccff94f8a7648"; + sha256 = "549dda8a1049d074887f187689e73c38b814c1f1896752320f2a03f566bad2c8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/95.0.2/linux-x86_64/be/firefox-95.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/be/firefox-97.0.1.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "07e1692b749114e441e99509e5da570d2104c598f4335b16fe807bc01baa2943"; + sha256 = "06b0f7aabf8ed42ee6f021bc37abb44029586f5ddd2673f885f73f94c64032c7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/95.0.2/linux-x86_64/bg/firefox-95.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/bg/firefox-97.0.1.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "a15479f6066404f7def523febf56ea51fc5d51e29302ae65e6022e7c6f6eb3b5"; + sha256 = "72f5e07d24a2810659fc7d5c9a43214f427286f9a0096d602be0edbdb31d529c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/95.0.2/linux-x86_64/bn/firefox-95.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/bn/firefox-97.0.1.tar.bz2"; locale = "bn"; arch = "linux-x86_64"; - sha256 = "641cf4adc3bc2ee15e60e458aa3c25959355ab511087d2601391694533bd2f11"; + sha256 = "9f3d0376edd2c74b527190a5d53f0d2a36c371484fe4fff1f91c1d03b0a2dabd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/95.0.2/linux-x86_64/br/firefox-95.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/br/firefox-97.0.1.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "0b2e5ff481047324de3bf832e88893b6ff0c632c4e2c3275ad35d36149870ead"; + sha256 = "befbc0e991718afb4dc5362fa9aaae52a0e60fcac158a666a2b7a7b41eeaf834"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/95.0.2/linux-x86_64/bs/firefox-95.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/bs/firefox-97.0.1.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha256 = "03a65771f51281b8f6f116c794671f8cb42e2a3832027380785785cc47c16e46"; + sha256 = "a4d41ac7495d4d5311d5e03224a1c75a03fa059b6638666fc0622674ebfc6248"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/95.0.2/linux-x86_64/ca-valencia/firefox-95.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/ca-valencia/firefox-97.0.1.tar.bz2"; locale = "ca-valencia"; arch = "linux-x86_64"; - sha256 = "e42666332c27cd4b8e904f0c9c332971a8d17e12697fe18c7c93a8415f620f0c"; + sha256 = "2ff1b0f0035374f323fe2bfbacd321394fb040599ed064627f60d24c78571394"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/95.0.2/linux-x86_64/ca/firefox-95.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/ca/firefox-97.0.1.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "915ee8e30d27dec75019956f960a4777cf33a8eaaf86955d9c0d8fe81a2a6e8b"; + sha256 = "6f979602867721179454d2f6286cbecbf0a14aa0d42ba68ff7d7ca751f15a341"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/95.0.2/linux-x86_64/cak/firefox-95.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/cak/firefox-97.0.1.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "31e2dfc109314c942e52e0783c1df09959b7bc27961c419a7dcea709d0a27e50"; + sha256 = "dd8bc5188874f0b5b300a03a7ded9fe059ddf9c9f69112429233f2905a5b329f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/95.0.2/linux-x86_64/cs/firefox-95.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/cs/firefox-97.0.1.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "5657b42bf6c9baddb68740d05ff75f791d53d5fbe36159db3f3afd16b22e275d"; + sha256 = "8daef8ab21ad86b68999e052114b17b52d44e64e85b8879b690717c4017aa983"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/95.0.2/linux-x86_64/cy/firefox-95.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/cy/firefox-97.0.1.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "c553331598f9666a8acb0c54eb47872d6e0e81d5884a4296e69adf3fb93a447a"; + sha256 = "758d098d80d37b2bf15dcc3b16ad7289439166a3c7321bf815c555d96531589e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/95.0.2/linux-x86_64/da/firefox-95.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/da/firefox-97.0.1.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "affb6428a8075a20ab8ed161972297d7841e533ab63d37172fba0fd221933031"; + sha256 = "6fab3975b94d94809c734ee95cb26d9bcf24af71234a1bc3b8c4db0b97355405"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/95.0.2/linux-x86_64/de/firefox-95.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/de/firefox-97.0.1.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "2bc45b8224591336c7ae61e0a2bcc0e3c9e172845cd9d267df118657c4d9e0bb"; + sha256 = "1b776d58ce3b1d21580f725b065b164a6fc23e5b17d70025830286922f5c1455"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/95.0.2/linux-x86_64/dsb/firefox-95.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/dsb/firefox-97.0.1.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "ab7f31ca329192242baa95738bc762e300f8208cdd9bb825d39fa6f1965b3681"; + sha256 = "9b9c082e7fe273635b1095e6caebf8645abf3aadcfbc26e098616095d64b2f6b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/95.0.2/linux-x86_64/el/firefox-95.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/el/firefox-97.0.1.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "2fa3ae5de7cc898a838edd5beb33b706f50536864df60dd958506a0c86a86c77"; + sha256 = "475676b56b462193d6dd50932893b039e6826d247abf2d46a421415bd19a6c68"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/95.0.2/linux-x86_64/en-CA/firefox-95.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/en-CA/firefox-97.0.1.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "02ed1a2a567a9554d07a98a6ecae87c1fba977d84c3467347ebaf67142a51584"; + sha256 = "8c50ad38302dbae2d6737f6a03bc6127c850101c5f17c8a15b85d157b6b39ee5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/95.0.2/linux-x86_64/en-GB/firefox-95.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/en-GB/firefox-97.0.1.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "cc4c7a8215f2cdf91cba03c1e9b2b41c35e7d3867946a9f1f829556f8848d59c"; + sha256 = "e48d9aa35fe906f6e6d99eeffbef212730c15a3b9d5a7090dcf99e3e47eda9ab"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/95.0.2/linux-x86_64/en-US/firefox-95.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/en-US/firefox-97.0.1.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "f78a41215d168a2a215528a08877b3cc51e0caa3f1a840c27075b3112ef3d7d7"; + sha256 = "a63d28ae61926c0d7447f57d4e6fb514401d560abb50ce787bb6bd0e9b7b820f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/95.0.2/linux-x86_64/eo/firefox-95.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/eo/firefox-97.0.1.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha256 = "125bd4c7c0b758610165a360a7d754cbe74a75564428314dac88aaaca070b0e7"; + sha256 = "94394906bbe63f6dd414aa6b0739dc30082128e0e342fd408d33ab99cb01b9f9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/95.0.2/linux-x86_64/es-AR/firefox-95.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/es-AR/firefox-97.0.1.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "98f889c83e063bb14c1b0893507322a43676383490527c5a4c3c43540d19bcad"; + sha256 = "9738031b89b434127af39f20609b31ba767a004dc0ccf5d56b965165ab91fb82"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/95.0.2/linux-x86_64/es-CL/firefox-95.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/es-CL/firefox-97.0.1.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha256 = "af09fd6032a2b40a5af5207acb35240462f827abd46edc0336fce79498230b55"; + sha256 = "ceb4fd38b2b81b16f2faa95995b11e760dad4e710cf4435e6d311245bd6cb483"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/95.0.2/linux-x86_64/es-ES/firefox-95.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/es-ES/firefox-97.0.1.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "31fb87e5c96a328db0729cc17900ecd4ced722cb85790fda5781125fb1402f8d"; + sha256 = "37f94ded6c285c01300ee014f1a55d955a70b980647b8ffd5a0709dc9df34378"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/95.0.2/linux-x86_64/es-MX/firefox-95.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/es-MX/firefox-97.0.1.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha256 = "c56edc5a194cae8d442ed2119e3e5988923b308b38849879da801fad73814d93"; + sha256 = "b989f57bc1439e3204c912321df33626a9947691e76cb8bd22fb5bdcd77a86a2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/95.0.2/linux-x86_64/et/firefox-95.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/et/firefox-97.0.1.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "b9aa36097f1d91e49442b9da2313e6e4604e50a496d41472a707b45d452e22e5"; + sha256 = "757190b1a6de3cb7d44c005f9b23f745fb67f0c247956007f3ac269d494019cc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/95.0.2/linux-x86_64/eu/firefox-95.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/eu/firefox-97.0.1.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "e47e56023251ea1660e29d0c0e0b6827caad83fd6250a19d4951ebfb29411dbb"; + sha256 = "092f0378fdfa3fe44f19fc71543609a8b96a9add6f41324d24edf7aa7b446d36"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/95.0.2/linux-x86_64/fa/firefox-95.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/fa/firefox-97.0.1.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha256 = "97b597c2c932a26d9addb602ad912dc718b0a195910da42089498ab1e6c8065b"; + sha256 = "c1d003bdd9f21d6751de57b1e4d8b1057082f48260a94a732e3a3ae180ca186f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/95.0.2/linux-x86_64/ff/firefox-95.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/ff/firefox-97.0.1.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha256 = "606034717d76da565c643ac69e3799f7777741130f607073b701786e6fc103a6"; + sha256 = "af04da4c9528145e7b14bdc5283a41422704c0302675703a84a4bc2b42f8139e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/95.0.2/linux-x86_64/fi/firefox-95.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/fi/firefox-97.0.1.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "e2a5df47c570ff5fa9eb6e3206d4ef3ae653c7b787916962138cad40745aaf39"; + sha256 = "e3f7285b7d3666155863bd7d89bb7cf87008b755d34a7b5b04ec63425f7ed6c3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/95.0.2/linux-x86_64/fr/firefox-95.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/fr/firefox-97.0.1.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "d21aeaadad2390663b353445559518d25140f9dc6bf5673e36f44f107690971d"; + sha256 = "9fa04d611d74ba0688ad7ad7441759015724e61d7303eb211b7f7404603eb1b1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/95.0.2/linux-x86_64/fy-NL/firefox-95.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/fy-NL/firefox-97.0.1.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "6d15d80b73a5295e2ee3cac50f3eb15b5992c2519fe916eeae3df52f90a28927"; + sha256 = "0d017580e4847f644d8b4b8d8e90aba0a92f3b3aa436b9de68f176f7f3b00cb6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/95.0.2/linux-x86_64/ga-IE/firefox-95.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/ga-IE/firefox-97.0.1.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "3aca43ca905a894173ee2063d170ef4d348bfbfef9bd2a6b9ffdab3effef6725"; + sha256 = "73c602f8b41a5aefaa04646065197fbcad2e196c94b1d1537a019ebe33590a6d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/95.0.2/linux-x86_64/gd/firefox-95.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/gd/firefox-97.0.1.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "05f8f4832397706aedea72f049b9f8cbbe9056aff20aaddf0d8ea61a9ae5dd41"; + sha256 = "c1c9a41012983133bdd743e0afda81d7c752b04ac2cf73a7c4daa662d9db91c8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/95.0.2/linux-x86_64/gl/firefox-95.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/gl/firefox-97.0.1.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "5cd94e5d8d7f884fa7b747a814c6f80551dfecac683b55c0e6553407c43c4f13"; + sha256 = "8ca8b2e7a3549e1df2aebd86bc5192d6ba0b14c2581802f1ca06342ffb771ac4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/95.0.2/linux-x86_64/gn/firefox-95.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/gn/firefox-97.0.1.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha256 = "063f3d55e2d9ca33c051f49176e663ef40896deb87980d90eac56484b87f2aa5"; + sha256 = "10acfa3beecacbfaae592dbce92e72dc220cd27503334e28d3108846ec012e00"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/95.0.2/linux-x86_64/gu-IN/firefox-95.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/gu-IN/firefox-97.0.1.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha256 = "1f74c4a721f414ee37f8b4090e425971da64354dc31c338c4d9cdb07ac84485c"; + sha256 = "d2ea8b9386be163260d4ee0940dd80c4fa88d235cef7470fe9859fb18b5360f3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/95.0.2/linux-x86_64/he/firefox-95.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/he/firefox-97.0.1.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "d70277a80d159ae3bea155cf2f813179393317a1bbe2885d6c8fda4aa607d0c6"; + sha256 = "6dd00a7a9518868ce35e92e22951fba8e45690ad19afc297c82ec5d43690cbb8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/95.0.2/linux-x86_64/hi-IN/firefox-95.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/hi-IN/firefox-97.0.1.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha256 = "0b562e989e9dce6c04c3d556e09991ab28df4cb9cbf514a98b584c2ce8503d7b"; + sha256 = "fb583c15e2f5dba0c8c19c197f4e4f83c8e59ebcf568d3f52936bbbd4733830c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/95.0.2/linux-x86_64/hr/firefox-95.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/hr/firefox-97.0.1.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "df5788906b8b0d506e75054f133fef9bdd8fadc14fbaa570409afb3a8b8af8c1"; + sha256 = "07d6ded87285b2192f3668cbdc74b6571e708bab6d77964aa8665f1940722ff4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/95.0.2/linux-x86_64/hsb/firefox-95.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/hsb/firefox-97.0.1.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "f0f9f54b037b5e519c80f5742202cdb509bffdd1558af4e4025b59e169711eb6"; + sha256 = "fcbd4351ef9a4c3ea3bc290bf17679f900e73339b63d10ccfa2c554c09497bf4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/95.0.2/linux-x86_64/hu/firefox-95.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/hu/firefox-97.0.1.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "eb11850c9df446876e21ec6d292b0bd0f8073f66347504b7d7384365d0097b2a"; + sha256 = "1fade975a0ab75308b281b556c6980e81fc6a4c540746142534401e73323d9d7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/95.0.2/linux-x86_64/hy-AM/firefox-95.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/hy-AM/firefox-97.0.1.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "bd23fe1e26a17d328d6f98fc8cdade954c2072297d95197b52288e4ac95dc812"; + sha256 = "ac7d7124aad964783b65d9d7de037005fde865a7922cf22b9e07f44f36830032"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/95.0.2/linux-x86_64/ia/firefox-95.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/ia/firefox-97.0.1.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha256 = "a4fedb53f10455ea42f313a63c0dcab601b8b53043e736d307f3752e2e01e298"; + sha256 = "cda3d476e07f15cbdce88225d0b7fe785841d56327c63a53920dccff9ec8bb4d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/95.0.2/linux-x86_64/id/firefox-95.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/id/firefox-97.0.1.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "59e05c58d03dcb6c55e160414a5209e3590c92364eb4a7edcc381ee4076cad7e"; + sha256 = "3bcd1f707740b56e345c34dcb24453d33d9761eafeb9b3590d5e74e4558b5f33"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/95.0.2/linux-x86_64/is/firefox-95.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/is/firefox-97.0.1.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "d8f4626e7dd9fbddd37caadeec90985b5aeae052553cbc4e8a96cd8916688227"; + sha256 = "027f46db78d1796fa3ddbb3ec0f823e0a9e3677ca1f7e49eb1b9299be91c74a4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/95.0.2/linux-x86_64/it/firefox-95.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/it/firefox-97.0.1.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "cd03b57ee4b1bda04c4ef3d6d76db0e0b25c2e802f5b93390bcb39111231f2b6"; + sha256 = "7332a7566fb4f8748df9afdeaf5aa4634dab42cf63f52cc41cec13215820afa5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/95.0.2/linux-x86_64/ja/firefox-95.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/ja/firefox-97.0.1.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "93d3b15e2c9fd8eab8636e194f3db3bf164008f009d26e8e8858fd9b67556f10"; + sha256 = "c485ee96c2e6e0f0a508c99b2189595289f3858464ca2c48301ae78bbc59b299"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/95.0.2/linux-x86_64/ka/firefox-95.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/ka/firefox-97.0.1.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "614e9544235c6c6be9a05ca5193993a3122aa4580d62a69b71cf024c1a5be2d9"; + sha256 = "cd5b723c422e01d70856dd851337d719170585146029119f1490feec1d8ee188"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/95.0.2/linux-x86_64/kab/firefox-95.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/kab/firefox-97.0.1.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "83f64f8b96369d3027081155f9a73eea31dad343daf16a67b4daa81208963809"; + sha256 = "df540b3e9207f174cc6a280813d09c23abea18c1af540b9bc7e1330a4920be9c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/95.0.2/linux-x86_64/kk/firefox-95.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/kk/firefox-97.0.1.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "6053e9164deaced2b0d0dddc3ecd8a6282da862f426e935231e530b0dce5eace"; + sha256 = "1d6ae6bdfe89de470aebfff046d0ddd12dc85f4c7b9ad8931b8bdb9da7917906"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/95.0.2/linux-x86_64/km/firefox-95.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/km/firefox-97.0.1.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha256 = "10061378569908531c59f89c39c4364d8ba5cffbb8d2431d24cb936e61d949b7"; + sha256 = "1a5fb9460b33db9f32000c96ccdcbbe1d2fc3fa177b2cfaece1dabc514e3467c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/95.0.2/linux-x86_64/kn/firefox-95.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/kn/firefox-97.0.1.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha256 = "3a958d7739948f6a051761af519b96e4209a27141d7487d37ced02eac115be20"; + sha256 = "3c5766b4c29c699309cc8191fb1aab01852db29467c38ef529704c54d9087689"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/95.0.2/linux-x86_64/ko/firefox-95.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/ko/firefox-97.0.1.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "4a00e445bcebf1bb09b30958ee7ced9bb74fc99d459f13c001be625dfeafb2ae"; + sha256 = "08d9a5999a9b10fdaf9a386c9da99ec040200f2f19286cd7ff8e26de95955f5f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/95.0.2/linux-x86_64/lij/firefox-95.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/lij/firefox-97.0.1.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha256 = "5581da8f54ea490834504bdf6c6ba38ba94e580a3f5ded68864ca1de9db51ccc"; + sha256 = "925ea94387cf5f07b053ca5b25dc2a50b0ad9f6372509e91116fb6d20675204e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/95.0.2/linux-x86_64/lt/firefox-95.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/lt/firefox-97.0.1.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "9fbb08c96b44ab8e79c9d1f4c485b3e82abe0c0c44ced0b2e79640bd036042dd"; + sha256 = "f062e05e6fb52a42f813428be5be582dbb24b46f3379aa0975451bd029134c12"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/95.0.2/linux-x86_64/lv/firefox-95.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/lv/firefox-97.0.1.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "26d5a0d071e6df933f5fa602e5ac92908d6bee3aea3a0878dd9fb78e0fafaa34"; + sha256 = "ca08ec6516a07aef0404716b0111df6941b9b167173079397a013f93db23e8a2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/95.0.2/linux-x86_64/mk/firefox-95.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/mk/firefox-97.0.1.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha256 = "77eaffb3409fe962c042033304f0272a9b6a1d83a67c04039e0bfbe3fa77a406"; + sha256 = "3ddc7afca0f7030fd667f345ace3105eef1126332d18f20c7221596704eb1196"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/95.0.2/linux-x86_64/mr/firefox-95.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/mr/firefox-97.0.1.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha256 = "bbec138ef10b1d2dfa70e92b6911d5ba93d4a83c19d32af0e7d0f7b2273a440d"; + sha256 = "684d22d5841abcf6c107106966568e6f7476d15e1dac80447721836c4a20a71b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/95.0.2/linux-x86_64/ms/firefox-95.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/ms/firefox-97.0.1.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "f00ac99116a2ed626af9e384114414a385121f4c5ac9d6fdf88d514391c310be"; + sha256 = "9630d0e0b4466593a59efaa383d6fd0e9c08887959e0b851f03aeadb5c64d43a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/95.0.2/linux-x86_64/my/firefox-95.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/my/firefox-97.0.1.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha256 = "c8f24d949500f9829d539df0cad530431809a7fa74904e60646a3b0d68c49010"; + sha256 = "2bcab7bd7e35474466c3b587991cd8a62a18a30c14ea489d9c28932e1813db5e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/95.0.2/linux-x86_64/nb-NO/firefox-95.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/nb-NO/firefox-97.0.1.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "46a25d5703164b941fa33bbd8d51098129cf69aed3d29471b50bf47b0fa402ec"; + sha256 = "d6c4f2ce45109e37ca35c0fab316fc31b849f256f4745858dddf519b27fd8e75"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/95.0.2/linux-x86_64/ne-NP/firefox-95.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/ne-NP/firefox-97.0.1.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha256 = "7d10b7aeca90d46e0e58f7ae275432bdd99bf0f85009c85cb7c4b24f4801d552"; + sha256 = "ef96102307ab270615166a9feaddf0ae047d2c8a18d85015be7f388d00ad3cd1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/95.0.2/linux-x86_64/nl/firefox-95.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/nl/firefox-97.0.1.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "534b7103ae81a7804a9c7a08e99d208daeaa9ca0e90d7f7e33c57357f07ca432"; + sha256 = "4ea9eccaa1c7d354cdc199b33fedb6a7ed07400f331d33357c69ca7c2c654dfe"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/95.0.2/linux-x86_64/nn-NO/firefox-95.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/nn-NO/firefox-97.0.1.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "9bffdc0f5f5b53ec578a5dc2681b122b0d7a744e0c57955973c49df6f0f6e46a"; + sha256 = "59045e5cccac7dbc125e3fa3f8c9bff7b5d8b8b0e8f1e696f5bcd633bf9353e6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/95.0.2/linux-x86_64/oc/firefox-95.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/oc/firefox-97.0.1.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha256 = "292c4b1fa823d2260b34065f648e18aa56b27254fd59cb226df13de7861ebc8c"; + sha256 = "cdc9c76871be181f86871c55bd6819de9539bdcb11450cf3bac419f4bd44185c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/95.0.2/linux-x86_64/pa-IN/firefox-95.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/pa-IN/firefox-97.0.1.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "325bb3da2c70e34507f139697c4ece086a0002e488745ff33540778634b51c93"; + sha256 = "aad979dbe94c225b4255ff6b7b78097f8a60ecb14570517eddcd7cbbc553a9bf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/95.0.2/linux-x86_64/pl/firefox-95.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/pl/firefox-97.0.1.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "4f8dc3240001f4fad31c9e3e7f70499e0ac4d9e6c7080b727e7eb71b8e91003b"; + sha256 = "1f1be85fe26c4a55171f7114052ba679c405e731b3db7934ee2ac35323f095c6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/95.0.2/linux-x86_64/pt-BR/firefox-95.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/pt-BR/firefox-97.0.1.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "88ae3bb932005d9271eb5d82951f32c2333296c2c24f23881ab8a1a3d563bc76"; + sha256 = "588698a09d7320027027ace6196f6430aefe315cc9aae745f75568a062d6de6b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/95.0.2/linux-x86_64/pt-PT/firefox-95.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/pt-PT/firefox-97.0.1.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "a7a80f21b5e5a0e6e40c6865ef3526f1eec3c983f8d49caaba35a2e5ca5401c6"; + sha256 = "4cf0b84bbb4a5945ea787ca0f3d4da56a12073797dd603be29e408772a70860e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/95.0.2/linux-x86_64/rm/firefox-95.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/rm/firefox-97.0.1.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "9d16c2bcf15bf2b36f5ca664a0476e080d756b14566880c0a3c8590f707a1cba"; + sha256 = "b267cb45b84b114c266551c4863bfb22db9ff4725c0b6b9d39616e0b01f71e86"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/95.0.2/linux-x86_64/ro/firefox-95.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/ro/firefox-97.0.1.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "db0cf0ac7b6383fdaa8a3ef5e6d59f3677009908ddfd12221e0f97b19b58be6b"; + sha256 = "26a6ba053a270db85fe008f72c23b905072a84c27815131d1a3af90fba0f3518"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/95.0.2/linux-x86_64/ru/firefox-95.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/ru/firefox-97.0.1.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "f1def34584ce90445355eaeb64bad5ace27e1c6447b3a1346dd2e5d32ef1428a"; + sha256 = "caea6755305f8f077fc82895343c01a7e1eac0e1cc70faaa1915bb88cba01344"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/95.0.2/linux-x86_64/sco/firefox-95.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/sco/firefox-97.0.1.tar.bz2"; locale = "sco"; arch = "linux-x86_64"; - sha256 = "e1c3953c2ebb12fb6975727b68ad9667b983d1d1c7fdccdbe0c52e5cf12c815c"; + sha256 = "eb249baafdf9d54b61e923bf3f23d2f462d5026f4b81bacfadd713bd569d3255"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/95.0.2/linux-x86_64/si/firefox-95.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/si/firefox-97.0.1.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha256 = "268bf3da414e1e00696262e0104b77d71e2b61b6b6fe1fc23cff33ede4108f58"; + sha256 = "44a98bc22309035b432c3f01c5f87d469df3f2bee44c26f54f507f10b7098908"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/95.0.2/linux-x86_64/sk/firefox-95.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/sk/firefox-97.0.1.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "39c018398173f92334775077b0b11379f859597b162f5b186747e9c403206718"; + sha256 = "a81e8f814a2816ad95414c6e43acf55d88e4ce0757de14ab163f6b622fc49d41"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/95.0.2/linux-x86_64/sl/firefox-95.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/sl/firefox-97.0.1.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "0bd6c112fd967944205fd08055ca7a5096c23bc7ea8e0d09738883635a3653cf"; + sha256 = "a2b9f1dd69a9a3fd4b5198280462d06b49d5c63fd101865707cac6aa6fc9581c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/95.0.2/linux-x86_64/son/firefox-95.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/son/firefox-97.0.1.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha256 = "c7a7b276935012c9be0cda1531f6206163434ac5810580a65a1b0f0f2c839660"; + sha256 = "0033fcff083aa29a738799cb9bb3d32eeeafaaa3a1d41c422048c89000a9968a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/95.0.2/linux-x86_64/sq/firefox-95.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/sq/firefox-97.0.1.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "27d6cd975c7f68d4622b0a2e1b7847d0f3e301b2e9e76008e047d522917e7d3b"; + sha256 = "3614b46f72a142655f58c0577345a772350ead46af9060cd20e8918f517c7cf4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/95.0.2/linux-x86_64/sr/firefox-95.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/sr/firefox-97.0.1.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "68a99dc76c9c7179f12bb892920aa02f3a9019186a8999a06448a0e19fa93ff7"; + sha256 = "034dceafc44b83ca9d493f98645bd0ae45fd513f55f20f0de85752679e39c570"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/95.0.2/linux-x86_64/sv-SE/firefox-95.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/sv-SE/firefox-97.0.1.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "d0d64191bab8421feadb1abe91b471a6b059041b2935e0bc43f6d9c959d2dfaf"; + sha256 = "aff9dc0399629aef20dff6eed5ecc7664cc8c83b53614b2cd011db6089262a9f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/95.0.2/linux-x86_64/szl/firefox-95.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/szl/firefox-97.0.1.tar.bz2"; locale = "szl"; arch = "linux-x86_64"; - sha256 = "3c698e152b2aba10d46ee06a5ee0425afd4c7e7354984b45d883ed5e286890f7"; + sha256 = "9b6242e30b948507978f96180ec6d7d5921e32657f41fbe211a7c254cb11777b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/95.0.2/linux-x86_64/ta/firefox-95.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/ta/firefox-97.0.1.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha256 = "ca9883cbe4558e38ac9cda62b0f43f3c173c9dc479214b6a746805e43aeda031"; + sha256 = "368a48fe15bc7ed6359cbbba817b47a99a583cc3ce91d2d98f0387d3a9880a95"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/95.0.2/linux-x86_64/te/firefox-95.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/te/firefox-97.0.1.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha256 = "251915074e437e83c1165005b41c28d0b17b4234bd3caff8197ac660bb35eeac"; + sha256 = "dfeadd822000e10c0214d05c75203a6e9c98c4bf20d65377c35ee8d485a2707e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/95.0.2/linux-x86_64/th/firefox-95.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/th/firefox-97.0.1.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "7275ebab122274b2ec633a760bb2dc7b1257d3523051266ecccd55661cdd7b45"; + sha256 = "f1932432028ef648897e64bf033bb3e8984100052ea52a9840d000272f9d5eb7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/95.0.2/linux-x86_64/tl/firefox-95.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/tl/firefox-97.0.1.tar.bz2"; locale = "tl"; arch = "linux-x86_64"; - sha256 = "0217bdd9c71f993360ca97fe185d020d222c4e250138499088d521e0f21c984c"; + sha256 = "9436d48c6b56c7b765a4ab6ce20bc12f3e5241691edb3b1517fe27a3a1fab6a5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/95.0.2/linux-x86_64/tr/firefox-95.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/tr/firefox-97.0.1.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "d9923e72ed18af3204df15d7a414f5c41627ab80e9566b1cc16f4cd0d5bcbb16"; + sha256 = "bf0d0808d6d5f880bf382e9d440013855a6fda82275cc628833fb8cb694e4f6f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/95.0.2/linux-x86_64/trs/firefox-95.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/trs/firefox-97.0.1.tar.bz2"; locale = "trs"; arch = "linux-x86_64"; - sha256 = "3ec42470cfd25149f8291ae6634825648e64d0bdd115c75cc2aaefb7db953d03"; + sha256 = "546416fc106774a28b2234e31d5d9850ed4708a2e5be4a4231deb28f4544512a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/95.0.2/linux-x86_64/uk/firefox-95.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/uk/firefox-97.0.1.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "a059f9ea668d4c70ce6574f59762f917baef5cc62bb0af0c7e422577a55828f5"; + sha256 = "5395cb322632fc68ef84241a75786db589863709344d5dfa9cbb650bc94c8f6d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/95.0.2/linux-x86_64/ur/firefox-95.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/ur/firefox-97.0.1.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha256 = "d68ffb37896e8c1405f919adf301053266c3bee0f729a7889be1d234343dd9f8"; + sha256 = "d8dcdc4d95646392582904a29946f652e670bf276dd1b156e5b28477f4369e50"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/95.0.2/linux-x86_64/uz/firefox-95.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/uz/firefox-97.0.1.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "54ffc455910dcb2aa83e1736e36672cfae84658486d5117fd0c1b97f61f829b4"; + sha256 = "7b1b8b9e9efd430ea5191d3e30c2b28ef28f9fad9779a4d65d1bd653c575986a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/95.0.2/linux-x86_64/vi/firefox-95.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/vi/firefox-97.0.1.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "9b46375c46b831db3680d592400e68ad953dc778e77742a4f24f36af73e9e810"; + sha256 = "6ccc1efad3f2a57b365195afbda665548d82d141f5143beb04691d995e0ad1ad"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/95.0.2/linux-x86_64/xh/firefox-95.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/xh/firefox-97.0.1.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha256 = "e728b54cde7f96a6c036a7d65c14ab14df2a073227f33709485e52a5f34bc565"; + sha256 = "4099f3357f74bc5443ad59ef72bb1d1881b1d96965628544f72eb3bf72a02a36"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/95.0.2/linux-x86_64/zh-CN/firefox-95.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/zh-CN/firefox-97.0.1.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "5856e43a3f3a7bfa7710b42f15209e0d0ce39a98d8509e0e19f957b972e7c1e7"; + sha256 = "9588d9eee65b7389c91ac43782f455169889742b2996bce8306fa07075f1c4b5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/95.0.2/linux-x86_64/zh-TW/firefox-95.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-x86_64/zh-TW/firefox-97.0.1.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "9defb0e1cac327e91f4a950448d553dec01d5e359008d365991e1e188453dafc"; + sha256 = "d4f9228777a8af5e68616865fcdbf522cd73d69164ca0936098bbf0534911413"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/95.0.2/linux-i686/ach/firefox-95.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/ach/firefox-97.0.1.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha256 = "158fa1d03e0b7bafe9603c7b2f30e78819dbce67b07b2ec78c4fd89f05303729"; + sha256 = "bb0e66383954377252fe15d1e3b251ff0e7ff518fa8d817f4f26b18449e8525b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/95.0.2/linux-i686/af/firefox-95.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/af/firefox-97.0.1.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "a6ce2aaac2061d36b294de9871bbfbb4321f4ad1f421460a6e3d799ef54b608d"; + sha256 = "5d73dbd6f2cd49f79e99538ba0b4247c8c29c92ce3417e6ddc23b89df59d4ba2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/95.0.2/linux-i686/an/firefox-95.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/an/firefox-97.0.1.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha256 = "1e8d592f2431a2e5df7453dee984bd29bf94d3ad1781474effa14ffe9de3ba3f"; + sha256 = "43b1ccf184fee070ec1a279914eda6b25ab15f294468b524e4c2a5e975e7c818"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/95.0.2/linux-i686/ar/firefox-95.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/ar/firefox-97.0.1.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "ae55b1595118148889049b9ddf25ed9e32e6d6b2cc66b0e90821cf79d6bf2ff0"; + sha256 = "6ef2f6bf6fac15b194a08aaec137adfe59ac7a8e1e06eacf88328dc1c917c994"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/95.0.2/linux-i686/ast/firefox-95.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/ast/firefox-97.0.1.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "17e76ef25a9028042f3e35b725ff0171bfd82678c6ab826115785ce6ff2d2010"; + sha256 = "01aa7a8ea0263ba32f0c398918b184cb0d9f588df4330b16e37a8f3fb1efb165"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/95.0.2/linux-i686/az/firefox-95.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/az/firefox-97.0.1.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha256 = "2ffd85a5982a0ed0c359d1f8f8712407aa6ff10823d21750cfb16d925fa0c5f7"; + sha256 = "3605a671f1752f0ba3499720095b66a7d058b5a0aeec3f864d87d7027121c970"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/95.0.2/linux-i686/be/firefox-95.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/be/firefox-97.0.1.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "e78fa23ab27503921d3d4e2f79dfd391d0e200552f2bb48cd27a6cdd47468ab7"; + sha256 = "9ecdd7986a2b2b0c28ec11eab24130e4d35c8dc96e9fd95bebd0fd2e724e38ef"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/95.0.2/linux-i686/bg/firefox-95.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/bg/firefox-97.0.1.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "4e866bb3705f17fdcd7b98313b025e52544dd7bee2f523e886b3654455480b62"; + sha256 = "c66c13d707aa0f52154061dd6d59407acd1bf5b1a29284da8821c2abbb2b02fe"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/95.0.2/linux-i686/bn/firefox-95.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/bn/firefox-97.0.1.tar.bz2"; locale = "bn"; arch = "linux-i686"; - sha256 = "e170018a2e2f6a568148ec5073c5f82fa401894f5310b887dafe36e388b8876f"; + sha256 = "bab8e1f9004caab4f2a4ba0dbfa22ce10957b5c2a4adf52049d64953200cc052"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/95.0.2/linux-i686/br/firefox-95.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/br/firefox-97.0.1.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "73ea87a78ab765589c7e76237044bcdffd783183ea6b8afc67f2871231692143"; + sha256 = "07f177e9396567d4f0852c68b2080a04ac2f00c38c3cb0c1bc0fc4fcb3b629f5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/95.0.2/linux-i686/bs/firefox-95.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/bs/firefox-97.0.1.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha256 = "900d9625d1cbaed04155e5e024cf7872d454f6b22ee37a57739c702c6a328657"; + sha256 = "e9fd1dfce60b27dd8037c144810379a2526c4d270d9c2bb2536a74df8be7a586"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/95.0.2/linux-i686/ca-valencia/firefox-95.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/ca-valencia/firefox-97.0.1.tar.bz2"; locale = "ca-valencia"; arch = "linux-i686"; - sha256 = "bfd22c146671bfb21b7f36c17691754cbd8c6abb29eeb0703d3a030df51364f2"; + sha256 = "f6ae71d70746a7c56ad416543cff9ceb4298dfe30d1bce4d72ea695131ebad95"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/95.0.2/linux-i686/ca/firefox-95.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/ca/firefox-97.0.1.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "1b1e3fcdcaf4c299cd8c0f5b109493646e74c46bf9a0b09dc5f33b33062a398f"; + sha256 = "7b12613954b0e6b81ed7fb1fcca7099dc4500a72cec7333dd8de6a7deca28820"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/95.0.2/linux-i686/cak/firefox-95.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/cak/firefox-97.0.1.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "ce307ae50893ac9e424eedbedea8cb1a9358e287ee2893a8d0894003cbdfe609"; + sha256 = "b18f916d3eec4121c7a854ca2ba2ccf5baecf53d7a173578e19c3c3c50aed076"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/95.0.2/linux-i686/cs/firefox-95.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/cs/firefox-97.0.1.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "c6230333dc66ccf20b68879c31a69061874b5a0869786d87d8190c88d5a02664"; + sha256 = "56afa0af38d7ec85b938a961363b781d4980ccfeec9945f0971be201a21b1cd1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/95.0.2/linux-i686/cy/firefox-95.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/cy/firefox-97.0.1.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "3f87de3d75fd4a7f66af64bcb3eda0dc43a8717797840235dd64c0acd5eca1a8"; + sha256 = "f82d0db8338a0eb4cf5f180f4982c5c7db7db4b9fb953ec496aa2e9961966091"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/95.0.2/linux-i686/da/firefox-95.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/da/firefox-97.0.1.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "eac9b4c6bc7737c82fd631608157448ad9c78e793c4c7b4e319e36a6e5ff61b1"; + sha256 = "fe7def9df91782a3adbdf02a4deac85ab07caa4f378f695e2253e0eccde3ab34"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/95.0.2/linux-i686/de/firefox-95.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/de/firefox-97.0.1.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "71b618dee298b67383c8567addc0e2d93d4bcf2d196ca7db87ec20a3315ccace"; + sha256 = "1fba10e324128c2d30b9a9a0489f1f065bda575afc7dbe0c6625ece2b96b4bc7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/95.0.2/linux-i686/dsb/firefox-95.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/dsb/firefox-97.0.1.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "cbeb7eeffef1c0437644182dd5475e770bf0118a351eadb3c7892c69fed7e0a4"; + sha256 = "3e43d5c0d27290b023c7e53a48aad5894474d9a33a544a20cca4893fe4dd3267"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/95.0.2/linux-i686/el/firefox-95.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/el/firefox-97.0.1.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "2d9bd41145a737c8b25826d7af978219a61199b9d045651b6aa68029e5027187"; + sha256 = "71864f8294844e051674f20d49b78f3b129ae10f7ae93c4bdc4e194ca6a586d3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/95.0.2/linux-i686/en-CA/firefox-95.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/en-CA/firefox-97.0.1.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "65d83800562d29c0b042dcd9ae4d7fb230f8248ba0bd0cf8bd40505884f839c9"; + sha256 = "845713d2c18c1bc029509590e6156edb2166dd7bfc8e5a8cb9e6092143bb8193"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/95.0.2/linux-i686/en-GB/firefox-95.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/en-GB/firefox-97.0.1.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "bf4cc0aea5826f1bcdcf493f241cf23509f626f81fafbf436430b0f0507f674d"; + sha256 = "b5b2f7d607be95cccfc6dbc12298333e5f261a9cb27650dff946ea4246e87df8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/95.0.2/linux-i686/en-US/firefox-95.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/en-US/firefox-97.0.1.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "86e33e0163773378fcef227884d3c439f61c2d0d6ec3cdafde1740816812c811"; + sha256 = "c736080050a9715077a004add55dcb3dcb3be891d5870939709096bc81195eed"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/95.0.2/linux-i686/eo/firefox-95.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/eo/firefox-97.0.1.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha256 = "18fa6af5ca174cefd1b8f266e1c6bb6576facc8acd28b6b9a8f6121fba1d6426"; + sha256 = "38f135a137826862f9319b88edd9ba0e41a7c57f7de3603ca23d5c6101b2cdc0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/95.0.2/linux-i686/es-AR/firefox-95.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/es-AR/firefox-97.0.1.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "efce9ac44d6156558ee28c7bc4b1489f1554afa632ed0dda2dafe2272e885d6f"; + sha256 = "63856d08aab14fec8b28aa6ad6f765aa43d5bf52cd1da5e48aa3c111e13be60c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/95.0.2/linux-i686/es-CL/firefox-95.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/es-CL/firefox-97.0.1.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha256 = "920e9183e71935da136d2142ed0b1a9e5a764e7d4bcd6ac2c65e3e405ee0d82f"; + sha256 = "0bffa72431868aa53835a67b18a257e7b3083da778182b13f723f68a38478910"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/95.0.2/linux-i686/es-ES/firefox-95.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/es-ES/firefox-97.0.1.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "3c6cd25f55dc3aa17f1d613878b3b40bee28847a80b36fcb7d0c3b4ee5e6462b"; + sha256 = "11adfe391791b2e17114c72d984db96586c70102d43563f907c371cd85c89b03"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/95.0.2/linux-i686/es-MX/firefox-95.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/es-MX/firefox-97.0.1.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha256 = "7b076daa30e58362534aa2373931d0f984967824f3592dd92ffecc7597c4826c"; + sha256 = "6b9360899c575c665e156dbb8a3f20b396bebb742f14eab9957f30f1dc2f644e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/95.0.2/linux-i686/et/firefox-95.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/et/firefox-97.0.1.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "d9188331a592ee8e7f40c3cc70fd5947164408bb18066195af5966b25deffa44"; + sha256 = "3fff6be4dd8d62163cbffee59d2d4811944f89b452a57192b3444515dd510bd2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/95.0.2/linux-i686/eu/firefox-95.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/eu/firefox-97.0.1.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "48414c68c2c67719d43845799dcbb64a13d513aadadc8299e5ced7ac7dad89d3"; + sha256 = "1fb5ce8792f92d810f170746c61133d1835513dc644c6db88f1a4a6d81906815"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/95.0.2/linux-i686/fa/firefox-95.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/fa/firefox-97.0.1.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha256 = "1cfc92b1100d803a148feea5bd0d40af26dbd976fb30b29e79125687bc5ab247"; + sha256 = "a69afe063a18b4f95fef028c584a46de1246fec45137e394e4b4a6f711be84c5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/95.0.2/linux-i686/ff/firefox-95.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/ff/firefox-97.0.1.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha256 = "0e576c6cc65b92123294b7d230ea3431704ac107be56ed93486c93021019cc2b"; + sha256 = "f1c3797c11b975d7a2feeb03d20cadd89396659c3661f7604853d9912a5b6faa"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/95.0.2/linux-i686/fi/firefox-95.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/fi/firefox-97.0.1.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "031de60746e0acba133c58091ff8993e9f03822b8eb2dde8636719685b10a5f0"; + sha256 = "d8c628c73ff53c5883a8396bde4bb9b931e1dc7ac44637e9774b3d5d3ecf6b06"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/95.0.2/linux-i686/fr/firefox-95.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/fr/firefox-97.0.1.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "072876a0c2f8d78271b83faba916c61b9e14f783a9afc6af08158e7e988c850c"; + sha256 = "85dbf4270eced53b4020d7a269a9d9ed4e55fa7251672b9c32feb96d6336b110"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/95.0.2/linux-i686/fy-NL/firefox-95.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/fy-NL/firefox-97.0.1.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "cde0cb368aee49b281ef4f0893eaa15345ca60623c57dc7f93d8320216fd1edd"; + sha256 = "30da6a888702ba5060e461539ed51390014c79b55c1358e6a8b76c80c335199c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/95.0.2/linux-i686/ga-IE/firefox-95.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/ga-IE/firefox-97.0.1.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "cab5ecdbdb5e3286726b06e7fa8adb43d49f8c8316ee240ccc849c339bac3076"; + sha256 = "3c1a33c4d7b3e3161f2b07ff95adbc466a2e9d718227d786ee6007318730c1a0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/95.0.2/linux-i686/gd/firefox-95.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/gd/firefox-97.0.1.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "ee5c4c06b9b899b14374dc6abeee533e130e90242acd866e02b0c759ca6ed397"; + sha256 = "0ffce6d8f9e2d0d1b84c2c9b2ecc49a1861f88356c5b37d75522d537364f5208"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/95.0.2/linux-i686/gl/firefox-95.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/gl/firefox-97.0.1.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "e8fb73e3495d3c4dc1e827b21d50458e6ebfd56f3735c5c87ed88fb9bc9d379c"; + sha256 = "31fb23e14aa007cb6ea74b5ccd124d51a1d2c19cb6003d693afff07e83640666"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/95.0.2/linux-i686/gn/firefox-95.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/gn/firefox-97.0.1.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha256 = "3511c27b51f12f26238e5862edff7b171cb9eb6b0843843d62ae6ad4f23891d7"; + sha256 = "042b2c8e5652f2f9e1e3cb01a4308cec100680d45acaa37babcf33b8bef5512f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/95.0.2/linux-i686/gu-IN/firefox-95.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/gu-IN/firefox-97.0.1.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha256 = "34fb15517f0e8472655950e0269050b897b5d2986aec4545dc6aa4e4314054a6"; + sha256 = "5052d0c6a28b1c83e1c38b771f62f3c973089ccbfd048d0e089c8a637a80d218"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/95.0.2/linux-i686/he/firefox-95.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/he/firefox-97.0.1.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "263e6ec46f8347a27be1b8ae44ecfd3bd4475d2142fc0bbf21eedf791fa6e522"; + sha256 = "06a78cb3435dc6f8dabff279ad1c69f6f4d44c5a8e56d04d38dbfb046ad42fa8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/95.0.2/linux-i686/hi-IN/firefox-95.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/hi-IN/firefox-97.0.1.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha256 = "c19cee388dfb212fa28ab7b93379db8bd60964dfb3a8a6f5371f5b4384fcefad"; + sha256 = "340d637d0de3df62ab79e69b3465a154a80e47a4dfe2b48cd949874457955cbe"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/95.0.2/linux-i686/hr/firefox-95.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/hr/firefox-97.0.1.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "b3af09b207e11d6ba87b39f33e7c8ddffc80482fd3f5d910d2079481b3db4268"; + sha256 = "526fa7a1bf5e3e3b32f2fa61b8d28617873aba9bf1bacc5e13533b0621df993a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/95.0.2/linux-i686/hsb/firefox-95.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/hsb/firefox-97.0.1.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "ea52879ce3a7b7a0921746d56163af72d824a287ead51a97b491682a479ebd05"; + sha256 = "4443703e0b590e66dc4d295b1262d61f91cebb0a59ef6c246348a4e411663398"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/95.0.2/linux-i686/hu/firefox-95.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/hu/firefox-97.0.1.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "e83307c88b9246e098a1063b61a886148c930bd891cbc75f8b6a1257f9746363"; + sha256 = "b2b1be8b090734f1069f7bd78294072bab28920312aa34125d02213a030bc9b1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/95.0.2/linux-i686/hy-AM/firefox-95.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/hy-AM/firefox-97.0.1.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "f414105b7cb3485004af9e798d8159a0eb801e8f384b8b6926d34fd07af6ec0f"; + sha256 = "a81e4add5314774f19fb514b539bdd7e12b907a4faf8b606c13f7dac8461e3b6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/95.0.2/linux-i686/ia/firefox-95.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/ia/firefox-97.0.1.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha256 = "ef3879f8e5ada797c0011ddf3a6fcf6407f2ee1e858f254ad2d500233c7703ba"; + sha256 = "a1ead289cc491600b89d63f96081b21e5f8172936023e42b5d949c0d5aea2bbd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/95.0.2/linux-i686/id/firefox-95.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/id/firefox-97.0.1.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "6c888381f1d10e4ffe6ed3a056933400e8adcb64e4a5c6da2524f92ce0eda62f"; + sha256 = "f56eaa86629a013f60c7af973a844abca72cb7ad236e02479bda9d1aeeb02b32"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/95.0.2/linux-i686/is/firefox-95.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/is/firefox-97.0.1.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "3d256a5d9382866e93f0b6f5a0cf1dac1bd724ef5f7c693ed0e355ad34db8476"; + sha256 = "0d762f8c70bafdc9d8155572ff71ebbb0dfd9d83388298196a87ad130f8527a8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/95.0.2/linux-i686/it/firefox-95.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/it/firefox-97.0.1.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "fda1bea7c61c172dcba91e07e22f2e205f08e99b63ceba5d96576a432af47b60"; + sha256 = "54a79040a115b67cea2b912fd905d8acee05e737702c778628fd10282b27364e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/95.0.2/linux-i686/ja/firefox-95.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/ja/firefox-97.0.1.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "ae5aac021a845ff644d893de7a39a96aec33b128b1537e583fd48a06ff87e07f"; + sha256 = "e92f3cf4d7f2f0e26280d814d6bf26f14fc2f5d8923451cbb6075607ba4d95c1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/95.0.2/linux-i686/ka/firefox-95.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/ka/firefox-97.0.1.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "043e54c91838a71c1b9ceae8fa40112c54dcd5a530d96cf0874b1eba76220878"; + sha256 = "ff89c8ecc80897ec8acea68de166ae6f626f181fc7f0c1d30ac5208c4a221eb7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/95.0.2/linux-i686/kab/firefox-95.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/kab/firefox-97.0.1.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "fd7368cd63c612606cf57eee9476e009abd9c2f35a200f9887c50b34f36fddf0"; + sha256 = "bdcc2807c9ac16d6df6e1f35e2648f7e1776dd117edc1731d24192eaee5f9661"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/95.0.2/linux-i686/kk/firefox-95.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/kk/firefox-97.0.1.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "b4a7e455aae1894b2b9418e3f0b14350f0a3446923684fcf61a8e6abdf131681"; + sha256 = "535bb672a95a37550779c84ecb5eaf98f151a30123b2b7a099b7940e8bede683"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/95.0.2/linux-i686/km/firefox-95.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/km/firefox-97.0.1.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha256 = "2635a41aa81a9ca863652b5e726bc2022369993059d64a6ad81a2f751e65ff1d"; + sha256 = "3e60008c56da46e0897c326a843871d63fe0e534487f4a94f2e398ea6c5377f9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/95.0.2/linux-i686/kn/firefox-95.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/kn/firefox-97.0.1.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha256 = "adf9111e992ce6504aae6dc2bde5519e58ce474ce52317fbb503138fb49a490c"; + sha256 = "90d8c47a1cd42b7bd4f9e2c04ec6bfa701fc978a6ea680fc5e48bfd4fa6a727f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/95.0.2/linux-i686/ko/firefox-95.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/ko/firefox-97.0.1.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "b47532250fa7baff58d47052a51c966ed52b6e8009bc36b67958e67631e2de1b"; + sha256 = "d62427eafe143f3d2aaa1eba6969358316b8c76c7fe926d8fc5985dddc588e7f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/95.0.2/linux-i686/lij/firefox-95.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/lij/firefox-97.0.1.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha256 = "92d270be61a7a30876d00bd1e2741c0db4363f34f87a97456b700c5af28252c9"; + sha256 = "0db93d63e67c7f1bae536d425dd1789b0c0d1737fd23e8d0aa0c7b66f4c958a3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/95.0.2/linux-i686/lt/firefox-95.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/lt/firefox-97.0.1.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "8c4efa500b88d76ca8b0abde737552ab905db34807816df0d2614e3d47a00dd7"; + sha256 = "ae3cfea73e03c61afdea361c4b23408f7c894197c4ef370286a653d35e0eb406"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/95.0.2/linux-i686/lv/firefox-95.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/lv/firefox-97.0.1.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha256 = "db86073e2910f6d54466e8015fd8ed68b02f08c6ba4595ce21c3547addada57d"; + sha256 = "6bb0a946109cb8316a1d3b412602b590caf4f6a22fc7659fc43d79c0f921acab"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/95.0.2/linux-i686/mk/firefox-95.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/mk/firefox-97.0.1.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha256 = "91a39fbc897197d48792bb1ed82e4e6a2bc969efdbe31c9d6cdaed60e4af4884"; + sha256 = "6e36851e9c7b14e8c180ac9b715b245ec627fd2c73dbb4adc31219247696f658"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/95.0.2/linux-i686/mr/firefox-95.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/mr/firefox-97.0.1.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha256 = "97e775f3926ee3f158d30a16dfa5dcebf67b9d337e51ddad43235d1c7ac77cfc"; + sha256 = "68678735aa1fa850cc30445e71fc2589f32d3845238a781c96d62164b00a1da6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/95.0.2/linux-i686/ms/firefox-95.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/ms/firefox-97.0.1.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "32cd9715073cb1b987abf73f909185c96231d9bc9ea07972ff6c58a1e1ef5dde"; + sha256 = "0dc9802f1ea0bfa4e2916dd4a7b02b7aaa5cac0238aa4bae62bad4eebd49939b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/95.0.2/linux-i686/my/firefox-95.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/my/firefox-97.0.1.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha256 = "4e70811af633f19718076fd1d0ce4008e6cc8ab6b24842fb1eeb184b505cef50"; + sha256 = "c3fdec85d214fa4f85b502647f9f0f50e0d473820e69a4f4f8d5d24fe58e6cd0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/95.0.2/linux-i686/nb-NO/firefox-95.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/nb-NO/firefox-97.0.1.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "97dda05d66002f87bf7b4ba2d08c18402ce2462ef2fb3e3876d4a55520329823"; + sha256 = "48947dd10062ebef8e9095a1938dbb0b5e24689ffd5f835080512612e93f2efd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/95.0.2/linux-i686/ne-NP/firefox-95.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/ne-NP/firefox-97.0.1.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha256 = "7ea002b8d50f49e64123612d0a43100411a5edc975d40081b1d99e47b6413242"; + sha256 = "8952004bde5d731fe48ddde9bced409e5d2c46d25157542f3c72568b87a9be8b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/95.0.2/linux-i686/nl/firefox-95.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/nl/firefox-97.0.1.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "da9bd1e61d17d5625d9c9114315b63b37b062a3af13e91fa480af0e0aff35366"; + sha256 = "f2c7c1348dabee858c89b8aaf37e5cfcf0cd867f4e9b0587285aef13aa302a26"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/95.0.2/linux-i686/nn-NO/firefox-95.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/nn-NO/firefox-97.0.1.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "096683e5c3cc1794c099197c6126df8d3f74b677a5c583559d0bfb884d380bef"; + sha256 = "bd05d1b619c77fbb502080f4862cbb715e628c814d8c35720998ec43d6c4920a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/95.0.2/linux-i686/oc/firefox-95.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/oc/firefox-97.0.1.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha256 = "5823e9978b4abbfe5edd656165dc2d8a49a1cc1b65fd8e4fedc0d8dc642af695"; + sha256 = "6092e57f1d6bcaed08e5d1acdd15d9fda0430f1c0073a48fc38f8a73578f1fba"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/95.0.2/linux-i686/pa-IN/firefox-95.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/pa-IN/firefox-97.0.1.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "56f1acdbd9c9613923aabdc69f80878f21acf3ff10a713eddb9e2224c35d7399"; + sha256 = "51bc6d1b738c12eedd1b35f829b51ceb157c65a25241e911e10c13289b92a5b1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/95.0.2/linux-i686/pl/firefox-95.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/pl/firefox-97.0.1.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "ec6c676224031272a81cf624db09d5c9a26fe02ac0fca72255a7af25ceab70fc"; + sha256 = "f286860bd5912b91fa62494837da2c335c4a4a484a164b4b999022c2813d5c28"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/95.0.2/linux-i686/pt-BR/firefox-95.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/pt-BR/firefox-97.0.1.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "2c86036d927857fa93778ad5b56ef134cd3bd95ba6be032c8fd6f94a9b01dac0"; + sha256 = "a1f48ba9c56f2c54899d14b1292cbb4e517482ba0552bf17ace7dd6b517eef4d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/95.0.2/linux-i686/pt-PT/firefox-95.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/pt-PT/firefox-97.0.1.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "331e81e86dfd3802432457bb78f5c65cc35c2ee459503b5158c0d9a44ddf38d7"; + sha256 = "6d91ff36f186ef11ba70d604443b7e818f608dd6d667f49a7892c1a69e64bdbc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/95.0.2/linux-i686/rm/firefox-95.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/rm/firefox-97.0.1.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "8d238b1fa93a4aacdc6f54a456fe523a9ac61d834420cf2b349062dc35e8d228"; + sha256 = "cc190575af60d5a09266b2296796978f7a37dd07b2709523b84b88499729e546"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/95.0.2/linux-i686/ro/firefox-95.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/ro/firefox-97.0.1.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "caff2dde8dde6829c5401f0408c0c1cf146453583b407efed01f5dd629d70bf1"; + sha256 = "4193936ca7e10f01b91ab990ba0b7aa354c344a7749356bb9b30d251d46b84bf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/95.0.2/linux-i686/ru/firefox-95.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/ru/firefox-97.0.1.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "762466026aeaf8c8d0bee290113d658712cf02d09b130ac0cfb638d7d2806eda"; + sha256 = "f85ad1700117a99b8657d9fd9061935b77acfc4a0d7c8b3caa8d7c0ddf142a8d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/95.0.2/linux-i686/sco/firefox-95.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/sco/firefox-97.0.1.tar.bz2"; locale = "sco"; arch = "linux-i686"; - sha256 = "e75313594dfd1390e452667746073e6eab67f62da7e5bb8f9d9c3c399e0873c2"; + sha256 = "23d16650132fe30c6fb90797f744d09f21f16a0673821cc0c59392a9d2adbfab"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/95.0.2/linux-i686/si/firefox-95.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/si/firefox-97.0.1.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha256 = "4672751457c6bab937736fb5085fa24588e97543989d9e340859876c5537d793"; + sha256 = "44ec177853f6d3d72ce141ebfc25508df4c63c8b37265df4dfcac8b48799b007"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/95.0.2/linux-i686/sk/firefox-95.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/sk/firefox-97.0.1.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "bd17ebe6aad0ab05854d20c66de4d695d9fe967d867f46c29e2c8c40da709b2a"; + sha256 = "4a31daac61e0ac3a729c5299dc5d14046bb2cadec61aad443fa4391a0cc99b3f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/95.0.2/linux-i686/sl/firefox-95.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/sl/firefox-97.0.1.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "c68745642e9c3581bb7f4bbcf17eab7f62c397caac5b2b7fc14668a0b2ac3daf"; + sha256 = "8ca7306d8e68d9943ae3dbeffe3da88682c4c22fa9974142b9f609c4c62b06f7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/95.0.2/linux-i686/son/firefox-95.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/son/firefox-97.0.1.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha256 = "895170b400df833df90608a44e17b99405dbc932cf15ec5e1b5e91febc2fd629"; + sha256 = "9c5c17a9f85814779f88f320030bc6d935cac0b5b51ec9524283553c36c751c5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/95.0.2/linux-i686/sq/firefox-95.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/sq/firefox-97.0.1.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "ee67428d035b065e4d6c129e0659a508bf6eca7e0d64802edbabdc460db479ee"; + sha256 = "2c40123f37130de16e47175472086e5774598b5e6090de4d88e67512bf982c43"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/95.0.2/linux-i686/sr/firefox-95.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/sr/firefox-97.0.1.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "954800db592b449bdd7c37141198702cc1a3a2b8b217f71f5ca4ee7e9dcbb04d"; + sha256 = "2ab762afa95e0d0baa3650e35612f4f56f9d4ddd2baa34f615e9fb7bf95353e3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/95.0.2/linux-i686/sv-SE/firefox-95.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/sv-SE/firefox-97.0.1.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "ca2604feb91c22f5dee9e59f3c1098ad12c34b5082fc45841d54ecea4e6c8e4c"; + sha256 = "ea00b75128a67638d67ca83ce9f5e15f4afe9eda1903e90cd6f27820117fcac6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/95.0.2/linux-i686/szl/firefox-95.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/szl/firefox-97.0.1.tar.bz2"; locale = "szl"; arch = "linux-i686"; - sha256 = "3e434f5a395d1f0230affedb75d97976f5571a3f90801f92a606f1ff39377393"; + sha256 = "88ac139760b68702f33ad02889dacbd31d3c31140f3dff763dcbf6f9e7f6adf8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/95.0.2/linux-i686/ta/firefox-95.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/ta/firefox-97.0.1.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha256 = "ba25db7b2fd274e2e29f3cb10bc5a5d2af8c4ab5e75fe62164a538316d7171cc"; + sha256 = "3828cc9dea353d7fb259fd57396ddd59b316fb323caa6b8b47f485a6aad8e1a5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/95.0.2/linux-i686/te/firefox-95.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/te/firefox-97.0.1.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha256 = "f0bb3fe0d28a1e7440e07060c36d8a4c62a7d8e7d7567c793997f23504018406"; + sha256 = "1dba53e1907eac8f76759b2fe0a5499c31c733dcd627193916e6d4ebab27c625"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/95.0.2/linux-i686/th/firefox-95.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/th/firefox-97.0.1.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "705f294d3b735821cbc6cc93ce25264e4e2eb398194926ecaac2bb03fe51ef8a"; + sha256 = "461a11d1a033cf9ef113f0d362484696b29ba6d52e7e14ec4a3015ce55767f01"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/95.0.2/linux-i686/tl/firefox-95.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/tl/firefox-97.0.1.tar.bz2"; locale = "tl"; arch = "linux-i686"; - sha256 = "2f12aa7ac32ec89b5ca09289a8d6296fe9fbf332b53b7d183b75fb9b1dca3b11"; + sha256 = "572f60b9222c9a008ea23eb0f9c184fff17af4393e887cf2db871a7f86f74b77"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/95.0.2/linux-i686/tr/firefox-95.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/tr/firefox-97.0.1.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "5353938c7b90e557cb5e14e2f8556e9a14698e135b94eba0475c4303b293642a"; + sha256 = "bcc59684f7e6c6efa6df66fb2eacec8b1a59f0aa42f8bea86a7e0fd6a29916a2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/95.0.2/linux-i686/trs/firefox-95.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/trs/firefox-97.0.1.tar.bz2"; locale = "trs"; arch = "linux-i686"; - sha256 = "428ec7d2ba7ab418f6c3eb51f1cfe81ee798360333211195bc15c3372522107e"; + sha256 = "d97ea9fcc6ec94e168ddfe219f08fc202013e1cbfdf35e34749569e54f6ae65a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/95.0.2/linux-i686/uk/firefox-95.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/uk/firefox-97.0.1.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "b32b3419816ae3e5cf738baa307a30c364652e3344d002468fbf2cb021e2561e"; + sha256 = "49078902f54f5e0ffbaa93a7a797a7795a1baeb5cb57942afd3c6df38b68683a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/95.0.2/linux-i686/ur/firefox-95.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/ur/firefox-97.0.1.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha256 = "1219c56cef41202253988164a8708f09a5f7cdcc7454887326a9e04eb355388e"; + sha256 = "7df5518a9e0f8a82b61bba992bbdb4c3ceb935768d057ffa3602036a921b1754"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/95.0.2/linux-i686/uz/firefox-95.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/uz/firefox-97.0.1.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "68cc0b19902ba281441aab7d0f90b25ee839cbd9017ca7aee6330589dd1a83a0"; + sha256 = "6a36b93b799cbaca9a7f5765723c63a1e42c1645bad6ca2e3ee8dad8d64f3c40"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/95.0.2/linux-i686/vi/firefox-95.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/vi/firefox-97.0.1.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "577dd4afc185e80a7132334897fabe4017f36df51a388084704c18980dcf995a"; + sha256 = "da081f083f64ebe61465848358ac018ca4417104ec94911d39f4ea87a858d49e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/95.0.2/linux-i686/xh/firefox-95.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/xh/firefox-97.0.1.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha256 = "b53674150eb3726b22a2cef24d762390e63e43283e303f2b9e04f54f988b1f8f"; + sha256 = "3dd0234d0ae5739290f7236264500c3ead31b6afa9b00cfbf8405e1ca13d1a57"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/95.0.2/linux-i686/zh-CN/firefox-95.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/zh-CN/firefox-97.0.1.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "b59cc02e88c94d3dd681d59f705b0c554a0998ce3670f9bde435f75a07a6b97e"; + sha256 = "9e21e6ea94ad72b890c1eca95da2e1ed3f5c3b61ac56216092a7393c072048e4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/95.0.2/linux-i686/zh-TW/firefox-95.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/97.0.1/linux-i686/zh-TW/firefox-97.0.1.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "8dfb5d549ca2a63b0be9b2e32df95122a1f40f2066cfc3d3144e506a37c72371"; + sha256 = "e8eefb56597f20a92c839a7e4ccfabfa009de100505982a72c8088a64ecca879"; } ]; } diff --git a/nixpkgs/pkgs/applications/networking/browsers/firefox/common.nix b/nixpkgs/pkgs/applications/networking/browsers/firefox/common.nix index 5394499f2113..498bdd3e9067 100644 --- a/nixpkgs/pkgs/applications/networking/browsers/firefox/common.nix +++ b/nixpkgs/pkgs/applications/networking/browsers/firefox/common.nix @@ -1,7 +1,8 @@ { pname, version, meta, updateScript ? null , binaryName ? "firefox", application ? "browser" , src, unpackPhase ? null, patches ? [] -, extraNativeBuildInputs ? [], extraConfigureFlags ? [], extraMakeFlags ? [], tests ? [] }: +, extraNativeBuildInputs ? [], extraConfigureFlags ? [], extraMakeFlags ? [], tests ? [] +, extraPostPatch ? "", extraPassthru ? {} }: { lib, stdenv, pkg-config, pango, perl, python3, zip , libjpeg, zlib, dbus, dbus-glib, bzip2, xorg @@ -9,7 +10,7 @@ , yasm, libGLU, libGL, sqlite, unzip, makeWrapper , hunspell, libevent, libstartup_notification , libvpx -, icu69, libpng, glib, pciutils +, icu70, libpng, glib, pciutils , autoconf213, which, gnused, rustPackages , rust-cbindgen, nodejs, nasm, fetchpatch , gnum4 @@ -132,7 +133,8 @@ buildStdenv.mkDerivation ({ ] ++ lib.optional (lib.versionAtLeast version "86") ./env_var_for_system_dir-ff86.patch ++ lib.optional (lib.versionAtLeast version "90" && lib.versionOlder version "95") ./no-buildconfig-ffx90.patch ++ - lib.optional (lib.versionAtLeast version "95") ./no-buildconfig-ffx95.patch ++ + lib.optional (lib.versionAtLeast version "96") ./no-buildconfig-ffx96.patch ++ + patches; # Ignore trivial whitespace changes in patches, this fixes compatibility of @@ -148,9 +150,10 @@ buildStdenv.mkDerivation ({ xorg.xorgproto xorg.libXdamage xorg.libXext + xorg.libXtst libevent libstartup_notification /* cairo */ libpng glib - nasm icu69 libvpx + nasm icu70 libvpx # >= 66 requires nasm for the AV1 lib dav1d # yasm can potentially be removed in future versions # https://bugzilla.mozilla.org/show_bug.cgi?id=1501796 @@ -173,7 +176,9 @@ buildStdenv.mkDerivation ({ rm -rf obj-x86_64-pc-linux-gnu substituteInPlace toolkit/xre/glxtest.cpp \ --replace 'dlopen("libpci.so' 'dlopen("${pciutils}/lib/libpci.so' - ''; + + patchShebangs mach + '' + extraPostPatch; nativeBuildInputs = [ @@ -370,7 +375,7 @@ buildStdenv.mkDerivation ({ inherit applicationName; inherit tests; inherit gtk3; - }; + } // extraPassthru; hardeningDisable = [ "format" ]; # -Werror=format-security diff --git a/nixpkgs/pkgs/applications/networking/browsers/firefox/librewolf/default.nix b/nixpkgs/pkgs/applications/networking/browsers/firefox/librewolf/default.nix new file mode 100644 index 000000000000..4d8fe708e75a --- /dev/null +++ b/nixpkgs/pkgs/applications/networking/browsers/firefox/librewolf/default.nix @@ -0,0 +1,41 @@ +{ callPackage, git }: +let + src = callPackage ./src.nix { }; +in +rec { + + inherit (src) packageVersion firefox source; + + patches = [ ./verify-telemetry-macros.patch ]; + + extraConfigureFlags = [ + "--with-app-name=librewolf" + "--with-app-basename=LibreWolf" + "--with-branding=browser/branding/librewolf" + "--with-distribution-id=io.gitlab.librewolf-community" + "--with-unsigned-addon-scopes=app,system" + "--allow-addon-sideload" + ]; + + extraPostPatch = '' + while read patch_name; do + echo "applying LibreWolf patch: $patch_name" + patch -p1 < ${source}/$patch_name + done <${source}/assets/patches.txt + + cp -r ${source}/themes/browser . + cp ${source}/assets/search-config.json services/settings/dumps/main/search-config.json + sed -i '/MOZ_SERVICES_HEALTHREPORT/ s/True/False/' browser/moz.configure + sed -i '/MOZ_NORMANDY/ s/True/False/' browser/moz.configure + ''; + + extraPrefsFiles = [ "${source}/submodules/settings/librewolf.cfg" ]; + + extraPoliciesFiles = [ "${source}/submodules/settings/distribution/policies.json" ]; + + extraPassthru = { + librewolf = { inherit src patches; }; + inherit extraPrefsFiles extraPoliciesFiles; + }; +} + diff --git a/nixpkgs/pkgs/applications/networking/browsers/firefox/librewolf/src.json b/nixpkgs/pkgs/applications/networking/browsers/firefox/librewolf/src.json new file mode 100644 index 000000000000..bcedf9d22d87 --- /dev/null +++ b/nixpkgs/pkgs/applications/networking/browsers/firefox/librewolf/src.json @@ -0,0 +1,11 @@ +{ + "packageVersion": "97.0.1-1", + "source": { + "rev": "97.0.1-1", + "sha256": "10gbnkmyivawwqn3gf5c98l49b03j70gbniaar8bfl80j8av0v5j" + }, + "firefox": { + "version": "97.0.1", + "sha512": "8620aace77167593aab5acd230860eb3e67eeddc49c0aad0491b5dc20bd0ddb6089dbb8975aed241426f57b2ad772238b04d03b95390175f580cbd80bb6d5f6c" + } +} diff --git a/nixpkgs/pkgs/applications/networking/browsers/firefox/librewolf/src.nix b/nixpkgs/pkgs/applications/networking/browsers/firefox/librewolf/src.nix new file mode 100644 index 000000000000..38c5dc6b593d --- /dev/null +++ b/nixpkgs/pkgs/applications/networking/browsers/firefox/librewolf/src.nix @@ -0,0 +1,18 @@ +{ fetchurl, fetchFromGitLab }: +let src = builtins.fromJSON (builtins.readFile ./src.json); +in +{ + inherit (src) packageVersion; + source = fetchFromGitLab { + owner = "librewolf-community"; + repo = "browser/source"; + fetchSubmodules = true; + inherit (src.source) rev sha256; + }; + firefox = fetchurl { + url = + "mirror://mozilla/firefox/releases/${src.firefox.version}/source/firefox-${src.firefox.version}.source.tar.xz"; + inherit (src.firefox) sha512; + }; +} + diff --git a/nixpkgs/pkgs/applications/networking/browsers/firefox/librewolf/update.nix b/nixpkgs/pkgs/applications/networking/browsers/firefox/librewolf/update.nix new file mode 100644 index 000000000000..5cb5c6168f73 --- /dev/null +++ b/nixpkgs/pkgs/applications/networking/browsers/firefox/librewolf/update.nix @@ -0,0 +1,65 @@ +{ writeScript +, lib +, coreutils +, gnused +, gnugrep +, curl +, gnupg +, jq +, nix-prefetch-git +, moreutils +, runtimeShell +, ... +}: + +writeScript "update-librewolf" '' + #!${runtimeShell} + PATH=${lib.makeBinPath [ coreutils curl gnugrep gnupg gnused jq moreutils nix-prefetch-git ]} + set -euo pipefail + + latestTag=$(curl https://gitlab.com/api/v4/projects/librewolf-community%2Fbrowser%2Fsource/repository/tags?per_page=1 | jq -r .[0].name) + echo "latestTag=$latestTag" + + srcJson=pkgs/applications/networking/browsers/firefox/librewolf/src.json + localRev=$(jq -r .source.rev < $srcJson) + echo "localRev=$localRev" + + if [ "$localRev" == "$latestTag" ]; then + exit 0 + fi + + prefetchOut=$(mktemp) + repoUrl=https://gitlab.com/librewolf-community/browser/source.git/ + nix-prefetch-git $repoUrl --quiet --rev $latestTag --fetch-submodules > $prefetchOut + srcDir=$(jq -r .path < $prefetchOut) + srcHash=$(jq -r .sha256 < $prefetchOut) + + ffVersion=$(<$srcDir/version) + lwRelease=$(<$srcDir/release) + lwVersion="$ffVersion-$lwRelease" + echo "lwVersion=$lwVersion" + echo "ffVersion=$ffVersion" + if [ "$lwVersion" != "$latestTag" ]; then + echo "error: Tag name does not match the computed LibreWolf version" + exit 1 + fi + + HOME=$(mktemp -d) + export GNUPGHOME=$(mktemp -d) + gpg --receive-keys 14F26682D0916CDD81E37B6D61B7B526D98F0353 + + mozillaUrl=https://archive.mozilla.org/pub/firefox/releases/ + + curl --silent --show-error -o "$HOME"/shasums "$mozillaUrl$ffVersion/SHA512SUMS" + curl --silent --show-error -o "$HOME"/shasums.asc "$mozillaUrl$ffVersion/SHA512SUMS.asc" + gpgv --keyring="$GNUPGHOME"/pubring.kbx "$HOME"/shasums.asc "$HOME"/shasums + + ffHash=$(grep '\.source\.tar\.xz$' "$HOME"/shasums | grep '^[^ ]*' -o) + echo "ffHash=$ffHash" + + jq ".source.rev = \"$latestTag\"" $srcJson | sponge $srcJson + jq ".source.sha256 = \"$srcHash\"" $srcJson | sponge $srcJson + jq ".firefox.version = \"$ffVersion\"" $srcJson | sponge $srcJson + jq ".firefox.sha512 = \"$ffHash\"" $srcJson | sponge $srcJson + jq ".packageVersion = \"$lwVersion\"" $srcJson | sponge $srcJson +'' diff --git a/nixpkgs/pkgs/applications/networking/browsers/firefox/no-buildconfig-ffx95.patch b/nixpkgs/pkgs/applications/networking/browsers/firefox/no-buildconfig-ffx96.patch index 238c32ee45b1..51f9f0e354f2 100644 --- a/nixpkgs/pkgs/applications/networking/browsers/firefox/no-buildconfig-ffx95.patch +++ b/nixpkgs/pkgs/applications/networking/browsers/firefox/no-buildconfig-ffx96.patch @@ -1,5 +1,5 @@ diff --git a/docshell/base/nsAboutRedirector.cpp b/docshell/base/nsAboutRedirector.cpp -index 038136a..1709f1f 100644 +index e7be91a248..5eb98534ee 100644 --- a/docshell/base/nsAboutRedirector.cpp +++ b/docshell/base/nsAboutRedirector.cpp @@ -66,9 +66,6 @@ static const RedirEntry kRedirMap[] = { @@ -13,13 +13,13 @@ index 038136a..1709f1f 100644 nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT | nsIAboutModule::ALLOW_SCRIPT}, diff --git a/toolkit/content/jar.mn b/toolkit/content/jar.mn -index 9ac4305..916b4ad 100644 +index 74c0ae8f34..a5d9645a96 100644 --- a/toolkit/content/jar.mn +++ b/toolkit/content/jar.mn -@@ -39,8 +39,6 @@ toolkit.jar: - content/global/plugins.html +@@ -41,8 +41,6 @@ toolkit.jar: content/global/plugins.css content/global/plugins.js + #endif -* content/global/buildconfig.html - content/global/buildconfig.css content/global/contentAreaUtils.js diff --git a/nixpkgs/pkgs/applications/networking/browsers/firefox/packages.nix b/nixpkgs/pkgs/applications/networking/browsers/firefox/packages.nix index 43c7585849ed..645a2547cdc3 100644 --- a/nixpkgs/pkgs/applications/networking/browsers/firefox/packages.nix +++ b/nixpkgs/pkgs/applications/networking/browsers/firefox/packages.nix @@ -3,10 +3,10 @@ rec { firefox = firefoxCommon rec { pname = "firefox"; - version = "95.0.2"; + version = "97.0.1"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz"; - sha512 = "1b9eb91d72a6975b4d2558a7c5de0e008095398b9862498623656ab6d8056e3cffc12263f58aa07feeddc91ccfb512aa4b582dfeadb142d548d96c3d50204196"; + sha512 = "8620aace77167593aab5acd230860eb3e67eeddc49c0aad0491b5dc20bd0ddb6089dbb8975aed241426f57b2ad772238b04d03b95390175f580cbd80bb6d5f6c"; }; meta = { @@ -28,10 +28,10 @@ rec { firefox-esr-91 = firefoxCommon rec { pname = "firefox-esr"; - version = "91.4.1esr"; + version = "91.6.0esr"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz"; - sha512 = "1b9f17c4e58e3753f8507754bba93e3b7f76df5b6845d6173719fbdd98b70af2a90242df42fe274217f56d0280e5dbae17962f5b6bf111421260790f770f5337"; + sha512 = "3dd1929f93cdd087a93fc3597f32d9005c986b59832954e01a8c2472b179c92ad611eaa73d3fc000a08b838a0b70da73ff5ba82d6009160655ba6894cf04520e"; }; meta = { @@ -53,9 +53,9 @@ rec { firefox-beta = (firefoxCommon rec { pname = "firefox"; - ffversion = "83.0b10"; + version = "83.0b10"; src = fetchurl { - url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz"; + url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz"; sha512 = "1div55x8c9qw8ck7njpf1c9kl1l0hi6fn8gnrj2irbiwhvl5cfxqp84sn7yq9saj46wzicxmczn32w3a1vs5xzjfp454zggg8wllhcx"; }; @@ -68,8 +68,32 @@ rec { }; updateScript = callPackage ./update.nix { attrPath = "firefox-beta"; - versionKey = "ffversion"; + versionKey = "version"; }; }).override { pipewireSupport = false; }; + librewolf = + let + librewolf-src = callPackage ./librewolf { }; + in + (firefoxCommon rec { + pname = "librewolf"; + binaryName = "librewolf"; + version = librewolf-src.packageVersion; + src = librewolf-src.firefox; + inherit (librewolf-src) extraConfigureFlags extraPostPatch extraPassthru; + + meta = { + description = "A fork of Firefox, focused on privacy, security and freedom"; + homepage = "https://librewolf.net/"; + maintainers = with lib.maintainers; [ squalus ]; + inherit (firefox.meta) platforms badPlatforms broken maxSilent license; + }; + updateScript = callPackage ./librewolf/update.nix { + attrPath = "librewolf-unwrapped"; + }; + }).override { + crashreporterSupport = false; + enableOfficialBranding = false; + }; } diff --git a/nixpkgs/pkgs/applications/networking/browsers/firefox/wrapper.nix b/nixpkgs/pkgs/applications/networking/browsers/firefox/wrapper.nix index 462c24a62319..b428687025d1 100644 --- a/nixpkgs/pkgs/applications/networking/browsers/firefox/wrapper.nix +++ b/nixpkgs/pkgs/applications/networking/browsers/firefox/wrapper.nix @@ -37,10 +37,12 @@ let # For more information about anti tracking (german website) # visit https://wiki.kairaven.de/open/app/firefox , extraPrefs ? "" + , extraPrefsFiles ? [] # For more information about policies visit # https://github.com/mozilla/policy-templates#enterprisepoliciesenabled , extraPolicies ? {} - , libName ? "firefox" # Important for tor package or the like + , extraPoliciesFiles ? [] + , libName ? browser.libName or "firefox" # Important for tor package or the like , nixExtensions ? null }: @@ -150,24 +152,7 @@ let # # ############################# - # TODO: remove this after the next release (21.03) - configPlugins = lib.filter (a: builtins.hasAttr a cfg) [ - "enableAdobeFlash" - "enableAdobeReader" - "enableBluejeans" - "enableDjvu" - "enableFriBIDPlugin" - "enableGoogleTalkPlugin" - "enableMPlayer" - "enableVLC" - "icedtea" - "jre" - ]; - pluginsError = - "Your configuration mentions ${lib.concatMapStringsSep ", " (p: applicationName + "." + p) configPlugins}. All plugin related options have been removed, since Firefox from version 52 onwards no longer supports npapi plugins (see https://support.mozilla.org/en-US/kb/npapi-plugins)."; - - in if configPlugins != [] then throw pluginsError else - (stdenv.mkDerivation { + in stdenv.mkDerivation { inherit pname version; desktopItem = makeDesktopItem { @@ -189,7 +174,7 @@ let ]; }; - nativeBuildInputs = [ makeWrapper lndir ]; + nativeBuildInputs = [ makeWrapper lndir replace jq ]; buildInputs = [ browser.gtk3 ]; @@ -217,8 +202,8 @@ let find . -type f \( -not -name "${applicationName}" \) -exec ln -sT "${browser}"/{} "$out"/{} \; - find . -type f -name "${applicationName}" -print0 | while read -d $'\0' f; do - cp -P --no-preserve=mode,ownership "${browser}/$f" "$out/$f" + find . -type f \( -name "${applicationName}" -o -name "${applicationName}-bin" \) -print0 | while read -d $'\0' f; do + cp -P --no-preserve=mode,ownership --remove-destination "${browser}/$f" "$out/$f" chmod a+rwx "$out/$f" done @@ -226,14 +211,14 @@ let cd "${browser}" find . -type l -print0 | while read -d $'\0' l; do - target="$(readlink "$l" | ${replace}/bin/replace-literal -es -- "${browser}" "$out")" + target="$(readlink "$l" | replace-literal -es -- "${browser}" "$out")" ln -sfT "$target" "$out/$l" done # This will not patch binaries, only "text" files. # Its there for the wrapper mostly. cd "$out" - ${replace}/bin/replace-literal -esfR -- "${browser}" "$out" + replace-literal -esfR -- "${browser}" "$out" # create the wrapper @@ -325,6 +310,12 @@ let rm -f "$POL_PATH" cat ${policiesJson} >> "$POL_PATH" + extraPoliciesFiles=(${builtins.toString extraPoliciesFiles}) + for extraPoliciesFile in "''${extraPoliciesFiles[@]}"; do + jq -s '.[0] + .[1]' "$POL_PATH" $extraPoliciesFile > .tmp.json + mv .tmp.json "$POL_PATH" + done + # preparing for autoconfig mkdir -p "$out/lib/${libName}/defaults/pref" @@ -333,6 +324,11 @@ let cat > "$out/lib/${libName}/mozilla.cfg" < ${mozillaCfg} + extraPrefsFiles=(${builtins.toString extraPrefsFiles}) + for extraPrefsFile in "''${extraPrefsFiles[@]}"; do + cat "$extraPrefsFile" >> "$out/lib/${libName}/mozilla.cfg" + done + mkdir -p $out/lib/${libName}/distribution/extensions ############################# @@ -356,5 +352,5 @@ let hydraPlatforms = []; priority = (browser.meta.priority or 0) - 1; # prefer wrapper over the package }; - }); + }; in lib.makeOverridable wrapper diff --git a/nixpkgs/pkgs/applications/networking/browsers/google-chrome/default.nix b/nixpkgs/pkgs/applications/networking/browsers/google-chrome/default.nix index fe6ef5c059de..5ba831b21022 100644 --- a/nixpkgs/pkgs/applications/networking/browsers/google-chrome/default.nix +++ b/nixpkgs/pkgs/applications/networking/browsers/google-chrome/default.nix @@ -1,11 +1,11 @@ { lib, stdenv, patchelf, makeWrapper # Linked dynamic libraries. -, glib, fontconfig, freetype, pango, cairo, libX11, libXi, atk, gconf, nss, nspr +, glib, fontconfig, freetype, pango, cairo, libX11, libXi, atk, nss, nspr , libXcursor, libXext, libXfixes, libXrender, libXScrnSaver, libXcomposite, libxcb , alsa-lib, libXdamage, libXtst, libXrandr, libxshmfence, expat, cups , dbus, gtk3, gdk-pixbuf, gcc-unwrapped, at-spi2-atk, at-spi2-core -, libkrb5, libdrm, mesa +, libkrb5, libdrm, libglvnd, mesa , libxkbcommon, pipewire, wayland # ozone/wayland # Command line programs @@ -44,7 +44,7 @@ , libvaSupport ? true, libva # For Vulkan support (--enable-features=Vulkan) -, vulkanSupport ? true, vulkan-loader +, addOpenGLRunpath }: with lib; @@ -57,7 +57,7 @@ let version = chromium.upstream-info.version; deps = [ - glib fontconfig freetype pango cairo libX11 libXi atk gconf nss nspr + glib fontconfig freetype pango cairo libX11 libXi atk nss nspr libXcursor libXext libXfixes libXrender libXScrnSaver libXcomposite libxcb alsa-lib libXdamage libXtst libXrandr libxshmfence expat cups dbus gdk-pixbuf gcc-unwrapped.lib @@ -66,11 +66,10 @@ let liberation_ttf curl util-linux xdg-utils wget flac harfbuzz icu libpng opusWithCustomModes snappy speechd bzip2 libcap at-spi2-atk at-spi2-core - libkrb5 libdrm mesa coreutils + libkrb5 libdrm libglvnd mesa coreutils libxkbcommon pipewire wayland ] ++ optional pulseSupport libpulseaudio ++ optional libvaSupport libva - ++ optional vulkanSupport vulkan-loader ++ [ gtk3 ]; suffix = if channel != "stable" then "-" + channel else ""; @@ -119,12 +118,9 @@ in stdenv.mkDerivation { cp -a opt/* $out/share cp -a usr/share/* $out/share - # To fix --use-gl=egl: - test -e $out/share/google/$appname/libEGL.so - ln -s libEGL.so $out/share/google/$appname/libEGL.so.1 - test -e $out/share/google/$appname/libGLESv2.so - ln -s libGLESv2.so $out/share/google/$appname/libGLESv2.so.2 + substituteInPlace $out/share/google/$appname/google-$appname \ + --replace 'CHROME_WRAPPER' 'WRAPPER' substituteInPlace $out/share/applications/google-$appname.desktop \ --replace /usr/bin/google-chrome-$dist $exe substituteInPlace $out/share/gnome-control-center/default-apps/google-$appname.xml \ @@ -149,8 +145,10 @@ in stdenv.mkDerivation { makeWrapper "$out/share/google/$appname/google-$appname" "$exe" \ --prefix LD_LIBRARY_PATH : "$rpath" \ --prefix PATH : "$binpath" \ - --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" \ - --add-flags ${escapeShellArg commandLineArgs} + --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH:${addOpenGLRunpath.driverLink}/share" \ + --set CHROME_WRAPPER "google-chrome-$dist" \ + --add-flags ${escapeShellArg commandLineArgs} \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--enable-features=UseOzonePlatform --ozone-platform=wayland}}" for elf in $out/share/google/$appname/{chrome,chrome-sandbox,${crashpadHandlerBinary},nacl_helper}; do patchelf --set-rpath $rpath $elf diff --git a/nixpkgs/pkgs/applications/networking/browsers/icecat-bin/default.nix b/nixpkgs/pkgs/applications/networking/browsers/icecat-bin/default.nix deleted file mode 100644 index 2427570a59d0..000000000000 --- a/nixpkgs/pkgs/applications/networking/browsers/icecat-bin/default.nix +++ /dev/null @@ -1,130 +0,0 @@ -{ stdenv -, lib -, fetchzip -, autoPatchelfHook -, wrapGAppsHook -, gnome2 -, gtk2 -, nss -, xdg-utils -, xorg -, alsa-lib -, atk -, cairo -, cups -, curl -, dbus -, expat -, fontconfig -, freetype -, gdk-pixbuf -, glib -, gtk3 -, libX11 -, libxcb -, libXScrnSaver -, libXcomposite -, libXcursor -, libXdamage -, libXext -, libXfixes -, libXi -, libXrandr -, libXrender -, libXtst -, libdrm -, libnotify -, libopus -, libpulseaudio -, libuuid -, libxshmfence -, mesa -, nspr -, pango -, systemd -, at-spi2-atk -, at-spi2-core -}: - -stdenv.mkDerivation rec { - pname = "icecat-bin"; - version = "60.7.0"; - - src = fetchzip { - url = "https://mirror.tochlab.net/pub/gnu/gnuzilla/${version}/icecat-${version}.en-US.gnulinux-x86_64.tar.bz2"; - sha256 = "sha256-bEapbQIcZXQ0Tip/X1Q0guowpr3wNDYsFbHGmTbc5mE="; - }; - - nativeBuildInputs = [ - autoPatchelfHook - wrapGAppsHook - ]; - - buildInputs = [ - nss - xdg-utils - xorg.libxkbfile - alsa-lib - at-spi2-atk - at-spi2-core - atk - cairo - cups - curl - dbus - expat - fontconfig.lib - freetype - gdk-pixbuf - glib - gnome2.GConf - gtk2 - gtk3 - libX11 - libXScrnSaver - libXcomposite - libXcursor - libXdamage - libXext - libXfixes - libXi - libXrandr - libXrender - libXtst - libdrm - libnotify - libopus - libuuid - libxcb - libxshmfence - mesa - nspr - nss - pango - xorg.libXt - stdenv.cc.cc.lib - ]; - - unpackPhase = '' - mkdir -p $TMP/ $out/{opt,bin} - cp $src/* $TMP/ -r - ''; - - installPhase = '' - cp -r $TMP/* $out/opt/ - ln -sf $out/opt/icecat-bin $out/bin/icecat - ''; - - runtimeDependencies = [ - libpulseaudio.out - (lib.getLib systemd) - ]; - - meta = with lib; { - description = "Binary build of the GNU version of the Mozilla Firefox browser"; - homepage = "https://www.gnu.org/software/gnuzilla/"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ dan4ik605743 ]; - platforms = platforms.linux; - }; -} diff --git a/nixpkgs/pkgs/applications/networking/browsers/lagrange/default.nix b/nixpkgs/pkgs/applications/networking/browsers/lagrange/default.nix index 4daab414268a..bf370dd6ec0c 100644 --- a/nixpkgs/pkgs/applications/networking/browsers/lagrange/default.nix +++ b/nixpkgs/pkgs/applications/networking/browsers/lagrange/default.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation rec { pname = "lagrange"; - version = "1.9.3"; + version = "1.10.6"; src = fetchFromGitHub { owner = "skyjake"; repo = "lagrange"; rev = "v${version}"; - sha256 = "sha256-0+NY21oIbRMCYnneWxw48yQ3UOXW0Ves2A4JTXyLnCE="; + sha256 = "sha256-N4NB4lfWIN+jreAuaaGKRdpgwHy2CKrPrGxu1iSCZyU="; fetchSubmodules = true; }; @@ -38,8 +38,6 @@ stdenv.mkDerivation rec { buildInputs = [ fribidi harfbuzz libunistring libwebp mpg123 openssl pcre SDL2 zlib ] ++ lib.optional stdenv.isDarwin AppKit; - hardeningDisable = lib.optional (!stdenv.cc.isClang) "format"; - installPhase = lib.optionalString stdenv.isDarwin '' mkdir -p $out/Applications mv Lagrange.app $out/Applications diff --git a/nixpkgs/pkgs/applications/networking/browsers/nyxt/default.nix b/nixpkgs/pkgs/applications/networking/browsers/nyxt/default.nix index 59bb2adbf518..7c1cb7f04a71 100644 --- a/nixpkgs/pkgs/applications/networking/browsers/nyxt/default.nix +++ b/nixpkgs/pkgs/applications/networking/browsers/nyxt/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, lispPackages , makeWrapper, wrapGAppsHook, gst_all_1 , glib, gdk-pixbuf, cairo -, mime-types, pango, gtk3 +, mailcap, pango, gtk3 , glib-networking, gsettings-desktop-schemas , xclip, notify-osd, enchant }: @@ -22,12 +22,12 @@ stdenv.mkDerivation rec { ]; buildInputs = [ glib gdk-pixbuf cairo - mime-types pango gtk3 + mailcap pango gtk3 glib-networking gsettings-desktop-schemas xclip notify-osd enchant ] ++ gstBuildInputs; - GST_PLUGIN_SYSTEM_PATH_1_0 = lib.concatMapStringsSep ":" (p: "${p}/lib/gstreamer-1.0") gstBuildInputs; + GST_PLUGIN_SYSTEM_PATH_1_0 = lib.makeSearchPathOutput "lib" "lib/gstreamer-1.0" gstBuildInputs; dontWrapGApps = true; installPhase = '' diff --git a/nixpkgs/pkgs/applications/networking/browsers/opera/default.nix b/nixpkgs/pkgs/applications/networking/browsers/opera/default.nix index 642781d570a7..5013ca86d3e4 100644 --- a/nixpkgs/pkgs/applications/networking/browsers/opera/default.nix +++ b/nixpkgs/pkgs/applications/networking/browsers/opera/default.nix @@ -11,7 +11,6 @@ , freetype , gdk-pixbuf , glib -, gnome2 , gtk3 , gtk4 , lib @@ -79,7 +78,6 @@ in stdenv.mkDerivation rec { freetype gdk-pixbuf glib - gnome2.GConf gtk3 libX11 libXScrnSaver diff --git a/nixpkgs/pkgs/applications/networking/browsers/palemoon/default.nix b/nixpkgs/pkgs/applications/networking/browsers/palemoon/default.nix index a536bf15cfec..e33ff3f3ca6e 100644 --- a/nixpkgs/pkgs/applications/networking/browsers/palemoon/default.nix +++ b/nixpkgs/pkgs/applications/networking/browsers/palemoon/default.nix @@ -44,12 +44,12 @@ assert with lib.strings; ( stdenv.mkDerivation rec { pname = "palemoon"; - version = "29.4.3"; + version = "29.4.4"; src = fetchzip { name = "${pname}-${version}"; url = "http://archive.palemoon.org/source/${pname}-${version}.source.tar.xz"; - sha256 = "sha256-9Qut7zgzDrU6T/sWbSF2Me7E02VJVL/B2bzJw14KWFs="; + sha256 = "sha256-0R0IJd4rd7NqnxQxkHSx10cNlwECqpKgJnlfYAMx4wc="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/applications/networking/browsers/telescope/default.nix b/nixpkgs/pkgs/applications/networking/browsers/telescope/default.nix index ae4a649724b3..552c05ac9cd4 100644 --- a/nixpkgs/pkgs/applications/networking/browsers/telescope/default.nix +++ b/nixpkgs/pkgs/applications/networking/browsers/telescope/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "telescope"; - version = "0.6.1"; + version = "0.7.1"; src = fetchFromGitHub { owner = "omar-polo"; repo = pname; rev = version; - sha256 = "sha256-r2+jvmnW9EeQf/2X2cOxnOa+HGuGHV6YMftT2MxbSYQ="; + sha256 = "sha256-W42e1p70dMhF9C7BBPp1Yhp2PrRb8/Lu07yOGiUSmNg="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix b/nixpkgs/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix index e1c93fe97726..427f6bcdc9a4 100644 --- a/nixpkgs/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix +++ b/nixpkgs/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix @@ -87,7 +87,7 @@ let fteLibPath = makeLibraryPath [ stdenv.cc.cc gmp ]; # Upstream source - version = "11.0.3"; + version = "11.0.6"; lang = "en-US"; @@ -97,7 +97,7 @@ let "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz" "https://tor.eff.org/dist/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz" ]; - sha256 = "1a2nxxmjg1gk8p0bxxjqx2g9bwv4ivz8hndabg31nglzv83r7p35"; + sha256 = "03c3l720x4c6mfq56fyqspc5sxw0mz1ph48l5wph06dzw8wd5cfz"; }; i686-linux = fetchurl { @@ -105,7 +105,7 @@ let "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz" "https://tor.eff.org/dist/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz" ]; - sha256 = "0fjq6bj2b6rd66ky9i4p7asda0ghdcm6q0fnr92yan5x77pji73m"; + sha256 = "0llg1nl7x7y4kp0hr3bbhdfggaf8praizkvcpp88x2i2zc9sp5mx"; }; }; in diff --git a/nixpkgs/pkgs/applications/networking/browsers/vieb/default.nix b/nixpkgs/pkgs/applications/networking/browsers/vieb/default.nix index 781163050944..fbd0df2fd3ad 100644 --- a/nixpkgs/pkgs/applications/networking/browsers/vieb/default.nix +++ b/nixpkgs/pkgs/applications/networking/browsers/vieb/default.nix @@ -2,13 +2,13 @@ mkYarnPackage rec { pname = "vieb"; - version = "6.1.0"; + version = "6.2.0"; src = fetchFromGitHub { owner = "Jelmerro"; repo = pname; rev = version; - sha256 = "sha256-MJJeHnwfXouBygRT/wFWFMRHxQVf/3k2c7vp/tkD5co="; + sha256 = "sha256-FuaN9iUxR5Y6SnNmuegmNJXn1BYKgcobquTL3thuByM="; }; packageJSON = ./package.json; diff --git a/nixpkgs/pkgs/applications/networking/browsers/vivaldi/default.nix b/nixpkgs/pkgs/applications/networking/browsers/vivaldi/default.nix index bf220c02b4e4..139bfdc965f4 100644 --- a/nixpkgs/pkgs/applications/networking/browsers/vivaldi/default.nix +++ b/nixpkgs/pkgs/applications/networking/browsers/vivaldi/default.nix @@ -4,7 +4,7 @@ , freetype, fontconfig, libXft, libXrender, libxcb, expat , libuuid , libxml2 -, glib, gtk3, pango, gdk-pixbuf, cairo, atk, at-spi2-atk, at-spi2-core, gnome2 +, glib, gtk3, pango, gdk-pixbuf, cairo, atk, at-spi2-atk, at-spi2-core , libdrm, mesa , nss, nspr , patchelf, makeWrapper @@ -19,11 +19,11 @@ let vivaldiName = if isSnapshot then "vivaldi-snapshot" else "vivaldi"; in stdenv.mkDerivation rec { pname = "vivaldi"; - version = "5.0.2497.32-1"; + version = "5.1.2567.39-1"; src = fetchurl { url = "https://downloads.vivaldi.com/${branch}/vivaldi-${branch}_${version}_amd64.deb"; - sha256 = "1l333q002z9rr08np0r0j89j26shmsl8y2clyqwh54h22h7hmypz"; + sha256 = "140idghryk132nyb8np011xiwzgh518n0fxrkjnnvi3c67shq7qc"; }; unpackPhase = '' @@ -38,7 +38,7 @@ in stdenv.mkDerivation rec { libXi libXft libXcursor libXfixes libXScrnSaver libXcomposite libXdamage libXtst libXrandr atk at-spi2-atk at-spi2-core alsa-lib dbus cups gtk3 gdk-pixbuf libexif ffmpeg systemd libva freetype fontconfig libXrender libuuid expat glib nss nspr - libxml2 pango cairo gnome2.GConf + libxml2 pango cairo libdrm mesa ] ++ lib.optional proprietaryCodecs vivaldi-ffmpeg-codecs; diff --git a/nixpkgs/pkgs/applications/networking/browsers/vivaldi/ffmpeg-codecs.nix b/nixpkgs/pkgs/applications/networking/browsers/vivaldi/ffmpeg-codecs.nix index 0e4236f421a1..28543c31edc4 100644 --- a/nixpkgs/pkgs/applications/networking/browsers/vivaldi/ffmpeg-codecs.nix +++ b/nixpkgs/pkgs/applications/networking/browsers/vivaldi/ffmpeg-codecs.nix @@ -1,21 +1,18 @@ -{ lib, stdenv, fetchurl -, dpkg -}: +{ dpkg, fetchurl, lib, stdenv }: stdenv.mkDerivation rec { pname = "chromium-codecs-ffmpeg-extra"; - version = "94.0.4606.50"; + version = "97.0.4692.56"; src = fetchurl { - url = "https://launchpadlibrarian.net/558847674/${pname}_${version}-0ubuntu0.18.04.1_amd64.deb"; - sha256 = "sha256-H7Tzd8tkaoLClXtNiwEO5nD4+PPt7Jgs+gtLiag/KN4="; + url = "https://launchpadlibrarian.net/574348729/${pname}_${version}-0ubuntu0.18.04.1_amd64.deb"; + sha256 = "sha256-v5DHJxQjHjBeIS/psaM+LyUaHKlwzrKncLarErbUGVU="; }; buildInputs = [ dpkg ]; unpackPhase = '' dpkg-deb -x $src . - find . ''; installPhase = '' @@ -26,7 +23,7 @@ stdenv.mkDerivation rec { description = "Additional support for proprietary codecs for Vivaldi"; homepage = "https://ffmpeg.org/"; license = licenses.lgpl21; - maintainers = with maintainers; [ betaboon lluchs ]; + maintainers = with maintainers; [ betaboon cawilliamson lluchs ]; platforms = [ "x86_64-linux" ]; }; } diff --git a/nixpkgs/pkgs/applications/networking/browsers/vivaldi/widevine.nix b/nixpkgs/pkgs/applications/networking/browsers/vivaldi/widevine.nix index 3b0dbe8e9367..71a5a67331ed 100644 --- a/nixpkgs/pkgs/applications/networking/browsers/vivaldi/widevine.nix +++ b/nixpkgs/pkgs/applications/networking/browsers/vivaldi/widevine.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "widevine"; - version = "4.10.1582.1"; + version = "4.10.2391.0"; src = fetchurl { url = "https://dl.google.com/widevine-cdm/${version}-linux-x64.zip"; - sha256 = "0l743f2yyaq1vvc3iicajgnfpjxjsfvjcqvanndbxs23skgjcv6r"; + sha256 = "sha256-7gH808C67m/s09e4rQUQHb/t+iGVdzW+YzrB1ZxGIdo="; }; nativeBuildInputs = [ unzip ]; diff --git a/nixpkgs/pkgs/applications/networking/calls/default.nix b/nixpkgs/pkgs/applications/networking/calls/default.nix index 68ab73da01e3..2215de9291d5 100644 --- a/nixpkgs/pkgs/applications/networking/calls/default.nix +++ b/nixpkgs/pkgs/applications/networking/calls/default.nix @@ -26,18 +26,20 @@ , docbook-xsl-nons , docbook_xml_dtd_43 , gobject-introspection +, gst_all_1 +, sofia_sip }: stdenv.mkDerivation rec { pname = "calls"; - version = "0.3.1"; + version = "41.1"; src = fetchFromGitLab { - domain = "source.puri.sm"; - owner = "Librem5"; + domain = "gitlab.gnome.org"; + owner = "GNOME"; repo = pname; - rev = "v${version}"; - sha256 = "0igap5ynq269xqaky6fqhdg2dpsvxa008z953ywa4s5b5g5dk3dd"; + rev = version; + sha256 = "1vbw9x5s3ww11f3lnqivc74rjlmi9fk1hzaq1idrdcck3gvif0h8"; }; outputs = [ "out" "devdoc" ]; @@ -62,11 +64,16 @@ stdenv.mkDerivation rec { folks gom gsound + gst_all_1.gstreamer + gst_all_1.gst-plugins-base + gst_all_1.gst-plugins-good + gst_all_1.gst-plugins-bad + gst_all_1.gst-plugins-ugly feedbackd callaudiod gtk3 libpeas - libgdata # required by some dependency transitively + sofia_sip ]; checkInputs = [ @@ -80,7 +87,8 @@ stdenv.mkDerivation rec { "-Dgtk_doc=true" ]; - doCheck = true; + # Disable until tests are fixed upstream https://gitlab.gnome.org/GNOME/calls/-/issues/258 + doCheck = false; checkPhase = '' runHook preCheck @@ -97,7 +105,7 @@ stdenv.mkDerivation rec { longDescription = "GNOME Calls is a phone dialer and call handler. Setting NixOS option `programs.calls.enable = true` is recommended."; homepage = "https://source.puri.sm/Librem5/calls"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ craigem lheckemann ]; + maintainers = with maintainers; [ craigem lheckemann tomfitzhenry ]; platforms = platforms.linux; }; } diff --git a/nixpkgs/pkgs/applications/networking/cloudflared/default.nix b/nixpkgs/pkgs/applications/networking/cloudflared/default.nix index a3b14264e0a6..954ce2292ec1 100644 --- a/nixpkgs/pkgs/applications/networking/cloudflared/default.nix +++ b/nixpkgs/pkgs/applications/networking/cloudflared/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "cloudflared"; - version = "2021.12.3"; + version = "2022.2.1"; src = fetchFromGitHub { owner = "cloudflare"; repo = "cloudflared"; rev = version; - sha256 = "sha256-+T8BtYc/TBP2qL/Wfi2CDwD6VAqY/0F7QIUEhjOnLUk="; + hash = "sha256-y9TduC6Fa1p3UFvSeW9n42AUD63dp/LEagiv3xlT/4U="; }; vendorSha256 = null; @@ -18,9 +18,9 @@ buildGoModule rec { ldflags = [ "-X main.Version=${version}" ]; meta = with lib; { - description = "CloudFlare Argo Tunnel daemon (and DNS-over-HTTPS client)"; - homepage = "https://www.cloudflare.com/products/argo-tunnel"; - license = licenses.unfree; + description = "CloudFlare Tunnel daemon (and DNS-over-HTTPS client)"; + homepage = "https://www.cloudflare.com/products/tunnel"; + license = licenses.asl20; platforms = platforms.unix; maintainers = with maintainers; [ bbigras enorris thoughtpolice ]; }; diff --git a/nixpkgs/pkgs/applications/networking/cluster/argo-rollouts/default.nix b/nixpkgs/pkgs/applications/networking/cluster/argo-rollouts/default.nix new file mode 100644 index 000000000000..8127904023c9 --- /dev/null +++ b/nixpkgs/pkgs/applications/networking/cluster/argo-rollouts/default.nix @@ -0,0 +1,27 @@ +{ buildGoModule, lib, fetchFromGitHub }: + +buildGoModule rec { + pname = "argo-rollouts"; + version = "1.1.1"; + + src = fetchFromGitHub { + owner = "argoproj"; + repo = "argo-rollouts"; + rev = "v${version}"; + sha256 = "0qb1wbv3razwhqsv972ywfazaq73y83iw6f6qdjcbwwfwsybig21"; + }; + + vendorSha256 = "00ic1nn3wgg495x2170ik1d1cha20b4w89j9jclq8p0b3nndv0c0"; + + # Disable tests since some test fail because of missing test data + doCheck = false; + + subPackages = [ "cmd/rollouts-controller" "cmd/kubectl-argo-rollouts" ]; + + meta = with lib; { + description = "Kubernetes Progressive Delivery Controller"; + homepage = "https://github.com/argoproj/argo-rollouts/"; + license = licenses.asl20; + maintainers = with maintainers; [ psibi ]; + }; +} diff --git a/nixpkgs/pkgs/applications/networking/cluster/argo/default.nix b/nixpkgs/pkgs/applications/networking/cluster/argo/default.nix index b57181ce4a25..52bd37ec6138 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/argo/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/argo/default.nix @@ -19,16 +19,16 @@ let in buildGoModule rec { pname = "argo"; - version = "3.2.4"; + version = "3.2.8"; src = fetchFromGitHub { owner = "argoproj"; repo = "argo"; rev = "v${version}"; - sha256 = "sha256-uymE+Eq4jsqWIhDsbALzV+xAKF22DddPFzKtn3tV2EA="; + sha256 = "sha256-A6YI5OGveJj9RRk1fMF3ejYYnMsbjxE34ximtkZUNys="; }; - vendorSha256 = "sha256-2b+PvD5IKgobBzFrubjRl2NvFxw91dXYpnWO8dqDG+U="; + vendorSha256 = "sha256-hxSr0sNlz93JxOxnE2SnR6/OgCGK8DrJZxqQtSxfbj8="; doCheck = false; diff --git a/nixpkgs/pkgs/applications/networking/cluster/argocd/default.nix b/nixpkgs/pkgs/applications/networking/cluster/argocd/default.nix index c937c8414717..360d566009d4 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/argocd/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/argocd/default.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "argocd"; - version = "2.2.1"; - commit = "122ecefc3abfe8b691a08d9f3cecf9a170cc8c37"; + version = "2.2.5"; + commit = "8f981ccfcf942a9eb00bc466649f8499ba0455f5"; tag = "v${version}"; src = fetchFromGitHub { owner = "argoproj"; repo = "argo-cd"; rev = tag; - sha256 = "sha256-BI4aoe9XVmuyb4oDPd2Clz5IWVzu4rAMHDi6Cb6spyE="; + sha256 = "sha256-wSvDoRHV4BObRL8lEpHt9oGXNB06LXdIYasRYqmM5QA="; }; - vendorSha256 = "sha256-GeU8uQM+oMottzYsE6oQyKZL3aWB5vQgTDLQiuQdapw="; + vendorSha256 = "sha256-BVhts+gOM6nhcR1lkFzy7OJnainLXw5YdeseBBRF2xE="; nativeBuildInputs = [ packr makeWrapper installShellFiles ]; diff --git a/nixpkgs/pkgs/applications/networking/cluster/arkade/default.nix b/nixpkgs/pkgs/applications/networking/cluster/arkade/default.nix index f74f87ad11c1..2cf5d35f653d 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/arkade/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/arkade/default.nix @@ -2,24 +2,22 @@ , stdenv , buildGoModule , fetchFromGitHub -, makeWrapper -, kubectl }: buildGoModule rec { pname = "arkade"; - version = "0.8.11"; + version = "0.8.14"; src = fetchFromGitHub { owner = "alexellis"; repo = "arkade"; rev = version; - sha256 = "0mdi5cjcs0qzj238lfjqbjgi131r2vxj810zx1gv1lc9y0aq0hkl"; + sha256 = "sha256-XH7JtLv0J6bznZZ/L8wg5KB53OPe3KLiYujBlxP71pg="; }; CGO_ENABLED = 0; - vendorSha256 = "05zdd5c2x4k4myxmgj32md8wq08i543l8q81rabqgyd3r9nwv4lx"; + vendorSha256 = "sha256-ipLVzBkliQSPBZTL5FU8xosTVjxFsUVlAvO0a0q+j2o="; # Exclude pkg/get: tests downloading of binaries which fail when sandbox=true subPackages = [ @@ -40,25 +38,10 @@ buildGoModule rec { "-X github.com/alexellis/arkade/cmd.Version=${version}" ]; - buildInputs = [ makeWrapper ]; - - postInstall = '' - wrapProgram "$out/bin/arkade" \ - --prefix PATH : ${lib.makeBinPath [ kubectl ]} - ''; - meta = with lib; { homepage = "https://github.com/alexellis/arkade"; description = "Open Source Kubernetes Marketplace"; license = licenses.mit; maintainers = with maintainers; [ welteki ]; - platforms = [ - "x86_64-linux" - "x86_64-darwin" - "aarch64-linux" - "aarch64-darwin" - "armv7l-linux" - "armv6l-linux" - ]; }; } diff --git a/nixpkgs/pkgs/applications/networking/cluster/bosh-cli/default.nix b/nixpkgs/pkgs/applications/networking/cluster/bosh-cli/default.nix index e03451f4f2fb..a629de63729e 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/bosh-cli/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/bosh-cli/default.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "bosh-cli"; - version = "6.4.7"; + version = "6.4.16"; src = fetchFromGitHub { owner = "cloudfoundry"; repo = pname; rev = "v${version}"; - sha256 = "sha256-uLzYRfH2wJB/ucYtZGjKi0K5FaiP3CyA85gJ8Ji3WHE="; + sha256 = "sha256-yjW0XlMXa1MyNIud3uGm7RNj47B4Bp3DK9tvBrfqkoA="; }; vendorSha256 = null; diff --git a/nixpkgs/pkgs/applications/networking/cluster/cilium/default.nix b/nixpkgs/pkgs/applications/networking/cluster/cilium/default.nix index da9f0938d144..91d8655fe6d2 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/cilium/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/cilium/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "cilium-cli"; - version = "0.9.3"; + version = "0.10.3"; src = fetchFromGitHub { owner = "cilium"; repo = pname; rev = "v${version}"; - sha256 = "sha256-t4Im3/2qcKnDDcKWmUUa/lsZszDDlos+uTERKxd7x1c="; + sha256 = "sha256-nE2mrFALJCGxUce8anJ3ErUO8575GgR6pupG06rRCCM="; }; vendorSha256 = null; diff --git a/nixpkgs/pkgs/applications/networking/cluster/clusterctl/default.nix b/nixpkgs/pkgs/applications/networking/cluster/clusterctl/default.nix index fdd0e4967a76..b14c98b4453d 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/clusterctl/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/clusterctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "clusterctl"; - version = "1.0.2"; + version = "1.1.2"; src = fetchFromGitHub { owner = "kubernetes-sigs"; repo = "cluster-api"; rev = "v${version}"; - sha256 = "sha256-esSpCNvgYhuz9i22AU4ZowU5A5ZOPZ15+XHB4OOfTa4="; + sha256 = "sha256-IjkksHa94gkNiaeksGHlLdeHlLS/uwI0GnKK0d3s5wk="; }; - vendorSha256 = "sha256-VO1Z4NUWrd4JuFYFg0a01psqoIM8ps3vKd0djR5OELU="; + vendorSha256 = "sha256-3PzaMB7U19HnqS+zRbIupErE1S8+MzG92vQFq3oxHpE="; subPackages = [ "cmd/clusterctl" ]; diff --git a/nixpkgs/pkgs/applications/networking/cluster/cmctl/default.nix b/nixpkgs/pkgs/applications/networking/cluster/cmctl/default.nix new file mode 100644 index 000000000000..64a8ebd4a99b --- /dev/null +++ b/nixpkgs/pkgs/applications/networking/cluster/cmctl/default.nix @@ -0,0 +1,38 @@ +{ lib, buildGoModule, fetchFromGitHub, installShellFiles }: + +buildGoModule rec { + pname = "cmctl"; + version = "1.7.1"; + + src = fetchFromGitHub { + owner = "cert-manager"; + repo = "cert-manager"; + rev = "v${version}"; + sha256 = "sha256-RO7YcGEfAQ9kTxfqgekYf6M5b6Fg64hCPLA/vt6IWp8="; + }; + + vendorSha256 = "sha256-4zhdpedOmLl/i1G0QCto4ACxguWRZLzOm5HfMBMtvPY="; + + subPackages = [ "cmd/ctl" ]; + + ldflags = [ "-s" "-w" ]; + + nativeBuildInputs = [ installShellFiles ]; + + postInstall = '' + mv $out/bin/ctl $out/bin/cmctl + installShellCompletion --cmd cmctl \ + --bash <($out/bin/cmctl completion bash) \ + --fish <($out/bin/cmctl completion fish) \ + --zsh <($out/bin/cmctl completion zsh) + ''; + + meta = with lib; { + description = "A CLI tool for managing Cert-Manager service on Kubernetes clusters"; + downloadPage = "https://github.com/cert-manager/cert-manager"; + license = licenses.asl20; + homepage = "https://cert-manager.io/"; + maintainers = with maintainers; [ superherointj ]; + }; +} + diff --git a/nixpkgs/pkgs/applications/networking/cluster/driftctl/default.nix b/nixpkgs/pkgs/applications/networking/cluster/driftctl/default.nix index 212f15329213..725cd419d083 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/driftctl/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/driftctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "driftctl"; - version = "0.17"; + version = "0.20.0"; src = fetchFromGitHub { owner = "cloudskiff"; repo = "driftctl"; rev = "v${version}"; - sha256 = "sha256-JloeRoW+1tepSJzhcOQu38TDQfY10NtG2EyeVhP26BQ="; + sha256 = "sha256-8egkz1wXvdNoTkbhOdvoP4hrBPmuiUvd2QaD6tPH2xU="; }; - vendorSha256 = "sha256-aaJ5fpS+BiVq1K8OxN+/CBD96wy3flGDhch8O2ACIh8="; + vendorSha256 = "sha256-lftOTcob8l9dUZkH2MMxzD6FZzLOR/PXEXFVdOaguK4="; postUnpack = '' # Without this, tests fail to locate aws/3.19.0.json diff --git a/nixpkgs/pkgs/applications/networking/cluster/flink/default.nix b/nixpkgs/pkgs/applications/networking/cluster/flink/default.nix index 55f3e23ad6c3..36940d7441dc 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/flink/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/flink/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "flink"; - version = "1.14.0"; + version = "1.14.3"; src = fetchurl { url = "mirror://apache/flink/${pname}-${version}/${pname}-${version}-bin-scala_2.11.tgz"; - sha256 = "149b9ae774022acc0109dced893ca2d73430627a612be17ff12de8734464aff8"; + sha256 = "sha256-dst0Q1AlDdggtOwYROoV6QcBLRNfmGTo7DL2BV/5PB4="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/nixpkgs/pkgs/applications/networking/cluster/fluxcd/default.nix b/nixpkgs/pkgs/applications/networking/cluster/fluxcd/default.nix index 54eaf06e12fb..30a12281c872 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/fluxcd/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/fluxcd/default.nix @@ -1,9 +1,9 @@ { lib, buildGoModule, fetchFromGitHub, fetchzip, installShellFiles }: let - version = "0.24.1"; - sha256 = "18jzf5kd06c10f45y4crvaqa5r10dhq2ashlhppzrmhigiyavxac"; - manifestsSha256 = "0qbdik65irnwgw7klj5w0z00jxflm855gikpnqb9gsxd7rbw8ysk"; + version = "0.26.3"; + sha256 = "0j6zvcjykk775nnj8s0n5154lqslgfpi8884gh6sv204z2drfjff"; + manifestsSha256 = "1pfk0fj228zy0m1cz0400l4r41l7p0gsdq5lqnl3a8vgb4f6i41q"; manifests = fetchzip { url = @@ -23,7 +23,7 @@ in buildGoModule rec { inherit sha256; }; - vendorSha256 = "sha256-HoAVdY+kZLpUEl3mE7obbTzAJUyt5MBPjGhs6ZDSnzU="; + vendorSha256 = "sha256-34hSbOB7n9OFpVqe8y1+jAC3j0HEBg9LhYOvVGH9kLY="; postUnpack = '' cp -r ${manifests} source/cmd/flux/manifests diff --git a/nixpkgs/pkgs/applications/networking/cluster/fn-cli/default.nix b/nixpkgs/pkgs/applications/networking/cluster/fn-cli/default.nix index cb15d47e02d1..e86eeb94ff91 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/fn-cli/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/fn-cli/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "fn"; - version = "0.6.11"; + version = "0.6.13"; src = fetchFromGitHub { owner = "fnproject"; repo = "cli"; rev = version; - sha256 = "sha256-mBPRsLBIwahKm2RR22pNXxJhdLaWHCKx0TKc4H4YIVY="; + sha256 = "sha256-zynhDxhZEpLmO8Z8shU8DnJUJ+K0wmf8fkRjMMV35uE="; }; vendorSha256 = null; diff --git a/nixpkgs/pkgs/applications/networking/cluster/glooctl/default.nix b/nixpkgs/pkgs/applications/networking/cluster/glooctl/default.nix new file mode 100644 index 000000000000..49a53e84e25c --- /dev/null +++ b/nixpkgs/pkgs/applications/networking/cluster/glooctl/default.nix @@ -0,0 +1,36 @@ +{ lib, buildGoModule, fetchFromGitHub, installShellFiles }: + +buildGoModule rec { + pname = "glooctl"; + version = "1.10.8"; + + src = fetchFromGitHub { + owner = "solo-io"; + repo = "gloo"; + rev = "v${version}"; + sha256 = "sha256-D6UWwR+cs/pGLBOIky34g253xMxWygczbmjtg8ixNoQ="; + }; + + subPackages = [ "projects/gloo/cli/cmd" ]; + vendorSha256 = "sha256-6hmGtTNuuR4V0uMGEsOy6Iz/hhL8p1cn/4rEx4Uleug="; + + nativeBuildInputs = [ installShellFiles ]; + + postInstall = '' + mv $out/bin/cmd $out/bin/glooctl + + export HOME=$TMP + installShellCompletion --cmd glooctl \ + --bash <($out/bin/glooctl completion bash) \ + --zsh <($out/bin/glooctl completion zsh) + ''; + + ldflags = [ "-s" "-w" "-X github.com/solo-io/gloo/pkg/version.Version=${version}" ]; + + meta = with lib; { + description = "glooctl is the unified CLI for Gloo"; + homepage = "https://docs.solo.io/gloo-edge/latest/reference/cli/glooctl/"; + license = licenses.asl20; + maintainers = with maintainers; [ nelsonjeppesen ]; + }; +} diff --git a/nixpkgs/pkgs/applications/networking/cluster/helm-docs/default.nix b/nixpkgs/pkgs/applications/networking/cluster/helm-docs/default.nix index 7214530a046d..f7c05843bcfc 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/helm-docs/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/helm-docs/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "helm-docs"; - version = "1.5.0"; + version = "1.7.0"; src = fetchFromGitHub { owner = "norwoodj"; repo = "helm-docs"; rev = "v${version}"; - sha256 = "sha256-eyFuF03rqwfXyjEkqNRkjrJlHBazGYij1EtN0LAKdFk="; + sha256 = "sha256-TXwEVyRYRiVqCDL7IR+DIu1iKqaq81W5xkvz+laxVek="; }; - vendorSha256 = "sha256-aAn969C4UhFGu5/qXIG/rc1cErQIDtPwEA+f0d43y0w="; + vendorSha256 = "sha256-XTV0gyUWe6G5gxucsXOaDOUQoKMCfhrWzlKwUOaA6y4="; subPackages = [ "cmd/helm-docs" ]; ldflags = [ diff --git a/nixpkgs/pkgs/applications/networking/cluster/helm/chart-testing/default.nix b/nixpkgs/pkgs/applications/networking/cluster/helm/chart-testing/default.nix index c4365975713a..2f6dcbe01446 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/helm/chart-testing/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/helm/chart-testing/default.nix @@ -1,17 +1,17 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub, installShellFiles }: buildGoModule rec { pname = "chart-testing"; - version = "3.4.0"; + version = "3.5.0"; src = fetchFromGitHub { owner = "helm"; repo = pname; rev = "v${version}"; - sha256 = "sha256-c7Rjk2YZaQXyFwrDVwYgOCnq/F2ooIUVETXVn5FVlZE="; + sha256 = "sha256-lXi778MTeVUBtepGjIkKAX1kDEaaVzQI1gTKfcpANC0="; }; - vendorSha256 = "sha256-1Py66ljDjJC38biJ25D8KnWEi3nXAVt9QSgyH1KkwHM="; + vendorSha256 = "sha256-pNevyTibnhUK8LSM1lVnmumFazXK86q4AZ2WKFt5jok="; postPatch = '' substituteInPlace pkg/config/config.go \ @@ -26,9 +26,16 @@ buildGoModule rec { "-X github.com/helm/chart-testing/v3/ct/cmd.BuildDate=19700101-00:00:00" ]; + nativeBuildInputs = [ installShellFiles ]; + postInstall = '' install -Dm644 -t $out/etc/ct etc/chart_schema.yaml install -Dm644 -t $out/etc/ct etc/lintconf.yaml + + installShellCompletion --cmd ct \ + --bash <($out/bin/ct completion bash) \ + --zsh <($out/bin/ct completion zsh) \ + --fish <($out/bin/ct completion fish) \ ''; meta = with lib; { @@ -36,5 +43,6 @@ buildGoModule rec { homepage = "https://github.com/helm/chart-testing"; license = licenses.asl20; maintainers = with maintainers; [ atkinschang ]; + mainProgram = "ct"; }; } diff --git a/nixpkgs/pkgs/applications/networking/cluster/helm/default.nix b/nixpkgs/pkgs/applications/networking/cluster/helm/default.nix index 59d4a4ff7cee..42d2e63eaac5 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/helm/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/helm/default.nix @@ -2,22 +2,23 @@ buildGoModule rec { pname = "helm"; - version = "3.7.2"; - gitCommit = "663a896f4a815053445eec4153677ddc24a0a361"; + version = "3.8.0"; + gitCommit = "d14138609b01886f544b2025f5000351c9eb092e"; src = fetchFromGitHub { owner = "helm"; repo = "helm"; rev = "v${version}"; - sha256 = "sha256-MhBuwpgF1PBAZ5QwF7t4J1gqam2cMX+hkdZs7KoSD6I="; + sha256 = "sha256-/vxf3YfBP1WHFpqll6iq4m+X4NA16qHnuGA0wvrVRsg="; }; - vendorSha256 = "sha256-YDdpeVh9rG3MF1HgG7uuRvjXDr9Fcjuhrj16kpK8tsI="; + vendorSha256 = "sha256-M7XId+2HIh1mFzU54qQZEisWdVq67RlGJjlw+2dpiDc="; doCheck = false; subPackages = [ "cmd/helm" ]; ldflags = [ - "-w" "-s" + "-w" + "-s" "-X helm.sh/helm/v3/internal/version.version=v${version}" "-X helm.sh/helm/v3/internal/version.gitCommit=${gitCommit}" ]; diff --git a/nixpkgs/pkgs/applications/networking/cluster/helm/plugins/helm-diff.nix b/nixpkgs/pkgs/applications/networking/cluster/helm/plugins/helm-diff.nix index 3f340b0e5228..09de0219c7e8 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/helm/plugins/helm-diff.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/helm/plugins/helm-diff.nix @@ -28,7 +28,7 @@ buildGoModule rec { meta = with lib; { description = "A Helm plugin that shows a diff"; inherit (src.meta) homepage; - license = licenses.apsl20; + license = licenses.asl20; maintainers = with maintainers; [ yurrriq ]; }; } diff --git a/nixpkgs/pkgs/applications/networking/cluster/helm/plugins/helm-s3.nix b/nixpkgs/pkgs/applications/networking/cluster/helm/plugins/helm-s3.nix index 81e0d07d0bba..b6a47ec9dd5c 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/helm/plugins/helm-s3.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/helm/plugins/helm-s3.nix @@ -31,7 +31,7 @@ buildGoModule rec { meta = with lib; { description = "A Helm plugin that shows a diff"; inherit (src.meta) homepage; - license = licenses.apsl20; + license = licenses.mit; maintainers = with maintainers; [ yurrriq ]; }; } diff --git a/nixpkgs/pkgs/applications/networking/cluster/helm/plugins/helm-secrets.nix b/nixpkgs/pkgs/applications/networking/cluster/helm/plugins/helm-secrets.nix index cd1e6ece4377..a16472413f31 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/helm/plugins/helm-secrets.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/helm/plugins/helm-secrets.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A Helm plugin that helps manage secrets"; inherit (src.meta) homepage; - license = licenses.apsl20; + license = licenses.asl20; maintainers = with maintainers; [ yurrriq ]; platforms = platforms.all; }; diff --git a/nixpkgs/pkgs/applications/networking/cluster/helmfile/default.nix b/nixpkgs/pkgs/applications/networking/cluster/helmfile/default.nix index 59c3437383a1..1fde5343d29d 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/helmfile/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/helmfile/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "helmfile"; - version = "0.142.0"; + version = "0.143.0"; src = fetchFromGitHub { owner = "roboll"; repo = "helmfile"; rev = "v${version}"; - sha256 = "sha256-kz5U9MPpN+14Eb1D1hjwDfvTOygzg0unyIgrFTFhE0Q="; + sha256 = "sha256-3Kuj3umyD7fooa4alNJAm7Adu+7EQvoB7Gt/LRjgW94="; }; - vendorSha256 = "sha256-HKHMeDnIDmQ7AjuS2lYCMphTHGD1JgQuBYDJe2+PEk4="; + vendorSha256 = "sha256-/MbKYPcZ7cOPQKT+nYQaaCiahKLcesrSVKNo8hKFlf0="; doCheck = false; diff --git a/nixpkgs/pkgs/applications/networking/cluster/helmsman/default.nix b/nixpkgs/pkgs/applications/networking/cluster/helmsman/default.nix index 47da659d7e1f..e01f9c14a182 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/helmsman/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/helmsman/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "helmsman"; - version = "3.7.7"; + version = "3.8.1"; src = fetchFromGitHub { owner = "Praqma"; repo = "helmsman"; rev = "v${version}"; - sha256 = "sha256-duNkvRMq3CKAGDDsrDWKydFZRt6fxuO0uP2Ff3HA+ek="; + sha256 = "sha256-njo5LlowlgWFK5G2lpgi7hdxtnSs8f5cT0oHI7bJxNc="; }; - vendorSha256 = "sha256-4imZrZfpR/5tw9ZFSTr7Gx4G9O1iHNE9YRYMOJFKvHU="; + vendorSha256 = "sha256-F+b4EXAxa4+O6yepx+9eRrdq294ZcQ+sODFUCKYpSuo="; doCheck = false; diff --git a/nixpkgs/pkgs/applications/networking/cluster/istioctl/default.nix b/nixpkgs/pkgs/applications/networking/cluster/istioctl/default.nix index 1340133e7111..3d36a3210184 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/istioctl/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/istioctl/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "istioctl"; - version = "1.12.1"; + version = "1.13.0"; src = fetchFromGitHub { owner = "istio"; repo = "istio"; rev = version; - sha256 = "sha256-oMf60mxreBSlgxVInTFM8kozYVZz5RdgzV3rYUnadnA="; + sha256 = "sha256-f0e2jdiIMfakG97LqJCP5Jk41D93a6wxaChN7WwY5oA="; }; - vendorSha256 = "sha256-e8qh8J745TXUo6c1uMS8GyawEG9YFlMYl/nHpWIFK1Q="; + vendorSha256 = "sha256-gukwJp+qLbNJlBL5SemrVD6mExPnX0+19tbw/b4SJ8s="; doCheck = false; diff --git a/nixpkgs/pkgs/applications/networking/cluster/k0sctl/default.nix b/nixpkgs/pkgs/applications/networking/cluster/k0sctl/default.nix index 689922515de5..256d7e642255 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/k0sctl/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/k0sctl/default.nix @@ -14,7 +14,7 @@ buildGoModule rec { sha256 = "sha256-Fk1aYSa3LqzxiHtlzH5pcNtodOprjfnCFh4UMqCa6Rc="; }; - vendorSha256 = "sha256-N4cU9wzBRZn71mZHkNDXKgSXvlN2QFS6K4MtlR25DJc="; + vendorSha256 = "sha256-21C6wZ8lKQnbUg3aD0ZFVOgopblXyWk4WP/ubZVk3Yk="; ldflags = [ "-s" diff --git a/nixpkgs/pkgs/applications/networking/cluster/k3s/default.nix b/nixpkgs/pkgs/applications/networking/cluster/k3s/default.nix index f3b5e4cd70c9..5b5dfece1f1b 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/k3s/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/k3s/default.nix @@ -5,9 +5,11 @@ , iptables , iproute2 , bridge-utils +, btrfs-progs , conntrack-tools -, buildGoPackage +, buildGoModule , runc +, rsync , kmod , libseccomp , pkg-config @@ -18,6 +20,8 @@ , fetchzip , fetchgit , zstd +, yq-go +, nixosTests }: with lib; @@ -42,27 +46,58 @@ with lib; # Those pieces of software we entirely ignore upstream's handling of, and just # make sure they're in the path if desired. let - k3sVersion = "1.22.3+k3s1"; # k3s git tag - k3sCommit = "61a2aab25eeb97c26fa3f2b177e4355a7654c991"; # k3s git commit at the above version - k3sRepoSha256 = "0lz5hr3c86gxm9w5jy3g26n6a26m8k0y559hv6220rsi709j7ma9"; + k3sVersion = "1.23.3+k3s1"; # k3s git tag + k3sCommit = "6f4217a3405d16a1a51bbb40872d7dcb87207bb9"; # k3s git commit at the above version + k3sRepoSha256 = "sha256-0dRusG1vL+1KbmViIUNCZK1b+FEgV6otcVUyFonHmm4="; - traefikChartVersion = "10.3.0"; # taken from ./manifests/traefik.yaml at spec.version - traefikChartSha256 = "0y6wr64xp7bgx24kqil0x6myr3pnfrg8rw0d1h5zd2n5a8nfd73f"; + # taken from ./manifests/traefik.yaml, extracted from '.spec.chart' https://github.com/k3s-io/k3s/blob/v1.23.3%2Bk3s1/scripts/download#L9 + # The 'patch' and 'minor' versions are currently hardcoded as single digits only, so ignore the trailing two digits. Weird, I know. + traefikChartVersion = "10.9.1"; + traefikChartSha256 = "sha256-XM1DLofU1zEEFeB5bNQ7cgv102gXsToPP7SFh87QuGQ="; - k3sRootVersion = "0.9.1"; # taken from ./scripts/download at ROOT_VERSION + # taken from ./scripts/version.sh VERSION_ROOT https://github.com/k3s-io/k3s/blob/v1.23.3%2Bk3s1/scripts/version.sh#L47 + k3sRootVersion = "0.9.1"; k3sRootSha256 = "0r2cj4l50cxkrvszpzxfk36lvbjf9vcmp6d5lvxg8qsah8lki3x8"; - k3sCNIVersion = "0.9.1-k3s1"; # taken from ./scripts/version.sh at VERSION_CNIPLUGINS + # taken from ./scripts/version.sh VERSION_CNIPLUGINS https://github.com/k3s-io/k3s/blob/v1.23.3%2Bk3s1/scripts/version.sh#L45 + k3sCNIVersion = "0.9.1-k3s1"; k3sCNISha256 = "1327vmfph7b8i14q05c2xdfzk60caflg1zhycx0mrf3d59f4zsz5"; + # taken from go.mod, the 'github.com/containerd/containerd' line + # run `grep github.com/containerd/containerd go.mod | head -n1 | awk '{print $4}'` + containerdVersion = "v1.5.9-k3s1"; + containerdSha256 = "sha256-7xlhBA6KuwFlw+jyThygv4Ow9F3xjjIUtS6x8YHwjic="; + + # run `grep github.com/kubernetes-sigs/cri-tools go.mod | head -n1 | awk '{print $4}'` in the k3s repo at the tag + criCtlVersion = "v1.22.0-k3s1"; + baseMeta = { description = "A lightweight Kubernetes distribution"; license = licenses.asl20; homepage = "https://k3s.io"; - maintainers = with maintainers; [ euank ]; + maintainers = with maintainers; [ euank mic92 ]; platforms = platforms.linux; }; + # https://github.com/k3s-io/k3s/blob/5fb370e53e0014dc96183b8ecb2c25a61e891e76/scripts/build#L19-L40 + versionldflags = [ + "-X github.com/rancher/k3s/pkg/version.Version=v${k3sVersion}" + "-X github.com/rancher/k3s/pkg/version.GitCommit=${lib.substring 0 8 k3sCommit}" + "-X k8s.io/client-go/pkg/version.gitVersion=v${k3sVersion}" + "-X k8s.io/client-go/pkg/version.gitCommit=${k3sCommit}" + "-X k8s.io/client-go/pkg/version.gitTreeState=clean" + "-X k8s.io/client-go/pkg/version.buildDate=1970-01-01T01:01:01Z" + "-X k8s.io/component-base/version.gitVersion=v${k3sVersion}" + "-X k8s.io/component-base/version.gitCommit=${k3sCommit}" + "-X k8s.io/component-base/version.gitTreeState=clean" + "-X k8s.io/component-base/version.buildDate=1970-01-01T01:01:01Z" + "-X github.com/kubernetes-sigs/cri-tools/pkg/version.Version=${criCtlVersion}" + "-X github.com/containerd/containerd/version.Version=${containerdVersion}" + "-X github.com/containerd/containerd/version.Package=github.com/k3s-io/containerd" + "-X github.com/containerd/containerd/version.Version=${containerdVersion}" + "-X github.com/containerd/containerd/version.Package=github.com/k3s-io/containerd" + ]; + # bundled into the k3s binary traefikChart = fetchurl { url = "https://helm.traefik.io/traefik/traefik-${traefikChartVersion}.tgz"; @@ -83,11 +118,11 @@ let sha256 = k3sRootSha256; stripRoot = false; }; - k3sPlugins = buildGoPackage rec { - name = "k3s-cni-plugins"; + k3sCNIPlugins = buildGoModule rec { + pname = "k3s-cni-plugins"; version = k3sCNIVersion; + vendorSha256 = null; - goPackagePath = "github.com/containernetworking/plugins"; subPackages = [ "." ]; src = fetchFromGitHub { @@ -97,6 +132,10 @@ let sha256 = k3sCNISha256; }; + postInstall = '' + mv $out/bin/plugins $out/bin/cni + ''; + meta = baseMeta // { description = "CNI plugins, as patched by rancher for k3s"; }; @@ -123,50 +162,38 @@ let # Then, we bundle those binaries into our thick k3s binary and use that as # the final single output. # This approach was chosen because it ensures the bundled binaries all are - # correctly built to run with nix (we can lean on the existing buildGoPackage + # correctly built to run with nix (we can lean on the existing buildGoModule # stuff), and we can again lean on that tooling for the final k3s binary too. # Other alternatives would be to manually run the # strip/patchelf/remove-references step ourselves in the installPhase of the # derivation when we've built all the binaries, but haven't bundled them in # with generated bindata yet. - k3sBuildStage1 = buildGoPackage rec { - name = "k3s-build-1"; + k3sServer = buildGoModule rec { + pname = "k3s-server"; version = k3sVersion; - goPackagePath = "github.com/rancher/k3s"; - src = k3sRepo; - - # Patch build scripts so that we can use them. - # This makes things more dynamically linked (because nix can deal with - # dynamically linked dependencies just fine), removes the upload at the - # end, and skips building runc + cni, since we have our own derivations for - # those. - patches = [ ./patches/0002-Add-nixpkgs-patches.patch ]; + vendorSha256 = "sha256-9+2k/ipAOhc8JJU+L2dwaM01Dkw+0xyrF5kt6mL19G0="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ libseccomp ]; - # Versioning info for build script - DRONE_TAG = "v${version}"; - DRONE_COMMIT = k3sCommit; - - buildPhase = '' - pushd go/src/${goPackagePath} - - patchShebangs ./scripts/build ./scripts/version.sh - mkdir -p bin - ./scripts/build - - popd - ''; - - installPhase = '' - pushd go/src/${goPackagePath} - - mkdir -p "$out/bin" - install -m 0755 -t "$out/bin" ./bin/* - + subPackages = [ "cmd/server" ]; + ldflags = versionldflags; + + # create the multicall symlinks for k3s + postInstall = '' + mv $out/bin/server $out/bin/k3s + pushd $out + # taken verbatim from https://github.com/k3s-io/k3s/blob/v1.23.3%2Bk3s1/scripts/build#L105-L113 + ln -s k3s ./bin/k3s-agent + ln -s k3s ./bin/k3s-server + ln -s k3s ./bin/k3s-etcd-snapshot + ln -s k3s ./bin/k3s-secrets-encrypt + ln -s k3s ./bin/k3s-certificate + ln -s k3s ./bin/kubectl + ln -s k3s ./bin/crictl + ln -s k3s ./bin/ctr popd ''; @@ -174,76 +201,33 @@ let description = "The various binaries that get packaged into the final k3s binary"; }; }; - k3sBin = buildGoPackage rec { - name = "k3s-bin"; + k3sContainerd = buildGoModule { + pname = "k3s-containerd"; version = k3sVersion; - - goPackagePath = "github.com/rancher/k3s"; - - src = k3sRepo; - - # See the above comment in k3sBuildStage1 - patches = [ ./patches/0002-Add-nixpkgs-patches.patch ]; - - nativeBuildInputs = [ pkg-config zstd ]; - # These dependencies are embedded as compressed files in k3s at runtime. - # Propagate them to avoid broken runtime references to libraries. - propagatedBuildInputs = [ k3sPlugins k3sBuildStage1 runc ]; - - # k3s appends a suffix to the final distribution binary for some arches - archSuffix = - if stdenv.hostPlatform.system == "x86_64-linux" then "" - else if stdenv.hostPlatform.system == "aarch64-linux" then "-arm64" - else throw "k3s isn't being built for ${stdenv.hostPlatform.system} yet."; - - DRONE_TAG = "v${version}"; - DRONE_COMMIT = k3sCommit; - - # In order to build the thick k3s binary (which is what - # ./scripts/package-cli does), we need to get all the binaries that script - # expects in place. - buildPhase = '' - pushd go/src/${goPackagePath} - - patchShebangs ./scripts/build ./scripts/version.sh ./scripts/package-cli - - mkdir -p bin - - install -m 0755 -t ./bin ${k3sBuildStage1}/bin/* - install -m 0755 -T "${k3sPlugins}/bin/plugins" ./bin/cni - # Note: use the already-nixpkgs-bundled k3s rather than the one bundled - # in k3s because the k3s one is completely unmodified from upstream - # (unlike containerd, cni, etc) - install -m 0755 -T "${runc}/bin/runc" ./bin/runc - cp -R "${k3sRoot}/etc" ./etc - mkdir -p "build/static/charts" - cp "${traefikChart}" "build/static/charts/traefik-${traefikChartVersion}.tgz" - - ./scripts/package-cli - - popd - ''; - - installPhase = '' - pushd go/src/${goPackagePath} - - mkdir -p "$out/bin" - install -m 0755 -T ./dist/artifacts/k3s${archSuffix} "$out/bin/k3s" - - popd - ''; - - meta = baseMeta // { - description = "The k3s go binary which is used by the final wrapped output below"; + src = fetchFromGitHub { + owner = "k3s-io"; + repo = "containerd"; + rev = containerdVersion; + sha256 = containerdSha256; }; + vendorSha256 = null; + buildInputs = [ btrfs-progs ]; + subPackages = [ "cmd/containerd" "cmd/containerd-shim-runc-v2" ]; + ldflags = versionldflags; }; in -stdenv.mkDerivation rec { +buildGoModule rec { pname = "k3s"; version = k3sVersion; - # `src` here is a workaround for the updateScript bot. It couldn't be empty. - src = builtins.filterSource (path: type: false) ./.; + src = k3sRepo; + proxyVendor = true; + vendorSha256 = "sha256-8Yp9csyRNSYi9wo8E8mF8cu92wG1t3l18wJ8Y4L7HEA="; + + patches = [ + ./patches/0001-scrips-download-strip-downloading-just-package-CRD.patch + ./patches/0002-Don-t-build-a-static-binary-in-package-cli.patch + ]; # Important utilities used by the kubelet, see # https://github.com/kubernetes/kubernetes/issues/26093#issuecomment-237202494 @@ -259,35 +243,73 @@ stdenv.mkDerivation rec { conntrack-tools ]; - buildInputs = [ - k3sBin - ] ++ k3sRuntimeDeps; + buildInputs = k3sRuntimeDeps; - nativeBuildInputs = [ makeWrapper ]; + nativeBuildInputs = [ + makeWrapper + rsync + yq-go + zstd + ]; - unpackPhase = "true"; + # embedded in the final k3s cli + propagatedBuildInputs = [ + k3sCNIPlugins + k3sContainerd + k3sServer + runc + ]; + + # We override most of buildPhase due to peculiarities in k3s's build. + # Specifically, it has a 'go generate' which runs part of the package. See + # this comment: + # https://github.com/NixOS/nixpkgs/pull/158089#discussion_r799965694 + # So, why do we use buildGoModule at all? For the `vendorSha256` / `go mod download` stuff primarily. + buildPhase = '' + patchShebangs ./scripts/package-cli ./scripts/download ./scripts/build-upload + + # copy needed 'go generate' inputs into place + mkdir -p ./bin/aux + rsync -a --no-perms ${k3sServer}/bin/ ./bin/ + ln -vsf ${runc}/bin/runc ./bin/runc + ln -vsf ${k3sCNIPlugins}/bin/cni ./bin/cni + ln -vsf ${k3sContainerd}/bin/* ./bin/ + rsync -a --no-perms --chmod u=rwX ${k3sRoot}/etc/ ./etc/ + mkdir -p ./build/static/charts + # Note, upstream's chart has a 00 suffix. This seems to not matter though, so we're ignoring that naming detail. + export TRAEFIK_CHART_FILE=${traefikChart} + # place the traefik chart using their code since it's complicated + # We trim the actual download, see patches + ./scripts/download + + export ARCH=$GOARCH + export DRONE_TAG="v${k3sVersion}" + export DRONE_COMMIT="${k3sCommit}" + # use ./scripts/package-cli to run 'go generate' + 'go build' + + ./scripts/package-cli + mkdir -p $out/bin + ''; + + # Otherwise it depends on 'getGoDirs', which is normally set in buildPhase + doCheck = false; - # And, one final derivation (you thought the last one was it, right?) - # We got the binary we wanted above, but it doesn't have all the runtime - # dependencies k8s wants, including mount utilities for kubelet, networking - # tools for cni/kubelet stuff, etc - # Use a wrapper script to reference all the binaries that k3s tries to - # execute, but that we didn't bundle with it. installPhase = '' - runHook preInstall - mkdir -p "$out/bin" - makeWrapper ${k3sBin}/bin/k3s "$out/bin/k3s" \ + # wildcard to match the arm64 build too + install -m 0755 dist/artifacts/k3s* -D $out/bin/k3s + wrapProgram $out/bin/k3s \ --prefix PATH : ${lib.makeBinPath k3sRuntimeDeps} \ --prefix PATH : "$out/bin" - runHook postInstall ''; doInstallCheck = true; installCheckPhase = '' - $out/bin/k3s --version | grep v${k3sVersion} > /dev/null + $out/bin/k3s --version | grep -F "v${k3sVersion}" >/dev/null ''; passthru.updateScript = ./update.sh; + passthru.tests = { inherit (nixosTests) k3s-single-node k3s-single-node-docker; }; + meta = baseMeta; } diff --git a/nixpkgs/pkgs/applications/networking/cluster/k3s/patches/0001-scrips-download-strip-downloading-just-package-CRD.patch b/nixpkgs/pkgs/applications/networking/cluster/k3s/patches/0001-scrips-download-strip-downloading-just-package-CRD.patch new file mode 100644 index 000000000000..115fd6824772 --- /dev/null +++ b/nixpkgs/pkgs/applications/networking/cluster/k3s/patches/0001-scrips-download-strip-downloading-just-package-CRD.patch @@ -0,0 +1,41 @@ +From 6f53bd36a40da4c71486e3b79f6e32d53d6eea5d Mon Sep 17 00:00:00 2001 +From: Euan Kemp <euank@euank.com> +Date: Thu, 3 Feb 2022 23:50:40 -0800 +Subject: [PATCH 2/2] scrips/download: strip downloading, just package CRD + +The CRD packaging is a complicated set of commands, so let's reuse it. +--- + scripts/download | 10 ++-------- + 1 file changed, 2 insertions(+), 8 deletions(-) + +diff --git a/scripts/download b/scripts/download +index 5effc0562a..82361803ee 100755 +--- a/scripts/download ++++ b/scripts/download +@@ -24,12 +24,6 @@ rm -rf ${CONTAINERD_DIR} + mkdir -p ${CHARTS_DIR} + mkdir -p ${DATA_DIR} + +-curl --compressed -sfL https://github.com/k3s-io/k3s-root/releases/download/${VERSION_ROOT}/k3s-root-${ARCH}.tar | tar xf - --exclude=bin/socat +- +-git clone --single-branch --branch=${VERSION_RUNC} --depth=1 https://github.com/opencontainers/runc ${RUNC_DIR} +- +-git clone --single-branch --branch=${VERSION_CONTAINERD} --depth=1 https://github.com/k3s-io/containerd ${CONTAINERD_DIR} +- + setup_tmp() { + TMP_DIR=$(mktemp -d --tmpdir=${CHARTS_DIR}) + cleanup() { +@@ -44,8 +38,8 @@ setup_tmp() { + + download_and_package_traefik () { + echo "Downloading Traefik Helm chart from ${TRAEFIK_URL}" +- curl -sfL ${TRAEFIK_URL} -o ${TMP_DIR}/${TRAEFIK_FILE} +- code=$? ++ # nixpkgs: copy in our known traefik chart instead ++ cp $TRAEFIK_CHART_FILE ${TMP_DIR}/${TRAEFIK_FILE} + + if [ $code -ne 0 ]; then + echo "Error: Failed to download Traefik Helm chart!" +-- +2.34.1 + diff --git a/nixpkgs/pkgs/applications/networking/cluster/k3s/patches/0002-Add-nixpkgs-patches.patch b/nixpkgs/pkgs/applications/networking/cluster/k3s/patches/0002-Add-nixpkgs-patches.patch deleted file mode 100644 index dd26810a4563..000000000000 --- a/nixpkgs/pkgs/applications/networking/cluster/k3s/patches/0002-Add-nixpkgs-patches.patch +++ /dev/null @@ -1,81 +0,0 @@ --Subject: [PATCH 2/2] Add nixpkgs patches --Original patch by: Euan Kemp <euank@euank.com> --Adapted by: superherointj -- --This patch allows us to re-use upstream build scripts when building for nix. ----- -- 2 files changed: -- scripts/build -- scripts/package-cli -- -diff --git a/scripts/build b/scripts/build -index 2f3d1dc496..4f4e5aa897 100755 ---- a/scripts/build -+++ b/scripts/build -@@ -12,7 +12,8 @@ PKG_CONTAINERD="github.com/containerd/containerd" - PKG_K3S_CONTAINERD="github.com/k3s-io/containerd" - PKG_CRICTL="github.com/kubernetes-sigs/cri-tools" - --buildDate=$(date -u '+%Y-%m-%dT%H:%M:%SZ') -+# nixpkgs: deterministic build date -+buildDate="$(date -d "$(git log -1 --format=%ai)" -u "+%Y-%m-%dT%H:%M:%SZ")" - - VENDOR_PREFIX="${PKG}/vendor/" - VERSIONFLAGS=" -@@ -89,17 +90,7 @@ cleanup() { - } - - INSTALLBIN=$(pwd)/bin --if [ ! -x ${INSTALLBIN}/cni ]; then --( -- echo Building cni -- TMPDIR=$(mktemp -d) -- trap cleanup EXIT -- WORKDIR=$TMPDIR/src/github.com/containernetworking/plugins -- git clone -b $VERSION_CNIPLUGINS https://github.com/rancher/plugins.git $WORKDIR -- cd $WORKDIR -- GOPATH=$TMPDIR CGO_ENABLED=0 "${GO}" build -tags "$TAGS" -ldflags "$LDFLAGS $STATIC" -o $INSTALLBIN/cni --) --fi -+# nixpkgs: skip building cni, we build it separately - # echo Building agent - # CGO_ENABLED=1 "${GO}" build -tags "$TAGS" -ldflags "$VERSIONFLAGS $LDFLAGS $STATIC" -o bin/k3s-agent ./cmd/agent/main.go - echo Building server -@@ -116,10 +107,7 @@ ln -s containerd ./bin/ctr - #CGO_ENABLED=1 "${GO}" build -tags "$TAGS" -ldflags "$VERSIONFLAGS $LDFLAGS $STATIC_SQLITE" -o bin/ctr ./cmd/ctr/main.go - # echo Building containerd - # CGO_ENABLED=0 "${GO}" build -tags "$TAGS" -ldflags "$VERSIONFLAGS $LDFLAGS $STATIC" -o bin/containerd ./cmd/containerd/ --echo Building runc --rm -f ./build/src/github.com/opencontainers/runc/runc --make GOPATH=$(pwd)/build EXTRA_LDFLAGS="-w -s" BUILDTAGS="$RUNC_TAGS" -C ./build/src/github.com/opencontainers/runc $RUNC_STATIC --cp -f ./build/src/github.com/opencontainers/runc/runc ./bin/runc -+# nixpkgs: we build runc separately - - echo Building containerd-shim - rm -f ./vendor/github.com/containerd/containerd/bin/containerd-shim -diff --git a/scripts/package-cli b/scripts/package-cli -index ab4a6dac63..044b5587d0 100755 ---- a/scripts/package-cli -+++ b/scripts/package-cli -@@ -50,15 +50,17 @@ fi - - CMD_NAME=dist/artifacts/k3s${BIN_SUFFIX} - --"${GO}" generate -+CGO_ENABLED=0 env -u GOARCH "${GO}" generate - LDFLAGS=" - -X github.com/rancher/k3s/pkg/version.Version=$VERSION - -X github.com/rancher/k3s/pkg/version.GitCommit=${COMMIT:0:8} - -w -s - " --STATIC="-extldflags '-static'" --CGO_ENABLED=0 "${GO}" build -ldflags "$LDFLAGS $STATIC" -o ${CMD_NAME} ./cmd/k3s/main.go -+# STATIC="-extldflags '-static'" -+# nixpkgs: we can depend on dynamic linking because we have a good package manager -+"${GO}" build -ldflags "$LDFLAGS" -o ${CMD_NAME} ./cmd/k3s/main.go - - stat ${CMD_NAME} - --./scripts/build-upload ${CMD_NAME} ${COMMIT} -+# nixpkgs: skip uploading -+# ./scripts/build-upload ${CMD_NAME} ${COMMIT} diff --git a/nixpkgs/pkgs/applications/networking/cluster/k3s/patches/0002-Don-t-build-a-static-binary-in-package-cli.patch b/nixpkgs/pkgs/applications/networking/cluster/k3s/patches/0002-Don-t-build-a-static-binary-in-package-cli.patch new file mode 100644 index 000000000000..886b6ec7409b --- /dev/null +++ b/nixpkgs/pkgs/applications/networking/cluster/k3s/patches/0002-Don-t-build-a-static-binary-in-package-cli.patch @@ -0,0 +1,37 @@ +From 49c000c7c5dd7a502a2be4c638d2c32b65673c00 Mon Sep 17 00:00:00 2001 +From: Euan Kemp <euank@euank.com> +Date: Sun, 6 Feb 2022 23:13:00 -0800 +Subject: [PATCH] Don't build a static binary in package-cli + +since nixpkgs prefers dynamically linked binaries. + +Also remove "trimpath" for the 'go generate' step because the codegen +they use doesn't work with trimpath set. +--- + scripts/package-cli | 5 ++--- + 1 file changed, 2 insertions(+), 3 deletions(-) + +diff --git a/scripts/package-cli b/scripts/package-cli +index 28927327b7..95dbb469f1 100755 +--- a/scripts/package-cli ++++ b/scripts/package-cli +@@ -48,14 +48,13 @@ fi + + CMD_NAME=dist/artifacts/k3s${BIN_SUFFIX} + +-"${GO}" generate ++GOFLAGS="" "${GO}" generate + LDFLAGS=" + -X github.com/rancher/k3s/pkg/version.Version=$VERSION + -X github.com/rancher/k3s/pkg/version.GitCommit=${COMMIT:0:8} + -w -s + " +-STATIC="-extldflags '-static'" +-CGO_ENABLED=0 "${GO}" build -ldflags "$LDFLAGS $STATIC" -o ${CMD_NAME} ./cmd/k3s/main.go ++CGO_ENABLED=0 "${GO}" build -ldflags "$LDFLAGS" -o ${CMD_NAME} ./cmd/k3s/main.go + + stat ${CMD_NAME} + +-- +2.34.1 + diff --git a/nixpkgs/pkgs/applications/networking/cluster/k3sup/default.nix b/nixpkgs/pkgs/applications/networking/cluster/k3sup/default.nix new file mode 100644 index 000000000000..befec62fbc50 --- /dev/null +++ b/nixpkgs/pkgs/applications/networking/cluster/k3sup/default.nix @@ -0,0 +1,48 @@ +{ lib +, buildGoModule +, fetchFromGitHub +, makeWrapper +, bash +, openssh +}: + +buildGoModule rec { + pname = "k3sup"; + version = "0.11.3"; + + src = fetchFromGitHub { + owner = "alexellis"; + repo = "k3sup"; + rev = version; + sha256 = "sha256-6WYUmC2uVHFGLsfkA2EUOWmmo1dSKJzI4MEdRnlLgYY="; + }; + + nativeBuildInputs = [ makeWrapper ]; + + vendorSha256 = "sha256-Pd+BgPWoxf1AhP0o5SgFSvy4LyUQB7peKWJk0BMy7ds="; + + postConfigure = '' + substituteInPlace vendor/github.com/alexellis/go-execute/pkg/v1/exec.go \ + --replace "/bin/bash" "${bash}/bin/bash" + ''; + + CGO_ENABLED = 0; + + ldflags = [ + "-s" "-w" + "-X github.com/alexellis/k3sup/cmd.GitCommit=ref/tags/${version}" + "-X github.com/alexellis/k3sup/cmd.Version=${version}" + ]; + + postInstall = '' + wrapProgram "$out/bin/k3sup" \ + --prefix PATH : ${lib.makeBinPath [ openssh ]} + ''; + + meta = with lib; { + homepage = "https://github.com/alexellis/k3sup"; + description = "Bootstrap Kubernetes with k3s over SSH"; + license = licenses.mit; + maintainers = with maintainers; [ welteki ]; + }; +} diff --git a/nixpkgs/pkgs/applications/networking/cluster/k9s/default.nix b/nixpkgs/pkgs/applications/networking/cluster/k9s/default.nix index 27514303a15f..a844f2216754 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/k9s/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/k9s/default.nix @@ -17,7 +17,7 @@ buildGoModule rec { "-X github.com/derailed/k9s/cmd.commit=${src.rev}" ]; - vendorSha256 = "sha256-jWZ1N1A8VECBQvkXyuzMUkI4u2NLr5/gSvJUfK5VgzM="; + vendorSha256 = "sha256-mMob7M9RQlqaVK0DgHpaAK9d1btzfQetnliUqFTvjJQ="; preCheck = "export HOME=$(mktemp -d)"; diff --git a/nixpkgs/pkgs/applications/networking/cluster/kbst/default.nix b/nixpkgs/pkgs/applications/networking/cluster/kbst/default.nix index 3787c3462671..9a949bc8c800 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/kbst/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/kbst/default.nix @@ -34,7 +34,7 @@ buildGoModule rec { meta = with lib; { description = "Kubestack framework CLI"; homepage = "https://www.kubestack.com/"; - license = licenses.apsl20; + license = licenses.asl20; maintainers = with maintainers; [ mtrsk ]; }; } diff --git a/nixpkgs/pkgs/applications/networking/cluster/kconf/default.nix b/nixpkgs/pkgs/applications/networking/cluster/kconf/default.nix index 683a91ffee85..e549c8f09fb0 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/kconf/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/kconf/default.nix @@ -2,16 +2,20 @@ buildGoModule rec { pname = "kconf"; - version = "1.10.1"; + version = "1.11.0"; src = fetchFromGitHub { owner = "particledecay"; repo = "kconf"; rev = "v${version}"; - sha256 = "NlTpHQFOJJcIt/xMT3fvdrlxANyg//wtYMmXzEtaFXo="; + sha256 = "sha256-V+B1vqI/MLASqEy6DZiB71h7EkUfrxVKIMxriRK6pyY="; }; - vendorSha256 = "2d4o87wE9QZltk2YOHc20XVYF8n0EOrDf5mJ6i6EB0c="; + vendorSha256 = "sha256-Fq3V3vYaofB0TWt3t7uW1Dd7MlwMvh8RaRVpdq9XZh4="; + + ldflags = [ + "-s" "-w" "-X github.com/particledecay/kconf/build.Version=${version}" + ]; meta = with lib; { description = "An opinionated command line tool for managing multiple kubeconfigs"; diff --git a/nixpkgs/pkgs/applications/networking/cluster/kn/default.nix b/nixpkgs/pkgs/applications/networking/cluster/kn/default.nix index 796429f2a999..f492bfd6884c 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/kn/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/kn/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "kn"; - version = "1.1.0"; + version = "1.2.0"; src = fetchFromGitHub { owner = "knative"; repo = "client"; rev = "knative-v${version}"; - sha256 = "sha256-lRQ4IXV+q1idoTyhppJGlzjuUuRykP8DtQ3t/CsxhNw="; + sha256 = "sha256-yWzrMkkusRueHyWT4LwrflH4N7BNri2ycHIuAyvXceo="; }; vendorSha256 = null; diff --git a/nixpkgs/pkgs/applications/networking/cluster/krane/Gemfile.lock b/nixpkgs/pkgs/applications/networking/cluster/krane/Gemfile.lock index c2ef3e4b2510..1c1b8dc7b715 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/krane/Gemfile.lock +++ b/nixpkgs/pkgs/applications/networking/cluster/krane/Gemfile.lock @@ -1,41 +1,42 @@ GEM remote: https://rubygems.org/ specs: - activesupport (6.1.4.1) + activesupport (7.0.1) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 1.6, < 2) minitest (>= 5.1) tzinfo (~> 2.0) - zeitwerk (~> 2.3) addressable (2.8.0) public_suffix (>= 2.0.2, < 5.0) - cgi (0.3.1) colorize (0.8.1) concurrent-ruby (1.1.9) - date (3.2.2) domain_name (0.5.20190701) unf (>= 0.0.5, < 1.0.0) - ejson (1.3.0) - faraday (1.8.0) + ejson (1.3.1) + faraday (1.9.3) faraday-em_http (~> 1.0) faraday-em_synchrony (~> 1.0) faraday-excon (~> 1.1) - faraday-httpclient (~> 1.0.1) + faraday-httpclient (~> 1.0) + faraday-multipart (~> 1.0) faraday-net_http (~> 1.0) - faraday-net_http_persistent (~> 1.1) + faraday-net_http_persistent (~> 1.0) faraday-patron (~> 1.0) faraday-rack (~> 1.0) - multipart-post (>= 1.2, < 3) + faraday-retry (~> 1.0) ruby2_keywords (>= 0.0.4) faraday-em_http (1.0.0) faraday-em_synchrony (1.0.0) faraday-excon (1.1.0) faraday-httpclient (1.0.1) + faraday-multipart (1.0.3) + multipart-post (>= 1.2, < 3) faraday-net_http (1.0.1) faraday-net_http_persistent (1.2.0) faraday-patron (1.0.0) faraday-rack (1.0.0) - ffi (1.15.4) + faraday-retry (1.0.3) + ffi (1.15.5) ffi-compiler (1.0.1) ffi (>= 1.0.0) rake @@ -59,36 +60,34 @@ GEM ffi-compiler (>= 1.0, < 2.0) i18n (1.8.11) concurrent-ruby (~> 1.0) - jsonpath (0.9.9) + jsonpath (1.1.0) multi_json - to_regexp (~> 0.2.1) jwt (2.3.0) - krane (2.3.4) + krane (2.4.0) activesupport (>= 5.0) - cgi colorize (~> 0.8) concurrent-ruby (~> 1.1) - date ejson (~> 1.0) googleauth (~> 0.8) - jsonpath (~> 0.9.6) - kubeclient (~> 4.3) + jsonpath (~> 1.0) + kubeclient (~> 4.9) oj (~> 3.0) statsd-instrument (>= 2.8, < 4) thor (>= 1.0, < 2.0) - kubeclient (4.7.0) + kubeclient (4.9.2) http (>= 3.0, < 5.0) + jsonpath (~> 1.0) recursive-open-struct (~> 1.1, >= 1.1.1) rest-client (~> 2.0) memoist (0.16.2) mime-types (3.4.1) mime-types-data (~> 3.2015) - mime-types-data (3.2021.1115) - minitest (5.14.4) + mime-types-data (3.2022.0105) + minitest (5.15.0) multi_json (1.15.0) multipart-post (2.1.1) netrc (0.11.0) - oj (3.13.9) + oj (3.13.11) os (1.1.4) public_suffix (4.0.6) rake (13.0.6) @@ -105,14 +104,12 @@ GEM jwt (>= 1.5, < 3.0) multi_json (~> 1.10) statsd-instrument (3.1.2) - thor (1.1.0) - to_regexp (0.2.1) + thor (1.2.1) tzinfo (2.0.4) concurrent-ruby (~> 1.0) unf (0.1.4) unf_ext unf_ext (0.0.8) - zeitwerk (2.5.1) PLATFORMS ruby diff --git a/nixpkgs/pkgs/applications/networking/cluster/krane/default.nix b/nixpkgs/pkgs/applications/networking/cluster/krane/default.nix index 6d325d6f592e..cc9d19fd8152 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/krane/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/krane/default.nix @@ -1,7 +1,5 @@ { lib , bundlerApp -, makeWrapper -, kubectl , bundlerUpdateScript }: @@ -10,13 +8,6 @@ bundlerApp { gemdir = ./.; exes = [ "krane" ]; - buildInputs = [ makeWrapper ]; - - postBuild = '' - wrapProgram "$out/bin/krane" \ - --prefix PATH : ${lib.makeBinPath [ kubectl ]} - ''; - passthru.updateScript = bundlerUpdateScript "krane"; meta = with lib; { diff --git a/nixpkgs/pkgs/applications/networking/cluster/krane/gemset.nix b/nixpkgs/pkgs/applications/networking/cluster/krane/gemset.nix index 43bbe528cb69..e14b6902fe26 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/krane/gemset.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/krane/gemset.nix @@ -1,14 +1,14 @@ { activesupport = { - dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo" "zeitwerk"]; + dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "19gx1jcq46x9d1pi1w8xq0bgvvfw239y4lalr8asm291gj3q3ds4"; + sha256 = "02lys9pnb99hsczs551iqzjn008i8k7c728xxba7acfi9rdw9pa6"; type = "gem"; }; - version = "6.1.4.1"; + version = "7.0.1"; }; addressable = { dependencies = ["public_suffix"]; @@ -21,16 +21,6 @@ }; version = "2.8.0"; }; - cgi = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1vy8g58ns18x3dl566wg5rp4hymlx9584ddf75isdyig0yxjl0sn"; - type = "gem"; - }; - version = "0.3.1"; - }; colorize = { groups = ["default"]; platforms = []; @@ -51,16 +41,6 @@ }; version = "1.1.9"; }; - date = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0j1ghv5lqpn8jdvvci2fqvl30j4x31hhgzzc0mj54cga1sgh97n7"; - type = "gem"; - }; - version = "3.2.2"; - }; domain_name = { dependencies = ["unf"]; groups = ["default"]; @@ -77,21 +57,21 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "09584dhklhnxvgrf1b1lvb1illhzg79rsd9sgbpzrawiir789ksy"; + sha256 = "0gmfyyzzvb9k5nm1a5x83d7krajfghghfsakhxmdpvncyj2vnrpa"; type = "gem"; }; - version = "1.3.0"; + version = "1.3.1"; }; faraday = { - dependencies = ["faraday-em_http" "faraday-em_synchrony" "faraday-excon" "faraday-httpclient" "faraday-net_http" "faraday-net_http_persistent" "faraday-patron" "faraday-rack" "multipart-post" "ruby2_keywords"]; + dependencies = ["faraday-em_http" "faraday-em_synchrony" "faraday-excon" "faraday-httpclient" "faraday-multipart" "faraday-net_http" "faraday-net_http_persistent" "faraday-patron" "faraday-rack" "faraday-retry" "ruby2_keywords"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0afhlqgby2cizcwgh7h2sq5f77q01axjbdl25bsvfwsry9n7gyyi"; + sha256 = "0y32gj994ll3zlcqjmwp78r7s03iiwayij6fz2pjpkfywgvp71s6"; type = "gem"; }; - version = "1.8.0"; + version = "1.9.3"; }; faraday-em_http = { groups = ["default"]; @@ -133,6 +113,17 @@ }; version = "1.0.1"; }; + faraday-multipart = { + dependencies = ["multipart-post"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "03qfi9020ynf7hkdiaq01sd2mllvw7fg4qiin3pk028b4wv23j3j"; + type = "gem"; + }; + version = "1.0.3"; + }; faraday-net_http = { groups = ["default"]; platforms = []; @@ -173,15 +164,25 @@ }; version = "1.0.0"; }; + faraday-retry = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "153i967yrwnswqgvnnajgwp981k9p50ys1h80yz3q94rygs59ldd"; + type = "gem"; + }; + version = "1.0.3"; + }; ffi = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ssxcywmb3flxsjdg13is6k01807zgzasdhj4j48dm7ac59cmksn"; + sha256 = "1862ydmclzy1a0cjbvm8dz7847d9rch495ib0zb64y84d3xd4bkg"; type = "gem"; }; - version = "1.15.4"; + version = "1.15.5"; }; ffi-compiler = { dependencies = ["ffi" "rake"]; @@ -270,15 +271,15 @@ version = "1.8.11"; }; jsonpath = { - dependencies = ["multi_json" "to_regexp"]; + dependencies = ["multi_json"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1zim5bl7zsbccd502iy63f7c3b6dw0a820z7q8kpv66hncavb7gp"; + sha256 = "12hjsr0plnx6v0bh1rhhimfi7z3rqm19xb47ybdkc1h9yhynnmdq"; type = "gem"; }; - version = "0.9.9"; + version = "1.1.0"; }; jwt = { groups = ["default"]; @@ -291,26 +292,26 @@ version = "2.3.0"; }; krane = { - dependencies = ["activesupport" "cgi" "colorize" "concurrent-ruby" "date" "ejson" "googleauth" "jsonpath" "kubeclient" "oj" "statsd-instrument" "thor"]; + dependencies = ["activesupport" "colorize" "concurrent-ruby" "ejson" "googleauth" "jsonpath" "kubeclient" "oj" "statsd-instrument" "thor"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "07pij3z7kz7n0nvf8xwcaackck8wyjwldjva7215k2dm8csdzaih"; + sha256 = "1xnf0cw5i1i8l5nm1c9z02h184ad6hvy7fydr4bdzckjkyinamv9"; type = "gem"; }; - version = "2.3.4"; + version = "2.4.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 = "1k4w7h6fywhccv7fskwks9p71fvbh00qyvcx8cc4bnvwjn43680w"; + sha256 = "0kld1w4706dfd6jx3snsi4h2pvqfazz1fni5al2ln60s3b8sybq4"; type = "gem"; }; - version = "4.7.0"; + version = "4.9.2"; }; memoist = { groups = ["default"]; @@ -338,20 +339,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "03m3fkix2haah20kvh1jgv262yg9jlzn6wq0y31kafxk8fysfy27"; + sha256 = "003gd7mcay800k2q4pb2zn8lwwgci4bhi42v2jvlidm8ksx03i6q"; type = "gem"; }; - version = "3.2021.1115"; + version = "3.2022.0105"; }; minitest = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "19z7wkhg59y8abginfrm2wzplz7py3va8fyngiigngqvsws6cwgl"; + sha256 = "06xf558gid4w8lwx13jwfdafsch9maz8m0g85wnfymqj63x5nbbd"; type = "gem"; }; - version = "5.14.4"; + version = "5.15.0"; }; multi_json = { groups = ["default"]; @@ -388,10 +389,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1hcmczbp9afxijzg0gvp9milyzk15phfmbpmmsj5ppmziwkdls16"; + sha256 = "0bm8sdh7vz7ss3y21v961rd8nww23w5g4yhgvnd7jk331kdjyyzl"; type = "gem"; }; - version = "3.13.9"; + version = "3.13.11"; }; os = { groups = ["default"]; @@ -480,20 +481,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "18yhlvmfya23cs3pvhr1qy38y41b6mhr5q9vwv5lrgk16wmf3jna"; - type = "gem"; - }; - version = "1.1.0"; - }; - to_regexp = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1rgabfhnql6l4fx09mmj5d0vza924iczqf2blmn82l782b6qqi9v"; + sha256 = "0inl77jh4ia03jw3iqm5ipr76ghal3hyjrd6r8zqsswwvi9j2xdi"; type = "gem"; }; - version = "0.2.1"; + version = "1.2.1"; }; tzinfo = { dependencies = ["concurrent-ruby"]; @@ -527,14 +518,4 @@ }; version = "0.0.8"; }; - zeitwerk = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "18l4r6layck0d80ydc692mv1lxak5xbf6w2paj1x7m2ggbggzxgj"; - type = "gem"; - }; - version = "2.5.1"; - }; } diff --git a/nixpkgs/pkgs/applications/networking/cluster/kube-capacity/default.nix b/nixpkgs/pkgs/applications/networking/cluster/kube-capacity/default.nix index 9ab32c644747..0a2386d37cee 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/kube-capacity/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/kube-capacity/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "kube-capacity"; - version = "0.6.1"; + version = "0.7.0"; src = fetchFromGitHub { rev = "v${version}"; owner = "robscott"; repo = pname; - sha256 = "sha256-4UdNmuxJsPekA0y4mP302AYIFkG3ee3n99Redb/rPHw="; + sha256 = "sha256-jop1dn+D0A6BkR1UCMrU9qcbZ1AHVth430cTd+kUYJw="; }; - vendorSha256 = "sha256-PQlOuBqn+b7fO9eHgtTAKxo3YdWmgbxx2JomklttCrM="; + vendorSha256 = "sha256-PkCUwe3S1bq37ME2WyTUnwEcbnFcNI0eaI9yW/HZ1uw="; meta = with lib; { description = diff --git a/nixpkgs/pkgs/applications/networking/cluster/kube-score/default.nix b/nixpkgs/pkgs/applications/networking/cluster/kube-score/default.nix index 6ef24ded1a67..c1383e8688d1 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/kube-score/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/kube-score/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "kube-score"; - version = "1.13.0"; + version = "1.14.0"; src = fetchFromGitHub { owner = "zegl"; repo = pname; rev = "v${version}"; - sha256 = "sha256-QAtsXNmR+Sg9xmvP7x6b2jAJkUcL/sMYk8i5CSzjVos="; + sha256 = "sha256-6/+S1aj2qoUPz+6+8Z4Z5dpfyOi/DnrLLUpPgBn/OxU="; }; - vendorSha256 = "sha256-kPYvkovzQDmoB67TZHCKZ5jtW6pN3gHxBPKAU8prbgo="; + vendorSha256 = "sha256-0Zi62FmX4rFl3os2ehtussSSUPJtxLq7622CEdeKZCs="; meta = with lib; { description = "Kubernetes object analysis with recommendations for improved reliability and security"; diff --git a/nixpkgs/pkgs/applications/networking/cluster/kube3d/default.nix b/nixpkgs/pkgs/applications/networking/cluster/kube3d/default.nix index 861fa2eb97ef..0da63fae4215 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/kube3d/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/kube3d/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "kube3d"; - version = "5.2.1"; + version = "5.3.0"; src = fetchFromGitHub { owner = "rancher"; repo = "k3d"; rev = "v${version}"; - sha256 = "sha256-rKiOPpRupoCRtGJ3DVBUY9483EEBxaaECZRdWiyxaEk="; + sha256 = "sha256-ZuUjk1wb7iRZX+OpjLJHp1T0WYNjCHU6DpYF4V/heVc="; }; vendorSha256 = null; @@ -49,7 +49,7 @@ buildGoModule rec { multi-node k3s cluster on a single machine using docker. ''; license = licenses.mit; - maintainers = with maintainers; [ kuznero jlesquembre ngerstle jk ]; - platforms = platforms.linux; + maintainers = with maintainers; [ kuznero jlesquembre ngerstle jk ricochet ]; + platforms = platforms.linux ++ platforms.darwin; }; } diff --git a/nixpkgs/pkgs/applications/networking/cluster/kubebuilder/default.nix b/nixpkgs/pkgs/applications/networking/cluster/kubebuilder/default.nix index 02c1c834781a..1b1089f655cf 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/kubebuilder/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/kubebuilder/default.nix @@ -9,15 +9,15 @@ buildGoModule rec { pname = "kubebuilder"; - version = "3.2.0"; + version = "3.3.0"; src = fetchFromGitHub { owner = "kubernetes-sigs"; repo = "kubebuilder"; rev = "v${version}"; - sha256 = "sha256-V/g2RHnZPa/9hkVG5WVXmbx6hnJAwUEyyUX/Q3OR2DM="; + sha256 = "sha256-xLeS0vfYuLEdzuou67ViduaBf62+Yqk+scaCCK+Xetk="; }; - vendorSha256 = "sha256-bTCLuAo5xXNoafjGpjKLKlKVKB29PEFwdPu9+qjvufs="; + vendorSha256 = "sha256-zE/y9FAoUZBmWiUMWbc66CwkK0h7SEXzfZY3KkjtQ0A="; subPackages = ["cmd"]; diff --git a/nixpkgs/pkgs/applications/networking/cluster/kubectl-doctor/default.nix b/nixpkgs/pkgs/applications/networking/cluster/kubectl-doctor/default.nix index 5d056907264d..5e78cc9b72bd 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/kubectl-doctor/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/kubectl-doctor/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "kubectl-doctor"; - version = "0.3.0"; + version = "0.3.1"; src = fetchFromGitHub { owner = "emirozer"; repo = pname; rev = version; - sha256 = "0x784jbcwd34vzdnhg2yldh5ivkxvs2qlbsvaammbxkn04ch1ijz"; + sha256 = "sha256-yp5OfSDxIASiCgISUVNxfe3dsLukgIoHARVPALIaQfY="; }; - vendorSha256 = "04xq5kp1m7c98gb4fd0dni258vpfnhv535gl2qllfcp2mvk3mn55"; + vendorSha256 = "sha256-pdg65q7iMkcpFvSVUTa07m5URLQNNEfWQ4mdGu4suBM="; postInstall = '' mv $out/bin/{cmd,kubectl-doctor} diff --git a/nixpkgs/pkgs/applications/networking/cluster/kubectl-example/default.nix b/nixpkgs/pkgs/applications/networking/cluster/kubectl-example/default.nix index 228f12075c4e..ed74f2f102e9 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/kubectl-example/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/kubectl-example/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "kubectl-example"; - version = "1.0.1"; + version = "1.1.0"; src = fetchFromGitHub { owner = "seredot"; repo = pname; rev = "v${version}"; - sha256 = "18vp53cda93qjssxygwqp55yc80a93781839gf3138awngf731yq"; + sha256 = "sha256-7tqeIE6Ds8MrLH9k8cdzpeJP9pXVptduoEFE0zdrLlo="; }; vendorSha256 = null; diff --git a/nixpkgs/pkgs/applications/networking/cluster/kubedb-cli/default.nix b/nixpkgs/pkgs/applications/networking/cluster/kubedb-cli/default.nix index ee6a241a2304..8bfa519dee36 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/kubedb-cli/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/kubedb-cli/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "kubedb-cli"; - version = "0.24.0"; + version = "0.25.0"; src = fetchFromGitHub { owner = "kubedb"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-b5LbA2qEsEA7J0djEMhDeBY9iV1cvGVtxTlmneQGKYY="; + sha256 = "sha256-hRLju3nVLy0eDgqGeReHaF8p7oOlpo1T0IbLq4h/uwg="; }; vendorSha256 = null; diff --git a/nixpkgs/pkgs/applications/networking/cluster/kubelogin-oidc/default.nix b/nixpkgs/pkgs/applications/networking/cluster/kubelogin-oidc/default.nix index ce1974fe2148..953a202170a5 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/kubelogin-oidc/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/kubelogin-oidc/default.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "kubelogin"; - version = "1.25.0"; + version = "1.25.1"; src = fetchFromGitHub { owner = "int128"; repo = pname; rev = "v${version}"; - sha256 = "sha256-orclZtmkdplTRvYkN7VotbynSQ9L2kvAPqP20j8QJ2s="; + sha256 = "sha256-BKJ6dZMGW+Md+YUEEgWtPdfiFiOP5Nfb+awx8FXB+bM="; }; subPackages = ["."]; - vendorSha256 = "sha256-i46G0lsRvh/PmM+pMYuAjoLMHWF1Uzbd8+EkjIId8KE="; + vendorSha256 = "sha256-mu4NHeYZBM4C5qpj2wRTLsRNLDvZGNkppKGDw621mp4="; # Rename the binary instead of symlinking to avoid conflict with the # Azure version of kubelogin diff --git a/nixpkgs/pkgs/applications/networking/cluster/kubelogin/default.nix b/nixpkgs/pkgs/applications/networking/cluster/kubelogin/default.nix index d5f04c14d572..d2ad103eee9c 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/kubelogin/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/kubelogin/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "kubelogin"; - version = "0.0.10"; + version = "0.0.11"; src = fetchFromGitHub { owner = "Azure"; repo = pname; rev = "v${version}"; - sha256 = "sha256-YLYyU3k3I74ZuczFZBwcJoJSfCR4B9Z1EbFupA+xkiE="; + sha256 = "sha256-+u+75Z2Efaq16g7kGNq1GHavXwtKvNO6dytniUr8mlE="; }; vendorSha256 = "sha256-vJfTf9gD/qrsPAfJeMYLjGa90mYLOshgDehv2Fcl6xM="; diff --git a/nixpkgs/pkgs/applications/networking/cluster/kubeone/default.nix b/nixpkgs/pkgs/applications/networking/cluster/kubeone/default.nix index 2b9ca9df0494..e08a3b46d156 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/kubeone/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/kubeone/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "kubeone"; - version = "1.3.3"; + version = "1.4.0"; src = fetchFromGitHub { owner = "kubermatic"; repo = "kubeone"; rev = "v${version}"; - sha256 = "sha256-IgV1ULxwL17ECsm7MdRfQERcEVy9cEft2L7fHP3XCKo="; + sha256 = "sha256-uij5daVHKIfxx+8UTmU/HKSbf/RTRFuO8mCQdsC80qI="; }; - vendorSha256 = "sha256-/rhV7JHuqejCTizcjKIkaJlbRcx7AfMcGqQYo6dlg48="; + vendorSha256 = "sha256-kI5i1us3Ooh603HOz9Y+HlfPUy/1J8z89/jvKEenpLw="; nativeBuildInputs = [ installShellFiles diff --git a/nixpkgs/pkgs/applications/networking/cluster/kubergrunt/default.nix b/nixpkgs/pkgs/applications/networking/cluster/kubergrunt/default.nix index 4e945e456409..32130ee96d28 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/kubergrunt/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/kubergrunt/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "kubergrunt"; - version = "0.7.11"; + version = "0.8.0"; src = fetchFromGitHub { owner = "gruntwork-io"; repo = "kubergrunt"; rev = "v${version}"; - sha256 = "1224ssqdz9ak0vylyfbr9c2w0yfdp4hw9jh99qmfi2j5nhw9kzcc"; + sha256 = "sha256-K94cGU+cFHOrAGXjHQFFFJYhZi9zNfdlGy5eb2DkcV8="; }; vendorSha256 = "sha256-95rteSEMOBQnAw0QKuj5Yyi8n3xXGl0Tm97WiyTGxVw="; diff --git a/nixpkgs/pkgs/applications/networking/cluster/kubernetes/default.nix b/nixpkgs/pkgs/applications/networking/cluster/kubernetes/default.nix index 7adeed5ae126..7a708c5e061d 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/kubernetes/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/kubernetes/default.nix @@ -21,13 +21,13 @@ stdenv.mkDerivation rec { pname = "kubernetes"; - version = "1.22.4"; + version = "1.23.4"; src = fetchFromGitHub { owner = "kubernetes"; repo = "kubernetes"; rev = "v${version}"; - sha256 = "sha256-6ivBecOttzbX85+WCttaU5nXjaiEiKU8xRhnCPkjLXg="; + sha256 = "sha256-srJHW/wvrFKKgxVwJB4h0FGeaT7iSJYOTtSeTkcR3FE="; }; nativeBuildInputs = [ removeReferencesTo makeWrapper which go rsync installShellFiles ]; @@ -95,7 +95,7 @@ stdenv.mkDerivation rec { description = "Production-Grade Container Scheduling and Management"; license = licenses.asl20; homepage = "https://kubernetes.io"; - maintainers = with maintainers; [ johanot offline saschagrunert ]; + maintainers = with maintainers; [ ] ++ teams.kubernetes.members; platforms = platforms.unix; }; diff --git a/nixpkgs/pkgs/applications/networking/cluster/kubectl/default.nix b/nixpkgs/pkgs/applications/networking/cluster/kubernetes/kubectl.nix index fec93d8878e0..fec93d8878e0 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/kubectl/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/kubernetes/kubectl.nix diff --git a/nixpkgs/pkgs/applications/networking/cluster/kuma/default.nix b/nixpkgs/pkgs/applications/networking/cluster/kuma/default.nix index d7a58f09b4e7..b6d1ac477596 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/kuma/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/kuma/default.nix @@ -16,15 +16,15 @@ buildGoModule rec { inherit pname ; - version = "1.4.0"; + version = "1.4.1"; tags = lib.optionals enableGateway ["gateway"]; - vendorSha256 = "1fc5psvbd9bpc6c3y2cpx5dx8cgr2fcp7nln3kwfgbryahq2y8wl"; + vendorSha256 = "sha256-9v+ti/JTAF4TLZ0uvzFvrB0YBnRD2E0Q6K2yicEX3Zw="; src = fetchFromGitHub { owner = "kumahq"; repo = "kuma"; rev = version; - sha256 = "0agib3w5s270n5rhg54m3p4f21s5fhdrhaks374j7l21njs7xhqb"; + sha256 = "sha256-zx4rohkv6jm2abtd0I/uQMITkCuhY3StHMKoaTxce0Q="; }; doCheck = false; diff --git a/nixpkgs/pkgs/applications/networking/cluster/lens/default.nix b/nixpkgs/pkgs/applications/networking/cluster/lens/default.nix index 985ae1763236..66c507312c26 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/lens/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/lens/default.nix @@ -1,24 +1,29 @@ -{ lib, fetchurl, appimageTools }: +{ lib, fetchurl, appimageTools, wrapGAppsHook, gsettings-desktop-schemas, gtk3 }: let pname = "lens"; - version = "5.2.6"; - build = "${version}-latest.20211104.1"; + version = "5.3.4"; + build = "${version}-latest.20220120.1"; name = "${pname}-${version}"; src = fetchurl { url = "https://api.k8slens.dev/binaries/Lens-${build}.x86_64.AppImage"; - sha256 = "1lkxzgwrgafraimpnciv89fs6r399275vb73drxlg5z83acacf5z"; - name="${pname}.AppImage"; + sha256 = "sha256-9vRLQFSocVkHAfgwdKSPhSAO4G/v/ANd0WQmilcZiVw="; + name = "${pname}.AppImage"; }; appimageContents = appimageTools.extractType2 { inherit name src; }; -in appimageTools.wrapType2 { +in +appimageTools.wrapType2 { inherit name src; + profile = '' + export XDG_DATA_DIRS=${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}:${gtk3}/share/gsettings-schemas/${gtk3.name}:$XDG_DATA_DIRS + ''; + extraInstallCommands = '' mv $out/bin/${name} $out/bin/${pname} diff --git a/nixpkgs/pkgs/applications/networking/cluster/linkerd/edge.nix b/nixpkgs/pkgs/applications/networking/cluster/linkerd/edge.nix index 0af651246e5e..8c8a6d92930a 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/linkerd/edge.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/linkerd/edge.nix @@ -2,7 +2,7 @@ (callPackage ./generic.nix { }) { channel = "edge"; - version = "21.10.3"; - sha256 = "09k4c0dgn9vvgp6xb20x0vylk6bbd03srk3sra8vnpywwi591mcv"; - vendorSha256 = "sha256-J/+YFXHC6UTyhln2ZDEq/EyqMEP9XcNC4GRuJjGEY3g="; + version = "22.1.4"; + sha256 = "00r58k26qnxjsqjdcqz04p21c1vvw5ls485gad0pcny370wrp65n"; + vendorSha256 = "sha256-5vYf9/BCSHJ0iydKhz+9yDg0rRXpLd+j8uD8kcKhByc="; } diff --git a/nixpkgs/pkgs/applications/networking/cluster/minikube/default.nix b/nixpkgs/pkgs/applications/networking/cluster/minikube/default.nix index e06f486ddf67..9b40f636bcb8 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/minikube/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/minikube/default.nix @@ -11,9 +11,9 @@ buildGoModule rec { pname = "minikube"; - version = "1.24.0"; + version = "1.25.1"; - vendorSha256 = "sha256-I23T1eWPTU9QiIVI4qi5mkaS6CkeGbOHKTHwjCnKTIM="; + vendorSha256 = "sha256-MnyXePsnhb1Tl76uAtVW/DLacE0etXREGsapgNiZbMo="; doCheck = false; @@ -21,7 +21,7 @@ buildGoModule rec { owner = "kubernetes"; repo = "minikube"; rev = "v${version}"; - sha256 = "sha256-WW5VVjm7cq/3/RGiIE2nn8O+VK0RHCtKkrlboIzhqC4="; + sha256 = "sha256-pRNOVN9u27im9fkUawJYjuGHTW0N7L5oJa3fQ6DUO+4="; }; nativeBuildInputs = [ installShellFiles pkg-config which ]; diff --git a/nixpkgs/pkgs/applications/networking/cluster/nerdctl/default.nix b/nixpkgs/pkgs/applications/networking/cluster/nerdctl/default.nix index 7b7a7a40e2bc..9a3a5f3a3d5f 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/nerdctl/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/nerdctl/default.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "nerdctl"; - version = "0.15.0"; + version = "0.17.0"; src = fetchFromGitHub { owner = "containerd"; repo = pname; rev = "v${version}"; - sha256 = "sha256-LXXTzpG0UDSzEL6RdczvBZHlH5eJTkt7oc3wMFLO1JQ="; + sha256 = "sha256-6v4oZmP/FBtHAdnxnbd/HFZln2LGOVGtMc1GyRV2aqs="; }; - vendorSha256 = "sha256-jFTtg3p8nS8j267CZ+wuoynruwFTRamwkEpResQSMjk="; + vendorSha256 = "sha256-joCJ4acSmClBJLZkW8DFeb0oha1Zowcpoaw6Elu+HrY="; nativeBuildInputs = [ makeWrapper installShellFiles ]; diff --git a/nixpkgs/pkgs/applications/networking/cluster/nixops/poetry-git-overlay.nix b/nixpkgs/pkgs/applications/networking/cluster/nixops/poetry-git-overlay.nix index c05cf0038a3d..5a121cbd3ec8 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/nixops/poetry-git-overlay.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/nixops/poetry-git-overlay.nix @@ -5,8 +5,8 @@ self: super: { _: { src = pkgs.fetchgit { url = "https://github.com/NixOS/nixops.git"; - rev = "7ebdd8ace8d6bcefc18ee9e3e590f8bfa3368771"; - sha256 = "16pwxs5bca6cd83f0rs4sf5r8yf07wmha051waysmxs9xxl856yc"; + rev = "0c989d79c9052ebf52f12964131f4fc31ac20a18"; + sha256 = "07jz9grq3hjn1g9xybln5phbjhn2zsldcnan3lal6syzjggja6v1"; }; } ); diff --git a/nixpkgs/pkgs/applications/networking/cluster/nixops/poetry.lock b/nixpkgs/pkgs/applications/networking/cluster/nixops/poetry.lock index 413d440c8254..e0118fe79298 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/nixops/poetry.lock +++ b/nixpkgs/pkgs/applications/networking/cluster/nixops/poetry.lock @@ -38,14 +38,14 @@ python-versions = "*" [[package]] name = "boto3" -version = "1.20.8" +version = "1.20.20" description = "The AWS SDK for Python" category = "main" optional = false python-versions = ">= 3.6" [package.dependencies] -botocore = ">=1.23.8,<1.24.0" +botocore = ">=1.23.20,<1.24.0" jmespath = ">=0.7.1,<1.0.0" s3transfer = ">=0.5.0,<0.6.0" @@ -54,7 +54,7 @@ crt = ["botocore[crt] (>=1.21.0,<2.0a0)"] [[package]] name = "botocore" -version = "1.23.8" +version = "1.23.20" description = "Low-level, data-driven core of boto 3." category = "main" optional = false @@ -89,7 +89,7 @@ pycparser = "*" [[package]] name = "charset-normalizer" -version = "2.0.7" +version = "2.0.9" description = "The Real First Universal Charset Detector. Open, modern and actively maintained alternative to Chardet." category = "main" optional = false @@ -194,7 +194,7 @@ testing = ["coverage (<5)", "pytest (>=3.5,!=3.7.3)", "pytest-checkdocs (>=1.2.3 [[package]] name = "libvirt-python" -version = "7.9.0" +version = "7.10.0" description = "The libvirt virtualization API python binding" category = "main" optional = false @@ -227,7 +227,7 @@ typing-extensions = "^3.7.4" type = "git" url = "https://github.com/NixOS/nixops.git" reference = "master" -resolved_reference = "7ebdd8ace8d6bcefc18ee9e3e590f8bfa3368771" +resolved_reference = "0c989d79c9052ebf52f12964131f4fc31ac20a18" [[package]] name = "nixops-aws" @@ -643,7 +643,7 @@ test = ["pytest"] [[package]] name = "typeguard" -version = "2.13.0" +version = "2.13.2" description = "Run-time type checker for Python" category = "main" optional = false @@ -697,12 +697,12 @@ boto = [ {file = "boto-2.49.0.tar.gz", hash = "sha256:ea0d3b40a2d852767be77ca343b58a9e3a4b00d9db440efb8da74b4e58025e5a"}, ] boto3 = [ - {file = "boto3-1.20.8-py3-none-any.whl", hash = "sha256:c0ac23cc36dc484edd1edd28903b5712cb07507af1ae19b2e8d6db176416d9e2"}, - {file = "boto3-1.20.8.tar.gz", hash = "sha256:81ebdcabc534a52e2b7a2bfcbe1a1d7f1e34f028f7fe1cb16ccd80e34cea867a"}, + {file = "boto3-1.20.20-py3-none-any.whl", hash = "sha256:6c173ffaf0604e34d6865edf7a9a71e1b3e79bd441b8b465ca4b2d44f840806d"}, + {file = "boto3-1.20.20.tar.gz", hash = "sha256:2c5377b6ab74eeccccd16f0f21537ede87b05c8322b0ccc852a68f36ea6c16c9"}, ] botocore = [ - {file = "botocore-1.23.8-py3-none-any.whl", hash = "sha256:a0c7cfea155a0202ab197a016736dd4e6a26f9e416bdd9cdd2c9a3fb88ffa5a8"}, - {file = "botocore-1.23.8.tar.gz", hash = "sha256:ae4ed9666199020a9e53c3d3efc0a7d417315cd2313b70cb013282afe70ac358"}, + {file = "botocore-1.23.20-py3-none-any.whl", hash = "sha256:98275e47c941cada6507089ecfe91e420972209b1deeceaf55a89ea50d046347"}, + {file = "botocore-1.23.20.tar.gz", hash = "sha256:22e1c7b4b2b8b11d7001ca5ef2b41bda9a8be46fb3cb994a2948462666ac5ef1"}, ] certifi = [ {file = "certifi-2021.10.8-py2.py3-none-any.whl", hash = "sha256:d62a0163eb4c2344ac042ab2bdf75399a71a2d8c7d47eac2e2ee91b9d6339569"}, @@ -761,8 +761,8 @@ cffi = [ {file = "cffi-1.15.0.tar.gz", hash = "sha256:920f0d66a896c2d99f0adbb391f990a84091179542c205fa53ce5787aff87954"}, ] charset-normalizer = [ - {file = "charset-normalizer-2.0.7.tar.gz", hash = "sha256:e019de665e2bcf9c2b64e2e5aa025fa991da8720daa3c1138cadd2fd1856aed0"}, - {file = "charset_normalizer-2.0.7-py3-none-any.whl", hash = "sha256:f7af805c321bfa1ce6714c51f254e0d5bb5e5834039bc17db7ebe3a4cec9492b"}, + {file = "charset-normalizer-2.0.9.tar.gz", hash = "sha256:b0b883e8e874edfdece9c28f314e3dd5badf067342e42fb162203335ae61aa2c"}, + {file = "charset_normalizer-2.0.9-py3-none-any.whl", hash = "sha256:1eecaa09422db5be9e29d7fc65664e6c33bd06f9ced7838578ba40d58bdf3721"}, ] colorama = [ {file = "colorama-0.4.4-py2.py3-none-any.whl", hash = "sha256:9f47eda37229f68eee03b24b9748937c7dc3868f906e8ba69fbcbdd3bc5dc3e2"}, @@ -775,6 +775,8 @@ cryptography = [ {file = "cryptography-3.4.8-cp36-abi3-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:34dae04a0dce5730d8eb7894eab617d8a70d0c97da76b905de9efb7128ad7085"}, {file = "cryptography-3.4.8-cp36-abi3-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:1eb7bb0df6f6f583dd8e054689def236255161ebbcf62b226454ab9ec663746b"}, {file = "cryptography-3.4.8-cp36-abi3-manylinux_2_24_x86_64.whl", hash = "sha256:9965c46c674ba8cc572bc09a03f4c649292ee73e1b683adb1ce81e82e9a6a0fb"}, + {file = "cryptography-3.4.8-cp36-abi3-musllinux_1_1_aarch64.whl", hash = "sha256:3c4129fc3fdc0fa8e40861b5ac0c673315b3c902bbdc05fc176764815b43dd1d"}, + {file = "cryptography-3.4.8-cp36-abi3-musllinux_1_1_x86_64.whl", hash = "sha256:695104a9223a7239d155d7627ad912953b540929ef97ae0c34c7b8bf30857e89"}, {file = "cryptography-3.4.8-cp36-abi3-win32.whl", hash = "sha256:21ca464b3a4b8d8e86ba0ee5045e103a1fcfac3b39319727bc0fc58c09c6aff7"}, {file = "cryptography-3.4.8-cp36-abi3-win_amd64.whl", hash = "sha256:3520667fda779eb788ea00080124875be18f2d8f0848ec00733c0ec3bb8219fc"}, {file = "cryptography-3.4.8-pp36-pypy36_pp73-manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:d2a6e5ef66503da51d2110edf6c403dc6b494cc0082f85db12f54e9c5d4c3ec5"}, @@ -815,15 +817,31 @@ jsonpickle = [ {file = "jsonpickle-2.0.0.tar.gz", hash = "sha256:0be49cba80ea6f87a168aa8168d717d00c6ca07ba83df3cec32d3b30bfe6fb9a"}, ] libvirt-python = [ - {file = "libvirt-python-7.9.0.tar.gz", hash = "sha256:8535cffa5fbf05185648f9f57a2f71899c3bc12c897d320351c53725a48e5359"}, + {file = "libvirt-python-7.10.0.tar.gz", hash = "sha256:267774bbdf99d47515274542880499437dc94ae291771f5663c62020a62da975"}, ] markupsafe = [ + {file = "MarkupSafe-2.0.1-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:d8446c54dc28c01e5a2dbac5a25f071f6653e6e40f3a8818e8b45d790fe6ef53"}, + {file = "MarkupSafe-2.0.1-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:36bc903cbb393720fad60fc28c10de6acf10dc6cc883f3e24ee4012371399a38"}, + {file = "MarkupSafe-2.0.1-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:2d7d807855b419fc2ed3e631034685db6079889a1f01d5d9dac950f764da3dad"}, + {file = "MarkupSafe-2.0.1-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:add36cb2dbb8b736611303cd3bfcee00afd96471b09cda130da3581cbdc56a6d"}, + {file = "MarkupSafe-2.0.1-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:168cd0a3642de83558a5153c8bd34f175a9a6e7f6dc6384b9655d2697312a646"}, + {file = "MarkupSafe-2.0.1-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:4dc8f9fb58f7364b63fd9f85013b780ef83c11857ae79f2feda41e270468dd9b"}, + {file = "MarkupSafe-2.0.1-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:20dca64a3ef2d6e4d5d615a3fd418ad3bde77a47ec8a23d984a12b5b4c74491a"}, + {file = "MarkupSafe-2.0.1-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:cdfba22ea2f0029c9261a4bd07e830a8da012291fbe44dc794e488b6c9bb353a"}, + {file = "MarkupSafe-2.0.1-cp310-cp310-win32.whl", hash = "sha256:99df47edb6bda1249d3e80fdabb1dab8c08ef3975f69aed437cb69d0a5de1e28"}, + {file = "MarkupSafe-2.0.1-cp310-cp310-win_amd64.whl", hash = "sha256:e0f138900af21926a02425cf736db95be9f4af72ba1bb21453432a07f6082134"}, {file = "MarkupSafe-2.0.1-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:f9081981fe268bd86831e5c75f7de206ef275defcb82bc70740ae6dc507aee51"}, {file = "MarkupSafe-2.0.1-cp36-cp36m-manylinux1_i686.whl", hash = "sha256:0955295dd5eec6cb6cc2fe1698f4c6d84af2e92de33fbcac4111913cd100a6ff"}, {file = "MarkupSafe-2.0.1-cp36-cp36m-manylinux1_x86_64.whl", hash = "sha256:0446679737af14f45767963a1a9ef7620189912317d095f2d9ffa183a4d25d2b"}, {file = "MarkupSafe-2.0.1-cp36-cp36m-manylinux2010_i686.whl", hash = "sha256:f826e31d18b516f653fe296d967d700fddad5901ae07c622bb3705955e1faa94"}, {file = "MarkupSafe-2.0.1-cp36-cp36m-manylinux2010_x86_64.whl", hash = "sha256:fa130dd50c57d53368c9d59395cb5526eda596d3ffe36666cd81a44d56e48872"}, {file = "MarkupSafe-2.0.1-cp36-cp36m-manylinux2014_aarch64.whl", hash = "sha256:905fec760bd2fa1388bb5b489ee8ee5f7291d692638ea5f67982d968366bef9f"}, + {file = "MarkupSafe-2.0.1-cp36-cp36m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:bf5d821ffabf0ef3533c39c518f3357b171a1651c1ff6827325e4489b0e46c3c"}, + {file = "MarkupSafe-2.0.1-cp36-cp36m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:0d4b31cc67ab36e3392bbf3862cfbadac3db12bdd8b02a2731f509ed5b829724"}, + {file = "MarkupSafe-2.0.1-cp36-cp36m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:baa1a4e8f868845af802979fcdbf0bb11f94f1cb7ced4c4b8a351bb60d108145"}, + {file = "MarkupSafe-2.0.1-cp36-cp36m-musllinux_1_1_aarch64.whl", hash = "sha256:deb993cacb280823246a026e3b2d81c493c53de6acfd5e6bfe31ab3402bb37dd"}, + {file = "MarkupSafe-2.0.1-cp36-cp36m-musllinux_1_1_i686.whl", hash = "sha256:63f3268ba69ace99cab4e3e3b5840b03340efed0948ab8f78d2fd87ee5442a4f"}, + {file = "MarkupSafe-2.0.1-cp36-cp36m-musllinux_1_1_x86_64.whl", hash = "sha256:8d206346619592c6200148b01a2142798c989edcb9c896f9ac9722a99d4e77e6"}, {file = "MarkupSafe-2.0.1-cp36-cp36m-win32.whl", hash = "sha256:6c4ca60fa24e85fe25b912b01e62cb969d69a23a5d5867682dd3e80b5b02581d"}, {file = "MarkupSafe-2.0.1-cp36-cp36m-win_amd64.whl", hash = "sha256:b2f4bf27480f5e5e8ce285a8c8fd176c0b03e93dcc6646477d4630e83440c6a9"}, {file = "MarkupSafe-2.0.1-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:0717a7390a68be14b8c793ba258e075c6f4ca819f15edfc2a3a027c823718567"}, @@ -832,14 +850,27 @@ markupsafe = [ {file = "MarkupSafe-2.0.1-cp37-cp37m-manylinux2010_i686.whl", hash = "sha256:d7f9850398e85aba693bb640262d3611788b1f29a79f0c93c565694658f4071f"}, {file = "MarkupSafe-2.0.1-cp37-cp37m-manylinux2010_x86_64.whl", hash = "sha256:6a7fae0dd14cf60ad5ff42baa2e95727c3d81ded453457771d02b7d2b3f9c0c2"}, {file = "MarkupSafe-2.0.1-cp37-cp37m-manylinux2014_aarch64.whl", hash = "sha256:b7f2d075102dc8c794cbde1947378051c4e5180d52d276987b8d28a3bd58c17d"}, + {file = "MarkupSafe-2.0.1-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:e9936f0b261d4df76ad22f8fee3ae83b60d7c3e871292cd42f40b81b70afae85"}, + {file = "MarkupSafe-2.0.1-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:2a7d351cbd8cfeb19ca00de495e224dea7e7d919659c2841bbb7f420ad03e2d6"}, + {file = "MarkupSafe-2.0.1-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:60bf42e36abfaf9aff1f50f52644b336d4f0a3fd6d8a60ca0d054ac9f713a864"}, + {file = "MarkupSafe-2.0.1-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:d6c7ebd4e944c85e2c3421e612a7057a2f48d478d79e61800d81468a8d842207"}, + {file = "MarkupSafe-2.0.1-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:f0567c4dc99f264f49fe27da5f735f414c4e7e7dd850cfd8e69f0862d7c74ea9"}, + {file = "MarkupSafe-2.0.1-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:89c687013cb1cd489a0f0ac24febe8c7a666e6e221b783e53ac50ebf68e45d86"}, {file = "MarkupSafe-2.0.1-cp37-cp37m-win32.whl", hash = "sha256:a30e67a65b53ea0a5e62fe23682cfe22712e01f453b95233b25502f7c61cb415"}, {file = "MarkupSafe-2.0.1-cp37-cp37m-win_amd64.whl", hash = "sha256:611d1ad9a4288cf3e3c16014564df047fe08410e628f89805e475368bd304914"}, + {file = "MarkupSafe-2.0.1-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:5bb28c636d87e840583ee3adeb78172efc47c8b26127267f54a9c0ec251d41a9"}, {file = "MarkupSafe-2.0.1-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:be98f628055368795d818ebf93da628541e10b75b41c559fdf36d104c5787066"}, {file = "MarkupSafe-2.0.1-cp38-cp38-manylinux1_i686.whl", hash = "sha256:1d609f577dc6e1aa17d746f8bd3c31aa4d258f4070d61b2aa5c4166c1539de35"}, {file = "MarkupSafe-2.0.1-cp38-cp38-manylinux1_x86_64.whl", hash = "sha256:7d91275b0245b1da4d4cfa07e0faedd5b0812efc15b702576d103293e252af1b"}, {file = "MarkupSafe-2.0.1-cp38-cp38-manylinux2010_i686.whl", hash = "sha256:01a9b8ea66f1658938f65b93a85ebe8bc016e6769611be228d797c9d998dd298"}, {file = "MarkupSafe-2.0.1-cp38-cp38-manylinux2010_x86_64.whl", hash = "sha256:47ab1e7b91c098ab893b828deafa1203de86d0bc6ab587b160f78fe6c4011f75"}, {file = "MarkupSafe-2.0.1-cp38-cp38-manylinux2014_aarch64.whl", hash = "sha256:97383d78eb34da7e1fa37dd273c20ad4320929af65d156e35a5e2d89566d9dfb"}, + {file = "MarkupSafe-2.0.1-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:6fcf051089389abe060c9cd7caa212c707e58153afa2c649f00346ce6d260f1b"}, + {file = "MarkupSafe-2.0.1-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:5855f8438a7d1d458206a2466bf82b0f104a3724bf96a1c781ab731e4201731a"}, + {file = "MarkupSafe-2.0.1-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:3dd007d54ee88b46be476e293f48c85048603f5f516008bee124ddd891398ed6"}, + {file = "MarkupSafe-2.0.1-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:aca6377c0cb8a8253e493c6b451565ac77e98c2951c45f913e0b52facdcff83f"}, + {file = "MarkupSafe-2.0.1-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:04635854b943835a6ea959e948d19dcd311762c5c0c6e1f0e16ee57022669194"}, + {file = "MarkupSafe-2.0.1-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:6300b8454aa6930a24b9618fbb54b5a68135092bc666f7b06901f897fa5c2fee"}, {file = "MarkupSafe-2.0.1-cp38-cp38-win32.whl", hash = "sha256:023cb26ec21ece8dc3907c0e8320058b2e0cb3c55cf9564da612bc325bed5e64"}, {file = "MarkupSafe-2.0.1-cp38-cp38-win_amd64.whl", hash = "sha256:984d76483eb32f1bcb536dc27e4ad56bba4baa70be32fa87152832cdd9db0833"}, {file = "MarkupSafe-2.0.1-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:2ef54abee730b502252bcdf31b10dacb0a416229b72c18b19e24a4509f273d26"}, @@ -849,6 +880,12 @@ markupsafe = [ {file = "MarkupSafe-2.0.1-cp39-cp39-manylinux2010_i686.whl", hash = "sha256:4efca8f86c54b22348a5467704e3fec767b2db12fc39c6d963168ab1d3fc9135"}, {file = "MarkupSafe-2.0.1-cp39-cp39-manylinux2010_x86_64.whl", hash = "sha256:ab3ef638ace319fa26553db0624c4699e31a28bb2a835c5faca8f8acf6a5a902"}, {file = "MarkupSafe-2.0.1-cp39-cp39-manylinux2014_aarch64.whl", hash = "sha256:f8ba0e8349a38d3001fae7eadded3f6606f0da5d748ee53cc1dab1d6527b9509"}, + {file = "MarkupSafe-2.0.1-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:c47adbc92fc1bb2b3274c4b3a43ae0e4573d9fbff4f54cd484555edbf030baf1"}, + {file = "MarkupSafe-2.0.1-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:37205cac2a79194e3750b0af2a5720d95f786a55ce7df90c3af697bfa100eaac"}, + {file = "MarkupSafe-2.0.1-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:1f2ade76b9903f39aa442b4aadd2177decb66525062db244b35d71d0ee8599b6"}, + {file = "MarkupSafe-2.0.1-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:4296f2b1ce8c86a6aea78613c34bb1a672ea0e3de9c6ba08a960efe0b0a09047"}, + {file = "MarkupSafe-2.0.1-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:9f02365d4e99430a12647f09b6cc8bab61a6564363f313126f775eb4f6ef798e"}, + {file = "MarkupSafe-2.0.1-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:5b6d930f030f8ed98e3e6c98ffa0652bdb82601e7a016ec2ab5d7ff23baa78d1"}, {file = "MarkupSafe-2.0.1-cp39-cp39-win32.whl", hash = "sha256:10f82115e21dc0dfec9ab5c0223652f7197feb168c940f3ef61563fc2d6beb74"}, {file = "MarkupSafe-2.0.1-cp39-cp39-win_amd64.whl", hash = "sha256:693ce3f9e70a6cf7d2fb9e6c9d8b204b6b39897a2c4a1aa65728d5ac97dcc1d8"}, {file = "MarkupSafe-2.0.1.tar.gz", hash = "sha256:594c67807fb16238b30c44bdf74f36c02cdf22d1c8cda91ef8a0ed8dabf5620a"}, @@ -945,8 +982,8 @@ sphinxcontrib-serializinghtml = [ {file = "sphinxcontrib_serializinghtml-1.1.5-py2.py3-none-any.whl", hash = "sha256:352a9a00ae864471d3a7ead8d7d79f5fc0b57e8b3f95e9867eb9eb28999b92fd"}, ] typeguard = [ - {file = "typeguard-2.13.0-py3-none-any.whl", hash = "sha256:0bc44d1ff865b522eda969627868b0e001c8329296ce50aededbea03febc79ee"}, - {file = "typeguard-2.13.0.tar.gz", hash = "sha256:04e38f92eb59410c9375d3be23df65e0a7643f2e8bcbd421423d808d2f9e99df"}, + {file = "typeguard-2.13.2-py3-none-any.whl", hash = "sha256:4f7da3d80dda5e42d6973f11f33da3542b8bf86edc12ba926b2dbad62adf3fcf"}, + {file = "typeguard-2.13.2.tar.gz", hash = "sha256:7e50071590ab997509aa0977609eb5cf9d73d84c1f416cb4fab78b77a9d15326"}, ] typing-extensions = [ {file = "typing_extensions-3.10.0.2-py2-none-any.whl", hash = "sha256:d8226d10bc02a29bcc81df19a26e56a9647f8b0a6d4a83924139f4a8b01f17b7"}, diff --git a/nixpkgs/pkgs/applications/networking/cluster/nomad-autoscaler/default.nix b/nixpkgs/pkgs/applications/networking/cluster/nomad-autoscaler/default.nix index cfa86ea2dcaf..4bdaf7690869 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/nomad-autoscaler/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/nomad-autoscaler/default.nix @@ -1,9 +1,9 @@ -{ lib, fetchFromGitHub, buildGoModule, go, removeReferencesTo, buildEnv }: +{ lib, fetchFromGitHub, buildGoModule, buildEnv }: let package = buildGoModule rec { pname = "nomad-autoscaler"; - version = "0.3.4"; + version = "0.3.5"; outputs = [ "out" @@ -25,26 +25,24 @@ let owner = "hashicorp"; repo = "nomad-autoscaler"; rev = "v${version}"; - sha256 = "sha256-SmlcQH+K/axl6Gj+bX0Quk6K/usP0c1hWnIdFjS1dn8="; + sha256 = "sha256-2d36ddAjbt+nPmsHawgMq1CnKB2VNv8yMKMrPx5L+yw="; }; - vendorSha256 = "sha256-tO8vi9jBV6rVcGk/OoaXzpnQi4yPdozYZZwAMFCz2+c="; + vendorSha256 = "sha256-g3INNvAQ124kBJSe5cnsIq1y8sWpPYKLwJONgbIUaoM="; - subPackages = [ "." ]; - - nativeBuildInputs = [ removeReferencesTo ]; - - # buildGoModule overrides normal buildPhase, can't use makeTargets - postBuild = '' + buildPhase = '' + runHook preBuild make build plugins + runHook postBuild ''; # tries to pull tests from network, and fails silently anyway doCheck = false; - postInstall = '' - mkdir -p $bin/bin - mv $out/bin/nomad-autoscaler $bin/bin/nomad-autoscaler + installPhase = '' + runHook preInstall + mkdir -p $bin/bin $out/bin + mv bin/nomad-autoscaler $bin/bin ln -s $bin/bin/nomad-autoscaler $out/bin/nomad-autoscaler for d in $outputs; do @@ -54,7 +52,6 @@ let # have out contain all of the plugins for plugin in bin/plugins/*; do - remove-references-to -t ${go} "$plugin" cp "$plugin" $out/share/ done @@ -73,6 +70,7 @@ let mv bin/plugins/prometheus $prometheus/share/ mv bin/plugins/target-value $target_value/share/ mv bin/plugins/threshold $threshold/share/ + runHook postInstall ''; # make toggle-able, so that overrided versions can disable this check if diff --git a/nixpkgs/pkgs/applications/networking/cluster/nomad-pack/default.nix b/nixpkgs/pkgs/applications/networking/cluster/nomad-pack/default.nix new file mode 100644 index 000000000000..93d1d3badad2 --- /dev/null +++ b/nixpkgs/pkgs/applications/networking/cluster/nomad-pack/default.nix @@ -0,0 +1,38 @@ +{ lib +, fetchFromGitHub +, buildGoModule +}: + +buildGoModule rec { + pname = "nomad-pack"; + version = "2022-02-11"; + rev = "568ac5e42bc41172a1fa3c8b18af2f42b9e341ff"; + + src = fetchFromGitHub { + owner = "hashicorp"; + repo = pname; + inherit rev; + sha256 = "sha256-0hvnGdUT72sWvMER67ZBxcC+VTbuFMIos2NudOjeTB8="; + }; + + vendorSha256 = "sha256-wmoXZIogKj4i9+AsEjY7QaT2Tn4LQyGQcEFHrRO0W9s="; + + # skip running go tests as they require network access + doCheck = false; + + doInstallCheck = true; + installCheckPhase = '' + runHook preInstallCheck + $out/bin/nomad-pack --version + runHook postInstallCheck + ''; + + meta = with lib; { + homepage = "https://github.com/hashicorp/nomad-pack"; + changelog = "https://github.com/hashicorp/nomad-pack/blob/main/CHANGELOG.md"; + description = "Nomad Pack is a templating and packaging tool used with HashiCorp Nomad."; + license = licenses.mpl20; + maintainers = with maintainers; [ techknowlogick ]; + }; + +} diff --git a/nixpkgs/pkgs/applications/networking/cluster/nomad/1.0.nix b/nixpkgs/pkgs/applications/networking/cluster/nomad/1.0.nix deleted file mode 100644 index 079c957ebb0f..000000000000 --- a/nixpkgs/pkgs/applications/networking/cluster/nomad/1.0.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ callPackage -, buildGoPackage -, nvidia_x11 -, nvidiaGpuSupport -}: - -callPackage ./generic.nix { - inherit buildGoPackage nvidia_x11 nvidiaGpuSupport; - version = "1.0.13"; - sha256 = "19wlma2y8lpb7p01wb0l20rb6nvrvldz0mm3qfisx33y56ykjyh8"; -} diff --git a/nixpkgs/pkgs/applications/networking/cluster/nomad/1.1.nix b/nixpkgs/pkgs/applications/networking/cluster/nomad/1.1.nix index 5a3e964ad5f8..750e49fc1e18 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/nomad/1.1.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/nomad/1.1.nix @@ -4,7 +4,7 @@ , nvidiaGpuSupport }: -callPackage ./genericModule.nix { +callPackage ./generic.nix { inherit buildGoModule nvidia_x11 nvidiaGpuSupport; version = "1.1.8"; sha256 = "05k1r157h3jaqzzsrkgc96zcny3mi8dvixc2v1w0lwcxixqk0y2l"; diff --git a/nixpkgs/pkgs/applications/networking/cluster/nomad/1.2.nix b/nixpkgs/pkgs/applications/networking/cluster/nomad/1.2.nix new file mode 100644 index 000000000000..81a31de7e506 --- /dev/null +++ b/nixpkgs/pkgs/applications/networking/cluster/nomad/1.2.nix @@ -0,0 +1,12 @@ +{ callPackage +, buildGoModule +, nvidia_x11 +, nvidiaGpuSupport +}: + +callPackage ./generic.nix { + inherit buildGoModule nvidia_x11 nvidiaGpuSupport; + version = "1.2.6"; + sha256 = "1ik8v1jznky9y4m85bzxgyba256zqmm5fs6d5xsvp5rzcylcdwgd"; + vendorSha256 = "1mbvpssf7haaxzx6ka9qzixm49jck8i89w8ymkaddgmxhlbxjv05"; +} diff --git a/nixpkgs/pkgs/applications/networking/cluster/nomad/generic.nix b/nixpkgs/pkgs/applications/networking/cluster/nomad/generic.nix index 586308dd424f..180cf48e3fb1 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/nomad/generic.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/nomad/generic.nix @@ -1,27 +1,30 @@ { lib -, buildGoPackage +, buildGoModule , fetchFromGitHub , version , sha256 +, vendorSha256 , nvidiaGpuSupport , patchelf , nvidia_x11 +, nixosTests }: -buildGoPackage rec { +buildGoModule rec { pname = "nomad"; inherit version; - rev = "v${version}"; - goPackagePath = "github.com/hashicorp/nomad"; subPackages = [ "." ]; src = fetchFromGitHub { owner = "hashicorp"; repo = pname; - inherit rev sha256; + rev = "v${version}"; + inherit sha256; }; + inherit vendorSha256; + nativeBuildInputs = lib.optionals nvidiaGpuSupport [ patchelf ]; @@ -39,11 +42,13 @@ buildGoPackage rec { done ''; + passthru.tests.nomad = nixosTests.nomad; + meta = with lib; { homepage = "https://www.nomadproject.io/"; description = "A Distributed, Highly Available, Datacenter-Aware Scheduler"; platforms = platforms.unix; license = licenses.mpl20; - maintainers = with maintainers; [ rushmorem pradeepchhetri endocrimes maxeaubrey ]; + maintainers = with maintainers; [ rushmorem pradeepchhetri endocrimes maxeaubrey techknowlogick ]; }; } diff --git a/nixpkgs/pkgs/applications/networking/cluster/nomad/genericModule.nix b/nixpkgs/pkgs/applications/networking/cluster/nomad/genericModule.nix deleted file mode 100644 index c2e657317533..000000000000 --- a/nixpkgs/pkgs/applications/networking/cluster/nomad/genericModule.nix +++ /dev/null @@ -1,54 +0,0 @@ -{ lib -, buildGoModule -, fetchFromGitHub -, version -, sha256 -, vendorSha256 -, nvidiaGpuSupport -, patchelf -, nvidia_x11 -, nixosTests -}: - -buildGoModule rec { - pname = "nomad"; - inherit version; - - subPackages = [ "." ]; - - src = fetchFromGitHub { - owner = "hashicorp"; - repo = pname; - rev = "v${version}"; - inherit sha256; - }; - - inherit vendorSha256; - - nativeBuildInputs = lib.optionals nvidiaGpuSupport [ - patchelf - ]; - - # ui: - # Nomad release commits include the compiled version of the UI, but the file - # is only included if we build with the ui tag. - tags = [ "ui" ] ++ lib.optional (!nvidiaGpuSupport) "nonvidia"; - - # The dependency on NVML isn't explicit. We have to make it so otherwise the - # binary will not know where to look for the relevant symbols. - postFixup = lib.optionalString nvidiaGpuSupport '' - for bin in $out/bin/*; do - patchelf --add-needed "${nvidia_x11}/lib/libnvidia-ml.so" "$bin" - done - ''; - - passthru.tests.nomad = nixosTests.nomad; - - meta = with lib; { - homepage = "https://www.nomadproject.io/"; - description = "A Distributed, Highly Available, Datacenter-Aware Scheduler"; - platforms = platforms.unix; - license = licenses.mpl20; - maintainers = with maintainers; [ rushmorem pradeepchhetri endocrimes maxeaubrey ]; - }; -} diff --git a/nixpkgs/pkgs/applications/networking/cluster/qbec/default.nix b/nixpkgs/pkgs/applications/networking/cluster/qbec/default.nix index a83bf805d876..3d34a65e2926 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/qbec/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/qbec/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "qbec"; - version = "0.14.8"; + version = "0.15.1"; src = fetchFromGitHub { owner = "splunk"; repo = "qbec"; rev = "v${version}"; - sha256 = "sha256-awuYmazBx7zv/WuDsePzdWNRcpAzLK7lf4L2W2Jbt3A="; + sha256 = "sha256-cXU+LnOCsGg+iwH5c7cKVi2Htw45AGxyjJFKXKbTkUo="; }; - vendorSha256 = "sha256-VOBRQJzATaY9DNRhZvYTRpoISikbzUAwS/1hUfce/44="; + vendorSha256 = "sha256-CiVAzFN/ygIiyhZKYtJ197TZO3ppL/emWSj4hAlIanc="; doCheck = false; diff --git a/nixpkgs/pkgs/applications/networking/cluster/sonobuoy/default.nix b/nixpkgs/pkgs/applications/networking/cluster/sonobuoy/default.nix index c256f23dbc9c..cb0e9adaf262 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/sonobuoy/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/sonobuoy/default.nix @@ -1,11 +1,11 @@ { lib, buildGoModule, fetchFromGitHub }: # SHA of ${version} for the tool's help output. Unfortunately this is needed in build flags. -let rev = "237bd35906f5c4bed1f4de4aa58cc6a6a676d4fd"; +let rev = "6cf7519717a14c9a3e495fcd4588fa4eb16d2be2"; in buildGoModule rec { pname = "sonobuoy"; - version = "0.55.1"; # Do not forget to update `rev` above + version = "0.56.2"; # Do not forget to update `rev` above ldflags = let t = "github.com/vmware-tanzu/sonobuoy"; @@ -20,10 +20,10 @@ buildGoModule rec { owner = "vmware-tanzu"; repo = "sonobuoy"; rev = "v${version}"; - sha256 = "sha256-pHpnh+6O9yjnDA8u0jyLvqNQbXC+xz8fRn47aQNdOAo="; + sha256 = "sha256-KYpBubNHAstKUtf9Ys4VCWyZ+y4HjzVMs9EtWzVFviQ="; }; - vendorSha256 = "sha256-jPKCWTFABKRZCg6X5VVdrmOU/ZFc7yGD7R8RJrpcITg="; + vendorSha256 = "sha256-qKXm39CwrTcXENIMh2BBS3MUlhJvmTTA3UzZNpF0PCc="; subPackages = [ "." ]; diff --git a/nixpkgs/pkgs/applications/networking/cluster/ssm-session-manager-plugin/default.nix b/nixpkgs/pkgs/applications/networking/cluster/ssm-session-manager-plugin/default.nix index b5c732282b9a..f7401d36b0ea 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/ssm-session-manager-plugin/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/ssm-session-manager-plugin/default.nix @@ -19,8 +19,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoPatchelfHook ] ++ (if stdenv.isDarwin then [ unzip ] else [ dpkg ]); - buildInputs = [ awscli ]; - unpackPhase = if stdenv.isDarwin then "unzip $src" else "dpkg-deb -x $src ."; installPhase = '' diff --git a/nixpkgs/pkgs/applications/networking/cluster/starboard/default.nix b/nixpkgs/pkgs/applications/networking/cluster/starboard/default.nix index 6c22203eaaf1..30ca2ee1cdee 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/starboard/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/starboard/default.nix @@ -1,20 +1,32 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub, installShellFiles }: buildGoModule rec { pname = "starboard"; - version = "0.12.0"; + version = "0.14.1"; src = fetchFromGitHub { owner = "aquasecurity"; repo = pname; rev = "v${version}"; - sha256 = "sha256-6QIQsxqTKERo5x2Knv4IBeNt5KjvfoW0ryFJLlALqrA="; + sha256 = "sha256-sB7C0IKadgpQ2h6HuH4D6ku/GXnFfFS+fGCW/RBSc10="; + # populate values that require us to use git. By doing this in postFetch we + # can delete .git afterwards and maintain better reproducibility of the src. + leaveDotGit = true; + postFetch = '' + cd "$out" + commit="$(git rev-parse HEAD)" + source_date_epoch=$(git log --date=format:'%Y-%m-%dT%H:%M:%SZ' -1 --pretty=%ad) + substituteInPlace "$out/cmd/starboard/main.go" \ + --replace 'commit = "none"' "commit = \"$commit\"" \ + --replace 'date = "unknown"' "date = \"$source_date_epoch\"" + find "$out" -name .git -print0 | xargs -0 rm -rf + ''; }; + vendorSha256 = "sha256-R7tF724y5WNIByE+9nRoNSZDZzfLtPfK/9tSBkARaN0="; - vendorSha256 = "sha256-r6wMSeW5Et6hYwoEKufmcOmucuHlYuBDOMuXXMT4W2Y="; + nativeBuildInputs = [ installShellFiles ]; - # Don't build and check the integration tests - excludedPackages = "itest"; + subPackages = [ "cmd/starboard" ]; ldflags = [ "-s" "-w" "-X main.version=v${version}" @@ -23,6 +35,20 @@ buildGoModule rec { preCheck = '' # Remove test that requires networking rm pkg/plugin/aqua/client/client_integration_test.go + + # Feed in all but the integration tests for testing + # This is because subPackages above limits what is built to just what we + # want but also limits the tests + getGoDirs() { + go list ./... | grep -v itest + } + ''; + + postInstall = '' + installShellCompletion --cmd starboard \ + --bash <($out/bin/starboard completion bash) \ + --fish <($out/bin/starboard completion fish) \ + --zsh <($out/bin/starboard completion zsh) ''; doInstallCheck = true; diff --git a/nixpkgs/pkgs/applications/networking/cluster/stern/default.nix b/nixpkgs/pkgs/applications/networking/cluster/stern/default.nix index 959c40637fbe..19184ac15ae8 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/stern/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/stern/default.nix @@ -4,16 +4,16 @@ let isCrossBuild = stdenv.hostPlatform != stdenv.buildPlatform; in buildGoModule rec { pname = "stern"; - version = "1.20.1"; + version = "1.21.0"; src = fetchFromGitHub { owner = "stern"; repo = "stern"; rev = "v${version}"; - sha256 = "sha256-JredVk2hjnhoaJ9bT7D5k35skBNjcEBLa6GgO8dB2+U="; + sha256 = "sha256-+V0mRSjAwhZoiIS/OpZyqa5rvlqU9pGJwmW0QZ3H2g4="; }; - vendorSha256 = "sha256-ybsDB54kkbONi3b9URtNUusHIdUfzymOpYlNHJz4i2A="; + vendorSha256 = "sha256-IPHu23/2e6406FELB1Mwegp0C16cFD65mbW5Ah32D4Q="; subPackages = [ "." ]; diff --git a/nixpkgs/pkgs/applications/networking/cluster/talosctl/default.nix b/nixpkgs/pkgs/applications/networking/cluster/talosctl/default.nix new file mode 100644 index 000000000000..8613abd99470 --- /dev/null +++ b/nixpkgs/pkgs/applications/networking/cluster/talosctl/default.nix @@ -0,0 +1,58 @@ +{ lib, buildGoModule, fetchFromGitHub, installShellFiles }: +let + # look for GO_LDFLAGS getting set in the Makefile + version = "0.14.2"; + sha256 = "sha256-sQtry94T5cDO+836D/p/8ptQi3WYKDBLr1QZyEXdLQI="; + vendorSha256 = "sha256-cd2iNMxWmkSWqqkPLYocUG+fCUXoeUXEuGQxjUWQnXk="; + pkgsVersion = "0.9.0-4-gc875fbe"; + extrasVersion = "0.7.0-2-gb4c9d21"; +in +buildGoModule rec { + pname = "talosctl"; + inherit version vendorSha256; + # nixpkgs-update: no auto update + + src = fetchFromGitHub { + owner = "talos-systems"; + repo = "talos"; + rev = "v${version}"; + inherit sha256; + }; + + ldflags = + let + versionPkg = "github.com/talos-systems/talos/pkg/version"; # VERSION_PKG + imagesPkgs = "github.com/talos-systems/talos/pkg/images"; # IMAGES_PKGS + mgmtHelpersPkg = "github.com/talos-systems/talos/cmd/talosctl/pkg/mgmt/helpers"; #MGMT_HELPERS_PKG + in + [ + "-X ${versionPkg}.Name=Talos" + "-X ${versionPkg}.SHA=${src.rev}" # should be the hash, but as we build from tags, this needs to do + "-X ${versionPkg}.Tag=${src.rev}" + "-X ${versionPkg}.PkgsVersion=v${pkgsVersion}" # PKGS + "-X ${versionPkg}.ExtrasVersion=v${extrasVersion}" # EXTRAS + "-X ${imagesPkgs}.Username=talos-systems" # USERNAME + "-X ${imagesPkgs}.Registry=ghcr.io" # REGISTRY + "-X ${mgmtHelpersPkg}.ArtifactsPath=_out" # ARTIFACTS + ]; + + subPackages = [ "cmd/talosctl" ]; + + nativeBuildInputs = [ installShellFiles ]; + + postInstall = '' + installShellCompletion --cmd talosctl \ + --bash <($out/bin/talosctl completion bash) \ + --fish <($out/bin/talosctl completion fish) \ + --zsh <($out/bin/talosctl completion zsh) + ''; + + doCheck = false; + + meta = with lib; { + description = "A CLI for out-of-band management of Kubernetes nodes created by Talos"; + homepage = "https://github.com/talos-systems/talos"; + license = licenses.mpl20; + maintainers = with maintainers; [ flokli ]; + }; +} diff --git a/nixpkgs/pkgs/applications/networking/cluster/tanka/default.nix b/nixpkgs/pkgs/applications/networking/cluster/tanka/default.nix index e1ea0a690c95..0d21e440031d 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/tanka/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/tanka/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "tanka"; - version = "0.17.3"; + version = "0.20.0"; src = fetchFromGitHub { owner = "grafana"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Khu6ovtcXkqqt3W4OoJ09INgv80tw/6uDcJS+jt3y0Y="; + sha256 = "sha256-Wtfn9ffUNKuwByRbeCYq27xvr2DuzxSSQMH9Sv5a7rU="; }; - vendorSha256 = "sha256-vpm2y/CxRNWkz6+AOMmmZH5AjRQWAa6WD5Fnx5lqJYw="; + vendorSha256 = "sha256-ed6rC+wrZHDViGfJrSBl5VUqX/o6RKytXbTKqxb3ZtU="; doCheck = false; diff --git a/nixpkgs/pkgs/applications/networking/cluster/tektoncd-cli/default.nix b/nixpkgs/pkgs/applications/networking/cluster/tektoncd-cli/default.nix index 0db134bdb215..9f3c046a266a 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/tektoncd-cli/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/tektoncd-cli/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "tektoncd-cli"; - version = "0.20.0"; + version = "0.22.0"; src = fetchFromGitHub { owner = "tektoncd"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-aVR1xNmL6M/m+1znt70vrCtuABCqDz0sDp8mDFI2uIg="; + sha256 = "sha256-AmJN7hnYuhxYNG/qs7yv3phhffYKVaM8f7irhi9wRfA="; }; vendorSha256 = null; @@ -22,10 +22,14 @@ buildGoModule rec { excludedPackages = "\\(third_party\\|cmd/docs\\)"; preCheck = '' - # Some tests try to write to the home dir + # some tests try to write to the home dir export HOME="$TMPDIR" - # Change the golden files to match our desired version - sed -i "s/dev/${version}/" pkg/cmd/version/testdata/{TestGetVersions-,TestGetComponentVersions/}*.golden + + # the tests expect the clientVersion ldflag not to be set + unset ldflags + + # remove tests with networking + rm pkg/cmd/version/version_test.go ''; postInstall = '' diff --git a/nixpkgs/pkgs/applications/networking/cluster/temporal/default.nix b/nixpkgs/pkgs/applications/networking/cluster/temporal/default.nix index a03f69a9fc0a..2475dd0f1d94 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/temporal/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/temporal/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "temporal"; - version = "1.12.0"; + version = "1.15.0"; src = fetchFromGitHub { owner = "temporalio"; repo = "temporal"; rev = "v${version}"; - sha256 = "1gdks7pzaqrsdihh2m3v597x0dw2qww95jlznj0h112jgicanimj"; + sha256 = "sha256-5Tu838086qgIa2fqda2xi7vn4JbkENVJH4XU3NwW7Ic="; }; - vendorSha256 = "sha256-dGmd6tCUKoK4uwhB5kXGOpXemtLn0VssabDE4iQWEAw="; + vendorSha256 = "sha256-caRBgkuHQ38r6OsKQCJ2pxAe8s6mc4g/QCIsCEXvY3M="; # Errors: # > === RUN TestNamespaceHandlerGlobalNamespaceDisabledSuite @@ -22,9 +22,10 @@ buildGoModule rec { runHook preInstall mkdir -p $out/bin install -Dm755 "$GOPATH/bin/cli" -T $out/bin/tctl - install -Dm755 "$GOPATH/bin/cassandra" -T $out/bin/temporal-cassandra + install -Dm755 "$GOPATH/bin/authorization" -T $out/bin/tctl-authorization-plugin install -Dm755 "$GOPATH/bin/server" -T $out/bin/temporal-server - install -Dm755 "$GOPATH/bin/sql" -T $out/bin/temporal-sql + install -Dm755 "$GOPATH/bin/cassandra" -T $out/bin/temporal-cassandra-tool + install -Dm755 "$GOPATH/bin/sql" -T $out/bin/temporal-sql-tool runHook postInstall ''; @@ -35,9 +36,9 @@ buildGoModule rec { meta = with lib; { description = "A microservice orchestration platform which enables developers to build scalable applications without sacrificing productivity or reliability"; - downloadPage = "https://github.com/temporalio/temporal"; homepage = "https://temporal.io"; + changelog = "https://github.com/temporalio/temporal/releases/tag/v${version}"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ titanous ]; }; } diff --git a/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/default.nix b/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/default.nix index 5a546851caa4..93be46bc7927 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/default.nix @@ -1,98 +1,108 @@ { lib , buildGoModule -, buildGoPackage , fetchFromGitHub , callPackage , config + +, cdrtools # libvirt }: let - list = lib.importJSON ./providers.json; + # Our generic constructor to build new providers. + # + # Is designed to combine with the terraform.withPlugins implementation. + mkProvider = lib.makeOverridable + ({ owner + , repo + , rev + , version + , sha256 + , vendorSha256 ? throw "vendorSha256 missing: please use `buildGoModule`" /* added 2022/01 */ + , deleteVendor ? false + , proxyVendor ? false + , # Looks like "registry.terraform.io/vancluever/acme" + provider-source-address + }@attrs: + buildGoModule { + pname = repo; + inherit vendorSha256 version deleteVendor proxyVendor; + subPackages = [ "." ]; + doCheck = false; + # https://github.com/hashicorp/terraform-provider-scaffolding/blob/a8ac8375a7082befe55b71c8cbb048493dd220c2/.goreleaser.yml + # goreleaser (used for builds distributed via terraform registry) requires that CGO is disabled + CGO_ENABLED = 0; + ldflags = [ "-s" "-w" "-X main.version=${version}" "-X main.commit=${rev}" ]; + src = fetchFromGitHub { + inherit owner repo rev sha256; + }; - buildWithGoModule = data: - buildGoModule { - pname = data.repo; - version = data.version; - subPackages = [ "." ]; - doCheck = false; - src = fetchFromGitHub { - inherit (data) owner repo rev sha256; - }; - vendorSha256 = data.vendorSha256 or null; - deleteVendor = data.deleteVendor or false; - proxyVendor = data.proxyVendor or false; + # Move the provider to libexec + postInstall = '' + dir=$out/libexec/terraform-providers/${provider-source-address}/${version}/''${GOOS}_''${GOARCH} + mkdir -p "$dir" + mv $out/bin/* "$dir/terraform-provider-$(basename ${provider-source-address})_${version}" + rmdir $out/bin + ''; - # Terraform allow checking the provider versions, but this breaks - # if the versions are not provided via file paths. - postBuild = "mv $NIX_BUILD_TOP/go/bin/${data.repo}{,_v${data.version}}"; - passthru = data; - }; - - buildWithGoPackage = data: - buildGoPackage { - pname = data.repo; - version = data.version; - goPackagePath = "github.com/${data.owner}/${data.repo}"; - subPackages = [ "." ]; - doCheck = false; - src = fetchFromGitHub { - inherit (data) owner repo rev sha256; - }; - # Terraform allow checking the provider versions, but this breaks - # if the versions are not provided via file paths. - postBuild = "mv $NIX_BUILD_TOP/go/bin/${data.repo}{,_v${data.version}}"; - passthru = data; - }; + # Keep the attributes around for later consumption + passthru = attrs; + }); - # Our generic constructor to build new providers - mkProvider = attrs: - (if (lib.hasAttr "vendorSha256" attrs) then buildWithGoModule else buildWithGoPackage) - attrs; + list = lib.importJSON ./providers.json; # These providers are managed with the ./update-all script automated-providers = lib.mapAttrs (_: attrs: mkProvider attrs) list; # These are the providers that don't fall in line with the default model - special-providers = let archived = throw "the provider has been archived by upsteam"; in { - # Packages that don't fit the default model - gandi = callPackage ./gandi { }; - libvirt = callPackage ./libvirt { }; - teleport = callPackage ./teleport { }; - vpsadmin = callPackage ./vpsadmin { }; - } // (lib.optionalAttrs (config.allowAliases or false) { - arukas = archived; # added 2022/01 - bitbucket = archived; # added 2022/01 - chef = archived; # added 2022/01 - cherryservers = archived; # added 2022/01 - clc = archived; # added 2022/01 - cloudstack = throw "removed from nixpkgs"; # added 2022/01 - cobbler = archived; # added 2022/01 - cohesity = archived; # added 2022/01 - dyn = archived; # added 2022/01 - genymotion = archived; # added 2022/01 - hedvig = archived; # added 2022/01 - ignition = archived; # added 2022/01 - incapsula = archived; # added 2022/01 - influxdb = archived; # added 2022/01 - jdcloud = archived; # added 2022/01 - kubernetes-alpha = throw "This has been merged as beta into the kubernetes provider. See https://www.hashicorp.com/blog/beta-support-for-crds-in-the-terraform-provider-for-kubernetes for details"; - librato = archived; # added 2022/01 - logentries = archived; # added 2022/01 - metalcloud = archived; # added 2022/01 - mysql = archived; # added 2022/01 - nixos = archived; # added 2022/01 - oneandone = archived; # added 2022/01 - packet = archived; # added 2022/01 - profitbricks = archived; # added 2022/01 - pureport = archived; # added 2022/01 - rancher = archived; # added 2022/01 - rightscale = archived; # added 2022/01 - runscope = archived; # added 2022/01 - segment = throw "removed from nixpkgs"; # added 2022/01 - softlayer = archived; # added 2022/01 - telefonicaopencloud = archived; # added 2022/01 - terraform = archived; # added 2022/01 - ultradns = archived; # added 2022/01 - vthunder = throw "provider was renamed to thunder"; # added 2022/01 - }); + special-providers = + { + # Packages that don't fit the default model + + # mkisofs needed to create ISOs holding cloud-init data, + # and wrapped to terraform via deecb4c1aab780047d79978c636eeb879dd68630 + libvirt = automated-providers.libvirt.overrideAttrs (_: { propagatedBuildInputs = [ cdrtools ]; }); + }; + + # Put all the providers we not longer support in this list. + removed-providers = + let + archived = date: throw "the provider has been archived by upstream on ${date}"; + removed = date: throw "removed from nixpkgs on ${date}"; + in + lib.optionalAttrs (config.allowAliases or false) { + arukas = archived "2022/01"; + chef = archived "2022/01"; + cherryservers = archived "2022/01"; + clc = archived "2022/01"; + cloudstack = removed "2022/01"; + cobbler = archived "2022/01"; + cohesity = archived "2022/01"; + dyn = archived "2022/01"; + genymotion = archived "2022/01"; + hedvig = archived "2022/01"; + ignition = archived "2022/01"; + incapsula = archived "2022/01"; + influxdb = archived "2022/01"; + jdcloud = archived "2022/01"; + kubernetes-alpha = throw "This has been merged as beta into the kubernetes provider. See https://www.hashicorp.com/blog/beta-support-for-crds-in-the-terraform-provider-for-kubernetes for details"; + librato = archived "2022/01"; + logentries = archived "2022/01"; + metalcloud = archived "2022/01"; + mysql = archived "2022/01"; + nixos = archived "2022/01"; + oneandone = archived "2022/01"; + packet = archived "2022/01"; + profitbricks = archived "2022/01"; + pureport = archived "2022/01"; + rancher = archived "2022/01"; + rightscale = archived "2022/01"; + runscope = archived "2022/01"; + segment = removed "2022/01"; + softlayer = archived "2022/01"; + telefonicaopencloud = archived "2022/01"; + teleport = removed "2022/01"; + terraform = archived "2022/01"; + ultradns = archived "2022/01"; + vthunder = throw "provider was renamed to thunder on 2022/01"; + }; in -automated-providers // special-providers // { inherit mkProvider; } +automated-providers // special-providers // removed-providers // { inherit mkProvider; } diff --git a/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/gandi/default.nix b/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/gandi/default.nix deleted file mode 100644 index 13afa8d3818a..000000000000 --- a/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/gandi/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ lib, fetchFromGitHub, buildGoPackage }: -buildGoPackage rec { - pname = "terraform-provider-gandi"; - version = "1.0.0"; - - goPackagePath = "github.com/tiramiseb/terraform-provider-gandi"; - goDeps = ./deps.nix; - - src = fetchFromGitHub { - owner = "tiramiseb"; - repo = "terraform-provider-gandi"; - rev = "v${version}"; - sha256 = "0byydpqsimvnk11bh9iz8zlxbsmsk65w55pvkp18vjzqrhf4kyfv"; - }; - - # Terraform allow checking the provider versions, but this breaks - # if the versions are not provided via file paths. - postBuild = "mv go/bin/terraform-provider-gandi{,_v${version}}"; - - meta = with lib; { - description = "Terraform provider for the Gandi LiveDNS service."; - homepage = "https://github.com/tiramiseb/terraform-provider-gandi"; - license = licenses.mpl20; - maintainers = with maintainers; [ manveru ]; - }; -} diff --git a/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/gandi/deps.nix b/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/gandi/deps.nix deleted file mode 100644 index 3d4a3547502d..000000000000 --- a/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/gandi/deps.nix +++ /dev/null @@ -1,21 +0,0 @@ -# This file was generated by https://github.com/kamilchm/go2nix v1.2.1 -[ - { - goPackagePath = "github.com/hashicorp/terraform"; - fetch = { - type = "git"; - url = "https://github.com/hashicorp/terraform"; - rev = "27b720113ed5143a870ec151b3b7c9d955a09bc0"; - sha256 = "1f0hwdf2z68p0ll3pgrx949h09q52gcfaxap0zz52m7px98sfab4"; - }; - } - { - goPackagePath = "github.com/tiramiseb/go-gandi-livedns"; - fetch = { - type = "git"; - url = "https://github.com/tiramiseb/go-gandi-livedns"; - rev = "4773a84f8ee7365ed21edc6cd0602aaf93e94e59"; - sha256 = "1i8s7yclrkhf974vs2splh5symzk0ym54px0bc216bq4ifzkwkqc"; - }; - } -] diff --git a/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/libvirt/default.nix b/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/libvirt/default.nix deleted file mode 100644 index a2ea7e8008ef..000000000000 --- a/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/libvirt/default.nix +++ /dev/null @@ -1,56 +0,0 @@ -{ buildGoModule, cdrtools, fetchFromGitHub, lib, libvirt, makeWrapper, pkg-config }: - -# USAGE: -# install the following package globally or in nix-shell: -# -# (terraform.withPlugins (p: [p.libvirt])) -# -# configuration.nix: -# -# virtualisation.libvirtd.enable = true; -# -# pick an example from (i.e ubuntu): -# https://github.com/dmacvicar/terraform-provider-libvirt/tree/main/examples - -let - sha256 = "sha256-1l+ARrXHxtSdnQfYV/6gw3BYHVH8NN4pi+Ttk1nwF88="; - vendorSha256 = "sha256-OJa8pQgf5PlECZZkFV9fyCOdh6CrregY1BWycx7JPFE="; - version = "0.6.12"; -in buildGoModule { - inherit version; - inherit vendorSha256; - - pname = "terraform-provider-libvirt"; - - src = fetchFromGitHub { - inherit sha256; - - owner = "dmacvicar"; - repo = "terraform-provider-libvirt"; - rev = "v${version}"; - }; - - nativeBuildInputs = [ pkg-config makeWrapper ]; - - buildInputs = [ libvirt ]; - - # mkisofs needed to create ISOs holding cloud-init data, - # and wrapped to terraform via deecb4c1aab780047d79978c636eeb879dd68630 - propagatedBuildInputs = [ cdrtools ]; - - # Terraform allow checking the provider versions, but this breaks - # if the versions are not provided via file paths. - postBuild = "mv $GOPATH/bin/terraform-provider-libvirt{,_v${version}}"; - - ldflags = [ "-X main.version=${version}" ]; - passthru.provider-source-address = "registry.terraform.io/dmacvicar/libvirt"; - - doCheck = false; - - meta = with lib; { - homepage = "https://github.com/dmacvicar/terraform-provider-libvirt"; - description = "Terraform provider for libvirt"; - license = licenses.asl20; - maintainers = with maintainers; [ mic92 ]; - }; -} diff --git a/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/providers.json b/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/providers.json index 78016c931fd0..d74ddedb31f9 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -3,47 +3,47 @@ "owner": "CiscoDevNet", "provider-source-address": "registry.terraform.io/CiscoDevNet/aci", "repo": "terraform-provider-aci", - "rev": "v1.2.0", - "sha256": "1jxnamd701fjz0y62k229njrxa3ijmr1m1dszn0x3mpak5qgw7li", + "rev": "v2.0.0", + "sha256": "1v62lfm9w8d8iq70nwjrry52zxh5ixmxfp0dlmxvck7qjzcng8rg", "vendorSha256": null, - "version": "1.2.0" + "version": "2.0.0" }, "acme": { "owner": "vancluever", "provider-source-address": "registry.terraform.io/vancluever/acme", "repo": "terraform-provider-acme", - "rev": "v2.7.1", - "sha256": "0gnq8jm31v0q2a4v310cjrrdc7y17c9vi326c6x9cs3lgjvn27m2", - "vendorSha256": "1wssw8x8zlrgx51ij0ghhwsbyzfl2r1qy4aqv03v705xipil8yn3", - "version": "2.7.1" + "rev": "v2.8.0", + "sha256": "06wjvjsh8qgncrbdhziqjd4pgp550q21p0xm4igdx80gd7541hr1", + "vendorSha256": "1gpbc72q7mjyjxk75dyfi3j2fk6glgz0a15m2pq7clyc35kapnkc", + "version": "2.8.0" }, "aiven": { "owner": "aiven", "provider-source-address": "registry.terraform.io/aiven/aiven", "repo": "terraform-provider-aiven", - "rev": "v2.4.0", - "sha256": "0m43d2iaa9kywzvlgcnsya1ma9k570j9q8cq9l6ldpc8565fqq0i", - "vendorSha256": "1lpfnpg4sivy8vilkxamdn1hyn6k61lxsfcq67afxsq8pcy6q44v", - "version": "2.4.0" + "rev": "v2.7.0", + "sha256": "12n97z3r5bz7hwgcz193x90n7ibk4fdph7pqxwwinrvlc6zb7hz6", + "vendorSha256": "12lj7p74mhiy30fhc12ihbf827axlbxhbfzr10iwwhb0nydsfiyl", + "version": "2.7.0" }, "akamai": { "owner": "akamai", "provider-source-address": "registry.terraform.io/akamai/akamai", "repo": "terraform-provider-akamai", - "rev": "v1.9.1", - "sha256": "17a3ml4h1b1480z9dzppig20jx9mgldnmpz8cn2x8qgzbpiqz3hs", - "vendorSha256": "0l50hy4cy360g6adbhhbl4x8hagma9zfb3yyzk6vbslal9m4kd6j", - "version": "1.9.1" + "rev": "v1.10.1", + "sha256": "0gbvq5hlibqxch4igicsyfqfbvm9pdz4901ywaabnd80jmsfhv4c", + "vendorSha256": "0rzxfybxdsl99mzr5r5amammpsjv66fiakialfws696mz915zz4k", + "version": "1.10.1" }, "alicloud": { "deleteVendor": true, "owner": "aliyun", "provider-source-address": "registry.terraform.io/aliyun/alicloud", "repo": "terraform-provider-alicloud", - "rev": "v1.149.0", - "sha256": "0v9jhpvz33hzq09i8bxp1dif9jdypb5g2xy3d2g1mw4lgqrdpjix", + "rev": "v1.157.0", + "sha256": "02zsp7kxvg6i7wzrx6qigjsvxmmz4rhpjb36qz1jwn3dzpx6dyv1", "vendorSha256": "18chs2723i2cxhhm649mz52pp6wrfqzxgk12zxq9idrhicchqnzg", - "version": "1.149.0" + "version": "1.157.0" }, "ansible": { "owner": "nbering", @@ -67,55 +67,55 @@ "owner": "alexkappa", "provider-source-address": "registry.terraform.io/alexkappa/auth0", "repo": "terraform-provider-auth0", - "rev": "v0.25.0", - "sha256": "0ibscxhwj92k8p43apnxyl9sly7pldv0lgcikjfjj352084q4k62", - "vendorSha256": "0k6lylkcdvm0piaic8hdbhg1jf1vzc897w1sq7v57brx7586h3sc", - "version": "0.25.0" + "rev": "v0.26.2", + "sha256": "1n9gn7zsdygdr2ybki7xz2snp3fygls6myb1w5zndby497kgxrkw", + "vendorSha256": "1x61f7vz73m2q6pdb6ddy27j4npiwrrlgzvd90zrcc0yj22h6mms", + "version": "0.26.2" }, "avi": { "owner": "vmware", "provider-source-address": "registry.terraform.io/vmware/avi", "repo": "terraform-provider-avi", - "rev": "v21.1.2", - "sha256": "1j96k7yklaxykqj6v1yvxxib2zr2jyx37pkan34jxd8nk43lix67", - "vendorSha256": "0pz0n2ijmbhqzvhq41h1hs80yiphwwb0lf3zacifp6rxyv8aawlf", - "version": "21.1.2" + "rev": "v21.1.3", + "sha256": "160l9864p73283hc27qaabd3lrh7lm8fyh6k9xlal5isfd9vrm5p", + "vendorSha256": "1hw1xp20nhs4p1q9l887m82456fg5977pm66165gdkczwrq2zr6v", + "version": "21.1.3" }, "aviatrix": { "owner": "AviatrixSystems", "provider-source-address": "registry.terraform.io/AviatrixSystems/aviatrix", "repo": "terraform-provider-aviatrix", - "rev": "v2.20.3", - "sha256": "1k3sdfn0np9nzvc0bfc2wi7ixbrv0ikmzwyh103jfppidkasy5yq", + "rev": "v2.21.0-6.6.ga", + "sha256": "0svims34vw8xplza77flp675r90rsh9gj8cb5c02knnh4lgf7ffv", "vendorSha256": null, - "version": "2.20.3" + "version": "2.21.0-6.6.ga" }, "aws": { "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/aws", "repo": "terraform-provider-aws", - "rev": "v3.70.0", - "sha256": "0133f1ngwa7x8w9zicfwmkj14rav9cvwk7qf7hdz0cfmyl4pj4x2", - "vendorSha256": "03k8xijzfawbdzc1wavw9k2z2zyffi1ysnqls412nzdyvxyl8xw4", - "version": "3.70.0" + "rev": "v4.2.0", + "sha256": "1ijspv7bf6qi4s3k58vbaz4gbk6y60h7jrml2wjn6mas6pchiy0f", + "vendorSha256": "09p029a5qqhf28afhcs5pk2px18x2q6kc16xzjzmzpisvnfl4hfb", + "version": "4.2.0" }, "azuread": { "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/azuread", "repo": "terraform-provider-azuread", - "rev": "v2.13.0", - "sha256": "13337m20yxamdjpiw4kfi2ik4i5ivvr1fryygixpsj34lr21zxgk", + "rev": "v2.18.0", + "sha256": "06l4w9g4p48gnb9c9mmnydvpyr89f8rijpf103ndsg6ack6k4mg2", "vendorSha256": null, - "version": "2.13.0" + "version": "2.18.0" }, "azurerm": { "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/azurerm", "repo": "terraform-provider-azurerm", - "rev": "v2.90.0", - "sha256": "04bll0ygjgrqq18va97xi42p55fvlbgdc24m2i9amjhjbly5m7wn", + "rev": "v2.97.0", + "sha256": "0a95xq2bk6a1yas2kxfq30s41s2jgv2rjvz4y7m34wlldd9qxfhg", "vendorSha256": null, - "version": "2.90.0" + "version": "2.97.0" }, "azurestack": { "owner": "hashicorp", @@ -139,19 +139,37 @@ "owner": "F5Networks", "provider-source-address": "registry.terraform.io/F5Networks/bigip", "repo": "terraform-provider-bigip", - "rev": "v1.12.1", - "sha256": "0dpgxcdcpv6y25ffs0gp2pvq8z9yfh7hdqll25d0b09z0pqgb61q", + "rev": "v1.12.2", + "sha256": "08qs8psr4wy5f9qiv7chkmmsls19dwj2p2k6fqxdrd6pj2154rcg", "vendorSha256": null, - "version": "1.12.1" + "version": "1.12.2" + }, + "bitbucket": { + "owner": "DrFaust92", + "provider-source-address": "registry.terraform.io/DrFaust92/bitbucket", + "repo": "terraform-provider-bitbucket", + "rev": "v2.4.1", + "sha256": "07y0biab2g6plkyp8scqf7b12alijnxq2zqqr05lbm6wgrc22kvk", + "vendorSha256": null, + "version": "2.4.1" }, "brightbox": { "owner": "brightbox", "provider-source-address": "registry.terraform.io/brightbox/brightbox", "repo": "terraform-provider-brightbox", - "rev": "v2.0.6", - "sha256": "0k3k6d0rnvs1r2fb22q37g10zi0wq9kvakvj6zw97hkfld9wrqfj", - "vendorSha256": "07mznpp2mr1n9izgk2s8aibfvqsamj533666s46x1k49p0sh7lqx", - "version": "2.0.6" + "rev": "v2.1.1", + "sha256": "0gscxy921h8wkr40pi86dfx62z2jl0kkvnkfw7ab7xswz63h1ilm", + "vendorSha256": "1ij21y7lx6599b87vlz31mwykj0qam62w7776d6ar99pc0zl8r8k", + "version": "2.1.1" + }, + "checkly": { + "owner": "checkly", + "provider-source-address": "registry.terraform.io/checkly/checkly", + "repo": "terraform-provider-checkly", + "rev": "v1.4.1", + "sha256": "15biy4gm8lwmqm1s5rjr0d77vy4mgyjwaa3wydrna1655w3rgkr6", + "vendorSha256": "0pjxrdpsn99g6hjp0flrk7czjb05ibnsjcggrvvpwzrbj55rqzgd", + "version": "1.4.1" }, "checkpoint": { "deleteVendor": true, @@ -176,10 +194,10 @@ "owner": "cloudflare", "provider-source-address": "registry.terraform.io/cloudflare/cloudflare", "repo": "terraform-provider-cloudflare", - "rev": "v3.6.0", - "sha256": "1adpzk9vjllr18dq8kggxfabm3ax59m55ls98mkqh8lmgq96bh7d", - "vendorSha256": "0qby6fa1x5fapgcy5i35dwwlkb2ggws9sxcssshzssy0fzpb3k87", - "version": "3.6.0" + "rev": "v3.9.1", + "sha256": "02kyjf2mizvxv1a2fkw2wsk0gmilj83sj3qv1d7g0wxxkxx00nd2", + "vendorSha256": "167jafxr4g43y9gvqjq5z7vd9cyf15d69wbrdvqsfzj8sszqfq5l", + "version": "3.9.1" }, "cloudfoundry": { "owner": "cloudfoundry-community", @@ -187,7 +205,7 @@ "repo": "terraform-provider-cloudfoundry", "rev": "v0.15.0", "sha256": "0kg9aivxlbkqgrwv0j02hfsaky5q4f0bmqihn589dsdk7jds66i7", - "vendorSha256": "19jnaazhdqagfx5wkpvrf0amf7d22kg6hzk0nsg888d0l4x93hna", + "vendorSha256": "19h526ag7p2jkdp0610slbpsz8q3njvj9d4xmsfdsv3r8pz7xzls", "version": "0.15.0" }, "cloudinit": { @@ -230,19 +248,19 @@ "owner": "poseidon", "provider-source-address": "registry.terraform.io/poseidon/ct", "repo": "terraform-provider-ct", - "rev": "v0.9.1", - "sha256": "1d8q6ffh64v46r80vmbpsgmjw1vg6y26hpq3nz2h5mvqm0fqya9r", - "vendorSha256": "sha256-e/r59hnVRxrSqmQUwYZiN+YCCz+LbxUHGV2MFGcmJn4=", - "version": "0.9.1" + "rev": "v0.9.2", + "sha256": "104j34b1m110fdya21k4rz03j1yba4a9cpm7hq13i8hc2diqjqnc", + "vendorSha256": "0qk83ppnwkwvj85dh9p0cv6a0nv8l8zlf4k74cy3m0bqym4ad0qk", + "version": "0.9.2" }, "datadog": { "owner": "DataDog", "provider-source-address": "registry.terraform.io/DataDog/datadog", "repo": "terraform-provider-datadog", - "rev": "v3.7.0", - "sha256": "0fynbn0zbplslbvqz0jij4gm8q6ydg697x7nh5rzw89dy26l2f8g", - "vendorSha256": "0ngvbc9h3csl811g40q707flf4dl1hal95hpkxsvz7p71s3371q8", - "version": "3.7.0" + "rev": "v3.8.1", + "sha256": "0mvl80dsqzab1r3p5n446737dadzfbsyfbdy2w2xvmz4fgx6aklh", + "vendorSha256": "0p8czqb4hn5z9bfgsfajdpx46hwil0ax75j8xljlh1ccvpp2rvyz", + "version": "3.8.1" }, "dhall": { "owner": "awakesecurity", @@ -257,10 +275,10 @@ "owner": "digitalocean", "provider-source-address": "registry.terraform.io/digitalocean/digitalocean", "repo": "terraform-provider-digitalocean", - "rev": "v2.16.0", - "sha256": "0l67yd7l0s36lwp1hm44d77i7d5019j0ddjzf22aw8cv9xd5fhxw", + "rev": "v2.17.1", + "sha256": "0dfw4sjmsfzrs28gf5k4vqjs6phwa6w3pwi7fpbngnw6l2r4m6h9", "vendorSha256": null, - "version": "2.16.0" + "version": "2.17.1" }, "dme": { "owner": "DNSMadeEasy", @@ -277,145 +295,154 @@ "repo": "terraform-provider-dns", "rev": "v3.2.1", "sha256": "1zynfwm7hl7pnldjr2nxj0a06j209r62g8zpkasj6zdjscy62rc8", - "vendorSha256": "sha256-D/CD3O/EHIa2GTwmIAZM3e3bFSLMXy4KhAGWeD4i7kI=", + "vendorSha256": "0hpf48z7i5h1hh52wpyc48axpvfx9h3209iw36v8c764xzf87w0g", "version": "3.2.1" }, "dnsimple": { "owner": "dnsimple", "provider-source-address": "registry.terraform.io/dnsimple/dnsimple", "repo": "terraform-provider-dnsimple", - "rev": "v0.11.0", - "sha256": "0w5lz9lz5jfvpn87d7xzpjimvh6wnwqfwk6masrhiw88h10pgd7n", + "rev": "v0.11.1", + "sha256": "0jzw1kjykbka59kx30xm3qicjb6fdmm5l4f2dr8g7nxdaqnxri0s", "vendorSha256": "06wggchs5khzyg6fd9s0qj76awnw28s7l278awanqimqgqajijkj", - "version": "0.11.0" + "version": "0.11.1" }, "docker": { "owner": "kreuzwerker", "provider-source-address": "registry.terraform.io/kreuzwerker/docker", "repo": "terraform-provider-docker", - "rev": "v2.15.0", - "sha256": "0fk4i8hi0x40rgcnq40j4jv12wsn9kn974h8qwhzxnd66n0xbnv0", - "vendorSha256": "0ax2368nhi6hfs4zwf84dqnf5ijyy93gz0brlfk89m7d2a90gfkp", - "version": "2.15.0" + "rev": "v2.16.0", + "sha256": "0bh27al9s6zczdz208lr70qab517lsazpi708z6711pgns7qhwjm", + "vendorSha256": "0ykfmksffcc62xwni9dqwgj3vlcmzf6paz6kviljib6sv9vqf0pm", + "version": "2.16.0" }, "dome9": { "owner": "dome9", "provider-source-address": "registry.terraform.io/dome9/dome9", "repo": "terraform-provider-dome9", - "rev": "v1.24.4", - "sha256": "01zvav3r25qbhq1dfxjwmcgyk377cisn1k6406xq66fsyijcf5rw", + "rev": "v1.24.5", + "sha256": "0a4q5lf11xxfc9ndicdmjir77rdsiq5a8fwb6065879qaamvaxqi", "vendorSha256": null, - "version": "1.24.4" + "version": "1.24.5" }, "elasticsearch": { "owner": "phillbaker", "provider-source-address": "registry.terraform.io/phillbaker/elasticsearch", "repo": "terraform-provider-elasticsearch", - "rev": "v2.0.0-beta.2", - "sha256": "1pr0vaag0b0i83381pcpxnq5bpjfj80bm6m483rivbaqbxr0dakw", + "rev": "v2.0.0-beta.4", + "sha256": "0ypw916sziy8dhvbv96f7d4as08ps18xxx8h6ip69mk74vf029sm", "vendorSha256": "1w92k895ikrqm9n1hf36wlh9nq278vifl3r14v0rxa8g9awizfdr", - "version": "2.0.0-beta.2" + "version": "2.0.0-beta.4" }, "exoscale": { "owner": "exoscale", "provider-source-address": "registry.terraform.io/exoscale/exoscale", "repo": "terraform-provider-exoscale", - "rev": "v0.31.1", - "sha256": "1k6z7mi20ijn3lj734abrbpgcpa6lr5ziacg8h5xr99xs5r9g5yi", + "rev": "v0.31.2", + "sha256": "1fncpy8vc72g6h560mnkwm160wah8iik4bn12mjgbz3nvjlsm04x", "vendorSha256": null, - "version": "0.31.1" + "version": "0.31.2" }, "external": { "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/external", "repo": "terraform-provider-external", - "rev": "v2.1.1", - "sha256": "1f92cg2fjwy2n5380fx9j6j2bnsnkcy18kq0bjbkwkh8kmshqjn8", - "vendorSha256": "031knr4axrcwisbhzs39faykzc1jgm9hx4rhqk46wim950gifl7g", - "version": "2.1.1" + "rev": "v2.2.0", + "sha256": "0s7zxz9dni1p93di1ddx595d0mmizq7zrvkbbx1m4c5f208m262x", + "vendorSha256": "1f5gh110rylb1cw4dlwdzsj8sb0myj7xcj7ix966l5qa9x05p9pn", + "version": "2.2.0" }, "fastly": { "owner": "fastly", "provider-source-address": "registry.terraform.io/fastly/fastly", "repo": "terraform-provider-fastly", - "rev": "v0.39.0", - "sha256": "0sjjcz2z7qr1dmm6zzyi382cas4k5vdg0q7yxlpcqxqqrql636k8", + "rev": "v1.0.0", + "sha256": "0rpggjsnxwz3rd93nxqr0w2addscxw498mf1mjp3mvkj1f3r9afi", "vendorSha256": null, - "version": "0.39.0" + "version": "1.0.0" }, "flexibleengine": { "owner": "FlexibleEngineCloud", "provider-source-address": "registry.terraform.io/FlexibleEngineCloud/flexibleengine", "repo": "terraform-provider-flexibleengine", - "rev": "v1.26.0", - "sha256": "1n22jll76gw3cxnyi2xfzh3mh0g9912rmkqpps7fid0imaz5jlck", + "rev": "v1.27.0", + "sha256": "0xc0a1gzdld039b4vlivf9b8g3pjja6pfzyqhjx0iy01akm1a9cc", "vendorSha256": null, - "version": "1.26.0" + "version": "1.27.0" }, "fortios": { "owner": "fortinetdev", "provider-source-address": "registry.terraform.io/fortinetdev/fortios", "repo": "terraform-provider-fortios", - "rev": "v1.13.2", - "sha256": "042fn5jii9fx7vb6x4kcvmrmiccj7s13xqm91l3b2i9mzh4cgb3k", + "rev": "v1.14.0", + "sha256": "078wvbihrs6j5yrbqsx5g6l7z05y98kwlyanq5w99fsazz78rr4h", "vendorSha256": null, - "version": "1.13.2" + "version": "1.14.0" + }, + "gandi": { + "owner": "go-gandi", + "provider-source-address": "registry.terraform.io/go-gandi/gandi", + "repo": "terraform-provider-gandi", + "rev": "v2.0.0", + "sha256": "0xvdnjadcddrrfhhp198mraf2bm01xfy7gapjay441dbzffynw1m", + "vendorSha256": "1yccjnz6xw3b51xqmiaw78m87y2xmlp9z5z3gx5dbzz0lkj1k523", + "version": "2.0.0" }, "github": { "owner": "integrations", "provider-source-address": "registry.terraform.io/integrations/github", "repo": "terraform-provider-github", - "rev": "v4.19.0", - "sha256": "17xpkcrklzbim91rxw4g4n8izk9qiw9q0vfivr467i32dv5mzc2d", + "rev": "v4.20.0", + "sha256": "0cibbzj3nj5dgi2mcr93bdxwvb7r2qscwshjbssbc7avwvhh3171", "vendorSha256": null, - "version": "4.19.0" + "version": "4.20.0" }, "gitlab": { "owner": "gitlabhq", "provider-source-address": "registry.terraform.io/gitlabhq/gitlab", "repo": "terraform-provider-gitlab", - "rev": "v3.8.0", - "sha256": "0ha6lp0z3lqdk05fhggdgdz50dm7z6ksn648khp44n7in0c0c5pj", - "vendorSha256": "sha256-tkPenz+gkghIGMYF9iFj1TXUV3NGm/zYGQ3nP2hWdZA=", - "version": "3.8.0" + "rev": "v3.9.1", + "sha256": "1pqwgshjrzdw8prgadwq0hf0q72jjjfaas6kgh2as3yn8q24ynca", + "vendorSha256": "04v5hgq23rpz6h242v0m2zhpsfmx4h97pf396w4v6j0kj1wabf87", + "version": "3.9.1" }, "google": { "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/google", "proxyVendor": true, "repo": "terraform-provider-google", - "rev": "v4.5.0", - "sha256": "173aqwrzqdb3y57wiq1dbgb74ksr063qqq1k178n4wrab4s1h3px", - "vendorSha256": "0f18fh0qi1v1hkq3j8nrc8x2rah7vk6njjgdakxr1g1xxv8f0nhx", - "version": "4.5.0" + "rev": "v4.11.0", + "sha256": "1n3d4qxy2x69ryphqwyih7iz6slx5z1plyyzdcd7pxlaw8x8hpgm", + "vendorSha256": "0g23ngr1rfh53255svg1qg5lyljb3gnai6ia8yik5b8pvyqcw4l7", + "version": "4.11.0" }, "google-beta": { "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/google-beta", "proxyVendor": true, "repo": "terraform-provider-google-beta", - "rev": "v4.5.0", - "sha256": "17z2jy8b9gk0id8q0318a6k60fhcqps0p36s7d7kkqmr44shgzs4", - "vendorSha256": "0f18fh0qi1v1hkq3j8nrc8x2rah7vk6njjgdakxr1g1xxv8f0nhx", - "version": "4.5.0" + "rev": "v4.11.0", + "sha256": "0ylfx8ks5azicnckkx3lrawf1gpsq95qsng550p51gr1wna1aqmy", + "vendorSha256": "0g23ngr1rfh53255svg1qg5lyljb3gnai6ia8yik5b8pvyqcw4l7", + "version": "4.11.0" }, "grafana": { "owner": "grafana", "provider-source-address": "registry.terraform.io/grafana/grafana", "repo": "terraform-provider-grafana", - "rev": "v1.17.0", - "sha256": "10mj1dvz7q3w250hvi3k4rj2x0mn592gw2xcy1j98x5ll6kx4ynd", - "vendorSha256": "1bhygkkgd3j971cg6wha57cyh4ggbkaihw6sn6p9jvdi1k1f63lw", - "version": "1.17.0" + "rev": "v1.19.0", + "sha256": "1ch4nxva1ixmgm6kjyvbd4ydrl8w39ll0ljpk1m2lrg5pn349mjn", + "vendorSha256": "0z8sd1hq0hhm51fi91ri6dmsq6brba9vd22gxkgzxfdsncq24h2a", + "version": "1.19.0" }, "gridscale": { "owner": "gridscale", "provider-source-address": "registry.terraform.io/gridscale/gridscale", "repo": "terraform-provider-gridscale", - "rev": "v1.13.0", - "sha256": "0m4n1ih7fzwxrnd3b70i4xl0nrwbpw8f6hh1fpa02jv7znpdp7l8", + "rev": "v1.14.1", + "sha256": "1vf1xvj3djm1mgrgfj428yh26qxksclxxnvkxl663nqsvy14gd6s", "vendorSha256": null, - "version": "1.13.0" + "version": "1.14.1" }, "hcloud": { "owner": "hetznercloud", @@ -423,7 +450,7 @@ "repo": "terraform-provider-hcloud", "rev": "v1.32.2", "sha256": "0rr65bxd0w5r0zqgj975rzxw7j3wrav4dw9gl3ispfhkb9v1302f", - "vendorSha256": "0g8cbkg5kcddd1x3p6d8mb6mqwsayqby0mrrifkw5icf7rlaa0sl", + "vendorSha256": "0rc4pznb16fm5dhi54fwka44zvngy3hp0cfwlrh84ifmzqgx0mlv", "version": "1.32.2" }, "helm": { @@ -439,10 +466,10 @@ "owner": "heroku", "provider-source-address": "registry.terraform.io/heroku/heroku", "repo": "terraform-provider-heroku", - "rev": "v4.8.0", - "sha256": "12v0agcib8bziywaqzn6p04pwxnzyn74kqc5al8n572k0ndw3bps", - "vendorSha256": "183j20my61mqhch87cn455l938jqx4ssbnv8yl416i6bxgcpy6f9", - "version": "4.8.0" + "rev": "v5.0.0", + "sha256": "1dskbwa10dmj5fdw0wplby6hhcvxri68jlg34966mqx8pas3zsxy", + "vendorSha256": "13f7841i14b5n5iabqky7694mbqg95f0cvaygapczki5lf2j7fqy", + "version": "5.0.0" }, "http": { "owner": "hashicorp", @@ -457,10 +484,10 @@ "owner": "huaweicloud", "provider-source-address": "registry.terraform.io/huaweicloud/huaweicloud", "repo": "terraform-provider-huaweicloud", - "rev": "v1.32.0", - "sha256": "1k5d4a488mrba6cvpcbhd9hqhhb977yi89p32wlfx266mf11w2yw", + "rev": "v1.33.0", + "sha256": "07m2kzx4m9gn9j5czlfdsq0a1ki8vfwlywrfgz2jxvz2cqnn4gsx", "vendorSha256": null, - "version": "1.32.0" + "version": "1.33.0" }, "huaweicloudstack": { "owner": "huaweicloud", @@ -484,10 +511,10 @@ "owner": "IBM-Cloud", "provider-source-address": "registry.terraform.io/IBM-Cloud/ibm", "repo": "terraform-provider-ibm", - "rev": "v1.37.1", - "sha256": "1m9038ylv44xhgws0jrqdynj7kd97x9jgk1npqblbfv86fccwqxc", - "vendorSha256": "1a8zy023j3mcy3bswyrmllkgv61wiyxa1f7bfj8mxx3701rsb4ji", - "version": "1.37.1" + "rev": "v1.39.0-beta0", + "sha256": "1ms6jr2f112qxslv2lapvngkmg2mlf0jfjnpx6rxqzclq0xcjqn1", + "vendorSha256": "0g6bm2pvdvj24yw26d2w8d7nr9izzqwrwzdz4y9dbr426xycrgy5", + "version": "1.39.0-beta0" }, "icinga2": { "owner": "Icinga", @@ -502,37 +529,37 @@ "owner": "infobloxopen", "provider-source-address": "registry.terraform.io/infobloxopen/infoblox", "repo": "terraform-provider-infoblox", - "rev": "v2.0.1", - "sha256": "0xmlhm4lgb43f75300hajlq7zk3r1xqxi4dc2x0vlnkhgdj3hrfi", + "rev": "v2.1.0", + "sha256": "1agxlvm5gxgsfyg1kij09jaly4pj3wfbdc4hk7456m2v1k4r7asn", "vendorSha256": null, - "version": "2.0.1" + "version": "2.1.0" }, "kafka": { "owner": "Mongey", "provider-source-address": "registry.terraform.io/Mongey/kafka", "repo": "terraform-provider-kafka", - "rev": "v0.4.1", - "sha256": "0k1vrd2h7d01ypyhs2q1x83nnmiivglwsbrmwrj4k750x2wniygq", - "vendorSha256": "06n2xpic0lmb81rbkx39avz6zgnspmi6xv69kfzdvx7q3zpf7w4s", - "version": "0.4.1" + "rev": "v0.4.2", + "sha256": "1qgcjcdkhxh2r2c12zd3b5cjn8zf4rdmw91a9h4izy52fsmc2x3q", + "vendorSha256": "1y6q5q84a6hin1h86gbm7c5glmfjc4im0w6cjaznmj9gmrkjh8qg", + "version": "0.4.2" }, "kafka-connect": { "owner": "Mongey", "provider-source-address": "registry.terraform.io/Mongey/kafka-connect", "repo": "terraform-provider-kafka-connect", - "rev": "v0.2.3", - "sha256": "0fn03l58lkrlinvnxld2ba7z1gx95vxklbhh2z7930pih0vhr0sr", - "vendorSha256": "17fwqhxh22szdys97dxh069z6s8xr3y9i3pi5ckdcr462j1dr95w", - "version": "0.2.3" + "rev": "v0.2.4", + "sha256": "17qslh2axvwiqmqzaxdl75zg3ww6hcpq7k2bfx026ca7bifqx13f", + "vendorSha256": "0acl8ijai4awgxhps17bwnwd9aks0qbjvv4ad6pj8vbf496dc411", + "version": "0.2.4" }, "keycloak": { "owner": "mrparkers", "provider-source-address": "registry.terraform.io/mrparkers/keycloak", "repo": "terraform-provider-keycloak", - "rev": "v3.6.0", - "sha256": "1lrnzfjrw0yn4hsklhikf75n6drra7nljlzxf2asfkfaiwgcik99", - "vendorSha256": "17v5h5s2vijfx5yxhindr30g8ilmz7hamkxhmlk0zg5qb80mzqc1", - "version": "3.6.0" + "rev": "v3.7.0", + "sha256": "1qzdm0jgk6f0zyjbv5qaq24h9a37bgb4ghym61vg763lqra69als", + "vendorSha256": "1q5z54rz5lqgdv9gfl20gfnzi4in0d65jkfxnmmsx6fjcb9ih4p6", + "version": "3.7.0" }, "ksyun": { "owner": "kingsoftcloud", @@ -556,28 +583,37 @@ "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/kubernetes", "repo": "terraform-provider-kubernetes", - "rev": "v2.7.1", - "sha256": "061zxphysj6spr1giwfnqgy3hh8s4j0lw10gs3cjkqxbpc4bbs7a", + "rev": "v2.8.0", + "sha256": "15mjx531jzrsfd4kxnklcr8q7gbq64z772y9m5lhq73anr9yqfa3", "vendorSha256": null, - "version": "2.7.1" + "version": "2.8.0" }, "launchdarkly": { "owner": "launchdarkly", "provider-source-address": "registry.terraform.io/launchdarkly/launchdarkly", "repo": "terraform-provider-launchdarkly", - "rev": "v2.2.0", - "sha256": "06lhcimk368ll73vhs09d6lsmphbm2mvlxhiajc190db492nnjnl", - "vendorSha256": "05gx87dwh49zc5mlqnzcqn46pjf9q4wsv9l15pjr3spczzi11cnz", - "version": "2.2.0" + "rev": "v2.5.0", + "sha256": "1083w217y8l6clj3q31f1lanzngfinw682kdqpm0xfssqas7qzx6", + "vendorSha256": "13vcxvw56bn7mdz917lvdryd2d7mcvi83ykbzjfbpxr4lzrrm9qw", + "version": "2.5.0" + }, + "libvirt": { + "owner": "dmacvicar", + "provider-source-address": "registry.terraform.io/dmacvicar/libvirt", + "repo": "terraform-provider-libvirt", + "rev": "v0.6.14", + "sha256": "1x1xl3blcs4dpjavf4im82l9vrv0plyyiayy475qjf0sl028criy", + "vendorSha256": "1kq0sbz7sv4gw35wl52z7gjv588r82izhrz7ydf5n0c4d2izmg6a", + "version": "0.6.14" }, "linode": { "owner": "linode", "provider-source-address": "registry.terraform.io/linode/linode", "repo": "terraform-provider-linode", - "rev": "v1.25.0", - "sha256": "11ybl1ny90y7w999hwjnwnmmdkqak5q8gbg1qqimhjvw69j0dr81", - "vendorSha256": "01146ds79clf2hn8ph4hx0g8chwhfawdy5cpslnppsm1w8v5arrm", - "version": "1.25.0" + "rev": "v1.25.2", + "sha256": "18w9x80zary64873d1r824g28l5dhkda1qq0lr895afwh8g11dfp", + "vendorSha256": "0c882yafydhdhnp5awb8llzbmiljfdbamqlx740347ywpliy0ga2", + "version": "1.25.2" }, "linuxbox": { "owner": "numtide", @@ -611,10 +647,10 @@ "owner": "terraform-lxd", "provider-source-address": "registry.terraform.io/terraform-lxd/lxd", "repo": "terraform-provider-lxd", - "rev": "v1.6.0", - "sha256": "07h159mjbddkf3ishhdknqn10pyb2wh9yavjps5mwmdbiii6qpvy", + "rev": "v1.7.1", + "sha256": "0r1d0d6fp3rihxhfsxlay0dqp5rmnja9s369msra8jylqyharnrh", "vendorSha256": "11x12jxh4q99hinpljqfchysgkhch93sgv0mz065ws20y0dxzfvs", - "version": "1.6.0" + "version": "1.7.1" }, "mailgun": { "owner": "wgebis", @@ -638,28 +674,37 @@ "owner": "equinix", "provider-source-address": "registry.terraform.io/equinix/metal", "repo": "terraform-provider-metal", - "rev": "v3.2.1", - "sha256": "0j07rras4m6i668lkvvn3rq5l67qfzk9bmpijsfk3my0zsgv8nvw", + "rev": "v3.2.2", + "sha256": "193897farpyb3zxz6p79mfaf04ccin7xdirbkclqb3x3c56jy0xi", "vendorSha256": null, - "version": "3.2.1" + "version": "3.2.2" + }, + "minio": { + "owner": "aminueza", + "provider-source-address": "registry.terraform.io/aminueza/minio", + "repo": "terraform-provider-minio", + "rev": "v1.3.0", + "sha256": "0cgjcq5fk4cyxrpvqkg7nk9hjzr28nmhmlnhclx9bw2rm3g7i000", + "vendorSha256": "0p3mg2j89jjkhgv57l5pkpyjdhbh41ilb5az5y2m5zz3kbl4y13b", + "version": "1.3.0" }, "mongodbatlas": { "owner": "mongodb", "provider-source-address": "registry.terraform.io/mongodb/mongodbatlas", "repo": "terraform-provider-mongodbatlas", - "rev": "v1.1.1", - "sha256": "0ifrpamajmrqa3fmsg4qyag1i7ghrswbhl0ixj8hgw7kzbzslsyd", - "vendorSha256": "1xrpgrzk5hr7qc5zm7nq5ljhc4sgzbsaxfszc8dlpc5y49j5q0ip", - "version": "1.1.1" + "rev": "v1.2.0", + "sha256": "08v1byvy7c2wdlbinjxb01vbzvsqfc73nc3cacp40n69z8wl70bi", + "vendorSha256": "19q835m219i85bq7mm5gafpw4q2y4lhbas2ppbfn3hkky15mvwks", + "version": "1.2.0" }, "ncloud": { "owner": "NaverCloudPlatform", "provider-source-address": "registry.terraform.io/NaverCloudPlatform/ncloud", "repo": "terraform-provider-ncloud", - "rev": "v2.2.1", - "sha256": "0igzwc1hycnlcvgi0il1z94xlb6rlklr1h7j909im1am3p6s3q1s", - "vendorSha256": "1799i4d32y22v6ywwklm3ncmzir5hg8cw23jzb8d28xiw8vswhs4", - "version": "2.2.1" + "rev": "v2.2.5", + "sha256": "0hspr6iv69izg1y8s1sj24kgy562jggn9nwqgprn4zca7vsrl29r", + "vendorSha256": "1hiz0pphl4jxfglxj28rm58ih7c5dabhd2gaig23hcqvczhf1wd2", + "version": "2.2.5" }, "netlify": { "owner": "AegirHealth", @@ -674,10 +719,10 @@ "owner": "newrelic", "provider-source-address": "registry.terraform.io/newrelic/newrelic", "repo": "terraform-provider-newrelic", - "rev": "v2.34.1", - "sha256": "1j7r6cac1ajp8f6h2492dnz7ihkxbdi8js535dv04kiah79r49d5", - "vendorSha256": "0qbrrh5qdbcnzmf69jilcd9qql526w9mf4ix8y8bi94w7m0nwxap", - "version": "2.34.1" + "rev": "v2.37.0", + "sha256": "1gx2sxm39ap84anaiffdacqqrgagymgxywxc0rnc7zkwvziazhw9", + "vendorSha256": "130ddc9qs6i8l2ka76n9rxwsz71h0wywbnjd3p2xbkkpqsg66lbz", + "version": "2.37.0" }, "nomad": { "owner": "hashicorp", @@ -689,14 +734,13 @@ "version": "1.4.16" }, "ns1": { - "deleteVendor": true, "owner": "ns1-terraform", "provider-source-address": "registry.terraform.io/ns1-terraform/ns1", "repo": "terraform-provider-ns1", - "rev": "v1.12.1", - "sha256": "0l72z92k71z48ls1dwy6apwhgi9xbs4czmryc0k65krh4hgjhhwk", - "vendorSha256": "0nk8xs24hwsarr22h5m1qcpixg7ijdkah5686wkp51y8cp69v25r", - "version": "1.12.1" + "rev": "v1.12.5", + "sha256": "0g69jr96ns2h578cmh5zz27m5dkgygrfr6shvx79wal26fpr8413", + "vendorSha256": "0s70626ng7pvqxnx0a4rp22b8spy45y011bvvm77fndm8fc1w9zn", + "version": "1.12.5" }, "nsxt": { "owner": "vmware", @@ -721,28 +765,28 @@ "owner": "nutanix", "provider-source-address": "registry.terraform.io/nutanix/nutanix", "repo": "terraform-provider-nutanix", - "rev": "v1.2.2", - "sha256": "08y5hxp28z5mhrbfs0mdwdj694k26gwl0qb80dggmmdil704ajwk", - "vendorSha256": "0s7yi00zskc4j7vnqjfd64pxk2bpk1cqmqgiyxfh7aqqzg22yqkz", - "version": "1.2.2" + "rev": "v1.3.0", + "sha256": "1q38f6a8d607sdhrr6xcqmdsvm625v7y36xma137bqv09g3xga0s", + "vendorSha256": "0qkd9pnidf4rhbk7p4jkpcdq36g8lp8pwpsf3hydy6xh072iy4id", + "version": "1.3.0" }, "oci": { "owner": "terraform-providers", "provider-source-address": "registry.terraform.io/hashicorp/oci", "repo": "terraform-provider-oci", - "rev": "v4.57.0", - "sha256": "123k24pa5232j9yxhgn6ng36s46y3iv4xsqay9ry53g4pw6zcx9y", + "rev": "v4.64.0", + "sha256": "1x8lhyr356j2gihgfy8563n75aqb2prwvdlnkxmvlbqcp10rnggd", "vendorSha256": null, - "version": "4.57.0" + "version": "4.64.0" }, "okta": { "owner": "okta", "provider-source-address": "registry.terraform.io/okta/okta", "repo": "terraform-provider-okta", - "rev": "v3.20.2", - "sha256": "0qlm99m4dljnczsypn4gmw9n4vvxkfazi21hvkbkgy2v3wmhsms9", - "vendorSha256": "1dadvvkspb654pmxzb8vlp88vpnh2ssgfsvlcaiikyjqh2z7wbq4", - "version": "3.20.2" + "rev": "v3.21.0", + "sha256": "1j1nvg0qj8xaqnbwlrnhpy73032zc1ik78c0q1iq7xa2gs833qya", + "vendorSha256": "0l0di6cmm41z7i4d498xxc8wcrbg6r9w4vcdksqhz92s1gqs3f4z", + "version": "3.21.0" }, "oktaasa": { "owner": "oktadeveloper", @@ -767,37 +811,37 @@ "owner": "OpenNebula", "provider-source-address": "registry.terraform.io/OpenNebula/opennebula", "repo": "terraform-provider-opennebula", - "rev": "v0.3.0", - "sha256": "110mzxr2mk9hzw7nfisyl4in7r7q4m280szzgc3bzlp9sjvqgg3y", - "vendorSha256": "1wp9dk5kcrkmcx7mh5inbq3zd7qwp8sbl9hc0svaf44mf1p9446w", - "version": "0.3.0" + "rev": "v0.4.1", + "sha256": "13z14p8zkrmffai5pdiwi33xsznan015nl9b9cfyxi1is4m5i41m", + "vendorSha256": "0qyzavig8wnnjzm63pny5azywqyrnjm978yg5y0sr6zw8wghjd15", + "version": "0.4.1" }, "openstack": { "owner": "terraform-provider-openstack", "provider-source-address": "registry.terraform.io/terraform-provider-openstack/openstack", "repo": "terraform-provider-openstack", - "rev": "v1.46.0", - "sha256": "1kkqfr0i33kw0qj3dp5knxm14p1ndy72n4chd36dhkydp4rm688f", - "vendorSha256": "1f77z6p8423gh8x7zbhn3pkd8a1nxd5pabc1043d66pbw9rxchax", - "version": "1.46.0" + "rev": "v1.47.0", + "sha256": "0hbp5hk3b9fdsyqkxb3fzpjiw5dd7h7f3gs3xv5imzkfv1dmqghz", + "vendorSha256": "007qmkgp5svhy7gvlkbyxllh0ijsk4xq5kmy7zmjgf7mawp16ny6", + "version": "1.47.0" }, "opentelekomcloud": { "owner": "opentelekomcloud", "provider-source-address": "registry.terraform.io/opentelekomcloud/opentelekomcloud", "repo": "terraform-provider-opentelekomcloud", - "rev": "v1.27.2", - "sha256": "1icfsjpch6plp9qbx0snn55kvkba0kvnd0skwdhzxi66xcdw0s9b", - "vendorSha256": "0dc4l5swfw666mpm5q67gm45abkm9zsvibqrja910h6rrp387576", - "version": "1.27.2" + "rev": "v1.27.5", + "sha256": "04kr3319xpzabajzav3hl2ibws2lj7x2naqfc9gpdy7j06rhhkaa", + "vendorSha256": "1lyz6lb4ciddr3d2zh5hfdfvhdacs13xynkpsjcjyqqfhayxqavg", + "version": "1.27.5" }, "opsgenie": { "owner": "opsgenie", "provider-source-address": "registry.terraform.io/opsgenie/opsgenie", "repo": "terraform-provider-opsgenie", - "rev": "v0.6.7", - "sha256": "1dfp7s8zvnifnbka7azfxss42cj11s00mp92fj10bji4hkk0bvjq", + "rev": "v0.6.10", + "sha256": "1kxq66skal10nx5mgk8qj15chk01fi1pjamgakr1j56m1dgw03cw", "vendorSha256": null, - "version": "0.6.7" + "version": "0.6.10" }, "oraclepaas": { "owner": "terraform-providers", @@ -821,19 +865,19 @@ "owner": "PagerDuty", "provider-source-address": "registry.terraform.io/PagerDuty/pagerduty", "repo": "terraform-provider-pagerduty", - "rev": "v2.2.1", - "sha256": "0nhn47bd9lqs14wvxjkvhsnzgm6iys5icy5ydmsma3p2fb90qgas", + "rev": "v2.3.0", + "sha256": "02k416zgjg2f4bl4ilxbg0ig2lh86qc4pv96p2slpzyg8ypf87zg", "vendorSha256": null, - "version": "2.2.1" + "version": "2.3.0" }, "panos": { "owner": "PaloAltoNetworks", "provider-source-address": "registry.terraform.io/PaloAltoNetworks/panos", "repo": "terraform-provider-panos", - "rev": "v1.9.0", - "sha256": "0v2vydrljnaq47pkz6rfrhl7zsqa8lgjclpa6jy7nyc69c02d90c", + "rev": "v1.10.0", + "sha256": "1nh1kc8pz10014p6dw8l2qdiqxdgcj5yy3da2qhbarwn0qm9fs36", "vendorSha256": null, - "version": "1.9.0" + "version": "1.10.0" }, "pass": { "owner": "camptocamp", @@ -848,10 +892,10 @@ "owner": "cyrilgdn", "provider-source-address": "registry.terraform.io/cyrilgdn/postgresql", "repo": "terraform-provider-postgresql", - "rev": "v1.14.0", - "sha256": "08z8i2y4qmq7zd50hjaiz6vazwb9yszm1c0mxc87sxayj0mcyl6r", - "vendorSha256": null, - "version": "1.14.0" + "rev": "v1.15.0", + "sha256": "04gm7y5qyvipg0a0glgyx257vjrkk4k5pjrvzik6adyrjyidixw1", + "vendorSha256": "0pp9c76zdpfyq57jcwv258gipvmy6hjqi933xdi155hkx45cnixr", + "version": "1.15.0" }, "powerdns": { "owner": "pan-net", @@ -868,17 +912,17 @@ "repo": "terraform-provider-rabbitmq", "rev": "v1.6.0", "sha256": "0src4d032z3mpv10fgya2izqm8qfdgr87rfhpnld1r90yvxqgnl2", - "vendorSha256": "sha256-wbnjAM2PYocAtRuY4fjLPGFPJfzsKih6Q0YCvFyMulQ=", + "vendorSha256": "0m5siifbq0j68dx2hapczhjlyq9wrgwf360vnl08fqlgrl0f7ff1", "version": "1.6.0" }, "rancher2": { "owner": "rancher", "provider-source-address": "registry.terraform.io/rancher/rancher2", "repo": "terraform-provider-rancher2", - "rev": "v1.22.1", - "sha256": "0sx24riks78ywxsrhvc18w3wppz676zv1bjmzvm7r4q94miplxgl", - "vendorSha256": "0qdd1sl9r6rpp9jmxy3r5a064f8agjmlkrn241p4sd7j5cncxdk3", - "version": "1.22.1" + "rev": "v1.22.2", + "sha256": "0k5ljyb55nw993vc3whhnyjgwy97qr1pp5mbi9g40dlm84myi9bm", + "vendorSha256": "1x7i69cyss5mkz82ii5pqvjprgvqyd41admfdm7hpci626i9dhsr", + "version": "1.22.2" }, "random": { "owner": "hashicorp", @@ -893,19 +937,19 @@ "owner": "rundeck", "provider-source-address": "registry.terraform.io/rundeck/rundeck", "repo": "terraform-provider-rundeck", - "rev": "v0.4.2", - "sha256": "0447hsmdf8k4464m56c7ipn9a05rv6hlrjb7q8b1jdwh2j5yq8pr", + "rev": "v0.4.3", + "sha256": "1bvk5mfjpl57dfglksnz1cnvd5qgk2cnidwiwjwa3ssmm2kzji8s", "vendorSha256": null, - "version": "0.4.2" + "version": "0.4.3" }, "scaleway": { "owner": "scaleway", "provider-source-address": "registry.terraform.io/scaleway/scaleway", "repo": "terraform-provider-scaleway", - "rev": "v2.2.0", - "sha256": "1l9cmdz46rhvbnlyxi3hyk8rszf44xphpz22w56mrbi91z1yr8c1", - "vendorSha256": "0f2nx0x6gpxw440s81mn7plg63zd0g4crnlbalmj6i2rjkpj48v5", - "version": "2.2.0" + "rev": "v2.2.1-rc.1", + "sha256": "0f4sizgcy3000k67nb3axa8xhpczvzdla3bnpda27jdrx22ckyz8", + "vendorSha256": "11g5v5kvs4qxdg34ai7fpinwbshrjwi9hxzav2vpnzhy8lfqpkzb", + "version": "2.2.1-rc.1" }, "secret": { "owner": "numtide", @@ -920,19 +964,19 @@ "owner": "selectel", "provider-source-address": "registry.terraform.io/selectel/selectel", "repo": "terraform-provider-selectel", - "rev": "v3.7.1", - "sha256": "02sfzrs3k907djcyjz7qn42b21wccykw0fw65ms34h5vz5ld73mx", - "vendorSha256": null, - "version": "3.7.1" + "rev": "v3.8.0", + "sha256": "0qc08v217cv2i43cxcx854rvhihrlhlakfark37vcdrh9z6swf1n", + "vendorSha256": "1mjp5yqwl1nya82yf5v6l3sq7iv0m94xy5w7y5avn8h40dl1wfnf", + "version": "3.8.0" }, "sentry": { "owner": "jianyuan", "provider-source-address": "registry.terraform.io/jianyuan/sentry", "repo": "terraform-provider-sentry", - "rev": "v0.6.0", - "sha256": "0246hv52kslrzj43dkbk8r8gimwz3sgzxsbv7sxwmk3ll3sl2zrk", - "vendorSha256": "1d4c8cg4a81mndrzwrsi1k9ll553csnb0r4avlq9hyc03z60dwdc", - "version": "0.6.0" + "rev": "v0.7.0", + "sha256": "09rxgq4m28nhwg6y51m5sq3d12lx7r1q3k76zrd5gpbxagqhvhkr", + "vendorSha256": "1wh2nf5q69j1p568c0q5yhlkd8ij3r8jg2769qy51wsj3bbv0wcj", + "version": "0.7.0" }, "shell": { "owner": "scottwinkler", @@ -940,17 +984,17 @@ "repo": "terraform-provider-shell", "rev": "v1.7.10", "sha256": "15pw8i1j47ppwrrh1gpfdkba54zab50ziqfqsc17pmv2gisq8d9d", - "vendorSha256": "0d76xpzfba4xxxafgw0k2dkm22xpzgsa2bf53jwrgwyfvjgvj41c", + "vendorSha256": "1vgs7nvqa25c0qxhj7jpjfphshxsqhxvxnr9ny7x4ghzg9ab90rh", "version": "1.7.10" }, "signalfx": { "owner": "splunk-terraform", "provider-source-address": "registry.terraform.io/splunk-terraform/signalfx", "repo": "terraform-provider-signalfx", - "rev": "v6.7.10", - "sha256": "113q9wwvz0lxn1l948g5mnwbpd76q8j2pm9q90nbkg1yvwsidsqi", - "vendorSha256": "124vw40rpnsmna6fkwb9qp8z31hlxn4dx7p7vgng32l1w7ddwmcp", - "version": "6.7.10" + "rev": "v6.8.1", + "sha256": "094a3avlvaacw8g45ll17x1wrch47m5bvj548rvmz77pdbhpzvr5", + "vendorSha256": "12c1lhyrl3bwnkvp4qw9wxawy54x3k86vh1dnnvf5n8916pvwcw0", + "version": "6.8.1" }, "skytap": { "owner": "skytap", @@ -974,10 +1018,10 @@ "owner": "spotinst", "provider-source-address": "registry.terraform.io/spotinst/spotinst", "repo": "terraform-provider-spotinst", - "rev": "v1.64.1", - "sha256": "0a0v1ydickmnn5gsv5lr97yv4lvhxf3q9mhhkl38ksijzd2radlz", - "vendorSha256": "1lv305kamb3xnw3a2q45ndn7a88ifnh8j8ngv7awc41028j539w4", - "version": "1.64.1" + "rev": "v1.68.0", + "sha256": "0llyy4rskspw4cy8jdbk175rli9s53mabj4b9yarm7apg17ai399", + "vendorSha256": "0j0airkc1p0y9w1w40fbwxmymf8rbal2ycrkp31x1c06f8s4lhzm", + "version": "1.68.0" }, "stackpath": { "owner": "stackpath", @@ -1001,10 +1045,10 @@ "owner": "SumoLogic", "provider-source-address": "registry.terraform.io/SumoLogic/sumologic", "repo": "terraform-provider-sumologic", - "rev": "v2.11.5", - "sha256": "1k3z0rbnqfjrz4awrmid03g7lmalkya7m60l22qdhpsc6c6pg0mp", - "vendorSha256": "0jfzyzlfvpkbxi60439hmsrn2qqm86ghb859jl4mphd6g7p75zdj", - "version": "2.11.5" + "rev": "v2.12.0", + "sha256": "04rrs6x9grkqqqrz3l3nqzp3vy03jw24l1grx2nbw8srpgw1pcwl", + "vendorSha256": "19zhpa47wxkxk2nixd960xz9xh38nq5ml7dwnimr4v1mpvw9hcgc", + "version": "2.12.0" }, "template": { "owner": "hashicorp", @@ -1019,19 +1063,19 @@ "owner": "tencentcloudstack", "provider-source-address": "registry.terraform.io/tencentcloudstack/tencentcloud", "repo": "terraform-provider-tencentcloud", - "rev": "v1.60.25", - "sha256": "0ag0h9cxjzmzz3iqh6c9czmfqd6zxg82n13nahlcg7qg1b0c2rvv", + "rev": "v1.61.8", + "sha256": "1a8p141m3kcr1irl9z3vpjs6zkgqp003z7m52yskapv4df8d6skz", "vendorSha256": null, - "version": "1.60.25" + "version": "1.61.8" }, "tfe": { "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/tfe", "repo": "terraform-provider-tfe", - "rev": "v0.27.0", - "sha256": "00lra2d8dzczlmx74cblk7hglj2dvlkkgv30ndb85fbmaq2jqw0n", - "vendorSha256": "1g77ghz4928kfpidqd92cy6xkrqmz2y97x7g7lb55mw3mxg2bsx5", - "version": "0.27.0" + "rev": "v0.28.1", + "sha256": "0xvah6qaf6kxgxhgzgh4rqswjda3366i6gqqwaiw4gc3w0ks2i3g", + "vendorSha256": "1qxbsnay75v6ss3fvi00rif10ra1l23b107d0v5cc1il4smqc36g", + "version": "0.28.1" }, "thunder": { "owner": "a10networks", @@ -1048,7 +1092,7 @@ "repo": "terraform-provider-time", "rev": "v0.7.2", "sha256": "02b7l65civmphhdax05ajvbfm2ilqf421di1p3vj1zysz194wgl2", - "vendorSha256": "sha256-oBgHd0KTAdlnAZZZdT1FOzcfC0afdIKoDEIwx/rMxRk=", + "vendorSha256": "06f5rkxcfc221jl84x4z8q5iydrv8lypancn05kxj0ck89vhf650", "version": "0.7.2" }, "tls": { @@ -1074,47 +1118,47 @@ "owner": "turbot", "provider-source-address": "registry.terraform.io/turbot/turbot", "repo": "terraform-provider-turbot", - "rev": "v1.8.2", - "sha256": "16nxngn7mx7049mar7azj03pyslmf9wri50kwhimkfjva0k9zbl7", + "rev": "v1.8.3", + "sha256": "0jx37w4sbm7gj8vqnb58rg24s6fafc73ds954vqh9rjn8a6x0qz9", "vendorSha256": null, - "version": "1.8.2" + "version": "1.8.3" }, "ucloud": { "owner": "ucloud", "provider-source-address": "registry.terraform.io/ucloud/ucloud", "repo": "terraform-provider-ucloud", - "rev": "v1.30.0", - "sha256": "1difp4nkyr8hp9l3ik5vdxl3kxiq9i342mmpc0j3drmr341djf1s", + "rev": "v1.31.0", + "sha256": "0maiqxrr1xl2q4lgpv0d78znsrrl95qi2bgpr5jd14w1kvw2bj73", "vendorSha256": null, - "version": "1.30.0" + "version": "1.31.0" }, "vault": { "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/vault", "repo": "terraform-provider-vault", - "rev": "v3.1.1", - "sha256": "15fwc0sfdpcl85194gq6r97y18ggh61wbyh6lq7nrprwn2xvjch9", - "vendorSha256": "1q2yfmg6g3bl6h0vzanz7874xc4g7ggmysh2dqryijvr4kccnari", - "version": "3.1.1" + "rev": "v3.3.0", + "sha256": "1b36c2f06fglf6bs6s4ly73vk1cm7zd1ci13df5wp0f2xxib3szk", + "vendorSha256": "0x9cyxnaqkfpzx9ml7qqhl98jslpy1v965kd11kgcvqpr9lmc77x", + "version": "3.3.0" }, "vcd": { "owner": "vmware", "provider-source-address": "registry.terraform.io/vmware/vcd", "repo": "terraform-provider-vcd", - "rev": "v3.4.0", - "sha256": "0lvpcw4d70888c0dssvpzbx8n67a52yb66kanqzp4is0clw4943g", - "vendorSha256": "19lwrr28fknv098s82cvczdb7xrcblsrh0jmzpn69gym5axcc2v9", - "version": "3.4.0" + "rev": "v3.5.1", + "sha256": "1fwkbsgnxn0jl84nji57grasdsbw0ydd7vzcllpv7r1z3jpa545q", + "vendorSha256": "0bzp6807l4hspk1c1pmgnzk0axk0nir3v0lqmw9xvkij4c5rnz9s", + "version": "3.5.1" }, "venafi": { "deleteVendor": true, "owner": "Venafi", "provider-source-address": "registry.terraform.io/Venafi/venafi", "repo": "terraform-provider-venafi", - "rev": "v0.13.0", - "sha256": "1gvr0g622ddc8sw7f1g6vqw6wvzmm26qqzw7dljmgbvch0xyal86", - "vendorSha256": "1hk8nwm29yfbvwy6h8lv136vvh8nynjnqifzjdriqv2ldxl6pykj", - "version": "0.13.0" + "rev": "v0.14.0", + "sha256": "16a7mr4dzfkvf9gg77dax92dp6g99plfg5qpzfhxdfanb25lq7za", + "vendorSha256": "0vmmki2pmg6ns75ldygyvj5pzl3blzz62zfqh4jsm1zbswfs75df", + "version": "0.14.0" }, "vercel": { "owner": "ondrejsika", @@ -1125,14 +1169,23 @@ "vendorSha256": "0s0kf1v2217q9hfmc7r2yybcfk33k566dfvs2jiq63kyjnadhb0k", "version": "2.1.0" }, + "vpsadmin": { + "owner": "vpsfreecz", + "provider-source-address": "registry.terraform.io/vpsfreecz/vpsadmin", + "repo": "terraform-provider-vpsadmin", + "rev": "v1.0.0", + "sha256": "1ci86ikdz8i6gwdiif4ayx15hjm9phr756rvywz8pblaa6niwl9h", + "vendorSha256": "1wc0kzinz39kv4gib438js2qv07ndm6yj2qpj041d75hnlq06drv", + "version": "1.0.0" + }, "vra7": { "owner": "vmware", "provider-source-address": "registry.terraform.io/vmware/vra7", "repo": "terraform-provider-vra7", - "rev": "v3.0.3", - "sha256": "0f4mc7gbjbzw4x6rw6cbhc9xrmkhwhvjdzcinvc96pfm2fy3cdxh", + "rev": "v3.0.4", + "sha256": "1w16cl27fqpzy1v6cdp61shgrmj787fdfjwhr719n57hqax4pck5", "vendorSha256": null, - "version": "3.0.3" + "version": "3.0.4" }, "vsphere": { "owner": "hashicorp", @@ -1147,10 +1200,10 @@ "owner": "vultr", "provider-source-address": "registry.terraform.io/vultr/vultr", "repo": "terraform-provider-vultr", - "rev": "v2.8.1", - "sha256": "1dhfxr6a4kj1llalfw76w36iw6vcdk1p0nb90kfkpg2sh58a6rid", + "rev": "v2.9.1", + "sha256": "1w6699ngk6vcjii9skhrzv93p79mn6rmyqbb7fdchrwcvamk3y9a", "vendorSha256": null, - "version": "2.8.1" + "version": "2.9.1" }, "wavefront": { "owner": "vmware", @@ -1165,9 +1218,9 @@ "owner": "yandex-cloud", "provider-source-address": "registry.terraform.io/yandex-cloud/yandex", "repo": "terraform-provider-yandex", - "rev": "v0.69.0", - "sha256": "0k4py0asibcpfl9w8q0bn3rfjxhxf6cs3g53j35qij3gakqf1w2i", - "vendorSha256": "0zx2lq9va0llrjlf3lk8pnx6f5knmi4jjxrnll89kp01imydjqv8", - "version": "0.69.0" + "rev": "v0.71.0", + "sha256": "1ccfmn6j96jy6hhqijjas31ylsmhs1gj8367v3b94mgam7p1pxcd", + "vendorSha256": "16cdg3j00dkmddxgb94as49470a67nv8linfm6s9vrx3xvjk04xw", + "version": "0.71.0" } } diff --git a/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/teleport/default.nix b/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/teleport/default.nix deleted file mode 100644 index 8544ac260bfd..000000000000 --- a/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/teleport/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ lib, fetchFromGitHub, buildGoModule, teleport }: - -buildGoModule rec { - pname = "terraform-provider-teleport"; - version = "8.0.6"; - - src = fetchFromGitHub { - owner = "gravitational"; - repo = "teleport-plugins"; - rev = "v${version}"; - sha256 = "1rhvpbw4dga256dp2cr5f912d2j7rh8pd1v88dlgq3mmw8n5c7vy"; - }; - vendorSha256 = null; - - checkInputs = [ teleport ]; - - sourceRoot = "source/terraform"; - - # Terraform allow checking the provider versions, but this breaks - # if the versions are not provided via file paths. - postBuild = '' - mv $NIX_BUILD_TOP/go/bin/{terraform,terraform-provider-teleport_v${version}} - ''; - - passthru.provider-source-address = "gravitational.com/teleport/teleport"; - - meta = with lib; { - description = "Provider for managing resources in Teleport access plane"; - homepage = "https://github.com/gravitational/teleport-plugins"; - license = licenses.asl20; - maintainers = with maintainers; [ justinas ]; - }; -} diff --git a/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/update-all-providers b/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/update-all-providers index 46f0ce1be561..57e1ab32f083 100755 --- a/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/update-all-providers +++ b/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/update-all-providers @@ -18,5 +18,5 @@ echo "${providers}" for provider in ${providers}; do echo "Updating ${provider}" - ./update-provider "${provider}" + ./update-provider "$@" "${provider}" done diff --git a/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/update-provider b/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/update-provider index 47206914f7a9..255e82aee1d3 100755 --- a/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/update-provider +++ b/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/update-provider @@ -11,7 +11,7 @@ shopt -s inherit_errexit show_usage() { cat <<DOC -Usage: ./update-provider [--force] [--vendor] [<owner>/]<provider> +Usage: ./update-provider [--force] [--no-build] [<owner>/]<provider> Update a single provider in the providers.json inventory file. @@ -27,14 +27,14 @@ to add the provider to the list: Options: * --force: Force the update even if the version matches. - * --vendor: Switch from go package to go modules with vendor. + * --no-build: Don't build provider * --vendor-sha256 <sha256>: Override the SHA256 or "null". DOC } force= provider= -vendor= +build=1 vendorSha256= while [[ $# -gt 0 ]]; do @@ -47,9 +47,8 @@ while [[ $# -gt 0 ]]; do force=1 shift ;; - --vendor) - force=1 - vendor=1 + --no-build) + build=0 shift ;; --vendor-sha256) @@ -142,14 +141,12 @@ update_attr rev "${rev}" sha256=$(prefetch_github "${org}" "${repo}" "${rev}") update_attr sha256 "${sha256}" -repo_root=$(git rev-parse --show-toplevel) - if [[ -z ${vendorSha256} ]]; then if [[ ${old_vendor_sha256} == null ]]; then vendorSha256=null - elif [[ -n ${old_vendor_sha256} || ${vendor} == 1 ]]; then + elif [[ -n ${old_vendor_sha256} ]]; then echo "=== Calculating vendorSha256 ===" - vendorSha256=$(nix-prefetch "{ sha256 }: (import ../../../../.. {}).terraform-providers.${provider_name}.go-modules.overrideAttrs (_: { vendorSha256 = sha256; })") + vendorSha256=$(nix-prefetch -I nixpkgs=../../../../.. "{ sha256 }: (import ../../../../.. {}).terraform-providers.${provider_name}.go-modules.overrideAttrs (_: { vendorSha256 = sha256; })") # Deal with nix unstable if [[ ${vendorSha256} == sha256-* ]]; then vendorSha256=$(nix --extra-experimental-features nix-command hash to-base32 "${vendorSha256}") @@ -162,5 +159,7 @@ if [[ -n ${vendorSha256} ]]; then fi # Check that the provider builds -echo "=== Building terraform-providers.${provider_name} ===" -nix-build --no-out-link "${repo_root}" -A "terraform-providers.${provider_name}" +if [[ ${build} == 1 ]]; then + echo "=== Building terraform-providers.${provider_name} ===" + nix-build --no-out-link ../../../../.. -A "terraform-providers.${provider_name}" +fi diff --git a/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/vpsadmin/default.nix b/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/vpsadmin/default.nix deleted file mode 100644 index 93401dfc635b..000000000000 --- a/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/vpsadmin/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ lib, fetchFromGitHub, buildGoModule }: -buildGoModule rec { - pname = "terraform-provider-vpsadmin"; - version = "0.1.0"; - - src = fetchFromGitHub { - owner = "vpsfreecz"; - repo = "terraform-provider-vpsadmin"; - rev = "v${version}"; - sha256 = "1vny6w9arbbra04bjjafisaswinm93ic1phy59l0g78sqf6x3a7v"; - }; - - vendorSha256 = "0j90fnzba23mwf9bzf9w5h0hszkl3h61p5i780s9v9c0hbzhbqsh"; - - doCheck = false; - - subPackages = [ "." ]; - - # Terraform allow checking the provider versions, but this breaks - # if the versions are not provided via file paths. - postInstall = "mv $out/bin/${pname}{,_v${version}}"; - - meta = with lib; { - description = "Terraform provider for vpsAdmin"; - homepage = "https://github.com/vpsfreecz/terraform-provider-vpsadmin"; - license = licenses.mpl20; - maintainers = with maintainers; [ zimbatm ]; - }; -} diff --git a/nixpkgs/pkgs/applications/networking/cluster/terraform/default.nix b/nixpkgs/pkgs/applications/networking/cluster/terraform/default.nix index a15305cba848..3954a143e5b8 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/terraform/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/terraform/default.nix @@ -62,9 +62,9 @@ let babariviere kalbasit marsam + maxeaubrey timstott zimbatm - maxeaubrey zowoq ]; }; @@ -76,39 +76,6 @@ let let actualPlugins = plugins terraform.plugins; - # Make providers available in Terraform 0.13 and 0.12 search paths. - pluginDir = lib.concatMapStrings - (pl: - let - inherit (pl) version GOOS GOARCH; - - pname = pl.pname or (throw "${pl.name} is missing a pname attribute"); - - # This is just the name, without the terraform-provider- prefix - plugin_name = lib.removePrefix "terraform-provider-" pname; - - slug = pl.passthru.provider-source-address or "registry.terraform.io/nixpkgs/${plugin_name}"; - - shim = writeText "shim" '' - #!${runtimeShell} - exec ${pl}/bin/${pname}_v${version} "$@" - ''; - in - '' - TF_0_13_PROVIDER_PATH=$out/plugins/${slug}/${version}/${GOOS}_${GOARCH}/${pname}_v${version} - mkdir -p "$(dirname $TF_0_13_PROVIDER_PATH)" - - cp ${shim} "$TF_0_13_PROVIDER_PATH" - chmod +x "$TF_0_13_PROVIDER_PATH" - - TF_0_12_PROVIDER_PATH=$out/plugins/${pname}_v${version} - - cp ${shim} "$TF_0_12_PROVIDER_PATH" - chmod +x "$TF_0_12_PROVIDER_PATH" - '' - ) - actualPlugins; - # Wrap PATH of plugins propagatedBuildInputs, plugins may have runtime dependencies on external binaries wrapperInputs = lib.unique (lib.flatten (lib.catAttrs "propagatedBuildInputs" @@ -119,7 +86,26 @@ let withPlugins (x: newplugins x ++ actualPlugins); full = withPlugins (p: lib.filter lib.isDerivation (lib.attrValues p)); - # Ouch + # Expose wrappers around the override* functions of the terraform + # derivation. + # + # Note that this does not behave as anyone would expect if plugins + # are specified. The overrides are not on the user-visible wrapper + # derivation but instead on the function application that eventually + # generates the wrapper. This means: + # + # 1. When using overrideAttrs, only `passthru` attributes will + # become visible on the wrapper derivation. Other overrides that + # modify the derivation *may* still have an effect, but it can be + # difficult to follow. + # + # 2. Other overrides may work if they modify the terraform + # derivation, or they may have no effect, depending on what + # exactly is being changed. + # + # 3. Specifying overrides on the wrapper is unsupported. + # + # See nixpkgs#158620 for details. overrideDerivation = f: (pluggable (terraform.overrideDerivation f)).withPlugins plugins; overrideAttrs = f: @@ -138,14 +124,35 @@ let inherit (terraform) name meta; nativeBuildInputs = [ makeWrapper ]; - buildCommand = pluginDir + '' + # Expose the passthru set with the override functions + # defined above, as well as any passthru values already + # set on `terraform` at this point (relevant in case a + # user overrides attributes). + passthru = terraform.passthru // passthru; + + buildCommand = '' + # Create wrappers for terraform plugins because Terraform only + # walks inside of a tree of files. + for providerDir in ${toString actualPlugins} + do + for file in $(find $providerDir/libexec/terraform-providers -type f) + do + relFile=''${file#$providerDir/} + mkdir -p $out/$(dirname $relFile) + cat <<WRAPPER > $out/$relFile + #!${runtimeShell} + exec "$file" "$@" + WRAPPER + chmod +x $out/$relFile + done + done + + # Create a wrapper for terraform to point it to the plugins dir. mkdir -p $out/bin/ makeWrapper "${terraform}/bin/terraform" "$out/bin/terraform" \ - --set NIX_TERRAFORM_PLUGIN_DIR $out/plugins \ + --set NIX_TERRAFORM_PLUGIN_DIR $out/libexec/terraform-providers \ --prefix PATH : "${lib.makeBinPath wrapperInputs}" ''; - - inherit passthru; }); in withPlugins (_: [ ]); @@ -160,20 +167,6 @@ rec { # Constructor for other terraform versions mkTerraform = attrs: pluggable (generic attrs); - terraform_0_12 = mkTerraform { - version = "0.12.31"; - sha256 = "03p698xdbk5gj0f9v8v1fpd74zng3948dyy4f2hv7zgks9hid7fg"; - patches = [ - ./provider-path.patch - (fetchpatch { - name = "fix-mac-mojave-crashes.patch"; - url = "https://github.com/hashicorp/terraform/commit/cd65b28da051174a13ac76e54b7bb95d3051255c.patch"; - sha256 = "1k70kk4hli72x8gza6fy3vpckdm3sf881w61fmssrah3hgmfmbrs"; - }) - ]; - passthru = { inherit plugins; }; - }; - terraform_0_13 = mkTerraform { version = "0.13.7"; sha256 = "1cahnmp66dk21g7ga6454yfhaqrxff7hpwpdgc87cswyq823fgjn"; @@ -184,7 +177,7 @@ rec { terraform_0_14 = mkTerraform { version = "0.14.11"; sha256 = "1yi1jj3n61g1kn8klw6l78shd23q79llb7qqwigqrx3ki2mp279j"; - vendorSha256 = "1d93aqkjdrvabkvix6h1qaxpjzv7w1wa7xa44czdnjs2lapx4smm"; + vendorSha256 = "sha256-tWrSr6JCS9s+I0T1o3jgZ395u8IBmh73XGrnJidWI7U="; patches = [ ./provider-path.patch ]; passthru = { inherit plugins; }; }; @@ -192,15 +185,15 @@ rec { terraform_0_15 = mkTerraform { version = "0.15.5"; sha256 = "18f4a6l24s3cym7gk40agxikd90i56q84wziskw1spy9rgv2yx6d"; - vendorSha256 = "12hrpxay6k3kz89ihyhl91c4lw4wp821ppa245w9977fq09fhnx0"; + vendorSha256 = "sha256-oFvoEsDunJR4IULdGwS6nHBKWEgUehgT+nNM41W/GYo="; patches = [ ./provider-path-0_15.patch ]; passthru = { inherit plugins; }; }; terraform_1 = mkTerraform { - version = "1.1.2"; - sha256 = "sha256-8M/hs4AiApe9C19VnVhWYYOkKqXbv3aREUTNfExTDww="; - vendorSha256 = "sha256-inPNvNUcil9X0VQ/pVgZdnnmn9UCfEz7qXiuKDj8RYM="; + version = "1.1.6"; + sha256 = "sha256-Y1ARRCzqYBUQqpqwVrH0PPOZ9IWnw51yfyGFD/6P/ro="; + vendorSha256 = "sha256-RhGiY/APd12v0Hoqw381Wlk4oDx7aZt5zZvqkR99rd0="; patches = [ ./provider-path-0_15.patch ]; passthru = { inherit plugins; }; }; diff --git a/nixpkgs/pkgs/applications/networking/cluster/terragrunt/default.nix b/nixpkgs/pkgs/applications/networking/cluster/terragrunt/default.nix index 3af96d828ad9..92810bcad4b0 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/terragrunt/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/terragrunt/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "terragrunt"; - version = "0.35.16"; + version = "0.36.1"; src = fetchFromGitHub { owner = "gruntwork-io"; repo = pname; rev = "v${version}"; - sha256 = "sha256-m32QhQUG3Dkh0odfqYhNmJ5Rrt0qf5wCvxePPusyRyI="; + sha256 = "sha256-aGVhxyPm5GtYjJlFNiPNxkPtdGdOiYOSkRRTlzyF/lM="; }; vendorSha256 = "sha256-tNgEepKqwiqXhmoRCIEg7VJw7Y0TGt+R+6dZzd8aECg="; diff --git a/nixpkgs/pkgs/applications/networking/cluster/terranix/default.nix b/nixpkgs/pkgs/applications/networking/cluster/terranix/default.nix index a8541336b3de..98ce3c474ff2 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/terranix/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/terranix/default.nix @@ -2,20 +2,20 @@ stdenv.mkDerivation rec { pname = "terranix"; - version = "2.5.0"; + version = "2.5.3"; src = fetchFromGitHub { owner = "mrVanDalo"; repo = "terranix"; rev = version; - sha256 = "sha256-HDiyJGgyDUoLnpL8N+wDm3cM/vEfYYc/p4N1kKH/kLk="; + sha256 = "sha256-Jhq0pkyF1KWJ6HgeWLoRfIxo7QHvOwwXzsIxZQgQtK4="; }; nativeBuildInputs = [ makeWrapper ]; installPhase = '' mkdir -p $out/{bin,core,modules,lib} - mv bin core modules lib $out/ + mv bin core modules lib share $out/ wrapProgram $out/bin/terranix-doc-json \ --prefix PATH : ${lib.makeBinPath [ jq nix ]} diff --git a/nixpkgs/pkgs/applications/networking/cluster/tgswitch/default.nix b/nixpkgs/pkgs/applications/networking/cluster/tgswitch/default.nix index 9a1652f25d36..560e593ba19c 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/tgswitch/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/tgswitch/default.nix @@ -1,13 +1,13 @@ { buildGoPackage, lib, fetchFromGitHub }: buildGoPackage rec { pname = "tgswitch"; - version = "0.5.378"; + version = "0.5.382"; src = fetchFromGitHub { owner = "warrensbox"; repo = "tgswitch"; rev = version; - sha256 = "0q2aqh75acbpkmvkws0rl3d5dzq3sisy637c0x6cnc88h34g3n3i"; + sha256 = "sha256-DbPf1o1XlXLpuYSrNMRwHRqi/urQhSfzPW5BPIvZC/Y="; }; goPackagePath = "github.com/warrensbox/tgswitch"; diff --git a/nixpkgs/pkgs/applications/networking/cluster/tilt/default.nix b/nixpkgs/pkgs/applications/networking/cluster/tilt/default.nix index dbdf06771b46..47392ea83a54 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/tilt/default.nix +++ b/nixpkgs/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.23.4"; + version = "0.25.1"; src = fetchFromGitHub { owner = "tilt-dev"; repo = pname; rev = "v${version}"; - sha256 = "sha256-SWofXsbkuirPvqgU639W8IQklafLKbThoZUzOzfYwdQ="; + sha256 = "sha256-dvY5kiLJ3psoQxG12E4qOjgF9GdXpjRKU3HlbPvwWBU="; }; vendorSha256 = null; diff --git a/nixpkgs/pkgs/applications/networking/cluster/vcluster/default.nix b/nixpkgs/pkgs/applications/networking/cluster/vcluster/default.nix new file mode 100644 index 000000000000..b41e443ba327 --- /dev/null +++ b/nixpkgs/pkgs/applications/networking/cluster/vcluster/default.nix @@ -0,0 +1,45 @@ +{ lib, buildGoModule, fetchFromGitHub, installShellFiles }: + +buildGoModule rec { + pname = "vcluster"; + version = "0.5.3"; + + src = fetchFromGitHub { + owner = "loft-sh"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-+rLDRVfB6wZ1wYoLE2wwRxzS6GmI6KYtOKdXZd+LnnU="; + }; + + vendorSha256 = null; + + subPackages = [ "cmd/vclusterctl" ]; + + nativeBuildInputs = [ installShellFiles ]; + + ldflags = [ "-s" "-w" ]; + + # Test is disabled because e2e tests expect k8s. + doCheck = false; + + installPhase = '' + runHook preInstall + mkdir -p $out/bin + install -Dm755 "$GOPATH/bin/vclusterctl" -T $out/bin/vcluster + runHook postInstall + ''; + + postInstall = '' + installShellCompletion --cmd vcluster \ + --bash <($out/bin/vcluster completion bash) \ + --zsh <($out/bin/vcluster completion zsh) + ''; + + meta = with lib; { + description = "Create fully functional virtual Kubernetes clusters"; + downloadPage = "https://github.com/loft-sh/vcluster"; + homepage = "https://www.vcluster.com/"; + license = licenses.asl20; + maintainers = with maintainers; [ peterromfeldhk ]; + }; +} diff --git a/nixpkgs/pkgs/applications/networking/cluster/waypoint/default.nix b/nixpkgs/pkgs/applications/networking/cluster/waypoint/default.nix index b0d0d6193e27..4a78f01a1cae 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/waypoint/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/waypoint/default.nix @@ -2,17 +2,16 @@ buildGoModule rec { pname = "waypoint"; - version = "0.4.1"; + version = "0.7.1"; src = fetchFromGitHub { owner = "hashicorp"; repo = pname; rev = "v${version}"; - sha256 = "sha256-JB/0nU/05Agh4fWFeSfrUHFtR8cQjxdXW0QHAoH0dDc="; + sha256 = "1vcwzksixc9n016gf8zavkdk7ba33zkmymclvjwb32pwsanvzdz7"; }; - deleteVendor = true; - vendorSha256 = "sha256-2YrCRdpRk+gPHN8flahgWb2sbK5dYL5ivVqeJSsiy8Y="; + vendorSha256 = "0v4xk1ia6zhh4h2rgpinfl0hs300lk84vabm35mjahch7kmvfhvb"; nativeBuildInputs = [ go-bindata installShellFiles ]; @@ -77,7 +76,6 @@ buildGoModule rec { through a consistent and repeatable workflow. ''; license = licenses.mpl20; - maintainers = with maintainers; [ winpat jk ]; - platforms = platforms.linux; + maintainers = with maintainers; [ winpat jk techknowlogick ]; }; } diff --git a/nixpkgs/pkgs/applications/networking/cluster/werf/default.nix b/nixpkgs/pkgs/applications/networking/cluster/werf/default.nix index 6883a33964c0..2769ec44ea2b 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/werf/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/werf/default.nix @@ -11,15 +11,15 @@ buildGoModule rec { pname = "werf"; - version = "1.2.55"; + version = "1.2.69"; src = fetchFromGitHub { owner = "werf"; repo = "werf"; rev = "v${version}"; - sha256 = "sha256-yLrCE0C8+LIXnBm4xG4q0vXtjTyau6mjkZ+/o/lbGhI="; + sha256 = "sha256-rmDP8qPOPhUrygt5gAF2MOVNCHqh+1Gc50mnVFXpev4="; }; - vendorSha256 = "sha256-xALB4QCIVpN0s1rR/fvHZFlFDf2trtG8yJKJLBRH4pw="; + vendorSha256 = "sha256-PNg4QEi9+LvYWWhj2B6OrP+SBanuINlSGZYCMNjOQv0="; proxyVendor = true; nativeBuildInputs = [ pkg-config ]; diff --git a/nixpkgs/pkgs/applications/networking/compactor/default.nix b/nixpkgs/pkgs/applications/networking/compactor/default.nix index f4535c9120cd..459b5652089c 100644 --- a/nixpkgs/pkgs/applications/networking/compactor/default.nix +++ b/nixpkgs/pkgs/applications/networking/compactor/default.nix @@ -1,59 +1,71 @@ -{ autoconf, automake, boost, cbor-diag, cddl, fetchFromGitHub, file, libctemplate, libmaxminddb -, libpcap, libtins, libtool, xz, openssl, pkg-config, lib, stdenv, tcpdump, wireshark-cli +{ lib, stdenv, fetchFromGitHub +, asciidoctor, autoreconfHook, pkg-config +, boost, libctemplate, libmaxminddb, libpcap, libtins, openssl, protobuf, xz, zlib +, cbor-diag, cddl, diffutils, file, mktemp, netcat, tcpdump, wireshark-cli }: stdenv.mkDerivation rec { pname = "compactor"; - version = "1.1.0"; + version = "1.2.0"; src = fetchFromGitHub { owner = "dns-stats"; repo = pname; rev = version; - sha256 = "0qykdnwi2q9sajkkc2sl5f00lvxjfymqjzqm0limsziykanh87c0"; + fetchSubmodules = true; + hash = "sha256-AUNPUk70VwJ0nZgMPLMU258nqkL4QP6km0USrZi2ea0="; }; - # cbor-diag, cddl and wireshark-cli are only used for tests. - nativeBuildInputs = [ autoconf automake libtool pkg-config cbor-diag cddl wireshark-cli ]; + nativeBuildInputs = [ + asciidoctor + autoreconfHook + pkg-config + ]; buildInputs = [ boost + libctemplate + libmaxminddb libpcap - openssl libtins + openssl + protobuf xz - libctemplate - libmaxminddb + zlib ]; - prePatch = '' + postPatch = '' patchShebangs test-scripts/ ''; preConfigure = '' - ${stdenv.shell} autogen.sh substituteInPlace configure \ --replace "/usr/bin/file" "${file}/bin/file" ''; - CXXFLAGS = "-std=c++11"; + configureFlags = [ "--with-boost-libdir=${boost.out}/lib" "--with-boost=${boost.dev}" ]; enableParallelBuilding = true; - doCheck = true; - preCheck = '' - substituteInPlace test-scripts/check-live-pcap.sh \ - --replace "/usr/sbin/tcpdump" "${tcpdump}/bin/tcpdump" - rm test-scripts/same-tshark-output.sh - ''; # TODO: https://github.com/dns-stats/compactor/issues/49 (failing test) + doCheck = !stdenv.isDarwin; # check-dnstap.sh failing on Darwin + checkInputs = [ + cbor-diag + cddl + diffutils + file + mktemp + netcat + tcpdump + wireshark-cli + ]; meta = with lib; { description = "Tools to capture DNS traffic and record it in C-DNS files"; - homepage = "http://dns-stats.org/"; + homepage = "https://dns-stats.org/"; changelog = "https://github.com/dns-stats/${pname}/raw/${version}/ChangeLog.txt"; - license = [ licenses.boost licenses.mpl20 licenses.openssl ]; + license = licenses.mpl20; maintainers = with maintainers; [ fdns ]; - platforms = lib.platforms.unix; + platforms = platforms.unix; }; } diff --git a/nixpkgs/pkgs/applications/networking/dnscontrol/default.nix b/nixpkgs/pkgs/applications/networking/dnscontrol/default.nix index 92421b33a21c..8b6a5e2cc258 100644 --- a/nixpkgs/pkgs/applications/networking/dnscontrol/default.nix +++ b/nixpkgs/pkgs/applications/networking/dnscontrol/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "dnscontrol"; - version = "3.13.1"; + version = "3.14.0"; src = fetchFromGitHub { owner = "StackExchange"; repo = pname; rev = "v${version}"; - sha256 = "sha256-S3/uxtrCFU9HbNhYKqOYy1ytSVi2DU/lXIlhBgNnaPg="; + sha256 = "sha256-4az63Ff4aUAFMZoQeHshS9TxA/BIyHFZ/svFgAsU6WU="; }; - vendorSha256 = "sha256-OwiZL+MBmAFtV8Vg2Wl9yAeTG3AzMSmCjefxObU7lfQ="; + vendorSha256 = "sha256-KbM2bKYnllxTw4B9W5E8iLZKvN/DJqBmWkXXLhEtsSQ="; subPackages = [ "." ]; diff --git a/nixpkgs/pkgs/applications/networking/feedreaders/photon/default.nix b/nixpkgs/pkgs/applications/networking/feedreaders/photon/default.nix new file mode 100644 index 000000000000..0a02c1db1818 --- /dev/null +++ b/nixpkgs/pkgs/applications/networking/feedreaders/photon/default.nix @@ -0,0 +1,27 @@ +{ buildGoModule, fetchFromSourcehut, lib, xorg }: + +buildGoModule rec { + pname = "photon"; + version = "unstable-2022-01-11"; + + src = fetchFromSourcehut { + owner = "~ghost08"; + repo = "photon"; + rev = "5d1f7dd8d0d526096886b03c7bc0ef56cbdd6d79"; + sha256 = "sha256-2RSGLWfthcChd5YhDSBfLSch6wuTUv1Sh1f7flgzQwc="; + }; + + buildInputs = [ xorg.libX11 ]; + + proxyVendor = true; + + vendorSha256 = "sha256-1vlgnY4kZJfoAtbv+r8onxL03Ak32zKLJgtrBYZX09g="; + + meta = with lib; { + description = "RSS/Atom reader with the focus on speed, usability and a bit of unix philosophy"; + homepage = "https://sr.ht/~ghost08/photon"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ kmein ]; + platforms = platforms.linux; + }; +} diff --git a/nixpkgs/pkgs/applications/networking/feedreaders/rssguard/default.nix b/nixpkgs/pkgs/applications/networking/feedreaders/rssguard/default.nix index c3c58dc07568..4f9d5852cbf9 100644 --- a/nixpkgs/pkgs/applications/networking/feedreaders/rssguard/default.nix +++ b/nixpkgs/pkgs/applications/networking/feedreaders/rssguard/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "rssguard"; - version = "4.0.4"; + version = "4.1.2"; src = fetchFromGitHub { owner = "martinrotter"; repo = pname; rev = version; - sha256 = "sha256-c6+SlZx3ACG0nJRW+zcDDzVd/oSLAdSaq2fHrPpt6zw="; + sha256 = "sha256-aG7Wkn2CHe7Dumskd0+DMja95lzvBWnFXACSqfU7Ow0="; }; buildInputs = [ qtwebengine qttools ]; diff --git a/nixpkgs/pkgs/applications/networking/flexget/default.nix b/nixpkgs/pkgs/applications/networking/flexget/default.nix index 950dd24f3309..6c3a9b769350 100644 --- a/nixpkgs/pkgs/applications/networking/flexget/default.nix +++ b/nixpkgs/pkgs/applications/networking/flexget/default.nix @@ -2,14 +2,14 @@ python3Packages.buildPythonApplication rec { pname = "flexget"; - version = "3.2.7"; + version = "3.2.18"; # Fetch from GitHub in order to use `requirements.in` src = fetchFromGitHub { owner = "flexget"; repo = "flexget"; rev = "v${version}"; - sha256 = "12nj1jcxbkpc0x59rg59fsryignpppsx0wiwncdv6fzr58pdhd3v"; + sha256 = "sha256-68tD7I7MI/Cp94tp6c4lQx+8xwRnJTKTF/3SWz4Ddgg="; }; postPatch = '' diff --git a/nixpkgs/pkgs/applications/networking/ftp/filezilla/default.nix b/nixpkgs/pkgs/applications/networking/ftp/filezilla/default.nix index 0ffa9e1023bd..d5e73f833c3a 100644 --- a/nixpkgs/pkgs/applications/networking/ftp/filezilla/default.nix +++ b/nixpkgs/pkgs/applications/networking/ftp/filezilla/default.nix @@ -18,11 +18,11 @@ stdenv.mkDerivation rec { pname = "filezilla"; - version = "3.57.0"; + version = "3.58.0"; src = fetchurl { url = "https://download.filezilla-project.org/client/FileZilla_${version}_src.tar.bz2"; - sha256 = "sha256-gr9scHfKEwElSTVrRjlS8STuBIdvIeS6cgrMmBHImcc="; + sha256 = "sha256-0P5/cuAfd0K6oGRmgYsYbo6R//Ytbuey8OiEtrM4XYg="; }; # https://www.linuxquestions.org/questions/slackware-14/trouble-building-filezilla-3-47-2-1-current-4175671182/#post6099769 diff --git a/nixpkgs/pkgs/applications/networking/gftp/default.nix b/nixpkgs/pkgs/applications/networking/ftp/gftp/default.nix index 947a75d0e2d2..37338d31e0dc 100644 --- a/nixpkgs/pkgs/applications/networking/gftp/default.nix +++ b/nixpkgs/pkgs/applications/networking/ftp/gftp/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "gftp"; - version = "2.7.0b"; + version = "2.8.0b"; src = fetchFromGitHub { owner = "masneyb"; repo = pname; rev = version; - hash = "sha256-cIB3SneYKavgdI8eTtM1qsOrBJJ0c7/3CEvNPishNog="; + hash = "sha256-syeRFpqbd1VhKhhs/fIByDSVpcY+SAlmikDo3J1ZHlo="; }; nativeBuildInputs = [ @@ -32,6 +32,7 @@ stdenv.mkDerivation rec { libtool pkg-config ]; + buildInputs = [ gtk ncurses @@ -39,12 +40,12 @@ stdenv.mkDerivation rec { readline ]; - hardeningDisable = [ "format" ]; - preConfigure = '' ./autogen.sh ''; + hardeningDisable = [ "format" ]; + meta = with lib; { homepage = "https://github.com/masneyb/gftp"; description = "GTK-based multithreaded FTP client for *nix-based machines"; diff --git a/nixpkgs/pkgs/applications/networking/giara/default.nix b/nixpkgs/pkgs/applications/networking/giara/default.nix index 1f4d2e0a2d90..b17430dc09bd 100644 --- a/nixpkgs/pkgs/applications/networking/giara/default.nix +++ b/nixpkgs/pkgs/applications/networking/giara/default.nix @@ -1,22 +1,24 @@ { lib , fetchFromGitLab +, fetchpatch , meson , gobject-introspection , pkg-config , ninja , python3 -, wrapGAppsHook -, gtk3 +, wrapGAppsHook4 +, gtk4 , gdk-pixbuf , webkitgtk -, gtksourceview4 -, libhandy +, gtksourceview5 , glib-networking +, libadwaita +, appstream }: python3.pkgs.buildPythonApplication rec { pname = "giara"; - version = "0.3"; + version = "1.0"; format = "other"; @@ -25,24 +27,25 @@ python3.pkgs.buildPythonApplication rec { owner = "World"; repo = pname; rev = version; - sha256 = "004qmkfrgd37axv0b6hfh6v7nx4pvy987k5yv4bmlmkj9sbqm6f9"; + hash = "sha256-xDIzgr8zYal0r0sASWqiSZANCMC52LrVmLjlnGAd2Mg="; }; nativeBuildInputs = [ + appstream meson gobject-introspection pkg-config ninja - wrapGAppsHook + wrapGAppsHook4 ]; buildInputs = [ - gtk3 + gtk4 gdk-pixbuf webkitgtk - gtksourceview4 - libhandy + gtksourceview5 glib-networking + libadwaita ]; pythonPath = with python3.pkgs; [ @@ -55,6 +58,21 @@ python3.pkgs.buildPythonApplication rec { beautifulsoup4 ]; + patches = [ + # Proper support for gtk4 and libadwaita + # @TODO: Remove when bumping the version. + (fetchpatch { + name = "giara-gtk4-libadwaita.patch"; + url = "https://gitlab.gnome.org/World/giara/-/commit/6204427f8b8e3d8c72b669717a3f129ffae401d9.patch"; + sha256 = "sha256-E8kbVsACPD2gkfNrzYUy0+1U7+/pIkUu4rCkX+xY0us="; + }) + ]; + + postPatch = '' + substituteInPlace meson_post_install.py \ + --replace "gtk-update-icon-cache" "gtk4-update-icon-cache" + ''; + # Fix setup-hooks https://github.com/NixOS/nixpkgs/issues/56943 strictDeps = false; diff --git a/nixpkgs/pkgs/applications/networking/gmailctl/default.nix b/nixpkgs/pkgs/applications/networking/gmailctl/default.nix index ff620989f9de..f024de8d55ed 100644 --- a/nixpkgs/pkgs/applications/networking/gmailctl/default.nix +++ b/nixpkgs/pkgs/applications/networking/gmailctl/default.nix @@ -26,7 +26,7 @@ buildGoModule rec { --zsh <($out/bin/gmailctl completion zsh) ''; - vendorSha256 = "sha256-zEWEcv6G/9tmM6/+lhMFkyew3r/pvQRjvh74BENTYI4="; + vendorSha256 = "sha256-nAczO439tRiQU9f9LbJVENJiURVRnBAInwUp699RxOY="; doCheck = false; diff --git a/nixpkgs/pkgs/applications/networking/gns3/default.nix b/nixpkgs/pkgs/applications/networking/gns3/default.nix index b3d8a5b3fead..5bb125c10077 100644 --- a/nixpkgs/pkgs/applications/networking/gns3/default.nix +++ b/nixpkgs/pkgs/applications/networking/gns3/default.nix @@ -1,7 +1,7 @@ { callPackage, libsForQt5 }: let - stableVersion = "2.2.18"; + stableVersion = "2.2.29"; previewVersion = stableVersion; addVersion = args: let version = if args.stable then stableVersion else previewVersion; @@ -18,16 +18,16 @@ let }); }; commonOverrides = [ - (mkOverride "psutil" "5.6.7" - "1an5llivfkwpbcfaapbx78p8sfnvzyfypf60wfxihib1mjr8xbgz") + (mkOverride "psutil" "5.8.0" + "sha256-DJzLmat2Al8vC77PNB1GVunBNR24zIoDzNYuMYq0tcY=") (mkOverride "jsonschema" "3.2.0" "0ykr61yiiizgvm3bzipa3l73rvj49wmrybbfwhvpgk3pscl5pa68") ]; }; mkGui = args: libsForQt5.callPackage (import ./gui.nix (addVersion args // extraArgs)) { }; mkServer = args: callPackage (import ./server.nix (addVersion args // extraArgs)) { }; - guiSrcHash = "118z6asl6hsv0777rld4plnrwzkbkh3gb9lg9i6bqrjs93p028fw"; - serverSrcHash = "0gd37zpvibhlvqqpflpwlrgg8g9rpbxwi9w9fsym00mfwf7sdd3b"; + guiSrcHash = "04yqh0kq5pkmadcxf090ilh9sqqxajcg65nf7ai1iikxi3x7z3r8"; + serverSrcHash = "0p6q421rldmyqi0padssgrssf4d9mb5ifiqjm5y8vfhwfl5a2cqk"; in { guiStable = mkGui { stable = true; diff --git a/nixpkgs/pkgs/applications/networking/gns3/gui.nix b/nixpkgs/pkgs/applications/networking/gns3/gui.nix index a88ff36a8ca4..95ec995cbfd5 100644 --- a/nixpkgs/pkgs/applications/networking/gns3/gui.nix +++ b/nixpkgs/pkgs/applications/networking/gns3/gui.nix @@ -7,7 +7,21 @@ let ]; python = python3.override { - packageOverrides = lib.foldr lib.composeExtensions (self: super: { }) defaultOverrides; + packageOverrides = lib.foldr lib.composeExtensions (self: super: { + jsonschema = super.jsonschema.overridePythonAttrs (oldAttrs: rec { + version = "3.2.0"; + + src = super.fetchPypi { + inherit (oldAttrs) pname; + inherit version; + sha256 = "sha256-yKhbKNN3zHc35G4tnytPRO48Dh3qxr9G3e/HGH0weXo="; + }; + + SETUPTOOLS_SCM_PRETEND_VERSION = version; + + doCheck = false; + }); + }) defaultOverrides; }; in python.pkgs.buildPythonPackage rec { pname = "gns3-gui"; @@ -32,6 +46,10 @@ in python.pkgs.buildPythonPackage rec { postFixup = '' wrapQtApp "$out/bin/gns3" ''; + postPatch = '' + substituteInPlace requirements.txt \ + --replace "sentry-sdk==1.3.1" "sentry-sdk>=1.3.1" \ + ''; meta = with lib; { description = "Graphical Network Simulator 3 GUI (${branch} release)"; diff --git a/nixpkgs/pkgs/applications/networking/gns3/server.nix b/nixpkgs/pkgs/applications/networking/gns3/server.nix index 9feceffc0346..818c01a89ab4 100644 --- a/nixpkgs/pkgs/applications/networking/gns3/server.nix +++ b/nixpkgs/pkgs/applications/networking/gns3/server.nix @@ -8,22 +8,37 @@ let (self: super: { aiofiles = super.aiofiles.overridePythonAttrs (oldAttrs: rec { pname = "aiofiles"; - version = "0.5.0"; + version = "0.7.0"; src = fetchFromGitHub { owner = "Tinche"; repo = pname; rev = "v${version}"; - sha256 = "17bsg2x5r0q6jy74hajnbp717pvbf752w0wgih6pbb4hdvfg5lcf"; + sha256 = "sha256-njQ7eRYJO+dUrwO5pZwKHXn9nVSGYcEhwhs3x5BMc28="; }; doCheck = false; }); + + jsonschema = super.jsonschema.overridePythonAttrs (oldAttrs: rec { + version = "3.2.0"; + + src = super.fetchPypi { + inherit (oldAttrs) pname; + inherit version; + sha256 = "sha256-yKhbKNN3zHc35G4tnytPRO48Dh3qxr9G3e/HGH0weXo="; + }; + + SETUPTOOLS_SCM_PRETEND_VERSION = version; + + doCheck = false; + }); + }) ]; python = python3.override { packageOverrides = lib.foldr lib.composeExtensions (self: super: { }) ([ packageOverrides ] ++ defaultOverrides); }; -in python.pkgs.buildPythonPackage { +in python.pkgs.buildPythonApplication { pname = "gns3-server"; inherit version; @@ -36,8 +51,10 @@ in python.pkgs.buildPythonPackage { postPatch = '' substituteInPlace requirements.txt \ - --replace "aiohttp==3.6.2" "aiohttp>=3.6.2" \ - --replace "py-cpuinfo==7.0.0" "py-cpuinfo>=8.0.0" + --replace "aiohttp==3.7.4" "aiohttp>=3.7.4" \ + --replace "Jinja2==3.0.1" "Jinja2>=3.0.1" \ + --replace "sentry-sdk==1.3.1" "sentry-sdk>=1.3.1" \ + --replace "async-timeout==3.0.1" "async-timeout>=3.0.1" \ ''; propagatedBuildInputs = with python.pkgs; [ diff --git a/nixpkgs/pkgs/applications/networking/hyprspace/default.nix b/nixpkgs/pkgs/applications/networking/hyprspace/default.nix index 037feccca4ed..5482ce12e253 100644 --- a/nixpkgs/pkgs/applications/networking/hyprspace/default.nix +++ b/nixpkgs/pkgs/applications/networking/hyprspace/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "hyprspace"; - version = "0.1.7"; + version = "0.2.2"; propagatedBuildInputs = lib.optional stdenv.isDarwin iproute2mac; @@ -10,10 +10,10 @@ buildGoModule rec { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-Ecdxs6see4uexY6DatZ/VSGgWR81zRjo3AeAsXSjJ4A="; + sha256 = "sha256-UlIQCy4moW58tQ1dqxrPsU5LN1Bs/Jy5X+2CEmXdYIk="; }; - vendorSha256 = "sha256-nFiBHhtvTu9Ya6n1KUF+pOXrksHMOph7ABVtGSWVWlo="; + vendorSha256 = "sha256-EV59sXmjunWs+MC++CwyuBlbWzWZI1YXDLEsOaESgRU="; meta = with lib; { description = "A Lightweight VPN Built on top of Libp2p for Truly Distributed Networks."; diff --git a/nixpkgs/pkgs/applications/networking/ids/zeek/default.nix b/nixpkgs/pkgs/applications/networking/ids/zeek/default.nix index 20623ac31827..e91b517e8158 100644 --- a/nixpkgs/pkgs/applications/networking/ids/zeek/default.nix +++ b/nixpkgs/pkgs/applications/networking/ids/zeek/default.nix @@ -21,16 +21,33 @@ stdenv.mkDerivation rec { pname = "zeek"; - version = "4.1.1"; + version = "4.2.0"; src = fetchurl { url = "https://download.zeek.org/zeek-${version}.tar.gz"; - sha256 = "0wq3kjc3zc5ikzwix7k7gr92v75rg6283kx5fzvc3lcdkaczq2lc"; + sha256 = "sha256-jZoCjKn+x61KnkinY+KWBSOEz0AupM03FXe/8YPCdFE="; }; - nativeBuildInputs = [ cmake flex bison file ]; - buildInputs = [ openssl libpcap zlib curl libmaxminddb gperftools python3 swig ncurses ] - ++ lib.optionals stdenv.isDarwin [ gettext ]; + nativeBuildInputs = [ + bison + cmake + file + flex + ]; + + buildInputs = [ + curl + gperftools + libmaxminddb + libpcap + ncurses + openssl + python3 + swig + zlib + ] ++ lib.optionals stdenv.isDarwin [ + gettext + ]; outputs = [ "out" "lib" "py" ]; @@ -54,7 +71,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - description = "Powerful network analysis framework much different from a typical IDS"; + description = "Network analysis framework much different from a typical IDS"; homepage = "https://www.zeek.org"; changelog = "https://github.com/zeek/zeek/blob/v${version}/CHANGES"; license = licenses.bsd3; diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/alfaview/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/alfaview/default.nix index bf674ef44426..764ba6a0d79e 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/alfaview/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/alfaview/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "alfaview"; - version = "8.34.0"; + version = "8.37.0"; src = fetchurl { url = "https://production-alfaview-assets.alfaview.com/stable/linux/${pname}_${version}.deb"; - sha256 = "sha256-85bsu6l/B+lHkjFBXNQ9BEzOn1oYTsFgungG06p9nD0="; + sha256 = "sha256-hU4tqDu95ej8ChiWJq3ZPhEwxBcmTQkA/n///pPVa5U="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/baresip/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/baresip/default.nix index 122433d197aa..95afcfae4f2b 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/baresip/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/baresip/default.nix @@ -1,17 +1,60 @@ -{ lib, stdenv, fetchurl, zlib, openssl, libre, librem, pkg-config, gst_all_1 -, cairo, mpg123, alsa-lib, SDL, libv4l, celt, libsndfile, srtp, ffmpeg -, gsm, speex, portaudio, spandsp, libuuid, libvpx +{ lib +, stdenv +, fetchFromGitHub +, zlib +, openssl +, libre +, librem +, pkg-config +, gst_all_1 +, cairo +, mpg123 +, alsa-lib +, SDL2 +, libv4l +, celt +, libsndfile +, srtp +, ffmpeg +, gsm +, speex +, portaudio +, spandsp3 +, libuuid +, libvpx }: stdenv.mkDerivation rec { - version = "0.6.5"; + version = "1.1.0"; pname = "baresip"; - src=fetchurl { - url = "http://www.creytiv.com/pub/baresip-${version}.tar.gz"; - sha256 = "13di0ycdcr2q2a20mjvyaqfmvk5xldwqaxklqsz7470jnbc5n0rb"; + src = fetchFromGitHub { + owner = "baresip"; + repo = "baresip"; + rev = "v${version}"; + sha256 = "sha256-9mc1Beo7/iNhDXSDC/jiTL+lJRt8ah/1xF1heoHTE+g="; }; + postPatch = '' + patchShebangs modules/ctrl_dbus/gen.sh + ''; nativeBuildInputs = [ pkg-config ]; - buildInputs = [zlib openssl libre librem cairo mpg123 - alsa-lib SDL libv4l celt libsndfile srtp ffmpeg gsm speex portaudio spandsp libuuid + buildInputs = [ + zlib + openssl + libre + librem + cairo + mpg123 + alsa-lib + SDL2 + libv4l + celt + libsndfile + srtp + ffmpeg + gsm + speex + portaudio + spandsp3 + libuuid libvpx ] ++ (with gst_all_1; [ gstreamer gst-libav gst-plugins-base gst-plugins-bad gst-plugins-good ]); makeFlags = [ @@ -23,30 +66,55 @@ stdenv.mkDerivation rec { "USE_VIDEO=1" "CCACHE_DISABLE=1" - "USE_ALSA=1" "USE_AMR=1" "USE_CAIRO=1" "USE_CELT=1" - "USE_CONS=1" "USE_EVDEV=1" "USE_FFMPEG=1" "USE_GSM=1" "USE_GST1=1" - "USE_L16=1" "USE_MPG123=1" "USE_OSS=1" "USE_PLC=1" "USE_VPX=1" - "USE_PORTAUDIO=1" "USE_SDL=1" "USE_SNDFILE=1" "USE_SPEEX=1" - "USE_SPEEX_AEC=1" "USE_SPEEX_PP=1" "USE_SPEEX_RESAMP=1" "USE_SRTP=1" - "USE_STDIO=1" "USE_SYSLOG=1" "USE_UUID=1" "USE_V4L2=1" "USE_X11=1" + "USE_ALSA=1" + "USE_AMR=1" + "USE_CAIRO=1" + "USE_CELT=1" + "USE_CONS=1" + "USE_EVDEV=1" + "USE_FFMPEG=1" + "USE_GSM=1" + "USE_GST1=1" + "USE_L16=1" + "USE_MPG123=1" + "USE_OSS=1" + "USE_PLC=1" + "USE_VPX=1" + "USE_PORTAUDIO=1" + "USE_SDL=1" + "USE_SNDFILE=1" + "USE_SPEEX=1" + "USE_SPEEX_AEC=1" + "USE_SPEEX_PP=1" + "USE_SPEEX_RESAMP=1" + "USE_SRTP=1" + "USE_STDIO=1" + "USE_SYSLOG=1" + "USE_UUID=1" + "USE_V4L2=1" + "USE_X11=1" - "USE_BV32=" "USE_COREAUDIO=" "USE_G711=1" "USE_G722=1" "USE_G722_1=" - "USE_ILBC=" "USE_OPUS=" "USE_SILK=" + "USE_BV32=" + "USE_COREAUDIO=" + "USE_G711=1" + "USE_G722=1" + "USE_G722_1=" + "USE_ILBC=" + "USE_OPUS=" + "USE_SILK=" ] ++ lib.optional (stdenv.cc.cc != null) "SYSROOT_ALT=${stdenv.cc.cc}" ++ lib.optional (stdenv.cc.libc != null) "SYSROOT=${stdenv.cc.libc}" ; - NIX_CFLAGS_COMPILE='' -I${librem}/include/rem -I${gsm}/include/gsm + NIX_CFLAGS_COMPILE = '' -I${librem}/include/rem -I${gsm}/include/gsm -DHAVE_INTTYPES_H -D__GLIBC__ -D__need_timeval -D__need_timespec -D__need_time_t ''; + meta = { - homepage = "http://www.creytiv.com/baresip.html"; - platforms = with lib.platforms; linux; - maintainers = with lib.maintainers; [raskin]; + description = "A modular SIP User-Agent with audio and video support"; + homepage = "https://github.com/baresip/baresip"; + maintainers = with lib.maintainers; [ elohmeier raskin ]; license = lib.licenses.bsd3; - downloadPage = "http://www.creytiv.com/pub/"; - updateWalker = true; - downloadURLRegexp = "/baresip-.*[.]tar[.].*"; }; } diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/bitlbee/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/bitlbee/default.nix index 4ecc449fe85a..de8c4dc1026e 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/bitlbee/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/bitlbee/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchurl, fetchpatch, stdenv, gnutls, glib, pkg-config, check, libotr, python2 +{ lib, fetchurl, fetchpatch, stdenv, gnutls, glib, pkg-config, check, libotr, python3 , enableLibPurple ? false, pidgin ? null , enablePam ? false, pam ? null }: @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ] ++ optional doCheck check; - buildInputs = [ gnutls libotr python2 ] + buildInputs = [ gnutls libotr python3 ] ++ optional enableLibPurple pidgin ++ optional enablePam pam; @@ -63,7 +63,7 @@ stdenv.mkDerivation rec { homepage = "https://www.bitlbee.org/"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ pSub ]; + maintainers = with maintainers; [ lassulus pSub ]; platforms = platforms.gnu ++ platforms.linux; # arbitrary choice }; } diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/blink/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/blink/default.nix deleted file mode 100644 index 805278b4e456..000000000000 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/blink/default.nix +++ /dev/null @@ -1,68 +0,0 @@ -{ lib, fetchdarcs, python2Packages, libvncserver, zlib -, gnutls, libvpx, makeDesktopItem, mkDerivationWith }: - -mkDerivationWith python2Packages.buildPythonApplication rec { - - pname = "blink"; - version = "3.2.0"; - - src = fetchdarcs { - url = "http://devel.ag-projects.com/repositories/blink-qt"; - rev = "release-${version}"; - sha256 = "19rcwr5scw48qnj79q1pysw95fz9h98nyc3161qy2kph5g7dwkc3"; - }; - - patches = [ ./pythonpath.patch ]; - postPatch = '' - sed -i 's|@out@|'"''${out}"'|g' blink/resources.py - ''; - - propagatedBuildInputs = with python2Packages; [ - pyqt5_with_qtwebkit - cjson - sipsimple - twisted - google-api-python-client - ]; - - buildInputs = [ - python2Packages.cython - zlib - libvncserver - libvpx - ]; - - desktopItem = makeDesktopItem { - name = "Blink"; - exec = "blink"; - comment = meta.description; - desktopName = "Blink"; - icon = "blink"; - genericName = "Instant Messaging"; - categories = "Internet;"; - }; - - dontWrapQtApps = true; - - postInstall = '' - mkdir -p "$out/share/applications" - mkdir -p "$out/share/pixmaps" - cp "$desktopItem"/share/applications/* "$out/share/applications" - cp "$out"/share/blink/icons/blink.* "$out/share/pixmaps" - ''; - - preFixup = '' - makeWrapperArgs+=( - --prefix "LD_LIBRARY_PATH" ":" "${gnutls.out}/lib" - "''${qtWrapperArgs[@]}" - ) - ''; - - meta = with lib; { - homepage = "http://icanblink.com/"; - description = "A state of the art, easy to use SIP client for Voice, Video and IM"; - platforms = platforms.linux; - license = licenses.gpl3; - maintainers = with maintainers; [ pSub ]; - }; -} diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/blink/pythonpath.patch b/nixpkgs/pkgs/applications/networking/instant-messengers/blink/pythonpath.patch deleted file mode 100644 index 0df8bc84ff30..000000000000 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/blink/pythonpath.patch +++ /dev/null @@ -1,49 +0,0 @@ ---- blink-2.0.0/blink/resources.py 2016-03-09 14:39:07.000000000 +0100 -+++ blink-2.0.0/blink/resources-patched.py 2016-03-12 21:34:14.965476623 +0100 -@@ -1,7 +1,10 @@ -+# Copyright (C) 2010-2013 AG Projects. See LICENSE for details. -+# - - """Provide access to Blink's resources""" - --import __main__ -+__all__ = ['ApplicationData', 'Resources', 'IconManager'] -+ - import imghdr - import os - import platform -@@ -19,14 +22,10 @@ - from blink.util import run_in_gui_thread - - --__all__ = ['ApplicationData', 'Resources', 'IconManager'] -- -- - class DirectoryContextManager(unicode): - def __enter__(self): - self.directory = os.getcwdu() - os.chdir(self) -- - def __exit__(self, type, value, traceback): - os.chdir(self.directory) - -@@ -61,18 +60,7 @@ - @classproperty - def directory(cls): - if cls._cached_directory is None: -- try: -- binary_directory = os.path.dirname(os.path.realpath(__main__.__file__)) -- except AttributeError: -- if hasattr(sys, 'frozen'): -- application_directory = os.path.dirname(os.path.realpath(sys.executable)) -- else: -- application_directory = os.path.realpath('') # executed in interactive interpreter -- else: -- if os.path.basename(binary_directory) == 'bin': -- application_directory = os.path.dirname(binary_directory) -- else: -- application_directory = binary_directory -+ application_directory = '@out@' - if os.path.exists(os.path.join(application_directory, 'resources', 'blink.ui')): - cls._cached_directory = os.path.join(application_directory, 'resources').decode(sys.getfilesystemencoding()) - else: diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/bluejeans/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/bluejeans/default.nix index 97530b722fdb..ad57e2c6623b 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/bluejeans/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/bluejeans/default.nix @@ -44,11 +44,11 @@ in stdenv.mkDerivation rec { pname = "bluejeans"; - version = "2.25.0.78"; + version = "2.26.0.136"; src = fetchurl { url = "https://swdl.bluejeans.com/desktop-app/linux/${getFirst 3 version}/BlueJeans_${version}.rpm"; - sha256 = "sha256-Xk9iU7mNm3YlXKsmf6yPqd1YAklsFOWu+04Llb+2yWQ="; + sha256 = "sha256-9QiE7CjCepDXQCzduqGzNUGqUgYS+PWBS71ouzHa83o="; }; nativeBuildInputs = [ rpmextract makeWrapper ]; diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/chatty/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/chatty/default.nix index fe7881de9959..f9cec37a5068 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/chatty/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/chatty/default.nix @@ -11,6 +11,7 @@ , evolution-data-server , feedbackd , glibmm +, gnome , gspell , gtk3 , json-glib @@ -27,14 +28,15 @@ stdenv.mkDerivation rec { pname = "chatty"; - version = "0.4.0"; + version = "0.6.1"; src = fetchFromGitLab { domain = "source.puri.sm"; owner = "Librem5"; repo = "chatty"; rev = "v${version}"; - sha256 = "12k1a5xrwd6zk4x0m53hbzggk695z3bpbzy1wcikzy0jvch7h13d"; + fetchSubmodules = true; + hash = "sha256-AufxwuOibTx5OvLBVbJqay/mYLmcDpE2BgwVv6Y5IlY="; }; postPatch = '' @@ -55,6 +57,7 @@ stdenv.mkDerivation rec { evolution-data-server feedbackd glibmm + gnome.gnome-desktop gspell gtk3 json-glib diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/cinny/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/cinny/default.nix new file mode 100644 index 000000000000..4c8f356cdf47 --- /dev/null +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/cinny/default.nix @@ -0,0 +1,31 @@ +{ lib, stdenv, fetchurl, writeText, jq, conf ? {} }: + +let + configOverrides = writeText "cinny-config-overrides.json" (builtins.toJSON conf); +in stdenv.mkDerivation rec { + pname = "cinny"; + version = "1.6.1"; + + src = fetchurl { + url = "https://github.com/ajbura/cinny/releases/download/v${version}/cinny-v${version}.tar.gz"; + sha256 = "sha256-RJpLK16bedpqo/JJf3atpiuL5spHJNowomcusjZtEWA="; + }; + + installPhase = '' + runHook preInstall + + mkdir -p $out/ + cp -R . $out/ + ${jq}/bin/jq -s '.[0] * .[1]' "config.json" "${configOverrides}" > "$out/config.json" + + runHook postInstall + ''; + + meta = with lib; { + description = "Yet another Matrix client for the web"; + homepage = "https://cinny.in/"; + maintainers = with maintainers; [ abbe ]; + license = licenses.mit; + platforms = platforms.all; + }; +} diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/coyim/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/coyim/default.nix index abcdf617352b..7e2f2422573a 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/coyim/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/coyim/default.nix @@ -23,5 +23,6 @@ buildGoPackage rec { homepage = "https://coy.im/"; license = licenses.gpl3; platforms = platforms.linux; + broken = true; #fails to build with go >= 1.16 }; } diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/deltachat-cursed/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/deltachat-cursed/default.nix index 8a04d75f5a63..442a6adcb790 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/deltachat-cursed/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/deltachat-cursed/default.nix @@ -8,13 +8,13 @@ python3.pkgs.buildPythonApplication rec { pname = "deltachat-cursed"; - version = "0.3.0"; + version = "0.3.1"; src = fetchFromGitHub { owner = "adbenitez"; repo = "deltachat-cursed"; rev = "v${version}"; - sha256 = "0zzzrzc8yxw6ffwfirbrr5ahbidbvlwdvgdg82zjsdjjbarxph8c"; + hash = "sha256-IZrTPnj6eX1qgEPnEiD9qmVkwn1SMK38gVKAJFgZNfw="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/deltachat-desktop/package.json b/nixpkgs/pkgs/applications/networking/instant-messengers/deltachat-desktop/package.json index fe9f024052c4..23f0f15e3c47 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/deltachat-desktop/package.json +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/deltachat-desktop/package.json @@ -12,7 +12,7 @@ "emoji-js-clean": "^4.0.0", "emoji-mart": "^3.0.0", "emoji-regex": "^9.2.2", - "error-stack-parser": "^2.0.6", + "error-stack-parser": "2.0.6", "filesize": "^8.0.6", "mapbox-gl": "^1.12.0", "mime-types": "^2.1.31", diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/dino/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/dino/default.nix index 5e362784c811..3e992899e43e 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/dino/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/dino/default.nix @@ -13,17 +13,19 @@ , pcre , qrencode , icu +, gspell +, srtp, libnice, gnutls, gstreamer, gst-plugins-base, gst-plugins-good }: stdenv.mkDerivation rec { pname = "dino"; - version = "0.2.2"; + version = "0.3.0"; src = fetchFromGitHub { owner = "dino"; repo = "dino"; rev = "v${version}"; - sha256 = "sha256-uYP3D2uyvfRP91fq/1jKOaKgp/+How0SUwmxSrLLH4c="; + sha256 = "sha256-L5a5QlF9qlr4X/hGTabbbvOE5J1x/UVneWl/BRAa29Q="; }; nativeBuildInputs = [ @@ -56,6 +58,13 @@ stdenv.mkDerivation rec { icu libsignal-protocol-c librsvg + gspell + srtp + libnice + gnutls + gstreamer + gst-plugins-base + gst-plugins-good ] ++ lib.optionals (!stdenv.isDarwin) [ xorg.libxcb xorg.libpthreadstubs @@ -83,6 +92,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/dino/dino"; license = licenses.gpl3Plus; platforms = platforms.linux ++ platforms.darwin; - maintainers = with maintainers; [ qyliss ]; + maintainers = with maintainers; [ qyliss tomfitzhenry ]; }; } diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/discord/darwin.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/discord/darwin.nix new file mode 100644 index 000000000000..4bc9ac98df1f --- /dev/null +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/discord/darwin.nix @@ -0,0 +1,14 @@ +{ pname, version, src, meta, stdenv, binaryName, desktopName, undmg }: + +stdenv.mkDerivation { + inherit pname version src meta; + + nativeBuildInputs = [ undmg ]; + + sourceRoot = "."; + + installPhase = '' + mkdir -p $out/Applications + cp -r "${desktopName}.app" $out/Applications + ''; +} diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/discord/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/discord/default.nix index b499f01d88fd..4f19fd924e76 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/discord/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/discord/default.nix @@ -1,35 +1,84 @@ -{ branch ? "stable", pkgs }: +{ branch ? "stable", pkgs, lib, stdenv }: let inherit (pkgs) callPackage fetchurl; -in { - stable = callPackage ./base.nix rec { - pname = "discord"; - binaryName = "Discord"; - desktopName = "Discord"; - version = "0.0.16"; - src = fetchurl { - url = "https://dl.discordapp.net/apps/linux/${version}/discord-${version}.tar.gz"; - sha256 = "UTVKjs/i7C/m8141bXBsakQRFd/c//EmqqhKhkr1OOk="; - }; + versions = if stdenv.isLinux then { + stable = "0.0.17"; + ptb = "0.0.27"; + canary = "0.0.133"; + } else { + stable = "0.0.264"; + ptb = "0.0.59"; + canary = "0.0.283"; }; - ptb = callPackage ./base.nix rec { - pname = "discord-ptb"; - binaryName = "DiscordPTB"; - desktopName = "Discord PTB"; - version = "0.0.26"; - src = fetchurl { - url = "https://dl-ptb.discordapp.net/apps/linux/${version}/discord-ptb-${version}.tar.gz"; - sha256 = "1rlj76yhxjwwfmdln3azjr69hvfx1bjqdg9jhdn4fp6mlirkrcq4"; + version = versions.${branch}; + srcs = let + darwin-ptb = fetchurl { + url = "https://dl-ptb.discordapp.net/apps/osx/${version}/DiscordPTB.dmg"; + sha256 = "sha256-LS7KExVXkOv8O/GrisPMbBxg/pwoDXIOo1dK9wk1yB8="; }; - }; - canary = callPackage ./base.nix rec { - pname = "discord-canary"; - binaryName = "DiscordCanary"; - desktopName = "Discord Canary"; - version = "0.0.131"; - src = fetchurl { - url = "https://dl-canary.discordapp.net/apps/linux/${version}/discord-canary-${version}.tar.gz"; - sha256 = "087rzyivk0grhc73v7ldxxghks0n16ifrvpmk95vzaw99l9xv0v5"; + in { + x86_64-linux = { + stable = fetchurl { + url = + "https://dl.discordapp.net/apps/linux/${version}/discord-${version}.tar.gz"; + sha256 = "058k0cmbm4y572jqw83bayb2zzl2fw2aaz0zj1gvg6sxblp76qil"; + }; + ptb = fetchurl { + url = + "https://dl-ptb.discordapp.net/apps/linux/${version}/discord-ptb-${version}.tar.gz"; + sha256 = "0yphs65wpyr0ap6y24b0nbhq7sm02dg5c1yiym1fxjbynm1mdvqb"; + }; + canary = fetchurl { + url = + "https://dl-canary.discordapp.net/apps/linux/${version}/discord-canary-${version}.tar.gz"; + sha256 = "0wx8wkgkzvw9094baa3dni834l0n4p6ih024bj1851sgwwnidb0a"; + }; }; + x86_64-darwin = { + stable = fetchurl { + url = "https://dl.discordapp.net/apps/osx/${version}/Discord.dmg"; + sha256 = "1jvlxmbfqhslsr16prsgbki77kq7i3ipbkbn67pnwlnis40y9s7p"; + }; + ptb = darwin-ptb; + canary = fetchurl { + url = + "https://dl-canary.discordapp.net/apps/osx/${version}/DiscordCanary.dmg"; + sha256 = "0mqpk1szp46mih95x42ld32rrspc6jx1j7qdaxf01whzb3d4pi9l"; + }; + }; + # Only PTB bundles a MachO Universal binary with ARM support. + aarch64-darwin = { ptb = darwin-ptb; }; + }; + src = srcs.${stdenv.hostPlatform.system}.${branch}; + + meta = with lib; { + description = "All-in-one cross-platform voice and text chat for gamers"; + homepage = "https://discordapp.com/"; + downloadPage = "https://discordapp.com/download"; + license = licenses.unfree; + maintainers = with maintainers; [ ldesgoui MP2E devins2518 ]; + platforms = [ "x86_64-linux" "x86_64-darwin" ] + ++ lib.optionals (branch == "ptb") [ "aarch64-darwin" ]; }; -}.${branch} + package = if stdenv.isLinux then ./linux.nix else ./darwin.nix; + packages = (builtins.mapAttrs + (_: value: callPackage package (value // { inherit src version; meta = meta // { mainProgram = value.binaryName; }; })) + { + stable = rec { + pname = "discord"; + binaryName = "Discord"; + desktopName = "Discord"; + }; + ptb = rec { + pname = "discord-ptb"; + binaryName = "DiscordPTB"; + desktopName = "Discord PTB"; + }; + canary = rec { + pname = "discord-canary"; + binaryName = "DiscordCanary"; + desktopName = "Discord Canary"; + }; + } + ); +in packages.${branch} diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/discord/base.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/discord/linux.nix index 5943917dc659..c9e642aceb99 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/discord/base.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/discord/linux.nix @@ -1,17 +1,14 @@ -{ pname, version, src, binaryName, desktopName -, autoPatchelfHook, makeDesktopItem, lib, stdenv, wrapGAppsHook -, alsa-lib, at-spi2-atk, at-spi2-core, atk, cairo, cups, dbus, expat, fontconfig -, freetype, gdk-pixbuf, glib, gtk3, libcxx, libdrm, libnotify, libpulseaudio, libuuid -, libX11, libXScrnSaver, libXcomposite, libXcursor, libXdamage, libXext -, libXfixes, libXi, libXrandr, libXrender, libXtst, libxcb, libxshmfence -, mesa, nspr, nss, pango, systemd, libappindicator-gtk3, libdbusmenu -, writeScript, common-updater-scripts -}: +{ pname, version, src, meta, binaryName, desktopName, autoPatchelfHook +, makeDesktopItem, lib, stdenv, wrapGAppsHook, alsa-lib, at-spi2-atk +, at-spi2-core, atk, cairo, cups, dbus, expat, fontconfig, freetype, gdk-pixbuf +, glib, gtk3, libcxx, libdrm, libnotify, libpulseaudio, libuuid, libX11 +, libXScrnSaver, libXcomposite, libXcursor, libXdamage, libXext, libXfixes +, libXi, libXrandr, libXrender, libXtst, libxcb, libxshmfence, mesa, nspr, nss +, pango, systemd, libappindicator-gtk3, libdbusmenu, writeScript +, common-updater-scripts }: -let - inherit binaryName; -in stdenv.mkDerivation rec { - inherit pname version src; +stdenv.mkDerivation rec { + inherit pname version src meta; nativeBuildInputs = [ alsa-lib @@ -33,13 +30,45 @@ in stdenv.mkDerivation rec { dontWrapGApps = true; libPath = lib.makeLibraryPath [ - libcxx systemd libpulseaudio libdrm mesa - stdenv.cc.cc alsa-lib atk at-spi2-atk at-spi2-core cairo cups dbus expat fontconfig freetype - gdk-pixbuf glib gtk3 libnotify libX11 libXcomposite libuuid - libXcursor libXdamage libXext libXfixes libXi libXrandr libXrender - libXtst nspr nss libxcb pango libXScrnSaver - libappindicator-gtk3 libdbusmenu - ]; + libcxx + systemd + libpulseaudio + libdrm + mesa + stdenv.cc.cc + alsa-lib + atk + at-spi2-atk + at-spi2-core + cairo + cups + dbus + expat + fontconfig + freetype + gdk-pixbuf + glib + gtk3 + libnotify + libX11 + libXcomposite + libuuid + libXcursor + libXdamage + libXext + libXfixes + libXi + libXrandr + libXrender + libXtst + nspr + nss + libxcb + pango + libXScrnSaver + libappindicator-gtk3 + libdbusmenu + ]; installPhase = '' mkdir -p $out/{bin,opt/${binaryName},share/pixmaps} @@ -51,12 +80,15 @@ in stdenv.mkDerivation rec { wrapProgram $out/opt/${binaryName}/${binaryName} \ "''${gappsWrapperArgs[@]}" \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--enable-features=UseOzonePlatform --ozone-platform=wayland}}" \ --prefix XDG_DATA_DIRS : "${gtk3}/share/gsettings-schemas/${gtk3.name}/" \ --prefix LD_LIBRARY_PATH : ${libPath}:$out/opt/${binaryName} ln -s $out/opt/${binaryName}/${binaryName} $out/bin/ # Without || true the install would fail on case-insensitive filesystems - ln -s $out/opt/${binaryName}/${binaryName} $out/bin/${lib.strings.toLower binaryName} || true + ln -s $out/opt/${binaryName}/${binaryName} $out/bin/${ + lib.strings.toLower binaryName + } || true ln -s $out/opt/${binaryName}/discord.png $out/share/pixmaps/${pname}.png ln -s "${desktopItem}/share/applications" $out/share/ @@ -76,18 +108,11 @@ in stdenv.mkDerivation rec { #!/usr/bin/env nix-shell #!nix-shell -i bash -p curl gnugrep common-updater-scripts set -eou pipefail; - url=$(curl -sI "https://discordapp.com/api/download/${builtins.replaceStrings ["discord-" "discord"] ["" "stable"] pname}?platform=linux&format=tar.gz" | grep -oP 'location: \K\S+') + url=$(curl -sI "https://discordapp.com/api/download/${ + builtins.replaceStrings [ "discord-" "discord" ] [ "" "stable" ] pname + }?platform=linux&format=tar.gz" | grep -oP 'location: \K\S+') version=''${url##https://dl*.discordapp.net/apps/linux/} version=''${version%%/*.tar.gz} update-source-version ${pname} "$version" --file=./pkgs/applications/networking/instant-messengers/discord/default.nix ''; - - meta = with lib; { - description = "All-in-one cross-platform voice and text chat for gamers"; - homepage = "https://discordapp.com/"; - downloadPage = "https://discordapp.com/download"; - license = licenses.unfree; - maintainers = with maintainers; [ ldesgoui MP2E ]; - platforms = [ "x86_64-linux" ]; - }; } diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/element/element-desktop-package.json b/nixpkgs/pkgs/applications/networking/instant-messengers/element/element-desktop-package.json index 2e0a913705c9..ac0869e5cdc3 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/element/element-desktop-package.json +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/element/element-desktop-package.json @@ -2,7 +2,7 @@ "name": "element-desktop", "productName": "Element", "main": "lib/electron-main.js", - "version": "1.9.8", + "version": "1.10.4", "description": "A feature-rich client for Matrix.org", "author": "Element", "repository": { @@ -22,7 +22,7 @@ "lint": "yarn lint:types && yarn lint:js", "lint:js": "eslint --max-warnings 0 src scripts hak", "lint:js-fix": "eslint --fix src scripts hak", - "lint:types": "tsc --noEmit", + "lint:types": "tsc --noEmit && tsc -p scripts/hak/tsconfig.json --noEmit && tsc -p hak/tsconfig.json --noEmit", "build:native": "yarn run hak", "build:native:universal": "yarn run hak --target x86_64-apple-darwin fetchandbuild && yarn run hak --target aarch64-apple-darwin fetchandbuild && yarn run hak --target x86_64-apple-darwin --target aarch64-apple-darwin copyandlink", "build:32": "yarn run build:ts && yarn run build:res && electron-builder --ia32", @@ -37,7 +37,7 @@ "docker:install": "scripts/in-docker.sh yarn install", "debrepo": "scripts/mkrepo.sh", "clean": "rimraf webapp.asar dist packages deploys lib", - "hak": "node scripts/hak/index.js" + "hak": "ts-node scripts/hak/index.ts" }, "dependencies": { "auto-launch": "^5.0.5", @@ -52,30 +52,35 @@ "@types/auto-launch": "^5.0.1", "@types/counterpart": "^0.18.1", "@types/minimist": "^1.2.1", + "@types/mkdirp": "^1.0.2", + "@types/pacote": "^11.1.1", + "@types/rimraf": "^3.0.2", "@typescript-eslint/eslint-plugin": "^5.6.0", "@typescript-eslint/parser": "^5.6.0", "allchange": "^1.0.6", "app-builder-lib": "^22.14.10", "asar": "^2.0.1", "chokidar": "^3.5.2", - "electron": "13.5", + "electron": "^15.3.5", "electron-builder": "22.11.4", "electron-builder-squirrel-windows": "22.11.4", "electron-devtools-installer": "^3.1.1", "electron-notarize": "^1.0.0", "eslint": "7.18.0", "eslint-config-google": "^0.14.0", - "eslint-plugin-matrix-org": "github:matrix-org/eslint-plugin-matrix-org#2306b3d4da4eba908b256014b979f1d3d43d2945", + "eslint-plugin-import": "^2.25.4", + "eslint-plugin-matrix-org": "^0.4.0", "find-npm-prefix": "^1.0.2", "fs-extra": "^8.1.0", "glob": "^7.1.6", - "matrix-web-i18n": "github:matrix-org/matrix-web-i18n", + "matrix-web-i18n": "^1.2.0", "mkdirp": "^1.0.3", "needle": "^2.5.0", "node-pre-gyp": "^0.15.0", "pacote": "^11.3.5", "rimraf": "^3.0.2", "tar": "^6.1.2", + "ts-node": "^10.4.0", "typescript": "^4.5.3" }, "hakDependencies": { diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/element/element-desktop.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/element/element-desktop.nix index bce13052e5ac..d9683740667c 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/element/element-desktop.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/element/element-desktop.nix @@ -7,12 +7,12 @@ , fetchYarnDeps , electron , element-web +, sqlcipher , callPackage , Security , AppKit , CoreServices - -, useWayland ? false +, desktopToDarwinBundle }: let @@ -37,7 +37,7 @@ mkYarnPackage rec { sha256 = pinData.desktopYarnHash; }; - nativeBuildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ] ++ lib.optionals stdenv.isDarwin [ desktopToDarwinBundle ]; seshat = callPackage ./seshat { inherit CoreServices; }; keytar = callPackage ./keytar { inherit Security AppKit; }; @@ -78,8 +78,11 @@ mkYarnPackage rec { ln -s "${desktopItem}/share/applications" "$out/share/applications" # executable wrapper + # LD_PRELOAD workaround for sqlcipher not found: https://github.com/matrix-org/seshat/issues/102 makeWrapper '${electron_exec}' "$out/bin/${executableName}" \ - --add-flags "$out/share/element/electron${lib.optionalString useWayland " --enable-features=UseOzonePlatform --ozone-platform=wayland"}" + --set LD_PRELOAD ${sqlcipher}/lib/libsqlcipher.so \ + --add-flags "$out/share/element/electron" \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--enable-features=UseOzonePlatform --ozone-platform=wayland}}" ''; # Do not attempt generating a tarball for element-web again. @@ -94,7 +97,7 @@ mkYarnPackage rec { name = "element-desktop"; exec = "${executableName} %u"; icon = "element"; - desktopName = "Element (Riot)"; + desktopName = "Element"; genericName = "Matrix Client"; comment = meta.description; categories = "Network;InstantMessaging;Chat;"; diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/element/pin.json b/nixpkgs/pkgs/applications/networking/instant-messengers/element/pin.json index b0dc0c2e739d..27dbb16f088f 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/element/pin.json +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/element/pin.json @@ -1,6 +1,6 @@ { - "version": "1.9.8", - "desktopSrcHash": "o6SICu7QDdBv9WXDconkypQRj3TbrU4ZAxayO9yemvc=", - "desktopYarnHash": "176ih0nzzx2yds6kp3lzdsrlp0glb9nqw146z0s1az7pjp6nrf18", - "webHash": "141fqvh4d5lwm692yc8mfwrlvqnfixvc7vlbfis86qi557vq6ljq" + "version": "1.10.4", + "desktopSrcHash": "cuMo0wRMC6+un3BQK0+Ecnjvs6HugNk71yElNJarlyc=", + "desktopYarnHash": "0llnqwgiqggfcgjyaar2h2r1pyw8m14icfb1pcdphqxrah9gpsar", + "webHash": "0vf8npddbx4dmq9c1ghak97jn28b18ssblbrq5smdhlzsnxlpm3l" } diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/ferdi/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/ferdi/default.nix index 2389aee53a99..92e39f091b15 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/ferdi/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/ferdi/default.nix @@ -17,10 +17,10 @@ in mkFranzDerivation' rec { pname = "ferdi"; name = "Ferdi"; - version = "5.6.5"; + version = "5.7.0"; src = fetchurl { url = "https://github.com/getferdi/ferdi/releases/download/v${version}/ferdi_${version}_amd64.deb"; - sha256 = "sha256-JeFPvU4xXHcv6/ApCDkejYWfA8lqsxwoFXnqIiOQ0+Y="; + sha256 = "sha256-WwtnYNjXHk80o1wMsEBoaT9j0+4TWTfWhuVpGHaZB7c="; }; extraBuildInputs = [ xorg.libxshmfence ]; meta = with lib; { diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/fluffychat/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/fluffychat/default.nix new file mode 100644 index 000000000000..e567f18fe7b1 --- /dev/null +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/fluffychat/default.nix @@ -0,0 +1,31 @@ +{ lib +, fetchFromGitLab +, flutter +, olm +}: + +flutter.mkFlutterApp rec { + pname = "fluffychat"; + version = "1.2.0"; + + vendorHash = "sha256-Qg0IlajbIl8e3BkKgn4O+mbZGvhfqr7XwllBLJQAA/I="; + + src = fetchFromGitLab { + owner = "famedly"; + repo = "fluffychat"; + rev = "v${version}"; + hash = "sha256-PJH3jMQc6u9R6Snn+9rNN8t+8kt6l3Xt7zKPbpqj13E="; + }; + + buildInputs = [ + olm + ]; + + meta = with lib; { + description = "Chat with your friends (matrix client)"; + homepage = "https://fluffychat.im/"; + license = licenses.agpl3Plus; + maintainers = with maintainers; [ mkg20001 ]; + platforms = platforms.linux; + }; +} diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/franz/generic.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/franz/generic.nix index d63318ecfaf7..7438e5496acd 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/franz/generic.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/franz/generic.nix @@ -13,7 +13,6 @@ , freetype , fontconfig , gtk3 -, gnome2 , dbus , nss , nspr @@ -24,6 +23,7 @@ , libnotify , xdg-utils , mesa +, libappindicator-gtk3 }: # Helper function for building a derivation for Franz and forks. @@ -60,7 +60,6 @@ stdenv.mkDerivation rec { freetype fontconfig dbus - gnome2.GConf nss nspr alsa-lib @@ -68,7 +67,7 @@ stdenv.mkDerivation rec { expat stdenv.cc.cc ]; - runtimeDependencies = [ stdenv.cc.cc.lib (lib.getLib udev) libnotify ]; + runtimeDependencies = [ stdenv.cc.cc.lib (lib.getLib udev) libnotify libappindicator-gtk3 ]; unpackPhase = "dpkg-deb -x $src ."; diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/gajim/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/gajim/default.nix index 2b6cb9969e82..3c56d84db4b5 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/gajim/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/gajim/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchurl, gettext, wrapGAppsHook +{ lib, fetchurl, fetchFromGitLab, gettext, wrapGAppsHook # Native dependencies , python3, gtk3, gobject-introspection, gnome @@ -41,6 +41,21 @@ python3.pkgs.buildPythonApplication rec { gettext wrapGAppsHook ]; + # Workaround for https://dev.gajim.org/gajim/gajim/-/issues/10719. + # We don't use plugin release URL because it's updated in place. + plugins = fetchFromGitLab { + domain = "dev.gajim.org"; + owner = "gajim"; + repo = "gajim-plugins"; + rev = "fea522e4360cec6ceacbf1df92644ab3343d4b99"; + sha256 = "sha256-CmwEiLsdldoOfgHfWL/5hf/dp0HEDNAIlc5N0Np20KE="; + }; + + postPatch = '' + mkdir -p gajim/data/plugins + cp -r $plugins/plugin_installer gajim/data/plugins + ''; + dontWrapGApps = true; preFixup = '' @@ -59,7 +74,8 @@ python3.pkgs.buildPythonApplication rec { checkPhase = '' xvfb-run dbus-run-session \ --config-file=${dbus.daemon}/share/dbus-1/session.conf \ - ${python3.interpreter} setup.py test + ${python3.interpreter} -m unittest discover -s test/unit -v + ${python3.interpreter} -m unittest discover -s test/no_gui -v ''; # necessary for wrapGAppsHook @@ -71,7 +87,6 @@ python3.pkgs.buildPythonApplication rec { license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ raskin abbradar ]; downloadPage = "http://gajim.org/downloads.php"; - updateWalker = true; platforms = lib.platforms.linux; }; } diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/gitter/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/gitter/default.nix index 854cc18a47ff..853043b97cbe 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/gitter/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/gitter/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, alsa-lib, atk, at-spi2-core, cairo, cups, dbus, dpkg, expat, fetchurl -, fontconfig, freetype, gdk-pixbuf, glib, gnome2, gtk3, libdrm, libX11 +, fontconfig, freetype, gdk-pixbuf, glib, gtk3, libdrm, libX11 , libXScrnSaver, libXcomposite, libXcursor, libXdamage, libXext, libXfixes , libXi, libXrandr, libXrender, libXtst, libappindicator-gtk3, libcxx , libnotify, libpulseaudio, libxcb, makeDesktopItem, makeWrapper, mesa, nspr, nss @@ -18,7 +18,6 @@ let gitterDirectorySuffix = "opt/gitter"; freetype gdk-pixbuf glib - gnome2.GConf gtk3 libX11 libXScrnSaver diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/gurk-rs/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/gurk-rs/default.nix new file mode 100644 index 000000000000..6430ebdd22fc --- /dev/null +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/gurk-rs/default.nix @@ -0,0 +1,30 @@ +{ stdenv +, lib +, protobuf +, rustPlatform +, fetchFromGitHub +}: + +rustPlatform.buildRustPackage rec { + pname = "gurk-rs"; + version = "0.2.3"; + + src = fetchFromGitHub { + owner = "boxdot"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-Mko5udM8BY50uUwn7xESxB+s0MEO1kAJX4Dt/DnEEa4="; + }; + + cargoHash = "sha256-pYMMgBvLsqkj2peouDQK1vn97ByUjtdCrkbzuZZLXrY="; + buildInputs = [ protobuf ]; + + PROTOC = "${protobuf}/bin/protoc"; + + meta = with lib; { + description = "Signal Messenger client for terminal"; + homepage = "https://github.com/boxdot/gurk-rs"; + license = licenses.agpl3Only; + maintainers = with maintainers; [ devhell ]; + }; +} diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/jami/daemon.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/jami/daemon.nix index a324d061aa73..f39b731132ea 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/jami/daemon.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/jami/daemon.nix @@ -7,7 +7,7 @@ , autoreconfHook , pkg-config , perl # for pod2man -, ffmpeg +, ffmpeg_4 , pjsip , alsa-lib , asio @@ -39,7 +39,7 @@ let readLinesToList = with builtins; file: filter (s: isString s && stringLength s > 0) (split "\n" (readFile file)); - ffmpeg-jami = ffmpeg.overrideAttrs (old: + ffmpeg-jami = ffmpeg_4.overrideAttrs (old: let patch-src = src + "/daemon/contrib/src/ffmpeg/"; in diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/jami/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/jami/default.nix index 5be6e0211788..3e0ba8bb5e8f 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/jami/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/jami/default.nix @@ -8,11 +8,11 @@ }: rec { - version = "20211213.2.37be4c3"; + version = "20211223.2.37be4c3"; src = fetchzip { url = "https://dl.jami.net/release/tarballs/jami_${version}.tar.gz"; - sha256 = "08abswvxwsxh6b0smb4l4cmymsbfiy7473b2sgvghj55w603prsc"; + sha256 = "1zw9azwmxr4991nq5kl527lbwlj7psrissgvrkl1kxxbfbdncbhh"; stripRoot = false; extraPostFetch = '' diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/jitsi-meet-electron/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/jitsi-meet-electron/default.nix index 149be3686e85..2395a196f605 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/jitsi-meet-electron/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/jitsi-meet-electron/default.nix @@ -4,15 +4,16 @@ , makeWrapper , electron , xorg +, pipewire }: stdenv.mkDerivation rec { pname = "jitsi-meet-electron"; - version = "2.8.11"; + version = "2022.1.1"; src = fetchurl { url = "https://github.com/jitsi/jitsi-meet-electron/releases/download/v${version}/jitsi-meet-x86_64.AppImage"; - sha256 = "sha256-DznbSwA1UISw3EkIfM5hGgmIToeXsH1b1HB7UOgDTKU="; + sha256 = "0x3fdqgjnsd570b7nszfx3h8l5c8x2kg32ig85n2a2g481c7xi6l"; name = "${pname}-${version}.AppImage"; }; @@ -45,7 +46,7 @@ stdenv.mkDerivation rec { postFixup = '' makeWrapper ${electron}/bin/electron $out/bin/${pname} \ --add-flags $out/share/${pname}/resources/app.asar \ - --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ stdenv.cc.cc xorg.libXtst ]}" + --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ stdenv.cc.cc xorg.libXtst pipewire ]}" ''; meta = with lib; { diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/kdeltachat/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/kdeltachat/default.nix index 133355e074e2..5fe90d50a31a 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/kdeltachat/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/kdeltachat/default.nix @@ -14,13 +14,13 @@ mkDerivation rec { pname = "kdeltachat"; - version = "unstable-2021-12-26"; + version = "unstable-2022-01-02"; src = fetchFromSourcehut { owner = "~link2xt"; repo = "kdeltachat"; - rev = "aabe9421cb26f8e2537d49df5392e428bca8d72d"; - hash = "sha256-5ql4KGMie9EbhHbPSNHIUQrvNpO//WgpTDIK6ETwdkg="; + rev = "ec545c8208c870c44312558f91c79e6ffce4444e"; + hash = "sha256-s/dJ2ahdUK7ODKsna+tl81e+VQLkCAELb/iEXf9WlIM="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/mattermost-desktop/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/mattermost-desktop/default.nix index 874fbd6375d0..6f53fe2b3a3b 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/mattermost-desktop/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/mattermost-desktop/default.nix @@ -1,105 +1,91 @@ -{ lib, stdenv, fetchurl, gnome2, gtk3, pango, atk, cairo, gdk-pixbuf, glib, -freetype, fontconfig, dbus, libX11, xorg, libXi, libXcursor, libXdamage, -libXrandr, libXcomposite, libXext, libXfixes, libXrender, libXtst, -libXScrnSaver, nss, nspr, alsa-lib, cups, expat, udev, wrapGAppsHook, -hicolor-icon-theme, libuuid, at-spi2-core, at-spi2-atk, libappindicator-gtk3 }: +{ lib +, stdenv +, fetchurl +, atomEnv +, systemd +, pulseaudio +, libxshmfence +, libnotify +, libappindicator-gtk3 +, wrapGAppsHook +, autoPatchelfHook +}: let - rpath = lib.makeLibraryPath [ - alsa-lib - at-spi2-atk - at-spi2-core - atk - cairo - cups - dbus - expat - fontconfig - freetype - gdk-pixbuf - glib - gnome2.GConf - gtk3 - pango + + pname = "mattermost-desktop"; + version = "5.0.3"; + + srcs = { + "x86_64-linux" = { + url = "https://releases.mattermost.com/desktop/${version}/${pname}-${version}-linux-x64.tar.gz"; + hash = "sha256-KLSWJpNSMGmfugbkFIJLDnxcZtrtBZOGjLlR+kAoMTA="; + }; + + "i686-linux" = { + url = "https://releases.mattermost.com/desktop/${version}/${pname}-${version}-linux-ia32.tar.gz"; + hash = "sha256-4ofjOsfGbgO1PSqQpigNp90JsvlGP1kGexVAR/h3/88="; + }; + }; + + inherit (stdenv.hostPlatform) system; + +in + +stdenv.mkDerivation { + inherit pname version; + + src = fetchurl (srcs."${system}" or (throw "Unsupported system ${system}")); + + dontBuild = true; + dontConfigure = true; + dontStrip = true; + + nativeBuildInputs = [ wrapGAppsHook autoPatchelfHook ]; + + buildInputs = atomEnv.packages ++ [ + libxshmfence + ]; + + runtimeDependencies = [ + (lib.getLib systemd) + pulseaudio + libnotify libappindicator-gtk3 - libuuid - libX11 - libXScrnSaver - libXcomposite - libXcursor - libXdamage - libXext - libXfixes - libXi - libXrandr - libXrender - libXtst - nspr - nss - stdenv.cc.cc - udev - xorg.libxcb ]; -in - stdenv.mkDerivation rec { - pname = "mattermost-desktop"; - version = "4.6.2"; - - src = - if stdenv.hostPlatform.system == "x86_64-linux" then - fetchurl { - url = "https://releases.mattermost.com/desktop/${version}/${pname}-${version}-linux-x64.tar.gz"; - sha256 = "0i836bc0gx375a9fm2cdxg84k03zhpx1z6jqxndf2m8pkfsblc3x"; - } - else if stdenv.hostPlatform.system == "i686-linux" then - fetchurl { - url = "https://releases.mattermost.com/desktop/${version}/${pname}-${version}-linux-ia32.tar.gz"; - sha256 = "04jv9hkmkh0jipv0fjdprnp5kmkjvf3c0fah6ysi21wmnmp5ab3m"; - } - else - throw "Mattermost-Desktop is not currently supported on ${stdenv.hostPlatform.system}"; - - dontBuild = true; - dontConfigure = true; - dontPatchELF = true; - - nativeBuildInputs = [ wrapGAppsHook ]; - - buildInputs = [ gtk3 hicolor-icon-theme ]; - - installPhase = '' - runHook preInstall - - mkdir -p $out/share/mattermost-desktop - cp -R . $out/share/mattermost-desktop - - mkdir -p "$out/bin" - ln -s $out/share/mattermost-desktop/mattermost-desktop \ - $out/bin/mattermost-desktop - - patchShebangs $out/share/mattermost-desktop/create_desktop_file.sh - $out/share/mattermost-desktop/create_desktop_file.sh - rm $out/share/mattermost-desktop/create_desktop_file.sh - mkdir -p $out/share/applications - mv Mattermost.desktop $out/share/applications/Mattermost.desktop - substituteInPlace \ - $out/share/applications/Mattermost.desktop \ - --replace /share/mattermost-desktop/mattermost-desktop /bin/mattermost-desktop - - patchelf \ - --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath "${rpath}:$out/share/mattermost-desktop" \ - $out/share/mattermost-desktop/mattermost-desktop - - runHook postInstall - ''; - - meta = with lib; { - description = "Mattermost Desktop client"; - homepage = "https://about.mattermost.com/"; - license = licenses.asl20; - platforms = [ "x86_64-linux" "i686-linux" ]; - maintainers = [ maintainers.joko ]; - }; - } + installPhase = '' + runHook preInstall + + # Mattermost tarball comes with executable bit set for everything. + # We’ll apply it only to files that need it. + find . -type f -print0 | xargs -0 chmod -x + find . -type f \( -name '*.so.*' -o -name '*.s[oh]' \) -print0 | xargs -0 chmod +x + chmod +x mattermost-desktop chrome-sandbox + + mkdir -p $out/share/mattermost-desktop + cp -R . $out/share/mattermost-desktop + + mkdir -p "$out/bin" + ln -s $out/share/mattermost-desktop/mattermost-desktop $out/bin/mattermost-desktop + + patchShebangs $out/share/mattermost-desktop/create_desktop_file.sh + $out/share/mattermost-desktop/create_desktop_file.sh + rm $out/share/mattermost-desktop/create_desktop_file.sh + mkdir -p $out/share/applications + chmod -x Mattermost.desktop + mv Mattermost.desktop $out/share/applications/Mattermost.desktop + substituteInPlace $out/share/applications/Mattermost.desktop \ + --replace /share/mattermost-desktop/mattermost-desktop /bin/mattermost-desktop + + runHook postInstall + ''; + + meta = with lib; { + description = "Mattermost Desktop client"; + homepage = "https://about.mattermost.com/"; + license = licenses.asl20; + platforms = [ "x86_64-linux" "i686-linux" ]; + maintainers = [ maintainers.joko ]; + }; +} diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/mcabber/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/mcabber/default.nix index 2ca94953c4f6..3acd11a9a0d3 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/mcabber/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/mcabber/default.nix @@ -38,8 +38,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2; maintainers = with maintainers; [ pSub ]; platforms = with platforms; linux; - updateWalker = true; downloadPage = "http://mcabber.com/files/"; - downloadURLRegexp = "mcabber-[0-9.]+[.]tar[.][a-z0-9]+$"; }; } diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/mirage/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/mirage/default.nix index a4693dc667b9..f35db8e3a11b 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/mirage/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/mirage/default.nix @@ -47,22 +47,24 @@ mkDerivation rec { ] ++ pythonPath; pythonPath = with python3Packages; [ + pillow aiofiles appdirs - blist cairosvg filetype html-sanitizer - hsluv - matrix-nio + lxml mistune - plyer pymediainfo - pyotherside + plyer + sortedcontainers + watchgod redbaron + hsluv simpleaudio setuptools watchgod + dbus-python ]; qmakeFlags = [ @@ -84,6 +86,6 @@ mkDerivation rec { license = licenses.lgpl3Plus; maintainers = with maintainers; [ colemickens AndersonTorres ]; inherit (qtbase.meta) platforms; - broken = stdenv.isDarwin; + broken = stdenv.isDarwin || python3Packages.isPy37 || python3Packages.isPy38; }; } diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/neochat/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/neochat/default.nix index b6706d647868..6de6922913fc 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/neochat/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/neochat/default.nix @@ -61,7 +61,7 @@ mkDerivation rec { description = "A client for matrix, the decentralized communication protocol."; homepage = "https://apps.kde.org/en/neochat"; license = licenses.gpl3Only; - maintainers = with maintainers; [ mjlbach peterhoeg ]; + maintainers = with maintainers; [ peterhoeg ]; platforms = with platforms; linux; }; } diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/pantalaimon/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/pantalaimon/default.nix index 9722d3b89e32..894294ae24c5 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/pantalaimon/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/pantalaimon/default.nix @@ -10,7 +10,7 @@ buildPythonApplication rec { pname = "pantalaimon"; - version = "0.10.2"; + version = "0.10.4"; disabled = pythonOlder "3.6"; @@ -19,7 +19,7 @@ buildPythonApplication rec { owner = "matrix-org"; repo = pname; rev = version; - sha256 = "sha256-sjaJomKMKSZqLlKWTG7Oa87dXa5SnGQlVnrdS707A1w="; + sha256 = "sha256-X6DJHH+ZBPw7iWVMa43HvVFh+LDn6shzOU1A2uiAYL4="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-plugin-pack/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-plugin-pack/default.nix index ef9ce5bca74c..f393a17c1bc6 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-plugin-pack/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-plugin-pack/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pidgin, intltool, python } : +{ lib, stdenv, fetchurl, pidgin, intltool, python2 } : stdenv.mkDerivation rec { pname = "purple-plugin-pack"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "0g5hmy7fwgjq59j52h9yps28jsjjrfkd4r18gyx6hfd3g3kzbg1b"; }; - buildInputs = [ pidgin intltool python ]; + buildInputs = [ pidgin intltool python2 ]; meta = with lib; { homepage = "https://bitbucket.org/rekkanoryo/purple-plugin-pack"; diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/psi-plus/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/psi-plus/default.nix index d1cf00969b10..9288f272134a 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/psi-plus/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/psi-plus/default.nix @@ -43,13 +43,13 @@ assert enablePsiMedia -> enablePlugins; mkDerivation rec { pname = "psi-plus"; - version = "1.5.1596"; + version = "1.5.1600"; src = fetchFromGitHub { owner = "psi-plus"; repo = "psi-plus-snapshots"; rev = version; - sha256 = "sha256-8GnENdoFgFa+pDN8C+W5qoFxsCE7tl3dUHf5TBipo5g="; + sha256 = "sha256-AZSxElEpYUYa92KdYxVyM+ppKHpXXwwlBFVOOKH/O7g="; }; cmakeFlags = [ diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/rambox/pro.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/rambox/pro.nix index 827cac7c2970..e8b48232ee33 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/rambox/pro.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/rambox/pro.nix @@ -19,7 +19,7 @@ in mkRambox rec { description = "Messaging and emailing app that combines common web applications into one"; homepage = "https://rambox.pro"; license = licenses.unfree; - maintainers = with maintainers; [ chrisaw ]; + maintainers = with maintainers; [ cawilliamson ]; platforms = [ "x86_64-linux" ]; }; } diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/ripcord/darwin.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/ripcord/darwin.nix new file mode 100644 index 000000000000..ef9dad66b5d6 --- /dev/null +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/ripcord/darwin.nix @@ -0,0 +1,33 @@ +{ stdenvNoCC, lib, fetchzip }: + +stdenvNoCC.mkDerivation rec { + pname = "ripcord"; + version = "0.4.29"; + + src = fetchzip { + url = "https://cancel.fm/dl/Ripcord_Mac_${version}.zip"; + sha256 = "sha256-v8iydjLBjFN5LuctpcBpEkhSICxPhLKzLjSASWtsQok="; + stripRoot = false; + }; + + dontBuild = true; + dontFixup = true; # modification is not allowed by the license https://cancel.fm/ripcord/shareware-redistribution/ + + installPhase = '' + runHook preInstall + + mkdir -p $out/Applications + cp -r $src/Ripcord.app $out/Applications/ + + runHook postInstall + ''; + + meta = with lib; { + description = "Desktop chat client for Slack and Discord"; + homepage = "https://cancel.fm/ripcord/"; + # See: https://cancel.fm/ripcord/shareware-redistribution/ + license = licenses.unfreeRedistributable; + maintainers = with maintainers; [ mikroskeem ]; + platforms = [ "x86_64-darwin" ]; + }; +} diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/ripcord/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/ripcord/default.nix index 76f93d9d2173..76f93d9d2173 100755..100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/ripcord/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/ripcord/default.nix diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/rocketchat-desktop/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/rocketchat-desktop/default.nix index 1317fd70a952..b5c558e7702b 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/rocketchat-desktop/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/rocketchat-desktop/default.nix @@ -4,11 +4,11 @@ let in stdenv.mkDerivation rec { pname = "rocketchat-desktop"; - version = "3.7.4"; + version = "3.7.7"; src = fetchurl { url = "https://github.com/RocketChat/Rocket.Chat.Electron/releases/download/${version}/rocketchat_${version}_amd64.deb"; - sha256 = "sha256-yYUMVMSGUMAXbBm40jNCaFusWsWxoIgLDeAwNqSewX8="; + sha256 = "sha256-WTsiNZ5XANdRQyJX4n8VL66JzyF8QyRWu2ctsV4TxuY="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/schildichat/pin.json b/nixpkgs/pkgs/applications/networking/instant-messengers/schildichat/pin.json index 30ca1e9f475a..aceeec448fdf 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/schildichat/pin.json +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/schildichat/pin.json @@ -1,6 +1,6 @@ { - "version": "1.9.7-sc.1", - "srcHash": "0qrjjwcxa141phsgdz325rrkfmjqdmxc3h917cs9c9kf6cblkxaq", - "webYarnHash": "19c594pql2yz1z15phfdlkwcvrcbm8k058fcq7p0k6840dhif5fd", - "desktopYarnHash": "058ihkljb1swjzvgf8gqci5ghvwapmpcf2bsab3yr66lhps7fhci" + "version": "1.9.8-sc.1", + "srcHash": "1ki4ccsa2i0mv10ypxg6bx9njikipdqkc5bsq5h7bi86scjm4lni", + "webYarnHash": "1za6r0snrflh2605xw4m19p88chx19ip8jj592bqjdagildqm50l", + "desktopYarnHash": "176ih0nzzx2yds6kp3lzdsrlp0glb9nqw146z0s1az7pjp6nrf18" } diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/schildichat/schildichat-desktop.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/schildichat/schildichat-desktop.nix index 4e1d330f5000..f16c7b599e4a 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/schildichat/schildichat-desktop.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/schildichat/schildichat-desktop.nix @@ -7,13 +7,13 @@ , makeDesktopItem , copyDesktopItems , fetchYarnDeps -, yarn, nodejs, fixup_yarn_lock +, yarn +, nodejs +, fixup_yarn_lock , electron , Security , AppKit , CoreServices - -, useWayland ? false }: let @@ -88,7 +88,8 @@ stdenv.mkDerivation rec { # executable wrapper makeWrapper '${electron_exec}' "$out/bin/${executableName}" \ - --add-flags "$out/share/element/electron${lib.optionalString useWayland " --enable-features=UseOzonePlatform --ozone-platform=wayland"}" + --add-flags "$out/share/element/electron" \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--enable-features=UseOzonePlatform --ozone-platform=wayland}}" runHook postInstall ''; @@ -101,17 +102,17 @@ stdenv.mkDerivation rec { # https://github.com/schildichat/element-desktop/blob/sc/package.json desktopItems = [ (makeDesktopItem { - name = "schildichat-desktop"; - exec = "${executableName} %u"; - icon = "schildichat"; - desktopName = "SchildiChat"; - genericName = "Matrix Client"; - comment = meta.description; - categories = "Network;InstantMessaging;Chat;"; - extraEntries = '' - StartupWMClass=schildichat - MimeType=x-scheme-handler/element; - ''; + name = "schildichat-desktop"; + exec = "${executableName} %u"; + icon = "schildichat"; + desktopName = "SchildiChat"; + genericName = "Matrix Client"; + comment = meta.description; + categories = "Network;InstantMessaging;Chat;"; + extraEntries = '' + StartupWMClass=schildichat + MimeType=x-scheme-handler/element; + ''; }) ]; diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/session-desktop-appimage/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/session-desktop-appimage/default.nix index c998f869d1ea..9126a587dc7a 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/session-desktop-appimage/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/session-desktop-appimage/default.nix @@ -5,10 +5,10 @@ appimageTools.wrapType2 rec { pname = "session-desktop-appimage"; - version = "1.7.6"; + version = "1.7.7"; src = fetchurl { url = "https://github.com/oxen-io/session-desktop/releases/download/v${version}/session-desktop-linux-x86_64-${version}.AppImage"; - sha256 = "PNjUslqLcSxkRSXFpesBr2sfre4wetZWfUQTjywdClU="; + sha256 = "iMJk7/Q3Kh2KwLs0m+DAPVv471iPZcsIs4+YCSbmeIo="; }; meta = with lib; { diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/signal-cli/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/signal-cli/default.nix index 59ff3554ebf5..bca45576db71 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/signal-cli/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/signal-cli/default.nix @@ -1,13 +1,13 @@ -{ stdenv, lib, fetchurl, makeWrapper, openjdk11_headless, libmatthew_java, dbus, dbus_java }: +{ stdenv, lib, fetchurl, makeWrapper, openjdk17_headless, libmatthew_java, dbus, dbus_java }: stdenv.mkDerivation rec { pname = "signal-cli"; - version = "0.9.2"; + version = "0.10.2"; # Building from source would be preferred, but is much more involved. src = fetchurl { url = "https://github.com/AsamK/signal-cli/releases/download/v${version}/signal-cli-${version}.tar.gz"; - sha256 = "sha256-CumrIlOPmvQ3x7Ua5I2G7ZlTSAbhLgAQMPUg4I5WCeQ="; + sha256 = "sha256-etCO7sy48A7aL3mnXWitClNiw/E122G4eD6YfVmXEPw="; }; buildInputs = lib.optionals stdenv.isLinux [ libmatthew_java dbus dbus_java ]; @@ -18,15 +18,15 @@ stdenv.mkDerivation rec { cp -r lib $out/lib cp bin/signal-cli $out/bin/signal-cli '' + (if stdenv.isLinux then '' - makeWrapper ${openjdk11_headless}/bin/java $out/bin/signal-cli \ - --set JAVA_HOME "${openjdk11_headless}" \ + makeWrapper ${openjdk17_headless}/bin/java $out/bin/signal-cli \ + --set JAVA_HOME "${openjdk17_headless}" \ --add-flags "-classpath '$out/lib/*:${libmatthew_java}/lib/jni'" \ --add-flags "-Djava.library.path=${libmatthew_java}/lib/jni:${dbus_java}/share/java/dbus:$out/lib" \ --add-flags "org.asamk.signal.Main" '' else '' wrapProgram $out/bin/signal-cli \ - --prefix PATH : ${lib.makeBinPath [ openjdk11_headless ]} \ - --set JAVA_HOME ${openjdk11_headless} + --prefix PATH : ${lib.makeBinPath [ openjdk17_headless ]} \ + --set JAVA_HOME ${openjdk17_headless} ''); # Execution in the macOS (10.13) sandbox fails with diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix index 38e718972f32..8af5185386cb 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchurl, autoPatchelfHook, dpkg, wrapGAppsHook, nixosTests -, gnome2, gtk3, atk, at-spi2-atk, cairo, pango, gdk-pixbuf, glib, freetype, fontconfig +, gtk3, atk, at-spi2-atk, cairo, pango, gdk-pixbuf, glib, freetype, fontconfig , dbus, libX11, xorg, libXi, libXcursor, libXdamage, libXrandr, libXcomposite , libXext, libXfixes, libXrender, libXtst, libXScrnSaver, nss, nspr, alsa-lib , cups, expat, libuuid, at-spi2-core, libappindicator-gtk3, mesa @@ -24,7 +24,7 @@ let in stdenv.mkDerivation rec { pname = "signal-desktop"; - version = "5.26.1"; # Please backport all updates to the stable channel. + version = "5.31.1"; # Please backport all updates to the stable channel. # All releases have a limited lifetime and "expire" 90 days after the release. # When releases "expire" the application becomes unusable until an update is # applied. The expiration date for the current release can be extracted with: @@ -34,7 +34,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb"; - sha256 = "sha256-QIRt16AHILBNxKPxsOQ0n65W/bbalhXH1fM7KIaXP10="; + sha256 = "sha256-6w6znIIN5TFXTLLhazWyBXiqS5882zMNRZxYxnZjRHA="; }; nativeBuildInputs = [ @@ -56,7 +56,6 @@ in stdenv.mkDerivation rec { freetype gdk-pixbuf glib - gnome2.GConf gtk3 libX11 libXScrnSaver @@ -113,6 +112,9 @@ in stdenv.mkDerivation rec { mkdir -p $out/bin ln -s $out/lib/Signal/signal-desktop $out/bin/signal-desktop + # Create required symlinks: + ln -s libGLESv2.so $out/lib/Signal/libGLESv2.so.2 + runHook postInstall ''; @@ -120,6 +122,7 @@ in stdenv.mkDerivation rec { gappsWrapperArgs+=( --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ stdenv.cc.cc ] }" ${customLanguageWrapperArgs} + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--enable-features=UseOzonePlatform --ozone-platform=wayland}}" ) # Fix the desktop link diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/signalbackup-tools/apple-sdk-missing-utimensat.patch b/nixpkgs/pkgs/applications/networking/instant-messengers/signalbackup-tools/apple-sdk-missing-utimensat.patch new file mode 100644 index 000000000000..61474d0ab4fc --- /dev/null +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/signalbackup-tools/apple-sdk-missing-utimensat.patch @@ -0,0 +1,34 @@ +diff --git a/signalbackup/setfiletimestamp.cc b/signalbackup/setfiletimestamp.cc +index f53a168..d2d1c5e 100644 +--- a/signalbackup/setfiletimestamp.cc ++++ b/signalbackup/setfiletimestamp.cc +@@ -21,24 +21,23 @@ + + #if !defined(_WIN32) && !defined(__MINGW64__) + +-#include <fcntl.h> +-#include <sys/stat.h> ++#include <sys/time.h> + + bool SignalBackup::setFileTimeStamp(std::string const &file, long long int time_usec) const + { +- struct timespec ntimes[] = ++ struct timeval ntimes[] = + { + { // ntimes[0] = + time_usec / 1000, // tv_sec, seconds +- (time_usec % 1000) * 1000 // tv_usec, nanoseconds ++ static_cast<int>(time_usec) // tv_usec, nanoseconds + }, + { // ntimes[1] = + time_usec / 1000, // tv_sec, seconds +- (time_usec % 1000) * 1000 // tv_usec, nanoseconds ++ static_cast<int>(time_usec) // tv_usec, nanoseconds + } + }; + +- return (utimensat(AT_FDCWD, file.c_str(), ntimes, 0) == 0); ++ return (utimes(file.c_str(), ntimes) == 0); + } + + #else // this is poorly tested, I don't have windows diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix new file mode 100644 index 000000000000..931e9f93d084 --- /dev/null +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix @@ -0,0 +1,45 @@ +{ lib, stdenv, fetchFromGitHub, openssl, sqlite }: + +stdenv.mkDerivation rec { + pname = "signalbackup-tools"; + version = "20220218"; + + src = fetchFromGitHub { + owner = "bepaald"; + repo = pname; + rev = version; + sha256 = "sha256-6fwkhqXM6T0WCC1Y+GCmyLwStqhBTUAzDDsBTd5XlSE="; + }; + + # Remove when Apple SDK is >= 10.13 + patches = lib.optional (stdenv.system == "x86_64-darwin") ./apple-sdk-missing-utimensat.patch; + + buildInputs = [ openssl sqlite ]; + buildFlags = [ + "-Wall" + "-Wextra" + "-Wshadow" + "-Wold-style-cast" + "-Woverloaded-virtual" + "-pedantic" + "-std=c++2a" + "-O3" + "-march=native" + ]; + buildPhase = '' + $CXX $buildFlags */*.cc *.cc -lcrypto -lsqlite3 -o signalbackup-tools + ''; + + installPhase = '' + mkdir -p $out/bin + cp signalbackup-tools $out/bin/ + ''; + + meta = with lib; { + description = "Tool to work with Signal Backup files"; + homepage = "https://github.com/bepaald/signalbackup-tools"; + license = licenses.gpl3Only; + maintainers = [ maintainers.malo ]; + platforms = platforms.all; + }; +} diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix index 89da54527798..4fc3d56baccf 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, dpkg -, alsa-lib, atk, cairo, cups, curl, dbus, expat, fontconfig, freetype, gdk-pixbuf, glib, glibc, gnome2, gnome +, alsa-lib, atk, cairo, cups, curl, dbus, expat, fontconfig, freetype, gdk-pixbuf, glib, glibc, gnome , gtk3, libappindicator-gtk3, libnotify, libpulseaudio, libsecret, libv4l, nspr, nss, pango, systemd, wrapGAppsHook, xorg , at-spi2-atk, libuuid, at-spi2-core, libdrm, mesa, libxkbcommon, libxshmfence }: @@ -7,7 +7,7 @@ let # Please keep the version x.y.0.z and do not update to x.y.76.z because the # source of the latter disappears much faster. - version = "8.79.0.95"; + version = "8.80.0.143"; rpath = lib.makeLibraryPath [ alsa-lib @@ -26,7 +26,6 @@ let libsecret libuuid - gnome2.GConf gdk-pixbuf gtk3 libappindicator-gtk3 @@ -69,7 +68,7 @@ let "https://mirror.cs.uchicago.edu/skype/pool/main/s/skypeforlinux/skypeforlinux_${version}_amd64.deb" "https://web.archive.org/web/https://repo.skype.com/deb/pool/main/s/skypeforlinux/skypeforlinux_${version}_amd64.deb" ]; - sha256 = "sha256-a6ZtgA0cMAuNVQWAeiIDJ2noPhXjV8KPE8ibkGR7Dns="; + sha256 = "sha256-SLypP+ZRHMWeB3KuvmmYb0Y1T3ipSpWNiYYQIzMCDDY="; } else throw "Skype for linux is not supported on ${stdenv.hostPlatform.system}"; diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/slack/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/slack/default.nix index 5e0175518716..5eb7518ea378 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/slack/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/slack/default.nix @@ -18,7 +18,6 @@ , freetype , gdk-pixbuf , glib -, gnome2 , gtk3 , libGL , libappindicator-gtk3 @@ -45,46 +44,45 @@ let pname = "slack"; - x86_64-darwin-version = "4.22.0"; - x86_64-darwin-sha256 = "094p9vyv56m5qfp9jh2205ijfqcp0dr6bkmiv0wxihy2rg20b5zp"; + x86_64-darwin-version = "4.23.0"; + x86_64-darwin-sha256 = "0l4zfyys0yf95dn0sldyjkhzp7bpn84z9q9li1lvv5jj55f0g9jd"; - x86_64-linux-version = "4.22.0"; - x86_64-linux-sha256 = "0k84glxp653lxgfv5b65zvvysax7fr3lhsjgq76safk7g7cjc86i"; + x86_64-linux-version = "4.23.0"; + x86_64-linux-sha256 = "1wsrxacnj9f3cb6as7ncbdvi02jqcbyc7ijsavps5bls9phkp0is"; - aarch64-darwin-version = "4.22.0"; - aarch64-darwin-sha256 = "1z2pcgva9ixjx702c1535b4k0xr9fdnfzi5m08xgvabk9x66hqx4"; + aarch64-darwin-version = "4.23.0"; + aarch64-darwin-sha256 = "053psiqysyi7l8pviq0vwvk2azlxcpdrwfa0b99f1h6lbfcf48f3"; version = { x86_64-darwin = x86_64-darwin-version; - aarch64-darwin = aarch64-darwin-version; x86_64-linux = x86_64-linux-version; + aarch64-darwin = aarch64-darwin-version; }.${system} or throwSystem; - src = - let - base = "https://downloads.slack-edge.com"; - in - { - x86_64-darwin = fetchurl { - url = "${base}/releases/macos/${version}/prod/x64/Slack-${version}-macOS.dmg"; - sha256 = x86_64-darwin-sha256; - }; - aarch64-darwin = fetchurl { - url = "${base}/releases/macos/${version}/prod/arm64/Slack-${version}-macOS.dmg"; - sha256 = aarch64-darwin-sha256; - }; - x86_64-linux = fetchurl { - url = "${base}/releases/linux/${version}/prod/x64/slack-desktop-${version}-amd64.deb"; - sha256 = x86_64-linux-sha256; - }; - }.${system} or throwSystem; + + src = let + base = "https://downloads.slack-edge.com"; + in { + x86_64-darwin = fetchurl { + url = "${base}/releases/macos/${version}/prod/x64/Slack-${version}-macOS.dmg"; + sha256 = x86_64-darwin-sha256; + }; + x86_64-linux = fetchurl { + url = "${base}/releases/linux/${version}/prod/x64/slack-desktop-${version}-amd64.deb"; + sha256 = x86_64-linux-sha256; + }; + aarch64-darwin = fetchurl { + url = "${base}/releases/macos/${version}/prod/arm64/Slack-${version}-macOS.dmg"; + sha256 = aarch64-darwin-sha256; + }; + }.${system} or throwSystem; meta = with lib; { description = "Desktop client for Slack"; homepage = "https://slack.com"; license = licenses.unfree; maintainers = with maintainers; [ mmahut ]; - platforms = [ "x86_64-darwin" "x86_64-linux" "aarch64-darwin"]; + platforms = [ "x86_64-darwin" "x86_64-linux" "aarch64-darwin" ]; }; linux = stdenv.mkDerivation rec { @@ -106,7 +104,6 @@ let freetype gdk-pixbuf glib - gnome2.GConf gtk3 libGL libappindicator-gtk3 @@ -170,7 +167,8 @@ let rm $out/bin/slack makeWrapper $out/lib/slack/slack $out/bin/slack \ --prefix XDG_DATA_DIRS : $GSETTINGS_SCHEMAS_PATH \ - --prefix PATH : ${lib.makeBinPath [xdg-utils]} + --prefix PATH : ${lib.makeBinPath [xdg-utils]} \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--enable-features=UseOzonePlatform --ozone-platform=wayland}}" # Fix the desktop link substituteInPlace $out/share/applications/slack.desktop \ @@ -194,7 +192,10 @@ let runHook preInstall mkdir -p $out/Applications/Slack.app cp -R . $out/Applications/Slack.app - /usr/bin/defaults write com.tinyspeck.slackmacgap SlackNoAutoUpdates -bool YES + '' + lib.optionalString (!stdenv.isAarch64) '' + # on aarch64-darwin we get: Could not write domain com.tinyspeck.slackmacgap; exiting + /usr/bin/defaults write com.tinyspeck.slackmacgap SlackNoAutoUpdates -Bool YES + '' + '' runHook postInstall ''; }; diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/slack/update.sh b/nixpkgs/pkgs/applications/networking/instant-messengers/slack/update.sh index 0bb0d784167c..688fe579f877 100755 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/slack/update.sh +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/slack/update.sh @@ -16,21 +16,28 @@ nixpkgs="$(git rev-parse --show-toplevel)" slack_nix="$nixpkgs/pkgs/applications/networking/instant-messengers/slack/default.nix" nixpkgs_linux_version=$(cat "$slack_nix" | sed -n 's/.*x86_64-linux-version = \"\([0-9\.]\+\)\";.*/\1/p') nixpkgs_mac_version=$(cat "$slack_nix" | sed -n 's/.*x86_64-darwin-version = \"\([0-9\.]\+\)\";.*/\1/p') +nixpkgs_mac_arm_version=$(cat "$slack_nix" | sed -n 's/.*aarch64-darwin-version = \"\([0-9\.]\+\)\";.*/\1/p') -if [[ "$nixpkgs_linux_version" == "$latest_linux_version" && "$nixpkgs_mac_version" == "$latest_mac_version" ]]; then +if [[ "$nixpkgs_linux_version" == "$latest_linux_version" && \ + "$nixpkgs_mac_version" == "$latest_mac_version" && \ + "$nixpkgs_mac_arm_version" == "$latest_mac_version" ]]; then echo "nixpkgs versions are all up to date!" exit 0 fi -linux_url="https://downloads.slack-edge.com/linux_releases/slack-desktop-${latest_linux_version}-amd64.deb" +linux_url="https://downloads.slack-edge.com/releases/linux/${latest_linux_version}/prod/x64/slack-desktop-${latest_linux_version}-amd64.deb" mac_url="https://downloads.slack-edge.com/releases/macos/${latest_mac_version}/prod/x64/Slack-${latest_mac_version}-macOS.dmg" +mac_arm_url="https://downloads.slack-edge.com/releases/macos/${latest_mac_version}/prod/arm64/Slack-${latest_mac_version}-macOS.dmg" linux_sha256=$(nix-prefetch-url ${linux_url}) mac_sha256=$(nix-prefetch-url ${mac_url}) +mac_arm_sha256=$(nix-prefetch-url ${mac_arm_url}) sed -i "s/x86_64-linux-version = \".*\"/x86_64-linux-version = \"${latest_linux_version}\"/" "$slack_nix" sed -i "s/x86_64-darwin-version = \".*\"/x86_64-darwin-version = \"${latest_mac_version}\"/" "$slack_nix" +sed -i "s/aarch64-darwin-version = \".*\"/aarch64-darwin-version = \"${latest_mac_version}\"/" "$slack_nix" sed -i "s/x86_64-linux-sha256 = \".*\"/x86_64-linux-sha256 = \"${linux_sha256}\"/" "$slack_nix" sed -i "s/x86_64-darwin-sha256 = \".*\"/x86_64-darwin-sha256 = \"${mac_sha256}\"/" "$slack_nix" +sed -i "s/aarch64-darwin-sha256 = \".*\"/aarch64-darwin-sha256 = \"${mac_arm_sha256}\"/" "$slack_nix" if ! nix-build -A slack "$nixpkgs"; then echo "The updated slack failed to build." diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/teams/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/teams/default.nix index 52935267cf2e..84310498eee4 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/teams/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/teams/default.nix @@ -14,109 +14,150 @@ , xdg-utils , systemd , nodePackages -, enableRectOverlay ? false }: +, xar +, cpio +, makeWrapper +, enableRectOverlay ? false +}: -stdenv.mkDerivation rec { +let pname = "teams"; version = "1.4.00.26453"; - - src = fetchurl { - url = "https://packages.microsoft.com/repos/ms-teams/pool/main/t/teams/teams_${version}_amd64.deb"; - sha256 = "0ndqk893l17m42hf5fiiv6mka0v7v8r54kblvb67jsxajdvva5gf"; + meta = with lib; { + description = "Microsoft Teams"; + homepage = "https://teams.microsoft.com"; + downloadPage = "https://teams.microsoft.com/downloads"; + license = licenses.unfree; + maintainers = with maintainers; [ liff tricktron ]; + platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-darwin" ]; }; - nativeBuildInputs = [ dpkg autoPatchelfHook wrapGAppsHook nodePackages.asar ]; + linux = stdenv.mkDerivation rec { + inherit pname version meta; - unpackCmd = "dpkg -x $curSrc ."; + src = fetchurl { + url = "https://packages.microsoft.com/repos/ms-teams/pool/main/t/teams/teams_${version}_amd64.deb"; + sha256 = "0ndqk893l17m42hf5fiiv6mka0v7v8r54kblvb67jsxajdvva5gf"; + }; - buildInputs = atomEnv.packages ++ [ - libuuid - at-spi2-atk - ]; + nativeBuildInputs = [ dpkg autoPatchelfHook wrapGAppsHook nodePackages.asar ]; - runtimeDependencies = [ - (lib.getLib systemd) - pulseaudio - libappindicator-gtk3 - ]; + unpackCmd = "dpkg -x $curSrc ."; - preFixup = '' - gappsWrapperArgs+=(--prefix PATH : "${coreutils}/bin:${gawk}/bin") - gappsWrapperArgs+=(--add-flags --disable-namespace-sandbox) - gappsWrapperArgs+=(--add-flags --disable-setuid-sandbox) - ''; + buildInputs = atomEnv.packages ++ [ + libuuid + at-spi2-atk + ]; + runtimeDependencies = [ + (lib.getLib systemd) + pulseaudio + libappindicator-gtk3 + ]; - buildPhase = '' - runHook preBuild + preFixup = '' + gappsWrapperArgs+=(--prefix PATH : "${coreutils}/bin:${gawk}/bin") + gappsWrapperArgs+=(--add-flags --disable-namespace-sandbox) + gappsWrapperArgs+=(--add-flags --disable-setuid-sandbox) + ''; - asar extract share/teams/resources/app.asar "$TMP/work" - substituteInPlace $TMP/work/main.bundle.js \ - --replace "/usr/share/pixmaps/" "$out/share/pixmaps" \ - --replace "/usr/bin/xdg-mime" "${xdg-utils}/bin/xdg-mime" \ - --replace "Exec=/usr/bin/" "Exec=" # Remove usage of absolute path in autostart. - asar pack --unpack='{*.node,*.ftz,rect-overlay}' "$TMP/work" share/teams/resources/app.asar - runHook postBuild - ''; + buildPhase = '' + runHook preBuild - preferLocalBuild = true; + asar extract share/teams/resources/app.asar "$TMP/work" + substituteInPlace $TMP/work/main.bundle.js \ + --replace "/usr/share/pixmaps/" "$out/share/pixmaps" \ + --replace "/usr/bin/xdg-mime" "${xdg-utils}/bin/xdg-mime" \ + --replace "Exec=/usr/bin/" "Exec=" # Remove usage of absolute path in autostart. + asar pack --unpack='{*.node,*.ftz,rect-overlay}' "$TMP/work" share/teams/resources/app.asar - installPhase = '' - runHook preInstall + runHook postBuild + ''; - mkdir -p $out/{opt,bin} + preferLocalBuild = true; - mv share/teams $out/opt/ - mv share $out/share + installPhase = '' + runHook preInstall - substituteInPlace $out/share/applications/teams.desktop \ - --replace /usr/bin/ "" + mkdir -p $out/{opt,bin} - ln -s $out/opt/teams/teams $out/bin/ + mv share/teams $out/opt/ + mv share $out/share - ${lib.optionalString (!enableRectOverlay) '' - # Work-around screen sharing bug - # https://docs.microsoft.com/en-us/answers/questions/42095/sharing-screen-not-working-anymore-bug.html - rm $out/opt/teams/resources/app.asar.unpacked/node_modules/slimcore/bin/rect-overlay - ''} + substituteInPlace $out/share/applications/teams.desktop \ + --replace /usr/bin/ "" - runHook postInstall - ''; + ln -s $out/opt/teams/teams $out/bin/ - dontAutoPatchelf = true; + ${lib.optionalString (!enableRectOverlay) '' + # Work-around screen sharing bug + # https://docs.microsoft.com/en-us/answers/questions/42095/sharing-screen-not-working-anymore-bug.html + rm $out/opt/teams/resources/app.asar.unpacked/node_modules/slimcore/bin/rect-overlay + ''} - # Includes runtimeDependencies in the RPATH of the included Node modules - # so that dynamic loading works. We cannot use directly runtimeDependencies - # here, since the libraries from runtimeDependencies are not propagated - # to the dynamically loadable node modules because of a condition in - # autoPatchElfHook since *.node modules have Type: DYN (Shared object file) - # instead of EXEC or INTERP it expects. - # Fixes: https://github.com/NixOS/nixpkgs/issues/85449 - postFixup = '' - autoPatchelf "$out" + runHook postInstall + ''; - runtime_rpath="${lib.makeLibraryPath runtimeDependencies}" + dontAutoPatchelf = true; - for mod in $(find "$out/opt/teams" -name '*.node'); do - mod_rpath="$(patchelf --print-rpath "$mod")" + # Includes runtimeDependencies in the RPATH of the included Node modules + # so that dynamic loading works. We cannot use directly runtimeDependencies + # here, since the libraries from runtimeDependencies are not propagated + # to the dynamically loadable node modules because of a condition in + # autoPatchElfHook since *.node modules have Type: DYN (Shared object file) + # instead of EXEC or INTERP it expects. + # Fixes: https://github.com/NixOS/nixpkgs/issues/85449 + postFixup = '' + autoPatchelf "$out" - echo "Adding runtime dependencies to RPATH of Node module $mod" - patchelf --set-rpath "$runtime_rpath:$mod_rpath" "$mod" - done; + runtime_rpath="${lib.makeLibraryPath runtimeDependencies}" - # fix for https://docs.microsoft.com/en-us/answers/questions/298724/open-teams-meeting-link-on-linux-doens39t-work.html?childToView=309406#comment-309406 - # while we create the wrapper ourselves, gappsWrapperArgs leads to the same issue - # another option would be to introduce gappsWrapperAppendedArgs, to allow control of positioning - substituteInPlace "$out/bin/teams" --replace '.teams-wrapped" --disable-namespace-sandbox --disable-setuid-sandbox "$@"' '.teams-wrapped" "$@" --disable-namespace-sandbox --disable-setuid-sandbox' - ''; + for mod in $(find "$out/opt/teams" -name '*.node'); do + mod_rpath="$(patchelf --print-rpath "$mod")" - meta = with lib; { - description = "Microsoft Teams"; - homepage = "https://teams.microsoft.com"; - downloadPage = "https://teams.microsoft.com/downloads"; - license = licenses.unfree; - maintainers = [ maintainers.liff ]; - platforms = [ "x86_64-linux" ]; + echo "Adding runtime dependencies to RPATH of Node module $mod" + patchelf --set-rpath "$runtime_rpath:$mod_rpath" "$mod" + done; + + # fix for https://docs.microsoft.com/en-us/answers/questions/298724/open-teams-meeting-link-on-linux-doens39t-work.html?childToView=309406#comment-309406 + # while we create the wrapper ourselves, gappsWrapperArgs leads to the same issue + # another option would be to introduce gappsWrapperAppendedArgs, to allow control of positioning + substituteInPlace "$out/bin/teams" --replace '.teams-wrapped" --disable-namespace-sandbox --disable-setuid-sandbox "$@"' '.teams-wrapped" "$@" --disable-namespace-sandbox --disable-setuid-sandbox' + ''; + }; + + appName = "Teams.app"; + + darwin = stdenv.mkDerivation { + inherit pname version meta; + + src = fetchurl { + url = "https://statics.teams.cdn.office.net/production-osx/${version}/Teams_osx.pkg"; + sha256 = "1mg6a3b3954w4xy5rlcrwxczymygl61dv2rxqp45sjcsh3hp39q0"; + }; + + buildInputs = [ xar cpio makeWrapper ]; + + unpackPhase = '' + xar -xf $src + zcat < Teams_osx_app.pkg/Payload | cpio -i + ''; + + sourceRoot = "Microsoft\ Teams.app"; + dontPatch = true; + dontConfigure = true; + dontBuild = true; + + installPhase = '' + runHook preInstall + mkdir -p $out/{Applications/${appName},bin} + cp -R . $out/Applications/${appName} + makeWrapper $out/Applications/${appName}/Contents/MacOS/Teams $out/bin/teams + runHook postInstall + ''; }; -} +in +if stdenv.isDarwin +then darwin +else linux diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/tg_owt.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/tg_owt.nix index 614183b72d08..aff74a174b9c 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/tg_owt.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/tg_owt.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, pkg-config, cmake, ninja, yasm -, libjpeg, openssl, libopus, ffmpeg, alsa-lib, libpulseaudio, protobuf +, libjpeg, openssl, libopus, ffmpeg_4, alsa-lib, libpulseaudio, protobuf , xorg, libXtst }: @@ -23,7 +23,7 @@ in stdenv.mkDerivation { nativeBuildInputs = [ pkg-config cmake ninja yasm ]; buildInputs = [ - libjpeg openssl libopus ffmpeg alsa-lib libpulseaudio protobuf + libjpeg openssl libopus ffmpeg_4 alsa-lib libpulseaudio protobuf xorg.libX11 libXtst ]; diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix index 77508eb02978..9a34513acabd 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix @@ -48,6 +48,8 @@ , brotli , microsoft_gsl , rlottie +, stdenv +, gcc10Stdenv }: # Main reference: @@ -63,10 +65,12 @@ let cxxStandard = "17"; }; }; + # Aarch64 default gcc9 will cause ICE. For reference #108305 + env = if stdenv.isAarch64 then gcc10Stdenv else stdenv; in -mkDerivation rec { +env.mkDerivation rec { pname = "telegram-desktop"; - version = "3.1.11"; + version = "3.4.8"; # Note: Update via pkgs/applications/networking/instant-messengers/telegram/tdesktop/update.py # Telegram-Desktop with submodules @@ -75,7 +79,7 @@ mkDerivation rec { repo = "tdesktop"; rev = "v${version}"; fetchSubmodules = true; - sha256 = "0hpcsraw3gx37wk3r88q51qf68ny0kb3kd6slnklwf22d1jqr3fn"; + sha256 = "11h2w82i10zn55iz9xda8ihsnv6s8rxm3wkmmmkpa4zfzinryqb4"; }; postPatch = '' @@ -154,6 +158,8 @@ mkDerivation rec { "-DTDESKTOP_API_HASH=d524b414d21f4d37f08684c1df41ac9c" # See: https://github.com/NixOS/nixpkgs/pull/130827#issuecomment-885212649 "-DDESKTOP_APP_USE_PACKAGED_FONTS=OFF" + # TODO: Remove once QT6 is available in nixpkgs + "-DDESKTOP_APP_QT6=OFF" ]; postFixup = '' @@ -183,6 +189,6 @@ mkDerivation rec { platforms = platforms.linux; homepage = "https://desktop.telegram.org/"; changelog = "https://github.com/telegramdesktop/tdesktop/releases/tag/v${version}"; - maintainers = with maintainers; [ oxalica vanilla ]; + maintainers = with maintainers; [ oxalica ]; }; } diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/tdesktop/tg_owt.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/tdesktop/tg_owt.nix index 878fea994db3..25dc1ff3d034 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/tdesktop/tg_owt.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/tdesktop/tg_owt.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation { pname = "tg_owt"; - version = "unstable-2021-10-21"; + version = "unstable-2021-12-22"; src = fetchFromGitHub { owner = "desktop-app"; repo = "tg_owt"; - rev = "d578c760dc6f1ae5f0f3bb5317b0b2ed04b79138"; - sha256 = "12lr50nma3j9df55sxi6p48yhn9yxrwzz5yrx7r29p8p4fv1c75w"; + rev = "6708e0d31a73e64fe12f54829bf4060c41b2658e"; + sha256 = "081ylw8vp8c84x3f1xx1kia6k1sds2iza9fm5dvn3ccgjwxdm5ny"; fetchSubmodules = true; }; diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/torchat/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/torchat/default.nix index 8fece5412721..3278d68cd0b5 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/torchat/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/torchat/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, python, unzip, wxPython, wrapPython, tor }: +{ lib, stdenv, fetchFromGitHub, python2, unzip, tor }: stdenv.mkDerivation rec { pname = "torchat"; @@ -12,8 +12,8 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ unzip ]; - buildInputs = [ python wxPython wrapPython ]; - pythonPath = [ wxPython ]; + buildInputs = with python2.pkgs; [ python wxPython wrapPython ]; + pythonPath = with python2.pkgs; [ wxPython ]; preConfigure = "cd torchat/src; rm portable.txt"; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { mkdir -p $out/lib/torchat cp -rf * $out/lib/torchat - makeWrapper ${python}/bin/python $out/bin/torchat \ + makeWrapper ${python2}/bin/python $out/bin/torchat \ --set PYTHONPATH $out/lib/torchat:$program_PYTHONPATH \ --run "cd $out/lib/torchat" \ --add-flags "-O $out/lib/torchat/torchat.py" diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/viber/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/viber/default.nix index 97df6d643c88..f8e048edc4b0 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/viber/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/viber/default.nix @@ -99,7 +99,7 @@ stdenv.mkDerivation { dontPatchELF = true; meta = { - homepage = "http://www.viber.com"; + homepage = "https://www.viber.com"; description = "An instant messaging and Voice over IP (VoIP) app"; license = lib.licenses.unfree; platforms = [ "x86_64-linux" ]; diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/zoom-us/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/zoom-us/default.nix index 9451dcd2d236..a33980874553 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/zoom-us/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/zoom-us/default.nix @@ -28,11 +28,11 @@ }: let - version = "5.8.6.739"; + version = "5.9.3.1911"; srcs = { x86_64-linux = fetchurl { url = "https://zoom.us/client/${version}/zoom_x86_64.pkg.tar.xz"; - sha256 = "12gzdfxf6xy558smsfazvjj4g1rnaiw7l2lznzlh2qazyaq6f3mq"; + sha256 = "0pamn028k96z0j9xzv56szk7sy0czd9myqm4p3hps1gkczc9wzs4"; }; }; diff --git a/nixpkgs/pkgs/applications/networking/ipfs-cluster/default.nix b/nixpkgs/pkgs/applications/networking/ipfs-cluster/default.nix index a7627feb94d1..d66efa86a7f9 100644 --- a/nixpkgs/pkgs/applications/networking/ipfs-cluster/default.nix +++ b/nixpkgs/pkgs/applications/networking/ipfs-cluster/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "ipfs-cluster"; - version = "0.14.1"; + version = "0.14.4"; - vendorSha256 = "sha256-vDNWYgWlM3kJqlHW/6Bj6P+t6M61TvOVRJwDN2p0mi4="; + vendorSha256 = "sha256-4j6aPs17YNXyPIRr5NshAPYIfNM08GlYV13jnGtJzQc="; src = fetchFromGitHub { owner = "ipfs"; repo = "ipfs-cluster"; rev = "v${version}"; - sha256 = "sha256-GELCd12LhA4CBe9DRRBu4r+AwCksaRVIWcSAJScvnbk="; + sha256 = "sha256-82t3sHMKZiV6sYnW72N94qfRZ/aMkavj+hiAyg5viHQ="; }; meta = with lib; { diff --git a/nixpkgs/pkgs/applications/networking/ipget/default.nix b/nixpkgs/pkgs/applications/networking/ipget/default.nix index 19cc4445b328..a8888b8e2958 100644 --- a/nixpkgs/pkgs/applications/networking/ipget/default.nix +++ b/nixpkgs/pkgs/applications/networking/ipget/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "ipget"; - version = "0.7.0"; + version = "0.8.0"; src = fetchFromGitHub { owner = "ipfs"; repo = "ipget"; rev = "v${version}"; - sha256 = "sha256-YD05HIVr99b8VmEJgzY2ClNv31I98d0NbfCk3XcB+xk="; + sha256 = "sha256-qRPke8/CUmGX6v+8qv9JQCUC8T9pjwRRyGmBWvatsJ0="; }; - vendorSha256 = "sha256-bymHVWskCt7bf02CveMXl1VhZYhRSEH7xIoESh31iGg="; + vendorSha256 = "sha256-La9V5B+UDaOswh/R8ad4xsnCF5ewtF7G+uiqnarM4Mg="; postPatch = '' # main module (github.com/ipfs/ipget) does not contain package github.com/ipfs/ipget/sharness/dependencies diff --git a/nixpkgs/pkgs/applications/networking/irc/catgirl/default.nix b/nixpkgs/pkgs/applications/networking/irc/catgirl/default.nix index 68ada703f8d6..9f979781857d 100644 --- a/nixpkgs/pkgs/applications/networking/irc/catgirl/default.nix +++ b/nixpkgs/pkgs/applications/networking/irc/catgirl/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "catgirl"; - version = "2.0"; + version = "2.0a"; src = fetchurl { url = "https://git.causal.agency/catgirl/snapshot/${pname}-${version}.tar.gz"; - sha256 = "sha256-rk6nvfyaFxJ/7JN92L5tDraTngffVb6u/U7dbNjK9jI="; + sha256 = "sha256-AbzzTqaulPDplntwRYw4fVxZXUIJ2L0MKZvyWq4lvro="; }; # catgirl's configure script uses pkg-config --variable exec_prefix openssl diff --git a/nixpkgs/pkgs/applications/networking/irc/hexchat/default.nix b/nixpkgs/pkgs/applications/networking/irc/hexchat/default.nix index 504481479ed2..0bc25c0f8592 100644 --- a/nixpkgs/pkgs/applications/networking/irc/hexchat/default.nix +++ b/nixpkgs/pkgs/applications/networking/irc/hexchat/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "hexchat"; - version = "2.16.0"; + version = "2.16.1"; src = fetchFromGitHub { owner = "hexchat"; repo = "hexchat"; rev = "v${version}"; - sha256 = "08zhlf9d3xdis62byxzgizhfg8kbppxl7cgxkzhwdc1srpj7vpx6"; + sha256 = "sha256-2IUlNUTL3TOJnDNMds2EWwkfn5NUOQ1ids96Ddo196E="; }; nativeBuildInputs = [ meson ninja pkg-config makeWrapper ]; @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { done ''; - mesonFlags = [ "-Dwith-lua=lua" "-Dwith-text=true" ]; + mesonFlags = [ "-Dwith-lua=lua" "-Dtext-frontend=true" ]; postInstall = '' wrapProgram $out/bin/hexchat --prefix PYTHONPATH : "$PYTHONPATH" diff --git a/nixpkgs/pkgs/applications/networking/irc/ii/default.nix b/nixpkgs/pkgs/applications/networking/irc/ii/default.nix index 18a9a8882fac..e39f7b75bb5d 100644 --- a/nixpkgs/pkgs/applications/networking/irc/ii/default.nix +++ b/nixpkgs/pkgs/applications/networking/irc/ii/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "ii"; - version = "1.8"; + version = "1.9"; src = fetchurl { url = "https://dl.suckless.org/tools/${pname}-${version}.tar.gz"; - sha256 = "1lk8vjl7i8dcjh4jkg8h8bkapcbs465sy8g9c0chfqsywbmf3ndr"; + sha256 = "sha256-hQyzI7WD0mG1G9qZk+5zMzQ1Ko5soeLwK1fBVL9WjBc="; }; makeFlags = [ "CC:=$(CC)" ]; diff --git a/nixpkgs/pkgs/applications/networking/irc/irssi/default.nix b/nixpkgs/pkgs/applications/networking/irc/irssi/default.nix index 7a4fc703dd77..8dbd2cd73ee4 100644 --- a/nixpkgs/pkgs/applications/networking/irc/irssi/default.nix +++ b/nixpkgs/pkgs/applications/networking/irc/irssi/default.nix @@ -1,17 +1,27 @@ -{ lib, stdenv, fetchurl, pkg-config, ncurses, glib, openssl, perl, libintl, libgcrypt, libotr }: +{ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool, pkg-config, ncurses, glib, openssl, perl, libintl, libgcrypt, libotr, git }: stdenv.mkDerivation rec { pname = "irssi"; version = "1.2.3"; - src = fetchurl { - url = "https://github.com/irssi/irssi/releases/download/${version}/${pname}-${version}.tar.gz"; - sha256 = "09cwz5ff1i5lp35qhhmw6kbw5dwcn9pl16gpzkc92xg5sx3bgjr9"; + + src = fetchFromGitHub { + "owner" = "irssi"; + "repo" = "irssi"; + "rev" = "91dc3e4dfa1a9558c5a7fe0ea982cb9df0e2de65"; + "sha256" = "efnE4vuDd7TnOBxMPduiV0/nez1jVhTjbJ0vzN4ZMcg="; + "leaveDotGit" = true; }; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ pkg-config autoconf automake libtool git ]; buildInputs = [ ncurses glib openssl perl libintl libgcrypt libotr ]; + enableParallelBuilding = true; + + preConfigure = '' + NOCONFIGURE=1 ./autogen.sh + ''; + configureFlags = [ "--with-proxy" "--with-bot" diff --git a/nixpkgs/pkgs/applications/networking/irc/irssi/fish/default.nix b/nixpkgs/pkgs/applications/networking/irc/irssi/fish/default.nix index df59ddec6a90..a3ee4e4ab9c7 100644 --- a/nixpkgs/pkgs/applications/networking/irc/irssi/fish/default.nix +++ b/nixpkgs/pkgs/applications/networking/irc/irssi/fish/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; preConfigure = '' - tar xf ${irssi.src} + cp -a "${irssi.src}" "./${irssi.name}" configureFlags="$configureFlags --with-irssi-source=`pwd`/${irssi.name}" ./regen.sh diff --git a/nixpkgs/pkgs/applications/networking/irc/kirc/default.nix b/nixpkgs/pkgs/applications/networking/irc/kirc/default.nix index c4f63613fc57..08823cab5735 100644 --- a/nixpkgs/pkgs/applications/networking/irc/kirc/default.nix +++ b/nixpkgs/pkgs/applications/networking/irc/kirc/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "kirc"; - version = "0.2.7"; + version = "0.2.9"; src = fetchFromGitHub { owner = "mcpcpc"; repo = pname; rev = version; - hash = "sha256-iaqj4xB15DB3w/RaiCOMdAu8eONhTw1Dz0j5kykAHV4="; + hash = "sha256-KRCVjz59SHjk86VgfGxYKk/Ti3o77dV7fdRu9mB3FSo="; }; dontConfigure = true; diff --git a/nixpkgs/pkgs/applications/networking/irc/quassel/0001-common-Disable-enum-type-stream-operators-for-Qt-5.1.patch b/nixpkgs/pkgs/applications/networking/irc/quassel/0001-common-Disable-enum-type-stream-operators-for-Qt-5.1.patch deleted file mode 100644 index 6c40dc8dd895..000000000000 --- a/nixpkgs/pkgs/applications/networking/irc/quassel/0001-common-Disable-enum-type-stream-operators-for-Qt-5.1.patch +++ /dev/null @@ -1,37 +0,0 @@ -From ac9387271b2420a71f7d172f44354fc35adac504 Mon Sep 17 00:00:00 2001 -From: Manuel Nickschas <sputnick@quassel-irc.org> -Date: Tue, 7 Jan 2020 18:34:54 +0100 -Subject: [PATCH] common: Disable enum type stream operators for Qt >= 5.14 - -Starting from version 5.14, Qt provides stream operators for enum -types, which collide with the ones we ship in types.h. Disable -Quassel's stream operators when compiling against Qt 5.14 or later. - -(cherry-picked from 579e559a6322209df7cd51c34801fecff5fe734b) ---- - src/common/types.h | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/src/common/types.h b/src/common/types.h -index 467d9fb2..c4b9f364 100644 ---- a/src/common/types.h -+++ b/src/common/types.h -@@ -140,6 +140,7 @@ Q_DECLARE_METATYPE(QHostAddress) - typedef QList<MsgId> MsgIdList; - typedef QList<BufferId> BufferIdList; - -+#if QT_VERSION < QT_VERSION_CHECK(5, 14, 0) - /** - * Catch-all stream serialization operator for enum types. - * -@@ -169,6 +170,7 @@ QDataStream &operator>>(QDataStream &in, T &value) { - value = static_cast<T>(v); - return in; - } -+#endif - - // Exceptions - --- -2.26.2 - diff --git a/nixpkgs/pkgs/applications/networking/irc/quassel/default.nix b/nixpkgs/pkgs/applications/networking/irc/quassel/default.nix index 44e7fb853601..d218f114143f 100644 --- a/nixpkgs/pkgs/applications/networking/irc/quassel/default.nix +++ b/nixpkgs/pkgs/applications/networking/irc/quassel/default.nix @@ -5,7 +5,7 @@ , static ? false # link statically , lib, stdenv, fetchFromGitHub, cmake, makeWrapper, dconf -, mkDerivation, qtbase, qtscript +, mkDerivation, qtbase, boost, zlib, qtscript , phonon, libdbusmenu, qca-qt5 , withKDE ? true # enable KDE integration @@ -33,27 +33,21 @@ let in (if !buildClient then stdenv.mkDerivation else mkDerivation) rec { pname = "quassel${tag}"; - version = "0.13.1"; + version = "0.14.0"; src = fetchFromGitHub { owner = "quassel"; repo = "quassel"; rev = version; - sha256 = "0z8p7iv90yrrjbh31cyxhpr6hsynfmi23rlayn7p2f6ki5az7yc3"; + sha256 = "sha256-eulhNcyCmy9ryietOhT2yVJeJH+MMZRbTUo2XuTy9qU="; }; - patches = [ - # fixes build with Qt 5.14 - # source: https://github.com/quassel/quassel/pull/518/commits/8a46d983fc99204711cdff1e4c542e272fef45b9 - ./0001-common-Disable-enum-type-stream-operators-for-Qt-5.1.patch - ]; - # Prevent ``undefined reference to `qt_version_tag''' in SSL check NIX_CFLAGS_COMPILE = "-DQT_NO_VERSION_TAGGING=1"; nativeBuildInputs = [ cmake makeWrapper ]; - buildInputs = [ qtbase ] - ++ lib.optionals buildCore [qtscript qca-qt5] + buildInputs = [ qtbase boost zlib ] + ++ lib.optionals buildCore [qtscript qca-qt5 ] ++ lib.optionals buildClient [libdbusmenu phonon] ++ lib.optionals (buildClient && withKDE) [ extra-cmake-modules kconfigwidgets kcoreaddons diff --git a/nixpkgs/pkgs/applications/networking/irc/senpai/default.nix b/nixpkgs/pkgs/applications/networking/irc/senpai/default.nix index bd660660e462..0fc0284a183e 100644 --- a/nixpkgs/pkgs/applications/networking/irc/senpai/default.nix +++ b/nixpkgs/pkgs/applications/networking/irc/senpai/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "senpai"; - version = "unstable-2021-11-29"; + version = "unstable-2021-12-14"; src = fetchFromSourcehut { owner = "~taiite"; repo = "senpai"; - rev = "3904c9190d94f273c0ae9937d3161b9fe4adf856"; - sha256 = "sha256-4ZhJuAxcoGjRO5xVqzlmaUvipnyiFMuJ1A3n8vlhYxU="; + rev = "8091752a67781273944e7a79a803b7a671378313"; + sha256 = "sha256-tZp0ra/Sq/5MAFlAFHPJ94jYxtHbDiG1wSD4NOH1x7I="; }; vendorSha256 = "sha256-xkJh7k8GZmoZqE0HgbFp2xMJQOVDkPEXOZEl6bJZz1A="; diff --git a/nixpkgs/pkgs/applications/networking/irc/srain/default.nix b/nixpkgs/pkgs/applications/networking/irc/srain/default.nix index 8cac8e144b85..2fb6fed15ca8 100644 --- a/nixpkgs/pkgs/applications/networking/irc/srain/default.nix +++ b/nixpkgs/pkgs/applications/networking/irc/srain/default.nix @@ -20,13 +20,13 @@ stdenv.mkDerivation rec { pname = "srain"; - version = "1.3.1"; + version = "1.3.2"; src = fetchFromGitHub { owner = "SrainApp"; repo = "srain"; rev = version; - sha256 = "sha256-jGt0DlxlR2J9bE5S9pqT45OZTqzsr+DiZ7pON5QbU/Y="; + sha256 = "sha256-JsXReGmdBtzMXhrT1cFlkBbw8j/SxzgXSeHcHlns2po="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/applications/networking/irc/wraith/configure.patch b/nixpkgs/pkgs/applications/networking/irc/wraith/configure.patch index e5fa2feb2019..16e65be00a25 100644 --- a/nixpkgs/pkgs/applications/networking/irc/wraith/configure.patch +++ b/nixpkgs/pkgs/applications/networking/irc/wraith/configure.patch @@ -1,8 +1,8 @@ --- a/configure +++ b/configure -@@ -6029,53 +6029,8 @@ +@@ -6143,53 +6143,8 @@ rm -f confcache + #AC_CHECK_HEADERS(openssl/ssl.h openssl/crypto.h) #AC_CHECK_HEADERS(zlib.h) - #EGG_CHECK_ZLIB -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for path to OpenSSL" >&5 -$as_echo_n "checking for path to OpenSSL... " >&6; } diff --git a/nixpkgs/pkgs/applications/networking/irc/wraith/default.nix b/nixpkgs/pkgs/applications/networking/irc/wraith/default.nix index 3b1fa79aa266..30aec18c107f 100644 --- a/nixpkgs/pkgs/applications/networking/irc/wraith/default.nix +++ b/nixpkgs/pkgs/applications/networking/irc/wraith/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "wraith"; - version = "1.4.7"; + version = "1.4.10"; src = fetchurl { url = "mirror://sourceforge/wraithbotpack/wraith-v${version}.tar.gz"; - sha256 = "0h6liac5y7im0jfm2sj18mibvib7d1l727fjs82irsjj1v9kif3j"; + sha256 = "1h8159g6wh1hi69cnhqkgwwwa95fa6z1zrzjl219mynbf6vjjzkw"; }; hardeningDisable = [ "format" ]; buildInputs = [ openssl ]; diff --git a/nixpkgs/pkgs/applications/networking/irc/wraith/dlopen.patch b/nixpkgs/pkgs/applications/networking/irc/wraith/dlopen.patch index bfc854ef9e9c..5bf11eb72692 100644 --- a/nixpkgs/pkgs/applications/networking/irc/wraith/dlopen.patch +++ b/nixpkgs/pkgs/applications/networking/irc/wraith/dlopen.patch @@ -1,15 +1,15 @@ diff --git a/src/libcrypto.cc b/src/libcrypto.cc -index 0339258..68746c8 100644 +index 5139f66..517103f 100644 --- a/src/libcrypto.cc +++ b/src/libcrypto.cc -@@ -95,17 +95,9 @@ int load_libcrypto() { +@@ -100,17 +100,9 @@ int load_libcrypto() { } sdprintf("Loading libcrypto"); + dlerror(); // Clear Errors + libcrypto_handle = dlopen("@openssl@/lib/libcrypto.so", RTLD_LAZY|RTLD_GLOBAL); -- bd::Array<bd::String> libs_list(bd::String("libcrypto.so." SHLIB_VERSION_NUMBER " libcrypto.so libcrypto.so.0.9.8 libcrypto.so.7 libcrypto.so.6").split(' ')); +- bd::Array<bd::String> libs_list(bd::String("libcrypto.so." SHLIB_VERSION_NUMBER " libcrypto.so libcrypto.so.1.1 libcrypto.so.1.0.0 libcrypto.so.0.9.8 libcrypto.so.10 libcrypto.so.9 libcrypto.so.8 libcrypto.so.7 libcrypto.so.6").split(' ')); - - for (size_t i = 0; i < libs_list.length(); ++i) { - dlerror(); // Clear Errors @@ -23,17 +23,17 @@ index 0339258..68746c8 100644 fprintf(stderr, STR("Unable to find libcrypto\n")); return(1); diff --git a/src/libssl.cc b/src/libssl.cc -index b432c7b..8940998 100644 +index 6010abc..86e29fc 100644 --- a/src/libssl.cc +++ b/src/libssl.cc -@@ -68,17 +68,9 @@ int load_libssl() { +@@ -78,17 +78,9 @@ int load_libssl() { } sdprintf("Loading libssl"); + dlerror(); // Clear Errors + libssl_handle = dlopen("@openssl@/lib/libssl.so", RTLD_LAZY); -- bd::Array<bd::String> libs_list(bd::String("libssl.so." SHLIB_VERSION_NUMBER " libssl.so libssl.so.0.9.8 libssl.so.7 libssl.so.6").split(' ')); +- bd::Array<bd::String> libs_list(bd::String("libssl.so." SHLIB_VERSION_NUMBER " libssl.so libssl.so.1.1 libssl.so.1.0.0 libssl.so.0.9.8 libssl.so.10 libssl.so.9 libssl.so.8 libssl.so.7 libssl.so.6").split(' ')); - - for (size_t i = 0; i < libs_list.length(); ++i) { - dlerror(); // Clear Errors diff --git a/nixpkgs/pkgs/applications/networking/mailreaders/aerc/default.nix b/nixpkgs/pkgs/applications/networking/mailreaders/aerc/default.nix index 5ab0bfd8030d..172cea3d061d 100644 --- a/nixpkgs/pkgs/applications/networking/mailreaders/aerc/default.nix +++ b/nixpkgs/pkgs/applications/networking/mailreaders/aerc/default.nix @@ -5,17 +5,17 @@ buildGoModule rec { pname = "aerc"; - version = "0.6.0"; + version = "0.7.1"; src = fetchFromSourcehut { owner = "~rjarry"; repo = pname; rev = version; - sha256 = "sha256-RaHigTp1YGkjQ46gFLhKcJuajekcCgfozu0ndCNq5Ac="; + sha256 = "sha256-wiylBBqnivDnMUyCg3Zateu4jcjicTfrQFALT8dg5No="; }; - runVend = true; - vendorSha256 = "sha256-A2MZzTYzGuZLFENn9OBIBBreJan+b3RKOEu5bQcDwS8="; + proxyVendor = true; + vendorSha256 = "sha256-hpGd78PWk3tIwB+TPmPy0gKkU8+t5NTm9RzPuLae+Fk="; doCheck = false; diff --git a/nixpkgs/pkgs/applications/networking/mailreaders/afew/default.nix b/nixpkgs/pkgs/applications/networking/mailreaders/afew/default.nix index 2e6c8cf02368..d0050f73759d 100644 --- a/nixpkgs/pkgs/applications/networking/mailreaders/afew/default.nix +++ b/nixpkgs/pkgs/applications/networking/mailreaders/afew/default.nix @@ -40,6 +40,6 @@ python3Packages.buildPythonApplication rec { homepage = "https://github.com/afewmail/afew"; description = "An initial tagging script for notmuch mail"; license = licenses.isc; - maintainers = with maintainers; [ andir flokli ]; + maintainers = with maintainers; [ flokli ]; }; } diff --git a/nixpkgs/pkgs/applications/networking/mailreaders/alot/default.nix b/nixpkgs/pkgs/applications/networking/mailreaders/alot/default.nix new file mode 100644 index 000000000000..3d09711fb3cc --- /dev/null +++ b/nixpkgs/pkgs/applications/networking/mailreaders/alot/default.nix @@ -0,0 +1,103 @@ +{ lib +, python3 +, fetchFromGitHub +, file +, gnupg +, gawk +, notmuch +, procps +, withManpage ? false +}: + +with python3.pkgs; +let + notmuch2 = callPackage ./notmuch.nix { + inherit notmuch; + }; +in +buildPythonApplication rec { + pname = "alot"; + version = "0.10"; + + outputs = [ + "out" + ] ++ lib.optional withManpage [ + "man" + ]; + + disabled = !isPy3k; + + src = fetchFromGitHub { + owner = "pazz"; + repo = "alot"; + rev = version; + sha256 = "sha256-1reAq8X9VwaaZDY5UfvcFzHDKd71J88CqJgH3+ANjis="; + }; + + postPatch = '' + substituteInPlace alot/settings/manager.py \ + --replace /usr/share "$out/share" + ''; + + nativeBuildInputs = lib.optional withManpage sphinx; + + propagatedBuildInputs = [ + configobj + file + gpgme + notmuch2 + python_magic + service-identity + twisted + urwid + urwidtrees + ]; + + checkInputs = [ + future + gawk + gnupg + mock + procps + pytestCheckHook + ]; + + postBuild = lib.optionalString withManpage [ + "make -C docs man" + ]; + + disabledTests = [ + # Some twisted tests need internet access + "test_env_set" + "test_no_spawn_no_stdin_attached" + # DatabaseLockedError + "test_save_named_query" + ]; + + postInstall = + let + completionPython = python.withPackages (ps: [ ps.configobj ]); + in + lib.optionalString withManpage '' + mkdir -p $out/man + cp -r docs/build/man $out/man + '' + + '' + mkdir -p $out/share/{applications,alot} + cp -r extra/themes $out/share/alot + + substituteInPlace extra/completion/alot-completion.zsh \ + --replace "python3" "${completionPython.interpreter}" + install -D extra/completion/alot-completion.zsh $out/share/zsh/site-functions/_alot + + sed "s,/usr/bin,$out/bin,g" extra/alot.desktop > $out/share/applications/alot.desktop + ''; + + meta = with lib; { + homepage = "https://github.com/pazz/alot"; + description = "Terminal MUA using notmuch mail"; + license = licenses.gpl3Plus; + platforms = platforms.linux; + maintainers = with maintainers; [ milibopp ]; + }; +} diff --git a/nixpkgs/pkgs/applications/networking/mailreaders/alot/notmuch.nix b/nixpkgs/pkgs/applications/networking/mailreaders/alot/notmuch.nix new file mode 100644 index 000000000000..bd195b52d44e --- /dev/null +++ b/nixpkgs/pkgs/applications/networking/mailreaders/alot/notmuch.nix @@ -0,0 +1,27 @@ +{ lib + +, buildPythonPackage +, notmuch +, python +, cffi +}: + +buildPythonPackage { + pname = "notmuch2"; + inherit (notmuch) version src; + + sourceRoot = "notmuch-${notmuch.version}/bindings/python-cffi"; + + buildInputs = [ python notmuch cffi ]; + + # no tests + doCheck = false; + pythonImportsCheck = [ "notmuch2" ]; + + meta = with lib; { + description = "Pythonic bindings for the notmuch mail database using CFFI"; + homepage = "https://notmuchmail.org/"; + license = licenses.gpl3; + maintainers = with maintainers; [ teto ]; + }; +} diff --git a/nixpkgs/pkgs/applications/networking/mailreaders/evolution/evolution-ews/default.nix b/nixpkgs/pkgs/applications/networking/mailreaders/evolution/evolution-ews/default.nix index 432544c60c6c..246d666df308 100644 --- a/nixpkgs/pkgs/applications/networking/mailreaders/evolution/evolution-ews/default.nix +++ b/nixpkgs/pkgs/applications/networking/mailreaders/evolution/evolution-ews/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "evolution-ews"; - version = "3.42.1"; + version = "3.42.3"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "nCvGMSfDS0GUQfF8zomVq+gKf9H72X896zptRy9/Xy0="; + sha256 = "qgi2ycWlzY4PaiEMHu0Rd3bN2aqFcLtxkII1MzZXls4="; }; nativeBuildInputs = [ cmake gettext intltool pkg-config ]; diff --git a/nixpkgs/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix b/nixpkgs/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix index 3ccf066831c1..9aac3db3594c 100644 --- a/nixpkgs/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix +++ b/nixpkgs/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix @@ -42,11 +42,11 @@ stdenv.mkDerivation rec { pname = "evolution"; - version = "3.42.2"; + version = "3.42.4"; src = fetchurl { url = "mirror://gnome/sources/evolution/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "C+QT8W3WjsjUNCpPJpVlryp0oZpb+hxcv2Y1I6W1ujg="; + sha256 = "+oprem1GsinbXfIv3nZCVFIjV/4b7NexjlNt/piJCmU="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/applications/networking/mailreaders/hasmail/default.nix b/nixpkgs/pkgs/applications/networking/mailreaders/hasmail/default.nix index b2ec2a743f3d..c039febb6d7c 100644 --- a/nixpkgs/pkgs/applications/networking/mailreaders/hasmail/default.nix +++ b/nixpkgs/pkgs/applications/networking/mailreaders/hasmail/default.nix @@ -19,7 +19,7 @@ buildGoModule rec { sha256 = "1p6kwa5xk1mb1fkkxz1b5rcyp5kb4zc8nfif1gk6fab6wbdj9ia1"; }; - vendorSha256 = "0sblgjmn3i3k31jfq5zy3bx7bv5z2cg6rjzr7aj87c57yhzzcmk7"; + vendorSha256 = "129hvr8qh5mxj6mzg7793p5jsi4jmsm96f63j7r8wn544yq8sqci"; doCheck = false; diff --git a/nixpkgs/pkgs/applications/networking/mailreaders/himalaya/default.nix b/nixpkgs/pkgs/applications/networking/mailreaders/himalaya/default.nix index 33c1cc63a7f9..4e70facb5f18 100644 --- a/nixpkgs/pkgs/applications/networking/mailreaders/himalaya/default.nix +++ b/nixpkgs/pkgs/applications/networking/mailreaders/himalaya/default.nix @@ -12,16 +12,16 @@ rustPlatform.buildRustPackage rec { pname = "himalaya"; - version = "0.5.1"; + version = "0.5.5"; src = fetchFromGitHub { owner = "soywod"; repo = pname; rev = "v${version}"; - sha256 = "sha256-BmV4kekl0QDbX/ueSrWM5jRvqr6WQeZIs7hiXhiHBSI="; + sha256 = "sha256-BZTecYNY8gbGe+r80QWi7FkC56dww9rrtwLfi9ya1mQ="; }; - cargoSha256 = "sha256-lu5xVuAw9yTeQr3gpiW5g5bdm7Alf0YXmlbSkPaXhk0="; + cargoSha256 = "sha256-2xkKJqp7uf0gh8g2zzDjSl8foTvPj6MVHfDuSr914HU="; nativeBuildInputs = lib.optionals enableCompletions [ installShellFiles ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ pkg-config ]; diff --git a/nixpkgs/pkgs/applications/networking/mailreaders/mailpile/default.nix b/nixpkgs/pkgs/applications/networking/mailreaders/mailpile/default.nix deleted file mode 100644 index cab43750a56e..000000000000 --- a/nixpkgs/pkgs/applications/networking/mailreaders/mailpile/default.nix +++ /dev/null @@ -1,52 +0,0 @@ -{ lib, fetchFromGitHub, python2Packages, gnupg1orig, openssl, git }: - -python2Packages.buildPythonApplication rec { - pname = "mailpile"; - version = "1.0.0rc2"; - - src = fetchFromGitHub { - owner = "mailpile"; - repo = "Mailpile"; - rev = version; - sha256 = "1z5psh00fjr8gnl4yjcl4m9ywfj24y1ffa2rfb5q8hq4ksjblbdj"; - }; - - postPatch = '' - patchShebangs scripts - ''; - - nativeBuildInputs = with python2Packages; [ pbr git ]; - PBR_VERSION=version; - - propagatedBuildInputs = with python2Packages; [ - appdirs - cryptography - fasteners - gnupg1orig - jinja2 - pgpdump - pillow - python2Packages.lxml - spambayes - ]; - - postInstall = '' - wrapProgram $out/bin/mailpile \ - --prefix PATH ":" "${lib.makeBinPath [ gnupg1orig openssl ]}" \ - --set-default MAILPILE_SHARED "$out/share/mailpile" - ''; - - # No tests were found - doCheck = false; - - meta = with lib; { - description = "A modern, fast web-mail client with user-friendly encryption and privacy features"; - homepage = "https://www.mailpile.is/"; - license = [ licenses.asl20 licenses.agpl3 ]; - platforms = platforms.linux; - maintainers = [ ]; - knownVulnerabilities = [ - "Numerous and uncounted, upstream has requested we not package it. See more: https://github.com/NixOS/nixpkgs/pull/23058#issuecomment-283515104" - ]; - }; -} diff --git a/nixpkgs/pkgs/applications/networking/mailreaders/mlarchive2maildir/default.nix b/nixpkgs/pkgs/applications/networking/mailreaders/mlarchive2maildir/default.nix index a3a6051ef0c0..f95439b2fb1b 100644 --- a/nixpkgs/pkgs/applications/networking/mailreaders/mlarchive2maildir/default.nix +++ b/nixpkgs/pkgs/applications/networking/mailreaders/mlarchive2maildir/default.nix @@ -23,6 +23,6 @@ python3.pkgs.buildPythonApplication rec { homepage = "https://github.com/flokli/mlarchive2maildir"; description = "Imports mail from (pipermail) archives into a maildir"; license = licenses.mit; - maintainers = with maintainers; [ andir flokli ]; + maintainers = with maintainers; [ flokli ]; }; } diff --git a/nixpkgs/pkgs/applications/networking/mailreaders/mutt/default.nix b/nixpkgs/pkgs/applications/networking/mailreaders/mutt/default.nix index 98298d854d5f..af05bfe884c3 100644 --- a/nixpkgs/pkgs/applications/networking/mailreaders/mutt/default.nix +++ b/nixpkgs/pkgs/applications/networking/mailreaders/mutt/default.nix @@ -27,11 +27,11 @@ with lib; stdenv.mkDerivation rec { pname = "mutt"; - version = "2.1.5"; + version = "2.2.1"; src = fetchurl { url = "http://ftp.mutt.org/pub/mutt/${pname}-${version}.tar.gz"; - sha256 = "1q1bq5qfv67s6ynbqga19ifaprgavhdbgg154kb9ffingvj0k8wj"; + sha256 = "1ddbhwsycfpf430k52l5gggywd09h10hwcwzpydam43c5ga30vdp"; }; patches = optional smimeSupport (fetchpatch { diff --git a/nixpkgs/pkgs/applications/networking/mailreaders/notmuch/default.nix b/nixpkgs/pkgs/applications/networking/mailreaders/notmuch/default.nix index df5c9de29d17..184804a87888 100644 --- a/nixpkgs/pkgs/applications/networking/mailreaders/notmuch/default.nix +++ b/nixpkgs/pkgs/applications/networking/mailreaders/notmuch/default.nix @@ -2,20 +2,23 @@ , pkg-config, gnupg , xapian, gmime, talloc, zlib , doxygen, perl, texinfo +, notmuch , pythonPackages , emacs , ruby +, testVersion , which, dtach, openssl, bash, gdb, man , withEmacs ? true +, withRuby ? true }: stdenv.mkDerivation rec { pname = "notmuch"; - version = "0.34.1"; + version = "0.35"; src = fetchurl { url = "https://notmuchmail.org/releases/notmuch-${version}.tar.xz"; - sha256 = "05nq64gp8vnrwrl22d60v7ixgdhm9339ajhcdfkq0ll1qiycyyj5"; + sha256 = "0fdc81m24xrbhfrhw00g12ak4b8hap4961sq7ap6q2pjqhac8cd8"; }; nativeBuildInputs = [ @@ -24,15 +27,15 @@ stdenv.mkDerivation rec { pythonPackages.sphinx # (optional) documentation -> doc/INSTALL texinfo # (optional) documentation -> doc/INSTALL pythonPackages.cffi - ] ++ lib.optional withEmacs emacs; + ] ++ lib.optional withEmacs emacs + ++ lib.optional withRuby ruby; buildInputs = [ gnupg # undefined dependencies xapian gmime talloc zlib # dependencies described in INSTALL perl pythonPackages.python - ruby - ]; + ] ++ lib.optional withRuby ruby; postPatch = '' patchShebangs configure test/ @@ -51,7 +54,7 @@ stdenv.mkDerivation rec { "--infodir=${placeholder "info"}/share/info" ] ++ lib.optional (!withEmacs) "--without-emacs" ++ lib.optional withEmacs "--emacslispdir=${placeholder "emacs"}/share/emacs/site-lisp" - ++ lib.optional (isNull ruby) "--without-ruby"; + ++ lib.optional (!withRuby) "--without-ruby"; # Notmuch doesn't use autoconf and consequently doesn't tag --bindir and # friends @@ -59,7 +62,9 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; makeFlags = [ "V=1" ]; - outputs = [ "out" "man" "info" ] ++ lib.optional withEmacs "emacs"; + outputs = [ "out" "man" "info" ] + ++ lib.optional withEmacs "emacs" + ++ lib.optional withRuby "ruby"; preCheck = let test-database = fetchurl { @@ -82,10 +87,17 @@ stdenv.mkDerivation rec { postInstall = lib.optionalString withEmacs '' moveToOutput bin/notmuch-emacs-mua $emacs + '' + lib.optionalString withRuby '' + make -C bindings/ruby install \ + vendordir=$ruby/lib/ruby \ + SHELL=$SHELL \ + $makeFlags "''${makeFlagsArray[@]}" \ + $installFlags "''${installFlagsArray[@]}" ''; passthru = { pythonSourceRoot = "notmuch-${version}/bindings/python"; + tests.version = testVersion { package = notmuch; }; inherit version; }; diff --git a/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix b/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix index b3ecb27dfb29..eb708962e010 100644 --- a/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix +++ b/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix @@ -1,655 +1,655 @@ { - version = "91.4.1"; + version = "91.6.1"; sources = [ - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.4.1/linux-x86_64/af/thunderbird-91.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/af/thunderbird-91.6.1.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "7af2c19b46daf1869af49289c1ab080559f8640c6dfc21cdae1ff48cdc26bf1f"; + sha256 = "b0d36d12bb29897b4502fe28fd5d05117b8cf3c6f2a8f9a0a88542b915587cda"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.4.1/linux-x86_64/ar/thunderbird-91.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/ar/thunderbird-91.6.1.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "dfabb7336f9b5929041c43997ad7ac34fca0750d70293dacdc32f9048de2fc7d"; + sha256 = "26c86b4a73085d1b2b08e73a9adb1a2e8148fce1c8b27f3b1f9566fb72269361"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.4.1/linux-x86_64/ast/thunderbird-91.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/ast/thunderbird-91.6.1.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "3aade12867be4da3fb890214a7cd8551e12e962fb2a66b7e76da20a06755d045"; + sha256 = "f0ffeb6273b2c748cdeb2b6e73e17848c6c1b583ee0dfae1ec7eda8b295bef09"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.4.1/linux-x86_64/be/thunderbird-91.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/be/thunderbird-91.6.1.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "8bb288330b957d8361880738b7d5e5833602dd81aad580a96f1031e88bd963f4"; + sha256 = "b55b54e87b28329d717023397d42d162299bf89dc47b6db5910b57263b377645"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.4.1/linux-x86_64/bg/thunderbird-91.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/bg/thunderbird-91.6.1.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "fcd8bbef82a24b146f4473da351cbd5262f8286d5b7ea78265516e815c7c84da"; + sha256 = "93d99a4eebf65152ffede2b86f94f0bb4a626c0a0b0925514e529785b717ec21"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.4.1/linux-x86_64/br/thunderbird-91.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/br/thunderbird-91.6.1.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "c1d331f6621fc120076d49015046f22ff898b089af8cac5226491bbe82391b9a"; + sha256 = "944395c06dbc26d14add54d6e9e990496179ee0e956d585d84246e90d3a5a058"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.4.1/linux-x86_64/ca/thunderbird-91.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/ca/thunderbird-91.6.1.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "7b2a63bd30d1e47db16f64ea077623dfca965d71b2aa7f7ce56f8940a2f59301"; + sha256 = "426f1f2b8c3849e60e1e88e74f33c1bc51f8de3007fbbf9d58c0c477e7c4d0f2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.4.1/linux-x86_64/cak/thunderbird-91.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/cak/thunderbird-91.6.1.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "f22de3c4bc4237610e7826ed6d46f84f8a02d5370e7d0675932abd98ee24256e"; + sha256 = "04baa09f4f28e62057cb4a62981f916c820a82be5c7418367be67a5f1f180dff"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.4.1/linux-x86_64/cs/thunderbird-91.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/cs/thunderbird-91.6.1.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "8dd685427622c1bc710d8056e527d5766f7e5f0c47ca7e170b8e48ed01e8c5a5"; + sha256 = "d724b84ac07ec0dd8f81b790f4baf58c2d81f9d1e8aa121fe379aa968fd7c78a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.4.1/linux-x86_64/cy/thunderbird-91.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/cy/thunderbird-91.6.1.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "d98ebd1787b29a6ee785a4b7cfaa2283b836f23214c3c27d4fbb3e7154c1e9e5"; + sha256 = "bde7231dda570182a0c4e73645025aad818be321bea0c0425dddb275b28d438c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.4.1/linux-x86_64/da/thunderbird-91.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/da/thunderbird-91.6.1.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "202729a6f4813bb3760a5ae834731a019593dbcd5d66173999f5cbbedf277f00"; + sha256 = "b671d892a013f551ce32c3ee98d956227561a9ad9f168095521f8be1899bd1fe"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.4.1/linux-x86_64/de/thunderbird-91.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/de/thunderbird-91.6.1.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "c035ce2cb81b7083d0c6fc859ee259afce5440bc8f2c8e1ca1db02ce97f0b237"; + sha256 = "cca775ff187ab71db985c031ff08d906fcfba2aa2aa25ad204f1223c94ee1fd8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.4.1/linux-x86_64/dsb/thunderbird-91.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/dsb/thunderbird-91.6.1.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "413eda01d4390e41f6d859def75c5972c4595b453fc9da948415e8e38f4766c0"; + sha256 = "19bd301bb47874abaece776961e85b277ae02cfe772c11f62b731d19c3d87b39"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.4.1/linux-x86_64/el/thunderbird-91.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/el/thunderbird-91.6.1.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "b238ee1b8dbf54ab0aa4c6f23a646e037a48e31d77749698744dc122bf38608a"; + sha256 = "40f279167634c0903f60297a76ce483a34233110c34d50d01fdd976f65337e41"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.4.1/linux-x86_64/en-CA/thunderbird-91.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/en-CA/thunderbird-91.6.1.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "4ef51ab9fdcd3c6ab1323a402253f5cd8682fa100f3b05fa62bf1153bbc04c28"; + sha256 = "41ac7d58a099e68cf87f604d77e8fa844e48264b52409b9f8637fc777d15bdad"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.4.1/linux-x86_64/en-GB/thunderbird-91.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/en-GB/thunderbird-91.6.1.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "3ee22d3b5c23bfba703d36e58185ef139ccfa923c1877f983fed90419e7fdf8b"; + sha256 = "e20e547b074816931fce3cffe04eb7b9690439f047b2154d2f0d36b7eda9071e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.4.1/linux-x86_64/en-US/thunderbird-91.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/en-US/thunderbird-91.6.1.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "6bd3bbcf3d92efe04b19bb45c0d9ac3abe8dd68fc84e255b76467b37ea5918b1"; + sha256 = "08e963292b4e63be2dad7a24eb125bca484107b05856dcebf98ceddaf47f1e87"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.4.1/linux-x86_64/es-AR/thunderbird-91.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/es-AR/thunderbird-91.6.1.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "14b7fac461e90c4dd1790f6095e291e1ba510561d51655b16bda4ad7050dca8e"; + sha256 = "23775b4446630146d6e6c34760cbb9c155a21bfa759d6b18135fe28e80459c7f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.4.1/linux-x86_64/es-ES/thunderbird-91.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/es-ES/thunderbird-91.6.1.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "ee910bc3415e314d5f3b072608d61089ae55e969a138ee446377edf0e5ba710a"; + sha256 = "0ba964ad2cc0d86b12e8498ccfd374931d0e26fb163994704aae622a420bffe8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.4.1/linux-x86_64/et/thunderbird-91.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/et/thunderbird-91.6.1.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "a643d96e71123c554a8af69bc875515113ffd30ab621d5f3b5678c33931cfab0"; + sha256 = "94a73f46e5e2e9672a0c54a4a445c5a24a60924e45d57218a0c5a3eda7437091"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.4.1/linux-x86_64/eu/thunderbird-91.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/eu/thunderbird-91.6.1.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "b910976d8e940331d46ac92f82f56aff61f8d91137bae9c869715cb371309f9e"; + sha256 = "3fed5e7cc72572e7a71f2916ac1750b40c0896d7786bfb76a49679d15ac07031"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.4.1/linux-x86_64/fi/thunderbird-91.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/fi/thunderbird-91.6.1.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "a8dd93299fde700cf1419187da06405093b3f010e7fdd327742fbddcef1721a0"; + sha256 = "b7e233e744afd3569748013d091f57fbb8339e1cefd328d1808cccd0abd9f7c7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.4.1/linux-x86_64/fr/thunderbird-91.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/fr/thunderbird-91.6.1.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "526f4f4feae5f6a0b9f1d80b0f76a7f26af7456e1eb09e36eadd51fc8d4115ed"; + sha256 = "1066814d16f3de8e0a6b0aad4ecbc078bc4e76a5daad8173d7a0af1986fc49ba"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.4.1/linux-x86_64/fy-NL/thunderbird-91.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/fy-NL/thunderbird-91.6.1.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "df5320f98ecd32439273b18237a742c34590e5b533a7da9471cfd37921725108"; + sha256 = "eeb7f557ac32ab426c5843061c1fa394671328794f9b0d5313351768ea020fa1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.4.1/linux-x86_64/ga-IE/thunderbird-91.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/ga-IE/thunderbird-91.6.1.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "c13529036ec2186e0e3088f63e351086bee21b0f8a3479586420c6a2701ee8f1"; + sha256 = "8c1adead3a4c715cd2e6ebd7d23a086a6bb5308cb8620e35aeef151c3a25ad40"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.4.1/linux-x86_64/gd/thunderbird-91.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/gd/thunderbird-91.6.1.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "f6c2c7cf6c8a39997e272d9aae5c7ab4620f426e2be96b4e90c3641db672a6ea"; + sha256 = "23db6bd6aded7d7424c2c0b5a5c9da938b504b517297b535d0eee907c20ff921"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.4.1/linux-x86_64/gl/thunderbird-91.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/gl/thunderbird-91.6.1.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "ba0d17f99ca15bc81631201057509694c5dc656176a03e67d5f89371a4200eda"; + sha256 = "10483ac92240dd7f1a4cc25dfae74291ef3546ff36b51205bcb3fa2af2e97489"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.4.1/linux-x86_64/he/thunderbird-91.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/he/thunderbird-91.6.1.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "c71bf27c55ad5b6c7981a434d598eeab8a927dbfc0510d4d68df357cb1abff9f"; + sha256 = "211c4f58cd5553da8933386c4b1a7847f61df83212228f3ec4ef807a2115f220"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.4.1/linux-x86_64/hr/thunderbird-91.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/hr/thunderbird-91.6.1.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "9cf92e922329ec46ed68f352284de30c78aa2d25f040da4e1289d5ea0226bc3a"; + sha256 = "3b71a6ab9df2a45c15342f241cb63f323170f692d204e9a98f9772f6e50809f4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.4.1/linux-x86_64/hsb/thunderbird-91.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/hsb/thunderbird-91.6.1.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "e4d6baa0d92fbe7f40071045fcdb20f59944a0c1422c1095b946019461013242"; + sha256 = "0603f34c825bee5e813fb63c5f1060e5de31ab89d12abe4259f5f2c56f880e65"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.4.1/linux-x86_64/hu/thunderbird-91.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/hu/thunderbird-91.6.1.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "cea2f9b614e0b7cec709947ff75b9eb6abe6600b76d642b60910e2de1788f09b"; + sha256 = "64db18fb3477198f696cbf8d100b45abb2cf74abc960c90143abad224fe56e48"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.4.1/linux-x86_64/hy-AM/thunderbird-91.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/hy-AM/thunderbird-91.6.1.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "8708acca6f1e4088f10f94f8c26a7790913fe55acbf0ab555e22b1256b74a866"; + sha256 = "ec3064d387558c56e80965fc87a73c19ae530802ffff3f0cd35e7026f76655e3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.4.1/linux-x86_64/id/thunderbird-91.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/id/thunderbird-91.6.1.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "745ecb2038a84b1571e326ed0e6d38e7519bcf5b7f2bacf6ef053c9a88926c77"; + sha256 = "a7635897857f1c4bc86b9208ecbfa983a80a889a24274ce2c41d1fd401163230"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.4.1/linux-x86_64/is/thunderbird-91.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/is/thunderbird-91.6.1.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "e04b6fc88ddd46e6e6cbe47eb681acce91b47df355847f65e793d92419dc4204"; + sha256 = "310cae89c6a62b5a9cf19a81622395b1d9d2de1670dfb9542d8465fd2bebe3a6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.4.1/linux-x86_64/it/thunderbird-91.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/it/thunderbird-91.6.1.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "e23eb2075bcac5abc195b1abffe64b8e1a409c855699c6d5bcbd102c19a2ad4b"; + sha256 = "826223383cfd0ed931f0df19100ec24e22c5ed6eabb71ebee2663a4199368fd5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.4.1/linux-x86_64/ja/thunderbird-91.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/ja/thunderbird-91.6.1.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "a79711803c46b6ab95f654d5b9dffafe85733b6c839238de8f76d30f9757553c"; + sha256 = "a62b2d76c228d54a00dcb81931a010369ab5cb5f7e5d5601fa74076431ec39c9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.4.1/linux-x86_64/ka/thunderbird-91.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/ka/thunderbird-91.6.1.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "3076defee6dadfad4560800ecf2b3556fcf8f4dd5a8795bb578ee73bbbccf72f"; + sha256 = "2e7b571096baa8d4d68eec97f25197b7504ef0e196bb711344180f4324b260e9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.4.1/linux-x86_64/kab/thunderbird-91.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/kab/thunderbird-91.6.1.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "65f796d71d02118794b79d5460ef9db06e3d172e5d15ff350eff52cc214587dc"; + sha256 = "378de38b2393987fcbd22057c64c581365ddff6239d8055ac631df9903df4ed4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.4.1/linux-x86_64/kk/thunderbird-91.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/kk/thunderbird-91.6.1.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "f8df25990df8b577e224551f1af44fb87c867b7d7622931214bbceeec3699646"; + sha256 = "51e8c5d832f8deb27d962ef175cd2bf6ea66fd8c0a24b7c647d4d98d524c3bef"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.4.1/linux-x86_64/ko/thunderbird-91.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/ko/thunderbird-91.6.1.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "77d6e16972f9ddb553d9bd19627a0725d25d42a0ad6d1e665d249b094b137dc9"; + sha256 = "a63cf39f84cab3c6a6164a6c62ace5aab948ab71d8934f5869cd2290851c17ac"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.4.1/linux-x86_64/lt/thunderbird-91.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/lt/thunderbird-91.6.1.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "208eb06ba9e8b1cd391a7694552af6e7ba3ead33567d51fda82d70e024378f56"; + sha256 = "1d44efdae4a299d57c1ab4769fccc5326e85b95cb2078332aadde3a3d0d72c7a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.4.1/linux-x86_64/lv/thunderbird-91.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/lv/thunderbird-91.6.1.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "a4a85c3f969dc40149ad82d0dbc4e1089de67ba3c6d7495f5c45196e8c7083a8"; + sha256 = "cc8e4b043ae003d43240df52eed2b3b3a16cc09e963c6bc768d672e6dcb59022"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.4.1/linux-x86_64/ms/thunderbird-91.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/ms/thunderbird-91.6.1.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "e5f3259e002b31d9a2738ad81826d59dd464aa34532441e9092e976efe8be7b4"; + sha256 = "8b64d50a219467347cbe02e237fc1f5473a9d86d8b29fa0cfaa5c423c7265db3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.4.1/linux-x86_64/nb-NO/thunderbird-91.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/nb-NO/thunderbird-91.6.1.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "33fa29d2490c7618d1f9bbaceb34b898d150e57fc9b96b957a5b348b6fe47cfc"; + sha256 = "71256fe14843fc5c3026dc17d39d9f10b0dcb5ebe0d1769740397db45164e8fe"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.4.1/linux-x86_64/nl/thunderbird-91.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/nl/thunderbird-91.6.1.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "726962fd26948726230b49736f2d1e6c6daa562a4389e0fa0069ab737304cbac"; + sha256 = "6cc1efd14f8fdfde047ac8245fcbd42cc6829d4973fadad43e5113d95c2334af"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.4.1/linux-x86_64/nn-NO/thunderbird-91.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/nn-NO/thunderbird-91.6.1.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "09bab6f8061400413e7167693e4c2f14caa4aba0ac68c7cfeaf9ed2dfa44ea0a"; + sha256 = "efcf3519eed57080c022d8ea3e45bb50cb302d6eead93b2e50d3e6d69635b1db"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.4.1/linux-x86_64/pa-IN/thunderbird-91.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/pa-IN/thunderbird-91.6.1.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "2203476872b140a1fec867435bf1a006b63a7ffc018eb466ea164597474a2083"; + sha256 = "69e27e7a1e7534b6903f3e6a1248b8d62617dbeda0051453f78ebe68bd0e978c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.4.1/linux-x86_64/pl/thunderbird-91.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/pl/thunderbird-91.6.1.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "3cc4fa964b4deaef9d901fd9fba597059f638b1b8322515ac02cbb97f5a5c28b"; + sha256 = "8903c2302e4ec1a77076cf51a770861738793d4f5ec87faa87da922f1be2d620"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.4.1/linux-x86_64/pt-BR/thunderbird-91.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/pt-BR/thunderbird-91.6.1.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "c68055c96551a1b529bdf81659231ec5244c4c68255d88f581c378046bbb5e84"; + sha256 = "558adf768654a03738f755b765a2c6c3aad514ffbe532b4e47c0d94cd9dfd262"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.4.1/linux-x86_64/pt-PT/thunderbird-91.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/pt-PT/thunderbird-91.6.1.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "36c9b2170aff5e6f58377efd53f679e9e823f45b67d7407cb3c34d72f676625a"; + sha256 = "2fb3c682ee289e2bdf1263b5c32f38e31090d742b108b373befb3f093d655e30"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.4.1/linux-x86_64/rm/thunderbird-91.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/rm/thunderbird-91.6.1.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "2f00df17c29128e2b135136fe700930ff0078e8896e1cb4f7c34b44af0cfd8f2"; + sha256 = "9e489ce3861ee17a2ee145ed5edb1c0b2c0c3f1446f6fb64081ac623f381ef1d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.4.1/linux-x86_64/ro/thunderbird-91.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/ro/thunderbird-91.6.1.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "ed93041b32a711e04de6737c5d6fbcf6b598ca9eccefe5ab0e02cf3cacba5ffa"; + sha256 = "4bf6b617ea7d4a2ebe81a73c09e24cd1e1bb360ca501a4f139c99a84d1492005"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.4.1/linux-x86_64/ru/thunderbird-91.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/ru/thunderbird-91.6.1.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "206ccfcb5d6a9d70f4258ddeff0cc79c38e801d860a05bf6214c03b24e2f9057"; + sha256 = "fd88dd41fd4c93d829c6e44d2d88092652827ed08121c6ba25cd410082cf4991"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.4.1/linux-x86_64/sk/thunderbird-91.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/sk/thunderbird-91.6.1.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "aa8e6dd53d5b741bee345d1f7a5b03866121619f54993233cb4239c6107eb3e6"; + sha256 = "53b6fa462a3057e9eec72f75d698631486514839bdf30f6388f9749848846462"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.4.1/linux-x86_64/sl/thunderbird-91.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/sl/thunderbird-91.6.1.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "95f3a97adc32abb33c0a7579c19247595f6f27c7da0cf06bf1fa9d8270b41996"; + sha256 = "cebe056640e0589c8f4ff029aa74f1666b1a0faeb742f356b74e07b2b0998e39"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.4.1/linux-x86_64/sq/thunderbird-91.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/sq/thunderbird-91.6.1.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "fe8255e55081a6cae15085cfcf793c4094de55a2b12d3732c7e75ce567b85716"; + sha256 = "9f1bf49edf710455bcf23cd6c14618518ae4b07a75d259e2cc821d5c85c0e0aa"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.4.1/linux-x86_64/sr/thunderbird-91.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/sr/thunderbird-91.6.1.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "f889e1ff38542aae19d6ebaf827a2c6d6f8dbd6e16a80966bc311588e4e10ffc"; + sha256 = "f287d6abde4537dffa599c54910bda7e0f90596f931d88921d0d3248c941166a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.4.1/linux-x86_64/sv-SE/thunderbird-91.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/sv-SE/thunderbird-91.6.1.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "2f90c95bbdcb6bfd59cee40013cc1c498e50f5cc0209799dfe1dfc57afbc37ad"; + sha256 = "02952a1f2d47394b4a8ce06af67a1058822c47660f69d606e719f215205709d8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.4.1/linux-x86_64/th/thunderbird-91.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/th/thunderbird-91.6.1.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "3fa19fef25c76f49f9e6ee9edc2f24cd02c2b589b8e2cea270f4aa71f1a1a621"; + sha256 = "8cec77f0fd16e9ab2b316ba884c26f35dbe15694e22e02ecd27d3caec68970bc"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.4.1/linux-x86_64/tr/thunderbird-91.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/tr/thunderbird-91.6.1.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "7de3ccbe109401dab260ed1c8ae9fc360e5392c81111df930d0c7f7d46211f83"; + sha256 = "aa66efd16a8e5328e20052676d0e06f3ede903a88262c4b01ff0a78ec013f9cb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.4.1/linux-x86_64/uk/thunderbird-91.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/uk/thunderbird-91.6.1.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "967020d05810d1514be84635cb56162b83f7f28a2bea221ad21ecb4ebd960968"; + sha256 = "23d654a7755a846b2354c392a6d86f0794f126425e64a19af7c1f047bd758cae"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.4.1/linux-x86_64/uz/thunderbird-91.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/uz/thunderbird-91.6.1.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "371d60bc164552f04cf680a29af5992f1ac353e8bb30af62a5cdadf744576c71"; + sha256 = "c97b2d05e7043ba438f313569bb6165fd106b9f2351478549a6de5467f980280"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.4.1/linux-x86_64/vi/thunderbird-91.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/vi/thunderbird-91.6.1.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "600cc9d18a18ebc13bd8371140b573723b913e100937b3bb22ab04cf7846e1e7"; + sha256 = "0c4341944eeb0d6724dbabda5dc68796cf40034dffed1d0af2d942af5eb242f2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.4.1/linux-x86_64/zh-CN/thunderbird-91.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/zh-CN/thunderbird-91.6.1.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "ae59930a4c609e4ce0562338019db1202c3eafc2e3dabd90888076ece4fe8ee5"; + sha256 = "86bb80438e4e729faaf57a3b5651b936647ec6ff58c78e263011e242d7e41fbe"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.4.1/linux-x86_64/zh-TW/thunderbird-91.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-x86_64/zh-TW/thunderbird-91.6.1.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "2cd58c1fb54b572e6a2f63b9881f53ee65d9992d75c0905ea2e1047afabd08a9"; + sha256 = "733ec3383204fff674456bdda36f7088e32914fceaa62fa6a98768e9ecbef321"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.4.1/linux-i686/af/thunderbird-91.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/af/thunderbird-91.6.1.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "bbf9e3a8856f66ed2d263b05d5520a9be26719f45380a5f29e6cf27c891c3e23"; + sha256 = "3c8f1f172919ef3c5327bf337a49ed428f6581e3dc6f3ed69c7f6268cf8f4fea"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.4.1/linux-i686/ar/thunderbird-91.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/ar/thunderbird-91.6.1.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "0df457c90aedef53adca7dafe34dc95847b77603362b27f814f4e88d40311ccb"; + sha256 = "e938549a5be6c8f1dff66e330cc9e059a352ed9b539145a812838aeec2668bdf"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.4.1/linux-i686/ast/thunderbird-91.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/ast/thunderbird-91.6.1.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "b97a3fc046dcd75e2703629e01abbe2c7a81bc98746fdd96ac195b2508e396b7"; + sha256 = "a0d93d9f8c9ed659409f971ebecdd6134db8a4b954db9638b7a440c898adb0b3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.4.1/linux-i686/be/thunderbird-91.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/be/thunderbird-91.6.1.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "158495d87e2bc8c2b257d055fc9096580bbb7dcc126b3b83a4aa0f3deaae9cf7"; + sha256 = "741da67fb46ef6e73196dec3f0c71ce1024e282421c6a8e111ffb9ba2a2a5014"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.4.1/linux-i686/bg/thunderbird-91.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/bg/thunderbird-91.6.1.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "77497a922cd441a3ed791d6f497586b2d3b286a64cf057cf34b07e38b6c1f5f2"; + sha256 = "afb8fac75b94957f60686c170bec9af438d04c4f42d259e80c07bb446c875aff"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.4.1/linux-i686/br/thunderbird-91.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/br/thunderbird-91.6.1.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "862629fb07c7743a2bc909883ebe19347fea71fc91b8df927d846054ce2b1b08"; + sha256 = "474656d25e48718b303b2d4463465bb7a272cadcabf6360adfaa7dd23c808c2b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.4.1/linux-i686/ca/thunderbird-91.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/ca/thunderbird-91.6.1.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "33ab06809f5982036b849aed5ec46d7271c217cb7330149f4783fd308c19ef46"; + sha256 = "c2b4e38ea9810f10455c78de2d68a76655eb855ea8e3d55c895e6f8d5df84066"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.4.1/linux-i686/cak/thunderbird-91.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/cak/thunderbird-91.6.1.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "6bd1cd49eb18ce7bb88e4e023063bf03e2c2078f7c3ccf0f1c477d712b4e67fb"; + sha256 = "1da916a640b36c8e2f84e733dfa6b1cd4a7e90dc2367e56522ad3525d646712d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.4.1/linux-i686/cs/thunderbird-91.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/cs/thunderbird-91.6.1.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "528aba25c407f52e728361e5174cb232f2583ef5ff62bf47386d4766f776566d"; + sha256 = "f0ff0220167566300fb0913f58056ff81c5b70f2835830d325c1235caa468a99"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.4.1/linux-i686/cy/thunderbird-91.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/cy/thunderbird-91.6.1.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "efd1490cd2a357c1d61d5225a8d1b1b9a61be5c25805b26496ea3ad946d4cbcc"; + sha256 = "1b8e7ae9b27dab0872443a2b26733888d569765e6e72cfaea775d157273c8344"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.4.1/linux-i686/da/thunderbird-91.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/da/thunderbird-91.6.1.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "00e9e787a8bf21caebcd1b21889c5534d38d14d8eb2e10b297b320e71455910f"; + sha256 = "79ae2ac91c0540e76578556c82bec7340baee79758ef0e157155aed8f1d68b3b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.4.1/linux-i686/de/thunderbird-91.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/de/thunderbird-91.6.1.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "1c93e59e8d55ff671e630dc86091b1503b73e8b92f7bf0b6726d3b9829bfa8d1"; + sha256 = "cf5096d178152abfcc5fbe7cd109722875d8d11575b526577e713a4efd28d226"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.4.1/linux-i686/dsb/thunderbird-91.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/dsb/thunderbird-91.6.1.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "d8de15bf2699fa44b82aab0872b966d20dae733b46404b03a1e8c41e28b2c4dd"; + sha256 = "a650eda884498dd7d0e3dbd73cb1e9b020f10e690ce26d77ed654c0202f1d915"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.4.1/linux-i686/el/thunderbird-91.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/el/thunderbird-91.6.1.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "1ecb81092cd8bdae878792f2be7a32edc378d3691ca696bcfe3899e81ace7cd7"; + sha256 = "be65c035956efd25246265fa102f934fc14794457fc110d815b140165c81fed9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.4.1/linux-i686/en-CA/thunderbird-91.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/en-CA/thunderbird-91.6.1.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "68836e09adf5f9d2b5c9f3b96ed5b05f56931faa33bbb17c578436c13c5cc4ee"; + sha256 = "dc906637f397a2ad86b72d8c4636b511263255327b3a92da5adc9d3444117311"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.4.1/linux-i686/en-GB/thunderbird-91.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/en-GB/thunderbird-91.6.1.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "b20a74cc35abd3d066384f57b5d2f7a6a1dd24193b720fedce693d8b864058b6"; + sha256 = "0f028e97594448ab058b839e3a4ab2f3aaefe79732512a4f193c53dc75c59e3c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.4.1/linux-i686/en-US/thunderbird-91.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/en-US/thunderbird-91.6.1.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "8f3bffb289081a898f9e77c291ef1ce63af8c0e966894b54a3c533741b655aa9"; + sha256 = "5f24ac86a2e91f4568d179529caf5254c3aff65593b3a79d25ef96d03211d0c0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.4.1/linux-i686/es-AR/thunderbird-91.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/es-AR/thunderbird-91.6.1.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "b1c26f4dd600995a88ad960f55fbf6026ad2ff93b94ac12af991440ada44a54a"; + sha256 = "5c5a93460f61d7e8a7168c14a46ff24fdecbf67c06da0aab2b30602bd1a1ef51"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.4.1/linux-i686/es-ES/thunderbird-91.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/es-ES/thunderbird-91.6.1.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "a28fb5020e2e5a577958f4702cd3f15dadf4fcc62c3bfc954d5df3777ef4152a"; + sha256 = "8ecf33158eda96155604583c57dccc55c7168abd8dc161e8801da0e7c7d24b40"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.4.1/linux-i686/et/thunderbird-91.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/et/thunderbird-91.6.1.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "9a8fc8ba9df9aa179ca6b18d412ee0395c54ed3e2394d951c1cb85d4cb656808"; + sha256 = "a0e3b7c8c095dd8c116630fec01f50fca6b07d83902a7a004d2f4b52b02536e2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.4.1/linux-i686/eu/thunderbird-91.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/eu/thunderbird-91.6.1.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "56b10b3f9a824fbd91d1107db46e085b45d2c7d78a67a9eb8554afa7aab881a9"; + sha256 = "e18f1f105a7e7a88410e749ed9e6e51685cbd6d9fd44f37c8146d333ba405274"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.4.1/linux-i686/fi/thunderbird-91.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/fi/thunderbird-91.6.1.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "ef41d1f5a985f1bf98790f76cd9dc9cf8d02614b0d780c59f95fe30224678f02"; + sha256 = "984c5d69ef752ae62b08e6615ca19384ff9b2a46167d17ad01e71bec48dd7996"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.4.1/linux-i686/fr/thunderbird-91.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/fr/thunderbird-91.6.1.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "2af9a88a1bf2bc0932ef0131a53b2ab3fda256ceaf3e8f256e41f648153eea8f"; + sha256 = "ae2fabdf55e587f3b57849ddd518bfac0035f5c0e1eaed585713f022fb50fcab"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.4.1/linux-i686/fy-NL/thunderbird-91.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/fy-NL/thunderbird-91.6.1.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "3406057ce9f70c9f1a2efce979fd9b1bffa2ad7fe63bb90e541ea539a2eb071f"; + sha256 = "a4abcd89e36fbdad7f2102142b0790f1223116b5a016bce6cffd59f5547b26e7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.4.1/linux-i686/ga-IE/thunderbird-91.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/ga-IE/thunderbird-91.6.1.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "ee6a8941da6093a7b342da1f124ab5d82cfc9ed288a7385c2ce33e5d95370fb6"; + sha256 = "eff63f42237deb6ecaa60b940ec877e88827769346e14d55624ce3044fac1860"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.4.1/linux-i686/gd/thunderbird-91.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/gd/thunderbird-91.6.1.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "9b57c51af6dbdb9c654e0fc96fe086c04f4dc482fa3528c9658261b9710bc229"; + sha256 = "4399f90f6e28be1bfd68ef3273a4b11cb3a912394033a4ba4f0f722eceeb916e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.4.1/linux-i686/gl/thunderbird-91.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/gl/thunderbird-91.6.1.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "d2d12a17334c0b74904fd5a64294c0ca86430d79ebd765d7118b3451cb361819"; + sha256 = "be6a01476604cf120131724e0e5afc1951421baf489c231fd10115b947a56f41"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.4.1/linux-i686/he/thunderbird-91.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/he/thunderbird-91.6.1.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "da8791864ea612b37839075a85ed446aecd4be941c4f624ed212fa1e4d322768"; + sha256 = "fd3548a80dc4983b264f5a2062d87bd9956c681fc191d35246bac2248c61c429"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.4.1/linux-i686/hr/thunderbird-91.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/hr/thunderbird-91.6.1.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "11ef3a9c2b7555ef144cc0689265f928c29b01fccded781d76a3f2105d15ed67"; + sha256 = "e149a9a469ef013264ffbcf10051e1476f946f52ad4eae8f734643394f6f74c8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.4.1/linux-i686/hsb/thunderbird-91.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/hsb/thunderbird-91.6.1.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "bce0ebbaa3e19912d74e5a9754a45a93948f41d5fa9dfab77aea03856ea70ef4"; + sha256 = "77baab4a6d3ba3339cc32475fdd654034eb57e61d2c51258e38eba6c14aa2f89"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.4.1/linux-i686/hu/thunderbird-91.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/hu/thunderbird-91.6.1.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "dd1b5a48fb175be82967f3b9ca72ea86b2797ebb68285fee143c77ae72a9e659"; + sha256 = "c796ac09b0e4033f1ab9d1e6da4b78e540f1b731bfbcda040743e409164ea2f1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.4.1/linux-i686/hy-AM/thunderbird-91.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/hy-AM/thunderbird-91.6.1.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "cc172a84b6c586a786a7691eb728e8bce5af253316cec64b989fe2f10f253f95"; + sha256 = "c6023895e3e26e7b52c277640702a821bf4a562287ba7d8e632a59774a6757ee"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.4.1/linux-i686/id/thunderbird-91.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/id/thunderbird-91.6.1.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "6ac4c494569bb7d5a9948d1e19cb273135638b3b0fa487a535d36f2b70c86bfa"; + sha256 = "a76f567644ef6092168e2c526839bc0901a18533f08ac525381e74f77e9fcb7d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.4.1/linux-i686/is/thunderbird-91.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/is/thunderbird-91.6.1.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "e98642ccc27cc77180a83b34a55a59f9b653beb993e80647b76b1c2d1fec003a"; + sha256 = "a023e32837355ab83583bcf504e9ff3210f3a68d30c73477ec158ef1162df4eb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.4.1/linux-i686/it/thunderbird-91.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/it/thunderbird-91.6.1.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "bada535c73a41318650acb3e744771beea09bf192b3f88e6e8be0de0f9c15b4f"; + sha256 = "459aec2da31a3159f0d81cb0876686e63d9b1e72ad36e967472d1ce98c380983"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.4.1/linux-i686/ja/thunderbird-91.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/ja/thunderbird-91.6.1.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "dc30bc5943518dbde7b213df3fdd0b454550612d741e167003efc0463b3fd2ae"; + sha256 = "307faf7556594072ab83121c1774005392bc556396c5234a2467ef6843a490f9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.4.1/linux-i686/ka/thunderbird-91.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/ka/thunderbird-91.6.1.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "747b850fdb8cad7607b807bf402e2b6d9b58006c9d8323947c2c991d3d775d1e"; + sha256 = "42cd7f10453541b23099631f402ff70103131025ef868de06fe2e82430bb7eb3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.4.1/linux-i686/kab/thunderbird-91.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/kab/thunderbird-91.6.1.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "fd063bc5e41bec78ad7d006370ecc0be0644a63bb0f5d6cfdda7148790113059"; + sha256 = "cc62b8ce7bea99dd9e9cf660f5dcaac4b9a44746b7b4cccf84612ef844df9e7e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.4.1/linux-i686/kk/thunderbird-91.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/kk/thunderbird-91.6.1.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "f853aeb878ed181070b192f1b27dd985a6f0b2318500373b23358c53a56c3d97"; + sha256 = "ee9e74534c1d7716ea80e2874007b4f9778942bcae559effc830477e614341ee"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.4.1/linux-i686/ko/thunderbird-91.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/ko/thunderbird-91.6.1.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "7444d40c6db9b592d3831115e981208567311a58d47606da6947217e58650e90"; + sha256 = "12106fad7493ce63c189b0a7e92c9828c7b2d46d7f5cd9ecadbc90be041e6bbd"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.4.1/linux-i686/lt/thunderbird-91.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/lt/thunderbird-91.6.1.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "c7f1cf8b583e6659ec84a0546a3e7828626bae3664de35bc9bcd9fbbb97b56ba"; + sha256 = "ead9b5e035f2fcd1213aba5e63c8898b96bf0bfaefde7709228014aadf608420"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.4.1/linux-i686/lv/thunderbird-91.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/lv/thunderbird-91.6.1.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha256 = "30671983c35bb5c112b2b9755e56a1c36afe5bd03c0f09ba930095880b7ab25a"; + sha256 = "72980d6c676a269b9d3220a171cffd67ebc1dc0759bef5ac15db76725aac86cc"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.4.1/linux-i686/ms/thunderbird-91.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/ms/thunderbird-91.6.1.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "233464fc722e9deba822c3cec0c7ebf5b1b72295a6847a3203410784e8e33f0f"; + sha256 = "dfd0cfceee31c31a300ebe37fe99690008f5a21992e7188680b319fe5b5d0207"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.4.1/linux-i686/nb-NO/thunderbird-91.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/nb-NO/thunderbird-91.6.1.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "299f50b9d2077ea8300959cd90aaf3113b5fc5da77fa66617533d2b6d4a11f72"; + sha256 = "7610a56f57d4753f6fd7a55147d7a22157453b47548fe807b5fdbc1ef166eda0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.4.1/linux-i686/nl/thunderbird-91.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/nl/thunderbird-91.6.1.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "4374b5d175d4c990d706241083886e9459f9aa51b1c9862dc02c5134df6a8523"; + sha256 = "6a470f707e9838937c67e2ce7c2da216e23964bab94c4590d20cedb4b337d18d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.4.1/linux-i686/nn-NO/thunderbird-91.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/nn-NO/thunderbird-91.6.1.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "786c23053df9dedb177bd22ab3cf78e3083b73b9bd11b45c17bae35921f8c762"; + sha256 = "e393dfbd10ae6ce910ed594ca6d314d048d57e98a1a01d53be82788d6a3988d2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.4.1/linux-i686/pa-IN/thunderbird-91.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/pa-IN/thunderbird-91.6.1.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "cc3df207d658cdc6b13e8d67dec598afa477520d81d6c4bda23bfa0a3bdfe9f7"; + sha256 = "ddc8558e84531478a4295fe1a3b09f95df458e1f1ecec89b0e1ee19e0dea6e5c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.4.1/linux-i686/pl/thunderbird-91.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/pl/thunderbird-91.6.1.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "9471ddfc7086cf21222eb1de8c5de76f61f0d9479d6691fa4cce16ea4a481361"; + sha256 = "015e25da0565942bbad23a9e0a345cbec4b24676c21286bbce3cf85938031ca2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.4.1/linux-i686/pt-BR/thunderbird-91.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/pt-BR/thunderbird-91.6.1.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "0e466b0a1a0e258b9d3b5288902dcf4fc114a192ba156d956d8be9bbcea1a42a"; + sha256 = "2966875426c08658dcc5aec7e91305e40342bb7318b8ba19482b036d6f1efc9e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.4.1/linux-i686/pt-PT/thunderbird-91.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/pt-PT/thunderbird-91.6.1.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "83b0e2bfe657f16b88906f2a70a0d954b73d053c01b545812e40d02f343b50ef"; + sha256 = "c3ee66dff637e75aaa4a8e3d40c85176e152c19464e7afcbd40cc1e3108a1d91"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.4.1/linux-i686/rm/thunderbird-91.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/rm/thunderbird-91.6.1.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "507059e7cad7c0665c0468436e334a3c2cef258751fe97e90a731d067e0cc672"; + sha256 = "c320c05190b160ad807528e9be6604ac5f79958fad9a4de32c55842a94db20fd"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.4.1/linux-i686/ro/thunderbird-91.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/ro/thunderbird-91.6.1.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "61e4d4652ecbce03421dab02aa15f49e4a782cf63380d76207173afd07dc6183"; + sha256 = "90547a8965aec3db8d4150c0e232bdf6e623df1850cb206a9cbca43432a3cd35"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.4.1/linux-i686/ru/thunderbird-91.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/ru/thunderbird-91.6.1.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "b3c1d07ace631bc8117d1003029216a5579a64f7e83a4289877fe5101c0b261b"; + sha256 = "1dbaf198232b519711c90646c05d77b16bdad20054aaa7f313255ac15e773dec"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.4.1/linux-i686/sk/thunderbird-91.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/sk/thunderbird-91.6.1.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "ec8949eec7a001e075888500749f7b0211996afe4d25dc081df34e20a214e835"; + sha256 = "8d92baafe787bdd054cf7c76a7135a6075da0bd573237f28dcb379fb6e1f7c49"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.4.1/linux-i686/sl/thunderbird-91.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/sl/thunderbird-91.6.1.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "026a55fbb143621ba98d2218ff72c5eea2491ea74e3abbf46dc4d8405a7df327"; + sha256 = "f6ba6c8a7c7aacd28959c85adf708ad1661b4921c82035a1c954c6f6264d101a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.4.1/linux-i686/sq/thunderbird-91.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/sq/thunderbird-91.6.1.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "0a22abf8961874edc88fb7654d8b66694050f98ed4440eb7aabbf7a4969bd993"; + sha256 = "e4fe39206253ab53000e5d5265e2cf3183f8c15900f1f0e5ba23cbe141145e20"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.4.1/linux-i686/sr/thunderbird-91.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/sr/thunderbird-91.6.1.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "4304ac8a1283065aabc63b39734cd7d023a82b590cc1d255093d73cc1155e30c"; + sha256 = "469cda2fad3873e8de320ee7a68c45c4da6cad5e6d9904242d2c489a1e5b829e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.4.1/linux-i686/sv-SE/thunderbird-91.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/sv-SE/thunderbird-91.6.1.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "b2196727748a1d42bc67fcde4df47e7e1661a446e0620e11c64dcc1a7db0da06"; + sha256 = "0303bb0290c84ede66d657ac88795e879611c42815e5eaec98beb235d7764922"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.4.1/linux-i686/th/thunderbird-91.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/th/thunderbird-91.6.1.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "de52a8a1a64b26d29721be3843c12df6bdb732354c9263782f989918a51dee2a"; + sha256 = "5915739123b4c14d72f919fdb193a65e3a15ef472e563d21d7e1e872858f3364"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.4.1/linux-i686/tr/thunderbird-91.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/tr/thunderbird-91.6.1.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "bba119fb7749350c06760d6885a89efa0632098e593f22a23451a592dbea9e1d"; + sha256 = "8cf4a385c861d5905b742a0366df783666a05e154b4e0f23e65f883c81b2bfd9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.4.1/linux-i686/uk/thunderbird-91.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/uk/thunderbird-91.6.1.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "34198ab171b0783d0ac592e0a72ea355aae75b950f2569d2e6ed30a9b1a5d2f8"; + sha256 = "7e1a14c20e1ef7aa923bdb8d09a3a513dedd653388721d8537f42354c0cf386d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.4.1/linux-i686/uz/thunderbird-91.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/uz/thunderbird-91.6.1.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "1adcedb12bb9485da32b47558352d5fa9182fd8411450386d9ac8a528b40cca4"; + sha256 = "8f129954fcccf19fe4e46cb66f35fa298ef396d5327f647d1e7b813345dc7ecf"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.4.1/linux-i686/vi/thunderbird-91.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/vi/thunderbird-91.6.1.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "c22cd41206fd7e4d80c6855c7217071be3890e84460cd030f4029a910c672bb2"; + sha256 = "ab232199fe149938019dd3e8a242630875be9529e32050f94add2419d2690726"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.4.1/linux-i686/zh-CN/thunderbird-91.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/zh-CN/thunderbird-91.6.1.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "744515522d16884b4067a75412977243753baece132c4d5c815ac60d5a26bd7b"; + sha256 = "cb58b53ffb9eb1d05ff3ae856a80f8f504f86e8cdaa2075ff5b5bfcc27712b97"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.4.1/linux-i686/zh-TW/thunderbird-91.4.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.6.1/linux-i686/zh-TW/thunderbird-91.6.1.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "21fcb4c30b76c607e215363688966ea92ae1f3cd658ce7c9118f3d0f2cfff729"; + sha256 = "441a2fc15f7d4efeb7f76cef1166c694cd7713b12f75aab0ceae161f3e77f934"; } ]; } diff --git a/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird/packages.nix b/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird/packages.nix index 1ba3c40ea98b..5b0b66ca3451 100644 --- a/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird/packages.nix +++ b/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird/packages.nix @@ -10,12 +10,12 @@ in rec { thunderbird = common rec { pname = "thunderbird"; - version = "91.4.1"; + version = "91.6.1"; application = "comm/mail"; binaryName = pname; src = fetchurl { url = "mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz"; - sha512 = "aa442ef886277f5091ebadff907a29451a0ee6542f24adb5c1fb4223193d719c2cb01474d3ccd96067695b19ce3cbf042893b0beaaeb7c65e0660ab5072bf82e"; + sha512 = "a74d9489bbd2d62916eac8214c6c3a54dfa0c03b56ad471750724315f8bdd96b6ee1079687ac973264ba0f70bdfbf2f183f359c33f7fcda9a9e48914636b1ab2"; }; patches = [ # The file to be patched is different from firefox's `no-buildconfig-ffx90.patch`. diff --git a/nixpkgs/pkgs/applications/networking/mailreaders/tutanota-desktop/default.nix b/nixpkgs/pkgs/applications/networking/mailreaders/tutanota-desktop/default.nix index c44b5f72724e..e5edfaa46709 100644 --- a/nixpkgs/pkgs/applications/networking/mailreaders/tutanota-desktop/default.nix +++ b/nixpkgs/pkgs/applications/networking/mailreaders/tutanota-desktop/default.nix @@ -3,12 +3,12 @@ electron, libsecret }: stdenv.mkDerivation rec { pname = "tutanota-desktop"; - version = "3.89.25"; + version = "3.91.10"; src = fetchurl { url = "https://github.com/tutao/tutanota/releases/download/tutanota-release-${version}/${pname}-${version}-unpacked-linux.tar.gz"; name = "tutanota-desktop-${version}.tar.gz"; - sha256 = "sha256-0j0vL45kpZeBBdW7NY8lvseYUhXGPoCbOdUtT97fMiI="; + sha256 = "sha256-RlEgpXco0lkkjlJ8FZz4MxYznKLPl1Lxkb5MSmhOTzI="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/applications/networking/mullvad-vpn/default.nix b/nixpkgs/pkgs/applications/networking/mullvad-vpn/default.nix index fd08817f026d..0df8fc010e2c 100644 --- a/nixpkgs/pkgs/applications/networking/mullvad-vpn/default.nix +++ b/nixpkgs/pkgs/applications/networking/mullvad-vpn/default.nix @@ -1,7 +1,8 @@ { stdenv, lib, fetchurl, dpkg , alsa-lib, atk, cairo, cups, dbus, expat, fontconfig, freetype -, gdk-pixbuf, glib, gnome2, pango, nspr, nss, gtk3, mesa +, gdk-pixbuf, glib, pango, nspr, nss, gtk3, mesa , xorg, autoPatchelfHook, systemd, libnotify, libappindicator +, makeWrapper }: let deps = [ @@ -15,7 +16,6 @@ let deps = [ freetype gdk-pixbuf glib - gnome2.GConf pango gtk3 libappindicator @@ -53,6 +53,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoPatchelfHook dpkg + makeWrapper ]; buildInputs = deps; @@ -73,12 +74,14 @@ stdenv.mkDerivation rec { mv usr/bin/* $out/bin mv opt/Mullvad\ VPN/* $out/share/mullvad - sed -i 's|"\/opt\/Mullvad.*VPN|env MULLVAD_DISABLE_UPDATE_NOTIFICATION=1 "'$out'/bin|g' $out/share/applications/mullvad-vpn.desktop - ln -s $out/share/mullvad/mullvad-{gui,vpn} $out/bin/ ln -s $out/share/mullvad/resources/mullvad-daemon $out/bin/mullvad-daemon ln -sf $out/share/mullvad/resources/mullvad-problem-report $out/bin/mullvad-problem-report + wrapProgram $out/bin/mullvad-vpn --set MULLVAD_DISABLE_UPDATE_NOTIFICATION 1 + + sed -i "s|Exec.*$|Exec=$out/bin/mullvad-vpn $U|" $out/share/applications/mullvad-vpn.desktop + runHook postInstall ''; diff --git a/nixpkgs/pkgs/applications/networking/n8n/default.nix b/nixpkgs/pkgs/applications/networking/n8n/default.nix index 94305a8cfeea..e7e1be095a20 100644 --- a/nixpkgs/pkgs/applications/networking/n8n/default.nix +++ b/nixpkgs/pkgs/applications/networking/n8n/default.nix @@ -1,8 +1,9 @@ -{ pkgs, nodejs, stdenv, lib, ... }: +{ pkgs, nodejs-14_x, stdenv, lib }: let nodePackages = import ./node-composition.nix { - inherit pkgs nodejs; + inherit pkgs; + nodejs = nodejs-14_x; inherit (stdenv.hostPlatform) system; }; in @@ -10,9 +11,12 @@ nodePackages.n8n.override { nativeBuildInputs = with pkgs.nodePackages; [ node-pre-gyp ]; + + passthru.updateScript = ./generate-dependencies.sh; + meta = with lib; { description = "Free and open fair-code licensed node based Workflow Automation Tool"; - maintainers = with maintainers; [ freezeboy ]; + maintainers = with maintainers; [ freezeboy k900 ]; license = licenses.asl20; }; } diff --git a/nixpkgs/pkgs/applications/networking/n8n/generate-dependencies.sh b/nixpkgs/pkgs/applications/networking/n8n/generate-dependencies.sh index 292811669184..f7412bc5e5e2 100755 --- a/nixpkgs/pkgs/applications/networking/n8n/generate-dependencies.sh +++ b/nixpkgs/pkgs/applications/networking/n8n/generate-dependencies.sh @@ -1,7 +1,20 @@ #!/usr/bin/env nix-shell #! nix-shell -i bash -p nodePackages.node2nix +# --strip-optional-dependencies to get rid of deprecated build deps: +# +# n8n +# -> n8n-nodes-base +# -> ssh2-sftp-client +# -> ssh2 +# -> cpu-features +# -> node-gyp@3.8.0 -> python2 +# -> cmake +cd "$(dirname $(readlink -f $0))" + node2nix \ + --14 \ + --strip-optional-dependencies \ --node-env node-env.nix \ --input package.json \ --output node-packages.nix \ diff --git a/nixpkgs/pkgs/applications/networking/n8n/node-composition.nix b/nixpkgs/pkgs/applications/networking/n8n/node-composition.nix index 64326c6b2160..53bdef1f9864 100644 --- a/nixpkgs/pkgs/applications/networking/n8n/node-composition.nix +++ b/nixpkgs/pkgs/applications/networking/n8n/node-composition.nix @@ -6,7 +6,7 @@ let nodeEnv = import ./node-env.nix { - inherit (pkgs) stdenv lib python2 runCommand writeTextFile; + inherit (pkgs) stdenv lib python2 runCommand writeTextFile writeShellScript; inherit pkgs nodejs; libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null; }; diff --git a/nixpkgs/pkgs/applications/networking/n8n/node-env.nix b/nixpkgs/pkgs/applications/networking/n8n/node-env.nix index c2b723195b77..5f055785791b 100644 --- a/nixpkgs/pkgs/applications/networking/n8n/node-env.nix +++ b/nixpkgs/pkgs/applications/networking/n8n/node-env.nix @@ -1,6 +1,6 @@ # This file originates from node2nix -{lib, stdenv, nodejs, python2, pkgs, libtool, runCommand, writeTextFile}: +{lib, stdenv, nodejs, python2, pkgs, libtool, runCommand, writeTextFile, writeShellScript}: let # Workaround to cope with utillinux in Nixpkgs 20.09 and util-linux in Nixpkgs master @@ -40,36 +40,22 @@ let ''; }; - includeDependencies = {dependencies}: - lib.optionalString (dependencies != []) - (lib.concatMapStrings (dependency: - '' - # Bundle the dependencies of the package - mkdir -p node_modules - cd node_modules - - # Only include dependencies if they don't exist. They may also be bundled in the package. - if [ ! -e "${dependency.name}" ] - then - ${composePackage dependency} - fi + # Common shell logic + installPackage = writeShellScript "install-package" '' + installPackage() { + local packageName=$1 src=$2 - cd .. - '' - ) dependencies); + local strippedName - # Recursively composes the dependencies of a package - composePackage = { name, packageName, src, dependencies ? [], ... }@args: - builtins.addErrorContext "while evaluating node package '${packageName}'" '' - DIR=$(pwd) + local DIR=$PWD cd $TMPDIR - unpackFile ${src} + unpackFile $src # Make the base dir in which the target dependency resides first - mkdir -p "$(dirname "$DIR/${packageName}")" + mkdir -p "$(dirname "$DIR/$packageName")" - if [ -f "${src}" ] + if [ -f "$src" ] then # Figure out what directory has been unpacked packageDir="$(find . -maxdepth 1 -type d | tail -1)" @@ -79,28 +65,53 @@ let chmod -R u+w "$packageDir" # Move the extracted tarball into the output folder - mv "$packageDir" "$DIR/${packageName}" - elif [ -d "${src}" ] + mv "$packageDir" "$DIR/$packageName" + elif [ -d "$src" ] then # Get a stripped name (without hash) of the source directory. # On old nixpkgs it's already set internally. if [ -z "$strippedName" ] then - strippedName="$(stripHash ${src})" + strippedName="$(stripHash $src)" fi # Restore write permissions to make building work chmod -R u+w "$strippedName" # Move the extracted directory into the output folder - mv "$strippedName" "$DIR/${packageName}" + mv "$strippedName" "$DIR/$packageName" fi - # Unset the stripped name to not confuse the next unpack step - unset strippedName + # Change to the package directory to install dependencies + cd "$DIR/$packageName" + } + ''; + + # Bundle the dependencies of the package + # + # Only include dependencies if they don't exist. They may also be bundled in the package. + includeDependencies = {dependencies}: + lib.optionalString (dependencies != []) ( + '' + mkdir -p node_modules + cd node_modules + '' + + (lib.concatMapStrings (dependency: + '' + if [ ! -e "${dependency.name}" ]; then + ${composePackage dependency} + fi + '' + ) dependencies) + + '' + cd .. + '' + ); - # Include the dependencies of the package - cd "$DIR/${packageName}" + # Recursively composes the dependencies of a package + composePackage = { name, packageName, src, dependencies ? [], ... }@args: + builtins.addErrorContext "while evaluating node package '${packageName}'" '' + installPackage "${packageName}" "${src}" ${includeDependencies { inherit dependencies; }} cd .. ${lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."} @@ -391,13 +402,14 @@ let , dontStrip ? true , unpackPhase ? "true" , buildPhase ? "true" + , meta ? {} , ... }@args: let - extraArgs = removeAttrs args [ "name" "dependencies" "buildInputs" "dontStrip" "dontNpmInstall" "preRebuild" "unpackPhase" "buildPhase" ]; + extraArgs = removeAttrs args [ "name" "dependencies" "buildInputs" "dontStrip" "dontNpmInstall" "preRebuild" "unpackPhase" "buildPhase" "meta" ]; in stdenv.mkDerivation ({ - name = "node_${name}-${version}"; + name = "${name}-${version}"; buildInputs = [ tarWrapper python nodejs ] ++ lib.optional (stdenv.isLinux) utillinux ++ lib.optional (stdenv.isDarwin) libtool @@ -414,6 +426,8 @@ let passAsFile = [ "compositionScript" "pinpointDependenciesScript" ]; installPhase = '' + source ${installPackage} + # Create and enter a root node_modules/ folder mkdir -p $out/lib/node_modules cd $out/lib/node_modules @@ -446,6 +460,11 @@ let # Run post install hook, if provided runHook postInstall ''; + + meta = { + # default to Node.js' platforms + platforms = nodejs.meta.platforms; + } // meta; } // extraArgs); # Builds a node environment (a node_modules folder and a set of binaries) @@ -486,6 +505,8 @@ let passAsFile = [ "includeScript" "pinpointDependenciesScript" ]; installPhase = '' + source ${installPackage} + mkdir -p $out/${packageName} cd $out/${packageName} diff --git a/nixpkgs/pkgs/applications/networking/n8n/node-packages.nix b/nixpkgs/pkgs/applications/networking/n8n/node-packages.nix index b497190b1887..ed813881a111 100644 --- a/nixpkgs/pkgs/applications/networking/n8n/node-packages.nix +++ b/nixpkgs/pkgs/applications/networking/n8n/node-packages.nix @@ -4,40 +4,148 @@ let sources = { - "@azure/ms-rest-azure-env-1.1.2" = { + "@azure/abort-controller-1.0.5" = { + name = "_at_azure_slash_abort-controller"; + packageName = "@azure/abort-controller"; + version = "1.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/@azure/abort-controller/-/abort-controller-1.0.5.tgz"; + sha512 = "G5sjKExiVsbFQo+4YY5MBPOSsh3EUv6XmqjgJaF/VCjckWLGGKPUPGfbCSn6Xal6gzGoPQMOQ+wCCGNCX9NAPg=="; + }; + }; + "@azure/core-asynciterator-polyfill-1.0.2" = { + name = "_at_azure_slash_core-asynciterator-polyfill"; + packageName = "@azure/core-asynciterator-polyfill"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@azure/core-asynciterator-polyfill/-/core-asynciterator-polyfill-1.0.2.tgz"; + sha512 = "3rkP4LnnlWawl0LZptJOdXNrT/fHp2eQMadoasa6afspXdpGrtPZuAQc2PD0cpgyuoXtUWyC3tv7xfntjGS5Dw=="; + }; + }; + "@azure/core-auth-1.3.2" = { + name = "_at_azure_slash_core-auth"; + packageName = "@azure/core-auth"; + version = "1.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@azure/core-auth/-/core-auth-1.3.2.tgz"; + sha512 = "7CU6DmCHIZp5ZPiZ9r3J17lTKMmYsm/zGvNkjArQwPkrLlZ1TZ+EUYfGgh2X31OLMVAQCTJZW4cXHJi02EbJnA=="; + }; + }; + "@azure/core-http-2.2.4" = { + name = "_at_azure_slash_core-http"; + packageName = "@azure/core-http"; + version = "2.2.4"; + src = fetchurl { + url = "https://registry.npmjs.org/@azure/core-http/-/core-http-2.2.4.tgz"; + sha512 = "QmmJmexXKtPyc3/rsZR/YTLDvMatzbzAypJmLzvlfxgz/SkgnqV/D4f6F2LsK6tBj1qhyp8BoXiOebiej0zz3A=="; + }; + }; + "@azure/core-lro-2.2.3" = { + name = "_at_azure_slash_core-lro"; + packageName = "@azure/core-lro"; + version = "2.2.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@azure/core-lro/-/core-lro-2.2.3.tgz"; + sha512 = "UMdlR9NsqDCLTba3EUbRjfMF4gDmWvld196JmUjbz9WWhJ2XT00OR5MXeWiR+vmGT+ETiO4hHFCi2/eGO5YVtg=="; + }; + }; + "@azure/core-paging-1.2.1" = { + name = "_at_azure_slash_core-paging"; + packageName = "@azure/core-paging"; + version = "1.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@azure/core-paging/-/core-paging-1.2.1.tgz"; + sha512 = "UtH5iMlYsvg+nQYIl4UHlvvSrsBjOlRF4fs0j7mxd3rWdAStrKYrh2durOpHs5C9yZbVhsVDaisoyaf/lL1EVA=="; + }; + }; + "@azure/core-tracing-1.0.0-preview.13" = { + name = "_at_azure_slash_core-tracing"; + packageName = "@azure/core-tracing"; + version = "1.0.0-preview.13"; + src = fetchurl { + url = "https://registry.npmjs.org/@azure/core-tracing/-/core-tracing-1.0.0-preview.13.tgz"; + sha512 = "KxDlhXyMlh2Jhj2ykX6vNEU0Vou4nHr025KoSEiz7cS3BNiHNaZcdECk/DmLkEB0as5T7b/TpRcehJ5yV6NeXQ=="; + }; + }; + "@azure/logger-1.0.3" = { + name = "_at_azure_slash_logger"; + packageName = "@azure/logger"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@azure/logger/-/logger-1.0.3.tgz"; + sha512 = "aK4s3Xxjrx3daZr3VylxejK3vG5ExXck5WOHDJ8in/k9AqlfIyFMMT1uG7u8mNjX+QRILTIn0/Xgschfh/dQ9g=="; + }; + }; + "@azure/ms-rest-azure-env-2.0.0" = { name = "_at_azure_slash_ms-rest-azure-env"; packageName = "@azure/ms-rest-azure-env"; - version = "1.1.2"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@azure/ms-rest-azure-env/-/ms-rest-azure-env-1.1.2.tgz"; - sha512 = "l7z0DPCi2Hp88w12JhDTtx5d0Y3+vhfE7JKJb9O7sEz71Cwp053N8piTtTnnk/tUor9oZHgEKi/p3tQQmLPjvA=="; + url = "https://registry.npmjs.org/@azure/ms-rest-azure-env/-/ms-rest-azure-env-2.0.0.tgz"; + sha512 = "dG76W7ElfLi+fbTjnZVGj+M9e0BIEJmRxU6fHaUQ12bZBe8EJKYb2GV50YWNaP2uJiVQ5+7nXEVj1VN1UQtaEw=="; }; }; - "@azure/ms-rest-js-1.9.1" = { + "@azure/ms-rest-js-2.6.0" = { name = "_at_azure_slash_ms-rest-js"; packageName = "@azure/ms-rest-js"; - version = "1.9.1"; + version = "2.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/@azure/ms-rest-js/-/ms-rest-js-1.9.1.tgz"; - sha512 = "F1crHKhmsvFLM9fsnDyCGFd2E2KR9GEZm5oBVV5D5k2EBQ7u7idtSJlSF6RDLDIrGWtc4NnFdYwsoiW8NLlBQg=="; + url = "https://registry.npmjs.org/@azure/ms-rest-js/-/ms-rest-js-2.6.0.tgz"; + sha512 = "4C5FCtvEzWudblB+h92/TYYPiq7tuElX8icVYToxOdggnYqeec4Se14mjse5miInKtZahiFHdl8lZA/jziEc5g=="; }; }; - "@azure/ms-rest-nodeauth-2.0.2" = { + "@azure/ms-rest-nodeauth-3.1.1" = { name = "_at_azure_slash_ms-rest-nodeauth"; packageName = "@azure/ms-rest-nodeauth"; - version = "2.0.2"; + version = "3.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@azure/ms-rest-nodeauth/-/ms-rest-nodeauth-3.1.1.tgz"; + sha512 = "UA/8dgLy3+ZiwJjAZHxL4MUB14fFQPkaAOZ94jsTW/Z6WmoOeny2+cLk0+dyIX/iH6qSrEWKwbStEeB970B9pA=="; + }; + }; + "@azure/storage-blob-12.8.0" = { + name = "_at_azure_slash_storage-blob"; + packageName = "@azure/storage-blob"; + version = "12.8.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@azure/storage-blob/-/storage-blob-12.8.0.tgz"; + sha512 = "c8+Wz19xauW0bGkTCoqZH4dYfbtBniPiGiRQOn1ca6G5jsjr4azwaTk9gwjVY8r3vY2Taf95eivLzipfIfiS4A=="; + }; + }; + "@babel/runtime-7.17.2" = { + name = "_at_babel_slash_runtime"; + packageName = "@babel/runtime"; + version = "7.17.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/runtime/-/runtime-7.17.2.tgz"; + sha512 = "hzeyJyMA1YGdJTuWU0e/j4wKXrU4OMFvY2MSlaI9B7VQb0r5cxTE3EAIS2Q7Tn2RIcDkRvTA/v2JsAEhxe99uw=="; + }; + }; + "@colors/colors-1.5.0" = { + name = "_at_colors_slash_colors"; + packageName = "@colors/colors"; + version = "1.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/@azure/ms-rest-nodeauth/-/ms-rest-nodeauth-2.0.2.tgz"; - sha512 = "KmNNICOxt3EwViAJI3iu2VH8t8BQg5J2rSAyO4IUYLF9ZwlyYsP419pdvl4NBUhluAP2cgN7dfD2V6E6NOMZlQ=="; + url = "https://registry.npmjs.org/@colors/colors/-/colors-1.5.0.tgz"; + sha512 = "ooWCrlZP11i8GImSjTHYHLkvFDP48nS4+204nGb1RiX/WXYHmJA2III9/e2DWVabCESdW7hBAEzHRqUn9OUVvQ=="; }; }; - "@dabh/diagnostics-2.0.2" = { + "@dabh/diagnostics-2.0.3" = { name = "_at_dabh_slash_diagnostics"; packageName = "@dabh/diagnostics"; - version = "2.0.2"; + version = "2.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/@dabh/diagnostics/-/diagnostics-2.0.2.tgz"; - sha512 = "+A1YivoVDNNVCdfozHSR8v/jyuuLTMXwjWuxPFlFlUapXoGc+Gj9mDlTDDfrwl7rXCl2tNZ0kE8sIBO6YOn96Q=="; + url = "https://registry.npmjs.org/@dabh/diagnostics/-/diagnostics-2.0.3.tgz"; + sha512 = "hrlQOIi7hAfzsMqlGSFyVucrx38O+j6wiGOf//H2ecvIEqYN4ADBSS2iLMh5UFyDunCNniUIPk/q3riFv45xRA=="; + }; + }; + "@fontsource/open-sans-4.5.5" = { + name = "_at_fontsource_slash_open-sans"; + packageName = "@fontsource/open-sans"; + version = "4.5.5"; + src = fetchurl { + url = "https://registry.npmjs.org/@fontsource/open-sans/-/open-sans-4.5.5.tgz"; + sha512 = "h1oUPSQpoMnDrnzIZTVS9PPBFhWXS87v6/cd9FY2Xc+GKbOVcjPZxcvUDU1TnCie2QSoYY9aifERRV/d8JHtWQ=="; }; }; "@icetee/ftp-0.3.15" = { @@ -49,58 +157,103 @@ let sha512 = "RxSa9VjcDWgWCYsaLdZItdCnJj7p4LxggaEk+Y3MP0dHKoxez8ioG07DVekVbZZqccsrL+oPB/N9AzVPxj4blg=="; }; }; - "@nodelib/fs.scandir-2.1.4" = { + "@kafkajs/confluent-schema-registry-1.0.6" = { + name = "_at_kafkajs_slash_confluent-schema-registry"; + packageName = "@kafkajs/confluent-schema-registry"; + version = "1.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/@kafkajs/confluent-schema-registry/-/confluent-schema-registry-1.0.6.tgz"; + sha512 = "NrZL1peOIlmlLKvheQcJAx9PHdnc4kaW+9+Yt4jXUfbbYR9EFNCZt6yApI4SwlFilaiZieReM6XslWy1LZAvoQ=="; + }; + }; + "@kwsites/file-exists-1.1.1" = { + name = "_at_kwsites_slash_file-exists"; + packageName = "@kwsites/file-exists"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@kwsites/file-exists/-/file-exists-1.1.1.tgz"; + sha512 = "m9/5YGR18lIwxSFDwfE3oA7bWuq9kdau6ugN4H2rJeyhFQZcG9AgSHkQtSD15a8WvTgfz9aikZMrKPHvbpqFiw=="; + }; + }; + "@kwsites/promise-deferred-1.1.1" = { + name = "_at_kwsites_slash_promise-deferred"; + packageName = "@kwsites/promise-deferred"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@kwsites/promise-deferred/-/promise-deferred-1.1.1.tgz"; + sha512 = "GaHYm+c0O9MjZRu0ongGBRbinu8gVAMd2UZjji6jVmqKtZluZnptXGWhz1E8j8D2HJ3f/yMxKAUC0b+57wncIw=="; + }; + }; + "@nodelib/fs.scandir-2.1.5" = { name = "_at_nodelib_slash_fs.scandir"; packageName = "@nodelib/fs.scandir"; - version = "2.1.4"; + version = "2.1.5"; src = fetchurl { - url = "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.4.tgz"; - sha512 = "33g3pMJk3bg5nXbL/+CY6I2eJDzZAni49PfJnL5fghPTggPvBd/pFNSgJsdAgWptuFu7qq/ERvOYFlhvsLTCKA=="; + url = "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz"; + sha512 = "vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g=="; }; }; - "@nodelib/fs.stat-2.0.4" = { + "@nodelib/fs.stat-2.0.5" = { name = "_at_nodelib_slash_fs.stat"; packageName = "@nodelib/fs.stat"; - version = "2.0.4"; + version = "2.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.4.tgz"; - sha512 = "IYlHJA0clt2+Vg7bccq+TzRdJvv19c2INqBSsoOLp1je7xjtr7J26+WXR72MCdvU9q1qTzIWDfhMf+DRvQJK4Q=="; + url = "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz"; + sha512 = "RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A=="; }; }; - "@nodelib/fs.walk-1.2.6" = { + "@nodelib/fs.walk-1.2.8" = { name = "_at_nodelib_slash_fs.walk"; packageName = "@nodelib/fs.walk"; - version = "1.2.6"; + version = "1.2.8"; src = fetchurl { - url = "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.6.tgz"; - sha512 = "8Broas6vTtW4GIXTAHDoE32hnN2M5ykgCpWGbuXHQ15vEMqr23pB76e/GZcYsZCHALv50ktd24qhEyKr6wBtow=="; + url = "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz"; + sha512 = "oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg=="; }; }; - "@oclif/command-1.8.0" = { + "@oclif/command-1.8.16" = { name = "_at_oclif_slash_command"; packageName = "@oclif/command"; - version = "1.8.0"; + version = "1.8.16"; src = fetchurl { - url = "https://registry.npmjs.org/@oclif/command/-/command-1.8.0.tgz"; - sha512 = "5vwpq6kbvwkQwKqAoOU3L72GZ3Ta8RRrewKj9OJRolx28KLJJ8Dg9Rf7obRwt5jQA9bkYd8gqzMTrI7H3xLfaw=="; + url = "https://registry.npmjs.org/@oclif/command/-/command-1.8.16.tgz"; + sha512 = "rmVKYEsKzurfRU0xJz+iHelbi1LGlihIWZ7Qvmb/CBz1EkhL7nOkW4SVXmG2dA5Ce0si2gr88i6q4eBOMRNJ1w=="; }; }; - "@oclif/config-1.17.0" = { + "@oclif/config-1.18.2" = { name = "_at_oclif_slash_config"; packageName = "@oclif/config"; - version = "1.17.0"; + version = "1.18.2"; src = fetchurl { - url = "https://registry.npmjs.org/@oclif/config/-/config-1.17.0.tgz"; - sha512 = "Lmfuf6ubjQ4ifC/9bz1fSCHc6F6E653oyaRXxg+lgT4+bYf9bk+nqrUpAbrXyABkCqgIBiFr3J4zR/kiFdE1PA=="; + url = "https://registry.npmjs.org/@oclif/config/-/config-1.18.2.tgz"; + sha512 = "cE3qfHWv8hGRCP31j7fIS7BfCflm/BNZ2HNqHexH+fDrdF2f1D5S8VmXWLC77ffv3oDvWyvE9AZeR0RfmHCCaA=="; }; }; - "@oclif/errors-1.3.4" = { + "@oclif/config-1.18.3" = { + name = "_at_oclif_slash_config"; + packageName = "@oclif/config"; + version = "1.18.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@oclif/config/-/config-1.18.3.tgz"; + sha512 = "sBpko86IrTscc39EvHUhL+c++81BVTsIZ3ETu/vG+cCdi0N6vb2DoahR67A9FI2CGnxRRHjnTfa3m6LulwNATA=="; + }; + }; + "@oclif/errors-1.3.5" = { name = "_at_oclif_slash_errors"; packageName = "@oclif/errors"; - version = "1.3.4"; + version = "1.3.5"; + src = fetchurl { + url = "https://registry.npmjs.org/@oclif/errors/-/errors-1.3.5.tgz"; + sha512 = "OivucXPH/eLLlOT7FkCMoZXiaVYf8I/w1eTAM1+gKzfhALwWTusxEx7wBmW0uzvkSg/9ovWLycPaBgJbM3LOCQ=="; + }; + }; + "@oclif/help-1.0.1" = { + name = "_at_oclif_slash_help"; + packageName = "@oclif/help"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@oclif/errors/-/errors-1.3.4.tgz"; - sha512 = "pJKXyEqwdfRTUdM8n5FIHiQQHg5ETM0Wlso8bF9GodczO40mF5Z3HufnYWJE7z8sGKxOeJCdbAVZbS8Y+d5GCw=="; + url = "https://registry.npmjs.org/@oclif/help/-/help-1.0.1.tgz"; + sha512 = "8rsl4RHL5+vBUAKBL6PFI3mj58hjPCp2VYyXD4TAa7IMStikFfOH2gtWmqLzIlxAED2EpD0dfYwo9JJxYsH7Aw=="; }; }; "@oclif/linewrap-1.0.0" = { @@ -112,22 +265,49 @@ let sha512 = "Ups2dShK52xXa8w6iBWLgcjPJWjais6KPJQq3gQ/88AY6BXoTX+MIGFPrWQO1KLMiQfoTpcLnUwloN4brrVUHw=="; }; }; - "@oclif/parser-3.8.5" = { + "@oclif/parser-3.8.6" = { name = "_at_oclif_slash_parser"; packageName = "@oclif/parser"; - version = "3.8.5"; + version = "3.8.6"; src = fetchurl { - url = "https://registry.npmjs.org/@oclif/parser/-/parser-3.8.5.tgz"; - sha512 = "yojzeEfmSxjjkAvMRj0KzspXlMjCfBzNRPkWw8ZwOSoNWoJn+OCS/m/S+yfV6BvAM4u2lTzX9Y5rCbrFIgkJLg=="; + url = "https://registry.npmjs.org/@oclif/parser/-/parser-3.8.6.tgz"; + sha512 = "tXb0NKgSgNxmf6baN6naK+CCwOueaFk93FG9u202U7mTBHUKsioOUlw1SG/iPi9aJM3WE4pHLXmty59pci0OEw=="; }; }; - "@oclif/plugin-help-3.2.1" = { - name = "_at_oclif_slash_plugin-help"; - packageName = "@oclif/plugin-help"; - version = "3.2.1"; + "@opentelemetry/api-1.1.0" = { + name = "_at_opentelemetry_slash_api"; + packageName = "@opentelemetry/api"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@opentelemetry/api/-/api-1.1.0.tgz"; + sha512 = "hf+3bwuBwtXsugA2ULBc95qxrOqP2pOekLz34BJhcAKawt94vfeNyUKpYc0lZQ/3sCP6LqRa7UAdHA7i5UODzQ=="; + }; + }; + "@rudderstack/rudder-sdk-node-1.0.6" = { + name = "_at_rudderstack_slash_rudder-sdk-node"; + packageName = "@rudderstack/rudder-sdk-node"; + version = "1.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/@rudderstack/rudder-sdk-node/-/rudder-sdk-node-1.0.6.tgz"; + sha512 = "kJYCXv6fRFbQrAp3hMsgRCnAa7RUBdbiGLBT9PcpQURi0VwHmD7mk3Ja7U4HDnL0EHXYJpPyx3oSonkklmPJ9Q=="; + }; + }; + "@segment/loosely-validate-event-2.0.0" = { + name = "_at_segment_slash_loosely-validate-event"; + packageName = "@segment/loosely-validate-event"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@oclif/plugin-help/-/plugin-help-3.2.1.tgz"; - sha512 = "vq7rn16TrQmjX3Al/k1Z5iBZWZ3HE8fDXs52OmDJmmTqryPSNvURH9WCAsqr0PODYCSR17Hy1VTzS0x7vVVLEQ=="; + url = "https://registry.npmjs.org/@segment/loosely-validate-event/-/loosely-validate-event-2.0.0.tgz"; + sha512 = "ZMCSfztDBqwotkl848ODgVcAmN4OItEWDCkshcKz0/W6gGSQayuuCtWV/MlodFivAZD793d6UgANd6wCXUfrIw=="; + }; + }; + "@selderee/plugin-htmlparser2-0.6.0" = { + name = "_at_selderee_slash_plugin-htmlparser2"; + packageName = "@selderee/plugin-htmlparser2"; + version = "0.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@selderee/plugin-htmlparser2/-/plugin-htmlparser2-0.6.0.tgz"; + sha512 = "J3jpy002TyBjd4N/p6s+s90eX42H2eRhK3SbsZuvTDv977/E8p2U3zikdiehyJja66do7FlxLomZLPlvl2/xaA=="; }; }; "@servie/events-1.0.0" = { @@ -157,49 +337,58 @@ let sha512 = "XO6INPbZCxdprl+9qa/AAbFFOMzzwqYxpjPgLICrMD6C2FCw6qfJOPcBk6JqqPLSaZ/Qx87qn4rpPmPMwaAK6w=="; }; }; - "@types/bluebird-3.5.33" = { + "@tokenizer/token-0.3.0" = { + name = "_at_tokenizer_slash_token"; + packageName = "@tokenizer/token"; + version = "0.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@tokenizer/token/-/token-0.3.0.tgz"; + sha512 = "OvjF+z51L3ov0OyAU0duzsYuvO01PH7x4t6DJx+guahgTnBHkhJdG7soQeTSFLWN3efnHyibZ4Z8l2EuWwJN3A=="; + }; + }; + "@tootallnate/once-1.1.2" = { + name = "_at_tootallnate_slash_once"; + packageName = "@tootallnate/once"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@tootallnate/once/-/once-1.1.2.tgz"; + sha512 = "RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw=="; + }; + }; + "@types/bluebird-3.5.36" = { name = "_at_types_slash_bluebird"; packageName = "@types/bluebird"; - version = "3.5.33"; + version = "3.5.36"; src = fetchurl { - url = "https://registry.npmjs.org/@types/bluebird/-/bluebird-3.5.33.tgz"; - sha512 = "ndEo1xvnYeHxm7I/5sF6tBvnsA4Tdi3zj1keRKRs12SP+2ye2A27NDJ1B6PqkfMbGAcT+mqQVqbZRIrhfOp5PQ=="; + url = "https://registry.npmjs.org/@types/bluebird/-/bluebird-3.5.36.tgz"; + sha512 = "HBNx4lhkxN7bx6P0++W8E289foSu8kO8GCk2unhuVggO+cE7rh9DhZUyPhUxNRG9m+5B5BTKxZQ5ZP92x/mx9Q=="; }; }; - "@types/body-parser-1.19.0" = { + "@types/body-parser-1.19.2" = { name = "_at_types_slash_body-parser"; packageName = "@types/body-parser"; - version = "1.19.0"; + version = "1.19.2"; src = fetchurl { - url = "https://registry.npmjs.org/@types/body-parser/-/body-parser-1.19.0.tgz"; - sha512 = "W98JrE0j2K78swW4ukqMleo8R7h/pFETjM2DQ90MF6XK2i4LO4W3gQ71Lt4w3bfm2EvVSyWHplECvB5sK22yFQ=="; + url = "https://registry.npmjs.org/@types/body-parser/-/body-parser-1.19.2.tgz"; + sha512 = "ALYone6pm6QmwZoAgeyNksccT9Q4AWZQ6PvfwR37GT6r6FWUPguq6sUmNGSMV2Wr761oQoBxwGGa6DR5o1DC9g=="; }; }; - "@types/connect-3.4.34" = { + "@types/connect-3.4.35" = { name = "_at_types_slash_connect"; packageName = "@types/connect"; - version = "3.4.34"; + version = "3.4.35"; src = fetchurl { - url = "https://registry.npmjs.org/@types/connect/-/connect-3.4.34.tgz"; - sha512 = "ePPA/JuI+X0vb+gSWlPKOY0NdNAie/rPUqX2GUPpbZwiKTkSPhjXWuee47E4MtE54QVzGCQMQkAL6JhV2E1+cQ=="; + url = "https://registry.npmjs.org/@types/connect/-/connect-3.4.35.tgz"; + sha512 = "cdeYyv4KWoEgpBISTxWvqYsVy444DOqehiF3fM3ne10AmJ62RSyNkUnxMJXHQWRQQX2eR94m5y1IZyDwBjV9FQ=="; }; }; - "@types/debug-4.1.5" = { - name = "_at_types_slash_debug"; - packageName = "@types/debug"; - version = "4.1.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/debug/-/debug-4.1.5.tgz"; - sha512 = "Q1y515GcOdTHgagaVFhHnIFQ38ygs/kmxdNpvpou+raI9UO3YZcHDngBSYKQklcKlvA7iuQlmIKbzvmxcOE9CQ=="; - }; - }; - "@types/express-4.17.11" = { + "@types/express-4.17.13" = { name = "_at_types_slash_express"; packageName = "@types/express"; - version = "4.17.11"; + version = "4.17.13"; src = fetchurl { - url = "https://registry.npmjs.org/@types/express/-/express-4.17.11.tgz"; - sha512 = "no+R6rW60JEc59977wIxreQVsIEOAYwgCqldrA/vkpCnbD7MqTefO97lmoBe4WE0F156bC4uLSP1XHDOySnChg=="; + url = "https://registry.npmjs.org/@types/express/-/express-4.17.13.tgz"; + sha512 = "6bSZTPaTIACxn48l50SR+axgrqm6qXFIxrdAKaG6PaJk3+zuUr35hBlgT7vOmJcum+OEaIBLtHV/qloEAFITeA=="; }; }; "@types/express-jwt-0.0.42" = { @@ -211,49 +400,67 @@ let sha512 = "WszgUddvM1t5dPpJ3LhWNH8kfNN8GPIBrAGxgIYXVCEGx6Bx4A036aAuf/r5WH9DIEdlmp7gHOYvSM6U87B0ag=="; }; }; - "@types/express-serve-static-core-4.17.18" = { + "@types/express-serve-static-core-4.17.28" = { name = "_at_types_slash_express-serve-static-core"; packageName = "@types/express-serve-static-core"; - version = "4.17.18"; + version = "4.17.28"; src = fetchurl { - url = "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.18.tgz"; - sha512 = "m4JTwx5RUBNZvky/JJ8swEJPKFd8si08pPF2PfizYjGZOKr/svUWPcoUmLow6MmPzhasphB7gSTINY67xn3JNA=="; + url = "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.28.tgz"; + sha512 = "P1BJAEAW3E2DJUlkgq4tOL3RyMunoWXqbSCygWo5ZIWTjUgN1YnaXWW4VWl/oc8vs/XoYibEGBKP0uZyF4AHig=="; }; }; - "@types/express-unless-0.5.1" = { + "@types/express-unless-0.5.3" = { name = "_at_types_slash_express-unless"; packageName = "@types/express-unless"; - version = "0.5.1"; + version = "0.5.3"; src = fetchurl { - url = "https://registry.npmjs.org/@types/express-unless/-/express-unless-0.5.1.tgz"; - sha512 = "5fuvg7C69lemNgl0+v+CUxDYWVPSfXHhJPst4yTLcqi4zKJpORCxnDrnnilk3k0DTq/WrAUdvXFs01+vUqUZHw=="; + url = "https://registry.npmjs.org/@types/express-unless/-/express-unless-0.5.3.tgz"; + sha512 = "TyPLQaF6w8UlWdv4gj8i46B+INBVzURBNRahCozCSXfsK2VTlL1wNyTlMKw817VHygBtlcl5jfnPadlydr06Yw=="; }; }; - "@types/ftp-0.3.31" = { + "@types/ftp-0.3.33" = { name = "_at_types_slash_ftp"; packageName = "@types/ftp"; - version = "0.3.31"; + version = "0.3.33"; src = fetchurl { - url = "https://registry.npmjs.org/@types/ftp/-/ftp-0.3.31.tgz"; - sha512 = "J30a1yD9avBsFahvmGoeumWUZ5YnGRj/7u0aKSa3dGxyaguU+14WkHmVzZYToK7vX0ADfyAXBUQlaQ20PTHhAA=="; + url = "https://registry.npmjs.org/@types/ftp/-/ftp-0.3.33.tgz"; + sha512 = "L7wFlX3t9GsGgNS0oxLt6zbAZZGgsdptMmciL4cdxHmbL3Hz4Lysh8YqAR34eHsJ1uacJITcZBBDl5XpQlxPpQ=="; }; }; - "@types/glob-7.1.3" = { - name = "_at_types_slash_glob"; - packageName = "@types/glob"; - version = "7.1.3"; + "@types/json-diff-0.5.2" = { + name = "_at_types_slash_json-diff"; + packageName = "@types/json-diff"; + version = "0.5.2"; src = fetchurl { - url = "https://registry.npmjs.org/@types/glob/-/glob-7.1.3.tgz"; - sha512 = "SEYeGAIQIQX8NN6LDKprLjbrd5dARM5EXsd8GI/A5l0apYI1fGMWgPHSe4ZKL4eozlAyI+doUE9XbYS4xCkQ1w=="; + url = "https://registry.npmjs.org/@types/json-diff/-/json-diff-0.5.2.tgz"; + sha512 = "2oqXStJYYLDHCciNAClY277Ti3kXT+JLvPD7lLm/490i+B7g0GR6M4qiW+bd2V5vpB+yMKY8IelbsHMAYX1D0A=="; }; }; - "@types/jsonwebtoken-8.5.0" = { + "@types/jsonwebtoken-8.5.8" = { name = "_at_types_slash_jsonwebtoken"; packageName = "@types/jsonwebtoken"; - version = "8.5.0"; + version = "8.5.8"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/jsonwebtoken/-/jsonwebtoken-8.5.8.tgz"; + sha512 = "zm6xBQpFDIDM6o9r6HSgDeIcLy82TKWctCXEPbJJcXb5AKmi5BNNdLXneixK4lplX3PqIVcwLBCGE/kAGnlD4A=="; + }; + }; + "@types/lodash-4.14.178" = { + name = "_at_types_slash_lodash"; + packageName = "@types/lodash"; + version = "4.14.178"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.178.tgz"; + sha512 = "0d5Wd09ItQWH1qFbEyQ7oTQ3GZrMfth5JkbN3EvTKLXcHLRDSXeLnlvlOn0wvxVIwK5o2M8JzP/OWz7T3NRsbw=="; + }; + }; + "@types/lossless-json-1.0.1" = { + name = "_at_types_slash_lossless-json"; + packageName = "@types/lossless-json"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@types/jsonwebtoken/-/jsonwebtoken-8.5.0.tgz"; - sha512 = "9bVao7LvyorRGZCw0VmH/dr7Og+NdjYSsKAxB43OQoComFbBgsEpoR9JW6+qSq/ogwVBg8GI2MfAlk4SYI4OLg=="; + url = "https://registry.npmjs.org/@types/lossless-json/-/lossless-json-1.0.1.tgz"; + sha512 = "zPE8kmpeL5/6L5gtTQHSOkAW/OSYYNTDRt6/2oEgLO1Zd3Rj5WVDoMloTtLJxQJhZGLGbL4pktKSh3NbzdaWdw=="; }; }; "@types/mime-1.3.2" = { @@ -265,40 +472,31 @@ let sha512 = "YATxVxgRqNH6nHEIsvg6k2Boc1JHI9ZbH5iWFFv/MTkchz3b1ieGDa5T0a9RznNdI0KhVbdbWSN+KWWrQZRxTw=="; }; }; - "@types/minimatch-3.0.3" = { - name = "_at_types_slash_minimatch"; - packageName = "@types/minimatch"; - version = "3.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/minimatch/-/minimatch-3.0.3.tgz"; - sha512 = "tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA=="; - }; - }; - "@types/node-12.19.15" = { + "@types/node-12.20.45" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "12.19.15"; + version = "12.20.45"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-12.19.15.tgz"; - sha512 = "lowukE3GUI+VSYSu6VcBXl14d61Rp5hA1D+61r16qnwC0lYNSqdxcvRh0pswejorHfS+HgwBasM8jLXz0/aOsw=="; + url = "https://registry.npmjs.org/@types/node/-/node-12.20.45.tgz"; + sha512 = "1Jg2Qv5tuxBqgQV04+wO5u+wmSHbHgpORCJdeCLM+E+YdPElpdHhgywU+M1V1InL8rfOtpqtOjswk+uXTKwx7w=="; }; }; - "@types/node-14.14.22" = { + "@types/node-17.0.17" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "14.14.22"; + version = "17.0.17"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-14.14.22.tgz"; - sha512 = "g+f/qj/cNcqKkc3tFqlXOYjrmZA+jNBiDzbP3kH+B+otKFqAdPgVTGP1IeKRdMml/aE69as5S4FqtxAbl+LaMw=="; + url = "https://registry.npmjs.org/@types/node/-/node-17.0.17.tgz"; + sha512 = "e8PUNQy1HgJGV3iU/Bp2+D/DXh3PYeyli8LgIwsQcs1Ar1LoaWHSIT6Rw+H2rNJmiq6SNWiDytfx8+gYj7wDHw=="; }; }; - "@types/node-8.10.66" = { - name = "_at_types_slash_node"; - packageName = "@types/node"; - version = "8.10.66"; + "@types/node-fetch-2.5.12" = { + name = "_at_types_slash_node-fetch"; + packageName = "@types/node-fetch"; + version = "2.5.12"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-8.10.66.tgz"; - sha512 = "tktOkFUA4kXx2hhhrB8bIFb5TbwzS4uOhKEmwiD+NoiL0qtP2OQ9mFldbgD4dV1djrlBYP6eBuQZiWjuHUpqFw=="; + url = "https://registry.npmjs.org/@types/node-fetch/-/node-fetch-2.5.12.tgz"; + sha512 = "MKgC4dlq4kKNa/mYrwpKfzQMB5X3ee5U6fSprkKpToBqBmX4nFZL9cW5jl6sWn+xpRJ7ypWh2yyqqr8UUCstSw=="; }; }; "@types/promise-ftp-1.3.4" = { @@ -319,67 +517,76 @@ let sha512 = "mqo6D4qdiJdzeqlzFwEIchQQZk2hZacjssmjoAX7nClcREmRUUsnmgbWXEfA2qK986rwOPqepfRoSu7rsjAKag=="; }; }; - "@types/qs-6.9.5" = { + "@types/qs-6.9.7" = { name = "_at_types_slash_qs"; packageName = "@types/qs"; - version = "6.9.5"; + version = "6.9.7"; src = fetchurl { - url = "https://registry.npmjs.org/@types/qs/-/qs-6.9.5.tgz"; - sha512 = "/JHkVHtx/REVG0VVToGRGH2+23hsYLHdyG+GrvoUGlGAd0ErauXDyvHtRI/7H7mzLm+tBCKA7pfcpkQ1lf58iQ=="; + url = "https://registry.npmjs.org/@types/qs/-/qs-6.9.7.tgz"; + sha512 = "FGa1F62FT09qcrueBA6qYTrJPVDzah9a+493+o2PCXsesWHIn27G98TsSMs3WPNbZIEj4+VJf6saSFpvD+3Zsw=="; }; }; - "@types/range-parser-1.2.3" = { + "@types/range-parser-1.2.4" = { name = "_at_types_slash_range-parser"; packageName = "@types/range-parser"; - version = "1.2.3"; + version = "1.2.4"; src = fetchurl { - url = "https://registry.npmjs.org/@types/range-parser/-/range-parser-1.2.3.tgz"; - sha512 = "ewFXqrQHlFsgc09MK5jP5iR7vumV/BYayNC6PgJO2LPe8vrnNFyjQjSppfEngITi0qvfKtzFvgKymGheFM9UOA=="; + url = "https://registry.npmjs.org/@types/range-parser/-/range-parser-1.2.4.tgz"; + sha512 = "EEhsLsD6UsDM1yFhAvy0Cjr6VwmpMWqFBCb9w07wVugF7w9nfajxLuVmngTIpgS6svCnm6Vaw+MZhoDCKnOfsw=="; }; }; - "@types/readable-stream-2.3.9" = { + "@types/readable-stream-2.3.13" = { name = "_at_types_slash_readable-stream"; packageName = "@types/readable-stream"; - version = "2.3.9"; + version = "2.3.13"; src = fetchurl { - url = "https://registry.npmjs.org/@types/readable-stream/-/readable-stream-2.3.9.tgz"; - sha512 = "sqsgQqFT7HmQz/V5jH1O0fvQQnXAJO46Gg9LRO/JPfjmVmGUlcx831TZZO3Y3HtWhIkzf3kTsNT0Z0kzIhIvZw=="; + url = "https://registry.npmjs.org/@types/readable-stream/-/readable-stream-2.3.13.tgz"; + sha512 = "4JSCx8EUzaW9Idevt+9lsRAt1lcSccoQfE+AouM1gk8sFxnnytKNIO3wTl9Dy+4m6jRJ1yXhboLHHT/LXBQiEw=="; }; }; - "@types/serve-static-1.13.9" = { + "@types/serve-static-1.13.10" = { name = "_at_types_slash_serve-static"; packageName = "@types/serve-static"; - version = "1.13.9"; + version = "1.13.10"; src = fetchurl { - url = "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.13.9.tgz"; - sha512 = "ZFqF6qa48XsPdjXV5Gsz0Zqmux2PerNd3a/ktL45mHpa19cuMi/cL8tcxdAx497yRh+QtYPuofjT9oWw9P7nkA=="; + url = "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.13.10.tgz"; + sha512 = "nCkHGI4w7ZgAdNkrEu0bv+4xNV/XDqW+DydknebMOQwkpDGx8G+HTlj7R7ABI8i8nKxVw0wtKPi1D+lPOkh4YQ=="; }; }; - "@types/snowflake-sdk-1.5.1" = { + "@types/snowflake-sdk-1.6.2" = { name = "_at_types_slash_snowflake-sdk"; packageName = "@types/snowflake-sdk"; - version = "1.5.1"; + version = "1.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/@types/snowflake-sdk/-/snowflake-sdk-1.5.1.tgz"; - sha512 = "0RPrY9NZZn3botFzmW+Yo7Qx8J0KbIRfrWOzVFqG9iN6qo9WfpZwoqApC8Y6y9htZBdpfAweeVQdyMOm6B8Z9w=="; + url = "https://registry.npmjs.org/@types/snowflake-sdk/-/snowflake-sdk-1.6.2.tgz"; + sha512 = "68albQhKcrtz6G7IhXab8JE/96EN5COPo63+xUxvjwbYXe1BD8WTLVIXIxLdvC5oLmrK8Tf5W0mz+swaH/AfBQ=="; }; }; - "@types/tough-cookie-2.3.7" = { + "@types/tough-cookie-2.3.8" = { name = "_at_types_slash_tough-cookie"; packageName = "@types/tough-cookie"; - version = "2.3.7"; + version = "2.3.8"; src = fetchurl { - url = "https://registry.npmjs.org/@types/tough-cookie/-/tough-cookie-2.3.7.tgz"; - sha512 = "rMQbgMGxnLsdn8e9aPVyuN+zMQLrZ2QW8xlv7eWS1mydfGXN+tsTKffcIzd8rGCcLdmi3xvQw2MDaZI1bBNTaw=="; + url = "https://registry.npmjs.org/@types/tough-cookie/-/tough-cookie-2.3.8.tgz"; + sha512 = "7axfYN8SW9pWg78NgenHasSproWQee5rzyPVLC9HpaQSDgNArsnKJD88EaMfi4Pl48AyciO3agYCFqpHS1gLpg=="; }; }; - "@types/tunnel-0.0.0" = { + "@types/tunnel-0.0.3" = { name = "_at_types_slash_tunnel"; packageName = "@types/tunnel"; - version = "0.0.0"; + version = "0.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/tunnel/-/tunnel-0.0.3.tgz"; + sha512 = "sOUTGn6h1SfQ+gbgqC364jLFBw2lnFqkgF3q0WovEHRLMrVD1sd5aufqi/aJObLekJO+Aq5z646U4Oxy6shXMA=="; + }; + }; + "@xmldom/xmldom-0.7.5" = { + name = "_at_xmldom_slash_xmldom"; + packageName = "@xmldom/xmldom"; + version = "0.7.5"; src = fetchurl { - url = "https://registry.npmjs.org/@types/tunnel/-/tunnel-0.0.0.tgz"; - sha512 = "FGDp0iBRiBdPjOgjJmn1NH0KDLN+Z8fRmo+9J7XGBhubq1DPrGrbmG4UTlGzrpbCpesMqD0sWkzi27EYkOMHyg=="; + url = "https://registry.npmjs.org/@xmldom/xmldom/-/xmldom-0.7.5.tgz"; + sha512 = "V3BIhmY36fXZ1OtVcI9W+FxQqxVLsPKcNjWigIaa81dLC9IolJl5Mt4Cvhmr0flUnjSpTdrbMTSbXqYqV5dT6A=="; }; }; "abbrev-1.1.1" = { @@ -391,13 +598,22 @@ let sha512 = "nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q=="; }; }; - "accepts-1.3.7" = { + "abort-controller-3.0.0" = { + name = "abort-controller"; + packageName = "abort-controller"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/abort-controller/-/abort-controller-3.0.0.tgz"; + sha512 = "h8lQ8tacZYnR3vNQTgibj+tODHI5/+l06Au2Pcriv/Gmet0eaj4TwWH41sO9wnHDiQsEj19q0drzdWdeAHtweg=="; + }; + }; + "accepts-1.3.8" = { name = "accepts"; packageName = "accepts"; - version = "1.3.7"; + version = "1.3.8"; src = fetchurl { - url = "https://registry.npmjs.org/accepts/-/accepts-1.3.7.tgz"; - sha512 = "Il80Qs2WjYlJIBNzNkK6KYqlVMTbZLXgHx2oT0pU/fjRHyEp+PEfEPY0R3WCwAGVOtauxh1hOxNgIf5bv7dQpA=="; + url = "https://registry.npmjs.org/accepts/-/accepts-1.3.8.tgz"; + sha512 = "PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw=="; }; }; "access-control-1.0.1" = { @@ -409,13 +625,31 @@ let sha512 = "H5aqjkogmFxfaOrfn/e42vyspHVXuJ8er63KuljJXpOyJ1ZO/U5CrHfO8BLKIy2w7mBM02L5quL0vbfQqrGQbA=="; }; }; - "adal-node-0.1.28" = { + "acorn-8.7.0" = { + name = "acorn"; + packageName = "acorn"; + version = "8.7.0"; + src = fetchurl { + url = "https://registry.npmjs.org/acorn/-/acorn-8.7.0.tgz"; + sha512 = "V/LGr1APy+PXIwKebEWrkZPwoeoF+w1jiOBUmuxuiUIaOHtob8Qc9BTrYo7VuI5fR8tqsy+buA2WFooR5olqvQ=="; + }; + }; + "acorn-walk-8.2.0" = { + name = "acorn-walk"; + packageName = "acorn-walk"; + version = "8.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.2.0.tgz"; + sha512 = "k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA=="; + }; + }; + "adal-node-0.2.3" = { name = "adal-node"; packageName = "adal-node"; - version = "0.1.28"; + version = "0.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/adal-node/-/adal-node-0.1.28.tgz"; - sha1 = "468c4bb3ebbd96b1270669f4b9cba4e0065ea485"; + url = "https://registry.npmjs.org/adal-node/-/adal-node-0.2.3.tgz"; + sha512 = "gMKr8RuYEYvsj7jyfCv/4BfKToQThz20SP71N3AtFn3ia3yAR8Qt2T3aVQhuJzunWs2b38ZsQV0qsZPdwZr7VQ=="; }; }; "adler-32-1.2.0" = { @@ -427,13 +661,13 @@ let sha1 = "6a3e6bf0a63900ba15652808cb15c6813d1a5f25"; }; }; - "agent-base-2.1.1" = { - name = "agent-base"; - packageName = "agent-base"; - version = "2.1.1"; + "adler-32-1.3.0" = { + name = "adler-32"; + packageName = "adler-32"; + version = "1.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/agent-base/-/agent-base-2.1.1.tgz"; - sha1 = "d6de10d5af6132d5bd692427d46fc538539094c7"; + url = "https://registry.npmjs.org/adler-32/-/adler-32-1.3.0.tgz"; + sha512 = "f5nltvjl+PRUh6YNfUstRaXwJxtfnKEWhAWWlmKvh+Y3J2+98a0KKVYDEhz6NdKGqswLhjNGznxfSsZGOvOd9g=="; }; }; "agent-base-4.3.0" = { @@ -445,6 +679,15 @@ let sha512 = "salcGninV0nPrwpGNn4VTXBb1SOuXQBiqbrNXoeizJsHrsL6ERFM2Ne3JUSBWRE6aeNJI2ROP/WEEIDUiDe3cg=="; }; }; + "agent-base-6.0.2" = { + name = "agent-base"; + packageName = "agent-base"; + version = "6.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz"; + sha512 = "RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ=="; + }; + }; "ajv-6.12.6" = { name = "ajv"; packageName = "ajv"; @@ -454,22 +697,22 @@ let sha512 = "j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g=="; }; }; - "amqplib-0.6.0" = { + "amqplib-0.8.0" = { name = "amqplib"; packageName = "amqplib"; - version = "0.6.0"; + version = "0.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/amqplib/-/amqplib-0.6.0.tgz"; - sha512 = "zXCh4jQ77TBZe1YtvZ1n7sUxnTjnNagpy8MVi2yc1ive239pS3iLwm4e4d5o4XZGx1BdTKQ/U0ZmaDU3c8MxYQ=="; + url = "https://registry.npmjs.org/amqplib/-/amqplib-0.8.0.tgz"; + sha512 = "icU+a4kkq4Y1PS4NNi+YPDMwdlbFcZ1EZTQT2nigW3fvOb6AOgUQ9+Mk4ue0Zu5cBg/XpDzB40oH10ysrk2dmA=="; }; }; - "ansi-escapes-4.3.1" = { + "ansi-escapes-4.3.2" = { name = "ansi-escapes"; packageName = "ansi-escapes"; - version = "4.3.1"; + version = "4.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.1.tgz"; - sha512 = "JWF7ocqNrp8u9oqpgV+wH5ftbt+cfvv+PTjOvKLT3AdYly/LmORARfEVT1iyjwN+4MqE5UmVKoAdIBqeoCHgLA=="; + url = "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.2.tgz"; + sha512 = "gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ=="; }; }; "ansi-regex-2.1.1" = { @@ -481,22 +724,13 @@ let sha1 = "c3b33ab5ee360d86e0e628f0468ae7ef27d654df"; }; }; - "ansi-regex-3.0.0" = { + "ansi-regex-5.0.1" = { name = "ansi-regex"; packageName = "ansi-regex"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz"; - sha1 = "ed0317c322064f79466c02966bddb605ab37d998"; - }; - }; - "ansi-regex-5.0.0" = { - name = "ansi-regex"; - packageName = "ansi-regex"; - version = "5.0.0"; + version = "5.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz"; - sha512 = "bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg=="; + url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz"; + sha512 = "quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ=="; }; }; "ansi-styles-2.2.1" = { @@ -508,15 +742,6 @@ let sha1 = "b432dd3358b634cf75e1e4664368240533c1ddbe"; }; }; - "ansi-styles-3.2.1" = { - name = "ansi-styles"; - packageName = "ansi-styles"; - version = "3.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz"; - sha512 = "VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA=="; - }; - }; "ansi-styles-4.3.0" = { name = "ansi-styles"; packageName = "ansi-styles"; @@ -526,15 +751,6 @@ let sha512 = "zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg=="; }; }; - "ansicolors-0.3.2" = { - name = "ansicolors"; - packageName = "ansicolors"; - version = "0.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/ansicolors/-/ansicolors-0.3.2.tgz"; - sha1 = "665597de86a9ffe3aa9bfbe6cae5c6ea426b4979"; - }; - }; "any-promise-1.3.0" = { name = "any-promise"; packageName = "any-promise"; @@ -544,6 +760,15 @@ let sha1 = "abc6afeedcea52e809cdc0376aed3ce39635d17f"; }; }; + "anymatch-3.1.2" = { + name = "anymatch"; + packageName = "anymatch"; + version = "3.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/anymatch/-/anymatch-3.1.2.tgz"; + sha512 = "P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg=="; + }; + }; "app-root-path-3.0.0" = { name = "app-root-path"; packageName = "app-root-path"; @@ -562,13 +787,13 @@ let sha512 = "Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw=="; }; }; - "are-we-there-yet-1.1.5" = { + "are-we-there-yet-1.1.7" = { name = "are-we-there-yet"; packageName = "are-we-there-yet"; - version = "1.1.5"; + version = "1.1.7"; src = fetchurl { - url = "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz"; - sha512 = "5hYdAkZlcG8tOLujVDTgCT+uPX0VnpAH28gWsLfzpXYm7wP6mp5Q/gYyR7YQ0cKVJcXJnl3j2kpBan13PtQf6w=="; + url = "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.7.tgz"; + sha512 = "nxwy40TuMiUGqMyRHgCSWZ9FM4VAoRP4xUYSTv5ImRog+h9yISPbVH7H8fASCIzYn9wlEv4zvFL7uKDMCFQm3g=="; }; }; "argparse-1.0.10" = { @@ -616,13 +841,13 @@ let sha512 = "HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw=="; }; }; - "asn1-0.2.4" = { + "asn1-0.2.6" = { name = "asn1"; packageName = "asn1"; - version = "0.2.4"; + version = "0.2.6"; src = fetchurl { - url = "https://registry.npmjs.org/asn1/-/asn1-0.2.4.tgz"; - sha512 = "jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg=="; + url = "https://registry.npmjs.org/asn1/-/asn1-0.2.6.tgz"; + sha512 = "ix/FxPn0MDjeyJ7i/yoHGFt/EX6LyNbxSEhPPXODPL+KB0VPk86UYfL0lMdy+KCnv+fmvIzySwaK5COwqVbWTQ=="; }; }; "asn1.js-4.10.1" = { @@ -706,13 +931,22 @@ let sha1 = "ec6a61ae56480c0c3cb241c95618e20892f9672a"; }; }; - "async-3.2.0" = { + "async-2.6.3" = { name = "async"; packageName = "async"; - version = "3.2.0"; + version = "2.6.3"; src = fetchurl { - url = "https://registry.npmjs.org/async/-/async-3.2.0.tgz"; - sha512 = "TR2mEZFVOj2pLStYxLht7TyfuRzaydfpxr3k9RpHIzMgw7A64dzsdqCxH1WJyQdoe8T10nDXd9wnEigmiuHIZw=="; + url = "https://registry.npmjs.org/async/-/async-2.6.3.tgz"; + sha512 = "zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg=="; + }; + }; + "async-3.2.3" = { + name = "async"; + packageName = "async"; + version = "3.2.3"; + src = fetchurl { + url = "https://registry.npmjs.org/async/-/async-3.2.3.tgz"; + sha512 = "spZRyzKL5l5BZQrr/6m/SqFdBN0q3OCI0f9rjfBzCMBIP4p75P620rR3gTmaksNOhmzgdxcaxdNfMy6anrbM0g=="; }; }; "asynckit-0.4.0" = { @@ -724,6 +958,33 @@ let sha1 = "c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"; }; }; + "auto-changelog-1.16.4" = { + name = "auto-changelog"; + packageName = "auto-changelog"; + version = "1.16.4"; + src = fetchurl { + url = "https://registry.npmjs.org/auto-changelog/-/auto-changelog-1.16.4.tgz"; + sha512 = "h7diyELoq692AA4oqO50ULoYKIomUdzuQ+NW+eFPwIX0xzVbXEu9cIcgzZ3TYNVbpkGtcNKh51aRfAQNef7HVA=="; + }; + }; + "avsc-5.7.3" = { + name = "avsc"; + packageName = "avsc"; + version = "5.7.3"; + src = fetchurl { + url = "https://registry.npmjs.org/avsc/-/avsc-5.7.3.tgz"; + sha512 = "uUbetCWczQHbsKyX1C99XpQHBM8SWfovvaZhPIj23/1uV7SQf0WeRZbiLpw0JZm+LHTChfNgrLfDJOVoU2kU+A=="; + }; + }; + "aws-sdk-2.1073.0" = { + name = "aws-sdk"; + packageName = "aws-sdk"; + version = "2.1073.0"; + src = fetchurl { + url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1073.0.tgz"; + sha512 = "TtyHDL4ZEs8Zh/DqWY/hv745DTWrIwOyBAvfjBJ45RE9h0TjpWqCIowEtb6gRPAKyPPyfGH4s+rEYu07vNK1Hg=="; + }; + }; "aws-sign2-0.7.0" = { name = "aws-sign2"; packageName = "aws-sign2"; @@ -742,31 +1003,31 @@ let sha512 = "xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA=="; }; }; - "axios-0.19.2" = { + "axios-0.21.4" = { name = "axios"; packageName = "axios"; - version = "0.19.2"; + version = "0.21.4"; src = fetchurl { - url = "https://registry.npmjs.org/axios/-/axios-0.19.2.tgz"; - sha512 = "fjgm5MvRHLhx+osE2xoekY70AhARk3a6hkN+3Io1jc00jtquGvxYlKlsFUhmUET0V5te6CcZI7lcv2Ym61mjHA=="; + url = "https://registry.npmjs.org/axios/-/axios-0.21.4.tgz"; + sha512 = "ut5vewkiu8jjGBdqpM44XxjuCjq9LAKeHVmoVfHVzy8eHgxxq8SbAVQNovDA8mVi05kP0Ea/n/UzcSHcTJQfNg=="; }; }; - "axios-0.21.1" = { - name = "axios"; - packageName = "axios"; - version = "0.21.1"; + "axios-retry-3.2.4" = { + name = "axios-retry"; + packageName = "axios-retry"; + version = "3.2.4"; src = fetchurl { - url = "https://registry.npmjs.org/axios/-/axios-0.21.1.tgz"; - sha512 = "dKQiRHxGD9PPRIUNIWvZhPTPpl1rf/OxTYKsqKUDjBwYylTvV7SjSHJb9ratfyzM6wCdLCOYLzs73qpg5c4iGA=="; + url = "https://registry.npmjs.org/axios-retry/-/axios-retry-3.2.4.tgz"; + sha512 = "Co3UXiv4npi6lM963mfnuH90/YFLKWWDmoBYfxkHT5xtkSSWNqK9zdG3fw5/CP/dsoKB5aMMJCsgab+tp1OxLQ=="; }; }; - "balanced-match-1.0.0" = { + "balanced-match-1.0.2" = { name = "balanced-match"; packageName = "balanced-match"; - version = "1.0.0"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz"; - sha1 = "89b4d199ab2bee49de164ea02b89ce462d71b767"; + url = "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz"; + sha512 = "3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw=="; }; }; "base64-js-1.5.1" = { @@ -805,13 +1066,13 @@ let sha1 = "9ab5627b93e60621ff7cdac5da9733027df1d0cb"; }; }; - "big-integer-1.6.48" = { + "big-integer-1.6.51" = { name = "big-integer"; packageName = "big-integer"; - version = "1.6.48"; + version = "1.6.51"; src = fetchurl { - url = "https://registry.npmjs.org/big-integer/-/big-integer-1.6.48.tgz"; - sha512 = "j51egjPa7/i+RdiRuJbPdJ2FIUYYPhvYLjzoYbcMMm62ooO6F94fETG4MTs46zPAF9Brs04OajboA/qTGuz78w=="; + url = "https://registry.npmjs.org/big-integer/-/big-integer-1.6.51.tgz"; + sha512 = "GPEid2Y9QU1Exl1rpO9B2IPJGHPSupF5GnVIP0blYvNOMer2bTvSWs1jGOUg04hTmu67nmLsQ9TBo1puaotBHg=="; }; }; "bignumber.js-2.4.0" = { @@ -823,6 +1084,33 @@ let sha1 = "838a992da9f9d737e0f4b2db0be62bb09dd0c5e8"; }; }; + "binary-extensions-2.2.0" = { + name = "binary-extensions"; + packageName = "binary-extensions"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz"; + sha512 = "jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA=="; + }; + }; + "binascii-0.0.2" = { + name = "binascii"; + packageName = "binascii"; + version = "0.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/binascii/-/binascii-0.0.2.tgz"; + sha1 = "a7f8a8801dbccf8b1756b743daa0fee9e2d9e0ee"; + }; + }; + "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"; + }; + }; "bitsyntax-0.1.0" = { name = "bitsyntax"; packageName = "bitsyntax"; @@ -850,13 +1138,13 @@ let sha512 = "jrCW5ZhfQ/Vt07WX1Ngs+yn9BDqPL/gw28S7s9H6QK/gupnizNzJAss5akW20ISgOrbLTlXOOCTJeNUQqruAWQ=="; }; }; - "bl-4.0.3" = { + "bl-4.1.0" = { name = "bl"; packageName = "bl"; - version = "4.0.3"; + version = "4.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/bl/-/bl-4.0.3.tgz"; - sha512 = "fs4G6/Hu4/EE+F75J8DuN/0IpQqNjAdC7aEQv7Qt8MHGUH7Ckv2MwTEEeN9QehD0pfIDkMI1bkHYkKy7xHyKIg=="; + url = "https://registry.npmjs.org/bl/-/bl-4.1.0.tgz"; + sha512 = "1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w=="; }; }; "bluebird-2.11.0" = { @@ -877,31 +1165,31 @@ let sha512 = "XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg=="; }; }; - "bn.js-4.11.9" = { + "bn.js-4.12.0" = { name = "bn.js"; packageName = "bn.js"; - version = "4.11.9"; + version = "4.12.0"; src = fetchurl { - url = "https://registry.npmjs.org/bn.js/-/bn.js-4.11.9.tgz"; - sha512 = "E6QoYqCKZfgatHTdHzs1RRKP7ip4vvm+EyRUeE2RF0NblwVvb0p6jSVeNTOFxPn26QXN2o6SMfNxKp6kU8zQaw=="; + url = "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz"; + sha512 = "c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA=="; }; }; - "body-parser-1.19.0" = { + "body-parser-1.19.1" = { name = "body-parser"; packageName = "body-parser"; - version = "1.19.0"; + version = "1.19.1"; src = fetchurl { - url = "https://registry.npmjs.org/body-parser/-/body-parser-1.19.0.tgz"; - sha512 = "dhEPs72UPbDnAQJ9ZKMNTP6ptJaionhP5cBb541nXPlW60Jepo9RV/a4fX4XWW9CuFNK22krhrj1+rgzifNCsw=="; + url = "https://registry.npmjs.org/body-parser/-/body-parser-1.19.1.tgz"; + sha512 = "8ljfQi5eBk8EJfECMrgqNGWPEY5jWP+1IzkzkGdFFEwFQZZyaZ21UqdaHktgiMlH0xLHqIFtE/u2OYE5dOtViA=="; }; }; - "body-parser-xml-1.1.0" = { + "body-parser-xml-2.0.3" = { name = "body-parser-xml"; packageName = "body-parser-xml"; - version = "1.1.0"; + version = "2.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/body-parser-xml/-/body-parser-xml-1.1.0.tgz"; - sha1 = "7b56bef1cd7d266c13602b4c1daf4f511d26447c"; + url = "https://registry.npmjs.org/body-parser-xml/-/body-parser-xml-2.0.3.tgz"; + sha512 = "tWvcAbh8QPd/lj+yfGZBMY/roof/e2iSXrJbYXYjxVhHQ88D2CF3AxDTdwhb9wcNdHVNbCttaWipchJPEs5r0g=="; }; }; "boolbase-1.0.0" = { @@ -940,13 +1228,22 @@ let sha1 = "9ece5b5aca89a29932242e18bf933def9876cc17"; }; }; - "bson-1.1.5" = { + "bson-1.1.6" = { name = "bson"; packageName = "bson"; - version = "1.1.5"; + version = "1.1.6"; + src = fetchurl { + url = "https://registry.npmjs.org/bson/-/bson-1.1.6.tgz"; + sha512 = "EvVNVeGo4tHxwi8L6bPj3y3itEvStdwvvlojVxxbyYfoaxJ6keLgrTuKdyfEAszFK+H3olzBuafE0yoh0D1gdg=="; + }; + }; + "buffer-4.9.2" = { + name = "buffer"; + packageName = "buffer"; + version = "4.9.2"; src = fetchurl { - url = "https://registry.npmjs.org/bson/-/bson-1.1.5.tgz"; - sha512 = "kDuEzldR21lHciPQAIulLs1LZlCXdLziXI6Mb/TDkwXhb//UORJNPXgcRs2CuO4H0DcMkpfT3/ySsP3unoZjBg=="; + url = "https://registry.npmjs.org/buffer/-/buffer-4.9.2.tgz"; + sha512 = "xq+q3SRMOxGivLhBNaUdC64hDTQwejJ+H0T/NB1XMtTVEwNTrfFF3gAxiyW0Bu/xWEGhjVKgUcMhCrUy2+uCWg=="; }; }; "buffer-5.7.1" = { @@ -967,13 +1264,13 @@ let sha1 = "f8e71132f7ffe6e01a5c9697a4c6f3e48d5cc819"; }; }; - "buffer-from-1.1.1" = { + "buffer-from-1.1.2" = { name = "buffer-from"; packageName = "buffer-from"; - version = "1.1.1"; + version = "1.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.1.tgz"; - sha512 = "MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A=="; + url = "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz"; + sha512 = "E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ=="; }; }; "buffer-more-ints-1.0.0" = { @@ -994,6 +1291,15 @@ let sha512 = "a7ZpuTZU1TRtnwyCNW3I5dc0wWNC3VR9S++Ewyk2HHZdrO3CQJqSpd+95Us590V6AL7JqUAH2IwZ/398PmNFgw=="; }; }; + "bull-3.29.3" = { + name = "bull"; + packageName = "bull"; + version = "3.29.3"; + src = fetchurl { + url = "https://registry.npmjs.org/bull/-/bull-3.29.3.tgz"; + sha512 = "MOqV1dKLy1YQgP9m3lFolyMxaU+1+o4afzYYf0H4wNM+x/S0I1QPQfkgGlLiH00EyFrvSmeubeCYFP47rTfpjg=="; + }; + }; "byte-length-1.0.2" = { name = "byte-length"; packageName = "byte-length"; @@ -1012,22 +1318,22 @@ let sha1 = "d32815404d689699f85a4ea4fa8755dd13a96048"; }; }; - "bytes-3.1.0" = { + "bytes-3.1.1" = { name = "bytes"; packageName = "bytes"; - version = "3.1.0"; + version = "3.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/bytes/-/bytes-3.1.0.tgz"; - sha512 = "zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg=="; + url = "https://registry.npmjs.org/bytes/-/bytes-3.1.1.tgz"; + sha512 = "dWe4nWO/ruEOY7HkUJ5gFt1DCFV9zPRoJr8pV0/ASQermOZjtq8jMjOprC0Kd10GLN+l7xaUPvxzJFWtxGu8Fg=="; }; }; - "cacheable-lookup-5.0.4" = { - name = "cacheable-lookup"; - packageName = "cacheable-lookup"; - version = "5.0.4"; + "call-bind-1.0.2" = { + name = "call-bind"; + packageName = "call-bind"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/cacheable-lookup/-/cacheable-lookup-5.0.4.tgz"; - sha512 = "2/kNscPhpcxrOigMZzbiWF7dz8ilhb/nIHU3EyZiXWXpeq/au8qJ8VhdftMkty3n7Gj6HIGalQG8oiBNB3AJgA=="; + url = "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz"; + sha512 = "7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA=="; }; }; "callback-stream-1.1.0" = { @@ -1039,6 +1345,15 @@ let sha1 = "4701a51266f06e06eaa71fc17233822d875f4908"; }; }; + "callsites-3.1.0" = { + name = "callsites"; + packageName = "callsites"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz"; + sha512 = "P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ=="; + }; + }; "camel-case-4.1.2" = { name = "camel-case"; packageName = "camel-case"; @@ -1048,15 +1363,6 @@ let sha512 = "gxGWBrTT1JuMx6R+o5PTXMmUnhnVzLQ9SNutD4YqKtI6ap897t3tKECYla6gCWEkplXnlNybEkZg9GEGxKFCgw=="; }; }; - "camelcase-5.3.1" = { - name = "camelcase"; - packageName = "camelcase"; - version = "5.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz"; - sha512 = "L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg=="; - }; - }; "capital-case-1.0.4" = { name = "capital-case"; packageName = "capital-case"; @@ -1066,15 +1372,6 @@ let sha512 = "ds37W8CytHgwnhGGTi88pcPyR15qoNkOpYwmMMfnWqqWgESapLqvDx6huFjQ5vqWSn2Z06173XNA7LtMOeUh1A=="; }; }; - "cardinal-2.1.1" = { - name = "cardinal"; - packageName = "cardinal"; - version = "2.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/cardinal/-/cardinal-2.1.1.tgz"; - sha1 = "7cc1055d822d212954d07b085dea251cc7bc5505"; - }; - }; "caseless-0.12.0" = { name = "caseless"; packageName = "caseless"; @@ -1084,13 +1381,13 @@ let sha1 = "1b681c21ff84033c826543090689420d187151dc"; }; }; - "cfb-1.2.0" = { + "cfb-1.2.1" = { name = "cfb"; packageName = "cfb"; - version = "1.2.0"; + version = "1.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/cfb/-/cfb-1.2.0.tgz"; - sha512 = "sXMvHsKCICVR3Naq+J556K+ExBo9n50iKl6LGarlnvuA2035uMlGA/qVrc0wQtow5P1vJEw9UyrKLCbtIKz+TQ=="; + url = "https://registry.npmjs.org/cfb/-/cfb-1.2.1.tgz"; + sha512 = "wT2ScPAFGSVy7CY+aauMezZBnNrfnaLSrxHUHdea+Td/86vrk6ZquggV+ssBR88zNs0OnBkL2+lf9q0K+zVGzQ=="; }; }; "chalk-1.1.3" = { @@ -1102,22 +1399,13 @@ let sha1 = "a8115c55e4a702fe4d150abd3872822a7e09fc98"; }; }; - "chalk-2.4.2" = { + "chalk-4.1.2" = { name = "chalk"; packageName = "chalk"; - version = "2.4.2"; - src = fetchurl { - url = "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz"; - sha512 = "Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ=="; - }; - }; - "chalk-4.1.0" = { - name = "chalk"; - packageName = "chalk"; - version = "4.1.0"; + version = "4.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz"; - sha512 = "qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A=="; + url = "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz"; + sha512 = "oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA=="; }; }; "change-case-4.1.2" = { @@ -1138,22 +1426,40 @@ let sha512 = "mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA=="; }; }; - "cheerio-1.0.0-rc.5" = { + "charenc-0.0.2" = { + name = "charenc"; + packageName = "charenc"; + version = "0.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/charenc/-/charenc-0.0.2.tgz"; + sha1 = "c0a1d2f3a7092e03774bfa83f14c0fc5790a8667"; + }; + }; + "cheerio-1.0.0-rc.6" = { name = "cheerio"; packageName = "cheerio"; - version = "1.0.0-rc.5"; + version = "1.0.0-rc.6"; src = fetchurl { - url = "https://registry.npmjs.org/cheerio/-/cheerio-1.0.0-rc.5.tgz"; - sha512 = "yoqps/VCaZgN4pfXtenwHROTp8NG6/Hlt4Jpz2FEP0ZJQ+ZUkVDd0hAPDNKhj3nakpfPt/CNs57yEtxD1bXQiw=="; + url = "https://registry.npmjs.org/cheerio/-/cheerio-1.0.0-rc.6.tgz"; + sha512 = "hjx1XE1M/D5pAtMgvWwE21QClmAEeGHOIDfycgmndisdNgI6PE1cGRQkMGBcsbUbmEQyWu5PJLUcAOjtQS8DWw=="; }; }; - "cheerio-select-tmp-0.1.1" = { - name = "cheerio-select-tmp"; - packageName = "cheerio-select-tmp"; - version = "0.1.1"; + "cheerio-select-1.5.0" = { + name = "cheerio-select"; + packageName = "cheerio-select"; + version = "1.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/cheerio-select-tmp/-/cheerio-select-tmp-0.1.1.tgz"; - sha512 = "YYs5JvbpU19VYJyj+F7oYrIE2BOll1/hRU7rEy/5+v9BzkSo3bK81iAeeQEMI92vRIxz677m72UmJUiVwwgjfQ=="; + url = "https://registry.npmjs.org/cheerio-select/-/cheerio-select-1.5.0.tgz"; + sha512 = "qocaHPv5ypefh6YNxvnbABM07KMxExbtbfuJoIie3iZXX1ERwYmJcIiRrr9H05ucQP1k28dav8rpdDgjQd8drg=="; + }; + }; + "chokidar-3.5.2" = { + name = "chokidar"; + packageName = "chokidar"; + version = "3.5.2"; + src = fetchurl { + url = "https://registry.npmjs.org/chokidar/-/chokidar-3.5.2.tgz"; + sha512 = "ekGhOnNVPgT77r4K/U3GDhu+FQ2S8TnK/s2KbIGXi0SZWuwkZ2QNyfWdZW+TVfn84DpEP7rLeCt2UI6bJ8GwbQ=="; }; }; "chownr-1.1.4" = { @@ -1165,6 +1471,15 @@ let sha512 = "jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg=="; }; }; + "class-validator-0.13.2" = { + name = "class-validator"; + packageName = "class-validator"; + version = "0.13.2"; + src = fetchurl { + url = "https://registry.npmjs.org/class-validator/-/class-validator-0.13.2.tgz"; + sha512 = "yBUcQy07FPlGzUjoLuUfIOXzgynnQPPruyK1Ge2B74k9ROwnle1E+NxLWnUv5OLU8hA/qL5leAE9XnXq3byaBw=="; + }; + }; "clean-stack-3.0.1" = { name = "clean-stack"; packageName = "clean-stack"; @@ -1174,6 +1489,15 @@ let sha512 = "lR9wNiMRcVQjSB3a7xXGLuz4cr4wJuuXlaAEbRutGowQTmlp7R72/DOgN21e8jdwblMWl9UOJMJXarX94pzKdg=="; }; }; + "cli-color-0.1.7" = { + name = "cli-color"; + packageName = "cli-color"; + version = "0.1.7"; + src = fetchurl { + url = "https://registry.npmjs.org/cli-color/-/cli-color-0.1.7.tgz"; + sha1 = "adc3200fa471cc211b0da7f566b71e98b9d67347"; + }; + }; "cli-cursor-3.1.0" = { name = "cli-cursor"; packageName = "cli-cursor"; @@ -1183,13 +1507,13 @@ let sha512 = "I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw=="; }; }; - "cli-highlight-2.1.10" = { + "cli-highlight-2.1.11" = { name = "cli-highlight"; packageName = "cli-highlight"; - version = "2.1.10"; + version = "2.1.11"; src = fetchurl { - url = "https://registry.npmjs.org/cli-highlight/-/cli-highlight-2.1.10.tgz"; - sha512 = "CcPFD3JwdQ2oSzy+AMG6j3LRTkNjM82kzcSKzoVw6cLanDCJNlsLjeqVTOTfOfucnWv5F0rmBemVf1m9JiIasw=="; + url = "https://registry.npmjs.org/cli-highlight/-/cli-highlight-2.1.11.tgz"; + sha512 = "9KDcoEVwyUXrjcJNvHD0NFc/hiwe/WPVYIleQh2O1N2Zro5gWJZ/K+3DGn8w8P/F6FxOgzyC5bxDyHIgCSPhGg=="; }; }; "cli-width-3.0.0" = { @@ -1219,6 +1543,15 @@ let sha512 = "OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ=="; }; }; + "cluster-key-slot-1.1.0" = { + name = "cluster-key-slot"; + packageName = "cluster-key-slot"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/cluster-key-slot/-/cluster-key-slot-1.1.0.tgz"; + sha512 = "2Nii8p3RwAPiFwsnZvukotvow2rIHM+yQ6ZcBXGHdniadkYGZYiGmkHJIbZPIV9nfv7m/U1IPMVVcAhoWFeklw=="; + }; + }; "code-point-at-1.1.0" = { name = "code-point-at"; packageName = "code-point-at"; @@ -1228,22 +1561,22 @@ let sha1 = "0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77"; }; }; - "codepage-1.14.0" = { + "codepage-1.15.0" = { name = "codepage"; packageName = "codepage"; - version = "1.14.0"; + version = "1.15.0"; src = fetchurl { - url = "https://registry.npmjs.org/codepage/-/codepage-1.14.0.tgz"; - sha1 = "8cbe25481323559d7d307571b0fff91e7a1d2f99"; + url = "https://registry.npmjs.org/codepage/-/codepage-1.15.0.tgz"; + sha512 = "3g6NUTPd/YtuuGrhMnOMRjFc+LJw/bnMp3+0r/Wcz3IXUuCosKRJvMphm5+Q+bvTVGcJJuRvVLuYba+WojaFaA=="; }; }; - "color-3.0.0" = { + "color-3.2.1" = { name = "color"; packageName = "color"; - version = "3.0.0"; + version = "3.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/color/-/color-3.0.0.tgz"; - sha512 = "jCpd5+s0s0t7p3pHQKpnJ0TpQKKdleP71LWcA0aqiljpiuAkOSUFN/dyH8ZwF0hRmFlrIuRhufds1QyEP9EB+w=="; + url = "https://registry.npmjs.org/color/-/color-3.2.1.tgz"; + sha512 = "aBl7dZI9ENN6fUGC7mWpMTPNHmWUSNan9tuWN6ahh5ZLNk9baLJOnSMlrQkHcrfFgz2/RigjUVAjdx36VcemKA=="; }; }; "color-convert-1.9.3" = { @@ -1282,13 +1615,13 @@ let sha512 = "dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="; }; }; - "color-string-1.5.4" = { + "color-string-1.9.0" = { name = "color-string"; packageName = "color-string"; - version = "1.5.4"; + version = "1.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/color-string/-/color-string-1.5.4.tgz"; - sha512 = "57yF5yt8Xa3czSEW1jfQDE79Idk0+AkN/4KWad6tbdxUmAs3MvjxlWSWD4deYytcRfoZ9nhKyFl1kj5tBvidbw=="; + url = "https://registry.npmjs.org/color-string/-/color-string-1.9.0.tgz"; + sha512 = "9Mrz2AQLefkH1UvASKj6v6hj/7eWgjnT/cVsR8CumieLoT+g900exWeNogqtweI8dxloXN9BDQTYro1oWu/5CQ=="; }; }; "colornames-1.1.1" = { @@ -1300,22 +1633,13 @@ let sha1 = "f8889030685c7c4ff9e2a559f5077eb76a816f96"; }; }; - "colors-1.4.0" = { - name = "colors"; - packageName = "colors"; - version = "1.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/colors/-/colors-1.4.0.tgz"; - sha512 = "a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA=="; - }; - }; - "colorspace-1.1.2" = { + "colorspace-1.1.4" = { name = "colorspace"; packageName = "colorspace"; - version = "1.1.2"; + version = "1.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/colorspace/-/colorspace-1.1.2.tgz"; - sha512 = "vt+OoIP2d76xLhjwbBaucYlNSpPsrJWPlBTtwCpQKIu6/CSMutyzX93O/Do0qzpH3YoHEes8YEFXyZ797rEhzQ=="; + url = "https://registry.npmjs.org/colorspace/-/colorspace-1.1.4.tgz"; + sha512 = "BgvKJiuVu1igBUF2kEjRCZXol6wiiGbY5ipL/oVPwm0BL9sIpMIzM8IK7vwuxIIzOXMV3Ey5w+vxhm0rR/TN8w=="; }; }; "combined-stream-1.0.8" = { @@ -1327,22 +1651,22 @@ let sha512 = "FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg=="; }; }; - "commander-2.14.1" = { + "commander-2.20.3" = { name = "commander"; packageName = "commander"; - version = "2.14.1"; + version = "2.20.3"; src = fetchurl { - url = "https://registry.npmjs.org/commander/-/commander-2.14.1.tgz"; - sha512 = "+YR16o3rK53SmWHU3rEM3tPAh2rwb1yPcQX5irVn7mb0gXbwuCCrnkbV5+PBfETdfg1vui07nM6PCG1zndcjQw=="; + url = "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz"; + sha512 = "GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ=="; }; }; - "commander-2.17.1" = { + "commander-5.1.0" = { name = "commander"; packageName = "commander"; - version = "2.17.1"; + version = "5.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/commander/-/commander-2.17.1.tgz"; - sha512 = "wPMUt6FnH2yzG95SA6mzjQOEKUU3aLaDEmzs1ti+1E9h+CsrZghRlqEM/EJ4KscsQVG8uNN4uVreUeT8+drlgg=="; + url = "https://registry.npmjs.org/commander/-/commander-5.1.0.tgz"; + sha512 = "P0CysNDQ7rtVw4QIQtm+MRxV66vKFSvlsQvGYXZWR3qFU0jlMKHZZZgw8e+8DSah4UDKMqnknRDQz+xuQXQ/Zg=="; }; }; "commist-1.1.0" = { @@ -1354,6 +1678,15 @@ let sha512 = "rraC8NXWOEjhADbZe9QBNzLAN5Q3fsTPQtBV+fEVj6xKIgDgNiEVE6ZNfHpZOqfQ21YUzfVNUXLOEZquYvQPPg=="; }; }; + "component-type-1.2.1" = { + name = "component-type"; + packageName = "component-type"; + version = "1.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/component-type/-/component-type-1.2.1.tgz"; + sha1 = "8a47901700238e4fc32269771230226f24b415a9"; + }; + }; "compressible-2.0.18" = { name = "compressible"; packageName = "compressible"; @@ -1381,15 +1714,6 @@ let sha1 = "d8a96bd77fd68df7793a73036a3ba0d5405d477b"; }; }; - "concat-stream-1.6.2" = { - name = "concat-stream"; - packageName = "concat-stream"; - version = "1.6.2"; - src = fetchurl { - url = "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.2.tgz"; - sha512 = "27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw=="; - }; - }; "concat-stream-2.0.0" = { name = "concat-stream"; packageName = "concat-stream"; @@ -1426,13 +1750,13 @@ let sha512 = "I2hSBi7Vvs7BEuJDr5dDHfzb/Ruj3FyvFyh7KLilAjNQw3Be+xgqUBA2W6scVEcL0hL1dwPRtIqEPVUCKkSsyQ=="; }; }; - "content-disposition-0.5.3" = { + "content-disposition-0.5.4" = { name = "content-disposition"; packageName = "content-disposition"; - version = "0.5.3"; + version = "0.5.4"; src = fetchurl { - url = "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.3.tgz"; - sha512 = "ExO0774ikEObIAEV9kDo50o+79VCUdEB6n6lzKgGwupcVeRlhrj3qGAfwq8G6uBJjkqLrhT0qEYFcWng8z1z0g=="; + url = "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.4.tgz"; + sha512 = "FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ=="; }; }; "content-type-1.0.4" = { @@ -1444,22 +1768,22 @@ let sha512 = "hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA=="; }; }; - "convict-5.2.0" = { + "convict-6.2.1" = { name = "convict"; packageName = "convict"; - version = "5.2.0"; + version = "6.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/convict/-/convict-5.2.0.tgz"; - sha512 = "C3cdUwo47cCikZNzu5Vv8AL0MuXVVeg9t/Gyr9qyK5ZpCjOkMPmJ85KUF3CowNeSfj4UtztHxS+hoO9wGRh6kg=="; + url = "https://registry.npmjs.org/convict/-/convict-6.2.1.tgz"; + sha512 = "Mn4AJiYkR3TAZH1Xm/RU7gFS/0kM5TBSAQDry8y40Aez0ASY+3boUhv+3QE5XbOXiXM2JjdhkKve3IsBvWCibQ=="; }; }; - "cookie-0.4.0" = { + "cookie-0.4.1" = { name = "cookie"; packageName = "cookie"; - version = "0.4.0"; + version = "0.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/cookie/-/cookie-0.4.0.tgz"; - sha512 = "+Hp8fLp57wnUSt0tY0tHEXh4voZRDnoIrZPqlo3DPiI4y9lwg/jqx+1Om94/W6ZaPDOUbnjOt/99w66zk+l1Xg=="; + url = "https://registry.npmjs.org/cookie/-/cookie-0.4.1.tgz"; + sha512 = "ZwrFkGJxUR3EIoXtO+yVE69Eb7KlixbaeAWfBQB9vVsNn/o+Yw69gBWSSDK825hQNdN+wF8zELf3dFNl/kxkUA=="; }; }; "cookie-signature-1.0.6" = { @@ -1471,6 +1795,15 @@ let sha1 = "e303a882b342cc3ee8ca513a79999734dab3ae2c"; }; }; + "core-js-3.21.0" = { + name = "core-js"; + packageName = "core-js"; + version = "3.21.0"; + src = fetchurl { + url = "https://registry.npmjs.org/core-js/-/core-js-3.21.0.tgz"; + sha512 = "YUdI3fFu4TF/2WykQ2xzSiTQdldLB4KVuL9WeAy5XONZYt5Cun/fpQvctoKbCgvPhmzADeesTk/j2Rdx77AcKQ=="; + }; + }; "core-util-is-1.0.2" = { name = "core-util-is"; packageName = "core-util-is"; @@ -1480,22 +1813,31 @@ let sha1 = "b5fd54220aa2bc5ab57aab7140c940754503c1a7"; }; }; - "crc-32-1.2.0" = { + "crc-32-1.2.1" = { name = "crc-32"; packageName = "crc-32"; - version = "1.2.0"; + version = "1.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/crc-32/-/crc-32-1.2.0.tgz"; - sha512 = "1uBwHxF+Y/4yF5G48fwnKq6QsIXheor3ZLPT80yGBV1oEUwpPojlEhQbWKVw1VwcTQyMGHK1/XMmTjmlsmTTGA=="; + url = "https://registry.npmjs.org/crc-32/-/crc-32-1.2.1.tgz"; + sha512 = "Dn/xm/1vFFgs3nfrpEVScHoIslO9NZRITWGz/1E/St6u4xw99vfZzVkW0OSnzx2h9egej9xwMCEut6sqwokM/w=="; }; }; - "cron-1.8.2" = { + "cron-1.7.2" = { name = "cron"; packageName = "cron"; - version = "1.8.2"; + version = "1.7.2"; src = fetchurl { - url = "https://registry.npmjs.org/cron/-/cron-1.8.2.tgz"; - sha512 = "Gk2c4y6xKEO8FSAUTklqtfSr7oTq0CiPQeLBG5Fl0qoXpZyMcj1SG59YL+hqq04bu6/IuEA7lMkYDAplQNKkyg=="; + url = "https://registry.npmjs.org/cron/-/cron-1.7.2.tgz"; + sha512 = "+SaJ2OfeRvfQqwXQ2kgr0Y5pzBR/lijf5OpnnaruwWnmI799JfWr2jN2ItOV9s3A/+TFOt6mxvKzQq5F0Jp6VQ=="; + }; + }; + "cron-parser-2.18.0" = { + name = "cron-parser"; + packageName = "cron-parser"; + version = "2.18.0"; + src = fetchurl { + url = "https://registry.npmjs.org/cron-parser/-/cron-parser-2.18.0.tgz"; + sha512 = "s4odpheTyydAbTBQepsqd2rNWGa2iV3cyo8g7zbI2QQYGLVsfbhmwukayS1XHppe02Oy1fg7mg6xoaraVJeEcg=="; }; }; "cross-spawn-4.0.2" = { @@ -1507,13 +1849,22 @@ let sha1 = "7b9247621c23adfdd3856004a823cbe397424d41"; }; }; - "crypto-js-4.0.0" = { + "crypt-0.0.2" = { + name = "crypt"; + packageName = "crypt"; + version = "0.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/crypt/-/crypt-0.0.2.tgz"; + sha1 = "88d7ff7ec0dfb86f713dc87bbb42d044d3e6c41b"; + }; + }; + "crypto-js-4.1.1" = { name = "crypto-js"; packageName = "crypto-js"; - version = "4.0.0"; + version = "4.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/crypto-js/-/crypto-js-4.0.0.tgz"; - sha512 = "bzHZN8Pn+gS7DQA6n+iUmBfl0hO5DJq++QP3U6uTucDtk/0iGpXd/Gg7CGR0p8tJhofJyaKoWBuJI4eAO00BBg=="; + url = "https://registry.npmjs.org/crypto-js/-/crypto-js-4.1.1.tgz"; + sha512 = "o2JlM7ydqd3Qk9CA0L4NL6mTzU2sdx96a+oOfPu8Mkl/PK51vSyoi8/rQ8NknZtk44vq15lmhAj9CIAGwgeWKw=="; }; }; "csrf-3.1.0" = { @@ -1525,31 +1876,22 @@ let sha512 = "uTqEnCvWRk042asU6JtapDTcJeeailFy4ydOQS28bj1hcLnYRiqi8SsD2jS412AY1I/4qdOwWZun774iqywf9w=="; }; }; - "css-select-3.1.2" = { + "css-select-4.2.1" = { name = "css-select"; packageName = "css-select"; - version = "3.1.2"; + version = "4.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/css-select/-/css-select-3.1.2.tgz"; - sha512 = "qmss1EihSuBNWNNhHjxzxSfJoFBM/lERB/Q4EnsJQQC62R2evJDW481091oAdOr9uh46/0n4nrg0It5cAnj1RA=="; + url = "https://registry.npmjs.org/css-select/-/css-select-4.2.1.tgz"; + sha512 = "/aUslKhzkTNCQUB2qTX84lVmfia9NyjP3WpDGtj/WxhwBzWBYUV3DgUpurHTme8UTPcPlAD1DJ+b0nN/t50zDQ=="; }; }; - "css-what-4.0.0" = { + "css-what-5.1.0" = { name = "css-what"; packageName = "css-what"; - version = "4.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/css-what/-/css-what-4.0.0.tgz"; - sha512 = "teijzG7kwYfNVsUh2H/YN62xW3KK9YhXEgSlbxMlcyjPNvdKJqFx5lrwlJgoFP1ZHlB89iGDlo/JyshKeRhv5A=="; - }; - }; - "d-1.0.1" = { - name = "d"; - packageName = "d"; - version = "1.0.1"; + version = "5.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/d/-/d-1.0.1.tgz"; - sha512 = "m62ShEObQ39CfralilEQRjH6oAMtNCV1xJyEx5LpRYUVN+EviphDgUc/F3hnYbADmkiNs67Y+3ylmlG7Lnu+FA=="; + url = "https://registry.npmjs.org/css-what/-/css-what-5.1.0.tgz"; + sha512 = "arSMRWIIFY0hV8pIxZMEfmMI47Wj3R/aWpZDDxWYCPEiOMv6tfOrnpDtgxBYPEQD4V0Y/958+1TdC3iWTFcUPw=="; }; }; "dashdash-1.14.1" = { @@ -1579,15 +1921,6 @@ let sha512 = "bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA=="; }; }; - "debug-3.1.0" = { - name = "debug"; - packageName = "debug"; - version = "3.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz"; - sha512 = "OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g=="; - }; - }; "debug-3.2.7" = { name = "debug"; packageName = "debug"; @@ -1597,31 +1930,31 @@ let sha512 = "CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ=="; }; }; - "debug-4.3.1" = { + "debug-4.3.2" = { name = "debug"; packageName = "debug"; - version = "4.3.1"; + version = "4.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz"; - sha512 = "doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ=="; + url = "https://registry.npmjs.org/debug/-/debug-4.3.2.tgz"; + sha512 = "mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw=="; }; }; - "debug-4.3.2" = { + "debug-4.3.3" = { name = "debug"; packageName = "debug"; - version = "4.3.2"; + version = "4.3.3"; src = fetchurl { - url = "https://registry.npmjs.org/debug/-/debug-4.3.2.tgz"; - sha512 = "mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw=="; + url = "https://registry.npmjs.org/debug/-/debug-4.3.3.tgz"; + sha512 = "/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q=="; }; }; - "decamelize-1.2.0" = { - name = "decamelize"; - packageName = "decamelize"; - version = "1.2.0"; + "debuglog-1.0.1" = { + name = "debuglog"; + packageName = "debuglog"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz"; - sha1 = "f6534d15148269b20352e7bee26f501f9a191290"; + url = "https://registry.npmjs.org/debuglog/-/debuglog-1.0.1.tgz"; + sha1 = "aa24ffb9ac3df9a2351837cfb2d279360cd78492"; }; }; "deep-extend-0.6.0" = { @@ -1633,6 +1966,24 @@ let sha512 = "LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA=="; }; }; + "deepmerge-4.2.2" = { + name = "deepmerge"; + packageName = "deepmerge"; + version = "4.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/deepmerge/-/deepmerge-4.2.2.tgz"; + sha512 = "FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg=="; + }; + }; + "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"; @@ -1651,13 +2002,22 @@ let sha1 = "84c6e159b81904fdca59a0ef44cd870d31250f9a"; }; }; - "denque-1.5.0" = { + "denque-1.5.1" = { name = "denque"; packageName = "denque"; - version = "1.5.0"; + version = "1.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/denque/-/denque-1.5.1.tgz"; + sha512 = "XwE+iZ4D6ZUB7mfYRMb5wByE8L74HCn30FBN7sWnXksWc1LO1bPDl67pBR9o/kC4z/xSNAwkMYcGgqDV3BE3Hw=="; + }; + }; + "denque-2.0.1" = { + name = "denque"; + packageName = "denque"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/denque/-/denque-1.5.0.tgz"; - sha512 = "CYiCSgIF1p6EUByQPlGkKnP1M9g0ZV3qMIrqMqZqdwazygIA/YP2vrbcyl1h/WppKJTdl1F85cXIle+394iDAQ=="; + url = "https://registry.npmjs.org/denque/-/denque-2.0.1.tgz"; + sha512 = "tfiWc6BQLXNLpNiR5iGd0Ocu3P3VpxfzFiqubLgMfhfOw9WyvgJBd46CClNn9k3qfbjvT//0cf7AlYRX/OslMQ=="; }; }; "depd-1.1.2" = { @@ -1705,6 +2065,15 @@ let sha512 = "8wn1PmdunLJ9Tqbx+Fx/ZEuHfJf4NKSN2ZBj7SJC/OWRWha843+WsTjqMe1B5E3p28jqBlp+mJ2fPVxPyNgYKQ=="; }; }; + "difflib-0.2.4" = { + name = "difflib"; + packageName = "difflib"; + version = "0.2.4"; + src = fetchurl { + url = "https://registry.npmjs.org/difflib/-/difflib-0.2.4.tgz"; + sha1 = "b5e30361a6db023176d562892db85940a718f47e"; + }; + }; "dir-glob-3.0.1" = { name = "dir-glob"; packageName = "dir-glob"; @@ -1714,76 +2083,49 @@ let sha512 = "WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA=="; }; }; - "dom-serializer-0.2.2" = { - name = "dom-serializer"; - packageName = "dom-serializer"; - version = "0.2.2"; + "discontinuous-range-1.0.0" = { + name = "discontinuous-range"; + packageName = "discontinuous-range"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.2.2.tgz"; - sha512 = "2/xPb3ORsQ42nHYiSunXkDjPLBaEj/xTwUO4B7XCZQTRk7EBtTOPaygh10YAAh2OI1Qrp6NWfpAhzswj0ydt9g=="; + url = "https://registry.npmjs.org/discontinuous-range/-/discontinuous-range-1.0.0.tgz"; + sha1 = "e38331f0844bba49b9a9cb71c771585aab1bc65a"; }; }; - "dom-serializer-1.2.0" = { + "dom-serializer-1.3.2" = { name = "dom-serializer"; packageName = "dom-serializer"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/dom-serializer/-/dom-serializer-1.2.0.tgz"; - sha512 = "n6kZFH/KlCrqs/1GHMOd5i2fd/beQHuehKdWvNNffbGHTr/almdhuVvTVFb3V7fglz+nC50fFusu3lY33h12pA=="; - }; - }; - "domelementtype-1.3.1" = { - name = "domelementtype"; - packageName = "domelementtype"; - version = "1.3.1"; + version = "1.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.1.tgz"; - sha512 = "BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w=="; + url = "https://registry.npmjs.org/dom-serializer/-/dom-serializer-1.3.2.tgz"; + sha512 = "5c54Bk5Dw4qAxNOI1pFEizPSjVsx5+bpJKmL2kPn8JhBUq2q09tTCa3mjijun2NfK78NMouDYNMBkOrPZiS+ig=="; }; }; - "domelementtype-2.1.0" = { + "domelementtype-2.2.0" = { name = "domelementtype"; packageName = "domelementtype"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/domelementtype/-/domelementtype-2.1.0.tgz"; - sha512 = "LsTgx/L5VpD+Q8lmsXSHW2WpA+eBlZ9HPf3erD1IoPF00/3JKHZ3BknUVA2QGDNu69ZNmyFmCWBSO45XjYKC5w=="; - }; - }; - "domhandler-2.4.2" = { - name = "domhandler"; - packageName = "domhandler"; - version = "2.4.2"; + version = "2.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/domhandler/-/domhandler-2.4.2.tgz"; - sha512 = "JiK04h0Ht5u/80fdLMCEmV4zkNh2BcoMFBmZ/91WtYZ8qVXSKjiw7fXMgFPnHcSZgOo3XdinHvmnDUeMf5R4wA=="; + url = "https://registry.npmjs.org/domelementtype/-/domelementtype-2.2.0.tgz"; + sha512 = "DtBMo82pv1dFtUmHyr48beiuq792Sxohr+8Hm9zoxklYPfa6n0Z3Byjj2IV7bmr2IyqClnqEQhfgHJJ5QF0R5A=="; }; }; - "domhandler-4.0.0" = { + "domhandler-4.3.0" = { name = "domhandler"; packageName = "domhandler"; - version = "4.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/domhandler/-/domhandler-4.0.0.tgz"; - sha512 = "KPTbnGQ1JeEMQyO1iYXoagsI6so/C96HZiFyByU3T6iAzpXn8EGEvct6unm1ZGoed8ByO2oirxgwxBmqKF9haA=="; - }; - }; - "domutils-1.7.0" = { - name = "domutils"; - packageName = "domutils"; - version = "1.7.0"; + version = "4.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/domutils/-/domutils-1.7.0.tgz"; - sha512 = "Lgd2XcJ/NjEw+7tFvfKxOzCYKZsdct5lczQ2ZaQY8Djz7pfAD3Gbp8ySJWtreII/vDlMVmxwa6pHmdxIYgttDg=="; + url = "https://registry.npmjs.org/domhandler/-/domhandler-4.3.0.tgz"; + sha512 = "fC0aXNQXqKSFTr2wDNZDhsEYjCiYsDWl3D01kwt25hm1YIPyDGHvvi3rw+PLqHAl/m71MaiF7d5zvBr0p5UB2g=="; }; }; - "domutils-2.4.4" = { + "domutils-2.8.0" = { name = "domutils"; packageName = "domutils"; - version = "2.4.4"; + version = "2.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/domutils/-/domutils-2.4.4.tgz"; - sha512 = "jBC0vOsECI4OMdD0GC9mGn7NXPLb+Qt6KW1YDQzeQYRUFKmNG8lh7mO5HiELfr+lLQE7loDVI4QcAxV80HS+RA=="; + url = "https://registry.npmjs.org/domutils/-/domutils-2.8.0.tgz"; + sha512 = "w96Cjofp72M5IIhpjgobBimYEfoPjx1Vx0BSX9P30WBdZW2WIKU0T1Bd0kz2eNZ9ikjKgHbEyKx8BB6H1L3h3A=="; }; }; "dot-case-3.0.4" = { @@ -1795,22 +2137,22 @@ let sha512 = "Kv5nKlh6yRrdrGvxeJ2e5y2eRUpkUosIW4A2AS38zwSz27zu7ufDwQPi5Jhs3XAlGNetl3bmnGhQsMtkKJnj3w=="; }; }; - "dotenv-8.2.0" = { + "dotenv-8.6.0" = { name = "dotenv"; packageName = "dotenv"; - version = "8.2.0"; + version = "8.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/dotenv/-/dotenv-8.2.0.tgz"; - sha512 = "8sJ78ElpbDJBHNeBzUbUVLsqKdccaa/BXF1uPTw3GrvQTBgrQrtObr2mUrE38vzYd8cEv+m/JBfDLioYcfXoaw=="; + url = "https://registry.npmjs.org/dotenv/-/dotenv-8.6.0.tgz"; + sha512 = "IrPdXQsk2BbzvCBGBOTmmSH5SodmqZNt4ERAZDmW4CT+tL8VtvinqywuANaFu4bOMWki16nqf0e4oC0QIaDr/g=="; }; }; - "double-ended-queue-2.1.0-0" = { - name = "double-ended-queue"; - packageName = "double-ended-queue"; - version = "2.1.0-0"; + "dreamopt-0.6.0" = { + name = "dreamopt"; + packageName = "dreamopt"; + version = "0.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/double-ended-queue/-/double-ended-queue-2.1.0-0.tgz"; - sha1 = "103d3527fd31528f40188130c841efdd78264e5c"; + url = "https://registry.npmjs.org/dreamopt/-/dreamopt-0.6.0.tgz"; + sha1 = "d813ccdac8d39d8ad526775514a13dda664d6b4b"; }; }; "duplexify-3.7.1" = { @@ -1903,24 +2245,6 @@ let sha512 = "+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q=="; }; }; - "entities-1.1.2" = { - name = "entities"; - packageName = "entities"; - version = "1.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/entities/-/entities-1.1.2.tgz"; - sha512 = "f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w=="; - }; - }; - "entities-2.1.0" = { - name = "entities"; - packageName = "entities"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/entities/-/entities-2.1.0.tgz"; - sha512 = "hCx1oky9PFrJ611mf0ifBLBRW8lUUVRlFolb5gWRfIELabBlbp9xZvrqZLZAs+NxFnbfQoeGd8wDkygjg7U85w=="; - }; - }; "entities-2.2.0" = { name = "entities"; packageName = "entities"; @@ -1939,31 +2263,40 @@ let sha512 = "bHz59NlBbtS0NhftmR8+ExBEekE7br0e01jw+kk0NDro7TtZzBYZ5ScGPs3OmwnpyfHTHOtr1Y6uedCdrIldtg=="; }; }; - "es5-ext-0.10.53" = { - name = "es5-ext"; - packageName = "es5-ext"; - version = "0.10.53"; + "err-code-2.0.3" = { + name = "err-code"; + packageName = "err-code"; + version = "2.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.53.tgz"; - sha512 = "Xs2Stw6NiNHWypzRTY1MtaG/uJlwCk8kH81920ma8mvN8Xq1gsfhZvpkImLQArw8AHnv8MT2I45J3c0R8slE+Q=="; + url = "https://registry.npmjs.org/err-code/-/err-code-2.0.3.tgz"; + sha512 = "2bmlRpNKBxT/CRmPOlyISQpNj+qSeYvcym/uT0Jx2bMOlKLtSy1ZmLuVxSEKKyor/N5yhvp/ZiG1oE3DEYMSFA=="; }; }; - "es6-iterator-2.0.3" = { - name = "es6-iterator"; - packageName = "es6-iterator"; - version = "2.0.3"; + "es-abstract-1.19.1" = { + name = "es-abstract"; + packageName = "es-abstract"; + version = "1.19.1"; src = fetchurl { - url = "https://registry.npmjs.org/es6-iterator/-/es6-iterator-2.0.3.tgz"; - sha1 = "a7de889141a05a94b0854403b2d0a0fbfa98f3b7"; + url = "https://registry.npmjs.org/es-abstract/-/es-abstract-1.19.1.tgz"; + sha512 = "2vJ6tjA/UfqLm2MPs7jxVybLoB8i1t1Jd9R3kISld20sIxPcTbLuggQOUxeWeAvIUkduv/CfMjuh4WmiXr2v9w=="; }; }; - "es6-map-0.1.5" = { - name = "es6-map"; - packageName = "es6-map"; - version = "0.1.5"; + "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/es6-map/-/es6-map-0.1.5.tgz"; - sha1 = "9136e0503dcc06a301690f0bb14ff4e364e949f0"; + url = "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz"; + sha512 = "QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA=="; + }; + }; + "es5-ext-0.8.2" = { + name = "es5-ext"; + packageName = "es5-ext"; + version = "0.8.2"; + src = fetchurl { + url = "https://registry.npmjs.org/es5-ext/-/es5-ext-0.8.2.tgz"; + sha1 = "aba8d9e1943a895ac96837a62a39b3f55ecd94ab"; }; }; "es6-promise-4.2.8" = { @@ -1984,33 +2317,6 @@ let sha1 = "5109d62f3e56ea967c4b63505aef08291c8a5203"; }; }; - "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"; @@ -2074,22 +2380,40 @@ let sha1 = "41ae2eeb65efa62268aebfea83ac7d79299b0887"; }; }; - "event-emitter-0.3.5" = { - name = "event-emitter"; - packageName = "event-emitter"; - version = "0.3.5"; + "event-target-shim-5.0.1" = { + name = "event-target-shim"; + packageName = "event-target-shim"; + version = "5.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/event-target-shim/-/event-target-shim-5.0.1.tgz"; + sha512 = "i/2XbnSz/uxRCU6+NdVJgKWDTM427+MqYbkQzD321DuCQJUqOuJKIA0IM2+W2xtYHdKOmZ4dR6fExsd4SXL+WQ=="; + }; + }; + "events-1.1.1" = { + name = "events"; + packageName = "events"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/events/-/events-1.1.1.tgz"; + sha1 = "9ebdb7635ad099c70dcc4c2a1f5004288e8bd924"; + }; + }; + "events-3.3.0" = { + name = "events"; + packageName = "events"; + version = "3.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/event-emitter/-/event-emitter-0.3.5.tgz"; - sha1 = "df8c69eef1647923c7157b9ce83840610b02cc39"; + url = "https://registry.npmjs.org/events/-/events-3.3.0.tgz"; + sha512 = "mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q=="; }; }; - "eventsource-1.0.7" = { + "eventsource-1.1.0" = { name = "eventsource"; packageName = "eventsource"; - version = "1.0.7"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/eventsource/-/eventsource-1.0.7.tgz"; - sha512 = "4Ln17+vVT0k8aWq+t/bF5arcS3EpT9gYtW66EPacdj/mAFevznsnyoHLPy2BA8gbIQeIHoPsvwmfBftfcG//BQ=="; + url = "https://registry.npmjs.org/eventsource/-/eventsource-1.1.0.tgz"; + sha512 = "VSJjT5oCNrFvCS6igjzPAt5hBzQ2qPBFIbJ03zLI9SE0mxwZpMw6BfJrbFHm1a141AavMEB8JHmBhWAd66PfCg=="; }; }; "exit-on-epipe-1.0.1" = { @@ -2101,22 +2425,22 @@ let sha512 = "h2z5mrROTxce56S+pnvAV890uu7ls7f1kEvVGJbw1OlFH3/mlJ5bkXu0KRyW94v37zzHPiUd55iLn3DA7TjWpw=="; }; }; - "express-4.17.1" = { - name = "express"; - packageName = "express"; - version = "4.17.1"; + "expand-tilde-2.0.2" = { + name = "expand-tilde"; + packageName = "expand-tilde"; + version = "2.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/express/-/express-4.17.1.tgz"; - sha512 = "mHJ9O79RqluphRrcw2X/GTh3k9tVv8YcoyY4Kkh4WDMUYKRZUq0h1o0w2rrrxBqM7VoeUVqgb27xlEMXTnYt4g=="; + url = "https://registry.npmjs.org/expand-tilde/-/expand-tilde-2.0.2.tgz"; + sha1 = "97e801aa052df02454de46b02bf621642cdc8502"; }; }; - "ext-1.4.0" = { - name = "ext"; - packageName = "ext"; - version = "1.4.0"; + "express-4.17.2" = { + name = "express"; + packageName = "express"; + version = "4.17.2"; src = fetchurl { - url = "https://registry.npmjs.org/ext/-/ext-1.4.0.tgz"; - sha512 = "Key5NIsUxdqKg3vIsdw9dSuXpPCQ297y6wBjL30edxwPgt2E44WcWBZey/ZvUc6sERLTxKdyCu4gZFmUbk1Q7A=="; + url = "https://registry.npmjs.org/express/-/express-4.17.2.tgz"; + sha512 = "oxlxJxcQlYwqPWKVJJtvQiwHgosH/LrLSPA+H4UxpyvSS6jC5aH+5MoHFM+KABgTOt0APue4w66Ha8jCUo9QGg=="; }; }; "extend-3.0.2" = { @@ -2155,13 +2479,13 @@ let sha512 = "f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q=="; }; }; - "fast-glob-3.2.5" = { + "fast-glob-3.2.11" = { name = "fast-glob"; packageName = "fast-glob"; - version = "3.2.5"; + version = "3.2.11"; src = fetchurl { - url = "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.5.tgz"; - sha512 = "2DtFcgT68wiTTiwZ2hNdJfcHNke9XOfnwmBRWXhmeKM8rF0TGwmC/Qto3S7RoZKp5cilZbxzO5iTNTQsJ+EeDg=="; + url = "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.11.tgz"; + sha512 = "xrO3+1bxSo3ZVHAnqzyuewYT6aMFHRAd4Kcs92MAonjwQZLsK9d0SF1IyQ3k5PoirxTW0Oe/RqFgMQ6TcNE5Ew=="; }; }; "fast-json-stable-stringify-2.1.0" = { @@ -2173,58 +2497,40 @@ let sha512 = "lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw=="; }; }; - "fast-safe-stringify-2.0.7" = { - name = "fast-safe-stringify"; - packageName = "fast-safe-stringify"; - version = "2.0.7"; - src = fetchurl { - url = "https://registry.npmjs.org/fast-safe-stringify/-/fast-safe-stringify-2.0.7.tgz"; - sha512 = "Utm6CdzT+6xsDk2m8S6uL8VHxNwI6Jub+e9NYTcAms28T84pTa25GJQV9j0CY0N1rM8hK4x6grpF2BQf+2qwVA=="; - }; - }; - "fastq-1.10.1" = { + "fastq-1.13.0" = { name = "fastq"; packageName = "fastq"; - version = "1.10.1"; + version = "1.13.0"; src = fetchurl { - url = "https://registry.npmjs.org/fastq/-/fastq-1.10.1.tgz"; - sha512 = "AWuv6Ery3pM+dY7LYS8YIaCiQvUaos9OB1RyNgaOWnaX+Tik7Onvcsf8x8c+YtDeT0maYLniBip2hox5KtEXXA=="; + url = "https://registry.npmjs.org/fastq/-/fastq-1.13.0.tgz"; + sha512 = "YpkpUnK8od0o1hmeSc7UUs/eB/vIPWJYjKck2QKIzAf71Vm1AAQ3EbuZB3g2JIy+pg+ERD0vqI79KyZiB2e2Nw=="; }; }; - "fecha-4.2.0" = { + "fecha-4.2.1" = { name = "fecha"; packageName = "fecha"; - version = "4.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/fecha/-/fecha-4.2.0.tgz"; - sha512 = "aN3pcx/DSmtyoovUudctc8+6Hl4T+hI9GBBHLjA76jdZl7+b1sgh5g4k+u/GL3dTy1/pnYzKp69FpJ0OicE3Wg=="; - }; - }; - "fflate-0.3.11" = { - name = "fflate"; - packageName = "fflate"; - version = "0.3.11"; + version = "4.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/fflate/-/fflate-0.3.11.tgz"; - sha512 = "Rr5QlUeGN1mbOHlaqcSYMKVpPbgLy0AWT/W0EHxA6NGI12yO1jpoui2zBBvU2G824ltM6Ut8BFgfHSBGfkmS0A=="; + url = "https://registry.npmjs.org/fecha/-/fecha-4.2.1.tgz"; + sha512 = "MMMQ0ludy/nBs1/o0zVOiKTpG7qMbonKUzjJgQFEuvq6INZ1OraKPRAWkBq5vlKLOUMpmNYG1JoN3oDPUQ9m3Q=="; }; }; - "fflate-0.4.8" = { + "fflate-0.7.3" = { name = "fflate"; packageName = "fflate"; - version = "0.4.8"; + version = "0.7.3"; src = fetchurl { - url = "https://registry.npmjs.org/fflate/-/fflate-0.4.8.tgz"; - sha512 = "FJqqoDBR00Mdj9ppamLa/Y7vxm+PRmNWA67N846RvsoYVMKB4q3y/de5PA7gUmRMYK/8CMz2GDZQmCRN1wBcWA=="; + url = "https://registry.npmjs.org/fflate/-/fflate-0.7.3.tgz"; + sha512 = "0Zz1jOzJWERhyhsimS54VTqOteCNwRtIlh8isdL0AXLo0g7xNTfTL7oWrkmCnPhZGocKIkWHBistBrrpoNH3aw=="; }; }; - "figlet-1.5.0" = { + "figlet-1.5.2" = { name = "figlet"; packageName = "figlet"; - version = "1.5.0"; + version = "1.5.2"; src = fetchurl { - url = "https://registry.npmjs.org/figlet/-/figlet-1.5.0.tgz"; - sha512 = "ZQJM4aifMpz6H19AW1VqvZ7l4pOE9p7i/3LyxgO2kp+PO/VcDYNqIHEMtkccqIhTXMKci4kjueJr/iCQEaT/Ww=="; + url = "https://registry.npmjs.org/figlet/-/figlet-1.5.2.tgz"; + sha512 = "WOn21V8AhyE1QqVfPIVxe3tupJacq1xGkPTB4iagT6o+P2cAgEOOwIxMftr4+ZCTI6d551ij9j61DFr0nsP2uQ=="; }; }; "figures-3.2.0" = { @@ -2263,13 +2569,13 @@ let sha512 = "aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA=="; }; }; - "flatted-2.0.2" = { + "flatted-3.2.5" = { name = "flatted"; packageName = "flatted"; - version = "2.0.2"; + version = "3.2.5"; src = fetchurl { - url = "https://registry.npmjs.org/flatted/-/flatted-2.0.2.tgz"; - sha512 = "r5wGx7YeOwNWNlCA0wQ86zKyDLMQr+/RB8xy74M4hTphfmjlijTSSXGuH8rnvKZnfT9i+75zmd8jcKdMR4O6jA=="; + url = "https://registry.npmjs.org/flatted/-/flatted-3.2.5.tgz"; + sha512 = "WIWGi2L3DyTUvUrwRKgGi9TwxQMUEqPOPQBVi71R96jZXJdFskXEmf54BoZaS1kknGODoIGASGEzBUYdyMCBJg=="; }; }; "fn.name-1.1.0" = { @@ -2281,22 +2587,22 @@ let sha512 = "GRnmB5gPyJpAhTQdSZTSp9uaPSvl09KoYcMQtsB9rQoOmzs9dH6ffeccH+Z+cv6P68Hu5bC6JjRh4Ah/mHSNRw=="; }; }; - "follow-redirects-1.13.2" = { + "follow-redirects-1.14.8" = { name = "follow-redirects"; packageName = "follow-redirects"; - version = "1.13.2"; + version = "1.14.8"; src = fetchurl { - url = "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.13.2.tgz"; - sha512 = "6mPTgLxYm3r6Bkkg0vNM0HTjfGrOEtsfbhagQvbxDEsEkpNhw582upBaoRZylzen6krEmxXJgt9Ju6HiI4O7BA=="; + url = "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.8.tgz"; + sha512 = "1x0S9UVJHsQprFcEC/qnNzBLcIxsjAV905f/UkQxbclCsoTWlacCNOpQa/anodLl2uaEKFhfWOvM2Qg77+15zA=="; }; }; - "follow-redirects-1.5.10" = { - name = "follow-redirects"; - packageName = "follow-redirects"; - version = "1.5.10"; + "for-each-0.3.3" = { + name = "for-each"; + packageName = "for-each"; + version = "0.3.3"; src = fetchurl { - url = "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.5.10.tgz"; - sha512 = "0V5l4Cizzvqt5D44aTXbFZz+FtyXV1vrDN6qrelxtfYQKW0KO0W2T/hkE8xvGa/540LkZlkaUjO4ailYTFtHVQ=="; + url = "https://registry.npmjs.org/for-each/-/for-each-0.3.3.tgz"; + sha512 = "jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw=="; }; }; "forever-agent-0.6.1" = { @@ -2317,22 +2623,49 @@ let sha512 = "1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ=="; }; }; - "formidable-1.2.2" = { + "form-data-2.5.1" = { + name = "form-data"; + packageName = "form-data"; + version = "2.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/form-data/-/form-data-2.5.1.tgz"; + sha512 = "m21N3WOmEEURgk6B9GLOE4RuWOFf28Lhh9qGYeNlGq4VDXUlJy2th2slBNU8Gp8EzloYZOibZJ7t5ecIrFSjVA=="; + }; + }; + "form-data-3.0.1" = { + name = "form-data"; + packageName = "form-data"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/form-data/-/form-data-3.0.1.tgz"; + sha512 = "RHkBKtLWUVwd7SqRIvCZMEvAMoGUp0XU+seQiZejj0COz3RI3hWP4sCv3gZWWLjJTd7rGwcsF5eKZGii0r/hbg=="; + }; + }; + "form-data-4.0.0" = { + name = "form-data"; + packageName = "form-data"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz"; + sha512 = "ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww=="; + }; + }; + "formidable-1.2.6" = { name = "formidable"; packageName = "formidable"; - version = "1.2.2"; + version = "1.2.6"; src = fetchurl { - url = "https://registry.npmjs.org/formidable/-/formidable-1.2.2.tgz"; - sha512 = "V8gLm+41I/8kguQ4/o1D3RIHRmhYFG4pnNyonvua+40rqcEmT4+V71yaZ3B457xbbgCsCfjSPi65u/W6vK1U5Q=="; + url = "https://registry.npmjs.org/formidable/-/formidable-1.2.6.tgz"; + sha512 = "KcpbcpuLNOwrEjnbpMC0gS+X8ciDoZE1kkqzat4a8vrprf+s9pKNQ/QIwWfbfs4ltgmFl3MD177SNTkve3BwGQ=="; }; }; - "forwarded-0.1.2" = { + "forwarded-0.2.0" = { name = "forwarded"; packageName = "forwarded"; - version = "0.1.2"; + version = "0.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/forwarded/-/forwarded-0.1.2.tgz"; - sha1 = "98c23dab1175657b8c0573e8ceccd91b0ff18c84"; + url = "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz"; + sha512 = "buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow=="; }; }; "frac-1.1.2" = { @@ -2380,6 +2713,15 @@ let sha1 = "1504ad2523158caa40db4a2787cb01411994ea4f"; }; }; + "function-bind-1.1.1" = { + name = "function-bind"; + packageName = "function-bind"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz"; + sha512 = "yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A=="; + }; + }; "gauge-2.7.4" = { name = "gauge"; packageName = "gauge"; @@ -2398,6 +2740,24 @@ let sha512 = "eeB5GfMNeevm/GRYq20ShmsaGcmI81kIX2K9XQx5miC8KdHaC6Jm0qQ8ZNeGOi7wYB8OsdxKs+Y2oVuTFuVwKQ=="; }; }; + "generic-pool-3.8.2" = { + name = "generic-pool"; + packageName = "generic-pool"; + version = "3.8.2"; + src = fetchurl { + url = "https://registry.npmjs.org/generic-pool/-/generic-pool-3.8.2.tgz"; + sha512 = "nGToKy6p3PAbYQ7p1UlWl6vSPwfwU6TMSWK7TTu+WUY4ZjyZQGniGGt2oNVvyNSpyZYSB43zMXVLcBm08MTMkg=="; + }; + }; + "get-caller-file-1.0.3" = { + name = "get-caller-file"; + packageName = "get-caller-file"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.3.tgz"; + sha512 = "3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w=="; + }; + }; "get-caller-file-2.0.5" = { name = "get-caller-file"; packageName = "get-caller-file"; @@ -2407,6 +2767,33 @@ let sha512 = "DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg=="; }; }; + "get-intrinsic-1.1.1" = { + name = "get-intrinsic"; + packageName = "get-intrinsic"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.1.tgz"; + sha512 = "kWZrnVM42QCiEA2Ig1bG8zjoIMOgxWwYCEeNdwY6Tv/cOSeGpcoX4pXHfKUxNKVoArnrEr2e9srnAxxGIraS9Q=="; + }; + }; + "get-port-5.1.1" = { + name = "get-port"; + packageName = "get-port"; + version = "5.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/get-port/-/get-port-5.1.1.tgz"; + sha512 = "g/Q1aTSDOxFpchXC4i8ZWvxA1lnPqx/JHqcpIw0/LX9T8x/GBbi6YnlN5nhaKIFkT8oFsscUKgDJYxfwfS6QsQ=="; + }; + }; + "get-symbol-description-1.0.0" = { + name = "get-symbol-description"; + packageName = "get-symbol-description"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/get-symbol-description/-/get-symbol-description-1.0.0.tgz"; + sha512 = "2EmdH1YvIQiZpltCNgkuiUnyukzxM/R6NDJX31Ke3BG1Nq5b0S2PhX59UKi9vZpPDQVdqn+1IcaAwnzTT5vCjw=="; + }; + }; "get-system-fonts-2.0.2" = { name = "get-system-fonts"; packageName = "get-system-fonts"; @@ -2425,13 +2812,13 @@ let sha1 = "5eff8e3e684d569ae4cb2b1282604e8ba62149fa"; }; }; - "glob-7.1.6" = { + "glob-7.2.0" = { name = "glob"; packageName = "glob"; - version = "7.1.6"; + version = "7.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz"; - sha512 = "LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA=="; + url = "https://registry.npmjs.org/glob/-/glob-7.2.0.tgz"; + sha512 = "lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q=="; }; }; "glob-parent-3.1.0" = { @@ -2443,22 +2830,13 @@ let sha1 = "9e6af6299d8d3bd2bd40430832bd113df906c5ae"; }; }; - "glob-parent-5.1.1" = { + "glob-parent-5.1.2" = { name = "glob-parent"; packageName = "glob-parent"; - version = "5.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.1.tgz"; - sha512 = "FnI+VGOpnlGHWZxthPGR+QhR78fuiK0sNLkHQv+bL9fQi57lNNdquIbna/WrfROrolq8GK5Ek6BiMwqL/voRYQ=="; - }; - }; - "glob-promise-3.4.0" = { - name = "glob-promise"; - packageName = "glob-promise"; - version = "3.4.0"; + version = "5.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/glob-promise/-/glob-promise-3.4.0.tgz"; - sha512 = "q08RJ6O+eJn+dVanerAndJwIcumgbDdYiUT7zFQl3Wm1xD6fBKtah7H8ZJChj4wP+8C+QfeVy8xautR7rdmKEw=="; + url = "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz"; + sha512 = "AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow=="; }; }; "glob-stream-6.1.0" = { @@ -2470,13 +2848,13 @@ let sha1 = "7045c99413b3eb94888d83ab46d0b404cc7bdde4"; }; }; - "globby-11.0.2" = { + "globby-11.1.0" = { name = "globby"; packageName = "globby"; - version = "11.0.2"; + version = "11.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/globby/-/globby-11.0.2.tgz"; - sha512 = "2ZThXDvvV8fYFRVIxnrMQBipZQDr7MxKAmQK1vujaj9/7eF0efG7BPUKJ7jP7G5SLF37xKDXvO4S/KKLj/Z0og=="; + url = "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz"; + sha512 = "jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g=="; }; }; "gm-1.23.1" = { @@ -2497,13 +2875,22 @@ let sha512 = "UWXQ7BpSCW8erDespU2I4cri22xsKgwOCyhsJal0OJhi2tFpwJpsYNJt4vCiFPL1p2HzCGiS713LKpNR25n9Kg=="; }; }; - "graceful-fs-4.2.4" = { + "graceful-fs-4.2.9" = { name = "graceful-fs"; packageName = "graceful-fs"; - version = "4.2.4"; + version = "4.2.9"; src = fetchurl { - url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.4.tgz"; - sha512 = "WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw=="; + url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.9.tgz"; + sha512 = "NtNxqUcXgpW2iMrfqSfR73Glt39K+BLwWsPs94yR63v45T0Wbej7eRmL5cWfwEgqXnmjQp3zaJTshdRW/qC2ZQ=="; + }; + }; + "handlebars-4.7.7" = { + name = "handlebars"; + packageName = "handlebars"; + version = "4.7.7"; + src = fetchurl { + url = "https://registry.npmjs.org/handlebars/-/handlebars-4.7.7.tgz"; + sha512 = "aAcXm5OAfE/8IXkcZvCepKU3VzW1/39Fb5ZuqMtgI/hT8X2YgoMvBY5dLhq/cpOvw7Lk1nK/UF71aLG/ZnVYRA=="; }; }; "har-schema-2.0.0" = { @@ -2524,6 +2911,15 @@ let sha512 = "nmT2T0lljbxdQZfspsno9hgrG3Uir6Ks5afism62poxqBM6sDnMEuPmzTq8XN0OEwqKLLdh1jQI3qyE66Nzb3w=="; }; }; + "has-1.0.3" = { + name = "has"; + packageName = "has"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/has/-/has-1.0.3.tgz"; + sha512 = "f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw=="; + }; + }; "has-ansi-2.0.0" = { name = "has-ansi"; packageName = "has-ansi"; @@ -2533,13 +2929,13 @@ let sha1 = "34f5049ce1ecdf2b0649af3ef24e45ed35416d91"; }; }; - "has-flag-3.0.0" = { - name = "has-flag"; - packageName = "has-flag"; - version = "3.0.0"; + "has-bigints-1.0.1" = { + name = "has-bigints"; + packageName = "has-bigints"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz"; - sha1 = "b5d454dc2199ae225699f3467e5a07f3b955bafd"; + url = "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.1.tgz"; + sha512 = "LSBS2LjbNBTf6287JEbEzvJgftkF5qFkmCo9hDRpAzKhUOlJ+hx8dd4USs00SgsUNwc4617J9ki5YtEClM2ffA=="; }; }; "has-flag-4.0.0" = { @@ -2551,6 +2947,24 @@ let sha512 = "EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ=="; }; }; + "has-symbols-1.0.2" = { + name = "has-symbols"; + packageName = "has-symbols"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.2.tgz"; + sha512 = "chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw=="; + }; + }; + "has-tostringtag-1.0.0" = { + name = "has-tostringtag"; + packageName = "has-tostringtag"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.0.tgz"; + sha512 = "kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ=="; + }; + }; "has-unicode-2.0.1" = { name = "has-unicode"; packageName = "has-unicode"; @@ -2578,6 +2992,15 @@ let sha512 = "H/vuk5TEEVZwrR0lp2zed9OCo1uAILMlx0JEMgC26rzyJJ3N1v6XkwHHXJQdR2doSjcGPM6OKPYoJgf0plJ11Q=="; }; }; + "heap-0.2.7" = { + name = "heap"; + packageName = "heap"; + version = "0.2.7"; + src = fetchurl { + url = "https://registry.npmjs.org/heap/-/heap-0.2.7.tgz"; + sha512 = "2bsegYkkHO+h/9MGbn6KWcE45cHZgPANo5LXF7EvWdT0yT2EguSVO1nDgU5c8+ZOPwp2vMNa7YFsJhVcDR9Sdg=="; + }; + }; "help-me-1.1.0" = { name = "help-me"; packageName = "help-me"; @@ -2587,49 +3010,58 @@ let sha1 = "8f2d508d0600b4a456da2f086556e7e5c056a3c6"; }; }; - "highlight.js-10.5.0" = { + "highlight.js-10.7.3" = { name = "highlight.js"; packageName = "highlight.js"; - version = "10.5.0"; + version = "10.7.3"; src = fetchurl { - url = "https://registry.npmjs.org/highlight.js/-/highlight.js-10.5.0.tgz"; - sha512 = "xTmvd9HiIHR6L53TMC7TKolEj65zG1XU+Onr8oi86mYa+nLcIbxTTWkpW7CsEwv/vK7u1zb8alZIMLDqqN6KTw=="; + url = "https://registry.npmjs.org/highlight.js/-/highlight.js-10.7.3.tgz"; + sha512 = "tzcUFauisWKNHaRkN4Wjl/ZA07gENAjFl3J/c480dprkGTg5EQstgaNFqBfUqCq54kZRIEcreTsAgF/m2quD7A=="; }; }; - "html-to-text-5.1.1" = { - name = "html-to-text"; - packageName = "html-to-text"; - version = "5.1.1"; + "homedir-polyfill-1.0.3" = { + name = "homedir-polyfill"; + packageName = "homedir-polyfill"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/html-to-text/-/html-to-text-5.1.1.tgz"; - sha512 = "Bci6bD/JIfZSvG4s0gW/9mMKwBRoe/1RWLxUME/d6WUSZCdY7T60bssf/jFf7EYXRyqU4P5xdClVqiYU0/ypdA=="; + url = "https://registry.npmjs.org/homedir-polyfill/-/homedir-polyfill-1.0.3.tgz"; + sha512 = "eSmmWE5bZTK2Nou4g0AI3zZ9rswp7GRKoKXS1BLUkvPviOqs4YTN1djQIqrXy9k5gEtdLPy86JjRwsNM9tnDcA=="; }; }; - "htmlparser2-3.10.1" = { - name = "htmlparser2"; - packageName = "htmlparser2"; - version = "3.10.1"; + "html-to-text-8.0.0" = { + name = "html-to-text"; + packageName = "html-to-text"; + version = "8.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.10.1.tgz"; - sha512 = "IgieNijUMbkDovyoKObU1DUhm1iwNYE/fuifEoEHfd1oZKZDaONBSkal7Y01shxsM49R4XaMdGez3WnF9UfiCQ=="; + url = "https://registry.npmjs.org/html-to-text/-/html-to-text-8.0.0.tgz"; + sha512 = "fEtul1OerF2aMEV+Wpy+Ue20tug134jOY1GIudtdqZi7D0uTudB2tVJBKfVhTL03dtqeJoF8gk8EPX9SyMEvLg=="; }; }; - "htmlparser2-6.0.0" = { + "htmlparser2-6.1.0" = { name = "htmlparser2"; packageName = "htmlparser2"; - version = "6.0.0"; + version = "6.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/htmlparser2/-/htmlparser2-6.0.0.tgz"; - sha512 = "numTQtDZMoh78zJpaNdJ9MXb2cv5G3jwUoe3dMQODubZvLoGvTE/Ofp6sHvH8OGKcN/8A47pGLi/k58xHP/Tfw=="; + url = "https://registry.npmjs.org/htmlparser2/-/htmlparser2-6.1.0.tgz"; + sha512 = "gyyPk6rgonLFEDGoeRgQNaEUvdJ4ktTmmUh/h2t7s+M8oPpIPxgNACWa+6ESR57kXstwqPiCut0V8NRpcwgU7A=="; }; }; - "http-errors-1.7.2" = { + "http-errors-1.8.1" = { name = "http-errors"; packageName = "http-errors"; - version = "1.7.2"; + version = "1.8.1"; src = fetchurl { - url = "https://registry.npmjs.org/http-errors/-/http-errors-1.7.2.tgz"; - sha512 = "uUQBt3H/cSIVfch6i1EuPNy/YsRSOUBXTVfZ+yR7Zjez3qjBz6i9+i4zjNaoqcoFVI4lQJ5plg63TvGfRSDCRg=="; + url = "https://registry.npmjs.org/http-errors/-/http-errors-1.8.1.tgz"; + sha512 = "Kpk9Sm7NmI+RHhnj6OIWDI1d6fIoFAtFt9RLaTMRlg/8w49juAStsrBgp0Dp4OdxdVbRIeKhtCUvoi/RuAhO4g=="; + }; + }; + "http-proxy-agent-4.0.1" = { + name = "http-proxy-agent"; + packageName = "http-proxy-agent"; + version = "4.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-4.0.1.tgz"; + sha512 = "k0zdNgqWTGA6aeIRVpvfVob4fL52dTfaehylg0Y4UvSySvOq/Y+BOyPrgpUrA7HylqvU8vIZGsRuXmspskV0Tg=="; }; }; "http-signature-1.2.0" = { @@ -2641,6 +3073,15 @@ let sha1 = "9aecd925114772f3d95b65a60abb8f7c18fbace1"; }; }; + "http-signature-1.3.6" = { + name = "http-signature"; + packageName = "http-signature"; + version = "1.3.6"; + src = fetchurl { + url = "https://registry.npmjs.org/http-signature/-/http-signature-1.3.6.tgz"; + sha512 = "3adrsD6zqo4GsTqtO7FyrejHNv+NgiIfAfv68+jVlFmSr9OGy7zrxONceFRLKvnnZA5jbxQBX1u9PpB6Wi32Gw=="; + }; + }; "https-proxy-agent-3.0.1" = { name = "https-proxy-agent"; packageName = "https-proxy-agent"; @@ -2650,6 +3091,15 @@ let sha512 = "+ML2Rbh6DAuee7d07tYGEKOEi2voWPUGan+ExdPbPW6Z3svq+JCqr0v8WmKPOkz1vOVykPCBSuobe7G8GJUtVg=="; }; }; + "https-proxy-agent-5.0.0" = { + name = "https-proxy-agent"; + packageName = "https-proxy-agent"; + version = "5.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.0.tgz"; + sha512 = "EkYm5BcKUGiduxzSt3Eppko+PiNWNEpa4ySk9vTC6wDsQJW9rHSa+UhGNJoRYp7bz6Ht1eaRIa6QaJqO5rCFbA=="; + }; + }; "iconv-lite-0.4.24" = { name = "iconv-lite"; packageName = "iconv-lite"; @@ -2659,15 +3109,6 @@ let sha512 = "v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA=="; }; }; - "iconv-lite-0.5.0" = { - name = "iconv-lite"; - packageName = "iconv-lite"; - version = "0.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.5.0.tgz"; - sha512 = "NnEhI9hIEKHOzJ4f697DMz9IQEXr/MMJ5w64vN2/4Ai+wRnvV7SBrL0KLoRlwaKVghOc7LQ5YkPLuX146b6Ydw=="; - }; - }; "iconv-lite-0.5.2" = { name = "iconv-lite"; packageName = "iconv-lite"; @@ -2686,6 +3127,33 @@ let sha512 = "2y91h5OpQlolefMPmUlivelittSWy0rP+oYVpn6A7GwVHNE8AWzoYOBNmlwks3LobaJxgHCYZAnyNo2GgpNRNQ=="; }; }; + "iconv-lite-0.6.3" = { + name = "iconv-lite"; + packageName = "iconv-lite"; + version = "0.6.3"; + src = fetchurl { + url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz"; + sha512 = "4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw=="; + }; + }; + "ics-2.35.0" = { + name = "ics"; + packageName = "ics"; + version = "2.35.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ics/-/ics-2.35.0.tgz"; + sha512 = "uxHoiu9VnE/1RUIWoUqn9GVswUzrejHFa5Gk20gGySw+2FO8xzgJe7GLFk+hzmevHViG/6zANLhjVY6kFWctKQ=="; + }; + }; + "ieee754-1.1.13" = { + name = "ieee754"; + packageName = "ieee754"; + version = "1.1.13"; + src = fetchurl { + url = "https://registry.npmjs.org/ieee754/-/ieee754-1.1.13.tgz"; + sha512 = "4vf7I2LYV/HaWerSo3XmlMkp5eZ83i+/CDluXi/IGTs/O1sejBNhTtnxzmRZfvOUqj7lZjqHkeTvpgSFDlWZTg=="; + }; + }; "ieee754-1.2.1" = { name = "ieee754"; packageName = "ieee754"; @@ -2695,22 +3163,22 @@ let sha512 = "dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA=="; }; }; - "ignore-5.1.8" = { + "ignore-5.2.0" = { name = "ignore"; packageName = "ignore"; - version = "5.1.8"; + version = "5.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/ignore/-/ignore-5.1.8.tgz"; - sha512 = "BMpfD7PpiETpBl/A6S498BaIJ6Y/ABT93ETbby2fP00v4EbvPBXWEoaR1UBPKs3iR53pJY7EtZk5KACI57i1Uw=="; + url = "https://registry.npmjs.org/ignore/-/ignore-5.2.0.tgz"; + sha512 = "CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ=="; }; }; - "ignore-walk-3.0.3" = { + "ignore-walk-3.0.4" = { name = "ignore-walk"; packageName = "ignore-walk"; - version = "3.0.3"; + version = "3.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/ignore-walk/-/ignore-walk-3.0.3.tgz"; - sha512 = "m7o6xuOaT1aqheYHKf8W6J5pYH85ZI9w077erOzLje3JsB1gkafkAhHHY19dqjulgIZHFm32Cp5uNZgcQqdJKw=="; + url = "https://registry.npmjs.org/ignore-walk/-/ignore-walk-3.0.4.tgz"; + sha512 = "PY6Ii8o1jMRA1z4F2hRkH/xN59ox43DavKvD3oDpfurRlOJyAHpifIwpbdv1n4jt4ov0jSpw3kQ4GhJnpBL6WQ=="; }; }; "imap-0.8.19" = { @@ -2749,15 +3217,6 @@ let sha1 = "49bd6331d7d02d0c09bc910a1075ba8165b56df9"; }; }; - "inherits-2.0.3" = { - name = "inherits"; - packageName = "inherits"; - version = "2.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz"; - sha1 = "633c2c83e3da42a502f52466022480f4208261de"; - }; - }; "inherits-2.0.4" = { name = "inherits"; packageName = "inherits"; @@ -2785,6 +3244,24 @@ let sha512 = "JG3eIAj5V9CwcGvuOmoo6LB9kbAYT8HXffUl6memuszlwDC/qvFAJw49XJ5NROSFNPxp3iQg1GqkFhaY/CR0IA=="; }; }; + "internal-slot-1.0.3" = { + name = "internal-slot"; + packageName = "internal-slot"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.3.tgz"; + sha512 = "O0DB1JC/sPyZl7cIo78n5dR7eUSwwpYPiXRhTzNxZVAMUuB8vlnRFyLxdrVToks6XPLVnFfbzaVd5WLjhgg+vA=="; + }; + }; + "ioredis-4.28.5" = { + name = "ioredis"; + packageName = "ioredis"; + version = "4.28.5"; + src = fetchurl { + url = "https://registry.npmjs.org/ioredis/-/ioredis-4.28.5.tgz"; + sha512 = "3GYo0GJtLqgNXj4YhrisLaNNvWSNwSS2wS4OELGfGxH8I69+XfNdnmV1AyN+ZqMh0i7eX+SWjrwFKDBDgfBC1A=="; + }; + }; "ip-regex-2.1.0" = { name = "ip-regex"; packageName = "ip-regex"; @@ -2821,13 +3298,67 @@ let sha512 = "eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ=="; }; }; - "is-docker-2.1.1" = { + "is-bigint-1.0.4" = { + name = "is-bigint"; + packageName = "is-bigint"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/is-bigint/-/is-bigint-1.0.4.tgz"; + sha512 = "zB9CruMamjym81i2JZ3UMn54PKGsQzsJeo6xvN3HJJ4CAsQNB6iRutp2To77OfCNuoxspsIhzaPoO1zyCEhFOg=="; + }; + }; + "is-binary-path-2.1.0" = { + name = "is-binary-path"; + packageName = "is-binary-path"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz"; + sha512 = "ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw=="; + }; + }; + "is-boolean-object-1.1.2" = { + name = "is-boolean-object"; + packageName = "is-boolean-object"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.1.2.tgz"; + sha512 = "gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA=="; + }; + }; + "is-buffer-1.1.6" = { + name = "is-buffer"; + packageName = "is-buffer"; + version = "1.1.6"; + src = fetchurl { + url = "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz"; + sha512 = "NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w=="; + }; + }; + "is-callable-1.2.4" = { + name = "is-callable"; + packageName = "is-callable"; + version = "1.2.4"; + src = fetchurl { + url = "https://registry.npmjs.org/is-callable/-/is-callable-1.2.4.tgz"; + sha512 = "nsuwtxZfMX67Oryl9LCQ+upnC0Z0BgpwntpS89m1H/TLF0zNfzfLMV/9Wa/6MZsj0acpEjAO0KF1xT6ZdLl95w=="; + }; + }; + "is-date-object-1.0.5" = { + name = "is-date-object"; + packageName = "is-date-object"; + version = "1.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.5.tgz"; + sha512 = "9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ=="; + }; + }; + "is-docker-2.2.1" = { name = "is-docker"; packageName = "is-docker"; - version = "2.1.1"; + version = "2.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/is-docker/-/is-docker-2.1.1.tgz"; - sha512 = "ZOoqiXfEwtGknTiuDEy8pN2CfE3TxMHprvNer1mXiqwkOT77Rw3YVrUQ52EqAOU3QAWDQ+bQdx7HJzrv7LS2Hw=="; + url = "https://registry.npmjs.org/is-docker/-/is-docker-2.2.1.tgz"; + sha512 = "F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ=="; }; }; "is-extglob-2.1.1" = { @@ -2848,15 +3379,6 @@ let sha1 = "ef9e31386f031a7f0d643af82fde50c457ef00cb"; }; }; - "is-fullwidth-code-point-2.0.0" = { - name = "is-fullwidth-code-point"; - packageName = "is-fullwidth-code-point"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz"; - sha1 = "a3b30a5c4f199183167aaab93beefae3ddfb654f"; - }; - }; "is-fullwidth-code-point-3.0.0" = { name = "is-fullwidth-code-point"; packageName = "is-fullwidth-code-point"; @@ -2875,13 +3397,22 @@ let sha1 = "7ba5ae24217804ac70707b96922567486cc3e84a"; }; }; - "is-glob-4.0.1" = { + "is-glob-4.0.3" = { name = "is-glob"; packageName = "is-glob"; - version = "4.0.1"; + version = "4.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/is-glob/-/is-glob-4.0.1.tgz"; - sha512 = "5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg=="; + url = "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz"; + sha512 = "xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg=="; + }; + }; + "is-nan-1.3.2" = { + name = "is-nan"; + packageName = "is-nan"; + version = "1.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/is-nan/-/is-nan-1.3.2.tgz"; + sha512 = "E+zBKpQ2t6MEo1VsonYmluk9NxGrbzpeeLC2xIViuO2EjU2xsXsBPwTr3Ykv9l08UYEVEdWeRZNouaZqF6RN0w=="; }; }; "is-negated-glob-1.0.0" = { @@ -2893,6 +3424,15 @@ let sha1 = "6910bca5da8c95e784b5751b976cf5a10fee36d2"; }; }; + "is-negative-zero-2.0.2" = { + name = "is-negative-zero"; + packageName = "is-negative-zero"; + version = "2.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.2.tgz"; + sha512 = "dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA=="; + }; + }; "is-number-7.0.0" = { name = "is-number"; packageName = "is-number"; @@ -2902,6 +3442,15 @@ let sha512 = "41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng=="; }; }; + "is-number-object-1.0.6" = { + name = "is-number-object"; + packageName = "is-number-object"; + version = "1.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.6.tgz"; + sha512 = "bEVOqiRcvo3zO1+G2lVMy+gkkEm9Yh7cDMRusKKu5ZJKPUYSJwICTKZrNKHA2EbSP0Tu0+6B/emsYNHZyn6K8g=="; + }; + }; "is-promise-1.0.1" = { name = "is-promise"; packageName = "is-promise"; @@ -2920,6 +3469,15 @@ let sha1 = "57fe1c4e48474edd65b09911f26b1cd4095dda84"; }; }; + "is-regex-1.1.4" = { + name = "is-regex"; + packageName = "is-regex"; + version = "1.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz"; + sha512 = "kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg=="; + }; + }; "is-relative-1.0.0" = { name = "is-relative"; packageName = "is-relative"; @@ -2929,13 +3487,49 @@ let sha512 = "Kw/ReK0iqwKeu0MITLFuj0jbPAmEiOsIwyIXvvbfa6QfmN9pkD1M+8pdk7Rl/dTKbH34/XBFMbgD4iMJhLQbGA=="; }; }; - "is-stream-2.0.0" = { + "is-retry-allowed-2.2.0" = { + name = "is-retry-allowed"; + packageName = "is-retry-allowed"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-retry-allowed/-/is-retry-allowed-2.2.0.tgz"; + sha512 = "XVm7LOeLpTW4jV19QSH38vkswxoLud8sQ57YwJVTPWdiaI9I8keEhGFpBlslyVsgdQy4Opg8QOLb8YRgsyZiQg=="; + }; + }; + "is-shared-array-buffer-1.0.1" = { + name = "is-shared-array-buffer"; + packageName = "is-shared-array-buffer"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.1.tgz"; + sha512 = "IU0NmyknYZN0rChcKhRO1X8LYz5Isj/Fsqh8NJOSf+N/hCOTwy29F32Ik7a+QszE63IdvmwdTPDd6cZ5pg4cwA=="; + }; + }; + "is-stream-2.0.1" = { name = "is-stream"; packageName = "is-stream"; - version = "2.0.0"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz"; + sha512 = "hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg=="; + }; + }; + "is-string-1.0.7" = { + name = "is-string"; + packageName = "is-string"; + version = "1.0.7"; + src = fetchurl { + url = "https://registry.npmjs.org/is-string/-/is-string-1.0.7.tgz"; + sha512 = "tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg=="; + }; + }; + "is-symbol-1.0.4" = { + name = "is-symbol"; + packageName = "is-symbol"; + version = "1.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/is-stream/-/is-stream-2.0.0.tgz"; - sha512 = "XCoy+WlUr7d1+Z8GgSuXmpuUFC9fOhRXglJMx+dwLKTkL44Cjd4W1Z5P+BQZpr+cR93aGP4S/s7Ftw6Nd/kiEw=="; + url = "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.4.tgz"; + sha512 = "C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg=="; }; }; "is-typedarray-1.0.0" = { @@ -2956,6 +3550,15 @@ let sha512 = "mrGpVd0fs7WWLfVsStvgF6iEJnbjDFZh9/emhRDcGWTduTfNHd9CHeUwH3gYIjdbwo4On6hunkztwOaAw0yllQ=="; }; }; + "is-weakref-1.0.2" = { + name = "is-weakref"; + packageName = "is-weakref"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/is-weakref/-/is-weakref-1.0.2.tgz"; + sha512 = "qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ=="; + }; + }; "is-windows-1.0.2" = { name = "is-windows"; packageName = "is-windows"; @@ -2992,6 +3595,15 @@ let sha1 = "bb935d48582cba168c06834957a54a3e07124f11"; }; }; + "isbot-3.4.2" = { + name = "isbot"; + packageName = "isbot"; + version = "3.4.2"; + src = fetchurl { + url = "https://registry.npmjs.org/isbot/-/isbot-3.4.2.tgz"; + sha512 = "b59O14840ltLAGq8z+M8VhL+1CdrjbZYQIhQBPacutjl27Ypa2/UksJ1DRzWOz19F5H/2d2pstbdAp7+b0ph+A=="; + }; + }; "isexe-2.0.0" = { name = "isexe"; packageName = "isexe"; @@ -3001,13 +3613,13 @@ let sha1 = "e8fbf374dc556ff8947a10dcb0572d633f2cfa10"; }; }; - "iso-639-1-2.1.7" = { + "iso-639-1-2.1.13" = { name = "iso-639-1"; packageName = "iso-639-1"; - version = "2.1.7"; + version = "2.1.13"; src = fetchurl { - url = "https://registry.npmjs.org/iso-639-1/-/iso-639-1-2.1.7.tgz"; - sha512 = "vPBh9Exxv0c430dRYiKtRt6TgErlsKy22Nkz473HFkzRkWTZeM7RLfX2raDoD7g74kA7HB4S2giwu6ZwiisQtg=="; + url = "https://registry.npmjs.org/iso-639-1/-/iso-639-1-2.1.13.tgz"; + sha512 = "stYt3u6OnVDNcK4IWARGXmTOOY5Wa5g4bUmBsttZp/55ZiEjDUibR3C59ZnorKoSS0tfJmFuGMST3ksnY1zu7Q=="; }; }; "isstream-0.1.2" = { @@ -3019,6 +3631,24 @@ let sha1 = "47e63f7af55afa6f92e1500e690eb8b8529c099a"; }; }; + "jmespath-0.16.0" = { + name = "jmespath"; + packageName = "jmespath"; + version = "0.16.0"; + src = fetchurl { + url = "https://registry.npmjs.org/jmespath/-/jmespath-0.16.0.tgz"; + sha512 = "9FzQjJ7MATs1tSpnco1K6ayiYE3figslrXA72G2HQ/n76RzvYlofyi5QM+iX4YRs/pu3yzxlVQSST23+dMDknw=="; + }; + }; + "join-component-1.1.0" = { + name = "join-component"; + packageName = "join-component"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/join-component/-/join-component-1.1.0.tgz"; + sha1 = "b8417b750661a392bee2c2537c68b2a9d4977cd5"; + }; + }; "js-yaml-3.14.1" = { name = "js-yaml"; packageName = "js-yaml"; @@ -3028,13 +3658,13 @@ let sha512 = "okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g=="; }; }; - "jsbi-3.1.4" = { + "jsbi-3.2.5" = { name = "jsbi"; packageName = "jsbi"; - version = "3.1.4"; + version = "3.2.5"; src = fetchurl { - url = "https://registry.npmjs.org/jsbi/-/jsbi-3.1.4.tgz"; - sha512 = "52QRRFSsi9impURE8ZUbzAMCLjPm4THO7H2fcuIvaaeFTbSysvkodbQQXIVsNgq/ypDbq6dJiuGKL0vZ/i9hUg=="; + url = "https://registry.npmjs.org/jsbi/-/jsbi-3.2.5.tgz"; + sha512 = "aBE4n43IPvjaddScbvWRA2YlTzKEynHzu7MqOyTipdHucf/VxS63ViCjxYRg86M8Rxwbt/GfzHl1kKERkt45fQ=="; }; }; "jsbn-0.1.1" = { @@ -3046,13 +3676,22 @@ let sha1 = "a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"; }; }; - "json-schema-0.2.3" = { + "json-diff-0.5.5" = { + name = "json-diff"; + packageName = "json-diff"; + version = "0.5.5"; + src = fetchurl { + url = "https://registry.npmjs.org/json-diff/-/json-diff-0.5.5.tgz"; + sha512 = "B2RSfPv8Y5iqm6/9aKC3cOhXPzjYupKDpGuqT5py9NRulL8J0UoB/zKXUo70xBsuxPcIFgtsGgEdXLrNp0GL7w=="; + }; + }; + "json-schema-0.4.0" = { name = "json-schema"; packageName = "json-schema"; - version = "0.2.3"; + version = "0.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz"; - sha1 = "b480c892e59a2f05954ce727bd3f2a4e882f9e13"; + url = "https://registry.npmjs.org/json-schema/-/json-schema-0.4.0.tgz"; + sha512 = "es94M3nTIfsEPisRafak+HDLfHXnKBhV3vU5eqPcS3flIWqcxJWgXHXiey3YrpaNsanY5ei1VoYEbOzijuq9BA=="; }; }; "json-schema-traverse-0.4.1" = { @@ -3082,15 +3721,6 @@ let sha1 = "1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"; }; }; - "json5-2.1.0" = { - name = "json5"; - packageName = "json5"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/json5/-/json5-2.1.0.tgz"; - sha512 = "8Mh9h6xViijj36g7Dxi+Y4S6hNGV96vcJZr/SrlHh1LR/pEn/8j/+qIBbs44YKl69Lrfctp4QD+AdWLTMqEZAQ=="; - }; - }; "jsonfile-4.0.0" = { name = "jsonfile"; packageName = "jsonfile"; @@ -3109,13 +3739,22 @@ let sha512 = "XjwVfRS6jTMsqYs0EsuJ4LGxXV14zQybNd4L2r0UvbVnSF9Af8x7p5MzbJ90Ioz/9TI41/hTCvznF/loiSzn8w=="; }; }; - "jsprim-1.4.1" = { + "jsprim-1.4.2" = { name = "jsprim"; packageName = "jsprim"; - version = "1.4.1"; + version = "1.4.2"; + src = fetchurl { + url = "https://registry.npmjs.org/jsprim/-/jsprim-1.4.2.tgz"; + sha512 = "P2bSOMAc/ciLz6DzgjVlGJP9+BrJWu5UDGK70C2iweC5QBIeFf0ZXRvGjEj2uYgrY2MkAAhsSWHDWlFtEroZWw=="; + }; + }; + "jsprim-2.0.2" = { + name = "jsprim"; + packageName = "jsprim"; + version = "2.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz"; - sha1 = "313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2"; + url = "https://registry.npmjs.org/jsprim/-/jsprim-2.0.2.tgz"; + sha512 = "gqXddjPqQ6G40VdnI6T6yObEC+pDNvyP95wdQhkWkg7crHH3km5qP1FsOXEkzEQwnz6gz5qGTn1c2Y52wP3OyQ=="; }; }; "jwa-1.4.1" = { @@ -3127,13 +3766,13 @@ let sha512 = "qiLX/xhEEFKUAJ6FiBMbes3w9ATzyk5W7Hvzpa/SLYdxNtng+gcurvrI7TbACjIXlsJyr05/S1oUhZrc63evQA=="; }; }; - "jwks-rsa-1.9.0" = { + "jwks-rsa-1.12.3" = { name = "jwks-rsa"; packageName = "jwks-rsa"; - version = "1.9.0"; + version = "1.12.3"; src = fetchurl { - url = "https://registry.npmjs.org/jwks-rsa/-/jwks-rsa-1.9.0.tgz"; - sha512 = "UPCfQQg0s2kF2Ju6UFJrQH73f7MaVN/hKBnYBYOp+X9KN4y6TLChhLtaXS5nRKbZqshwVdrZ9OY63m/Q9CLqcg=="; + url = "https://registry.npmjs.org/jwks-rsa/-/jwks-rsa-1.12.3.tgz"; + sha512 = "cFipFDeYYaO9FhhYJcZWX/IyZgc0+g316rcHnDpT2dNRNIE/lMOmWKKqp09TkJoYlNFzrEVODsR4GgXJMgWhnA=="; }; }; "jws-3.2.2" = { @@ -3145,13 +3784,13 @@ let sha512 = "YHlZCB6lMTllWDtSPHz/ZXTsi8S00usEV6v1tjq8tOUZzw7DpSDWVXjXDre6ed1w/pd495ODpHZYSdkRTsa0HA=="; }; }; - "kafkajs-1.15.0" = { + "kafkajs-1.16.0" = { name = "kafkajs"; packageName = "kafkajs"; - version = "1.15.0"; + version = "1.16.0"; src = fetchurl { - url = "https://registry.npmjs.org/kafkajs/-/kafkajs-1.15.0.tgz"; - sha512 = "yjPyEnQCkPxAuQLIJnY5dI+xnmmgXmhuOQ1GVxClG5KTOV/rJcW1qA3UfvyEJKTp/RTSqQnUR3HJsKFvHyTpNg=="; + url = "https://registry.npmjs.org/kafkajs/-/kafkajs-1.16.0.tgz"; + sha512 = "+Rcfu2hyQ/jv5skqRY8xA7Ra+mmRkDAzCaLDYbkGtgsNKpzxPWiLbk8ub0dgr4EbWrN1Zb4BCXHUkD6+zYfdWg=="; }; }; "kuler-1.0.1" = { @@ -3190,15 +3829,6 @@ let sha512 = "l+nePcPbIG1fNlqMzrh68MLkX/gTxk/+vdvAb388Ssi7UuUN31MI44w4Yf33mM3Cm4xDfw48mdf3rkdHszLNew=="; }; }; - "libmime-4.2.1" = { - name = "libmime"; - packageName = "libmime"; - version = "4.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/libmime/-/libmime-4.2.1.tgz"; - sha512 = "09y7zjSc5im1aNsq815zgo4/G3DnIzym3aDOHsGq4Ee5vrX4PdgQRybAsztz9Rv0NhO+J5C0llEUloa3sUmjmA=="; - }; - }; "libmime-5.0.0" = { name = "libmime"; packageName = "libmime"; @@ -3208,6 +3838,15 @@ let sha512 = "2Bm96d5ktnE217Ib1FldvUaPAaOst6GtZrsxJCwnJgi9lnsoAKIHyU0sae8rNx6DNYbjdqqh8lv5/b9poD8qOg=="; }; }; + "libphonenumber-js-1.9.49" = { + name = "libphonenumber-js"; + packageName = "libphonenumber-js"; + version = "1.9.49"; + src = fetchurl { + url = "https://registry.npmjs.org/libphonenumber-js/-/libphonenumber-js-1.9.49.tgz"; + sha512 = "/wEOIONcVboFky+lWlCaF7glm1FhBz11M5PHeCApA+xDdVfmhKjHktHS8KjyGxouV5CSXIr4f3GvLSpJa4qMSg=="; + }; + }; "libqp-1.1.0" = { name = "libqp"; packageName = "libqp"; @@ -3226,40 +3865,40 @@ let sha512 = "FWWMIEOxz3GwUI4Ts/IvgVy6LPvoMPgjMdQ185nN6psJyBJ4yOpzqm695/h5umdLJg2vW3GR5iG11MAkR2AzJA=="; }; }; - "linkify-it-3.0.2" = { + "linkify-it-3.0.3" = { name = "linkify-it"; packageName = "linkify-it"; - version = "3.0.2"; + version = "3.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/linkify-it/-/linkify-it-3.0.2.tgz"; - sha512 = "gDBO4aHNZS6coiZCKVhSNh43F9ioIL4JwRjLZPkoLIY4yZFwg264Y5lu2x6rb1Js42Gh6Yqm2f6L2AJcnkzinQ=="; + url = "https://registry.npmjs.org/linkify-it/-/linkify-it-3.0.3.tgz"; + sha512 = "ynTsyrFSdE5oZ/O9GEf00kPngmOfVwazR5GKDq6EYfhlpFug3J2zybX56a2PRRpc9P+FuSoGNAwjlbDs9jJBPQ=="; }; }; - "localtunnel-2.0.1" = { + "localtunnel-2.0.2" = { name = "localtunnel"; packageName = "localtunnel"; - version = "2.0.1"; + version = "2.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/localtunnel/-/localtunnel-2.0.1.tgz"; - sha512 = "LiaI5wZdz0xFkIQpXbNI62ZnNn8IMsVhwxHmhA+h4vj8R9JG/07bQHWwQlyy7b95/5fVOCHJfIHv+a5XnkvaJA=="; + url = "https://registry.npmjs.org/localtunnel/-/localtunnel-2.0.2.tgz"; + sha512 = "n418Cn5ynvJd7m/N1d9WVJISLJF/ellZnfsLnx8WBWGzxv/ntNcFkJ1o6se5quUhCplfLGBNL5tYHiq5WF3Nug=="; }; }; - "lodash-4.17.20" = { + "lodash-4.17.21" = { name = "lodash"; packageName = "lodash"; - version = "4.17.20"; + version = "4.17.21"; src = fetchurl { - url = "https://registry.npmjs.org/lodash/-/lodash-4.17.20.tgz"; - sha512 = "PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA=="; + url = "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz"; + sha512 = "v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="; }; }; - "lodash._reinterpolate-3.0.0" = { - name = "lodash._reinterpolate"; - packageName = "lodash._reinterpolate"; - version = "3.0.0"; + "lodash-es-4.17.21" = { + name = "lodash-es"; + packageName = "lodash-es"; + version = "4.17.21"; src = fetchurl { - url = "https://registry.npmjs.org/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz"; - sha1 = "0ccf2d89166af03b3663c796538b75ac6e114d9d"; + url = "https://registry.npmjs.org/lodash-es/-/lodash-es-4.17.21.tgz"; + sha512 = "mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw=="; }; }; "lodash.clonedeep-4.5.0" = { @@ -3271,6 +3910,24 @@ let sha1 = "e23f3f9c4f8fbdde872529c1071857a086e5ccef"; }; }; + "lodash.defaults-4.2.0" = { + name = "lodash.defaults"; + packageName = "lodash.defaults"; + version = "4.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.defaults/-/lodash.defaults-4.2.0.tgz"; + sha1 = "d09178716ffea4dde9e5fb7b37f6f0802274580c"; + }; + }; + "lodash.flatten-4.4.0" = { + name = "lodash.flatten"; + packageName = "lodash.flatten"; + version = "4.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.flatten/-/lodash.flatten-4.4.0.tgz"; + sha1 = "f31c22225a9632d2bbf8e4addbef240aa765a61f"; + }; + }; "lodash.get-4.4.2" = { name = "lodash.get"; packageName = "lodash.get"; @@ -3289,6 +3946,15 @@ let sha1 = "60bb98a87cb923c68ca1e51325483314849f553f"; }; }; + "lodash.isarguments-3.1.0" = { + name = "lodash.isarguments"; + packageName = "lodash.isarguments"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.isarguments/-/lodash.isarguments-3.1.0.tgz"; + sha1 = "2f573d85c6a24289ff00663b491c1d338ff3458a"; + }; + }; "lodash.isboolean-3.0.3" = { name = "lodash.isboolean"; packageName = "lodash.isboolean"; @@ -3298,6 +3964,15 @@ let sha1 = "6c2e171db2a257cd96802fd43b01b20d5f5870f6"; }; }; + "lodash.isequal-4.5.0" = { + name = "lodash.isequal"; + packageName = "lodash.isequal"; + version = "4.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.isequal/-/lodash.isequal-4.5.0.tgz"; + sha1 = "415c4478f2bcc30120c22ce10ed3226f7d3e18e0"; + }; + }; "lodash.isinteger-4.0.4" = { name = "lodash.isinteger"; packageName = "lodash.isinteger"; @@ -3334,6 +4009,15 @@ let sha1 = "d527dfb5456eca7cc9bb95d5daeaf88ba54a5451"; }; }; + "lodash.merge-4.6.2" = { + name = "lodash.merge"; + packageName = "lodash.merge"; + version = "4.6.2"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz"; + sha512 = "0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ=="; + }; + }; "lodash.once-4.1.1" = { name = "lodash.once"; packageName = "lodash.once"; @@ -3352,22 +4036,13 @@ let sha1 = "d8757b1da807dde24816b0d6a84bea1a76230b23"; }; }; - "lodash.template-4.5.0" = { - name = "lodash.template"; - packageName = "lodash.template"; - version = "4.5.0"; + "lodash.uniqby-4.7.0" = { + name = "lodash.uniqby"; + packageName = "lodash.uniqby"; + version = "4.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/lodash.template/-/lodash.template-4.5.0.tgz"; - sha512 = "84vYFxIkmidUiFxidA/KjjH9pAycqW+h980j7Fuz5qxRtO9pgB7MDFTdys1N7A5mcucRiDyEq4fusljItR1T/A=="; - }; - }; - "lodash.templatesettings-4.2.0" = { - name = "lodash.templatesettings"; - packageName = "lodash.templatesettings"; - version = "4.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.templatesettings/-/lodash.templatesettings-4.2.0.tgz"; - sha512 = "stgLz+i3Aa9mZgnjr/O+v9ruKZsPsndy7qPZOchbqk2cnTU1ZaldKK+v7m54WoKIyxiuMZTKT2H81F8BeAc3ZQ=="; + url = "https://registry.npmjs.org/lodash.uniqby/-/lodash.uniqby-4.7.0.tgz"; + sha1 = "d99c07a669e9e6d24e1362dfe266c67616af1302"; }; }; "lodash.unset-4.5.2" = { @@ -3379,13 +4054,13 @@ let sha1 = "370d1d3e85b72a7e1b0cdf2d272121306f23e4ed"; }; }; - "logform-2.2.0" = { + "logform-2.4.0" = { name = "logform"; packageName = "logform"; - version = "2.2.0"; + version = "2.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/logform/-/logform-2.2.0.tgz"; - sha512 = "N0qPlqfypFx7UHNn4B3lzS/b0uLqt2hmuoa+PpuXNYgozdJYAyauF5Ky0BWVjrxDlMWiT3qN4zPq3vVAfZy7Yg=="; + url = "https://registry.npmjs.org/logform/-/logform-2.4.0.tgz"; + sha512 = "CPSJw4ftjf517EhXZGGvTHHkYobo7ZCc0kvwUoOYcjfR2UVrI66RHj8MCrfAdEitdmFqbu2BYdYs8FHHZSb6iw=="; }; }; "long-4.0.0" = { @@ -3397,6 +4072,15 @@ let sha512 = "XsP+KhQif4bjX1kbuSiySJFNAehNxgLb6hPRGJ9QsUr8ajHkuXGdrHmFUTUUXhDwVX2R5bY4JNZEwbUiMhV+MA=="; }; }; + "lossless-json-1.0.5" = { + name = "lossless-json"; + packageName = "lossless-json"; + version = "1.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/lossless-json/-/lossless-json-1.0.5.tgz"; + sha512 = "RicKUuLwZVNZ6ZdJHgIZnSeA05p8qWc5NW0uR96mpPIjN9WDLUg9+kj1esQU1GkPn9iLZVKatSQK5gyiaFHgJA=="; + }; + }; "lower-case-2.0.2" = { name = "lower-case"; packageName = "lower-case"; @@ -3424,15 +4108,6 @@ let sha512 = "sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g=="; }; }; - "lru-cache-5.1.1" = { - name = "lru-cache"; - packageName = "lru-cache"; - version = "5.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz"; - sha512 = "KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w=="; - }; - }; "lru-cache-6.0.0" = { name = "lru-cache"; packageName = "lru-cache"; @@ -3451,22 +4126,31 @@ let sha512 = "IXAq50s4qwrOBrXJklY+KhgZF+5y98PDaNo0gi/v2KQBFLyWr+JyFvijZXkGKjQj/h9c0OwoE+JZbwUXce76hQ=="; }; }; - "mailparser-2.8.1" = { + "mailparser-3.4.0" = { name = "mailparser"; packageName = "mailparser"; - version = "2.8.1"; + version = "3.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/mailparser/-/mailparser-2.8.1.tgz"; - sha512 = "H/CYAO9dsw6SFNbEGGpZsejVSWDcFlyHjb1OkHUWg0wggUekva1tNc28trB155nSqM8rhtbwTKt//orX0AmJxQ=="; + url = "https://registry.npmjs.org/mailparser/-/mailparser-3.4.0.tgz"; + sha512 = "u2pfpLg+xr7m2FKDl+ohQhy2gMok1QZ+S9E5umS9ez5DSJWttrqSmBGswyj9F68pZMVTwbhLpBt7Kd04q/W4Vw=="; }; }; - "mailsplit-5.0.0" = { + "mailsplit-5.3.1" = { name = "mailsplit"; packageName = "mailsplit"; - version = "5.0.0"; + version = "5.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/mailsplit/-/mailsplit-5.3.1.tgz"; + sha512 = "o6R6HCzqWYmI2/IYlB+v2IMPgYqC2EynmagZQICAhR7zAq0CO6fPcsO6CrYmVuYT+SSwvLAEZR5WniohBELcAA=="; + }; + }; + "make-dir-3.1.0" = { + name = "make-dir"; + packageName = "make-dir"; + version = "3.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/mailsplit/-/mailsplit-5.0.0.tgz"; - sha512 = "HeXA0eyCKBtZqbr7uoeb3Nn2L7VV8Vm27x6/YBb0ZiNzRzLoNS2PqRgGYADwh0cBzLYtqddq40bSSirqLO2LGw=="; + url = "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz"; + sha512 = "g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw=="; }; }; "make-error-1.3.6" = { @@ -3487,6 +4171,24 @@ let sha512 = "etgt+n4LlOkGSJbBTV9VROHA5R7ekIPS4vfh+bCAoJgRrJWdqJCBbpS3osRJ/HrT7R68MzMiY3L3sDJ/Fd8aBg=="; }; }; + "mappersmith-2.37.1" = { + name = "mappersmith"; + packageName = "mappersmith"; + version = "2.37.1"; + src = fetchurl { + url = "https://registry.npmjs.org/mappersmith/-/mappersmith-2.37.1.tgz"; + sha512 = "3QiXhRADHTK/it1riJMJm/sHmLlGdw3pfLgZJQu9MfT1CNeiO93keNY0BVLlRmpPBsMER/P7kj3mtcAK2V331Q=="; + }; + }; + "md5-2.3.0" = { + name = "md5"; + packageName = "md5"; + version = "2.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/md5/-/md5-2.3.0.tgz"; + sha512 = "T1GITYmFaKuO91vxyoQMFETst+O71VUPEU3ze5GNzDm0OWdP8v1ziTaAEPUr/3kLsY3Sftgz242A1SetQiDL7g=="; + }; + }; "media-typer-0.3.0" = { name = "media-typer"; packageName = "media-typer"; @@ -3496,15 +4198,6 @@ let sha1 = "8710d7af0aa626f8fffa1ce00168545263255748"; }; }; - "memory-pager-1.5.0" = { - name = "memory-pager"; - packageName = "memory-pager"; - version = "1.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/memory-pager/-/memory-pager-1.5.0.tgz"; - sha512 = "ZS4Bp4r/Zoeq6+NLJpP+0Zzm0pR8whtGPf1XExKLJBAczGMnSi3It14OiNCStjQjM6NU1okjQGSxgEZN8eBYKg=="; - }; - }; "merge-descriptors-1.0.1" = { name = "merge-descriptors"; packageName = "merge-descriptors"; @@ -3532,13 +4225,13 @@ let sha1 = "5529a4d67654134edcc5266656835b0f851afcee"; }; }; - "micromatch-4.0.2" = { + "micromatch-4.0.4" = { name = "micromatch"; packageName = "micromatch"; - version = "4.0.2"; + version = "4.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/micromatch/-/micromatch-4.0.2.tgz"; - sha512 = "y7FpHSbMUMoyPbYUSzO6PaZ6FyRnQOpHuKwbo1G+Knck95XVU4QAiKdGEnj5wwoS7PlOgthX/09u5iFJ+aYf5Q=="; + url = "https://registry.npmjs.org/micromatch/-/micromatch-4.0.4.tgz"; + sha512 = "pRmzw/XUcwXGpD9aI9q/0XOwLNygjETJ8y0ao0wdqprrzDa4YnxLcz7fQRZr8voh8V10kGhABbNcHVk5wHgWwg=="; }; }; "millisecond-0.1.2" = { @@ -3559,22 +4252,22 @@ let sha512 = "x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg=="; }; }; - "mime-db-1.45.0" = { + "mime-db-1.51.0" = { name = "mime-db"; packageName = "mime-db"; - version = "1.45.0"; + version = "1.51.0"; src = fetchurl { - url = "https://registry.npmjs.org/mime-db/-/mime-db-1.45.0.tgz"; - sha512 = "CkqLUxUk15hofLoLyljJSrukZi8mAtgd+yE5uO4tqRZsdsAJKv0O+rFMhVDRJgozy+yG6md5KwuXhD4ocIoP+w=="; + url = "https://registry.npmjs.org/mime-db/-/mime-db-1.51.0.tgz"; + sha512 = "5y8A56jg7XVQx2mbv1lu49NR4dokRnhZYTtL+KGfaa27uq4pSTXkwQkFJl4pkRMyNFz/EtYDSkiiEHx3F7UN6g=="; }; }; - "mime-types-2.1.28" = { + "mime-types-2.1.34" = { name = "mime-types"; packageName = "mime-types"; - version = "2.1.28"; + version = "2.1.34"; src = fetchurl { - url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.28.tgz"; - sha512 = "0TO2yJ5YHYr7M2zzT7gDU1tbwHxEUWBCLt0lscSNpcdAfFyJOVEpRYNS7EXVcTLNj/25QO8gulHC5JtTzSE2UQ=="; + url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.34.tgz"; + sha512 = "6cP692WwGIs9XXdOO4++N+7qjqv0rqxxVvJ3VHPh/Sc9mVZcQP+ZGhkKiTvWMQRr2tbHkJP/Yn7Y0npb3ZBs4A=="; }; }; "mimic-fn-2.1.0" = { @@ -3595,13 +4288,13 @@ let sha512 = "UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A=="; }; }; - "minimatch-3.0.4" = { + "minimatch-3.1.1" = { name = "minimatch"; packageName = "minimatch"; - version = "3.0.4"; + version = "3.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz"; - sha512 = "yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA=="; + url = "https://registry.npmjs.org/minimatch/-/minimatch-3.1.1.tgz"; + sha512 = "reLxBcKUPNBnc/sVtAbxgRVFSegoGeLaSjmphNhcwcolhYLRgtJscn5mRl6YRZNQv40Y7P6JM2YhSIsbL9OB5A=="; }; }; "minimist-1.2.5" = { @@ -3649,58 +4342,76 @@ let sha512 = "vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw=="; }; }; - "moment-2.24.0" = { - name = "moment"; - packageName = "moment"; - version = "2.24.0"; + "mock-require-3.0.3" = { + name = "mock-require"; + packageName = "mock-require"; + version = "3.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/moment/-/moment-2.24.0.tgz"; - sha512 = "bV7f+6l2QigeBBZSM/6yTNq4P2fNpSWj/0e7jQcy87A8e7o2nAfP/34/2ky5Vw4B9S446EtIhodAzkFCcR4dQg=="; + url = "https://registry.npmjs.org/mock-require/-/mock-require-3.0.3.tgz"; + sha512 = "lLzfLHcyc10MKQnNUCv7dMcoY/2Qxd6wJfbqCcVk3LDb8An4hF6ohk5AztrvgKhJCqj36uyzi/p5se+tvyD+Wg=="; }; }; - "moment-2.28.0" = { + "moment-2.29.1" = { name = "moment"; packageName = "moment"; - version = "2.28.0"; + version = "2.29.1"; src = fetchurl { - url = "https://registry.npmjs.org/moment/-/moment-2.28.0.tgz"; - sha512 = "Z5KOjYmnHyd/ukynmFd/WwyXHd7L4J9vTI/nn5Ap9AVUgaAE15VvQ9MOGmJJygEUklupqIrFnor/tjTwRU+tQw=="; + url = "https://registry.npmjs.org/moment/-/moment-2.29.1.tgz"; + sha512 = "kHmoybcPV8Sqy59DwNDY3Jefr64lK/by/da0ViFcuA4DH0vQg5Q6Ze5VimxkfQNSC+Mls/Kx53s7TjP1RhFEDQ=="; }; }; - "moment-timezone-0.5.32" = { + "moment-timezone-0.5.34" = { name = "moment-timezone"; packageName = "moment-timezone"; - version = "0.5.32"; + version = "0.5.34"; + src = fetchurl { + url = "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.34.tgz"; + sha512 = "3zAEHh2hKUs3EXLESx/wsgw6IQdusOT8Bxm3D9UrHPQR7zlMmzwybC8zHEM1tQ4LJwP7fcxrWr8tuBg05fFCbg=="; + }; + }; + "monaco-editor-0.29.1" = { + name = "monaco-editor"; + packageName = "monaco-editor"; + version = "0.29.1"; src = fetchurl { - url = "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.32.tgz"; - sha512 = "Z8QNyuQHQAmWucp8Knmgei8YNo28aLjJq6Ma+jy1ZSpSk5nyfRT8xgUbSQvD2+2UajISfenndwvFuH3NGS+nvA=="; + url = "https://registry.npmjs.org/monaco-editor/-/monaco-editor-0.29.1.tgz"; + sha512 = "rguaEG/zrPQSaKzQB7IfX/PpNa0qxF1FY8ZXRkN4WIl8qZdTQRSRJCtRto7IMcSgrU6H53RXI+fTcywOBC4aVw=="; }; }; - "mongodb-3.6.3" = { + "mongodb-3.7.3" = { name = "mongodb"; packageName = "mongodb"; - version = "3.6.3"; + version = "3.7.3"; src = fetchurl { - url = "https://registry.npmjs.org/mongodb/-/mongodb-3.6.3.tgz"; - sha512 = "rOZuR0QkodZiM+UbQE5kDsJykBqWi0CL4Ec2i1nrGrUI3KO11r6Fbxskqmq3JK2NH7aW4dcccBuUujAP0ERl5w=="; + url = "https://registry.npmjs.org/mongodb/-/mongodb-3.7.3.tgz"; + sha512 = "Psm+g3/wHXhjBEktkxXsFMZvd3nemI0r3IPsE0bU+4//PnvNWKkzhZcEsbPcYiWqe8XqXJJEg4Tgtr7Raw67Yw=="; }; }; - "mqtt-4.2.1" = { + "moo-0.5.1" = { + name = "moo"; + packageName = "moo"; + version = "0.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/moo/-/moo-0.5.1.tgz"; + sha512 = "I1mnb5xn4fO80BH9BLcF0yLypy2UKl+Cb01Fu0hJRkJjlCRtxZMWkTdAtDd5ZqCOxtCkhmRwyI57vWT+1iZ67w=="; + }; + }; + "mqtt-4.2.6" = { name = "mqtt"; packageName = "mqtt"; - version = "4.2.1"; + version = "4.2.6"; src = fetchurl { - url = "https://registry.npmjs.org/mqtt/-/mqtt-4.2.1.tgz"; - sha512 = "Iv893r+jWlo5GkNcPOfCGwW8M49IixwHiKLFFYTociEymSibUVCORVEjPXWPGzSxhn7BdlUeHicbRmWiv0Crkg=="; + url = "https://registry.npmjs.org/mqtt/-/mqtt-4.2.6.tgz"; + sha512 = "GpxVObyOzL0CGPBqo6B04GinN8JLk12NRYAIkYvARd9ZCoJKevvOyCaWK6bdK/kFSDj3LPDnCsJbezzNlsi87Q=="; }; }; - "mqtt-packet-6.7.0" = { + "mqtt-packet-6.10.0" = { name = "mqtt-packet"; packageName = "mqtt-packet"; - version = "6.7.0"; + version = "6.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/mqtt-packet/-/mqtt-packet-6.7.0.tgz"; - sha512 = "GzgeeCirQpB59FyhHvf8BLiIYgxctPSxuSyaF2vWnkt7paX7jtuQ8Gpl+DkHCxZmYuv7GQE6zcUAegpafd0MqQ=="; + url = "https://registry.npmjs.org/mqtt-packet/-/mqtt-packet-6.10.0.tgz"; + sha512 = "ja8+mFKIHdB1Tpl6vac+sktqy3gA8t9Mduom1BA75cI+R9AHnZOiaBQwpGiWnaVJLDGRdNhQmFaAqd7tkKSMGA=="; }; }; "ms-2.0.0" = { @@ -3712,31 +4423,31 @@ let sha1 = "5608aeadfc00be6c2901df5f9861788de0d597c8"; }; }; - "ms-2.1.1" = { + "ms-2.1.2" = { name = "ms"; packageName = "ms"; - version = "2.1.1"; + version = "2.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz"; - sha512 = "tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg=="; + url = "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz"; + sha512 = "sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="; }; }; - "ms-2.1.2" = { + "ms-2.1.3" = { name = "ms"; packageName = "ms"; - version = "2.1.2"; + version = "2.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz"; - sha512 = "sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="; + url = "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz"; + sha512 = "6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA=="; }; }; - "mssql-6.3.1" = { + "mssql-6.4.0" = { name = "mssql"; packageName = "mssql"; - version = "6.3.1"; + version = "6.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/mssql/-/mssql-6.3.1.tgz"; - sha512 = "ammxrhbdDpcBWhiZLiy6miiU7ELt9qFbGvwmPbiufn+tBHAYUFR/AgwE4/v4jzPzbatowscmhFx1U61L91uVzQ=="; + url = "https://registry.npmjs.org/mssql/-/mssql-6.4.0.tgz"; + sha512 = "Mtgu3PXqoaL7aHCMurttvEHibjvz5XKjlR6ZCDyAeKtDBORpxm88JyzEU2EESVf7588GulYKc7Gr+Txf5CICBQ=="; }; }; "mute-stream-0.0.8" = { @@ -3748,13 +4459,13 @@ let sha512 = "nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA=="; }; }; - "mysql2-2.1.0" = { + "mysql2-2.3.3" = { name = "mysql2"; packageName = "mysql2"; - version = "2.1.0"; + version = "2.3.3"; src = fetchurl { - url = "https://registry.npmjs.org/mysql2/-/mysql2-2.1.0.tgz"; - sha512 = "9kGVyi930rG2KaHrz3sHwtc6K+GY9d8wWk1XRSYxQiunvGcn4DwuZxOwmK11ftuhhwrYDwGx9Ta4VBwznJn36A=="; + url = "https://registry.npmjs.org/mysql2/-/mysql2-2.3.3.tgz"; + sha512 = "wxJUev6LgMSgACDkb/InIFxDprRa6T95+VEoR+xPvtngtccNH2dGjEB/fVZ8yg1gWv1510c9CvXuJHi5zUm0ZA=="; }; }; "mz-2.7.0" = { @@ -3766,40 +4477,49 @@ let sha512 = "z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q=="; }; }; - "n8n-core-0.62.0" = { + "n8n-core-0.104.0" = { name = "n8n-core"; packageName = "n8n-core"; - version = "0.62.0"; + version = "0.104.0"; src = fetchurl { - url = "https://registry.npmjs.org/n8n-core/-/n8n-core-0.62.0.tgz"; - sha512 = "07RkPn6V5dCov3yt5zu5ASq2ibflji+dSGrSk7wnVrklGPBieuUjpZQuA7QrfQyjy5JUNDDp/Js+XGO8Vx3tew=="; + url = "https://registry.npmjs.org/n8n-core/-/n8n-core-0.104.0.tgz"; + sha512 = "rh8ooCF0zeVjic6JWByuCzcltpeV/OJjUmLcChXU3S6peggCvazvxlU6GOF/+YT69CeQdHwhTmOXSEevu0uzVQ=="; }; }; - "n8n-editor-ui-0.75.0" = { + "n8n-design-system-0.11.0" = { + name = "n8n-design-system"; + packageName = "n8n-design-system"; + version = "0.11.0"; + src = fetchurl { + url = "https://registry.npmjs.org/n8n-design-system/-/n8n-design-system-0.11.0.tgz"; + sha512 = "KL64XTr9sqqiBEEV7on2cdLooleHPyXClFL+THUy2oXDbGqdlyCGykukU7S4aX+nSjrJEQEDMaMcbw3NCHrumg=="; + }; + }; + "n8n-editor-ui-0.130.0" = { name = "n8n-editor-ui"; packageName = "n8n-editor-ui"; - version = "0.75.0"; + version = "0.130.0"; src = fetchurl { - url = "https://registry.npmjs.org/n8n-editor-ui/-/n8n-editor-ui-0.75.0.tgz"; - sha512 = "YWwiqGwTXxpuXjVB5d9qnjxoz55um27zwEfoXS63mNTDfDdIeuxHKQCY2pMWIjwXeYnx0x31NDhoSfjb8YRffA=="; + url = "https://registry.npmjs.org/n8n-editor-ui/-/n8n-editor-ui-0.130.0.tgz"; + sha512 = "UNvZ3CTcqmxJs1JuhLPSMo18nlakzFYAyJ8UKwCvAOGVfGltHweVeaKHnAEs0legDAkdJ3yEtaebTrQjF+dCoA=="; }; }; - "n8n-nodes-base-0.102.0" = { + "n8n-nodes-base-0.161.0" = { name = "n8n-nodes-base"; packageName = "n8n-nodes-base"; - version = "0.102.0"; + version = "0.161.0"; src = fetchurl { - url = "https://registry.npmjs.org/n8n-nodes-base/-/n8n-nodes-base-0.102.0.tgz"; - sha512 = "WDUh2c0qCNDf2c8ZwkA/9RrkU/64A364P2t3wE1c66a8E/n/QJyiLnd4BJAu96cdcm+n2A0DwO9+gX1F50EU5A=="; + url = "https://registry.npmjs.org/n8n-nodes-base/-/n8n-nodes-base-0.161.0.tgz"; + sha512 = "WRTzmzDO3dKZF6WRzQ/d6w2TaYLoPUb+X1kjDWaxF5omwz6UFc63dVtJ+irhyQR8wRj3/ytdrS3xEMDxZ9vXlg=="; }; }; - "n8n-workflow-0.51.0" = { + "n8n-workflow-0.86.0" = { name = "n8n-workflow"; packageName = "n8n-workflow"; - version = "0.51.0"; + version = "0.86.0"; src = fetchurl { - url = "https://registry.npmjs.org/n8n-workflow/-/n8n-workflow-0.51.0.tgz"; - sha512 = "KLjbJ10QhXc7clzmVRO60mftzZTeYR/MSC/RSobJBCzYGbAtnEp38YDg6a3ekznlwd6eIyTcD68xmv4EbSb2dQ=="; + url = "https://registry.npmjs.org/n8n-workflow/-/n8n-workflow-0.86.0.tgz"; + sha512 = "+Kdo5RMEsh7QJ8AkWNTSpyxYRtjpxPmPfifVAFg4HVguW7g5e7f74xlmqD2xnxQybC9B3f6jxvx6WMKbNcT/+A=="; }; }; "named-placeholders-1.1.2" = { @@ -3811,13 +4531,22 @@ let sha512 = "wiFWqxoLL3PGVReSZpjLVxyJ1bRqe+KKJVbr4hGs1KWfTZTQyezHFBbuKj9hsizHyGV2ne7EMjHdxEGAybD5SA=="; }; }; - "nan-2.14.2" = { - name = "nan"; - packageName = "nan"; - version = "2.14.2"; + "nanoclone-0.2.1" = { + name = "nanoclone"; + packageName = "nanoclone"; + version = "0.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/nan/-/nan-2.14.2.tgz"; - sha512 = "M2ufzIiINKCuDfBSAUr1vWQ+vuVcA9kqx8JJUsbQi6yf1uGRyb7HfpdfUr5qLXf3B/t8dPvcjhKMmlfnP47EzQ=="; + url = "https://registry.npmjs.org/nanoclone/-/nanoclone-0.2.1.tgz"; + sha512 = "wynEP02LmIbLpcYw8uBKpcfF6dmg2vcpKqxeH5UcoKEYdExslsdUA4ugFauuaeYdTB76ez6gJW8XAZ6CgkXYxA=="; + }; + }; + "nanoid-3.2.0" = { + name = "nanoid"; + packageName = "nanoid"; + version = "3.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/nanoid/-/nanoid-3.2.0.tgz"; + sha512 = "fmsZYa9lpn69Ad5eDn7FMcnnSR+8R34W9qJEijxYhTbfOWzr22n1QxCMzXLK+ODyW2973V3Fux959iQoUxzUIA=="; }; }; "native-duplexpair-1.0.0" = { @@ -3829,31 +4558,40 @@ let sha1 = "7899078e64bf3c8a3d732601b3d40ff05db58fa0"; }; }; - "needle-2.6.0" = { + "nearley-2.20.1" = { + name = "nearley"; + packageName = "nearley"; + version = "2.20.1"; + src = fetchurl { + url = "https://registry.npmjs.org/nearley/-/nearley-2.20.1.tgz"; + sha512 = "+Mc8UaAebFzgV+KpI5n7DasuuQCHA89dmwm7JXw3TV43ukfNQ9DnBH3Mdb2g/I4Fdxc26pwimBWvjIw0UAILSQ=="; + }; + }; + "needle-2.9.1" = { name = "needle"; packageName = "needle"; - version = "2.6.0"; + version = "2.9.1"; src = fetchurl { - url = "https://registry.npmjs.org/needle/-/needle-2.6.0.tgz"; - sha512 = "KKYdza4heMsEfSWD7VPUIz3zX2XDwOyX2d+geb4vrERZMT5RMU6ujjaD+I5Yr54uZxQ2w6XRTAhHBbSCyovZBg=="; + url = "https://registry.npmjs.org/needle/-/needle-2.9.1.tgz"; + sha512 = "6R9fqJ5Zcmf+uYaFgdIHmLwNldn5HbK8L5ybn7Uz+ylX/rnOsSp1AHcvQSrCaFN+qNM1wpymHqD7mVasEOlHGQ=="; }; }; - "negotiator-0.6.2" = { + "negotiator-0.6.3" = { name = "negotiator"; packageName = "negotiator"; - version = "0.6.2"; + version = "0.6.3"; src = fetchurl { - url = "https://registry.npmjs.org/negotiator/-/negotiator-0.6.2.tgz"; - sha512 = "hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw=="; + url = "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz"; + sha512 = "+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg=="; }; }; - "next-tick-1.0.0" = { - name = "next-tick"; - packageName = "next-tick"; - version = "1.0.0"; + "neo-async-2.6.2" = { + name = "neo-async"; + packageName = "neo-async"; + version = "2.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/next-tick/-/next-tick-1.0.0.tgz"; - sha1 = "ca86d1fe8828169b0120208e3dc8424b9db8342c"; + url = "https://registry.npmjs.org/neo-async/-/neo-async-2.6.2.tgz"; + sha512 = "Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw=="; }; }; "no-case-3.0.4" = { @@ -3865,6 +4603,15 @@ let sha512 = "fgAN3jGAh+RoxUGZHTSOLJIqUc2wmoBwGR4tbpNAKmmovFoWq0OdRkb0VkldReO2a2iBT/OEulG9XSUc10r3zg=="; }; }; + "node-addon-api-3.2.1" = { + name = "node-addon-api"; + packageName = "node-addon-api"; + version = "3.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/node-addon-api/-/node-addon-api-3.2.1.tgz"; + sha512 = "mmcei9JghVNDYydghQmeDX8KoAm0FAiYyIcUt/N4nhyAipB17pllZQDOJD2fotxABnt4Mdz+dKTO7eftLg4d0A=="; + }; + }; "node-ensure-0.0.0" = { name = "node-ensure"; packageName = "node-ensure"; @@ -3874,6 +4621,15 @@ let sha1 = "ecae764150de99861ec5c810fd5d096b183932a7"; }; }; + "node-fetch-2.6.7" = { + name = "node-fetch"; + packageName = "node-fetch"; + version = "2.6.7"; + src = fetchurl { + url = "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.7.tgz"; + sha512 = "ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ=="; + }; + }; "node-pre-gyp-0.11.0" = { name = "node-pre-gyp"; packageName = "node-pre-gyp"; @@ -3883,6 +4639,15 @@ let sha512 = "TwWAOZb0j7e9eGaf9esRx3ZcLaE5tQ2lvYy1pb5IAaG1a2e2Kv5Lms1Y4hpj+ciXJRofIxxlt5haeQ/2ANeE0Q=="; }; }; + "node-ssh-12.0.3" = { + name = "node-ssh"; + packageName = "node-ssh"; + version = "12.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/node-ssh/-/node-ssh-12.0.3.tgz"; + sha512 = "+TrX99Fvu50ZwBu/1Z9oWV1xC+vjADCJACSmvdgYUeUH/PKIX6Y5ltPvrh30WFXcxaP1wHN09BBVdQ3jfZlfoA=="; + }; + }; "nodeify-1.0.1" = { name = "nodeify"; packageName = "nodeify"; @@ -3892,22 +4657,22 @@ let sha1 = "64ab69a7bdbaf03ce107b4f0335c87c0b9e91b1d"; }; }; - "nodemailer-6.4.11" = { + "nodemailer-6.7.0" = { name = "nodemailer"; packageName = "nodemailer"; - version = "6.4.11"; + version = "6.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/nodemailer/-/nodemailer-6.4.11.tgz"; - sha512 = "BVZBDi+aJV4O38rxsUh164Dk1NCqgh6Cm0rQSb9SK/DHGll/DrCMnycVDD7msJgZCnmVa8ASo8EZzR7jsgTukQ=="; + url = "https://registry.npmjs.org/nodemailer/-/nodemailer-6.7.0.tgz"; + sha512 = "AtiTVUFHLiiDnMQ43zi0YgkzHOEWUkhDgPlBXrsDzJiJvB29Alo4OKxHQ0ugF3gRqRQIneCLtZU3yiUo7pItZw=="; }; }; - "nodemailer-6.4.17" = { + "nodemailer-6.7.2" = { name = "nodemailer"; packageName = "nodemailer"; - version = "6.4.17"; + version = "6.7.2"; src = fetchurl { - url = "https://registry.npmjs.org/nodemailer/-/nodemailer-6.4.17.tgz"; - sha512 = "89ps+SBGpo0D4Bi5ZrxcrCiRFaMmkCt+gItMXQGzEtZVR3uAD3QAQIDoxTWnx3ky0Dwwy/dhFrQ+6NNGXpw/qQ=="; + url = "https://registry.npmjs.org/nodemailer/-/nodemailer-6.7.2.tgz"; + sha512 = "Dz7zVwlef4k5R71fdmxwR8Q39fiboGbu3xgswkzGwczUfjp873rVxt1O46+Fh0j1ORnAC6L9+heI8uUpO6DT7Q=="; }; }; "nopt-4.0.3" = { @@ -3919,13 +4684,31 @@ let sha512 = "CvaGwVMztSMJLOeXPrez7fyfObdZqNUK1cPAEzLHrTybIua9pMdmmPR5YwtfNftIOMv3DPUhFaxsZMNTQO20Kg=="; }; }; - "npm-bundled-1.1.1" = { + "normalize-path-2.1.1" = { + name = "normalize-path"; + packageName = "normalize-path"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz"; + sha1 = "1ab28b556e198363a8c1a6f7e6fa20137fe6aed9"; + }; + }; + "normalize-path-3.0.0" = { + name = "normalize-path"; + packageName = "normalize-path"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz"; + sha512 = "6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA=="; + }; + }; + "npm-bundled-1.1.2" = { name = "npm-bundled"; packageName = "npm-bundled"; - version = "1.1.1"; + version = "1.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/npm-bundled/-/npm-bundled-1.1.1.tgz"; - sha512 = "gqkfgGePhTpAEgUsGEgcq1rqPXA+tv/aVBlgEzfXwA1yiUJF7xtEt3CtVwOjNYQOVknDk0F20w58Fnm3EtG0fA=="; + url = "https://registry.npmjs.org/npm-bundled/-/npm-bundled-1.1.2.tgz"; + sha512 = "x5DHup0SuyQcmL3s7Rx/YQ8sbw/Hzg0rj48eN0dV7hf5cmQq5PXIeioroH3raV1QC1yh3uTYuMThvEQF3iKgGQ=="; }; }; "npm-normalize-package-bin-1.0.1" = { @@ -3955,13 +4738,13 @@ let sha512 = "2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg=="; }; }; - "nth-check-2.0.0" = { + "nth-check-2.0.1" = { name = "nth-check"; packageName = "nth-check"; - version = "2.0.0"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/nth-check/-/nth-check-2.0.0.tgz"; - sha512 = "i4sc/Kj8htBrAiH1viZ0TgU8Y5XqCaV/FziYK6TBczxmeKm3AEFWqqF3195yKudrarqy7Zu80Ra5dobFjn9X/Q=="; + url = "https://registry.npmjs.org/nth-check/-/nth-check-2.0.1.tgz"; + sha512 = "it1vE95zF6dTT9lBsYbxvqh0Soy4SPowchj0UBGj/V6cTPnXXtQOPUbhZ6CmGzAD/rW22LQK6E96pcdJXk4A4w=="; }; }; "number-is-nan-1.0.1" = { @@ -4000,6 +4783,42 @@ let sha1 = "2109adc7965887cfc05cbbd442cac8bfbb360863"; }; }; + "object-inspect-1.12.0" = { + name = "object-inspect"; + packageName = "object-inspect"; + version = "1.12.0"; + src = fetchurl { + url = "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.0.tgz"; + sha512 = "Ho2z80bVIvJloH+YzRmpZVQe87+qASmBUKZDWgx9cu+KDrX2ZDH/3tMy+gXbZETVGs2M8YdxObOh7XAtim9Y0g=="; + }; + }; + "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.assign-4.1.2" = { + name = "object.assign"; + packageName = "object.assign"; + version = "4.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/object.assign/-/object.assign-4.1.2.tgz"; + sha512 = "ixT2L5THXsApyiUPYKmW+2EHpXXe5Ii3M+f4e+aJFAHao5amFRW6J0OO6c/LU8Be47utCx2GL89hxGB6XSmKuQ=="; + }; + }; + "object.getownpropertydescriptors-2.1.3" = { + name = "object.getownpropertydescriptors"; + packageName = "object.getownpropertydescriptors"; + version = "2.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.3.tgz"; + sha512 = "VdDoCwvJI4QdC6ndjpqFmoL3/+HxffFBbcJzKi5hwLLqqx3mdbedRpfZDdK0SrOSauj8X4GzBvnDZl4vTN7dOw=="; + }; + }; "ocsp-1.2.0" = { name = "ocsp"; packageName = "ocsp"; @@ -4054,13 +4873,13 @@ let sha512 = "kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg=="; }; }; - "open-7.4.0" = { + "open-7.4.2" = { name = "open"; packageName = "open"; - version = "7.4.0"; + version = "7.4.2"; src = fetchurl { - url = "https://registry.npmjs.org/open/-/open-7.4.0.tgz"; - sha512 = "PGoBCX/lclIWlpS/R2PQuIR4NJoXh6X5AwVzE7WXnWRGvHg7+4TBCgsujUgiPpm0K1y4qvQeWnCWVTpTKZBtvA=="; + url = "https://registry.npmjs.org/open/-/open-7.4.2.tgz"; + sha512 = "MVHddDVweXZF3awtlAS+6pgKLlm/JgxZ90+/NBurBoQctVOOB/zDdVjcyPzQ+0laDGbsWgrRkflI65sQeOgT9Q=="; }; }; "openurl-1.1.1" = { @@ -4072,6 +4891,15 @@ let sha1 = "3875b4b0ef7a52c156f0db41d4609dbb0f94b387"; }; }; + "optional-require-1.1.8" = { + name = "optional-require"; + packageName = "optional-require"; + version = "1.1.8"; + src = fetchurl { + url = "https://registry.npmjs.org/optional-require/-/optional-require-1.1.8.tgz"; + sha512 = "jq83qaUb0wNg9Krv1c5OQ+58EK+vHde6aBPzLvPPqJm89UQWsvSuFy9X/OSNJnFeSOKo7btE0n8Nl2+nE+z5nA=="; + }; + }; "ordered-read-streams-1.0.1" = { name = "ordered-read-streams"; packageName = "ordered-read-streams"; @@ -4117,13 +4945,40 @@ let sha512 = "0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g=="; }; }; - "p-cancelable-2.0.0" = { + "p-cancelable-2.1.1" = { name = "p-cancelable"; packageName = "p-cancelable"; - version = "2.0.0"; + version = "2.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/p-cancelable/-/p-cancelable-2.0.0.tgz"; - sha512 = "wvPXDmbMmu2ksjkB4Z3nZWTSkJEb9lqVdMaCKpZUGJG9TMiNp9XcbG3fn9fPKjem04fJMJnXoyFPk2FmgiaiNg=="; + url = "https://registry.npmjs.org/p-cancelable/-/p-cancelable-2.1.1.tgz"; + sha512 = "BZOr3nRQHOntUjTrH8+Lh54smKHoHyur8We1V8DSMVrl5A2malOOwuJRnKRDjSnkoeBh4at6BwEnb5I7Jl31wg=="; + }; + }; + "p-finally-1.0.0" = { + name = "p-finally"; + packageName = "p-finally"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz"; + sha1 = "3fbcfb15b899a44123b34b6dcc18b724336a2cae"; + }; + }; + "p-map-2.1.0" = { + name = "p-map"; + packageName = "p-map"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/p-map/-/p-map-2.1.0.tgz"; + sha512 = "y3b8Kpd8OAN444hxfBbFfj1FY/RjtTd8tzYwhUqNYXx0fXx2iX4maP4Qr6qhIKbQXI02wTLAda4fYUbDagTUFw=="; + }; + }; + "p-timeout-3.2.0" = { + name = "p-timeout"; + packageName = "p-timeout"; + version = "3.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/p-timeout/-/p-timeout-3.2.0.tgz"; + sha512 = "rhIwUycgwwKcP9yTOOFK/AKsAopjjCakVqLHePO3CC6Mir1Z99xT+R63jZxAT5lFZLa2inS5h+ZS2GvR99/FBg=="; }; }; "packet-reader-1.0.0" = { @@ -4153,6 +5008,24 @@ let sha1 = "746a167638083a860b0eef6732cb27ed46c32977"; }; }; + "parse-github-url-1.0.2" = { + name = "parse-github-url"; + packageName = "parse-github-url"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/parse-github-url/-/parse-github-url-1.0.2.tgz"; + sha512 = "kgBf6avCbO3Cn6+RnzRGLkUsv4ZVqv/VfAYkRsyBcgkshNvVBkRn1FEZcW0Jb+npXQWm2vHPnnOqFteZxRRGNw=="; + }; + }; + "parse-passwd-1.0.0" = { + name = "parse-passwd"; + packageName = "parse-passwd"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/parse-passwd/-/parse-passwd-1.0.0.tgz"; + sha1 = "6d5b934a456993b23d37f40a382d6f1666a8e5c6"; + }; + }; "parse5-5.1.1" = { name = "parse5"; packageName = "parse5"; @@ -4180,6 +5053,15 @@ let sha512 = "qPuWvbLgvDGilKc5BoicRovlT4MtYT6JfJyBOMDsKoiT+GiuP5qyrPCnR9HcPECIJJmZh5jRndyNThnhhb/vlA=="; }; }; + "parseley-0.7.0" = { + name = "parseley"; + packageName = "parseley"; + version = "0.7.0"; + src = fetchurl { + url = "https://registry.npmjs.org/parseley/-/parseley-0.7.0.tgz"; + sha512 = "xyOytsdDu077M3/46Am+2cGXEKM9U9QclBDv7fimY7e+BBlxh2JcBp2mgNsmkyA9uvgyTjVzDi7cP1v4hcFxbw=="; + }; + }; "parseurl-1.3.3" = { name = "parseurl"; packageName = "parseurl"; @@ -4252,13 +5134,13 @@ let sha512 = "v6ZJ/efsBpGrGGknjtq9J/oC8tZWq0KWL5vQrk2GlzLEQPUDB1ex+13Rmidl1neNN358Jn9EHZw5y07FFtaC7A=="; }; }; - "peek-readable-3.1.3" = { + "peek-readable-4.1.0" = { name = "peek-readable"; packageName = "peek-readable"; - version = "3.1.3"; + version = "4.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/peek-readable/-/peek-readable-3.1.3.tgz"; - sha512 = "mpAcysyRJxmICBcBa5IXH7SZPvWkcghm6Fk8RekoS3v+BpbSzlZzuWbMx+GXrlUwESi9qHar4nVEZNMKylIHvg=="; + url = "https://registry.npmjs.org/peek-readable/-/peek-readable-4.1.0.tgz"; + sha512 = "ZI3LnwUv5nOGbQzD9c2iDG6toheuXSZP5esSHBjopsXH4dg19soufvpUGA3uohi5anFtGb2lhAVdHzH6R/Evvg=="; }; }; "performance-now-2.1.0" = { @@ -4270,22 +5152,31 @@ let sha1 = "6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"; }; }; - "pg-8.5.1" = { + "pg-8.7.1" = { name = "pg"; packageName = "pg"; - version = "8.5.1"; + version = "8.7.1"; src = fetchurl { - url = "https://registry.npmjs.org/pg/-/pg-8.5.1.tgz"; - sha512 = "9wm3yX9lCfjvA98ybCyw2pADUivyNWT/yIP4ZcDVpMN0og70BUWYEGXPCTAQdGTAqnytfRADb7NERrY1qxhIqw=="; + url = "https://registry.npmjs.org/pg/-/pg-8.7.1.tgz"; + sha512 = "7bdYcv7V6U3KAtWjpQJJBww0UEsWuh4yQ/EjNf2HeO/NnvKjpvhEIe/A/TleP6wtmSKnUnghs5A9jUoK6iDdkA=="; }; }; - "pg-connection-string-2.4.0" = { + "pg-8.7.3" = { + name = "pg"; + packageName = "pg"; + version = "8.7.3"; + src = fetchurl { + url = "https://registry.npmjs.org/pg/-/pg-8.7.3.tgz"; + sha512 = "HPmH4GH4H3AOprDJOazoIcpI49XFsHCe8xlrjHkWiapdbHK+HLtbm/GQzXYAZwmPju/kzKhjaSfMACG+8cgJcw=="; + }; + }; + "pg-connection-string-2.5.0" = { name = "pg-connection-string"; packageName = "pg-connection-string"; - version = "2.4.0"; + version = "2.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/pg-connection-string/-/pg-connection-string-2.4.0.tgz"; - sha512 = "3iBXuv7XKvxeMrIgym7njT+HlZkwZqqGX4Bu9cci8xHZNT+Um1gWKqCsAzcC0d95rcKMU5WBg6YRUcHyV0HZKQ=="; + url = "https://registry.npmjs.org/pg-connection-string/-/pg-connection-string-2.5.0.tgz"; + sha512 = "r5o/V/ORTA6TmUnyWZR9nCj1klXCO2CEKNRlVuJptZe85QuhFayC7WeMic7ndayT5IRIR0S0xFxFi2ousartlQ=="; }; }; "pg-int8-1.0.1" = { @@ -4306,31 +5197,31 @@ let sha512 = "1KdmFGGTP6jplJoI8MfvRlfvMiyBivMRP7/ffh4a11RUFJ7kC2J0ZHlipoKiH/1hz+DVgceon9U2qbaHpPeyPg=="; }; }; - "pg-pool-3.2.2" = { + "pg-pool-3.5.1" = { name = "pg-pool"; packageName = "pg-pool"; - version = "3.2.2"; + version = "3.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/pg-pool/-/pg-pool-3.2.2.tgz"; - sha512 = "ORJoFxAlmmros8igi608iVEbQNNZlp89diFVx6yV5v+ehmpMY9sK6QgpmgoXbmkNaBAx8cOOZh9g80kJv1ooyA=="; + url = "https://registry.npmjs.org/pg-pool/-/pg-pool-3.5.1.tgz"; + sha512 = "6iCR0wVrro6OOHFsyavV+i6KYL4lVNyYAB9RD18w66xSzN+d8b66HiwuP30Gp1SH5O9T82fckkzsRjlrhD0ioQ=="; }; }; - "pg-promise-10.9.2" = { + "pg-promise-10.11.1" = { name = "pg-promise"; packageName = "pg-promise"; - version = "10.9.2"; + version = "10.11.1"; src = fetchurl { - url = "https://registry.npmjs.org/pg-promise/-/pg-promise-10.9.2.tgz"; - sha512 = "ewelfzZeSPe5sbgd5ylB6edVXqoD8AH/fqZj4wPLL0242vXtkFY3JuUqt3mfvTruOqZHhoINpoXTfmC9UXbZ7A=="; + url = "https://registry.npmjs.org/pg-promise/-/pg-promise-10.11.1.tgz"; + sha512 = "HAv32WSKf2m2RqHerW5RmANn/mcXIwWXbg/gOfGQcoS0SE+8iBi3Jj4JmoR4PNzSEozo/y/npy4e6F16psOItw=="; }; }; - "pg-protocol-1.4.0" = { + "pg-protocol-1.5.0" = { name = "pg-protocol"; packageName = "pg-protocol"; - version = "1.4.0"; + version = "1.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/pg-protocol/-/pg-protocol-1.4.0.tgz"; - sha512 = "El+aXWcwG/8wuFICMQjM5ZSAm6OWiJicFdNYo+VY3QP+8vI4SvLIWVe51PppTzMhikUJR+PsyIFKqfdXPz/yxA=="; + url = "https://registry.npmjs.org/pg-protocol/-/pg-protocol-1.5.0.tgz"; + sha512 = "muRttij7H8TqRNu/DxrAJQITO4Ac7RmX3Klyr/9mJEOBeIpgnF8f9jAfRz5d3XwQZl5qBjF9gLsUtMPJE0vezQ=="; }; }; "pg-types-2.2.0" = { @@ -4342,22 +5233,22 @@ let sha512 = "qTAAlrEsl8s4OiEQY69wDvcMIdQN6wdz5ojQiOy6YRMuynxenON0O5oCpJI6lshc6scgAY8qvJ2On/p+CXY0GA=="; }; }; - "pgpass-1.0.4" = { + "pgpass-1.0.5" = { name = "pgpass"; packageName = "pgpass"; - version = "1.0.4"; + version = "1.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/pgpass/-/pgpass-1.0.4.tgz"; - sha512 = "YmuA56alyBq7M59vxVBfPJrGSozru8QAdoNlWuW3cz8l+UX3cWge0vTvjKhsSHSJpo3Bom8/Mm6hf0TR5GY0+w=="; + url = "https://registry.npmjs.org/pgpass/-/pgpass-1.0.5.tgz"; + sha512 = "FdW9r/jQZhSeohs1Z3sI1yxFQNFvMcnmfuj4WBMUTxOrAyLMaTcE1aAMBiTlbMNaXvBCQuVi0R7hd8udDSP7ug=="; }; }; - "picomatch-2.2.2" = { + "picomatch-2.3.1" = { name = "picomatch"; packageName = "picomatch"; - version = "2.2.2"; + version = "2.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/picomatch/-/picomatch-2.2.2.tgz"; - sha512 = "q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg=="; + url = "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz"; + sha512 = "JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA=="; }; }; "popsicle-12.1.0" = { @@ -4396,13 +5287,13 @@ let sha512 = "XCpzVjVk7tty+IJnSdqWevmOr1n8HNDhL86v7mZ6T1JIIf2KGybxUk9mm7ZFOhWMkGB0e8XkacHip7BV8AQWQA=="; }; }; - "popsicle-transport-http-1.1.1" = { + "popsicle-transport-http-1.2.1" = { name = "popsicle-transport-http"; packageName = "popsicle-transport-http"; - version = "1.1.1"; + version = "1.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/popsicle-transport-http/-/popsicle-transport-http-1.1.1.tgz"; - sha512 = "RNbifrl5ckXLk1X6YGhjDb0gL5yAH1nvultmboiVGLTnWDbwaoxhEP8He9epMFOPuSDuNJ//TMRoN+XfpN0KCw=="; + url = "https://registry.npmjs.org/popsicle-transport-http/-/popsicle-transport-http-1.2.1.tgz"; + sha512 = "i5r3IGHkGiBDm1oPFvOfEeSGWR0lQJcsdTqwvvDjXqcTHYJJi4iSi3ecXIttDiTBoBtRAFAE9nF91fspQr63FQ=="; }; }; "popsicle-transport-xhr-2.0.0" = { @@ -4468,6 +5359,33 @@ let sha512 = "zA2SmoLaxZyArQTOPj5LXecR+RagfPSU5Kw1qP+jkWeNlrq+eJZyY2oS68SU1Z/7/myXM4lo9716laOFAVStCQ=="; }; }; + "printj-1.2.3" = { + name = "printj"; + packageName = "printj"; + version = "1.2.3"; + src = fetchurl { + url = "https://registry.npmjs.org/printj/-/printj-1.2.3.tgz"; + sha512 = "sanczS6xOJOg7IKDvi4sGOUOe7c1tsEzjwlLFH/zgwx/uyImVM9/rgBkc8AfiQa/Vg54nRd8mkm9yI7WV/O+WA=="; + }; + }; + "printj-1.3.1" = { + name = "printj"; + packageName = "printj"; + version = "1.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/printj/-/printj-1.3.1.tgz"; + sha512 = "GA3TdL8szPK4AQ2YnOe/b+Y1jUFwmmGMMK/qbY7VcE3Z7FU8JstbKiKRzO6CIiAKPhTO8m01NoQ0V5f3jc4OGg=="; + }; + }; + "process-0.11.10" = { + name = "process"; + packageName = "process"; + version = "0.11.10"; + src = fetchurl { + url = "https://registry.npmjs.org/process/-/process-0.11.10.tgz"; + sha1 = "7332300e840161bda3e69a1d1d91a7d4bc16f182"; + }; + }; "process-nextick-args-2.0.1" = { name = "process-nextick-args"; packageName = "process-nextick-args"; @@ -4477,6 +5395,15 @@ let sha512 = "3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag=="; }; }; + "prom-client-13.2.0" = { + name = "prom-client"; + packageName = "prom-client"; + version = "13.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/prom-client/-/prom-client-13.2.0.tgz"; + sha512 = "wGr5mlNNdRNzEhRYXgboUU2LxHWIojxscJKmtG3R8f4/KiWqyYgXTLHs0+Ted7tG3zFT7pgHJbtomzZ1L0ARaQ=="; + }; + }; "promise-1.3.0" = { name = "promise"; packageName = "promise"; @@ -4504,13 +5431,49 @@ let sha1 = "b4f8082a74035647703506763edb14230d9865da"; }; }; - "proxy-addr-2.0.6" = { + "promise-retry-2.0.1" = { + name = "promise-retry"; + packageName = "promise-retry"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/promise-retry/-/promise-retry-2.0.1.tgz"; + sha512 = "y+WKFlBR8BGXnsNlIHFGPZmyDf3DFMoLhaflAnyZgV6rG6xu+JwesTo2Q9R6XwYmtmwAFCkAk3e35jEdoeh/3g=="; + }; + }; + "promise.prototype.finally-3.1.3" = { + name = "promise.prototype.finally"; + packageName = "promise.prototype.finally"; + version = "3.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/promise.prototype.finally/-/promise.prototype.finally-3.1.3.tgz"; + sha512 = "EXRF3fC9/0gz4qkt/f5EP5iW4kj9oFpBICNpCNOb/52+8nlHIX07FPLbi/q4qYBQ1xZqivMzTpNQSnArVASolQ=="; + }; + }; + "property-expr-2.0.5" = { + name = "property-expr"; + packageName = "property-expr"; + version = "2.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/property-expr/-/property-expr-2.0.5.tgz"; + sha512 = "IJUkICM5dP5znhCckHSv30Q4b5/JA5enCtkRHYaOVOAocnH/1BQEYTC5NMfT3AVl/iXKdr3aqQbQn9DxyWknwA=="; + }; + }; + "proxy-addr-2.0.7" = { name = "proxy-addr"; packageName = "proxy-addr"; - version = "2.0.6"; + version = "2.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.6.tgz"; - sha512 = "dh/frvCBVmSsDYzw6n926jv974gddhkFPfiN8hPOi30Wax25QZyZEGveluCgliBnqmuM+UJmBErbAUFIoDbjOw=="; + url = "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.7.tgz"; + sha512 = "llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg=="; + }; + }; + "proxy-from-env-1.1.0" = { + name = "proxy-from-env"; + packageName = "proxy-from-env"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz"; + sha512 = "D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg=="; }; }; "pseudomap-1.0.2" = { @@ -4558,6 +5521,15 @@ let sha512 = "oClZI37HvuUJJxSKKrC17bZ9Cu0ZYhEAGPsPUy9KlMUmv9dKX2o77RUmq7f3XjIxbwyGwYzbzQ1L2Ks8sIradQ=="; }; }; + "punycode-1.3.2" = { + name = "punycode"; + packageName = "punycode"; + version = "1.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz"; + sha1 = "9653a036fb7c1ee42342f2325cceefea3926c48d"; + }; + }; "punycode-2.1.1" = { name = "punycode"; packageName = "punycode"; @@ -4567,22 +5539,49 @@ let sha512 = "XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A=="; }; }; - "qs-6.5.2" = { + "python-struct-1.1.3" = { + name = "python-struct"; + packageName = "python-struct"; + version = "1.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/python-struct/-/python-struct-1.1.3.tgz"; + sha512 = "UsI/mNvk25jRpGKYI38Nfbv84z48oiIWwG67DLVvjRhy8B/0aIK+5Ju5WOHgw/o9rnEmbAS00v4rgKFQeC332Q=="; + }; + }; + "qs-6.10.3" = { name = "qs"; packageName = "qs"; - version = "6.5.2"; + version = "6.10.3"; src = fetchurl { - url = "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz"; - sha512 = "N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA=="; + url = "https://registry.npmjs.org/qs/-/qs-6.10.3.tgz"; + sha512 = "wr7M2E0OFRfIfJZjKGieI8lBKb7fRCH4Fv5KNPEs7gJ8jadvotdsS08PzOKR7opXhZ/Xkjtt3WF9g38drmyRqQ=="; }; }; - "qs-6.7.0" = { + "qs-6.5.3" = { name = "qs"; packageName = "qs"; - version = "6.7.0"; + version = "6.5.3"; src = fetchurl { - url = "https://registry.npmjs.org/qs/-/qs-6.7.0.tgz"; - sha512 = "VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ=="; + url = "https://registry.npmjs.org/qs/-/qs-6.5.3.tgz"; + sha512 = "qxXIEh4pCGfHICj1mAJQ2/2XVZkjCDTcEgfoSQxc/fYivUZxTkk7L3bDBJSoNrEzXI17oUO5Dp07ktqE5KzczA=="; + }; + }; + "qs-6.9.6" = { + name = "qs"; + packageName = "qs"; + version = "6.9.6"; + src = fetchurl { + url = "https://registry.npmjs.org/qs/-/qs-6.9.6.tgz"; + sha512 = "TIRk4aqYLNoJUbd+g2lEdz5kLWIuTMRagAXxl78Q0RiVjAOugHmeKNGdd3cwo/ktpf9aL9epCfFqWDEKysUlLQ=="; + }; + }; + "querystring-0.2.0" = { + name = "querystring"; + packageName = "querystring"; + version = "0.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz"; + sha1 = "b209849203bb25df820da756e747005878521620"; }; }; "querystringify-2.2.0" = { @@ -4594,6 +5593,15 @@ let sha512 = "FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ=="; }; }; + "queue-microtask-1.2.3" = { + name = "queue-microtask"; + packageName = "queue-microtask"; + version = "1.2.3"; + src = fetchurl { + url = "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz"; + sha512 = "NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A=="; + }; + }; "quoted-printable-1.0.1" = { name = "quoted-printable"; packageName = "quoted-printable"; @@ -4603,6 +5611,24 @@ let sha1 = "9eebf5eb3d11eef022b264fd2d2b6b2bb3b84cc3"; }; }; + "railroad-diagrams-1.0.0" = { + name = "railroad-diagrams"; + packageName = "railroad-diagrams"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/railroad-diagrams/-/railroad-diagrams-1.0.0.tgz"; + sha1 = "eb7e6267548ddedfb899c1b90e57374559cddb7e"; + }; + }; + "randexp-0.4.6" = { + name = "randexp"; + packageName = "randexp"; + version = "0.4.6"; + src = fetchurl { + url = "https://registry.npmjs.org/randexp/-/randexp-0.4.6.tgz"; + sha512 = "80WNmd9DA0tmZrw9qQa62GPPWfuXJknrmVmLcxvq4uZBdYqb1wYoKTmnlGUchvVWe0XiLupYkBoXVOxz3C8DYQ=="; + }; + }; "random-bytes-1.0.0" = { name = "random-bytes"; packageName = "random-bytes"; @@ -4612,6 +5638,15 @@ let sha1 = "4f68a1dc0ae58bd3fb95848c30324db75d64360b"; }; }; + "randombytes-2.1.0" = { + name = "randombytes"; + packageName = "randombytes"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz"; + sha512 = "vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ=="; + }; + }; "range-parser-1.2.1" = { name = "range-parser"; packageName = "range-parser"; @@ -4621,13 +5656,13 @@ let sha512 = "Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg=="; }; }; - "raw-body-2.4.0" = { + "raw-body-2.4.2" = { name = "raw-body"; packageName = "raw-body"; - version = "2.4.0"; + version = "2.4.2"; src = fetchurl { - url = "https://registry.npmjs.org/raw-body/-/raw-body-2.4.0.tgz"; - sha512 = "4Oz8DUIwdvoa5qMJelxipzi/iJIi40O5cGV1wNYp5hvZP8ZN0T+jiNkL0QepXs+EsQ9XJ8ipEDoiH70ySUJP3Q=="; + url = "https://registry.npmjs.org/raw-body/-/raw-body-2.4.2.tgz"; + sha512 = "RPMAFUJP19WIet/99ngh6Iv8fzAbqum4Li7AD6DtGaW2RpMB/11xDoalPiJMTbu6I3hkbMVkATvZrqb9EEqeeQ=="; }; }; "rc-1.2.8" = { @@ -4675,40 +5710,49 @@ let sha512 = "+oZJurc4hXpaaqsN68GoZGQAQIA3qr09Or4fqEsargABnbe5Aau8hFn6ISVleT3cpY/0n/8drn7huyyEvTbghA=="; }; }; - "redeyed-2.1.1" = { - name = "redeyed"; - packageName = "redeyed"; - version = "2.1.1"; + "readdirp-3.6.0" = { + name = "readdirp"; + packageName = "readdirp"; + version = "3.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/redeyed/-/redeyed-2.1.1.tgz"; - sha1 = "8984b5815d99cb220469c99eeeffe38913e6cc0b"; + url = "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz"; + sha512 = "hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA=="; }; }; - "redis-2.8.0" = { + "redis-3.1.2" = { name = "redis"; packageName = "redis"; - version = "2.8.0"; + version = "3.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/redis/-/redis-2.8.0.tgz"; - sha512 = "M1OkonEQwtRmZv4tEWF2VgpG0JWJ8Fv1PhlgT5+B+uNq2cA3Rt1Yt/ryoR+vQNOQcIEgdCdfH0jr3bDpihAw1A=="; + url = "https://registry.npmjs.org/redis/-/redis-3.1.2.tgz"; + sha512 = "grn5KoZLr/qrRQVwoSkmzdbw6pwF+/rwODtrOr6vuBRiR/f3rjSTGupbF90Zpqm2oenix8Do6RV7pYEkGwlKkw=="; }; }; - "redis-commands-1.6.0" = { + "redis-commands-1.7.0" = { name = "redis-commands"; packageName = "redis-commands"; - version = "1.6.0"; + version = "1.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/redis-commands/-/redis-commands-1.6.0.tgz"; - sha512 = "2jnZ0IkjZxvguITjFTrGiLyzQZcTvaw8DAaCXxZq/dsHXz7KfMQ3OUJy7Tz9vnRtZRVz6VRCPDvruvU8Ts44wQ=="; + url = "https://registry.npmjs.org/redis-commands/-/redis-commands-1.7.0.tgz"; + sha512 = "nJWqw3bTFy21hX/CPKHth6sfhZbdiHP6bTawSgQBlKOVRG7EZkfHbbHwQJnrE4vsQf0CMNE+3gJ4Fmm16vdVlQ=="; }; }; - "redis-parser-2.6.0" = { + "redis-errors-1.2.0" = { + name = "redis-errors"; + packageName = "redis-errors"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/redis-errors/-/redis-errors-1.2.0.tgz"; + sha1 = "eb62d2adb15e4eaf4610c04afe1529384250abad"; + }; + }; + "redis-parser-3.0.0" = { name = "redis-parser"; packageName = "redis-parser"; - version = "2.6.0"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/redis-parser/-/redis-parser-2.6.0.tgz"; - sha1 = "52ed09dacac108f1a631c07e9b69941e7a19504b"; + url = "https://registry.npmjs.org/redis-parser/-/redis-parser-3.0.0.tgz"; + sha1 = "b66d828cdcafe6b4b8a428a7def4c6bcac31c8b4"; }; }; "reflect-metadata-0.1.13" = { @@ -4720,6 +5764,15 @@ let sha512 = "Ts1Y/anZELhSsjMcU605fU9RE4Oi3p5ORujwbIKXfWa+0Zxs510Qrmrce5/Jowq3cHSZSJqBjypxmHarc+vEWg=="; }; }; + "regenerator-runtime-0.13.9" = { + name = "regenerator-runtime"; + packageName = "regenerator-runtime"; + version = "0.13.9"; + src = fetchurl { + url = "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.9.tgz"; + sha512 = "p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA=="; + }; + }; "reinterval-1.1.0" = { name = "reinterval"; packageName = "reinterval"; @@ -4738,6 +5791,15 @@ let sha1 = "c24bce2a283adad5bc3f58e0d48249b92379d8ef"; }; }; + "remove-trailing-slash-0.1.1" = { + name = "remove-trailing-slash"; + packageName = "remove-trailing-slash"; + version = "0.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/remove-trailing-slash/-/remove-trailing-slash-0.1.1.tgz"; + sha512 = "o4S4Qh6L2jpnCy83ysZDau+VORNvnFw07CKSAymkd6ICNVEPisMyzlc00KlvvicsxKck94SEwhDnMNdICzO+tA=="; + }; + }; "request-2.88.2" = { name = "request"; packageName = "request"; @@ -4765,13 +5827,22 @@ let sha512 = "wcW+sIUiWnKgNY0dqCpOZkUbF/I+YPi+f09JZIDa39Ec+q82CpSYniDp+ISgTTbKmnpJWASeJBPZmoxH84wt3g=="; }; }; - "requestretry-4.1.2" = { + "requestretry-6.0.0" = { name = "requestretry"; packageName = "requestretry"; - version = "4.1.2"; + version = "6.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/requestretry/-/requestretry-4.1.2.tgz"; - sha512 = "N1WAp+8eOy8NfsVBChcSxNCKvPY1azOpliQ4Sby4WDe0HFEhdKywlNZeROMBQ+BI3Jpc0eNOT1KVFGREawtahA=="; + url = "https://registry.npmjs.org/requestretry/-/requestretry-6.0.0.tgz"; + sha512 = "X7O+BMlfHgzetfSDtgQIMinLn1BuT+95W12iffDzyOS+HLoBEIQqCZv++UTChUWVjOu+pudbocD76+4j+jK9ww=="; + }; + }; + "require-at-1.0.6" = { + name = "require-at"; + packageName = "require-at"; + version = "1.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/require-at/-/require-at-1.0.6.tgz"; + sha512 = "7i1auJbMUrXEAZCOQ0VNJgmcT2VOKPRl2YGJwgpHpC9CE91Mv4/4UYIUm4chGJaI381ZDq1JUicFii64Hapd8g=="; }; }; "require-directory-2.1.1" = { @@ -4783,15 +5854,6 @@ let sha1 = "8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"; }; }; - "require_optional-1.0.1" = { - name = "require_optional"; - packageName = "require_optional"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/require_optional/-/require_optional-1.0.1.tgz"; - sha512 = "qhM/y57enGWHAe3v/NcwML6a3/vfESLe/sGM2dII+gEO0BpKRUkWZow/tyloNqJyN6kXSl3RyyM8Ll5D/sJP8g=="; - }; - }; "requires-port-1.0.0" = { name = "requires-port"; packageName = "requires-port"; @@ -4801,15 +5863,6 @@ let sha1 = "925d2601d39ac485e091cf0da5c6e694dc3dcaff"; }; }; - "resolve-from-2.0.0" = { - name = "resolve-from"; - packageName = "resolve-from"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/resolve-from/-/resolve-from-2.0.0.tgz"; - sha1 = "9480ab20e94ffa1d9e80a804c7ea147611966b57"; - }; - }; "restore-cursor-3.1.0" = { name = "restore-cursor"; packageName = "restore-cursor"; @@ -4819,6 +5872,15 @@ let sha512 = "l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA=="; }; }; + "ret-0.1.15" = { + name = "ret"; + packageName = "ret"; + version = "0.1.15"; + src = fetchurl { + url = "https://registry.npmjs.org/ret/-/ret-0.1.15.tgz"; + sha512 = "TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg=="; + }; + }; "retry-0.12.0" = { name = "retry"; packageName = "retry"; @@ -4882,13 +5944,13 @@ let sha1 = "f33fe9cfb52bbfd520aa18323bc65db110a1b76c"; }; }; - "rss-parser-3.10.0" = { + "rss-parser-3.12.0" = { name = "rss-parser"; packageName = "rss-parser"; - version = "3.10.0"; + version = "3.12.0"; src = fetchurl { - url = "https://registry.npmjs.org/rss-parser/-/rss-parser-3.10.0.tgz"; - sha512 = "TC6FNvEmdFeaW6r/60MSJT7cp4d95X4M9As+mvNtxRx7YXHxpV95syMnWZthZSeD1BRN7SEKdq6c3nxMLQRopw=="; + url = "https://registry.npmjs.org/rss-parser/-/rss-parser-3.12.0.tgz"; + sha512 = "aqD3E8iavcCdkhVxNDIdg1nkBI17jgqF+9OqPS1orwNaOgySdpvq6B+DoONLhzjzwV8mWg37sb60e4bmLK117A=="; }; }; "run-async-2.4.1" = { @@ -4900,22 +5962,22 @@ let sha512 = "tvVnVv01b8c1RrA6Ep7JkStj85Guv/YrMcwqYQnwjsAS2cTmmPGBBjAjpCW7RrSodNSoE2/qg9O4bceNvUuDgQ=="; }; }; - "run-parallel-1.1.10" = { + "run-parallel-1.2.0" = { name = "run-parallel"; packageName = "run-parallel"; - version = "1.1.10"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/run-parallel/-/run-parallel-1.1.10.tgz"; - sha512 = "zb/1OuZ6flOlH6tQyMPUrE3x3Ulxjlo9WIVXR4yVYi4H9UXQaeIsPbLn2R3O3vQCnDKkAl2qHiuocKKX4Tz/Sw=="; + url = "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz"; + sha512 = "5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA=="; }; }; - "rxjs-6.6.3" = { + "rxjs-6.6.7" = { name = "rxjs"; packageName = "rxjs"; - version = "6.6.3"; + version = "6.6.7"; src = fetchurl { - url = "https://registry.npmjs.org/rxjs/-/rxjs-6.6.3.tgz"; - sha512 = "trsQc+xYYXZ3urjOiJOuCOa5N3jAZ3eiSpQB5hIT8zGlL2QfnHLJ2r7GMkBGuIausdJN1OneaI6gQlsqNHHmZQ=="; + url = "https://registry.npmjs.org/rxjs/-/rxjs-6.6.7.tgz"; + sha512 = "hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ=="; }; }; "safe-buffer-5.1.2" = { @@ -4936,6 +5998,15 @@ let sha512 = "rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ=="; }; }; + "safe-stable-stringify-2.3.1" = { + name = "safe-stable-stringify"; + packageName = "safe-stable-stringify"; + version = "2.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/safe-stable-stringify/-/safe-stable-stringify-2.3.1.tgz"; + sha512 = "kYBSfT+troD9cDA85VDnHZ1rpHC50O0g1e6WlGHVCz/g+JS+9WKLj+XwFYyR8UbrZN8ll9HUpDAAddY58MGisg=="; + }; + }; "safer-buffer-2.1.2" = { name = "safer-buffer"; packageName = "safer-buffer"; @@ -4945,13 +6016,13 @@ let sha512 = "YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="; }; }; - "saslprep-1.0.3" = { - name = "saslprep"; - packageName = "saslprep"; - version = "1.0.3"; + "sax-1.2.1" = { + name = "sax"; + packageName = "sax"; + version = "1.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/saslprep/-/saslprep-1.0.3.tgz"; - sha512 = "/MY/PEMbk2SuY5sScONwhUDsV2p77Znkb/q3nSVstq/yQzYJOH/Azh29p9oJLsl3LnQwSvZDKagDGBsBwSooag=="; + url = "https://registry.npmjs.org/sax/-/sax-1.2.1.tgz"; + sha1 = "7b8e656190b228e81a66aea748480d828cd2d37a"; }; }; "sax-1.2.4" = { @@ -4963,13 +6034,31 @@ let sha512 = "NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw=="; }; }; - "semver-5.0.3" = { - name = "semver"; - packageName = "semver"; - version = "5.0.3"; + "sb-promise-queue-2.1.0" = { + name = "sb-promise-queue"; + packageName = "sb-promise-queue"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/semver/-/semver-5.0.3.tgz"; - sha1 = "77466de589cd5d3c95f138aa78bc569a3cb5d27a"; + url = "https://registry.npmjs.org/sb-promise-queue/-/sb-promise-queue-2.1.0.tgz"; + sha512 = "zwq4YuP1FQFkGx2Q7GIkZYZ6PqWpV+bg0nIO1sJhWOyGyhqbj0MsTvK6lCFo5TQwX5pZr6SCQ75e8PCDCuNvkg=="; + }; + }; + "sb-scandir-3.1.0" = { + name = "sb-scandir"; + packageName = "sb-scandir"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/sb-scandir/-/sb-scandir-3.1.0.tgz"; + sha512 = "70BVm2xz9jn94zSQdpvYrEG101/UV9TVGcfWr9T5iob3QhCK4lYXeculfBqPGFv3XTeKgx4dpWyYIDeZUqo4kg=="; + }; + }; + "selderee-0.6.0" = { + name = "selderee"; + packageName = "selderee"; + version = "0.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/selderee/-/selderee-0.6.0.tgz"; + sha512 = "ibqWGV5aChDvfVdqNYuaJP/HnVBhlRGSRrlbttmlMpHcLuTqqbMH36QkSs9GEgj5M88JDYLI8eyP94JaQ8xRlg=="; }; }; "semver-5.3.0" = { @@ -4990,22 +6079,31 @@ let sha512 = "sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ=="; }; }; - "semver-7.3.4" = { + "semver-6.3.0" = { + name = "semver"; + packageName = "semver"; + version = "6.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz"; + sha512 = "b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw=="; + }; + }; + "semver-7.3.5" = { name = "semver"; packageName = "semver"; - version = "7.3.4"; + version = "7.3.5"; src = fetchurl { - url = "https://registry.npmjs.org/semver/-/semver-7.3.4.tgz"; - sha512 = "tCfb2WLjqFAtXn4KEdxIhalnRtoKFN7nAwj0B3ZXCbQloV2tq5eDbcTmT68JJD3nRJq24/XgxtQKFIpQdtvmVw=="; + url = "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz"; + sha512 = "PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ=="; }; }; - "send-0.17.1" = { + "send-0.17.2" = { name = "send"; packageName = "send"; - version = "0.17.1"; + version = "0.17.2"; src = fetchurl { - url = "https://registry.npmjs.org/send/-/send-0.17.1.tgz"; - sha512 = "BsVKsiGcQMFwT8UxypobUKyv7irCNRHk1T0G680vk88yf6LBByGcZJOTJCrTP2xVN6yI+XjPJcNuE3V4fT9sAg=="; + url = "https://registry.npmjs.org/send/-/send-0.17.2.tgz"; + sha512 = "UJYB6wFSJE3G00nEivR5rgWp8c2xXvJ3OPWPhmuteU0IKj8nKbG3DrjiOmLwpnHGYWAVwA69zmTm++YG0Hmwww=="; }; }; "sentence-case-3.0.4" = { @@ -5026,13 +6124,22 @@ let sha1 = "d56812e1c017a6e4e7c3e3a37a1da6d78dd3c93e"; }; }; - "serve-static-1.14.1" = { + "serialize-javascript-5.0.1" = { + name = "serialize-javascript"; + packageName = "serialize-javascript"; + version = "5.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-5.0.1.tgz"; + sha512 = "SaaNal9imEO737H2c05Og0/8LUXG7EnsZyMa8MzkmuHoELfT6txuj0cMqRj6zfPKnmQ1yasR4PCJc8x+M4JSPA=="; + }; + }; + "serve-static-1.14.2" = { name = "serve-static"; packageName = "serve-static"; - version = "1.14.1"; + version = "1.14.2"; src = fetchurl { - url = "https://registry.npmjs.org/serve-static/-/serve-static-1.14.1.tgz"; - sha512 = "JMrvUwE54emCYWlTI+hGrGv5I8dEwmco/00EvkzIIsR7MqrHonbD9pO2MOfFnpFntl7ecpZs+3mW+XbQZu9QCg=="; + url = "https://registry.npmjs.org/serve-static/-/serve-static-1.14.2.tgz"; + sha512 = "+TMNA9AFxUEGuC0z2mevogSnn9MXKb4fa7ngeRMJaaGv8vTwnIEkKi+QGvPt33HSnf8pRS+WGM0EbMtCJLKMBQ=="; }; }; "servie-4.3.3" = { @@ -5062,13 +6169,13 @@ let sha512 = "A704nIwzqGed0CnJZIqDE+0udMPS839ocgf1R9OJ8aq8vw4U980HWeNaD9ec8VnmBni9lyGEWDedOWXT/C5kxA=="; }; }; - "setprototypeof-1.1.1" = { + "setprototypeof-1.2.0" = { name = "setprototypeof"; packageName = "setprototypeof"; - version = "1.1.1"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.1.tgz"; - sha512 = "JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw=="; + url = "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz"; + sha512 = "E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw=="; }; }; "sha.js-2.4.11" = { @@ -5080,13 +6187,40 @@ let sha512 = "QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ=="; }; }; - "signal-exit-3.0.3" = { + "shell-escape-0.2.0" = { + name = "shell-escape"; + packageName = "shell-escape"; + version = "0.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/shell-escape/-/shell-escape-0.2.0.tgz"; + sha1 = "68fd025eb0490b4f567a027f0bf22480b5f84133"; + }; + }; + "side-channel-1.0.4" = { + name = "side-channel"; + packageName = "side-channel"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz"; + sha512 = "q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw=="; + }; + }; + "signal-exit-3.0.7" = { name = "signal-exit"; packageName = "signal-exit"; - version = "3.0.3"; + version = "3.0.7"; + src = fetchurl { + url = "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz"; + sha512 = "wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ=="; + }; + }; + "simple-git-2.48.0" = { + name = "simple-git"; + packageName = "simple-git"; + version = "2.48.0"; src = fetchurl { - url = "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.3.tgz"; - sha512 = "VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA=="; + url = "https://registry.npmjs.org/simple-git/-/simple-git-2.48.0.tgz"; + sha512 = "z4qtrRuaAFJS4PUd0g+xy7aN4y+RvEt/QTJpR184lhJguBA1S/LsVlvE/CM95RsYMOFJG3NGGDjqFCzKU19S/A=="; }; }; "simple-lru-cache-0.0.2" = { @@ -5125,22 +6259,22 @@ let sha512 = "LAOh4z89bGQvl9pFfNF8V146i7o7/CqFPbqzYgP+yYzDIDeS9HaNFtXABamRW+AQzEVODcvE79ljJ+8a9YSdMg=="; }; }; - "snowflake-sdk-1.5.3" = { + "snowflake-sdk-1.6.6" = { name = "snowflake-sdk"; packageName = "snowflake-sdk"; - version = "1.5.3"; + version = "1.6.6"; src = fetchurl { - url = "https://registry.npmjs.org/snowflake-sdk/-/snowflake-sdk-1.5.3.tgz"; - sha512 = "Env7ebuWyaPWLIsGbFf/AH8IdeSCshAfHg9cH6F9AHAG0uwtJEO4XPdNeOkxyV/xjykx69s1L4mHWwPksgj8VA=="; + url = "https://registry.npmjs.org/snowflake-sdk/-/snowflake-sdk-1.6.6.tgz"; + sha512 = "b8mbYI6TFGe8H0m0eviNd4FC/3jsw02OHNt21k9sLWkBp4re2VUhaJf7555ln7thMSnMcbkdAB8zQBZcbqdoPg=="; }; }; - "sparse-bitfield-3.0.3" = { - name = "sparse-bitfield"; - packageName = "sparse-bitfield"; - version = "3.0.3"; + "source-map-0.6.1" = { + name = "source-map"; + packageName = "source-map"; + version = "0.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/sparse-bitfield/-/sparse-bitfield-3.0.3.tgz"; - sha1 = "ff4ae6e68656056ba4b3e792ab3334d38273ca11"; + url = "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz"; + sha512 = "UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="; }; }; "spex-3.2.0" = { @@ -5161,6 +6295,15 @@ let sha512 = "9NThjpgZnifTkJpzTZ7Eue85S49QwpNhZTq6GRJwObb6jnLFNGB7Qm73V5HewTROPyxD0C29xqmaI68bQtV+hg=="; }; }; + "split2-4.1.0" = { + name = "split2"; + packageName = "split2"; + version = "4.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/split2/-/split2-4.1.0.tgz"; + sha512 = "VBiJxFkxiXRlUIeyMQi8s4hgvKCSjtknJv/LVYbrgALPwf5zSKmEwV9Lst25AkvMDnvxODugjdl6KZgwKM1WYQ=="; + }; + }; "sprintf-js-1.0.3" = { name = "sprintf-js"; packageName = "sprintf-js"; @@ -5179,13 +6322,13 @@ let sha512 = "VE0SOVEHCk7Qc8ulkWw3ntAzXuqf7S2lvwQaDLRnUeIEaKNQJzV6BwmLKhOqT61aGhfUMrXeaBk+oDGCzvhcug=="; }; }; - "sqlite3-4.2.0" = { + "sqlite3-5.0.2" = { name = "sqlite3"; packageName = "sqlite3"; - version = "4.2.0"; + version = "5.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/sqlite3/-/sqlite3-4.2.0.tgz"; - sha512 = "roEOz41hxui2Q7uYnWsjMOTry6TcNUNmp8audCx18gF10P2NknwdpF+E+HKvz/F2NvPKGGBF4NGc+ZPQ+AABwg=="; + url = "https://registry.npmjs.org/sqlite3/-/sqlite3-5.0.2.tgz"; + sha512 = "1SdTNo+BVU211Xj1csWa8lV6KM0CtucDwRyA0VHl91wEH1Mgh7RxUpI4rVvG7OhHrzCSGaVyW5g8vKvlrk9DJA=="; }; }; "sqlstring-2.3.2" = { @@ -5215,40 +6358,31 @@ let sha512 = "+idbmIXoYET47hH+d7dfm2epdOMUDjqcB4648sTZ+t2JwoyBFL/insLfB/racrDmsKB3diwsDA696pZMieAC5g=="; }; }; - "ssh2-0.8.9" = { + "ssh2-1.6.0" = { name = "ssh2"; packageName = "ssh2"; - version = "0.8.9"; + version = "1.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/ssh2/-/ssh2-0.8.9.tgz"; - sha512 = "GmoNPxWDMkVpMFa9LVVzQZHF6EW3WKmBwL+4/GeILf2hFmix5Isxm7Amamo8o7bHiU0tC+wXsGcUXOxp8ChPaw=="; + url = "https://registry.npmjs.org/ssh2/-/ssh2-1.6.0.tgz"; + sha512 = "lxc+uvXqOxyQ99N2M7k5o4pkYDO5GptOTYduWw7hIM41icxvoBcCNHcj+LTKrjkL0vFcAl+qfZekthoSFRJn2Q=="; }; }; - "ssh2-sftp-client-5.3.2" = { + "ssh2-sftp-client-7.2.2" = { name = "ssh2-sftp-client"; packageName = "ssh2-sftp-client"; - version = "5.3.2"; + version = "7.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/ssh2-sftp-client/-/ssh2-sftp-client-5.3.2.tgz"; - sha512 = "YD38WQKleuapAZyvqRJq7PN8pC6GnzWdWcnZN4vsPXMHtZpjcg/ipBcFGtDsC5rkHp5qXgRu56WPcDUkM87FiA=="; + url = "https://registry.npmjs.org/ssh2-sftp-client/-/ssh2-sftp-client-7.2.2.tgz"; + sha512 = "qZYivU1zezyRomCf+TtsCYVAsc0TDQWzxJMMUN8NknEPonm2TYGxJAzrW8acUh2ILYgA0ZPOJElLV/qp9nRVYQ=="; }; }; - "ssh2-streams-0.4.10" = { - name = "ssh2-streams"; - packageName = "ssh2-streams"; - version = "0.4.10"; - src = fetchurl { - url = "https://registry.npmjs.org/ssh2-streams/-/ssh2-streams-0.4.10.tgz"; - sha512 = "8pnlMjvnIZJvmTzUIIA5nT4jr2ZWNNVHwyXfMGdRJbug9TpI3kd99ffglgfSWqujVv/0gxwMsDn9j9RVst8yhQ=="; - }; - }; - "sshpk-1.16.1" = { + "sshpk-1.17.0" = { name = "sshpk"; packageName = "sshpk"; - version = "1.16.1"; + version = "1.17.0"; src = fetchurl { - url = "https://registry.npmjs.org/sshpk/-/sshpk-1.16.1.tgz"; - sha512 = "HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg=="; + url = "https://registry.npmjs.org/sshpk/-/sshpk-1.17.0.tgz"; + sha512 = "/9HIEs1ZXGhSPE8X6Ccm7Nam1z8KcoCqPdI7ecm1N33EzAetWahvQWVqLZtaZQ+IDKX4IyA2o0gBzqIMkAagHQ=="; }; }; "stack-trace-0.0.10" = { @@ -5260,6 +6394,15 @@ let sha1 = "547c70b347e8d32b4e108ea1a2a159e5fdde19c0"; }; }; + "standard-as-callback-2.1.0" = { + name = "standard-as-callback"; + packageName = "standard-as-callback"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/standard-as-callback/-/standard-as-callback-2.1.0.tgz"; + sha512 = "qoRRSyROncaz1z0mvYqIE4lCd9p2R90i6GxW3uZv5ucSu8tU7B5HXUP1gG8pVZsYNVaXjk8ClXHPttLyxAL48A=="; + }; + }; "statuses-1.5.0" = { name = "statuses"; packageName = "statuses"; @@ -5287,13 +6430,13 @@ let sha512 = "AiisoFqQ0vbGcZgQPY1cdP2I76glaVA/RauYR4G4thNFgkTqr90yXTo4LYX60Jl+sIlPNHHdGSwo01AvbKUSVQ=="; }; }; - "streamsearch-0.1.2" = { - name = "streamsearch"; - packageName = "streamsearch"; - version = "0.1.2"; + "string-similarity-4.0.4" = { + name = "string-similarity"; + packageName = "string-similarity"; + version = "4.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/streamsearch/-/streamsearch-0.1.2.tgz"; - sha1 = "808b9d0e56fc273d809ba57338e929919a1a9f1a"; + url = "https://registry.npmjs.org/string-similarity/-/string-similarity-4.0.4.tgz"; + sha512 = "/q/8Q4Bl4ZKAPjj8WerIBJWALKkaPRfrvhfF8k/B23i4nzrlRj2/go1m90In7nG/3XDSbOo0+pu6RvCTM9RGMQ=="; }; }; "string-width-1.0.2" = { @@ -5305,22 +6448,31 @@ let sha1 = "118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3"; }; }; - "string-width-2.1.1" = { + "string-width-4.2.3" = { name = "string-width"; packageName = "string-width"; - version = "2.1.1"; + version = "4.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz"; - sha512 = "nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw=="; + url = "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz"; + sha512 = "wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g=="; }; }; - "string-width-4.2.0" = { - name = "string-width"; - packageName = "string-width"; - version = "4.2.0"; + "string.prototype.trimend-1.0.4" = { + name = "string.prototype.trimend"; + packageName = "string.prototype.trimend"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.4.tgz"; + sha512 = "y9xCjw1P23Awk8EvTpcyL2NIr1j7wJ39f+k6lvRnSMz+mz9CGz9NYPelDk42kOz6+ql8xjfK8oYzy3jAP5QU5A=="; + }; + }; + "string.prototype.trimstart-1.0.4" = { + name = "string.prototype.trimstart"; + packageName = "string.prototype.trimstart"; + version = "1.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/string-width/-/string-width-4.2.0.tgz"; - sha512 = "zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg=="; + url = "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.4.tgz"; + sha512 = "jh6e984OBfvxS50tdY2nRZnoC5/mLFKOREQfw8t5yytkoUsJRNxvI/E39qu1sD0OtWI3OC0XgKSmcWwziwYuZw=="; }; }; "string_decoder-0.10.31" = { @@ -5359,22 +6511,13 @@ let sha1 = "6a385fb8853d952d5ff05d0e8aaf94278dc63dcf"; }; }; - "strip-ansi-4.0.0" = { + "strip-ansi-6.0.1" = { name = "strip-ansi"; packageName = "strip-ansi"; - version = "4.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz"; - sha1 = "a8479022eb1ac368a871389b635262c505ee368f"; - }; - }; - "strip-ansi-6.0.0" = { - name = "strip-ansi"; - packageName = "strip-ansi"; - version = "6.0.0"; + version = "6.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz"; - sha512 = "AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w=="; + url = "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz"; + sha512 = "Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A=="; }; }; "strip-json-comments-2.0.1" = { @@ -5386,13 +6529,13 @@ let sha1 = "3c531942e908c2697c0ec344858c286c7ca0a60a"; }; }; - "strtok3-6.0.8" = { + "strtok3-6.3.0" = { name = "strtok3"; packageName = "strtok3"; - version = "6.0.8"; + version = "6.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/strtok3/-/strtok3-6.0.8.tgz"; - sha512 = "QLgv+oiXwXgCgp2PdPPa+Jpp4D9imK9e/0BsyfeFMr6QL6wMVqoVn9+OXQ9I7MZbmUzN6lmitTJ09uwS2OmGcw=="; + url = "https://registry.npmjs.org/strtok3/-/strtok3-6.3.0.tgz"; + sha512 = "fZtbhtvI9I48xDSywd/somNqgUHl2L2cstmXCCif0itOf96jeW18MBSyrLuNicYQVkvpOxkZtkzujiTJ9LW5Jw=="; }; }; "supports-color-2.0.0" = { @@ -5404,15 +6547,6 @@ let sha1 = "535d045ce6b6363fa40117084629995e9df324c7"; }; }; - "supports-color-5.5.0" = { - name = "supports-color"; - packageName = "supports-color"; - version = "5.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz"; - sha512 = "QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow=="; - }; - }; "supports-color-7.2.0" = { name = "supports-color"; packageName = "supports-color"; @@ -5422,13 +6556,13 @@ let sha512 = "qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw=="; }; }; - "tar-4.4.13" = { + "tar-4.4.19" = { name = "tar"; packageName = "tar"; - version = "4.4.13"; + version = "4.4.19"; src = fetchurl { - url = "https://registry.npmjs.org/tar/-/tar-4.4.13.tgz"; - sha512 = "w2VwSrBoHa5BsSyH+KxEqeQBAllHhccyMFVHtGtdMpF4W7IRWfZjFiQceJPChOeTsSDVUpER2T8FA93pr0L+QA=="; + url = "https://registry.npmjs.org/tar/-/tar-4.4.19.tgz"; + sha512 = "a20gEsvHnWe0ygBY8JbxoM4w3SJdhc7ZAuxkLqh+nvNQN2IOt0B5lLgM490X5Hl8FF0dl0tOf2ewFYAlIFgzVA=="; }; }; "tarn-1.1.5" = { @@ -5440,13 +6574,31 @@ let sha512 = "PMtJ3HCLAZeedWjJPgGnCvcphbCOMbtZpjKgLq3qM5Qq9aQud+XHrL0WlrlgnTyS8U+jrjGbEXprFcQrxPy52g=="; }; }; - "tedious-6.7.0" = { + "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"; + }; + }; + "tedious-6.7.1" = { name = "tedious"; packageName = "tedious"; - version = "6.7.0"; + version = "6.7.1"; src = fetchurl { - url = "https://registry.npmjs.org/tedious/-/tedious-6.7.0.tgz"; - sha512 = "8qr7+sB0h4SZVQBRWUgHmYuOEflAOl2eihvxk0fVNvpvGJV4V5UC/YmSvebyfgyfwWcPO22/AnSbYVZZqf9wuQ=="; + url = "https://registry.npmjs.org/tedious/-/tedious-6.7.1.tgz"; + sha512 = "61eg/mvUa5vIqZcRizcqw/82dY65kR2uTll1TaUFh0aJ45XOrgbc8axiVR48dva8BahIAlJByaHNfAJ/KmPV0g=="; + }; + }; + "test-console-2.0.0" = { + name = "test-console"; + packageName = "test-console"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/test-console/-/test-console-2.0.0.tgz"; + sha512 = "ciILzfCQCny8zy1+HEw2yBLKus7LNMsAHymsp2fhvGTVh5pWE5v2EB7V+5ag3WM9aO2ULtgsXVQePWYE+fb7pA=="; }; }; "text-hex-1.0.0" = { @@ -5512,13 +6664,22 @@ let sha512 = "dLFe8bU8SeH0xeqeKL7BNo8XoPC/o91nz9/ooeplZPiso+DZukhoyZcSz9TFnUNScm+cA9qjU1m1853M6sPOng=="; }; }; - "tlds-1.208.0" = { + "timeago.js-4.0.2" = { + name = "timeago.js"; + packageName = "timeago.js"; + version = "4.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/timeago.js/-/timeago.js-4.0.2.tgz"; + sha512 = "a7wPxPdVlQL7lqvitHGGRsofhdwtkoSXPGATFuSOA2i1ZNQEPLrGnj68vOp2sOJTCFAQVXPeNMX/GctBaO9L2w=="; + }; + }; + "tlds-1.224.0" = { name = "tlds"; packageName = "tlds"; - version = "1.208.0"; + version = "1.224.0"; src = fetchurl { - url = "https://registry.npmjs.org/tlds/-/tlds-1.208.0.tgz"; - sha512 = "6kbY7GJpRQXwBddSOAbVUZXjObbCGFXliWWN+kOSEoRWIOyRWLB6zdeKC/Tguwwenl/KsUx016XR50EdHYsxZw=="; + url = "https://registry.npmjs.org/tlds/-/tlds-1.224.0.tgz"; + sha512 = "Jgdc8SEijbDFUsmCn6Wk/f7E6jBLFZOG3U1xK0amGSfEH55Xx97ItUS/d2NngsuApjn11UeWCWj8Um3VRhseZQ=="; }; }; "tmp-0.0.33" = { @@ -5539,13 +6700,13 @@ let sha512 = "76SUhtfqR2Ijn+xllcI5P1oyannHNHByD80W1q447gU3mp9G9PSpGdWmjUOHRDPiHYacIk66W7ubDTuPF3BEtQ=="; }; }; - "tmp-promise-3.0.2" = { + "tmp-promise-3.0.3" = { name = "tmp-promise"; packageName = "tmp-promise"; - version = "3.0.2"; + version = "3.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/tmp-promise/-/tmp-promise-3.0.2.tgz"; - sha512 = "OyCLAKU1HzBjL6Ev3gxUeraJNlbNingmi8IrHHEsYH8LTmEuhvYfqvhn2F/je+mjf4N58UmZ96OMEy1JanSCpA=="; + url = "https://registry.npmjs.org/tmp-promise/-/tmp-promise-3.0.3.tgz"; + sha512 = "RwM7MoPojPxsOBYnyd2hy0bxtIlVrihNs9pj5SUvY8Zz1sQcQG2tG1hSr8PDxfgEB8RNKDhqbIlroIarSNDNsQ=="; }; }; "to-absolute-glob-2.0.2" = { @@ -5566,13 +6727,13 @@ let sha512 = "65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ=="; }; }; - "toidentifier-1.0.0" = { + "toidentifier-1.0.1" = { name = "toidentifier"; packageName = "toidentifier"; - version = "1.0.0"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.0.tgz"; - sha512 = "yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw=="; + url = "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.1.tgz"; + sha512 = "o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA=="; }; }; "token-types-2.1.1" = { @@ -5584,6 +6745,15 @@ let sha512 = "wnQcqlreS6VjthyHO3Y/kpK/emflxDBNhlNUPfh7wE39KnuDdOituXomIbyI79vBtF0Ninpkh72mcuRHo+RG3Q=="; }; }; + "toposort-2.0.2" = { + name = "toposort"; + packageName = "toposort"; + version = "2.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/toposort/-/toposort-2.0.2.tgz"; + sha1 = "ae21768175d1559d48bef35420b2f4962f09c330"; + }; + }; "tough-cookie-2.5.0" = { name = "tough-cookie"; packageName = "tough-cookie"; @@ -5602,6 +6772,24 @@ let sha512 = "yQyJ0u4pZsv9D4clxO69OEjLWYw+jbgspjTue4lTQZLfV0c5l1VmK2y1JK8E9ahdpltPOaAThPcp5nKPUgSnsg=="; }; }; + "tough-cookie-4.0.0" = { + name = "tough-cookie"; + packageName = "tough-cookie"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.0.0.tgz"; + sha512 = "tHdtEpQCMrc1YLrMaqXXcj6AxhYi/xgit6mZu1+EDWUn+qhUf8wMQoFIy9NXuq23zAwtcB0t/MjACGR18pcRbg=="; + }; + }; + "tr46-0.0.3" = { + name = "tr46"; + packageName = "tr46"; + version = "0.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz"; + sha1 = "8184fd347dac9cdc185992f3a6622e14b9d9ab6a"; + }; + }; "triple-beam-1.3.0" = { name = "triple-beam"; packageName = "triple-beam"; @@ -5611,22 +6799,13 @@ let sha512 = "XrHUvV5HpdLmIj4uVMxHggLbFSZYIn7HEWsqePZcI50pco+MPqJ50wMGY794X7AOOhxOBAjbkqfAbEe/QMp2Lw=="; }; }; - "ts-expect-1.1.0" = { + "ts-expect-1.3.0" = { name = "ts-expect"; packageName = "ts-expect"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/ts-expect/-/ts-expect-1.1.0.tgz"; - sha512 = "cKoBZ47X85x/Qh7taf30m3BhOJOhtNbb7KFHz9CCuWeRSAh0wzprnmiN9TSOQ0FWp3+qDWS5f2FDnxkY93Kdfw=="; - }; - }; - "tslib-1.11.2" = { - name = "tslib"; - packageName = "tslib"; - version = "1.11.2"; + version = "1.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/tslib/-/tslib-1.11.2.tgz"; - sha512 = "tTSkux6IGPnUGUd1XAZHcpu85MOkIl5zX49pO+jfsie3eP0B6pyhOlLXm3cAC6T7s+euSDDUUV+Acop5WmtkVg=="; + url = "https://registry.npmjs.org/ts-expect/-/ts-expect-1.3.0.tgz"; + sha512 = "e4g0EJtAjk64xgnFPD6kTBUtpnMVzDrMb12N1YZV0VvSlhnVT3SGxiYTLdGy8Q5cYHOIC/FAHmZ10eGrAguicQ=="; }; }; "tslib-1.14.1" = { @@ -5638,13 +6817,13 @@ let sha512 = "Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg=="; }; }; - "tslib-2.1.0" = { + "tslib-2.3.1" = { name = "tslib"; packageName = "tslib"; - version = "2.1.0"; + version = "2.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/tslib/-/tslib-2.1.0.tgz"; - sha512 = "hcVC3wYEziELGGmEEXue7D75zbwIIVUMWAVbHItGPx0ziyXxrOMQx4rQEVEV45Ut/1IotuEvwqPopzIOkDMf0A=="; + url = "https://registry.npmjs.org/tslib/-/tslib-2.3.1.tgz"; + sha512 = "77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw=="; }; }; "tsscmp-1.0.6" = { @@ -5683,31 +6862,13 @@ 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-fest-0.11.0" = { + "type-fest-0.21.3" = { name = "type-fest"; packageName = "type-fest"; - version = "0.11.0"; + version = "0.21.3"; src = fetchurl { - url = "https://registry.npmjs.org/type-fest/-/type-fest-0.11.0.tgz"; - sha512 = "OdjXJxnCN1AvyLSzeKIgXTXxV+99ZuXl3Hpo9XpJAv9MBcHrrJOQ5kV7ypXOuQie+AmWG25hLbiKdwYTifzcfQ=="; + url = "https://registry.npmjs.org/type-fest/-/type-fest-0.21.3.tgz"; + sha512 = "t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w=="; }; }; "type-is-1.6.18" = { @@ -5764,6 +6925,15 @@ let sha512 = "KPHm4VL5dDXKz01UuEd88Df+KzynaohSL9fBh096KWAxSKZQDI2uBrVqtvRM4rwrIrRRKsdLNML/lnaaVSRioA=="; }; }; + "unbox-primitive-1.0.1" = { + name = "unbox-primitive"; + packageName = "unbox-primitive"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.1.tgz"; + sha512 = "tZU/3NqK3dA5gpE1KtyiJUrEB0lxnGkMFHptJ7q6ewdZ8s12QrODwNbhIJStmJkd1QDXa1NRA8aF2A1zk/Ypyw=="; + }; + }; "unc-path-regex-0.1.2" = { name = "unc-path-regex"; packageName = "unc-path-regex"; @@ -5773,13 +6943,13 @@ let sha1 = "e73dd3d7b0d7c5ed86fbac6b0ae7d8c6a69d50fa"; }; }; - "underscore-1.12.0" = { + "underscore-1.13.2" = { name = "underscore"; packageName = "underscore"; - version = "1.12.0"; + version = "1.13.2"; src = fetchurl { - url = "https://registry.npmjs.org/underscore/-/underscore-1.12.0.tgz"; - sha512 = "21rQzss/XPMjolTiIezSu3JAjgagXKROtNrYFEOWK109qY1Uv2tVjPTZ1ci2HgvQDA16gHYSthQIJfB+XId/rQ=="; + url = "https://registry.npmjs.org/underscore/-/underscore-1.13.2.tgz"; + sha512 = "ekY1NhRzq0B08g4bGuX4wd2jZx5GnKz6mKSqFL4nqBlfyMGiG10gDFhDTMEfYmDL6Jy0FUIZp7wiRB+0BP7J2g=="; }; }; "unique-stream-2.3.1" = { @@ -5836,13 +7006,22 @@ let sha512 = "7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg=="; }; }; - "url-parse-1.4.7" = { + "url-0.10.3" = { + name = "url"; + packageName = "url"; + version = "0.10.3"; + src = fetchurl { + url = "https://registry.npmjs.org/url/-/url-0.10.3.tgz"; + sha1 = "021e4d9c7705f21bbf37d03ceb58767402774c64"; + }; + }; + "url-parse-1.5.6" = { name = "url-parse"; packageName = "url-parse"; - version = "1.4.7"; + version = "1.5.6"; src = fetchurl { - url = "https://registry.npmjs.org/url-parse/-/url-parse-1.4.7.tgz"; - sha512 = "d3uaVyzDB9tQoSXFvuSUNFibTd9zxd2bkVrDRvF5TmvWWQwqE4lgYJ5m+x1DbecWkw+LK4RNl2CU1hHuOKPVlg=="; + url = "https://registry.npmjs.org/url-parse/-/url-parse-1.5.6.tgz"; + sha512 = "xj3QdUJ1DttD1LeSfvJlU1eiF1RvBSBfUu8GplFGdUzSO28y5yUtEl7wb//PI4Af6qh0o/K8545vUmucRrfWsw=="; }; }; "utf7-1.0.2" = { @@ -5872,6 +7051,15 @@ let sha1 = "450d4dc9fa70de732762fbd2d4a28981419a0ccf"; }; }; + "util.promisify-1.1.1" = { + name = "util.promisify"; + packageName = "util.promisify"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/util.promisify/-/util.promisify-1.1.1.tgz"; + sha512 = "/s3UsZUrIfa6xDhr7zZhnE9SLQ5RIXyYfiVnMMyMDzOc8WhWN4Nbh36H842OyurKbCDAesZOJaVyvmSl6fhGQw=="; + }; + }; "utils-merge-1.0.1" = { name = "utils-merge"; packageName = "utils-merge"; @@ -5890,6 +7078,15 @@ let sha1 = "c8d50370885663879385ab37e333c7e8e3b0218c"; }; }; + "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"; @@ -5899,13 +7096,31 @@ let sha512 = "HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A=="; }; }; - "validator-11.1.0" = { + "uuid-8.3.2" = { + name = "uuid"; + packageName = "uuid"; + version = "8.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz"; + sha512 = "+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg=="; + }; + }; + "v-click-outside-3.1.2" = { + name = "v-click-outside"; + packageName = "v-click-outside"; + version = "3.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/v-click-outside/-/v-click-outside-3.1.2.tgz"; + sha512 = "gMdRqfRE6m6XU6SiFi3dyBlFB2MWogiXpof8Aa3LQysrl9pzTndqp/iEaAphLoadaQUFnQ0ec6fLLaxr7LiY6A=="; + }; + }; + "validator-13.7.0" = { name = "validator"; packageName = "validator"; - version = "11.1.0"; + version = "13.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/validator/-/validator-11.1.0.tgz"; - sha512 = "qiQ5ktdO7CD6C/5/mYV4jku/7qnqzjrxb3C/Q5wR3vGGinHTgJZN/TdFT3ZX4vXhX2R1PXx42fB1cn5W+uJ4lg=="; + url = "https://registry.npmjs.org/validator/-/validator-13.7.0.tgz"; + sha512 = "nYXQLCBkpJ8X6ltALua9dRrZDHVYxjJ1wgskNt1lH9fzGjs3tgojGSCBjmEPwkWS1y29+DrizMTW19Pr9uB2nw=="; }; }; "vary-1.1.2" = { @@ -5926,22 +7141,49 @@ let sha1 = "3a105ca17053af55d6e270c1f8288682e18da400"; }; }; - "vm2-3.9.2" = { + "vm2-3.9.7" = { name = "vm2"; packageName = "vm2"; - version = "3.9.2"; + version = "3.9.7"; + src = fetchurl { + url = "https://registry.npmjs.org/vm2/-/vm2-3.9.7.tgz"; + sha512 = "g/GZ7V0Mlmch3eDVOATvAXr1GsJNg6kQ5PjvYy3HbJMCRn5slNbo/u73Uy7r5yUej1cRa3ZjtoVwcWSQuQ/fow=="; + }; + }; + "vue-fragment-1.5.2" = { + name = "vue-fragment"; + packageName = "vue-fragment"; + version = "1.5.2"; + src = fetchurl { + url = "https://registry.npmjs.org/vue-fragment/-/vue-fragment-1.5.2.tgz"; + sha512 = "KEW0gkeNOLJjtXN4jqJhTazez5jtrwimHkE5Few/VxblH4F9EcvJiEsahrV5kg5uKd5U8du4ORKS6QjGE0piYA=="; + }; + }; + "vue-i18n-8.27.0" = { + name = "vue-i18n"; + packageName = "vue-i18n"; + version = "8.27.0"; + src = fetchurl { + url = "https://registry.npmjs.org/vue-i18n/-/vue-i18n-8.27.0.tgz"; + sha512 = "SX35iJHL5PJ4Gfh0Mo/q0shyHiI2V6Zkh51c+k8E9O1RKv5BQyYrCxRzpvPrsIOJEnLaeiovet3dsUB0e/kDzw=="; + }; + }; + "webidl-conversions-3.0.1" = { + name = "webidl-conversions"; + packageName = "webidl-conversions"; + version = "3.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/vm2/-/vm2-3.9.2.tgz"; - sha512 = "nzyFmHdy2FMg7mYraRytc2jr4QBaUY3TEGe3q3bK8EgS9WC98wxn2jrPxS/ruWm+JGzrEIIeufKweQzVoQEd+Q=="; + url = "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz"; + sha1 = "24534275e2a7bc6be7bc86611cc16ae0a5654871"; }; }; - "when-3.7.8" = { - name = "when"; - packageName = "when"; - version = "3.7.8"; + "whatwg-url-5.0.0" = { + name = "whatwg-url"; + packageName = "whatwg-url"; + version = "5.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/when/-/when-3.7.8.tgz"; - sha1 = "c7130b6a7ea04693e842cdc9e7a1f2aa39a39f82"; + url = "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz"; + sha1 = "966454e8765462e37644d3626f6742ce8b70965d"; }; }; "which-1.3.1" = { @@ -5953,13 +7195,22 @@ let sha512 = "HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ=="; }; }; - "wide-align-1.1.3" = { + "which-boxed-primitive-1.0.2" = { + name = "which-boxed-primitive"; + packageName = "which-boxed-primitive"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz"; + sha512 = "bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg=="; + }; + }; + "wide-align-1.1.5" = { name = "wide-align"; packageName = "wide-align"; - version = "1.1.3"; + version = "1.1.5"; src = fetchurl { - url = "https://registry.npmjs.org/wide-align/-/wide-align-1.1.3.tgz"; - sha512 = "QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA=="; + url = "https://registry.npmjs.org/wide-align/-/wide-align-1.1.5.tgz"; + sha512 = "eDMORYaPNZ4sQIuuYPDHdQvf4gyCF9rEEV/yPxGfwPkRodwEgiMUUXTx/dex+Me0wxx53S+NgUHaP7y3MGlDmg=="; }; }; "widest-line-3.1.0" = { @@ -5971,22 +7222,22 @@ let sha512 = "NsmoXalsWVDMGupxZ5R08ka9flZjjiLvHVAWYOKtiKM8ujtZWr9cRffak+uSE48+Ob8ObalXpwyeUiyDD6QFgg=="; }; }; - "winston-3.3.3" = { + "winston-3.6.0" = { name = "winston"; packageName = "winston"; - version = "3.3.3"; + version = "3.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/winston/-/winston-3.3.3.tgz"; - sha512 = "oEXTISQnC8VlSAKf1KYSSd7J6IWuRPQqDdo8eoRNaYKLvwSb5+79Z3Yi1lrl6KDpU6/VWaxpakDAtb1oQ4n9aw=="; + url = "https://registry.npmjs.org/winston/-/winston-3.6.0.tgz"; + sha512 = "9j8T75p+bcN6D00sF/zjFVmPp+t8KMPB1MzbbzYjeN9VWxdsYnTB40TkbNUEXAmILEfChMvAMgidlX64OG3p6w=="; }; }; - "winston-transport-4.4.0" = { + "winston-transport-4.5.0" = { name = "winston-transport"; packageName = "winston-transport"; - version = "4.4.0"; + version = "4.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/winston-transport/-/winston-transport-4.4.0.tgz"; - sha512 = "Lc7/p3GtqtqPBYYtS6KCN3c77/2QCev51DvcJKbkFPQNoj1sinkGwLGFDxkXY9J6p9+EPnYs+D90uwbnaiURTw=="; + url = "https://registry.npmjs.org/winston-transport/-/winston-transport-4.5.0.tgz"; + sha512 = "YpZzcUzBedhlTAfJg6vJDlyEai/IFMIVcaEZZyl3UXIl4gmqRpU7AE89AHLkbzLUsv0NVmw7ts+iztqKxxPW1Q=="; }; }; "wmf-1.0.2" = { @@ -6007,13 +7258,22 @@ let sha512 = "OELeY0Q61OXpdUfTp+oweA/vtLVg5VDOXh+3he3PNzLGG/y0oylSOC1xRVj0+l4vQ3tj/bB1HVHv1ocXkQceFA=="; }; }; - "wrap-ansi-4.0.0" = { + "wordwrap-1.0.0" = { + name = "wordwrap"; + packageName = "wordwrap"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz"; + sha1 = "27584810891456a4171c8d0226441ade90cbcaeb"; + }; + }; + "wrap-ansi-6.2.0" = { name = "wrap-ansi"; packageName = "wrap-ansi"; - version = "4.0.0"; + version = "6.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-4.0.0.tgz"; - sha512 = "uMTsj9rDb0/7kk1PbcbCcwvHUxp60fGDB/NNXpVa0Q+ic/e7y5+BwTxKfQ33VYgDppSwi/FBzpetYzo8s6tfbg=="; + url = "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz"; + sha512 = "r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA=="; }; }; "wrap-ansi-7.0.0" = { @@ -6034,22 +7294,31 @@ let sha1 = "b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"; }; }; - "ws-7.4.2" = { + "ws-7.5.7" = { name = "ws"; packageName = "ws"; - version = "7.4.2"; + version = "7.5.7"; src = fetchurl { - url = "https://registry.npmjs.org/ws/-/ws-7.4.2.tgz"; - sha512 = "T4tewALS3+qsrpGI/8dqNMLIVdq/g/85U98HPMa6F0m6xTbvhXU6RCQLqPH3+SlomNV/LdY6RXEbBpMH6EOJnA=="; + url = "https://registry.npmjs.org/ws/-/ws-7.5.7.tgz"; + sha512 = "KMvVuFzpKBuiIXW3E4u3mySRO2/mCHSyZDJQM5NQ9Q9KHWHWh0NHgfbRMLLrceUK5qAL4ytALJbpRMjixFZh8A=="; }; }; - "xlsx-0.16.9" = { + "xlsx-0.17.5" = { name = "xlsx"; packageName = "xlsx"; - version = "0.16.9"; + version = "0.17.5"; src = fetchurl { - url = "https://registry.npmjs.org/xlsx/-/xlsx-0.16.9.tgz"; - sha512 = "gxi1I3EasYvgCX1vN9pGyq920Ron4NO8PNfhuoA3Hpq6Y8f0ECXiy4OLrK4QZBnj1jx3QD+8Fq5YZ/3mPZ5iXw=="; + url = "https://registry.npmjs.org/xlsx/-/xlsx-0.17.5.tgz"; + sha512 = "lXNU0TuYsvElzvtI6O7WIVb9Zar1XYw7Xb3VAx2wn8N/n0whBYrCnHMxtFyIiUU1Wjf09WzmLALDfBO5PqTb1g=="; + }; + }; + "xml2js-0.4.19" = { + name = "xml2js"; + packageName = "xml2js"; + version = "0.4.19"; + src = fetchurl { + url = "https://registry.npmjs.org/xml2js/-/xml2js-0.4.19.tgz"; + sha512 = "esZnJZJOiJR9wWKMyuvSE1y6Dq5LCuJanqhxslH2bxM6duahNZ+HMpCLhBQGZkbX6xRf8x1Y2eJlgt2q3qo49Q=="; }; }; "xml2js-0.4.23" = { @@ -6070,13 +7339,13 @@ let sha512 = "fDlsI/kFEx7gLvbecc0/ohLG50fugQp8ryHzMTuW9vSa1GJ0XYWKnhsUx7oie3G98+r56aTQIUB4kht42R3JvA=="; }; }; - "xmldom-0.4.0" = { - name = "xmldom"; - packageName = "xmldom"; - version = "0.4.0"; + "xmlbuilder-9.0.7" = { + name = "xmlbuilder"; + packageName = "xmlbuilder"; + version = "9.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/xmldom/-/xmldom-0.4.0.tgz"; - sha512 = "2E93k08T30Ugs+34HBSTQLVtpi6mCddaY8uO+pMNk1pqSjV5vElzn4mmh6KLxN3hki8rNcHSYzILoh3TEWORvA=="; + url = "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-9.0.7.tgz"; + sha1 = "132ee63d2ec5565c557e20f4c22df9aca686b10d"; }; }; "xpath.js-1.1.0" = { @@ -6106,13 +7375,13 @@ let sha512 = "LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ=="; }; }; - "y18n-5.0.5" = { + "y18n-5.0.8" = { name = "y18n"; packageName = "y18n"; - version = "5.0.5"; + version = "5.0.8"; src = fetchurl { - url = "https://registry.npmjs.org/y18n/-/y18n-5.0.5.tgz"; - sha512 = "hsRUr4FFrvhhRH12wOdfs38Gy7k2FFzB9qgN9v3aLykRq0dRcdcpz5C9FxdS2NuhOrI/628b/KSTJ3rwHysYSg=="; + url = "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz"; + sha512 = "0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA=="; }; }; "yallist-2.1.2" = { @@ -6160,22 +7429,31 @@ let sha512 = "D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw=="; }; }; - "yargs-parser-13.0.0" = { - name = "yargs-parser"; - packageName = "yargs-parser"; - version = "13.0.0"; + "yargs-17.1.1" = { + name = "yargs"; + packageName = "yargs"; + version = "17.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.0.0.tgz"; - sha512 = "w2LXjoL8oRdRQN+hOyppuXs+V/fVAYtpcrRxZuF7Kt/Oc+Jr2uAcVntaUTNT6w5ihoWfFDpNY8CPx1QskxZ/pw=="; + url = "https://registry.npmjs.org/yargs/-/yargs-17.1.1.tgz"; + sha512 = "c2k48R0PwKIqKhPMWjeiF6y2xY/gPMUlro0sgxqXpbOIohWiLNXWslsootttv7E1e73QPAMQSg5FeySbVcpsPQ=="; }; }; - "yargs-parser-20.2.4" = { + "yargs-parser-20.2.9" = { name = "yargs-parser"; packageName = "yargs-parser"; - version = "20.2.4"; + version = "20.2.9"; + src = fetchurl { + url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.9.tgz"; + sha512 = "y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w=="; + }; + }; + "yup-0.32.11" = { + name = "yup"; + packageName = "yup"; + version = "0.32.11"; src = fetchurl { - url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.4.tgz"; - sha512 = "WOkpgNhPTlE73h4VFAFsOnomJVaovO8VqLDzy5saChRBFQFBoMYirowyW+Q9HB4HFF4Z7VZTiG3iSzJJA29yRA=="; + url = "https://registry.npmjs.org/yup/-/yup-0.32.11.tgz"; + sha512 = "Z2Fe1bn+eLstG8DRR6FTavGD+MeAwyfmouhHsIUgaADz8jvFKbO/fXc2trJKZg+5EBjh4gGm3iU/t3onKlXHIg=="; }; }; }; @@ -6184,96 +7462,164 @@ in n8n = nodeEnv.buildNodePackage { name = "n8n"; packageName = "n8n"; - version = "0.105.0"; + version = "0.163.1"; src = fetchurl { - url = "https://registry.npmjs.org/n8n/-/n8n-0.105.0.tgz"; - sha512 = "Ry4JODQbj5vLsen5RTAyQdwstYFZ6KaMZhNzsnSQIm2qwzW+HS7hOm8r44WHzNrc5sMFHCPful2waMis8g81pA=="; + url = "https://registry.npmjs.org/n8n/-/n8n-0.163.1.tgz"; + sha512 = "lhup+qIy3cG0oWvBuOWi57Tn3F2k5NBD00KJ3ilKgnk4VsY+LmAca2xvyZNKvlRPa9i++3ukG6XioPTDuXylgw=="; }; dependencies = [ - sources."@azure/ms-rest-azure-env-1.1.2" - (sources."@azure/ms-rest-js-1.9.1" // { + (sources."@azure/abort-controller-1.0.5" // { dependencies = [ - sources."axios-0.21.1" - sources."follow-redirects-1.13.2" - sources."tough-cookie-2.5.0" + sources."tslib-2.3.1" + ]; + }) + sources."@azure/core-asynciterator-polyfill-1.0.2" + (sources."@azure/core-auth-1.3.2" // { + dependencies = [ + sources."tslib-2.3.1" + ]; + }) + (sources."@azure/core-http-2.2.4" // { + dependencies = [ + sources."tough-cookie-4.0.0" + sources."tslib-2.3.1" ]; }) - sources."@azure/ms-rest-nodeauth-2.0.2" - sources."@dabh/diagnostics-2.0.2" + (sources."@azure/core-lro-2.2.3" // { + dependencies = [ + sources."tslib-2.3.1" + ]; + }) + (sources."@azure/core-paging-1.2.1" // { + dependencies = [ + sources."tslib-2.3.1" + ]; + }) + (sources."@azure/core-tracing-1.0.0-preview.13" // { + dependencies = [ + sources."tslib-2.3.1" + ]; + }) + (sources."@azure/logger-1.0.3" // { + dependencies = [ + sources."tslib-2.3.1" + ]; + }) + sources."@azure/ms-rest-azure-env-2.0.0" + (sources."@azure/ms-rest-js-2.6.0" // { + dependencies = [ + sources."form-data-2.5.1" + ]; + }) + sources."@azure/ms-rest-nodeauth-3.1.1" + (sources."@azure/storage-blob-12.8.0" // { + dependencies = [ + sources."tslib-2.3.1" + ]; + }) + sources."@babel/runtime-7.17.2" + sources."@colors/colors-1.5.0" + (sources."@dabh/diagnostics-2.0.3" // { + dependencies = [ + sources."enabled-2.0.0" + sources."kuler-2.0.0" + ]; + }) + sources."@fontsource/open-sans-4.5.5" sources."@icetee/ftp-0.3.15" - sources."@nodelib/fs.scandir-2.1.4" - sources."@nodelib/fs.stat-2.0.4" - sources."@nodelib/fs.walk-1.2.6" - sources."@oclif/command-1.8.0" - (sources."@oclif/config-1.17.0" // { + sources."@kafkajs/confluent-schema-registry-1.0.6" + sources."@kwsites/file-exists-1.1.1" + sources."@kwsites/promise-deferred-1.1.1" + sources."@nodelib/fs.scandir-2.1.5" + sources."@nodelib/fs.stat-2.0.5" + sources."@nodelib/fs.walk-1.2.8" + sources."@oclif/command-1.8.16" + (sources."@oclif/config-1.18.3" // { dependencies = [ - sources."tslib-2.1.0" + sources."tslib-2.3.1" ]; }) - (sources."@oclif/errors-1.3.4" // { + (sources."@oclif/errors-1.3.5" // { dependencies = [ - sources."ansi-styles-4.3.0" - sources."color-convert-2.0.1" - sources."color-name-1.1.4" sources."wrap-ansi-7.0.0" ]; }) + (sources."@oclif/help-1.0.1" // { + dependencies = [ + sources."@oclif/config-1.18.2" + sources."tslib-2.3.1" + ]; + }) sources."@oclif/linewrap-1.0.0" - sources."@oclif/parser-3.8.5" - sources."@oclif/plugin-help-3.2.1" + (sources."@oclif/parser-3.8.6" // { + dependencies = [ + sources."tslib-2.3.1" + ]; + }) + sources."@opentelemetry/api-1.1.0" + sources."@rudderstack/rudder-sdk-node-1.0.6" + sources."@segment/loosely-validate-event-2.0.0" + sources."@selderee/plugin-htmlparser2-0.6.0" sources."@servie/events-1.0.0" sources."@sqltools/formatter-1.2.2" - sources."@tokenizer/token-0.1.1" - sources."@types/bluebird-3.5.33" - sources."@types/body-parser-1.19.0" - sources."@types/connect-3.4.34" - sources."@types/debug-4.1.5" - sources."@types/express-4.17.11" + sources."@tokenizer/token-0.3.0" + sources."@tootallnate/once-1.1.2" + sources."@types/bluebird-3.5.36" + sources."@types/body-parser-1.19.2" + sources."@types/connect-3.4.35" + sources."@types/express-4.17.13" sources."@types/express-jwt-0.0.42" - sources."@types/express-serve-static-core-4.17.18" - sources."@types/express-unless-0.5.1" - sources."@types/ftp-0.3.31" - sources."@types/glob-7.1.3" - sources."@types/jsonwebtoken-8.5.0" + sources."@types/express-serve-static-core-4.17.28" + sources."@types/express-unless-0.5.3" + sources."@types/ftp-0.3.33" + sources."@types/json-diff-0.5.2" + sources."@types/jsonwebtoken-8.5.8" + sources."@types/lodash-4.14.178" + sources."@types/lossless-json-1.0.1" sources."@types/mime-1.3.2" - sources."@types/minimatch-3.0.3" - sources."@types/node-14.14.22" + sources."@types/node-17.0.17" + (sources."@types/node-fetch-2.5.12" // { + dependencies = [ + sources."form-data-3.0.1" + ]; + }) sources."@types/promise-ftp-1.3.4" sources."@types/promise-ftp-common-1.1.0" - sources."@types/qs-6.9.5" - sources."@types/range-parser-1.2.3" - sources."@types/readable-stream-2.3.9" - sources."@types/serve-static-1.13.9" - sources."@types/snowflake-sdk-1.5.1" - sources."@types/tough-cookie-2.3.7" - sources."@types/tunnel-0.0.0" + sources."@types/qs-6.9.7" + sources."@types/range-parser-1.2.4" + sources."@types/readable-stream-2.3.13" + sources."@types/serve-static-1.13.10" + sources."@types/snowflake-sdk-1.6.2" + sources."@types/tough-cookie-2.3.8" + sources."@types/tunnel-0.0.3" + sources."@xmldom/xmldom-0.7.5" sources."abbrev-1.1.1" - sources."accepts-1.3.7" + sources."abort-controller-3.0.0" + sources."accepts-1.3.8" sources."access-control-1.0.1" - (sources."adal-node-0.1.28" // { + sources."acorn-8.7.0" + sources."acorn-walk-8.2.0" + (sources."adal-node-0.2.3" // { dependencies = [ - sources."@types/node-8.10.66" + sources."uuid-3.4.0" ]; }) sources."adler-32-1.2.0" - (sources."agent-base-2.1.1" // { - dependencies = [ - sources."semver-5.0.3" - ]; - }) + sources."agent-base-6.0.2" sources."ajv-6.12.6" - sources."amqplib-0.6.0" - sources."ansi-escapes-4.3.1" - sources."ansi-regex-5.0.0" - sources."ansi-styles-3.2.1" - sources."ansicolors-0.3.2" + sources."amqplib-0.8.0" + sources."ansi-escapes-4.3.2" + sources."ansi-regex-5.0.1" + sources."ansi-styles-4.3.0" sources."any-promise-1.3.0" + sources."anymatch-3.1.2" sources."app-root-path-3.0.0" sources."aproba-1.2.0" - (sources."are-we-there-yet-1.1.5" // { + (sources."are-we-there-yet-1.1.7" // { dependencies = [ sources."isarray-1.0.0" sources."readable-stream-2.3.7" + sources."safe-buffer-5.1.2" sources."string_decoder-1.1.1" ]; }) @@ -6286,206 +7632,246 @@ in sources."array-parallel-0.1.3" sources."array-series-0.1.5" sources."array-union-2.1.0" - sources."asn1-0.2.4" + sources."asn1-0.2.6" sources."asn1.js-5.4.1" sources."asn1.js-rfc2560-5.0.1" sources."asn1.js-rfc5280-3.0.0" sources."assert-options-0.7.0" sources."assert-plus-1.0.0" - sources."async-3.2.0" + sources."async-2.6.3" sources."asynckit-0.4.0" + (sources."auto-changelog-1.16.4" // { + dependencies = [ + sources."semver-6.3.0" + ]; + }) + sources."avsc-5.7.3" + (sources."aws-sdk-2.1073.0" // { + dependencies = [ + sources."buffer-4.9.2" + sources."events-1.1.1" + sources."ieee754-1.1.13" + sources."isarray-1.0.0" + sources."sax-1.2.1" + sources."uuid-3.3.2" + sources."xml2js-0.4.19" + sources."xmlbuilder-9.0.7" + ]; + }) sources."aws-sign2-0.7.0" sources."aws4-1.11.0" - sources."axios-0.19.2" - sources."balanced-match-1.0.0" + sources."axios-0.21.4" + sources."axios-retry-3.2.4" + sources."balanced-match-1.0.2" sources."base64-js-1.5.1" - sources."basic-auth-2.0.1" + (sources."basic-auth-2.0.1" // { + dependencies = [ + sources."safe-buffer-5.1.2" + ]; + }) sources."bcrypt-pbkdf-1.0.2" sources."bcryptjs-2.4.3" - sources."big-integer-1.6.48" + sources."big-integer-1.6.51" sources."bignumber.js-2.4.0" + sources."binary-extensions-2.2.0" + sources."binascii-0.0.2" + sources."bintrees-1.0.1" (sources."bitsyntax-0.1.0" // { dependencies = [ sources."debug-2.6.9" sources."ms-2.0.0" + sources."safe-buffer-5.1.2" ]; }) (sources."bl-2.2.1" // { dependencies = [ sources."isarray-1.0.0" - sources."readable-stream-2.3.7" - sources."string_decoder-1.1.1" + (sources."readable-stream-2.3.7" // { + dependencies = [ + sources."safe-buffer-5.1.2" + ]; + }) + (sources."string_decoder-1.1.1" // { + dependencies = [ + sources."safe-buffer-5.1.2" + ]; + }) ]; }) sources."bluebird-3.7.2" - sources."bn.js-4.11.9" - (sources."body-parser-1.19.0" // { + sources."bn.js-4.12.0" + (sources."body-parser-1.19.1" // { dependencies = [ sources."debug-2.6.9" sources."ms-2.0.0" ]; }) - sources."body-parser-xml-1.1.0" + sources."body-parser-xml-2.0.3" sources."boolbase-1.0.0" sources."brace-expansion-1.1.11" sources."braces-3.0.2" sources."browser-request-0.3.3" - sources."bson-1.1.5" + sources."bson-1.1.6" sources."buffer-5.7.1" sources."buffer-equal-constant-time-1.0.1" - sources."buffer-from-1.1.1" + sources."buffer-from-1.1.2" sources."buffer-more-ints-1.0.0" sources."buffer-writer-2.0.0" + sources."bull-3.29.3" sources."byte-length-1.0.2" - sources."bytes-3.1.0" - sources."cacheable-lookup-5.0.4" + sources."bytes-3.1.1" + sources."call-bind-1.0.2" sources."callback-stream-1.1.0" + sources."callsites-3.1.0" (sources."camel-case-4.1.2" // { dependencies = [ - sources."tslib-2.1.0" + sources."tslib-2.3.1" ]; }) - sources."camelcase-5.3.1" (sources."capital-case-1.0.4" // { dependencies = [ - sources."tslib-2.1.0" + sources."tslib-2.3.1" ]; }) - sources."cardinal-2.1.1" sources."caseless-0.12.0" - sources."cfb-1.2.0" - sources."chalk-2.4.2" - (sources."change-case-4.1.2" // { + (sources."cfb-1.2.1" // { dependencies = [ - sources."tslib-2.1.0" + (sources."adler-32-1.3.0" // { + dependencies = [ + sources."printj-1.2.3" + ]; + }) + sources."printj-1.3.1" ]; }) - sources."chardet-0.7.0" - sources."cheerio-1.0.0-rc.5" - sources."cheerio-select-tmp-0.1.1" - sources."chownr-1.1.4" - (sources."clean-stack-3.0.1" // { + sources."chalk-4.1.2" + (sources."change-case-4.1.2" // { dependencies = [ - sources."escape-string-regexp-4.0.0" + sources."tslib-2.3.1" ]; }) + sources."chardet-0.7.0" + sources."charenc-0.0.2" + sources."cheerio-1.0.0-rc.6" + sources."cheerio-select-1.5.0" + sources."chokidar-3.5.2" + sources."chownr-1.1.4" + sources."class-validator-0.13.2" + sources."clean-stack-3.0.1" + sources."cli-color-0.1.7" sources."cli-cursor-3.1.0" - (sources."cli-highlight-2.1.10" // { + (sources."cli-highlight-2.1.11" // { dependencies = [ - sources."ansi-styles-4.3.0" - sources."chalk-4.1.0" - sources."color-convert-2.0.1" - sources."color-name-1.1.4" - sources."has-flag-4.0.0" sources."parse5-5.1.1" - sources."supports-color-7.2.0" + sources."yargs-16.2.0" ]; }) sources."cli-width-3.0.0" - (sources."client-oauth2-4.3.3" // { - dependencies = [ - sources."safe-buffer-5.2.1" - ]; - }) + sources."client-oauth2-4.3.3" (sources."cliui-7.0.4" // { dependencies = [ - sources."ansi-styles-4.3.0" - sources."color-convert-2.0.1" - sources."color-name-1.1.4" sources."wrap-ansi-7.0.0" ]; }) + sources."cluster-key-slot-1.1.0" sources."code-point-at-1.1.0" - (sources."codepage-1.14.0" // { + sources."codepage-1.15.0" + (sources."color-3.2.1" // { dependencies = [ - sources."commander-2.14.1" + sources."color-convert-1.9.3" + sources."color-name-1.1.3" ]; }) - sources."color-3.0.0" - sources."color-convert-1.9.3" - sources."color-name-1.1.3" - sources."color-string-1.5.4" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" + sources."color-string-1.9.0" sources."colornames-1.1.1" - sources."colors-1.4.0" - sources."colorspace-1.1.2" + sources."colorspace-1.1.4" sources."combined-stream-1.0.8" - sources."commander-2.17.1" + sources."commander-5.1.0" sources."commist-1.1.0" + sources."component-type-1.2.1" sources."compressible-2.0.18" (sources."compression-1.7.4" // { dependencies = [ sources."bytes-3.0.0" sources."debug-2.6.9" sources."ms-2.0.0" + sources."safe-buffer-5.1.2" ]; }) sources."concat-map-0.0.1" - (sources."concat-stream-1.6.2" // { + (sources."concat-stream-2.0.0" // { dependencies = [ - sources."isarray-1.0.0" - sources."readable-stream-2.3.7" - sources."string_decoder-1.1.1" + sources."readable-stream-3.6.0" + sources."string_decoder-1.3.0" ]; }) sources."connect-history-api-fallback-1.6.0" sources."console-control-strings-1.1.0" (sources."constant-case-3.0.4" // { dependencies = [ - sources."tslib-2.1.0" + sources."tslib-2.3.1" ]; }) - sources."content-disposition-0.5.3" + sources."content-disposition-0.5.4" sources."content-type-1.0.4" - sources."convict-5.2.0" - sources."cookie-0.4.0" + sources."convict-6.2.1" + sources."cookie-0.4.1" sources."cookie-signature-1.0.6" + sources."core-js-3.21.0" sources."core-util-is-1.0.2" - sources."crc-32-1.2.0" - sources."cron-1.8.2" + (sources."crc-32-1.2.1" // { + dependencies = [ + sources."printj-1.3.1" + ]; + }) + sources."cron-1.7.2" + sources."cron-parser-2.18.0" (sources."cross-spawn-4.0.2" // { dependencies = [ sources."lru-cache-4.1.5" sources."yallist-2.1.2" ]; }) - sources."crypto-js-4.0.0" + sources."crypt-0.0.2" + sources."crypto-js-4.1.1" sources."csrf-3.1.0" - sources."css-select-3.1.2" - sources."css-what-4.0.0" - sources."d-1.0.1" + sources."css-select-4.2.1" + sources."css-what-5.1.0" sources."dashdash-1.14.1" sources."date-utils-1.2.21" - sources."debug-4.3.2" - sources."decamelize-1.2.0" + sources."debug-4.3.3" + sources."debuglog-1.0.1" sources."deep-extend-0.6.0" + sources."deepmerge-4.2.2" + sources."define-properties-1.1.3" sources."delayed-stream-1.0.0" sources."delegates-1.0.0" - sources."denque-1.5.0" + sources."denque-1.5.1" sources."depd-1.1.2" sources."destroy-1.0.4" sources."detect-libc-1.0.3" - (sources."diagnostics-1.1.1" // { - dependencies = [ - sources."enabled-1.0.2" - sources."kuler-1.0.1" - ]; - }) + sources."diagnostics-1.1.1" + sources."difflib-0.2.4" sources."dir-glob-3.0.1" - sources."dom-serializer-1.2.0" - sources."domelementtype-2.1.0" - sources."domhandler-4.0.0" - sources."domutils-2.4.4" + sources."discontinuous-range-1.0.0" + sources."dom-serializer-1.3.2" + sources."domelementtype-2.2.0" + sources."domhandler-4.3.0" + sources."domutils-2.8.0" (sources."dot-case-3.0.4" // { dependencies = [ - sources."tslib-2.1.0" + sources."tslib-2.3.1" ]; }) - sources."dotenv-8.2.0" - sources."double-ended-queue-2.1.0-0" + sources."dotenv-8.6.0" + sources."dreamopt-0.6.0" (sources."duplexify-3.7.1" // { dependencies = [ sources."isarray-1.0.0" sources."readable-stream-2.3.7" + sources."safe-buffer-5.1.2" sources."string_decoder-1.1.1" ]; }) @@ -6493,55 +7879,50 @@ in sources."ecdsa-sig-formatter-1.0.11" sources."ee-first-1.1.1" sources."emoji-regex-8.0.0" - sources."enabled-2.0.0" + sources."enabled-1.0.2" sources."encodeurl-1.0.2" sources."encoding-japanese-1.0.30" sources."end-of-stream-1.4.4" - sources."entities-2.1.0" + sources."entities-2.2.0" sources."env-variable-0.0.6" - sources."es5-ext-0.10.53" - sources."es6-iterator-2.0.3" - sources."es6-map-0.1.5" + sources."err-code-2.0.3" + sources."es-abstract-1.19.1" + sources."es-to-primitive-1.2.1" + sources."es5-ext-0.8.2" sources."es6-promise-4.2.8" sources."es6-promisify-5.0.0" - (sources."es6-set-0.1.5" // { - dependencies = [ - sources."es6-symbol-3.1.1" - ]; - }) - sources."es6-symbol-3.1.3" sources."escalade-3.1.1" sources."escape-html-1.0.3" - sources."escape-string-regexp-1.0.5" + sources."escape-string-regexp-4.0.0" sources."eslint-config-riot-1.0.0" sources."esprima-4.0.1" sources."etag-1.8.1" - sources."event-emitter-0.3.5" - sources."eventsource-1.0.7" + sources."event-target-shim-5.0.1" + sources."events-3.3.0" + sources."eventsource-1.1.0" sources."exit-on-epipe-1.0.1" - (sources."express-4.17.1" // { + sources."expand-tilde-2.0.2" + (sources."express-4.17.2" // { dependencies = [ sources."debug-2.6.9" sources."ms-2.0.0" ]; }) - (sources."ext-1.4.0" // { - dependencies = [ - sources."type-2.1.0" - ]; - }) sources."extend-3.0.2" sources."external-editor-3.1.0" sources."extsprintf-1.3.0" sources."fast-deep-equal-3.1.3" - sources."fast-glob-3.2.5" + sources."fast-glob-3.2.11" sources."fast-json-stable-stringify-2.1.0" - sources."fast-safe-stringify-2.0.7" - sources."fastq-1.10.1" - sources."fecha-4.2.0" - sources."fflate-0.4.8" - sources."figlet-1.5.0" - sources."figures-3.2.0" + sources."fastq-1.13.0" + sources."fecha-4.2.1" + sources."fflate-0.7.3" + sources."figlet-1.5.2" + (sources."figures-3.2.0" // { + dependencies = [ + sources."escape-string-regexp-1.0.5" + ]; + }) sources."file-type-14.7.1" sources."fill-range-7.0.1" (sources."finalhandler-1.1.2" // { @@ -6550,23 +7931,20 @@ in sources."ms-2.0.0" ]; }) - sources."flatted-2.0.2" + sources."flatted-3.2.5" sources."fn.name-1.1.0" - (sources."follow-redirects-1.5.10" // { - dependencies = [ - sources."debug-3.1.0" - sources."ms-2.0.0" - ]; - }) + sources."follow-redirects-1.14.8" + sources."for-each-0.3.3" sources."forever-agent-0.6.1" - sources."form-data-2.3.3" - sources."formidable-1.2.2" - sources."forwarded-0.1.2" + sources."form-data-4.0.0" + sources."formidable-1.2.6" + sources."forwarded-0.2.0" sources."frac-1.1.2" sources."fresh-0.5.2" sources."fs-extra-8.1.0" sources."fs-minipass-1.2.7" sources."fs.realpath-1.0.0" + sources."function-bind-1.1.1" (sources."gauge-2.7.4" // { dependencies = [ sources."ansi-regex-2.1.1" @@ -6576,135 +7954,137 @@ in ]; }) sources."generate-function-2.3.1" + sources."generic-pool-3.8.2" sources."get-caller-file-2.0.5" + sources."get-intrinsic-1.1.1" + sources."get-port-5.1.1" + sources."get-symbol-description-1.0.0" sources."get-system-fonts-2.0.2" sources."getpass-0.1.7" - sources."glob-7.1.6" - sources."glob-parent-5.1.1" - sources."glob-promise-3.4.0" + sources."glob-7.2.0" + sources."glob-parent-5.1.2" (sources."glob-stream-6.1.0" // { dependencies = [ sources."glob-parent-3.1.0" sources."is-glob-3.1.0" sources."isarray-1.0.0" sources."readable-stream-2.3.7" + sources."safe-buffer-5.1.2" sources."string_decoder-1.1.1" ]; }) - sources."globby-11.0.2" + sources."globby-11.1.0" (sources."gm-1.23.1" // { dependencies = [ sources."debug-3.2.7" ]; }) sources."google-timezones-json-1.0.2" - sources."graceful-fs-4.2.4" + sources."graceful-fs-4.2.9" + sources."handlebars-4.7.7" sources."har-schema-2.0.0" sources."har-validator-5.1.5" + sources."has-1.0.3" (sources."has-ansi-2.0.0" // { dependencies = [ sources."ansi-regex-2.1.1" ]; }) - sources."has-flag-3.0.0" + sources."has-bigints-1.0.1" + sources."has-flag-4.0.0" + sources."has-symbols-1.0.2" + sources."has-tostringtag-1.0.0" sources."has-unicode-2.0.1" sources."he-1.2.0" (sources."header-case-2.0.4" // { dependencies = [ - sources."tslib-2.1.0" + sources."tslib-2.3.1" ]; }) + sources."heap-0.2.7" sources."help-me-1.1.0" - sources."highlight.js-10.5.0" - (sources."html-to-text-5.1.1" // { - dependencies = [ - (sources."dom-serializer-0.2.2" // { - dependencies = [ - sources."domelementtype-2.1.0" - sources."entities-2.2.0" - ]; - }) - sources."domelementtype-1.3.1" - sources."domhandler-2.4.2" - sources."domutils-1.7.0" - sources."entities-1.1.2" - sources."htmlparser2-3.10.1" - sources."readable-stream-3.6.0" - sources."safe-buffer-5.2.1" - sources."string_decoder-1.3.0" - ]; - }) - sources."htmlparser2-6.0.0" - sources."http-errors-1.7.2" + sources."highlight.js-10.7.3" + sources."homedir-polyfill-1.0.3" + sources."html-to-text-8.0.0" + sources."htmlparser2-6.1.0" + sources."http-errors-1.8.1" + sources."http-proxy-agent-4.0.1" sources."http-signature-1.2.0" - (sources."https-proxy-agent-3.0.1" // { - dependencies = [ - sources."agent-base-4.3.0" - sources."debug-3.2.7" - ]; - }) + sources."https-proxy-agent-5.0.0" sources."iconv-lite-0.4.24" + sources."ics-2.35.0" sources."ieee754-1.2.1" - sources."ignore-5.1.8" - sources."ignore-walk-3.0.3" + sources."ignore-5.2.0" + sources."ignore-walk-3.0.4" sources."imap-0.8.19" sources."imap-simple-4.3.0" sources."indent-string-4.0.0" sources."inflight-1.0.6" - sources."inherits-2.0.3" + sources."inherits-2.0.4" sources."ini-1.3.8" - (sources."inquirer-7.3.3" // { - dependencies = [ - sources."ansi-styles-4.3.0" - sources."chalk-4.1.0" - sources."color-convert-2.0.1" - sources."color-name-1.1.4" - sources."has-flag-4.0.0" - sources."supports-color-7.2.0" - ]; - }) + sources."inquirer-7.3.3" + sources."internal-slot-1.0.3" + sources."ioredis-4.28.5" sources."ip-regex-2.1.0" sources."ipaddr.js-1.9.1" sources."is-absolute-1.0.0" sources."is-arrayish-0.3.2" - sources."is-docker-2.1.1" + sources."is-bigint-1.0.4" + sources."is-binary-path-2.1.0" + sources."is-boolean-object-1.1.2" + sources."is-buffer-1.1.6" + sources."is-callable-1.2.4" + sources."is-date-object-1.0.5" + sources."is-docker-2.2.1" sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-3.0.0" - sources."is-glob-4.0.1" + sources."is-glob-4.0.3" + sources."is-nan-1.3.2" sources."is-negated-glob-1.0.0" + sources."is-negative-zero-2.0.2" sources."is-number-7.0.0" + sources."is-number-object-1.0.6" sources."is-promise-1.0.1" sources."is-property-1.0.2" + sources."is-regex-1.1.4" sources."is-relative-1.0.0" - sources."is-stream-2.0.0" + sources."is-retry-allowed-2.2.0" + sources."is-shared-array-buffer-1.0.1" + sources."is-stream-2.0.1" + sources."is-string-1.0.7" + sources."is-symbol-1.0.4" sources."is-typedarray-1.0.0" sources."is-unc-path-1.0.0" + sources."is-weakref-1.0.2" sources."is-windows-1.0.2" sources."is-wsl-2.2.0" sources."isarray-0.0.1" + sources."isbot-3.4.2" sources."isexe-2.0.0" - sources."iso-639-1-2.1.7" + sources."iso-639-1-2.1.13" sources."isstream-0.1.2" + sources."jmespath-0.16.0" + sources."join-component-1.1.0" sources."js-yaml-3.14.1" - sources."jsbi-3.1.4" + sources."jsbi-3.2.5" sources."jsbn-0.1.1" - sources."json-schema-0.2.3" + sources."json-diff-0.5.5" + sources."json-schema-0.4.0" sources."json-schema-traverse-0.4.1" sources."json-stable-stringify-without-jsonify-1.0.1" sources."json-stringify-safe-5.0.1" - sources."json5-2.1.0" sources."jsonfile-4.0.0" (sources."jsonwebtoken-8.5.1" // { dependencies = [ sources."semver-5.7.1" ]; }) - sources."jsprim-1.4.1" + sources."jsprim-1.4.2" sources."jwa-1.4.1" - sources."jwks-rsa-1.9.0" + sources."jwks-rsa-1.12.3" sources."jws-3.2.2" - sources."kafkajs-1.15.0" - sources."kuler-2.0.0" + sources."kafkajs-1.16.0" + sources."kuler-1.0.1" sources."leven-2.1.0" sources."libbase64-1.2.1" (sources."libmime-5.0.0" // { @@ -6712,36 +8092,40 @@ in sources."iconv-lite-0.6.2" ]; }) + sources."libphonenumber-js-1.9.49" sources."libqp-1.1.0" sources."limiter-1.1.5" - sources."linkify-it-3.0.2" - (sources."localtunnel-2.0.1" // { + sources."linkify-it-3.0.3" + (sources."localtunnel-2.0.2" // { dependencies = [ - sources."axios-0.21.1" - sources."debug-4.3.1" - sources."follow-redirects-1.13.2" + sources."debug-4.3.2" ]; }) - sources."lodash-4.17.20" - sources."lodash._reinterpolate-3.0.0" + sources."lodash-4.17.21" + sources."lodash-es-4.17.21" sources."lodash.clonedeep-4.5.0" + sources."lodash.defaults-4.2.0" + sources."lodash.flatten-4.4.0" sources."lodash.get-4.4.2" sources."lodash.includes-4.3.0" + sources."lodash.isarguments-3.1.0" sources."lodash.isboolean-3.0.3" + sources."lodash.isequal-4.5.0" sources."lodash.isinteger-4.0.4" sources."lodash.isnumber-3.0.3" sources."lodash.isplainobject-4.0.6" sources."lodash.isstring-4.0.1" + sources."lodash.merge-4.6.2" sources."lodash.once-4.1.1" sources."lodash.set-4.3.2" - sources."lodash.template-4.5.0" - sources."lodash.templatesettings-4.2.0" + sources."lodash.uniqby-4.7.0" sources."lodash.unset-4.5.2" - sources."logform-2.2.0" + sources."logform-2.4.0" sources."long-4.0.0" + sources."lossless-json-1.0.5" (sources."lower-case-2.0.2" // { dependencies = [ - sources."tslib-2.1.0" + sources."tslib-2.3.1" ]; }) sources."lru-cache-6.0.0" @@ -6751,33 +8135,34 @@ in sources."yallist-2.1.2" ]; }) - (sources."mailparser-2.8.1" // { + (sources."mailparser-3.4.0" // { dependencies = [ - sources."iconv-lite-0.6.2" - sources."nodemailer-6.4.11" + sources."iconv-lite-0.6.3" + sources."nodemailer-6.7.0" ]; }) - (sources."mailsplit-5.0.0" // { + sources."mailsplit-5.3.1" + (sources."make-dir-3.1.0" // { dependencies = [ - sources."iconv-lite-0.5.0" - sources."libmime-4.2.1" + sources."semver-6.3.0" ]; }) sources."make-error-1.3.6" sources."make-error-cause-2.3.0" + sources."mappersmith-2.37.1" + sources."md5-2.3.0" sources."media-typer-0.3.0" - sources."memory-pager-1.5.0" sources."merge-descriptors-1.0.1" sources."merge2-1.4.1" sources."methods-1.1.2" - sources."micromatch-4.0.2" + sources."micromatch-4.0.4" sources."millisecond-0.1.2" sources."mime-1.6.0" - sources."mime-db-1.45.0" - sources."mime-types-2.1.28" + sources."mime-db-1.51.0" + sources."mime-types-2.1.34" sources."mimic-fn-2.1.0" sources."minimalistic-assert-1.0.1" - sources."minimatch-3.0.4" + sources."minimatch-3.1.1" sources."minimist-1.2.5" (sources."minipass-2.9.0" // { dependencies = [ @@ -6786,65 +8171,82 @@ in }) sources."minizlib-1.3.3" sources."mkdirp-1.0.4" - sources."moment-2.24.0" - sources."moment-timezone-0.5.32" - sources."mongodb-3.6.3" - (sources."mqtt-4.2.1" // { + (sources."mock-require-3.0.3" // { dependencies = [ - sources."isarray-1.0.0" - sources."readable-stream-2.3.7" - sources."string_decoder-1.1.1" + sources."get-caller-file-1.0.3" + sources."normalize-path-2.1.1" ]; }) - (sources."mqtt-packet-6.7.0" // { + sources."moment-2.29.1" + sources."moment-timezone-0.5.34" + sources."monaco-editor-0.29.1" + sources."mongodb-3.7.3" + sources."moo-0.5.1" + (sources."mqtt-4.2.6" // { dependencies = [ - sources."bl-4.0.3" - sources."inherits-2.0.4" sources."readable-stream-3.6.0" - sources."safe-buffer-5.2.1" + sources."string_decoder-1.3.0" + ]; + }) + (sources."mqtt-packet-6.10.0" // { + dependencies = [ + sources."bl-4.1.0" + sources."readable-stream-3.6.0" sources."string_decoder-1.3.0" ]; }) sources."ms-2.1.2" - sources."mssql-6.3.1" + sources."mssql-6.4.0" sources."mute-stream-0.0.8" - (sources."mysql2-2.1.0" // { + (sources."mysql2-2.3.3" // { dependencies = [ - sources."iconv-lite-0.5.2" - sources."lru-cache-5.1.1" - sources."yallist-3.1.1" + sources."denque-2.0.1" + sources."iconv-lite-0.6.3" ]; }) sources."mz-2.7.0" - sources."n8n-core-0.62.0" - sources."n8n-editor-ui-0.75.0" - (sources."n8n-nodes-base-0.102.0" // { + (sources."n8n-core-0.104.0" // { dependencies = [ - sources."moment-2.28.0" + sources."qs-6.10.3" ]; }) - sources."n8n-workflow-0.51.0" + sources."n8n-design-system-0.11.0" + sources."n8n-editor-ui-0.130.0" + (sources."n8n-nodes-base-0.161.0" // { + dependencies = [ + sources."iconv-lite-0.6.3" + ]; + }) + sources."n8n-workflow-0.86.0" (sources."named-placeholders-1.1.2" // { dependencies = [ sources."lru-cache-4.1.5" sources."yallist-2.1.2" ]; }) - sources."nan-2.14.2" + sources."nanoclone-0.2.1" + sources."nanoid-3.2.0" sources."native-duplexpair-1.0.0" - (sources."needle-2.6.0" // { + (sources."nearley-2.20.1" // { + dependencies = [ + sources."commander-2.20.3" + ]; + }) + (sources."needle-2.9.1" // { dependencies = [ sources."debug-3.2.7" ]; }) - sources."negotiator-0.6.2" - sources."next-tick-1.0.0" + sources."negotiator-0.6.3" + sources."neo-async-2.6.2" (sources."no-case-3.0.4" // { dependencies = [ - sources."tslib-2.1.0" + sources."tslib-2.3.1" ]; }) + sources."node-addon-api-3.2.1" sources."node-ensure-0.0.0" + sources."node-fetch-2.6.7" (sources."node-pre-gyp-0.11.0" // { dependencies = [ sources."mkdirp-0.5.5" @@ -6852,18 +8254,24 @@ in sources."semver-5.7.1" ]; }) + sources."node-ssh-12.0.3" sources."nodeify-1.0.1" - sources."nodemailer-6.4.17" + sources."nodemailer-6.7.2" sources."nopt-4.0.3" - sources."npm-bundled-1.1.1" + sources."normalize-path-3.0.0" + sources."npm-bundled-1.1.2" sources."npm-normalize-package-bin-1.0.1" sources."npm-packlist-1.4.8" sources."npmlog-4.1.2" - sources."nth-check-2.0.0" + sources."nth-check-2.0.1" sources."number-is-nan-1.0.1" sources."oauth-1.0a-2.2.6" sources."oauth-sign-0.9.0" sources."object-assign-4.1.1" + sources."object-inspect-1.12.0" + sources."object-keys-1.1.1" + sources."object.assign-4.1.2" + sources."object.getownpropertydescriptors-2.1.3" (sources."ocsp-1.2.0" // { dependencies = [ sources."asn1.js-4.10.1" @@ -6877,12 +8285,14 @@ in sources."once-1.4.0" sources."one-time-1.0.0" sources."onetime-5.1.2" - sources."open-7.4.0" + sources."open-7.4.2" sources."openurl-1.1.1" + sources."optional-require-1.1.8" (sources."ordered-read-streams-1.0.1" // { dependencies = [ sources."isarray-1.0.0" sources."readable-stream-2.3.7" + sources."safe-buffer-5.1.2" sources."string_decoder-1.1.1" ]; }) @@ -6890,25 +8300,31 @@ in sources."os-homedir-1.0.2" sources."os-tmpdir-1.0.2" sources."osenv-0.1.5" - sources."p-cancelable-2.0.0" + sources."p-cancelable-2.1.1" + sources."p-finally-1.0.0" + sources."p-map-2.1.0" + sources."p-timeout-3.2.0" sources."packet-reader-1.0.0" (sources."param-case-3.0.4" // { dependencies = [ - sources."tslib-2.1.0" + sources."tslib-2.3.1" ]; }) sources."parent-require-1.0.0" + sources."parse-github-url-1.0.2" + sources."parse-passwd-1.0.0" sources."parse5-6.0.1" sources."parse5-htmlparser2-tree-adapter-6.0.1" + sources."parseley-0.7.0" sources."parseurl-1.3.3" (sources."pascal-case-3.1.2" // { dependencies = [ - sources."tslib-2.1.0" + sources."tslib-2.3.1" ]; }) (sources."path-case-3.0.4" // { dependencies = [ - sources."tslib-2.1.0" + sources."tslib-2.3.1" ]; }) sources."path-dirname-1.0.2" @@ -6920,23 +8336,31 @@ in sources."debug-3.2.7" ]; }) - sources."peek-readable-3.1.3" + sources."peek-readable-4.1.0" sources."performance-now-2.1.0" - sources."pg-8.5.1" - sources."pg-connection-string-2.4.0" + sources."pg-8.7.3" + sources."pg-connection-string-2.5.0" sources."pg-int8-1.0.1" sources."pg-minify-1.6.2" - sources."pg-pool-3.2.2" - sources."pg-promise-10.9.2" - sources."pg-protocol-1.4.0" + sources."pg-pool-3.5.1" + (sources."pg-promise-10.11.1" // { + dependencies = [ + sources."pg-8.7.1" + ]; + }) + sources."pg-protocol-1.5.0" sources."pg-types-2.2.0" - sources."pgpass-1.0.4" - sources."picomatch-2.2.2" + (sources."pgpass-1.0.5" // { + dependencies = [ + sources."split2-4.1.0" + ]; + }) + sources."picomatch-2.3.1" sources."popsicle-12.1.0" sources."popsicle-content-encoding-1.0.0" sources."popsicle-cookie-jar-1.0.0" sources."popsicle-redirects-1.1.0" - sources."popsicle-transport-http-1.1.1" + sources."popsicle-transport-http-1.2.1" sources."popsicle-transport-xhr-2.0.0" sources."popsicle-user-agent-1.0.0" sources."postgres-array-2.0.0" @@ -6944,7 +8368,9 @@ in sources."postgres-date-1.0.7" sources."postgres-interval-1.2.0" sources."printj-1.1.2" + sources."process-0.11.10" sources."process-nextick-args-2.0.1" + sources."prom-client-13.2.0" sources."promise-1.3.0" (sources."promise-ftp-1.3.5" // { dependencies = [ @@ -6952,7 +8378,11 @@ in ]; }) sources."promise-ftp-common-1.1.5" - sources."proxy-addr-2.0.6" + sources."promise-retry-2.0.1" + sources."promise.prototype.finally-3.1.3" + sources."property-expr-2.0.5" + sources."proxy-addr-2.0.7" + sources."proxy-from-env-1.1.0" sources."pseudomap-1.0.2" sources."psl-1.8.0" sources."pump-3.0.0" @@ -6962,26 +8392,37 @@ in ]; }) sources."punycode-2.1.1" - sources."qs-6.7.0" + sources."python-struct-1.1.3" + sources."qs-6.9.6" + sources."querystring-0.2.0" sources."querystringify-2.2.0" + sources."queue-microtask-1.2.3" sources."quoted-printable-1.0.1" + sources."railroad-diagrams-1.0.0" + sources."randexp-0.4.6" sources."random-bytes-1.0.0" + sources."randombytes-2.1.0" sources."range-parser-1.2.1" - sources."raw-body-2.4.0" + sources."raw-body-2.4.2" sources."rc-1.2.8" sources."readable-stream-1.1.14" sources."readable-web-to-node-stream-2.0.0" - sources."redeyed-2.1.1" - sources."redis-2.8.0" - sources."redis-commands-1.6.0" - sources."redis-parser-2.6.0" + sources."readdirp-3.6.0" + sources."redis-3.1.2" + sources."redis-commands-1.7.0" + sources."redis-errors-1.2.0" + sources."redis-parser-3.0.0" sources."reflect-metadata-0.1.13" + sources."regenerator-runtime-0.13.9" sources."reinterval-1.1.0" sources."remove-trailing-separator-1.1.0" + sources."remove-trailing-slash-0.1.1" (sources."request-2.88.2" // { dependencies = [ - sources."qs-6.5.2" + sources."form-data-2.3.3" + sources."qs-6.5.3" sources."tough-cookie-2.5.0" + sources."uuid-3.4.0" ]; }) sources."request-promise-core-1.1.4" @@ -6990,16 +8431,12 @@ in sources."tough-cookie-2.5.0" ]; }) - sources."requestretry-4.1.2" + sources."requestretry-6.0.0" + sources."require-at-1.0.6" sources."require-directory-2.1.1" - (sources."require_optional-1.0.1" // { - dependencies = [ - sources."semver-5.7.1" - ]; - }) sources."requires-port-1.0.0" - sources."resolve-from-2.0.0" sources."restore-cursor-3.1.0" + sources."ret-0.1.15" sources."retry-0.12.0" sources."reusify-1.0.4" (sources."rhea-1.0.24" // { @@ -7010,105 +8447,113 @@ in sources."rimraf-3.0.2" sources."riot-tmpl-3.0.8" sources."rndm-1.2.0" - sources."rss-parser-3.10.0" + sources."rss-parser-3.12.0" sources."run-async-2.4.1" - sources."run-parallel-1.1.10" - sources."rxjs-6.6.3" - sources."safe-buffer-5.1.2" + sources."run-parallel-1.2.0" + sources."rxjs-6.6.7" + sources."safe-buffer-5.2.1" + sources."safe-stable-stringify-2.3.1" sources."safer-buffer-2.1.2" - sources."saslprep-1.0.3" sources."sax-1.2.4" - sources."semver-7.3.4" - (sources."send-0.17.1" // { + sources."sb-promise-queue-2.1.0" + sources."sb-scandir-3.1.0" + sources."selderee-0.6.0" + sources."semver-7.3.5" + (sources."send-0.17.2" // { dependencies = [ (sources."debug-2.6.9" // { dependencies = [ sources."ms-2.0.0" ]; }) - sources."ms-2.1.1" + sources."ms-2.1.3" ]; }) (sources."sentence-case-3.0.4" // { dependencies = [ - sources."tslib-2.1.0" + sources."tslib-2.3.1" ]; }) sources."seq-queue-0.0.5" - sources."serve-static-1.14.1" + sources."serialize-javascript-5.0.1" + sources."serve-static-1.14.2" sources."servie-4.3.3" sources."set-blocking-2.0.0" sources."setheader-1.0.2" - sources."setprototypeof-1.1.1" + sources."setprototypeof-1.2.0" sources."sha.js-2.4.11" - sources."signal-exit-3.0.3" + sources."shell-escape-0.2.0" + sources."side-channel-1.0.4" + sources."signal-exit-3.0.7" + sources."simple-git-2.48.0" sources."simple-lru-cache-0.0.2" sources."simple-swizzle-0.2.2" sources."slash-3.0.0" (sources."snake-case-3.0.4" // { dependencies = [ - sources."tslib-2.1.0" + sources."tslib-2.3.1" ]; }) - (sources."snowflake-sdk-1.5.3" // { + (sources."snowflake-sdk-1.6.6" // { dependencies = [ + sources."agent-base-4.3.0" sources."debug-3.2.7" + sources."http-signature-1.3.6" + sources."https-proxy-agent-3.0.1" + sources."jsprim-2.0.2" + sources."tmp-0.2.1" + sources."uuid-3.4.0" ]; }) - sources."sparse-bitfield-3.0.3" + sources."source-map-0.6.1" sources."spex-3.2.0" (sources."split2-3.2.2" // { dependencies = [ sources."readable-stream-3.6.0" - sources."safe-buffer-5.2.1" sources."string_decoder-1.3.0" ]; }) sources."sprintf-js-1.1.2" - sources."sqlite3-4.2.0" + sources."sqlite3-5.0.2" sources."sqlstring-2.3.2" sources."sse-channel-3.1.1" sources."ssf-0.11.2" - sources."ssh2-0.8.9" - (sources."ssh2-sftp-client-5.3.2" // { - dependencies = [ - sources."concat-stream-2.0.0" - sources."readable-stream-3.6.0" - sources."safe-buffer-5.2.1" - sources."string_decoder-1.3.0" - ]; - }) - sources."ssh2-streams-0.4.10" - sources."sshpk-1.16.1" + sources."ssh2-1.6.0" + sources."ssh2-sftp-client-7.2.2" + sources."sshpk-1.17.0" sources."stack-trace-0.0.10" + sources."standard-as-callback-2.1.0" sources."statuses-1.5.0" sources."stealthy-require-1.1.1" sources."stream-shift-1.0.1" - sources."streamsearch-0.1.2" - sources."string-width-4.2.0" + sources."string-similarity-4.0.4" + sources."string-width-4.2.3" + sources."string.prototype.trimend-1.0.4" + sources."string.prototype.trimstart-1.0.4" sources."string_decoder-0.10.31" - sources."strip-ansi-6.0.0" + sources."strip-ansi-6.0.1" sources."strip-json-comments-2.0.1" - sources."strtok3-6.0.8" - sources."supports-color-5.5.0" - (sources."tar-4.4.13" // { + sources."strtok3-6.3.0" + sources."supports-color-7.2.0" + (sources."tar-4.4.19" // { dependencies = [ sources."mkdirp-0.5.5" sources."yallist-3.1.1" ]; }) sources."tarn-1.1.5" - (sources."tedious-6.7.0" // { + sources."tdigest-0.1.1" + (sources."tedious-6.7.1" // { dependencies = [ - sources."@types/node-12.19.15" + sources."@types/node-12.20.45" sources."bl-3.0.1" sources."depd-2.0.0" sources."iconv-lite-0.5.2" sources."readable-stream-3.6.0" - sources."safe-buffer-5.2.1" sources."string_decoder-1.3.0" ]; }) + sources."test-console-2.0.0" sources."text-hex-1.0.0" sources."thenify-3.3.1" sources."thenify-all-1.6.0" @@ -7117,65 +8562,72 @@ in dependencies = [ sources."isarray-1.0.0" sources."readable-stream-2.3.7" + sources."safe-buffer-5.1.2" sources."string_decoder-1.1.1" ]; }) sources."through2-filter-3.0.0" sources."throwback-4.1.0" - sources."tlds-1.208.0" + sources."timeago.js-4.0.2" + sources."tlds-1.224.0" sources."tmp-0.0.33" - (sources."tmp-promise-3.0.2" // { + (sources."tmp-promise-3.0.3" // { dependencies = [ sources."tmp-0.2.1" ]; }) sources."to-absolute-glob-2.0.2" sources."to-regex-range-5.0.1" - sources."toidentifier-1.0.0" - sources."token-types-2.1.1" + sources."toidentifier-1.0.1" + (sources."token-types-2.1.1" // { + dependencies = [ + sources."@tokenizer/token-0.1.1" + ]; + }) + sources."toposort-2.0.2" sources."tough-cookie-3.0.1" + sources."tr46-0.0.3" sources."triple-beam-1.3.0" - sources."ts-expect-1.1.0" - sources."tslib-1.11.2" + sources."ts-expect-1.3.0" + sources."tslib-1.14.1" sources."tsscmp-1.0.6" sources."tunnel-0.0.6" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" - sources."type-1.2.0" - sources."type-fest-0.11.0" + sources."type-fest-0.21.3" sources."type-is-1.6.18" sources."typedarray-0.0.6" sources."typedarray-to-buffer-3.1.5" (sources."typeorm-0.2.30" // { dependencies = [ - sources."ansi-styles-4.3.0" - sources."chalk-4.1.0" - sources."color-convert-2.0.1" - sources."color-name-1.1.4" - sources."has-flag-4.0.0" - sources."supports-color-7.2.0" - sources."tslib-1.14.1" + sources."yargs-16.2.0" ]; }) sources."uc.micro-1.0.6" sources."uid-safe-2.1.5" + sources."unbox-primitive-1.0.1" sources."unc-path-regex-0.1.2" - sources."underscore-1.12.0" + sources."underscore-1.13.2" sources."unique-stream-2.3.1" sources."universalify-0.1.2" sources."unpipe-1.0.0" (sources."upper-case-2.0.2" // { dependencies = [ - sources."tslib-2.1.0" + sources."tslib-2.3.1" ]; }) (sources."upper-case-first-2.0.2" // { dependencies = [ - sources."tslib-2.1.0" + sources."tslib-2.3.1" ]; }) sources."uri-js-4.4.1" - sources."url-parse-1.4.7" + (sources."url-0.10.3" // { + dependencies = [ + sources."punycode-1.3.2" + ]; + }) + sources."url-parse-1.5.6" (sources."utf7-1.0.2" // { dependencies = [ sources."semver-5.3.0" @@ -7183,78 +8635,63 @@ in }) sources."utf8-2.1.2" sources."util-deprecate-1.0.2" + sources."util.promisify-1.1.1" sources."utils-merge-1.0.1" sources."uuencode-0.0.4" - sources."uuid-3.4.0" - sources."validator-11.1.0" + sources."uuid-8.3.2" + sources."v-click-outside-3.1.2" + sources."validator-13.7.0" sources."vary-1.1.2" sources."verror-1.10.0" - sources."vm2-3.9.2" - sources."when-3.7.8" + sources."vm2-3.9.7" + sources."vue-fragment-1.5.2" + sources."vue-i18n-8.27.0" + sources."webidl-conversions-3.0.1" + sources."whatwg-url-5.0.0" sources."which-1.3.1" - (sources."wide-align-1.1.3" // { - dependencies = [ - sources."ansi-regex-3.0.0" - sources."is-fullwidth-code-point-2.0.0" - sources."string-width-2.1.1" - sources."strip-ansi-4.0.0" - ]; - }) + sources."which-boxed-primitive-1.0.2" + sources."wide-align-1.1.5" sources."widest-line-3.1.0" - (sources."winston-3.3.3" // { + (sources."winston-3.6.0" // { dependencies = [ + sources."async-3.2.3" sources."readable-stream-3.6.0" - sources."safe-buffer-5.2.1" sources."string_decoder-1.3.0" ]; }) - (sources."winston-transport-4.4.0" // { + (sources."winston-transport-4.5.0" // { dependencies = [ - sources."isarray-1.0.0" - sources."readable-stream-2.3.7" - sources."string_decoder-1.1.1" + sources."readable-stream-3.6.0" + sources."string_decoder-1.3.0" ]; }) sources."wmf-1.0.2" sources."word-0.3.0" - (sources."wrap-ansi-4.0.0" // { - dependencies = [ - sources."ansi-regex-3.0.0" - sources."is-fullwidth-code-point-2.0.0" - sources."string-width-2.1.1" - sources."strip-ansi-4.0.0" - ]; - }) + sources."wordwrap-1.0.0" + sources."wrap-ansi-6.2.0" sources."wrappy-1.0.2" - sources."ws-7.4.2" - (sources."xlsx-0.16.9" // { - dependencies = [ - sources."fflate-0.3.11" - ]; - }) + sources."ws-7.5.7" + sources."xlsx-0.17.5" sources."xml2js-0.4.23" sources."xmlbuilder-11.0.1" - sources."xmldom-0.4.0" sources."xpath.js-1.1.0" sources."xregexp-2.0.0" sources."xtend-4.0.2" - sources."y18n-5.0.5" + sources."y18n-5.0.8" sources."yallist-4.0.0" (sources."yargonaut-1.1.4" // { dependencies = [ sources."ansi-regex-2.1.1" sources."ansi-styles-2.2.1" sources."chalk-1.1.3" + sources."escape-string-regexp-1.0.5" sources."strip-ansi-3.0.1" sources."supports-color-2.0.0" ]; }) - (sources."yargs-16.2.0" // { - dependencies = [ - sources."yargs-parser-20.2.4" - ]; - }) - sources."yargs-parser-13.0.0" + sources."yargs-17.1.1" + sources."yargs-parser-20.2.9" + sources."yup-0.32.11" ]; buildInputs = globalBuildInputs; meta = { diff --git a/nixpkgs/pkgs/applications/networking/nextcloud-client/default.nix b/nixpkgs/pkgs/applications/networking/nextcloud-client/default.nix index bbdddbf60682..874c0f8a177f 100644 --- a/nixpkgs/pkgs/applications/networking/nextcloud-client/default.nix +++ b/nixpkgs/pkgs/applications/networking/nextcloud-client/default.nix @@ -21,13 +21,13 @@ mkDerivation rec { pname = "nextcloud-client"; - version = "3.4.1"; + version = "3.4.2"; src = fetchFromGitHub { owner = "nextcloud"; repo = "desktop"; rev = "v${version}"; - sha256 = "sha256-1fUk4PUFkWcLOvrYvM+K+ZarUSeq/JtDU2bHHPoAoC8="; + sha256 = "sha256-cqpdn2STxJtUTBRFrUh1lRIDaFZfrRkJMxcJuTKxgk8="; }; patches = [ diff --git a/nixpkgs/pkgs/applications/networking/nextdns/default.nix b/nixpkgs/pkgs/applications/networking/nextdns/default.nix index ae7eb49a1c66..a18257dfeb65 100644 --- a/nixpkgs/pkgs/applications/networking/nextdns/default.nix +++ b/nixpkgs/pkgs/applications/networking/nextdns/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "nextdns"; - version = "1.37.3"; + version = "1.37.7"; src = fetchFromGitHub { owner = "nextdns"; repo = "nextdns"; rev = "v${version}"; - sha256 = "sha256-BCDVn4JaRYIexI7NrRDchUl9u4AEJa+An9ItYYJDs3A="; + sha256 = "sha256-L5PeT4Y2oWM1WUJaBK9xgrpfkpvKM1+sA29A3AiDE38="; }; - vendorSha256 = "sha256-YZm+DUrH+1xdJrGjmlajbcsnqVODVbZKivVjmqZ2e48="; + vendorSha256 = "sha256-6hWD05lXteqL7egj9tiRVHlevKM33i+a+zBUZs7PF7I="; doCheck = false; diff --git a/nixpkgs/pkgs/applications/networking/ngadmin/default.nix b/nixpkgs/pkgs/applications/networking/ngadmin/default.nix index 8392e0583454..f63fbfcf9503 100644 --- a/nixpkgs/pkgs/applications/networking/ngadmin/default.nix +++ b/nixpkgs/pkgs/applications/networking/ngadmin/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ autoreconfHook ] ++ lib.optional withReadline readline; - enableParallelBuild = true; + enableParallelBuilding = true; configureFlags = with lib; optional (!withReadline) "--without-readline" ++ optional enableEmu "--enable-emu" diff --git a/nixpkgs/pkgs/applications/networking/novnc/default.nix b/nixpkgs/pkgs/applications/networking/novnc/default.nix new file mode 100644 index 000000000000..269944324c64 --- /dev/null +++ b/nixpkgs/pkgs/applications/networking/novnc/default.nix @@ -0,0 +1,30 @@ +{ lib, stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + pname = "novnc"; + version = "1.3.0"; + + src = fetchFromGitHub { + owner = "novnc"; + repo = "noVNC"; + rev = "v${version}"; + sha256 = "sha256-Z+bks7kcwj+Z3uf/t0u25DnGOM60QhSH6uuoIi59jqU="; + }; + + installPhase = '' + runHook preInstall + + install -Dm755 utils/novnc_proxy "$out/bin/novnc" + install -dm755 "$out/share/webapps/novnc/" + cp -a app core po vendor vnc.html karma.conf.js package.json vnc_lite.html "$out/share/webapps/novnc/" + + runHook postInstall + ''; + + meta = with lib; { + description = "VNC client web application"; + homepage = "https://novnc.com"; + license = with licenses; [ mpl20 ofl bsd3 bsd2 mit ]; + maintainers = with maintainers; [ neverbehave ]; + }; +} diff --git a/nixpkgs/pkgs/applications/networking/onionshare/default.nix b/nixpkgs/pkgs/applications/networking/onionshare/default.nix index 5b1a1fad5b1a..e7b661ae6ae7 100644 --- a/nixpkgs/pkgs/applications/networking/onionshare/default.nix +++ b/nixpkgs/pkgs/applications/networking/onionshare/default.nix @@ -8,7 +8,7 @@ , flask , flask-httpauth , flask-socketio -, stem +, cepa , psutil , pyqt5 , pycrypto @@ -21,15 +21,16 @@ , unidecode , tor , obfs4 +, snowflake }: let - version = "2.4"; + version = "2.5"; src = fetchFromGitHub { owner = "onionshare"; repo = "onionshare"; rev = "v${version}"; - sha256 = "sha256-Lclm7mIkaAkQpWcNILTRJtLA43dpiyHtWAeHS2r3+ZQ="; + sha256 = "xCAM+tjjyDg/gqAXr4YNPhM8R3n9r895jktisAGlpZo="; }; meta = with lib; { description = "Securely and anonymously send and receive files"; @@ -55,16 +56,9 @@ let license = licenses.gpl3Plus; maintainers = with maintainers; [ lourkeur ]; }; - stem' = stem.overridePythonAttrs (_: rec { - version = "1.8.1"; - src = fetchFromGitHub { - owner = "onionshare"; - repo = "stem"; - rev = version; - sha256 = "Dzpvx7CgAr5OtGmfubWAYDLqq5LkGqcwjr3bxpfL/3A="; - }; - }); + # TODO: package meek https://support.torproject.org/glossary/meek/ + meek = "/meek-not-available"; in rec { @@ -76,7 +70,7 @@ rec { # hardcode store paths of dependencies (substituteAll { src = ./fix-paths.patch; - inherit tor obfs4; + inherit tor meek obfs4 snowflake; inherit (tor) geoip; }) ]; @@ -86,7 +80,7 @@ rec { flask flask-httpauth flask-socketio - stem' + cepa psutil pycrypto pynacl @@ -109,8 +103,6 @@ rec { ''; disabledTests = [ - "test_firefox_like_behavior" - "test_if_unmodified_since" "test_get_tor_paths_linux" # expects /usr instead of /nix/store ] ++ lib.optionals stdenv.isDarwin [ # on darwin (and only on darwin) onionshare attempts to discover @@ -123,12 +115,12 @@ rec { onionshare-gui = buildPythonApplication { pname = "onionshare"; inherit version meta; - src = "${src}/desktop/src"; + src = "${src}/desktop"; patches = [ # hardcode store paths of dependencies (substituteAll { src = ./fix-paths-gui.patch; - inherit tor obfs4; + inherit tor meek obfs4 snowflake; inherit (tor) geoip; }) ]; diff --git a/nixpkgs/pkgs/applications/networking/onionshare/fix-paths-gui.patch b/nixpkgs/pkgs/applications/networking/onionshare/fix-paths-gui.patch index 841af8fa95af..4eb611c860db 100644 --- a/nixpkgs/pkgs/applications/networking/onionshare/fix-paths-gui.patch +++ b/nixpkgs/pkgs/applications/networking/onionshare/fix-paths-gui.patch @@ -1,25 +1,46 @@ --- a/onionshare/gui_common.py +++ b/onionshare/gui_common.py -@@ -391,29 +391,10 @@ class GuiCommon: +@@ -410,52 +410,12 @@ class GuiCommon: } def get_tor_paths(self): - if self.common.platform == "Linux": -- tor_path = shutil.which("tor") -- obfs4proxy_file_path = shutil.which("obfs4proxy") -- prefix = os.path.dirname(os.path.dirname(tor_path)) -- tor_geo_ip_file_path = os.path.join(prefix, "share/tor/geoip") -- tor_geo_ipv6_file_path = os.path.join(prefix, "share/tor/geoip6") -- elif self.common.platform == "Windows": +- base_path = self.get_resource_path("tor") +- if base_path and os.path.isdir(base_path): +- self.common.log( +- "GuiCommon", "get_tor_paths", "using paths in resources" +- ) +- tor_path = os.path.join(base_path, "tor") +- tor_geo_ip_file_path = os.path.join(base_path, "geoip") +- tor_geo_ipv6_file_path = os.path.join(base_path, "geoip6") +- obfs4proxy_file_path = os.path.join(base_path, "obfs4proxy") +- snowflake_file_path = os.path.join(base_path, "snowflake-client") +- meek_client_file_path = os.path.join(base_path, "meek-client") +- else: +- # Fallback to looking in the path +- self.common.log("GuiCommon", "get_tor_paths", "using paths from PATH") +- tor_path = shutil.which("tor") +- obfs4proxy_file_path = shutil.which("obfs4proxy") +- snowflake_file_path = shutil.which("snowflake-client") +- meek_client_file_path = shutil.which("meek-client") +- prefix = os.path.dirname(os.path.dirname(tor_path)) +- tor_geo_ip_file_path = os.path.join(prefix, "share/tor/geoip") +- tor_geo_ipv6_file_path = os.path.join(prefix, "share/tor/geoip6") +- +- if self.common.platform == "Windows": - base_path = self.get_resource_path("tor") - tor_path = os.path.join(base_path, "Tor", "tor.exe") - obfs4proxy_file_path = os.path.join(base_path, "Tor", "obfs4proxy.exe") +- snowflake_file_path = os.path.join(base_path, "Tor", "snowflake-client.exe") +- meek_client_file_path = os.path.join(base_path, "Tor", "meek-client.exe") - tor_geo_ip_file_path = os.path.join(base_path, "Data", "Tor", "geoip") - tor_geo_ipv6_file_path = os.path.join(base_path, "Data", "Tor", "geoip6") - elif self.common.platform == "Darwin": - base_path = self.get_resource_path("tor") - tor_path = os.path.join(base_path, "tor") - obfs4proxy_file_path = os.path.join(base_path, "obfs4proxy") +- snowflake_file_path = os.path.join(base_path, "snowflake-client") +- meek_client_file_path = os.path.join(base_path, "meek-client") - tor_geo_ip_file_path = os.path.join(base_path, "geoip") - tor_geo_ipv6_file_path = os.path.join(base_path, "geoip6") - elif self.common.platform == "BSD": @@ -27,10 +48,14 @@ - tor_geo_ip_file_path = "/usr/local/share/tor/geoip" - tor_geo_ipv6_file_path = "/usr/local/share/tor/geoip6" - obfs4proxy_file_path = "/usr/local/bin/obfs4proxy" +- meek_client_file_path = "/usr/local/bin/meek-client" +- snowflake_file_path = "/usr/local/bin/snowflake-client" + tor_path = "@tor@/bin/tor" + tor_geo_ip_file_path = "@geoip@/share/tor/geoip" + tor_geo_ipv6_file_path = "@geoip@/share/tor/geoip6" + obfs4proxy_file_path = "@obfs4@/bin/obfs4proxy" ++ meek_client_file_path = "@meek@/bin/meek-client" ++ snowflake_file_path = "@snowflake@/bin/snowflake-client" return ( tor_path, diff --git a/nixpkgs/pkgs/applications/networking/onionshare/fix-paths.patch b/nixpkgs/pkgs/applications/networking/onionshare/fix-paths.patch index 9280ec4d255a..fec4b4e0395b 100644 --- a/nixpkgs/pkgs/applications/networking/onionshare/fix-paths.patch +++ b/nixpkgs/pkgs/applications/networking/onionshare/fix-paths.patch @@ -1,41 +1,76 @@ --- a/onionshare_cli/common.py +++ b/onionshare_cli/common.py -@@ -308,33 +308,10 @@ class Common: +@@ -318,67 +318,12 @@ class Common: return path - + def get_tor_paths(self): - if self.platform == "Linux": - tor_path = shutil.which("tor") - if not tor_path: - raise CannotFindTor() - obfs4proxy_file_path = shutil.which("obfs4proxy") +- snowflake_file_path = shutil.which("snowflake-client") +- meek_client_file_path = shutil.which("meek-client") - prefix = os.path.dirname(os.path.dirname(tor_path)) - tor_geo_ip_file_path = os.path.join(prefix, "share/tor/geoip") - tor_geo_ipv6_file_path = os.path.join(prefix, "share/tor/geoip6") - elif self.platform == "Windows": +- # In Windows, the Tor binaries are in the onionshare package, not the onionshare_cli package - base_path = self.get_resource_path("tor") +- base_path = base_path.replace("onionshare_cli", "onionshare") - tor_path = os.path.join(base_path, "Tor", "tor.exe") +- +- # If tor.exe isn't there, mayber we're running from the source tree +- if not os.path.exists(tor_path): +- base_path = os.path.join(os.getcwd(), "onionshare", "resources", "tor") +- +- tor_path = os.path.join(base_path, "Tor", "tor.exe") +- if not os.path.exists(tor_path): +- raise CannotFindTor() +- - obfs4proxy_file_path = os.path.join(base_path, "Tor", "obfs4proxy.exe") +- snowflake_file_path = os.path.join(base_path, "Tor", "snowflake-client.exe") +- meek_client_file_path = os.path.join(base_path, "Tor", "meek-client.exe") - tor_geo_ip_file_path = os.path.join(base_path, "Data", "Tor", "geoip") - tor_geo_ipv6_file_path = os.path.join(base_path, "Data", "Tor", "geoip6") +- - elif self.platform == "Darwin": -- tor_path = shutil.which("tor") -- if not tor_path: -- raise CannotFindTor() -- obfs4proxy_file_path = shutil.which("obfs4proxy") -- prefix = os.path.dirname(os.path.dirname(tor_path)) -- tor_geo_ip_file_path = os.path.join(prefix, "share/tor/geoip") -- tor_geo_ipv6_file_path = os.path.join(prefix, "share/tor/geoip6") +- # Let's see if we have tor binaries in the onionshare GUI package +- base_path = self.get_resource_path("tor") +- base_path = base_path.replace("onionshare_cli", "onionshare") +- tor_path = os.path.join(base_path, "tor") +- if os.path.exists(tor_path): +- obfs4proxy_file_path = os.path.join(base_path, "obfs4proxy") +- snowflake_file_path = os.path.join(base_path, "snowflake-client") +- meek_client_file_path = os.path.join(base_path, "meek-client") +- tor_geo_ip_file_path = os.path.join(base_path, "geoip") +- tor_geo_ipv6_file_path = os.path.join(base_path, "geoip6") +- else: +- # Fallback to looking in the path +- tor_path = shutil.which("tor") +- if not os.path.exists(tor_path): +- raise CannotFindTor() +- +- obfs4proxy_file_path = shutil.which("obfs4proxy") +- snowflake_file_path = shutil.which("snowflake-client") +- meek_client_file_path = shutil.which("meek-client") +- prefix = os.path.dirname(os.path.dirname(tor_path)) +- tor_geo_ip_file_path = os.path.join(prefix, "share/tor/geoip") +- tor_geo_ipv6_file_path = os.path.join(prefix, "share/tor/geoip6") +- - elif self.platform == "BSD": - tor_path = "/usr/local/bin/tor" - tor_geo_ip_file_path = "/usr/local/share/tor/geoip" - tor_geo_ipv6_file_path = "/usr/local/share/tor/geoip6" - obfs4proxy_file_path = "/usr/local/bin/obfs4proxy" +- snowflake_file_path = "/usr/local/bin/snowflake-client" +- meek_client_file_path = "/usr/local/bin/meek-client" + tor_path = "@tor@/bin/tor" + tor_geo_ip_file_path = "@geoip@/share/tor/geoip" + tor_geo_ipv6_file_path = "@geoip@/share/tor/geoip6" + obfs4proxy_file_path = "@obfs4@/bin/obfs4proxy" - ++ snowflake_file_path = "@snowflake@/bin/snowflake-client" ++ meek_client_file_path = "@meek@/bin/meek-client" + return ( tor_path, - diff --git a/nixpkgs/pkgs/applications/networking/openbazaar/client.nix b/nixpkgs/pkgs/applications/networking/openbazaar/client.nix deleted file mode 100644 index e7a19fa7825f..000000000000 --- a/nixpkgs/pkgs/applications/networking/openbazaar/client.nix +++ /dev/null @@ -1,60 +0,0 @@ -{ lib, stdenv -, fetchurl -, gcc-unwrapped -, dpkg -, bash -, nodePackages -, makeWrapper -, electron_6 -}: - -let - electron = electron_6; -in -stdenv.mkDerivation rec { - pname = "openbazaar-client"; - version = "2.4.10"; - - src = fetchurl { - url = "https://github.com/OpenBazaar/openbazaar-desktop/releases/download/v${version}/openbazaar2client_${version}_amd64.deb"; - sha256 = "sha256-X0iTTLOJsZeyVZwNU3y39cFMHnxlnYXmqQERE26CLTY="; - }; - - dontBuild = true; - dontConfigure = true; - - nativeBuildInputs = [ makeWrapper ]; - - unpackPhase = '' - ${dpkg}/bin/dpkg-deb -x $src . - ''; - - installPhase = '' - runHook preInstall - - mkdir -p $out/bin $out/share/{${pname},applications,pixmaps} - - cp -a usr/lib/openbazaar2client/{locales,resources} $out/share/${pname} - cp -a usr/share/applications/openbazaar2client.desktop $out/share/applications/${pname}.desktop - cp -a usr/share/pixmaps/openbazaar2client.png $out/share/pixmaps/${pname}.png - - substituteInPlace $out/share/applications/${pname}.desktop \ - --replace 'openbazaar2client' 'openbazaar-client' - - runHook postInstall - ''; - - postFixup = '' - makeWrapper ${electron}/bin/electron $out/bin/${pname} \ - --add-flags $out/share/${pname}/resources/app \ - --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ gcc-unwrapped.lib ]}" - ''; - - meta = with lib; { - description = "Decentralized Peer to Peer Marketplace for Bitcoin - client"; - homepage = "https://www.openbazaar.org/"; - license = licenses.mit; - maintainers = with maintainers; [ prusnak ]; - platforms = [ "x86_64-linux" ]; - }; -} diff --git a/nixpkgs/pkgs/applications/networking/openbazaar/default.nix b/nixpkgs/pkgs/applications/networking/openbazaar/default.nix deleted file mode 100644 index aa5d14724ac4..000000000000 --- a/nixpkgs/pkgs/applications/networking/openbazaar/default.nix +++ /dev/null @@ -1,48 +0,0 @@ -{ lib, stdenv -, fetchurl -}: - -stdenv.mkDerivation rec { - pname = "openbazaar"; - version = "0.14.6"; - - suffix = { - i686-linux = "linux-386"; - x86_64-darwin = "darwin-10.6-amd64"; - x86_64-linux = "linux-amd64"; - }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); - - src = fetchurl { - url = "https://github.com/OpenBazaar/openbazaar-go/releases/download/v${version}/${pname}-go-${suffix}"; - sha256 = { - i686-linux = "1cmv3gyfd6q7y6yn6kigksy2abkq5b8mfgk51d04ky1ckgbriaqq"; - x86_64-darwin = "0n32a0pyj1k2had3imimdyhdhyb285y1dj04f7g3jajmy5zndaxx"; - x86_64-linux = "105i5yl2yvhcvyh1wf35kqq1qyxgbl9j2kxs6yshsk14b2p02j5i"; - }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); - }; - - dontUnpack = true; - dontConfigure = true; - dontBuild = true; - dontStrip = true; - dontPatchELF = true; - preferLocalBuild = true; - - installPhase = '' - install -D $src $out/bin/openbazaard - ''; - - postFixup = lib.optionalString (!stdenv.isDarwin) '' - patchelf \ - --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - $out/bin/openbazaard - ''; - - meta = with lib; { - description = "Decentralized Peer to Peer Marketplace for Bitcoin - daemon"; - homepage = "https://www.openbazaar.org/"; - license = licenses.mit; - maintainers = with maintainers; [ prusnak ]; - platforms = [ "i686-linux" "x86_64-darwin" "x86_64-linux" ]; - }; -} diff --git a/nixpkgs/pkgs/applications/networking/owncloud-client/default.nix b/nixpkgs/pkgs/applications/networking/owncloud-client/default.nix index e3919430c8fc..006310e912b2 100644 --- a/nixpkgs/pkgs/applications/networking/owncloud-client/default.nix +++ b/nixpkgs/pkgs/applications/networking/owncloud-client/default.nix @@ -2,11 +2,11 @@ mkDerivation rec { pname = "owncloud-client"; - version = "2.9.2.6206"; + version = "2.10.0.6519"; src = fetchurl { url = "https://download.owncloud.com/desktop/ownCloud/stable/${version}/source/ownCloud-${version}.tar.xz"; - sha256 = "sha256-i6TmJFEuH4A1jTyoKiJoVU7yC+AXZIH4miYSk3XzVEo="; + sha256 = "sha256-HDH8s/VPeOAbkyrfE7hbhePhtWcx1IUdlhDCnodomh8="; }; nativeBuildInputs = [ pkg-config cmake extra-cmake-modules ]; diff --git a/nixpkgs/pkgs/applications/networking/p2p/deluge/default.nix b/nixpkgs/pkgs/applications/networking/p2p/deluge/default.nix index 2bd3cd739e66..49d21bbf3394 100644 --- a/nixpkgs/pkgs/applications/networking/p2p/deluge/default.nix +++ b/nixpkgs/pkgs/applications/networking/p2p/deluge/default.nix @@ -13,27 +13,13 @@ pythonPackages.buildPythonPackage rec { pname = "deluge"; - version = "2.0.3"; + version = "2.0.5"; src = fetchurl { url = "http://download.deluge-torrent.org/source/2.0/${pname}-${version}.tar.xz"; - sha256 = "14d8kn2pvr1qv8mwqrxmj85jycr73vwfqz12hzag0ararbkfhyky"; + sha256 = "sha256-xL0Eq/0hG2Uhi+A/PEbSb0QCSITeEOAYWfuFb91vJdg="; }; - patches = [ - (fetchpatch { - url = "https://github.com/deluge-torrent/deluge/commit/d6c96d629183e8bab2167ef56457f994017e7c85.patch"; - sha256 = "sha256-slGMt2bgp36pjDztJUXFeZNbzdJsus0s9ARRD6IpNUw="; - name = "fix_ngettext_warning.patch"; - }) - - (fetchpatch { - url = "https://github.com/deluge-torrent/deluge/commit/351664ec071daa04161577c6a1c949ed0f2c3206.patch"; - sha256 = "sha256-ry1LFgMe9lys66xAvATcPqIa3rzBPWVnsf8FL1dXkHo="; - name = "fix_logging_on_py38.patch"; - }) - ]; - propagatedBuildInputs = with pythonPackages; [ twisted Mako diff --git a/nixpkgs/pkgs/applications/networking/p2p/dht/default.nix b/nixpkgs/pkgs/applications/networking/p2p/dht/default.nix index 0088e517914f..b1d01f82876e 100644 --- a/nixpkgs/pkgs/applications/networking/p2p/dht/default.nix +++ b/nixpkgs/pkgs/applications/networking/p2p/dht/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { description = "BitTorrent DHT library"; homepage = "https://github.com/transmission/dht"; license = licenses.mit; - maintainers = with maintainers; [ angustrau ]; + maintainers = with maintainers; [ emilytrau ]; platforms = platforms.unix; }; } diff --git a/nixpkgs/pkgs/applications/networking/p2p/fragments/default.nix b/nixpkgs/pkgs/applications/networking/p2p/fragments/default.nix index 721f0ca259f0..a07869209c7d 100644 --- a/nixpkgs/pkgs/applications/networking/p2p/fragments/default.nix +++ b/nixpkgs/pkgs/applications/networking/p2p/fragments/default.nix @@ -71,7 +71,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://gitlab.gnome.org/World/Fragments"; description = "A GTK3 BitTorrent Client"; - maintainers = with maintainers; [ angustrau ]; + maintainers = with maintainers; [ emilytrau ]; license = licenses.gpl3Plus; platforms = platforms.linux; }; diff --git a/nixpkgs/pkgs/applications/networking/p2p/gnunet/gtk.nix b/nixpkgs/pkgs/applications/networking/p2p/gnunet/gtk.nix index 3711d5a3c1ed..369244604a88 100644 --- a/nixpkgs/pkgs/applications/networking/p2p/gnunet/gtk.nix +++ b/nixpkgs/pkgs/applications/networking/p2p/gnunet/gtk.nix @@ -13,11 +13,11 @@ stdenv.mkDerivation rec { pname = "gnunet-gtk"; - version = "0.14.0"; + version = "0.15.0"; src = fetchurl { url = "mirror://gnu/gnunet/${pname}-${version}.tar.gz"; - sha256 = "18rc7mb45y17d5nrlpf2p4ixp7ir67gcgjf4hlj4r95ic5zi54wa"; + sha256 = "sha256-FLLlqpQ7Bf+oNRUvx7IniVxFusy/tPYxEP2T6VGF7h8="; }; nativeBuildInputs= [ diff --git a/nixpkgs/pkgs/applications/networking/p2p/libutp/default.nix b/nixpkgs/pkgs/applications/networking/p2p/libutp/default.nix index 6fba4faf50c0..a07ffdea6b69 100644 --- a/nixpkgs/pkgs/applications/networking/p2p/libutp/default.nix +++ b/nixpkgs/pkgs/applications/networking/p2p/libutp/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { description = "uTorrent Transport Protocol library"; homepage = "https://github.com/transmission/libutp"; license = licenses.mit; - maintainers = with maintainers; [ angustrau ]; + maintainers = with maintainers; [ emilytrau ]; platforms = platforms.unix; }; } diff --git a/nixpkgs/pkgs/applications/networking/p2p/qbittorrent/default.nix b/nixpkgs/pkgs/applications/networking/p2p/qbittorrent/default.nix index f5f5b3bde762..3c05398df0ea 100644 --- a/nixpkgs/pkgs/applications/networking/p2p/qbittorrent/default.nix +++ b/nixpkgs/pkgs/applications/networking/p2p/qbittorrent/default.nix @@ -12,13 +12,13 @@ assert trackerSearch -> (python3 != null); with lib; mkDerivation rec { pname = "qbittorrent"; - version = "4.3.9"; + version = "4.4.1"; src = fetchFromGitHub { owner = "qbittorrent"; repo = "qBittorrent"; rev = "release-${version}"; - sha256 = "sha256-pFHeozx72qVjA3cmW6GK058IIAOWmyNm1UQVCQ1v5EU="; + sha256 = "sha256-HNgegPL7M0zwkn7+lcNcsgWgrCbY9/d0nuIlIC5hkAM="; }; enableParallelBuilding = true; diff --git a/nixpkgs/pkgs/applications/networking/p2p/tixati/default.nix b/nixpkgs/pkgs/applications/networking/p2p/tixati/default.nix index 4a0669d7d0af..0d44f084086e 100644 --- a/nixpkgs/pkgs/applications/networking/p2p/tixati/default.nix +++ b/nixpkgs/pkgs/applications/networking/p2p/tixati/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "tixati"; - version = "2.87"; + version = "2.88"; src = fetchurl { url = "https://download2.tixati.com/download/tixati-${version}-1.x86_64.manualinstall.tar.gz"; - sha256 = "sha256-URWLuZ/gtv/sX5+11ORu9SUZFIZUuKPn0CUQ1xaSQcQ="; + sha256 = "sha256-9d9Z+3Uyxy4Bj8STtzHWwyyhWeMv3wo0IH6uxGTaA0I="; }; installPhase = '' diff --git a/nixpkgs/pkgs/applications/networking/p2p/tribler/default.nix b/nixpkgs/pkgs/applications/networking/p2p/tribler/default.nix index 774aea642d43..d1df2fea444c 100644 --- a/nixpkgs/pkgs/applications/networking/p2p/tribler/default.nix +++ b/nixpkgs/pkgs/applications/networking/p2p/tribler/default.nix @@ -1,21 +1,23 @@ -{ stdenv, lib, fetchurl, python3, makeWrapper -, libtorrent-rasterbar-1_2_x, qt5 +{ lib +, stdenv +, fetchurl +, python3 +, makeWrapper +, libtorrent-rasterbar-1_2_x +, qt5 }: let libtorrent = (python3.pkgs.toPythonModule ( libtorrent-rasterbar-1_2_x.override { python = python3; })).python; - - aiohttp-apispec = python3.pkgs.callPackage - ../../../../development/python-modules/aiohttp-apispec/unstable.nix { }; in stdenv.mkDerivation rec { pname = "tribler"; - version = "7.10.0"; + version = "7.11.0"; src = fetchurl { url = "https://github.com/Tribler/tribler/releases/download/v${version}/Tribler-v${version}.tar.xz"; - sha256 = "1x45z23d1cqf0lai7wg5ki7gi2vba5hqk0swhggzplcjwma4wmh9"; + sha256 = "0ffh8chb47iaar8872gvalgm84fjzyxph16nixsxknnprqdxyrkx"; }; nativeBuildInputs = [ @@ -30,40 +32,38 @@ stdenv.mkDerivation rec { pythonPath = [ libtorrent ] ++ (with python3.pkgs; [ - twisted - netifaces - pycrypto - pyasn1 - requests - m2crypto - pyqt5 + aiohttp + aiohttp-apispec + asynctest chardet cherrypy - cryptography - libnacl configobj + cryptography decorator + faker feedparser - service-identity - psutil - pillow + libnacl + lz4 + m2crypto + netifaces networkx + pillow pony - lz4 + psutil + pyasn1 + pycrypto + pyqt5 pyqtgraph - pyyaml - aiohttp - aiohttp-apispec - faker - sentry-sdk pytest-asyncio pytest-timeout - asynctest + pyyaml + requests + sentry-sdk + service-identity + twisted yappi - - # there is a BTC feature, but it requires some unclear version of - # bitcoinlib, so this doesn't work right now. - # bitcoinlib + pydantic + anyio ]); installPhase = '' @@ -73,6 +73,7 @@ stdenv.mkDerivation rec { cp -prvd ./* $out/ makeWrapper ${python3.pkgs.python}/bin/python $out/bin/tribler \ --set QT_QPA_PLATFORM_PLUGIN_PATH ${qt5.qtbase.bin}/lib/qt-*/plugins/platforms \ + --set QT_PLUGIN_PATH "${qt5.qtsvg.bin}/${qt5.qtbase.qtPluginPrefix}" \ --set _TRIBLERPATH $out/src \ --set PYTHONPATH $out/src/tribler-core:$out/src/tribler-common:$out/src/tribler-gui:$program_PYTHONPATH \ --set NO_AT_BRIDGE 1 \ @@ -80,15 +81,22 @@ stdenv.mkDerivation rec { --add-flags "-O $out/src/run_tribler.py" mkdir -p $out/share/applications $out/share/icons - cp $out/build/debian/tribler/usr/share/applications/tribler.desktop $out/share/applications/tribler.desktop + cp $out/build/debian/tribler/usr/share/applications/org.tribler.Tribler.desktop $out/share/applications/ cp $out/build/debian/tribler/usr/share/pixmaps/tribler_big.xpm $out/share/icons/tribler.xpm ''; + shellHook = '' + wrapPythonPrograms || true + export QT_QPA_PLATFORM_PLUGIN_PATH=$(echo ${qt5.qtbase.bin}/lib/qt-*/plugins/platforms) + export PYTHONPATH=./tribler-core:./tribler-common:./tribler-gui:$program_PYTHONPATH + export QT_PLUGIN_PATH="${qt5.qtsvg.bin}/${qt5.qtbase.qtPluginPrefix}" + ''; + meta = with lib; { - maintainers = with maintainers; [ xvapx viric ]; + description = "Decentralised P2P filesharing client based on the Bittorrent protocol"; homepage = "https://www.tribler.org/"; - description = "A completely decentralised P2P filesharing client based on the Bittorrent protocol"; - license = licenses.lgpl21; + license = licenses.lgpl21Plus; + maintainers = with maintainers; [ xvapx viric ]; platforms = platforms.linux; }; } diff --git a/nixpkgs/pkgs/applications/networking/p2p/twister/default.nix b/nixpkgs/pkgs/applications/networking/p2p/twister/default.nix index 1d05cafef832..9c708b795885 100644 --- a/nixpkgs/pkgs/applications/networking/p2p/twister/default.nix +++ b/nixpkgs/pkgs/applications/networking/p2p/twister/default.nix @@ -13,7 +13,10 @@ let }; }; - boostPython = boost.override { enablePython = true; }; + boostPython = boost.override { + enablePython = true; + python = python2; + }; in stdenv.mkDerivation rec { pname = "twister"; diff --git a/nixpkgs/pkgs/applications/networking/p2p/xd/default.nix b/nixpkgs/pkgs/applications/networking/p2p/xd/default.nix index 54581a6070ba..779de53d3c5d 100644 --- a/nixpkgs/pkgs/applications/networking/p2p/xd/default.nix +++ b/nixpkgs/pkgs/applications/networking/p2p/xd/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "XD"; - version = "0.4.0"; + version = "0.4.2"; src = fetchFromGitHub { owner = "majestrate"; repo = "XD"; rev = "v${version}"; - sha256 = "sha256-fXENoqhR04TYS/kAJUqsqa0+j+KyzdsMlXIZ2GMPMhc="; + sha256 = "sha256-AavNiFZlpX6XZQLP1kl9igA833i0gxOTYGubo3MvpSU="; }; - vendorSha256 = "1wg3cym2rwrhjsqlgd38l8mdq5alccz808465117n3vyga9m35lq"; + vendorSha256 = "sha256-mJZRk3p+D3tCKIYggD5jVBXcKqJotEexljDzLKpn4/E="; checkInputs = [ perl ]; diff --git a/nixpkgs/pkgs/applications/networking/ping/default.nix b/nixpkgs/pkgs/applications/networking/ping/default.nix index 8b8748d70ff3..6074b1a51ccb 100644 --- a/nixpkgs/pkgs/applications/networking/ping/default.nix +++ b/nixpkgs/pkgs/applications/networking/ping/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv +{ lib +, stdenv , fetchFromGitHub , nix-update-script , meson @@ -14,7 +15,6 @@ , libsoup , libgee , wrapGAppsHook -, vala_0_40 }: stdenv.mkDerivation rec { @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja - vala_0_40 + vala pkg-config python3 wrapGAppsHook @@ -65,5 +65,12 @@ stdenv.mkDerivation rec { platforms = platforms.linux; license = licenses.gpl3; mainProgram = "com.github.jeremyvaartjes.ping"; + # Does not build with vala 0.48 or later + # ../src/Application.vala:696.46-696.57: error: Assignment: Cannot convert from + # `GLib.HashTable<weak string,weak string>' to `GLib.HashTable<string,string>?' + # HashTable<string,string> tempDataList = Soup.Form.decode(testObjs[id].data); + # ^^^^^^^^^^^^ + # Upstream has no activity since 28 Dec 2020 + broken = true; }; } diff --git a/nixpkgs/pkgs/applications/networking/protonmail-bridge/default.nix b/nixpkgs/pkgs/applications/networking/protonmail-bridge/default.nix index 1283f0d7fa80..d56197c31347 100644 --- a/nixpkgs/pkgs/applications/networking/protonmail-bridge/default.nix +++ b/nixpkgs/pkgs/applications/networking/protonmail-bridge/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "protonmail-bridge"; - version = "1.8.12"; + version = "2.1.1"; src = fetchFromGitHub { owner = "ProtonMail"; repo = "proton-bridge"; rev = "br-${version}"; - sha256 = "sha256-CkvD7PKx2Gm2KgsIIqQ9l1Z3tWlhqIbW0sxCV2UBYTE="; + sha256 = "sha256-8oDA1QU5ZjtQZoCPVDa1U3P2KLzXtegtOxm6rNh+Ahk="; }; - vendorSha256 = "sha256-Pz3xRTwlnJGh1XvxIbyjvYcMywk/wdp4hYovPLBD494="; + vendorSha256 = "sha256-n+WwkNHT+/CrC4vWIVHqYs2a8Qe/LNc0L3uoPZWDTts="; nativeBuildInputs = [ pkg-config ]; diff --git a/nixpkgs/pkgs/applications/networking/protonvpn-gui/default.nix b/nixpkgs/pkgs/applications/networking/protonvpn-gui/default.nix index 1bbf3d6554fc..b6583efe730e 100644 --- a/nixpkgs/pkgs/applications/networking/protonvpn-gui/default.nix +++ b/nixpkgs/pkgs/applications/networking/protonvpn-gui/default.nix @@ -3,13 +3,13 @@ wrapGAppsHook, python3Packages, gtk3, networkmanager, webkitgtk }: python3Packages.buildPythonApplication rec { pname = "protonvpn-linux-gui"; - version = "1.4.1"; + version = "1.7.0"; src = fetchFromGitHub { owner = "ProtonVPN"; repo = "linux-app"; rev = version; - sha256 = "sha256-08gXEKm8udgNltRdqvAMFL0pDCWZu/kfl1xGQtZPBCc="; + sha256 = "sha256-uzooFQBq2mhqTBr/cgea5cVQ889P70sgSk2vjXBQEfw="; }; strictDeps = false; diff --git a/nixpkgs/pkgs/applications/networking/remote/freerdp/default.nix b/nixpkgs/pkgs/applications/networking/remote/freerdp/default.nix index 9f8a6dfc5761..f9450c588263 100644 --- a/nixpkgs/pkgs/applications/networking/remote/freerdp/default.nix +++ b/nixpkgs/pkgs/applications/networking/remote/freerdp/default.nix @@ -1,9 +1,42 @@ -{ stdenv, lib, fetchFromGitHub, cmake, pkg-config, alsa-lib, ffmpeg, glib, openssl -, pcre, zlib, libX11, libXcursor, libXdamage, libXext, libXi, libXinerama -, libXrandr, libXrender, libXv, libXtst, libxkbcommon, libxkbfile, wayland -, gstreamer, gst-plugins-base, gst-plugins-good, libunwind, orc, libxslt, cairo -, libusb1, libpulseaudio, cups, pcsclite, systemd, libjpeg_turbo -, buildServer ? true, nocaps ? false +{ stdenv +, lib +, fetchFromGitHub +, cmake +, pkg-config +, alsa-lib +, ffmpeg +, glib +, openssl +, pcre +, zlib +, libX11 +, libXcursor +, libXdamage +, libXext +, libXi +, libXinerama +, libXrandr +, libXrender +, libXv +, libXtst +, libxkbcommon +, libxkbfile +, wayland +, gstreamer +, gst-plugins-base +, gst-plugins-good +, libunwind +, orc +, libxslt +, cairo +, libusb1 +, libpulseaudio +, cups +, pcsclite +, systemd +, libjpeg_turbo +, buildServer ? true +, nocaps ? false }: let @@ -16,15 +49,16 @@ let } ]; -in stdenv.mkDerivation rec { +in +stdenv.mkDerivation rec { pname = "freerdp"; - version = "2.4.1"; + version = "2.5.0"; src = fetchFromGitHub { owner = "FreeRDP"; repo = "FreeRDP"; rev = version; - sha256 = "sha256-0wwIuE6Gv8khhLAbWSHOBfHGrTUjR4f/C5bzYJpvWIQ="; + sha256 = "sha256-OLz/f4E+Haumw5Jaw+F1hiHz0jfcywhfK3fEUgLorao="; }; postPatch = '' @@ -47,40 +81,39 @@ in stdenv.mkDerivation rec { --replace "RDP_SCANCODE_CAPSLOCK" "RDP_SCANCODE_LCONTROL" ''; - buildInputs = with lib; - [ - alsa-lib - cairo - cups - ffmpeg - glib - gst-plugins-base - gst-plugins-good - gstreamer - libX11 - libXcursor - libXdamage - libXext - libXi - libXinerama - libXrandr - libXrender - libXtst - libXv - libjpeg_turbo - libpulseaudio - libunwind - libusb1 - libxkbcommon - libxkbfile - libxslt - openssl - orc - pcre - pcsclite - wayland - zlib - ] ++ optional stdenv.isLinux systemd; + buildInputs = [ + alsa-lib + cairo + cups + ffmpeg + glib + gst-plugins-base + gst-plugins-good + gstreamer + libX11 + libXcursor + libXdamage + libXext + libXi + libXinerama + libXrandr + libXrender + libXtst + libXv + libjpeg_turbo + libpulseaudio + libunwind + libusb1 + libxkbcommon + libxkbfile + libxslt + openssl + orc + pcre + pcsclite + wayland + zlib + ] ++ lib.optional stdenv.isLinux systemd; nativeBuildInputs = [ cmake pkg-config ]; @@ -88,18 +121,18 @@ in stdenv.mkDerivation rec { cmakeFlags = [ "-DCMAKE_INSTALL_LIBDIR=lib" ] ++ lib.mapAttrsToList (k: v: "-D${k}=${if v then "ON" else "OFF"}") { - BUILD_TESTING = doCheck; - WITH_CUNIT = doCheck; - WITH_CUPS = (cups != null); - WITH_OSS = false; - WITH_PCSC = (pcsclite != null); - WITH_PULSE = (libpulseaudio != null); - WITH_SERVER = buildServer; - WITH_SSE2 = stdenv.isx86_64; - WITH_VAAPI = true; - WITH_JPEG = (libjpeg_turbo != null); - WITH_CAIRO = (cairo != null); - }; + BUILD_TESTING = doCheck; + WITH_CUNIT = doCheck; + WITH_CUPS = (cups != null); + WITH_OSS = false; + WITH_PCSC = (pcsclite != null); + WITH_PULSE = (libpulseaudio != null); + WITH_SERVER = buildServer; + WITH_SSE2 = stdenv.isx86_64; + WITH_VAAPI = true; + WITH_JPEG = (libjpeg_turbo != null); + WITH_CAIRO = (cairo != null); + }; meta = with lib; { description = "A Remote Desktop Protocol Client"; diff --git a/nixpkgs/pkgs/applications/networking/remote/remmina/default.nix b/nixpkgs/pkgs/applications/networking/remote/remmina/default.nix index 11fcde29b882..58ce130a7305 100644 --- a/nixpkgs/pkgs/applications/networking/remote/remmina/default.nix +++ b/nixpkgs/pkgs/applications/networking/remote/remmina/default.nix @@ -13,13 +13,13 @@ with lib; stdenv.mkDerivation rec { pname = "remmina"; - version = "1.4.20"; + version = "1.4.24"; src = fetchFromGitLab { owner = "Remmina"; repo = "Remmina"; rev = "v${version}"; - sha256 = "sha256-m3DUaoOD8COxMwCVBTipzCAz3mqIdunEbVPjyjAl9So="; + sha256 = "sha256-rcxgr3HVOWA3mTfX8tka9bPGDRDtKhBRsfQ3hv9XHf0="; }; nativeBuildInputs = [ cmake ninja pkg-config wrapGAppsHook ]; diff --git a/nixpkgs/pkgs/applications/networking/remote/teamviewer/default.nix b/nixpkgs/pkgs/applications/networking/remote/teamviewer/default.nix index 08f71bd1a55b..00289e5c6286 100644 --- a/nixpkgs/pkgs/applications/networking/remote/teamviewer/default.nix +++ b/nixpkgs/pkgs/applications/networking/remote/teamviewer/default.nix @@ -6,11 +6,11 @@ mkDerivation rec { pname = "teamviewer"; - version = "15.25.5"; + version = "15.26.4"; src = fetchurl { url = "https://dl.tvcdn.de/download/linux/version_15x/teamviewer_${version}_amd64.deb"; - sha256 = "sha256-LtITPS0bLy85dv/zdOo8JcsEZ0ZgtVmM+CcggaYJxXA="; + sha256 = "sha256-2CprtdKHHTLxS8jA4bRVoHvj/8zyVUV0aGPzU7mNxM8="; }; unpackPhase = '' @@ -93,7 +93,7 @@ mkDerivation rec { preferLocalBuild = true; meta = with lib; { - homepage = "http://www.teamviewer.com"; + homepage = "https://www.teamviewer.com"; license = licenses.unfree; description = "Desktop sharing application, providing remote support and online meetings"; platforms = [ "x86_64-linux" ]; diff --git a/nixpkgs/pkgs/applications/networking/remote/vmware-horizon-client/default.nix b/nixpkgs/pkgs/applications/networking/remote/vmware-horizon-client/default.nix index 033386afd1ff..ee9467467cf4 100644 --- a/nixpkgs/pkgs/applications/networking/remote/vmware-horizon-client/default.nix +++ b/nixpkgs/pkgs/applications/networking/remote/vmware-horizon-client/default.nix @@ -1,57 +1,40 @@ { stdenv , lib -, at-spi2-atk -, atk , buildFHSUserEnv -, cairo -, dbus , fetchurl -, fontconfig -, freetype -, gdk-pixbuf -, glib , gsettings-desktop-schemas -, gtk2 -, gtk3-x11 -, harfbuzz -, liberation_ttf -, libjpeg -, libtiff -, libudev0-shim -, libuuid -, libX11 -, libXcursor -, libXext -, libXi -, libXinerama -, libxkbfile -, libxml2 -, libXrandr -, libXrender -, libXScrnSaver -, libxslt -, libXtst , makeDesktopItem , makeWrapper -, pango -, pcsclite -, pixman -, zlib +, writeTextDir +, configText ? "" }: let - version = "2106.1"; + version = "2111"; sysArch = if stdenv.hostPlatform.system == "x86_64-linux" then "x64" else throw "Unsupported system: ${stdenv.hostPlatform.system}"; # The downloaded archive also contains ARM binaries, but these have not been tested. + # For USB support, ensure that /var/run/vmware/<YOUR-UID> + # exists and is owned by you. Then run vmware-usbarbitrator as root. + bins = [ "vmware-view" "vmware-usbarbitrator" ]; + + # This forces the default GTK theme (Adwaita) because Horizon is prone to + # UI usability issues when using non-default themes, such as Adwaita-dark. + wrapBinCommands = name: '' + makeWrapper "$out/bin/${name}" "$out/bin/${name}_wrapper" \ + --set GTK_THEME Adwaita \ + --suffix XDG_DATA_DIRS : "${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}" \ + --suffix LD_LIBRARY_PATH : "$out/lib/vmware/view/crtbora:$out/lib/vmware" + ''; + vmwareHorizonClientFiles = stdenv.mkDerivation { name = "vmwareHorizonClientFiles"; inherit version; src = fetchurl { - url = "https://download3.vmware.com/software/view/viewclients/CART22FQ2/VMware-Horizon-Client-Linux-2106.1-8.3.1-18435609.tar.gz"; - sha256 = "b42ddb9d7e9c8d0f8b86b69344fcfca45251c5a5f1e06a18a3334d5a04e18c39"; + url = "https://download3.vmware.com/software/view/viewclients/CART22FH2/VMware-Horizon-Client-Linux-2111-8.4.0-18957622.tar.gz"; + sha256 = "2f79d2d8d34e6f85a5d21a3350618c4763d60455e7d68647ea40715eaff486f7"; }; nativeBuildInputs = [ makeWrapper ]; installPhase = '' @@ -65,27 +48,19 @@ let # Deleting the bundled library is the simplest way to force it to use our version. rm "$out/lib/vmware/gcc/libstdc++.so.6" - # This libjpeg library interferes with Chromium, so we will be using ours instead. - rm $out/lib/vmware/libjpeg.* - # This library causes the program to core-dump occasionally. Use ours instead. rm $out/lib/vmware/view/crtbora/libcairo.* - # Force the default GTK theme (Adwaita) because Horizon is prone to - # UI usability issues when using non-default themes, such as Adwaita-dark. - makeWrapper "$out/bin/vmware-view" "$out/bin/vmware-view_wrapper" \ - --set GTK_THEME Adwaita \ - --suffix XDG_DATA_DIRS : "${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}" \ - --suffix LD_LIBRARY_PATH : "$out/lib/vmware/view/crtbora:$out/lib/vmware" + ${lib.concatMapStrings wrapBinCommands bins} ''; }; - vmwareFHSUserEnv = buildFHSUserEnv { - name = "vmware-view"; + vmwareFHSUserEnv = name: buildFHSUserEnv { + inherit name; - runScript = "${vmwareHorizonClientFiles}/bin/vmware-view_wrapper"; + runScript = "${vmwareHorizonClientFiles}/bin/${name}_wrapper"; - targetPkgs = pkgs: [ + targetPkgs = pkgs: with pkgs; [ at-spi2-atk atk cairo @@ -99,25 +74,29 @@ let harfbuzz liberation_ttf libjpeg + libpulseaudio libtiff libudev0-shim libuuid - libX11 - libXcursor - libXext - libXi - libXinerama - libxkbfile + libv4l libxml2 - libXrandr - libXrender - libXScrnSaver - libXtst pango pcsclite pixman vmwareHorizonClientFiles + xorg.libX11 + xorg.libXcursor + xorg.libXext + xorg.libXi + xorg.libXinerama + xorg.libxkbfile + xorg.libXrandr + xorg.libXrender + xorg.libXScrnSaver + xorg.libXtst zlib + + (writeTextDir "etc/vmware/config" configText) ]; }; @@ -125,20 +104,25 @@ let name = "vmware-view"; desktopName = "VMware Horizon Client"; icon = "${vmwareHorizonClientFiles}/share/icons/vmware-view.png"; - exec = "${vmwareFHSUserEnv}/bin/vmware-view %u"; + exec = "${vmwareFHSUserEnv "vmware-view"}/bin/vmware-view %u"; mimeType = "x-scheme-handler/vmware-view"; }; + binLinkCommands = lib.concatMapStringsSep + "\n" + (bin: "ln -s ${vmwareFHSUserEnv bin}/bin/${bin} $out/bin/") + bins; + in stdenv.mkDerivation { - name = "vmware-view"; + name = "vmware-horizon-client"; dontUnpack = true; installPhase = '' mkdir -p $out/bin $out/share/applications - cp "${desktopItem}"/share/applications/* $out/share/applications/ - ln -s "${vmwareFHSUserEnv}/bin/vmware-view" "$out/bin/" + cp ${desktopItem}/share/applications/* $out/share/applications/ + ${binLinkCommands} ''; unwrapped = vmwareHorizonClientFiles; @@ -146,10 +130,11 @@ stdenv.mkDerivation { passthru.updateScript = ./update.sh; meta = with lib; { + mainProgram = "vmware-view"; description = "Allows you to connect to your VMware Horizon virtual desktop"; homepage = "https://www.vmware.com/go/viewclients"; license = licenses.unfree; - platforms = platforms.linux; + platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ buckley310 ]; }; } diff --git a/nixpkgs/pkgs/applications/networking/remote/waypipe/default.nix b/nixpkgs/pkgs/applications/networking/remote/waypipe/default.nix index 8bde51d8937c..74dc8564b0b1 100644 --- a/nixpkgs/pkgs/applications/networking/remote/waypipe/default.nix +++ b/nixpkgs/pkgs/applications/networking/remote/waypipe/default.nix @@ -15,8 +15,9 @@ stdenv.mkDerivation rec { sha256 = "02q8l1qaahmd41h6v3r46akh7xlqz7fpwwsy15qww4jdvypg6vg4"; }; + strictDeps = true; + depsBuildBuild = [ pkg-config ]; nativeBuildInputs = [ meson ninja pkg-config scdoc ]; - buildInputs = [ # Optional dependencies: mesa lz4 zstd ffmpeg libva diff --git a/nixpkgs/pkgs/applications/networking/seahub/default.nix b/nixpkgs/pkgs/applications/networking/seahub/default.nix new file mode 100644 index 000000000000..8c26b7290836 --- /dev/null +++ b/nixpkgs/pkgs/applications/networking/seahub/default.nix @@ -0,0 +1,74 @@ +{ lib, fetchFromGitHub, python3, makeWrapper }: +let + # Seahub 8.x.x does not support django-webpack-loader >=1.x.x + python = python3.override { + packageOverrides = self: super: { + django-webpack-loader = super.django-webpack-loader.overridePythonAttrs (old: rec { + version = "0.7.0"; + src = old.src.override { + inherit version; + sha256 = "0izl6bibhz3v538ad5hl13lfr6kvprf62rcl77wq2i5538h8hg3s"; + }; + }); + }; + }; +in +python.pkgs.buildPythonApplication rec { + pname = "seahub"; + version = "8.0.8"; + + src = fetchFromGitHub { + owner = "haiwen"; + repo = "seahub"; + rev = "c51346155b2f31e038c3a2a12e69dcc6665502e2"; # using a fixed revision because upstream may re-tag releases :/ + sha256 = "0dagiifxllfk73xdzfw2g378jccpzplhdrmkwbaakbhgbvvkg92k"; + }; + + dontBuild = true; + doCheck = false; # disabled because it requires a ccnet environment + + nativeBuildInputs = [ makeWrapper ]; + + propagatedBuildInputs = with python.pkgs; [ + django + future + django-statici18n + django-webpack-loader + django-simple-captcha + django-picklefield + django-formtools + mysqlclient + pillow + python-dateutil + django_compressor + djangorestframework + openpyxl + requests + requests_oauthlib + pyjwt + pycryptodome + qrcode + pysearpc + seaserv + gunicorn + ]; + + installPhase = '' + cp -dr --no-preserve='ownership' . $out/ + wrapProgram $out/manage.py \ + --prefix PYTHONPATH : "$PYTHONPATH:$out/thirdpart:" + ''; + + passthru = { + inherit python; + pythonPath = python3.pkgs.makePythonPath propagatedBuildInputs; + }; + + meta = with lib; { + homepage = "https://github.com/haiwen/seahub"; + description = "The web end of seafile server"; + license = licenses.asl20; + platforms = platforms.linux; + maintainers = with maintainers; [ greizgh schmittlauch ]; + }; +} diff --git a/nixpkgs/pkgs/applications/networking/seaweedfs/default.nix b/nixpkgs/pkgs/applications/networking/seaweedfs/default.nix index ed8a86bc9d3f..4dd603dae1ea 100644 --- a/nixpkgs/pkgs/applications/networking/seaweedfs/default.nix +++ b/nixpkgs/pkgs/applications/networking/seaweedfs/default.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "seaweedfs"; - version = "2.71"; + version = "2.89"; src = fetchFromGitHub { owner = "chrislusf"; repo = "seaweedfs"; rev = version; - sha256 = "sha256-d4Vl+HixZy7fJ8YU1fy3b2B+F/76mm0NQmFC/PDl4SY="; + sha256 = "sha256-OCfgWMKFhdjdmNHnTUP2VthPxBjAVd9Z+yH/c+vF1a4="; }; - vendorSha256 = "sha256-oxrOjiRxgcJ5yzQYQvLXFPHlOHMB88FThw4OCVxFOwQ="; + vendorSha256 = "sha256-E6bMpWzXb5dMPXkrVSJJWXJYvkmI3cNRseMgrQNpCl4="; subPackages = [ "weed" ]; diff --git a/nixpkgs/pkgs/applications/networking/shellhub-agent/default.nix b/nixpkgs/pkgs/applications/networking/shellhub-agent/default.nix index 3128529f0e67..0b95023ad59d 100644 --- a/nixpkgs/pkgs/applications/networking/shellhub-agent/default.nix +++ b/nixpkgs/pkgs/applications/networking/shellhub-agent/default.nix @@ -9,18 +9,18 @@ buildGoModule rec { pname = "shellhub-agent"; - version = "0.8.2"; + version = "0.9.0"; src = fetchFromGitHub { owner = "shellhub-io"; repo = "shellhub"; rev = "v${version}"; - sha256 = "saaohHHjX9ws74SXlpP+V9cks0ddLkz04ceY14uoVhA="; + sha256 = "A1634b3uxlILMpx/9jpCIApqAqofvD4ZPasVKL29Gtc="; }; modRoot = "./agent"; - vendorSha256 = "sha256-Xfzk6Ts6+LzGaMTcbopGG6WT541nkAnZxq/3AlX81ks="; + vendorSha256 = "sha256-LxJtLQr8djoRGznT5hL2agTgtZY6pFS8Zo0BwHDmugc="; ldflags = [ "-s" "-w" "-X main.AgentVersion=v${version}" ]; diff --git a/nixpkgs/pkgs/applications/networking/sniffers/wireshark/default.nix b/nixpkgs/pkgs/applications/networking/sniffers/wireshark/default.nix index 293192908b2e..b667c7671bdc 100644 --- a/nixpkgs/pkgs/applications/networking/sniffers/wireshark/default.nix +++ b/nixpkgs/pkgs/applications/networking/sniffers/wireshark/default.nix @@ -3,6 +3,7 @@ , libssh, nghttp2, zlib, cmake, makeWrapper , withQt ? true, qt5 ? null , ApplicationServices, SystemConfiguration, gmp +, asciidoctor }: assert withQt -> qt5 != null; @@ -10,7 +11,7 @@ assert withQt -> qt5 != null; with lib; let - version = "3.6.1"; + version = "3.6.2"; variant = if withQt then "qt" else "cli"; in stdenv.mkDerivation { @@ -20,7 +21,7 @@ in stdenv.mkDerivation { src = fetchurl { url = "https://www.wireshark.org/download/src/all-versions/wireshark-${version}.tar.xz"; - sha256 = "sha256-BDTtqPtr+I4rQqZ+tdHeJUpn1QW+w7tR/unXyteSWjg="; + sha256 = "sha256-XZAaVXKu+VPwStwlPtKgaZ1MYnedMkkCHh6FQaAkww4="; }; cmakeFlags = [ @@ -33,7 +34,7 @@ in stdenv.mkDerivation { # Avoid referencing -dev paths because of debug assertions. NIX_CFLAGS_COMPILE = [ "-DQT_NO_DEBUG" ]; - nativeBuildInputs = [ bison cmake flex makeWrapper pkg-config ] ++ optional withQt qt5.wrapQtAppsHook; + nativeBuildInputs = [ asciidoctor bison cmake flex makeWrapper pkg-config ] ++ optional withQt qt5.wrapQtAppsHook; buildInputs = [ gettext pcre perl libpcap lua5 libssh nghttp2 openssl libgcrypt diff --git a/nixpkgs/pkgs/applications/networking/soapui/default.nix b/nixpkgs/pkgs/applications/networking/soapui/default.nix index 96d3de98d891..6839b6be6729 100644 --- a/nixpkgs/pkgs/applications/networking/soapui/default.nix +++ b/nixpkgs/pkgs/applications/networking/soapui/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, lib, stdenv, writeText, jdk, makeWrapper }: +{ fetchurl, lib, stdenv, writeText, jdk, makeWrapper, nixosTests }: stdenv.mkDerivation rec { pname = "soapui"; @@ -46,6 +46,8 @@ stdenv.mkDerivation rec { '') ]; + passthru.tests = { inherit (nixosTests) soapui; }; + meta = with lib; { description = "The Most Advanced REST & SOAP Testing Tool in the World"; homepage = "https://www.soapui.org/"; diff --git a/nixpkgs/pkgs/applications/networking/soulseek/nicotine-plus/default.nix b/nixpkgs/pkgs/applications/networking/soulseek/nicotine-plus/default.nix index 34579ec8ba77..c38a01a49d5e 100644 --- a/nixpkgs/pkgs/applications/networking/soulseek/nicotine-plus/default.nix +++ b/nixpkgs/pkgs/applications/networking/soulseek/nicotine-plus/default.nix @@ -5,13 +5,13 @@ with lib; python3Packages.buildPythonApplication rec { pname = "nicotine-plus"; - version = "3.2.0"; + version = "3.2.1"; src = fetchFromGitHub { owner = "Nicotine-Plus"; repo = "nicotine-plus"; rev = version; - hash = "sha256-E8b2VRlnMWmBHu919QDPBYuMbrjov9t//bHi1Y/F0Ak="; + hash = "sha256-3NXlNd3Zy++efnvcnfIOUP83mdJ5h8BmE4a2uWn5CPQ="; }; nativeBuildInputs = [ gettext wrapGAppsHook ]; diff --git a/nixpkgs/pkgs/applications/networking/sync/onedrive/default.nix b/nixpkgs/pkgs/applications/networking/sync/onedrive/default.nix index 7ea6ef290a05..2cbf706ea78e 100644 --- a/nixpkgs/pkgs/applications/networking/sync/onedrive/default.nix +++ b/nixpkgs/pkgs/applications/networking/sync/onedrive/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "onedrive"; - version = "2.4.14"; + version = "2.4.15"; src = fetchFromGitHub { owner = "abraunegg"; repo = pname; rev = "v${version}"; - sha256 = "sha256-zh9CSvuwZj9B8XPvV23xS0MqnsR+vhfdD8V+k6CjCxQ="; + sha256 = "sha256-nYko7htg16Sp/Fs+KuPflrpHn8WShM0OKozhr9BFH5U="; }; nativeBuildInputs = [ autoreconfHook ldc installShellFiles pkg-config ]; diff --git a/nixpkgs/pkgs/applications/networking/syncthing/default.nix b/nixpkgs/pkgs/applications/networking/syncthing/default.nix index bec35fdd5338..76bddac6c23b 100644 --- a/nixpkgs/pkgs/applications/networking/syncthing/default.nix +++ b/nixpkgs/pkgs/applications/networking/syncthing/default.nix @@ -4,16 +4,16 @@ let common = { stname, target, postInstall ? "" }: buildGoModule rec { pname = stname; - version = "1.18.5"; + version = "1.19.0"; src = fetchFromGitHub { owner = "syncthing"; repo = "syncthing"; rev = "v${version}"; - sha256 = "sha256-qGPAfNsl20+k5Gn0w6aY8VFSOmpPk7S5u4FHPrSCz80="; + sha256 = "sha256-jQoY0mA/vAOCaCMR8Aapt49AF7HAmjPsr3MKLoaa24g="; }; - vendorSha256 = "sha256-klbAVOHLefxG33zpEYFlPezrKrXfuWOaE+UnIsu462M="; + vendorSha256 = "sha256-hZcMt3LlK5FuhhlwCmYtlDAJv1QNK+YY7NvZaWMBuys="; doCheck = false; diff --git a/nixpkgs/pkgs/applications/networking/synology-drive-client/default.nix b/nixpkgs/pkgs/applications/networking/synology-drive-client/default.nix index 990e9691516d..459e38970ddd 100644 --- a/nixpkgs/pkgs/applications/networking/synology-drive-client/default.nix +++ b/nixpkgs/pkgs/applications/networking/synology-drive-client/default.nix @@ -8,12 +8,12 @@ let description = "Desktop application to synchronize files and folders between the computer and the Synology Drive server."; homepage = "https://www.synology.com/en-global/dsm/feature/drive"; license = licenses.unfree; - maintainers = with maintainers; [ jcouyang ]; + maintainers = with maintainers; [ jcouyang MoritzBoehme ]; platforms = [ "x86_64-linux" "x86_64-darwin" ]; }; linux = qt5.mkDerivation { - inherit pname version; + inherit pname version meta; src = fetchurl { url = "${baseUrl}/${version}-${buildNumber}/Ubuntu/Installer/x86_64/synology-drive-client-${buildNumber}.x86_64.deb"; @@ -43,7 +43,7 @@ let }; darwin = stdenv.mkDerivation { - inherit pname version; + inherit pname version meta; src = fetchurl { url = "${baseUrl}/${version}-${buildNumber}/Mac/Installer/synology-drive-client-${buildNumber}.dmg"; diff --git a/nixpkgs/pkgs/applications/networking/synology-drive/default.nix b/nixpkgs/pkgs/applications/networking/synology-drive/default.nix deleted file mode 100644 index 20b0f1168cb3..000000000000 --- a/nixpkgs/pkgs/applications/networking/synology-drive/default.nix +++ /dev/null @@ -1,45 +0,0 @@ -{ lib, mkDerivation, fetchurl, autoPatchelfHook, dpkg, glibc, gnome }: - -mkDerivation rec { - pname = "synology-drive"; - subVersion = "12674"; - version = "3.0.1-${subVersion}"; - - src = fetchurl { - url = "https://global.download.synology.com/download/Utility/SynologyDriveClient/${version}/Ubuntu/Installer/x86_64/synology-drive-client-${subVersion}.x86_64.deb"; - sha256 = "1yyv6zgszsym22kf4jvlan7n9lw09fw24fyrh7c8pzbb2029gp8a"; - }; - - nativeBuildInputs = [ autoPatchelfHook dpkg ]; - - buildInputs = [ glibc gnome.nautilus ]; - - unpackPhase = '' - mkdir -p $out - dpkg -x $src $out - ''; - - installPhase = '' - # synology-drive executable - cp -av $out/usr/* $out - rm -rf $out/usr - - runHook postInstall - ''; - - postInstall = '' - substituteInPlace $out/bin/synology-drive --replace /opt $out/opt - ''; - - meta = with lib; { - homepage = "https://www.synology.com/"; - description = "Synchronize files between client and Synology NAS."; - longDescription = '' - Drive for PC, the desktop utility of the DSM add-on package. - Drive, allows you to sync and share files owned by you or shared by others between a centralized Synology NAS and multiple client computers. - ''; - license = licenses.unfree; - maintainers = with maintainers; [ MoritzBoehme ]; - platforms = [ "x86_64-linux" ]; - }; -} diff --git a/nixpkgs/pkgs/applications/networking/vnstat/default.nix b/nixpkgs/pkgs/applications/networking/vnstat/default.nix index 77812f88ad17..a40f4cb2f575 100644 --- a/nixpkgs/pkgs/applications/networking/vnstat/default.nix +++ b/nixpkgs/pkgs/applications/networking/vnstat/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "vnstat"; - version = "2.8"; + version = "2.9"; src = fetchFromGitHub { owner = "vergoh"; repo = pname; rev = "v${version}"; - sha256 = "sha256-r+dmsL3bPgCDdBje7uzg+ArhMkqj+R/hepNLMDqe350="; + sha256 = "sha256-AEpq3Pn/WUiPDxYk6WKb1Uur5tD+OBfFAzLUDWnZH/0="; }; postPatch = '' diff --git a/nixpkgs/pkgs/applications/networking/wayback_machine_downloader/Gemfile b/nixpkgs/pkgs/applications/networking/wayback_machine_downloader/Gemfile index e519efbf5701..3625511551d3 100644 --- a/nixpkgs/pkgs/applications/networking/wayback_machine_downloader/Gemfile +++ b/nixpkgs/pkgs/applications/networking/wayback_machine_downloader/Gemfile @@ -1,5 +1,4 @@ # frozen_string_literal: true -source 'https://rubygems.org' do - gem 'wayback_machine_downloader' -end +source 'https://rubygems.org' +gem 'wayback_machine_downloader' diff --git a/nixpkgs/pkgs/applications/networking/wayback_machine_downloader/Gemfile.lock b/nixpkgs/pkgs/applications/networking/wayback_machine_downloader/Gemfile.lock index 4534beb20c39..936e10996fb3 100644 --- a/nixpkgs/pkgs/applications/networking/wayback_machine_downloader/Gemfile.lock +++ b/nixpkgs/pkgs/applications/networking/wayback_machine_downloader/Gemfile.lock @@ -1,13 +1,13 @@ GEM remote: https://rubygems.org/ specs: - wayback_machine_downloader (2.2.1) + wayback_machine_downloader (2.3.1) PLATFORMS ruby DEPENDENCIES - wayback_machine_downloader! + wayback_machine_downloader BUNDLED WITH - 2.1.4 + 2.3.6 diff --git a/nixpkgs/pkgs/applications/networking/wayback_machine_downloader/gemset.nix b/nixpkgs/pkgs/applications/networking/wayback_machine_downloader/gemset.nix index 1ef3cd36536d..87cb3019d0a5 100644 --- a/nixpkgs/pkgs/applications/networking/wayback_machine_downloader/gemset.nix +++ b/nixpkgs/pkgs/applications/networking/wayback_machine_downloader/gemset.nix @@ -4,9 +4,9 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "12kb1qmvmmsaihqab1prn6cmynkn6cgb4vf41mgv22wkcgv5wgk2"; + sha256 = "170426sashqc2k2angg8d0bhs7spi1x1isv6cyk2hif0l6xxm3cm"; type = "gem"; }; - version = "2.2.1"; + version = "2.3.1"; }; } |