diff options
Diffstat (limited to 'pkgs')
362 files changed, 5607 insertions, 4577 deletions
diff --git a/pkgs/applications/audio/guitarix/default.nix b/pkgs/applications/audio/guitarix/default.nix index 69e427dd96c..7f41fa6c5f9 100644 --- a/pkgs/applications/audio/guitarix/default.nix +++ b/pkgs/applications/audio/guitarix/default.nix @@ -17,7 +17,6 @@ , hicolor-icon-theme , intltool , ladspaH -, libav , libjack2 , libsndfile , lilv @@ -74,7 +73,6 @@ stdenv.mkDerivation rec { gtk3 gtkmm3 ladspaH - libav libjack2 libsndfile lilv diff --git a/pkgs/applications/audio/keyfinder-cli/default.nix b/pkgs/applications/audio/keyfinder-cli/default.nix index d6e96d90834..62db3d79690 100644 --- a/pkgs/applications/audio/keyfinder-cli/default.nix +++ b/pkgs/applications/audio/keyfinder-cli/default.nix @@ -1,17 +1,17 @@ -{ lib, stdenv, fetchFromGitHub, libav, libkeyfinder }: +{ lib, stdenv, fetchFromGitHub, ffmpeg, libkeyfinder }: stdenv.mkDerivation rec { pname = "keyfinder-cli"; - version = "2015-09-13"; + version = "1.1.1"; src = fetchFromGitHub { repo = "keyfinder-cli"; owner = "EvanPurkhiser"; - rev = "8579282f15ab3ebad937fed398ec5c88843be03d"; - sha256 = "0jylykigxmsqvdny265k58vpxa4cqs1hq2f7mph1nl3apfx2shrh"; + rev = "v${version}"; + sha256 = "1mlcygbj3gqii3cz8jd6ks1lz612i4jp0343qjg293xm39fg47ns"; }; - buildInputs = [ libav libkeyfinder ]; + buildInputs = [ ffmpeg libkeyfinder ]; makeFlags = [ "PREFIX=$(out)" ]; diff --git a/pkgs/applications/audio/keyfinder/default.nix b/pkgs/applications/audio/keyfinder/default.nix index 19433466ec3..80cd8f4d9a0 100644 --- a/pkgs/applications/audio/keyfinder/default.nix +++ b/pkgs/applications/audio/keyfinder/default.nix @@ -1,12 +1,12 @@ -{ lib, stdenv, fetchFromGitHub, libav_0_8, libkeyfinder, qtbase, qtxmlpatterns, qmake, taglib }: +{ lib, mkDerivation, fetchFromGitHub, libav_0_8, libkeyfinder, qtbase, qtxmlpatterns, qmake, taglib }: -stdenv.mkDerivation rec { +mkDerivation rec { pname = "keyfinder"; - version = "2.2"; + version = "2.4"; src = fetchFromGitHub { - sha256 = "0vjszk1h8vj2qycgbffzy6k7amg75jlvlnzwaqhz9nll2pcvw0zl"; - rev = version; + sha256 = "11yhdwan7bz8nn8vxr54drckyrnlxynhx5s981i475bbccg8g7ls"; + rev = "530034d6fe86d185f6a68b817f8db5f552f065d7"; # tag is missing repo = "is_KeyFinder"; owner = "ibsh"; }; diff --git a/pkgs/applications/audio/mmtc/default.nix b/pkgs/applications/audio/mmtc/default.nix new file mode 100644 index 00000000000..0d1d2c5684f --- /dev/null +++ b/pkgs/applications/audio/mmtc/default.nix @@ -0,0 +1,23 @@ +{ fetchFromGitHub, lib, rustPlatform }: + +rustPlatform.buildRustPackage rec { + pname = "mmtc"; + version = "0.2.12"; + + src = fetchFromGitHub { + owner = "figsoda"; + repo = pname; + rev = "v${version}"; + sha256 = "1chcnv8wql6v2vckpzvq6sxgpss7mnxaj008jdm8xalhw9d496s4"; + }; + + cargoSha256 = "06b0hag3s5irvi57n0hc97agfw4sw783lkkl1b26iap6mfbvrqma"; + + meta = with lib; { + description = "Minimal mpd terminal client that aims to be simple yet highly configurable"; + homepage = "https://github.com/figsoda/mmtc"; + changelog = "https://github.com/figsoda/mmtc/blob/v${version}/CHANGELOG.md"; + license = licenses.mpl20; + maintainers = with maintainers; [ figsoda ]; + }; +} diff --git a/pkgs/applications/audio/mopidy/default.nix b/pkgs/applications/audio/mopidy/default.nix index f4d4e416de4..2c19afb16a2 100644 --- a/pkgs/applications/audio/mopidy/default.nix +++ b/pkgs/applications/audio/mopidy/default.nix @@ -41,6 +41,8 @@ let mopidy-tunein = callPackage ./tunein.nix { }; mopidy-youtube = callPackage ./youtube.nix { }; + + mopidy-subidy = callPackage ./subidy.nix { }; }; in self diff --git a/pkgs/applications/audio/mopidy/subidy.nix b/pkgs/applications/audio/mopidy/subidy.nix new file mode 100644 index 00000000000..98d69816b73 --- /dev/null +++ b/pkgs/applications/audio/mopidy/subidy.nix @@ -0,0 +1,24 @@ +{ lib, fetchFromGitHub, pythonPackages, mopidy }: + +pythonPackages.buildPythonApplication rec { + pname = "mopidy-subidy"; + version = "1.0.0"; + + src = fetchFromGitHub { + owner = "Prior99"; + repo = pname; + rev = version; + sha256 = "0c5ghhhrj5v3yp4zmll9ari6r5c6ha8c1izwqshvadn40b02q7xz"; + }; + + propagatedBuildInputs = [ mopidy pythonPackages.py-sonic ]; + + checkInputs = with pythonPackages; [ pytestCheckHook ]; + + meta = with lib; { + homepage = "https://www.mopidy.com/"; + description = "Mopidy extension for playing music from a Subsonic-compatible Music Server"; + license = licenses.bsd3; + maintainers = with maintainers; [ wenngle ]; + }; +} diff --git a/pkgs/applications/audio/musly/default.nix b/pkgs/applications/audio/musly/default.nix index 1e8d29d3770..0d10b55d329 100644 --- a/pkgs/applications/audio/musly/default.nix +++ b/pkgs/applications/audio/musly/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, eigen, libav }: +{ lib, stdenv, fetchFromGitHub, cmake, eigen, ffmpeg }: stdenv.mkDerivation { pname = "musly"; version = "unstable-2017-04-26"; @@ -9,7 +9,7 @@ stdenv.mkDerivation { sha256 = "1q42wvdwy2pac7bhfraqqj2czw7w2m33ms3ifjl8phm7d87i8825"; }; nativeBuildInputs = [ cmake ]; - buildInputs = [ eigen (libav.override { vaapiSupport = stdenv.isLinux; }) ]; + buildInputs = [ eigen ffmpeg ]; fixupPhase = if stdenv.isDarwin then '' install_name_tool -change libmusly.dylib $out/lib/libmusly.dylib $out/bin/musly install_name_tool -change libmusly_resample.dylib $out/lib/libmusly_resample.dylib $out/bin/musly diff --git a/pkgs/applications/audio/ncmpc/default.nix b/pkgs/applications/audio/ncmpc/default.nix index 4e30e32774d..86651169246 100644 --- a/pkgs/applications/audio/ncmpc/default.nix +++ b/pkgs/applications/audio/ncmpc/default.nix @@ -10,13 +10,13 @@ assert pcreSupport -> pcre != null; stdenv.mkDerivation rec { pname = "ncmpc"; - version = "0.43"; + version = "0.44"; src = fetchFromGitHub { owner = "MusicPlayerDaemon"; repo = "ncmpc"; rev = "v${version}"; - sha256 = "sha256-/bynLU4/QtUawBjhcaajjuUDUwaSt6zk4/4TZqfQX3c="; + sha256 = "sha256-Qu41TL8KSKC9L25D6Z8bEbJUJQ9QI08grTGZ+0qGdUQ="; }; buildInputs = [ glib ncurses mpd_clientlib boost ] diff --git a/pkgs/applications/audio/vorbis-tools/default.nix b/pkgs/applications/audio/vorbis-tools/default.nix index 894bed1715f..865d82a7356 100644 --- a/pkgs/applications/audio/vorbis-tools/default.nix +++ b/pkgs/applications/audio/vorbis-tools/default.nix @@ -1,26 +1,17 @@ -{ lib, stdenv, fetchurl, fetchzip, libogg, libvorbis, libao, pkg-config, curl -, speex, flac }: +{ lib, stdenv, fetchurl, libogg, libvorbis, libao, pkg-config, curl +, speex, flac +, autoreconfHook }: + +stdenv.mkDerivation rec { + pname = "vorbis-tools"; + version = "1.4.2"; -let - debPatch = fetchzip { - url = "mirror://debian/pool/main/v/vorbis-tools/vorbis-tools_1.4.0-11.debian.tar.xz"; - sha256 = "0kvmd5nslyqplkdb7pnmqj47ir3y5lmaxd12wmrnqh679a8jhcyi"; - }; -in -stdenv.mkDerivation { - name = "vorbis-tools-1.4.0"; src = fetchurl { - url = "http://downloads.xiph.org/releases/vorbis/vorbis-tools-1.4.0.tar.gz"; - sha256 = "1g12bnh5ah08v529y72kfdz5lhvy75iaz7f9jskyby23m9dkk2d3"; + url = "http://downloads.xiph.org/releases/vorbis/vorbis-tools-${version}.tar.gz"; + sha256 = "1c7h4ivgfdyygz2hyh6nfibxlkz8kdk868a576qkkjgj5gn78xyv"; }; - postPatch = '' - for patch in $(ls "${debPatch}"/patches/*.{diff,patch} | grep -v debian_subdir) - do patch -p1 < "$patch" - done - ''; - - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ libogg libvorbis libao curl speex flac ]; meta = with lib; { diff --git a/pkgs/applications/blockchains/electrs.nix b/pkgs/applications/blockchains/electrs.nix index 0b0da5913ab..b43a6edc5e5 100644 --- a/pkgs/applications/blockchains/electrs.nix +++ b/pkgs/applications/blockchains/electrs.nix @@ -6,20 +6,20 @@ rustPlatform.buildRustPackage rec { pname = "electrs"; - version = "0.8.6"; + version = "0.8.7"; src = fetchFromGitHub { owner = "romanz"; repo = pname; rev = "v${version}"; - sha256 = "0nnblxz4xr8k083wy3whx8qxqmdzbxsh5gd91161mrnvidganvgb"; + sha256 = "101prhxg7dr701gwm4s15maxb7cf65hf85hc7ai53b404v39vm71"; }; # needed for librocksdb-sys nativeBuildInputs = [ llvmPackages.clang ]; LIBCLANG_PATH = "${llvmPackages.libclang}/lib"; - cargoSha256 = "11xwjcfc3kqjyp94qzmyb26xwynf4f1q3ac3rp7l7qq1njly07gr"; + cargoSha256 = "12ypx0rkpbjl4awzx8ga30qhiqqd56a24q4jwlxxnfpw9ks1z252"; meta = with lib; { description = "An efficient re-implementation of Electrum Server in Rust"; diff --git a/pkgs/applications/blockchains/polkadot/default.nix b/pkgs/applications/blockchains/polkadot/default.nix index 84bb42fabf8..613409bee2f 100644 --- a/pkgs/applications/blockchains/polkadot/default.nix +++ b/pkgs/applications/blockchains/polkadot/default.nix @@ -7,16 +7,16 @@ }: rustPlatform.buildRustPackage rec { pname = "polkadot"; - version = "0.8.27"; + version = "0.8.28"; src = fetchFromGitHub { owner = "paritytech"; repo = "polkadot"; rev = "v${version}"; - sha256 = "1zkqmsclhnv14s4mxz7h49kfx8wyi3lyi0dik6jn1fh6w8zr962c"; + sha256 = "sha256-t6ULiTY+4jRfkdSN52A8c3YWznqbI2YVicKwfWJ/dGA="; }; - cargoSha256 = "1j0pr09y5pc43a4rz1zq3h9vmd874zz6z0wd279lpm6p2m0077cs"; + cargoSha256 = "sha256-ag+Xvo1i1WR4oCtGsFIRtUGgd5AIBFsIKblY6TAsUV0="; nativeBuildInputs = [ clang ]; diff --git a/pkgs/applications/blockchains/turbo-geth.nix b/pkgs/applications/blockchains/turbo-geth.nix index dcfba417149..3c56e0bbb2b 100644 --- a/pkgs/applications/blockchains/turbo-geth.nix +++ b/pkgs/applications/blockchains/turbo-geth.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "turbo-geth"; - version = "2021.01.01"; + version = "2021.02.01"; src = fetchFromGitHub { owner = "ledgerwatch"; repo = pname; rev = "v${version}"; - sha256 = "0a570570cmyngbz645728jdd0d2xmnyrnln2gbxnngiv4v62dxls"; + sha256 = "sha256-9z0Hogu/VgGxvgQMKIImv+qyTqTmR40JS4NNIOk5EZI="; }; - vendorSha256 = "1x3mhfc16slaamp51rbscfwll25qj6ama1xkysidy7rscmmsj392"; + vendorSha256 = "sha256-Ho68+SzYELQN4DE57LNSXeHIu43zAOb7HK/jx7PFdXk="; runVend = true; subPackages = [ diff --git a/pkgs/applications/editors/ox/default.nix b/pkgs/applications/editors/ox/default.nix new file mode 100644 index 00000000000..aa3f22a2626 --- /dev/null +++ b/pkgs/applications/editors/ox/default.nix @@ -0,0 +1,23 @@ +{ lib, fetchFromGitHub, rustPlatform }: + +rustPlatform.buildRustPackage rec { + pname = "ox"; + version = "0.2.7"; + + src = fetchFromGitHub { + owner = "curlpipe"; + repo = pname; + rev = version; + sha256 = "18iffnmvax6mbnhypf7yma98y5q2zlsyp9q18f92fdwz426r33p0"; + }; + + cargoSha256 = "0v0a1dl9rq5qyy9xwnb59w62qr9db3y3zlmnp60wafvj70zi9zxs"; + + meta = with lib; { + description = "An independent Rust text editor that runs in your terminal"; + homepage = "https://github.com/curlpipe/ox"; + changelog = "https://github.com/curlpipe/ox/releases/tag/${version}"; + license = licenses.gpl2Only; + maintainers = with maintainers; [ fortuneteller2k ]; + }; +} diff --git a/pkgs/applications/editors/vscode/generic.nix b/pkgs/applications/editors/vscode/generic.nix index eea34cacfc0..470683bad43 100644 --- a/pkgs/applications/editors/vscode/generic.nix +++ b/pkgs/applications/editors/vscode/generic.nix @@ -3,6 +3,9 @@ , gtk2, atomEnv, at-spi2-atk, autoPatchelfHook , systemd, fontconfig, libdbusmenu +# Populate passthru.tests +, tests + # Attributes inherit from specific versions , version, src, meta, sourceRoot , executableName, longName, shortName, pname @@ -16,7 +19,7 @@ in inherit pname version src sourceRoot; passthru = { - inherit executableName; + inherit executableName tests; }; desktopItem = makeDesktopItem { diff --git a/pkgs/applications/editors/vscode/vscodium.nix b/pkgs/applications/editors/vscode/vscodium.nix index cae16110615..7034dc76868 100644 --- a/pkgs/applications/editors/vscode/vscodium.nix +++ b/pkgs/applications/editors/vscode/vscodium.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, callPackage, fetchurl }: +{ lib, stdenv, callPackage, fetchurl, nixosTests }: let inherit (stdenv.hostPlatform) system; @@ -45,6 +45,8 @@ in inherit sha256; }; + tests = nixosTests.vscodium; + meta = with lib; { description = '' Open source source code editor developed by Microsoft for Windows, diff --git a/pkgs/applications/graphics/ImageMagick/7.0.nix b/pkgs/applications/graphics/ImageMagick/7.0.nix index ee608b7538f..58c47721b6b 100644 --- a/pkgs/applications/graphics/ImageMagick/7.0.nix +++ b/pkgs/applications/graphics/ImageMagick/7.0.nix @@ -14,8 +14,8 @@ let else throw "ImageMagick is not supported on this platform."; cfg = { - version = "7.0.10-46"; - sha256 = "019l1qv8ds8hvyjwi1g21293a7v28bxf8ycnvr9828kpdhf4jxaa"; + version = "7.0.10-61"; + sha256 = "sha256-c/90N5H9iz5JYmn7/ynHgSOAmO5NTtkxajChZvjfMP8="; patches = []; }; in diff --git a/pkgs/applications/graphics/darktable/default.nix b/pkgs/applications/graphics/darktable/default.nix index 0f47b87d4ac..2ff712851b9 100644 --- a/pkgs/applications/graphics/darktable/default.nix +++ b/pkgs/applications/graphics/darktable/default.nix @@ -7,12 +7,12 @@ }: stdenv.mkDerivation rec { - version = "3.4.0"; + version = "3.4.1"; pname = "darktable"; src = fetchurl { url = "https://github.com/darktable-org/darktable/releases/download/release-${version}/darktable-${version}.tar.xz"; - sha256 = "6dd3de1f5ea9f94af92838c0be5ff30fdaa599aa1d737dcb562f9e0b2b2dbdda"; + sha256 = "sha256-f8P4UdqbzXxQU+zQnyGqPrYQO+mKbFj1IBC28iF0lB4="; }; nativeBuildInputs = [ cmake ninja llvm pkg-config intltool perl desktop-file-utils wrapGAppsHook ]; diff --git a/pkgs/applications/graphics/ipe/default.nix b/pkgs/applications/graphics/ipe/default.nix index d9c51d38802..72c79d7dc50 100644 --- a/pkgs/applications/graphics/ipe/default.nix +++ b/pkgs/applications/graphics/ipe/default.nix @@ -1,43 +1,67 @@ -{ lib, fetchurl, makeWrapper, pkg-config, zlib, freetype, cairo, lua5, texlive, ghostscript -, libjpeg, libpng, qtbase, mkDerivation +{ lib +, mkDerivation +, fetchurl +, pkg-config +, cairo +, freetype +, ghostscript +, gsl +, libjpeg +, libpng +, libspiro +, lua5 +, qtbase +, texlive +, zlib }: mkDerivation rec { - name = "ipe-7.2.13"; + pname = "ipe"; + version = "7.2.23"; src = fetchurl { - url = "https://dl.bintray.com/otfried/generic/ipe/7.2/${name}-src.tar.gz"; - sha256 = "1a6a88r7j5z01z6k1z72a8g3n6lxdjjxxkdrzrfdd6df2gbs6g5g"; + url = "https://dl.bintray.com/otfried/generic/ipe/7.2/${pname}-${version}-src.tar.gz"; + sha256 = "0yvm3zfba1ljyy518vjnvwpyg7lgnmdwm19v5k0wfgz64aca56x1"; }; - sourceRoot = "${name}/src"; + sourceRoot = "${pname}-${version}/src"; - IPEPREFIX=placeholder "out"; - URWFONTDIR="${texlive}/texmf-dist/fonts/type1/urw/"; - LUA_PACKAGE = "lua"; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ - libjpeg libpng zlib qtbase freetype cairo lua5 texlive ghostscript + cairo + freetype + ghostscript + gsl + libjpeg + libpng + libspiro + lua5 + qtbase + texlive + zlib ]; - nativeBuildInputs = [ pkg-config ]; + IPEPREFIX=placeholder "out"; + URWFONTDIR="${texlive}/texmf-dist/fonts/type1/urw/"; + LUA_PACKAGE = "lua"; qtWrapperArgs = [ "--prefix PATH : ${texlive}/bin" ]; enableParallelBuilding = true; - #TODO: make .desktop entry + # TODO: make .desktop entry - meta = { + meta = with lib; { description = "An editor for drawing figures"; - homepage = "http://ipe.otfried.org"; - license = lib.licenses.gpl3Plus; + homepage = "http://ipe.otfried.org"; # https not available + license = licenses.gpl3Plus; longDescription = '' Ipe is an extensible drawing editor for creating figures in PDF and Postscript format. It supports making small figures for inclusion into LaTeX-documents as well as presentations in PDF. ''; - maintainers = [ lib.maintainers.ttuegel ]; - platforms = lib.platforms.linux; + maintainers = with maintainers; [ ttuegel ]; + platforms = platforms.linux; }; } diff --git a/pkgs/applications/graphics/sane/backends/brscan4/default.nix b/pkgs/applications/graphics/sane/backends/brscan4/default.nix index 0e768afdde1..9713618d79a 100644 --- a/pkgs/applications/graphics/sane/backends/brscan4/default.nix +++ b/pkgs/applications/graphics/sane/backends/brscan4/default.nix @@ -1,5 +1,4 @@ -{ lib, stdenv, fetchurl, callPackage, patchelf, makeWrapper, coreutils, libusb-compat-0_1 }: - +{ stdenv, lib, fetchurl, callPackage, patchelf, makeWrapper, coreutils, libusb-compat-0_1 }: let myPatchElf = file: with lib; '' patchelf --set-interpreter \ @@ -7,22 +6,23 @@ let ${file} ''; - udevRules = callPackage ./udev_rules_type1.nix {}; + udevRules = callPackage ./udev_rules_type1.nix { }; + +in +stdenv.mkDerivation rec { + pname = "brscan4"; + version = "0.4.9-1"; + src = { + "i686-linux" = fetchurl { + url = "http://download.brother.com/welcome/dlf006646/${pname}-${version}.i386.deb"; + sha256 = "0pkg9aqvnkpjnb9cgzf7lxw2g4jqrf2w98irkv22r0gfsfs3nwma"; + }; + "x86_64-linux" = fetchurl { -in stdenv.mkDerivation rec { - name = "brscan4-0.4.8-1"; - src = - if stdenv.hostPlatform.system == "i686-linux" then - fetchurl { - url = "http://download.brother.com/welcome/dlf006646/${name}.i386.deb"; - sha256 = "15hrf1gpm36lniqi6yf47dvdqjinm644xb752c6rcv8n06wb79ag"; - } - else if stdenv.hostPlatform.system == "x86_64-linux" then - fetchurl { - url = "https://download.brother.com/welcome/dlf006645/${name}.amd64.deb"; - sha256 = "0pyprjl0capg403yp6pp07gd6msx9kn7bzjcdswdbn28fyxrk5l4"; - } - else throw "${name} is not supported on ${stdenv.hostPlatform.system} (only i686-linux and x86_64 linux are supported)"; + url = "https://download.brother.com/welcome/dlf006645/${pname}-${version}.amd64.deb"; + sha256 = "0kakkl8rmsi2yr3f8vd1kk8vsl9g2ijhqil1cvvbwrhwgi0b7ai7"; + }; + }."${stdenv.hostPlatform.system}"; unpackPhase = '' ar x $src @@ -87,7 +87,7 @@ in stdenv.mkDerivation rec { meta = { description = "Brother brscan4 sane backend driver"; homepage = "http://www.brother.com"; - platforms = lib.platforms.linux; + platforms = [ "i686-linux" "x86_64-linux" ]; license = lib.licenses.unfree; maintainers = with lib.maintainers; [ jraygauthier ]; }; diff --git a/pkgs/applications/misc/archivy/default.nix b/pkgs/applications/misc/archivy/default.nix index 56260fa4f70..c670a4b367d 100644 --- a/pkgs/applications/misc/archivy/default.nix +++ b/pkgs/applications/misc/archivy/default.nix @@ -1,15 +1,15 @@ { lib, python3, fetchPypi, appdirs, attrs, requests, beautifulsoup4, click-plugins, elasticsearch, flask_login, flask_wtf, pypandoc, python-dotenv, python-frontmatter, tinydb, validators, -watchdog, wtforms }: +watchdog, wtforms, html2text, flask-compress }: python3.pkgs.buildPythonApplication rec { pname = "archivy"; - version = "0.9.3"; + version = "1.0.0"; src = fetchPypi { inherit pname version; - sha256 = "b6ff08a9ecd0a929663c36c73844ac5cb4dc847e69aae639a450c64d4320a506"; + sha256 = "FDyUfahjv4zqOVFr0nRhcgxr7mskFP1W/PlhZWx/6E8="; }; # Relax some dependencies @@ -22,7 +22,6 @@ python3.pkgs.buildPythonApplication rec { --replace 'python_frontmatter == 0.5.0' 'python_frontmatter' \ --replace 'requests ==' 'requests >=' \ --replace 'validators ==' 'validators >=' \ - --replace 'watchdog ==' 'watchdog >=' ''; propagatedBuildInputs = [ @@ -41,6 +40,8 @@ python3.pkgs.buildPythonApplication rec { validators watchdog wtforms + html2text + flask-compress ]; # __init__.py attempts to mkdir in read-only file system diff --git a/pkgs/applications/misc/clight/clightd.nix b/pkgs/applications/misc/clight/clightd.nix index 51c61ca28e7..547e7e0b6da 100644 --- a/pkgs/applications/misc/clight/clightd.nix +++ b/pkgs/applications/misc/clight/clightd.nix @@ -1,23 +1,31 @@ -{ lib, stdenv, fetchFromGitHub +{ lib, stdenv, fetchFromGitHub, fetchpatch , dbus, cmake, pkg-config -, glib, udev, polkit, libmodule +, glib, udev, polkit, libusb1, libjpeg, libmodule , pcre, libXdmcp, util-linux, libpthreadstubs , enableDdc ? true, ddcutil , enableDpms ? true, libXext -, enableGamma ? true, libXrandr +, enableGamma ? true, libdrm, libXrandr, wayland , enableScreen ? true }: stdenv.mkDerivation rec { pname = "clightd"; - version = "4.2"; + version = "5.1"; src = fetchFromGitHub { owner = "FedeDP"; repo = "Clightd"; rev = version; - sha256 = "07z1m1x7nnczd51sg7m2lb6rb2c37c8glsnbrlq44hx176sj9cmj"; + sha256 = "sha256-BEGum0t+FrCTAEQwTsWeYpoIqimTAz+Bv/ZQPQ3fePY="; }; + patches = [ + # Not needed by next version bump + (fetchpatch { + url = "https://github.com/FedeDP/Clightd/commit/a52a2888e3798c572dad359a017cb0d40e7c5fb7.patch"; + sha256 = "sha256-nUzNBia1EvBQxinAfjyKbuldBoHLY1hfMaxgG2lKQWg="; + }) + ]; + # dbus-1.pc has datadir=/etc SYSTEM_BUS_DIR = "${placeholder "out"}/share/dbus-1/system-services"; # systemd.pc has prefix=${systemd.out} @@ -48,19 +56,22 @@ stdenv.mkDerivation rec { glib udev polkit + libusb1 + libjpeg libmodule pcre libXdmcp util-linux libpthreadstubs - ] ++ optional enableDdc ddcutil - ++ optional enableDpms libXext - ++ optional enableGamma libXrandr; + ] ++ optionals enableDdc [ ddcutil ] + ++ optionals enableDpms [ libXext ] + ++ optionals enableGamma [ libXrandr ] + ++ optionals (enableDpms || enableGamma || enableScreen) [ libdrm wayland ]; postInstall = '' mkdir -p $out/bin - ln -svT $out/lib/clightd/clightd $out/bin/clightd + ln -svT $out/libexec/clightd $out/bin/clightd ''; meta = with lib; { diff --git a/pkgs/applications/misc/clight/default.nix b/pkgs/applications/misc/clight/default.nix index 6ef2e886a19..e502cd6ccf3 100644 --- a/pkgs/applications/misc/clight/default.nix +++ b/pkgs/applications/misc/clight/default.nix @@ -6,24 +6,21 @@ stdenv.mkDerivation rec { pname = "clight"; - version = "4.1"; + version = "4.2"; src = fetchFromGitHub { owner = "FedeDP"; repo = "Clight"; rev = version; - sha256 = "1j7va217g1k8lxl3lly13js8myf0shjc6knalq8q6lakc6j1mkxx"; + sha256 = "sha256-NmfnE6ZWgG9erBmrFFIhutnB1t2Ix/6jo+EeXYVtehg="; }; - # bash-completion.pc completionsdir=${bash-completion.out} - COMPLETIONS_DIR = "${placeholder "out"}/share/bash-completions/completions"; # dbus-1.pc has datadir=/etc SESSION_BUS_DIR = "${placeholder "out"}/share/dbus-1/services"; postPatch = '' sed -i "s@/usr@$out@" CMakeLists.txt sed -i "s@/etc@$out\0@" CMakeLists.txt - sed -i "s@pkg_get_variable(COMPLETIONS_DIR.*@set(COMPLETIONS_DIR $COMPLETIONS_DIR)@" CMakeLists.txt sed -i "s@pkg_get_variable(SESSION_BUS_DIR.*@set(SESSION_BUS_DIR $SESSION_BUS_DIR)@" CMakeLists.txt ''; @@ -46,6 +43,12 @@ stdenv.mkDerivation rec { ] ++ optional withGeoclue geoclue2 ++ optional withUpower upower; + cmakeFlags = [ + # bash-completion.pc completionsdir=${bash-completion.out} + "-DBASH_COMPLETIONS_DIR=${placeholder "out"}/share/bash-completions/completions" + "-DZSH_COMPLETIONS_DIR=${placeholder "out"}/share/zsh/site-functions" + ]; + meta = with lib; { description = "A C daemon that turns your webcam into a light sensor"; homepage = "https://github.com/FedeDP/Clight"; diff --git a/pkgs/applications/misc/clipcat/default.nix b/pkgs/applications/misc/clipcat/default.nix index 80e4982fc8a..497e5616e80 100644 --- a/pkgs/applications/misc/clipcat/default.nix +++ b/pkgs/applications/misc/clipcat/default.nix @@ -3,16 +3,16 @@ rustPlatform.buildRustPackage rec { pname = "clipcat"; - version = "0.4.19"; + version = "0.5.0"; src = fetchFromGitHub { owner = "xrelkd"; repo = pname; rev = "v${version}"; - sha256 = "1lhnm521qqy3aw2iyk1dv4yc5ms0c5x5iipx96bz6v6y0cnmf4kw"; + sha256 = "0rxl3ksjinw07q3p2vjqg80k3c6wx2q7pzpf2344zyfb4gkqzx1c"; }; - cargoSha256 = "04iflyvz8g53z658rkxafiyi2m9kzxwl3p1xgkjq7vacmz5jk15c"; + cargoSha256 = "1ffgvhkdj8wkhlgi0cj0njdm9ycxq2qda4b5qn8bmaygzr2zkwpd"; LIBCLANG_PATH = "${llvmPackages.libclang}/lib"; @@ -38,26 +38,15 @@ rustPlatform.buildRustPackage rec { cargoBuildFlags = [ "--features=all" ]; postInstall = '' - installShellCompletion --bash --name clipcatd completions/bash-completion/completions/clipcatd - installShellCompletion --fish --name clipcatd.fish completions/fish/completions/clipcatd.fish - installShellCompletion --zsh --name _clipcatd completions/zsh/site-functions/_clipcatd - - installShellCompletion --bash --name clipcatctl completions/bash-completion/completions/clipcatctl - installShellCompletion --fish --name clipcatctl.fish completions/fish/completions/clipcatctl.fish - installShellCompletion --zsh --name _clipcatctl completions/zsh/site-functions/_clipcatctl - - installShellCompletion --bash --name clipcat-menu completions/bash-completion/completions/clipcat-menu - installShellCompletion --fish --name clipcat-menu.fish completions/fish/completions/clipcat-menu.fish - installShellCompletion --zsh --name _clipcat-menu completions/zsh/site-functions/_clipcat-menu - - installShellCompletion --bash --name clipcat-notify completions/bash-completion/completions/clipcat-notify - installShellCompletion --fish --name clipcat-notify.fish completions/fish/completions/clipcat-notify.fish - installShellCompletion --zsh --name _clipcat-notify completions/zsh/site-functions/_clipcat-notify + installShellCompletion --bash completions/bash-completion/completions/* + installShellCompletion --fish completions/fish/completions/* + installShellCompletion --zsh completions/zsh/site-functions/* ''; meta = with lib; { description = "Clipboard Manager written in Rust Programming Language"; - license = licenses.gpl3; + homepage = "https://github.com/xrelkd/clipcat"; + license = licenses.gpl3Only; platforms = platforms.linux; maintainers = with maintainers; [ xrelkd ]; }; diff --git a/pkgs/applications/misc/ding/default.nix b/pkgs/applications/misc/ding/default.nix index f0a7e2a779f..36e2923522d 100644 --- a/pkgs/applications/misc/ding/default.nix +++ b/pkgs/applications/misc/ding/default.nix @@ -10,11 +10,11 @@ let }; in stdenv.mkDerivation rec { - name = "ding-1.8.1"; + name = "ding-1.9"; src = fetchurl { url = "http://ftp.tu-chemnitz.de/pub/Local/urz/ding/${name}.tar.gz"; - sha256 = "0chjqs3z9zs1w3l7b5lsaj682rgnkf9kibcbzhggqqcn1pbvl5sq"; + sha256 = "sha256-aabIH894WihsBTo1LzIBzIZxxyhRYVxLcHpDQwmwmOU="; }; buildInputs = [ aspellEnv fortune gnugrep makeWrapper tk tre ]; diff --git a/pkgs/applications/misc/jgmenu/default.nix b/pkgs/applications/misc/jgmenu/default.nix index 29816dea49e..88274b8664d 100644 --- a/pkgs/applications/misc/jgmenu/default.nix +++ b/pkgs/applications/misc/jgmenu/default.nix @@ -60,7 +60,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://github.com/johanmalm/jgmenu"; description = "Small X11 menu intended to be used with openbox and tint2"; - license = licenses.gpl2; + license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = [ maintainers.romildo ]; }; diff --git a/pkgs/applications/misc/jotta-cli/default.nix b/pkgs/applications/misc/jotta-cli/default.nix index 3b44555c541..b34661e6eb8 100644 --- a/pkgs/applications/misc/jotta-cli/default.nix +++ b/pkgs/applications/misc/jotta-cli/default.nix @@ -5,10 +5,10 @@ let in stdenv.mkDerivation rec { pname = "jotta-cli"; - version = "0.9.38023"; + version = "0.9.39536"; src = fetchzip { url = "https://repo.jotta.us/archives/linux/${arch}/jotta-cli-${version}_linux_${arch}.tar.gz"; - sha256 = "0whbf7sb4i3g1f6yps3a6l3f0z3dg681ypax4snxw5vchi3h99kc"; + sha256 = "sha256-JZtc6Si3ZQoRG3q+ctzPPQm7WbMYRailIuq/Y5Avd2s="; stripRoot = false; }; diff --git a/pkgs/applications/misc/multibootusb/default.nix b/pkgs/applications/misc/multibootusb/default.nix index fd1ca666589..1d625a67b7b 100644 --- a/pkgs/applications/misc/multibootusb/default.nix +++ b/pkgs/applications/misc/multibootusb/default.nix @@ -110,5 +110,6 @@ python36Packages.buildPythonApplication rec { homepage = "http://multibootusb.org/"; license = licenses.gpl2; maintainers = []; # Looking for a maintainer! + broken = true; # "name 'config' is not defined", added 2021-02-06 }; } diff --git a/pkgs/applications/misc/openbox-menu/with-svg.patch b/pkgs/applications/misc/openbox-menu/000-enable-svg.patch index dd6710f5cfc..dd6710f5cfc 100644 --- a/pkgs/applications/misc/openbox-menu/with-svg.patch +++ b/pkgs/applications/misc/openbox-menu/000-enable-svg.patch diff --git a/pkgs/applications/misc/openbox-menu/default.nix b/pkgs/applications/misc/openbox-menu/default.nix index 9d2695f97ff..71c7903dfe2 100644 --- a/pkgs/applications/misc/openbox-menu/default.nix +++ b/pkgs/applications/misc/openbox-menu/default.nix @@ -1,4 +1,11 @@ -{ lib, stdenv, fetchurl, pkg-config, glib, gtk2, menu-cache }: +{ lib +, stdenv +, fetchurl +, pkg-config +, glib +, gtk2 +, menu-cache +}: stdenv.mkDerivation rec { pname = "openbox-menu"; @@ -12,11 +19,12 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ glib gtk2 menu-cache ]; - patches = [ ./with-svg.patch ]; + # Enables SVG support by uncommenting the Makefile + patches = [ ./000-enable-svg.patch ]; - installPhase = "make install prefix=$out"; + installFlags = [ "prefix=${placeholder "out"}" ]; - meta = { + meta = with lib; { homepage = "http://fabrice.thiroux.free.fr/openbox-menu_en.html"; description = "Dynamic XDG menu generator for Openbox"; longDescription = '' @@ -24,8 +32,8 @@ stdenv.mkDerivation rec { dynamic menu listing installed applications. Most of the work is done by the LXDE library menu-cache. ''; - license = lib.licenses.gpl3; - maintainers = [ lib.maintainers.romildo ]; - platforms = lib.platforms.unix; + license = licenses.gpl3Plus; + maintainers = [ maintainers.romildo ]; + platforms = platforms.unix; }; } diff --git a/pkgs/applications/misc/pbpst/default.nix b/pkgs/applications/misc/pbpst/default.nix deleted file mode 100644 index 68b1908e515..00000000000 --- a/pkgs/applications/misc/pbpst/default.nix +++ /dev/null @@ -1,50 +0,0 @@ -{ llvmPackages, lib, stdenv, fetchFromGitHub -, python36Packages, which, pkg-config, curl, git, gettext, jansson - -# Optional overrides -, maxFileSize ? 64 # in MB -, provider ? "https://ptpb.pw/" -}: - -llvmPackages.stdenv.mkDerivation rec { - version = "unstable-2018-01-11"; - name = "pbpst-${version}"; - - src = fetchFromGitHub { - owner = "HalosGhost"; - repo = "pbpst"; - rev = "ecbe08a0b72a6e4212f09fc6cf52a73506992346"; - sha256 = "0dwhmw1dg4hg75nlvk5kmvv3slz2n3b9x65q4ig16agwqfsp4mdm"; - }; - - nativeBuildInputs = [ - python36Packages.sphinx - which - pkg-config - curl - git - gettext - ]; - buildInputs = [ curl jansson ]; - - patchPhase = '' - patchShebangs ./configure - - # Remove hardcoded check for libs in /usr/lib/ - sed -e '64,67d' -i ./configure - ''; - - configureFlags = [ - "--file-max=${toString (maxFileSize * 1024 * 1024)}" # convert to bytes - "--provider=${provider}" - ]; - - meta = with lib; { - description = "A command-line libcurl C client for pb deployments"; - inherit (src.meta) homepage; - license = licenses.gpl2; - platforms = platforms.linux; - maintainers = with maintainers; [ tmplt ]; - broken = true; - }; -} diff --git a/pkgs/applications/misc/surface-control/default.nix b/pkgs/applications/misc/surface-control/default.nix new file mode 100644 index 00000000000..2c5db1fe15a --- /dev/null +++ b/pkgs/applications/misc/surface-control/default.nix @@ -0,0 +1,37 @@ +{ lib, rustPlatform, fetchFromGitHub, installShellFiles, coreutils }: + +rustPlatform.buildRustPackage rec { + pname = "surface-control"; + version = "0.3.1-1"; + + src = fetchFromGitHub { + owner = "linux-surface"; + repo = pname; + rev = "v${version}"; + sha256 = "0wclzlix0a2naxbdg3wym7yw19p2wqpcjmkf7gn8cs00shrmzjld"; + }; + + cargoSha256 = "0vi26v9mvx298kx6k5g7h8dnn7r208an9knadc23vxcrrxjr6pn5"; + + nativeBuildInputs = [ installShellFiles ]; + + postInstall = '' + installShellCompletion \ + $releaseDir/build/surface-*/out/surface.{bash,fish} \ + --zsh $releaseDir/build/surface-*/out/_surface + install -Dm 0444 -t $out/etc/udev/rules.d \ + etc/udev/40-surface-control.rules + substituteInPlace $out/etc/udev/rules.d/40-surface-control.rules \ + --replace "/usr/bin/chmod" "${coreutils}/bin/chmod" \ + --replace "/usr/bin/chown" "${coreutils}/bin/chown" + ''; + + meta = with lib; { + description = + "Control various aspects of Microsoft Surface devices on Linux from the Command-Line"; + homepage = "https://github.com/linux-surface/surface-control"; + license = licenses.mit; + maintainers = with maintainers; [ winterqt ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/misc/syncthingtray/default.nix b/pkgs/applications/misc/syncthingtray/default.nix index f5c5faf4d96..2a395a227ba 100644 --- a/pkgs/applications/misc/syncthingtray/default.nix +++ b/pkgs/applications/misc/syncthingtray/default.nix @@ -19,14 +19,14 @@ }: mkDerivation rec { - version = "1.1.0"; + version = "1.1.2"; pname = "syncthingtray"; src = fetchFromGitHub { owner = "Martchus"; repo = "syncthingtray"; rev = "v${version}"; - sha256 = "0nzkzx870hzil2kny1irp4w2kxz5gmpchr2qxb7q4f9cnih92n0j"; + sha256 = "sha256-I5QhnYp4ga3ERJ3w4qjh5gFFU+S1Htw26vHK/2M8j5s="; }; buildInputs = [ qtbase cpp-utilities qtutilities ] diff --git a/pkgs/applications/misc/taskwarrior-tui/default.nix b/pkgs/applications/misc/taskwarrior-tui/default.nix index 5c5192ebb28..530d60c7631 100644 --- a/pkgs/applications/misc/taskwarrior-tui/default.nix +++ b/pkgs/applications/misc/taskwarrior-tui/default.nix @@ -5,19 +5,19 @@ rustPlatform.buildRustPackage rec { pname = "taskwarrior-tui"; - version = "0.9.6"; + version = "0.9.10"; src = fetchFromGitHub { owner = "kdheepak"; repo = "taskwarrior-tui"; rev = "v${version}"; - sha256 = "1w8x3qfw7p4q8srdbamqlrz5nsilyd0dy87jp7kq2n7yxsrbyh4x"; + sha256 = "sha256-NQzZhWoLeDF7iTgIljbVi0ULAe7DeIn45Cu6bgFCfKQ="; }; # Because there's a test that requires terminal access doCheck = false; - cargoSha256 = "0b69qyb74r9may6n61i5a5nzwhxpaij6y40bq6kh8rzdwy0awwx7"; + cargoSha256 = "sha256-9qfqQ7zFw+EwY7o35Y6RhBJ8h5eXnTAsdbqo/w0zO5w="; meta = with lib; { description = "A terminal user interface for taskwarrior "; diff --git a/pkgs/applications/misc/tickrs/default.nix b/pkgs/applications/misc/tickrs/default.nix index 856fa60d8e6..4452f643474 100644 --- a/pkgs/applications/misc/tickrs/default.nix +++ b/pkgs/applications/misc/tickrs/default.nix @@ -1,20 +1,22 @@ -{ lib, rustPlatform, fetchFromGitHub, perl }: +{ lib, stdenv, rustPlatform, fetchFromGitHub, perl, Security }: rustPlatform.buildRustPackage rec { pname = "tickrs"; - version = "0.7.1"; + version = "0.9.0"; src = fetchFromGitHub { owner = "tarkah"; repo = pname; rev = "v${version}"; - sha256 = "159smcjrf5193yijfpvy1g9b1gin72xwbjghfyrrphwscwhb215z"; + sha256 = "sha256-FCELPt7aBKD+mf5w9HuJqKPw64qBLgdbLIfGZEB19OI="; }; - cargoSha256 = "1s95b3x7vs1z8xs7j6j80y6mfpy5bdgnzmzn3qa9zr6cghabbf6n"; + cargoSha256 = "sha256-GsK0T9BfIqr0N4wxIhvvTmNEC6I2j3XPeAJMJjRiZKU="; nativeBuildInputs = [ perl ]; + buildInputs = lib.optionals stdenv.isDarwin [ Security ]; + meta = with lib; { description = "Realtime ticker data in your terminal"; homepage = "https://github.com/tarkah/tickrs"; diff --git a/pkgs/applications/misc/tootle/default.nix b/pkgs/applications/misc/tootle/default.nix index 3b9b09aaba9..0f6747d69f8 100644 --- a/pkgs/applications/misc/tootle/default.nix +++ b/pkgs/applications/misc/tootle/default.nix @@ -16,17 +16,18 @@ , json-glib , glib , glib-networking +, libhandy }: stdenv.mkDerivation rec { pname = "tootle"; - version = "0.2.0"; + version = "1.0"; src = fetchFromGitHub { owner = "bleakgrey"; repo = pname; rev = version; - sha256 = "1z3wyx316nns6gi7vlvcfmalhvxncmvcmmlgclbv6b6hwl5x2ysi"; + sha256 = "NRM7GiJA8c5z9AvXpGXtMl4ZaYN2GauEIbjBmoY4pdo="; }; nativeBuildInputs = [ @@ -47,15 +48,7 @@ stdenv.mkDerivation rec { json-glib libgee pantheon.granite - ]; - - patches = [ - # Fix build with Vala 0.46 - # https://github.com/bleakgrey/tootle/pull/164 - (fetchpatch { - url = "https://github.com/worldofpeace/tootle/commit/0a88bdad6d969ead1e4058b1a19675c9d6857b16.patch"; - sha256 = "0xyx00pgswnhxxbsxngsm6khvlbfcl6ic5wv5n64x7klk8rzh6cm"; - }) + libhandy ]; postPatch = '' diff --git a/pkgs/applications/misc/tut/default.nix b/pkgs/applications/misc/tut/default.nix index 893f901044a..3994541f48b 100644 --- a/pkgs/applications/misc/tut/default.nix +++ b/pkgs/applications/misc/tut/default.nix @@ -1,19 +1,18 @@ -{ lib, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: -buildGoPackage rec { +buildGoModule rec { pname = "tut"; - version = "0.0.14"; - - goPackagePath = "github.com/RasmusLindroth/tut"; - goDeps = ./deps.nix; + version = "0.0.17"; src = fetchFromGitHub { owner = "RasmusLindroth"; repo = pname; rev = version; - sha256 = "1l7lc6cjx97v9zhc0b6lfzqjmyv1i3qj83drkck36if3mc60vvwi"; + sha256 = "0g4kbprsdjk2lbx81azdvz8kkhyk370id3622xxssr894v0i7iwj"; }; + vendorSha256 = "1kf7ynmxrzvhl028b4nbz9h9v9x5srarsbynpgpp4vicmxqlvrmh"; + meta = with lib; { description = "A TUI for Mastodon with vim inspired keys"; homepage = "https://github.com/RasmusLindroth/tut"; diff --git a/pkgs/applications/misc/tut/deps.nix b/pkgs/applications/misc/tut/deps.nix deleted file mode 100644 index 9264153e503..00000000000 --- a/pkgs/applications/misc/tut/deps.nix +++ /dev/null @@ -1,318 +0,0 @@ -# file generated from go.mod using vgo2nix (https://github.com/adisbladis/vgo2nix) -[ - { - goPackagePath = "github.com/BurntSushi/toml"; - fetch = { - type = "git"; - url = "https://github.com/BurntSushi/toml"; - rev = "v0.3.1"; - sha256 = "1fjdwwfzyzllgiwydknf1pwjvy49qxfsczqx5gz3y0izs7as99j6"; - }; - } - { - goPackagePath = "github.com/DATA-DOG/go-sqlmock"; - fetch = { - type = "git"; - url = "https://github.com/DATA-DOG/go-sqlmock"; - rev = "v1.3.3"; - sha256 = "1xrly2vmy1mgj9dbkmivhh8gvq6v9f9xy2yp2dw54i1895zzs928"; - }; - } - { - goPackagePath = "github.com/PuerkitoBio/goquery"; - fetch = { - type = "git"; - url = "https://github.com/PuerkitoBio/goquery"; - rev = "v1.5.0"; - sha256 = "1fqf4rs66wy02nxz6w4mvs2qawf2j8srz17i294v64y8gvxisp56"; - }; - } - { - goPackagePath = "github.com/andybalholm/cascadia"; - fetch = { - type = "git"; - url = "https://github.com/andybalholm/cascadia"; - rev = "v1.0.0"; - sha256 = "09j8cavbhqqdxjqrkwbc40g8p0i49zf3184rpjm5p2rjbprcghcc"; - }; - } - { - goPackagePath = "github.com/davecgh/go-spew"; - fetch = { - type = "git"; - url = "https://github.com/davecgh/go-spew"; - rev = "v1.1.1"; - sha256 = "0hka6hmyvp701adzag2g26cxdj47g21x6jz4sc6jjz1mn59d474y"; - }; - } - { - goPackagePath = "github.com/fatih/color"; - fetch = { - type = "git"; - url = "https://github.com/fatih/color"; - rev = "v1.9.0"; - sha256 = "086z8ssmr1fn9ba4mqnw7pnccfpys6l5yfhvycv1gdrsk7n27mvs"; - }; - } - { - goPackagePath = "github.com/gdamore/encoding"; - fetch = { - type = "git"; - url = "https://github.com/gdamore/encoding"; - rev = "v1.0.0"; - sha256 = "1vmm5zll92i2fm4ajqx0gyx0p9j36496x5nabi3y0x7h0inv0pk9"; - }; - } - { - goPackagePath = "github.com/gdamore/tcell"; - fetch = { - type = "git"; - url = "https://github.com/gdamore/tcell"; - rev = "v1.3.0"; - sha256 = "1csg9qkmbg4ksj5247kgqcy7bxvqgz6b98r0rv2s4c1mkc99gx2r"; - }; - } - { - goPackagePath = "github.com/gopherjs/gopherjs"; - fetch = { - type = "git"; - url = "https://github.com/gopherjs/gopherjs"; - rev = "0766667cb4d1"; - sha256 = "13pfc9sxiwjky2lm1xb3i3lcisn8p6mgjk2d927l7r92ysph8dmw"; - }; - } - { - goPackagePath = "github.com/gorilla/websocket"; - fetch = { - type = "git"; - url = "https://github.com/gorilla/websocket"; - rev = "v1.4.1"; - sha256 = "03n1n0nwz3k9qshmriycqznnnvd3dkzsfwpnfjzzvafjxk9kyapv"; - }; - } - { - goPackagePath = "github.com/jtolds/gls"; - fetch = { - type = "git"; - url = "https://github.com/jtolds/gls"; - rev = "v4.20.0"; - sha256 = "1k7xd2q2ysv2xsh373qs801v6f359240kx0vrl0ydh7731lngvk6"; - }; - } - { - goPackagePath = "github.com/kyoh86/xdg"; - fetch = { - type = "git"; - url = "https://github.com/kyoh86/xdg"; - rev = "v1.2.0"; - sha256 = "0a5nz53fdz1c2qvwlf2dpjdd72nxri95i6q4b07c37kiipgaxncn"; - }; - } - { - goPackagePath = "github.com/lucasb-eyer/go-colorful"; - fetch = { - type = "git"; - url = "https://github.com/lucasb-eyer/go-colorful"; - rev = "v1.0.3"; - sha256 = "12bgz6dxbb2ki1g3x7fg9ipsjgfkd58fp7cdpv63h4kvlj2n7j69"; - }; - } - { - goPackagePath = "github.com/mattn/go-colorable"; - fetch = { - type = "git"; - url = "https://github.com/mattn/go-colorable"; - rev = "v0.1.4"; - sha256 = "1yxcz08kminqr1221zxpibnbzfcgs3fafin0z9zqb3gqvf74jywz"; - }; - } - { - goPackagePath = "github.com/mattn/go-isatty"; - fetch = { - type = "git"; - url = "https://github.com/mattn/go-isatty"; - rev = "v0.0.11"; - sha256 = "0h671sv7hfprja495kavazkalkx7xzaqksjh13brcnwq67ijrali"; - }; - } - { - goPackagePath = "github.com/mattn/go-mastodon"; - fetch = { - type = "git"; - url = "https://github.com/mattn/go-mastodon"; - rev = "3e91c76504df"; - sha256 = "1wh2hqrzx80gfs1y34f4h68mnz83asx88v0bsw372ch5j1shswlr"; - }; - } - { - goPackagePath = "github.com/mattn/go-runewidth"; - fetch = { - type = "git"; - url = "https://github.com/mattn/go-runewidth"; - rev = "v0.0.8"; - sha256 = "14ilkbhnhl8yj443dd1ga4biapswv4g0b4vm2mix78a8srdww39j"; - }; - } - { - goPackagePath = "github.com/mattn/go-tty"; - fetch = { - type = "git"; - url = "https://github.com/mattn/go-tty"; - rev = "v0.0.3"; - sha256 = "0d1d63q02pc5k5ga8bw4yjbkrli2769vg237psajsskjirjy53vf"; - }; - } - { - goPackagePath = "github.com/microcosm-cc/bluemonday"; - fetch = { - type = "git"; - url = "https://github.com/microcosm-cc/bluemonday"; - rev = "v1.0.2"; - sha256 = "0j0aylsxqjcj49w7ph8cmpaqjlpvg7mb5mrcrd9bg71dlb9z9ir2"; - }; - } - { - goPackagePath = "github.com/pelletier/go-toml"; - fetch = { - type = "git"; - url = "https://github.com/pelletier/go-toml"; - rev = "v1.7.0"; - sha256 = "0sqrwldjj2qxrgjz1diw1ffviya4ma7mz7nhdgydbisi2h55lqla"; - }; - } - { - goPackagePath = "github.com/rivo/tview"; - fetch = { - type = "git"; - url = "https://github.com/rivo/tview"; - rev = "ca37f83cb2e7"; - sha256 = "05nifgrxv6aib8f20mhs9m0grdfdyyg5vyhk6zgwsxjlwbzaj021"; - }; - } - { - goPackagePath = "github.com/rivo/uniseg"; - fetch = { - type = "git"; - url = "https://github.com/rivo/uniseg"; - rev = "v0.1.0"; - sha256 = "0flpc1px1l6b1lxzhdxi0mvpkkjchppvgxshxxnlmm40s76i9ww5"; - }; - } - { - goPackagePath = "github.com/smartystreets/assertions"; - fetch = { - type = "git"; - url = "https://github.com/smartystreets/assertions"; - rev = "b2de0cb4f26d"; - sha256 = "1i7ldgavgl35c7gk25p7bvdr282ckng090zr4ch9mk1705akx09y"; - }; - } - { - goPackagePath = "github.com/smartystreets/goconvey"; - fetch = { - type = "git"; - url = "https://github.com/smartystreets/goconvey"; - rev = "v1.6.4"; - sha256 = "07zjxwszayal88z1j2bwnqrsa32vg8l4nivks5yfr9j8xfsw7n6m"; - }; - } - { - goPackagePath = "github.com/tomnomnom/linkheader"; - fetch = { - type = "git"; - url = "https://github.com/tomnomnom/linkheader"; - rev = "02ca5825eb80"; - sha256 = "1ghrv28vrvvrpyr4d4q817yby8g1j04mid8ql00sds1pvfv67d32"; - }; - } - { - goPackagePath = "github.com/urfave/cli"; - fetch = { - type = "git"; - url = "https://github.com/urfave/cli"; - rev = "v1.20.0"; - sha256 = "0y6f4sbzkiiwrxbl15biivj8c7qwxnvm3zl2dd3mw4wzg4x10ygj"; - }; - } - { - goPackagePath = "golang.org/x/crypto"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/crypto"; - rev = "c2843e01d9a2"; - sha256 = "01xgxbj5r79nmisdvpq48zfy8pzaaj90bn6ngd4nf33j9ar1dp8r"; - }; - } - { - goPackagePath = "golang.org/x/net"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/net"; - rev = "d3edc9973b7e"; - sha256 = "12zbjwcsh9b0lwycqlkrnbyg5a6a9dzgj8hhgq399bdda5bd97y7"; - }; - } - { - goPackagePath = "golang.org/x/sync"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/sync"; - rev = "cd5d95a43a6e"; - sha256 = "1nqkyz2y1qvqcma52ijh02s8aiqmkfb95j08f6zcjhbga3ds6hds"; - }; - } - { - goPackagePath = "golang.org/x/sys"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/sys"; - rev = "85ca7c5b95cd"; - sha256 = "1504qkgbhhm4f0bhk77v2r1lj6x171ay5m79alkg78wjb5cign5l"; - }; - } - { - goPackagePath = "golang.org/x/text"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/text"; - rev = "v0.3.2"; - sha256 = "0flv9idw0jm5nm8lx25xqanbkqgfiym6619w575p7nrdh0riqwqh"; - }; - } - { - goPackagePath = "golang.org/x/tools"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/tools"; - rev = "ab21143f2384"; - sha256 = "15fk0psk53pplpyghz55bhay0kvsv5rikmn5hwgjnnyxq9vfy178"; - }; - } - { - goPackagePath = "gopkg.in/check.v1"; - fetch = { - type = "git"; - url = "https://gopkg.in/check.v1"; - rev = "20d25e280405"; - sha256 = "0k1m83ji9l1a7ng8a7v40psbymxasmssbrrhpdv2wl4rhs0nc3np"; - }; - } - { - goPackagePath = "gopkg.in/ini.v1"; - fetch = { - type = "git"; - url = "https://gopkg.in/ini.v1"; - rev = "v1.55.0"; - sha256 = "1b7wsfal3b3pl5pv5n2qix09b3imh0zhirrphlsg5p2rb8fk0d0j"; - }; - } - { - goPackagePath = "gopkg.in/yaml.v2"; - fetch = { - type = "git"; - url = "https://gopkg.in/yaml.v2"; - rev = "v2.2.8"; - sha256 = "1inf7svydzscwv9fcjd2rm61a4xjk6jkswknybmns2n58shimapw"; - }; - } -] diff --git a/pkgs/applications/misc/ultralist/default.nix b/pkgs/applications/misc/ultralist/default.nix index 2943fe29f4a..af2b6be2b2f 100644 --- a/pkgs/applications/misc/ultralist/default.nix +++ b/pkgs/applications/misc/ultralist/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "ultralist"; - version = "1.5.1"; + version = "1.7.0"; src = fetchFromGitHub { owner = "ultralist"; repo = "ultralist"; rev = version; - sha256 = "09kgf83jn5k35lyrnyzbsy0l1livzmy292qmlbx5dkdpaq5wxnmp"; + sha256 = "sha256-GGBW6rpwv1bVbLTD//cU8jNbq/27Ls0su7DymCJTSmY="; }; vendorSha256 = null; diff --git a/pkgs/applications/misc/wofi/default.nix b/pkgs/applications/misc/wofi/default.nix index 7b9e38c87d1..d8af28093b9 100644 --- a/pkgs/applications/misc/wofi/default.nix +++ b/pkgs/applications/misc/wofi/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "wofi"; - version = "1.2.3"; + version = "1.2.4"; src = fetchhg { url = "https://hg.sr.ht/~scoopta/wofi"; rev = "v${version}"; - sha256 = "0glpb2gf5n78s01z3rn614ak8ibxhfr824gy6xlljbxclgds264i"; + sha256 = "1bnf078fg1kwslzwm1mjxwcqqq3bhk1dzymwfw9gk3brqbxrl75c"; }; nativeBuildInputs = [ pkg-config meson ninja wrapGAppsHook installShellFiles ]; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A launcher/menu program for wlroots based wayland compositors such as sway"; homepage = "https://hg.sr.ht/~scoopta/wofi"; - license = licenses.gpl3; + license = licenses.gpl3Only; maintainers = with maintainers; [ elyhaka ]; platforms = with platforms; linux; }; diff --git a/pkgs/applications/networking/browsers/chromium/README.md b/pkgs/applications/networking/browsers/chromium/README.md index 9d23e3143c6..9576cb48628 100644 --- a/pkgs/applications/networking/browsers/chromium/README.md +++ b/pkgs/applications/networking/browsers/chromium/README.md @@ -1,11 +1,11 @@ # Maintainers -- TODO: We need more maintainers: - - https://github.com/NixOS/nixpkgs/issues/78450 - - If you just want to help out without becoming a maintainer: - - Look for open Nixpkgs issues or PRs related to Chromium - - Make your own PRs (but please try to make reviews as easy as possible) -- Primary maintainer (responsible for updating Chromium): @primeos +- Note: We could always use more contributors, testers, etc. E.g.: + - A dedicated maintainer for the NixOS stable channel + - PRs with cleanups, improvements, fixes, etc. (but please try to make reviews + as easy as possible) + - People who handle stale issues/PRs +- Primary maintainer (responsible for all updates): @primeos - Testers (test all stable channel updates) - `nixos-unstable`: - `x86_64`: @danielfullmer @@ -13,11 +13,14 @@ - Stable channel: - `x86_64`: @Frostman - Other relevant packages: - - `chromiumBeta` and `chromiumDev`: For testing purposes (not build on Hydra) + - `chromiumBeta` and `chromiumDev`: For testing purposes only (not build on + Hydra). We use these channels for testing and to fix build errors in advance + so that `chromium` updates are trivial and can be merged fast. - `google-chrome`, `google-chrome-beta`, `google-chrome-dev`: Updated via Chromium's `upstream-info.json` - - `ungoogled-chromium`: Based on `chromium` (the expressions are regularly - copied over and patched accordingly) + - `ungoogled-chromium`: @squalus + - `chromedriver`: Updated via Chromium's `upstream-info.json` and not built + from source. # Upstream links @@ -36,6 +39,11 @@ update `upstream-info.json`. After updates it is important to test at least `nixosTests.chromium` (or basic manual testing) and `google-chrome` (which reuses `upstream-info.json`). +Note: The source tarball is often only available a few hours after the release +was announced. The CI/CD status can be tracked here: +- https://ci.chromium.org/p/infra/builders/cron/publish_tarball +- https://ci.chromium.org/p/infra/builders/cron/publish_tarball_dispatcher + To run all automated NixOS VM tests for Chromium, ungoogled-chromium, and Google Chrome (not recommended, currently 6x tests!): ``` @@ -79,3 +87,13 @@ that a new major release of LLVM is required. Those channels are only used to test and fix builds in advance. They may be broken at times and must not delay stable channel updates. + +# Testing + +Useful tests: +- Version: chrome://version/ +- GPU acceleration: chrome://gpu/ +- Essential functionality: Browsing, extensions, video+audio, JS, ... +- WebGL: https://get.webgl.org/ +- VA-API: https://wiki.archlinux.org/index.php/chromium#Hardware_video_acceleration +- Optional: Widevine CDM (proprietary), Benchmarks, Ozone, etc. diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index 900e823bb75..79899d822b0 100644 --- a/pkgs/applications/networking/browsers/chromium/default.nix +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -12,7 +12,6 @@ , gnomeSupport ? false, gnome ? null , gnomeKeyringSupport ? false , proprietaryCodecs ? true -, enablePepperFlash ? false , enableWideVine ? false , enableVaapi ? false # Disabled by default due to unofficial support , ungoogled ? false # Whether to build chromium or ungoogled-chromium @@ -45,10 +44,6 @@ let browser = callPackage ./browser.nix { inherit channel enableWideVine ungoogled; }; - plugins = callPackage ./plugins.nix { - inherit enablePepperFlash; - }; - ungoogled-chromium = callPackage ./ungoogled.nix {}; }; @@ -166,7 +161,6 @@ in stdenv.mkDerivation { buildCommand = let browserBinary = "${chromiumWV}/libexec/chromium/chromium"; - getWrapperFlags = plugin: "$(< \"${plugin}/nix-support/wrapper-flags\")"; libPath = lib.makeLibraryPath [ libva pipewire_0_2 ]; in with lib; '' @@ -174,8 +168,7 @@ in stdenv.mkDerivation { eval makeWrapper "${browserBinary}" "$out/bin/chromium" \ --add-flags ${escapeShellArg (escapeShellArg commandLineArgs)} \ - ${lib.optionalString enableVaapi "--add-flags --enable-accelerated-video-decode"} \ - ${concatMapStringsSep " " getWrapperFlags chromium.plugins.enabled} + ${lib.optionalString enableVaapi "--add-flags --enable-accelerated-video-decode"} ed -v -s "$out/bin/chromium" << EOF 2i diff --git a/pkgs/applications/networking/browsers/chromium/plugins.nix b/pkgs/applications/networking/browsers/chromium/plugins.nix deleted file mode 100644 index 355f5633172..00000000000 --- a/pkgs/applications/networking/browsers/chromium/plugins.nix +++ /dev/null @@ -1,92 +0,0 @@ -{ lib, stdenv, gcc -, jshon -, glib -, nspr -, nss -, fetchzip -, enablePepperFlash ? false - -, upstream-info -}: - -with lib; - -let - mkrpath = p: "${makeSearchPathOutput "lib" "lib64" p}:${makeLibraryPath p}"; - - # Generate a shell fragment that emits flags appended to the - # final makeWrapper call for wrapping the browser's main binary. - # - # Note that this is shell-escaped so that only the variable specified - # by the "output" attribute is substituted. - mkPluginInfo = { output ? "out", allowedVars ? [ output ] - , flags ? [], envVars ? {} - }: let - shSearch = ["'"] ++ map (var: "@${var}@") allowedVars; - shReplace = ["'\\''"] ++ map (var: "'\"\${${var}}\"'") allowedVars; - # We need to triple-escape "val": - # * First because makeWrapper doesn't do any quoting of its arguments by - # itself. - # * Second because it's passed to the makeWrapper call separated by IFS but - # not by the _real_ arguments, for example the Widevine plugin flags - # contain spaces, so they would end up as separate arguments. - # * Third in order to be correctly quoted for the "echo" call below. - shEsc = val: "'${replaceStrings ["'"] ["'\\''"] val}'"; - mkSh = val: "'${replaceStrings shSearch shReplace (shEsc val)}'"; - mkFlag = flag: ["--add-flags" (shEsc flag)]; - mkEnvVar = key: val: ["--set" (shEsc key) (shEsc val)]; - envList = mapAttrsToList mkEnvVar envVars; - quoted = map mkSh (flatten ((map mkFlag flags) ++ envList)); - in '' - mkdir -p "''$${output}/nix-support" - echo ${toString quoted} > "''$${output}/nix-support/wrapper-flags" - ''; - - flash = stdenv.mkDerivation rec { - pname = "flashplayer-ppapi"; - version = "32.0.0.465"; - - src = fetchzip { - url = "https://fpdownload.adobe.com/pub/flashplayer/pdc/${version}/flash_player_ppapi_linux.x86_64.tar.gz"; - sha256 = "16qbc2s8dg2rwggphf8f5665iccc6lrvgz45bdwskg9pwg87hlj1"; - stripRoot = false; - }; - - patchPhase = '' - chmod +x libpepflashplayer.so - patchelf --set-rpath "${mkrpath [ gcc.cc ]}" libpepflashplayer.so - ''; - - doCheck = true; - checkPhase = '' - ! find -iname '*.so' -exec ldd {} + | grep 'not found' - ''; - - installPhase = '' - flashVersion="$( - "${jshon}/bin/jshon" -F manifest.json -e version -u - )" - - install -vD libpepflashplayer.so "$out/lib/libpepflashplayer.so" - - ${mkPluginInfo { - allowedVars = [ "out" "flashVersion" ]; - flags = [ - "--ppapi-flash-path=@out@/lib/libpepflashplayer.so" - "--ppapi-flash-version=@flashVersion@" - ]; - }} - ''; - - dontStrip = true; - - meta = { - license = lib.licenses.unfree; - maintainers = with lib.maintainers; [ taku0 ]; - platforms = platforms.x86_64; - }; - }; - -in { - enabled = optional enablePepperFlash flash; -} diff --git a/pkgs/applications/networking/browsers/firefox-bin/default.nix b/pkgs/applications/networking/browsers/firefox-bin/default.nix index 20101258da5..6b8a3b1c338 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/default.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/default.nix @@ -201,6 +201,6 @@ stdenv.mkDerivation { url = "http://www.mozilla.org/en-US/foundation/trademarks/policy/"; }; platforms = builtins.attrNames mozillaPlatforms; - maintainers = with maintainers; [ taku0 ]; + maintainers = with maintainers; [ taku0 lovesegfault ]; }; } diff --git a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix index 246bffb8bb4..7529c9b8c8b 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix @@ -1,965 +1,965 @@ { - version = "85.0"; + version = "85.0.1"; sources = [ - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/ach/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-x86_64/ach/firefox-85.0.1.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha256 = "af7632d2ec4772c1532745b44509ea429681fc41295e8cd577bded16aa56920a"; + sha256 = "31196e3a9dca5c8b0d1e44455020fe40500e2e5e2b2e01b8ea6d29705967ea11"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/af/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-x86_64/af/firefox-85.0.1.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "9254217dadb1fbdc58d8f2cb565a43cf22a48a9621dd9b25c274b266dfaa4a94"; + sha256 = "24505d0911f8ec1408508f719cdf9a3d11918dff04aa93c1e2ea41668e68724c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/an/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-x86_64/an/firefox-85.0.1.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha256 = "e92e9b30f6646ec58a8a963b4017883058058e52bb392ac81eceb6cfaccc5f98"; + sha256 = "8cb20d99a9ca151d53a3815b20d1f5f5f398e6d9d82e6b8d01390cbd6e261e46"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/ar/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-x86_64/ar/firefox-85.0.1.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "29d207b37c8b8832183256c5434da76bb41b8c893c728678877b6551b40f8d82"; + sha256 = "8eec93e95d5b9aa7df47f3b91eff25b1f8e12213828adfcd98b6409c87b1780b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/ast/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-x86_64/ast/firefox-85.0.1.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "aa68b7807a1cdaa0c780c0da2afcaa5b28946ead2c6f5ea5adfab798f9d223b1"; + sha256 = "b565b06e2219b1e5d7fc85cd2208424392ca80ccc4c36049603bbfbdc9d0cfcc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/az/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-x86_64/az/firefox-85.0.1.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha256 = "c193052c8ee725d6c909c4f84099d1f72de71ac59318f8fb7f959322ea78e315"; + sha256 = "d6e26dae51ec386a49c0ac21b7cc5213101396f0630abaa167d886b23d4825a8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/be/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-x86_64/be/firefox-85.0.1.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "54bb585bfbc3b910ac95dbce7b1507b210a871bece19df250bd871fdd4354e18"; + sha256 = "1fc9fd0348b818f710a8a7672d274ecd88f95d2ab3be549f3c283658d7757464"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/bg/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-x86_64/bg/firefox-85.0.1.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "3199a6111d85e00c63314f842adc8277d54bfbb457172bfa03f59fc186d0213e"; + sha256 = "ab0d3ff8b8bdcfb9dd740b97c9c6bd29f3499a0da94081d41c84d759db7f677e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/bn/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-x86_64/bn/firefox-85.0.1.tar.bz2"; locale = "bn"; arch = "linux-x86_64"; - sha256 = "c9767a236edb36585348d7d69668074ff8b7bf0ce8bf9461660fa3f5002b5700"; + sha256 = "2e6158c2fbf754a79f509e7880a6b19217f1d65599d46283f556cd8ae953982d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/br/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-x86_64/br/firefox-85.0.1.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "4f5cc23bb984de4703f0861c06d51621851149cf7f140439f4e628b760f7e6b8"; + sha256 = "534ef1278b858255f50bace759562174ee6c3ab7fb6cb063a6f5ff86f50cb59b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/bs/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-x86_64/bs/firefox-85.0.1.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha256 = "fd09d9c54505ed70a94a861bac653c89b1401f3dd8bcfade90a0b43517e0bb12"; + sha256 = "dc3a0a7499e7e400445d21050ec5633bce346448711887be546f5dd42de6431e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/ca-valencia/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-x86_64/ca-valencia/firefox-85.0.1.tar.bz2"; locale = "ca-valencia"; arch = "linux-x86_64"; - sha256 = "3b16d75fcd1f5cb38df9a3bada0dd59c050f57d4b19988d413dfa910a07a21d8"; + sha256 = "cf821b74bdba2b3e3d488e1918b1078893766e753d004ece5e48690736d43fc3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/ca/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-x86_64/ca/firefox-85.0.1.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "e3736de71272be8fb64762f48175d8f3c5efa001f5ef683327a706bacdbfe412"; + sha256 = "465d0b094d3a12147bb18d9f052b64c2d39018bb84e9a077bf66fdf17b5b1bb7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/cak/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-x86_64/cak/firefox-85.0.1.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "a75a176b989383367b973b683a0755a283350aad43e2b9f8825561a3fefd9bd0"; + sha256 = "387359eace3af8d11e2d8e7ea9f32fa8548ea5fbe7679eb5958bbb37afedd94c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/cs/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-x86_64/cs/firefox-85.0.1.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "40060c9664c9518692601215e86047f05e9dc1d7a51454b4e2097f6dddab5be4"; + sha256 = "967ab5becfb7d6143792a66f85375d55e740e4baa71f200534a9eaebdc96968c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/cy/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-x86_64/cy/firefox-85.0.1.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "a015e8b04695fbbc19f98361ea1965cb5901ecf285ed2a56f073b8ff0abe98fd"; + sha256 = "5f5306af912633302a35827694c2454794316322731577bbb1b43cec8c641f0a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/da/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-x86_64/da/firefox-85.0.1.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "976e53318750b552292d899f4534541cfd02d64c18f3f1f283ee6b5eba10f220"; + sha256 = "8674921da901e31308205cd5d4489b9ba121af811e000f323fef3265ee57801d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/de/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-x86_64/de/firefox-85.0.1.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "2951b14baacc84b9627b714a80dede18897a3f9696b50ce06c48131888b31322"; + sha256 = "7efc9b0125a58dfad1fc372ea0e52c8bca4942909001d3b0e15d984f730d4477"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/dsb/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-x86_64/dsb/firefox-85.0.1.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "7b878a3be6798bc19b06242696a61ea78536a1b39851f9a1d41797192d7313ef"; + sha256 = "b67b965fb98b327a80e57e7782843345023a27087c107b4a087ac6f32bc9e242"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/el/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-x86_64/el/firefox-85.0.1.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "86948d6656659180cc279401106ba7aa420e817b6cc2f633c5f9dde5f2753b33"; + sha256 = "6f3d23f1ccb0fa9c803c9146c79e71674e8ea4af98aff4f6fae4b17a96783e72"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/en-CA/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-x86_64/en-CA/firefox-85.0.1.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "cebc4e8e9320d0141e2a81b4e54177103f6bcf69685055e3ee1bdf59b2188efd"; + sha256 = "52a9d4e9d16afb7b8db26a0ccc1794cfb39bcbc311f673ea2cbbaff73dcc0ed9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/en-GB/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-x86_64/en-GB/firefox-85.0.1.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "377b3afe2fbf6dc6d953658fe086347b795a25131eb9374465fe0b7089d22d04"; + sha256 = "6fb66a9c6becb8e84b3910a390e99edd68a25510c7a156e6d369bd5512614c11"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/en-US/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-x86_64/en-US/firefox-85.0.1.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "addf2e4094d4b1f4d4445165a1f52fbd2198cde5fc9c213aef1145bfe8fffef2"; + sha256 = "b8e7263fe020374f116d71020162f1011b9f759cc3673c22c9f60fdf277f1595"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/eo/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-x86_64/eo/firefox-85.0.1.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha256 = "0393c54f640bba1d73c5a8f7f128d6c3d28b633432f72ec9fadc5305c6a394ee"; + sha256 = "413b0c757f906e8000bba8814abecb0702c1939b31f7d2d934d0726959b59696"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/es-AR/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-x86_64/es-AR/firefox-85.0.1.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "700a5c7c906514dba573c72ebd92fd2809351382b870362a9e73d295ad68ee7e"; + sha256 = "53185d003a12a68005aa2a1e5b9c8d9fcd84e32a2d27b1a87fab8569b7d5d09c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/es-CL/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-x86_64/es-CL/firefox-85.0.1.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha256 = "dc76f5b7690326a51ef2606bc19946c329ed3a4174cbcffe9193ec7281c03d83"; + sha256 = "0d42da5338a904e80e60c42535d3ff644eeb0166b7d4a2317ee5cf532736db45"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/es-ES/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-x86_64/es-ES/firefox-85.0.1.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "57e60cf15b7562d5766c3bffe511b43f50b9ee00c484344d7997b1dd74e6000e"; + sha256 = "23ff6c4f37541e1af443540abfd7f2588d103345b557921fc5fd5312d601c315"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/es-MX/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-x86_64/es-MX/firefox-85.0.1.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha256 = "77531203ff37345f9849b61f0c163c573c5ac5091e5d0e07037681609e0cac8e"; + sha256 = "89151879dedcf0a3d41778a0adedb6eb9a780a238a32e521feeb03d829aeb635"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/et/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-x86_64/et/firefox-85.0.1.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "a68e6825149007d042fc9f1fb359c18c8cf09da6bee0ef3d9f2a619bb2985b61"; + sha256 = "c9e215310845f9cae62be559087145762a9790854e257f5ab09af6d7b0a4cf5c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/eu/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-x86_64/eu/firefox-85.0.1.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "7a94fa17efff869247b65eaf1c8731c536fedfc46edaaffba27d0367033a54f0"; + sha256 = "f6942f741c03d5a1e246039bbe6d38024f3aeb15b0311318aacc17c7ec0613b5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/fa/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-x86_64/fa/firefox-85.0.1.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha256 = "732417908adb7da3a9a06ad9022d3f487f6650445b93c406d6bd03482a622401"; + sha256 = "815636c8539d92c74767f5c8001e7894633c67ce2eecfe32584d9d654a8e94f8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/ff/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-x86_64/ff/firefox-85.0.1.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha256 = "defe2f208ba27521850ec1fd8abe73c181004ddd66bc15d45a2d01c8908fee97"; + sha256 = "b2638766e7d538b6b9beb782406ab3ba9aeffe42201994be21dbb9d8e7c340ef"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/fi/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-x86_64/fi/firefox-85.0.1.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "247ad848a34946c93129012de65da3153401b3a1dbd41d132d03904657b8ff87"; + sha256 = "92d0e973e2e618be102cb057d0de62f1399ca65f05982f8db4188484b58a0cb7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/fr/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-x86_64/fr/firefox-85.0.1.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "ac56118839123c10899e043fde74051b4dca211832c2ca4abffc42062773648b"; + sha256 = "8ed02def2df76f31d72fa9b461efcba4d798d7a38b7ed530cefe786256188697"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/fy-NL/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-x86_64/fy-NL/firefox-85.0.1.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "aff1bdd3559698eb253e6339088a1818490bc11fcec08560fed9732705d8f12d"; + sha256 = "7a6ec5ed176fe70fafc94e0f85d7deae393f5db83cc7fe7f5478057be34a2e14"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/ga-IE/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-x86_64/ga-IE/firefox-85.0.1.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "b3aaaa9b45865d0be2fabaee45ec8ef481cc92afd93976058441c3c801f71761"; + sha256 = "c36b5cdb6e41956cddac273ce4e997cc61f53627a94e565d99390779980d11b5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/gd/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-x86_64/gd/firefox-85.0.1.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "979140c1d5db3ee847af64eb86e97a657f7665cc85e0754d4f580229a81a6a56"; + sha256 = "59835de77fbb13e425edb6d7bfdc6fa90b51f98f2977c3e6a91d424632046185"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/gl/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-x86_64/gl/firefox-85.0.1.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "8953815137c2f40fbf490ce41f09c9f1c44114cf0640478e22e16ad67397f99e"; + sha256 = "8060e3ace951502b498a900c8904e32b643e682fcc7db3d960be5d3ef8efcab4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/gn/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-x86_64/gn/firefox-85.0.1.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha256 = "5b8887274069e3c14ba4911cf64e01103ca2b2092f7819d535932ef09a486656"; + sha256 = "5f9493a44aa5b6c39496bcb9c2f52f9312eb94667e64913610333b8ecfb9e2bb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/gu-IN/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-x86_64/gu-IN/firefox-85.0.1.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha256 = "f18ac181d0b5dedfc107ace1b257475d7ff75e15f069db183bd445e91ff066fd"; + sha256 = "751e2cf9d6f050cba1f671052340de36ce255485fd3ccd528ba254e2f9acb678"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/he/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-x86_64/he/firefox-85.0.1.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "b1b4b4bba5379e6aea2052dce060a857d545abedb75beeb09132c83d89315772"; + sha256 = "0a28f7d1925d471fd712ead92a3abc1a988215715e9663fafecfb0efddebbe7e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/hi-IN/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-x86_64/hi-IN/firefox-85.0.1.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha256 = "9fa023800ee3db1485a18ba33ce6e4b004123434da4b7e177e9413cd9dc72293"; + sha256 = "95ab7ac27f5a70d083514909c5233cc5b9619bb1ee2e75159ee6707a33033a05"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/hr/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-x86_64/hr/firefox-85.0.1.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "5dd335bb622a37629874680a132b4199dddfc341ed6cab7c34cc8bc6fef8fd33"; + sha256 = "ebaa6abc6d3ffcd1ec3e65682cee08f3a4a2f451cd27a07ff49e510ebf139cb1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/hsb/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-x86_64/hsb/firefox-85.0.1.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "f89219c755fe8aaf1309c6b83feffaf6630816882563286e324a90ca62394a5f"; + sha256 = "e6313e9ca2f5fc39ebd8e237096f4bfbef6d1a00277024b406bb123420790d5a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/hu/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-x86_64/hu/firefox-85.0.1.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "8bff8576e76bc01e57838ec7751a8cf17d99e0c9dc153e91061ace650d8c058c"; + sha256 = "7c261fcd5c2b3fbbb1a08d3d64e774c869f91cc5dc57c69c8182ea7d1e0a1f8a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/hy-AM/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-x86_64/hy-AM/firefox-85.0.1.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "adab4ab3ce22632836266963323a75a81db9e653614b9b639a6f61eeb10543a5"; + sha256 = "d19a967744f9867b07a86187d103ff245abe12cdda6ba3ffc6767b0d1535f4ec"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/ia/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-x86_64/ia/firefox-85.0.1.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha256 = "8b4acfb5654eb694b50155cfa41e02e19316cb47e552fc6537339156bb5cbfca"; + sha256 = "b044bf688fcf53565943d6da05dd76261dd42d61e0aee8d524f167d937d10a86"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/id/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-x86_64/id/firefox-85.0.1.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "e848c3877e0453d4ab9b6ccf6078fb919c4d15b1f0f20c1a975654c5e6182530"; + sha256 = "aa84b7f4bf71246ae678ac01695b5b90ff7e3cf1f59efa5261a59fddef8cf5a8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/is/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-x86_64/is/firefox-85.0.1.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "00036a6977a932b547ee5b97f5c830456cb19393cda45c190ee5237e796a76e9"; + sha256 = "de6ab2d654feb56956f0b0a31382957cf10b14bf35e3e9f22858f00728082992"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/it/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-x86_64/it/firefox-85.0.1.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "81dc17afe61ed833494cca7687a1bea1f6a5a3d93571ae0522e481ba2c9e73aa"; + sha256 = "1bffd4e8b86a96edf4a6b1b0bb5b3a22358d18e3d5c66cdf54ae5755cc8add4a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/ja/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-x86_64/ja/firefox-85.0.1.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "2f0a652d51740c9adc760a8843433a52226327600fc7e9e87b603e97c0541547"; + sha256 = "e1d78e731415a15cedd07231c3ef75fc881b71bf2e5c8aee59dfebca1e940963"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/ka/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-x86_64/ka/firefox-85.0.1.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "8f01dcfe02fd71d3c3d564ab111b34e4f2d5c58981233c5698c87bf449144015"; + sha256 = "75426f16874db9daa7221ec860ae7e6a8549d8f2e3d41f063a575f29b93711c4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/kab/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-x86_64/kab/firefox-85.0.1.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "1163788f9d943533b124a57fb3e3fc1aae56793f929e5ac2d3f17b1826e3d353"; + sha256 = "4c4fca660e8ef2d8755ac30f5c835d82d24c2e9f9a8774f0114137456a5356f1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/kk/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-x86_64/kk/firefox-85.0.1.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "f91eae3b5afcff6c49548c6d5d5d5b0fc0dd6a9500b87baaf00e0cee96efe22f"; + sha256 = "c88f251fe8cc7ea5a52fd33b7f6eaac7d0e64ead921df96ee6528bd039ac52c7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/km/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-x86_64/km/firefox-85.0.1.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha256 = "2ab5040f15ceea952a7fb6d737eed93b23e1423e2298c31a5d7486c81ecab9af"; + sha256 = "37535cc8a315d107af45cb678c386e73fcb3a13e33bbd55db5b98bb09a9b6eb4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/kn/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-x86_64/kn/firefox-85.0.1.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha256 = "c141f0e1c95c0630aecda5f929ea3720f3620ad9f30f95e4e371865c2d0eb96b"; + sha256 = "dcdeb544cb9d9d29677f6b272ab33b7592005f7609d499bdd97b997bbbe7a2f5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/ko/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-x86_64/ko/firefox-85.0.1.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "8e87b7f748f2fddb3edf5f12fcd8238bf8f05b403c707471878ef540f8fa2a40"; + sha256 = "ba0677d2bc8a66cbe0f3c7bcf256da8248cce604ca43c9db543c02d5a638599b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/lij/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-x86_64/lij/firefox-85.0.1.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha256 = "99e4be7139c456c7a7da8d1ba1b845d381995241940b9e9f3db81892cb51231b"; + sha256 = "f79c200904a60d9156a25ca9c968edff7df81a7faa01dae0436da22d941f87e2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/lt/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-x86_64/lt/firefox-85.0.1.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "acfc0ce0b56a15d2b5a7492807b9b70b801712b420a72d5b2e73a6e5021cce71"; + sha256 = "866e8a42dd1a8fb6e43aa4c156da70c7ea01e57f98deb9733f2b91bc0b26c05a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/lv/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-x86_64/lv/firefox-85.0.1.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "c8bab5353b01987b6e3ee434ec5460cb54d56183662fa9c7f3017ae018be575d"; + sha256 = "e4c8675ff35bfae63fe38cea86283574fd51522c41e756c49f9437da4b0524c1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/mk/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-x86_64/mk/firefox-85.0.1.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha256 = "7ba1d47b8923862ff2228faeaf86a1277dd48f45ffa83230f3b9b22b1860febc"; + sha256 = "cbba302366387806d3ae185b93e45df4a5e5c36b469233ffda3f9ef45c41c799"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/mr/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-x86_64/mr/firefox-85.0.1.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha256 = "acbc9dd00e31437bee02f9d3548af926ca021f128239f67ff5399e533923e2d4"; + sha256 = "a26de1118be542a851e1033285e8517ea3eb3a1e2caf1f20018d98294df980c1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/ms/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-x86_64/ms/firefox-85.0.1.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "6293173ccfcd0475b6ee0baffb54d4b43776710b3c4ea97ef1437a8919aebc1d"; + sha256 = "9637de49c5b17d9d4809c614ab0d1988a0ea1d86b5ea02482eaf70e415ca190f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/my/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-x86_64/my/firefox-85.0.1.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha256 = "c4e075996c9a6c13e2631bd85d6f5b3015400dfa40116479e5a17c939d538cf6"; + sha256 = "c6f87c7e25c324d4fa767b16b7b91af4efca5dadb5fe684eeaca4742abe5387a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/nb-NO/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-x86_64/nb-NO/firefox-85.0.1.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "94d8f6ea965080e0b28d797c0c73813164216541bb6c008adffa523722a2727d"; + sha256 = "f1d6d30ecc0b53f971a74dee11364f6fbcb6efdbb1951260b341bdb6c98a5ae2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/ne-NP/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-x86_64/ne-NP/firefox-85.0.1.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha256 = "129ab6f7276d180c3adacfe970c4c870953481790b451f8dc98134c914daddd6"; + sha256 = "8d6d976c897c9f9a3d520af1124ffc953eb9a3a7f35aabb94002c94841486805"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/nl/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-x86_64/nl/firefox-85.0.1.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "0f7efdcd52cf5c214da536261e539b45d8da3ad37543b6296feb92186053a59f"; + sha256 = "6c5c15c780af0de9be4b70e3547d994b6d50d375067cc7e08377babb4335a52d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/nn-NO/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-x86_64/nn-NO/firefox-85.0.1.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "2e42e0a8eb2dc2fcd217aacd7c0aa7eac5e673bad0d66f0555f7bb51ffb895fd"; + sha256 = "488141d1dc9a9e5431baec0a89485061edadaf7a5762d284e3986206ca5b70ee"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/oc/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-x86_64/oc/firefox-85.0.1.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha256 = "d4fabdd18ca199f6081093fe4c88191885ae0c19fc36fe574f546b26b5d2eacf"; + sha256 = "bf332a5fae4298330e042c92d806cba19f12f8ca1f501f8e36b1b267f2486aed"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/pa-IN/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-x86_64/pa-IN/firefox-85.0.1.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "88ddf2bc486d13217edd3d325247dae774ba60d509481d7a6900e06ae30f70d8"; + sha256 = "7108d6fa99eb2ab077edcdf1539a8437e664e528b73b6ae2cce3af6ab07a41ac"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/pl/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-x86_64/pl/firefox-85.0.1.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "9e6336fe8745e21674270a95bce7d24508c9585955c58ad74f631e1fa73c56f3"; + sha256 = "40b7830f0dfc684b277c22aa6d558154aa4c37a2bdbf5d47add74ac406b6bfbe"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/pt-BR/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-x86_64/pt-BR/firefox-85.0.1.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "68573084e4a826978bfae5c1c8cbfecba2fd578d0c6a07affebc2ba19f1d97e1"; + sha256 = "1ba338037c07c2c77b3fe8767c8dbf240bd99ed9ffd33cf0cec1dd38adb7f196"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/pt-PT/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-x86_64/pt-PT/firefox-85.0.1.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "6b6bcca14f08cb8fe07282a3b24797417ea73a60300cdf76c64ffda4bfb051c0"; + sha256 = "6cff3b3f11364a7bd59f125854dff1c2d638287ee95f0a7bc6bdb075a0624f01"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/rm/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-x86_64/rm/firefox-85.0.1.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "331c0cd9510564ade274c209514dc5ec3647e3ea37da6b630a7cefb8c445332c"; + sha256 = "7c626161a43e052978ecb6673cf3a6a5e57bdeaed52113da3ae52bc0db653f9b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/ro/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-x86_64/ro/firefox-85.0.1.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "52df2b116aaac13590076b86216b904def287e18828f040980cae01e8ae67b1c"; + sha256 = "308ec282ca3850056370205fff303b75967051fd54058d1365949f1975793791"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/ru/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-x86_64/ru/firefox-85.0.1.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "2fbcd36492688e21dc4e8fb1faf1ea67ecd745f3b7f58b0950786120c9043cf0"; + sha256 = "48c445c3f25a9ef50fe81a59c8c70c9decab031c8d889da088616aab1e4d8b83"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/si/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-x86_64/si/firefox-85.0.1.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha256 = "2a4ab4bf9fee148931d09bae59ec1f049c09aafdcfee3c6a083adb3d2b1e42ee"; + sha256 = "5170634c140ea5734f8141e11b9e67f2257d2b80a0b41efeb6223dda69a9f364"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/sk/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-x86_64/sk/firefox-85.0.1.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "4ba12a5d49a2ee0f5c41f63cab08b7c161f3546ca9195339e22d463879e7f45b"; + sha256 = "0d8dd2d3c0269080cf77727950733f077d7db753ecdf910992292dfbcfcb79b6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/sl/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-x86_64/sl/firefox-85.0.1.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "6f1f6379a9706d2af9c7797d8c1c86700f3e9ff7cd72fa35c3d602e6622de47e"; + sha256 = "35177a269a4b4064bbb60f4d7d4fc0b9fe9e9227616a69efc0d9a3c4cc5c6417"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/son/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-x86_64/son/firefox-85.0.1.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha256 = "b9292626bad35a50dcb81d34db417417b031a6ef9a215e26d5e1ee9456e244cf"; + sha256 = "d594aec6adc95057c8ec786e07f72b8b63b3fd1f60bd056171ad1c1d08ea220f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/sq/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-x86_64/sq/firefox-85.0.1.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "077dbbaa904712782252e8f8a01b78237d51cbbeeda0e455ad5f2569f9a394d1"; + sha256 = "77b925e4ab229b7b5347de2cb5ee8bf774d94b4db831e87c2b5f10c926dc9efc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/sr/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-x86_64/sr/firefox-85.0.1.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "c537ab1e63530a82cf5c181d98895b580705e3418f598ab3f98fa67cd9a83f10"; + sha256 = "e967cde12e9e916b5cadec9bb545291fac31fc287333d62d6d9e82fc69a0f028"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/sv-SE/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-x86_64/sv-SE/firefox-85.0.1.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "42e36cc411666fad716a60643eae0be0301783fda10cb07943c8b6df293430dd"; + sha256 = "6d7bd35d5275fd73dedfef52a09d278efa74d3605000451553fa53c69e5d5cb0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/ta/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-x86_64/ta/firefox-85.0.1.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha256 = "b77e5c448f6a1bde09da07c3b20339f54214d89b4394123809e7bec668d65abb"; + sha256 = "7784e71986bfc5c0b471394ba3495a1d221fd7a863304f6db78791fef5a70838"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/te/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-x86_64/te/firefox-85.0.1.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha256 = "8c700eb9c7a9057e4639c39643430667ed9099a37d2214c8ffc5d349e5b0fe79"; + sha256 = "4d582c28386c13657b9983b8d6de9fabb021f5dc3c120162f370eec5fa7d0a7e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/th/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-x86_64/th/firefox-85.0.1.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "3a467b98fb435e80bb913c56291803a79a05a42c73576be49b014394a29002f1"; + sha256 = "e265ee575e71cb940ad679dc6ea8a37a075882fb2ff5023f68d63eb86a642cd7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/tl/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-x86_64/tl/firefox-85.0.1.tar.bz2"; locale = "tl"; arch = "linux-x86_64"; - sha256 = "599214c5dd5eb28d6ea3b7e2db8795ce4923284c721b15a85bcbdbe74b416c5f"; + sha256 = "7bbfbd0538048692b0ee755df1c9ac004bc408bf814c95835f7e1ed3f05bf1da"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/tr/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-x86_64/tr/firefox-85.0.1.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "1192f241df3a8691d0e895737c03a790f47a731a6335d2ee2fd1e1310b3d0cc0"; + sha256 = "b81c231bc5039a1b91438ce6447f93b86ad1c8d248b67dc565d7da870ea61ff3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/trs/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-x86_64/trs/firefox-85.0.1.tar.bz2"; locale = "trs"; arch = "linux-x86_64"; - sha256 = "f68c08305ec3d1396826e3310ac88b5b07beb71beebcbfaebf3ac81c543bc47e"; + sha256 = "bc72b31236b7422fd29f900f2dc8d8e19ec3ecef7d365e31d492e1aa3bea0368"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/uk/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-x86_64/uk/firefox-85.0.1.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "4705551ac9a02b450f5e81b05a08912b7b26bdba99b9e9095461aa9c70aeed36"; + sha256 = "c79263d7040815726dd42fa2d20f624b10a0827c6ad48d09d394c614bed4bc64"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/ur/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-x86_64/ur/firefox-85.0.1.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha256 = "ec84dd4c7a4e338a21ccf8f09c1dfb14a9e34e3240a55b92901cc5e6a89bb135"; + sha256 = "eb89fc6f432125287059fc4d9a02e7a1609f8eb49ac3ac5504a9b278b4a97845"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/uz/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-x86_64/uz/firefox-85.0.1.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "d7a5b1c95cd9c8bc20cff8add8a2fa9c9c909b3845cbdc6f593f2686f9f27a40"; + sha256 = "cac15fcb96b8f0e79746e563ef786162f86c977251b8f3983ebfa5d163f9ab38"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/vi/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-x86_64/vi/firefox-85.0.1.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "a3c1a719317c9fc73371132dfc0349dce50db061c4f96d32585bb26d0aecc7c9"; + sha256 = "37a966d4c4d3c58544596ab08a6e4b14d01cc40f36ace0039f2017df495795bb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/xh/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-x86_64/xh/firefox-85.0.1.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha256 = "cacdaf5b7044a7e951fd67c4ff25ed41f2fe05a6cf2f4ff5b9d8d9fb0cf211ca"; + sha256 = "17c22a1737f48b4cba5da7ddaa00776da1bd3ae032b70b9faf35e719f42f865e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/zh-CN/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-x86_64/zh-CN/firefox-85.0.1.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "888569bd9bf58a58ffd5effdc4f0c58ac53354cec5d2792f0d88cfb30efff4bd"; + sha256 = "93b176d2814e9c6a24a95f6211e4b5b7eca28895ea100ffdbb46d8482b149e29"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-x86_64/zh-TW/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-x86_64/zh-TW/firefox-85.0.1.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "71e1fc336cfda1401b4d96ed185423486480a5ad4d267d3c94336470fa4a8bce"; + sha256 = "bb33dc41bd7daddc954694fa72259c440d07ba84465b8b2fbe83f635b7400b22"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-i686/ach/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-i686/ach/firefox-85.0.1.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha256 = "efcfa1aaac69712596c7f5ecbaf359c69980eb0b4d8c99857085f3a4564d5026"; + sha256 = "ba34cc7c3ee0e0ac6ea0106874dc1860c08049700c4e9ba130d8417508edae6c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-i686/af/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-i686/af/firefox-85.0.1.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "b5e1eb9041fdda259a3db87d784e6b633a18f18c46038361d4a6d2a8aeadcda3"; + sha256 = "da95c9f5226d6a3ebe356c18249b026c535f803628f9697e19fb961a44aee70e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-i686/an/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-i686/an/firefox-85.0.1.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha256 = "35ecf29bbb2e65feb372c83d2bf6b1c28b6edd57873eaec3090ed0200121043a"; + sha256 = "5b151a370954bf27def1577e42101b484335aec48f840e907a8f945065a33268"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-i686/ar/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-i686/ar/firefox-85.0.1.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "ef86ed77ac7de83e4e068970f57843ab801f89f180837015f1ea4e3ea11f3b6c"; + sha256 = "c549b72bb31f1311c01b82a07271eb53964be982e889d04dbf63cd5d39d744d0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-i686/ast/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-i686/ast/firefox-85.0.1.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "6b58d2d132944a5106b73f47bdffbd606df63173f817bbdb32c4d3b2354030a0"; + sha256 = "c48cafd7ea778faebc31efd61bb090e9e55124f2a64f2b407a7aa7e19bd6e30b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-i686/az/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-i686/az/firefox-85.0.1.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha256 = "1ee85155d8d45fe003bea0d8ff9d5a1c40c4d52102e125b4bc1ad608b5383c39"; + sha256 = "fab896b2ebff58d16baac7f00998e85978b1e41ad0b9b5a219b65bcc854ea192"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-i686/be/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-i686/be/firefox-85.0.1.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "e6f30798e101d73b0e359a63a35b044ea51df964f1e22a9c894f1b572cb99653"; + sha256 = "d0dfc35174e9c02999e45ad25bea24332e71e860668211fd489c6e46f184b890"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-i686/bg/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-i686/bg/firefox-85.0.1.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "e3bbc6ca6c77fdb56dac6c8ad0c45d425485ef279c115651bb4824f6d52a14f8"; + sha256 = "da6ab40fdffeaf8e1df8f379c3cf07f97da10590732d385a1bacacd3e5dd84fb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-i686/bn/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-i686/bn/firefox-85.0.1.tar.bz2"; locale = "bn"; arch = "linux-i686"; - sha256 = "583762c0fb01f6ee1165eb98122940fc42286e6f8678679466a2b79051a45fd3"; + sha256 = "c69fb64b3b47091ddefb4325d49aeb6e5b5a67bcaeea4240a0640fc38b821875"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-i686/br/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-i686/br/firefox-85.0.1.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "abef23deaac27bea07d0586f78578b34407765c05cdeaa9bd4d4ea0b552bafbe"; + sha256 = "8a3ec06d6eba37877d9201651f912e686bf99babb384e379feefafc9533c5e74"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-i686/bs/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-i686/bs/firefox-85.0.1.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha256 = "8f4385e1a8db5567d499a046a169d8a77c585a61734ee7257063a98d722cd278"; + sha256 = "d771063134a01e5f7a07e403ac5c2d23f8c7792f298bef7862396094c99c7a52"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-i686/ca-valencia/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-i686/ca-valencia/firefox-85.0.1.tar.bz2"; locale = "ca-valencia"; arch = "linux-i686"; - sha256 = "eca948e8e2020cf401ac4dcaefda2aaf967336122e1927418a80d9a854e2e52c"; + sha256 = "a1ca0f3a80fb6d3f98b1d1e74d6b8e5f3e7a6a91ca81cc29aeeb1947e7562c33"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-i686/ca/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-i686/ca/firefox-85.0.1.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "c46250371ac43baaed265e74998e0bc44fdf01c4308f1bae8e34896e75004096"; + sha256 = "baa21f32930fdc55862fe1fa3bf07ea3c3a790233f8472cecf621dfef9fbe639"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-i686/cak/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-i686/cak/firefox-85.0.1.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "64dace82a39b131fad3509b2865a6cb22c5044a88838187f975a9c3bbb5cff2b"; + sha256 = "b73a1347be66802aa55c5e2a068ab0556f1659e6e85289181c9d436698357ea0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-i686/cs/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-i686/cs/firefox-85.0.1.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "799c10e7f4068f4122637f4e8ae992f4da892b8f4ae17e47e2b93ff9f61f236c"; + sha256 = "8731d781753c8a6652df2cf9120cda12e88e42f721c99b8867df971ac33ab6b1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-i686/cy/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-i686/cy/firefox-85.0.1.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "9075bde46721937fc83f891a3f3162969e61c8ae6aa0904b6d597fd5c2872e81"; + sha256 = "da6da7f9e69a8a36a4a0f1a388b5560dca4b1cb64154a9d77cc2bf398a41a5cf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-i686/da/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-i686/da/firefox-85.0.1.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "d1bc56c35db77e1ed7c3b206ca7906834edd41e8d37f5fb467fa75eab22b1c6f"; + sha256 = "42b9b30111d186fcd5422731236050157a4f7c7fdf928d4879fa90c4f37b9da2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-i686/de/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-i686/de/firefox-85.0.1.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "8430827afb4a748890d1b114d3363898ff6a882b2a17165a10abe8ef385ec83f"; + sha256 = "e78fa2bd1b856d060a2093caf6dd79ff0d150e815a79b8831096df3315067c5a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-i686/dsb/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-i686/dsb/firefox-85.0.1.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "e6985031027fc9d4e5d8ab0899daadd93a5333a668b116b632181ed34006ae64"; + sha256 = "459e99e7636f1f09b5ae8a78b0be6dd69c3f1a53ccb7c1daeae1d8d146e61afd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-i686/el/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-i686/el/firefox-85.0.1.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "4e5bb6be18e963006f30a1478194b6613ff922e9dd3939ed7df5e2d79df5c630"; + sha256 = "6a2aaf9ab9782919e1bbe0d010a2526bc0d63f8c6c8483281bc9a206a611b2b3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-i686/en-CA/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-i686/en-CA/firefox-85.0.1.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "b172f0368b07b6f908035e7d41a95ee8abd9c21cfe77923d902ec53517716a6c"; + sha256 = "3fd67f804366b7454b2988730181d09cdf536c8c1f4db1f7d68aa1baa9392fd2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-i686/en-GB/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-i686/en-GB/firefox-85.0.1.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "3e64db811fa3cf989dff5b043b9ffc3349f119ce27185fcade110e57ccb66056"; + sha256 = "e661161aa18f629ce4d5b06e543f2fb513e82d5656a756352f3ee94b59b9287a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-i686/en-US/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-i686/en-US/firefox-85.0.1.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "e6269d7b11bd0e2d918e45059d201a2ae329da6ae69d33648de1e8ed885c65fc"; + sha256 = "e3a749f507b8bb5b380b4bedeee9dc360b8db4c1f61e6a54ad55d438907682d2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-i686/eo/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-i686/eo/firefox-85.0.1.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha256 = "fa1e60db4ff414b96c7813545a5b67730f312cbd85bbf079aa4c03eed5dc0920"; + sha256 = "b3d1b34a1dd3cd15735599a74650bae46ec359a70df09a0f5e26fdfc6df408ed"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-i686/es-AR/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-i686/es-AR/firefox-85.0.1.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "f65977cf029a0075e2214708719a6af4b8e41d39bbf59b1ad998a5fca460c717"; + sha256 = "dbcc491813d8ac79faf53c3ca22a10c6239a761e115e209164cb034a4e7b4e64"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-i686/es-CL/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-i686/es-CL/firefox-85.0.1.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha256 = "94cf0ad46c52685c03c385ca80e159e5ddf229f31c8ef764defa50dfb5e59857"; + sha256 = "8cc7b31c01141caba6d5fc6267ad19b7b78ad10f15d6311961cc2ecbf033a636"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-i686/es-ES/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-i686/es-ES/firefox-85.0.1.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "6603132e1660a50ab3f0347a22b52b9480f4bac21f67f958fb0f112205f3dd3c"; + sha256 = "ba7a70cd25045dc63d0da66336e171d548a35af029867ee8735ca04707ff560d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-i686/es-MX/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-i686/es-MX/firefox-85.0.1.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha256 = "325cefd6f0920207fdcb11674a4b5a3f8d71a4b65e64c11f7ab3681a7a1ffb08"; + sha256 = "442428e833626e05e6f35bbface199a1384fedcbc835fb9bf67831e331e9ff5d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-i686/et/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-i686/et/firefox-85.0.1.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "9e997aac788ad9c5d249a2e1cce5f3a968fb5564c67e585f842d576aad5b710f"; + sha256 = "c0f9b7eb84f4d92ca2b47ebe82f25a5bb19cb2080a6a2cef1bc039ef9382db0a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-i686/eu/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-i686/eu/firefox-85.0.1.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "c677e6c0e86ce007fd0027132891b0baeefb172dfe19b8a3b6c0a1fdb09413a5"; + sha256 = "359918d8dcad304b5b2ee93b241d4d2ff1dfd59f5cdded964013ebacec5e3b60"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-i686/fa/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-i686/fa/firefox-85.0.1.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha256 = "4961d99cfa342ff1148f751a7ecb480439f2850247e4b4815023ae767cb92c55"; + sha256 = "36ba466eb9f086052515b88d784374fafc5c807a89e4159049be64d8126c6e9c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-i686/ff/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-i686/ff/firefox-85.0.1.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha256 = "751d7fb2485d00f1653397cbab88e0131b959cb9fe94a2c74687b05967a0efe1"; + sha256 = "4de5b8e9150eea72652b4f92ff342b341e9c3ca4415036c8137da4dded04c484"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-i686/fi/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-i686/fi/firefox-85.0.1.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "98244bbd2d914c14b66a2f1b58312fed6ad09d69a8c6e36c6a28b9d6f5b93bd1"; + sha256 = "18cc61057ddb8f7e5001aa293b3cd71bec67af4859d6ca30e4ac2dc195553787"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-i686/fr/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-i686/fr/firefox-85.0.1.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "c90054aa48353ecd2e7d8bec810e98b8706bc837216bd2237010c50d73890de1"; + sha256 = "6314372c93709f3ed262171e94e94927997ed478167542d9840a4acb77b34ff5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-i686/fy-NL/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-i686/fy-NL/firefox-85.0.1.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "343559198dbea2cd4f4d66c83fb8c0f44fede93843d43421c9a7e5925a7f834c"; + sha256 = "38b62d1de5b452f79be50875bd97317951d9359d76727fad9972a9aa00a1f4eb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-i686/ga-IE/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-i686/ga-IE/firefox-85.0.1.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "44a19acee4c0a8e03604de46c19c28f54f9ecc8bbf8f32f2e7b3922c11659df9"; + sha256 = "b77b30753800e5c95f8336d1b2a7cc39e011b38001d0f7b1f3755d69cf71e4cc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-i686/gd/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-i686/gd/firefox-85.0.1.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "bad179771be3cb0fd0ed4dfb287f16df65a06b78b3741853f474184f534f1ec2"; + sha256 = "5dcf35c3415eb2e296c3433ca2a7038ce8d9fb7793ae920401f43796ac22b077"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-i686/gl/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-i686/gl/firefox-85.0.1.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "58732e181252d40d59e3acfaaa1da9533e659fa4d3c43f70c03801fe793c7280"; + sha256 = "cd0f2128636ace6fd258f241ef5be40a05815ed3db18c2acb9200bcd5202b464"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-i686/gn/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-i686/gn/firefox-85.0.1.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha256 = "645d6840fa76e286bf107c526de0762c5074ef3b52bae49ee5f02307c52d02f6"; + sha256 = "9d99e57af9c9cdc32e8c0b7198ee3d4f0ef11f7a1e653a4f6f9608ae2e6c8dda"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-i686/gu-IN/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-i686/gu-IN/firefox-85.0.1.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha256 = "f61f6b052a687807022b72629a22a6b53890487add36634d09e2860d92d6733e"; + sha256 = "9bcfaad7478e6c4a3c01258c826254779410e95ed5c57bc0e272713446b07e36"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-i686/he/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-i686/he/firefox-85.0.1.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "5b96a1b4298737182a7c7c99ea43eb7b6558593f9f7b18df4a0217101dc183e4"; + sha256 = "0b62ba8fb9edc4fe6cad699fe1897910bd4043e17c9e699260504ed8a18fc824"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-i686/hi-IN/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-i686/hi-IN/firefox-85.0.1.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha256 = "e4c393235aaa9d80d678ea2f69092462815705647022fb2635a00174e597eb60"; + sha256 = "038569c047693b15c932b88c0db716ea4067c7f3989ee8e53af3b9a0f306a2ba"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-i686/hr/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-i686/hr/firefox-85.0.1.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "3722f05edf8f9fd5adf782291be51b708e7f08943b2f03351b36df00a1ef0d1e"; + sha256 = "08c738bd05d8997a156d87ea21c3ab979d7045d4bd0f7cef95bd10c68c7a55c2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-i686/hsb/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-i686/hsb/firefox-85.0.1.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "e79dc707afdd246540e886522890d6ae2f53c38054c8902303d9bdd03df02359"; + sha256 = "199f9ee619eae1fbbbf2d2b39fd0a4cf142ca57894d12007c32d15a90bf2b030"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-i686/hu/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-i686/hu/firefox-85.0.1.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "415edcbfa2cf3bd0cb1278799914ccd683af51b8e380039c4aaba118e66047af"; + sha256 = "e13ab60488ba0ea2dbb5de33a09b2e5d6892216eb16bf629fbe4e271e29f04f4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-i686/hy-AM/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-i686/hy-AM/firefox-85.0.1.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "4561cf20fea47b11a330be2bc3b517c1c53b4577f250b531225c53f321df7382"; + sha256 = "1d5646a2419e197a3726a9869ff443f5d2b73d855816b9c0f0f043bce5a8d098"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-i686/ia/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-i686/ia/firefox-85.0.1.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha256 = "97b44d0e08f79ad55aafe2384b523d24e0147d414b95ff81834feb59c6b07695"; + sha256 = "2703c8337a5a41b5d48bab5d1dbe9d9a191f78b3a50942f454508239494b16b9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-i686/id/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-i686/id/firefox-85.0.1.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "2b501c2b43fc54f1ba5a89f8b0d19f8d25626584d1bcc108e16e2287f11449a2"; + sha256 = "b4f31fde1297d8c111e94eef2d8d14ac41e41d788ee0dcb91ef0c3d93a9d2b22"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-i686/is/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-i686/is/firefox-85.0.1.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "2cc3d7b82be2bad7ab6dc5659bf7a4c8ce4d882964588a2a767e78a34d832b27"; + sha256 = "092218c6719ea8455de72927dcb6bf905e1452d8f725ae9471613cffa58b767a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-i686/it/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-i686/it/firefox-85.0.1.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "68b3f63b6e561f038894d6503b4fba8177e3fc025a189b68e2da11f8bef11c2a"; + sha256 = "99b7d253f83d9f861eeee85d898370b5c96d1bc06fe2633ebd5f8dc9420916a1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-i686/ja/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-i686/ja/firefox-85.0.1.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "0023494cb7a5485b1d492c2b9f1eb40a9fed06db0de6a2bcc76b54c4c8b44b5b"; + sha256 = "4df203562e717e738f00af034213e6e30f2969a63fa81c072c9997fd765b95dc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-i686/ka/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-i686/ka/firefox-85.0.1.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "a6489db173bbf47f76379afd09c75912d2bc4b8fdd8023d654df9d5f257378ed"; + sha256 = "f312d8e17f8ca7ef1641acb8be356f1dc7705373f93f58c7bf12f89864184b57"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-i686/kab/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-i686/kab/firefox-85.0.1.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "3b060b719b8bf0993786b05753467534e10986304b3251f572603be5aaeec2eb"; + sha256 = "9256a1473243411b86bbc2c0c241e0ab8755602a251dfb73243a6d26bf33d214"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-i686/kk/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-i686/kk/firefox-85.0.1.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "7c1139dad1b300c8450357356e6c317159b5d702db30747c1ff7aec31f33f82b"; + sha256 = "6a2cbf1777f61add117921e4c95e3300abdee1b2ff85d12912e858796ee8a468"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-i686/km/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-i686/km/firefox-85.0.1.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha256 = "f9dbec23d5110b389fea294cdecad03772f2471952e9ea01bc9d0462f7541ca5"; + sha256 = "3c6c9d7d635ba38c8fb31e760b1b0a2d41028be6462e9a0a6ef5648e237e8728"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-i686/kn/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-i686/kn/firefox-85.0.1.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha256 = "7521548f755d51ed47e9596d58223f699fd4494bd5af8fffc1c59018f20be8bc"; + sha256 = "dfc497b7c576734d0e5eef4ba71d2b83b10dabacb7b00d3ee379a0f362daeab1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-i686/ko/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-i686/ko/firefox-85.0.1.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "bed7a64af30ad21413516c201498fbc335125768ebea48cc895e724e6208d566"; + sha256 = "5f1bf45b3eaa39d01a96835d48eec83b41e64ea0a8a667e7b4446b02c1ec11d2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-i686/lij/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-i686/lij/firefox-85.0.1.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha256 = "426c432ae9727806af45667948a1f1aed7196a245441054da590931f98b5e96a"; + sha256 = "156d0d166dcaf8e711abe2bc6706a210e40ca52f84dbe309192f884bed4f57e6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-i686/lt/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-i686/lt/firefox-85.0.1.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "badafabd22ea7934cc2099677c9890cca609c56f3b16a863fa2c977f1e86a9c2"; + sha256 = "be07851e9501167e23170fdef7317239cf2b20e650fbd266cbf46d2758c7a108"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-i686/lv/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-i686/lv/firefox-85.0.1.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha256 = "7caf8f81efa55b69cd51fb5f75652c6d9aeacb2711d9bdbc29fa80dcfeda74df"; + sha256 = "107c4285a3972d7d6b52cec8e560ea43f2d383a5f072f5d6d7f4fcccde47771d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-i686/mk/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-i686/mk/firefox-85.0.1.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha256 = "ef22239e208acfc9b0a57dd06781c09dea1afd0303a091cf075c021a5c85003a"; + sha256 = "3b8f230ca42054fa478de727be855980d30fb7676a1d646a0e5768fa17c7b3f0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-i686/mr/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-i686/mr/firefox-85.0.1.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha256 = "99d2c32ea14feec74db39d1eabc0c914a8681bc216aa76cd970473fbc06e5dee"; + sha256 = "ff0fa9e3aba32036ac14a4b0ff286d4c56743b2053c38cfea1701dc33b038df6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-i686/ms/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-i686/ms/firefox-85.0.1.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "43011dbbc33615a67088619053a2579098e2afaed43b09268e5117290f100101"; + sha256 = "e87b449c93b85e02e2caedada6efcf15a424cc45addcb66cf6386c60f4a4ef17"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-i686/my/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-i686/my/firefox-85.0.1.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha256 = "d78bb48ec1b01787037d575da259b724db2bfffb0cad1700801ac7696eeacc55"; + sha256 = "52a3bf3baefaf1849fed451ee33e48af54e2f35d8a5269880fff37dfcef738fe"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-i686/nb-NO/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-i686/nb-NO/firefox-85.0.1.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "64f55d03bcdd9132b40cad1a5265cd81e2945022056141272dc0fca22aee2a71"; + sha256 = "595a6bd542be8d2af1bec356cee0de1fefaa8f5190ff3d026de3afea97efb70c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-i686/ne-NP/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-i686/ne-NP/firefox-85.0.1.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha256 = "b3d7c64b087ccd67b56dbb0f9554dd3db6481fd59ec7f46db1a03dfea129c372"; + sha256 = "517d36aece9e022c1c41cc528dcf0dac76c5be613d558f27de6aefe5d891b18f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-i686/nl/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-i686/nl/firefox-85.0.1.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "f2c83282acb30108f4bb381eecc30d61758d1e2279abfb772050b3ed8827b8fa"; + sha256 = "e355786c54fa0614580a45b027a2d23e34b91c08365c471d58aecfc87477ddf6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-i686/nn-NO/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-i686/nn-NO/firefox-85.0.1.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "534dbf0d58c85fe21ad9998a703ac4df5a0b7d124c80eaca0b72fe42b97628f4"; + sha256 = "ff4ec96c42a4d4446755defe19da5f9f39ed052323adc6b576b101b10fd4388a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-i686/oc/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-i686/oc/firefox-85.0.1.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha256 = "c3eaa5dbee8ee90d735c5e6db3c397011837385d4ac4d46ba3693d3aebd03e1f"; + sha256 = "54ca433f89e1815c1e5cc50c9e4a7f3c4b3c095e8408261f9eaf4e3c0c348aec"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-i686/pa-IN/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-i686/pa-IN/firefox-85.0.1.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "66c640b7bfb626b8d851af9f3170356adb3436fe1adbce76961df586fcdac051"; + sha256 = "ff0486665cf7645a36930e56f52dcb38457b361da7427572c57bc1a048e091f0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-i686/pl/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-i686/pl/firefox-85.0.1.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "64d5f25fc15cad09c103fd243d0767aa4d0a6e10940e9229e9fbf5e5354f14b3"; + sha256 = "3749820c56b131a923a5384afd81ac8ce342667a5db1d956b312db6fc03a0786"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-i686/pt-BR/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-i686/pt-BR/firefox-85.0.1.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "8cbd4c44af5da9fff2baedddfda640661dc3c3e0a2541985a12b0a42a76bbece"; + sha256 = "a95d7f4bda46d13d8f5d5907c53d29c8cbccb239ebbc9fac4309e4c981d4203f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-i686/pt-PT/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-i686/pt-PT/firefox-85.0.1.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "5fde2c95eafa41bd9c8da90fbc6408eee8fe8187d18ebc2b9e04a19e662eb7a8"; + sha256 = "b15eadb24566535692f9b46f6e9c757f0efd6caab3ac67ae45ed8784600bcc72"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-i686/rm/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-i686/rm/firefox-85.0.1.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "1f2b1d0c9695b7a8796670baefe35e95d91a4060137c01739e00033a2c50aae3"; + sha256 = "f3054641f0168651132e5fc0c4c65b6d5d3fb6c3550ccb2842629c1fe7f7876d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-i686/ro/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-i686/ro/firefox-85.0.1.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "77fad9b28166ba65d8514f76f43f4686345ac7ce7cd8e08bb5575da1b042bba4"; + sha256 = "46d4d15780be478f1bee7d621728643507e96fe8a78ac839d12a9dd146ea02b9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-i686/ru/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-i686/ru/firefox-85.0.1.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "58b4896bf014197734a9d8fcd03e526be422858aa0ac109282f0dcd543bb8697"; + sha256 = "fdc5baff45f39bd3322e849ec2d1124d3e1ea8a3b88717c3dad69983f0053337"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-i686/si/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-i686/si/firefox-85.0.1.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha256 = "8aee64af130801e33df0d2aa91ed0b1d1328e39963320a418fd04a3bb0a0ec89"; + sha256 = "2bd63e7dcfb62649bb083a6ebecb36cdad8bea8a11b6c6bc49eb41b3dd8aa1ee"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-i686/sk/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-i686/sk/firefox-85.0.1.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "2f7813dc98211b3cf8fd0d2d233e2c7dca7f94e85fb2a70df9c69aa6bd5add5e"; + sha256 = "d6e575e676b776fd7c60f9a0025318c6d41e7e525d064da04d25da565c680f36"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-i686/sl/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-i686/sl/firefox-85.0.1.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "75564047dfa2bc5e4c0dd1d1dd1f15e1c59e96c203470731db143ae424cd8c2f"; + sha256 = "db6d41f37fd8d1452f2a810cdab92a4abf276bb2b852ab016dc8a9cf9a42e134"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-i686/son/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-i686/son/firefox-85.0.1.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha256 = "3684681de408a4cd02fdb81c559bdb15252dc56c0376a94ee512d7cc49e67190"; + sha256 = "dbe54692404e9aa2478f4d89288a5e4aabe03289531f0c70e752dbe28f128ad0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-i686/sq/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-i686/sq/firefox-85.0.1.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "573e998a49756843d14f063d4e3aea23f7844076d8ed3b5a0409d0c3758d7a17"; + sha256 = "13770eaa25dc493b7f9ccd52d05682eb7fedaf6eb71511375bf38c7147d7238f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-i686/sr/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-i686/sr/firefox-85.0.1.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "9289ae5e5270553dfc11dd6a7b9db6e6afa106919daedf085494c96f79cd0c52"; + sha256 = "3b72e4c6464c3ad2b3e314c46220f86348f583b4c382ebb07772bad79e67619d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-i686/sv-SE/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-i686/sv-SE/firefox-85.0.1.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "4b97dd3f617774925a140edcde97b5e0864405401222f46bcc59d02537168ff9"; + sha256 = "849c3c8628741e1f96408828996aa463b7b8cdc0f7e60eee712404db0dc98037"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-i686/ta/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-i686/ta/firefox-85.0.1.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha256 = "80273dacecd26e0dbf1dcc39858f05c5ef0415972851166c0761f553e832e071"; + sha256 = "705bc6133fc936ed0057d61283783f7bcd1d4d08e8dabf2e25d3ec772d138fa3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-i686/te/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-i686/te/firefox-85.0.1.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha256 = "e074997f616b1b356f40dab47f25e13e8b9b143bfaf932a0a281eec8675b71dd"; + sha256 = "7bedf0917824342facd96e426db6dd387ce4b425ca7a5e9803c03c869082c648"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-i686/th/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-i686/th/firefox-85.0.1.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "e28ae199709c1ab1d580f8bd83b7ef8cf56750f17b4c30bcd188b088a61d8ba7"; + sha256 = "0767b03ead7c33c316923ab6a0978a7b970cfcd3afe8c46b6bb343d1df09cdc0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-i686/tl/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-i686/tl/firefox-85.0.1.tar.bz2"; locale = "tl"; arch = "linux-i686"; - sha256 = "c8b5161094d3fbed51d4dc033804ce5c2e77f9d96172076edced695ba76922c9"; + sha256 = "fd6f6432fb60ae420f29c7790d9e33782df353a353cdc8596492369156fa69ea"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-i686/tr/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-i686/tr/firefox-85.0.1.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "a5178b392fdf8b36292548c9a98e22b879eb19e0f6d237192b376b7df92ee219"; + sha256 = "69c56cab60cc5f309957eeb55fefea654dd67edebefa4aacf9742820e42e7ab0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-i686/trs/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-i686/trs/firefox-85.0.1.tar.bz2"; locale = "trs"; arch = "linux-i686"; - sha256 = "38554c05e9122c71ea0910892e6c455c4402ead97c6f00d309391544ca208697"; + sha256 = "945106e6e39f0b28f891606d9e991ad612f2712d2be04f1cb2aeee4739890289"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-i686/uk/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-i686/uk/firefox-85.0.1.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "d6b2fe56aae2b6f4543072f0968c357ab893d89b92ff6c053cc709df75a51aa8"; + sha256 = "757ce998065bfcacc90f7a7e24b4b558def38673c03e01607913d40bb773ea33"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-i686/ur/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-i686/ur/firefox-85.0.1.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha256 = "fcd15754df86493bc627e8fd65f0237a7a10e6e5e5843715bd31445e4b99f2dd"; + sha256 = "08c455a739c558b390001dfc955d7ace4ca0df484ed772816417393f9b01e296"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-i686/uz/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-i686/uz/firefox-85.0.1.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "2a9cfc082a01c6af057627f4d028b67e0f0b72f913994ac208cea6ccfcd7e41a"; + sha256 = "ecf118f83fe6139e547757da784f438a990118351bdbb3417488eaa848d24066"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-i686/vi/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-i686/vi/firefox-85.0.1.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "b32b7b8ff09a0642d4636a1d6477ba3b14c0a47ef93407078998818e7fc23145"; + sha256 = "ce5c52ff6a709ffa32a262ed2ba22d7120c153ec7d1d237ea4885b3c215be21a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-i686/xh/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-i686/xh/firefox-85.0.1.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha256 = "5a95cd2dbb58f739b58eb8ba5d829d1e7f4e7be405cc6659857432a5c10c8d21"; + sha256 = "abef46a099e046e675c79b8e131897fca57c083626cda2bc67aa242a1e8ecbba"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-i686/zh-CN/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-i686/zh-CN/firefox-85.0.1.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "e5f93c089a0de95e3e430ed7ad3b028ee7a427072ebb3a035451b5724ee248d7"; + sha256 = "81b604aa7d452f7b07a719bfbfc1a583df2f9121cb9215b6f5671555d080def4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/85.0/linux-i686/zh-TW/firefox-85.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0.1/linux-i686/zh-TW/firefox-85.0.1.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "348b26495fca92805814ee355962741154654d9babe5959ed4f41065123a50d2"; + sha256 = "2097306adf4e26a8ab039184b301a997d8ac1f19a494e2a9b9df5e1ec270fc14"; } ]; } diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix index c54d5338402..fb340ee1ace 100644 --- a/pkgs/applications/networking/browsers/firefox/common.nix +++ b/pkgs/applications/networking/browsers/firefox/common.nix @@ -8,7 +8,7 @@ , yasm, libGLU, libGL, sqlite, unzip, makeWrapper , hunspell, libXdamage, libevent, libstartup_notification , libvpx_1_8 -, icu67, libpng, jemalloc, glib +, icu67, libpng, jemalloc, glib, pciutils , autoconf213, which, gnused, rustPackages, rustPackages_1_45 , rust-cbindgen, nodejs, nasm, fetchpatch , gnum4 @@ -182,6 +182,8 @@ buildStdenv.mkDerivation ({ postPatch = '' rm -rf obj-x86_64-pc-linux-gnu + substituteInPlace toolkit/xre/glxtest.cpp \ + --replace 'dlopen("libpci.so' 'dlopen("${pciutils}/lib/libpci.so' '' + lib.optionalString (pipewireSupport && lib.versionOlder ffversion "83") '' # substitute the /usr/include/ lines for the libraries that pipewire provides. # The patch we pick from fedora only contains the generated moz.build files diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix index 53830b7d180..cc558e69bac 100644 --- a/pkgs/applications/networking/browsers/firefox/packages.nix +++ b/pkgs/applications/networking/browsers/firefox/packages.nix @@ -7,16 +7,16 @@ in rec { firefox = common rec { pname = "firefox"; - ffversion = "85.0"; + ffversion = "85.0.1"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz"; - sha512 = "17bx4782ix3nrjnc6y29bz86lkpc2fzapqraa67xi65m46qrn0cs9hwdjyl48rdc44j5972gilpmd217kfxf4wxrfc2vcxadgk75158"; + sha512 = "0i0x1jvwrjvbdz90dgmf7lw3qj56y37nf5h3qs55263d0jgvnkqfc5dgjfzrq51z5a546lmbs4p97qiaf2p3d5wiv3lx8cw43n74axd"; }; meta = { description = "A web browser built from Firefox source tree"; homepage = "http://www.mozilla.com/en-US/firefox/"; - maintainers = with lib.maintainers; [ eelco ]; + maintainers = with lib.maintainers; [ eelco lovesegfault ]; platforms = lib.platforms.unix; badPlatforms = lib.platforms.darwin; broken = stdenv.buildPlatform.is32bit; # since Firefox 60, build on 32-bit platforms fails with "out of memory". @@ -32,10 +32,10 @@ rec { firefox-esr-78 = common rec { pname = "firefox-esr"; - ffversion = "78.7.0esr"; + ffversion = "78.7.1esr"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz"; - sha512 = "0606prndxfv9nvrpcnagwky04j4jhn1139gr72a0rydfagznsaqwy13gpzdf58ifycdln63052kchlh2dslz5m8hifp215ydcppv8xg"; + sha512 = "138dcfpdkp78yqgygac212vg5fm5ich2a82p7258ch8hk6bpvpdxbws4sdqwljs92x831dblcsshwkl06vh48899489gx87mdkqd0nm"; }; meta = { diff --git a/pkgs/applications/networking/cluster/helm/default.nix b/pkgs/applications/networking/cluster/helm/default.nix index d823e38f3f2..5da9e9220a8 100644 --- a/pkgs/applications/networking/cluster/helm/default.nix +++ b/pkgs/applications/networking/cluster/helm/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "helm"; - version = "3.4.2"; + version = "3.5.2"; src = fetchFromGitHub { owner = "helm"; repo = "helm"; rev = "v${version}"; - sha256 = "17bb0f2w0qn6zq5isskckwqlscqig2d6pra3f7mfwilnckg1lj9s"; + sha256 = "sha256-XFWJtzKQrZL6lcr8JNiEQ8ldG5289x5pE21E8XgoYkA="; }; - vendorSha256 = "0ycp0i26rf3c96i4nqcbh7rb6i6lk62hljcsgsjyggq3pj3gpb4x"; + vendorSha256 = "sha256-mjWQxCCtTgj1VCFjnuJWgDjwMt/r4jiFC9Of+CXRgPg="; doCheck = false; diff --git a/pkgs/applications/networking/cluster/helmfile/default.nix b/pkgs/applications/networking/cluster/helmfile/default.nix index c45ff90c02d..72fcc2f9c35 100644 --- a/pkgs/applications/networking/cluster/helmfile/default.nix +++ b/pkgs/applications/networking/cluster/helmfile/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "helmfile"; - version = "0.138.2"; + version = "0.138.4"; src = fetchFromGitHub { owner = "roboll"; repo = "helmfile"; rev = "v${version}"; - sha256 = "sha256-hy673acO9/fJL/80VTnQS8t9jXb7y9KVSVa0Zmja4uk="; + sha256 = "sha256-Y0/0wC00s7QY7/B6igOoPKXv5TE2P8NoGd9UhfVmLOk="; }; - vendorSha256 = "sha256-BWWmdKrxay0Qy5z+UFFZ3we5C7wI1KUHv6qHF4TPzJE="; + vendorSha256 = "sha256-WlV6moJymQ7VyZXXuViCNN1WP4NzBUszavxpKjQR8to="; doCheck = false; diff --git a/pkgs/applications/networking/cluster/kube3d/default.nix b/pkgs/applications/networking/cluster/kube3d/default.nix index e55df3c4c30..d20da00f76a 100644 --- a/pkgs/applications/networking/cluster/kube3d/default.nix +++ b/pkgs/applications/networking/cluster/kube3d/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "kube3d"; - version = "4.1.0"; + version = "4.1.1"; excludedPackages = "tools"; @@ -10,7 +10,7 @@ buildGoModule rec { owner = "rancher"; repo = "k3d"; rev = "v${version}"; - sha256 = "sha256-hhgZpX6nM5viGW37gxejO1SRRlN9+m8F6j9EV9/6ApM="; + sha256 = "sha256-ZdPBlGlrgSJQlp6sWUeXm34+O30WtXHy5hvye40qew0="; }; vendorSha256 = null; diff --git a/pkgs/applications/networking/cluster/stern/default.nix b/pkgs/applications/networking/cluster/stern/default.nix index 29aa7d41f32..96264799344 100644 --- a/pkgs/applications/networking/cluster/stern/default.nix +++ b/pkgs/applications/networking/cluster/stern/default.nix @@ -4,16 +4,16 @@ let isCrossBuild = stdenv.hostPlatform != stdenv.buildPlatform; in buildGoModule rec { pname = "stern"; - version = "1.13.1"; + version = "1.14.0"; src = fetchFromGitHub { owner = "stern"; repo = "stern"; rev = "v${version}"; - sha256 = "0fj6a52wb0jv5bz2j2wq3ljnlxnsj9bg3kbzgkz0vh0b63zyn782"; + sha256 = "sha256-8l/Tr+IxR3yPmt9hI70XuUQ4YEYzRTMLbo8BsngoU60="; }; - vendorSha256 = "14nrdaaby74bjbk777hr82p0ybzk3spc59lbrjn9z0q3hc0p4vaf"; + vendorSha256 = "sha256-pvFT4A7bDBvBf1odyv3z4inw1/IsvOA+++OPbfNjzxM="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/applications/networking/cluster/terraform-providers/default.nix b/pkgs/applications/networking/cluster/terraform-providers/default.nix index 3570191fd84..cbabdcac72f 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/default.nix +++ b/pkgs/applications/networking/cluster/terraform-providers/default.nix @@ -63,7 +63,6 @@ let libvirt = callPackage ./libvirt {}; linuxbox = callPackage ./linuxbox {}; lxd = callPackage ./lxd {}; - shell = callPackage ./shell {}; vpsadmin = callPackage ./vpsadmin {}; vercel = callPackage ./vercel {}; }; diff --git a/pkgs/applications/networking/cluster/terraform-providers/lxd/default.nix b/pkgs/applications/networking/cluster/terraform-providers/lxd/default.nix index 23d41ce7f1f..ab3d07a7f47 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/lxd/default.nix +++ b/pkgs/applications/networking/cluster/terraform-providers/lxd/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "terraform-provider-lxd"; - version = "1.4.0"; + version = "1.5.0"; src = fetchFromGitHub { owner = "sl1pm4t"; repo = "terraform-provider-lxd"; rev = "v${version}"; - sha256 = "00gj7zj45wm9sf7a7nybjijdrdr00g2yf8h41c6j679a6nfnx0fd"; + sha256 = "sha256-ikI8LQ6qawdeUSb1Ee03H409DQw2M4QtsIxAESxXNRI="; }; - vendorSha256 = "0xq8zgx8h47pc88nkdvy5skpr8vk87b4212mm5msfxk8n7nl4fi2"; + vendorSha256 = "sha256-IjpC7bFodqdrqVUEQdZBc6N8py5+t2kRYvcQiPr7CHc="; doCheck = false; diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 76d36255c71..26304bf0374 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -865,6 +865,15 @@ "sha256": "1fs96qd2b4glk8hhn5m9r04ap679g0kf3nnhjx1a2idqwrv71gcl", "version": "3.3.0" }, + "shell": { + "owner": "scottwinkler", + "provider-source-address": "registry.terraform.io/scottwinkler/shell", + "repo": "terraform-provider-shell", + "rev": "v1.6.0", + "sha256": "0jxb30vw93ibnwz8nfqapac7p9r2famzvsf2h4nfbmhkm6mpan4l", + "vendorSha256": "1p2ja6cw3dl7mx41svri6frjpgb9pxsrl7sq0rk1d3sviw0f88sg", + "version": "1.6.0" + }, "signalfx": { "owner": "terraform-providers", "repo": "terraform-provider-signalfx", diff --git a/pkgs/applications/networking/cluster/terraform-providers/shell/default.nix b/pkgs/applications/networking/cluster/terraform-providers/shell/default.nix deleted file mode 100644 index f2e9b86a646..00000000000 --- a/pkgs/applications/networking/cluster/terraform-providers/shell/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ lib, fetchFromGitHub, buildGoModule }: -buildGoModule rec { - pname = "terraform-provider-shell"; - version = "1.6.0"; - - src = fetchFromGitHub { - owner = "scottwinkler"; - repo = pname; - rev = "v${version}"; - sha256 = "0jxb30vw93ibnwz8nfqapac7p9r2famzvsf2h4nfbmhkm6mpan4l"; - }; - - vendorSha256 = "1p2ja6cw3dl7mx41svri6frjpgb9pxsrl7sq0rk1d3sviw0f88sg"; - - doCheck = false; - - subPackages = [ "." ]; - - # Terraform allows checking the provider versions, but this breaks - # if the versions are not provided via file paths. - postInstall = "mv $out/bin/${pname}{,_v${version}}"; - - passthru.provider-source-address = "registry.terraform.io/scottwinkler/shell"; - - meta = with lib; { - inherit (src.meta) homepage; - description = "Terraform provider for executing shell commands and saving output to state file"; - changelog = "https://github.com/scottwinkler/terraform-provider-shell/releases/tag/v${version}"; - license = licenses.mpl20; - maintainers = with maintainers; [ mupdt ]; - }; -} diff --git a/pkgs/applications/networking/cluster/terragrunt/default.nix b/pkgs/applications/networking/cluster/terragrunt/default.nix index 95772e997e5..deead024b97 100644 --- a/pkgs/applications/networking/cluster/terragrunt/default.nix +++ b/pkgs/applications/networking/cluster/terragrunt/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "terragrunt"; - version = "0.28.1"; + version = "0.28.2"; src = fetchFromGitHub { owner = "gruntwork-io"; repo = pname; rev = "v${version}"; - sha256 = "sha256-uY0J/w7uIVMd+0N0IeWKWWzQENI6oaLCD4+YUz9BOVA="; + sha256 = "sha256-942PlEoR3ljHecg5RNqqq5cvVzfrIqIbSiV172STiGM="; }; vendorSha256 = "sha256-lRJerUYafpkXAGf8MEM8SeG3aB86mlMo7iLpeHFAnd4="; diff --git a/pkgs/applications/networking/cluster/tilt/default.nix b/pkgs/applications/networking/cluster/tilt/default.nix index a185c64646f..415a895e523 100644 --- a/pkgs/applications/networking/cluster/tilt/default.nix +++ b/pkgs/applications/networking/cluster/tilt/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { /* Do not use "dev" as a version. If you do, Tilt will consider itself running in development environment and try to serve assets from the source tree, which is not there once build completes. */ - version = "0.18.5"; + version = "0.18.8"; src = fetchFromGitHub { owner = "tilt-dev"; repo = pname; rev = "v${version}"; - sha256 = "0msfc2cgfq7dz02n2z898iw2bx98qsny3j4pzja767vcdpnzjmr5"; + sha256 = "sha256-ICJrY4XUrxVeZlMx69SB/ounfIwLFSguf9bhLOpYP3E="; }; vendorSha256 = null; diff --git a/pkgs/applications/networking/cluster/waypoint/default.nix b/pkgs/applications/networking/cluster/waypoint/default.nix index 32a4aa373a4..3d62a1dcf29 100644 --- a/pkgs/applications/networking/cluster/waypoint/default.nix +++ b/pkgs/applications/networking/cluster/waypoint/default.nix @@ -2,45 +2,43 @@ buildGoModule rec { pname = "waypoint"; - version = "0.2.0"; + version = "0.2.1"; src = fetchFromGitHub { owner = "hashicorp"; repo = pname; rev = "v${version}"; - sha256 = "sha256-iGR2N1ZYA5G9K2cpfrwWRhSEfehRshx157ot1yq15AY="; + sha256 = "sha256-bCvi5xIL6xAtQ9mgf4feh076sAmog/3eGBlgvcLXJyc="; }; deleteVendor = true; vendorSha256 = "sha256-ArebHOjP3zvpASVAoaPXpSbrG/jq+Jbx7+EaQ1uHSVY="; - subPackages = ["."]; - nativeBuildInputs = [ go-bindata ]; + # GIT_{COMMIT,DIRTY} filled in blank to prevent trying to run git and ending up blank anyway buildPhase = '' - CGO_ENABLED=0 go build -ldflags '-s -w -extldflags "-static"' -o ./internal/assets/ceb/ceb ./cmd/waypoint-entrypoint - cd internal/assets - go-bindata -pkg assets -o prod.go -tags assetsembedded ./ceb - cd ../../ - CGO_ENABLED=0 go build -ldflags '-s -w -X github.com/hashicorp/waypoint/version.GitDescribe=v${version}' -tags assetsembedded -o ./waypoint ./cmd/waypoint - CGO_ENABLED=0 go build -ldflags '-s -w' -tags assetsembedded -o ./waypoint-entrypoint ./cmd/waypoint-entrypoint + make bin GIT_DESCRIBE="v${version}" GIT_COMMIT="" GIT_DIRTY="" ''; installPhase = '' - mkdir -p $out/bin - mv waypoint{,-entrypoint} $out/bin/ + install -D waypoint $out/bin/waypoint ''; + dontPatchELF = true; + dontPatchShebangs = true; + meta = with lib; { + homepage = "https://waypointproject.io"; + changelog = "https://github.com/hashicorp/waypoint/blob/v${version}/CHANGELOG.md"; description = "A tool to build, deploy, and release any application on any platform"; longDescription = '' - Waypoint allows developers to define their application build, deploy, and release lifecycle as code, reducing the - time to deliver deployments through a consistent and repeatable workflow. + Waypoint allows developers to define their application build, deploy, and + release lifecycle as code, reducing the time to deliver deployments + through a consistent and repeatable workflow. ''; - homepage = "https://waypointproject.io"; - platforms = platforms.linux; license = licenses.mpl20; maintainers = with maintainers; [ winpat jk ]; + platforms = platforms.linux; }; } diff --git a/pkgs/applications/networking/instant-messengers/jitsi-meet-electron/default.nix b/pkgs/applications/networking/instant-messengers/jitsi-meet-electron/default.nix index 7cb614f1d41..feffbe312d5 100644 --- a/pkgs/applications/networking/instant-messengers/jitsi-meet-electron/default.nix +++ b/pkgs/applications/networking/instant-messengers/jitsi-meet-electron/default.nix @@ -2,19 +2,19 @@ , fetchurl , appimageTools , makeWrapper -, electron_9 +, electron_10 }: let - electron = electron_9; + electron = electron_10; in stdenv.mkDerivation rec { pname = "jitsi-meet-electron"; - version = "2.3.1"; + version = "2.4.2"; src = fetchurl { url = "https://github.com/jitsi/jitsi-meet-electron/releases/download/v${version}/jitsi-meet-x86_64.AppImage"; - sha256 = "0af87lvqw3sagi2cayripm62q17nfd841xz0ghvbixzfnqkvgf7x"; + sha256 = "1lv3ca9qlggyb8vcg8zlxv46i8fgx5qrx7i7y71dlqblajalf42p"; name = "${pname}-${version}.AppImage"; }; diff --git a/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix b/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix index 09452aa90b6..fe7a2e3ba0f 100644 --- a/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix +++ b/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix @@ -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.66.0.74"; + version = "8.68.0.100"; rpath = lib.makeLibraryPath [ alsaLib @@ -65,7 +65,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 = "11bpzr3j6fa5x62xrx2q2sr1wxjrn0a37053j4prxjcvdrc5in8f"; + sha256 = "gHjgQRdNABO+R+fcDurHDAQtZpckIxLbODM6Txz+LH4="; } else throw "Skype for linux is not supported on ${stdenv.hostPlatform.system}"; diff --git a/pkgs/applications/networking/instant-messengers/toxic/default.nix b/pkgs/applications/networking/instant-messengers/toxic/default.nix index e59e5864432..fc6c78a4f67 100644 --- a/pkgs/applications/networking/instant-messengers/toxic/default.nix +++ b/pkgs/applications/networking/instant-messengers/toxic/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "toxic"; - version = "0.10.0"; + version = "0.10.1"; src = fetchFromGitHub { owner = "Tox"; repo = "toxic"; rev = "v${version}"; - sha256 = "1v9cdpy6i3xl70g75zg33sqi4aqp20by0pyjhjg5iz24fxvfaw6c"; + sha256 = "sha256-EElDi/VEYgYPpoDNatxcKQC1pnCU8kOcj0bAFojD9fU="; }; makeFlags = [ "PREFIX=$(out)"]; diff --git a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix index fafda5577c2..c431b5d0ce6 100644 --- a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix +++ b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix @@ -31,11 +31,11 @@ assert pulseaudioSupport -> libpulseaudio != null; let - version = "5.5.6981.0202"; + version = "5.5.7011.0206"; srcs = { x86_64-linux = fetchurl { url = "https://zoom.us/client/${version}/zoom_x86_64.pkg.tar.xz"; - sha256 = "05alb81cn1vbpva5rcfwh58sjbg4f2pils4vcdgw6dvi4pbvs694"; + sha256 = "00ahly3kjjznn73vcxgm5wj2pxgw6wdk6vzgd8svfmnl5kqq6c02"; }; }; dontUnpack = true; diff --git a/pkgs/applications/networking/mailreaders/neomutt/default.nix b/pkgs/applications/networking/mailreaders/neomutt/default.nix index 104e0da9a81..c0ebb3d8078 100644 --- a/pkgs/applications/networking/mailreaders/neomutt/default.nix +++ b/pkgs/applications/networking/mailreaders/neomutt/default.nix @@ -6,14 +6,14 @@ }: stdenv.mkDerivation rec { - version = "20201127"; + version = "20210205"; pname = "neomutt"; src = fetchFromGitHub { owner = "neomutt"; repo = "neomutt"; rev = version; - sha256 = "sha256-BkDGKZmpwahDw1vD67CyWfxD93H83kcpv5JBGVL5F/o="; + sha256 = "sha256-ADg/+gmndOiuQHsncOzS5K4chthXeUFz6RRJsrZNeZY="; }; buildInputs = [ diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix index f78c4457b89..e86e847e8f3 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix @@ -1,665 +1,665 @@ { - version = "78.7.0"; + version = "78.7.1"; sources = [ - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-x86_64/af/thunderbird-78.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-x86_64/af/thunderbird-78.7.1.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "2e5741f536243b84f6014c33b44900a01dcbe8c42e17f3d6acb62a2441708c69"; + sha256 = "b9d7bacd982db97e531775ceca569e011603dbd2806a64bce43ef2ff30e6c8f4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-x86_64/ar/thunderbird-78.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-x86_64/ar/thunderbird-78.7.1.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "bb2126528e1aa170fd0b59914fbcb3df3eba57aa83c995284ceadb40b24e65be"; + sha256 = "144647297e15556de5273e4f41712fc348b3dd401d71356d556c1ed09221037d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-x86_64/ast/thunderbird-78.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-x86_64/ast/thunderbird-78.7.1.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "93b59d8d66b2d87076f680fd6e284f7f424a7925d82e3fa6e394388278a89a4a"; + sha256 = "9adb0d16ab633e4ffa3628969ccb542488fc299da5250c058828144f6f773781"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-x86_64/be/thunderbird-78.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-x86_64/be/thunderbird-78.7.1.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "92dd5f24667a1886ab321df2148096ab7530c6fb8306d6d21e158c72dbcd8611"; + sha256 = "3e54fa9ca34bcc11d411a979ed6bcd0a68b67da08cdba49e1f8a59794bc2dff0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-x86_64/bg/thunderbird-78.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-x86_64/bg/thunderbird-78.7.1.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "03444b4e10bbad0fec4928564d39b30f9e9ff8705adcc20706959eee357ee45c"; + sha256 = "d576d3193c8e263d44942043b7e13c8861b2234ebb66969ac2cd20f84d6d769f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-x86_64/br/thunderbird-78.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-x86_64/br/thunderbird-78.7.1.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "088b6b2456f475c76527122d503f2d91c274e88cafa9a052029f2f4e00a0609d"; + sha256 = "cd85058134a3b1364049d11a32bd964f8f9488fb48ece65d32fbb9005831b1d4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-x86_64/ca/thunderbird-78.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-x86_64/ca/thunderbird-78.7.1.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "4be51f350929a907aa20a036c7ea7232d14874ff29c622cb4a6c917634a79019"; + sha256 = "5bf9ac27b8401f7c1479cacddc48e6310e6ac52e038f824193788dd6883512a6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-x86_64/cak/thunderbird-78.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-x86_64/cak/thunderbird-78.7.1.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "f50880a17573b1eb2bee79c2768eb04eaf2b715b7fbeb134e08634dac3ea7e22"; + sha256 = "dfa2f97ee07f80adc5ded391bf01aea36e2aaf5a12ca9a510c5842756d9b9f8e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-x86_64/cs/thunderbird-78.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-x86_64/cs/thunderbird-78.7.1.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "e1971a4e5f91a7d6de06fd2121e7cc0169d5c8ec04418540a840c887b5c1a560"; + sha256 = "c76d755c9b54921a4edc9521aea2c51aa6301d954154fa6228195193000be56f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-x86_64/cy/thunderbird-78.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-x86_64/cy/thunderbird-78.7.1.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "20f7086783ce5ed7bafa9875555008e62e146b080fe6eb1ad3ddf2e5fee9f0c1"; + sha256 = "09475639dec1e370360c1c257b88ab45fbf2251bd22d1d50e9df078b035b8560"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-x86_64/da/thunderbird-78.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-x86_64/da/thunderbird-78.7.1.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "8ea77a13dd99252ada9a02115457ffd8a73e7422bd633d1f8dff835fef1daedf"; + sha256 = "74cc98d1d99e9fd101e86051cf9aee26b40cfcb6203892adf6fd45fad5934926"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-x86_64/de/thunderbird-78.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-x86_64/de/thunderbird-78.7.1.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "9ba270c4013c0bee106ea45fc46b79f066daa1e1b90a03000ec93a54c80f65b6"; + sha256 = "509648ba2c7d9ef4db1755ae5e017d3dc1c73c5a3a94a293bbc9a505b5349e2a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-x86_64/dsb/thunderbird-78.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-x86_64/dsb/thunderbird-78.7.1.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "1e4394e4ecd44714abc0756054e751daeee4b2f485bcd3fa2db697dceb756c37"; + sha256 = "03dff2bbcb39d967c96934675134acd3ec74b39df3b6cc76846229ff92653483"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-x86_64/el/thunderbird-78.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-x86_64/el/thunderbird-78.7.1.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "543d9343785f655caa637a2bdbf56a814b280efe206ef5868c855f2b397e0e88"; + sha256 = "d6ec9ccdd2945d6de1718f32b551e922da1808d59acec937a16addaa0004e94a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-x86_64/en-CA/thunderbird-78.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-x86_64/en-CA/thunderbird-78.7.1.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "76e414cf62428874d4e9633fa6ae166ea16f6d295a4ddb4240c5f310557ec928"; + sha256 = "bc97cadcf95bd0273708e1ea5cc8cdddd29f11b280213c1bd4f35a50d446763e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-x86_64/en-GB/thunderbird-78.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-x86_64/en-GB/thunderbird-78.7.1.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "cfbd194b58349fbd5d8dc0ccaeb36ea0fe21b28bf25f176ba8d12bb79ff25501"; + sha256 = "82fd7e16cc8d5df4e775187d7f3e32b9b1dab3647cd766cec1649c39d08d5165"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-x86_64/en-US/thunderbird-78.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-x86_64/en-US/thunderbird-78.7.1.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "2e0501823951e4f5239b4c75a05f1d9d882d600a0080fd5cc7bc792990357b2f"; + sha256 = "463c1164b80f0f8bcb72f04fb0c17e32a637df988c0ea14d90469b1d7a958f82"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-x86_64/es-AR/thunderbird-78.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-x86_64/es-AR/thunderbird-78.7.1.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "37c8d43b674558fa7e8bfe9b276762562e9132daf377727ac77cd2869c16a628"; + sha256 = "1ce69e73e8326e316d056a98efe601e7300714f1b65f69e2fcd175123fdca96b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-x86_64/es-ES/thunderbird-78.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-x86_64/es-ES/thunderbird-78.7.1.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "b79324ecdf228b24c7c51a1dc9129c39518d6a19c7a083364639bab16cc52214"; + sha256 = "a04161f56944527f8537d46e046fbed715a554e4dc581aa636f1cec3fb1e1351"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-x86_64/et/thunderbird-78.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-x86_64/et/thunderbird-78.7.1.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "35c30673d027bfc465bb1ff9b5fa2f52487472ef870e6a8c08e0ec2d0ceacae2"; + sha256 = "36c2e7ae029b65976b92cff62c3c3a97e8c44a73c2f5e48415260b23a23ff653"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-x86_64/eu/thunderbird-78.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-x86_64/eu/thunderbird-78.7.1.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "3af23e4364bb5a44f38a8931da270269780c0d8d0a115f77d16a15ff84f4c2bb"; + sha256 = "538a42bb6eb11360fa70bd06058dbd47f2a3eec53fbbfe0232ddfbbeb4a4187c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-x86_64/fa/thunderbird-78.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-x86_64/fa/thunderbird-78.7.1.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha256 = "596877606b66903812ca456332aeb0c80d365255d99c6adc51d8606a5a80e024"; + sha256 = "6e2b18166237fdf0d020570957ee7d0815d846a0aca8df2036cdf99e651cfce9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-x86_64/fi/thunderbird-78.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-x86_64/fi/thunderbird-78.7.1.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "e9fa8440743a8ff0ba6963e1d595e959791ad814bc3c239f63478ef1fe2fe05c"; + sha256 = "1769213bf789a21572014d4d97c823db14e11f7a32b91d57d98bebe39a80786d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-x86_64/fr/thunderbird-78.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-x86_64/fr/thunderbird-78.7.1.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "5b41d9065654f248b3765c79872d6ab9f4333515f36d6bdd8306e73502100f54"; + sha256 = "60017c2151aed3782567d9c10817e89c738d6bce322fd33f1188bc25dc12ac3f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-x86_64/fy-NL/thunderbird-78.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-x86_64/fy-NL/thunderbird-78.7.1.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "f607c83d05d40ba9bb596819a86cc1c15fedc55ff47916f83650ef8f6e37251c"; + sha256 = "3878ce39135e30a76c67182765f5fa7fc38b7019021aa86f0806028f67a7dfd5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-x86_64/ga-IE/thunderbird-78.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-x86_64/ga-IE/thunderbird-78.7.1.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "b1a244481eef2a8a7796fb17ec6283ab44bce5ec04063a8b84a5fffef8ea70d0"; + sha256 = "b2e66dd3fe5a78d2eb6691bc91521b3f22fbb5be88c556e2d5158057db0d6cfd"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-x86_64/gd/thunderbird-78.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-x86_64/gd/thunderbird-78.7.1.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "bf30f3825599bc0168fe533a50481f779acd57432188fd0b90c98fa50ad23eb6"; + sha256 = "c4722ceb4eca2afaa3502f2bc419b0ffc6cd2600100c5a91bf2cb7cdda60cd66"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-x86_64/gl/thunderbird-78.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-x86_64/gl/thunderbird-78.7.1.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "3184484adade8ee8fd57570103fd3dce2f2ac582e9f4fb5bfc884fd3f0fa6630"; + sha256 = "0f34fd28523062c90c521b40b0a67ad23e3b2ba05fe5c03cc1da29d480fde1e3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-x86_64/he/thunderbird-78.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-x86_64/he/thunderbird-78.7.1.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "e34713989d1b98d55ea852f23e49353779be449142bdfa5098d68d076d6a9f69"; + sha256 = "8cf8a0b5e1bd3ed116ac1dcbcb1857db9ccff8452ff0d1f3ac2957cada5883c8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-x86_64/hr/thunderbird-78.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-x86_64/hr/thunderbird-78.7.1.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "a1833d7bbd438319f4dc37378c1dce49243f148db7f58f8063346bf9a5725653"; + sha256 = "827d0c46d404d871661af45d301645a1c888941741c1b6cad27c7c37aed52800"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-x86_64/hsb/thunderbird-78.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-x86_64/hsb/thunderbird-78.7.1.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "359117a30c63a85b9d41f0369bb448ba470edd41f705070d9f7b4a805f89cf65"; + sha256 = "83e965004f0293c324393914cc931ccfa608360982d338859da1e7e2ae0f333f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-x86_64/hu/thunderbird-78.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-x86_64/hu/thunderbird-78.7.1.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "4d51554390fdab6caa01993697b1490d69504556207e9202d6e59614256dc941"; + sha256 = "120ca3f7b356c57d7fa2af63ebcb974ad0ba313fe9c615afa5553b2e7ab75e62"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-x86_64/hy-AM/thunderbird-78.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-x86_64/hy-AM/thunderbird-78.7.1.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "a838b6bfefa9c2852e4316f3665c37c1fcad8e8400fcf8fff769f1e44b4004eb"; + sha256 = "7d0c2c5854f0a5a2288cacb6bf0d2f8ecd838dffcc8ccd040f993af94cb92d13"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-x86_64/id/thunderbird-78.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-x86_64/id/thunderbird-78.7.1.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "b293c67ff239ac6632d9c914ba8c9f6a161c1400bf3dca3295683632d2e4e64b"; + sha256 = "29462ae0dd0eaa8ac9370b8fc46ad8ad679ef44996a7f80468890b8a75ce4a29"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-x86_64/is/thunderbird-78.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-x86_64/is/thunderbird-78.7.1.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "f5cce0c2dcaef81da19a2eaf3e294e9c72153d25be48d382ecd06aca430c76c8"; + sha256 = "084aee31331bb0bbdf466d3c3a6bb1834dfbdddaefe0e8c6e1d4a91eec0725ca"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-x86_64/it/thunderbird-78.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-x86_64/it/thunderbird-78.7.1.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "1ab3587a7ba49e479588fba735571f458f378f4845a686a22bcd6e2483bbc3d7"; + sha256 = "f180ceb0cd9f2e1d3e975f30fffa968e938b18ebb3c45108b6758d36989918e6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-x86_64/ja/thunderbird-78.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-x86_64/ja/thunderbird-78.7.1.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "9ce1c13c539e3e11203ad35ef1f70e71204ceaf548279ac1dd8f39ee07f92013"; + sha256 = "662f124e3a32ab9e6b6fbefed9b58779060d927558bbc9527d83936191e3e044"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-x86_64/ka/thunderbird-78.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-x86_64/ka/thunderbird-78.7.1.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "5174664bb0cd1dcbdc845664ba41c89ea0ae3bbd4c755219e709f1be76d99ef7"; + sha256 = "2faece980493b0071e5d62a579f4e1c4d792a63293949d81fa96e70468044acc"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-x86_64/kab/thunderbird-78.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-x86_64/kab/thunderbird-78.7.1.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "de5fc0cbc657d07138f8ba744903909133fe4cfeb5436c13a5c669573b4b5170"; + sha256 = "7382fc4e006bcb05c0db2dc88f8aad32a3abbce2bcb32f28d6271658caf934b8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-x86_64/kk/thunderbird-78.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-x86_64/kk/thunderbird-78.7.1.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "abbb0e5474a369c230a4faf386dbf6d663020ffbaa0bd75e69305e539006d6f4"; + sha256 = "c8c52e06cd3ac3a02dc0081a82b25223a1da5a918335f770660122c8a6ba750c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-x86_64/ko/thunderbird-78.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-x86_64/ko/thunderbird-78.7.1.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "7b66371753ced2b07d136c67c3fc91a562a3fcee6b377fe1d35c550126358b91"; + sha256 = "67928b2f6861b1071ff76c457f6aef4a9eb0d80f896331bdb847543c62b0dd11"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-x86_64/lt/thunderbird-78.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-x86_64/lt/thunderbird-78.7.1.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "99811e5ecd83d827a3fbbe20666da7ea307e105fdf1090f0f61e3853a51bb53f"; + sha256 = "aec1acfb847cea57772197d81d122e97915b03358c984293d40f6ce759b9e77a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-x86_64/ms/thunderbird-78.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-x86_64/ms/thunderbird-78.7.1.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "d2c11fb20170d2c9eec6b780532ac9aa4e7d8d705802e2b68a8d7c07d3d1e120"; + sha256 = "9a4411e932789040abc939a64b9ad979104ffe868a969dabc27022dc9ff822fd"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-x86_64/nb-NO/thunderbird-78.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-x86_64/nb-NO/thunderbird-78.7.1.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "19fb8d0d0f8d80c4ed9c45c861c98c862ae880bcefb365c86fc5bcea1ef19d8c"; + sha256 = "c7cfcd78108d931c60e9a061ed459da9df0cee27b16085fd1c6f3d71d54cd2fd"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-x86_64/nl/thunderbird-78.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-x86_64/nl/thunderbird-78.7.1.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "42855c4f257cad05b6f9c6c7c48ee9cf02a9159e5dd05619f3af4b473574bd87"; + sha256 = "44e9a143f00636a9287b2f0774720fd372de25fff9de8ceb468bc81de1d7ade3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-x86_64/nn-NO/thunderbird-78.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-x86_64/nn-NO/thunderbird-78.7.1.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "c16c892b9a515700e328f01f5a92b7c4af199ae29a7c610d4795140c70bb83e5"; + sha256 = "75269ac3171d14ca6145c3d00ba004489f89fc9210cf3af0d4e0248e24dac273"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-x86_64/pa-IN/thunderbird-78.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-x86_64/pa-IN/thunderbird-78.7.1.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "74c8bbf72b304d81d14fe9c1342c7b8bf17eb42dae52bb3b9ee043f0bdec94ec"; + sha256 = "ef98d53446ad294eaa861919cc8e9e70f4f6458d3a4210a43ec37bd919db8aa7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-x86_64/pl/thunderbird-78.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-x86_64/pl/thunderbird-78.7.1.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "cadf3756acf8cbae0c2778edda4656589eb3d339a80736a9223c6add5c6fa99c"; + sha256 = "682c6b2a5e808e65e1e233fb48bbd68058a7f2745648d01d6342c90316b8135c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-x86_64/pt-BR/thunderbird-78.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-x86_64/pt-BR/thunderbird-78.7.1.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "1fe1f6edbd9d38a9db30720413c48ef91e4be77b1c218fddcb3db1fb98017971"; + sha256 = "761988b180f3077cd9710324fd87ec577de5f5ee11c79404b416c64ba322c65a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-x86_64/pt-PT/thunderbird-78.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-x86_64/pt-PT/thunderbird-78.7.1.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "ae5be903d29582feab6402b12034a01bbf338602a8739a1cad9d5d9806e4ed1c"; + sha256 = "9182a7064d0f98a49b34b9bf78ae4d63fe6b588c51ceb48ffe0974455e767867"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-x86_64/rm/thunderbird-78.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-x86_64/rm/thunderbird-78.7.1.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "cfc9dba2b3977ac5721559746a1a1e071ff24116db5c52039ce9b40631e43619"; + sha256 = "33a8bec5ee7240fb44e350139f60e1d7c92361020bba2857634af03e40ee0f87"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-x86_64/ro/thunderbird-78.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-x86_64/ro/thunderbird-78.7.1.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "97bdb9a195a3b8a74d82dd373cd5b25ffb1d61178a9f2b0a3610341e9a207158"; + sha256 = "a50168d1b5e62d7bec9d75714612614b9d2342fdc6b8f89959d50d1505cbf7d0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-x86_64/ru/thunderbird-78.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-x86_64/ru/thunderbird-78.7.1.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "c16b656259451be87d5e86795bf2ee14322743046a0b6f3542369337494abc90"; + sha256 = "555e630090fbc41711e88d0a8e822febf0619333c2bcace5bdfbfdfdddfbb0dd"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-x86_64/si/thunderbird-78.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-x86_64/si/thunderbird-78.7.1.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha256 = "34596141553b28a72b743cc7f80edb06549a71816f8caa4c7f9b20148a523fcc"; + sha256 = "f977bd3fb4caaefb03eb8c967ae4850c0b7b2b8dfa0f7d7cedfba0847788cdb3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-x86_64/sk/thunderbird-78.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-x86_64/sk/thunderbird-78.7.1.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "71ec684701c5d42521e5e1f39601f0cbf8b9c082555dd593695288f327c1a44e"; + sha256 = "f1e5c9787a2ae8f8aaceef1ca2963884031a6cb8dc0ab3c3230fa0021156cfc4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-x86_64/sl/thunderbird-78.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-x86_64/sl/thunderbird-78.7.1.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "9c4de92259c02966d8970fa7792d6a1d279d2021ecf78e4cdb5e992f4eae5e8d"; + sha256 = "59a97046285bca3e5b8ba396d3afef69fe2cb5a41347e4e0a21e9ff66c03ae12"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-x86_64/sq/thunderbird-78.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-x86_64/sq/thunderbird-78.7.1.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "e05525980dba6605f4e722a42aa074a014c7a5786d261b3fa6f10570cfd952da"; + sha256 = "ed0cf7d341d42dedeaa224f7f1f8e005172134da591f65664a4aca717e6db44a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-x86_64/sr/thunderbird-78.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-x86_64/sr/thunderbird-78.7.1.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "e05a147164785faa39ca35728cbc8f5e769267a546bb22cade4411e3cc34cc22"; + sha256 = "fd61b2e8e048f162e59a1a428100e6d0556d7120de1f8b46decdfe60509de0d7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-x86_64/sv-SE/thunderbird-78.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-x86_64/sv-SE/thunderbird-78.7.1.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "f1349dce69bc95329b7558cd7b87109ccbf201bb6f42040c1b1a034d48d7d62a"; + sha256 = "87afa3b4b12848de156ea61d1727dea1ef5b86bc83b583df55f089bd1d1bec1e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-x86_64/th/thunderbird-78.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-x86_64/th/thunderbird-78.7.1.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "e30b19275cfe460ebdf47c1c9bf8f97342568041ed16e925ddda334532ad1453"; + sha256 = "0e9b959424106680bced6d924c184d1306f7f1fd34fb4d3e4d8a54cb191500bd"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-x86_64/tr/thunderbird-78.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-x86_64/tr/thunderbird-78.7.1.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "13d3264c891b198e4030334ee771919c8fa45ca4cee4a9c30e6776e258a15ed1"; + sha256 = "f2d037cea39d2698e71a0885587302644450149434ac7c3234c7ae32c5f4d103"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-x86_64/uk/thunderbird-78.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-x86_64/uk/thunderbird-78.7.1.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "f3a3c098c71c7632c36da1e1f401db5dcb5fefe8c4658d2e221d429be4d0867d"; + sha256 = "663aa8509cc75c074697509981bf54ab00eeddc50c53acc0221225c3d7c63f9f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-x86_64/uz/thunderbird-78.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-x86_64/uz/thunderbird-78.7.1.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "8c4a4e904eb4ddc131dbec594ccc9e4faef209f746d999c08618ad9757ec300b"; + sha256 = "892209fbe5d48532710feab4ad8f38f9387e10b088d91a12c9778bc465af194c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-x86_64/vi/thunderbird-78.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-x86_64/vi/thunderbird-78.7.1.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "bad2147d54293ce4b245df01d47ab2555811292ec117a1b74e49aece0a5aa625"; + sha256 = "a66d1d470f4a76cfa8b31fa3d60acb91cc7657455f9aebf930e127c2acbf4c8f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-x86_64/zh-CN/thunderbird-78.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-x86_64/zh-CN/thunderbird-78.7.1.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "000a1143b3f7c09717610459549305c99cedd4a4fc35d1b0bb276ae72b83c44e"; + sha256 = "10830b4a84ca22c19ee329cb00b92816e9b74f99c99a1ba6cfc86171470d655d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-x86_64/zh-TW/thunderbird-78.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-x86_64/zh-TW/thunderbird-78.7.1.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "bae5923d844f137e38b46519420a6e765fa5457733a60ffa6bda70185993e575"; + sha256 = "b88200643a70ba3391cfd3be6cbc7bb178c6170f26041d4153021736d03365f0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-i686/af/thunderbird-78.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-i686/af/thunderbird-78.7.1.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "94e7737e9e06d84b336b5f69ff3a69220ff6ef12588857b8b8e4596f5f5ca7f3"; + sha256 = "e78e2ef7411b3e6c0f2ed5c0729dfdc144f94e8575f2f30ae1cbaeb7c73188dc"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-i686/ar/thunderbird-78.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-i686/ar/thunderbird-78.7.1.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "2843aa9cbc0f102aae2abb192590445240568e94e35f4ed558fac446895c9daa"; + sha256 = "42c3f3b177a50afd6640db6815e7c159048cebb6dd5613c2fdf9ef18871d40cf"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-i686/ast/thunderbird-78.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-i686/ast/thunderbird-78.7.1.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "01130d2e0bba48de5c9cdb3c0c83081e29ce8964218ab1e7f9d03b61facfb513"; + sha256 = "b8fb786756051169d96a4fecf05cdabf4becc8fbcabd56ba676e96286a80b9d2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-i686/be/thunderbird-78.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-i686/be/thunderbird-78.7.1.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "d8377688f8760afdea0ff93b37267b117090c311e0636aefe1185ab2ed0e0a05"; + sha256 = "4e3f8f26b1321d130fb16b5eb30c3b3c3a7863e6d43ee9604f1a6da97228c85f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-i686/bg/thunderbird-78.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-i686/bg/thunderbird-78.7.1.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "2eca1032ae4bc73967fab319681a5123ae2681a0128de6efd0d7a58aa97986b3"; + sha256 = "0385b615dfb21f33b3e84b6c9213d3d8980379bb4be07967f5309888078ac177"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-i686/br/thunderbird-78.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-i686/br/thunderbird-78.7.1.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "3c5b9e1a96be9f706f458480badcd4efb324d59c2e1227c31720c98eef19dac0"; + sha256 = "e338d6b439577af562c4dbcd2951176d2c6cf87254203e6d20602de4563484c0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-i686/ca/thunderbird-78.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-i686/ca/thunderbird-78.7.1.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "c31b3d7936726295e2e66a25b554af25fef04d76eeca0f0b2744dc6b38eb25d0"; + sha256 = "71f1b5f1b35a9c5712ba6cedbf3de96f4a3814655c44ed1cda48d4e5a56c3e03"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-i686/cak/thunderbird-78.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-i686/cak/thunderbird-78.7.1.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "8abbf5f08d4b9e606090a976bfc9e5cad794259cf2461c2a4edd028c783440e8"; + sha256 = "0f616eb61c0de3e38d2092ae215613ba104be279027259def8bca4082bd74cd3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-i686/cs/thunderbird-78.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-i686/cs/thunderbird-78.7.1.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "63a6a2e0eab7f7ab0522d36369b4cd696af3b24e9a00977bf3ba1ae440ec077c"; + sha256 = "8de26b3daa7b087fb94a349e909da703867665fb2b4add360584c8d61f0c84ee"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-i686/cy/thunderbird-78.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-i686/cy/thunderbird-78.7.1.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "5415f68080e95b331146a53d00b312882a8c0b904c91509785bf79139a1accd6"; + sha256 = "74e28fb04e08bcfd68215eec443fde725077850e412798c1f0870e776ecbeeb1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-i686/da/thunderbird-78.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-i686/da/thunderbird-78.7.1.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "a43d6445cb39506a898e96432d1730b780bc745344011d230771e4592e34b49d"; + sha256 = "d50f37a31e4e5805084fa14bf639057b543deac99738871c402ad9af9684ce20"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-i686/de/thunderbird-78.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-i686/de/thunderbird-78.7.1.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "b14360cbc698e636b56150bdf3ffd145d3bbb43c9f342eb56d74dca82674c25e"; + sha256 = "7aa84ada2e6cb6b467a618b234a7cd0370f5d71fd1eb0f5da1addb6478665ad3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-i686/dsb/thunderbird-78.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-i686/dsb/thunderbird-78.7.1.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "dc83ee5540b4254cd01f67f72adad857774f23769748550fcf46e7f066a672a3"; + sha256 = "e273b80d5039097a34e7e2c96f65aca112e68d72a82782e783ea9412e49ab21f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-i686/el/thunderbird-78.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-i686/el/thunderbird-78.7.1.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "5ca65866f1440ba2161d08005d3229e5f08c9a5696db51f633a8154c93d0ce97"; + sha256 = "f31dfc543cca8d8f3c6e1cc40f8a07ead7b231222c8e04e5e2202c315c4708d8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-i686/en-CA/thunderbird-78.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-i686/en-CA/thunderbird-78.7.1.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "35afceb267f29985ea068afb0358e3e73d120c7f63162ddd22854b1179a2c409"; + sha256 = "534f8008886a3028c09afb1c030923359f8ee0c85c6e961faa4c974b6c2c30da"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-i686/en-GB/thunderbird-78.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-i686/en-GB/thunderbird-78.7.1.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "6f2cb3fe2d4223809ec7e842746bb6453ec741df59fcf63898af9e4c579158c9"; + sha256 = "c9c138e5d92847c0c0ec82d1799fddf1267b95a5f6ef2cae7820f560aff53732"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-i686/en-US/thunderbird-78.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-i686/en-US/thunderbird-78.7.1.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "dc1dae45f45246c95861ef7a50c2acfd7ad343eb0bf39049094dd999e18338ee"; + sha256 = "6ec06f3a432301745ed24607b0549602ae31bf6e051ca9a4079f4cd6caf2041f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-i686/es-AR/thunderbird-78.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-i686/es-AR/thunderbird-78.7.1.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "1d25b980227c60cff9db1c052167c82c06f853b0ebafb5144e53a1be6fbf4b49"; + sha256 = "8debebc56ee0fbcbf2507f98f28f7807b55d4d768bd40c7820aa9e4f7dc9f0ad"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-i686/es-ES/thunderbird-78.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-i686/es-ES/thunderbird-78.7.1.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "c34971c9a52bb6174254d4bbb67b682e862187b008bd0fa3c07d3d6955da6f6d"; + sha256 = "58ac431d1b48a1c8224e414577a7405f20336cd990f6e4d8399e304cc5f38a3f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-i686/et/thunderbird-78.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-i686/et/thunderbird-78.7.1.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "da6305745f73ea4469d308c6ada3749b8c09852e57e9af6d00fe470e40092cf2"; + sha256 = "a80917893c189acbd745e56820b7f4fce1ebf14e99be8700db75817ffa3eccf5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-i686/eu/thunderbird-78.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-i686/eu/thunderbird-78.7.1.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "406bb8b9a7c5eace3b84ed29e16dee077ee2e4f1b8ddd49afc9291e368b44ce0"; + sha256 = "f305db54f9cc504777ee9d329ca1da97a8642f7505903b2744cb7d86382b0ccf"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-i686/fa/thunderbird-78.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-i686/fa/thunderbird-78.7.1.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha256 = "4756eca3217756d540bf4e904bcda9f7259b65ae2062b493a8f05122a730130c"; + sha256 = "0a90e573bf94097f790dec0ef2771266bf115c0c4768c3952758f8c17f7cfb70"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-i686/fi/thunderbird-78.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-i686/fi/thunderbird-78.7.1.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "dbe77298a712a0a64a16fcf618b1e3fb21d1afbea8f7b93a9e6d7e43edbede6a"; + sha256 = "264104b86cd034927586520b6c4df25b1c75da4d97ea18bffd74261e553b4eb5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-i686/fr/thunderbird-78.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-i686/fr/thunderbird-78.7.1.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "71ce692f4f46e8afe488581670c186c20eccb5bf78306452fd7b82964f6d1087"; + sha256 = "2cbca14d94252f24dd50c971fd5ad367b4b3c0d3ccfd2d9ce8b18cb1df62a82c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-i686/fy-NL/thunderbird-78.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-i686/fy-NL/thunderbird-78.7.1.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "2f62f25c74e382cec5a9cccc24429cff5a5c36ab3810b5b43f194beb0a5b7a3a"; + sha256 = "d60c543f59ebdb539b9d3799d77f4ad1d05738cc5d1b78d016a7d2f036d72095"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-i686/ga-IE/thunderbird-78.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-i686/ga-IE/thunderbird-78.7.1.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "4da8e456e0e1f115e4018275c041fa345c02b635fd20ec0b3a5b3d1975dde52f"; + sha256 = "2d0a19e3a702a72866af8c8e9aac64e9c41b3b1bc44de53ec42b56efd657cd63"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-i686/gd/thunderbird-78.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-i686/gd/thunderbird-78.7.1.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "8517486ccdf76ac04b8e8c4df11e5bfd79375a8023efb63476232d985b47a8ca"; + sha256 = "93eaaf7d5c6cdf1947e25fbd053185f09f60329ba729a53f12d272f24dca6bf7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-i686/gl/thunderbird-78.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-i686/gl/thunderbird-78.7.1.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "928f1721f4ca40f154041bc4ed4aa7b06e3508eba45c7f6ee889fb4e698fb6a6"; + sha256 = "02d78333abaed79e7a2fccc6af3edef3077e08cadcc83fa2856779b6d24e9113"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-i686/he/thunderbird-78.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-i686/he/thunderbird-78.7.1.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "e49d647ee9d414cfd9dfecc4fdaa7931fd4d4a8ffab3fe9bd820023813d0d7b6"; + sha256 = "d4dd60245672fc23e114d2cfef40ff69faf08a2f188969deff7d084d8aebd64f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-i686/hr/thunderbird-78.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-i686/hr/thunderbird-78.7.1.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "8c804b3288036619e0be76d9129102098f5406a00c6586a7edd1e35ac5ffe1ea"; + sha256 = "0aba235af4ebdd924d9d909755dd059025c1b502ab0056a24ef0eb5aea05b9ae"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-i686/hsb/thunderbird-78.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-i686/hsb/thunderbird-78.7.1.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "846966d7f8dc6619afa7904debeaf3aeac95d040478fb3e29cae5cb116782d88"; + sha256 = "acc53828d809a21b3a5bc6b00cf5681b376284e4818c8db250f61a3117573f78"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-i686/hu/thunderbird-78.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-i686/hu/thunderbird-78.7.1.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "a05a7410d0f8ae016d3aa69152a381173c22f3361c7a940a2f7f1684a42ac0d7"; + sha256 = "39aac6a7e96fbc71c9e537f4312fa528c0f3b56a5d669638ca2a4ff2a4823cb8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-i686/hy-AM/thunderbird-78.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-i686/hy-AM/thunderbird-78.7.1.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "93783417a9c065a4b53566d21bfd34f3a96c9cca7e6cd61c20474c63c28f5f15"; + sha256 = "bb1fdc6084ca5d761823b5391aa237d14d62f783007cbb2d6ccff1b69a7b3142"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-i686/id/thunderbird-78.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-i686/id/thunderbird-78.7.1.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "3608569802e13a45feb519239f43bed7ee06f8e3198f188ba8f5c815ca9748bb"; + sha256 = "340b91be60235a91b1a130d68e9b5ddc16d63eba381cc59efd2d396764bf2327"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-i686/is/thunderbird-78.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-i686/is/thunderbird-78.7.1.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "afbcee0a5c4926dc7ee089e6e11d83844d068bac2ddb71bf7cf29747dc753420"; + sha256 = "4f3b255119669de976714089d11532342eb6c1ede95e98d8de09413cdaf28c4c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-i686/it/thunderbird-78.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-i686/it/thunderbird-78.7.1.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "212d0125796a12ccde71939bf1b62b540a630a965f160ebe6199e8b1d3149043"; + sha256 = "1fdda6110ef1eec5702490dfb786fadeb6bbb73fa849526327baebdf3aeaf348"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-i686/ja/thunderbird-78.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-i686/ja/thunderbird-78.7.1.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "c450ba455b8e8b846a6dfc6a380c672e6ed9d18553c07caae3cd3d24a9d21744"; + sha256 = "fd10c2307c71e143d76dfba7d26ea15a6a211878bcf1287128d5706018fb3083"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-i686/ka/thunderbird-78.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-i686/ka/thunderbird-78.7.1.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "349da02164ef984dc22b85b9e4e7a09748cdd1d6325904b32c1e36a8a9f7c4f5"; + sha256 = "b796f8b6aaa28a23726afe915b741b7c89ed73f4e731bf7fad3848aade16001c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-i686/kab/thunderbird-78.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-i686/kab/thunderbird-78.7.1.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "0f367818d4a7568e57ad9d06c52c55c2feebac351d164c434f86943a420c283b"; + sha256 = "35941699918a3177b092c650a73d8bc8f6d06bdf8cbc5c33e492d93f6cb0f198"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-i686/kk/thunderbird-78.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-i686/kk/thunderbird-78.7.1.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "3274d7e4b787e5ed2f26ce11ff26e261e33a90b60bfef644f017215cbdaefc6e"; + sha256 = "3ea99defb54f2e672d48b424e842c876ad0ceacd87cd19cc643acb55586948ea"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-i686/ko/thunderbird-78.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-i686/ko/thunderbird-78.7.1.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "8aa9eebe4ffeaa3f6d963806a6b5d0d3e6530b08476bf55e9cdc1b25cdc105d5"; + sha256 = "4cfa908b81773b57486b8144eb61c949c70615eafc1b3d050b6ceb6292958769"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-i686/lt/thunderbird-78.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-i686/lt/thunderbird-78.7.1.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "2e811db91100b6e3671693fda6776406477ee3f71f4ae9431eb1b94e1aff4a19"; + sha256 = "0d668e8a27f7044c610cff1028f245d2952abf6320ce905365bd42a39df85c23"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-i686/ms/thunderbird-78.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-i686/ms/thunderbird-78.7.1.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "950a316e46a5f6bc127715295e00cf9c742d3bd7ef23a489e3fe4131f7394e2e"; + sha256 = "a632e60198e189d33e87a01c084179bdfb8f8c1d1547dfa4747dec325d1c04c7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-i686/nb-NO/thunderbird-78.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-i686/nb-NO/thunderbird-78.7.1.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "c3bcd1740b5288b9d0f486fc9d2f5936e38e869eab5bf84a92bfc50caa11c5cc"; + sha256 = "d0336060f8e8b632462df91dc0e3ba33f2a7dbf1da6084d41961c05fbbedd46b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-i686/nl/thunderbird-78.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-i686/nl/thunderbird-78.7.1.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "f7eb04082ef4ff38e287016ea3b75e795eb7428c8271ae06a21930031de108bf"; + sha256 = "4e9c1921dac5ce0008b7380d810d5ee4530c4d336c79c6a274c657ea338a4ca1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-i686/nn-NO/thunderbird-78.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-i686/nn-NO/thunderbird-78.7.1.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "01adbf1a345fa117ac8cf5ae65f11e5ce14dafe3f06d99fede51abaa4eee3f94"; + sha256 = "c33045aaa5d9054022431cf66f03ba2485ea7c68553ea245b73c8cf33b4458fc"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-i686/pa-IN/thunderbird-78.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-i686/pa-IN/thunderbird-78.7.1.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "3d8b49a32080315c3726fbc77ff2de4eda453e4919b487af99cbc85a9e8b79fa"; + sha256 = "8b3810587f61e029a2536cb0eceb8b0b26656adf9ce17e8a7f020ed41b6e5724"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-i686/pl/thunderbird-78.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-i686/pl/thunderbird-78.7.1.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "32429dee14ba7c405ccab71bc3a8ea24cc4a028ea331254c0b4e227c921da58b"; + sha256 = "01c8e6ba91037b8e5f713fd7d0dc9b6025aa3dc83fd8b13f1490dd849ec5e87f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-i686/pt-BR/thunderbird-78.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-i686/pt-BR/thunderbird-78.7.1.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "2709ac332c29c0d2dfb3e76c77e3af58cc27a9d23496fa7432fe043ebd486a35"; + sha256 = "9ab3d18699c6de55a198028592da01b576d67920375cbc2154d356bdf7fd4ccc"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-i686/pt-PT/thunderbird-78.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-i686/pt-PT/thunderbird-78.7.1.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "eca228d5846b51cbbd64888477e7514669dc1714dc07d1aab86e38ab0f7956b5"; + sha256 = "3446b5b82aeb058ff880d82fa7da923231a7104bcef77bc08f640490c79b24b5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-i686/rm/thunderbird-78.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-i686/rm/thunderbird-78.7.1.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "269e7483c5f1a884fd809dc3ccb5c1627573708c558a5f2acdd9ca6b925312b5"; + sha256 = "0e1ba7a270021b2df2f189715ddd6b0d540c35dbfb3f45d8216b24e29c6ecd25"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-i686/ro/thunderbird-78.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-i686/ro/thunderbird-78.7.1.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "41d769fb26c99e66708c7c8884c822e863d8066b46512ec20b26c760e7c78916"; + sha256 = "9845b2e33d758474c44e46804c7c49255f3acf9f25c8afa299320828cefb3ec8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-i686/ru/thunderbird-78.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-i686/ru/thunderbird-78.7.1.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "06ed87bfb7830607e87ef5f17f553e34275f3c0a56674f1f07e7e30b43c1f9d0"; + sha256 = "60dc7072a6dfa0723972522d4a06be75c99e6e1b423e68e91af276f2a325913b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-i686/si/thunderbird-78.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-i686/si/thunderbird-78.7.1.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha256 = "09b96524a7b887ba0cdae931ca368f079d5c3536134f6d9798b0073cfa047332"; + sha256 = "fd08c36b8143196ca73aade09e3a8292bab0ce8b6e6d18705eed2594f342ce86"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-i686/sk/thunderbird-78.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-i686/sk/thunderbird-78.7.1.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "a9025df80c0dd8ebe96dec1503d11820ac7c48ea35ef695e883f1e01dbd0b6dd"; + sha256 = "068d927b94908224c7a789bfe33d1e884228d82d3f30e573a0006136d5841c5f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-i686/sl/thunderbird-78.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-i686/sl/thunderbird-78.7.1.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "8db2dceecad941230113b079bd083d0548cafef3bab0b9698260ce3db28453fd"; + sha256 = "27d3a7f5549c48fa2724dc98b8df72bf2b843b0cc34d55371f050ca217cd2ed3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-i686/sq/thunderbird-78.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-i686/sq/thunderbird-78.7.1.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "365db0f0872959400b5aaae94866f1a49e0b14db2fd55938c0084e983f06f2bc"; + sha256 = "b8d3ca545ff88c854b13e1ee89793b33df39f3d6713aae8fb4a2fa3be2d6f73f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-i686/sr/thunderbird-78.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-i686/sr/thunderbird-78.7.1.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "252587e46e7cf1fbd83f9bc9da6b8273985f26d5ede94aab16a2d2ef1d92faa2"; + sha256 = "10d0f70e52bbb8b0978ff6c26359120bb537cc9f15b47a93744ad8ee6dbd7b96"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-i686/sv-SE/thunderbird-78.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-i686/sv-SE/thunderbird-78.7.1.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "029d0a70f4c0bf770dc37263639097aed24b6186057cd9d81c50fb4657ce3e04"; + sha256 = "15fd51de4cd82eaadfb0c9a5231cd6c8f83a58eca1eb66acafa037ca8ae76767"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-i686/th/thunderbird-78.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-i686/th/thunderbird-78.7.1.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "24b20e9cd1d9a5b863d4dcfd8d62599b52ba9a64126b6bf584d4ff5c3db524d8"; + sha256 = "07a6289101aa3d105c2a358ea53d1045bfc3616cd909e57b5a577bcba38dba0f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-i686/tr/thunderbird-78.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-i686/tr/thunderbird-78.7.1.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "d7d9878fbcf9b552164f588600ac1704a5e295fe73c333f0e838b5d99fbd5deb"; + sha256 = "6253f5e59cf07cfe8bbdd566b27ad9cd56aab29f40c42df1368d7e14d064a27a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-i686/uk/thunderbird-78.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-i686/uk/thunderbird-78.7.1.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "3c8eef6d084fec6b0ac57ae6d2fce6dc7e02977ed10c670be30d032e417a50ce"; + sha256 = "e4e37d8194d8df48810afc47463d044e4b4b9fdd0752b0199e4c6a7aa1b46d60"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-i686/uz/thunderbird-78.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-i686/uz/thunderbird-78.7.1.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "545de649b406faa1b942020eb418c4e52054efcc8706a2f4881409d253ed5c4a"; + sha256 = "983d9701e367017ada3b6583d9e6985a73609c642968f1c82ec9b08644fe82b5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-i686/vi/thunderbird-78.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-i686/vi/thunderbird-78.7.1.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "86ae5dbef5ec4cdb0e25ce3cbe78b46ed35349d11038ed12a49dc0440dc7111e"; + sha256 = "b743d0c18257880cf0d7c463a0e39f6029fede79a534bef9dbd5ffe6ba3b10e7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-i686/zh-CN/thunderbird-78.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-i686/zh-CN/thunderbird-78.7.1.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "ce94974470209d9dc81f676f3e74a6359d4e97c7f8801f644c7ea0fe774ad6bc"; + sha256 = "8cc5d4a05eef0498fe12476e7ee7a91dce0c69234b78278cc7985505708ff8ab"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.0/linux-i686/zh-TW/thunderbird-78.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.7.1/linux-i686/zh-TW/thunderbird-78.7.1.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "f013131307e31eed708f8a75e1313b2f94cd401de06e00053f4155aedca33b13"; + sha256 = "5070474b2ac89d09e45bced9513b0f317d4dce76c57ce5f82c75feafb6d49ec3"; } ]; } diff --git a/pkgs/applications/networking/mailreaders/thunderbird/default.nix b/pkgs/applications/networking/mailreaders/thunderbird/default.nix index 8c7d471776d..d91239c3a6e 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/default.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/default.nix @@ -73,13 +73,13 @@ assert waylandSupport -> gtk3Support == true; stdenv.mkDerivation rec { pname = "thunderbird"; - version = "78.7.0"; + version = "78.7.1"; src = fetchurl { url = "mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz"; sha512 = - "1fwi9dvh9q8pzwri6hyyg89zxkfpw3zin53nkqgvips43yq6jdmyxnz3y9qnk2f50d0lnkx12vvkzgirjhdz23gkf7y860zmwg85vpy"; + "328p14mgcam4dxx0asbgp4v2v559bwbw7z2kxd5yfwkna040r9ccrkkirma5580z9vkwb0rcjlmai9wrbacxrg8hg65d8vylvnkampy"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/umurmur/default.nix b/pkgs/applications/networking/umurmur/default.nix index 05aa66eb39c..bf45db92098 100644 --- a/pkgs/applications/networking/umurmur/default.nix +++ b/pkgs/applications/networking/umurmur/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "umurmur"; - version = "0.2.17"; + version = "0.2.19"; src = fetchFromGitHub { owner = "umurmur"; repo = "umurmur"; rev = version; - sha256 = "074px4ygmv4ydy2pqwxwnz17f0hfswqkz5kc9qfz0iby3h5i3fyl"; + sha256 = "sha256-86wveYlM493RIuU8aKac6XTOMPv0JxlZL4qH2N2AqRU="; }; nativeBuildInputs = [ autoreconfHook ]; diff --git a/pkgs/applications/office/homebank/default.nix b/pkgs/applications/office/homebank/default.nix index 03c9445fe24..17c72e8a330 100644 --- a/pkgs/applications/office/homebank/default.nix +++ b/pkgs/applications/office/homebank/default.nix @@ -2,10 +2,10 @@ , libsoup, gnome3 }: stdenv.mkDerivation rec { - name = "homebank-5.4.3"; + name = "homebank-5.5"; src = fetchurl { url = "http://homebank.free.fr/public/${name}.tar.gz"; - sha256 = "02wd569viwy6ncy0144z9nxr3zmpl4shkqhz7zzwyky4gknxf8lj"; + sha256 = "sha256-3tqmsCxQXNAsDsLdiyuk4MydH0WgHqsNpgqxvCp+bHU="; }; nativeBuildInputs = [ pkg-config wrapGAppsHook ]; diff --git a/pkgs/applications/office/jabref/default.nix b/pkgs/applications/office/jabref/default.nix index 3974e75a2f7..4eb39f4d1f8 100644 --- a/pkgs/applications/office/jabref/default.nix +++ b/pkgs/applications/office/jabref/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, makeWrapper, makeDesktopItem, wrapGAppsHook, gtk3, gsettings-desktop-schemas -, zlib , libX11, libXext, libXi, libXrender, libXtst, libGL, alsaLib, libav, cairo, freetype, pango, gdk-pixbuf, glib }: +, zlib , libX11, libXext, libXi, libXrender, libXtst, libGL, alsaLib, cairo, freetype, pango, gdk-pixbuf, glib }: stdenv.mkDerivation rec { version = "5.1"; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ makeWrapper wrapGAppsHook ]; buildInputs = [ gsettings-desktop-schemas ] ++ systemLibs; - systemLibs = [ gtk3 zlib libX11 libXext libXi libXrender libXtst libGL alsaLib libav cairo freetype pango gdk-pixbuf glib ]; + systemLibs = [ gtk3 zlib libX11 libXext libXi libXrender libXtst libGL alsaLib cairo freetype pango gdk-pixbuf glib ]; systemLibPaths = lib.makeLibraryPath systemLibs; installPhase = '' diff --git a/pkgs/applications/office/kbibtex/default.nix b/pkgs/applications/office/kbibtex/default.nix new file mode 100644 index 00000000000..861ec4d99ef --- /dev/null +++ b/pkgs/applications/office/kbibtex/default.nix @@ -0,0 +1,74 @@ +{ lib +, mkDerivation +, fetchurl +# build-time +, extra-cmake-modules +, shared-mime-info +# Qt +, qtxmlpatterns +, qtwebengine +, qca-qt5 +# KDE +, ki18n +, kxmlgui +, kio +, kiconthemes +, kitemviews +, kparts +, kcoreaddons +, kservice +, ktexteditor +, kdoctools +, kwallet +, kcrash +# other +, poppler +, bibutils +}: + +mkDerivation rec { + pname = "kbibtex"; + version = "0.9.2"; + + src = fetchurl { + url = "mirror://kde/stable/KBibTeX/${version}/kbibtex-${version}.tar.xz"; + sha256 = "09xcdx363z9hps3wbr1kx96a6q6678y8pg8r3apyps4xm7xm31nr"; + }; + + nativeBuildInputs = [ + extra-cmake-modules + shared-mime-info + ]; + + buildInputs = [ + qtxmlpatterns + qtwebengine + qca-qt5 + # TODO qtoauth + ki18n + kxmlgui + kio + kiconthemes + kitemviews + kparts + kcoreaddons + kservice + ktexteditor + kdoctools + kwallet + kcrash + poppler + ]; + + qtWrapperArgs = [ + "--prefix" "PATH" ":" "${lib.makeBinPath [ bibutils ]}" + ]; + + meta = with lib; { + description = "Bibliography editor for KDE"; + homepage = "https://userbase.kde.org/KBibTeX"; + changelog = "https://invent.kde.org/office/kbibtex/-/raw/v${version}/ChangeLog"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/applications/office/trilium/default.nix b/pkgs/applications/office/trilium/default.nix index 499aa1e5faf..cb0781f74e1 100644 --- a/pkgs/applications/office/trilium/default.nix +++ b/pkgs/applications/office/trilium/default.nix @@ -19,16 +19,16 @@ let maintainers = with maintainers; [ emmanuelrosa dtzWill ]; }; - version = "0.43.3"; + version = "0.43.4"; desktopSource = { url = "https://github.com/zadam/trilium/releases/download/v${version}/trilium-linux-x64-${version}.tar.xz"; - sha256 = "1k9vcs7pwa89bzivqp0gfs45jzqw216fpypg3ja4n2dzn4qkv2as"; + sha256 = "0kjysam5alsmnj93fcqq1ivawnra42gn7dch99rrfmvbkxp7hhr8"; }; serverSource = { url = "https://github.com/zadam/trilium/releases/download/v${version}/trilium-linux-x64-server-${version}.tar.xz"; - sha256 = "1n3v7wdav6mvgcy72mmfhncsa74i0ax1ij5rjczgfjjyiyc5y0rk"; + sha256 = "128mvmp15mjpb5ipkmr0yn7ahby26shbix3f8q094f4zpxjp83zx"; }; in { diff --git a/pkgs/applications/radio/fldigi/default.nix b/pkgs/applications/radio/fldigi/default.nix index 51728bfb403..d14e0017f6d 100644 --- a/pkgs/applications/radio/fldigi/default.nix +++ b/pkgs/applications/radio/fldigi/default.nix @@ -2,12 +2,12 @@ libsamplerate, libpulseaudio, libXinerama, gettext, pkg-config, alsaLib }: stdenv.mkDerivation rec { - version = "4.1.17"; + version = "4.1.18"; pname = "fldigi"; src = fetchurl { url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.gz"; - sha256 = "1gzff60sn3h05279f9mdi1rkdws52m28shcil16911lvlq6ki13m"; + sha256 = "sha256-PH/YSrOoS6RSWyUenVYSDa7mJqODFoSpdP2tR2+QJw0="; }; buildInputs = [ libXinerama gettext hamlib fltk14 libjpeg libpng portaudio diff --git a/pkgs/applications/radio/sdrangel/default.nix b/pkgs/applications/radio/sdrangel/default.nix index b4a6cb775cc..6f723971c8e 100644 --- a/pkgs/applications/radio/sdrangel/default.nix +++ b/pkgs/applications/radio/sdrangel/default.nix @@ -9,7 +9,7 @@ fftwFloat, glew, hackrf, lib, -libav, +ffmpeg, libiio, libopus, libpulseaudio, @@ -44,7 +44,7 @@ mkDerivation rec { nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ - glew opencv3 libusb1 boost libopus limesuite libav libiio libpulseaudio + glew opencv3 libusb1 boost libopus limesuite ffmpeg libiio libpulseaudio qtbase qtwebsockets qtmultimedia rtl-sdr airspy hackrf fftwFloat codec2 cm256cc serialdv qtserialport libbladeRF uhd soapysdr-with-plugins diff --git a/pkgs/applications/science/astronomy/stellarium/default.nix b/pkgs/applications/science/astronomy/stellarium/default.nix index 4c773208d56..235d06a9cd6 100644 --- a/pkgs/applications/science/astronomy/stellarium/default.nix +++ b/pkgs/applications/science/astronomy/stellarium/default.nix @@ -6,13 +6,13 @@ mkDerivation rec { pname = "stellarium"; - version = "0.20.3"; + version = "0.20.4"; src = fetchFromGitHub { owner = "Stellarium"; repo = "stellarium"; rev = "v${version}"; - sha256 = "08abrshrzhdfcg3b2vzfmnq8fhzrasadg1ajs81kcw96yjc59vak"; + sha256 = "sha256-EhlcaMxlDyX2RneBrpbmLScc9vd77Tf7RPblbQqAqZ0="; }; nativeBuildInputs = [ cmake perl wrapQtAppsHook ]; diff --git a/pkgs/applications/science/biology/blast/default.nix b/pkgs/applications/science/biology/blast/default.nix index 6fd061f1402..877b5b7d34c 100644 --- a/pkgs/applications/science/biology/blast/default.nix +++ b/pkgs/applications/science/biology/blast/default.nix @@ -1,12 +1,12 @@ -{ lib, stdenv, fetchurl, zlib, bzip2, perl, cpio, gawk, coreutils, ApplicationServices }: +{ lib, stdenv, buildPackages, fetchurl, zlib, bzip2, perl, cpio, gawk, coreutils, ApplicationServices }: stdenv.mkDerivation rec { pname = "blast"; - version = "2.10.0"; + version = "2.11.0"; src = fetchurl { - url = "ftp://ftp.ncbi.nlm.nih.gov/blast/executables/blast+/${version}/ncbi-blast-${version}+-src.tar.gz"; - sha256 = "09nry5knj5hhxpn0a5ww1gb1704grd4r1y7adbjl6kqwq37dkk9s"; + url = "https://ftp.ncbi.nlm.nih.gov/blast/executables/blast+/${version}/ncbi-blast-${version}+-src.tar.gz"; + sha256 = "0m0r9vkw631ky1za1wilsfk9k9spwqh22nkrb9a57rbwmrc1i3nq"; }; sourceRoot = "ncbi-blast-${version}+-src/c++"; @@ -75,6 +75,7 @@ stdenv.mkDerivation rec { --replace /bin/date ${coreutils}/bin/date ''; + depsBuildBuild = [ buildPackages.stdenv.cc ]; nativeBuildInputs = [ perl ]; # perl is necessary in buildInputs so that installed perl scripts get patched diff --git a/pkgs/applications/science/biology/blast/no_slash_bin.patch b/pkgs/applications/science/biology/blast/no_slash_bin.patch index 9b78ac57926..851e37fa905 100644 --- a/pkgs/applications/science/biology/blast/no_slash_bin.patch +++ b/pkgs/applications/science/biology/blast/no_slash_bin.patch @@ -171,14 +171,8 @@ diff -u --recursive ncbi-blast-2.9.0+-src/scripts/common/impl/strip_for_install. GREP = @GREP@ --- ncbi-blast-2.9.0+-src/src/build-system/configure 2019-03-05 00:49:08.000000000 +0800 +++ ncbi-blast-2.9.0+-src.patched/src/build-system/configure 2019-05-15 16:55:40.711795042 +0800 -@@ -10417,10 +10417,6 @@ - echo "${ECHO_T}no, using $LN_S" >&6; } - fi - +@@ -10417,4 +10417,0 @@ -case "$LN_S" in - /*) ;; - * ) LN_S=/bin/$LN_S ;; -esac - - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. diff --git a/pkgs/applications/science/biology/picard-tools/default.nix b/pkgs/applications/science/biology/picard-tools/default.nix index 4a3816c4d4a..8914e1f8c1b 100644 --- a/pkgs/applications/science/biology/picard-tools/default.nix +++ b/pkgs/applications/science/biology/picard-tools/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "picard-tools"; - version = "2.24.1"; + version = "2.24.2"; src = fetchurl { url = "https://github.com/broadinstitute/picard/releases/download/${version}/picard.jar"; - sha256 = "sha256-acCsYHyZ358hYqa2haOxR+g6FQGtK+hstYfLBvHLwR8="; + sha256 = "sha256-O+bA7vP7Y9AbFA+nEjE6O1i0DcAWVLO2Guw0ntq55s4="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/science/math/calc/default.nix b/pkgs/applications/science/math/calc/default.nix index e770cff2da9..81b7487bd27 100644 --- a/pkgs/applications/science/math/calc/default.nix +++ b/pkgs/applications/science/math/calc/default.nix @@ -3,14 +3,14 @@ stdenv.mkDerivation rec { pname = "calc"; - version = "2.12.7.2"; + version = "2.12.7.6"; src = fetchurl { urls = [ "https://github.com/lcn2/calc/releases/download/${version}/${pname}-${version}.tar.bz2" "http://www.isthe.com/chongo/src/calc/${pname}-${version}.tar.bz2" ]; - sha256 = "147wmbajcxv6wp92j6pizq4plrr1sb7jirifr1477bx33hc49bsp"; + sha256 = "sha256-Pg8nvW+RDy1Vb+Xg+5tnDxZEVkD80VcQGyZVayq8zsk="; }; patchPhase = '' diff --git a/pkgs/applications/science/robotics/qgroundcontrol/default.nix b/pkgs/applications/science/robotics/qgroundcontrol/default.nix index 95c8aebd32d..82959e7f5e3 100644 --- a/pkgs/applications/science/robotics/qgroundcontrol/default.nix +++ b/pkgs/applications/science/robotics/qgroundcontrol/default.nix @@ -6,7 +6,7 @@ mkDerivation rec { pname = "qgroundcontrol"; - version = "4.0.11"; + version = "4.1.1"; qtInputs = [ qtbase qtcharts qtlocation qtserialport qtsvg qtquickcontrols2 @@ -27,6 +27,7 @@ mkDerivation rec { ''; qmakeFlags = [ + "CONFIG+=StableBuild" # Default install tries to copy Qt files into package "CONFIG+=QGC_DISABLE_BUILD_SETUP" "../qgroundcontrol.pro" @@ -42,7 +43,7 @@ mkDerivation rec { cp -v deploy/qgroundcontrol.desktop $out/share/applications mkdir -p $out/bin - cp -v build/release/QGroundControl "$out/bin/" + cp -v build/staging/QGroundControl "$out/bin/" mkdir -p $out/share/qgroundcontrol cp -rv resources/ $out/share/qgroundcontrol @@ -62,7 +63,7 @@ mkDerivation rec { owner = "mavlink"; repo = pname; rev = "v${version}"; - sha256 = "14pk1vmcpg2cc5p100chbhnynclcwyqmyb2n2w11vvk0l2c9z1gz"; + sha256 = "1dji7jmwsrgcgzhra94wrgz67ydsdra7p10fw8gbw54gf6ncjfjm"; fetchSubmodules = true; }; diff --git a/pkgs/applications/system/glances/default.nix b/pkgs/applications/system/glances/default.nix index 10a6eb9c6bb..26ca10e3f3f 100644 --- a/pkgs/applications/system/glances/default.nix +++ b/pkgs/applications/system/glances/default.nix @@ -9,14 +9,14 @@ buildPythonApplication rec { pname = "glances"; - version = "3.1.6.1"; + version = "3.1.6.2"; disabled = isPyPy; src = fetchFromGitHub { owner = "nicolargo"; repo = "glances"; rev = "v${version}"; - sha256 = "sha256-lYvFNeCuvLIV//fEQDZIj+nLGZmrKHfAQyNpe4vMmfU="; + sha256 = "sha256-6vxJKIwMKz8KQn10aOzqXhVBDfBLylw925hR1hWP7/A="; }; # Some tests fail in the sandbox (they e.g. require access to /sys/class/power_supply): diff --git a/pkgs/applications/terminal-emulators/st/xst.nix b/pkgs/applications/terminal-emulators/st/xst.nix index 9634a3be6b6..baa71a09b9e 100644 --- a/pkgs/applications/terminal-emulators/st/xst.nix +++ b/pkgs/applications/terminal-emulators/st/xst.nix @@ -1,18 +1,14 @@ { lib, stdenv, fetchFromGitHub, pkg-config, libX11, ncurses, libXext, libXft, fontconfig }: -with lib; - -let - version = "0.7.2"; - name = "xst-${version}"; -in stdenv.mkDerivation { - inherit name; +stdenv.mkDerivation rec { + pname = "xst"; + version = "0.8.4.1"; src = fetchFromGitHub { owner = "gnotclub"; - repo = "xst"; + repo = pname; rev = "v${version}"; - sha256 = "1fplgy30gyrwkjsw3z947327r98i13zd1whwkplpj9fzckhb9vs9"; + sha256 = "nOJcOghtzFkl7B/4XeXptn2TdrGQ4QTKBo+t+9npxOA="; }; nativeBuildInputs = [ pkg-config ]; @@ -22,8 +18,8 @@ in stdenv.mkDerivation { TERMINFO=$out/share/terminfo make install PREFIX=$out ''; - meta = { - homepage = "https://github.com/neeasade/xst"; + meta = with lib; { + homepage = "https://github.com/gnotclub/xst"; description = "Simple terminal fork that can load config from Xresources"; license = licenses.mit; maintainers = [ maintainers.vyp ]; diff --git a/pkgs/applications/window-managers/dwm/git.nix b/pkgs/applications/window-managers/dwm/git.nix index 71e91b6093b..a13fc78fbfb 100644 --- a/pkgs/applications/window-managers/dwm/git.nix +++ b/pkgs/applications/window-managers/dwm/git.nix @@ -1,16 +1,14 @@ -{ lib, stdenv, fetchgit, libX11, libXinerama, libXft, patches ? [], conf ? null }: - -let - name = "dwm-git-20180602"; -in +{ lib, stdenv, fetchgit, libX11, libXinerama, libXft, writeText, patches ? [ ] +, conf ? null }: stdenv.mkDerivation { - inherit name; + pname = "dwm-git"; + version = "20200303"; src = fetchgit { url = "git://git.suckless.org/dwm"; - rev = "b69c870a3076d78ab595ed1cd4b41cf6b03b2610"; - sha256 = "10i079h79l4gdch1qy2vrrb2xxxkgkjmgphr5r9a75jbbagwvz0k"; + rev = "61bb8b2241d4db08bea4261c82e27cd9797099e7"; + sha256 = "1j3vly8dln35vnwnwwlaa8ql9fmnlmrv43jcyc8dbfhfxiw6f34l"; }; buildInputs = [ libX11 libXinerama libXft ]; @@ -20,18 +18,19 @@ stdenv.mkDerivation { # Allow users set their own list of patches inherit patches; - # Allow users to override the entire config file AFTER appying the patches - postPatch = lib.optionalString (conf!=null) '' - echo -n '${conf}' > config.def.h - ''; - - buildPhase = "make"; + # Allow users to set the config.def.h file containing the configuration + postPatch = let + configFile = if lib.isDerivation conf || builtins.isPath conf then + conf + else + writeText "config.def.h" conf; + in lib.optionalString (conf != null) "cp ${configFile} config.def.h"; meta = with lib; { homepage = "https://suckless.org/"; description = "Dynamic window manager for X, development version"; license = licenses.mit; - maintainers = with maintainers; [xeji]; + maintainers = with maintainers; [ xeji ]; platforms = platforms.unix; }; } diff --git a/pkgs/applications/window-managers/labwc/default.nix b/pkgs/applications/window-managers/labwc/default.nix index 3ebab2f62bf..9d39bd537fd 100644 --- a/pkgs/applications/window-managers/labwc/default.nix +++ b/pkgs/applications/window-managers/labwc/default.nix @@ -20,13 +20,13 @@ stdenv.mkDerivation rec { pname = "labwc"; - version = "unstable-2021-01-12"; + version = "unstable-2021-02-06"; src = fetchFromGitHub { owner = "johanmalm"; repo = pname; - rev = "2a7086d9f7367d4a81bce58a6f7fc6614bbfbdb3"; - sha256 = "ECwEbWkCjktNNtbLSCflOVlEyxkg4XTfRevq7+qQ2IA="; + rev = "4a8fcf5c6d0b730b1e2e17e544ce7d7d3c72cd13"; + sha256 = "g1ba8dchUN393eis0VAu1bIjQfthDGLaSijSavz4lfU="; }; nativeBuildInputs = [ pkg-config meson ninja pandoc ]; @@ -54,4 +54,3 @@ stdenv.mkDerivation rec { platforms = platforms.unix; }; } -# TODO: report a SIGSEGV when labwc starts inside a started Wayland window diff --git a/pkgs/applications/window-managers/wayfire/default.nix b/pkgs/applications/window-managers/wayfire/default.nix index 513784b8b52..cb9f2fe85a7 100644 --- a/pkgs/applications/window-managers/wayfire/default.nix +++ b/pkgs/applications/window-managers/wayfire/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "wayfire"; - version = "0.6.0"; + version = "0.7.0"; src = fetchurl { - url = "https://github.com/WayfireWM/wayfire/releases/download/${version}/wayfire-${version}.tar.xz"; - sha256 = "0wc5szslgf8d4r4dlbfgc5v49j2ziaa8fycmknq4p0vl67mh7acq"; + url = "https://github.com/WayfireWM/wayfire/releases/download/v${version}/wayfire-${version}.tar.xz"; + sha256 = "19k9nk5whql03ik66i06r4xgxk5v7mpdphjpv13hdw8ba48w73hd"; }; nativeBuildInputs = [ meson ninja pkg-config wayland ]; diff --git a/pkgs/applications/window-managers/wayfire/wcm.nix b/pkgs/applications/window-managers/wayfire/wcm.nix index 7c4b546c68e..d6ac6aeb84e 100644 --- a/pkgs/applications/window-managers/wayfire/wcm.nix +++ b/pkgs/applications/window-managers/wayfire/wcm.nix @@ -1,16 +1,14 @@ -{ stdenv, lib, fetchFromGitHub, meson, ninja, pkg-config, wayland, wrapGAppsHook +{ stdenv, lib, fetchurl, meson, ninja, pkg-config, wayland, wrapGAppsHook , gnome3, libevdev, libxml2, wayfire, wayland-protocols, wf-config, wf-shell }: stdenv.mkDerivation rec { pname = "wcm"; - version = "0.6.0"; + version = "0.7.0"; - src = fetchFromGitHub { - owner = "WayfireWM"; - repo = "wcm"; - rev = "v${version}"; - sha256 = "1b22gymqfn0c49nf39676q5bj25rxab874iayiq31cmn14r30dyg"; + src = fetchurl { + url = "https://github.com/WayfireWM/wcm/releases/download/v${version}/wcm-${version}.tar.xz"; + sha256 = "19za1fnlf5hz4n4mxxwqcr5yxp6mga9ah539ifnjnqrgvj19cjlj"; }; nativeBuildInputs = [ meson ninja pkg-config wayland wrapGAppsHook ]; diff --git a/pkgs/applications/window-managers/wayfire/wf-config.nix b/pkgs/applications/window-managers/wayfire/wf-config.nix index 00a4404c1d4..b8e4c6aa770 100644 --- a/pkgs/applications/window-managers/wayfire/wf-config.nix +++ b/pkgs/applications/window-managers/wayfire/wf-config.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "wf-config"; - version = "0.6.0"; + version = "0.7.0"; src = fetchurl { - url = "https://github.com/WayfireWM/wf-config/releases/download/${version}/wf-config-${version}.tar.xz"; - sha256 = "1a5aqybhbp9dp4jygrm3gbkdap5qbd52y6ihfr4rm1cj37sckcn0"; + url = "https://github.com/WayfireWM/wf-config/releases/download/v${version}/wf-config-${version}.tar.xz"; + sha256 = "1bas5gsbnf8jxkkxd95992chz8yk5ckgg7r09gfnmm7xi8w0pyy7"; }; nativeBuildInputs = [ meson ninja pkg-config ]; diff --git a/pkgs/applications/window-managers/wayfire/wf-shell.nix b/pkgs/applications/window-managers/wayfire/wf-shell.nix index 6e5f189275b..3948e9a32ab 100644 --- a/pkgs/applications/window-managers/wayfire/wf-shell.nix +++ b/pkgs/applications/window-managers/wayfire/wf-shell.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "wf-shell"; - version = "0.6.1"; + version = "0.7.0"; # > Note to packagers: do not use the autogenerated "Source code" # > archives from GitHub, but the wf-shell-0.4.0.tar.xz file. src = fetchurl { url = "https://github.com/WayfireWM/wf-shell/releases/download/v${version}/wf-shell-${version}.tar.xz"; - sha256 = "0jl8gj185k2ff754lcj5b5nldhkvrhmlaj8lsik4kx78vlb5m3ns"; + sha256 = "1isybm9lcpxwyf6zh2vzkwrcnw3q7qxm21535g4f08f0l68cd5bl"; }; nativeBuildInputs = [ meson ninja pkg-config wayland ]; diff --git a/pkgs/build-support/appimage/default.nix b/pkgs/build-support/appimage/default.nix index 6824b8215e5..2a13d107bd0 100644 --- a/pkgs/build-support/appimage/default.nix +++ b/pkgs/build-support/appimage/default.nix @@ -121,7 +121,6 @@ rec { libusb1 udev dbus-glib - libav atk at-spi2-atk libudev0-shim diff --git a/pkgs/build-support/bintools-wrapper/default.nix b/pkgs/build-support/bintools-wrapper/default.nix index 48a3ebb32df..8fef2ca6624 100644 --- a/pkgs/build-support/bintools-wrapper/default.nix +++ b/pkgs/build-support/bintools-wrapper/default.nix @@ -64,6 +64,7 @@ let else if targetPlatform.system == "powerpc-linux" then "${libc_lib}/lib/ld.so.1" else if targetPlatform.isMips then "${libc_lib}/lib/ld.so.1" else if targetPlatform.isDarwin then "/usr/lib/dyld" + else if targetPlatform.isFreeBSD then "/libexec/ld-elf.so.1" else if lib.hasSuffix "pc-gnu" targetPlatform.config then "ld.so.1" else null; diff --git a/pkgs/build-support/fetchcvs/builder.sh b/pkgs/build-support/fetchcvs/builder.sh index 0975c347882..fe1019aafc2 100644 --- a/pkgs/build-support/fetchcvs/builder.sh +++ b/pkgs/build-support/fetchcvs/builder.sh @@ -1,6 +1,6 @@ source $stdenv/setup -(echo '#!/usr/bin/env sh'; \ +(echo "#!$SHELL"; \ echo 'ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no "$@"') > ssh chmod +x ssh export CVS_RSH=$PWD/ssh diff --git a/pkgs/build-support/release/debian-build.nix b/pkgs/build-support/release/debian-build.nix index 2544d5c740c..4c2d82ce630 100644 --- a/pkgs/build-support/release/debian-build.nix +++ b/pkgs/build-support/release/debian-build.nix @@ -2,7 +2,6 @@ # that contains a Debian-like (i.e. dpkg-based) OS. { name ? "debian-build" -, lib , diskImage , src, lib, stdenv, vmTools, checkinstall , fsTranslation ? false diff --git a/pkgs/data/fonts/iosevka/bin.nix b/pkgs/data/fonts/iosevka/bin.nix index f3bd8dab013..e9fad77e8c0 100644 --- a/pkgs/data/fonts/iosevka/bin.nix +++ b/pkgs/data/fonts/iosevka/bin.nix @@ -10,7 +10,7 @@ let (builtins.attrNames (builtins.removeAttrs variantHashes [ "iosevka" ])); in stdenv.mkDerivation rec { pname = "${name}-bin"; - version = "4.4.0"; + version = "4.5.0"; src = fetchurl { url = "https://github.com/be5invis/Iosevka/releases/download/v${version}/ttc-${name}-${version}.zip"; diff --git a/pkgs/data/fonts/iosevka/variants.nix b/pkgs/data/fonts/iosevka/variants.nix index 6b6cd00f49a..8ee3206d070 100644 --- a/pkgs/data/fonts/iosevka/variants.nix +++ b/pkgs/data/fonts/iosevka/variants.nix @@ -1,24 +1,24 @@ # This file was autogenerated. DO NOT EDIT! { - iosevka = "0qkxqdx3vs53djiibc4ib3qj61fygxvxfcvs7yi08vdhd9qbxhjg"; - iosevka-aile = "053f6b1z0w1089y608k4wmspgljn9lyzyggq168k0110z9vlfjhf"; - iosevka-curly = "04kc7f6gqqxbdkdh1k4z4b28f8pj09npb87fx4zr41wkzkxmavcf"; - iosevka-curly-slab = "1pdm2g3a1nfc8w53r3sdifwypj3diil16jy6sgvgpmk7klf804vf"; - iosevka-etoile = "10vw53cd317qxhvws11zf98756vfn836assw3rbns6zpfrj7a2xg"; - iosevka-slab = "01ynv6b7fqdd98imfr14xcgrhp20yffa3n738iz5qnr75vqpnfdc"; - iosevka-sparkle = "1nw63dd1ccj8cp1x06alfxdvdlw9ibin41llmc0jla0nz7n8vsp3"; - iosevka-ss01 = "0g54rghx6z0a9azckvgh7njq12rsr1zzskgrm3f29rin8fdwvvd9"; - iosevka-ss02 = "0jhl75bwd76vp9hpvqgj7awpvibv4pk5vjab97n53b4bdxdxh1rf"; - iosevka-ss03 = "1ki5q7gafgm2iayjn82wrnwkfb3nbcr2xsrgs2vsw5lm9plawbmd"; - iosevka-ss04 = "03933skk5zqxrkj5m0j90cxrv4fmjfbp7ai5fywmhjzq92xbcr97"; - iosevka-ss05 = "014dglqr17adyj2229vvzhz61jpkgj33ngkav5sh2dj5wcx6b137"; - iosevka-ss06 = "07z87rm0rb9n6d7h0kmp51dnnglmr0wbwmplc5mlv036fcrdibaj"; - iosevka-ss07 = "1672n5ynd5fv8dwnwg8aa50ny74ad9gbx2xlk2ixih7ajv15p19d"; - iosevka-ss08 = "1jqdqg6dzrnq6y0g7ls2ya3dh0j00xj2k41aajvdqw342n08h27k"; - iosevka-ss09 = "1p1v0byb2nh11k362zxjrbvzbbryh2wk76dsd1zwyjrlgqq6qa81"; - iosevka-ss10 = "12c940w8vy1hjhi7cxgqsb23ip60xw1ydzhx5cv4ycxmi5745wqq"; - iosevka-ss11 = "0s6fvh5pw119w872w4rvamiwssryx4a98c7fhr737nzgiqy4iyz5"; - iosevka-ss12 = "14gjqmn807cv3dbvkm2i6dz6if46fbrkr8ls5shwalnl8qj3d06c"; - iosevka-ss13 = "1qd04cani9jzp1hjs8g6b42bmxvjyyxdha122816s0rg9i46mpcc"; - iosevka-ss14 = "0q109ahk7ww66brxgldgmr61m2qzpyhi1q21591wg1br5cn2d52w"; + iosevka = "1ic5w8w4v27vfq7pvx9wv2zdcsj16xi71ln2a3fb4kh93zj84kl8"; + iosevka-aile = "1qv2b4zcz172knvr39argqshjpin1lidlafilfcm569cp8rasrdd"; + iosevka-curly = "0x9pdgyiab8hibyf1yrwn6cr90aqy9ygyk1zz9nqzcndk5mk54p4"; + iosevka-curly-slab = "0mxnbf9dwq3iq5dc0cgrdqf2dlyymylv46psb83n5kra4rz1wxnb"; + iosevka-etoile = "1rz9dkpiwwfjnhiajfxg3rrnf4lyxnynx89qswg0b8wql4q6bz71"; + iosevka-slab = "17p0cf4k8k3kabqp0b1anqqj8phfw7nnxiiscnngbrxhdvhpp62n"; + iosevka-sparkle = "0ip46lcq7gcv77ar6vqz51lhf448fd0nviijfpqfg7gdywdzalm0"; + iosevka-ss01 = "1v1z2rx7r6nb45i3qcb9pvilm6yxxkl5ks7ldmm902cx67pkv7rj"; + iosevka-ss02 = "1pd4sbr1p1cf9917nnn22v1kah8jfgm9jpfvq1j51wyr8lnxqz2k"; + iosevka-ss03 = "0pdbvrzilrxxcaz9gnhnqxvk4ipfxcgys41sasl3znxzij1ary8s"; + iosevka-ss04 = "08xwdp5s3dp30qy81j3qwhhqk1bibcpnh2i00a3kyw3g6jsnsvmp"; + iosevka-ss05 = "1njf1ysd42k2rc2lvg5ilq6q2wvg8dlm04d7wygdamw0yx6sia83"; + iosevka-ss06 = "04g4m770i1b75gl1lanbs0ibmjj8vg5yfwyn6n0bidfn30z4n01l"; + iosevka-ss07 = "07f1n44f5bvifbns6572ys6zihac6yljv7frm58w7xgyl0a3prvg"; + iosevka-ss08 = "157cq5jfxvr0n7ksqln5mjmr800dbyfy8vwl0ngbf0aiq3mw2x8f"; + iosevka-ss09 = "0yib3mhb48g2vjiaviwgcl6lad4dbwwblnmv4zi880bdvz7jrwr9"; + iosevka-ss10 = "06s0s9x1fiqqmnkm42khasws40db7l68d2ycsm38mx6b62nlsbkr"; + iosevka-ss11 = "0yzy322zqas0id70i1p92x7fbim8gai0a61nf6bf33aq3qgsj2w8"; + iosevka-ss12 = "0lhmhwd4z44y4469av6na7k5w4ra47g98dxfi0mb42a4n4sq0k5j"; + iosevka-ss13 = "1cq91iqfgq4fsazi2pjh6l4n9mgci4aayqp7fiy8lydv7f1ym0z9"; + iosevka-ss14 = "0xid48yr2qfsh6kvlajlaqnb43ck351kg8r3bwpvzrdbvl809983"; } diff --git a/pkgs/data/icons/iconpack-jade/default.nix b/pkgs/data/icons/iconpack-jade/default.nix index 7d13476d73e..3a5fe541985 100644 --- a/pkgs/data/icons/iconpack-jade/default.nix +++ b/pkgs/data/icons/iconpack-jade/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "iconpack-jade"; - version = "1.24"; + version = "1.25"; src = fetchFromGitHub { owner = "madmaxms"; repo = pname; rev = "v${version}"; - sha256 = "1bns1f3vv7d7ps08plnhl3432cy2l2mhv85h7n4fifjqqi8bll9x"; + sha256 = "0pwz3l5i93s84iwkn1jq8a150ma96788a0n41xq2cgy00j8h8xh0"; }; nativeBuildInputs = [ gtk3 ]; @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Icon pack based upon Faenza and Mint-X"; homepage = "https://github.com/madmaxms/iconpack-jade"; - license = licenses.lgpl3; + license = licenses.gpl3Only; platforms = platforms.linux; maintainers = [ maintainers.romildo ]; }; diff --git a/pkgs/desktops/lxde/core/lxappearance/default.nix b/pkgs/desktops/lxde/core/lxappearance/default.nix index 8ff71e0a545..21d82455333 100644 --- a/pkgs/desktops/lxde/core/lxappearance/default.nix +++ b/pkgs/desktops/lxde/core/lxappearance/default.nix @@ -9,10 +9,11 @@ }: stdenv.mkDerivation rec { - name = "lxappearance-0.6.3"; + pname = "lxappearance"; + version = "0.6.3"; src = fetchurl { - url = "mirror://sourceforge/project/lxde/LXAppearance/${name}.tar.xz"; + url = "mirror://sourceforge/project/lxde/LXAppearance/${pname}-${version}.tar.xz"; sha256 = "0f4bjaamfxxdr9civvy55pa6vv9dx1hjs522gjbbgx7yp1cdh8kj"; }; @@ -35,7 +36,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Lightweight program for configuring the theme and fonts of gtk applications"; homepage = "https://lxde.org/"; - license = licenses.gpl2; + license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = with maintainers; [ hinton romildo ]; }; diff --git a/pkgs/desktops/lxde/core/lxpanel/default.nix b/pkgs/desktops/lxde/core/lxpanel/default.nix index 8cb8d2f580c..95e5061a985 100644 --- a/pkgs/desktops/lxde/core/lxpanel/default.nix +++ b/pkgs/desktops/lxde/core/lxpanel/default.nix @@ -1,21 +1,54 @@ -{ lib, stdenv, fetchurl, pkg-config, gettext, m4, intltool, libxmlxx, keybinder -, gtk2, libX11, libfm, libwnck, libXmu, libXpm, cairo, gdk-pixbuf, gdk-pixbuf-xlib -, menu-cache, lxmenu-data, wirelesstools, curl +{ lib +, stdenv +, fetchurl +, pkg-config +, gettext +, m4 +, intltool +, libxmlxx +, keybinder +, gtk2 +, libX11 +, libfm +, libwnck +, libXmu +, libXpm +, cairo +, gdk-pixbuf +, gdk-pixbuf-xlib +, menu-cache +, lxmenu-data +, wirelesstools +, curl , supportAlsa ? false, alsaLib }: stdenv.mkDerivation rec { - name = "lxpanel-0.10.0"; + pname = "lxpanel"; + version = "0.10.0"; src = fetchurl { - url = "mirror://sourceforge/lxde/${name}.tar.xz"; + url = "mirror://sourceforge/lxde/${pname}-${version}.tar.xz"; sha256 = "0zis3b815p375s6mymhf5sn1a0c1xv0ixxzb0mh3fqhrby6cqy26"; }; nativeBuildInputs = [ pkg-config gettext m4 intltool libxmlxx ]; buildInputs = [ - keybinder gtk2 libX11 libfm libwnck libXmu libXpm cairo gdk-pixbuf gdk-pixbuf-xlib.dev - menu-cache lxmenu-data m4 wirelesstools curl + keybinder + gtk2 + libX11 + libfm + libwnck + libXmu + libXpm + cairo + gdk-pixbuf + gdk-pixbuf-xlib.dev + menu-cache + lxmenu-data + m4 + wirelesstools + curl ] ++ lib.optional supportAlsa alsaLib; postPatch = '' @@ -25,11 +58,11 @@ stdenv.mkDerivation rec { --replace "@PACKAGE_CFLAGS@" "@PACKAGE_CFLAGS@ -I${gdk-pixbuf-xlib.dev}/include/gdk-pixbuf-2.0" ''; - meta = { + meta = with lib; { description = "Lightweight X11 desktop panel for LXDE"; homepage = "https://lxde.org/"; - license = lib.licenses.gpl2; - maintainers = [ lib.maintainers.ryneeverett ]; - platforms = lib.platforms.linux; + license = licenses.gpl2Plus; + maintainers = [ maintainers.ryneeverett ]; + platforms = platforms.linux; }; } diff --git a/pkgs/desktops/lxde/core/lxrandr/default.nix b/pkgs/desktops/lxde/core/lxrandr/default.nix index 7de2886eeb4..b6358cadead 100644 --- a/pkgs/desktops/lxde/core/lxrandr/default.nix +++ b/pkgs/desktops/lxde/core/lxrandr/default.nix @@ -1,23 +1,37 @@ -{ lib, stdenv, fetchurl, pkg-config, intltool, gtk2, libX11, xrandr, withGtk3 ? false, gtk3 }: +{ lib +, stdenv +, fetchurl +, pkg-config +, intltool +, gtk2 +, libX11 +, xrandr +, withGtk3 ? false, gtk3 +}: stdenv.mkDerivation rec { - name = "lxrandr-0.3.2"; + pname = "lxrandr"; + version = "0.3.2"; src = fetchurl { - url = "mirror://sourceforge/lxde/${name}.tar.xz"; + url = "mirror://sourceforge/lxde/${pname}-${version}.tar.xz"; sha256 = "04n3vgh3ix12p8jfs4w0dyfq3anbjy33h7g53wbbqqc0f74xyplb"; }; configureFlags = lib.optional withGtk3 "--enable-gtk3"; nativeBuildInputs = [ pkg-config intltool ]; - buildInputs = [ libX11 (if withGtk3 then gtk3 else gtk2) xrandr ]; + buildInputs = [ + libX11 + xrandr + (if withGtk3 then gtk3 else gtk2) + ]; meta = with lib; { description = "Standard screen manager of LXDE"; homepage = "https://lxde.org/"; - license = lib.licenses.gpl2; + license = licenses.gpl2Plus; maintainers = with maintainers; [ rawkode ]; - platforms = lib.platforms.linux; + platforms = platforms.linux; }; } diff --git a/pkgs/desktops/lxde/core/lxsession/default.nix b/pkgs/desktops/lxde/core/lxsession/default.nix index 16264522f28..b30c195f636 100644 --- a/pkgs/desktops/lxde/core/lxsession/default.nix +++ b/pkgs/desktops/lxde/core/lxsession/default.nix @@ -58,9 +58,9 @@ stdenv.mkDerivation rec { preConfigure = "./autogen.sh"; meta = with lib; { + homepage = "https://wiki.lxde.org/en/LXSession"; description = "Classic LXDE session manager"; license = licenses.gpl2Plus; - homepage = "https://wiki.lxde.org/en/LXSession"; maintainers = [ maintainers.shamilton ]; platforms = platforms.linux; }; diff --git a/pkgs/desktops/lxde/core/lxtask/default.nix b/pkgs/desktops/lxde/core/lxtask/default.nix index 27066ba9952..d2a560afd06 100644 --- a/pkgs/desktops/lxde/core/lxtask/default.nix +++ b/pkgs/desktops/lxde/core/lxtask/default.nix @@ -1,4 +1,11 @@ -{ lib, stdenv, fetchurl, pkg-config, intltool, gtk3, libintl }: +{ lib +, stdenv +, fetchurl +, pkg-config +, intltool +, gtk3 +, libintl +}: stdenv.mkDerivation rec { pname = "lxtask"; @@ -15,7 +22,8 @@ stdenv.mkDerivation rec { configureFlags = [ "--enable-gtk3" ]; - meta = { + meta = with lib; { + homepage = "https://wiki.lxde.org/en/LXTask"; description = "Lightweight and desktop independent task manager"; longDescription = '' LXTask is a lightweight task manager derived from xfce4 task manager @@ -24,9 +32,8 @@ stdenv.mkDerivation rec { Desktop Environment, it's totally desktop independent and only requires pure GTK. ''; - homepage = "https://wiki.lxde.org/en/LXTask"; - license = lib.licenses.gpl2Plus; - platforms = lib.platforms.unix; - maintainers = [ lib.maintainers.romildo ]; + license = licenses.gpl2Plus; + platforms = platforms.unix; + maintainers = [ maintainers.romildo ]; }; } diff --git a/pkgs/desktops/lxqt/compton-conf/default.nix b/pkgs/desktops/lxqt/compton-conf/default.nix index 0ffdc5199aa..111f7f175da 100644 --- a/pkgs/desktops/lxqt/compton-conf/default.nix +++ b/pkgs/desktops/lxqt/compton-conf/default.nix @@ -40,9 +40,9 @@ mkDerivation rec { passthru.updateScript = lxqt.lxqtUpdateScript { inherit pname version src; }; meta = with lib; { - description = "GUI configuration tool for compton X composite manager"; homepage = "https://github.com/lxqt/compton-conf"; - license = licenses.lgpl21; + description = "GUI configuration tool for compton X composite manager"; + license = licenses.lgpl21Plus; platforms = with platforms; unix; maintainers = with maintainers; [ romildo ]; }; diff --git a/pkgs/desktops/lxqt/libfm-qt/default.nix b/pkgs/desktops/lxqt/libfm-qt/default.nix index 4bb3cd52d82..be1f8a80e78 100644 --- a/pkgs/desktops/lxqt/libfm-qt/default.nix +++ b/pkgs/desktops/lxqt/libfm-qt/default.nix @@ -46,9 +46,9 @@ mkDerivation rec { passthru.updateScript = lxqtUpdateScript { inherit pname version src; }; meta = with lib; { - description = "Core library of PCManFM-Qt (Qt binding for libfm)"; homepage = "https://github.com/lxqt/libfm-qt"; - license = licenses.lgpl21; + description = "Core library of PCManFM-Qt (Qt binding for libfm)"; + license = licenses.lgpl21Plus; platforms = with platforms; unix; maintainers = with maintainers; [ romildo ]; }; diff --git a/pkgs/desktops/lxqt/libqtxdg/default.nix b/pkgs/desktops/lxqt/libqtxdg/default.nix index f2d00a5869e..adb8b8a1161 100644 --- a/pkgs/desktops/lxqt/libqtxdg/default.nix +++ b/pkgs/desktops/lxqt/libqtxdg/default.nix @@ -40,9 +40,9 @@ mkDerivation rec { passthru.updateScript = lxqtUpdateScript { inherit pname version src; }; meta = with lib; { - description = "Qt implementation of freedesktop.org xdg specs"; homepage = "https://github.com/lxqt/libqtxdg"; - license = licenses.lgpl21; + description = "Qt implementation of freedesktop.org xdg specs"; + license = licenses.lgpl21Plus; platforms = platforms.linux; maintainers = with maintainers; [ romildo ]; }; diff --git a/pkgs/desktops/lxqt/lximage-qt/default.nix b/pkgs/desktops/lxqt/lximage-qt/default.nix index 217a6fe7922..b7e30096b76 100644 --- a/pkgs/desktops/lxqt/lximage-qt/default.nix +++ b/pkgs/desktops/lxqt/lximage-qt/default.nix @@ -45,9 +45,9 @@ mkDerivation rec { passthru.updateScript = lxqtUpdateScript { inherit pname version src; }; meta = with lib; { - description = "The image viewer and screenshot tool for lxqt"; homepage = "https://github.com/lxqt/lximage-qt"; - license = licenses.gpl2; + description = "The image viewer and screenshot tool for lxqt"; + license = licenses.gpl2Plus; platforms = with platforms; unix; maintainers = with maintainers; [ romildo ]; }; diff --git a/pkgs/desktops/lxqt/lxqt-about/default.nix b/pkgs/desktops/lxqt/lxqt-about/default.nix index 0070d31af9a..523092d1782 100644 --- a/pkgs/desktops/lxqt/lxqt-about/default.nix +++ b/pkgs/desktops/lxqt/lxqt-about/default.nix @@ -40,9 +40,9 @@ mkDerivation rec { passthru.updateScript = lxqtUpdateScript { inherit pname version src; }; meta = with lib; { - description = "Dialogue window providing information about LXQt and the system it's running on"; homepage = "https://github.com/lxqt/lxqt-about"; - license = licenses.lgpl21; + description = "Dialogue window providing information about LXQt and the system it's running on"; + license = licenses.lgpl21Plus; platforms = platforms.linux; maintainers = with maintainers; [ romildo ]; }; diff --git a/pkgs/desktops/lxqt/lxqt-admin/default.nix b/pkgs/desktops/lxqt/lxqt-admin/default.nix index b3b74b92f6a..8406b909493 100644 --- a/pkgs/desktops/lxqt/lxqt-admin/default.nix +++ b/pkgs/desktops/lxqt/lxqt-admin/default.nix @@ -47,9 +47,9 @@ mkDerivation rec { passthru.updateScript = lxqtUpdateScript { inherit pname version src; }; meta = with lib; { - description = "LXQt system administration tool"; homepage = "https://github.com/lxqt/lxqt-admin"; - license = licenses.lgpl21; + description = "LXQt system administration tool"; + license = licenses.lgpl21Plus; platforms = platforms.linux; maintainers = with maintainers; [ romildo ]; }; diff --git a/pkgs/desktops/lxqt/lxqt-archiver/default.nix b/pkgs/desktops/lxqt/lxqt-archiver/default.nix index 3d2ce3c0f57..43896c2d6c4 100644 --- a/pkgs/desktops/lxqt/lxqt-archiver/default.nix +++ b/pkgs/desktops/lxqt/lxqt-archiver/default.nix @@ -42,9 +42,9 @@ mkDerivation rec { passthru.updateScript = lxqtUpdateScript { inherit pname version src; }; meta = with lib; { - description = "Archive tool for the LXQt desktop environment"; homepage = "https://github.com/lxqt/lxqt-archiver/"; - license = licenses.gpl2; + description = "Archive tool for the LXQt desktop environment"; + license = licenses.gpl2Plus; platforms = with platforms; unix; maintainers = with maintainers; [ jchw ]; }; diff --git a/pkgs/desktops/lxqt/lxqt-build-tools/default.nix b/pkgs/desktops/lxqt/lxqt-build-tools/default.nix index 249d1664884..f45f8c72955 100644 --- a/pkgs/desktops/lxqt/lxqt-build-tools/default.nix +++ b/pkgs/desktops/lxqt/lxqt-build-tools/default.nix @@ -44,9 +44,9 @@ mkDerivation rec { passthru.updateScript = lxqtUpdateScript { inherit pname version src; }; meta = with lib; { - description = "Various packaging tools and scripts for LXQt applications"; homepage = "https://github.com/lxqt/lxqt-build-tools"; - license = licenses.lgpl21; + description = "Various packaging tools and scripts for LXQt applications"; + license = licenses.lgpl21Plus; platforms = with platforms; unix; maintainers = with maintainers; [ romildo ]; }; diff --git a/pkgs/desktops/lxqt/lxqt-config/default.nix b/pkgs/desktops/lxqt/lxqt-config/default.nix index 407e45655ae..c273a7bd859 100644 --- a/pkgs/desktops/lxqt/lxqt-config/default.nix +++ b/pkgs/desktops/lxqt/lxqt-config/default.nix @@ -58,9 +58,9 @@ mkDerivation rec { passthru.updateScript = lxqtUpdateScript { inherit pname version src; }; meta = with lib; { - description = "Tools to configure LXQt and the underlying operating system"; homepage = "https://github.com/lxqt/lxqt-config"; - license = licenses.lgpl21; + description = "Tools to configure LXQt and the underlying operating system"; + license = licenses.lgpl21Plus; platforms = platforms.linux; maintainers = with maintainers; [ romildo ]; }; diff --git a/pkgs/desktops/lxqt/lxqt-globalkeys/default.nix b/pkgs/desktops/lxqt/lxqt-globalkeys/default.nix index 62bb75e7876..a54564e062b 100644 --- a/pkgs/desktops/lxqt/lxqt-globalkeys/default.nix +++ b/pkgs/desktops/lxqt/lxqt-globalkeys/default.nix @@ -42,9 +42,9 @@ mkDerivation rec { passthru.updateScript = lxqtUpdateScript { inherit pname version src; }; meta = with lib; { - description = "LXQt service for global keyboard shortcuts registration"; homepage = "https://github.com/lxqt/lxqt-globalkeys"; - license = licenses.lgpl21; + description = "LXQt service for global keyboard shortcuts registration"; + license = licenses.lgpl21Plus; platforms = platforms.linux; maintainers = with maintainers; [ romildo ]; }; diff --git a/pkgs/desktops/lxqt/lxqt-notificationd/default.nix b/pkgs/desktops/lxqt/lxqt-notificationd/default.nix index 520c0322eaa..c02b768d6b7 100644 --- a/pkgs/desktops/lxqt/lxqt-notificationd/default.nix +++ b/pkgs/desktops/lxqt/lxqt-notificationd/default.nix @@ -42,9 +42,9 @@ mkDerivation rec { passthru.updateScript = lxqtUpdateScript { inherit pname version src; }; meta = with lib; { - description = "The LXQt notification daemon"; homepage = "https://github.com/lxqt/lxqt-notificationd"; - license = licenses.lgpl21; + description = "The LXQt notification daemon"; + license = licenses.lgpl21Plus; platforms = platforms.linux; maintainers = with maintainers; [ romildo ]; }; diff --git a/pkgs/desktops/lxqt/lxqt-openssh-askpass/default.nix b/pkgs/desktops/lxqt/lxqt-openssh-askpass/default.nix index cdfb51a472d..3aac000fb67 100644 --- a/pkgs/desktops/lxqt/lxqt-openssh-askpass/default.nix +++ b/pkgs/desktops/lxqt/lxqt-openssh-askpass/default.nix @@ -42,9 +42,9 @@ mkDerivation rec { passthru.updateScript = lxqtUpdateScript { inherit pname version src; }; meta = with lib; { - description = "GUI to query passwords on behalf of SSH agents"; homepage = "https://github.com/lxqt/lxqt-openssh-askpass"; - license = licenses.lgpl21; + description = "GUI to query passwords on behalf of SSH agents"; + license = licenses.lgpl21Plus; platforms = platforms.linux; maintainers = with maintainers; [ romildo ]; }; diff --git a/pkgs/desktops/lxqt/lxqt-panel/default.nix b/pkgs/desktops/lxqt/lxqt-panel/default.nix index 5da0ab2499e..bb6ed854891 100644 --- a/pkgs/desktops/lxqt/lxqt-panel/default.nix +++ b/pkgs/desktops/lxqt/lxqt-panel/default.nix @@ -73,9 +73,9 @@ mkDerivation rec { passthru.updateScript = lxqtUpdateScript { inherit pname version src; }; meta = with lib; { - description = "The LXQt desktop panel"; homepage = "https://github.com/lxqt/lxqt-panel"; - license = licenses.lgpl21; + description = "The LXQt desktop panel"; + license = licenses.lgpl21Plus; platforms = platforms.linux; maintainers = with maintainers; [ romildo ]; }; diff --git a/pkgs/desktops/lxqt/lxqt-policykit/default.nix b/pkgs/desktops/lxqt/lxqt-policykit/default.nix index 762e7ac0462..fc4378d861c 100644 --- a/pkgs/desktops/lxqt/lxqt-policykit/default.nix +++ b/pkgs/desktops/lxqt/lxqt-policykit/default.nix @@ -48,9 +48,9 @@ mkDerivation rec { passthru.updateScript = lxqtUpdateScript { inherit pname version src; }; meta = with lib; { - description = "The LXQt PolicyKit agent"; homepage = "https://github.com/lxqt/lxqt-policykit"; - license = licenses.lgpl21; + description = "The LXQt PolicyKit agent"; + license = licenses.lgpl21Plus; platforms = platforms.linux; maintainers = with maintainers; [ romildo ]; }; diff --git a/pkgs/desktops/lxqt/lxqt-powermanagement/default.nix b/pkgs/desktops/lxqt/lxqt-powermanagement/default.nix index 22eb060dfd5..3c1350753cf 100644 --- a/pkgs/desktops/lxqt/lxqt-powermanagement/default.nix +++ b/pkgs/desktops/lxqt/lxqt-powermanagement/default.nix @@ -48,9 +48,9 @@ mkDerivation rec { passthru.updateScript = lxqtUpdateScript { inherit pname version src; }; meta = with lib; { - description = "Power management module for LXQt"; homepage = "https://github.com/lxqt/lxqt-powermanagement"; - license = licenses.lgpl21; + description = "Power management module for LXQt"; + license = licenses.lgpl21Plus; platforms = platforms.linux; maintainers = with maintainers; [ romildo ]; }; diff --git a/pkgs/desktops/lxqt/lxqt-qtplugin/default.nix b/pkgs/desktops/lxqt/lxqt-qtplugin/default.nix index 5fbf9f8f568..d19abcfe952 100644 --- a/pkgs/desktops/lxqt/lxqt-qtplugin/default.nix +++ b/pkgs/desktops/lxqt/lxqt-qtplugin/default.nix @@ -47,9 +47,9 @@ mkDerivation rec { passthru.updateScript = lxqtUpdateScript { inherit pname version src; }; meta = with lib; { - description = "LXQt Qt platform integration plugin"; homepage = "https://github.com/lxqt/lxqt-qtplugin"; - license = licenses.lgpl21; + description = "LXQt Qt platform integration plugin"; + license = licenses.lgpl21Plus; platforms = platforms.linux; maintainers = with maintainers; [ romildo ]; }; diff --git a/pkgs/desktops/lxqt/lxqt-runner/default.nix b/pkgs/desktops/lxqt/lxqt-runner/default.nix index 41a673fc345..3f80800310f 100644 --- a/pkgs/desktops/lxqt/lxqt-runner/default.nix +++ b/pkgs/desktops/lxqt/lxqt-runner/default.nix @@ -52,9 +52,9 @@ mkDerivation rec { passthru.updateScript = lxqtUpdateScript { inherit pname version src; }; meta = with lib; { - description = "Tool used to launch programs quickly by typing their names"; homepage = "https://github.com/lxqt/lxqt-runner"; - license = licenses.lgpl21; + description = "Tool used to launch programs quickly by typing their names"; + license = licenses.lgpl21Plus; platforms = platforms.linux; maintainers = with maintainers; [ romildo ]; }; diff --git a/pkgs/desktops/lxqt/lxqt-session/default.nix b/pkgs/desktops/lxqt/lxqt-session/default.nix index 4be5eab5d94..4c29a249dde 100644 --- a/pkgs/desktops/lxqt/lxqt-session/default.nix +++ b/pkgs/desktops/lxqt/lxqt-session/default.nix @@ -49,9 +49,9 @@ mkDerivation rec { passthru.updateScript = lxqtUpdateScript { inherit pname version src; }; meta = with lib; { - description = "An alternative session manager ported from the original razor-session"; homepage = "https://github.com/lxqt/lxqt-session"; - license = licenses.lgpl21; + description = "An alternative session manager ported from the original razor-session"; + license = licenses.lgpl21Plus; platforms = platforms.linux; maintainers = with maintainers; [ romildo ]; }; diff --git a/pkgs/desktops/lxqt/lxqt-sudo/default.nix b/pkgs/desktops/lxqt/lxqt-sudo/default.nix index a6fef7479ab..79168795c60 100644 --- a/pkgs/desktops/lxqt/lxqt-sudo/default.nix +++ b/pkgs/desktops/lxqt/lxqt-sudo/default.nix @@ -44,9 +44,9 @@ mkDerivation rec { passthru.updateScript = lxqtUpdateScript { inherit pname version src; }; meta = with lib; { - description = "GUI frontend for sudo/su"; homepage = "https://github.com/lxqt/lxqt-sudo"; - license = licenses.lgpl21; + description = "GUI frontend for sudo/su"; + license = licenses.lgpl21Plus; platforms = platforms.linux; maintainers = with maintainers; [ romildo ]; }; diff --git a/pkgs/desktops/lxqt/lxqt-themes/default.nix b/pkgs/desktops/lxqt/lxqt-themes/default.nix index 5ab100bd101..08ba99c9606 100644 --- a/pkgs/desktops/lxqt/lxqt-themes/default.nix +++ b/pkgs/desktops/lxqt/lxqt-themes/default.nix @@ -25,9 +25,9 @@ mkDerivation rec { passthru.updateScript = lxqtUpdateScript { inherit pname version src; }; meta = with lib; { - description = "Themes, graphics and icons for LXQt"; homepage = "https://github.com/lxqt/lxqt-themes"; - license = licenses.lgpl21; + description = "Themes, graphics and icons for LXQt"; + license = licenses.lgpl21Plus; platforms = platforms.linux; maintainers = with maintainers; [ romildo ]; }; diff --git a/pkgs/desktops/lxqt/obconf-qt/default.nix b/pkgs/desktops/lxqt/obconf-qt/default.nix index 5772dfcf9e7..442c4c940b0 100644 --- a/pkgs/desktops/lxqt/obconf-qt/default.nix +++ b/pkgs/desktops/lxqt/obconf-qt/default.nix @@ -44,9 +44,9 @@ mkDerivation rec { passthru.updateScript = lxqtUpdateScript { inherit pname version src; }; meta = with lib; { - description = "The Qt port of obconf, the Openbox configuration tool"; homepage = "https://github.com/lxqt/obconf-qt"; - license = licenses.gpl2; + description = "The Qt port of obconf, the Openbox configuration tool"; + license = licenses.gpl2Plus; platforms = with platforms; unix; maintainers = with maintainers; [ romildo ]; }; diff --git a/pkgs/desktops/lxqt/pavucontrol-qt/default.nix b/pkgs/desktops/lxqt/pavucontrol-qt/default.nix index cd6d177b2ef..e996eefc903 100644 --- a/pkgs/desktops/lxqt/pavucontrol-qt/default.nix +++ b/pkgs/desktops/lxqt/pavucontrol-qt/default.nix @@ -39,9 +39,9 @@ mkDerivation rec { passthru.updateScript = lxqt.lxqtUpdateScript { inherit pname version src; }; meta = with lib; { - description = "A Pulseaudio mixer in Qt (port of pavucontrol)"; homepage = "https://github.com/lxqt/pavucontrol-qt"; - license = licenses.gpl2; + description = "A Pulseaudio mixer in Qt (port of pavucontrol)"; + license = licenses.gpl2Plus; platforms = with platforms; linux; maintainers = with maintainers; [ romildo ]; }; diff --git a/pkgs/desktops/lxqt/pcmanfm-qt/default.nix b/pkgs/desktops/lxqt/pcmanfm-qt/default.nix index a2378fafd55..2fa7879d58e 100644 --- a/pkgs/desktops/lxqt/pcmanfm-qt/default.nix +++ b/pkgs/desktops/lxqt/pcmanfm-qt/default.nix @@ -47,9 +47,9 @@ mkDerivation rec { ''; meta = with lib; { - description = "File manager and desktop icon manager (Qt port of PCManFM and libfm)"; homepage = "https://github.com/lxqt/pcmanfm-qt"; - license = licenses.gpl2; + description = "File manager and desktop icon manager (Qt port of PCManFM and libfm)"; + license = licenses.gpl2Plus; platforms = with platforms; unix; maintainers = with maintainers; [ romildo ]; }; diff --git a/pkgs/desktops/lxqt/qps/default.nix b/pkgs/desktops/lxqt/qps/default.nix index fea3db315cf..be28b589ca1 100644 --- a/pkgs/desktops/lxqt/qps/default.nix +++ b/pkgs/desktops/lxqt/qps/default.nix @@ -40,9 +40,9 @@ mkDerivation rec { passthru.updateScript = lxqtUpdateScript { inherit pname version src; }; meta = with lib; { - description = "Qt based process manager"; homepage = "https://github.com/lxqt/qps"; - license = licenses.gpl2; + description = "Qt based process manager"; + license = licenses.gpl2Plus; platforms = with platforms; linux; # does not build on darwin maintainers = with maintainers; [ romildo ]; }; diff --git a/pkgs/desktops/lxqt/qterminal/default.nix b/pkgs/desktops/lxqt/qterminal/default.nix index 47a621d2198..740cc09fca5 100644 --- a/pkgs/desktops/lxqt/qterminal/default.nix +++ b/pkgs/desktops/lxqt/qterminal/default.nix @@ -36,9 +36,9 @@ mkDerivation rec { passthru.updateScript = lxqtUpdateScript { inherit pname version src; }; meta = with lib; { - description = "A lightweight Qt-based terminal emulator"; homepage = "https://github.com/lxqt/qterminal"; - license = licenses.gpl2; + description = "A lightweight Qt-based terminal emulator"; + license = licenses.gpl2Plus; platforms = with platforms; unix; maintainers = with maintainers; [ romildo globin ]; }; diff --git a/pkgs/desktops/lxqt/qtermwidget/default.nix b/pkgs/desktops/lxqt/qtermwidget/default.nix index 2517b7a4447..5970827f458 100644 --- a/pkgs/desktops/lxqt/qtermwidget/default.nix +++ b/pkgs/desktops/lxqt/qtermwidget/default.nix @@ -32,9 +32,9 @@ mkDerivation rec { passthru.updateScript = lxqtUpdateScript { inherit pname version src; }; meta = with lib; { - description = "A terminal emulator widget for Qt 5"; homepage = "https://github.com/lxqt/qtermwidget"; - license = licenses.gpl2; + description = "A terminal emulator widget for Qt 5"; + license = licenses.gpl2Plus; platforms = with platforms; unix; maintainers = with maintainers; [ romildo ]; }; diff --git a/pkgs/desktops/lxqt/screengrab/default.nix b/pkgs/desktops/lxqt/screengrab/default.nix index bc4f0f0de9f..36174c870df 100644 --- a/pkgs/desktops/lxqt/screengrab/default.nix +++ b/pkgs/desktops/lxqt/screengrab/default.nix @@ -45,9 +45,9 @@ mkDerivation rec { passthru.updateScript = lxqtUpdateScript { inherit pname version src; }; meta = with lib; { - description = "Crossplatform tool for fast making screenshots"; homepage = "https://github.com/lxqt/screengrab"; - license = licenses.gpl2; + description = "Crossplatform tool for fast making screenshots"; + license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = with maintainers; [ romildo ]; }; diff --git a/pkgs/development/beam-modules/default.nix b/pkgs/development/beam-modules/default.nix index 570155e4d1a..02877a95411 100644 --- a/pkgs/development/beam-modules/default.nix +++ b/pkgs/development/beam-modules/default.nix @@ -33,6 +33,7 @@ let buildRebar3 = callPackage ./build-rebar3.nix {}; buildHex = callPackage ./build-hex.nix {}; buildErlangMk = callPackage ./build-erlang-mk.nix {}; + fetchMixDeps = callPackage ./fetch-mix-deps.nix { }; buildMix = callPackage ./build-mix.nix {}; # BEAM-based languages. diff --git a/pkgs/development/beam-modules/fetch-mix-deps.nix b/pkgs/development/beam-modules/fetch-mix-deps.nix new file mode 100644 index 00000000000..020a82ad70b --- /dev/null +++ b/pkgs/development/beam-modules/fetch-mix-deps.nix @@ -0,0 +1,40 @@ +{ stdenvNoCC, lib, elixir, hex, rebar, rebar3, cacert, git }: + +{ name, version, sha256, src, mixEnv ? "prod", debug ? false, meta ? { } }: + +stdenvNoCC.mkDerivation ({ + name = "mix-deps-${name}-${version}"; + + nativeBuildInputs = [ elixir hex cacert git ]; + + inherit src; + + MIX_ENV = mixEnv; + MIX_DEBUG = if debug then 1 else 0; + DEBUG = if debug then 1 else 0; # for rebar3 + + configurePhase = '' + export HEX_HOME="$TEMPDIR/.hex"; + export MIX_HOME="$TEMPDIR/.mix"; + export MIX_DEPS_PATH="$out"; + + # Rebar + mix local.rebar rebar "${rebar}/bin/rebar" + mix local.rebar rebar3 "${rebar3}/bin/rebar3" + export REBAR_GLOBAL_CONFIG_DIR="$TMPDIR/rebar3" + export REBAR_CACHE_DIR="$TMPDIR/rebar3.cache" + ''; + + dontBuild = true; + + installPhase = '' + mix deps.get --only ${mixEnv} + ''; + + outputHashAlgo = "sha256"; + outputHashMode = "recursive"; + outputHash = sha256; + + impureEnvVars = lib.fetchers.proxyImpureEnvVars; + inherit meta; +}) diff --git a/pkgs/development/compilers/gleam/default.nix b/pkgs/development/compilers/gleam/default.nix index b9c7e7e1e3d..78a335f1b7b 100644 --- a/pkgs/development/compilers/gleam/default.nix +++ b/pkgs/development/compilers/gleam/default.nix @@ -22,6 +22,6 @@ rustPlatform.buildRustPackage rec { description = "A statically typed language for the Erlang VM"; homepage = "https://gleam.run/"; license = licenses.asl20; - maintainers = with maintainers; [ Br1ght0ne ]; + maintainers = teams.beam.members; }; } diff --git a/pkgs/development/compilers/graalvm/enterprise-edition.nix b/pkgs/development/compilers/graalvm/enterprise-edition.nix index c9c5206f6da..eb3045d52ad 100644 --- a/pkgs/development/compilers/graalvm/enterprise-edition.nix +++ b/pkgs/development/compilers/graalvm/enterprise-edition.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, requireFile, perl, unzip, glibc, zlib, bzip2, gdk-pixbuf, xorg, glib, fontconfig, freetype, cairo, pango, gtk3, gtk2, ffmpeg, libGL, atk, alsaLib, libav_0_8, setJavaClassPath }: +{ lib, stdenv, requireFile, perl, unzip, glibc, zlib, bzip2, gdk-pixbuf, xorg, glib, fontconfig, freetype, cairo, pango, gtk3, gtk2, ffmpeg, libGL, atk, alsaLib, setJavaClassPath }: let common = javaVersion: diff --git a/pkgs/development/compilers/zulu/8.nix b/pkgs/development/compilers/zulu/8.nix index e81cc412428..2bc90539be1 100644 --- a/pkgs/development/compilers/zulu/8.nix +++ b/pkgs/development/compilers/zulu/8.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchurl, unzip, makeWrapper, setJavaClassPath -, zulu, glib, libxml2, libav_0_8, ffmpeg_3, libxslt, libGL, alsaLib +, zulu, glib, libxml2, ffmpeg_3, libxslt, libGL, alsaLib , fontconfig, freetype, pango, gtk2, cairo, gdk-pixbuf, atk, xorg , swingSupport ? true }: @@ -15,7 +15,7 @@ let extension = if stdenv.isDarwin then "zip" else "tar.gz"; libraries = [ - stdenv.cc.libc glib libxml2 libav_0_8 ffmpeg_3 libxslt libGL + stdenv.cc.libc glib libxml2 ffmpeg_3 libxslt libGL xorg.libXxf86vm alsaLib fontconfig freetype pango gtk2 cairo gdk-pixbuf atk ] ++ (lib.optionals swingSupport (with xorg; [ diff --git a/pkgs/development/compilers/zulu/default.nix b/pkgs/development/compilers/zulu/default.nix index 63b95465c27..cbfa9997b8d 100644 --- a/pkgs/development/compilers/zulu/default.nix +++ b/pkgs/development/compilers/zulu/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchurl, unzip, makeWrapper, setJavaClassPath -, zulu, glib, libxml2, libav_0_8, ffmpeg_3, libxslt, libGL, alsaLib +, zulu, glib, libxml2, ffmpeg_3, libxslt, libGL, alsaLib , fontconfig, freetype, pango, gtk2, cairo, gdk-pixbuf, atk, xorg, zlib , swingSupport ? true }: @@ -15,7 +15,7 @@ let extension = if stdenv.isDarwin then "zip" else "tar.gz"; libraries = [ - stdenv.cc.libc glib libxml2 libav_0_8 ffmpeg_3 libxslt libGL + stdenv.cc.libc glib libxml2 ffmpeg_3 libxslt libGL xorg.libXxf86vm alsaLib fontconfig freetype pango gtk2 cairo gdk-pixbuf atk zlib ] ++ (lib.optionals swingSupport (with xorg; [ diff --git a/pkgs/development/interpreters/elixir/generic-builder.nix b/pkgs/development/interpreters/elixir/generic-builder.nix index 358fff039c6..85e5fdf733c 100644 --- a/pkgs/development/interpreters/elixir/generic-builder.nix +++ b/pkgs/development/interpreters/elixir/generic-builder.nix @@ -69,6 +69,6 @@ in license = licenses.epl10; platforms = platforms.unix; - maintainers = with maintainers; [ havvy couchemar ankhers Br1ght0ne ]; + maintainers = teams.beam.members; }; }) diff --git a/pkgs/development/interpreters/erlang/generic-builder.nix b/pkgs/development/interpreters/erlang/generic-builder.nix index 4429dc1eaf3..0db577ca6eb 100644 --- a/pkgs/development/interpreters/erlang/generic-builder.nix +++ b/pkgs/development/interpreters/erlang/generic-builder.nix @@ -126,7 +126,7 @@ in stdenv.mkDerivation ({ ''; platforms = platforms.unix; - maintainers = with maintainers; [ sjmackenzie couchemar gleber ]; + maintainers = teams.beam.members; license = licenses.asl20; } // meta); } diff --git a/pkgs/development/interpreters/lfe/generic-builder.nix b/pkgs/development/interpreters/lfe/generic-builder.nix index 895054fac46..397be81e7c8 100644 --- a/pkgs/development/interpreters/lfe/generic-builder.nix +++ b/pkgs/development/interpreters/lfe/generic-builder.nix @@ -87,7 +87,7 @@ buildRebar3 { downloadPage = "https://github.com/rvirding/lfe/releases"; license = licenses.asl20; - maintainers = with maintainers; [ yurrriq ankhers ]; + maintainers = teams.beam.members; platforms = platforms.unix; }; } diff --git a/pkgs/development/interpreters/php/7.3.nix b/pkgs/development/interpreters/php/7.3.nix index 13b64e8cb6e..d611cb7693c 100644 --- a/pkgs/development/interpreters/php/7.3.nix +++ b/pkgs/development/interpreters/php/7.3.nix @@ -4,8 +4,8 @@ let generic = (import ./generic.nix) _args; base = callPackage generic (_args // { - version = "7.3.26"; - sha256 = "0klxnf6nhsib9b2mdls1x2wbpi04gmgwxajbn593rzalh5y5l7ip"; + version = "7.3.27"; + sha256 = "00z0vadxazm2flks9g8qmchj2pwkli880kg313jgbb1mx3shc84x"; # https://bugs.php.net/bug.php?id=76826 extraPatches = lib.optional stdenv.isDarwin ./php73-darwin-isfinite.patch; diff --git a/pkgs/development/interpreters/php/7.4.nix b/pkgs/development/interpreters/php/7.4.nix index 9ee0c9c9e7c..42aa28b65e6 100644 --- a/pkgs/development/interpreters/php/7.4.nix +++ b/pkgs/development/interpreters/php/7.4.nix @@ -4,8 +4,8 @@ let generic = (import ./generic.nix) _args; base = callPackage generic (_args // { - version = "7.4.14"; - sha256 = "1xm1s2w9fsd8q7kjbpqw8s4bs7ggziwws23m0ykkmvmd0l3cm2b8"; + version = "7.4.15"; + sha256 = "0mvp7b16sy9j36v9v1mhixwz16hi8mhax7rwpqy3sv24jc1bxmqv"; }); in base.withExtensions ({ all, ... }: with all; ([ diff --git a/pkgs/development/interpreters/php/8.0.nix b/pkgs/development/interpreters/php/8.0.nix index 5779c836dd4..a4aa4842dfa 100644 --- a/pkgs/development/interpreters/php/8.0.nix +++ b/pkgs/development/interpreters/php/8.0.nix @@ -4,8 +4,8 @@ let generic = (import ./generic.nix) _args; base = callPackage generic (_args // { - version = "8.0.1"; - sha256 = "1vmx9rhks8v2198f9d6cq62bway5mrfsz72garjdwcyi82ppckn4"; + version = "8.0.2"; + sha256 = "1rm3gc2h9l0zd1ccawpg1wxqm8v8rllq417f2w5pqcdf7sgah3q0"; }); in base.withExtensions ({ all, ... }: with all; ([ diff --git a/pkgs/development/libraries/aws-checksums/default.nix b/pkgs/development/libraries/aws-checksums/default.nix index bf50401a213..75b26695e2f 100644 --- a/pkgs/development/libraries/aws-checksums/default.nix +++ b/pkgs/development/libraries/aws-checksums/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "aws-checksums"; - version = "0.1.10"; + version = "0.1.11"; src = fetchFromGitHub { owner = "awslabs"; repo = pname; rev = "v${version}"; - sha256 = "1f9scl5734pgjlsixspwljrrlndzhllwlfygdcr1gx5p0za08zjb"; + sha256 = "sha256-fXu7GI2UR9QiBGP2n2pEFRjz9ZwA+BAK9zxhNnoYWt4="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/cfitsio/default.nix b/pkgs/development/libraries/cfitsio/default.nix index 28bb0761777..a430bc31793 100644 --- a/pkgs/development/libraries/cfitsio/default.nix +++ b/pkgs/development/libraries/cfitsio/default.nix @@ -1,21 +1,18 @@ -{ fetchurl, lib, stdenv - -# Optional dependencies -, bzip2 ? null }: +{ fetchurl, lib, stdenv, bzip2 }: stdenv.mkDerivation rec { pname = "cfitsio"; - version = "3.47"; + version = "3.49"; src = fetchurl { url = "https://heasarc.gsfc.nasa.gov/FTP/software/fitsio/c/cfitsio-${version}.tar.gz"; - sha256 = "1vzlxnrjckz78p2wf148v2z3krkwnykfqvlj42sz3q711vqid1a1"; + sha256 = "1cyl1qksnkl3cq1fzl4dmjvkd6329b57y9iqyv44wjakbh6s4rav"; }; buildInputs = [ bzip2 ]; patches = [ ./darwin-rpath-universal.patch ]; - configureFlags = lib.optional (bzip2 != null) "--with-bzip2=${bzip2.out}"; + configureFlags = "--with-bzip2=${bzip2.out}"; hardeningDisable = [ "format" ]; diff --git a/pkgs/development/libraries/doctest/default.nix b/pkgs/development/libraries/doctest/default.nix index 702015e5d38..233e01e0380 100644 --- a/pkgs/development/libraries/doctest/default.nix +++ b/pkgs/development/libraries/doctest/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://github.com/onqtam/doctest"; description = "The fastest feature-rich C++11/14/17/20 single-header testing framework"; - platforms = platforms.linux; + platforms = platforms.all; license = licenses.mit; maintainers = with maintainers; [ davidtwco ]; }; diff --git a/pkgs/development/libraries/gensio/default.nix b/pkgs/development/libraries/gensio/default.nix index 3e4b68ec79c..4efc713bb1d 100644 --- a/pkgs/development/libraries/gensio/default.nix +++ b/pkgs/development/libraries/gensio/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "gensio"; - version = "2.2.3"; + version = "2.2.4"; src = fetchFromGitHub { owner = "cminyard"; repo = pname; rev = "v${version}"; - sha256 = "sha256-jWKm64RvVkeA/Zvy8VIAXMykuqv2FEzsduN2zcPm4ME="; + sha256 = "sha256-tdMdIudB8zZWXF+Q0YhFo9Q4VHjLJh3rdfQsYhgo2DU="; }; passthru = { diff --git a/pkgs/development/libraries/jsoncpp/default.nix b/pkgs/development/libraries/jsoncpp/default.nix index 71b0d7b9a92..b7754a186d1 100644 --- a/pkgs/development/libraries/jsoncpp/default.nix +++ b/pkgs/development/libraries/jsoncpp/default.nix @@ -13,6 +13,14 @@ stdenv.mkDerivation rec { sha256 = "0qnx5y6c90fphl9mj9d20j2dfgy6s5yr5l0xnzid0vh71zrp6jwv"; }; + patches = [ + # Fix for https://github.com/open-source-parsers/jsoncpp/issues/1235. + (fetchpatch { + url = "https://github.com/open-source-parsers/jsoncpp/commit/ac2870298ed5b5a96a688d9df07461b31f83e906.patch"; + sha256 = "02wswhiwypmf1jn3rj9q1fw164kljiv4l8h0q6wyijzr77hq4wsg"; + }) + ]; + /* During darwin bootstrap, we have a cp that doesn't understand the * --reflink=auto flag, which is used in the default unpackPhase for dirs */ diff --git a/pkgs/development/libraries/libav/default.nix b/pkgs/development/libraries/libav/default.nix index 93d6e0d209c..ad95edb68cb 100644 --- a/pkgs/development/libraries/libav/default.nix +++ b/pkgs/development/libraries/libav/default.nix @@ -127,6 +127,10 @@ let license = with licenses; if enableUnfree then unfree #ToDo: redistributable or not? else if enableGPL then gpl2Plus else lgpl21Plus; platforms = with platforms; linux ++ darwin; + knownVulnerabilities = + lib.optional (lib.versionOlder version "12.1") "CVE-2017-9051" + ++ lib.optionals (lib.versionOlder version "12.3") [ "CVE-2018-5684" "CVE-2018-5766" ] + ++ lib.optionals (lib.versionOlder version "12.4") [ "CVE-2019-9717" "CVE-2019-9720" ]; }; }; # libavFun diff --git a/pkgs/development/libraries/libfm/default.nix b/pkgs/development/libraries/libfm/default.nix index dc835924125..255ddfa22ad 100644 --- a/pkgs/development/libraries/libfm/default.nix +++ b/pkgs/development/libraries/libfm/default.nix @@ -1,32 +1,40 @@ -{ lib, stdenv, fetchurl, glib, intltool, menu-cache, pango, pkg-config, vala +{ lib +, stdenv +, fetchurl +, glib +, intltool +, menu-cache +, pango +, pkg-config +, vala , extraOnly ? false -, withGtk3 ? false, gtk2, gtk3 }: +, withGtk3 ? false, gtk2, gtk3 +}: + let gtk = if withGtk3 then gtk3 else gtk2; inherit (lib) optional; in stdenv.mkDerivation rec { - name = if extraOnly - then "libfm-extra-${version}" - else "libfm-${version}"; - version = "1.3.1"; + pname = if extraOnly + then "libfm-extra" + else "libfm"; + version = "1.3.2"; src = fetchurl { url = "mirror://sourceforge/pcmanfm/libfm-${version}.tar.xz"; - sha256 = "1r6gl49xrykldwz8y4h2s7gjarxigg3bbkrj0gphxjj1vr5j9ccn"; + sha256 = "sha256-pQQmMDBM+OXYz/nVZca9VG8ii0jJYBU+02ajTofK0eU="; }; nativeBuildInputs = [ vala pkg-config intltool ]; - buildInputs = [ glib gtk pango ] ++ optional (!extraOnly) menu-cache; + buildInputs = [ glib gtk pango ] + ++ optional (!extraOnly) menu-cache; - configureFlags = [ - "--sysconfdir=/etc" - ] ++ optional extraOnly "--with-extra-only" - ++ optional withGtk3 "--with-gtk=3"; + configureFlags = [ "--sysconfdir=/etc" ] + ++ optional extraOnly "--with-extra-only" + ++ optional withGtk3 "--with-gtk=3"; - installFlags = [ - "sysconfdir=${placeholder "out"}/etc" - ]; + installFlags = [ "sysconfdir=${placeholder "out"}/etc" ]; # libfm-extra is pulled in by menu-cache and thus leads to a collision for libfm postInstall = optional (!extraOnly) '' diff --git a/pkgs/development/libraries/libgroove/default.nix b/pkgs/development/libraries/libgroove/default.nix index 963bf722b2a..f14524df0dc 100644 --- a/pkgs/development/libraries/libgroove/default.nix +++ b/pkgs/development/libraries/libgroove/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, libav, SDL2, chromaprint, libebur128 }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, ffmpeg_3, SDL2, chromaprint, libebur128 }: stdenv.mkDerivation rec { version = "4.3.0"; @@ -11,10 +11,17 @@ stdenv.mkDerivation rec { sha256 = "1la9d9kig50mc74bxvhx6hzqv0nrci9aqdm4k2j4q0s1nlfgxipd"; }; - patches = [ ./no-warnings-as-errors.patch ]; + patches = [ + ./no-warnings-as-errors.patch + (fetchpatch { + name = "update-for-ffmpeg-3.0.patch"; + url = "https://aur.archlinux.org/cgit/aur.git/plain/0001-update-for-ffmpeg-3.0.patch?h=libgroove&id=a9f3bd2a5afd3227733414a5d54c7a2aa0a1249e"; + sha256 = "0800drk9df1kwbv80f2ffv77xk888249fk0d961rp2a305hvyrk0"; + }) + ]; nativeBuildInputs = [ cmake ]; - buildInputs = [ libav SDL2 chromaprint libebur128 ]; + buildInputs = [ ffmpeg_3 SDL2 chromaprint libebur128 ]; meta = with lib; { description = "Streaming audio processing library"; diff --git a/pkgs/development/libraries/libhugetlbfs/default.nix b/pkgs/development/libraries/libhugetlbfs/default.nix index ed5f67d4370..061fe51ed5b 100644 --- a/pkgs/development/libraries/libhugetlbfs/default.nix +++ b/pkgs/development/libraries/libhugetlbfs/default.nix @@ -1,26 +1,16 @@ -{ stdenv, lib, fetchurl, fetchpatch }: +{ stdenv, lib, fetchurl }: stdenv.mkDerivation rec { pname = "libhugetlbfs"; - version = "2.22"; + version = "2.23"; src = fetchurl { url = "https://github.com/libhugetlbfs/libhugetlbfs/releases/download/${version}/libhugetlbfs-${version}.tar.gz"; - sha256 = "11b7k8xvgx68rjzidm12a6l6b23hwi7hj149y9xxfz2j5kmakp4l"; + sha256 = "0ya4q001g111d3pqlzrf3yaifadl0ccirx5dndz1pih7x3qp41mp"; }; outputs = [ "bin" "dev" "man" "doc" "lib" "out" ]; - patches = [ - # Don't check that 32-bit and 64-bit libraries don't get installed - # to the same place if only one platform is being built for. - # Can be removed if build succeeds without it. - (fetchpatch { - url = "https://groups.google.com/forum/message/raw?msg=libhugetlbfs/IswjDAygfwA/PKy7MZbVAAAJ"; - sha256 = "00fyrhn380d6swil8pcf4x0krl1113ghswrvjn3m9czc3h4p385a"; - }) - ]; - postConfigure = '' patchShebangs ld.hugetlbfs ''; @@ -34,8 +24,8 @@ stdenv.mkDerivation rec { "LIBDIR64=$(lib)/$(LIB64)" "EXEDIR=$(bin)/bin" "DOCDIR=$(doc)/share/doc/libhugetlbfs" - ] ++ map (n: "MANDIR${n}=$(man)/share/man/man${n}") - (lib.genList (n: toString (n + 1)) 8); + "MANDIR=$(man)/share/man" + ]; # Default target builds tests as well, and the tests want a static # libc. diff --git a/pkgs/development/libraries/libvirt/5.9.0.nix b/pkgs/development/libraries/libvirt/5.9.0.nix index 76466a1a9f5..c11d698079b 100644 --- a/pkgs/development/libraries/libvirt/5.9.0.nix +++ b/pkgs/development/libraries/libvirt/5.9.0.nix @@ -133,5 +133,10 @@ in stdenv.mkDerivation rec { license = licenses.lgpl2Plus; platforms = platforms.unix; maintainers = with maintainers; [ fpletz globin ]; + knownVulnerabilities = [ + "https://security.libvirt.org/2019/0008.html" + "https://security.libvirt.org/2019/0009.html" + "https://security.libvirt.org/2020/0001.html" + ]; }; } diff --git a/pkgs/development/libraries/openxr-loader/default.nix b/pkgs/development/libraries/openxr-loader/default.nix index 2f901f0e412..452f72146d9 100644 --- a/pkgs/development/libraries/openxr-loader/default.nix +++ b/pkgs/development/libraries/openxr-loader/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "openxr-loader"; - version = "1.0.13"; + version = "1.0.14"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "OpenXR-SDK-Source"; rev = "release-${version}"; - sha256 = "0znhv7x81bvqijk5xhc5w760d5yy6vr5c2y271wpk9lkmxbbcpl1"; + sha256 = "sha256-ZmaxHm4MPd2q83PLduoavoynqRPEI79IpMfW32gkV14="; }; nativeBuildInputs = [ cmake python3 ]; diff --git a/pkgs/development/libraries/rocksdb/default.nix b/pkgs/development/libraries/rocksdb/default.nix index dea8fcc6759..e4ee3c47307 100644 --- a/pkgs/development/libraries/rocksdb/default.nix +++ b/pkgs/development/libraries/rocksdb/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "rocksdb"; - version = "6.15.4"; + version = "6.15.5"; src = fetchFromGitHub { owner = "facebook"; repo = pname; rev = "v${version}"; - sha256 = "06lddr6md4ypmywvi6qrrkw97c8ddz0flj43hzx32ia3iq2mw4w5"; + sha256 = "sha256-o7bi0xcWaH5DXcEJgfY7MxhYfntqhzGoko6EqgrKyY8="; }; nativeBuildInputs = [ cmake ninja ]; diff --git a/pkgs/development/libraries/sharness/default.nix b/pkgs/development/libraries/sharness/default.nix new file mode 100644 index 00000000000..43a102686e9 --- /dev/null +++ b/pkgs/development/libraries/sharness/default.nix @@ -0,0 +1,51 @@ +{ stdenv +, lib +, fetchFromGitHub +, fetchurl +, perl +, perlPackages +, sharnessExtensions ? {} }: + +stdenv.mkDerivation rec { + pname = "sharness"; + version = "1.1.0-dev"; + + src = fetchFromGitHub { + owner = "chriscool"; + repo = pname; + rev = "3f238a740156dd2082f4bd60ced205e05894d367"; # 2020-12-09 + sha256 = "FCYskpIqkrpNaWCi2LkhEkiow4/rXLe+lfEWNUthLUg="; + }; + + # Used for testing + nativeBuildInputs = [ perl perlPackages.IOTty ]; + + outputs = [ "out" "doc" ]; + + makeFlags = [ "prefix=$(out)" ]; + + extensions = lib.mapAttrsToList (k: v: "${k}.sh ${v}") sharnessExtensions; + + postInstall = lib.optionalString (sharnessExtensions != {}) '' + extDir=$out/share/sharness/sharness.d + mkdir -p "$extDir" + linkExtensions() { + set -- $extensions + while [ $# -ge 2 ]; do + ln -s "$2" "$extDir/$1" + shift 2 + done + } + linkExtensions + ''; + + doCheck = true; + + meta = with lib; { + description = "Portable shell library to write, run and analyze automated tests adhering to Test Anything Protocol (TAP)"; + homepage = "https://github.com/chriscool/sharness"; + license = licenses.gpl2Only; + maintainers = [ maintainers.spacefrogg ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/development/libraries/sundials/default.nix b/pkgs/development/libraries/sundials/default.nix index f8db8f3c379..3536ebd586e 100644 --- a/pkgs/development/libraries/sundials/default.nix +++ b/pkgs/development/libraries/sundials/default.nix @@ -1,7 +1,6 @@ { lib, stdenv , cmake , fetchurl -, fetchpatch , python , blas , lapack @@ -13,24 +12,15 @@ stdenv.mkDerivation rec { pname = "sundials"; - version = "5.6.1"; + version = "5.7.0"; outputs = [ "out" "examples" ]; src = fetchurl { url = "https://computation.llnl.gov/projects/${pname}/download/${pname}-${version}.tar.gz"; - sha256 = "Frd5mex+fyFXqh0Eyh3kojccqBUOBW0klR0MWJZvKoM="; + sha256 = "jW3QlP7Mu41uzEE0DsFqZfq6yC7UQVAj9tfBwjkOovM="; }; - patches = [ - # Fixing an upstream regression in treating cmake prefix directories: - # https://github.com/LLNL/sundials/pull/58 - (fetchpatch { - url = "https://github.com/LLNL/sundials/commit/dd32ff9baa05618f36e44aadb420bbae4236ea1e.patch"; - sha256 = "kToAuma+2iHFyL1v/l29F3+nug4AdK5cPG6IcXv2afc="; - }) - ]; - nativeBuildInputs = [ cmake ]; buildInputs = [ diff --git a/pkgs/development/libraries/tiledb/default.nix b/pkgs/development/libraries/tiledb/default.nix index 560a991c44a..4e6e49d68c4 100644 --- a/pkgs/development/libraries/tiledb/default.nix +++ b/pkgs/development/libraries/tiledb/default.nix @@ -21,13 +21,13 @@ stdenv.mkDerivation rec { pname = "tiledb"; - version = "2.1.3"; + version = "2.2.3"; src = fetchFromGitHub { owner = "TileDB-Inc"; repo = "TileDB"; rev = version; - sha256 = "1ia00bk6dc1176arf84lx08x4c7c74q7ycn7dqjnmyxkg3kmr21g"; + sha256 = "sha256-QYJ5dJQyVy0GLVKRcwb2WBK4IE1q/jXl1OQGau0HBSg="; }; # (bundled) blosc headers have a warning on some archs that it will be using diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index 0065061590a..11d38da548b 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -319,31 +319,31 @@ let sha512 = "vG6SvB6oYEhvgisZNFRmRCUkLz11c7rp+tbNTynGqc6mS1d5ATd/sGyV6W0KZZnXRKMTzZDRgQT3Ou9jhpAfUg=="; }; }; - "@babel/code-frame-7.12.11" = { + "@babel/code-frame-7.12.13" = { name = "_at_babel_slash_code-frame"; packageName = "@babel/code-frame"; - version = "7.12.11"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.12.11.tgz"; - sha512 = "Zt1yodBx1UcyiePMSkWnU4hPqhwq7hGi2nFL1LeA3EUl+q2LQx16MISgJ0+z7dnmgvP9QtIleuETGOiOH1RcIw=="; + url = "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.12.13.tgz"; + sha512 = "HV1Cm0Q3ZrpCR93tkWOYiuYIgLxZXZFVG2VgK+MBWjUqZTundupbfx2aXarXuw5Ko5aMcjtJgbSs4vUGBS5v6g=="; }; }; - "@babel/compat-data-7.12.7" = { + "@babel/compat-data-7.12.13" = { name = "_at_babel_slash_compat-data"; packageName = "@babel/compat-data"; - version = "7.12.7"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.12.7.tgz"; - sha512 = "YaxPMGs/XIWtYqrdEOZOCPsVWfEoriXopnsz3/i7apYPXQ3698UFhS6dVT1KN5qOsWmVgw/FOrmQgpRaZayGsw=="; + url = "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.12.13.tgz"; + sha512 = "U/hshG5R+SIoW7HVWIdmy1cB7s3ki+r3FpyEZiCgpi4tFgPnX/vynY80ZGSASOIrUM6O7VxOgCZgdt7h97bUGg=="; }; }; - "@babel/core-7.12.10" = { + "@babel/core-7.12.13" = { name = "_at_babel_slash_core"; packageName = "@babel/core"; - version = "7.12.10"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/core/-/core-7.12.10.tgz"; - sha512 = "eTAlQKq65zHfkHZV0sIVODCPGVgoo1HdBlbSLi9CqOzuZanMv2ihzY+4paiKr1mH+XmYESMAmJ/dpZ68eN6d8w=="; + url = "https://registry.npmjs.org/@babel/core/-/core-7.12.13.tgz"; + sha512 = "BQKE9kXkPlXHPeqissfxo0lySWJcYdEP0hdtJOH/iJfDdhOCcgtNCjftCJg3qqauB4h+lz2N6ixM++b9DN1Tcw=="; }; }; "@babel/core-7.9.0" = { @@ -364,166 +364,166 @@ let sha512 = "Ggg6WPOJtSi8yYQvLVjG8F/TlpWDlKx0OpS4Kt+xMQPs5OaGYWy+v1A+1TvxI6sAMGZpKWWoAQ1DaeQbImlItA=="; }; }; - "@babel/helper-annotate-as-pure-7.12.10" = { + "@babel/generator-7.12.13" = { + name = "_at_babel_slash_generator"; + packageName = "@babel/generator"; + version = "7.12.13"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/generator/-/generator-7.12.13.tgz"; + sha512 = "9qQ8Fgo8HaSvHEt6A5+BATP7XktD/AdAnObUeTRz5/e2y3kbrxZgz32qUJJsdmwUvBJzF4AeV21nGTNwv05Mpw=="; + }; + }; + "@babel/helper-annotate-as-pure-7.12.13" = { name = "_at_babel_slash_helper-annotate-as-pure"; packageName = "@babel/helper-annotate-as-pure"; - version = "7.12.10"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.12.10.tgz"; - sha512 = "XplmVbC1n+KY6jL8/fgLVXXUauDIB+lD5+GsQEh6F6GBF1dq1qy4DP4yXWzDKcoqXB3X58t61e85Fitoww4JVQ=="; + url = "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.12.13.tgz"; + sha512 = "7YXfX5wQ5aYM/BOlbSccHDbuXXFPxeoUmfWtz8le2yTkTZc+BxsiEnENFoi2SlmA8ewDkG2LgIMIVzzn2h8kfw=="; }; }; - "@babel/helper-builder-binary-assignment-operator-visitor-7.10.4" = { + "@babel/helper-builder-binary-assignment-operator-visitor-7.12.13" = { name = "_at_babel_slash_helper-builder-binary-assignment-operator-visitor"; packageName = "@babel/helper-builder-binary-assignment-operator-visitor"; - version = "7.10.4"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.10.4.tgz"; - sha512 = "L0zGlFrGWZK4PbT8AszSfLTM5sDU1+Az/En9VrdT8/LmEiJt4zXt+Jve9DCAnQcbqDhCI+29y/L93mrDzddCcg=="; + url = "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.12.13.tgz"; + sha512 = "CZOv9tGphhDRlVjVkAgm8Nhklm9RzSmWpX2my+t7Ua/KT616pEzXsQCjinzvkRvHWJ9itO4f296efroX23XCMA=="; }; }; - "@babel/helper-compilation-targets-7.12.5" = { + "@babel/helper-compilation-targets-7.12.13" = { name = "_at_babel_slash_helper-compilation-targets"; packageName = "@babel/helper-compilation-targets"; - version = "7.12.5"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.12.5.tgz"; - sha512 = "+qH6NrscMolUlzOYngSBMIOQpKUGPPsc61Bu5W10mg84LxZ7cmvnBHzARKbDoFxVvqqAbj6Tg6N7bSrWSPXMyw=="; + url = "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.12.13.tgz"; + sha512 = "dXof20y/6wB5HnLOGyLh/gobsMvDNoekcC+8MCV2iaTd5JemhFkPD73QB+tK3iFC9P0xJC73B6MvKkyUfS9cCw=="; }; }; - "@babel/helper-create-class-features-plugin-7.12.1" = { + "@babel/helper-create-class-features-plugin-7.12.13" = { name = "_at_babel_slash_helper-create-class-features-plugin"; packageName = "@babel/helper-create-class-features-plugin"; - version = "7.12.1"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.12.1.tgz"; - sha512 = "hkL++rWeta/OVOBTRJc9a5Azh5mt5WgZUGAKMD8JM141YsE08K//bp1unBBieO6rUKkIPyUE0USQ30jAy3Sk1w=="; + url = "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.12.13.tgz"; + sha512 = "Vs/e9wv7rakKYeywsmEBSRC9KtmE7Px+YBlESekLeJOF0zbGUicGfXSNi3o+tfXSNS48U/7K9mIOOCR79Cl3+Q=="; }; }; - "@babel/helper-create-regexp-features-plugin-7.12.7" = { + "@babel/helper-create-regexp-features-plugin-7.12.13" = { name = "_at_babel_slash_helper-create-regexp-features-plugin"; packageName = "@babel/helper-create-regexp-features-plugin"; - version = "7.12.7"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.12.7.tgz"; - sha512 = "idnutvQPdpbduutvi3JVfEgcVIHooQnhvhx0Nk9isOINOIGYkZea1Pk2JlJRiUnMefrlvr0vkByATBY/mB4vjQ=="; - }; - }; - "@babel/helper-define-map-7.10.5" = { - name = "_at_babel_slash_helper-define-map"; - packageName = "@babel/helper-define-map"; - version = "7.10.5"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-define-map/-/helper-define-map-7.10.5.tgz"; - sha512 = "fMw4kgFB720aQFXSVaXr79pjjcW5puTCM16+rECJ/plGS+zByelE8l9nCpV1GibxTnFVmUuYG9U8wYfQHdzOEQ=="; + url = "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.12.13.tgz"; + sha512 = "XC+kiA0J3at6E85dL5UnCYfVOcIZ834QcAY0TIpgUVnz0zDzg+0TtvZTnJ4g9L1dPRGe30Qi03XCIS4tYCLtqw=="; }; }; - "@babel/helper-explode-assignable-expression-7.12.1" = { + "@babel/helper-explode-assignable-expression-7.12.13" = { name = "_at_babel_slash_helper-explode-assignable-expression"; packageName = "@babel/helper-explode-assignable-expression"; - version = "7.12.1"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.12.1.tgz"; - sha512 = "dmUwH8XmlrUpVqgtZ737tK88v07l840z9j3OEhCLwKTkjlvKpfqXVIZ0wpK3aeOxspwGrf/5AP5qLx4rO3w5rA=="; + url = "https://registry.npmjs.org/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.12.13.tgz"; + sha512 = "5loeRNvMo9mx1dA/d6yNi+YiKziJZFylZnCo1nmFF4qPU4yJ14abhWESuSMQSlQxWdxdOFzxXjk/PpfudTtYyw=="; }; }; - "@babel/helper-function-name-7.12.11" = { + "@babel/helper-function-name-7.12.13" = { name = "_at_babel_slash_helper-function-name"; packageName = "@babel/helper-function-name"; - version = "7.12.11"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.12.11.tgz"; - sha512 = "AtQKjtYNolKNi6nNNVLQ27CP6D9oFR6bq/HPYSizlzbp7uC1M59XJe8L+0uXjbIaZaUJF99ruHqVGiKXU/7ybA=="; + url = "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.12.13.tgz"; + sha512 = "TZvmPn0UOqmvi5G4vvw0qZTpVptGkB1GL61R6lKvrSdIxGm5Pky7Q3fpKiIkQCAtRCBUwB0PaThlx9vebCDSwA=="; }; }; - "@babel/helper-get-function-arity-7.12.10" = { + "@babel/helper-get-function-arity-7.12.13" = { name = "_at_babel_slash_helper-get-function-arity"; packageName = "@babel/helper-get-function-arity"; - version = "7.12.10"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.12.10.tgz"; - sha512 = "mm0n5BPjR06wh9mPQaDdXWDoll/j5UpCAPl1x8fS71GHm7HA6Ua2V4ylG1Ju8lvcTOietbPNNPaSilKj+pj+Ag=="; + url = "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.12.13.tgz"; + sha512 = "DjEVzQNz5LICkzN0REdpD5prGoidvbdYk1BVgRUOINaWJP2t6avB27X1guXK1kXNrX0WMfsrm1A/ZBthYuIMQg=="; }; }; - "@babel/helper-hoist-variables-7.10.4" = { + "@babel/helper-hoist-variables-7.12.13" = { name = "_at_babel_slash_helper-hoist-variables"; packageName = "@babel/helper-hoist-variables"; - version = "7.10.4"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.10.4.tgz"; - sha512 = "wljroF5PgCk2juF69kanHVs6vrLwIPNp6DLD+Lrl3hoQ3PpPPikaDRNFA+0t81NOoMt2DL6WW/mdU8k4k6ZzuA=="; + url = "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.12.13.tgz"; + sha512 = "KSC5XSj5HreRhYQtZ3cnSnQwDzgnbdUDEFsxkN0m6Q3WrCRt72xrnZ8+h+pX7YxM7hr87zIO3a/v5p/H3TrnVw=="; }; }; - "@babel/helper-member-expression-to-functions-7.12.7" = { + "@babel/helper-member-expression-to-functions-7.12.13" = { name = "_at_babel_slash_helper-member-expression-to-functions"; packageName = "@babel/helper-member-expression-to-functions"; - version = "7.12.7"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.12.7.tgz"; - sha512 = "DCsuPyeWxeHgh1Dus7APn7iza42i/qXqiFPWyBDdOFtvS581JQePsc1F/nD+fHrcswhLlRc2UpYS1NwERxZhHw=="; + url = "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.12.13.tgz"; + sha512 = "B+7nN0gIL8FZ8SvMcF+EPyB21KnCcZHQZFczCxbiNGV/O0rsrSBlWGLzmtBJ3GMjSVMIm4lpFhR+VdVBuIsUcQ=="; }; }; - "@babel/helper-module-imports-7.12.5" = { + "@babel/helper-module-imports-7.12.13" = { name = "_at_babel_slash_helper-module-imports"; packageName = "@babel/helper-module-imports"; - version = "7.12.5"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.12.5.tgz"; - sha512 = "SR713Ogqg6++uexFRORf/+nPXMmWIn80TALu0uaFb+iQIUoR7bOC7zBWyzBs5b3tBBJXuyD0cRu1F15GyzjOWA=="; + url = "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.12.13.tgz"; + sha512 = "NGmfvRp9Rqxy0uHSSVP+SRIW1q31a7Ji10cLBcqSDUngGentY4FRiHOFZFE1CLU5eiL0oE8reH7Tg1y99TDM/g=="; }; }; - "@babel/helper-module-transforms-7.12.1" = { + "@babel/helper-module-transforms-7.12.13" = { name = "_at_babel_slash_helper-module-transforms"; packageName = "@babel/helper-module-transforms"; - version = "7.12.1"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.12.1.tgz"; - sha512 = "QQzehgFAZ2bbISiCpmVGfiGux8YVFXQ0abBic2Envhej22DVXV9nCFaS5hIQbkyo1AdGb+gNME2TSh3hYJVV/w=="; + url = "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.12.13.tgz"; + sha512 = "acKF7EjqOR67ASIlDTupwkKM1eUisNAjaSduo5Cz+793ikfnpe7p4Q7B7EWU2PCoSTPWsQkR7hRUWEIZPiVLGA=="; }; }; - "@babel/helper-optimise-call-expression-7.12.10" = { + "@babel/helper-optimise-call-expression-7.12.13" = { name = "_at_babel_slash_helper-optimise-call-expression"; packageName = "@babel/helper-optimise-call-expression"; - version = "7.12.10"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.12.10.tgz"; - sha512 = "4tpbU0SrSTjjt65UMWSrUOPZTsgvPgGG4S8QSTNHacKzpS51IVWGDj0yCwyeZND/i+LSN2g/O63jEXEWm49sYQ=="; + url = "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.12.13.tgz"; + sha512 = "BdWQhoVJkp6nVjB7nkFWcn43dkprYauqtk++Py2eaf/GRDFm5BxRqEIZCiHlZUGAVmtwKcsVL1dC68WmzeFmiA=="; }; }; - "@babel/helper-plugin-utils-7.10.4" = { + "@babel/helper-plugin-utils-7.12.13" = { name = "_at_babel_slash_helper-plugin-utils"; packageName = "@babel/helper-plugin-utils"; - version = "7.10.4"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.4.tgz"; - sha512 = "O4KCvQA6lLiMU9l2eawBPMf1xPP8xPfB3iEQw150hOVTqj/rfXz0ThTb4HEzqQfs2Bmo5Ay8BzxfzVtBrr9dVg=="; + url = "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.12.13.tgz"; + sha512 = "C+10MXCXJLiR6IeG9+Wiejt9jmtFpxUc3MQqCmPY8hfCjyUGl9kT+B2okzEZrtykiwrc4dbCPdDoz0A/HQbDaA=="; }; }; - "@babel/helper-remap-async-to-generator-7.12.1" = { + "@babel/helper-remap-async-to-generator-7.12.13" = { name = "_at_babel_slash_helper-remap-async-to-generator"; packageName = "@babel/helper-remap-async-to-generator"; - version = "7.12.1"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.12.1.tgz"; - sha512 = "9d0KQCRM8clMPcDwo8SevNs+/9a8yWVVmaE80FGJcEP8N1qToREmWEGnBn8BUlJhYRFz6fqxeRL1sl5Ogsed7A=="; + url = "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.12.13.tgz"; + sha512 = "Qa6PU9vNcj1NZacZZI1Mvwt+gXDH6CTfgAkSjeRMLE8HxtDK76+YDId6NQR+z7Rgd5arhD2cIbS74r0SxD6PDA=="; }; }; - "@babel/helper-replace-supers-7.12.11" = { + "@babel/helper-replace-supers-7.12.13" = { name = "_at_babel_slash_helper-replace-supers"; packageName = "@babel/helper-replace-supers"; - version = "7.12.11"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.12.11.tgz"; - sha512 = "q+w1cqmhL7R0FNzth/PLLp2N+scXEK/L2AHbXUyydxp828F4FEa5WcVoqui9vFRiHDQErj9Zof8azP32uGVTRA=="; + url = "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.12.13.tgz"; + sha512 = "pctAOIAMVStI2TMLhozPKbf5yTEXc0OJa0eENheb4w09SrgOWEs+P4nTOZYJQCqs8JlErGLDPDJTiGIp3ygbLg=="; }; }; - "@babel/helper-simple-access-7.12.1" = { + "@babel/helper-simple-access-7.12.13" = { name = "_at_babel_slash_helper-simple-access"; packageName = "@babel/helper-simple-access"; - version = "7.12.1"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.12.1.tgz"; - sha512 = "OxBp7pMrjVewSSC8fXDFrHrBcJATOOFssZwv16F3/6Xtc138GHybBfPbm9kfiqQHKhYQrlamWILwlDCeyMFEaA=="; + url = "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.12.13.tgz"; + sha512 = "0ski5dyYIHEfwpWGx5GPWhH35j342JaflmCeQmsPWcrOQDtCN6C1zKAVRFVbK53lPW2c9TsuLLSUDf0tIGJ5hA=="; }; }; "@babel/helper-skip-transparent-expression-wrappers-7.12.1" = { @@ -535,13 +535,13 @@ let sha512 = "Mf5AUuhG1/OCChOJ/HcADmvcHM42WJockombn8ATJG3OnyiSxBK/Mm5x78BQWvmtXZKHgbjdGL2kin/HOLlZGA=="; }; }; - "@babel/helper-split-export-declaration-7.12.11" = { + "@babel/helper-split-export-declaration-7.12.13" = { name = "_at_babel_slash_helper-split-export-declaration"; packageName = "@babel/helper-split-export-declaration"; - version = "7.12.11"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.12.11.tgz"; - sha512 = "LsIVN8j48gHgwzfocYUSkO/hjYAOJqlpJEc7tGXcIm4cubjVUf8LGW6eWRyxEu7gA25q02p0rQUWoCI33HNS5g=="; + url = "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.12.13.tgz"; + sha512 = "tCJDltF83htUtXx5NLcaDqRmknv652ZWCHyoTETf1CXYJdPC7nohZohjUgieXhv0hTJdRf2FjDueFehdNucpzg=="; }; }; "@babel/helper-validator-identifier-7.12.11" = { @@ -562,40 +562,40 @@ let sha512 = "TBFCyj939mFSdeX7U7DDj32WtzYY7fDcalgq8v3fBZMNOJQNn7nOYzMaUCiPxPYfCup69mtIpqlKgMZLvQ8Xhw=="; }; }; - "@babel/helper-wrap-function-7.12.3" = { + "@babel/helper-wrap-function-7.12.13" = { name = "_at_babel_slash_helper-wrap-function"; packageName = "@babel/helper-wrap-function"; - version = "7.12.3"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.12.3.tgz"; - sha512 = "Cvb8IuJDln3rs6tzjW3Y8UeelAOdnpB8xtQ4sme2MSZ9wOxrbThporC0y/EtE16VAtoyEfLM404Xr1e0OOp+ow=="; + url = "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.12.13.tgz"; + sha512 = "t0aZFEmBJ1LojdtJnhOaQEVejnzYhyjWHSsNSNo8vOYRbAJNh6r6GQF7pd36SqG7OKGbn+AewVQ/0IfYfIuGdw=="; }; }; - "@babel/helpers-7.12.5" = { + "@babel/helpers-7.12.13" = { name = "_at_babel_slash_helpers"; packageName = "@babel/helpers"; - version = "7.12.5"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helpers/-/helpers-7.12.5.tgz"; - sha512 = "lgKGMQlKqA8meJqKsW6rUnc4MdUk35Ln0ATDqdM1a/UpARODdI4j5Y5lVfUScnSNkJcdCRAaWkspykNoFg9sJA=="; + url = "https://registry.npmjs.org/@babel/helpers/-/helpers-7.12.13.tgz"; + sha512 = "oohVzLRZ3GQEk4Cjhfs9YkJA4TdIDTObdBEZGrd6F/T0GPSnuV6l22eMcxlvcvzVIPH3VTtxbseudM1zIE+rPQ=="; }; }; - "@babel/highlight-7.10.4" = { + "@babel/highlight-7.12.13" = { name = "_at_babel_slash_highlight"; packageName = "@babel/highlight"; - version = "7.10.4"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/highlight/-/highlight-7.10.4.tgz"; - sha512 = "i6rgnR/YgPEQzZZnbTHHuZdlE8qyoBNalD6F+q4vAFlcMEcqmkoG+mPqJYJCo63qPf74+Y1UZsl3l6f7/RIkmA=="; + url = "https://registry.npmjs.org/@babel/highlight/-/highlight-7.12.13.tgz"; + sha512 = "kocDQvIbgMKlWxXe9fof3TQ+gkIPOUSEYhJjqUjvKMez3krV7vbzYCDq39Oj11UAVK7JqPVGQPlgE85dPNlQww=="; }; }; - "@babel/parser-7.12.11" = { + "@babel/parser-7.12.14" = { name = "_at_babel_slash_parser"; packageName = "@babel/parser"; - version = "7.12.11"; + version = "7.12.14"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/parser/-/parser-7.12.11.tgz"; - sha512 = "N3UxG+uuF4CMYoNj8AhnbAcJF0PiuJ9KHuy1lQmkYsxTer/MAH9UBNHsBoAX/4s6NvlDD047No8mYVGGzLL4hg=="; + url = "https://registry.npmjs.org/@babel/parser/-/parser-7.12.14.tgz"; + sha512 = "xcfxDq3OrBnDsA/Z8eK5/2iPcLD8qbOaSSfOw4RA6jp4i7e6dEQ7+wTwxItEwzcXPQcsry5nZk96gmVPKletjQ=="; }; }; "@babel/plugin-external-helpers-7.8.3" = { @@ -607,22 +607,22 @@ let sha512 = "mx0WXDDiIl5DwzMtzWGRSPugXi9BxROS05GQrhLNbEamhBiicgn994ibwkyiBH+6png7bm/yA7AUsvHyCXi4Vw=="; }; }; - "@babel/plugin-proposal-async-generator-functions-7.12.12" = { + "@babel/plugin-proposal-async-generator-functions-7.12.13" = { name = "_at_babel_slash_plugin-proposal-async-generator-functions"; packageName = "@babel/plugin-proposal-async-generator-functions"; - version = "7.12.12"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.12.12.tgz"; - sha512 = "nrz9y0a4xmUrRq51bYkWJIO5SBZyG2ys2qinHsN0zHDHVsUaModrkpyWWWXfGqYQmOL3x9sQIcTNN/pBGpo09A=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.12.13.tgz"; + sha512 = "1KH46Hx4WqP77f978+5Ye/VUbuwQld2hph70yaw2hXS2v7ER2f3nlpNMu909HO2rbvP0NKLlMVDPh9KXklVMhA=="; }; }; - "@babel/plugin-proposal-class-properties-7.12.1" = { + "@babel/plugin-proposal-class-properties-7.12.13" = { name = "_at_babel_slash_plugin-proposal-class-properties"; packageName = "@babel/plugin-proposal-class-properties"; - version = "7.12.1"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.12.1.tgz"; - sha512 = "cKp3dlQsFsEs5CWKnN7BnSHOd0EOW8EKpEjkoz1pO2E5KzIDNV9Ros1b0CnmbVgAGXJubOYVBOGCT1OmJwOI7w=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.12.13.tgz"; + sha512 = "8SCJ0Ddrpwv4T7Gwb33EmW1V9PY5lggTO+A8WjyIwxrSHDUyBw4MtF96ifn1n8H806YlxbVCoKXbbmzD6RD+cA=="; }; }; "@babel/plugin-proposal-dynamic-import-7.12.1" = { @@ -634,103 +634,103 @@ let sha512 = "a4rhUSZFuq5W8/OO8H7BL5zspjnc1FLd9hlOxIK/f7qG4a0qsqk8uvF/ywgBA8/OmjsapjpvaEOYItfGG1qIvQ=="; }; }; - "@babel/plugin-proposal-export-default-from-7.12.1" = { + "@babel/plugin-proposal-export-default-from-7.12.13" = { name = "_at_babel_slash_plugin-proposal-export-default-from"; packageName = "@babel/plugin-proposal-export-default-from"; - version = "7.12.1"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-export-default-from/-/plugin-proposal-export-default-from-7.12.1.tgz"; - sha512 = "z5Q4Ke7j0AexQRfgUvnD+BdCSgpTEKnqQ3kskk2jWtOBulxICzd1X9BGt7kmWftxZ2W3++OZdt5gtmC8KLxdRQ=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-export-default-from/-/plugin-proposal-export-default-from-7.12.13.tgz"; + sha512 = "idIsBT+DGXdOHL82U+8bwX4goHm/z10g8sGGrQroh+HCRcm7mDv/luaGdWJQMTuCX2FsdXS7X0Nyyzp4znAPJA=="; }; }; - "@babel/plugin-proposal-export-namespace-from-7.12.1" = { + "@babel/plugin-proposal-export-namespace-from-7.12.13" = { name = "_at_babel_slash_plugin-proposal-export-namespace-from"; packageName = "@babel/plugin-proposal-export-namespace-from"; - version = "7.12.1"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.12.1.tgz"; - sha512 = "6CThGf0irEkzujYS5LQcjBx8j/4aQGiVv7J9+2f7pGfxqyKh3WnmVJYW3hdrQjyksErMGBPQrCnHfOtna+WLbw=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.12.13.tgz"; + sha512 = "INAgtFo4OnLN3Y/j0VwAgw3HDXcDtX+C/erMvWzuV9v71r7urb6iyMXu7eM9IgLr1ElLlOkaHjJ0SbCmdOQ3Iw=="; }; }; - "@babel/plugin-proposal-json-strings-7.12.1" = { + "@babel/plugin-proposal-json-strings-7.12.13" = { name = "_at_babel_slash_plugin-proposal-json-strings"; packageName = "@babel/plugin-proposal-json-strings"; - version = "7.12.1"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.12.1.tgz"; - sha512 = "GoLDUi6U9ZLzlSda2Df++VSqDJg3CG+dR0+iWsv6XRw1rEq+zwt4DirM9yrxW6XWaTpmai1cWJLMfM8qQJf+yw=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.12.13.tgz"; + sha512 = "v9eEi4GiORDg8x+Dmi5r8ibOe0VXoKDeNPYcTTxdGN4eOWikrJfDJCJrr1l5gKGvsNyGJbrfMftC2dTL6oz7pg=="; }; }; - "@babel/plugin-proposal-logical-assignment-operators-7.12.1" = { + "@babel/plugin-proposal-logical-assignment-operators-7.12.13" = { name = "_at_babel_slash_plugin-proposal-logical-assignment-operators"; packageName = "@babel/plugin-proposal-logical-assignment-operators"; - version = "7.12.1"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.12.1.tgz"; - sha512 = "k8ZmVv0JU+4gcUGeCDZOGd0lCIamU/sMtIiX3UWnUc5yzgq6YUGyEolNYD+MLYKfSzgECPcqetVcJP9Afe/aCA=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.12.13.tgz"; + sha512 = "fqmiD3Lz7jVdK6kabeSr1PZlWSUVqSitmHEe3Z00dtGTKieWnX9beafvavc32kjORa5Bai4QNHgFDwWJP+WtSQ=="; }; }; - "@babel/plugin-proposal-nullish-coalescing-operator-7.12.1" = { + "@babel/plugin-proposal-nullish-coalescing-operator-7.12.13" = { name = "_at_babel_slash_plugin-proposal-nullish-coalescing-operator"; packageName = "@babel/plugin-proposal-nullish-coalescing-operator"; - version = "7.12.1"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.12.1.tgz"; - sha512 = "nZY0ESiaQDI1y96+jk6VxMOaL4LPo/QDHBqL+SF3/vl6dHkTwHlOI8L4ZwuRBHgakRBw5zsVylel7QPbbGuYgg=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.12.13.tgz"; + sha512 = "Qoxpy+OxhDBI5kRqliJFAl4uWXk3Bn24WeFstPH0iLymFehSAUR8MHpqU7njyXv/qbo7oN6yTy5bfCmXdKpo1Q=="; }; }; - "@babel/plugin-proposal-numeric-separator-7.12.7" = { + "@babel/plugin-proposal-numeric-separator-7.12.13" = { name = "_at_babel_slash_plugin-proposal-numeric-separator"; packageName = "@babel/plugin-proposal-numeric-separator"; - version = "7.12.7"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.12.7.tgz"; - sha512 = "8c+uy0qmnRTeukiGsjLGy6uVs/TFjJchGXUeBqlG4VWYOdJWkhhVPdQ3uHwbmalfJwv2JsV0qffXP4asRfL2SQ=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.12.13.tgz"; + sha512 = "O1jFia9R8BUCl3ZGB7eitaAPu62TXJRHn7rh+ojNERCFyqRwJMTmhz+tJ+k0CwI6CLjX/ee4qW74FSqlq9I35w=="; }; }; - "@babel/plugin-proposal-object-rest-spread-7.12.1" = { + "@babel/plugin-proposal-object-rest-spread-7.12.13" = { name = "_at_babel_slash_plugin-proposal-object-rest-spread"; packageName = "@babel/plugin-proposal-object-rest-spread"; - version = "7.12.1"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.12.1.tgz"; - sha512 = "s6SowJIjzlhx8o7lsFx5zmY4At6CTtDvgNQDdPzkBQucle58A6b/TTeEBYtyDgmcXjUTM+vE8YOGHZzzbc/ioA=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.12.13.tgz"; + sha512 = "WvA1okB/0OS/N3Ldb3sziSrXg6sRphsBgqiccfcQq7woEn5wQLNX82Oc4PlaFcdwcWHuQXAtb8ftbS8Fbsg/sg=="; }; }; - "@babel/plugin-proposal-optional-catch-binding-7.12.1" = { + "@babel/plugin-proposal-optional-catch-binding-7.12.13" = { name = "_at_babel_slash_plugin-proposal-optional-catch-binding"; packageName = "@babel/plugin-proposal-optional-catch-binding"; - version = "7.12.1"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.12.1.tgz"; - sha512 = "hFvIjgprh9mMw5v42sJWLI1lzU5L2sznP805zeT6rySVRA0Y18StRhDqhSxlap0oVgItRsB6WSROp4YnJTJz0g=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.12.13.tgz"; + sha512 = "9+MIm6msl9sHWg58NvqpNpLtuFbmpFYk37x8kgnGzAHvX35E1FyAwSUt5hIkSoWJFSAH+iwU8bJ4fcD1zKXOzg=="; }; }; - "@babel/plugin-proposal-optional-chaining-7.12.7" = { + "@babel/plugin-proposal-optional-chaining-7.12.13" = { name = "_at_babel_slash_plugin-proposal-optional-chaining"; packageName = "@babel/plugin-proposal-optional-chaining"; - version = "7.12.7"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.12.7.tgz"; - sha512 = "4ovylXZ0PWmwoOvhU2vhnzVNnm88/Sm9nx7V8BPgMvAzn5zDou3/Awy0EjglyubVHasJj+XCEkr/r1X3P5elCA=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.12.13.tgz"; + sha512 = "0ZwjGfTcnZqyV3y9DSD1Yk3ebp+sIUpT2YDqP8hovzaNZnQq2Kd7PEqa6iOIUDBXBt7Jl3P7YAcEIL5Pz8u09Q=="; }; }; - "@babel/plugin-proposal-private-methods-7.12.1" = { + "@babel/plugin-proposal-private-methods-7.12.13" = { name = "_at_babel_slash_plugin-proposal-private-methods"; packageName = "@babel/plugin-proposal-private-methods"; - version = "7.12.1"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.12.1.tgz"; - sha512 = "mwZ1phvH7/NHK6Kf8LP7MYDogGV+DKB1mryFOEwx5EBNQrosvIczzZFTUmWaeujd5xT6G1ELYWUz3CutMhjE1w=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.12.13.tgz"; + sha512 = "sV0V57uUwpauixvR7s2o75LmwJI6JECwm5oPUY5beZB1nBl2i37hc7CJGqB5G+58fur5Y6ugvl3LRONk5x34rg=="; }; }; - "@babel/plugin-proposal-unicode-property-regex-7.12.1" = { + "@babel/plugin-proposal-unicode-property-regex-7.12.13" = { name = "_at_babel_slash_plugin-proposal-unicode-property-regex"; packageName = "@babel/plugin-proposal-unicode-property-regex"; - version = "7.12.1"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.12.1.tgz"; - sha512 = "MYq+l+PvHuw/rKUz1at/vb6nCnQ2gmJBNaM62z0OgH7B2W1D9pvkpYtlti9bGtizNIU1K3zm4bZF9F91efVY0w=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.12.13.tgz"; + sha512 = "XyJmZidNfofEkqFV5VC/bLabGmO5QzenPO/YOfGuEbgU+2sSwMmio3YLb4WtBgcmmdwZHyVyv8on77IUjQ5Gvg=="; }; }; "@babel/plugin-syntax-async-generators-7.8.4" = { @@ -751,13 +751,13 @@ let sha512 = "wnTnFlG+YxQm3vDxpGE57Pj0srRU4sHE/mDkt1qv2YJJSeUAec2ma4WLUnUPeKjyrfntVwe/N6dCXpU+zL3Npg=="; }; }; - "@babel/plugin-syntax-class-properties-7.12.1" = { + "@babel/plugin-syntax-class-properties-7.12.13" = { name = "_at_babel_slash_plugin-syntax-class-properties"; packageName = "@babel/plugin-syntax-class-properties"; - version = "7.12.1"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.1.tgz"; - sha512 = "U40A76x5gTwmESz+qiqssqmeEsKvcSyvtgktrm0uzcARAmM9I1jR221f6Oq+GmHrcD+LvZDag1UTOTe2fL3TeA=="; + url = "https://registry.npmjs.org/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.13.tgz"; + sha512 = "fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA=="; }; }; "@babel/plugin-syntax-dynamic-import-7.8.3" = { @@ -769,13 +769,13 @@ let sha512 = "5gdGbFon+PszYzqs83S3E5mpi7/y/8M9eC90MRTZfduQOYW76ig6SOSPNe41IG5LoP3FGBn2N0RjVDSQiS94kQ=="; }; }; - "@babel/plugin-syntax-export-default-from-7.12.1" = { + "@babel/plugin-syntax-export-default-from-7.12.13" = { name = "_at_babel_slash_plugin-syntax-export-default-from"; packageName = "@babel/plugin-syntax-export-default-from"; - version = "7.12.1"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-syntax-export-default-from/-/plugin-syntax-export-default-from-7.12.1.tgz"; - sha512 = "dP5eGg6tHEkhnRD2/vRG/KJKRSg8gtxu2i+P/8/yFPJn/CfPU5G0/7Gks2i3M6IOVAPQekmsLN9LPsmXFFL4Uw=="; + url = "https://registry.npmjs.org/@babel/plugin-syntax-export-default-from/-/plugin-syntax-export-default-from-7.12.13.tgz"; + sha512 = "gVry0zqoums0hA+EniCYK3gABhjYSLX1dVuwYpPw9DrLNA4/GovXySHVg4FGRsZht09ON/5C2NVx3keq+qqVGQ=="; }; }; "@babel/plugin-syntax-export-namespace-from-7.8.3" = { @@ -787,13 +787,13 @@ let sha512 = "MXf5laXo6c1IbEbegDmzGPwGNTsHZmEy6QGznu5Sh2UCWvueywb2ee+CCE4zQiZstxU9BMoQO9i6zUFSY0Kj0Q=="; }; }; - "@babel/plugin-syntax-flow-7.12.1" = { + "@babel/plugin-syntax-flow-7.12.13" = { name = "_at_babel_slash_plugin-syntax-flow"; packageName = "@babel/plugin-syntax-flow"; - version = "7.12.1"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-syntax-flow/-/plugin-syntax-flow-7.12.1.tgz"; - sha512 = "1lBLLmtxrwpm4VKmtVFselI/P3pX+G63fAtUUt6b2Nzgao77KNDwyuRt90Mj2/9pKobtt68FdvjfqohZjg/FCA=="; + url = "https://registry.npmjs.org/@babel/plugin-syntax-flow/-/plugin-syntax-flow-7.12.13.tgz"; + sha512 = "J/RYxnlSLXZLVR7wTRsozxKT8qbsx1mNKJzXEEjQ0Kjx1ZACcyHgbanNWNCFtc36IzuWhYWPpvJFFoexoOWFmA=="; }; }; "@babel/plugin-syntax-import-meta-7.10.4" = { @@ -814,13 +814,13 @@ let sha512 = "lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA=="; }; }; - "@babel/plugin-syntax-jsx-7.12.1" = { + "@babel/plugin-syntax-jsx-7.12.13" = { name = "_at_babel_slash_plugin-syntax-jsx"; packageName = "@babel/plugin-syntax-jsx"; - version = "7.12.1"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.12.1.tgz"; - sha512 = "1yRi7yAtB0ETgxdY9ti/p2TivUxJkTdhu/ZbF9MshVGqOx1TdB3b7xCXs49Fupgg50N45KcAsRP/ZqWjs9SRjg=="; + url = "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.12.13.tgz"; + sha512 = "d4HM23Q1K7oq/SLNmG6mRt85l2csmQ0cHRaxRXjKW0YFdEXqlZ5kzFQKH5Uc3rDJECgu+yCRgPkG04Mm98R/1g=="; }; }; "@babel/plugin-syntax-logical-assignment-operators-7.10.4" = { @@ -877,373 +877,373 @@ let sha512 = "KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg=="; }; }; - "@babel/plugin-syntax-top-level-await-7.12.1" = { + "@babel/plugin-syntax-top-level-await-7.12.13" = { name = "_at_babel_slash_plugin-syntax-top-level-await"; packageName = "@babel/plugin-syntax-top-level-await"; - version = "7.12.1"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.12.1.tgz"; - sha512 = "i7ooMZFS+a/Om0crxZodrTzNEPJHZrlMVGMTEpFAj6rYY/bKCddB0Dk/YxfPuYXOopuhKk/e1jV6h+WUU9XN3A=="; + url = "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.12.13.tgz"; + sha512 = "A81F9pDwyS7yM//KwbCSDqy3Uj4NMIurtplxphWxoYtNPov7cJsDkAFNNyVlIZ3jwGycVsurZ+LtOA8gZ376iQ=="; }; }; - "@babel/plugin-syntax-typescript-7.12.1" = { + "@babel/plugin-syntax-typescript-7.12.13" = { name = "_at_babel_slash_plugin-syntax-typescript"; packageName = "@babel/plugin-syntax-typescript"; - version = "7.12.1"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.12.1.tgz"; - sha512 = "UZNEcCY+4Dp9yYRCAHrHDU+9ZXLYaY9MgBXSRLkB9WjYFRR6quJBumfVrEkUxrePPBwFcpWfNKXqVRQQtm7mMA=="; + url = "https://registry.npmjs.org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.12.13.tgz"; + sha512 = "cHP3u1JiUiG2LFDKbXnwVad81GvfyIOmCD6HIEId6ojrY0Drfy2q1jw7BwN7dE84+kTnBjLkXoL3IEy/3JPu2w=="; }; }; - "@babel/plugin-transform-arrow-functions-7.12.1" = { + "@babel/plugin-transform-arrow-functions-7.12.13" = { name = "_at_babel_slash_plugin-transform-arrow-functions"; packageName = "@babel/plugin-transform-arrow-functions"; - version = "7.12.1"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.12.1.tgz"; - sha512 = "5QB50qyN44fzzz4/qxDPQMBCTHgxg3n0xRBLJUmBlLoU/sFvxVWGZF/ZUfMVDQuJUKXaBhbupxIzIfZ6Fwk/0A=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.12.13.tgz"; + sha512 = "tBtuN6qtCTd+iHzVZVOMNp+L04iIJBpqkdY42tWbmjIT5wvR2kx7gxMBsyhQtFzHwBbyGi9h8J8r9HgnOpQHxg=="; }; }; - "@babel/plugin-transform-async-to-generator-7.12.1" = { + "@babel/plugin-transform-async-to-generator-7.12.13" = { name = "_at_babel_slash_plugin-transform-async-to-generator"; packageName = "@babel/plugin-transform-async-to-generator"; - version = "7.12.1"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.12.1.tgz"; - sha512 = "SDtqoEcarK1DFlRJ1hHRY5HvJUj5kX4qmtpMAm2QnhOlyuMC4TMdCRgW6WXpv93rZeYNeLP22y8Aq2dbcDRM1A=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.12.13.tgz"; + sha512 = "psM9QHcHaDr+HZpRuJcE1PXESuGWSCcbiGFFhhwfzdbTxaGDVzuVtdNYliAwcRo3GFg0Bc8MmI+AvIGYIJG04A=="; }; }; - "@babel/plugin-transform-block-scoped-functions-7.12.1" = { + "@babel/plugin-transform-block-scoped-functions-7.12.13" = { name = "_at_babel_slash_plugin-transform-block-scoped-functions"; packageName = "@babel/plugin-transform-block-scoped-functions"; - version = "7.12.1"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.12.1.tgz"; - sha512 = "5OpxfuYnSgPalRpo8EWGPzIYf0lHBWORCkj5M0oLBwHdlux9Ri36QqGW3/LR13RSVOAoUUMzoPI/jpE4ABcHoA=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.12.13.tgz"; + sha512 = "zNyFqbc3kI/fVpqwfqkg6RvBgFpC4J18aKKMmv7KdQ/1GgREapSJAykLMVNwfRGO3BtHj3YQZl8kxCXPcVMVeg=="; }; }; - "@babel/plugin-transform-block-scoping-7.12.12" = { + "@babel/plugin-transform-block-scoping-7.12.13" = { name = "_at_babel_slash_plugin-transform-block-scoping"; packageName = "@babel/plugin-transform-block-scoping"; - version = "7.12.12"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.12.12.tgz"; - sha512 = "VOEPQ/ExOVqbukuP7BYJtI5ZxxsmegTwzZ04j1aF0dkSypGo9XpDHuOrABsJu+ie+penpSJheDJ11x1BEZNiyQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.12.13.tgz"; + sha512 = "Pxwe0iqWJX4fOOM2kEZeUuAxHMWb9nK+9oh5d11bsLoB0xMg+mkDpt0eYuDZB7ETrY9bbcVlKUGTOGWy7BHsMQ=="; }; }; - "@babel/plugin-transform-classes-7.12.1" = { + "@babel/plugin-transform-classes-7.12.13" = { name = "_at_babel_slash_plugin-transform-classes"; packageName = "@babel/plugin-transform-classes"; - version = "7.12.1"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.12.1.tgz"; - sha512 = "/74xkA7bVdzQTBeSUhLLJgYIcxw/dpEpCdRDiHgPJ3Mv6uC11UhjpOhl72CgqbBCmt1qtssCyB2xnJm1+PFjog=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.12.13.tgz"; + sha512 = "cqZlMlhCC1rVnxE5ZGMtIb896ijL90xppMiuWXcwcOAuFczynpd3KYemb91XFFPi3wJSe/OcrX9lXoowatkkxA=="; }; }; - "@babel/plugin-transform-computed-properties-7.12.1" = { + "@babel/plugin-transform-computed-properties-7.12.13" = { name = "_at_babel_slash_plugin-transform-computed-properties"; packageName = "@babel/plugin-transform-computed-properties"; - version = "7.12.1"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.12.1.tgz"; - sha512 = "vVUOYpPWB7BkgUWPo4C44mUQHpTZXakEqFjbv8rQMg7TC6S6ZhGZ3otQcRH6u7+adSlE5i0sp63eMC/XGffrzg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.12.13.tgz"; + sha512 = "dDfuROUPGK1mTtLKyDPUavmj2b6kFu82SmgpztBFEO974KMjJT+Ytj3/oWsTUMBmgPcp9J5Pc1SlcAYRpJ2hRA=="; }; }; - "@babel/plugin-transform-destructuring-7.12.1" = { + "@babel/plugin-transform-destructuring-7.12.13" = { name = "_at_babel_slash_plugin-transform-destructuring"; packageName = "@babel/plugin-transform-destructuring"; - version = "7.12.1"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.12.1.tgz"; - sha512 = "fRMYFKuzi/rSiYb2uRLiUENJOKq4Gnl+6qOv5f8z0TZXg3llUwUhsNNwrwaT/6dUhJTzNpBr+CUvEWBtfNY1cw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.12.13.tgz"; + sha512 = "Dn83KykIFzjhA3FDPA1z4N+yfF3btDGhjnJwxIj0T43tP0flCujnU8fKgEkf0C1biIpSv9NZegPBQ1J6jYkwvQ=="; }; }; - "@babel/plugin-transform-dotall-regex-7.12.1" = { + "@babel/plugin-transform-dotall-regex-7.12.13" = { name = "_at_babel_slash_plugin-transform-dotall-regex"; packageName = "@babel/plugin-transform-dotall-regex"; - version = "7.12.1"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.12.1.tgz"; - sha512 = "B2pXeRKoLszfEW7J4Hg9LoFaWEbr/kzo3teWHmtFCszjRNa/b40f9mfeqZsIDLLt/FjwQ6pz/Gdlwy85xNckBA=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.12.13.tgz"; + sha512 = "foDrozE65ZFdUC2OfgeOCrEPTxdB3yjqxpXh8CH+ipd9CHd4s/iq81kcUpyH8ACGNEPdFqbtzfgzbT/ZGlbDeQ=="; }; }; - "@babel/plugin-transform-duplicate-keys-7.12.1" = { + "@babel/plugin-transform-duplicate-keys-7.12.13" = { name = "_at_babel_slash_plugin-transform-duplicate-keys"; packageName = "@babel/plugin-transform-duplicate-keys"; - version = "7.12.1"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.12.1.tgz"; - sha512 = "iRght0T0HztAb/CazveUpUQrZY+aGKKaWXMJ4uf9YJtqxSUe09j3wteztCUDRHs+SRAL7yMuFqUsLoAKKzgXjw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.12.13.tgz"; + sha512 = "NfADJiiHdhLBW3pulJlJI2NB0t4cci4WTZ8FtdIuNc2+8pslXdPtRRAEWqUY+m9kNOk2eRYbTAOipAxlrOcwwQ=="; }; }; - "@babel/plugin-transform-exponentiation-operator-7.12.1" = { + "@babel/plugin-transform-exponentiation-operator-7.12.13" = { name = "_at_babel_slash_plugin-transform-exponentiation-operator"; packageName = "@babel/plugin-transform-exponentiation-operator"; - version = "7.12.1"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.12.1.tgz"; - sha512 = "7tqwy2bv48q+c1EHbXK0Zx3KXd2RVQp6OC7PbwFNt/dPTAV3Lu5sWtWuAj8owr5wqtWnqHfl2/mJlUmqkChKug=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.12.13.tgz"; + sha512 = "fbUelkM1apvqez/yYx1/oICVnGo2KM5s63mhGylrmXUxK/IAXSIf87QIxVfZldWf4QsOafY6vV3bX8aMHSvNrA=="; }; }; - "@babel/plugin-transform-flow-strip-types-7.12.10" = { + "@babel/plugin-transform-flow-strip-types-7.12.13" = { name = "_at_babel_slash_plugin-transform-flow-strip-types"; packageName = "@babel/plugin-transform-flow-strip-types"; - version = "7.12.10"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-flow-strip-types/-/plugin-transform-flow-strip-types-7.12.10.tgz"; - sha512 = "0ti12wLTLeUIzu9U7kjqIn4MyOL7+Wibc7avsHhj4o1l5C0ATs8p2IMHrVYjm9t9wzhfEO6S3kxax0Rpdo8LTg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-flow-strip-types/-/plugin-transform-flow-strip-types-7.12.13.tgz"; + sha512 = "39/t9HtN+Jlc7EEY6oCSCf3kRrKIl2JULOGPnHZiaRjoYZEFaDXDZI32uE2NosQRh8o6N9B+8iGvDK7ToJhJaw=="; }; }; - "@babel/plugin-transform-for-of-7.12.1" = { + "@babel/plugin-transform-for-of-7.12.13" = { name = "_at_babel_slash_plugin-transform-for-of"; packageName = "@babel/plugin-transform-for-of"; - version = "7.12.1"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.12.1.tgz"; - sha512 = "Zaeq10naAsuHo7heQvyV0ptj4dlZJwZgNAtBYBnu5nNKJoW62m0zKcIEyVECrUKErkUkg6ajMy4ZfnVZciSBhg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.12.13.tgz"; + sha512 = "xCbdgSzXYmHGyVX3+BsQjcd4hv4vA/FDy7Kc8eOpzKmBBPEOTurt0w5fCRQaGl+GSBORKgJdstQ1rHl4jbNseQ=="; }; }; - "@babel/plugin-transform-function-name-7.12.1" = { + "@babel/plugin-transform-function-name-7.12.13" = { name = "_at_babel_slash_plugin-transform-function-name"; packageName = "@babel/plugin-transform-function-name"; - version = "7.12.1"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.12.1.tgz"; - sha512 = "JF3UgJUILoFrFMEnOJLJkRHSk6LUSXLmEFsA23aR2O5CSLUxbeUX1IZ1YQ7Sn0aXb601Ncwjx73a+FVqgcljVw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.12.13.tgz"; + sha512 = "6K7gZycG0cmIwwF7uMK/ZqeCikCGVBdyP2J5SKNCXO5EOHcqi+z7Jwf8AmyDNcBgxET8DrEtCt/mPKPyAzXyqQ=="; }; }; - "@babel/plugin-transform-literals-7.12.1" = { + "@babel/plugin-transform-literals-7.12.13" = { name = "_at_babel_slash_plugin-transform-literals"; packageName = "@babel/plugin-transform-literals"; - version = "7.12.1"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.12.1.tgz"; - sha512 = "+PxVGA+2Ag6uGgL0A5f+9rklOnnMccwEBzwYFL3EUaKuiyVnUipyXncFcfjSkbimLrODoqki1U9XxZzTvfN7IQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.12.13.tgz"; + sha512 = "FW+WPjSR7hiUxMcKqyNjP05tQ2kmBCdpEpZHY1ARm96tGQCCBvXKnpjILtDplUnJ/eHZ0lALLM+d2lMFSpYJrQ=="; }; }; - "@babel/plugin-transform-member-expression-literals-7.12.1" = { + "@babel/plugin-transform-member-expression-literals-7.12.13" = { name = "_at_babel_slash_plugin-transform-member-expression-literals"; packageName = "@babel/plugin-transform-member-expression-literals"; - version = "7.12.1"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.12.1.tgz"; - sha512 = "1sxePl6z9ad0gFMB9KqmYofk34flq62aqMt9NqliS/7hPEpURUCMbyHXrMPlo282iY7nAvUB1aQd5mg79UD9Jg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.12.13.tgz"; + sha512 = "kxLkOsg8yir4YeEPHLuO2tXP9R/gTjpuTOjshqSpELUN3ZAg2jfDnKUvzzJxObun38sw3wm4Uu69sX/zA7iRvg=="; }; }; - "@babel/plugin-transform-modules-amd-7.12.1" = { + "@babel/plugin-transform-modules-amd-7.12.13" = { name = "_at_babel_slash_plugin-transform-modules-amd"; packageName = "@babel/plugin-transform-modules-amd"; - version = "7.12.1"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.12.1.tgz"; - sha512 = "tDW8hMkzad5oDtzsB70HIQQRBiTKrhfgwC/KkJeGsaNFTdWhKNt/BiE8c5yj19XiGyrxpbkOfH87qkNg1YGlOQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.12.13.tgz"; + sha512 = "JHLOU0o81m5UqG0Ulz/fPC68/v+UTuGTWaZBUwpEk1fYQ1D9LfKV6MPn4ttJKqRo5Lm460fkzjLTL4EHvCprvA=="; }; }; - "@babel/plugin-transform-modules-commonjs-7.12.1" = { + "@babel/plugin-transform-modules-commonjs-7.12.13" = { name = "_at_babel_slash_plugin-transform-modules-commonjs"; packageName = "@babel/plugin-transform-modules-commonjs"; - version = "7.12.1"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.12.1.tgz"; - sha512 = "dY789wq6l0uLY8py9c1B48V8mVL5gZh/+PQ5ZPrylPYsnAvnEMjqsUXkuoDVPeVK+0VyGar+D08107LzDQ6pag=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.12.13.tgz"; + sha512 = "OGQoeVXVi1259HjuoDnsQMlMkT9UkZT9TpXAsqWplS/M0N1g3TJAn/ByOCeQu7mfjc5WpSsRU+jV1Hd89ts0kQ=="; }; }; - "@babel/plugin-transform-modules-systemjs-7.12.1" = { + "@babel/plugin-transform-modules-systemjs-7.12.13" = { name = "_at_babel_slash_plugin-transform-modules-systemjs"; packageName = "@babel/plugin-transform-modules-systemjs"; - version = "7.12.1"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.12.1.tgz"; - sha512 = "Hn7cVvOavVh8yvW6fLwveFqSnd7rbQN3zJvoPNyNaQSvgfKmDBO9U1YL9+PCXGRlZD9tNdWTy5ACKqMuzyn32Q=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.12.13.tgz"; + sha512 = "aHfVjhZ8QekaNF/5aNdStCGzwTbU7SI5hUybBKlMzqIMC7w7Ho8hx5a4R/DkTHfRfLwHGGxSpFt9BfxKCoXKoA=="; }; }; - "@babel/plugin-transform-modules-umd-7.12.1" = { + "@babel/plugin-transform-modules-umd-7.12.13" = { name = "_at_babel_slash_plugin-transform-modules-umd"; packageName = "@babel/plugin-transform-modules-umd"; - version = "7.12.1"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.12.1.tgz"; - sha512 = "aEIubCS0KHKM0zUos5fIoQm+AZUMt1ZvMpqz0/H5qAQ7vWylr9+PLYurT+Ic7ID/bKLd4q8hDovaG3Zch2uz5Q=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.12.13.tgz"; + sha512 = "BgZndyABRML4z6ibpi7Z98m4EVLFI9tVsZDADC14AElFaNHHBcJIovflJ6wtCqFxwy2YJ1tJhGRsr0yLPKoN+w=="; }; }; - "@babel/plugin-transform-named-capturing-groups-regex-7.12.1" = { + "@babel/plugin-transform-named-capturing-groups-regex-7.12.13" = { name = "_at_babel_slash_plugin-transform-named-capturing-groups-regex"; packageName = "@babel/plugin-transform-named-capturing-groups-regex"; - version = "7.12.1"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.12.1.tgz"; - sha512 = "tB43uQ62RHcoDp9v2Nsf+dSM8sbNodbEicbQNA53zHz8pWUhsgHSJCGpt7daXxRydjb0KnfmB+ChXOv3oADp1Q=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.12.13.tgz"; + sha512 = "Xsm8P2hr5hAxyYblrfACXpQKdQbx4m2df9/ZZSQ8MAhsadw06+jW7s9zsSw6he+mJZXRlVMyEnVktJo4zjk1WA=="; }; }; - "@babel/plugin-transform-new-target-7.12.1" = { + "@babel/plugin-transform-new-target-7.12.13" = { name = "_at_babel_slash_plugin-transform-new-target"; packageName = "@babel/plugin-transform-new-target"; - version = "7.12.1"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.12.1.tgz"; - sha512 = "+eW/VLcUL5L9IvJH7rT1sT0CzkdUTvPrXC2PXTn/7z7tXLBuKvezYbGdxD5WMRoyvyaujOq2fWoKl869heKjhw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.12.13.tgz"; + sha512 = "/KY2hbLxrG5GTQ9zzZSc3xWiOy379pIETEhbtzwZcw9rvuaVV4Fqy7BYGYOWZnaoXIQYbbJ0ziXLa/sKcGCYEQ=="; }; }; - "@babel/plugin-transform-object-assign-7.12.1" = { + "@babel/plugin-transform-object-assign-7.12.13" = { name = "_at_babel_slash_plugin-transform-object-assign"; packageName = "@babel/plugin-transform-object-assign"; - version = "7.12.1"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-object-assign/-/plugin-transform-object-assign-7.12.1.tgz"; - sha512 = "geUHn4XwHznRAFiuROTy0Hr7bKbpijJCmr1Svt/VNGhpxmp0OrdxURNpWbOAf94nUbL+xj6gbxRVPHWIbRpRoA=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-object-assign/-/plugin-transform-object-assign-7.12.13.tgz"; + sha512 = "4QxDMc0lAOkIBSfCrnSGbAJ+4epDBF2XXwcLXuBcG1xl9u7LrktNVD4+LwhL47XuKVPQ7R25e/WdcV+h97HyZA=="; }; }; - "@babel/plugin-transform-object-super-7.12.1" = { + "@babel/plugin-transform-object-super-7.12.13" = { name = "_at_babel_slash_plugin-transform-object-super"; packageName = "@babel/plugin-transform-object-super"; - version = "7.12.1"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.12.1.tgz"; - sha512 = "AvypiGJH9hsquNUn+RXVcBdeE3KHPZexWRdimhuV59cSoOt5kFBmqlByorAeUlGG2CJWd0U+4ZtNKga/TB0cAw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.12.13.tgz"; + sha512 = "JzYIcj3XtYspZDV8j9ulnoMPZZnF/Cj0LUxPOjR89BdBVx+zYJI9MdMIlUZjbXDX+6YVeS6I3e8op+qQ3BYBoQ=="; }; }; - "@babel/plugin-transform-parameters-7.12.1" = { + "@babel/plugin-transform-parameters-7.12.13" = { name = "_at_babel_slash_plugin-transform-parameters"; packageName = "@babel/plugin-transform-parameters"; - version = "7.12.1"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.12.1.tgz"; - sha512 = "xq9C5EQhdPK23ZeCdMxl8bbRnAgHFrw5EOC3KJUsSylZqdkCaFEXxGSBuTSObOpiiHHNyb82es8M1QYgfQGfNg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.12.13.tgz"; + sha512 = "e7QqwZalNiBRHCpJg/P8s/VJeSRYgmtWySs1JwvfwPqhBbiWfOcHDKdeAi6oAyIimoKWBlwc8oTgbZHdhCoVZA=="; }; }; - "@babel/plugin-transform-property-literals-7.12.1" = { + "@babel/plugin-transform-property-literals-7.12.13" = { name = "_at_babel_slash_plugin-transform-property-literals"; packageName = "@babel/plugin-transform-property-literals"; - version = "7.12.1"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.12.1.tgz"; - sha512 = "6MTCR/mZ1MQS+AwZLplX4cEySjCpnIF26ToWo942nqn8hXSm7McaHQNeGx/pt7suI1TWOWMfa/NgBhiqSnX0cQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.12.13.tgz"; + sha512 = "nqVigwVan+lR+g8Fj8Exl0UQX2kymtjcWfMOYM1vTYEKujeyv2SkMgazf2qNcK7l4SDiKyTA/nHCPqL4e2zo1A=="; }; }; - "@babel/plugin-transform-react-display-name-7.12.1" = { + "@babel/plugin-transform-react-display-name-7.12.13" = { name = "_at_babel_slash_plugin-transform-react-display-name"; packageName = "@babel/plugin-transform-react-display-name"; - version = "7.12.1"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.12.1.tgz"; - sha512 = "cAzB+UzBIrekfYxyLlFqf/OagTvHLcVBb5vpouzkYkBclRPraiygVnafvAoipErZLI8ANv8Ecn6E/m5qPXD26w=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.12.13.tgz"; + sha512 = "MprESJzI9O5VnJZrL7gg1MpdqmiFcUv41Jc7SahxYsNP2kDkFqClxxTZq+1Qv4AFCamm+GXMRDQINNn+qrxmiA=="; }; }; - "@babel/plugin-transform-react-jsx-7.12.12" = { + "@babel/plugin-transform-react-jsx-7.12.13" = { name = "_at_babel_slash_plugin-transform-react-jsx"; packageName = "@babel/plugin-transform-react-jsx"; - version = "7.12.12"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.12.12.tgz"; - sha512 = "JDWGuzGNWscYcq8oJVCtSE61a5+XAOos+V0HrxnDieUus4UMnBEosDnY1VJqU5iZ4pA04QY7l0+JvHL1hZEfsw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.12.13.tgz"; + sha512 = "hhXZMYR8t9RvduN2uW4sjl6MRtUhzNE726JvoJhpjhxKgRUVkZqTsA0xc49ALZxQM7H26pZ/lLvB2Yrea9dllA=="; }; }; - "@babel/plugin-transform-react-jsx-source-7.12.1" = { + "@babel/plugin-transform-react-jsx-source-7.12.13" = { name = "_at_babel_slash_plugin-transform-react-jsx-source"; packageName = "@babel/plugin-transform-react-jsx-source"; - version = "7.12.1"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-react-jsx-source/-/plugin-transform-react-jsx-source-7.12.1.tgz"; - sha512 = "keQ5kBfjJNRc6zZN1/nVHCd6LLIHq4aUKcVnvE/2l+ZZROSbqoiGFRtT5t3Is89XJxBQaP7NLZX2jgGHdZvvFQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-react-jsx-source/-/plugin-transform-react-jsx-source-7.12.13.tgz"; + sha512 = "O5JJi6fyfih0WfDgIJXksSPhGP/G0fQpfxYy87sDc+1sFmsCS6wr3aAn+whbzkhbjtq4VMqLRaSzR6IsshIC0Q=="; }; }; - "@babel/plugin-transform-regenerator-7.12.1" = { + "@babel/plugin-transform-regenerator-7.12.13" = { name = "_at_babel_slash_plugin-transform-regenerator"; packageName = "@babel/plugin-transform-regenerator"; - version = "7.12.1"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.12.1.tgz"; - sha512 = "gYrHqs5itw6i4PflFX3OdBPMQdPbF4bj2REIUxlMRUFk0/ZOAIpDFuViuxPjUL7YC8UPnf+XG7/utJvqXdPKng=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.12.13.tgz"; + sha512 = "lxb2ZAvSLyJ2PEe47hoGWPmW22v7CtSl9jW8mingV4H2sEX/JOcrAj2nPuGWi56ERUm2bUpjKzONAuT6HCn2EA=="; }; }; - "@babel/plugin-transform-reserved-words-7.12.1" = { + "@babel/plugin-transform-reserved-words-7.12.13" = { name = "_at_babel_slash_plugin-transform-reserved-words"; packageName = "@babel/plugin-transform-reserved-words"; - version = "7.12.1"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.12.1.tgz"; - sha512 = "pOnUfhyPKvZpVyBHhSBoX8vfA09b7r00Pmm1sH+29ae2hMTKVmSp4Ztsr8KBKjLjx17H0eJqaRC3bR2iThM54A=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.12.13.tgz"; + sha512 = "xhUPzDXxZN1QfiOy/I5tyye+TRz6lA7z6xaT4CLOjPRMVg1ldRf0LHw0TDBpYL4vG78556WuHdyO9oi5UmzZBg=="; }; }; - "@babel/plugin-transform-runtime-7.12.10" = { + "@babel/plugin-transform-runtime-7.12.13" = { name = "_at_babel_slash_plugin-transform-runtime"; packageName = "@babel/plugin-transform-runtime"; - version = "7.12.10"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.12.10.tgz"; - sha512 = "xOrUfzPxw7+WDm9igMgQCbO3cJKymX7dFdsgRr1eu9n3KjjyU4pptIXbXPseQDquw+W+RuJEJMHKHNsPNNm3CA=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.12.13.tgz"; + sha512 = "ho1CV2lm8qn2AxD3JdvPgtLVHCYLDaOszlf0gosdHcJAIfgNizag76WI+FoibrvfT+h117fgf8h+wgvo4O2qbA=="; }; }; - "@babel/plugin-transform-shorthand-properties-7.12.1" = { + "@babel/plugin-transform-shorthand-properties-7.12.13" = { name = "_at_babel_slash_plugin-transform-shorthand-properties"; packageName = "@babel/plugin-transform-shorthand-properties"; - version = "7.12.1"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.12.1.tgz"; - sha512 = "GFZS3c/MhX1OusqB1MZ1ct2xRzX5ppQh2JU1h2Pnfk88HtFTM+TWQqJNfwkmxtPQtb/s1tk87oENfXJlx7rSDw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.12.13.tgz"; + sha512 = "xpL49pqPnLtf0tVluuqvzWIgLEhuPpZzvs2yabUHSKRNlN7ScYU7aMlmavOeyXJZKgZKQRBlh8rHbKiJDraTSw=="; }; }; - "@babel/plugin-transform-spread-7.12.1" = { + "@babel/plugin-transform-spread-7.12.13" = { name = "_at_babel_slash_plugin-transform-spread"; packageName = "@babel/plugin-transform-spread"; - version = "7.12.1"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.12.1.tgz"; - sha512 = "vuLp8CP0BE18zVYjsEBZ5xoCecMK6LBMMxYzJnh01rxQRvhNhH1csMMmBfNo5tGpGO+NhdSNW2mzIvBu3K1fng=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.12.13.tgz"; + sha512 = "dUCrqPIowjqk5pXsx1zPftSq4sT0aCeZVAxhdgs3AMgyaDmoUT0G+5h3Dzja27t76aUEIJWlFgPJqJ/d4dbTtg=="; }; }; - "@babel/plugin-transform-sticky-regex-7.12.7" = { + "@babel/plugin-transform-sticky-regex-7.12.13" = { name = "_at_babel_slash_plugin-transform-sticky-regex"; packageName = "@babel/plugin-transform-sticky-regex"; - version = "7.12.7"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.12.7.tgz"; - sha512 = "VEiqZL5N/QvDbdjfYQBhruN0HYjSPjC4XkeqW4ny/jNtH9gcbgaqBIXYEZCNnESMAGs0/K/R7oFGMhOyu/eIxg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.12.13.tgz"; + sha512 = "Jc3JSaaWT8+fr7GRvQP02fKDsYk4K/lYwWq38r/UGfaxo89ajud321NH28KRQ7xy1Ybc0VUE5Pz8psjNNDUglg=="; }; }; - "@babel/plugin-transform-template-literals-7.12.1" = { + "@babel/plugin-transform-template-literals-7.12.13" = { name = "_at_babel_slash_plugin-transform-template-literals"; packageName = "@babel/plugin-transform-template-literals"; - version = "7.12.1"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.12.1.tgz"; - sha512 = "b4Zx3KHi+taXB1dVRBhVJtEPi9h1THCeKmae2qP0YdUHIFhVjtpqqNfxeVAa1xeHVhAy4SbHxEwx5cltAu5apw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.12.13.tgz"; + sha512 = "arIKlWYUgmNsF28EyfmiQHJLJFlAJNYkuQO10jL46ggjBpeb2re1P9K9YGxNJB45BqTbaslVysXDYm/g3sN/Qg=="; }; }; - "@babel/plugin-transform-typeof-symbol-7.12.10" = { + "@babel/plugin-transform-typeof-symbol-7.12.13" = { name = "_at_babel_slash_plugin-transform-typeof-symbol"; packageName = "@babel/plugin-transform-typeof-symbol"; - version = "7.12.10"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.12.10.tgz"; - sha512 = "JQ6H8Rnsogh//ijxspCjc21YPd3VLVoYtAwv3zQmqAt8YGYUtdo5usNhdl4b9/Vir2kPFZl6n1h0PfUz4hJhaA=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.12.13.tgz"; + sha512 = "eKv/LmUJpMnu4npgfvs3LiHhJua5fo/CysENxa45YCQXZwKnGCQKAg87bvoqSW1fFT+HA32l03Qxsm8ouTY3ZQ=="; }; }; - "@babel/plugin-transform-typescript-7.12.1" = { + "@babel/plugin-transform-typescript-7.12.13" = { name = "_at_babel_slash_plugin-transform-typescript"; packageName = "@babel/plugin-transform-typescript"; - version = "7.12.1"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.12.1.tgz"; - sha512 = "VrsBByqAIntM+EYMqSm59SiMEf7qkmI9dqMt6RbD/wlwueWmYcI0FFK5Fj47pP6DRZm+3teXjosKlwcZJ5lIMw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.12.13.tgz"; + sha512 = "z1VWskPJxK9tfxoYvePWvzSJC+4pxXr8ArmRm5ofqgi+mwpKg6lvtomkIngBYMJVnKhsFYVysCQLDn//v2RHcg=="; }; }; - "@babel/plugin-transform-unicode-escapes-7.12.1" = { + "@babel/plugin-transform-unicode-escapes-7.12.13" = { name = "_at_babel_slash_plugin-transform-unicode-escapes"; packageName = "@babel/plugin-transform-unicode-escapes"; - version = "7.12.1"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.12.1.tgz"; - sha512 = "I8gNHJLIc7GdApm7wkVnStWssPNbSRMPtgHdmH3sRM1zopz09UWPS4x5V4n1yz/MIWTVnJ9sp6IkuXdWM4w+2Q=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.12.13.tgz"; + sha512 = "0bHEkdwJ/sN/ikBHfSmOXPypN/beiGqjo+o4/5K+vxEFNPRPdImhviPakMKG4x96l85emoa0Z6cDflsdBusZbw=="; }; }; - "@babel/plugin-transform-unicode-regex-7.12.1" = { + "@babel/plugin-transform-unicode-regex-7.12.13" = { name = "_at_babel_slash_plugin-transform-unicode-regex"; packageName = "@babel/plugin-transform-unicode-regex"; - version = "7.12.1"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.12.1.tgz"; - sha512 = "SqH4ClNngh/zGwHZOOQMTD+e8FGWexILV+ePMyiDJttAWRh5dhDL8rcl5lSgU3Huiq6Zn6pWTMvdPAb21Dwdyg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.12.13.tgz"; + sha512 = "mDRzSNY7/zopwisPZ5kM9XKCfhchqIYwAKRERtEnhYscZB79VRekuRSoYbN0+KVe3y8+q1h6A4svXtP7N+UoCA=="; }; }; "@babel/polyfill-7.12.1" = { @@ -1255,22 +1255,22 @@ let sha512 = "X0pi0V6gxLi6lFZpGmeNa4zxtwEmCs42isWLNjZZDE0Y8yVfgu0T2OAHlzBbdYlqbW/YXVvoBHpATEM+goCj8g=="; }; }; - "@babel/preset-env-7.12.11" = { + "@babel/preset-env-7.12.13" = { name = "_at_babel_slash_preset-env"; packageName = "@babel/preset-env"; - version = "7.12.11"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.12.11.tgz"; - sha512 = "j8Tb+KKIXKYlDBQyIOy4BLxzv1NUOwlHfZ74rvW+Z0Gp4/cI2IMDPBWAgWceGcE7aep9oL/0K9mlzlMGxA8yNw=="; + url = "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.12.13.tgz"; + sha512 = "JUVlizG8SoFTz4LmVUL8++aVwzwxcvey3N0j1tRbMAXVEy95uQ/cnEkmEKHN00Bwq4voAV3imQGnQvpkLAxsrw=="; }; }; - "@babel/preset-flow-7.12.1" = { + "@babel/preset-flow-7.12.13" = { name = "_at_babel_slash_preset-flow"; packageName = "@babel/preset-flow"; - version = "7.12.1"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/preset-flow/-/preset-flow-7.12.1.tgz"; - sha512 = "UAoyMdioAhM6H99qPoKvpHMzxmNVXno8GYU/7vZmGaHk6/KqfDYL1W0NxszVbJ2EP271b7e6Ox+Vk2A9QsB3Sw=="; + url = "https://registry.npmjs.org/@babel/preset-flow/-/preset-flow-7.12.13.tgz"; + sha512 = "gcEjiwcGHa3bo9idURBp5fmJPcyFPOszPQjztXrOjUE2wWVqc6fIVJPgWPIQksaQ5XZ2HWiRsf2s1fRGVjUtVw=="; }; }; "@babel/preset-modules-0.1.4" = { @@ -1291,22 +1291,31 @@ let sha512 = "dStnEQgejNYIHFNACdDCigK4BF7wgW6Zahv9Dc2un7rGjbeVtZhBfR3sy0I7ZJOhBexkFxVdMZ5hqmll7BFShw=="; }; }; - "@babel/preset-typescript-7.12.7" = { + "@babel/preset-typescript-7.12.13" = { name = "_at_babel_slash_preset-typescript"; packageName = "@babel/preset-typescript"; - version = "7.12.7"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/preset-typescript/-/preset-typescript-7.12.7.tgz"; - sha512 = "nOoIqIqBmHBSEgBXWR4Dv/XBehtIFcw9PqZw6rFYuKrzsZmOQm3PR5siLBnKZFEsDb03IegG8nSjU/iXXXYRmw=="; + url = "https://registry.npmjs.org/@babel/preset-typescript/-/preset-typescript-7.12.13.tgz"; + sha512 = "gYry7CeXwD2wtw5qHzrtzKaShEhOfTmKb4i0ZxeYBcBosN5VuAudsNbjX7Oj5EAfQ3K4s4HsVMQRRcqGsPvs2A=="; }; }; - "@babel/register-7.12.10" = { + "@babel/register-7.12.13" = { name = "_at_babel_slash_register"; packageName = "@babel/register"; - version = "7.12.10"; + version = "7.12.13"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/register/-/register-7.12.13.tgz"; + sha512 = "fnCeRXj970S9seY+973oPALQg61TRvAaW0nRDe1f4ytKqM3fZgsNXewTZWmqZedg74LFIRpg/11dsrPZZvYs2g=="; + }; + }; + "@babel/runtime-7.12.13" = { + name = "_at_babel_slash_runtime"; + packageName = "@babel/runtime"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/register/-/register-7.12.10.tgz"; - sha512 = "EvX/BvMMJRAA3jZgILWgbsrHwBQvllC5T8B29McyME8DvkdOxk4ujESfrMvME8IHSDvWXrmMXxPvA/lx2gqPLQ=="; + url = "https://registry.npmjs.org/@babel/runtime/-/runtime-7.12.13.tgz"; + sha512 = "8+3UMPBrjFa/6TtKi/7sehPKqfAm4g6K+YQjyyFOLUTxzOngcRZTlAVY8sc2CORJYqdHQY8gRPHmn+qo15rCBw=="; }; }; "@babel/runtime-7.12.5" = { @@ -1327,22 +1336,22 @@ let sha512 = "cTIudHnzuWLS56ik4DnRnqqNf8MkdUzV4iFFI1h7Jo9xvrpQROYaAnaSd2mHLQAzzZAPfATynX5ord6YlNYNMA=="; }; }; - "@babel/template-7.12.7" = { + "@babel/template-7.12.13" = { name = "_at_babel_slash_template"; packageName = "@babel/template"; - version = "7.12.7"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/template/-/template-7.12.7.tgz"; - sha512 = "GkDzmHS6GV7ZeXfJZ0tLRBhZcMcY0/Lnb+eEbXDBfCAcZCjrZKe6p3J4we/D24O9Y8enxWAg1cWwof59yLh2ow=="; + url = "https://registry.npmjs.org/@babel/template/-/template-7.12.13.tgz"; + sha512 = "/7xxiGA57xMo/P2GVvdEumr8ONhFOhfgq2ihK3h1e6THqzTAkHbkXgB0xI9yeTfIUoH3+oAeHhqm/I43OTbbjA=="; }; }; - "@babel/traverse-7.12.12" = { + "@babel/traverse-7.12.13" = { name = "_at_babel_slash_traverse"; packageName = "@babel/traverse"; - version = "7.12.12"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.12.12.tgz"; - sha512 = "s88i0X0lPy45RrLM8b9mz8RPH5FqO9G9p7ti59cToE44xFm1Q+Pjh5Gq4SXBbtb88X7Uy7pexeqRIQDDMNkL0w=="; + url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.12.13.tgz"; + sha512 = "3Zb4w7eE/OslI0fTp8c7b286/cQps3+vdLW3UcwC8VSJC6GbKn55aeVVu2QJNuCDoeKyptLOFrPq8WqZZBodyA=="; }; }; "@babel/types-7.10.4" = { @@ -1354,13 +1363,13 @@ let sha512 = "UTCFOxC3FsFHb7lkRMVvgLzaRVamXuAs2Tz4wajva4WxtVY82eZeaUBtC2Zt95FU9TiznuC0Zk35tsim8jeVpg=="; }; }; - "@babel/types-7.12.12" = { + "@babel/types-7.12.13" = { name = "_at_babel_slash_types"; packageName = "@babel/types"; - version = "7.12.12"; + version = "7.12.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/types/-/types-7.12.12.tgz"; - sha512 = "lnIX7piTxOH22xE7fDXDbSHg9MM1/6ORnafpJmov5rs0kX5g4BZxeXNJLXsMRiO0U5Rb8/FvMS6xlTnTHvxonQ=="; + url = "https://registry.npmjs.org/@babel/types/-/types-7.12.13.tgz"; + sha512 = "oKrdZTld2im1z8bDwTOQvUbxKwE+854zc16qWZQlcTqMN00pWxHQ4ZeOq0yDMnisOpRykH2/5Qqcrk/OlbAjiQ=="; }; }; "@braintree/sanitize-url-3.1.0" = { @@ -1930,13 +1939,13 @@ let sha512 = "HLZNtkETFUuCP76Wk/oF54+tVp6aPGzsoJRsmnkh78gloC9CGp8JK+LQUYfj9dtzcHDHq64/dAA2e4j2tzjhaQ=="; }; }; - "@fluentui/react-7.158.0" = { + "@fluentui/react-7.158.1" = { name = "_at_fluentui_slash_react"; packageName = "@fluentui/react"; - version = "7.158.0"; + version = "7.158.1"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/react/-/react-7.158.0.tgz"; - sha512 = "9vFTB7jt0ztni9CAwqKu66qE1/WEcvp/CN9sJslFgrj+r6kJSjZ2+Uk7O0VblVSiRIhgWqLEhuEDaEdH5q5QIA=="; + url = "https://registry.npmjs.org/@fluentui/react/-/react-7.158.1.tgz"; + sha512 = "AbmLB14+RA5Bf5P40/KdsaHxTr2IDwmU9q9vJsrzDOzGGhv13w6qVhdahJvTR8a5TFLPCob7wWhPRtKrTGZCxw=="; }; }; "@fluentui/react-focus-7.17.1" = { @@ -2101,13 +2110,13 @@ let sha512 = "9acgDkkYeAHpuqhOa3E63NZPCX/iWo819Q320sCCMkydF1xgx0qCRYz/V03xPdpQETKRqBG2i2N2csneeEYYig=="; }; }; - "@graphql-tools/schema-7.1.2" = { + "@graphql-tools/schema-7.1.3" = { name = "_at_graphql-tools_slash_schema"; packageName = "@graphql-tools/schema"; - version = "7.1.2"; + version = "7.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/schema/-/schema-7.1.2.tgz"; - sha512 = "GabNT51ErVHE2riDH4EQdRusUsI+nMElT8LdFHyuP53v8gwtleAj+LePQ9jif4NYUe/JQVqO8V28vPcHrA7gfQ=="; + url = "https://registry.npmjs.org/@graphql-tools/schema/-/schema-7.1.3.tgz"; + sha512 = "ZY76hmcJlF1iyg3Im0sQ3ASRkiShjgv102vLTVcH22lEGJeCaCyyS/GF1eUHom418S60bS8Th6+autRUxfBiBg=="; }; }; "@graphql-tools/url-loader-6.8.0" = { @@ -2146,13 +2155,13 @@ let sha512 = "KCWBXsDfvG46GNUawRltJL4j9BMGoOG7oo3WEyCQP+SByWXiTe5cBF45SLDVQgdjljGNZhZ4Lq/7avIkF7/zDQ=="; }; }; - "@grpc/grpc-js-1.2.5" = { + "@grpc/grpc-js-1.2.6" = { name = "_at_grpc_slash_grpc-js"; packageName = "@grpc/grpc-js"; - version = "1.2.5"; + version = "1.2.6"; src = fetchurl { - url = "https://registry.npmjs.org/@grpc/grpc-js/-/grpc-js-1.2.5.tgz"; - sha512 = "CBCNwedw8McnEBq9jvoiJikws16WN0OiHFejQPovY71XkFWSiIqgvydYiDwpvIYDJmhPQ7qZNzW9BPndhXbx1Q=="; + url = "https://registry.npmjs.org/@grpc/grpc-js/-/grpc-js-1.2.6.tgz"; + sha512 = "wfYwFy7CvVEmBKzeDX1kQQYrv5NBpe8Z+VwXipFvqof3lCXKch7k+4T3grKtptaH5GQ5KP9iKwPr9hMDSynIUw=="; }; }; "@grpc/proto-loader-0.5.6" = { @@ -2785,13 +2794,13 @@ let sha512 = "4JQNk+3mVzK3xh2rqd6RB4J46qUR19azEHBneZyTZM+c456qOrbbM/5xcR8huNCCcbVt7+UmizG6GuUvPvKUYg=="; }; }; - "@jsii/spec-1.18.0" = { + "@jsii/spec-1.20.0" = { name = "_at_jsii_slash_spec"; packageName = "@jsii/spec"; - version = "1.18.0"; + version = "1.20.0"; src = fetchurl { - url = "https://registry.npmjs.org/@jsii/spec/-/spec-1.18.0.tgz"; - sha512 = "NtIvTyKBFCpwmZpCX76WtIks+W6I0Rbo94SvDuLsMGV8KBgiIEfgLP47P57vKxaJkXLNiINMjFBOSTDwF3bWKg=="; + url = "https://registry.npmjs.org/@jsii/spec/-/spec-1.20.0.tgz"; + sha512 = "7KwIuFTAcT4N7tOBQSacaIK3TEkCrWjTHY1iSWh5VNF9Yrc5I6KQ/WmGa/5yC3jZThR3J/+z1H/IIUVPhfiUYw=="; }; }; "@kwsites/file-exists-1.1.1" = { @@ -3433,13 +3442,13 @@ let sha512 = "b+MGNyP9/LXkapreJzNUzcvuzZslj/RGgdVVJ16P2wSlYatfLycPObImqVJSmNAdyeShvNeM/pl3sVZsObFueg=="; }; }; - "@netlify/build-8.3.4" = { + "@netlify/build-8.4.0" = { name = "_at_netlify_slash_build"; packageName = "@netlify/build"; - version = "8.3.4"; + version = "8.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/build/-/build-8.3.4.tgz"; - sha512 = "DHDvJoM/CtlVuUQoeWzluE4nIabwOKJdIp7yfU/MkpXwXjI1RSPCRvmtzK7A1CUkTZ7sH0m2otgpihgf4pgslw=="; + url = "https://registry.npmjs.org/@netlify/build/-/build-8.4.0.tgz"; + sha512 = "FKjJB9vYZVQUij1cHF1gztKX5qbKsZ8t0vSJtZuziLYCAH4KqWdLxKAZX9UNGw8tNe9SVRDknr6juGuePtozow=="; }; }; "@netlify/cache-utils-1.0.6" = { @@ -3451,13 +3460,13 @@ let sha512 = "Pz/TzLZhMUACT+X7Un6jZCXgEUwLPVNbx69DQtEOMZ6hNBE1b1ErTHFbSaHA0KfDn/yqCII5vS274DERvNuRwg=="; }; }; - "@netlify/config-3.1.1" = { + "@netlify/config-3.1.2" = { name = "_at_netlify_slash_config"; packageName = "@netlify/config"; - version = "3.1.1"; + version = "3.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/config/-/config-3.1.1.tgz"; - sha512 = "FUOXzkn/iHrWU8wezWnAVsO7x/l2mPXBpcaP2X2BIcMzOePvzreHPCAplekjNof2Q1QPjHfo746Bd/CyMIUOeg=="; + url = "https://registry.npmjs.org/@netlify/config/-/config-3.1.2.tgz"; + sha512 = "a56KY1o1oMX5HAIsbQjsIxgZAdyVm8dU98VDxgmPciogJ+ZmlDba4PhZ5FilmUSy2XsCszRg05FtSW9NVzXcEw=="; }; }; "@netlify/framework-info-2.1.1" = { @@ -3469,13 +3478,13 @@ let sha512 = "JblagtBYtOwuxZy94jXPNc3p+QOuyx+kZurfduswYbT8VWPlyuiL4AQFKaIJvdZS6O9G8uKEiFGsKFhRTx6vAA=="; }; }; - "@netlify/functions-utils-1.3.9" = { + "@netlify/functions-utils-1.3.10" = { name = "_at_netlify_slash_functions-utils"; packageName = "@netlify/functions-utils"; - version = "1.3.9"; + version = "1.3.10"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/functions-utils/-/functions-utils-1.3.9.tgz"; - sha512 = "i3HE/2NXqjUvShOqWCwPsBLV7puloMK6R7u3O6M3m7WacYKD8nh7dwkNIZSq7QbEueljslH8rwzbNw5EtyKIHw=="; + url = "https://registry.npmjs.org/@netlify/functions-utils/-/functions-utils-1.3.10.tgz"; + sha512 = "cakXwiNWNau80ZLU33nbmBxNfFmMwrwgy+P9U9ep3NXxocWJeMVjCPoXzpoE3VydnOoyVJNy6erTziNdOVykEA=="; }; }; "@netlify/git-utils-1.0.7" = { @@ -3568,58 +3577,58 @@ let sha512 = "nYHM4dnlua/aCe74ZPZcIlWAN1QbyGDaWbJi+Qkb0VSe4yX6PYvPNeymABggDbA9xFhk+nEA98wSu2A/beHPfQ=="; }; }; - "@node-red/editor-api-1.2.8" = { + "@node-red/editor-api-1.2.9" = { name = "_at_node-red_slash_editor-api"; packageName = "@node-red/editor-api"; - version = "1.2.8"; + version = "1.2.9"; src = fetchurl { - url = "https://registry.npmjs.org/@node-red/editor-api/-/editor-api-1.2.8.tgz"; - sha512 = "p8kWDzQSKX/CJAC8sjk7ge4bW+3nLfb16Vew/ZQLMks9Q/KOnZRmFOzmn4D4Ao0/ZLawPMKEIhkmRzn429dAlw=="; + url = "https://registry.npmjs.org/@node-red/editor-api/-/editor-api-1.2.9.tgz"; + sha512 = "KsN5Cp/YMfYM6E/rclWuEoNpTe3krRbKhc3X+TGOirZZ5JVW4qbpdP1p0jRmcBkhZPc1i6yOh5PE7qN7LoPH5A=="; }; }; - "@node-red/editor-client-1.2.8" = { + "@node-red/editor-client-1.2.9" = { name = "_at_node-red_slash_editor-client"; packageName = "@node-red/editor-client"; - version = "1.2.8"; + version = "1.2.9"; src = fetchurl { - url = "https://registry.npmjs.org/@node-red/editor-client/-/editor-client-1.2.8.tgz"; - sha512 = "D/BbK5JyQKwLKgrJqYBvmplXMHo0ZJoL/MZWQQnpITqcFGaPCPrH1BfQZrbx2H/N0NeOtNufHVmqJ/tBXA2KmQ=="; + url = "https://registry.npmjs.org/@node-red/editor-client/-/editor-client-1.2.9.tgz"; + sha512 = "L8zDaeVLjo7dZzqVTTj0XcQFj6QlnLJOPpnpt9V0sSQDwWzA+lWTP6nNwUcXiGuchN/WeXQXrsfBEemHgKUNLg=="; }; }; - "@node-red/nodes-1.2.8" = { + "@node-red/nodes-1.2.9" = { name = "_at_node-red_slash_nodes"; packageName = "@node-red/nodes"; - version = "1.2.8"; + version = "1.2.9"; src = fetchurl { - url = "https://registry.npmjs.org/@node-red/nodes/-/nodes-1.2.8.tgz"; - sha512 = "jp5DRxvigsfyQfMslq9arr/PbI4rMCFdCE2NaKhAXtNbSEfX5FHWqgMuNtfvjAwiuyoAfT+TDqYYlK7n1BAQ/g=="; + url = "https://registry.npmjs.org/@node-red/nodes/-/nodes-1.2.9.tgz"; + sha512 = "ZQ3NCzl7gC3KIGgjmRZTqO3W0W03nnu4r8IX/OeiM4ewlhDlrvfoejOX1zTtIHnmgzFM+FjweyLeWEQ7bpy8jA=="; }; }; - "@node-red/registry-1.2.8" = { + "@node-red/registry-1.2.9" = { name = "_at_node-red_slash_registry"; packageName = "@node-red/registry"; - version = "1.2.8"; + version = "1.2.9"; src = fetchurl { - url = "https://registry.npmjs.org/@node-red/registry/-/registry-1.2.8.tgz"; - sha512 = "/VAP+sQvyHiJgYHnAiBHzvCi6gOXvS7dv8wB/wgLcyOc1XQ+t8I1U6+m+Tp5MH+jFwmsZi9Ygwdsovi59iD4xA=="; + url = "https://registry.npmjs.org/@node-red/registry/-/registry-1.2.9.tgz"; + sha512 = "OxFbHU7UrisBEM0413KSsPRXzQCJIwNQtg1E+oPDiFuMtHwVhUiVicnqbo8IiftO58PsMkSL+Wj2+ta34phlgA=="; }; }; - "@node-red/runtime-1.2.8" = { + "@node-red/runtime-1.2.9" = { name = "_at_node-red_slash_runtime"; packageName = "@node-red/runtime"; - version = "1.2.8"; + version = "1.2.9"; src = fetchurl { - url = "https://registry.npmjs.org/@node-red/runtime/-/runtime-1.2.8.tgz"; - sha512 = "Z9IYd2bIxI0692tL1MgUIDZiss+SabPFHYgIzysUWiiUC1FyqPLJq2e3S5hHyIiBfepB0k7QjdRnAzgfbwvXfg=="; + url = "https://registry.npmjs.org/@node-red/runtime/-/runtime-1.2.9.tgz"; + sha512 = "wcSq7MNVbRLaahKWHV5diqyeCWviKtr6VNzAmtIB+wH+omfx+OWiJEimu9x/56l9iv3mc9ew4PwtOMG07QNiTQ=="; }; }; - "@node-red/util-1.2.8" = { + "@node-red/util-1.2.9" = { name = "_at_node-red_slash_util"; packageName = "@node-red/util"; - version = "1.2.8"; + version = "1.2.9"; src = fetchurl { - url = "https://registry.npmjs.org/@node-red/util/-/util-1.2.8.tgz"; - sha512 = "fujIH4X/DXkPLDnIdfjkxFUf0NocsKV1Dx7i+Yrz0cmaSuBqDpA/p8Ngw/AtOhP3OLlLUNXvRPLoTgaw/gsGwg=="; + url = "https://registry.npmjs.org/@node-red/util/-/util-1.2.9.tgz"; + sha512 = "a4JVRFaxkSpuVAHwwQ8yi+jwyhsflgZD7glGFlcPdfBXvcE4EiGxx1OFbNzI3JJ7pL+8sE0xxwfsZuY24IZahw=="; }; }; "@nodelib/fs.scandir-2.1.4" = { @@ -3811,13 +3820,13 @@ let sha512 = "bGHUdo5e7DjPJ0vTeRBMIrfqTRDBfyR5w0MP41u0n3r7YG5p14lvMmiCXxi6WDaP2Hw5nqx3PnkAIntCKZZN7g=="; }; }; - "@oclif/plugin-help-3.2.1" = { + "@oclif/plugin-help-3.2.2" = { name = "_at_oclif_slash_plugin-help"; packageName = "@oclif/plugin-help"; - version = "3.2.1"; + version = "3.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/@oclif/plugin-help/-/plugin-help-3.2.1.tgz"; - sha512 = "vq7rn16TrQmjX3Al/k1Z5iBZWZ3HE8fDXs52OmDJmmTqryPSNvURH9WCAsqr0PODYCSR17Hy1VTzS0x7vVVLEQ=="; + url = "https://registry.npmjs.org/@oclif/plugin-help/-/plugin-help-3.2.2.tgz"; + sha512 = "SPZ8U8PBYK0n4srFjCLedk0jWU4QlxgEYLCXIBShJgOwPhTTQknkUlsEwaMIevvCU4iCQZhfMX+D8Pz5GZjFgA=="; }; }; "@oclif/plugin-not-found-1.2.4" = { @@ -3874,13 +3883,13 @@ let sha512 = "fUIPpx+pZyoLW4GCs3yMnlj2LfoXTWDUVPTC4V3MUEKZm48W+XYpeWSZCv+vYF1ZABUm2CqnDVf1sFtIYrj7KQ=="; }; }; - "@octokit/openapi-types-3.4.1" = { + "@octokit/openapi-types-4.0.1" = { name = "_at_octokit_slash_openapi-types"; packageName = "@octokit/openapi-types"; - version = "3.4.1"; + version = "4.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-3.4.1.tgz"; - sha512 = "7Sjm3UwEAM11f+ck9+qlyEfgl8hCk5sSZBU2qcWY8+8ibowjqcwxhhtvY0/pjHPF8mcvmedFpGmmIYs2qM9/+Q=="; + url = "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-4.0.1.tgz"; + sha512 = "k2hRcfcLRyPJjtYfJLzg404n7HZ6sUpAWAR/uNI8tf96NgatWOpw1ocdF+WFfx/trO1ivBh7ckynO1rn+xAw/Q=="; }; }; "@octokit/plugin-enterprise-rest-6.0.1" = { @@ -3964,13 +3973,23 @@ let sha512 = "O75k56TYvJ8WpAakWwYRN8Bgu60KrmX0z1KqFp1kNiFNkgW+JW+9EBKZ+S33PU6SLvbihqd+3drvPxKK68Ee8Q=="; }; }; - "@octokit/types-6.7.1" = { + "@octokit/types-6.8.2" = { name = "_at_octokit_slash_types"; packageName = "@octokit/types"; - version = "6.7.1"; + version = "6.8.2"; src = fetchurl { - url = "https://registry.npmjs.org/@octokit/types/-/types-6.7.1.tgz"; - sha512 = "OzRXbizUfixgzTjlSZQj+yuo0J9vAMOLtpsIm3JjQUsI3CcLXZnVaxRIWtYD+iwHznnvG9fJlPHM6SRp77fUcw=="; + url = "https://registry.npmjs.org/@octokit/types/-/types-6.8.2.tgz"; + sha512 = "RpG0NJd7OKSkWptiFhy1xCLkThs5YoDIKM21lEtDmUvSpbaIEfrxzckWLUGDFfF8RydSyngo44gDv8m2hHruUg=="; + }; + }; + "@open-policy-agent/opa-wasm-git+https://github.com/open-policy-agent/npm-opa-wasm.git#f4a21fe6f4d70706f85106dc6ea867983747e040" = { + name = "_at_open-policy-agent_slash_opa-wasm"; + packageName = "@open-policy-agent/opa-wasm"; + version = "1.1.0"; + src = fetchgit { + url = "https://github.com/open-policy-agent/npm-opa-wasm.git"; + rev = "f4a21fe6f4d70706f85106dc6ea867983747e040"; + sha256 = "148ed1d81abef5779491612e4d4850ed748177a95157e9f81e3b7bdb53614b3d"; }; }; "@opencensus/core-0.0.8" = { @@ -4729,13 +4748,13 @@ let sha512 = "lOUyRopNTKJYVEU9T6stp2irwlTDsYMmUKBOUjnMcwGveuUfIJqrCOtFLtIPPj3XJlbZy5F68l4KP9rZ8Ipang=="; }; }; - "@serverless/components-3.6.0" = { + "@serverless/components-3.6.1" = { name = "_at_serverless_slash_components"; packageName = "@serverless/components"; - version = "3.6.0"; + version = "3.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/@serverless/components/-/components-3.6.0.tgz"; - sha512 = "zOGD1yN5n3WWdMuSUKVshawrllbucQBhmBTitcmEJTm8KIDwMxV7dMBGeO8RdhruvU3qO6eII3LiVTnV/G6eXg=="; + url = "https://registry.npmjs.org/@serverless/components/-/components-3.6.1.tgz"; + sha512 = "B6X+jV9zu8NPavTDiUVvRTOZeREUiJ8D1RT8BpKB6kJubPS6h/RTBjdPrt3Y+DQBX4AfMb9xa2G4L4rj2shHJQ=="; }; }; "@serverless/core-1.1.2" = { @@ -4765,13 +4784,13 @@ let sha512 = "YAV5V/y+XIOfd+HEVeXfPWZb8C6QLruFk9tBivoX2roQLWVq145s4uxf8D0QioCueuRzkukHUS4JIj+KVoS34A=="; }; }; - "@serverless/platform-client-3.10.0" = { + "@serverless/platform-client-3.11.0" = { name = "_at_serverless_slash_platform-client"; packageName = "@serverless/platform-client"; - version = "3.10.0"; + version = "3.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/@serverless/platform-client/-/platform-client-3.10.0.tgz"; - sha512 = "+dSJxViCfXcMUB1GrvJXkbw8M0KoI6uf01SxWFD7dYY61ojlmErBPuGAMmyOLxc9SzfCG4rQDkrzfIqP77zrqw=="; + url = "https://registry.npmjs.org/@serverless/platform-client/-/platform-client-3.11.0.tgz"; + sha512 = "fC4Q6mjARGdkPrBzEdsiZIgC4To74P7ro9qbtjhre1K9O0tJvvFB7/TuF3F7Xdry4fSPG6RuqdEDEXYA4FwkZw=="; }; }; "@serverless/platform-client-china-2.1.4" = { @@ -6178,22 +6197,13 @@ let sha512 = "i5y7HTbvhonZQE+GnUM2rz1Bi8QkzxdQmEv1LKOv4nWyaQk/gdeiTApuQR3PDJHX7WomAbpx2wlWSEpxXGZ/UQ=="; }; }; - "@types/node-12.19.15" = { + "@types/node-13.13.41" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "12.19.15"; + version = "13.13.41"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-12.19.15.tgz"; - sha512 = "lowukE3GUI+VSYSu6VcBXl14d61Rp5hA1D+61r16qnwC0lYNSqdxcvRh0pswejorHfS+HgwBasM8jLXz0/aOsw=="; - }; - }; - "@types/node-13.13.40" = { - name = "_at_types_slash_node"; - packageName = "@types/node"; - version = "13.13.40"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-13.13.40.tgz"; - sha512 = "eKaRo87lu1yAXrzEJl0zcJxfUMDT5/mZalFyOkT44rnQps41eS2pfWzbaulSPpQLFNy29bFqn+Y5lOTL8ATlEQ=="; + url = "https://registry.npmjs.org/@types/node/-/node-13.13.41.tgz"; + sha512 = "qLT9IvHiXJfdrje9VmsLzun7cQ65obsBTmtU3EOnCSLFOoSHx1hpiRHoBnpdbyFqnzqdUUIv81JcEJQCB8un9g=="; }; }; "@types/node-14.11.1" = { @@ -6205,13 +6215,13 @@ let sha512 = "oTQgnd0hblfLsJ6BvJzzSL+Inogp3lq9fGgqRkMB/ziKMgEUaFl801OncOzUmalfzt14N0oPHMK47ipl+wbTIw=="; }; }; - "@types/node-14.14.22" = { + "@types/node-14.14.25" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "14.14.22"; + version = "14.14.25"; 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-14.14.25.tgz"; + sha512 = "EPpXLOVqDvisVxtlbvzfyqSsFeQxltFbluZNRndIb8tr9KiBnYNLzrc1N3pyKUCww2RNrfHDViqDWWE1LCJQtQ=="; }; }; "@types/node-6.14.13" = { @@ -7510,31 +7520,31 @@ let sha512 = "2J0nE95rHXHyQ24cWjMKJ1tqB/ds8z/cyeOZxJhcb+rW+SQASVjuznUSmdz5GpVJTzU8JkhYut0D3siFDD6wsA=="; }; }; - "@webpack-cli/configtest-1.0.0" = { + "@webpack-cli/configtest-1.0.1" = { name = "_at_webpack-cli_slash_configtest"; packageName = "@webpack-cli/configtest"; - version = "1.0.0"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@webpack-cli/configtest/-/configtest-1.0.0.tgz"; - sha512 = "Un0SdBoN1h4ACnIO7EiCjWuyhNI0Jl96JC+63q6xi4HDUYRZn8Auluea9D+v9NWKc5J4sICVEltdBaVjLX39xw=="; + url = "https://registry.npmjs.org/@webpack-cli/configtest/-/configtest-1.0.1.tgz"; + sha512 = "B+4uBUYhpzDXmwuo3V9yBH6cISwxEI4J+NO5ggDaGEEHb0osY/R7MzeKc0bHURXQuZjMM4qD+bSJCKIuI3eNBQ=="; }; }; - "@webpack-cli/info-1.2.1" = { + "@webpack-cli/info-1.2.2" = { name = "_at_webpack-cli_slash_info"; packageName = "@webpack-cli/info"; - version = "1.2.1"; + version = "1.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/@webpack-cli/info/-/info-1.2.1.tgz"; - sha512 = "fLnDML5HZ5AEKzHul8xLAksoKN2cibu6MgonkUj8R9V7bbeVRkd1XbGEGWrAUNYHbX1jcqCsDEpBviE5StPMzQ=="; + url = "https://registry.npmjs.org/@webpack-cli/info/-/info-1.2.2.tgz"; + sha512 = "5U9kUJHnwU+FhKH4PWGZuBC1hTEPYyxGSL5jjoBI96Gx8qcYJGOikpiIpFoTq8mmgX3im2zAo2wanv/alD74KQ=="; }; }; - "@webpack-cli/serve-1.2.2" = { + "@webpack-cli/serve-1.3.0" = { name = "_at_webpack-cli_slash_serve"; packageName = "@webpack-cli/serve"; - version = "1.2.2"; + version = "1.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/@webpack-cli/serve/-/serve-1.2.2.tgz"; - sha512 = "03GkWxcgFfm8+WIwcsqJb9agrSDNDDoxaNnexPnCCexP5SCE4IgFd9lNpSy+K2nFqVMpgTFw6SwbmVAVTndVew=="; + url = "https://registry.npmjs.org/@webpack-cli/serve/-/serve-1.3.0.tgz"; + sha512 = "k2p2VrONcYVX1wRRrf0f3X2VGltLWcv+JzXRBDmvCxGlCeESx4OXw91TsWeKOkp784uNoVQo313vxJFHXPPwfw=="; }; }; "@wry/context-0.4.4" = { @@ -10345,13 +10355,13 @@ let sha512 = "+KBkqH7t/XE91Fqn8eyJeNIWsnhSWL8bSUqFD7TfE3FN07MTlC0nprGYp+2WfcYNz5i8Bus1vY2DHNVhtTImnw=="; }; }; - "aws-sdk-2.834.0" = { + "aws-sdk-2.836.0" = { name = "aws-sdk"; packageName = "aws-sdk"; - version = "2.834.0"; + version = "2.836.0"; src = fetchurl { - url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.834.0.tgz"; - sha512 = "9WRULrn4qAmgXI+tEW/IG5s/6ixJGZqjPOrmJsFZQev7/WRkxAZmJAjcwd4Ifm/jsJbXx2FSwO76gOPEvu2LqA=="; + url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.836.0.tgz"; + sha512 = "lVOT5/yr9ONfbn6UXYYIdFlVIFmSoX0CnjAQzXkfcYg+k7CZklbqqVIdgdLoiQYwQGLceoWghSevPGe7fjFg9Q=="; }; }; "aws-sign2-0.6.0" = { @@ -11731,13 +11741,13 @@ let sha512 = "6Pesp1w0DEX1N550i/uGV/TqucVL4AM/pgThFSN/Qq9si1/DF9aIHs1BxD8V/QU0HoeHO6cQRTAuYnLPKq1e4g=="; }; }; - "bl-4.0.3" = { + "bl-4.0.4" = { name = "bl"; packageName = "bl"; - version = "4.0.3"; + version = "4.0.4"; 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.0.4.tgz"; + sha512 = "7tdr4EpSd7jJ6tuQ21vu2ke8w7pNEstzj1O8wwq6sNNzO3UDi5MA8Gny/gquCj7r2C6fHudg8tKRGyjRgmvNxQ=="; }; }; "blake2b-2.1.3" = { @@ -11839,13 +11849,13 @@ let sha1 = "13ebfe778a03205cfe03751481ebb4b3300c126a"; }; }; - "block-stream2-2.0.0" = { + "block-stream2-2.1.0" = { name = "block-stream2"; packageName = "block-stream2"; - version = "2.0.0"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/block-stream2/-/block-stream2-2.0.0.tgz"; - sha512 = "1oI+RHHUEo64xomy1ozLgVJetFlHkIfQfJzTBQrj6xWnEMEPooeo2fZoqFjp0yzfHMBrgxwgh70tKp6T17+i3g=="; + url = "https://registry.npmjs.org/block-stream2/-/block-stream2-2.1.0.tgz"; + sha512 = "suhjmLI57Ewpmq00qaygS8UgEq2ly2PCItenIyhMqVjo4t4pGzqMvfgJuX8iWTeSDdfSSqS6j38fL4ToNL7Pfg=="; }; }; "blru-0.1.6" = { @@ -12298,6 +12308,15 @@ let sha1 = "12c25efe40a45e3c323eb8675a0a0ce57b22371f"; }; }; + "browser-hrtime-1.1.8" = { + name = "browser-hrtime"; + packageName = "browser-hrtime"; + version = "1.1.8"; + src = fetchurl { + url = "https://registry.npmjs.org/browser-hrtime/-/browser-hrtime-1.1.8.tgz"; + sha512 = "kzXheikaJsBtzUBlyVtPIY5r0soQePzjwVwT4IlDpU2RvfB5Py52gpU98M77rgqMCheoSSZvrcrdj3t6cZ3suA=="; + }; + }; "browser-launcher2-0.4.6" = { name = "browser-launcher2"; packageName = "browser-launcher2"; @@ -13558,13 +13577,13 @@ let sha512 = "vlNK021QdI7PNeiUh/lKkC/mNHHfV0m/Ad5JoI0TYtlBnJAslM/JIkm/tGC88bkLIwO6OQ5uV6ztS6kVAtCDlg=="; }; }; - "cdk8s-1.0.0-beta.6" = { + "cdk8s-1.0.0-beta.8" = { name = "cdk8s"; packageName = "cdk8s"; - version = "1.0.0-beta.6"; + version = "1.0.0-beta.8"; src = fetchurl { - url = "https://registry.npmjs.org/cdk8s/-/cdk8s-1.0.0-beta.6.tgz"; - sha512 = "L/J8c7/wSEY2POx5j9SnxxgEJ7V7mFYS3F9pGj2idUfj4GCHbMLCGXQ8bAPzaiWOFSEDVMOPBOangLEia+5RBw=="; + url = "https://registry.npmjs.org/cdk8s/-/cdk8s-1.0.0-beta.8.tgz"; + sha512 = "99jNfGUIVic0hZCWXTU1yQLJ5ww06O7egXkgjltlHS0Fom9MY4bzFpqlVTNlmKguEO5eK3OEjjkoek4qVpEbpw=="; }; }; "cdktf-0.1.0" = { @@ -13585,13 +13604,13 @@ let sha1 = "aa0d32629b6ee972200411cbd4461c907bc2b7ad"; }; }; - "chai-4.2.0" = { + "chai-4.3.0" = { name = "chai"; packageName = "chai"; - version = "4.2.0"; + version = "4.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/chai/-/chai-4.2.0.tgz"; - sha512 = "XQU3bhBukrOsQCuwZndwGcCVQHyZi53fQ6Ys1Fym7E4olpIqqZZhhoFJoaKVvV17lWQoXYwgWN2nF5crA8J2jw=="; + url = "https://registry.npmjs.org/chai/-/chai-4.3.0.tgz"; + sha512 = "/BFd2J30EcOwmdOgXvVsmM48l0Br0nmZPlO0uOW4XKh6kpsUumRXBgPV+IlaqFaqr9cYbeoZAM1Npx0i4A+aiA=="; }; }; "chai-as-promised-7.1.1" = { @@ -14989,13 +15008,13 @@ let sha512 = "3WQV/Fpa77nvzjUlc+0u53uIroJyyMB2Qwl++aXpAiDIsrsiAQq4uCURwdRBRX+eLkOTIAmT0L4qna3T7+2pUg=="; }; }; - "codemaker-1.18.0" = { + "codemaker-1.20.0" = { name = "codemaker"; packageName = "codemaker"; - version = "1.18.0"; + version = "1.20.0"; src = fetchurl { - url = "https://registry.npmjs.org/codemaker/-/codemaker-1.18.0.tgz"; - sha512 = "sUVEg7pzW5HlWvC8OZvMoon9+8LZXA+5dIAqJD8GleosY16UOlOY2MlbLldRa34PXfqCODrXlktTbH93AELgHg=="; + url = "https://registry.npmjs.org/codemaker/-/codemaker-1.20.0.tgz"; + sha512 = "ubrKzvcYARQdyjEOaNrcoqnEw8HBwo5mYeq9/Uwf3QnTkKUhgFEY3fQYIBKENUd0C4LtAygjvDKd4VDF+E+fAQ=="; }; }; "codepage-1.4.0" = { @@ -15943,13 +15962,13 @@ let sha1 = "7890482bf5c71af6c5ca192be3136aed74428aad"; }; }; - "consola-2.15.1" = { + "consola-2.15.2" = { name = "consola"; packageName = "consola"; - version = "2.15.1"; + version = "2.15.2"; src = fetchurl { - url = "https://registry.npmjs.org/consola/-/consola-2.15.1.tgz"; - sha512 = "uNINF19d9f1/Pza5aNmQ/JlrmY4uPOW0BxID3Xvw5iOP6diJArUXp+JgcIQ4fR56qV+HB9o/ZRUnrnYd92LxZw=="; + url = "https://registry.npmjs.org/consola/-/consola-2.15.2.tgz"; + sha512 = "VxqWw5C8O/mQpZYtfaaSCDJcVK3AxyvQ26rhgvyAI4j/QJISh8DLwFS8GQU+9154u4ngyCsSlnyIAYJme9kQug=="; }; }; "console-browserify-1.1.0" = { @@ -16024,13 +16043,22 @@ let sha1 = "c20b96d8c617748aaf1c16021760cd27fcb8cb75"; }; }; - "constructs-3.3.3" = { + "constructs-3.3.11" = { name = "constructs"; packageName = "constructs"; - version = "3.3.3"; + version = "3.3.11"; + src = fetchurl { + url = "https://registry.npmjs.org/constructs/-/constructs-3.3.11.tgz"; + sha512 = "yis7ff0LPa1bgXBKKEU4BiS9sGCuRqCqHU6F12b2PnDurKQDMvy2meDzre15uaTf4mrxYmsezIGhiy9+GkIguw=="; + }; + }; + "constructs-3.3.5" = { + name = "constructs"; + packageName = "constructs"; + version = "3.3.5"; src = fetchurl { - url = "https://registry.npmjs.org/constructs/-/constructs-3.3.3.tgz"; - sha512 = "tus97CfZU14VcAdM5Qhg5OGMj89IAyxOyomt7h2Gup5EpBiMz6yIkOsxV9GAh30xmUKWSAwX56AD8QjzZCjIEQ=="; + url = "https://registry.npmjs.org/constructs/-/constructs-3.3.5.tgz"; + sha512 = "qicg+YQ/8ftntU+PtvB+faUmGMCPMJyQ+Vo1Y7z2QdlDVRW1YJ5XVS4Skk4WlOfaJ9r/dvlSinB9+Vaw3Yb2Ww=="; }; }; "consume-http-header-1.0.0" = { @@ -16691,13 +16719,13 @@ let sha512 = "mctvpXlbzsvK+6z8kJwSJ5crm7yBwrQMTybJzMw1O4lLGJqjlDCXY2Zw7KheiA6XBEcBmfLx1D88mjRGVJtY9w=="; }; }; - "crc32-stream-4.0.1" = { + "crc32-stream-4.0.2" = { name = "crc32-stream"; packageName = "crc32-stream"; - version = "4.0.1"; + version = "4.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/crc32-stream/-/crc32-stream-4.0.1.tgz"; - sha512 = "FN5V+weeO/8JaXsamelVYO1PHyeCsuL3HcG4cqsj0ceARcocxalaShCsohZMSAF+db7UYFwBy1rARK/0oFItUw=="; + url = "https://registry.npmjs.org/crc32-stream/-/crc32-stream-4.0.2.tgz"; + sha512 = "DxFZ/Hk473b/muq1VJ///PMNLj0ZMnzye9thBpmjpJKCc5eMgB95aK8zCGrGfQ90cWo561Te6HK9D+j4KPdM6w=="; }; }; "create-ecdh-4.0.4" = { @@ -16745,13 +16773,13 @@ let sha512 = "MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg=="; }; }; - "create-torrent-4.4.3" = { + "create-torrent-4.4.4" = { name = "create-torrent"; packageName = "create-torrent"; - version = "4.4.3"; + version = "4.4.4"; src = fetchurl { - url = "https://registry.npmjs.org/create-torrent/-/create-torrent-4.4.3.tgz"; - sha512 = "balXwhJEpD8F0rt1vNKJuxhYPWOHo82LVm50wRzUFVzZ8APciwtZntzIzDEX6dNnD4NoLL0AeYgosF7e+FVQBA=="; + url = "https://registry.npmjs.org/create-torrent/-/create-torrent-4.4.4.tgz"; + sha512 = "VvKEgpRZvqqkw00Ab+j+EGy8VAr8Q6t+ZiJAbFeBaiQDklY/eRIkAqKIsKenMTFi1J28l4IgQJ4UQ1vgccPweA=="; }; }; "cron-1.7.2" = { @@ -20417,13 +20445,13 @@ let sha512 = "dldq3ZfFtgVTJMLjOe+/3sROTzALlL9E34V4/sDtUd/KlBSS0s6U1/+WPE1B4sj9CXHJpL1M6rhNJnc9Wbal9w=="; }; }; - "electron-to-chromium-1.3.650" = { + "electron-to-chromium-1.3.653" = { name = "electron-to-chromium"; packageName = "electron-to-chromium"; - version = "1.3.650"; + version = "1.3.653"; src = fetchurl { - url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.650.tgz"; - sha512 = "j6pRuNylFBbroG6NB8Lw/Im9oDY74s2zWHBP5TmdYg73cBuL6cz//SMgolVa0gIJk/DSL+kO7baJ1DSXW1FUZg=="; + url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.653.tgz"; + sha512 = "LehOhcl74u9fkV9Un6WahJ+Xh+0FZLCCDnKYis1Olx1DX2ugRww5PJicE65OG8yznMj8EOQZRcz6FSV1xKxqsA=="; }; }; "electrum-client-git://github.com/janoside/electrum-client" = { @@ -20481,13 +20509,13 @@ let sha512 = "4Kp3AA94jC085IJox+qnvrZ3PudqTi4gQNvIoTZfJJ9IqkRuCoqP60vCVYlIg00c5aYusi5Wjh2bf0cHYt+6gQ=="; }; }; - "elliptic-6.5.3" = { + "elliptic-6.5.4" = { name = "elliptic"; packageName = "elliptic"; - version = "6.5.3"; + version = "6.5.4"; src = fetchurl { - url = "https://registry.npmjs.org/elliptic/-/elliptic-6.5.3.tgz"; - sha512 = "IMqzv5wNQf+E6aHeIqATs0tOLeOTwj1QKbRcS3jBbYkl5oLAserA8yJTT7/VyHUYG91PRmPyeQDObKLPpeS4dw=="; + url = "https://registry.npmjs.org/elliptic/-/elliptic-6.5.4.tgz"; + sha512 = "iLhC6ULemrljPZb+QutR5TQGB+pdW6KGD5RSegS+8sorOZT+rdQFbsQFJgvN3eRqNALqJer4oQ16YvJHlU8hzQ=="; }; }; "email-validator-2.0.4" = { @@ -20671,15 +20699,6 @@ let sha1 = "d4596e702734a93e40e9af864319eabd99ff2f0e"; }; }; - "end-of-stream-1.4.1" = { - name = "end-of-stream"; - packageName = "end-of-stream"; - version = "1.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.1.tgz"; - sha512 = "1MkrZNvWTKCaigbn+W15elq2BB/L22nqrSY5DKlo3X6+vclJm8Bb5djXJBmEX6fS3+zCh/F4VBK5Z2KxJt4s2Q=="; - }; - }; "end-of-stream-1.4.4" = { name = "end-of-stream"; packageName = "end-of-stream"; @@ -23011,13 +23030,13 @@ let sha512 = "CJ0HCB5tL5fYTEA7ToAq5+kTwd++Borf1/bifxd9iT70QcXr4MRrO3Llf8Ifs70q+SJcGHFtnIE/Nw6giCtECA=="; }; }; - "faunadb-4.0.2" = { + "faunadb-4.0.3" = { name = "faunadb"; packageName = "faunadb"; - version = "4.0.2"; + version = "4.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/faunadb/-/faunadb-4.0.2.tgz"; - sha512 = "YE+pvchQcH+kYCobywpV3LO3ZOWWrunu7DTNHFW2eT1SCECE+uOuHz7sFcA3vmxhcYvBpZ7mVTnrTFfZdH5LqQ=="; + url = "https://registry.npmjs.org/faunadb/-/faunadb-4.0.3.tgz"; + sha512 = "pfXX3pwyQQfsx+wO4u8m16gQyDPJRbpjMGk5fCzq0tCT/3mPyCVlc5zTorSdBWWmLFuResP9idFrWdqo+q2IEA=="; }; }; "faye-websocket-0.10.0" = { @@ -24217,13 +24236,13 @@ let sha512 = "wJaE62fLaB3jCYvY2ZHjZvmKK2iiLiiehX38rz5QZxtdN8fVPJDeZUiVvJrHStdTc+23LHlyZuSEKgFc0pxi2g=="; }; }; - "fp-ts-2.9.3" = { + "fp-ts-2.9.5" = { name = "fp-ts"; packageName = "fp-ts"; - version = "2.9.3"; + version = "2.9.5"; src = fetchurl { - url = "https://registry.npmjs.org/fp-ts/-/fp-ts-2.9.3.tgz"; - sha512 = "NjzcHYgigcbPQ6yJ52zwgsVDwKz3vwy9sjbxyzcvfXQm+j1BGeOPRuzLKEwsLyE4Xut6gG1FXJtsU9/gUB7tXg=="; + url = "https://registry.npmjs.org/fp-ts/-/fp-ts-2.9.5.tgz"; + sha512 = "MiHrA5teO6t8zKArE3DdMPT/Db6v2GUt5yfWnhBTrrsVfeCJUUnV6sgFvjGNBKDmEMqVwRFkEePL7wPwqrLKKA=="; }; }; "fragment-cache-0.2.1" = { @@ -24856,13 +24875,13 @@ let sha512 = "3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg=="; }; }; - "geoip-country-4.0.53" = { + "geoip-country-4.0.54" = { name = "geoip-country"; packageName = "geoip-country"; - version = "4.0.53"; + version = "4.0.54"; src = fetchurl { - url = "https://registry.npmjs.org/geoip-country/-/geoip-country-4.0.53.tgz"; - sha512 = "nfSIkLmt432isig80keqzkWo0N87CE1Ezv+T0SIFx6z7DNSRenKQn+v4EHts3RguJ0x/hg9skTOjaTLeqGyrfw=="; + url = "https://registry.npmjs.org/geoip-country/-/geoip-country-4.0.54.tgz"; + sha512 = "lljh5cAhSVJzysNR3NBMw6jqf95HyvfZQJ8+LeR+LIX0R2Kd2Ab8wx6F/xsdHgwbEi7jYENy8J73QOhxjqIjXA=="; }; }; "get-amd-module-type-3.0.0" = { @@ -24919,13 +24938,13 @@ let sha1 = "ead774abee72e20409433a066366023dd6887a41"; }; }; - "get-intrinsic-1.1.0" = { + "get-intrinsic-1.1.1" = { name = "get-intrinsic"; packageName = "get-intrinsic"; - version = "1.1.0"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.0.tgz"; - sha512 = "M11rgtQp5GZMZzDL7jLTNxbDfurpzuau5uqRWDPvlHjfvg3TdScAZo96GLvhMjImrmR8uAt0FS2RLoMrfWGKlg=="; + url = "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.1.tgz"; + sha512 = "kWZrnVM42QCiEA2Ig1bG8zjoIMOgxWwYCEeNdwY6Tv/cOSeGpcoX4pXHfKUxNKVoArnrEr2e9srnAxxGIraS9Q=="; }; }; "get-own-enumerable-property-symbols-3.0.2" = { @@ -30951,13 +30970,13 @@ let sha1 = "bcb4045c8dd0539c134bc1488cdd3e768a7a9e51"; }; }; - "jquery.terminal-2.20.2" = { + "jquery.terminal-2.21.0" = { name = "jquery.terminal"; packageName = "jquery.terminal"; - version = "2.20.2"; + version = "2.21.0"; src = fetchurl { - url = "https://registry.npmjs.org/jquery.terminal/-/jquery.terminal-2.20.2.tgz"; - sha512 = "f3heC+hG2NE9tuJmGI3g5fR/KoD1/G31rJlXjVYPU2oBqbPQXRiiYvW78mm4aK9+IClYhMoqXiKxdzWIxjAxxA=="; + url = "https://registry.npmjs.org/jquery.terminal/-/jquery.terminal-2.21.0.tgz"; + sha512 = "Cd2uediwjcWaKbag/+WtF25coudkPLnH7RSg8oKH80BsUiPi/3aQIVBTKVB7Gw3viGwN6VV3G3TsuvKBqPrKTg=="; }; }; "js-base64-2.6.4" = { @@ -31221,49 +31240,49 @@ let sha512 = "OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA=="; }; }; - "jsii-1.18.0" = { + "jsii-1.20.0" = { name = "jsii"; packageName = "jsii"; - version = "1.18.0"; + version = "1.20.0"; src = fetchurl { - url = "https://registry.npmjs.org/jsii/-/jsii-1.18.0.tgz"; - sha512 = "5s+kOLF9yJOWjJD3UyaRYGT/PGaPvs0hNBDMtZqJ5AH8yIgjfJz+3+eHDXPLK0ffGaZF83sysiUueA5+Stxkww=="; + url = "https://registry.npmjs.org/jsii/-/jsii-1.20.0.tgz"; + sha512 = "jAA0wEV1wjc6i5514tTY4KHXczxnSbpzP6991SDRGNNW0h8iPws07G2tWG4I3qjnuecbC8oiWuVA1tsjXjy+uQ=="; }; }; - "jsii-pacmak-1.18.0" = { + "jsii-pacmak-1.20.0" = { name = "jsii-pacmak"; packageName = "jsii-pacmak"; - version = "1.18.0"; + version = "1.20.0"; src = fetchurl { - url = "https://registry.npmjs.org/jsii-pacmak/-/jsii-pacmak-1.18.0.tgz"; - sha512 = "j1gRTaCn+IQ1R2a2uLqCfohY+unI/hD8Zedw9TOCTBjpASDDbDd9DMbOGnQBZ9G2nRq4SUIPg5eVOKPovpTI+w=="; + url = "https://registry.npmjs.org/jsii-pacmak/-/jsii-pacmak-1.20.0.tgz"; + sha512 = "e2wdE1cBDmxJ6buUe5WbYXQ6dcG4eQLYBsurO6bTo8RWMm7mvb1dDWIzgwK41C6TGWzPpMrygKUpDNeaUQZkHA=="; }; }; - "jsii-reflect-1.18.0" = { + "jsii-reflect-1.20.0" = { name = "jsii-reflect"; packageName = "jsii-reflect"; - version = "1.18.0"; + version = "1.20.0"; src = fetchurl { - url = "https://registry.npmjs.org/jsii-reflect/-/jsii-reflect-1.18.0.tgz"; - sha512 = "IXLdYl+zWVeUModJT51bOIgPjHGhnk8W/LxBMxIIN+VpFHkcPiZX1P7MfOCWIermAkrxVQOHpPbWEKoeUFl7CQ=="; + url = "https://registry.npmjs.org/jsii-reflect/-/jsii-reflect-1.20.0.tgz"; + sha512 = "W3UBQLW2pVaWkdSBRnQJOSEtzsphypCaskxlW/dSPf0ikULjoSDOMdC6oJEUNp8uzYAdpXo/uFYJZnBDk+Dafw=="; }; }; - "jsii-rosetta-1.18.0" = { + "jsii-rosetta-1.20.0" = { name = "jsii-rosetta"; packageName = "jsii-rosetta"; - version = "1.18.0"; + version = "1.20.0"; src = fetchurl { - url = "https://registry.npmjs.org/jsii-rosetta/-/jsii-rosetta-1.18.0.tgz"; - sha512 = "gPBt689vGjR9CqmfYHusSsFr/v4v9qcJAKaCqc3uan2nGCe/lugxR416YnhkpsVQBZdT+H4EA2Lp+yjqj9kMUw=="; + url = "https://registry.npmjs.org/jsii-rosetta/-/jsii-rosetta-1.20.0.tgz"; + sha512 = "xIRnNlyr4ybbEx4i3WRcdLBActMAj270Nb5buGTvYHWyEF6T4r1Dv/BFO1S4iwmvYw7ZyFtpx8RJ+CcJLOge/A=="; }; }; - "jsii-srcmak-0.1.214" = { + "jsii-srcmak-0.1.218" = { name = "jsii-srcmak"; packageName = "jsii-srcmak"; - version = "0.1.214"; + version = "0.1.218"; src = fetchurl { - url = "https://registry.npmjs.org/jsii-srcmak/-/jsii-srcmak-0.1.214.tgz"; - sha512 = "xhRdmv3s+xa1NQRebHfx639VJ8Tk/0Mrq4fCCX4O+67b6CgZaWKRkpQiy1Rl8Osv0kh9YfJdAWXV4RpZiXTfrg=="; + url = "https://registry.npmjs.org/jsii-srcmak/-/jsii-srcmak-0.1.218.tgz"; + sha512 = "e9J3Fx76Ic+EFptAUAdj3nhLuJBPpoqCTgxtuqIOzTYgJuoiUff3PXk8qQtAxCQWLsmBV0F8oP6U3ovgRtdL1g=="; }; }; "json-bigint-0.2.3" = { @@ -35407,13 +35426,13 @@ let sha512 = "EGwzEeCcLniFX51DhTpmTom+dSA/MG/OBUDjnWtHbEnjAH180VzUeAw+oE4+Zv+CoYBWyRlYOTR0N8SO9R1PVw=="; }; }; - "marked-1.2.8" = { + "marked-1.2.9" = { name = "marked"; packageName = "marked"; - version = "1.2.8"; + version = "1.2.9"; src = fetchurl { - url = "https://registry.npmjs.org/marked/-/marked-1.2.8.tgz"; - sha512 = "lzmFjGnzWHkmbk85q/ILZjFoHHJIQGF+SxGEfIdGk/XhiTPhqGs37gbru6Kkd48diJnEyYwnG67nru0Z2gQtuQ=="; + url = "https://registry.npmjs.org/marked/-/marked-1.2.9.tgz"; + sha512 = "H8lIX2SvyitGX+TRdtS06m1jHMijKN/XjfH6Ooii9fvxMlh8QdqBfBDkGUpMWH2kQNrtixjzYUa3SH8ROTgRRw=="; }; }; "marked-terminal-3.3.0" = { @@ -35659,13 +35678,13 @@ let sha512 = "7GlnT24gEwDrdAwEHrU4Vv5lLWrEer4KOkAiKT9nYstsTad7Oc1TwqT2zIMKRdZF7cTuaf+GA1E4Kv7jJh8mPA=="; }; }; - "mdast-util-from-markdown-0.8.4" = { + "mdast-util-from-markdown-0.8.5" = { name = "mdast-util-from-markdown"; packageName = "mdast-util-from-markdown"; - version = "0.8.4"; + version = "0.8.5"; src = fetchurl { - url = "https://registry.npmjs.org/mdast-util-from-markdown/-/mdast-util-from-markdown-0.8.4.tgz"; - sha512 = "jj891B5pV2r63n2kBTFh8cRI2uR9LQHsXG1zSDqfhXkIlDzrTcIlbB5+5aaYEkl8vOPIOPLf8VT7Ere1wWTMdw=="; + url = "https://registry.npmjs.org/mdast-util-from-markdown/-/mdast-util-from-markdown-0.8.5.tgz"; + sha512 = "2hkTXtYYnr+NubD/g6KGBS/0mFmBcifAsI0yIWRiRo0PjVs6SSOSOdtzbp6kSGnShDN6G5aWZpKQ2lWRy27mWQ=="; }; }; "mdast-util-to-markdown-0.6.2" = { @@ -36298,13 +36317,13 @@ let sha512 = "jo1OfR4TaEwd5HOrt5+tAZ9mqT4jmpNAusXtyfNzqVm9uiSYFZlKM1wYL4oU7azZW/PxQW53wM0S6OR1JHNa2g=="; }; }; - "micromark-2.11.3" = { + "micromark-2.11.4" = { name = "micromark"; packageName = "micromark"; - version = "2.11.3"; + version = "2.11.4"; src = fetchurl { - url = "https://registry.npmjs.org/micromark/-/micromark-2.11.3.tgz"; - sha512 = "oph5YYkVqR2U9OtWBcXYysZMtrdIvi8dfSeyEdr1wFr3Bk6YwI6THosX2AzKnhdps7mVUbXiqhmosu9DcA+xlQ=="; + url = "https://registry.npmjs.org/micromark/-/micromark-2.11.4.tgz"; + sha512 = "+WoovN/ppKolQOFIAajxi7Lu9kInbPxFuTBVEavFcL8eAfVstoc5MocPmqBeAdBOJV00uaVjegzH4+MA0DN/uA=="; }; }; "micromatch-2.3.11" = { @@ -36937,13 +36956,13 @@ let sha1 = "ebb3a977e7af1c683ae6fda12b545a6ba6c5853d"; }; }; - "mobx-6.1.4" = { + "mobx-6.1.5" = { name = "mobx"; packageName = "mobx"; - version = "6.1.4"; + version = "6.1.5"; src = fetchurl { - url = "https://registry.npmjs.org/mobx/-/mobx-6.1.4.tgz"; - sha512 = "DorvGl+ssJ9i5Sef90XzcIuOBMa2kWSC+PidTLHtgBX4f1bXOd+NKtujSjaRnQMDLTRkCzfJEFcC08hEjzCVaA=="; + url = "https://registry.npmjs.org/mobx/-/mobx-6.1.5.tgz"; + sha512 = "BsVAHEk/Ty+6BmCis0CUvA7E9u5aJpUkdRM91YwBt4lVha4heDLjRT43z2pqENeFuVZPfA1RRaf7sRcqRB2i4Q=="; }; }; "mobx-react-7.1.0" = { @@ -37486,13 +37505,13 @@ let sha512 = "xasv76hl6nr1dEy3lPvy7Ej7K/Lx3O/FCvwge8PeVJpciPPoNCbaANcNiBug3IpdvTveZUcAV0DJzdnUDMesNQ=="; }; }; - "multistream-4.0.1" = { + "multistream-4.1.0" = { name = "multistream"; packageName = "multistream"; - version = "4.0.1"; + version = "4.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/multistream/-/multistream-4.0.1.tgz"; - sha512 = "LNPIR/LD0JUw2beGlSv4sgTSnGbZp16d/PG2rnIrYjkeCaepNmBTobuiaNQATCPiYgn+BBuQTm70UlvwRfLZ3Q=="; + url = "https://registry.npmjs.org/multistream/-/multistream-4.1.0.tgz"; + sha512 = "J1XDiAmmNpRCBfIWJv+n0ymC4ABcf/Pl+5YvC5B/D2f/2+8PtHvCNxMPKiQcZyi922Hq69J2YOpb1pTywfifyw=="; }; }; "munin-plugin-0.0.9" = { @@ -39901,13 +39920,13 @@ let sha512 = "fZ4qZdQ2nxJvtcasX7Ghl+WlWS/d9IgnBIwFZXVNNZUmzpno91SX5bc5vuxiuKoCtK78XxGGNuSCrDC7xYB3OQ=="; }; }; - "office-ui-fabric-react-7.158.0" = { + "office-ui-fabric-react-7.158.1" = { name = "office-ui-fabric-react"; packageName = "office-ui-fabric-react"; - version = "7.158.0"; + version = "7.158.1"; src = fetchurl { - url = "https://registry.npmjs.org/office-ui-fabric-react/-/office-ui-fabric-react-7.158.0.tgz"; - sha512 = "kMOEK/487tLEo4ws3IY3tL2vs0wwtDDPWkv/B9HEnV7begq00whn53X7Uw75sRjrRDJo1s8gZcF95EY/EJXBhA=="; + url = "https://registry.npmjs.org/office-ui-fabric-react/-/office-ui-fabric-react-7.158.1.tgz"; + sha512 = "fnPK3w0GZaOmtd5rd/1kOwHJa4wf/arplYn4I3TrFaQ+y+cOtTUU2yXGTaC9v0Q80NQjjLwTfRTHg0+sHXpqxg=="; }; }; "omggif-1.0.10" = { @@ -40081,13 +40100,13 @@ let sha512 = "jQ31cORBFE6td25deYeD80wxKBMj+zBmHTrVxnc6CKhx8gho6ipmWM5zj/oeoqioZ99yqBls9Z/9Nss7J26G2g=="; }; }; - "oo-ascii-tree-1.18.0" = { + "oo-ascii-tree-1.20.0" = { name = "oo-ascii-tree"; packageName = "oo-ascii-tree"; - version = "1.18.0"; + version = "1.20.0"; src = fetchurl { - url = "https://registry.npmjs.org/oo-ascii-tree/-/oo-ascii-tree-1.18.0.tgz"; - sha512 = "++zVwRSnfwwx8BRBfPz7xdKUnOf7RYeX1RTklO37btNcbHPvRlKSZ9o1/D9SRGzmHf3lV4zKVbYTN1VOWfQvjA=="; + url = "https://registry.npmjs.org/oo-ascii-tree/-/oo-ascii-tree-1.20.0.tgz"; + sha512 = "LUWabLSB7XYAzIz3QxuinYdaW0/WAJAifr/mlEH5PRjOLe37pBJ1H0aMSbpwZXYQR9bND57pT5JfLeItIbY2JA=="; }; }; "opal-runtime-1.0.11" = { @@ -45923,13 +45942,13 @@ let sha512 = "0X2CImDkJGApiAlcf0ODKIneSwBPhqJawOa5wCtKbu7ZECrmS26NvtSILynQ66cgkT/RJ4LidJOc3bUESwmU8g=="; }; }; - "react-dev-utils-11.0.1" = { + "react-dev-utils-11.0.2" = { name = "react-dev-utils"; packageName = "react-dev-utils"; - version = "11.0.1"; + version = "11.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/react-dev-utils/-/react-dev-utils-11.0.1.tgz"; - sha512 = "rlgpCupaW6qQqvu0hvv2FDv40QG427fjghV56XyPcP5aKtOAPzNAhQ7bHqk1YdS2vpW1W7aSV3JobedxuPlBAA=="; + url = "https://registry.npmjs.org/react-dev-utils/-/react-dev-utils-11.0.2.tgz"; + sha512 = "xG7GlMoYkrgc2M1kDCHKRywXMDbFnjOB+/VzpytQyYBusEzR8NlGTMmUbvN86k94yyKu5XReHB8eZC2JZrNchQ=="; }; }; "react-devtools-core-4.10.1" = { @@ -45950,13 +45969,13 @@ let sha512 = "1gCeQXDLoIqMgqD3IO2Ah9bnf0w9kzhwN5q4FGnHZ67hBm9yePzB5JJAIQCc8x3pFnNlwFq4RidZggNAAkzWWw=="; }; }; - "react-error-overlay-6.0.8" = { + "react-error-overlay-6.0.9" = { name = "react-error-overlay"; packageName = "react-error-overlay"; - version = "6.0.8"; + version = "6.0.9"; src = fetchurl { - url = "https://registry.npmjs.org/react-error-overlay/-/react-error-overlay-6.0.8.tgz"; - sha512 = "HvPuUQnLp5H7TouGq3kzBeioJmXms1wHy9EGjz2OURWBp4qZO6AfGEcnxts1D/CbwPLRAgTMPCEgYhA3sEM4vw=="; + url = "https://registry.npmjs.org/react-error-overlay/-/react-error-overlay-6.0.9.tgz"; + sha512 = "nQTTcUu+ATDbrSD1BZHr5kgSD4oF8OFjxun8uAaL8RwPBacGBNPf/yAuVVdx17N8XNzRDMrZ9XcKZHCjPW+9ew=="; }; }; "react-is-16.13.1" = { @@ -48011,13 +48030,13 @@ let sha1 = "44e00858ebebc0133d58e40b2cd8a1fbb04203f5"; }; }; - "rss-parser-3.10.0" = { + "rss-parser-3.11.0" = { name = "rss-parser"; packageName = "rss-parser"; - version = "3.10.0"; + version = "3.11.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.11.0.tgz"; + sha512 = "oTLoYW+bNqNwkz8OpGinBU9s3As0sdczQjETIZFgyAdi7AopyhoVFGPIyFMYXXEY8hayKzD5CH+4CtmiPtJ89g=="; }; }; "rss-parser-3.7.1" = { @@ -49901,13 +49920,13 @@ let sha512 = "7REUy5U6h2wCPIg9060V5bh24gichRHfuqWC22xrp/n+dVolQXvG5RN/PqdJiPsCj7Y9voyWLbYai+Tmk3o82Q=="; }; }; - "snyk-gradle-plugin-3.12.2" = { + "snyk-gradle-plugin-3.12.3" = { name = "snyk-gradle-plugin"; packageName = "snyk-gradle-plugin"; - version = "3.12.2"; + version = "3.12.3"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-gradle-plugin/-/snyk-gradle-plugin-3.12.2.tgz"; - sha512 = "tooWdLxgX6uJnzpfeHQbRy097ZI/p7/kII9ECqEO11dqeZEW8zvVnmzy+93CiyAY9OtsSTjJaDLzMxy+y6odCA=="; + url = "https://registry.npmjs.org/snyk-gradle-plugin/-/snyk-gradle-plugin-3.12.3.tgz"; + sha512 = "1LdlB/tDGqeeh5xgJYmv2Rw9eeYsbZ9VX9MS+u6V/DwdzbiXZvFeqexdCqwVOKwBtYUeQfg/QXm5AAd0hQwxCA=="; }; }; "snyk-module-1.9.1" = { @@ -50090,13 +50109,13 @@ let sha512 = "5yWQ43P/4IttmPCGKDQ3CVocBiJWGpibyhYJxgUhf69EHMzmK8XW0DkmHIoYdLmZaVZJyiEkUqpeC7rSCIqekw=="; }; }; - "socket.io-3.1.0" = { + "socket.io-3.1.1" = { name = "socket.io"; packageName = "socket.io"; - version = "3.1.0"; + version = "3.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/socket.io/-/socket.io-3.1.0.tgz"; - sha512 = "Aqg2dlRh6xSJvRYK31ksG65q4kmBOqU4g+1ukhPcoT6wNGYoIwSYPlCPuRwOO9pgLUajojGFztl6+V2opmKcww=="; + url = "https://registry.npmjs.org/socket.io/-/socket.io-3.1.1.tgz"; + sha512 = "7cBWdsDC7bbyEF6WbBqffjizc/H4YF1wLdZoOzuYfo2uMNSFjJKuQ36t0H40o9B20DO6p+mSytEd92oP4S15bA=="; }; }; "socket.io-adapter-0.2.0" = { @@ -53628,13 +53647,13 @@ let sha512 = "wK0Ri4fOGjv/XPy8SBHZChl8CM7uMc5VML7SqiQ0zG7+J5Vr+RMQDoHa2CNT6KHUnTGIXH34UDMkPzAUyapBZg=="; }; }; - "terminal-kit-1.45.9" = { + "terminal-kit-1.47.0" = { name = "terminal-kit"; packageName = "terminal-kit"; - version = "1.45.9"; + version = "1.47.0"; src = fetchurl { - url = "https://registry.npmjs.org/terminal-kit/-/terminal-kit-1.45.9.tgz"; - sha512 = "uf648u2bfWz3lX9iBVgdTebIMVc78OE0cgEGuuNQWWKU8soaf+R09fYQWTpMRiz59nKxn78s8wZptGmt/hAyfQ=="; + url = "https://registry.npmjs.org/terminal-kit/-/terminal-kit-1.47.0.tgz"; + sha512 = "wyfslVEOJrB2kmZyUEkTKtd4jlNTVR9G1ogkrs7a1VMk55t83+m8sMDJTNuEqfwYXvWbRyGD8pyhv9vyl9xc5w=="; }; }; "terminal-link-2.1.1" = { @@ -57013,6 +57032,15 @@ let sha1 = "79ce59eced874809cab9a71fc7102c7d45d4118d"; }; }; + "utf8-3.0.0" = { + name = "utf8"; + packageName = "utf8"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/utf8/-/utf8-3.0.0.tgz"; + sha512 = "E8VjFIQ/TyQgp+TZfS6l8yp/xWppSAHzidGiRrqe4bK4XP9pTRyKFgGJpO3SN7zdX4DeomTrwaseCHovfpFcqQ=="; + }; + }; "utf8-byte-length-1.0.4" = { name = "utf8-byte-length"; packageName = "utf8-byte-length"; @@ -59074,13 +59102,13 @@ let sha512 = "OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg=="; }; }; - "webtorrent-0.112.3" = { + "webtorrent-0.113.0" = { name = "webtorrent"; packageName = "webtorrent"; - version = "0.112.3"; + version = "0.113.0"; src = fetchurl { - url = "https://registry.npmjs.org/webtorrent/-/webtorrent-0.112.3.tgz"; - sha512 = "CKe3udf2psctyd/GBNfZgz9bnXugvFTiU5GJCkcg4MKdd63qf0d8CS8bOYxwyir+EqvmgQQgJRO56b4PftI+PA=="; + url = "https://registry.npmjs.org/webtorrent/-/webtorrent-0.113.0.tgz"; + sha512 = "j4vhBl5nKo7p/tLwbBl+OlLKLvTrFOEFNlGghsBA2NR30SPHee7gXOmv59elB4gjxKKWAF3rtyoJPZ8UNaKpWw=="; }; }; "well-known-symbols-2.0.0" = { @@ -59965,6 +59993,15 @@ let sha512 = "T4tewALS3+qsrpGI/8dqNMLIVdq/g/85U98HPMa6F0m6xTbvhXU6RCQLqPH3+SlomNV/LdY6RXEbBpMH6EOJnA=="; }; }; + "ws-7.4.3" = { + name = "ws"; + packageName = "ws"; + version = "7.4.3"; + src = fetchurl { + url = "https://registry.npmjs.org/ws/-/ws-7.4.3.tgz"; + sha512 = "hr6vCR76GsossIRsr8OLR9acVVm1jyfEWvhbNjtgPOrfvAlKzvyeg/P6r8RuDjRyrcQoPQT7K0DGEPc7Ae6jzA=="; + }; + }; "x-default-browser-0.3.1" = { name = "x-default-browser"; packageName = "x-default-browser"; @@ -61107,7 +61144,7 @@ in sources."balanced-match-1.0.0" sources."base64-js-1.5.1" sources."bcrypt-pbkdf-1.0.2" - sources."bl-4.0.3" + sources."bl-4.0.4" sources."brace-expansion-1.1.11" sources."buffer-5.7.1" sources."builtins-1.0.3" @@ -61404,7 +61441,7 @@ in sources."async-lock-1.2.8" sources."balanced-match-1.0.0" sources."base64-js-0.0.2" - sources."bl-4.0.3" + sources."bl-4.0.4" sources."bops-0.0.7" sources."brace-expansion-1.1.11" sources."braces-3.0.2" @@ -61489,7 +61526,7 @@ in }) sources."fs.realpath-1.0.0" sources."function-bind-1.1.1" - sources."get-intrinsic-1.1.0" + sources."get-intrinsic-1.1.1" (sources."get-stream-4.1.0" // { dependencies = [ sources."pump-3.0.0" @@ -61693,17 +61730,17 @@ in "@bitwarden/cli" = nodeEnv.buildNodePackage { name = "_at_bitwarden_slash_cli"; packageName = "@bitwarden/cli"; - version = "1.13.3"; + version = "1.14.0"; src = fetchurl { - url = "https://registry.npmjs.org/@bitwarden/cli/-/cli-1.13.3.tgz"; - sha512 = "N6eUF/1JBENunuXcpt0d2t5fRLuZndobKMxKTMyqguEH3Fy9cRhEopirxbXskEDCf7Dh2jUdlL/b+4e3fpG7rw=="; + url = "https://registry.npmjs.org/@bitwarden/cli/-/cli-1.14.0.tgz"; + sha512 = "j9xCEhsE+xkR6tYYONv+MSlv7/OIQHj9G2JYq5vOauC4RNRLYSmo5I94LKliqUZDrZb4HpByhcL/nUcNxu5fNw=="; }; dependencies = [ sources."abab-2.0.5" sources."acorn-6.4.2" sources."acorn-globals-4.3.4" sources."acorn-walk-6.2.0" - sources."agent-base-5.1.1" + sources."agent-base-6.0.2" sources."ajv-6.12.6" sources."ansi-escapes-3.2.0" sources."ansi-regex-3.0.0" @@ -61717,6 +61754,7 @@ in sources."aws4-1.11.0" sources."bcrypt-pbkdf-1.0.2" sources."big-integer-1.6.36" + sources."browser-hrtime-1.1.8" sources."browser-process-hrtime-1.0.0" sources."caseless-0.12.0" sources."chalk-2.4.1" @@ -61758,7 +61796,7 @@ in sources."has-flag-3.0.0" sources."html-encoding-sniffer-1.0.2" sources."http-signature-1.2.0" - sources."https-proxy-agent-4.0.0" + sources."https-proxy-agent-5.0.0" sources."iconv-lite-0.4.24" sources."inquirer-6.2.0" sources."is-docker-2.1.1" @@ -61868,9 +61906,9 @@ in sources."@angular-devkit/core-11.0.3" sources."@angular-devkit/schematics-11.0.3" sources."@angular-devkit/schematics-cli-0.1100.3" - sources."@babel/code-frame-7.12.11" + sources."@babel/code-frame-7.12.13" sources."@babel/helper-validator-identifier-7.12.11" - (sources."@babel/highlight-7.10.4" // { + (sources."@babel/highlight-7.12.13" // { dependencies = [ sources."ansi-styles-3.2.1" sources."chalk-2.4.2" @@ -61895,7 +61933,7 @@ in sources."@types/estree-0.0.45" sources."@types/json-schema-7.0.7" sources."@types/json5-0.0.29" - sources."@types/node-14.14.22" + sources."@types/node-14.14.25" sources."@types/parse-json-4.0.0" sources."@types/source-list-map-0.1.2" sources."@types/tapable-1.0.6" @@ -61942,7 +61980,7 @@ in sources."balanced-match-1.0.0" sources."base64-js-1.5.1" sources."binary-extensions-2.2.0" - sources."bl-4.0.3" + sources."bl-4.0.4" sources."brace-expansion-1.1.11" sources."braces-3.0.2" sources."browserslist-4.16.3" @@ -61970,7 +62008,7 @@ in sources."cross-spawn-7.0.3" sources."deepmerge-4.2.2" sources."defaults-1.0.3" - sources."electron-to-chromium-1.3.650" + sources."electron-to-chromium-1.3.653" sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" sources."enhanced-resolve-4.5.0" @@ -62233,127 +62271,135 @@ in sources."@apollographql/graphql-language-service-types-2.0.2" sources."@apollographql/graphql-language-service-utils-2.0.2" sources."@apollographql/graphql-playground-html-1.6.26" - sources."@babel/code-frame-7.12.11" - sources."@babel/compat-data-7.12.7" - (sources."@babel/core-7.12.10" // { + sources."@babel/code-frame-7.12.13" + sources."@babel/compat-data-7.12.13" + (sources."@babel/core-7.12.13" // { dependencies = [ - sources."@babel/types-7.12.12" + sources."@babel/generator-7.12.13" + sources."@babel/types-7.12.13" sources."semver-5.7.1" ]; }) (sources."@babel/generator-7.12.11" // { dependencies = [ - sources."@babel/types-7.12.12" + sources."@babel/types-7.12.13" ]; }) - (sources."@babel/helper-annotate-as-pure-7.12.10" // { + (sources."@babel/helper-annotate-as-pure-7.12.13" // { dependencies = [ - sources."@babel/types-7.12.12" + sources."@babel/types-7.12.13" ]; }) - sources."@babel/helper-builder-binary-assignment-operator-visitor-7.10.4" - (sources."@babel/helper-compilation-targets-7.12.5" // { + (sources."@babel/helper-builder-binary-assignment-operator-visitor-7.12.13" // { + dependencies = [ + sources."@babel/types-7.12.13" + ]; + }) + (sources."@babel/helper-compilation-targets-7.12.13" // { dependencies = [ sources."semver-5.7.1" ]; }) - sources."@babel/helper-create-class-features-plugin-7.12.1" - sources."@babel/helper-create-regexp-features-plugin-7.12.7" - (sources."@babel/helper-define-map-7.10.5" // { + sources."@babel/helper-create-class-features-plugin-7.12.13" + sources."@babel/helper-create-regexp-features-plugin-7.12.13" + (sources."@babel/helper-explode-assignable-expression-7.12.13" // { dependencies = [ - sources."@babel/types-7.12.12" + sources."@babel/types-7.12.13" ]; }) - (sources."@babel/helper-explode-assignable-expression-7.12.1" // { + (sources."@babel/helper-function-name-7.12.13" // { dependencies = [ - sources."@babel/types-7.12.12" + sources."@babel/types-7.12.13" ]; }) - (sources."@babel/helper-function-name-7.12.11" // { + (sources."@babel/helper-get-function-arity-7.12.13" // { dependencies = [ - sources."@babel/types-7.12.12" + sources."@babel/types-7.12.13" ]; }) - (sources."@babel/helper-get-function-arity-7.12.10" // { + (sources."@babel/helper-hoist-variables-7.12.13" // { dependencies = [ - sources."@babel/types-7.12.12" + sources."@babel/types-7.12.13" ]; }) - sources."@babel/helper-hoist-variables-7.10.4" - (sources."@babel/helper-member-expression-to-functions-7.12.7" // { + (sources."@babel/helper-member-expression-to-functions-7.12.13" // { dependencies = [ - sources."@babel/types-7.12.12" + sources."@babel/types-7.12.13" ]; }) - (sources."@babel/helper-module-imports-7.12.5" // { + (sources."@babel/helper-module-imports-7.12.13" // { dependencies = [ - sources."@babel/types-7.12.12" + sources."@babel/types-7.12.13" ]; }) - (sources."@babel/helper-module-transforms-7.12.1" // { + (sources."@babel/helper-module-transforms-7.12.13" // { dependencies = [ - sources."@babel/types-7.12.12" + sources."@babel/types-7.12.13" ]; }) - (sources."@babel/helper-optimise-call-expression-7.12.10" // { + (sources."@babel/helper-optimise-call-expression-7.12.13" // { dependencies = [ - sources."@babel/types-7.12.12" + sources."@babel/types-7.12.13" ]; }) - sources."@babel/helper-plugin-utils-7.10.4" - (sources."@babel/helper-remap-async-to-generator-7.12.1" // { + sources."@babel/helper-plugin-utils-7.12.13" + (sources."@babel/helper-remap-async-to-generator-7.12.13" // { dependencies = [ - sources."@babel/types-7.12.12" + sources."@babel/types-7.12.13" ]; }) - (sources."@babel/helper-replace-supers-7.12.11" // { + (sources."@babel/helper-replace-supers-7.12.13" // { dependencies = [ - sources."@babel/types-7.12.12" + sources."@babel/types-7.12.13" ]; }) - (sources."@babel/helper-simple-access-7.12.1" // { + (sources."@babel/helper-simple-access-7.12.13" // { dependencies = [ - sources."@babel/types-7.12.12" + sources."@babel/types-7.12.13" ]; }) (sources."@babel/helper-skip-transparent-expression-wrappers-7.12.1" // { dependencies = [ - sources."@babel/types-7.12.12" + sources."@babel/types-7.12.13" ]; }) - (sources."@babel/helper-split-export-declaration-7.12.11" // { + (sources."@babel/helper-split-export-declaration-7.12.13" // { dependencies = [ - sources."@babel/types-7.12.12" + sources."@babel/types-7.12.13" ]; }) sources."@babel/helper-validator-identifier-7.12.11" sources."@babel/helper-validator-option-7.12.11" - sources."@babel/helper-wrap-function-7.12.3" - (sources."@babel/helpers-7.12.5" // { + (sources."@babel/helper-wrap-function-7.12.13" // { + dependencies = [ + sources."@babel/types-7.12.13" + ]; + }) + (sources."@babel/helpers-7.12.13" // { dependencies = [ - sources."@babel/types-7.12.12" + sources."@babel/types-7.12.13" ]; }) - sources."@babel/highlight-7.10.4" - sources."@babel/parser-7.12.11" - sources."@babel/plugin-proposal-async-generator-functions-7.12.12" - sources."@babel/plugin-proposal-class-properties-7.12.1" + sources."@babel/highlight-7.12.13" + sources."@babel/parser-7.12.14" + sources."@babel/plugin-proposal-async-generator-functions-7.12.13" + sources."@babel/plugin-proposal-class-properties-7.12.13" sources."@babel/plugin-proposal-dynamic-import-7.12.1" - sources."@babel/plugin-proposal-export-namespace-from-7.12.1" - sources."@babel/plugin-proposal-json-strings-7.12.1" - sources."@babel/plugin-proposal-logical-assignment-operators-7.12.1" - sources."@babel/plugin-proposal-nullish-coalescing-operator-7.12.1" - sources."@babel/plugin-proposal-numeric-separator-7.12.7" - sources."@babel/plugin-proposal-object-rest-spread-7.12.1" - sources."@babel/plugin-proposal-optional-catch-binding-7.12.1" - sources."@babel/plugin-proposal-optional-chaining-7.12.7" - sources."@babel/plugin-proposal-private-methods-7.12.1" - sources."@babel/plugin-proposal-unicode-property-regex-7.12.1" + sources."@babel/plugin-proposal-export-namespace-from-7.12.13" + sources."@babel/plugin-proposal-json-strings-7.12.13" + sources."@babel/plugin-proposal-logical-assignment-operators-7.12.13" + sources."@babel/plugin-proposal-nullish-coalescing-operator-7.12.13" + sources."@babel/plugin-proposal-numeric-separator-7.12.13" + sources."@babel/plugin-proposal-object-rest-spread-7.12.13" + sources."@babel/plugin-proposal-optional-catch-binding-7.12.13" + sources."@babel/plugin-proposal-optional-chaining-7.12.13" + sources."@babel/plugin-proposal-private-methods-7.12.13" + sources."@babel/plugin-proposal-unicode-property-regex-7.12.13" sources."@babel/plugin-syntax-async-generators-7.8.4" - sources."@babel/plugin-syntax-class-properties-7.12.1" + sources."@babel/plugin-syntax-class-properties-7.12.13" sources."@babel/plugin-syntax-dynamic-import-7.8.3" sources."@babel/plugin-syntax-export-namespace-from-7.8.3" - sources."@babel/plugin-syntax-flow-7.12.1" + sources."@babel/plugin-syntax-flow-7.12.13" sources."@babel/plugin-syntax-json-strings-7.8.3" sources."@babel/plugin-syntax-logical-assignment-operators-7.10.4" sources."@babel/plugin-syntax-nullish-coalescing-operator-7.8.3" @@ -62361,67 +62407,68 @@ in sources."@babel/plugin-syntax-object-rest-spread-7.8.3" sources."@babel/plugin-syntax-optional-catch-binding-7.8.3" sources."@babel/plugin-syntax-optional-chaining-7.8.3" - sources."@babel/plugin-syntax-top-level-await-7.12.1" - sources."@babel/plugin-syntax-typescript-7.12.1" - sources."@babel/plugin-transform-arrow-functions-7.12.1" - sources."@babel/plugin-transform-async-to-generator-7.12.1" - sources."@babel/plugin-transform-block-scoped-functions-7.12.1" - sources."@babel/plugin-transform-block-scoping-7.12.12" - sources."@babel/plugin-transform-classes-7.12.1" - sources."@babel/plugin-transform-computed-properties-7.12.1" - sources."@babel/plugin-transform-destructuring-7.12.1" - sources."@babel/plugin-transform-dotall-regex-7.12.1" - sources."@babel/plugin-transform-duplicate-keys-7.12.1" - sources."@babel/plugin-transform-exponentiation-operator-7.12.1" - sources."@babel/plugin-transform-flow-strip-types-7.12.10" - sources."@babel/plugin-transform-for-of-7.12.1" - sources."@babel/plugin-transform-function-name-7.12.1" - sources."@babel/plugin-transform-literals-7.12.1" - sources."@babel/plugin-transform-member-expression-literals-7.12.1" - sources."@babel/plugin-transform-modules-amd-7.12.1" - sources."@babel/plugin-transform-modules-commonjs-7.12.1" - sources."@babel/plugin-transform-modules-systemjs-7.12.1" - sources."@babel/plugin-transform-modules-umd-7.12.1" - sources."@babel/plugin-transform-named-capturing-groups-regex-7.12.1" - sources."@babel/plugin-transform-new-target-7.12.1" - sources."@babel/plugin-transform-object-super-7.12.1" - sources."@babel/plugin-transform-parameters-7.12.1" - sources."@babel/plugin-transform-property-literals-7.12.1" - sources."@babel/plugin-transform-regenerator-7.12.1" - sources."@babel/plugin-transform-reserved-words-7.12.1" - sources."@babel/plugin-transform-shorthand-properties-7.12.1" - sources."@babel/plugin-transform-spread-7.12.1" - sources."@babel/plugin-transform-sticky-regex-7.12.7" - sources."@babel/plugin-transform-template-literals-7.12.1" - sources."@babel/plugin-transform-typeof-symbol-7.12.10" - sources."@babel/plugin-transform-typescript-7.12.1" - sources."@babel/plugin-transform-unicode-escapes-7.12.1" - sources."@babel/plugin-transform-unicode-regex-7.12.1" - (sources."@babel/preset-env-7.12.11" // { - dependencies = [ - sources."@babel/types-7.12.12" + sources."@babel/plugin-syntax-top-level-await-7.12.13" + sources."@babel/plugin-syntax-typescript-7.12.13" + sources."@babel/plugin-transform-arrow-functions-7.12.13" + sources."@babel/plugin-transform-async-to-generator-7.12.13" + sources."@babel/plugin-transform-block-scoped-functions-7.12.13" + sources."@babel/plugin-transform-block-scoping-7.12.13" + sources."@babel/plugin-transform-classes-7.12.13" + sources."@babel/plugin-transform-computed-properties-7.12.13" + sources."@babel/plugin-transform-destructuring-7.12.13" + sources."@babel/plugin-transform-dotall-regex-7.12.13" + sources."@babel/plugin-transform-duplicate-keys-7.12.13" + sources."@babel/plugin-transform-exponentiation-operator-7.12.13" + sources."@babel/plugin-transform-flow-strip-types-7.12.13" + sources."@babel/plugin-transform-for-of-7.12.13" + sources."@babel/plugin-transform-function-name-7.12.13" + sources."@babel/plugin-transform-literals-7.12.13" + sources."@babel/plugin-transform-member-expression-literals-7.12.13" + sources."@babel/plugin-transform-modules-amd-7.12.13" + sources."@babel/plugin-transform-modules-commonjs-7.12.13" + sources."@babel/plugin-transform-modules-systemjs-7.12.13" + sources."@babel/plugin-transform-modules-umd-7.12.13" + sources."@babel/plugin-transform-named-capturing-groups-regex-7.12.13" + sources."@babel/plugin-transform-new-target-7.12.13" + sources."@babel/plugin-transform-object-super-7.12.13" + sources."@babel/plugin-transform-parameters-7.12.13" + sources."@babel/plugin-transform-property-literals-7.12.13" + sources."@babel/plugin-transform-regenerator-7.12.13" + sources."@babel/plugin-transform-reserved-words-7.12.13" + sources."@babel/plugin-transform-shorthand-properties-7.12.13" + sources."@babel/plugin-transform-spread-7.12.13" + sources."@babel/plugin-transform-sticky-regex-7.12.13" + sources."@babel/plugin-transform-template-literals-7.12.13" + sources."@babel/plugin-transform-typeof-symbol-7.12.13" + sources."@babel/plugin-transform-typescript-7.12.13" + sources."@babel/plugin-transform-unicode-escapes-7.12.13" + sources."@babel/plugin-transform-unicode-regex-7.12.13" + (sources."@babel/preset-env-7.12.13" // { + dependencies = [ + sources."@babel/types-7.12.13" sources."semver-5.7.1" ]; }) - sources."@babel/preset-flow-7.12.1" + sources."@babel/preset-flow-7.12.13" sources."@babel/preset-modules-0.1.4" - sources."@babel/preset-typescript-7.12.7" - (sources."@babel/register-7.12.10" // { + sources."@babel/preset-typescript-7.12.13" + (sources."@babel/register-7.12.13" // { dependencies = [ sources."make-dir-2.1.0" sources."pify-4.0.1" sources."semver-5.7.1" ]; }) - sources."@babel/runtime-7.12.5" - (sources."@babel/template-7.12.7" // { + sources."@babel/runtime-7.12.13" + (sources."@babel/template-7.12.13" // { dependencies = [ - sources."@babel/types-7.12.12" + sources."@babel/types-7.12.13" ]; }) - (sources."@babel/traverse-7.12.12" // { + (sources."@babel/traverse-7.12.13" // { dependencies = [ - sources."@babel/types-7.12.12" + sources."@babel/generator-7.12.13" + sources."@babel/types-7.12.13" ]; }) sources."@babel/types-7.10.4" @@ -62451,9 +62498,15 @@ in }) (sources."@oclif/command-1.8.0" // { dependencies = [ - sources."@oclif/plugin-help-3.2.1" + sources."@oclif/plugin-help-3.2.2" + 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."lru-cache-6.0.0" sources."semver-7.3.4" + sources."supports-color-7.2.0" ]; }) (sources."@oclif/config-1.17.0" // { @@ -62580,7 +62633,7 @@ in sources."@types/long-4.0.1" sources."@types/mime-1.3.2" sources."@types/minimatch-3.0.3" - sources."@types/node-14.14.22" + sources."@types/node-14.14.25" (sources."@types/node-fetch-2.5.7" // { dependencies = [ sources."form-data-3.0.0" @@ -62603,14 +62656,14 @@ in sources."@vue/cli-ui-addon-widgets-4.5.11" (sources."@vue/compiler-core-3.0.5" // { dependencies = [ - sources."@babel/types-7.12.12" + sources."@babel/types-7.12.13" sources."source-map-0.6.1" ]; }) sources."@vue/compiler-dom-3.0.5" (sources."@vue/compiler-sfc-3.0.5" // { dependencies = [ - sources."@babel/types-7.12.12" + sources."@babel/types-7.12.13" sources."source-map-0.6.1" ]; }) @@ -63065,7 +63118,7 @@ in sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" sources."ejs-2.7.4" - sources."electron-to-chromium-1.3.650" + sources."electron-to-chromium-1.3.653" sources."elegant-spinner-1.0.1" sources."emoji-regex-8.0.0" sources."emojis-list-3.0.0" @@ -63180,7 +63233,7 @@ in sources."generic-names-2.0.1" sources."gensync-1.0.0-beta.2" sources."get-caller-file-2.0.5" - sources."get-intrinsic-1.1.0" + sources."get-intrinsic-1.1.1" sources."get-proxy-2.1.0" sources."get-stream-4.1.0" sources."get-value-2.0.6" @@ -63810,7 +63863,7 @@ in sources."reusify-1.0.4" sources."rimraf-3.0.2" sources."roarr-2.15.4" - sources."rss-parser-3.10.0" + sources."rss-parser-3.11.0" sources."run-async-2.4.1" sources."run-parallel-1.1.10" sources."rxjs-6.6.3" @@ -64323,13 +64376,13 @@ in sha512 = "Q1OfB3hpa4TtM6x5a2gJmZncpQYx0hFt4ohdgv4Ms67kcAVwL29QQ2NDbNqfKr15IzlNAhLGueCzxG6dMjdnbQ=="; }; dependencies = [ - sources."@babel/code-frame-7.12.11" - sources."@babel/generator-7.12.11" + sources."@babel/code-frame-7.12.13" + sources."@babel/generator-7.12.13" sources."@babel/helper-validator-identifier-7.12.11" - sources."@babel/highlight-7.10.4" - sources."@babel/parser-7.12.11" - sources."@babel/template-7.12.7" - sources."@babel/types-7.12.12" + sources."@babel/highlight-7.12.13" + sources."@babel/parser-7.12.14" + sources."@babel/template-7.12.13" + sources."@babel/types-7.12.13" sources."@webassemblyjs/ast-1.11.0" sources."@webassemblyjs/floating-point-hex-parser-1.11.0" sources."@webassemblyjs/helper-api-error-1.11.0" @@ -64404,33 +64457,33 @@ in sha512 = "bBFO/imgikyrGd6urHfiZDmceZzAMfWeAmt5Fd9du5B+rv6IIJsDZMrTcalKUhwL6NdM0mBwkFcLmQvjm8UMOw=="; }; dependencies = [ - sources."@babel/code-frame-7.12.11" - (sources."@babel/core-7.12.10" // { + sources."@babel/code-frame-7.12.13" + (sources."@babel/core-7.12.13" // { dependencies = [ sources."source-map-0.5.7" ]; }) - (sources."@babel/generator-7.12.11" // { + (sources."@babel/generator-7.12.13" // { dependencies = [ sources."source-map-0.5.7" ]; }) - sources."@babel/helper-function-name-7.12.11" - sources."@babel/helper-get-function-arity-7.12.10" - sources."@babel/helper-member-expression-to-functions-7.12.7" - sources."@babel/helper-module-imports-7.12.5" - sources."@babel/helper-module-transforms-7.12.1" - sources."@babel/helper-optimise-call-expression-7.12.10" - sources."@babel/helper-replace-supers-7.12.11" - sources."@babel/helper-simple-access-7.12.1" - sources."@babel/helper-split-export-declaration-7.12.11" + sources."@babel/helper-function-name-7.12.13" + sources."@babel/helper-get-function-arity-7.12.13" + sources."@babel/helper-member-expression-to-functions-7.12.13" + sources."@babel/helper-module-imports-7.12.13" + sources."@babel/helper-module-transforms-7.12.13" + sources."@babel/helper-optimise-call-expression-7.12.13" + sources."@babel/helper-replace-supers-7.12.13" + sources."@babel/helper-simple-access-7.12.13" + sources."@babel/helper-split-export-declaration-7.12.13" sources."@babel/helper-validator-identifier-7.12.11" - sources."@babel/helpers-7.12.5" - sources."@babel/highlight-7.10.4" - sources."@babel/parser-7.12.11" - sources."@babel/template-7.12.7" - sources."@babel/traverse-7.12.12" - sources."@babel/types-7.12.12" + sources."@babel/helpers-7.12.13" + sources."@babel/highlight-7.12.13" + sources."@babel/parser-7.12.14" + sources."@babel/template-7.12.13" + sources."@babel/traverse-7.12.13" + sources."@babel/types-7.12.13" sources."JSV-4.0.2" sources."ansi-styles-3.2.1" sources."array-unique-0.3.2" @@ -64537,7 +64590,7 @@ in dependencies = [ sources."@types/glob-7.1.3" sources."@types/minimatch-3.0.3" - sources."@types/node-14.14.22" + sources."@types/node-14.14.25" sources."balanced-match-1.0.0" sources."brace-expansion-1.1.11" sources."chromium-pickle-js-0.2.0" @@ -64931,7 +64984,7 @@ in }) sources."domain-browser-1.2.0" sources."duplexer2-0.1.4" - (sources."elliptic-6.5.3" // { + (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.11.9" ]; @@ -64945,7 +64998,7 @@ in sources."fs.realpath-1.0.0" sources."function-bind-1.1.1" sources."get-assigned-identifiers-1.2.0" - sources."get-intrinsic-1.1.0" + sources."get-intrinsic-1.1.1" sources."glob-7.1.6" sources."has-1.0.3" sources."has-symbols-1.0.1" @@ -65213,7 +65266,7 @@ in sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" sources."electrum-client-git://github.com/janoside/electrum-client" - sources."elliptic-6.5.3" + sources."elliptic-6.5.4" sources."emoji-regex-7.0.3" sources."encodeurl-1.0.2" sources."entities-1.1.2" @@ -65250,7 +65303,7 @@ in sources."fresh-0.5.2" sources."function-bind-1.1.1" sources."get-caller-file-2.0.5" - sources."get-intrinsic-1.1.0" + sources."get-intrinsic-1.1.1" sources."getpass-0.1.7" sources."glob-6.0.4" sources."graceful-fs-4.2.4" @@ -65558,7 +65611,7 @@ in sources."@protobufjs/pool-1.1.0" sources."@protobufjs/utf8-1.1.0" sources."@types/long-4.0.1" - sources."@types/node-13.13.40" + sources."@types/node-13.13.41" sources."addr-to-ip-port-1.5.1" sources."airplay-js-0.2.16" sources."ajv-6.12.6" @@ -65963,13 +66016,13 @@ in cdk8s-cli = nodeEnv.buildNodePackage { name = "cdk8s-cli"; packageName = "cdk8s-cli"; - version = "1.0.0-beta.6"; + version = "1.0.0-beta.8"; src = fetchurl { - url = "https://registry.npmjs.org/cdk8s-cli/-/cdk8s-cli-1.0.0-beta.6.tgz"; - sha512 = "x6sJTGaSPoyQbcKbxkKxmgdGXLpyO+qbgt6GgN9guIk28dgkoqZG9CcfmwjAs+OXoY4ZiyNKvNO4w9ljW/+XOQ=="; + url = "https://registry.npmjs.org/cdk8s-cli/-/cdk8s-cli-1.0.0-beta.8.tgz"; + sha512 = "3gtzVdy2/KcfUsXmbEuehe8O1L1EtjzEvfzBYcQtZ1VYJK+X95H2UXlDwI6ug+K8A/Fmnrh2TjtIq1Vakv0fcQ=="; }; dependencies = [ - sources."@jsii/spec-1.18.0" + sources."@jsii/spec-1.20.0" sources."@types/node-10.17.51" sources."ansi-regex-5.0.0" sources."ansi-styles-4.3.0" @@ -65979,10 +66032,10 @@ in sources."call-bind-1.0.2" sources."camelcase-6.2.0" sources."case-1.6.3" - sources."cdk8s-1.0.0-beta.6" + sources."cdk8s-1.0.0-beta.8" sources."cliui-7.0.4" sources."clone-2.1.2" - (sources."codemaker-1.18.0" // { + (sources."codemaker-1.20.0" // { dependencies = [ sources."fs-extra-9.1.0" ]; @@ -65991,7 +66044,7 @@ in sources."color-name-1.1.4" sources."colors-1.4.0" sources."commonmark-0.29.3" - sources."constructs-3.3.3" + sources."constructs-3.3.5" sources."date-format-3.0.0" sources."debug-4.3.2" sources."decamelize-5.0.0" @@ -66018,7 +66071,7 @@ in }) sources."function-bind-1.1.1" sources."get-caller-file-2.0.5" - sources."get-intrinsic-1.1.0" + sources."get-intrinsic-1.1.1" sources."graceful-fs-4.2.4" sources."has-1.0.3" sources."has-symbols-1.0.1" @@ -66039,31 +66092,31 @@ in sources."is-weakmap-2.0.1" sources."is-weakset-2.0.1" sources."isarray-2.0.5" - (sources."jsii-1.18.0" // { + (sources."jsii-1.20.0" // { dependencies = [ sources."fs-extra-9.1.0" sources."yargs-16.2.0" ]; }) - (sources."jsii-pacmak-1.18.0" // { + (sources."jsii-pacmak-1.20.0" // { dependencies = [ sources."fs-extra-9.1.0" sources."yargs-16.2.0" ]; }) - (sources."jsii-reflect-1.18.0" // { + (sources."jsii-reflect-1.20.0" // { dependencies = [ sources."fs-extra-9.1.0" sources."yargs-16.2.0" ]; }) - (sources."jsii-rosetta-1.18.0" // { + (sources."jsii-rosetta-1.20.0" // { dependencies = [ sources."fs-extra-9.1.0" sources."yargs-16.2.0" ]; }) - (sources."jsii-srcmak-0.1.214" // { + (sources."jsii-srcmak-0.1.218" // { dependencies = [ sources."fs-extra-9.1.0" ]; @@ -66085,7 +66138,7 @@ in sources."object-is-1.1.4" sources."object-keys-1.1.1" sources."object.assign-4.1.2" - sources."oo-ascii-tree-1.18.0" + sources."oo-ascii-tree-1.20.0" sources."p-limit-2.3.0" sources."p-locate-4.1.0" sources."p-try-2.2.0" @@ -66160,12 +66213,12 @@ in sha512 = "tlkYo1SbitrwfqcTK0S5ZsGasRaJtN5tRP3VxgIszJZggav7mpRGABjTkqY23GzG8UXIaUTvH4uBGshx+iqcOA=="; }; dependencies = [ - sources."@jsii/spec-1.18.0" + sources."@jsii/spec-1.20.0" sources."@skorfmann/terraform-cloud-1.7.1" sources."@types/archiver-5.1.0" sources."@types/glob-7.1.3" sources."@types/minimatch-3.0.3" - sources."@types/node-14.14.22" + sources."@types/node-14.14.25" sources."@types/readline-sync-1.4.3" sources."@types/stream-buffers-3.0.3" sources."@types/uuid-8.3.0" @@ -66191,7 +66244,7 @@ in sources."axios-0.21.1" sources."balanced-match-1.0.0" sources."base64-js-1.5.1" - sources."bl-4.0.3" + sources."bl-4.0.4" sources."brace-expansion-1.1.11" sources."buffer-5.7.1" sources."buffer-crc32-0.2.13" @@ -66218,10 +66271,10 @@ in sources."commonmark-0.29.3" sources."compress-commons-4.0.2" sources."concat-map-0.0.1" - sources."constructs-3.3.3" + sources."constructs-3.3.11" sources."core-util-is-1.0.2" sources."crc-32-1.2.0" - sources."crc32-stream-4.0.1" + sources."crc32-stream-4.0.2" sources."date-format-3.0.0" sources."debug-4.3.2" sources."decamelize-1.2.0" @@ -66258,7 +66311,7 @@ in sources."fs.realpath-1.0.0" sources."function-bind-1.1.1" sources."get-caller-file-2.0.5" - sources."get-intrinsic-1.1.0" + sources."get-intrinsic-1.1.1" sources."glob-7.1.6" sources."graceful-fs-4.2.4" sources."has-1.0.3" @@ -66302,7 +66355,7 @@ in sources."is-wsl-2.2.0" sources."isarray-1.0.0" sources."js-tokens-4.0.0" - (sources."jsii-1.18.0" // { + (sources."jsii-1.20.0" // { dependencies = [ sources."fs-extra-9.1.0" sources."jsonfile-6.1.0" @@ -66310,10 +66363,10 @@ in sources."yargs-16.2.0" ]; }) - (sources."jsii-pacmak-1.18.0" // { + (sources."jsii-pacmak-1.20.0" // { dependencies = [ sources."camelcase-6.2.0" - sources."codemaker-1.18.0" + sources."codemaker-1.20.0" sources."decamelize-5.0.0" sources."fs-extra-9.1.0" sources."jsonfile-6.1.0" @@ -66321,7 +66374,7 @@ in sources."yargs-16.2.0" ]; }) - (sources."jsii-reflect-1.18.0" // { + (sources."jsii-reflect-1.20.0" // { dependencies = [ sources."fs-extra-9.1.0" sources."jsonfile-6.1.0" @@ -66329,7 +66382,7 @@ in sources."yargs-16.2.0" ]; }) - (sources."jsii-rosetta-1.18.0" // { + (sources."jsii-rosetta-1.20.0" // { dependencies = [ sources."fs-extra-9.1.0" sources."jsonfile-6.1.0" @@ -66337,7 +66390,7 @@ in sources."yargs-16.2.0" ]; }) - (sources."jsii-srcmak-0.1.214" // { + (sources."jsii-srcmak-0.1.218" // { dependencies = [ sources."fs-extra-9.1.0" sources."jsonfile-6.1.0" @@ -66398,7 +66451,7 @@ in sources."object.values-1.1.2" sources."once-1.4.0" sources."onetime-5.1.2" - sources."oo-ascii-tree-1.18.0" + sources."oo-ascii-tree-1.20.0" sources."open-7.4.0" sources."p-limit-2.3.0" sources."p-locate-4.1.0" @@ -66931,7 +66984,7 @@ in sources."fb-watchman-2.0.1" sources."flatted-2.0.2" sources."follow-redirects-1.13.2" - sources."fp-ts-2.9.3" + sources."fp-ts-2.9.5" sources."fs-extra-8.1.0" sources."fs-minipass-2.1.0" sources."fs.realpath-1.0.0" @@ -66942,7 +66995,7 @@ in ]; }) sources."function-bind-1.1.1" - sources."get-intrinsic-1.1.0" + sources."get-intrinsic-1.1.1" sources."get-stream-4.1.0" sources."glob-7.1.6" sources."graceful-fs-4.2.4" @@ -67085,9 +67138,9 @@ in sha512 = "3p4AwJnsjtLJM53wLsMtcVUzWPMnnYI6pkwQraHH6Tp7/ZuXwIVhjUvDgMcAvhmIkVePyvJF5xZHN4ghLLP02A=="; }; dependencies = [ - sources."@babel/code-frame-7.12.11" + sources."@babel/code-frame-7.12.13" sources."@babel/helper-validator-identifier-7.12.11" - sources."@babel/highlight-7.10.4" + sources."@babel/highlight-7.12.13" sources."@mrmlnc/readdir-enhanced-2.2.1" sources."@nodelib/fs.stat-1.1.3" sources."@types/eslint-visitor-keys-1.0.0" @@ -67256,7 +67309,7 @@ in sources."domutils-1.7.0" sources."dot-prop-5.3.0" sources."duplexer3-0.1.4" - sources."electron-to-chromium-1.3.650" + sources."electron-to-chromium-1.3.653" sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" sources."entities-1.1.2" @@ -68173,29 +68226,29 @@ in sha512 = "+GYR6KTvHQnqu0j1kXT30hRZMuCwG/G52wG/19LSPE+p9Q0i8XFH6582T0btTu39xz2TPsDOGjT1VgyRw2urug=="; }; dependencies = [ - sources."@babel/code-frame-7.12.11" - sources."@babel/core-7.12.10" - sources."@babel/generator-7.12.11" - sources."@babel/helper-function-name-7.12.11" - sources."@babel/helper-get-function-arity-7.12.10" - sources."@babel/helper-member-expression-to-functions-7.12.7" - sources."@babel/helper-module-imports-7.12.5" - sources."@babel/helper-module-transforms-7.12.1" - sources."@babel/helper-optimise-call-expression-7.12.10" - sources."@babel/helper-replace-supers-7.12.11" - sources."@babel/helper-simple-access-7.12.1" - sources."@babel/helper-split-export-declaration-7.12.11" + sources."@babel/code-frame-7.12.13" + sources."@babel/core-7.12.13" + sources."@babel/generator-7.12.13" + sources."@babel/helper-function-name-7.12.13" + sources."@babel/helper-get-function-arity-7.12.13" + sources."@babel/helper-member-expression-to-functions-7.12.13" + sources."@babel/helper-module-imports-7.12.13" + sources."@babel/helper-module-transforms-7.12.13" + sources."@babel/helper-optimise-call-expression-7.12.13" + sources."@babel/helper-replace-supers-7.12.13" + sources."@babel/helper-simple-access-7.12.13" + sources."@babel/helper-split-export-declaration-7.12.13" sources."@babel/helper-validator-identifier-7.12.11" - sources."@babel/helpers-7.12.5" - (sources."@babel/highlight-7.10.4" // { + sources."@babel/helpers-7.12.13" + (sources."@babel/highlight-7.12.13" // { dependencies = [ sources."chalk-2.4.2" ]; }) - sources."@babel/parser-7.12.11" - sources."@babel/template-7.12.7" - sources."@babel/traverse-7.12.12" - sources."@babel/types-7.12.12" + sources."@babel/parser-7.12.14" + sources."@babel/template-7.12.13" + sources."@babel/traverse-7.12.13" + sources."@babel/types-7.12.13" sources."@nodelib/fs.scandir-2.1.4" sources."@nodelib/fs.stat-2.0.4" sources."@nodelib/fs.walk-1.2.6" @@ -68259,7 +68312,7 @@ in sources."domelementtype-1.3.1" sources."domhandler-2.4.2" sources."domutils-1.7.0" - sources."electron-to-chromium-1.3.650" + sources."electron-to-chromium-1.3.653" sources."emoji-regex-8.0.0" sources."entities-1.1.2" sources."error-ex-1.3.2" @@ -68338,12 +68391,12 @@ in sources."lru-cache-6.0.0" sources."map-obj-4.1.0" sources."mathml-tag-names-2.1.3" - sources."mdast-util-from-markdown-0.8.4" + sources."mdast-util-from-markdown-0.8.5" sources."mdast-util-to-markdown-0.6.2" sources."mdast-util-to-string-2.0.0" sources."meow-9.0.0" sources."merge2-1.4.1" - sources."micromark-2.11.3" + sources."micromark-2.11.4" sources."micromatch-4.0.2" sources."min-indent-1.0.1" sources."minimatch-3.0.4" @@ -68524,9 +68577,9 @@ in sha512 = "5Zxv2Adtb6Mlpv2YdKErhf8ntxiBl1UyrbEqo7gR9nFIAfi3o0Ue6TJTpZfOhQViFQxLjJAS65IQVRaNlbhkxw=="; }; dependencies = [ - sources."@babel/code-frame-7.12.11" + sources."@babel/code-frame-7.12.13" sources."@babel/helper-validator-identifier-7.12.11" - sources."@babel/highlight-7.10.4" + sources."@babel/highlight-7.12.13" sources."ansi-styles-3.2.1" sources."argparse-1.0.10" sources."balanced-match-1.0.0" @@ -68639,9 +68692,9 @@ in sha512 = "2SHFFjxkw2kl0hADDNUYX85OR/PbjqYPxFnpNp6G83SbeZBoJN8KDUl7TrIJ7BZ4UCiIilXnKQCHpxREiVPAEg=="; }; dependencies = [ - sources."@babel/code-frame-7.12.11" + sources."@babel/code-frame-7.12.13" sources."@babel/helper-validator-identifier-7.12.11" - (sources."@babel/highlight-7.10.4" // { + (sources."@babel/highlight-7.12.13" // { dependencies = [ sources."chalk-2.4.2" ]; @@ -69584,15 +69637,15 @@ in sha512 = "HCpNdBkQy3rw+uARLuIf0YurqsMXYzBa9ihhSAuxYJcNIrqrSq3BstPfr0cQN38AdMrQiO9Dp4hYy7GtGJsLPg=="; }; dependencies = [ - sources."@babel/code-frame-7.12.11" + sources."@babel/code-frame-7.12.13" sources."@babel/helper-validator-identifier-7.12.11" - sources."@babel/highlight-7.10.4" + sources."@babel/highlight-7.12.13" sources."@mrmlnc/readdir-enhanced-2.2.1" sources."@nodelib/fs.stat-1.1.3" sources."@types/glob-7.1.3" sources."@types/minimatch-3.0.3" sources."@types/minimist-1.2.1" - sources."@types/node-14.14.22" + sources."@types/node-14.14.25" sources."@types/normalize-package-data-2.4.0" sources."aggregate-error-3.1.0" sources."ansi-styles-3.2.1" @@ -69963,7 +70016,7 @@ in sources."@cycle/run-3.4.0" sources."@cycle/time-0.10.1" sources."@types/cookiejar-2.1.2" - sources."@types/node-14.14.22" + sources."@types/node-14.14.25" sources."@types/superagent-3.8.2" sources."ansi-escapes-3.2.0" sources."ansi-regex-2.1.1" @@ -70107,10 +70160,10 @@ in create-react-app = nodeEnv.buildNodePackage { name = "create-react-app"; packageName = "create-react-app"; - version = "4.0.1"; + version = "4.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/create-react-app/-/create-react-app-4.0.1.tgz"; - sha512 = "ryEU58YUtn4gxaEQ/Zwt3Bbmkoc3MghLNbNKs1MUg8zDWyM+az1SvMmZ7QaXye9DNNwn5TS2/Ok+fpw2KKvZhA=="; + url = "https://registry.npmjs.org/create-react-app/-/create-react-app-4.0.2.tgz"; + sha512 = "B78UC1E8LwvbmvEjIPumKXvu9yeNTpaKrNVf0HpP5AJmGgq9fdipcYKtpqRNAwm06lvhpNhO3jvR9xeRQDsmog=="; }; dependencies = [ sources."ansi-styles-4.3.0" @@ -71043,7 +71096,7 @@ in dependencies = [ sources."@fast-csv/format-4.3.5" sources."@fast-csv/parse-4.3.6" - sources."@types/node-14.14.22" + sources."@types/node-14.14.25" sources."JSONStream-1.3.5" sources."ajv-6.12.6" sources."asn1-0.2.4" @@ -71205,40 +71258,40 @@ in sha512 = "ohjlUXM2v39rDqGIrlyxdcn9ql+4b+X1u90CXNWjYw5wX6C3wTHRfqFfeV8jajYD6Xc+ufn2X1QeZZWhRBXTlA=="; }; dependencies = [ - sources."@babel/code-frame-7.12.11" - sources."@babel/core-7.12.10" - sources."@babel/generator-7.12.11" - sources."@babel/helper-annotate-as-pure-7.12.10" - sources."@babel/helper-function-name-7.12.11" - sources."@babel/helper-get-function-arity-7.12.10" - sources."@babel/helper-member-expression-to-functions-7.12.7" - sources."@babel/helper-module-imports-7.12.5" - sources."@babel/helper-module-transforms-7.12.1" - sources."@babel/helper-optimise-call-expression-7.12.10" - sources."@babel/helper-plugin-utils-7.10.4" - sources."@babel/helper-replace-supers-7.12.11" - sources."@babel/helper-simple-access-7.12.1" - sources."@babel/helper-split-export-declaration-7.12.11" + sources."@babel/code-frame-7.12.13" + sources."@babel/core-7.12.13" + sources."@babel/generator-7.12.13" + sources."@babel/helper-annotate-as-pure-7.12.13" + sources."@babel/helper-function-name-7.12.13" + sources."@babel/helper-get-function-arity-7.12.13" + sources."@babel/helper-member-expression-to-functions-7.12.13" + sources."@babel/helper-module-imports-7.12.13" + sources."@babel/helper-module-transforms-7.12.13" + sources."@babel/helper-optimise-call-expression-7.12.13" + sources."@babel/helper-plugin-utils-7.12.13" + sources."@babel/helper-replace-supers-7.12.13" + sources."@babel/helper-simple-access-7.12.13" + sources."@babel/helper-split-export-declaration-7.12.13" sources."@babel/helper-validator-identifier-7.12.11" - sources."@babel/helpers-7.12.5" - sources."@babel/highlight-7.10.4" - sources."@babel/parser-7.12.11" - sources."@babel/plugin-proposal-object-rest-spread-7.12.1" - sources."@babel/plugin-syntax-jsx-7.12.1" + sources."@babel/helpers-7.12.13" + sources."@babel/highlight-7.12.13" + sources."@babel/parser-7.12.14" + sources."@babel/plugin-proposal-object-rest-spread-7.12.13" + sources."@babel/plugin-syntax-jsx-7.12.13" sources."@babel/plugin-syntax-object-rest-spread-7.8.3" - sources."@babel/plugin-transform-destructuring-7.12.1" - sources."@babel/plugin-transform-parameters-7.12.1" - sources."@babel/plugin-transform-react-jsx-7.12.12" - sources."@babel/template-7.12.7" - sources."@babel/traverse-7.12.12" - sources."@babel/types-7.12.12" + sources."@babel/plugin-transform-destructuring-7.12.13" + sources."@babel/plugin-transform-parameters-7.12.13" + sources."@babel/plugin-transform-react-jsx-7.12.13" + sources."@babel/template-7.12.13" + sources."@babel/traverse-7.12.13" + sources."@babel/types-7.12.13" sources."@sindresorhus/is-4.0.0" sources."@szmarczak/http-timer-4.0.5" sources."@types/cacheable-request-6.0.1" sources."@types/http-cache-semantics-4.0.0" sources."@types/keyv-3.1.1" sources."@types/minimist-1.2.1" - sources."@types/node-14.14.22" + sources."@types/node-14.14.25" sources."@types/normalize-package-data-2.4.0" sources."@types/responselike-1.0.0" sources."@types/yoga-layout-1.9.2" @@ -71515,7 +71568,7 @@ in ]; }) sources."wrappy-1.0.2" - sources."ws-7.4.2" + sources."ws-7.4.3" sources."yallist-4.0.0" sources."yargs-parser-18.1.3" sources."yoga-layout-prebuilt-1.10.0" @@ -71553,9 +71606,9 @@ in version = "1.7.5"; src = ../../applications/video/epgstation; dependencies = [ - sources."@babel/code-frame-7.12.11" + sources."@babel/code-frame-7.12.13" sources."@babel/helper-validator-identifier-7.12.11" - (sources."@babel/highlight-7.10.4" // { + (sources."@babel/highlight-7.12.13" // { dependencies = [ sources."ansi-styles-3.2.1" sources."chalk-2.4.2" @@ -71565,7 +71618,7 @@ in sources."@fluentui/date-time-utilities-7.9.0" sources."@fluentui/dom-utilities-1.1.1" sources."@fluentui/keyboard-key-0.2.13" - sources."@fluentui/react-7.158.0" + sources."@fluentui/react-7.158.1" sources."@fluentui/react-focus-7.17.1" sources."@fluentui/react-window-provider-1.0.1" sources."@fluentui/theme-1.7.1" @@ -72011,9 +72064,10 @@ in sources."each-props-1.3.2" sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" - (sources."elliptic-6.5.3" // { + (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.11.9" + sources."inherits-2.0.4" ]; }) sources."emojis-list-3.0.0" @@ -72179,7 +72233,7 @@ in ]; }) sources."get-caller-file-1.0.3" - sources."get-intrinsic-1.1.0" + sources."get-intrinsic-1.1.1" sources."get-stream-4.1.0" sources."get-value-2.0.6" sources."getpass-0.1.7" @@ -72601,7 +72655,7 @@ in sources."object.map-1.0.1" sources."object.pick-1.3.0" sources."object.reduce-1.0.1" - sources."office-ui-fabric-react-7.158.0" + sources."office-ui-fabric-react-7.158.1" sources."on-finished-2.3.0" sources."on-headers-1.0.2" sources."once-1.4.0" @@ -73188,7 +73242,7 @@ in ]; }) sources."wrappy-1.0.2" - sources."ws-7.4.2" + sources."ws-7.4.3" sources."xmlhttprequest-ssl-1.5.5" sources."xtend-4.0.2" sources."y18n-3.2.2" @@ -73240,9 +73294,9 @@ in sha512 = "CGlMgJY56JZ9ZSYhJuhow61lMPPjUzWmChFya71Z/jilVos7mR/jPgaEfVGgMBY5DshbKdG8Ezb8FDCHcoMEMg=="; }; dependencies = [ - sources."@babel/code-frame-7.12.11" + sources."@babel/code-frame-7.12.13" sources."@babel/helper-validator-identifier-7.12.11" - (sources."@babel/highlight-7.10.4" // { + (sources."@babel/highlight-7.12.13" // { dependencies = [ sources."chalk-2.4.2" ]; @@ -73396,9 +73450,9 @@ in sha512 = "rMZDE3kiJ2JXv1qk3i3xa5lzelEVQuTNRF5nMHQNX2SDzHKucisbNQh9ExvXU3Wd+jNjeVOSmZ6Ir0gY3COf2w=="; }; dependencies = [ - sources."@babel/code-frame-7.12.11" + sources."@babel/code-frame-7.12.13" sources."@babel/helper-validator-identifier-7.12.11" - (sources."@babel/highlight-7.10.4" // { + (sources."@babel/highlight-7.12.13" // { dependencies = [ sources."chalk-2.4.2" sources."has-flag-3.0.0" @@ -73576,132 +73630,131 @@ in sha512 = "C6UvtUWCsJyFOah57CKNeSP+tZeJDfED7dyHIWDQ+cQx2EYzNQVt4GIOu63u1Hzf3WArehxMroTmMayHCdhTeA=="; }; dependencies = [ - sources."@babel/code-frame-7.12.11" - sources."@babel/compat-data-7.12.7" + sources."@babel/code-frame-7.12.13" + sources."@babel/compat-data-7.12.13" (sources."@babel/core-7.9.0" // { dependencies = [ sources."semver-5.7.1" ]; }) - sources."@babel/generator-7.12.11" - sources."@babel/helper-annotate-as-pure-7.12.10" - sources."@babel/helper-builder-binary-assignment-operator-visitor-7.10.4" - (sources."@babel/helper-compilation-targets-7.12.5" // { + sources."@babel/generator-7.12.13" + sources."@babel/helper-annotate-as-pure-7.12.13" + sources."@babel/helper-builder-binary-assignment-operator-visitor-7.12.13" + (sources."@babel/helper-compilation-targets-7.12.13" // { dependencies = [ sources."semver-5.7.1" ]; }) - sources."@babel/helper-create-class-features-plugin-7.12.1" - sources."@babel/helper-create-regexp-features-plugin-7.12.7" - sources."@babel/helper-define-map-7.10.5" - sources."@babel/helper-explode-assignable-expression-7.12.1" - sources."@babel/helper-function-name-7.12.11" - sources."@babel/helper-get-function-arity-7.12.10" - sources."@babel/helper-hoist-variables-7.10.4" - sources."@babel/helper-member-expression-to-functions-7.12.7" - sources."@babel/helper-module-imports-7.12.5" - sources."@babel/helper-module-transforms-7.12.1" - sources."@babel/helper-optimise-call-expression-7.12.10" - sources."@babel/helper-plugin-utils-7.10.4" - sources."@babel/helper-remap-async-to-generator-7.12.1" - sources."@babel/helper-replace-supers-7.12.11" - sources."@babel/helper-simple-access-7.12.1" + sources."@babel/helper-create-class-features-plugin-7.12.13" + sources."@babel/helper-create-regexp-features-plugin-7.12.13" + sources."@babel/helper-explode-assignable-expression-7.12.13" + sources."@babel/helper-function-name-7.12.13" + sources."@babel/helper-get-function-arity-7.12.13" + sources."@babel/helper-hoist-variables-7.12.13" + sources."@babel/helper-member-expression-to-functions-7.12.13" + sources."@babel/helper-module-imports-7.12.13" + sources."@babel/helper-module-transforms-7.12.13" + sources."@babel/helper-optimise-call-expression-7.12.13" + sources."@babel/helper-plugin-utils-7.12.13" + sources."@babel/helper-remap-async-to-generator-7.12.13" + sources."@babel/helper-replace-supers-7.12.13" + sources."@babel/helper-simple-access-7.12.13" sources."@babel/helper-skip-transparent-expression-wrappers-7.12.1" - sources."@babel/helper-split-export-declaration-7.12.11" + sources."@babel/helper-split-export-declaration-7.12.13" sources."@babel/helper-validator-identifier-7.12.11" sources."@babel/helper-validator-option-7.12.11" - sources."@babel/helper-wrap-function-7.12.3" - sources."@babel/helpers-7.12.5" - (sources."@babel/highlight-7.10.4" // { + sources."@babel/helper-wrap-function-7.12.13" + sources."@babel/helpers-7.12.13" + (sources."@babel/highlight-7.12.13" // { dependencies = [ sources."chalk-2.4.2" ]; }) - sources."@babel/parser-7.12.11" - sources."@babel/plugin-proposal-async-generator-functions-7.12.12" - sources."@babel/plugin-proposal-class-properties-7.12.1" + sources."@babel/parser-7.12.14" + sources."@babel/plugin-proposal-async-generator-functions-7.12.13" + sources."@babel/plugin-proposal-class-properties-7.12.13" sources."@babel/plugin-proposal-dynamic-import-7.12.1" - sources."@babel/plugin-proposal-export-default-from-7.12.1" - sources."@babel/plugin-proposal-export-namespace-from-7.12.1" - sources."@babel/plugin-proposal-json-strings-7.12.1" - sources."@babel/plugin-proposal-logical-assignment-operators-7.12.1" - sources."@babel/plugin-proposal-nullish-coalescing-operator-7.12.1" - sources."@babel/plugin-proposal-numeric-separator-7.12.7" - sources."@babel/plugin-proposal-object-rest-spread-7.12.1" - sources."@babel/plugin-proposal-optional-catch-binding-7.12.1" - sources."@babel/plugin-proposal-optional-chaining-7.12.7" - sources."@babel/plugin-proposal-private-methods-7.12.1" - sources."@babel/plugin-proposal-unicode-property-regex-7.12.1" + sources."@babel/plugin-proposal-export-default-from-7.12.13" + sources."@babel/plugin-proposal-export-namespace-from-7.12.13" + sources."@babel/plugin-proposal-json-strings-7.12.13" + sources."@babel/plugin-proposal-logical-assignment-operators-7.12.13" + sources."@babel/plugin-proposal-nullish-coalescing-operator-7.12.13" + sources."@babel/plugin-proposal-numeric-separator-7.12.13" + sources."@babel/plugin-proposal-object-rest-spread-7.12.13" + sources."@babel/plugin-proposal-optional-catch-binding-7.12.13" + sources."@babel/plugin-proposal-optional-chaining-7.12.13" + sources."@babel/plugin-proposal-private-methods-7.12.13" + sources."@babel/plugin-proposal-unicode-property-regex-7.12.13" sources."@babel/plugin-syntax-async-generators-7.8.4" - sources."@babel/plugin-syntax-class-properties-7.12.1" + sources."@babel/plugin-syntax-class-properties-7.12.13" sources."@babel/plugin-syntax-dynamic-import-7.8.3" - sources."@babel/plugin-syntax-export-default-from-7.12.1" + sources."@babel/plugin-syntax-export-default-from-7.12.13" sources."@babel/plugin-syntax-export-namespace-from-7.8.3" - sources."@babel/plugin-syntax-flow-7.12.1" + sources."@babel/plugin-syntax-flow-7.12.13" sources."@babel/plugin-syntax-json-strings-7.8.3" - sources."@babel/plugin-syntax-jsx-7.12.1" + sources."@babel/plugin-syntax-jsx-7.12.13" sources."@babel/plugin-syntax-logical-assignment-operators-7.10.4" sources."@babel/plugin-syntax-nullish-coalescing-operator-7.8.3" sources."@babel/plugin-syntax-numeric-separator-7.10.4" sources."@babel/plugin-syntax-object-rest-spread-7.8.3" sources."@babel/plugin-syntax-optional-catch-binding-7.8.3" sources."@babel/plugin-syntax-optional-chaining-7.8.3" - sources."@babel/plugin-syntax-top-level-await-7.12.1" - sources."@babel/plugin-syntax-typescript-7.12.1" - sources."@babel/plugin-transform-arrow-functions-7.12.1" - sources."@babel/plugin-transform-async-to-generator-7.12.1" - sources."@babel/plugin-transform-block-scoped-functions-7.12.1" - sources."@babel/plugin-transform-block-scoping-7.12.12" - sources."@babel/plugin-transform-classes-7.12.1" - sources."@babel/plugin-transform-computed-properties-7.12.1" - sources."@babel/plugin-transform-destructuring-7.12.1" - sources."@babel/plugin-transform-dotall-regex-7.12.1" - sources."@babel/plugin-transform-duplicate-keys-7.12.1" - sources."@babel/plugin-transform-exponentiation-operator-7.12.1" - sources."@babel/plugin-transform-flow-strip-types-7.12.10" - sources."@babel/plugin-transform-for-of-7.12.1" - sources."@babel/plugin-transform-function-name-7.12.1" - sources."@babel/plugin-transform-literals-7.12.1" - sources."@babel/plugin-transform-member-expression-literals-7.12.1" - sources."@babel/plugin-transform-modules-amd-7.12.1" - sources."@babel/plugin-transform-modules-commonjs-7.12.1" - sources."@babel/plugin-transform-modules-systemjs-7.12.1" - sources."@babel/plugin-transform-modules-umd-7.12.1" - sources."@babel/plugin-transform-named-capturing-groups-regex-7.12.1" - sources."@babel/plugin-transform-new-target-7.12.1" - sources."@babel/plugin-transform-object-assign-7.12.1" - sources."@babel/plugin-transform-object-super-7.12.1" - sources."@babel/plugin-transform-parameters-7.12.1" - sources."@babel/plugin-transform-property-literals-7.12.1" - sources."@babel/plugin-transform-react-display-name-7.12.1" - sources."@babel/plugin-transform-react-jsx-7.12.12" - sources."@babel/plugin-transform-react-jsx-source-7.12.1" - sources."@babel/plugin-transform-regenerator-7.12.1" - sources."@babel/plugin-transform-reserved-words-7.12.1" - (sources."@babel/plugin-transform-runtime-7.12.10" // { + sources."@babel/plugin-syntax-top-level-await-7.12.13" + sources."@babel/plugin-syntax-typescript-7.12.13" + sources."@babel/plugin-transform-arrow-functions-7.12.13" + sources."@babel/plugin-transform-async-to-generator-7.12.13" + sources."@babel/plugin-transform-block-scoped-functions-7.12.13" + sources."@babel/plugin-transform-block-scoping-7.12.13" + sources."@babel/plugin-transform-classes-7.12.13" + sources."@babel/plugin-transform-computed-properties-7.12.13" + sources."@babel/plugin-transform-destructuring-7.12.13" + sources."@babel/plugin-transform-dotall-regex-7.12.13" + sources."@babel/plugin-transform-duplicate-keys-7.12.13" + sources."@babel/plugin-transform-exponentiation-operator-7.12.13" + sources."@babel/plugin-transform-flow-strip-types-7.12.13" + sources."@babel/plugin-transform-for-of-7.12.13" + sources."@babel/plugin-transform-function-name-7.12.13" + sources."@babel/plugin-transform-literals-7.12.13" + sources."@babel/plugin-transform-member-expression-literals-7.12.13" + sources."@babel/plugin-transform-modules-amd-7.12.13" + sources."@babel/plugin-transform-modules-commonjs-7.12.13" + sources."@babel/plugin-transform-modules-systemjs-7.12.13" + sources."@babel/plugin-transform-modules-umd-7.12.13" + sources."@babel/plugin-transform-named-capturing-groups-regex-7.12.13" + sources."@babel/plugin-transform-new-target-7.12.13" + sources."@babel/plugin-transform-object-assign-7.12.13" + sources."@babel/plugin-transform-object-super-7.12.13" + sources."@babel/plugin-transform-parameters-7.12.13" + sources."@babel/plugin-transform-property-literals-7.12.13" + sources."@babel/plugin-transform-react-display-name-7.12.13" + sources."@babel/plugin-transform-react-jsx-7.12.13" + sources."@babel/plugin-transform-react-jsx-source-7.12.13" + sources."@babel/plugin-transform-regenerator-7.12.13" + sources."@babel/plugin-transform-reserved-words-7.12.13" + (sources."@babel/plugin-transform-runtime-7.12.13" // { dependencies = [ sources."semver-5.7.1" ]; }) - sources."@babel/plugin-transform-shorthand-properties-7.12.1" - sources."@babel/plugin-transform-spread-7.12.1" - sources."@babel/plugin-transform-sticky-regex-7.12.7" - sources."@babel/plugin-transform-template-literals-7.12.1" - sources."@babel/plugin-transform-typeof-symbol-7.12.10" - sources."@babel/plugin-transform-typescript-7.12.1" - sources."@babel/plugin-transform-unicode-escapes-7.12.1" - sources."@babel/plugin-transform-unicode-regex-7.12.1" - (sources."@babel/preset-env-7.12.11" // { + sources."@babel/plugin-transform-shorthand-properties-7.12.13" + sources."@babel/plugin-transform-spread-7.12.13" + sources."@babel/plugin-transform-sticky-regex-7.12.13" + sources."@babel/plugin-transform-template-literals-7.12.13" + sources."@babel/plugin-transform-typeof-symbol-7.12.13" + sources."@babel/plugin-transform-typescript-7.12.13" + sources."@babel/plugin-transform-unicode-escapes-7.12.13" + sources."@babel/plugin-transform-unicode-regex-7.12.13" + (sources."@babel/preset-env-7.12.13" // { dependencies = [ sources."semver-5.7.1" ]; }) sources."@babel/preset-modules-0.1.4" - sources."@babel/preset-typescript-7.12.7" - sources."@babel/runtime-7.12.5" - sources."@babel/template-7.12.7" - sources."@babel/traverse-7.12.12" - sources."@babel/types-7.12.12" + sources."@babel/preset-typescript-7.12.13" + sources."@babel/runtime-7.12.13" + sources."@babel/template-7.12.13" + sources."@babel/traverse-7.12.13" + sources."@babel/types-7.12.13" sources."@expo/apple-utils-0.0.0-alpha.17" sources."@expo/babel-preset-cli-0.2.18" sources."@expo/bunyan-4.0.0" @@ -74239,7 +74292,7 @@ in ]; }) sources."connect-history-api-fallback-1.6.0" - sources."consola-2.15.1" + sources."consola-2.15.2" sources."console-browserify-1.2.0" sources."console-control-strings-1.1.0" sources."constants-browserify-1.0.0" @@ -74424,8 +74477,8 @@ in sources."duplexify-3.7.1" sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.3.650" - (sources."elliptic-6.5.3" // { + sources."electron-to-chromium-1.3.653" + (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.11.9" ]; @@ -74603,7 +74656,7 @@ in }) sources."gensync-1.0.0-beta.2" sources."get-caller-file-2.0.5" - sources."get-intrinsic-1.1.0" + sources."get-intrinsic-1.1.1" sources."get-own-enumerable-property-symbols-3.0.2" sources."get-port-3.2.0" sources."get-stream-4.1.0" @@ -75407,7 +75460,7 @@ in }) sources."raw-body-2.3.3" sources."rc-1.2.8" - (sources."react-dev-utils-11.0.1" // { + (sources."react-dev-utils-11.0.2" // { dependencies = [ sources."@babel/code-frame-7.10.4" sources."array-union-2.1.0" @@ -75435,7 +75488,7 @@ in sources."which-2.0.2" ]; }) - sources."react-error-overlay-6.0.8" + sources."react-error-overlay-6.0.9" sources."react-is-16.13.1" sources."react-refresh-0.4.3" sources."read-chunk-3.2.0" @@ -76349,14 +76402,17 @@ in sources."@nodelib/fs.walk-1.2.6" (sources."@oclif/command-1.8.0" // { dependencies = [ - sources."@oclif/plugin-help-3.2.1" + sources."@oclif/plugin-help-3.2.2" sources."ansi-regex-3.0.0" sources."ansi-styles-3.2.1" + sources."chalk-4.1.0" sources."color-convert-1.9.3" sources."color-name-1.1.3" + sources."has-flag-4.0.0" sources."is-fullwidth-code-point-2.0.0" sources."string-width-2.1.1" sources."strip-ansi-4.0.0" + sources."supports-color-7.2.0" sources."wrap-ansi-4.0.0" ]; }) @@ -76543,7 +76599,7 @@ in sources."fast-json-stable-stringify-2.1.0" sources."fast-levenshtein-2.0.6" sources."fastq-1.10.1" - sources."faunadb-4.0.2" + sources."faunadb-4.0.3" sources."fill-range-7.0.1" sources."fn-annotate-1.2.0" sources."for-in-1.0.2" @@ -76731,7 +76787,6 @@ in sources."punycode-2.1.1" sources."qs-6.5.2" sources."query-string-5.1.1" - sources."querystringify-2.2.0" (sources."readable-stream-2.3.7" // { dependencies = [ sources."safe-buffer-5.1.2" @@ -76744,7 +76799,6 @@ in sources."request-2.88.2" sources."request-promise-4.2.6" sources."request-promise-core-1.1.4" - sources."requires-port-1.0.0" sources."resolve-url-0.2.1" sources."responselike-1.0.2" sources."ret-0.1.15" @@ -76861,7 +76915,6 @@ in }) sources."uri-js-4.4.1" sources."urix-0.1.0" - sources."url-parse-1.4.7" sources."url-parse-lax-3.0.0" sources."url-to-options-1.0.1" sources."use-3.1.1" @@ -76901,9 +76954,8 @@ in sources."@google-cloud/projectify-2.0.1" sources."@google-cloud/promisify-2.0.3" sources."@google-cloud/pubsub-2.8.0" - (sources."@grpc/grpc-js-1.2.5" // { + (sources."@grpc/grpc-js-1.2.6" // { dependencies = [ - sources."@types/node-12.19.15" sources."semver-6.3.0" ]; }) @@ -76934,7 +76986,7 @@ in sources."@tootallnate/once-1.1.2" sources."@types/duplexify-3.6.0" sources."@types/long-4.0.1" - sources."@types/node-14.14.22" + sources."@types/node-14.14.25" sources."JSONStream-1.3.5" sources."abbrev-1.1.1" sources."abort-controller-3.0.0" @@ -76995,7 +77047,7 @@ in sources."bignumber.js-9.0.1" sources."binary-0.3.0" sources."binary-extensions-2.2.0" - sources."bl-4.0.3" + sources."bl-4.0.4" sources."blakejs-1.1.0" sources."bluebird-3.4.7" (sources."body-parser-1.19.0" // { @@ -77499,7 +77551,7 @@ in sources."promise-breaker-5.0.0" (sources."protobufjs-6.10.2" // { dependencies = [ - sources."@types/node-13.13.40" + sources."@types/node-13.13.41" ]; }) sources."proxy-addr-2.0.6" @@ -77717,7 +77769,7 @@ in sources."word-wrap-1.2.3" sources."wrappy-1.0.2" sources."write-file-atomic-3.0.3" - sources."ws-7.4.2" + sources."ws-7.4.3" sources."xdg-basedir-4.0.0" sources."xmlbuilder-9.0.7" sources."xmldom-0.1.31" @@ -77794,9 +77846,9 @@ in sha512 = "untVuHgEQjwTXQGiWcwMTi0Uks6ht9R5hb1mDT4AEQitZ/z8UrhvseQsGEC3kVEjfxQ6bdmCMaA/hKTZ5aQDrA=="; }; dependencies = [ - sources."@babel/code-frame-7.12.11" + sources."@babel/code-frame-7.12.13" sources."@babel/helper-validator-identifier-7.12.11" - (sources."@babel/highlight-7.10.4" // { + (sources."@babel/highlight-7.12.13" // { dependencies = [ sources."ansi-styles-3.2.1" sources."chalk-2.4.2" @@ -77981,7 +78033,7 @@ in sources."concat-map-0.0.1" sources."fd-slicer-1.1.0" sources."fs.realpath-1.0.0" - sources."geoip-country-4.0.53" + sources."geoip-country-4.0.54" sources."glob-7.1.6" sources."iconv-lite-0.5.2" sources."inflight-1.0.6" @@ -78153,7 +78205,7 @@ in sources."fs.realpath-1.0.0" sources."fsevents-1.2.13" sources."function-bind-1.1.1" - sources."get-intrinsic-1.1.0" + sources."get-intrinsic-1.1.1" sources."get-value-2.0.6" sources."glob-7.1.6" (sources."glob-parent-3.1.0" // { @@ -78706,9 +78758,9 @@ in sha512 = "2H4Y6kXvYRBdh42FUz8gaLkQ5AvtYYBXRgRElXjX/st4QhG+bgHdnCFGYoTbrVc2uA2vS63HtUS8AJ7SNE6Rew=="; }; dependencies = [ - sources."@babel/code-frame-7.12.11" + sources."@babel/code-frame-7.12.13" sources."@babel/helper-validator-identifier-7.12.11" - (sources."@babel/highlight-7.10.4" // { + (sources."@babel/highlight-7.12.13" // { dependencies = [ sources."ansi-styles-3.2.1" sources."chalk-2.4.2" @@ -78738,7 +78790,7 @@ in sources."arrify-1.0.1" sources."atomically-1.7.0" sources."base64-js-1.5.1" - sources."bl-4.0.3" + sources."bl-4.0.4" (sources."boxen-5.0.0" // { dependencies = [ sources."camelcase-6.2.0" @@ -78996,9 +79048,9 @@ in }; dependencies = [ sources."@ardatan/aggregate-error-0.0.6" - sources."@babel/code-frame-7.12.11" + sources."@babel/code-frame-7.12.13" sources."@babel/helper-validator-identifier-7.12.11" - (sources."@babel/highlight-7.10.4" // { + (sources."@babel/highlight-7.12.13" // { dependencies = [ sources."ansi-styles-3.2.1" sources."chalk-2.4.2" @@ -79053,13 +79105,10 @@ in sources."tslib-2.1.0" ]; }) - (sources."@graphql-tools/schema-7.1.2" // { + (sources."@graphql-tools/schema-7.1.3" // { dependencies = [ - (sources."@graphql-tools/utils-7.2.5" // { - dependencies = [ - sources."tslib-2.1.0" - ]; - }) + sources."@graphql-tools/utils-7.2.5" + sources."tslib-2.1.0" ]; }) (sources."@graphql-tools/url-loader-6.8.0" // { @@ -79093,7 +79142,7 @@ in sources."@nodelib/fs.walk-1.2.6" sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" - sources."@types/node-14.14.22" + sources."@types/node-14.14.25" sources."@types/parse-json-4.0.0" sources."@types/websocket-1.0.1" sources."aggregate-error-3.1.0" @@ -79226,7 +79275,7 @@ in sources."fullname-4.0.1" sources."function-bind-1.1.1" sources."get-caller-file-2.0.5" - sources."get-intrinsic-1.1.0" + sources."get-intrinsic-1.1.1" sources."get-stream-4.1.0" sources."getpass-0.1.7" sources."glob-7.1.6" @@ -80252,7 +80301,7 @@ in sources."fsevents-1.2.13" sources."function-bind-1.1.1" sources."get-caller-file-1.0.3" - sources."get-intrinsic-1.1.0" + sources."get-intrinsic-1.1.1" sources."get-value-2.0.6" sources."glob-7.1.6" (sources."glob-parent-3.1.0" // { @@ -80652,7 +80701,7 @@ in sources."fragment-cache-0.2.1" sources."function-bind-1.1.1" sources."get-caller-file-1.0.3" - sources."get-intrinsic-1.1.0" + sources."get-intrinsic-1.1.1" sources."get-value-2.0.6" sources."global-modules-1.0.0" sources."global-prefix-1.0.2" @@ -81255,7 +81304,7 @@ in sources."aproba-1.2.0" sources."are-we-there-yet-1.1.5" sources."base64-js-1.5.1" - (sources."bl-4.0.3" // { + (sources."bl-4.0.4" // { dependencies = [ sources."readable-stream-3.6.0" ]; @@ -81677,7 +81726,7 @@ in sources."is-wsl-2.2.0" sources."isexe-2.0.0" sources."jquery-3.5.1" - sources."jquery.terminal-2.20.2" + sources."jquery.terminal-2.21.0" sources."jsonfile-2.4.0" sources."keyboardevent-key-polyfill-1.1.0" sources."line-reader-0.4.0" @@ -81998,7 +82047,7 @@ in }) sources."wrappy-1.0.2" sources."write-file-atomic-3.0.3" - sources."ws-7.4.2" + sources."ws-7.4.3" sources."xregexp-2.0.0" sources."yallist-3.1.1" ]; @@ -82459,7 +82508,7 @@ in sources."balanced-match-1.0.0" sources."brace-expansion-1.1.11" sources."bufrw-1.3.0" - sources."chai-4.2.0" + sources."chai-4.3.0" sources."chai-as-promised-7.1.1" sources."chalk-2.4.2" sources."check-error-1.0.2" @@ -82591,7 +82640,7 @@ in sources."async-mutex-0.1.4" sources."asynckit-0.4.0" sources."atob-2.1.2" - (sources."aws-sdk-2.834.0" // { + (sources."aws-sdk-2.836.0" // { dependencies = [ sources."sax-1.2.1" sources."uuid-3.3.2" @@ -82607,7 +82656,7 @@ in sources."base64-stream-1.0.0" sources."bcrypt-pbkdf-1.0.2" sources."binary-extensions-2.2.0" - (sources."bl-4.0.3" // { + (sources."bl-4.0.4" // { dependencies = [ sources."buffer-5.7.1" sources."readable-stream-3.6.0" @@ -83172,7 +83221,7 @@ in sources."q-0.9.7" ]; }) - sources."terminal-kit-1.45.9" + sources."terminal-kit-1.47.0" (sources."terser-4.8.0" // { dependencies = [ sources."commander-2.20.3" @@ -83245,7 +83294,7 @@ in ]; }) sources."wrappy-1.0.2" - sources."ws-7.4.2" + sources."ws-7.4.3" sources."xml-name-validator-3.0.0" sources."xml2js-0.4.23" sources."xmlbuilder-11.0.1" @@ -83337,7 +83386,7 @@ in sha512 = "znR99e1BHeyEkSvgDDpX0sTiTu+8aQyDl9DawrkOGZTTW8hv0deIFXx87114zJ7gRaDZKVQD/4tr1ifmJp9xhQ=="; }; dependencies = [ - sources."@babel/parser-7.12.11" + sources."@babel/parser-7.12.14" sources."argparse-1.0.10" sources."bluebird-3.7.2" sources."catharsis-0.8.11" @@ -83794,16 +83843,16 @@ in karma = nodeEnv.buildNodePackage { name = "karma"; packageName = "karma"; - version = "6.0.4"; + version = "6.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/karma/-/karma-6.0.4.tgz"; - sha512 = "Yk451MSSV82wwThwissGvTpaHYhKDOzzzcguj+XYMmLF9ZN6QDnUmOexzYPeDcne6g0eWEkP1QttzX0N9lQybw=="; + url = "https://registry.npmjs.org/karma/-/karma-6.1.0.tgz"; + sha512 = "QmRZ6HdKe6mHd89Az6yb85URRyDbXmn2IBo3lic7cwkkLjDWpjrMJxPAKlwNa5dFM1iHdT+kjtNJM0J5YAH90A=="; }; dependencies = [ sources."@types/component-emitter-1.2.10" sources."@types/cookie-0.4.0" sources."@types/cors-2.8.9" - sources."@types/node-14.14.22" + sources."@types/node-14.14.25" sources."accepts-1.3.7" sources."ansi-regex-5.0.0" sources."ansi-styles-4.3.0" @@ -83903,7 +83952,7 @@ in sources."rimraf-3.0.2" sources."safer-buffer-2.1.2" sources."setprototypeof-1.1.1" - (sources."socket.io-3.1.0" // { + (sources."socket.io-3.1.1" // { dependencies = [ sources."debug-4.3.2" sources."ms-2.1.2" @@ -83939,7 +83988,7 @@ in sources."void-elements-2.0.1" sources."wrap-ansi-7.0.0" sources."wrappy-1.0.2" - sources."ws-7.4.2" + sources."ws-7.4.3" sources."y18n-5.0.5" sources."yargs-16.2.0" sources."yargs-parser-20.2.4" @@ -83983,7 +84032,7 @@ in sources."fs-mkdirp-stream-1.0.0" sources."fs.realpath-1.0.0" sources."function-bind-1.1.1" - sources."get-intrinsic-1.1.0" + sources."get-intrinsic-1.1.1" sources."glob-7.1.6" sources."glob-parent-3.1.0" sources."glob-stream-6.1.0" @@ -84317,9 +84366,9 @@ in sha512 = "vk1lfVRFm+UuEFA7wkLKeSF7Iz13W+N/vFd48aW2yuS7Kv0RbNm2/qcDPV863056LMfkRlsEe+QYOw3palj5Lg=="; }; dependencies = [ - sources."@babel/code-frame-7.12.11" + sources."@babel/code-frame-7.12.13" sources."@babel/helper-validator-identifier-7.12.11" - sources."@babel/highlight-7.10.4" + sources."@babel/highlight-7.12.13" (sources."@evocateur/libnpmaccess-3.1.2" // { dependencies = [ sources."aproba-2.0.0" @@ -84421,7 +84470,7 @@ in sources."universal-user-agent-6.0.0" ]; }) - sources."@octokit/openapi-types-3.4.1" + sources."@octokit/openapi-types-4.0.1" sources."@octokit/plugin-enterprise-rest-6.0.1" (sources."@octokit/plugin-paginate-rest-1.1.2" // { dependencies = [ @@ -84447,11 +84496,11 @@ in ]; }) sources."@octokit/rest-16.43.2" - sources."@octokit/types-6.7.1" + sources."@octokit/types-6.8.2" sources."@types/glob-7.1.3" sources."@types/minimatch-3.0.3" sources."@types/minimist-1.2.1" - sources."@types/node-14.14.22" + sources."@types/node-14.14.25" sources."@types/normalize-package-data-2.4.0" sources."@zkochan/cmd-shim-3.1.0" sources."JSONStream-1.3.5" @@ -84732,7 +84781,7 @@ in }) sources."genfun-5.0.0" sources."get-caller-file-2.0.5" - sources."get-intrinsic-1.1.0" + sources."get-intrinsic-1.1.1" (sources."get-pkg-repo-1.4.0" // { dependencies = [ sources."camelcase-2.1.1" @@ -86231,7 +86280,7 @@ in sources."uuid-3.4.0" sources."vary-1.1.2" sources."verror-1.10.0" - sources."ws-7.4.2" + sources."ws-7.4.3" sources."xmlhttprequest-ssl-1.5.5" sources."yeast-0.1.2" ]; @@ -86251,57 +86300,56 @@ in version = "1.10.1"; src = ../interpreters/clojurescript/lumo; dependencies = [ - sources."@babel/code-frame-7.12.11" - sources."@babel/compat-data-7.12.7" - sources."@babel/core-7.12.10" - sources."@babel/generator-7.12.11" - sources."@babel/helper-annotate-as-pure-7.12.10" - sources."@babel/helper-builder-binary-assignment-operator-visitor-7.10.4" - sources."@babel/helper-compilation-targets-7.12.5" - sources."@babel/helper-create-class-features-plugin-7.12.1" - sources."@babel/helper-create-regexp-features-plugin-7.12.7" - sources."@babel/helper-define-map-7.10.5" - sources."@babel/helper-explode-assignable-expression-7.12.1" - sources."@babel/helper-function-name-7.12.11" - sources."@babel/helper-get-function-arity-7.12.10" - sources."@babel/helper-hoist-variables-7.10.4" - sources."@babel/helper-member-expression-to-functions-7.12.7" - sources."@babel/helper-module-imports-7.12.5" - sources."@babel/helper-module-transforms-7.12.1" - sources."@babel/helper-optimise-call-expression-7.12.10" - sources."@babel/helper-plugin-utils-7.10.4" - sources."@babel/helper-remap-async-to-generator-7.12.1" - sources."@babel/helper-replace-supers-7.12.11" - sources."@babel/helper-simple-access-7.12.1" + sources."@babel/code-frame-7.12.13" + sources."@babel/compat-data-7.12.13" + sources."@babel/core-7.12.13" + sources."@babel/generator-7.12.13" + sources."@babel/helper-annotate-as-pure-7.12.13" + sources."@babel/helper-builder-binary-assignment-operator-visitor-7.12.13" + sources."@babel/helper-compilation-targets-7.12.13" + sources."@babel/helper-create-class-features-plugin-7.12.13" + sources."@babel/helper-create-regexp-features-plugin-7.12.13" + sources."@babel/helper-explode-assignable-expression-7.12.13" + sources."@babel/helper-function-name-7.12.13" + sources."@babel/helper-get-function-arity-7.12.13" + sources."@babel/helper-hoist-variables-7.12.13" + sources."@babel/helper-member-expression-to-functions-7.12.13" + sources."@babel/helper-module-imports-7.12.13" + sources."@babel/helper-module-transforms-7.12.13" + sources."@babel/helper-optimise-call-expression-7.12.13" + sources."@babel/helper-plugin-utils-7.12.13" + sources."@babel/helper-remap-async-to-generator-7.12.13" + sources."@babel/helper-replace-supers-7.12.13" + sources."@babel/helper-simple-access-7.12.13" sources."@babel/helper-skip-transparent-expression-wrappers-7.12.1" - sources."@babel/helper-split-export-declaration-7.12.11" + sources."@babel/helper-split-export-declaration-7.12.13" sources."@babel/helper-validator-identifier-7.12.11" sources."@babel/helper-validator-option-7.12.11" - sources."@babel/helper-wrap-function-7.12.3" - sources."@babel/helpers-7.12.5" - (sources."@babel/highlight-7.10.4" // { + sources."@babel/helper-wrap-function-7.12.13" + sources."@babel/helpers-7.12.13" + (sources."@babel/highlight-7.12.13" // { dependencies = [ sources."chalk-2.4.2" ]; }) - sources."@babel/parser-7.12.11" + sources."@babel/parser-7.12.14" sources."@babel/plugin-external-helpers-7.8.3" - sources."@babel/plugin-proposal-async-generator-functions-7.12.12" - sources."@babel/plugin-proposal-class-properties-7.12.1" + sources."@babel/plugin-proposal-async-generator-functions-7.12.13" + sources."@babel/plugin-proposal-class-properties-7.12.13" sources."@babel/plugin-proposal-dynamic-import-7.12.1" - sources."@babel/plugin-proposal-export-namespace-from-7.12.1" - sources."@babel/plugin-proposal-json-strings-7.12.1" - sources."@babel/plugin-proposal-logical-assignment-operators-7.12.1" - sources."@babel/plugin-proposal-nullish-coalescing-operator-7.12.1" - sources."@babel/plugin-proposal-numeric-separator-7.12.7" - sources."@babel/plugin-proposal-object-rest-spread-7.12.1" - sources."@babel/plugin-proposal-optional-catch-binding-7.12.1" - sources."@babel/plugin-proposal-optional-chaining-7.12.7" - sources."@babel/plugin-proposal-private-methods-7.12.1" - sources."@babel/plugin-proposal-unicode-property-regex-7.12.1" + sources."@babel/plugin-proposal-export-namespace-from-7.12.13" + sources."@babel/plugin-proposal-json-strings-7.12.13" + sources."@babel/plugin-proposal-logical-assignment-operators-7.12.13" + sources."@babel/plugin-proposal-nullish-coalescing-operator-7.12.13" + sources."@babel/plugin-proposal-numeric-separator-7.12.13" + sources."@babel/plugin-proposal-object-rest-spread-7.12.13" + sources."@babel/plugin-proposal-optional-catch-binding-7.12.13" + sources."@babel/plugin-proposal-optional-chaining-7.12.13" + sources."@babel/plugin-proposal-private-methods-7.12.13" + sources."@babel/plugin-proposal-unicode-property-regex-7.12.13" sources."@babel/plugin-syntax-async-generators-7.8.4" sources."@babel/plugin-syntax-bigint-7.8.3" - sources."@babel/plugin-syntax-class-properties-7.12.1" + sources."@babel/plugin-syntax-class-properties-7.12.13" sources."@babel/plugin-syntax-dynamic-import-7.8.3" sources."@babel/plugin-syntax-export-namespace-from-7.8.3" sources."@babel/plugin-syntax-import-meta-7.10.4" @@ -86312,47 +86360,47 @@ in sources."@babel/plugin-syntax-object-rest-spread-7.8.3" sources."@babel/plugin-syntax-optional-catch-binding-7.8.3" sources."@babel/plugin-syntax-optional-chaining-7.8.3" - sources."@babel/plugin-syntax-top-level-await-7.12.1" - sources."@babel/plugin-transform-arrow-functions-7.12.1" - sources."@babel/plugin-transform-async-to-generator-7.12.1" - sources."@babel/plugin-transform-block-scoped-functions-7.12.1" - sources."@babel/plugin-transform-block-scoping-7.12.12" - sources."@babel/plugin-transform-classes-7.12.1" - sources."@babel/plugin-transform-computed-properties-7.12.1" - sources."@babel/plugin-transform-destructuring-7.12.1" - sources."@babel/plugin-transform-dotall-regex-7.12.1" - sources."@babel/plugin-transform-duplicate-keys-7.12.1" - sources."@babel/plugin-transform-exponentiation-operator-7.12.1" - sources."@babel/plugin-transform-for-of-7.12.1" - sources."@babel/plugin-transform-function-name-7.12.1" - sources."@babel/plugin-transform-literals-7.12.1" - sources."@babel/plugin-transform-member-expression-literals-7.12.1" - sources."@babel/plugin-transform-modules-amd-7.12.1" - sources."@babel/plugin-transform-modules-commonjs-7.12.1" - sources."@babel/plugin-transform-modules-systemjs-7.12.1" - sources."@babel/plugin-transform-modules-umd-7.12.1" - sources."@babel/plugin-transform-named-capturing-groups-regex-7.12.1" - sources."@babel/plugin-transform-new-target-7.12.1" - sources."@babel/plugin-transform-object-super-7.12.1" - sources."@babel/plugin-transform-parameters-7.12.1" - sources."@babel/plugin-transform-property-literals-7.12.1" - sources."@babel/plugin-transform-regenerator-7.12.1" - sources."@babel/plugin-transform-reserved-words-7.12.1" - sources."@babel/plugin-transform-runtime-7.12.10" - sources."@babel/plugin-transform-shorthand-properties-7.12.1" - sources."@babel/plugin-transform-spread-7.12.1" - sources."@babel/plugin-transform-sticky-regex-7.12.7" - sources."@babel/plugin-transform-template-literals-7.12.1" - sources."@babel/plugin-transform-typeof-symbol-7.12.10" - sources."@babel/plugin-transform-unicode-escapes-7.12.1" - sources."@babel/plugin-transform-unicode-regex-7.12.1" - sources."@babel/preset-env-7.12.11" + sources."@babel/plugin-syntax-top-level-await-7.12.13" + sources."@babel/plugin-transform-arrow-functions-7.12.13" + sources."@babel/plugin-transform-async-to-generator-7.12.13" + sources."@babel/plugin-transform-block-scoped-functions-7.12.13" + sources."@babel/plugin-transform-block-scoping-7.12.13" + sources."@babel/plugin-transform-classes-7.12.13" + sources."@babel/plugin-transform-computed-properties-7.12.13" + sources."@babel/plugin-transform-destructuring-7.12.13" + sources."@babel/plugin-transform-dotall-regex-7.12.13" + sources."@babel/plugin-transform-duplicate-keys-7.12.13" + sources."@babel/plugin-transform-exponentiation-operator-7.12.13" + sources."@babel/plugin-transform-for-of-7.12.13" + sources."@babel/plugin-transform-function-name-7.12.13" + sources."@babel/plugin-transform-literals-7.12.13" + sources."@babel/plugin-transform-member-expression-literals-7.12.13" + sources."@babel/plugin-transform-modules-amd-7.12.13" + sources."@babel/plugin-transform-modules-commonjs-7.12.13" + sources."@babel/plugin-transform-modules-systemjs-7.12.13" + sources."@babel/plugin-transform-modules-umd-7.12.13" + sources."@babel/plugin-transform-named-capturing-groups-regex-7.12.13" + sources."@babel/plugin-transform-new-target-7.12.13" + sources."@babel/plugin-transform-object-super-7.12.13" + sources."@babel/plugin-transform-parameters-7.12.13" + sources."@babel/plugin-transform-property-literals-7.12.13" + sources."@babel/plugin-transform-regenerator-7.12.13" + sources."@babel/plugin-transform-reserved-words-7.12.13" + sources."@babel/plugin-transform-runtime-7.12.13" + sources."@babel/plugin-transform-shorthand-properties-7.12.13" + sources."@babel/plugin-transform-spread-7.12.13" + sources."@babel/plugin-transform-sticky-regex-7.12.13" + sources."@babel/plugin-transform-template-literals-7.12.13" + sources."@babel/plugin-transform-typeof-symbol-7.12.13" + sources."@babel/plugin-transform-unicode-escapes-7.12.13" + sources."@babel/plugin-transform-unicode-regex-7.12.13" + sources."@babel/preset-env-7.12.13" sources."@babel/preset-modules-0.1.4" sources."@babel/preset-stage-2-7.8.3" - sources."@babel/runtime-7.12.5" - sources."@babel/template-7.12.7" - sources."@babel/traverse-7.12.12" - sources."@babel/types-7.12.12" + sources."@babel/runtime-7.12.13" + sources."@babel/template-7.12.13" + sources."@babel/traverse-7.12.13" + sources."@babel/types-7.12.13" sources."@cnakazawa/watch-1.0.4" sources."@comandeer/babel-plugin-banner-5.0.0" sources."@istanbuljs/load-nyc-config-1.1.0" @@ -86373,7 +86421,7 @@ in sources."@types/istanbul-lib-report-3.0.0" sources."@types/istanbul-reports-1.1.2" sources."@types/json-schema-7.0.7" - sources."@types/node-14.14.22" + sources."@types/node-14.14.25" sources."@types/normalize-package-data-2.4.0" sources."@types/resolve-0.0.8" sources."@types/yargs-15.0.13" @@ -86494,7 +86542,7 @@ in sources."big.js-5.2.2" sources."binary-extensions-2.2.0" sources."bindings-1.5.0" - (sources."bl-4.0.3" // { + (sources."bl-4.0.4" // { dependencies = [ sources."buffer-5.7.1" sources."readable-stream-3.6.0" @@ -86666,8 +86714,8 @@ in sources."duplexer2-0.1.4" sources."duplexify-3.7.1" sources."ecc-jsbn-0.1.2" - sources."electron-to-chromium-1.3.650" - (sources."elliptic-6.5.3" // { + sources."electron-to-chromium-1.3.653" + (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.11.9" ]; @@ -86766,7 +86814,7 @@ in sources."gensync-1.0.0-beta.2" sources."get-assigned-identifiers-1.2.0" sources."get-caller-file-2.0.5" - sources."get-intrinsic-1.1.0" + sources."get-intrinsic-1.1.1" sources."get-package-type-0.1.0" sources."get-stream-4.1.0" sources."get-value-2.0.6" @@ -87473,7 +87521,7 @@ in sources."link-check-4.5.4" sources."lodash-4.17.20" sources."markdown-link-extractor-1.2.6" - sources."marked-1.2.8" + sources."marked-1.2.9" sources."mime-db-1.45.0" sources."mime-types-2.1.28" sources."ms-2.1.3" @@ -87865,13 +87913,13 @@ in }; dependencies = [ sources."@braintree/sanitize-url-3.1.0" - sources."@types/node-14.14.22" + sources."@types/node-14.14.25" sources."@types/yauzl-2.9.1" sources."agent-base-5.1.1" sources."ansi-styles-4.3.0" sources."balanced-match-1.0.0" sources."base64-js-1.5.1" - sources."bl-4.0.3" + sources."bl-4.0.4" sources."brace-expansion-1.1.11" sources."buffer-5.7.1" sources."buffer-crc32-0.2.13" @@ -87998,7 +88046,7 @@ in sources."upper-case-1.1.3" sources."util-deprecate-1.0.2" sources."wrappy-1.0.2" - sources."ws-7.4.2" + sources."ws-7.4.3" sources."yauzl-2.10.0" ]; buildInputs = globalBuildInputs; @@ -88023,7 +88071,7 @@ in sources."@fluentui/date-time-utilities-7.9.0" sources."@fluentui/dom-utilities-1.1.1" sources."@fluentui/keyboard-key-0.2.13" - sources."@fluentui/react-7.158.0" + sources."@fluentui/react-7.158.1" sources."@fluentui/react-focus-7.17.1" sources."@fluentui/react-window-provider-1.0.1" sources."@fluentui/theme-1.7.1" @@ -88163,7 +88211,7 @@ in sources."node-fetch-1.6.3" sources."normalize-url-4.5.0" sources."object-assign-4.1.1" - sources."office-ui-fabric-react-7.158.0" + sources."office-ui-fabric-react-7.158.1" sources."on-finished-2.3.0" sources."on-headers-1.0.2" sources."once-1.4.0" @@ -88545,65 +88593,64 @@ in netlify-cli = nodeEnv.buildNodePackage { name = "netlify-cli"; packageName = "netlify-cli"; - version = "3.4.6"; + version = "3.4.7"; src = fetchurl { - url = "https://registry.npmjs.org/netlify-cli/-/netlify-cli-3.4.6.tgz"; - sha512 = "ZrD6so7tmmatQTWh4U7gApxKmBj1P27Fzo2cdDqhkPUenJY5Iw3AuUY1AvQUCPyxC5Cbco2d3SQdldKQYoL9Qw=="; + url = "https://registry.npmjs.org/netlify-cli/-/netlify-cli-3.4.7.tgz"; + sha512 = "hPfrUlBIA21FgEc/8gXehR5hQ5N5NvFNE9vXojJ+ou93gkeddh6AfKxx29XsOoH+ht7XqAJMf+vbdSZULo+8XQ=="; }; dependencies = [ - sources."@babel/code-frame-7.12.11" - sources."@babel/compat-data-7.12.7" - (sources."@babel/core-7.12.10" // { + sources."@babel/code-frame-7.12.13" + sources."@babel/compat-data-7.12.13" + (sources."@babel/core-7.12.13" // { dependencies = [ sources."semver-5.7.1" ]; }) - sources."@babel/generator-7.12.11" - sources."@babel/helper-annotate-as-pure-7.12.10" - sources."@babel/helper-builder-binary-assignment-operator-visitor-7.10.4" - (sources."@babel/helper-compilation-targets-7.12.5" // { + sources."@babel/generator-7.12.13" + sources."@babel/helper-annotate-as-pure-7.12.13" + sources."@babel/helper-builder-binary-assignment-operator-visitor-7.12.13" + (sources."@babel/helper-compilation-targets-7.12.13" // { dependencies = [ sources."semver-5.7.1" ]; }) - sources."@babel/helper-create-class-features-plugin-7.12.1" - sources."@babel/helper-create-regexp-features-plugin-7.12.7" - sources."@babel/helper-define-map-7.10.5" - sources."@babel/helper-explode-assignable-expression-7.12.1" - sources."@babel/helper-function-name-7.12.11" - sources."@babel/helper-get-function-arity-7.12.10" - sources."@babel/helper-hoist-variables-7.10.4" - sources."@babel/helper-member-expression-to-functions-7.12.7" - sources."@babel/helper-module-imports-7.12.5" - sources."@babel/helper-module-transforms-7.12.1" - sources."@babel/helper-optimise-call-expression-7.12.10" - sources."@babel/helper-plugin-utils-7.10.4" - sources."@babel/helper-remap-async-to-generator-7.12.1" - sources."@babel/helper-replace-supers-7.12.11" - sources."@babel/helper-simple-access-7.12.1" + sources."@babel/helper-create-class-features-plugin-7.12.13" + sources."@babel/helper-create-regexp-features-plugin-7.12.13" + sources."@babel/helper-explode-assignable-expression-7.12.13" + sources."@babel/helper-function-name-7.12.13" + sources."@babel/helper-get-function-arity-7.12.13" + sources."@babel/helper-hoist-variables-7.12.13" + sources."@babel/helper-member-expression-to-functions-7.12.13" + sources."@babel/helper-module-imports-7.12.13" + sources."@babel/helper-module-transforms-7.12.13" + sources."@babel/helper-optimise-call-expression-7.12.13" + sources."@babel/helper-plugin-utils-7.12.13" + sources."@babel/helper-remap-async-to-generator-7.12.13" + sources."@babel/helper-replace-supers-7.12.13" + sources."@babel/helper-simple-access-7.12.13" sources."@babel/helper-skip-transparent-expression-wrappers-7.12.1" - sources."@babel/helper-split-export-declaration-7.12.11" + sources."@babel/helper-split-export-declaration-7.12.13" sources."@babel/helper-validator-identifier-7.12.11" sources."@babel/helper-validator-option-7.12.11" - sources."@babel/helper-wrap-function-7.12.3" - sources."@babel/helpers-7.12.5" - sources."@babel/highlight-7.10.4" - sources."@babel/parser-7.12.11" - sources."@babel/plugin-proposal-async-generator-functions-7.12.12" - sources."@babel/plugin-proposal-class-properties-7.12.1" + sources."@babel/helper-wrap-function-7.12.13" + sources."@babel/helpers-7.12.13" + sources."@babel/highlight-7.12.13" + sources."@babel/parser-7.12.14" + sources."@babel/plugin-proposal-async-generator-functions-7.12.13" + sources."@babel/plugin-proposal-class-properties-7.12.13" sources."@babel/plugin-proposal-dynamic-import-7.12.1" - sources."@babel/plugin-proposal-export-namespace-from-7.12.1" - sources."@babel/plugin-proposal-json-strings-7.12.1" - sources."@babel/plugin-proposal-logical-assignment-operators-7.12.1" - sources."@babel/plugin-proposal-nullish-coalescing-operator-7.12.1" - sources."@babel/plugin-proposal-numeric-separator-7.12.7" - sources."@babel/plugin-proposal-object-rest-spread-7.12.1" - sources."@babel/plugin-proposal-optional-catch-binding-7.12.1" - sources."@babel/plugin-proposal-optional-chaining-7.12.7" - sources."@babel/plugin-proposal-private-methods-7.12.1" - sources."@babel/plugin-proposal-unicode-property-regex-7.12.1" + sources."@babel/plugin-proposal-export-namespace-from-7.12.13" + sources."@babel/plugin-proposal-json-strings-7.12.13" + sources."@babel/plugin-proposal-logical-assignment-operators-7.12.13" + sources."@babel/plugin-proposal-nullish-coalescing-operator-7.12.13" + sources."@babel/plugin-proposal-numeric-separator-7.12.13" + sources."@babel/plugin-proposal-object-rest-spread-7.12.13" + sources."@babel/plugin-proposal-optional-catch-binding-7.12.13" + sources."@babel/plugin-proposal-optional-chaining-7.12.13" + sources."@babel/plugin-proposal-private-methods-7.12.13" + sources."@babel/plugin-proposal-unicode-property-regex-7.12.13" sources."@babel/plugin-syntax-async-generators-7.8.4" - sources."@babel/plugin-syntax-class-properties-7.12.1" + sources."@babel/plugin-syntax-class-properties-7.12.13" sources."@babel/plugin-syntax-dynamic-import-7.8.3" sources."@babel/plugin-syntax-export-namespace-from-7.8.3" sources."@babel/plugin-syntax-json-strings-7.8.3" @@ -88613,49 +88660,49 @@ in sources."@babel/plugin-syntax-object-rest-spread-7.8.3" sources."@babel/plugin-syntax-optional-catch-binding-7.8.3" sources."@babel/plugin-syntax-optional-chaining-7.8.3" - sources."@babel/plugin-syntax-top-level-await-7.12.1" - sources."@babel/plugin-transform-arrow-functions-7.12.1" - sources."@babel/plugin-transform-async-to-generator-7.12.1" - sources."@babel/plugin-transform-block-scoped-functions-7.12.1" - sources."@babel/plugin-transform-block-scoping-7.12.12" - sources."@babel/plugin-transform-classes-7.12.1" - sources."@babel/plugin-transform-computed-properties-7.12.1" - sources."@babel/plugin-transform-destructuring-7.12.1" - sources."@babel/plugin-transform-dotall-regex-7.12.1" - sources."@babel/plugin-transform-duplicate-keys-7.12.1" - sources."@babel/plugin-transform-exponentiation-operator-7.12.1" - sources."@babel/plugin-transform-for-of-7.12.1" - sources."@babel/plugin-transform-function-name-7.12.1" - sources."@babel/plugin-transform-literals-7.12.1" - sources."@babel/plugin-transform-member-expression-literals-7.12.1" - sources."@babel/plugin-transform-modules-amd-7.12.1" - sources."@babel/plugin-transform-modules-commonjs-7.12.1" - sources."@babel/plugin-transform-modules-systemjs-7.12.1" - sources."@babel/plugin-transform-modules-umd-7.12.1" - sources."@babel/plugin-transform-named-capturing-groups-regex-7.12.1" - sources."@babel/plugin-transform-new-target-7.12.1" - sources."@babel/plugin-transform-object-super-7.12.1" - sources."@babel/plugin-transform-parameters-7.12.1" - sources."@babel/plugin-transform-property-literals-7.12.1" - sources."@babel/plugin-transform-regenerator-7.12.1" - sources."@babel/plugin-transform-reserved-words-7.12.1" - sources."@babel/plugin-transform-shorthand-properties-7.12.1" - sources."@babel/plugin-transform-spread-7.12.1" - sources."@babel/plugin-transform-sticky-regex-7.12.7" - sources."@babel/plugin-transform-template-literals-7.12.1" - sources."@babel/plugin-transform-typeof-symbol-7.12.10" - sources."@babel/plugin-transform-unicode-escapes-7.12.1" - sources."@babel/plugin-transform-unicode-regex-7.12.1" - (sources."@babel/preset-env-7.12.11" // { + sources."@babel/plugin-syntax-top-level-await-7.12.13" + sources."@babel/plugin-transform-arrow-functions-7.12.13" + sources."@babel/plugin-transform-async-to-generator-7.12.13" + sources."@babel/plugin-transform-block-scoped-functions-7.12.13" + sources."@babel/plugin-transform-block-scoping-7.12.13" + sources."@babel/plugin-transform-classes-7.12.13" + sources."@babel/plugin-transform-computed-properties-7.12.13" + sources."@babel/plugin-transform-destructuring-7.12.13" + sources."@babel/plugin-transform-dotall-regex-7.12.13" + sources."@babel/plugin-transform-duplicate-keys-7.12.13" + sources."@babel/plugin-transform-exponentiation-operator-7.12.13" + sources."@babel/plugin-transform-for-of-7.12.13" + sources."@babel/plugin-transform-function-name-7.12.13" + sources."@babel/plugin-transform-literals-7.12.13" + sources."@babel/plugin-transform-member-expression-literals-7.12.13" + sources."@babel/plugin-transform-modules-amd-7.12.13" + sources."@babel/plugin-transform-modules-commonjs-7.12.13" + sources."@babel/plugin-transform-modules-systemjs-7.12.13" + sources."@babel/plugin-transform-modules-umd-7.12.13" + sources."@babel/plugin-transform-named-capturing-groups-regex-7.12.13" + sources."@babel/plugin-transform-new-target-7.12.13" + sources."@babel/plugin-transform-object-super-7.12.13" + sources."@babel/plugin-transform-parameters-7.12.13" + sources."@babel/plugin-transform-property-literals-7.12.13" + sources."@babel/plugin-transform-regenerator-7.12.13" + sources."@babel/plugin-transform-reserved-words-7.12.13" + sources."@babel/plugin-transform-shorthand-properties-7.12.13" + sources."@babel/plugin-transform-spread-7.12.13" + sources."@babel/plugin-transform-sticky-regex-7.12.13" + sources."@babel/plugin-transform-template-literals-7.12.13" + sources."@babel/plugin-transform-typeof-symbol-7.12.13" + sources."@babel/plugin-transform-unicode-escapes-7.12.13" + sources."@babel/plugin-transform-unicode-regex-7.12.13" + (sources."@babel/preset-env-7.12.13" // { dependencies = [ sources."semver-5.7.1" ]; }) sources."@babel/preset-modules-0.1.4" - sources."@babel/runtime-7.12.5" - sources."@babel/template-7.12.7" - sources."@babel/traverse-7.12.12" - sources."@babel/types-7.12.12" + sources."@babel/runtime-7.12.13" + sources."@babel/template-7.12.13" + sources."@babel/traverse-7.12.13" + sources."@babel/types-7.12.13" sources."@bugsnag/browser-7.6.0" sources."@bugsnag/core-7.6.0" sources."@bugsnag/cuid-3.0.0" @@ -88665,7 +88712,7 @@ in sources."@dabh/diagnostics-2.0.2" sources."@jest/types-24.9.0" sources."@mrmlnc/readdir-enhanced-2.2.1" - (sources."@netlify/build-8.3.4" // { + (sources."@netlify/build-8.4.0" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-3.0.0" @@ -88679,7 +88726,7 @@ in sources."locate-path-5.0.0" ]; }) - (sources."@netlify/config-3.1.1" // { + (sources."@netlify/config-3.1.2" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-3.0.0" @@ -88691,7 +88738,7 @@ in sources."locate-path-5.0.0" ]; }) - sources."@netlify/functions-utils-1.3.9" + sources."@netlify/functions-utils-1.3.10" (sources."@netlify/git-utils-1.0.7" // { dependencies = [ sources."braces-3.0.2" @@ -88765,15 +88812,20 @@ in }) (sources."@oclif/command-1.8.0" // { dependencies = [ - sources."@oclif/plugin-help-3.2.1" + sources."@oclif/plugin-help-3.2.2" sources."ansi-regex-3.0.0" - sources."ansi-styles-3.2.1" + sources."ansi-styles-4.3.0" + sources."chalk-4.1.0" sources."color-convert-1.9.3" sources."color-name-1.1.3" sources."is-fullwidth-code-point-2.0.0" sources."string-width-2.1.1" sources."strip-ansi-4.0.0" - sources."wrap-ansi-4.0.0" + (sources."wrap-ansi-4.0.0" // { + dependencies = [ + sources."ansi-styles-3.2.1" + ]; + }) ]; }) (sources."@oclif/config-1.17.0" // { @@ -88861,7 +88913,7 @@ in sources."universal-user-agent-6.0.0" ]; }) - sources."@octokit/openapi-types-3.4.1" + sources."@octokit/openapi-types-4.0.1" (sources."@octokit/plugin-paginate-rest-1.1.2" // { dependencies = [ sources."@octokit/types-2.16.2" @@ -88886,7 +88938,7 @@ in ]; }) sources."@octokit/rest-16.43.2" - sources."@octokit/types-6.7.1" + sources."@octokit/types-6.8.2" sources."@rollup/plugin-babel-5.2.3" (sources."@rollup/plugin-commonjs-17.1.0" // { dependencies = [ @@ -88921,7 +88973,7 @@ in sources."@types/istanbul-reports-1.1.2" sources."@types/minimatch-3.0.3" sources."@types/mkdirp-0.5.2" - sources."@types/node-14.14.22" + sources."@types/node-14.14.25" sources."@types/node-fetch-2.5.8" sources."@types/normalize-package-data-2.4.0" sources."@types/parse5-5.0.3" @@ -88979,7 +89031,7 @@ in sources."at-least-node-1.0.0" sources."atob-2.1.2" sources."atob-lite-2.0.0" - (sources."aws-sdk-2.834.0" // { + (sources."aws-sdk-2.836.0" // { dependencies = [ sources."buffer-4.9.2" sources."ieee754-1.1.13" @@ -88998,7 +89050,7 @@ in sources."base64-js-1.5.1" sources."before-after-hook-2.1.1" sources."binary-extensions-2.2.0" - sources."bl-4.0.3" + sources."bl-4.0.4" (sources."body-parser-1.19.0" // { dependencies = [ sources."debug-2.6.9" @@ -89283,7 +89335,7 @@ in }) sources."duplexer3-0.1.4" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.3.650" + sources."electron-to-chromium-1.3.653" sources."elf-cam-0.1.1" sources."emoji-regex-8.0.0" sources."enabled-2.0.0" @@ -89420,7 +89472,7 @@ in sources."gensync-1.0.0-beta.2" sources."get-amd-module-type-3.0.0" sources."get-caller-file-2.0.5" - sources."get-intrinsic-1.1.0" + sources."get-intrinsic-1.1.1" sources."get-port-5.1.1" sources."get-proxy-2.1.0" sources."get-stream-5.2.0" @@ -90879,16 +90931,16 @@ in node-red = nodeEnv.buildNodePackage { name = "node-red"; packageName = "node-red"; - version = "1.2.8"; + version = "1.2.9"; src = fetchurl { - url = "https://registry.npmjs.org/node-red/-/node-red-1.2.8.tgz"; - sha512 = "OBxxDA/Qn4W0H4J9oKGV64bT2F42eziZoR+lUZuZH0QfQqTl7ExWj2anu4CMuBtDcBhQN856idriwnhBxHqdDA=="; + url = "https://registry.npmjs.org/node-red/-/node-red-1.2.9.tgz"; + sha512 = "1BXFaT7oDd5VM80O+1Lf72P9wCkYjg3CODROPRIPvcSEke6ubMo1M5GFsgh5EwGPLlTTlkuSgI+a4T3UhjAzbQ=="; }; dependencies = [ - sources."@babel/runtime-7.12.5" - sources."@node-red/editor-api-1.2.8" - sources."@node-red/editor-client-1.2.8" - (sources."@node-red/nodes-1.2.8" // { + sources."@babel/runtime-7.12.13" + sources."@node-red/editor-api-1.2.9" + sources."@node-red/editor-client-1.2.9" + (sources."@node-red/nodes-1.2.9" // { dependencies = [ sources."cookie-0.4.1" sources."http-errors-1.7.3" @@ -90902,9 +90954,9 @@ in }) ]; }) - sources."@node-red/registry-1.2.8" - sources."@node-red/runtime-1.2.8" - sources."@node-red/util-1.2.8" + sources."@node-red/registry-1.2.9" + sources."@node-red/runtime-1.2.9" + sources."@node-red/util-1.2.9" sources."abbrev-1.1.1" sources."accepts-1.3.7" (sources."agent-base-6.0.2" // { @@ -90960,7 +91012,7 @@ in }) sources."bcrypt-pbkdf-1.0.2" sources."bcryptjs-2.4.3" - (sources."bl-4.0.3" // { + (sources."bl-4.0.4" // { dependencies = [ sources."inherits-2.0.4" sources."readable-stream-3.6.0" @@ -91184,7 +91236,7 @@ in sources."ms-2.1.2" sources."readable-stream-3.6.0" sources."string_decoder-1.3.0" - sources."ws-7.4.2" + sources."ws-7.4.3" ]; }) (sources."mqtt-packet-6.7.0" // { @@ -91749,9 +91801,9 @@ in sha512 = "jfMFJXAJlGkCowMPGzA8Ywbmywk7I9hT96DsOcWjDsjq/zP5h6m3VZDcZ1AWYoCBPg4E/lFrJxROmiQH3OWnzA=="; }; dependencies = [ - sources."@babel/code-frame-7.12.11" + sources."@babel/code-frame-7.12.13" sources."@babel/helper-validator-identifier-7.12.11" - (sources."@babel/highlight-7.10.4" // { + (sources."@babel/highlight-7.12.13" // { dependencies = [ sources."ansi-styles-3.2.1" sources."chalk-2.4.2" @@ -91776,7 +91828,7 @@ in sources."@types/http-cache-semantics-4.0.0" sources."@types/keyv-3.1.1" sources."@types/minimist-1.2.1" - sources."@types/node-14.14.22" + sources."@types/node-14.14.25" sources."@types/normalize-package-data-2.4.0" sources."@types/parse-json-4.0.0" sources."@types/responselike-1.0.0" @@ -92273,10 +92325,10 @@ in npm = nodeEnv.buildNodePackage { name = "npm"; packageName = "npm"; - version = "6.14.11"; + version = "7.5.2"; src = fetchurl { - url = "https://registry.npmjs.org/npm/-/npm-6.14.11.tgz"; - sha512 = "1Zh7LjuIoEhIyjkBflSSGzfjuPQwDlghNloppjruOH5bmj9midT9qcNT0tRUZRR04shU9ekrxNy9+UTBrqeBpQ=="; + url = "https://registry.npmjs.org/npm/-/npm-7.5.2.tgz"; + sha512 = "ViuWTzFbHvjvdGDAa5HGsB3kIg3W1FfOxSuKPnjWzewZ0txVhDL/FzxA9bUVnvX8kXvL89Ps0vRhdaiWfDA8NQ=="; }; buildInputs = globalBuildInputs; meta = { @@ -92879,112 +92931,111 @@ in sha512 = "G+iZGGiPEXcRzw0fiRxWYCKxdt/F7l9a0xkiU4XbcVRJCSlBnioWEwJMutOCCpoQmaQtjB4RBHDGIHN85AIhLQ=="; }; dependencies = [ - sources."@babel/code-frame-7.12.11" - sources."@babel/compat-data-7.12.7" - (sources."@babel/core-7.12.10" // { + sources."@babel/code-frame-7.12.13" + sources."@babel/compat-data-7.12.13" + (sources."@babel/core-7.12.13" // { dependencies = [ sources."json5-2.2.0" sources."source-map-0.5.7" ]; }) - (sources."@babel/generator-7.12.11" // { + (sources."@babel/generator-7.12.13" // { dependencies = [ sources."source-map-0.5.7" ]; }) - sources."@babel/helper-annotate-as-pure-7.12.10" - sources."@babel/helper-builder-binary-assignment-operator-visitor-7.10.4" - sources."@babel/helper-compilation-targets-7.12.5" - sources."@babel/helper-create-class-features-plugin-7.12.1" - sources."@babel/helper-create-regexp-features-plugin-7.12.7" - sources."@babel/helper-define-map-7.10.5" - sources."@babel/helper-explode-assignable-expression-7.12.1" - sources."@babel/helper-function-name-7.12.11" - sources."@babel/helper-get-function-arity-7.12.10" - sources."@babel/helper-hoist-variables-7.10.4" - sources."@babel/helper-member-expression-to-functions-7.12.7" - sources."@babel/helper-module-imports-7.12.5" - sources."@babel/helper-module-transforms-7.12.1" - sources."@babel/helper-optimise-call-expression-7.12.10" - sources."@babel/helper-plugin-utils-7.10.4" - sources."@babel/helper-remap-async-to-generator-7.12.1" - sources."@babel/helper-replace-supers-7.12.11" - sources."@babel/helper-simple-access-7.12.1" + sources."@babel/helper-annotate-as-pure-7.12.13" + sources."@babel/helper-builder-binary-assignment-operator-visitor-7.12.13" + sources."@babel/helper-compilation-targets-7.12.13" + sources."@babel/helper-create-class-features-plugin-7.12.13" + sources."@babel/helper-create-regexp-features-plugin-7.12.13" + sources."@babel/helper-explode-assignable-expression-7.12.13" + sources."@babel/helper-function-name-7.12.13" + sources."@babel/helper-get-function-arity-7.12.13" + sources."@babel/helper-hoist-variables-7.12.13" + sources."@babel/helper-member-expression-to-functions-7.12.13" + sources."@babel/helper-module-imports-7.12.13" + sources."@babel/helper-module-transforms-7.12.13" + sources."@babel/helper-optimise-call-expression-7.12.13" + sources."@babel/helper-plugin-utils-7.12.13" + sources."@babel/helper-remap-async-to-generator-7.12.13" + sources."@babel/helper-replace-supers-7.12.13" + sources."@babel/helper-simple-access-7.12.13" sources."@babel/helper-skip-transparent-expression-wrappers-7.12.1" - sources."@babel/helper-split-export-declaration-7.12.11" + sources."@babel/helper-split-export-declaration-7.12.13" sources."@babel/helper-validator-identifier-7.12.11" sources."@babel/helper-validator-option-7.12.11" - sources."@babel/helper-wrap-function-7.12.3" - sources."@babel/helpers-7.12.5" - sources."@babel/highlight-7.10.4" - sources."@babel/parser-7.12.11" - sources."@babel/plugin-proposal-async-generator-functions-7.12.12" - sources."@babel/plugin-proposal-class-properties-7.12.1" + sources."@babel/helper-wrap-function-7.12.13" + sources."@babel/helpers-7.12.13" + sources."@babel/highlight-7.12.13" + sources."@babel/parser-7.12.14" + sources."@babel/plugin-proposal-async-generator-functions-7.12.13" + sources."@babel/plugin-proposal-class-properties-7.12.13" sources."@babel/plugin-proposal-dynamic-import-7.12.1" - sources."@babel/plugin-proposal-export-namespace-from-7.12.1" - sources."@babel/plugin-proposal-json-strings-7.12.1" - sources."@babel/plugin-proposal-logical-assignment-operators-7.12.1" - sources."@babel/plugin-proposal-nullish-coalescing-operator-7.12.1" - sources."@babel/plugin-proposal-numeric-separator-7.12.7" - sources."@babel/plugin-proposal-object-rest-spread-7.12.1" - sources."@babel/plugin-proposal-optional-catch-binding-7.12.1" - sources."@babel/plugin-proposal-optional-chaining-7.12.7" - sources."@babel/plugin-proposal-private-methods-7.12.1" - sources."@babel/plugin-proposal-unicode-property-regex-7.12.1" + sources."@babel/plugin-proposal-export-namespace-from-7.12.13" + sources."@babel/plugin-proposal-json-strings-7.12.13" + sources."@babel/plugin-proposal-logical-assignment-operators-7.12.13" + sources."@babel/plugin-proposal-nullish-coalescing-operator-7.12.13" + sources."@babel/plugin-proposal-numeric-separator-7.12.13" + sources."@babel/plugin-proposal-object-rest-spread-7.12.13" + sources."@babel/plugin-proposal-optional-catch-binding-7.12.13" + sources."@babel/plugin-proposal-optional-chaining-7.12.13" + sources."@babel/plugin-proposal-private-methods-7.12.13" + sources."@babel/plugin-proposal-unicode-property-regex-7.12.13" sources."@babel/plugin-syntax-async-generators-7.8.4" - sources."@babel/plugin-syntax-class-properties-7.12.1" + sources."@babel/plugin-syntax-class-properties-7.12.13" sources."@babel/plugin-syntax-dynamic-import-7.8.3" sources."@babel/plugin-syntax-export-namespace-from-7.8.3" - sources."@babel/plugin-syntax-flow-7.12.1" + sources."@babel/plugin-syntax-flow-7.12.13" sources."@babel/plugin-syntax-json-strings-7.8.3" - sources."@babel/plugin-syntax-jsx-7.12.1" + sources."@babel/plugin-syntax-jsx-7.12.13" sources."@babel/plugin-syntax-logical-assignment-operators-7.10.4" sources."@babel/plugin-syntax-nullish-coalescing-operator-7.8.3" sources."@babel/plugin-syntax-numeric-separator-7.10.4" sources."@babel/plugin-syntax-object-rest-spread-7.8.3" sources."@babel/plugin-syntax-optional-catch-binding-7.8.3" sources."@babel/plugin-syntax-optional-chaining-7.8.3" - sources."@babel/plugin-syntax-top-level-await-7.12.1" - sources."@babel/plugin-transform-arrow-functions-7.12.1" - sources."@babel/plugin-transform-async-to-generator-7.12.1" - sources."@babel/plugin-transform-block-scoped-functions-7.12.1" - sources."@babel/plugin-transform-block-scoping-7.12.12" - sources."@babel/plugin-transform-classes-7.12.1" - sources."@babel/plugin-transform-computed-properties-7.12.1" - sources."@babel/plugin-transform-destructuring-7.12.1" - sources."@babel/plugin-transform-dotall-regex-7.12.1" - sources."@babel/plugin-transform-duplicate-keys-7.12.1" - sources."@babel/plugin-transform-exponentiation-operator-7.12.1" - sources."@babel/plugin-transform-flow-strip-types-7.12.10" - sources."@babel/plugin-transform-for-of-7.12.1" - sources."@babel/plugin-transform-function-name-7.12.1" - sources."@babel/plugin-transform-literals-7.12.1" - sources."@babel/plugin-transform-member-expression-literals-7.12.1" - sources."@babel/plugin-transform-modules-amd-7.12.1" - sources."@babel/plugin-transform-modules-commonjs-7.12.1" - sources."@babel/plugin-transform-modules-systemjs-7.12.1" - sources."@babel/plugin-transform-modules-umd-7.12.1" - sources."@babel/plugin-transform-named-capturing-groups-regex-7.12.1" - sources."@babel/plugin-transform-new-target-7.12.1" - sources."@babel/plugin-transform-object-super-7.12.1" - sources."@babel/plugin-transform-parameters-7.12.1" - sources."@babel/plugin-transform-property-literals-7.12.1" - sources."@babel/plugin-transform-react-jsx-7.12.12" - sources."@babel/plugin-transform-regenerator-7.12.1" - sources."@babel/plugin-transform-reserved-words-7.12.1" - sources."@babel/plugin-transform-shorthand-properties-7.12.1" - sources."@babel/plugin-transform-spread-7.12.1" - sources."@babel/plugin-transform-sticky-regex-7.12.7" - sources."@babel/plugin-transform-template-literals-7.12.1" - sources."@babel/plugin-transform-typeof-symbol-7.12.10" - sources."@babel/plugin-transform-unicode-escapes-7.12.1" - sources."@babel/plugin-transform-unicode-regex-7.12.1" - sources."@babel/preset-env-7.12.11" + sources."@babel/plugin-syntax-top-level-await-7.12.13" + sources."@babel/plugin-transform-arrow-functions-7.12.13" + sources."@babel/plugin-transform-async-to-generator-7.12.13" + sources."@babel/plugin-transform-block-scoped-functions-7.12.13" + sources."@babel/plugin-transform-block-scoping-7.12.13" + sources."@babel/plugin-transform-classes-7.12.13" + sources."@babel/plugin-transform-computed-properties-7.12.13" + sources."@babel/plugin-transform-destructuring-7.12.13" + sources."@babel/plugin-transform-dotall-regex-7.12.13" + sources."@babel/plugin-transform-duplicate-keys-7.12.13" + sources."@babel/plugin-transform-exponentiation-operator-7.12.13" + sources."@babel/plugin-transform-flow-strip-types-7.12.13" + sources."@babel/plugin-transform-for-of-7.12.13" + sources."@babel/plugin-transform-function-name-7.12.13" + sources."@babel/plugin-transform-literals-7.12.13" + sources."@babel/plugin-transform-member-expression-literals-7.12.13" + sources."@babel/plugin-transform-modules-amd-7.12.13" + sources."@babel/plugin-transform-modules-commonjs-7.12.13" + sources."@babel/plugin-transform-modules-systemjs-7.12.13" + sources."@babel/plugin-transform-modules-umd-7.12.13" + sources."@babel/plugin-transform-named-capturing-groups-regex-7.12.13" + sources."@babel/plugin-transform-new-target-7.12.13" + sources."@babel/plugin-transform-object-super-7.12.13" + sources."@babel/plugin-transform-parameters-7.12.13" + sources."@babel/plugin-transform-property-literals-7.12.13" + sources."@babel/plugin-transform-react-jsx-7.12.13" + sources."@babel/plugin-transform-regenerator-7.12.13" + sources."@babel/plugin-transform-reserved-words-7.12.13" + sources."@babel/plugin-transform-shorthand-properties-7.12.13" + sources."@babel/plugin-transform-spread-7.12.13" + sources."@babel/plugin-transform-sticky-regex-7.12.13" + sources."@babel/plugin-transform-template-literals-7.12.13" + sources."@babel/plugin-transform-typeof-symbol-7.12.13" + sources."@babel/plugin-transform-unicode-escapes-7.12.13" + sources."@babel/plugin-transform-unicode-regex-7.12.13" + sources."@babel/preset-env-7.12.13" sources."@babel/preset-modules-0.1.4" - sources."@babel/runtime-7.12.5" - sources."@babel/template-7.12.7" - sources."@babel/traverse-7.12.12" - sources."@babel/types-7.12.12" + sources."@babel/runtime-7.12.13" + sources."@babel/template-7.12.13" + sources."@babel/traverse-7.12.13" + sources."@babel/types-7.12.13" sources."@iarna/toml-2.2.5" sources."@mrmlnc/readdir-enhanced-2.2.1" sources."@nodelib/fs.stat-1.1.3" @@ -93234,8 +93285,8 @@ in sources."duplexer2-0.1.4" sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.3.650" - (sources."elliptic-6.5.3" // { + sources."electron-to-chromium-1.3.653" + (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.11.9" ]; @@ -93293,7 +93344,7 @@ in sources."fsevents-1.2.13" sources."function-bind-1.1.1" sources."gensync-1.0.0-beta.2" - sources."get-intrinsic-1.1.0" + sources."get-intrinsic-1.1.1" sources."get-port-3.2.0" sources."get-value-2.0.6" sources."getpass-0.1.7" @@ -93951,7 +94002,7 @@ in sources."gelf-stream-1.1.1" sources."gelfling-0.3.1" sources."get-caller-file-2.0.5" - sources."get-intrinsic-1.1.0" + sources."get-intrinsic-1.1.1" sources."getpass-0.1.7" sources."glob-7.1.6" sources."graceful-fs-4.2.4" @@ -94497,7 +94548,7 @@ in sources."fs.realpath-1.0.0" sources."function-bind-1.1.1" sources."get-browser-rtc-1.1.0" - sources."get-intrinsic-1.1.0" + sources."get-intrinsic-1.1.1" sources."get-stdin-4.0.1" sources."glob-7.1.6" sources."graceful-fs-4.2.4" @@ -94758,7 +94809,7 @@ in sources."ws-1.1.5" ]; }) - sources."bl-4.0.3" + sources."bl-4.0.4" sources."blob-0.0.5" sources."bn.js-4.11.9" sources."bncode-0.5.3" @@ -95062,7 +95113,7 @@ in sources."verror-1.10.0" sources."which-1.3.1" sources."wrappy-1.0.2" - sources."ws-7.4.2" + sources."ws-7.4.3" sources."xmlhttprequest-ssl-1.5.5" sources."xtend-4.0.2" sources."yeast-0.1.2" @@ -95427,9 +95478,9 @@ in sha512 = "leHXsQRq89S3JC9zw/tKyiVV2jAhnfQe0J8VI4eQQbUjwIe0XxVqLrR+7UsahF1s9wi4GlqP6SJ8ydf44cgF2Q=="; }; dependencies = [ - sources."@babel/code-frame-7.12.11" + sources."@babel/code-frame-7.12.13" sources."@babel/helper-validator-identifier-7.12.11" - (sources."@babel/highlight-7.10.4" // { + (sources."@babel/highlight-7.12.13" // { dependencies = [ sources."ansi-styles-3.2.1" sources."chalk-2.4.2" @@ -95685,7 +95736,7 @@ in }) sources."domain-browser-1.2.0" sources."duplexer2-0.1.4" - (sources."elliptic-6.5.3" // { + (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.11.9" ]; @@ -96193,7 +96244,7 @@ in sources."foreach-2.0.5" sources."fs.realpath-1.0.0" sources."function-bind-1.1.1" - sources."get-intrinsic-1.1.0" + sources."get-intrinsic-1.1.1" sources."glob-7.1.6" sources."has-1.0.3" sources."has-ansi-2.0.0" @@ -96448,7 +96499,7 @@ in sources."whatwg-url-8.4.0" sources."word-wrap-1.2.3" sources."wrap-ansi-7.0.0" - sources."ws-7.4.2" + sources."ws-7.4.3" sources."xml-name-validator-3.0.0" sources."xmlchars-2.2.0" sources."y18n-5.0.5" @@ -96473,31 +96524,31 @@ in sha512 = "j4dwDetXrQT5sz1wl6/ZckQ0Ynl9Z+Q/De+e4Qz29dqAq0itimml55DcGRDMyIfEcyYkFgdzpusvWIAi1t/OUw=="; }; dependencies = [ - sources."@babel/code-frame-7.12.11" - (sources."@babel/generator-7.12.11" // { + sources."@babel/code-frame-7.12.13" + (sources."@babel/generator-7.12.13" // { dependencies = [ sources."source-map-0.5.7" ]; }) - sources."@babel/helper-annotate-as-pure-7.12.10" - sources."@babel/helper-function-name-7.12.11" - sources."@babel/helper-get-function-arity-7.12.10" - sources."@babel/helper-module-imports-7.12.5" - sources."@babel/helper-split-export-declaration-7.12.11" + sources."@babel/helper-annotate-as-pure-7.12.13" + sources."@babel/helper-function-name-7.12.13" + sources."@babel/helper-get-function-arity-7.12.13" + sources."@babel/helper-module-imports-7.12.13" + sources."@babel/helper-split-export-declaration-7.12.13" sources."@babel/helper-validator-identifier-7.12.11" - sources."@babel/highlight-7.10.4" - sources."@babel/parser-7.12.11" - sources."@babel/runtime-7.12.5" - sources."@babel/template-7.12.7" - sources."@babel/traverse-7.12.12" - sources."@babel/types-7.12.12" + sources."@babel/highlight-7.12.13" + sources."@babel/parser-7.12.14" + sources."@babel/runtime-7.12.13" + sources."@babel/template-7.12.13" + sources."@babel/traverse-7.12.13" + sources."@babel/types-7.12.13" sources."@emotion/is-prop-valid-0.8.8" sources."@emotion/memoize-0.7.4" sources."@emotion/stylis-0.8.5" sources."@emotion/unitless-0.7.5" sources."@exodus/schemasafe-1.0.0-rc.3" sources."@redocly/react-dropdown-aria-2.0.11" - sources."@types/node-13.13.40" + sources."@types/node-13.13.41" sources."ajv-5.5.2" sources."ansi-regex-5.0.0" sources."ansi-styles-3.2.1" @@ -96579,9 +96630,10 @@ in }) sources."domain-browser-1.2.0" sources."dompurify-2.2.6" - (sources."elliptic-6.5.3" // { + (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.11.9" + sources."inherits-2.0.4" ]; }) sources."emoji-regex-8.0.0" @@ -96656,7 +96708,7 @@ in sources."minimalistic-crypto-utils-1.0.1" sources."minimist-1.2.5" sources."mkdirp-1.0.4" - sources."mobx-6.1.4" + sources."mobx-6.1.5" sources."mobx-react-7.1.0" sources."mobx-react-lite-3.2.0" sources."ms-2.1.2" @@ -96850,9 +96902,9 @@ in version = "0.4.0-dev"; src = ../../misc/vscode-extensions/rust-analyzer/build-deps; dependencies = [ - sources."@babel/code-frame-7.12.11" + sources."@babel/code-frame-7.12.13" sources."@babel/helper-validator-identifier-7.12.11" - (sources."@babel/highlight-7.10.4" // { + (sources."@babel/highlight-7.12.13" // { dependencies = [ sources."chalk-2.4.2" ]; @@ -97609,7 +97661,7 @@ in ]; }) sources."@serverless/component-metrics-1.0.8" - (sources."@serverless/components-3.6.0" // { + (sources."@serverless/components-3.6.1" // { dependencies = [ (sources."@serverless/utils-2.2.0" // { dependencies = [ @@ -97641,7 +97693,7 @@ in ]; }) sources."@serverless/event-mocks-1.1.1" - (sources."@serverless/platform-client-3.10.0" // { + (sources."@serverless/platform-client-3.11.0" // { dependencies = [ sources."js-yaml-3.14.1" ]; @@ -97681,7 +97733,7 @@ in sources."@types/keyv-3.1.1" sources."@types/lodash-4.14.168" sources."@types/long-4.0.1" - sources."@types/node-14.14.22" + sources."@types/node-14.14.25" sources."@types/request-2.48.5" sources."@types/request-promise-native-1.0.17" sources."@types/responselike-1.0.0" @@ -97711,7 +97763,7 @@ in (sources."archiver-5.2.0" // { dependencies = [ sources."async-3.2.0" - sources."bl-4.0.3" + sources."bl-4.0.4" sources."tar-stream-2.2.0" ]; }) @@ -97738,7 +97790,7 @@ in sources."async-limiter-1.0.1" sources."asynckit-0.4.0" sources."at-least-node-1.0.0" - (sources."aws-sdk-2.834.0" // { + (sources."aws-sdk-2.836.0" // { dependencies = [ sources."buffer-4.9.2" sources."ieee754-1.1.13" @@ -97853,7 +97905,7 @@ in sources."cookiejar-2.1.2" sources."core-util-is-1.0.2" sources."crc-32-1.2.0" - sources."crc32-stream-4.0.1" + sources."crc32-stream-4.0.2" (sources."cross-spawn-6.0.5" // { dependencies = [ sources."semver-5.7.1" @@ -98251,7 +98303,7 @@ in sources."promise-queue-2.2.5" (sources."protobufjs-6.10.2" // { dependencies = [ - sources."@types/node-13.13.40" + sources."@types/node-13.13.41" sources."long-4.0.0" ]; }) @@ -98463,7 +98515,7 @@ in }) sources."wrappy-1.0.2" sources."write-file-atomic-2.4.3" - sources."ws-7.4.2" + sources."ws-7.4.3" sources."xml2js-0.4.19" sources."xmlbuilder-9.0.7" sources."xmlhttprequest-ssl-1.5.5" @@ -99125,12 +99177,13 @@ in snyk = nodeEnv.buildNodePackage { name = "snyk"; packageName = "snyk"; - version = "1.440.4"; + version = "1.441.0"; src = fetchurl { - url = "https://registry.npmjs.org/snyk/-/snyk-1.440.4.tgz"; - sha512 = "ylKtCeG4VQ1aPn/yHYkP8Baokw1nnlBAy5D4T+eWFDyv6y86lqUat/DdbzORWy4rofj5ZS0sv36Hcxum3t1x3g=="; + url = "https://registry.npmjs.org/snyk/-/snyk-1.441.0.tgz"; + sha512 = "eMiggcjoGuV9rhg7nHdhb7e1JUAvOCz+nWo/+5wpmU6C22RBDqpkktvrdRbKO816exJr1rFLPRSqbzN1efyjnA=="; }; dependencies = [ + sources."@open-policy-agent/opa-wasm-git+https://github.com/open-policy-agent/npm-opa-wasm.git#f4a21fe6f4d70706f85106dc6ea867983747e040" sources."@sindresorhus/is-2.1.1" sources."@snyk/cli-interface-2.11.0" (sources."@snyk/cocoapods-lockfile-parser-3.5.2" // { @@ -99167,7 +99220,7 @@ in sources."@types/http-cache-semantics-4.0.0" sources."@types/js-yaml-3.12.6" sources."@types/keyv-3.1.1" - sources."@types/node-14.14.22" + sources."@types/node-14.14.25" sources."@types/responselike-1.0.0" sources."@types/semver-5.5.0" sources."@yarnpkg/lockfile-1.1.0" @@ -99185,7 +99238,11 @@ in sources."ansi-styles-3.2.1" sources."ansicolors-0.3.2" sources."archy-1.0.0" - sources."argparse-1.0.10" + (sources."argparse-1.0.10" // { + dependencies = [ + sources."sprintf-js-1.0.3" + ]; + }) sources."asap-2.0.6" sources."asn1-0.2.4" (sources."ast-types-0.14.2" // { @@ -99197,7 +99254,7 @@ in sources."balanced-match-1.0.0" sources."base64-js-1.5.1" sources."bcrypt-pbkdf-1.0.2" - (sources."bl-4.0.3" // { + (sources."bl-4.0.4" // { dependencies = [ sources."readable-stream-3.6.0" sources."safe-buffer-5.2.1" @@ -99534,7 +99591,7 @@ in sources."tmp-0.2.1" ]; }) - (sources."snyk-gradle-plugin-3.12.2" // { + (sources."snyk-gradle-plugin-3.12.3" // { dependencies = [ (sources."@snyk/cli-interface-2.9.1" // { dependencies = [ @@ -99653,7 +99710,7 @@ in sources."source-map-0.6.1" sources."source-map-support-0.5.19" sources."split-ca-1.0.1" - sources."sprintf-js-1.0.3" + sources."sprintf-js-1.1.2" sources."ssh2-0.8.9" sources."ssh2-streams-0.4.10" sources."statuses-1.5.0" @@ -99715,6 +99772,7 @@ in ]; }) sources."url-parse-lax-3.0.0" + sources."utf8-3.0.0" sources."util-deprecate-1.0.2" sources."uuid-3.4.0" sources."vscode-languageserver-types-3.16.0" @@ -99753,16 +99811,16 @@ in "socket.io" = nodeEnv.buildNodePackage { name = "socket.io"; packageName = "socket.io"; - version = "3.1.0"; + version = "3.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/socket.io/-/socket.io-3.1.0.tgz"; - sha512 = "Aqg2dlRh6xSJvRYK31ksG65q4kmBOqU4g+1ukhPcoT6wNGYoIwSYPlCPuRwOO9pgLUajojGFztl6+V2opmKcww=="; + url = "https://registry.npmjs.org/socket.io/-/socket.io-3.1.1.tgz"; + sha512 = "7cBWdsDC7bbyEF6WbBqffjizc/H4YF1wLdZoOzuYfo2uMNSFjJKuQ36t0H40o9B20DO6p+mSytEd92oP4S15bA=="; }; dependencies = [ sources."@types/component-emitter-1.2.10" sources."@types/cookie-0.4.0" sources."@types/cors-2.8.9" - sources."@types/node-14.14.22" + sources."@types/node-14.14.25" sources."accepts-1.3.7" sources."base64-arraybuffer-0.1.4" sources."base64id-2.0.0" @@ -99780,7 +99838,7 @@ in sources."socket.io-adapter-2.1.0" sources."socket.io-parser-4.0.4" sources."vary-1.1.2" - sources."ws-7.4.2" + sources."ws-7.4.3" ]; buildInputs = globalBuildInputs; meta = { @@ -100183,7 +100241,7 @@ in sources."fs.realpath-1.0.0" sources."fsevents-1.2.13" sources."function-bind-1.1.1" - sources."get-intrinsic-1.1.0" + sources."get-intrinsic-1.1.1" sources."get-value-2.0.6" sources."glob-6.0.4" sources."glob-base-0.3.0" @@ -100868,7 +100926,7 @@ in sources."async-1.5.2" sources."async-limiter-1.0.1" sources."asynckit-0.4.0" - (sources."aws-sdk-2.834.0" // { + (sources."aws-sdk-2.836.0" // { dependencies = [ sources."uuid-3.3.2" ]; @@ -101007,14 +101065,14 @@ in dependencies = [ sources."cookie-0.4.1" sources."debug-4.1.1" - sources."ws-7.4.2" + sources."ws-7.4.3" ]; }) (sources."engine.io-client-3.5.0" // { dependencies = [ sources."debug-3.1.0" sources."ms-2.0.0" - sources."ws-7.4.2" + sources."ws-7.4.3" ]; }) sources."engine.io-parser-2.2.1" @@ -101063,7 +101121,7 @@ in sources."generate-function-2.3.1" sources."generate-object-property-1.2.0" sources."get-caller-file-1.0.3" - sources."get-intrinsic-1.1.0" + sources."get-intrinsic-1.1.1" sources."get-stream-4.1.0" (sources."getpass-0.1.7" // { dependencies = [ @@ -101642,29 +101700,29 @@ in sha512 = "VVWH2oixOAxpWL1vH+V42ReCzBjW2AeqskSAbi8+3OjV1Xg3VZkmTcAqBZfRRvJeF4BvYuDLXebW3tIHxgZDEg=="; }; dependencies = [ - sources."@babel/code-frame-7.12.11" - sources."@babel/core-7.12.10" - sources."@babel/generator-7.12.11" - sources."@babel/helper-function-name-7.12.11" - sources."@babel/helper-get-function-arity-7.12.10" - sources."@babel/helper-member-expression-to-functions-7.12.7" - sources."@babel/helper-module-imports-7.12.5" - sources."@babel/helper-module-transforms-7.12.1" - sources."@babel/helper-optimise-call-expression-7.12.10" - sources."@babel/helper-replace-supers-7.12.11" - sources."@babel/helper-simple-access-7.12.1" - sources."@babel/helper-split-export-declaration-7.12.11" + sources."@babel/code-frame-7.12.13" + sources."@babel/core-7.12.13" + sources."@babel/generator-7.12.13" + sources."@babel/helper-function-name-7.12.13" + sources."@babel/helper-get-function-arity-7.12.13" + sources."@babel/helper-member-expression-to-functions-7.12.13" + sources."@babel/helper-module-imports-7.12.13" + sources."@babel/helper-module-transforms-7.12.13" + sources."@babel/helper-optimise-call-expression-7.12.13" + sources."@babel/helper-replace-supers-7.12.13" + sources."@babel/helper-simple-access-7.12.13" + sources."@babel/helper-split-export-declaration-7.12.13" sources."@babel/helper-validator-identifier-7.12.11" - sources."@babel/helpers-7.12.5" - (sources."@babel/highlight-7.10.4" // { + sources."@babel/helpers-7.12.13" + (sources."@babel/highlight-7.12.13" // { dependencies = [ sources."chalk-2.4.2" ]; }) - sources."@babel/parser-7.12.11" - sources."@babel/template-7.12.7" - sources."@babel/traverse-7.12.12" - sources."@babel/types-7.12.12" + sources."@babel/parser-7.12.14" + sources."@babel/template-7.12.13" + sources."@babel/traverse-7.12.13" + sources."@babel/types-7.12.13" sources."@nodelib/fs.scandir-2.1.4" sources."@nodelib/fs.stat-2.0.4" sources."@nodelib/fs.walk-1.2.6" @@ -101728,7 +101786,7 @@ in sources."domelementtype-1.3.1" sources."domhandler-2.4.2" sources."domutils-1.7.0" - sources."electron-to-chromium-1.3.650" + sources."electron-to-chromium-1.3.653" sources."emoji-regex-8.0.0" sources."entities-1.1.2" sources."error-ex-1.3.2" @@ -101806,12 +101864,12 @@ in sources."lru-cache-6.0.0" sources."map-obj-4.1.0" sources."mathml-tag-names-2.1.3" - sources."mdast-util-from-markdown-0.8.4" + sources."mdast-util-from-markdown-0.8.5" sources."mdast-util-to-markdown-0.6.2" sources."mdast-util-to-string-2.0.0" sources."meow-9.0.0" sources."merge2-1.4.1" - sources."micromark-2.11.3" + sources."micromark-2.11.4" sources."micromatch-4.0.2" sources."min-indent-1.0.1" sources."minimatch-3.0.4" @@ -101997,7 +102055,7 @@ in sources."escape-string-regexp-1.0.5" sources."esprima-4.0.1" sources."function-bind-1.1.1" - sources."get-intrinsic-1.1.0" + sources."get-intrinsic-1.1.1" sources."has-1.0.3" sources."has-flag-3.0.0" sources."has-symbols-1.0.1" @@ -102913,7 +102971,7 @@ in sources."format-0.2.2" sources."fs.realpath-1.0.0" sources."function-bind-1.1.1" - sources."get-intrinsic-1.1.0" + sources."get-intrinsic-1.1.1" sources."get-stdin-5.0.1" sources."glob-7.1.6" sources."graceful-fs-4.2.4" @@ -103103,7 +103161,7 @@ in sources."call-bind-1.0.2" sources."define-properties-1.1.3" sources."function-bind-1.1.1" - sources."get-intrinsic-1.1.0" + sources."get-intrinsic-1.1.1" sources."has-1.0.3" sources."has-symbols-1.0.1" sources."match-index-1.0.3" @@ -103129,9 +103187,9 @@ in sha512 = "z/Xo1WHxAn7eueUbRLXoMNew+R3dzGENPG/yiCt/KT2WgAfRuQ7GeF855kLcnCCqdTnl6W7sYq8TKy+/DLpiqQ=="; }; dependencies = [ - sources."@babel/code-frame-7.12.11" + sources."@babel/code-frame-7.12.13" sources."@babel/helper-validator-identifier-7.12.11" - sources."@babel/highlight-7.10.4" + sources."@babel/highlight-7.12.13" sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" sources."@textlint/ast-node-types-4.4.1" @@ -103675,7 +103733,7 @@ in sources."es-abstract-1.18.0-next.2" sources."es-to-primitive-1.2.1" sources."function-bind-1.1.1" - sources."get-intrinsic-1.1.0" + sources."get-intrinsic-1.1.1" sources."has-1.0.3" sources."has-symbols-1.0.1" sources."inherits-2.0.4" @@ -103731,7 +103789,7 @@ in sources."es-abstract-1.17.7" sources."es-to-primitive-1.2.1" sources."function-bind-1.1.1" - sources."get-intrinsic-1.1.0" + sources."get-intrinsic-1.1.1" sources."has-1.0.3" sources."has-symbols-1.0.1" sources."is-callable-1.2.3" @@ -103829,7 +103887,7 @@ in sources."es-abstract-1.18.0-next.2" sources."es-to-primitive-1.2.1" sources."function-bind-1.1.1" - sources."get-intrinsic-1.1.0" + sources."get-intrinsic-1.1.1" sources."has-1.0.3" sources."has-symbols-1.0.1" sources."is-callable-1.2.3" @@ -103872,7 +103930,7 @@ in sources."define-properties-1.1.3" sources."e-prime-0.10.4" sources."function-bind-1.1.1" - sources."get-intrinsic-1.1.0" + sources."get-intrinsic-1.1.1" sources."has-1.0.3" sources."has-symbols-1.0.1" sources."no-cliches-0.1.1" @@ -103914,7 +103972,7 @@ in sources."@types/debug-4.1.5" sources."@types/http-cache-semantics-4.0.0" sources."@types/keyv-3.1.1" - sources."@types/node-14.14.22" + sources."@types/node-14.14.25" sources."@types/responselike-1.0.0" sources."abbrev-1.1.1" sources."abstract-logging-2.0.1" @@ -104329,7 +104387,7 @@ in sources."wide-align-1.1.3" sources."with-open-file-0.1.7" sources."wrappy-1.0.2" - sources."ws-7.4.2" + sources."ws-7.4.3" sources."xmlhttprequest-ssl-1.5.5" sources."yallist-3.1.1" sources."yarn-1.22.4" @@ -104884,7 +104942,7 @@ in sources."@types/component-emitter-1.2.10" sources."@types/cookie-0.4.0" sources."@types/cors-2.8.9" - sources."@types/node-14.14.22" + sources."@types/node-14.14.25" sources."abbrev-1.1.1" sources."accepts-1.3.7" sources."ansi-regex-5.0.0" @@ -105138,7 +105196,7 @@ in }) sources."wrap-ansi-7.0.0" sources."wrappy-1.0.2" - sources."ws-7.4.2" + sources."ws-7.4.3" sources."y18n-5.0.5" sources."yallist-2.1.2" sources."yargs-16.2.0" @@ -105564,7 +105622,7 @@ in "vscode-lldb-build-deps-../../misc/vscode-extensions/vscode-lldb/build-deps" = nodeEnv.buildNodePackage { name = "vscode-lldb"; packageName = "vscode-lldb"; - version = "1.5.3"; + version = "1.6.1"; src = ../../misc/vscode-extensions/vscode-lldb/build-deps; dependencies = [ sources."@types/json5-0.0.30" @@ -105760,7 +105818,7 @@ in sources."string_decoder-1.1.1" ]; }) - (sources."elliptic-6.5.3" // { + (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.11.9" ]; @@ -105768,7 +105826,14 @@ in sources."emoji-regex-7.0.3" sources."emojis-list-3.0.0" sources."end-of-stream-1.4.4" - sources."enhanced-resolve-4.5.0" + (sources."enhanced-resolve-4.5.0" // { + dependencies = [ + sources."isarray-1.0.0" + sources."memory-fs-0.5.0" + sources."readable-stream-2.3.7" + sources."string_decoder-1.1.1" + ]; + }) sources."entities-2.1.0" sources."errno-0.1.8" (sources."es-abstract-1.18.0-next.2" // { @@ -105829,18 +105894,7 @@ in sources."fill-range-7.0.1" sources."find-cache-dir-2.1.0" sources."find-up-3.0.0" - (sources."findup-sync-3.0.0" // { - dependencies = [ - sources."braces-2.3.2" - sources."extend-shallow-2.0.1" - sources."fill-range-4.0.0" - sources."is-buffer-1.1.6" - sources."is-number-3.0.0" - sources."kind-of-3.2.2" - sources."micromatch-3.1.10" - sources."to-regex-range-2.1.1" - ]; - }) + sources."findup-sync-3.0.0" sources."flat-4.1.1" (sources."flush-write-stream-1.1.1" // { dependencies = [ @@ -105863,7 +105917,7 @@ in sources."fsevents-2.1.3" sources."function-bind-1.1.1" sources."get-caller-file-2.0.5" - sources."get-intrinsic-1.1.0" + sources."get-intrinsic-1.1.1" sources."get-value-2.0.6" sources."glob-7.1.3" sources."glob-parent-5.1.1" @@ -105936,16 +105990,12 @@ in sources."js-yaml-3.13.1" sources."json-parse-better-errors-1.0.2" sources."json-schema-traverse-0.4.1" - sources."json5-2.2.0" + sources."json5-1.0.1" sources."kind-of-6.0.3" sources."leven-3.1.0" sources."linkify-it-2.2.0" sources."loader-runner-2.4.0" - (sources."loader-utils-1.4.0" // { - dependencies = [ - sources."json5-1.0.1" - ]; - }) + sources."loader-utils-1.4.0" sources."locate-path-3.0.0" sources."lodash-4.17.20" sources."log-symbols-3.0.0" @@ -105960,7 +106010,7 @@ in }) sources."md5.js-1.3.5" sources."mdurl-1.0.1" - (sources."memory-fs-0.5.0" // { + (sources."memory-fs-0.4.1" // { dependencies = [ sources."isarray-1.0.0" sources."readable-stream-2.3.7" @@ -105968,7 +106018,27 @@ in ]; }) sources."memory-streams-0.1.3" - sources."micromatch-4.0.2" + (sources."micromatch-3.1.10" // { + dependencies = [ + (sources."braces-2.3.2" // { + dependencies = [ + sources."extend-shallow-2.0.1" + ]; + }) + (sources."fill-range-4.0.0" // { + dependencies = [ + sources."extend-shallow-2.0.1" + ]; + }) + sources."is-buffer-1.1.6" + (sources."is-number-3.0.0" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."to-regex-range-2.1.1" + ]; + }) (sources."miller-rabin-4.0.1" // { dependencies = [ sources."bn.js-4.11.9" @@ -106232,6 +106302,7 @@ in sources."to-regex-range-5.0.1" (sources."ts-loader-6.2.2" // { dependencies = [ + sources."micromatch-4.0.2" sources."semver-6.3.0" ]; }) @@ -106301,7 +106372,6 @@ in sources."is-number-3.0.0" sources."isarray-1.0.0" sources."kind-of-3.2.2" - sources."micromatch-3.1.10" sources."normalize-path-2.1.1" sources."readable-stream-2.3.7" sources."readdirp-2.2.1" @@ -106309,32 +106379,7 @@ in sources."to-regex-range-2.1.1" ]; }) - (sources."webpack-4.46.0" // { - dependencies = [ - (sources."braces-2.3.2" // { - dependencies = [ - sources."extend-shallow-2.0.1" - ]; - }) - (sources."fill-range-4.0.0" // { - dependencies = [ - sources."extend-shallow-2.0.1" - ]; - }) - sources."is-buffer-1.1.6" - (sources."is-number-3.0.0" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - sources."isarray-1.0.0" - sources."memory-fs-0.4.1" - sources."micromatch-3.1.10" - sources."readable-stream-2.3.7" - sources."string_decoder-1.1.1" - sources."to-regex-range-2.1.1" - ]; - }) + sources."webpack-4.46.0" (sources."webpack-cli-3.3.12" // { dependencies = [ sources."supports-color-6.1.0" @@ -106356,6 +106401,7 @@ in sources."xtend-4.0.2" sources."y18n-4.0.1" sources."yallist-3.1.1" + sources."yaml-1.10.0" (sources."yargs-13.3.2" // { dependencies = [ sources."ansi-regex-4.1.0" @@ -106669,9 +106715,9 @@ in sha512 = "/dd2bJLxOmX8Ie0EPTlmU+F8cxAekn/1m8K9OAFoijm4fc8SdHznFUUEKuz2RMMhsaL5+rccj8xLFAJELYNbaA=="; }; dependencies = [ - sources."@babel/code-frame-7.12.11" + sources."@babel/code-frame-7.12.13" sources."@babel/helper-validator-identifier-7.12.11" - sources."@babel/highlight-7.10.4" + sources."@babel/highlight-7.12.13" sources."@emmetio/extract-abbreviation-0.1.6" sources."@mrmlnc/readdir-enhanced-2.2.1" sources."@nodelib/fs.stat-1.1.3" @@ -106687,7 +106733,7 @@ in sources."@starptech/rehype-webparser-0.10.0" sources."@starptech/webparser-0.10.0" sources."@szmarczak/http-timer-1.1.2" - sources."@types/node-14.14.22" + sources."@types/node-14.14.25" sources."@types/unist-2.0.3" sources."@types/vfile-3.0.2" sources."@types/vfile-message-2.0.0" @@ -107604,9 +107650,9 @@ in sha512 = "f+NHiYwbTS0X6eSLkBDWoCYkkIJweVazGf4MD8S+kRX/5z40WsYsnRdVWG+p34Z6rCyNvlHHrnO2S1W8WWg7Tw=="; }; dependencies = [ - sources."@babel/code-frame-7.12.11" + sources."@babel/code-frame-7.12.13" sources."@babel/helper-validator-identifier-7.12.11" - (sources."@babel/highlight-7.10.4" // { + (sources."@babel/highlight-7.12.13" // { dependencies = [ sources."ansi-styles-3.2.1" sources."chalk-2.4.2" @@ -107633,7 +107679,7 @@ in sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" sources."@types/minimatch-3.0.3" - sources."@types/node-14.14.22" + sources."@types/node-14.14.25" sources."@types/yauzl-2.9.1" sources."JSONSelect-0.2.1" sources."acorn-7.4.1" @@ -107706,7 +107752,7 @@ in sources."bcrypt-pbkdf-1.0.2" sources."binary-extensions-2.2.0" sources."bindings-1.5.0" - sources."bl-4.0.3" + sources."bl-4.0.4" sources."bluebird-2.9.34" sources."boolbase-1.0.0" (sources."boxen-4.2.0" // { @@ -107796,7 +107842,7 @@ in sources."core-js-2.6.12" sources."core-util-is-1.0.2" sources."crc-32-1.2.0" - sources."crc32-stream-4.0.1" + sources."crc32-stream-4.0.2" sources."cross-spawn-7.0.3" sources."crypto-random-string-2.0.0" sources."css-select-1.2.0" @@ -107965,7 +108011,7 @@ in ]; }) sources."get-caller-file-2.0.5" - sources."get-intrinsic-1.1.0" + sources."get-intrinsic-1.1.1" sources."get-stream-5.2.0" sources."get-value-2.0.6" sources."getpass-0.1.7" @@ -108531,17 +108577,17 @@ in webpack = nodeEnv.buildNodePackage { name = "webpack"; packageName = "webpack"; - version = "5.19.0"; + version = "5.20.1"; src = fetchurl { - url = "https://registry.npmjs.org/webpack/-/webpack-5.19.0.tgz"; - sha512 = "egX19vAQ8fZ4cVYtA9Y941eqJtcZAK68mQq87MMv+GTXKZOc3TpKBBxdGX+HXUYlquPxiluNsJ1VHvwwklW7CQ=="; + url = "https://registry.npmjs.org/webpack/-/webpack-5.20.1.tgz"; + sha512 = "cStILc8W14WZXsgfeJmNIQlmQU06F7THfCJ6id3pIB/EXuR6nquolJ2ZJoaLNb6zdec6O2jOAzVKtBYc7vGDjg=="; }; dependencies = [ sources."@types/eslint-7.2.6" sources."@types/eslint-scope-3.7.0" sources."@types/estree-0.0.46" sources."@types/json-schema-7.0.7" - sources."@types/node-14.14.22" + sources."@types/node-14.14.25" sources."@webassemblyjs/ast-1.11.0" sources."@webassemblyjs/floating-point-hex-parser-1.11.0" sources."@webassemblyjs/helper-api-error-1.11.0" @@ -108568,7 +108614,7 @@ in sources."chrome-trace-event-1.0.2" sources."colorette-1.2.1" sources."commander-2.20.3" - sources."electron-to-chromium-1.3.650" + sources."electron-to-chromium-1.3.653" sources."enhanced-resolve-5.7.0" sources."es-module-lexer-0.3.26" sources."escalade-3.1.1" @@ -108582,7 +108628,6 @@ in sources."events-3.2.0" sources."fast-deep-equal-3.1.3" sources."fast-json-stable-stringify-2.1.0" - sources."find-up-5.0.0" sources."glob-to-regexp-0.4.1" sources."graceful-fs-4.2.4" sources."has-flag-4.0.0" @@ -108590,16 +108635,12 @@ in sources."json-parse-better-errors-1.0.2" sources."json-schema-traverse-0.4.1" sources."loader-runner-4.2.0" - sources."locate-path-6.0.0" sources."merge-stream-2.0.0" sources."mime-db-1.45.0" sources."mime-types-2.1.28" sources."neo-async-2.6.2" sources."node-releases-1.1.70" sources."p-limit-3.1.0" - sources."p-locate-5.0.0" - sources."path-exists-4.0.0" - sources."pkg-dir-5.0.0" sources."punycode-2.1.1" sources."randombytes-2.1.0" sources."safe-buffer-5.2.1" @@ -108635,20 +108676,20 @@ in webpack-cli = nodeEnv.buildNodePackage { name = "webpack-cli"; packageName = "webpack-cli"; - version = "4.4.0"; + version = "4.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/webpack-cli/-/webpack-cli-4.4.0.tgz"; - sha512 = "/Qh07CXfXEkMu5S8wEpjuaw2Zj/CC0hf/qbTDp6N8N7JjdGuaOjZ7kttz+zhuJO/J5m7alQEhNk9lsc4rC6xgQ=="; + url = "https://registry.npmjs.org/webpack-cli/-/webpack-cli-4.5.0.tgz"; + sha512 = "wXg/ef6Ibstl2f50mnkcHblRPN/P9J4Nlod5Hg9HGFgSeF8rsqDGHJeVe4aR26q9l62TUJi6vmvC2Qz96YJw1Q=="; }; dependencies = [ sources."@discoveryjs/json-ext-0.5.2" - sources."@webpack-cli/configtest-1.0.0" - sources."@webpack-cli/info-1.2.1" - sources."@webpack-cli/serve-1.2.2" + sources."@webpack-cli/configtest-1.0.1" + sources."@webpack-cli/info-1.2.2" + sources."@webpack-cli/serve-1.3.0" sources."ansi-colors-4.1.1" sources."clone-deep-4.0.1" sources."colorette-1.2.1" - sources."commander-6.2.1" + sources."commander-7.0.0" sources."cross-spawn-7.0.3" sources."enquirer-2.3.6" sources."envinfo-7.7.4" @@ -108714,7 +108755,7 @@ in dependencies = [ sources."@types/glob-7.1.3" sources."@types/minimatch-3.0.3" - sources."@types/node-14.14.22" + sources."@types/node-14.14.25" sources."accepts-1.3.7" sources."ajv-6.12.6" sources."ajv-errors-1.0.1" @@ -108908,7 +108949,7 @@ in sources."fsevents-1.2.13" sources."function-bind-1.1.1" sources."get-caller-file-2.0.5" - sources."get-intrinsic-1.1.0" + sources."get-intrinsic-1.1.1" sources."get-stream-4.1.0" sources."get-value-2.0.6" sources."glob-7.1.6" @@ -109367,7 +109408,7 @@ in sources."@protobufjs/pool-1.1.0" sources."@protobufjs/utf8-1.1.0" sources."@types/long-4.0.1" - sources."@types/node-13.13.40" + sources."@types/node-13.13.41" sources."addr-to-ip-port-1.5.1" sources."airplay-js-0.3.0" sources."balanced-match-1.0.0" @@ -109405,7 +109446,7 @@ in ]; }) sources."blob-to-buffer-1.2.9" - sources."block-stream2-2.0.0" + sources."block-stream2-2.1.0" sources."bn.js-5.1.3" sources."brace-expansion-1.1.11" sources."browserify-package-json-1.0.1" @@ -109445,7 +109486,7 @@ in ]; }) sources."core-util-is-1.0.2" - sources."create-torrent-4.4.3" + sources."create-torrent-4.4.4" sources."debug-2.6.9" sources."decompress-response-3.3.0" (sources."dlnacasts-0.1.0" // { @@ -109458,7 +109499,7 @@ in sources."ecstatic-4.1.4" sources."ee-first-1.1.1" sources."elementtree-0.1.7" - sources."end-of-stream-1.4.1" + sources."end-of-stream-1.4.4" sources."err-code-2.0.3" sources."escape-html-1.0.3" sources."executable-4.1.1" @@ -109522,7 +109563,7 @@ in sources."thunky-1.1.0" ]; }) - sources."multistream-4.0.1" + sources."multistream-4.1.0" sources."napi-macros-2.0.0" sources."netmask-1.0.6" sources."network-address-1.1.2" @@ -109635,7 +109676,7 @@ in sources."utp-native-2.3.0" sources."videostream-3.2.2" sources."vlc-command-1.2.0" - (sources."webtorrent-0.112.3" // { + (sources."webtorrent-0.113.0" // { dependencies = [ sources."debug-4.3.2" sources."decompress-response-6.0.0" @@ -109649,7 +109690,7 @@ in }) sources."winreg-1.2.4" sources."wrappy-1.0.2" - sources."ws-7.4.2" + sources."ws-7.4.3" sources."xml2js-0.4.23" sources."xmlbuilder-11.0.1" sources."xmldom-0.1.31" @@ -109791,16 +109832,16 @@ in sha512 = "GFg4QC1xi3gkbHGGUFme8/8XPg3kDISu/qJfx56X207yuv1FSevGY/eKuym7kh0bniCB4n3rseWW+QZXPH8LIw=="; }; dependencies = [ - sources."@babel/code-frame-7.12.11" + sources."@babel/code-frame-7.12.13" sources."@babel/helper-validator-identifier-7.12.11" - sources."@babel/highlight-7.10.4" - sources."@babel/runtime-7.12.5" + sources."@babel/highlight-7.12.13" + sources."@babel/runtime-7.12.13" sources."@mrmlnc/readdir-enhanced-2.2.1" sources."@nodelib/fs.stat-1.1.3" sources."@sindresorhus/is-0.7.0" sources."@types/glob-7.1.3" sources."@types/minimatch-3.0.3" - sources."@types/node-14.14.22" + sources."@types/node-14.14.25" sources."@types/normalize-package-data-2.4.0" sources."JSONStream-1.3.5" sources."aggregate-error-3.1.0" diff --git a/pkgs/development/ocaml-modules/kafka/default.nix b/pkgs/development/ocaml-modules/kafka/default.nix index 66055dca66e..7636942033a 100644 --- a/pkgs/development/ocaml-modules/kafka/default.nix +++ b/pkgs/development/ocaml-modules/kafka/default.nix @@ -1,18 +1,16 @@ -{ lib, fetchFromGitHub, buildDunePackage, base, cmdliner, ocaml_lwt, - rdkafka, zlib }: +{ lib, fetchurl, buildDunePackage +, rdkafka, zlib }: buildDunePackage rec { pname = "kafka"; - version = "0.4"; + version = "0.5"; - src = fetchFromGitHub { - owner = "didier-wenzek"; - repo = "ocaml-kafka"; - rev = version; - sha256 = "0lb8x0wh7sf8v9mjwhq32azjz54kw49fsjfb7m76z4nhxfkjw5hy"; - }; + useDune2 = true; - buildInputs = [ base cmdliner ocaml_lwt zlib ]; + src = fetchurl { + url = "https://github.com/didier-wenzek/ocaml-kafka/releases/download/${version}/kafka-${version}.tbz"; + sha256 = "0m9212yap0a00hd0f61i4y4fna3141p77qj3mm7jl1h4q60jdhvy"; + }; propagatedBuildInputs = [ rdkafka zlib ]; @@ -20,7 +18,7 @@ buildDunePackage rec { homepage = "https://github.com/didier-wenzek/ocaml-kafka"; description = "OCaml bindings for Kafka"; license = licenses.mit; - maintainers = [ maintainers.rixed ]; + maintainers = [ maintainers.vbgl ]; }; } diff --git a/pkgs/development/ocaml-modules/kafka/lwt.nix b/pkgs/development/ocaml-modules/kafka/lwt.nix new file mode 100644 index 00000000000..a6cef66b276 --- /dev/null +++ b/pkgs/development/ocaml-modules/kafka/lwt.nix @@ -0,0 +1,19 @@ +{ buildDunePackage +, kafka +, lwt +, cmdliner +}: + +buildDunePackage rec { + pname = "kafka_lwt"; + + inherit (kafka) version useDune2 src; + + buildInputs = [ cmdliner ]; + + propagatedBuildInputs = [ kafka lwt ]; + + meta = kafka.meta // { + description = "OCaml bindings for Kafka, Lwt bindings"; + }; +} diff --git a/pkgs/development/ocaml-modules/ocaml-migrate-parsetree/1.8.x.nix b/pkgs/development/ocaml-modules/ocaml-migrate-parsetree/1.8.x.nix index faadaf214f5..5d8d967bf4f 100644 --- a/pkgs/development/ocaml-modules/ocaml-migrate-parsetree/1.8.x.nix +++ b/pkgs/development/ocaml-modules/ocaml-migrate-parsetree/1.8.x.nix @@ -1,9 +1,11 @@ -{ lib, fetchFromGitHub, buildDunePackage, result, ppx_derivers }: +{ lib, fetchFromGitHub, buildDunePackage, ocaml, result, ppx_derivers }: buildDunePackage rec { pname = "ocaml-migrate-parsetree"; version = "1.8.0"; + useDune2 = lib.versionAtLeast ocaml.version "4.08"; + src = fetchFromGitHub { owner = "ocaml-ppx"; repo = pname; diff --git a/pkgs/development/python-modules/aenum/default.nix b/pkgs/development/python-modules/aenum/default.nix index 4f30eefbf90..b5fb2999c96 100644 --- a/pkgs/development/python-modules/aenum/default.nix +++ b/pkgs/development/python-modules/aenum/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "aenum"; - version = "2.2.6"; + version = "3.0.0"; src = fetchPypi { inherit pname version; - sha256 = "260225470b49429f5893a195a8b99c73a8d182be42bf90c37c93e7b20e44eaae"; + sha256 = "17cd8cfed1ee4b617198c9fabbabd70ebd8f01e54ac29cd6c3a92df14bd86656"; }; # For Python 3, locale has to be set to en_US.UTF-8 for diff --git a/pkgs/development/python-modules/ailment/default.nix b/pkgs/development/python-modules/ailment/default.nix new file mode 100644 index 00000000000..e23db23d151 --- /dev/null +++ b/pkgs/development/python-modules/ailment/default.nix @@ -0,0 +1,32 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, pyvex +}: + +buildPythonPackage rec { + pname = "ailment"; + version = "9.0.5739"; + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "angr"; + repo = pname; + rev = "v${version}"; + sha256 = "1fjwksia6h7w7m5zhys65yr4zxvyfgp9hr1k5dn802p9kvz34bpc"; + }; + + propagatedBuildInputs = [ pyvex ]; + + # Tests depend on angr (possibly a circular dependency) + doCheck = false; + #pythonImportsCheck = [ "ailment" ]; + + meta = with lib; { + description = "The angr Intermediate Language"; + homepage = "https://github.com/angr/ailment"; + license = with licenses; [ bsd2 ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/anyio/default.nix b/pkgs/development/python-modules/anyio/default.nix index f79bf23896f..1c3c72a8e2c 100644 --- a/pkgs/development/python-modules/anyio/default.nix +++ b/pkgs/development/python-modules/anyio/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "anyio"; - version = "2.0.2"; + version = "2.1.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "agronholm"; repo = pname; rev = version; - sha256 = "06nazfrm2sclp3lpgsn9wl8vmqxvx36s3gr2gnqz3zhjpf3glkxv"; + sha256 = "0k5c4a7xcbiyah8rgrfh2hwj3l3a9al7rh2lyz9ip4rr1hwnqvaf"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/apispec/default.nix b/pkgs/development/python-modules/apispec/default.nix index 0dea059f76a..ac6eb095777 100644 --- a/pkgs/development/python-modules/apispec/default.nix +++ b/pkgs/development/python-modules/apispec/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "apispec"; - version = "4.0.0"; + version = "4.2.0"; src = fetchPypi { inherit pname version; - sha256 = "360e28e5e84a4d7023b16de2b897327fe3da63ddc8e01f9165b9113b7fe1c48a"; + sha256 = "fbbd069caa22c0270bc71a5330b46b5a4e1984d8345b9236ca02fbca23094647"; }; checkInputs = [ diff --git a/pkgs/development/python-modules/archinfo/default.nix b/pkgs/development/python-modules/archinfo/default.nix index 8cd0f20a7f2..79f21a2762c 100644 --- a/pkgs/development/python-modules/archinfo/default.nix +++ b/pkgs/development/python-modules/archinfo/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "archinfo"; - version = "9.0.5610"; + version = "9.0.5739"; src = fetchFromGitHub { owner = "angr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-YlqCRLx8mqHXMKPCWqcGvHxRBGOxbwMZWPEDX/jEDdI="; + sha256 = "sha256-6qjX0r2vLYgJdrKBVKedplfa1yhWv9tBvTu5BsViXBc="; }; checkInputs = [ diff --git a/pkgs/development/python-modules/base58/default.nix b/pkgs/development/python-modules/base58/default.nix index 1e1da32f6c9..1437683941b 100644 --- a/pkgs/development/python-modules/base58/default.nix +++ b/pkgs/development/python-modules/base58/default.nix @@ -1,19 +1,29 @@ -{ lib, fetchPypi, buildPythonPackage, isPy27, pytest, pyhamcrest }: +{ lib +, buildPythonPackage +, fetchPypi +, pyhamcrest +, pytest-benchmark +, pytestCheckHook +, pythonOlder +}: buildPythonPackage rec { pname = "base58"; - version = "2.0.1"; - disabled = isPy27; # python 2 abandoned upstream + version = "2.1.0"; + disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "365c9561d9babac1b5f18ee797508cd54937a724b6e419a130abad69cec5ca79"; + sha256 = "sha256-FxpUe0o8YeGuOAciSm967HXjZMQ5XnViZJ1zNXaAAaI="; }; - checkInputs = [ pytest pyhamcrest ]; - checkPhase = '' - pytest - ''; + checkInputs = [ + pyhamcrest + pytest-benchmark + pytestCheckHook + ]; + + pythonImportsCheck = [ "base58" ]; meta = with lib; { description = "Base58 and Base58Check implementation"; diff --git a/pkgs/development/python-modules/bespon/default.nix b/pkgs/development/python-modules/bespon/default.nix index 599ad71b241..da6820ef6ec 100644 --- a/pkgs/development/python-modules/bespon/default.nix +++ b/pkgs/development/python-modules/bespon/default.nix @@ -4,12 +4,12 @@ }: buildPythonPackage rec { - version = "0.5.0"; + version = "0.6.0"; pname = "BespON"; src = fetchPypi { inherit pname version; - sha256 = "a75cd7e62746fb0fef9b98aa157a44f9ed2ef63e952f7ae4ec5b3c2892669187"; + sha256 = "2f2bda67fea8ee95c8aa7e885835ab88bdbfa392a94077ce1c9d29017420ce7a"; }; propagatedBuildInputs = [ ]; @@ -20,7 +20,7 @@ buildPythonPackage rec { meta = with lib; { description = "Encodes and decodes data in the BespON format."; homepage = "https://github.com/gpoore/bespon_py"; - license = licenses.lgpl3; + license = licenses.bsd3; maintainers = with maintainers; [ synthetica ]; }; diff --git a/pkgs/development/python-modules/binwalk/default.nix b/pkgs/development/python-modules/binwalk/default.nix index 74d79bd677b..b9120d412cb 100644 --- a/pkgs/development/python-modules/binwalk/default.nix +++ b/pkgs/development/python-modules/binwalk/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub +, stdenv , zlib , xz , ncompress @@ -20,22 +21,20 @@ , pyqtgraph , visualizationSupport ? false }: -let - version = "2.2.0"; -in -buildPythonPackage { +buildPythonPackage rec { pname = "binwalk"; - inherit version; + version = "2.2.0"; src = fetchFromGitHub { - owner = "devttys0"; + owner = "ReFirmLabs"; repo = "binwalk"; - rev = "be738a52e09b0da2a6e21470e0dbcd5beb42ed1b"; + rev = "v${version}"; sha256 = "1bxgj569fzwv6jhcbl864nmlsi9x1k1r20aywjxc8b9b1zgqrlvc"; }; - propagatedBuildInputs = [ zlib xz ncompress gzip bzip2 gnutar p7zip cabextract cramfsswap cramfsprogs sasquatch squashfsTools lzma pycrypto ] - ++ lib.optionals visualizationSupport [ matplotlib pyqtgraph ]; + propagatedBuildInputs = [ zlib xz ncompress gzip bzip2 gnutar p7zip cabextract squashfsTools lzma pycrypto ] + ++ lib.optionals visualizationSupport [ matplotlib pyqtgraph ] + ++ lib.optionals (!stdenv.isDarwin) [ cramfsprogs cramfsswap sasquatch ]; # setup.py only installs version.py during install, not test postPatch = '' @@ -49,6 +48,8 @@ buildPythonPackage { checkInputs = [ nose ]; + pythonImportsCheck = [ "binwalk" ]; + meta = with lib; { homepage = "https://github.com/ReFirmLabs/binwalk"; description = "A tool for searching a given binary image for embedded files"; diff --git a/pkgs/development/python-modules/buildbot/default.nix b/pkgs/development/python-modules/buildbot/default.nix index 84476a2ca36..f4c5bfb1622 100644 --- a/pkgs/development/python-modules/buildbot/default.nix +++ b/pkgs/development/python-modules/buildbot/default.nix @@ -25,11 +25,11 @@ let package = buildPythonPackage rec { pname = "buildbot"; - version = "2.10.0"; + version = "2.10.1"; src = fetchPypi { inherit pname version; - sha256 = "06fgp5gpacyx1sqh1f6590r792d5lhzspwmjli592ajx69ckzzwf"; + sha256 = "0jmgpvgn36kfc1sa27a1l1g26dawhl99a1wl8gn4ajbcbcvc2pkh"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/buildbot/pkg.nix b/pkgs/development/python-modules/buildbot/pkg.nix index 90c2f099197..f3dc0440ac5 100644 --- a/pkgs/development/python-modules/buildbot/pkg.nix +++ b/pkgs/development/python-modules/buildbot/pkg.nix @@ -6,7 +6,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "1wr8fxa80c6vq55zv7k9rf61r805flrhd2v28qfl05jz1inghysb"; + sha256 = "0ymqkjz1zk4gs0hkxjh07napc4k24xxb8f3pganw27fca60xcii0"; }; postPatch = '' diff --git a/pkgs/development/python-modules/buildbot/plugins.nix b/pkgs/development/python-modules/buildbot/plugins.nix index 92e78f940d5..ed2f363901e 100644 --- a/pkgs/development/python-modules/buildbot/plugins.nix +++ b/pkgs/development/python-modules/buildbot/plugins.nix @@ -7,7 +7,7 @@ src = fetchPypi { inherit pname version; - sha256 = "0bzn00qqx0xd9r4rrz01y9zmiwjlhcanrs13r1yzp2mycn9q5865"; + sha256 = "0x2k95lwx2gz2zj2ys646qiylhyqzlbiqf1k3q1l8w1wlggwv3xp"; }; # Remove unneccessary circular dependency on buildbot @@ -34,7 +34,7 @@ src = fetchPypi { inherit pname version; - sha256 = "0yh0dpg27gl3pk3nimj1yb6rw7kxvsv1bvzc6hbcfx3a9qdajicj"; + sha256 = "0fpam6x8x207la1xrr8m45yx35r646iizrs4gsaghlysmr95jb3i"; }; buildInputs = [ buildbot-pkg ]; @@ -56,7 +56,7 @@ src = fetchPypi { inherit pname version; - sha256 = "0b9fffr53wfq328csrqgdinafbs1v5s7yn4ky8faw6sqyd8l197v"; + sha256 = "0ari338hmi1bb1pln3mxv4k9aclbcby6z3km61wg3va511qhrrbq"; }; buildInputs = [ buildbot-pkg ]; @@ -78,7 +78,7 @@ src = fetchPypi { inherit pname version; - sha256 = "0pz1kmq731ap79l05l13f10r81lzgif5aydpsfz3k5fa9flvxjxs"; + sha256 = "0a5nrklyzfasaa119y4ivr7449rvsgifpkyravinacrl1g9phlls"; }; buildInputs = [ buildbot-pkg ]; @@ -100,7 +100,7 @@ src = fetchPypi { inherit pname version; - sha256 = "1jf72dzmgwrkqbr2f8s2dvf0zpvl3vbdq0qsf0g8xal272l7cmca"; + sha256 = "0rris2p7ic9p9ms3qcczia4nn5mb1yx2gv5mlnmg2yligjad2jaf"; }; buildInputs = [ buildbot-pkg ]; diff --git a/pkgs/development/python-modules/buildbot/worker.nix b/pkgs/development/python-modules/buildbot/worker.nix index bf5e1e6ae98..02139d15e75 100644 --- a/pkgs/development/python-modules/buildbot/worker.nix +++ b/pkgs/development/python-modules/buildbot/worker.nix @@ -7,7 +7,7 @@ buildPythonPackage (rec { src = fetchPypi { inherit pname version; - sha256 = "1s51ycgnvjbxc2y358vw6rnw8xsx9grj6pxzfxjrph784igy22r0"; + sha256 = "10ap7jlxs9vcmnyafr62mxlgsp709165nw55xmv9sw18r7m8wsm6"; }; propagatedBuildInputs = [ twisted future ]; diff --git a/pkgs/development/python-modules/cytoolz/default.nix b/pkgs/development/python-modules/cytoolz/default.nix index 0e72ecaa825..4e862d26092 100644 --- a/pkgs/development/python-modules/cytoolz/default.nix +++ b/pkgs/development/python-modules/cytoolz/default.nix @@ -22,9 +22,8 @@ buildPythonPackage rec { checkInputs = [ nose ]; propagatedBuildInputs = [ toolz ]; - # Failing test https://github.com/pytoolz/cytoolz/issues/122 checkPhase = '' - NOSE_EXCLUDE=test_introspect_builtin_modules nosetests -v $out/${python.sitePackages} + nosetests -v $out/${python.sitePackages} ''; meta = { diff --git a/pkgs/development/python-modules/dask-ml/default.nix b/pkgs/development/python-modules/dask-ml/default.nix index 4836fe35d18..737def7b9ac 100644 --- a/pkgs/development/python-modules/dask-ml/default.nix +++ b/pkgs/development/python-modules/dask-ml/default.nix @@ -20,13 +20,13 @@ }: buildPythonPackage rec { - version = "1.7.0"; + version = "1.8.0"; pname = "dask-ml"; disabled = pythonOlder "3.6"; # >= 3.6 src = fetchPypi { inherit pname version; - sha256 = "5f93e8560217ebbc5a2254eaf705e9cad8e1c82012567c658e26464a74fbab76"; + sha256 = "8fc4ac3ec1915e382fb8cae9ff1ec9b5ac1bee0b6f4c6975d6e6cb7191a4a815"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/databricks-connect/default.nix b/pkgs/development/python-modules/databricks-connect/default.nix index 299fa824034..a97d9bc0c98 100644 --- a/pkgs/development/python-modules/databricks-connect/default.nix +++ b/pkgs/development/python-modules/databricks-connect/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "databricks-connect"; - version = "7.3.7"; + version = "7.3.8"; src = fetchPypi { inherit pname version; - sha256 = "35ead50a0550e65a7d6fd78e2c8e54095b53514fba85180768a2dbcdd3f2cf0b"; + sha256 = "0c0f036cf30e00fdc47c983875c72d16a3073ae9be9bcf39371514280f00a82d"; }; sourceRoot = "."; diff --git a/pkgs/development/python-modules/dependency-injector/default.nix b/pkgs/development/python-modules/dependency-injector/default.nix index 979d2811fe6..5ed5a3eb152 100644 --- a/pkgs/development/python-modules/dependency-injector/default.nix +++ b/pkgs/development/python-modules/dependency-injector/default.nix @@ -9,11 +9,11 @@ in buildPythonPackage rec { pname = "dependency-injector"; - version = "4.5.4"; + version = "4.10.3"; src = fetchPypi { inherit pname version; - sha256 = "99e65335cb84d543ebb47e76edadc695d062e5c25cc474698f50ed5e2aaa9002"; + sha256 = "93db83fac85bcb861469c0db1af11f4bc874aa2f9380151189a05d38c21afd60"; }; propagatedBuildInputs = [ six ]; diff --git a/pkgs/development/python-modules/django-cache-url/default.nix b/pkgs/development/python-modules/django-cache-url/default.nix index 6487e276232..dee64ebd6ee 100644 --- a/pkgs/development/python-modules/django-cache-url/default.nix +++ b/pkgs/development/python-modules/django-cache-url/default.nix @@ -1,29 +1,29 @@ { lib , buildPythonPackage -, fetchPypi -, pytest +, fetchFromGitHub +, pytestCheckHook }: buildPythonPackage rec { - version = "3.1.2"; + version = "3.2.2"; pname = "django-cache-url"; - src = fetchPypi { - inherit pname version; - sha256 = "d0ee0d6c5daab92787bff47a4a6f5a6cf97c3c80d81a990820b2af16e12ad65a"; + src = fetchFromGitHub { + owner = "epicserve"; + repo = "django-cache-url"; + rev = "v${version}"; + sha256 = "0fxma2w6zl3cfl6wnynmlmp8snks67ffz4jcq4qmdc65xv1l204l"; }; - checkInputs = [ pytest ]; - - checkPhase = '' - pytest tests + postPatch = '' + # disable coverage tests + sed -i '/--cov/d' setup.cfg ''; - # tests not included with pypi release - doCheck = false; + checkInputs = [ pytestCheckHook ]; meta = with lib; { - homepage = "https://github.com/ghickman/django-cache-url"; + homepage = "https://github.com/epicserve/django-cache-url"; description = "Use Cache URLs in your Django application"; license = licenses.mit; maintainers = [ maintainers.costrouc ]; diff --git a/pkgs/development/python-modules/django-cors-headers/default.nix b/pkgs/development/python-modules/django-cors-headers/default.nix index 313ae32f04e..1bc9153d006 100644 --- a/pkgs/development/python-modules/django-cors-headers/default.nix +++ b/pkgs/development/python-modules/django-cors-headers/default.nix @@ -1,22 +1,30 @@ -{ lib, - fetchPypi, - django, - buildPythonPackage +{ lib +, fetchFromGitHub +, buildPythonPackage +, django +, pytest-django +, pytestCheckHook }: buildPythonPackage rec { pname = "django-cors-headers"; - version = "3.6.0"; + version = "3.7.0"; - src = fetchPypi { - inherit pname version; - sha256 = "5665fc1b1aabf1b678885cf6f8f8bd7da36ef0a978375e767d491b48d3055d8f"; + src = fetchFromGitHub { + owner = "adamchainz"; + repo = "django-cors-headers"; + rev = version; + sha256 = "1wc8cs1gpg9v98bq5qwnd4pcv043za50wd63gwkm86lbvjxyxynz"; }; - propagatedBuildInputs = [ django ]; + propagatedBuildInputs = [ + django + ]; - # pypi release does not include tests - doCheck = false; + checkInputs = [ + pytest-django + pytestCheckHook + ]; meta = with lib; { description = "Django app for handling server Cross-Origin Resource Sharing (CORS) headers"; diff --git a/pkgs/development/python-modules/django-sampledatahelper/default.nix b/pkgs/development/python-modules/django-sampledatahelper/default.nix index faad550d439..4ff2b7ba853 100644 --- a/pkgs/development/python-modules/django-sampledatahelper/default.nix +++ b/pkgs/development/python-modules/django-sampledatahelper/default.nix @@ -1,30 +1,39 @@ -{ lib, buildPythonPackage, fetchPypi, - django, nose, pillow, sampledata, six, versiontools +{ lib +, buildPythonPackage +, fetchFromGitHub +, versiontools +, django +, sampledata +, nose +, pillow +, six }: buildPythonPackage rec { pname = "django-sampledatahelper"; version = "0.5"; - meta = { - description = "Helper class for generate sample data for django apps development"; - homepage = "https://github.com/kaleidos/django-sampledatahelper"; - license = lib.licenses.bsd3; + # no tests on PyPI + src = fetchFromGitHub { + owner = "kaleidos"; + repo = "django-sampledatahelper"; + rev = "8576f352ec26a3650f4386a6e1285b723f6aec23"; # no tag + sha256 = "1fx3ql4b9791594zkary19n20x5ra1m1n3pjaya9di1qy64csac4"; }; - src = fetchPypi { - inherit pname version; - sha256 = "3fbc5533f1055f9d1944097f6271e8b18fcf4ed5cc582b518616445145300015"; - }; + nativeBuildInputs = [ versiontools ]; - buildInputs = [ django nose pillow sampledata six versiontools ]; propagatedBuildInputs = [ django sampledata ]; - # HACK To prevent collision with pythonPackages.sampledata - preBuild = '' - rm tests/* + checkInputs = [ nose pillow six ]; + + checkPhase = '' + DJANGO_SETTINGS_MODULE=tests.settings NOSE_EXCLUDE=test_calling_command nosetests -v ''; - # ERROR: test_image_from_directory (tests.tests.TestImageHelpers) - doCheck = false; + meta = { + description = "Helper class for generate sample data for django apps development"; + homepage = "https://github.com/kaleidos/django-sampledatahelper"; + license = lib.licenses.bsd3; + }; } diff --git a/pkgs/development/python-modules/django/2.nix b/pkgs/development/python-modules/django/2.nix index eac48593de2..06ec880e328 100644 --- a/pkgs/development/python-modules/django/2.nix +++ b/pkgs/development/python-modules/django/2.nix @@ -6,13 +6,13 @@ buildPythonPackage rec { pname = "Django"; - version = "2.2.17"; + version = "2.2.18"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "cf5370a4d7765a9dd6d42a7b96b53c74f9446cd38209211304b210fe0404b861"; + sha256 = "1d0b91343i9n0qz8xia1fbm4s3q8wi98nyc9a3acncm0w3sr9jf9"; }; patches = lib.optional withGdal diff --git a/pkgs/development/python-modules/docutils/default.nix b/pkgs/development/python-modules/docutils/default.nix index e24a00564be..bae0acc1d45 100644 --- a/pkgs/development/python-modules/docutils/default.nix +++ b/pkgs/development/python-modules/docutils/default.nix @@ -29,9 +29,10 @@ buildPythonPackage rec { done ''; - meta = { + meta = with lib; { description = "Python Documentation Utilities"; homepage = "http://docutils.sourceforge.net/"; - maintainers = with lib.maintainers; [ AndersonTorres ]; + license = with licenses; [ publicDomain bsd2 psfl gpl3Plus ]; + maintainers = with maintainers; [ AndersonTorres ]; }; } diff --git a/pkgs/development/python-modules/dulwich/default.nix b/pkgs/development/python-modules/dulwich/default.nix index 5d4ac94f7fa..4cc3f34929b 100644 --- a/pkgs/development/python-modules/dulwich/default.nix +++ b/pkgs/development/python-modules/dulwich/default.nix @@ -1,15 +1,24 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi -, urllib3, certifi -, gevent, geventhttpclient, mock, fastimport -, git, glibcLocales }: +{ lib +, stdenv +, buildPythonPackage +, certifi +, fastimport +, fetchPypi +, gevent +, geventhttpclient +, git +, glibcLocales +, mock +, urllib3 +}: buildPythonPackage rec { - version = "0.20.15"; + version = "0.20.18"; pname = "dulwich"; src = fetchPypi { inherit pname version; - sha256 = "1248942fr12av2rkzpm2fq0qn6rajvv2lcgq65h8kby27qvp65zv"; + sha256 = "sha256-ATE4f5uZrsxprJhlWzkx8q1D2lPTpj4FD6Om1iYKxVQ="; }; LC_ALL = "en_US.UTF-8"; @@ -21,6 +30,8 @@ buildPythonPackage rec { doCheck = !stdenv.isDarwin; + pythonImportsCheck = [ "dulwich" ]; + meta = with lib; { description = "Simple Python implementation of the Git file formats and protocols"; longDescription = '' @@ -29,7 +40,7 @@ buildPythonPackage rec { ''; homepage = "https://www.dulwich.io/"; changelog = "https://github.com/dulwich/dulwich/blob/dulwich-${version}/NEWS"; - license = with licenses; [ asl20 gpl2Plus]; + license = with licenses; [ asl20 gpl2Plus ]; maintainers = with maintainers; [ koral ]; }; } diff --git a/pkgs/development/python-modules/factory_boy/default.nix b/pkgs/development/python-modules/factory_boy/default.nix index a953632f9fd..845e27dcc44 100644 --- a/pkgs/development/python-modules/factory_boy/default.nix +++ b/pkgs/development/python-modules/factory_boy/default.nix @@ -1,30 +1,43 @@ { lib , buildPythonPackage -, fetchPypi -, isPy27 +, django , faker -, python -, ipaddress +, fetchPypi +, flask +, flask_sqlalchemy +, mongoengine +, pytestCheckHook +, sqlalchemy }: buildPythonPackage rec { pname = "factory_boy"; - version = "3.1.0"; + version = "3.2.0"; src = fetchPypi { inherit pname version; - sha256 = "ded73e49135c24bd4d3f45bf1eb168f8d290090f5cf4566b8df3698317dc9c08"; + sha256 = "0nsw2mdjk8sqds3qsix4cf19ws6i0fak79349pw2581ryc7w0720"; }; - propagatedBuildInputs = [ faker ] ++ lib.optionals isPy27 [ ipaddress ]; + propagatedBuildInputs = [ faker ]; - # tests not included with pypi release - doCheck = false; + checkInputs = [ + django + flask + flask_sqlalchemy + mongoengine + pytestCheckHook + sqlalchemy + ]; + + # Checks for MongoDB requires an a running DB + disabledTests = [ "MongoEngineTestCase" ]; + pythonImportsCheck = [ "factory" ]; meta = with lib; { - description = "A Python package to create factories for complex objects"; - homepage = "https://github.com/rbarrois/factory_boy"; - license = licenses.mit; + description = "Python package to create factories for complex objects"; + homepage = "https://github.com/rbarrois/factory_boy"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; }; - } diff --git a/pkgs/development/python-modules/fonttools/default.nix b/pkgs/development/python-modules/fonttools/default.nix index cd91eb08be0..75f4908b63b 100644 --- a/pkgs/development/python-modules/fonttools/default.nix +++ b/pkgs/development/python-modules/fonttools/default.nix @@ -20,14 +20,14 @@ buildPythonPackage rec { pname = "fonttools"; - version = "4.18.2"; + version = "4.19.1"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "0h750gvwpsp7fpmgfwkx93gkaf0m1s698g6r7n4xlaji563nlkiv"; + sha256 = "16jz3g4jzfdc43hs33b59vzd9m233qgflvy3ycdynifqk16lqsp2"; }; # all dependencies are optional, but diff --git a/pkgs/development/python-modules/globus-sdk/default.nix b/pkgs/development/python-modules/globus-sdk/default.nix index 20d47dfe7e9..0c2d74a90e1 100644 --- a/pkgs/development/python-modules/globus-sdk/default.nix +++ b/pkgs/development/python-modules/globus-sdk/default.nix @@ -1,35 +1,37 @@ { lib , buildPythonPackage -, flake8 -, nose2 -, mock +, fetchFromGitHub , requests , pyjwt -, fetchPypi +, pytestCheckHook +, responses }: buildPythonPackage rec { pname = "globus-sdk"; - version = "1.10.0"; + version = "2.0.1"; - src = fetchPypi { - inherit pname version; - sha256 = "b33021b58edacc16bf2ba8453efbb26a8b04242ee3f4d62dcdaa3c6e199f136f"; + src = fetchFromGitHub { + owner = "globus"; + repo = "globus-sdk-python"; + rev = version; + sha256 = "1kqnr50iwcq9nx40lblbqzf327cdcbkrir6vh70067hk33rq0gm9"; }; - checkPhase = '' - py.test tests - ''; + propagatedBuildInputs = [ + requests + pyjwt + ]; - # No tests in archive - doCheck = false; + checkInputs = [ + pytestCheckHook + responses + ]; - checkInputs = [ flake8 nose2 mock ]; - - propagatedBuildInputs = [ requests pyjwt ]; + pythonImportsCheck = [ "globus_sdk" ]; meta = with lib; { - description = "A convenient Pythonic interface to Globus REST APIs, including the Transfer API and the Globus Auth API."; + description = "A convenient Pythonic interface to Globus REST APIs, including the Transfer API and the Globus Auth API"; homepage = "https://github.com/globus/globus-sdk-python"; license = licenses.asl20; maintainers = with maintainers; [ ixxie ]; diff --git a/pkgs/development/python-modules/gtts/default.nix b/pkgs/development/python-modules/gtts/default.nix index 0fc9d43dc2c..f3e8162b714 100644 --- a/pkgs/development/python-modules/gtts/default.nix +++ b/pkgs/development/python-modules/gtts/default.nix @@ -15,13 +15,13 @@ buildPythonPackage rec { pname = "gtts"; - version = "2.2.1"; + version = "2.2.2"; src = fetchFromGitHub { owner = "pndurette"; repo = "gTTS"; rev = "v${version}"; - sha256 = "1a984691kfin1n896p5l7y8ggjzx19ynih2cw040smfms0azhp4w"; + sha256 = "052l7gk1v0zckraavyba1bc2cqvmrbffwxxjsklgnslbdcg5h514"; }; propagatedBuildInputs = [ @@ -47,6 +47,7 @@ buildPythonPackage rec { meta = with lib; { description = "A Python library and CLI tool to interface with Google Translate text-to-speech API"; homepage = "https://gtts.readthedocs.io"; + changelog = "https://gtts.readthedocs.io/en/latest/changelog.html"; license = licenses.mit; maintainers = with maintainers; [ unode ]; }; diff --git a/pkgs/development/python-modules/h3/default.nix b/pkgs/development/python-modules/h3/default.nix index 46b774a25c1..e66a3f5e9fc 100644 --- a/pkgs/development/python-modules/h3/default.nix +++ b/pkgs/development/python-modules/h3/default.nix @@ -1,35 +1,69 @@ -{ lib, stdenv +{ autoPatchelfHook , buildPythonPackage , cmake -, fetchPypi +, cython +, fetchFromGitHub , h3 -, python +, lib +, numpy +, pytestCheckHook +, scikit-build +, stdenv }: buildPythonPackage rec { pname = "h3"; - version = "3.7.0"; + version = "3.7.1"; - src = fetchPypi { - inherit pname version; - sha256 = "cd27fc8ecd9183f93934079b7c986401f499030ff2e2171eace9de462fab561d"; + # pypi version does not include tests + src = fetchFromGitHub { + owner = "uber"; + repo = "h3-py"; + rev = "v${version}"; + sha256 = "sha256-MIVV3kZGsIsaJ/ccJOK3+j1VwkUsZGHS5d1sGOBa1Ec="; }; - patches = [ - ./disable-custom-install.patch - ./hardcode-h3-path.patch + dontConfigure = true; + + checkInputs = [ pytestCheckHook ]; + + nativeBuildInputs = [ + scikit-build cmake cython + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ + # On Linux the .so files ends up referring to libh3.so instead of the full + # Nix store path. I'm not sure why this is happening! On Darwin it works + # fine. + autoPatchelfHook ]; - preBuild = '' - substituteInPlace h3/h3.py \ - --subst-var-by libh3_path ${h3}/lib/libh3${stdenv.hostPlatform.extensions.sharedLibrary} - ''; + # This is not needed per-se, it's only added for autoPatchelfHook to work + # correctly. See the note above ^^ + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ h3 ]; + + propagatedBuildInputs = [ numpy ]; + + # The following prePatch replaces the h3lib compilation with using the h3 packaged in nixpkgs. + # + # - Remove the h3lib submodule. + # - Patch CMakeLists to avoid building h3lib, and use h3 instead. + prePatch = + let + cmakeCommands = '' + include_directories(${h3}/include/h3) + link_directories(${h3}/lib) + ''; + in '' + rm -r src/h3lib + substituteInPlace CMakeLists.txt --replace "add_subdirectory(src/h3lib)" "${cmakeCommands}" + ''; + + # Extra check to make sure we can import it from Python + pythonImportsCheck = [ "h3" ]; meta = with lib; { homepage = "https://github.com/uber/h3-py"; - description = "This library provides Python bindings for the H3 Core Library."; + description = "Hierarchical hexagonal geospatial indexing system"; license = licenses.asl20; - platforms = platforms.unix ++ platforms.darwin; maintainers = [ maintainers.kalbasit ]; }; } diff --git a/pkgs/development/python-modules/h3/disable-custom-install.patch b/pkgs/development/python-modules/h3/disable-custom-install.patch deleted file mode 100644 index 981e3b6e2fc..00000000000 --- a/pkgs/development/python-modules/h3/disable-custom-install.patch +++ /dev/null @@ -1,41 +0,0 @@ -diff --git a/setup.py b/setup.py -index 8e1c220..45297b6 100644 ---- a/setup.py -+++ b/setup.py -@@ -25,20 +25,6 @@ class CustomBuildExtCommand(build_ext): - install_h3(h3_version) - - --# Tested with wheel v0.29.0 --class BinaryDistribution(Distribution): -- def __init__(self, attrs=None): -- Distribution.__init__(self, attrs) -- # The values used for the name and sources in the Extension below are -- # not important, because we override the build_ext command above. -- # The normal C extension building logic is never invoked, and is -- # replaced with our own custom logic. However, ext_modules cannot be -- # empty, because this signals to other parts of distutils that our -- # package contains C extensions and thus needs to be built for -- # different platforms separately. -- self.ext_modules = [Extension('h3c', [])] -- -- - long_description = open('README.rst').read() - - setup( -@@ -52,14 +38,10 @@ setup( - url='https://github.com/uber/h3-py.git', - packages=find_packages(exclude=['tests', 'tests.*']), - install_requires=[], -- cmdclass={ -- 'build_ext': CustomBuildExtCommand, -- }, - package_data={ - 'h-py': - ['out/*.dylib' if platform.system() == 'Darwin' else ( - 'out/*.dll' if platform.system() == 'Windows' else - 'out/*.so.*')] - }, -- license='Apache License 2.0', -- distclass=BinaryDistribution) -+ license='Apache License 2.0') diff --git a/pkgs/development/python-modules/h3/hardcode-h3-path.patch b/pkgs/development/python-modules/h3/hardcode-h3-path.patch deleted file mode 100644 index 87549f298d7..00000000000 --- a/pkgs/development/python-modules/h3/hardcode-h3-path.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff --git a/h3/h3.py b/h3/h3.py -index 18cf168..2cc7812 100644 ---- a/h3/h3.py -+++ b/h3/h3.py -@@ -34,13 +34,7 @@ from ctypes import ( - POINTER, - ) - --_dirname = os.path.dirname(__file__) --libh3_path = ('{}/{}'.format(_dirname, 'out/libh3.1.dylib') -- if platform.system() == 'Darwin' else ( -- '{}/{}'.format(_dirname, 'out/h3.dll') if platform.system() == 'Windows' else -- '{}/{}'.format(_dirname, 'out/libh3.so.1'))) -- --libh3 = cdll.LoadLibrary(libh3_path) -+libh3 = cdll.LoadLibrary('@libh3_path@') - - # Type of an H3 index - H3Index = c_ulonglong diff --git a/pkgs/development/python-modules/helper/default.nix b/pkgs/development/python-modules/helper/default.nix index 8560364d4f4..1697c727039 100644 --- a/pkgs/development/python-modules/helper/default.nix +++ b/pkgs/development/python-modules/helper/default.nix @@ -1,19 +1,35 @@ -{ lib, buildPythonPackage, fetchPypi, pyyaml, mock }: +{ lib +, buildPythonPackage +, fetchFromGitHub +, pyyaml +, pytestCheckHook +, mock +}: buildPythonPackage rec { pname = "helper"; - version = "2.4.2"; + version = "2.5.0"; - src = fetchPypi { - inherit pname version; - sha256 = "0p56dvjpaz9wnr0ik2wmvgqjf9ji180bhjky7q272l5dan94lgd6"; + src = fetchFromGitHub { + owner = "gmr"; + repo = pname; + rev = version; + sha256 = "0zypjv8rncvrsgl200v7d3bn08gs48dwqvgamfqv71h07cj6zngp"; }; - checkInputs = [ mock ]; - propagatedBuildInputs = [ pyyaml ]; + propagatedBuildInputs = [ + pyyaml + ]; - # No tests in the pypi tarball - doCheck = false; + checkInputs = [ + pytestCheckHook + mock + ]; + + pythonImportsCheck = [ + "helper" + "helper.config" + ]; meta = with lib; { description = "Development library for quickly writing configurable applications and daemons"; diff --git a/pkgs/development/python-modules/hmmlearn/default.nix b/pkgs/development/python-modules/hmmlearn/default.nix index 3f601eacc42..8d2afcf5e72 100644 --- a/pkgs/development/python-modules/hmmlearn/default.nix +++ b/pkgs/development/python-modules/hmmlearn/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "hmmlearn"; - version = "0.2.4"; + version = "0.2.5"; src = fetchurl { url = "mirror://pypi/h/hmmlearn/${pname}-${version}.tar.gz"; - sha256 = "0f5cb598a7494b9703c6188246dc89e529d46cbb6700eca70cc895085f0b3cc3"; + sha256 = "14fb4ad3fb7529785844a25fae5d32272619fb5973cc02c8784018055470ca01"; }; buildInputs = [ setuptools_scm cython ]; diff --git a/pkgs/development/python-modules/howdoi/default.nix b/pkgs/development/python-modules/howdoi/default.nix index cc6003fa952..e6323c951ee 100644 --- a/pkgs/development/python-modules/howdoi/default.nix +++ b/pkgs/development/python-modules/howdoi/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "howdoi"; - version = "2.0.8"; + version = "2.0.10"; src = fetchPypi { inherit pname version; - sha256 = "9b7cabab87cd614e26b408653bc8937ec27b79ca2fde6b9457da55d2541f75fb"; + sha256 = "e561e3c5d4f39ab1f86e9f24bb0b2803ee6e312de61e90907f739aa638f35215"; }; postPatch = '' diff --git a/pkgs/development/python-modules/html2text/default.nix b/pkgs/development/python-modules/html2text/default.nix index dd23ad6c619..51b92c8a4f6 100644 --- a/pkgs/development/python-modules/html2text/default.nix +++ b/pkgs/development/python-modules/html2text/default.nix @@ -1,5 +1,8 @@ -{ lib, buildPythonPackage, fetchFromGitHub, pythonOlder -, pytest +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, pytestCheckHook }: buildPythonPackage rec { @@ -14,15 +17,13 @@ buildPythonPackage rec { sha256 = "1y924clp2hiqg3a9437z808p29mqcx537j5fmz71plx8qrcm5jf9"; }; - # python setup.py test is broken, use pytest - checkInputs = [ pytest ]; - checkPhase = '' - pytest - ''; + checkInputs = [ pytestCheckHook ]; + + pythonImportsCheck = [ "html2text" ]; meta = with lib; { description = "Turn HTML into equivalent Markdown-structured text"; homepage = "https://github.com/Alir3z4/html2text/"; - license = licenses.gpl3; + license = licenses.gpl3Only; }; } diff --git a/pkgs/development/python-modules/hvac/default.nix b/pkgs/development/python-modules/hvac/default.nix index 9ce859c9b76..f7eb2948414 100644 --- a/pkgs/development/python-modules/hvac/default.nix +++ b/pkgs/development/python-modules/hvac/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "hvac"; - version = "0.10.6"; + version = "0.10.7"; src = fetchPypi { inherit pname version; - sha256 = "b0561dbdfecc6a6d7b0cc226d75a800ae9bbc93313a6ad526a1adc97be51eada"; + sha256 = "6ee2ba6002f11151472fa873b6637d902fc6045a2193aea08b39ae8147c230ba"; }; propagatedBuildInputs = [ requests six ]; @@ -14,6 +14,8 @@ buildPythonPackage rec { # Requires running a Vault server doCheck = false; + pythonImportsCheck = [ "hvac" ]; + meta = with lib; { description = "HashiCorp Vault API client"; homepage = "https://github.com/ianunruh/hvac"; diff --git a/pkgs/development/python-modules/jc/default.nix b/pkgs/development/python-modules/jc/default.nix index b4590ed28d3..ac0d51489a2 100644 --- a/pkgs/development/python-modules/jc/default.nix +++ b/pkgs/development/python-modules/jc/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "jc"; - version = "1.14.1"; + version = "1.14.2"; disabled = isPy27; src = fetchFromGitHub { owner = "kellyjonbrazil"; repo = "jc"; rev = "v${version}"; - sha256 = "1vzzz7dlg6apxhcl0qkfdpp2v9d0q6jyafpfmklkcbjs31zvwcsw"; + sha256 = "sha256-rYH4m7h2SPB1Io83ZUsqZ+Ll4XEi4Feuj4QYvaOJ2lY="; }; propagatedBuildInputs = [ ruamel_yaml xmltodict pygments ]; diff --git a/pkgs/development/python-modules/libpurecool/default.nix b/pkgs/development/python-modules/libpurecool/default.nix new file mode 100644 index 00000000000..aa523d9a98b --- /dev/null +++ b/pkgs/development/python-modules/libpurecool/default.nix @@ -0,0 +1,47 @@ +{ lib +, buildPythonPackage +, fetchPypi +, netifaces +, paho-mqtt +, pycryptodome +, requests +, six +, zeroconf +}: + +buildPythonPackage rec { + pname = "libpurecool"; + version = "0.6.4"; + + src = fetchPypi { + inherit pname version; + sha256 = "1kwbinbg0i4fca1bpx6jwa1fiw71vg0xa89jhq4pmnl5cn9c8kqx"; + }; + + # Remove vendorized zeroconf, https://github.com/etheralm/libpurecool/issues/33 + postPatch = '' + rm libpurecool/zeroconf.py + substituteInPlace libpurecool/dyson_pure_cool_link.py \ + --replace "from .zeroconf import ServiceBrowser, Zeroconf" "from zeroconf import ServiceBrowser, Zeroconf" + ''; + + propagatedBuildInputs = [ + netifaces + paho-mqtt + pycryptodome + requests + six + zeroconf + ]; + + # Tests are only present in repo, https://github.com/etheralm/libpurecool/issues/36 + doCheck = false; + pythonImportsCheck = [ "libpurecool" ]; + + meta = with lib; { + description = "Python library for Dyson devices"; + homepage = "http://libpurecool.readthedocs.io"; + license = with licenses; [ asl20 ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/libvirt/5.9.0.nix b/pkgs/development/python-modules/libvirt/5.9.0.nix index bfc6b711ab2..9cbd042c55a 100644 --- a/pkgs/development/python-modules/libvirt/5.9.0.nix +++ b/pkgs/development/python-modules/libvirt/5.9.0.nix @@ -18,6 +18,10 @@ buildPythonPackage rec { nosetests ''; + passthru = { + inherit libvirt; + }; + meta = with lib; { homepage = "http://www.libvirt.org/"; description = "libvirt Python bindings"; diff --git a/pkgs/development/python-modules/limnoria/default.nix b/pkgs/development/python-modules/limnoria/default.nix index ff7ac9fb3f9..86a505d4448 100644 --- a/pkgs/development/python-modules/limnoria/default.nix +++ b/pkgs/development/python-modules/limnoria/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "limnoria"; - version = "2020.12.05"; + version = "2021.01.15"; disabled = isPy27; # abandoned upstream src = fetchPypi { inherit pname version; - sha256 = "c4310ea12d1ac39984a96c40a12fab92aefc3d77a615f89ef542b10497ae56fa"; + sha256 = "5d7109fc779c44070e3c57186eae59b133014835d5fe15b262fa9438d7599c81"; }; patchPhase = '' diff --git a/pkgs/development/python-modules/mautrix/default.nix b/pkgs/development/python-modules/mautrix/default.nix index 8c77cffc4d0..d46b505991f 100644 --- a/pkgs/development/python-modules/mautrix/default.nix +++ b/pkgs/development/python-modules/mautrix/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "mautrix"; - version = "0.8.11"; + version = "0.8.12"; src = fetchPypi { inherit pname version; - sha256 = "d1958b9bd8c2631ccd6ebd4a54e35e5190dae2c0daeb786aec02f263b2c2e0b1"; + sha256 = "471684d40cbc2f7db345f2f809553b221a34d1c81e04bcdcb08a2832f140db1e"; }; propagatedBuildInputs = [ @@ -26,6 +26,8 @@ buildPythonPackage rec { # no tests available doCheck = false; + pythonImportsCheck = [ "mautrix" ]; + meta = with lib; { homepage = "https://github.com/tulir/mautrix-python"; description = "A Python 3 asyncio Matrix framework."; diff --git a/pkgs/development/python-modules/nbconflux/default.nix b/pkgs/development/python-modules/nbconflux/default.nix index 4e443a377ed..42d9ae3cf38 100644 --- a/pkgs/development/python-modules/nbconflux/default.nix +++ b/pkgs/development/python-modules/nbconflux/default.nix @@ -1,4 +1,12 @@ -{ lib, buildPythonPackage, fetchFromGitHub, isPy27, nbconvert, pytest, requests, responses }: +{ lib +, buildPythonPackage +, fetchFromGitHub +, isPy27 +, nbconvert +, pytestCheckHook +, requests +, responses +}: buildPythonPackage rec { pname = "nbconflux"; @@ -14,11 +22,13 @@ buildPythonPackage rec { propagatedBuildInputs = [ nbconvert requests ]; - checkInputs = [ pytest responses ]; + checkInputs = [ pytestCheckHook responses ]; - checkPhase = '' - pytest tests - ''; + JUPYTER_PATH="${nbconvert}/share/jupyter"; + disabledTests = [ + "test_post_to_confluence" + "test_optional_components" + ]; meta = with lib; { description = "Converts Jupyter Notebooks to Atlassian Confluence (R) pages using nbconvert"; diff --git a/pkgs/development/python-modules/nbsphinx/default.nix b/pkgs/development/python-modules/nbsphinx/default.nix index fb5eb6cbf7c..979b357607e 100644 --- a/pkgs/development/python-modules/nbsphinx/default.nix +++ b/pkgs/development/python-modules/nbsphinx/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "nbsphinx"; - version = "0.8.0"; + version = "0.8.1"; src = fetchPypi { inherit pname version; - sha256 = "369c16fe93af14c878d61fb3e81d838196fb35b27deade2cd7b95efe1fe56ea0"; + sha256 = "19lf036h0d9ryqasrh91myhn3dq5zcw4rik9jy6sayq7l6irmm94"; }; propagatedBuildInputs = [ @@ -29,9 +29,13 @@ buildPythonPackage rec { traitlets ]; - checkPhase = '' - ${python.interpreter} -m nbsphinx - ''; + # The package has not tests + doCheck = false; + + JUPYTER_PATH = "${nbconvert}/share/jupyter"; + pythonImportsCheck = [ + "nbsphinx" + ]; disabled = !isPy3k; diff --git a/pkgs/development/python-modules/pelican/default.nix b/pkgs/development/python-modules/pelican/default.nix index 71bec7e42df..1ae27b5ecf8 100644 --- a/pkgs/development/python-modules/pelican/default.nix +++ b/pkgs/development/python-modules/pelican/default.nix @@ -6,7 +6,7 @@ buildPythonPackage rec { pname = "pelican"; - version = "4.5.0"; + version = "4.5.4"; disabled = isPy27; @@ -14,7 +14,7 @@ buildPythonPackage rec { owner = "getpelican"; repo = "pelican"; rev = version; - sha256 = "0p8p84fcpkr19d54dhxvldd8ijbg334wmrmkr99pnbrdl1gf64qi"; + sha256 = "08l8kk3c7ca1znxmgdmfgzn28dzjcziwflzq80fn9zigqj0y7fi8"; # Remove unicode file names which leads to different checksums on HFS+ # vs. other filesystems because of unicode normalisation. extraPostFetch = '' @@ -27,6 +27,8 @@ buildPythonPackage rec { # Exclude custom locale test, which files were removed above to fix the source checksum checkPhase = '' nosetests -s \ + --exclude=test_basic_generation_works \ + --exclude=test_custom_generation_works \ --exclude=test_custom_locale_generation_works \ --exclude=test_log_filter \ pelican diff --git a/pkgs/development/python-modules/phonopy/default.nix b/pkgs/development/python-modules/phonopy/default.nix index 2259fcd7ba5..e68516fb07f 100644 --- a/pkgs/development/python-modules/phonopy/default.nix +++ b/pkgs/development/python-modules/phonopy/default.nix @@ -1,19 +1,26 @@ -{ lib, buildPythonPackage, python, fetchPypi, numpy, pyyaml, matplotlib, h5py, spglib, pytestCheckHook }: +{ lib +, buildPythonPackage +, fetchPypi +, numpy +, pyyaml +, matplotlib +, h5py +, spglib +, pytestCheckHook +}: buildPythonPackage rec { pname = "phonopy"; - version = "2.8.1"; + version = "2.9.1"; src = fetchPypi { inherit pname version; - sha256 = "28864b04adb900597705f1367a100da869af835088bdd13f1693c4382259f128"; + sha256 = "1jaizhkb59ixknvc75nrhfq51bh75912q8ay36bxpf4g5hzyhw3a"; }; propagatedBuildInputs = [ numpy pyyaml matplotlib h5py spglib ]; checkInputs = [ pytestCheckHook ]; - # flakey due to floating point inaccuracy - disabledTests = [ "test_NaCl" ]; # prevent pytest from importing local directory preCheck = '' diff --git a/pkgs/development/python-modules/pikepdf/default.nix b/pkgs/development/python-modules/pikepdf/default.nix index 38efe0a49b0..8ed27ea962e 100644 --- a/pkgs/development/python-modules/pikepdf/default.nix +++ b/pkgs/development/python-modules/pikepdf/default.nix @@ -1,4 +1,5 @@ -{ attrs +{ lib +, attrs , buildPythonPackage , defusedxml , fetchPypi @@ -6,29 +7,28 @@ , isPy3k , lxml , pillow +, psutil , pybind11 -, pytestCheckHook +, pytest-cov , pytest-helpers-namespace , pytest-timeout -, pytest_xdist -, pytestrunner +, pytest-xdist +, pytestCheckHook , python-dateutil , python-xmp-toolkit -, python3 , qpdf +, setuptools-scm , setuptools-scm-git-archive -, setuptools_scm -, lib }: buildPythonPackage rec { pname = "pikepdf"; - version = "2.2.0"; + version = "2.5.2"; disabled = ! isPy3k; src = fetchPypi { inherit pname version; - sha256 = "74300a32c41b3d578772f6933f23a88b19f74484185e71e5225ce2f7ea5aea78"; + sha256 = "sha256-j8PpeyTa+9SxrAV8jxRMGEZ85V00KhqMQmiIkOrVjvM="; }; buildInputs = [ @@ -38,36 +38,34 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools-scm-git-archive - setuptools_scm + setuptools-scm ]; checkInputs = [ attrs hypothesis - pillow - pytestCheckHook pytest-helpers-namespace pytest-timeout - pytest_xdist - pytestrunner + pytest-xdist + psutil + pytest-cov + pytestCheckHook python-dateutil python-xmp-toolkit ]; - propagatedBuildInputs = [ defusedxml lxml ]; - - postPatch = '' - sed -i \ - -e 's/^pytest .*/pytest/g' \ - -e 's/^attrs .*/attrs/g' \ - -e 's/^hypothesis .*/hypothesis/g' \ - requirements/test.txt - ''; + propagatedBuildInputs = [ + defusedxml + lxml + pillow + ]; preBuild = '' HOME=$TMPDIR ''; + pythonImportsCheck = [ "pikepdf" ]; + meta = with lib; { homepage = "https://github.com/pikepdf/pikepdf"; description = "Read and write PDFs with Python, powered by qpdf"; diff --git a/pkgs/development/python-modules/pixelmatch/default.nix b/pkgs/development/python-modules/pixelmatch/default.nix new file mode 100644 index 00000000000..d7473a05bcc --- /dev/null +++ b/pkgs/development/python-modules/pixelmatch/default.nix @@ -0,0 +1,38 @@ +{ lib, buildPythonPackage, fetchgit, poetry-core, pytestCheckHook, pytest-benchmark, pytest-mypy, pillow }: + +buildPythonPackage rec { + pname = "pixelmatch"; + version = "0.2.2"; + format = "pyproject"; + + # test fixtures are stored in LFS + src = fetchgit { + url = "https://github.com/whtsky/pixelmatch-py"; + rev = "v${version}"; + sha256 = "1dsix507dxqik9wvgzscvf2pifbg7gx74krrsalqbfcmm7d1i7xl"; + fetchLFS = true; + }; + + nativeBuildInputs = [ + poetry-core + ]; + + checkInputs = [ + pytestCheckHook + pytest-benchmark + pytest-mypy + pillow + ]; + + pytestFlagsArray = [ + "--mypy" + "--benchmark-disable" + ]; + + meta = with lib; { + description = "A pixel-level image comparison library."; + homepage = "https://github.com/whtsky/pixelmatch-py"; + license = licenses.isc; + maintainers = with maintainers; [ petabyteboy ]; + }; +} diff --git a/pkgs/development/python-modules/pkce/default.nix b/pkgs/development/python-modules/pkce/default.nix new file mode 100644 index 00000000000..4343899e040 --- /dev/null +++ b/pkgs/development/python-modules/pkce/default.nix @@ -0,0 +1,28 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "pkce"; + version = "1.0.2"; + + src = fetchFromGitHub { + owner = "RomeoDespres"; + repo = pname; + rev = version; + sha256 = "15fzpp3b5qmj27hpgnwkzjwllgwwdfccizz8ydmliakm2hdr1xpn"; + }; + + checkInputs = [ pytestCheckHook ]; + + pythonImportsCheck = [ "pkce" ]; + + meta = with lib; { + description = "Python module to work with PKCE"; + homepage = "https://github.com/RomeoDespres/pkce"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/plexapi/default.nix b/pkgs/development/python-modules/plexapi/default.nix index b9a4fb34bf6..5251ff1de0e 100644 --- a/pkgs/development/python-modules/plexapi/default.nix +++ b/pkgs/development/python-modules/plexapi/default.nix @@ -1,25 +1,37 @@ -{ lib, buildPythonPackage, fetchFromGitHub, requests -, tqdm, websocket_client, pytest, pillow, isPy27 }: +{ lib +, buildPythonPackage +, fetchFromGitHub +, requests +, tqdm +, websocket_client +, isPy27 +}: buildPythonPackage rec { pname = "PlexAPI"; - version = "4.1.2"; + version = "4.3.1"; disabled = isPy27; src = fetchFromGitHub { owner = "pkkid"; repo = "python-plexapi"; rev = version; - sha256 = "1l955q1q6lljq3bmyiayr33gzxrlw16xdwgjdaflznvyg16fcjkk"; + sha256 = "sha256-gRXNOGd9YGcGysKbAtiNwi5NxPvv39F6PEXBjiYbVq4="; }; - propagatedBuildInputs = [ requests tqdm websocket_client ]; + propagatedBuildInputs = [ + requests + tqdm + websocket_client + ]; - checkInputs = [ pytest pillow ]; + # Tests require a running Plex instance + doCheck = false; + pythonImportsCheck = [ "plexapi" ]; meta = with lib; { - homepage = "https://github.com/pkkid/python-plexapi"; description = "Python bindings for the Plex API"; + homepage = "https://github.com/pkkid/python-plexapi"; license = licenses.bsd3; maintainers = with maintainers; [ colemickens ]; }; diff --git a/pkgs/development/python-modules/praw/default.nix b/pkgs/development/python-modules/praw/default.nix index d6329d0c381..5ca1d3d83c9 100644 --- a/pkgs/development/python-modules/praw/default.nix +++ b/pkgs/development/python-modules/praw/default.nix @@ -14,13 +14,13 @@ buildPythonPackage rec { pname = "praw"; - version = "7.1.3"; + version = "7.1.4"; src = fetchFromGitHub { owner = "praw-dev"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Ndj7JNRQVLlWyOkS7zSi3B07mZyulyIL0Ju3owNoAsw="; + sha256 = "sha256-onxag3kmswqqSycbwW+orofrukry0pCaRSxVRq2u53A="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/py-multihash/default.nix b/pkgs/development/python-modules/py-multihash/default.nix index 1f8ecad0013..73307c75b8b 100644 --- a/pkgs/development/python-modules/py-multihash/default.nix +++ b/pkgs/development/python-modules/py-multihash/default.nix @@ -1,54 +1,48 @@ { base58 , buildPythonPackage , fetchFromGitHub -, isPy27 , lib , morphys -, pytest -, pytestcov -, pytestrunner +, pytest-runner +, pytestCheckHook +, pythonOlder , six -, variants , varint }: buildPythonPackage rec { pname = "py-multihash"; - version = "1.0.0"; + version = "2.0.1"; + disabled = pythonOlder "3.4"; src = fetchFromGitHub { owner = "multiformats"; repo = pname; rev = "v${version}"; - sha256 = "07qglrbgcb8sr9msqw2v7dqj9s4rs6nyvhdnx02i5w6xx5ibzi3z"; + sha256 = "sha256-z1lmSypGCMFWJNzNgV9hx/IStyXbpd5jvrptFpewuOA="; }; nativeBuildInputs = [ - pytestrunner + pytest-runner ]; propagatedBuildInputs = [ base58 morphys six - variants varint ]; checkInputs = [ - pytest - pytestcov + pytestCheckHook ]; pythonImportsCheck = [ "multihash" ]; - disabled = isPy27; - meta = with lib; { description = "Self describing hashes - for future proofing"; homepage = "https://github.com/multiformats/py-multihash"; license = licenses.mit; maintainers = with maintainers; [ rakesh4g ]; - broken = true; # no longer compatible with base58, no updates in 5 years. Added 2020-11-05 }; } diff --git a/pkgs/development/python-modules/pyairvisual/default.nix b/pkgs/development/python-modules/pyairvisual/default.nix index 2e9aa97f1f2..882182a3a1e 100644 --- a/pkgs/development/python-modules/pyairvisual/default.nix +++ b/pkgs/development/python-modules/pyairvisual/default.nix @@ -1,21 +1,21 @@ { lib +, aiohttp +, aresponses +, asynctest , buildPythonPackage -, pythonOlder , fetchFromGitHub -, poetry -, aiohttp , numpy +, poetry-core , pysmb -, aresponses -, asynctest , pytest-aiohttp , pytest-asyncio , pytestCheckHook +, pythonOlder }: buildPythonPackage rec { pname = "pyairvisual"; - version = "5.0.5"; + version = "5.0.6"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -24,10 +24,10 @@ buildPythonPackage rec { owner = "bachya"; repo = pname; rev = version; - sha256 = "0jjvng3py5g97gvx6rdbk5zxbn5rw8gq1ki4qi4vfsypchxbpz2q"; + sha256 = "sha256-7u8AwIr1Ah/7zCfXFwj/C/CaD/B3uLRkZ8Gf6d18Xp0="; }; - nativeBuildInputs = [ poetry ]; + nativeBuildInputs = [ poetry-core ]; propagatedBuildInputs = [ aiohttp diff --git a/pkgs/development/python-modules/pymyq/default.nix b/pkgs/development/python-modules/pymyq/default.nix index 2500909d534..f4b4a1b7920 100644 --- a/pkgs/development/python-modules/pymyq/default.nix +++ b/pkgs/development/python-modules/pymyq/default.nix @@ -1,26 +1,26 @@ { lib -, aiodns , aiohttp -, async-timeout +, beautifulsoup4 , buildPythonPackage , fetchFromGitHub +, pkce }: buildPythonPackage rec { pname = "pymyq"; - version = "2.0.14"; + version = "3.0.0"; src = fetchFromGitHub { owner = "arraylabs"; repo = pname; rev = "v${version}"; - sha256 = "18825b9c6qk4zcvva79hpg6098z4zqxyapnqmjsli23npw0zh67w"; + sha256 = "sha256-uCXgJxMy5gZQBvhHnmfev/rfJXOjhLqZdOrn8SetUT0="; }; propagatedBuildInputs = [ - aiodns aiohttp - async-timeout + beautifulsoup4 + pkce ]; # Project has no tests diff --git a/pkgs/development/python-modules/pynuki/default.nix b/pkgs/development/python-modules/pynuki/default.nix new file mode 100644 index 00000000000..9c3dc394cc0 --- /dev/null +++ b/pkgs/development/python-modules/pynuki/default.nix @@ -0,0 +1,34 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, poetry-core +, requests +}: + +buildPythonPackage rec { + pname = "pynuki"; + version = "1.4.1"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "pschmitt"; + repo = pname; + rev = version; + sha256 = "1nymlrf0j430851plp355697p55asfxjmavdh2zr96b16d41dnn4"; + }; + + nativeBuildInputs = [ poetry-core ]; + + propagatedBuildInputs = [ requests ]; + + # Project has no tests + doCheck = false; + pythonImportsCheck = [ "pynuki" ]; + + meta = with lib; { + description = "Python bindings for nuki.io bridges"; + homepage = "https://github.com/pschmitt/pynuki"; + license = with licenses; [ gpl3Only ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/pyopenuv/default.nix b/pkgs/development/python-modules/pyopenuv/default.nix new file mode 100644 index 00000000000..a5414021b25 --- /dev/null +++ b/pkgs/development/python-modules/pyopenuv/default.nix @@ -0,0 +1,50 @@ +{ lib +, aiohttp +, aresponses +, async-timeout +, asynctest +, buildPythonPackage +, fetchFromGitHub +, poetry-core +, pytest-aiohttp +, pytest-asyncio +, pytest-cov +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "pyopenuv"; + version = "2.0.1"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "bachya"; + repo = pname; + rev = version; + sha256 = "1pzdcy65gndrlyhrwyc1rwsh8n4w79wla8n9fr13m00vac3cqkl0"; + }; + + nativeBuildInputs = [ poetry-core ]; + + propagatedBuildInputs = [ aiohttp ]; + + checkInputs = [ + aresponses + asynctest + pytest-asyncio + pytest-aiohttp + pytest-cov + pytestCheckHook + ]; + + # Ignore the examples as they are prefixed with test_ + pytestFlagsArray = [ "--ignore examples/" ]; + pythonImportsCheck = [ "pyopenuv" ]; + + meta = with lib; { + description = "Python API to retrieve data from openuv.io"; + homepage = "https://github.com/bachya/pyopenuv"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/pyotp/default.nix b/pkgs/development/python-modules/pyotp/default.nix index ed25a3ecbe7..16916666a0d 100644 --- a/pkgs/development/python-modules/pyotp/default.nix +++ b/pkgs/development/python-modules/pyotp/default.nix @@ -2,19 +2,19 @@ buildPythonPackage rec { pname = "pyotp"; - version = "2.5.1"; + version = "2.6.0"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "2a54d393aff3a244b566d78d597c9cb42e91b3b12f3169cec89d9dfff1c9c5bc"; + sha256 = "d28ddfd40e0c1b6a6b9da961c7d47a10261fb58f378cb00f05ce88b26df9c432"; }; pythonImportsCheck = [ "pyotp" ]; meta = with lib; { description = "Python One Time Password Library"; - homepage = "https://github.com/pyotp/pyotp"; + homepage = "https://github.com/pyauth/pyotp"; license = licenses.mit; maintainers = with maintainers; [ dotlambda ]; }; diff --git a/pkgs/development/python-modules/pyshark/default.nix b/pkgs/development/python-modules/pyshark/default.nix new file mode 100644 index 00000000000..206e3671f47 --- /dev/null +++ b/pkgs/development/python-modules/pyshark/default.nix @@ -0,0 +1,38 @@ +{ lib, buildPythonPackage, fetchFromGitHub, py, lxml, pytestCheckHook, wireshark-cli }: + +buildPythonPackage rec { + pname = "pyshark"; + version = "0.4.2.11"; + + src = fetchFromGitHub { + owner = "KimiNewt"; + repo = pname; + rev = "v${version}"; + sha256 = "07dkhkf85cplcj1h3k8mmqzsn4zdkxzr0zg3gvf8yc8p5g5azx9q"; + }; + + propagatedBuildInputs = [ + py + lxml + ]; + + preConfigure = '' + cd src + ''; + + preCheck = '' + cd .. + ''; + + checkInputs = [ + pytestCheckHook + wireshark-cli + ]; + + meta = with lib; { + description = "Python wrapper for tshark, allowing python packet parsing using wireshark dissectors"; + homepage = "https://github.com/KimiNewt/pyshark/"; + license = licenses.mit; + maintainers = with maintainers; [ petabyteboy ]; + }; +} diff --git a/pkgs/development/python-modules/pyvex/default.nix b/pkgs/development/python-modules/pyvex/default.nix new file mode 100644 index 00000000000..ddec4f0f239 --- /dev/null +++ b/pkgs/development/python-modules/pyvex/default.nix @@ -0,0 +1,39 @@ +{ lib +, archinfo +, bitstring +, fetchPypi +, cffi +, buildPythonPackage +, future +, pycparser +}: + +buildPythonPackage rec { + pname = "pyvex"; + version = "9.0.5739"; + + src = fetchPypi { + inherit pname version; + sha256 = "1jwxxw2kw7wkz7kh8m8vbavzw6m5k6xph7mazfn3k2qbsshh3lk3"; + }; + + propagatedBuildInputs = [ + archinfo + bitstring + cffi + future + pycparser + ]; + + # No tests are available on PyPI, GitHub release has tests + # Switch to GitHub release after all angr parts are present + doCheck = false; + pythonImportsCheck = [ "pyvex" ]; + + meta = with lib; { + description = "Python interface to libVEX and VEX IR"; + homepage = "https://github.com/angr/pyvex"; + license = with licenses; [ bsd2 gpl3Plus lgpl3Plus ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/rx/default.nix b/pkgs/development/python-modules/rx/default.nix index 00808e744a2..5fd9064020a 100644 --- a/pkgs/development/python-modules/rx/default.nix +++ b/pkgs/development/python-modules/rx/default.nix @@ -2,7 +2,7 @@ buildPythonPackage rec { pname = "rx"; - version = "3.1.0"; + version = "3.1.1"; disabled = pythonOlder "3.6"; # There are no tests on the pypi source @@ -10,7 +10,7 @@ buildPythonPackage rec { owner = "ReactiveX"; repo = "rxpy"; rev = "v${version}"; - sha256 = "0rcwa8001il9p7s096b9gc5yld8cyxvrsmwh1gpc9b87j172z6ax"; + sha256 = "0p0cs67l40npkvwgn5sb18l1b6df1b9fg6rzlqkwk2aa0v3cpvhf"; }; checkInputs = [ nose ]; diff --git a/pkgs/development/python-modules/sqlite-utils/default.nix b/pkgs/development/python-modules/sqlite-utils/default.nix index 2bb700f6755..1c49e1f4a02 100644 --- a/pkgs/development/python-modules/sqlite-utils/default.nix +++ b/pkgs/development/python-modules/sqlite-utils/default.nix @@ -15,12 +15,12 @@ buildPythonPackage rec { pname = "sqlite-utils"; - version = "3.3"; + version = "3.4.1"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "1linla3za1gb3w0n0k6h3q8in62qhipizff259p14gzmyr95rjjv"; + sha256 = "sha256-LJuvUTbsL2anQENEuW1oaSUsMEiXnSgLEAhZ6EP5bNs="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/srsly/default.nix b/pkgs/development/python-modules/srsly/default.nix index ab7dea9cf53..c6db32a15e4 100644 --- a/pkgs/development/python-modules/srsly/default.nix +++ b/pkgs/development/python-modules/srsly/default.nix @@ -3,6 +3,7 @@ , fetchPypi , pythonOlder , cython +, catalogue , mock , numpy , pathlib @@ -12,17 +13,19 @@ buildPythonPackage rec { pname = "srsly"; - version = "2.3.2"; + version = "2.4.0"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "f78eaef8d982e98921ce026d4205e652a9333137259f0b621f5c7b579e746e9d"; + sha256 = "e29730be53015970e4a59050e8e9f9be44d762108a617df56c9dfc981b515ab7"; }; nativeBuildInputs = [ cython ]; + propagatedBuildInputs = [ catalogue ]; + checkInputs = [ mock numpy diff --git a/pkgs/development/python-modules/teslajsonpy/default.nix b/pkgs/development/python-modules/teslajsonpy/default.nix index 08ef9975b22..46c8a2853b5 100644 --- a/pkgs/development/python-modules/teslajsonpy/default.nix +++ b/pkgs/development/python-modules/teslajsonpy/default.nix @@ -1,26 +1,37 @@ { lib , aiohttp , backoff +, beautifulsoup4 , buildPythonPackage , fetchFromGitHub +, fetchpatch , pytestCheckHook , wrapt }: buildPythonPackage rec { pname = "teslajsonpy"; - version = "0.11.0"; + version = "0.11.5"; src = fetchFromGitHub { owner = "zabuldon"; repo = pname; rev = "v${version}"; - sha256 = "sha256-yfaUa12doOvdFkbHHdOYcFcu86hYZtt2i0tya2ENjf4="; + sha256 = "sha256-s0IZ1UNldYddaR3zJoYS6ey8Kjxd1fr4fOwf0gNNbow="; }; + patches = [ + (fetchpatch { + name = "dont-use-dummpy-module-bs4.patch"; + url = "https://github.com/zabuldon/teslajsonpy/pull/138/commits/f5a788e47d8338c8ebb06d954f802ba1ec614db3.patch"; + sha256 = "0rws7fhxmca8d5w0bkygx8scvzah3yvb3yfhn05qmp73mn3pmcb3"; + }) + ]; + propagatedBuildInputs = [ aiohttp backoff + beautifulsoup4 wrapt ]; diff --git a/pkgs/development/python-modules/twilio/default.nix b/pkgs/development/python-modules/twilio/default.nix index ff4bb845c89..56f3ba29ddf 100644 --- a/pkgs/development/python-modules/twilio/default.nix +++ b/pkgs/development/python-modules/twilio/default.nix @@ -1,21 +1,33 @@ -{ lib, buildPythonPackage, fetchFromGitHub -, pyjwt, pysocks, pytz, requests, six, nose, mock }: +{ lib +, buildPythonPackage +, fetchFromGitHub +, mock +, nose +, pyjwt +, pysocks +, pytz +, requests +, six +}: buildPythonPackage rec { pname = "twilio"; - version = "6.43.0"; + version = "6.51.1"; + # tests not included in PyPi, so fetch from github instead src = fetchFromGitHub { owner = "twilio"; repo = "twilio-python"; rev = version; - sha256 = "0p2chrzakqx5694g305j0klh9lxlclm5qp0qjm6wqicivyybggzg"; + sha256 = "sha256-OHtmUFm/9GkpIzz0DdSdlHyBFRIgu8GxQ4S4VMJik9o="; }; buildInputs = [ nose mock ]; propagatedBuildInputs = [ pyjwt pysocks pytz six requests ]; + pythonImportsCheck = [ "twilio" ]; + meta = with lib; { description = "Twilio API client and TwiML generator"; homepage = "https://github.com/twilio/twilio-python/"; diff --git a/pkgs/development/python-modules/typesystem/default.nix b/pkgs/development/python-modules/typesystem/default.nix index e993363769a..e93fd83656f 100644 --- a/pkgs/development/python-modules/typesystem/default.nix +++ b/pkgs/development/python-modules/typesystem/default.nix @@ -30,7 +30,15 @@ buildPythonPackage rec { pytestcov ]; - disabledTests = [ "test_to_json_schema_complex_regular_expression" ]; + disabledTests = [ + # https://github.com/encode/typesystem/issues/102. cosmetic issue where python3.8 changed + # the default string formatting of regular expression flags which breaks test assertion + "test_to_json_schema_complex_regular_expression" + ]; + disabledTestFiles = [ + # for some reason jinja2 not picking up forms directory (1% of tests) + "tests/test_forms.py" + ]; meta = with lib; { description = "A type system library for Python"; diff --git a/pkgs/development/python-modules/vsure/default.nix b/pkgs/development/python-modules/vsure/default.nix index 578578a21b1..40b1b328f16 100644 --- a/pkgs/development/python-modules/vsure/default.nix +++ b/pkgs/development/python-modules/vsure/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "vsure"; - version = "1.6.1"; + version = "1.7.2"; src = fetchPypi { inherit pname version; - sha256 = "1lsr0wl1dwbzpn68ww348yk6v42bw89nrghz5gjsimrr428zw6qn"; + sha256 = "sha256-EFat1sewh0Y9PHs08Grlk2RparA47GqkUv/WJ3J2494="; }; propagatedBuildInputs = [ requests ]; diff --git a/pkgs/development/python-modules/xknx/default.nix b/pkgs/development/python-modules/xknx/default.nix index ae9156099c8..221076fae84 100644 --- a/pkgs/development/python-modules/xknx/default.nix +++ b/pkgs/development/python-modules/xknx/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "xknx"; - version = "0.16.2"; + version = "0.16.3"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "XKNX"; repo = pname; rev = version; - sha256 = "14cx54ia38ifz7c750i8jxcmnybzwh03ds6hinlwhx8hd2cx9knj"; + sha256 = "sha256-toB66woREkFUv3J14wwquRo+uAOgXKO+cwFgyw4Mma8="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/tools/analysis/flow/default.nix b/pkgs/development/tools/analysis/flow/default.nix index 11f0297509d..5578e03dc96 100644 --- a/pkgs/development/tools/analysis/flow/default.nix +++ b/pkgs/development/tools/analysis/flow/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "flow"; - version = "0.143.1"; + version = "0.144.0"; src = fetchFromGitHub { owner = "facebook"; repo = "flow"; rev = "refs/tags/v${version}"; - sha256 = "sha256-x7+hLbfccyJLc84246R8xay0FJlK/3JgNc6pqeowl9Q="; + sha256 = "sha256-Qr/fizCV+t6SbETEqns72Xv24ucLcqi1JRXF8SAtQRU="; }; installPhase = '' diff --git a/pkgs/development/tools/analysis/svlint/default.nix b/pkgs/development/tools/analysis/svlint/default.nix index 51b363c6be3..3455d78b23f 100644 --- a/pkgs/development/tools/analysis/svlint/default.nix +++ b/pkgs/development/tools/analysis/svlint/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "svlint"; - version = "0.4.8"; + version = "0.4.16"; src = fetchFromGitHub { owner = "dalance"; repo = "svlint"; rev = "v${version}"; - sha256 = "1anbanvaikj8g5jcmjd165krzvjdwj1cl8f3vm1nmy997x8vxihf"; + sha256 = "sha256-2PYHKJ141RWdUIDAKAFK6IzR4C41bHi/A8lDErSRLnU="; }; - cargoSha256 = "18xnqsrnf2gc9zny8ayzf1bah8mq1fy5k807cz039gqz36cvnma0"; + cargoSha256 = "sha256-x5wU0Ld4ssRoNqo9graJhjlpel+VdVdkKZMjHFqZsrE="; meta = with lib; { description = "SystemVerilog linter"; diff --git a/pkgs/development/tools/analysis/tfsec/default.nix b/pkgs/development/tools/analysis/tfsec/default.nix index c4d22ecd89b..3e100681cff 100644 --- a/pkgs/development/tools/analysis/tfsec/default.nix +++ b/pkgs/development/tools/analysis/tfsec/default.nix @@ -2,13 +2,13 @@ buildGoPackage rec { pname = "tfsec"; - version = "0.37.1"; + version = "0.37.3"; src = fetchFromGitHub { owner = "tfsec"; repo = pname; rev = "v${version}"; - sha256 = "sha256-ZYJqnyIFwyPODFqXAZp1ep0Ofl/JH2F07gqPx4WZ7mo="; + sha256 = "sha256-36yiX/uTqjiG+ZdQUQGPiLxSxIXE6ThH/LMqBGnm1d8="; }; goPackagePath = "github.com/tfsec/tfsec"; diff --git a/pkgs/development/tools/b4/default.nix b/pkgs/development/tools/b4/default.nix new file mode 100644 index 00000000000..8210f7c409a --- /dev/null +++ b/pkgs/development/tools/b4/default.nix @@ -0,0 +1,36 @@ +{ lib, python3Packages }: + +python3Packages.buildPythonApplication rec { + pname = "b4"; + version = "0.6.2"; + + src = python3Packages.fetchPypi { + inherit pname version; + sha256 = "1j904dy9cwxl85k2ngc498q5cdnqwsmw3jibjr1m55w8aqdck68z"; + }; + + preConfigure = '' + substituteInPlace setup.py \ + --replace 'requests~=2.24' 'requests~=2.25' + ''; + + # tests make dns requests and fails + doCheck = false; + + propagatedBuildInputs = with python3Packages; [ + requests + dnspython + dkimpy + + # These may be required in the future for other patch attestation features + #pycryptodomex~=3.9.9 + #PyNaCl + ]; + + meta = with lib; { + homepage = "https://git.kernel.org/pub/scm/utils/b4/b4.git/about"; + license = licenses.gpl2Only; + description = "A helper utility to work with patches made available via a public-inbox archive"; + maintainers = with maintainers; [ jb55 ]; + }; +} diff --git a/pkgs/development/tools/build-managers/rebar/default.nix b/pkgs/development/tools/build-managers/rebar/default.nix index d3926beb321..30c55dbca37 100644 --- a/pkgs/development/tools/build-managers/rebar/default.nix +++ b/pkgs/development/tools/build-managers/rebar/default.nix @@ -37,5 +37,6 @@ stdenv.mkDerivation { platforms = lib.platforms.unix; license = lib.licenses.asl20; + maintainers = lib.teams.beam.members; }; } diff --git a/pkgs/development/tools/build-managers/rebar3/default.nix b/pkgs/development/tools/build-managers/rebar3/default.nix index aa3af12c934..0c6450766b1 100644 --- a/pkgs/development/tools/build-managers/rebar3/default.nix +++ b/pkgs/development/tools/build-managers/rebar3/default.nix @@ -136,7 +136,7 @@ stdenv.mkDerivation rec { ''; platforms = lib.platforms.unix; - maintainers = with lib.maintainers; [ gleber tazjin ]; + maintainers = lib.teams.beam.members; license = lib.licenses.asl20; }; } diff --git a/pkgs/development/tools/go-bindata/default.nix b/pkgs/development/tools/go-bindata/default.nix index 3b73c527315..fc44efca828 100644 --- a/pkgs/development/tools/go-bindata/default.nix +++ b/pkgs/development/tools/go-bindata/default.nix @@ -1,22 +1,23 @@ { lib, buildGoPackage, fetchFromGitHub }: -buildGoPackage { +buildGoPackage rec { pname = "go-bindata"; - version = "unstable-2015-10-23"; + version = "3.22.0"; - goPackagePath = "github.com/jteeuwen/go-bindata"; + goPackagePath = "github.com/kevinburke/go-bindata"; src = fetchFromGitHub { - owner = "jteeuwen"; - repo = "go-bindata"; - rev = "a0ff2567cfb70903282db057e799fd826784d41d"; - sha256 = "0d6zxv0hgh938rf59p1k5lj0ymrb8kcps2vfrb9kaarxsvg7y69v"; + owner = "kevinburke"; + repo = pname; + rev = "v${version}"; + sha256 = "10dq77dml5jvvq2jkdq81a9yjg7rncq8iw8r84cc3dz6l9hxzj0x"; }; - excludedPackages = "testdata"; + subPackages = [ "go-bindata" ]; meta = with lib; { - homepage = "https://github.com/jteeuwen/go-bindata"; + homepage = "https://github.com/kevinburke/go-bindata"; + changelog = "https://github.com/kevinburke/go-bindata/blob/v${version}/CHANGELOG.md"; description = "A small utility which generates Go code from any file, useful for embedding binary data in a Go program"; maintainers = with maintainers; [ cstrahan ]; license = licenses.cc0; diff --git a/pkgs/development/tools/haskell/haskell-language-server/withWrapper.nix b/pkgs/development/tools/haskell/haskell-language-server/withWrapper.nix index 09cb60901e4..4203564ae4a 100644 --- a/pkgs/development/tools/haskell/haskell-language-server/withWrapper.nix +++ b/pkgs/development/tools/haskell/haskell-language-server/withWrapper.nix @@ -1,4 +1,4 @@ -{ lib, supportedGhcVersions ? [ "865" "884" "8102" ], stdenv, haskellPackages +{ lib, supportedGhcVersions ? [ "865" "884" "8103" ], stdenv, haskellPackages , haskell }: # # The recommended way to override this package is diff --git a/pkgs/development/tools/java/cfr/default.nix b/pkgs/development/tools/java/cfr/default.nix index 35ac0dbc6a5..68841d48d47 100644 --- a/pkgs/development/tools/java/cfr/default.nix +++ b/pkgs/development/tools/java/cfr/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "cfr"; - version = "0.150"; + version = "0.151"; src = fetchurl { url = "http://www.benf.org/other/cfr/cfr_${version}.jar"; - sha256 = "09lq21phnhr374wb8gj355jsqj8c4m5m818r3pbr8f8zpaamjxfj"; + sha256 = "sha256-MW6QFbmvKVP8/0/oa/O7pwXzLnzSW9blNcaY3ool6Dc="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/tools/jbang/default.nix b/pkgs/development/tools/jbang/default.nix index 6bbf086749c..c41fb4c639f 100644 --- a/pkgs/development/tools/jbang/default.nix +++ b/pkgs/development/tools/jbang/default.nix @@ -1,12 +1,12 @@ { stdenv, lib, fetchzip, jdk, makeWrapper, coreutils, curl }: stdenv.mkDerivation rec { - version = "0.63.0"; + version = "0.65.1"; pname = "jbang"; src = fetchzip { url = "https://github.com/jbangdev/jbang/releases/download/v${version}/${pname}-${version}.tar"; - sha256 = "sha256-g3ARa69FvCfs8a3vbQuse8JvRlPXT6ysfmvZAUYnnA4="; + sha256 = "sha256-Puddnem03RGORKkvcLy5o/eOzKzrOuRvqPk5FsjQ3Lw="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/tools/kustomize/default.nix b/pkgs/development/tools/kustomize/default.nix index 6ff123bb2be..6164be83b88 100644 --- a/pkgs/development/tools/kustomize/default.nix +++ b/pkgs/development/tools/kustomize/default.nix @@ -2,9 +2,9 @@ buildGoModule rec { pname = "kustomize"; - version = "3.9.2"; - # rev is the 3.9.2 commit, mainly for kustomize version command output - rev = "e98eada7365fc564c9aba392e954f306a9cbf1dd"; + version = "3.9.3"; + # rev is the 3.9.3 commit, mainly for kustomize version command output + rev = "1ae8303bdc9372bc7c15942df6e9cf5d67fdba1a"; buildFlagsArray = let t = "sigs.k8s.io/kustomize/api/provenance"; in '' @@ -17,13 +17,13 @@ buildGoModule rec { owner = "kubernetes-sigs"; repo = pname; rev = "kustomize/v${version}"; - sha256 = "0p1rxswfaj0g3y8nfw70qmxrlyv1pnzkapy1mxpzzyf04mmhg7wn"; + sha256 = "147g8mhgcb8sjx10sz7r9yh84gqxwk6dald848jim2v2rax47v0p"; }; # avoid finding test and development commands sourceRoot = "source/kustomize"; - vendorSha256 = "1pv8g0nnrpzbvd6dqgnrw2i27xkilbrr9npdz6pxr7mmbcg3w3w9"; + vendorSha256 = "0ps4is8x2akvvvvin9sqdyjg4ms3b5b5y15923rs65fd7x33rxgp"; meta = with lib; { description = "Customization of kubernetes YAML configurations"; @@ -34,6 +34,6 @@ buildGoModule rec { ''; homepage = "https://github.com/kubernetes-sigs/kustomize"; license = licenses.asl20; - maintainers = with maintainers; [ carlosdagos vdemeester periklis zaninime Chili-Man]; + maintainers = with maintainers; [ carlosdagos vdemeester periklis zaninime Chili-Man ]; }; } diff --git a/pkgs/development/tools/misc/blackfire/default.nix b/pkgs/development/tools/misc/blackfire/default.nix index 27e043a9ac4..31c5d0d26e8 100644 --- a/pkgs/development/tools/misc/blackfire/default.nix +++ b/pkgs/development/tools/misc/blackfire/default.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation rec { pname = "blackfire-agent"; - version = "1.44.2"; + version = "1.46.0"; src = fetchurl { url = "https://packages.blackfire.io/debian/pool/any/main/b/blackfire-php/blackfire-agent_${version}_amd64.deb"; - sha256 = "1bam4sb0yhxciykph7wn41zs8fa7c9iwnbihd5kza0cylbb7fbkb"; + sha256 = "0cxgc18xpwyb5wp08km7aj8asn5biqnwq9fkgkk6wv1r1ihqlhf2"; }; nativeBuildInputs = [ diff --git a/pkgs/development/tools/misc/blackfire/php-probe.nix b/pkgs/development/tools/misc/blackfire/php-probe.nix index 97b5f9ed82c..780b2a8906f 100644 --- a/pkgs/development/tools/misc/blackfire/php-probe.nix +++ b/pkgs/development/tools/misc/blackfire/php-probe.nix @@ -18,11 +18,11 @@ let }.${lib.versions.majorMinor php.version} or (throw "Unsupported PHP version."); in stdenv.mkDerivation rec { pname = "php-blackfire"; - version = "1.46.4"; + version = "1.49.1"; src = fetchurl { url = "https://packages.blackfire.io/debian/pool/any/main/b/blackfire-php/blackfire-php_${version}_amd64.deb"; - sha256 = "1p46zi1hh9calkcfgqz60c6rdi9i7i16ylj84iibi6k0pc690fjy"; + sha256 = "5Z6CUj/HfSj+pC9iDEmU/OKCYePSAazU9q9M3glnOZU="; }; nativeBuildInputs = [ diff --git a/pkgs/development/tools/misc/bonnmotion/default.nix b/pkgs/development/tools/misc/bonnmotion/default.nix new file mode 100644 index 00000000000..7ec9f3e1400 --- /dev/null +++ b/pkgs/development/tools/misc/bonnmotion/default.nix @@ -0,0 +1,50 @@ +{ stdenv, lib, fetchzip, substituteAll, bash, jre }: + +stdenv.mkDerivation rec { + pname = "bonnmotion"; + version = "3.0.1"; + + src = fetchzip { + url = "https://sys.cs.uos.de/bonnmotion/src/bonnmotion-${version}.zip"; + sha256 = "16bjgr0hy6an892m5r3x9yq6rqrl11n91f9rambq5ik1cxjqarxw"; + }; + + patches = [ + # The software has a non-standard install bash script which kind of works. + # However, to make it fully functional, the automatically detection of the + # program paths must be substituted with full paths. + (substituteAll { + src = ./install.patch; + inherit bash jre; + }) + ]; + + installPhase = '' + runHook preInstall + + ./install + + mkdir -p $out/bin $out/share/bonnmotion + cp -r ./classes ./lib $out/share/bonnmotion/ + cp ./bin/bm $out/bin/ + + substituteInPlace $out/bin/bm \ + --replace /build/source $out/share/bonnmotion + + runHook postInstall + ''; + + meta = with lib; { + description = "A mobility scenario generation and analysis tool"; + longDescription = '' + BonnMotion is a Java software which creates and analyzes mobility + scenarios and is most commonly used as a tool for the investigation of + mobile ad hoc network characteristics. The scenarios can also be exported + for several network simulators, such as ns-2, ns-3, GloMoSim/QualNet, + COOJA, MiXiM, and ONE. + ''; + homepage = "https://sys.cs.uos.de/bonnmotion/"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ oxzi ]; + }; +} diff --git a/pkgs/development/tools/misc/bonnmotion/install.patch b/pkgs/development/tools/misc/bonnmotion/install.patch new file mode 100644 index 00000000000..86be99b3dd5 --- /dev/null +++ b/pkgs/development/tools/misc/bonnmotion/install.patch @@ -0,0 +1,75 @@ +diff --git a/install b/install +index 95afa2c..70c5fca 100755 +--- a/install ++++ b/install +@@ -1,4 +1,4 @@ +-#!/bin/bash ++#!@bash@/bin/bash + + echo "BonnMotion - a mobility scenario generation and analysis tool" + echo "Copyright (C) 2002-2012 University of Bonn" +@@ -19,28 +19,11 @@ echo "along with this program; if not, write to the Free Software" + echo "Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA" + echo + +-OS=`uname -s | tr A-Z a-z | sed -e s/_.\*//` +- + PACKAGE=edu.bonn.cs.iv.bonnmotion +-JAVAPATH=`which java 2> /dev/null` +-if [ ! "$JAVAPATH" = "" ] +-then +- JAVAPATH=`dirname ${JAVAPATH}` +-fi +-echo -n Please enter your Java binary path \[$JAVAPATH\]:\ +-read KBDENTRY +-if [ ! "$KBDENTRY" = "" ] +-then +- JAVAPATH=$KBDENTRY +-fi ++JAVAPATH="@jre@/bin" + if [ -x "${JAVAPATH}/java" ] + then +- cd `dirname $0` +- BONNMOTION=`pwd` +- +- cd "${JAVAPATH}" +- JAVAPATH=`pwd` +- cd "${BONNMOTION}" ++ BONNMOTION="$(realpath .)" + + CLASSPATH="${BONNMOTION}/classes" + DOCPATH="${BONNMOTION}/javadoc" +@@ -52,14 +35,7 @@ then + then + mkdir "${DOCPATH}" + fi +- if [ $OS = "cygwin" ] +- then +- cd "${CLASSPATH}" +- CLASSPATH=`cmd.exe /c cd` +- cd "${DOCPATH}" +- DOCPATH=`cmd.exe /c cd` +- fi +- ++ + for l in $BONNMOTION/lib/*.jar + do + LIBRARYPATH=$LIBRARYPATH:$l +@@ -69,7 +45,7 @@ then + APPS=`ls` + cd "${BONNMOTION}/bin" + +- echo \#\!/bin/bash > .head ++ echo \#\!@bash@/bin/bash > .head + echo >> .head + echo BONNMOTION=\"$BONNMOTION\" >> .head + echo PACKAGE=\"$PACKAGE\" >> .head +@@ -103,8 +79,6 @@ then + fi + echo "done." + echo +- echo "$ ./bin/bm -h" +- ./bm + else + echo No executable \"$JAVAPATH/java\", aborting. + fi diff --git a/pkgs/development/tools/misc/clojure-lsp/default.nix b/pkgs/development/tools/misc/clojure-lsp/default.nix index a2d28bf7d04..ce054da0d40 100644 --- a/pkgs/development/tools/misc/clojure-lsp/default.nix +++ b/pkgs/development/tools/misc/clojure-lsp/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "clojure-lsp"; - version = "2021.02.02-14.02.23"; + version = "2021.02.05-15.32.53"; src = fetchurl { url = "https://github.com/clojure-lsp/clojure-lsp/releases/download/${version}/${pname}.jar"; - sha256 = "sha256-NwaUIaGkSB+oVd/OArp+bs01ZDAFy5JJ4ic5sMDYg8s="; + sha256 = "sha256-kKjgAO3DEpZOm91Tzkhj4rmNOaacZi74o/qfp8n11Z4="; }; dontUnpack = true; diff --git a/pkgs/development/tools/misc/terraform-ls/default.nix b/pkgs/development/tools/misc/terraform-ls/default.nix index 498508d091f..9695c75a3c1 100644 --- a/pkgs/development/tools/misc/terraform-ls/default.nix +++ b/pkgs/development/tools/misc/terraform-ls/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "terraform-ls"; - version = "0.12.0"; + version = "0.13.0"; src = fetchFromGitHub { owner = "hashicorp"; repo = pname; rev = "v${version}"; - sha256 = "w9PLKLFjKehtub1LbVX9TbvKkj/S1t0MwZIZurF2x18="; + sha256 = "sha256-0WbUJYNRBKixRFl+YM1uSEltQneB6FYPFHNVVhmdseA="; }; - vendorSha256 = "J8ovcUeQsb58Bq/EM9mvYqtuDY1bXTEVCC9/AH+UttU="; + vendorSha256 = "sha256-WYTn2QoI1Z3L4Wxjrq0YT++X9vMA1Wm3zgl08CYiU1Y="; # tests fail in sandbox mode because of trying to download stuff from releases.hashicorp.com doCheck = false; diff --git a/pkgs/development/tools/operator-sdk/default.nix b/pkgs/development/tools/operator-sdk/default.nix index c09331de598..34d6abb7273 100644 --- a/pkgs/development/tools/operator-sdk/default.nix +++ b/pkgs/development/tools/operator-sdk/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "operator-sdk"; - version = "1.3.0"; + version = "1.4.0"; src = fetchFromGitHub { owner = "operator-framework"; repo = pname; rev = "v${version}"; - sha256 = "sha256-xYG605Z8WGFH5byJA+sHPBjBmWi8b+TTtWRnQnmYN/4="; + sha256 = "sha256-KxYGXwK6wF5MDY+zrSdcQqBYkSdnxOCYudTh+TwTkm8="; }; - vendorSha256 = "sha256-0ZowddIiVHVg1OKhaCFo+vQKcUe6wZ6L0J8RdMvZyGk="; + vendorSha256 = "sha256-GRw0u6zox2gseQhrx7n0M3WVu4+yCKZ7D/QHVcBRb30="; doCheck = false; diff --git a/pkgs/development/tools/rust/cargo-generate/default.nix b/pkgs/development/tools/rust/cargo-generate/default.nix index 635f36ee834..5576016d532 100644 --- a/pkgs/development/tools/rust/cargo-generate/default.nix +++ b/pkgs/development/tools/rust/cargo-generate/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-generate"; - version = "0.5.1"; + version = "0.5.2"; src = fetchFromGitHub { owner = "ashleygwilliams"; repo = "cargo-generate"; rev = "v${version}"; - sha256 = "0rq0anz0cawrgsinqyjh8wb3dgha09wx3ydrd3m9nfxs5dd3ij3k"; + sha256 = "sha256-/tZUYJaNvJ7H3xAc9ygcJD6meK1Em87VYqqYqY1l4zE="; }; - cargoSha256 = "1vngn9gbiv59wrq230qk2mv00bsbdfk2mi1iqpr736c5wj1caqld"; + cargoSha256 = "sha256-/6nr+UNQPa8+cEnAMgyjuCV1JjfqXcNLfuqi4/kgmk0="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/development/tools/rust/rust-analyzer/default.nix b/pkgs/development/tools/rust/rust-analyzer/default.nix index 85cf35b3568..3a4bd8f8126 100644 --- a/pkgs/development/tools/rust/rust-analyzer/default.nix +++ b/pkgs/development/tools/rust/rust-analyzer/default.nix @@ -2,10 +2,10 @@ { rust-analyzer-unwrapped = callPackage ./generic.nix rec { - rev = "2021-02-01"; + rev = "2021-02-08"; version = "unstable-${rev}"; - sha256 = "sha256-bPv51Jp6zJRdNJehuR8LVaBw/hubSeHbI5BeMwqEn4M="; - cargoSha256 = "sha256-5g9wFQ6qlkJgSHLSLS0pad00XT7KflyGAq8/BknF9/M="; + sha256 = "sha256-Idaaw6d0lvBUyZxpHKQ94aMtgM0zb0P8QRh+3pctX4k="; + cargoSha256 = "sha256-J6Hia83biutScZt/BMO4/qXYi35/Ec9MeaHeDG8Lqmc="; }; rust-analyzer = callPackage ./wrapper.nix {} { diff --git a/pkgs/development/tools/so/default.nix b/pkgs/development/tools/so/default.nix index 99f9cdcd936..cd52f319bb9 100644 --- a/pkgs/development/tools/so/default.nix +++ b/pkgs/development/tools/so/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "so"; - version = "0.4.2"; + version = "0.4.3"; src = fetchFromGitHub { owner = "samtay"; repo = pname; rev = "v${version}"; - sha256 = "09zswxxli9f5ayjwmvqhkp1yv2s4f435dcfp4cyia1zddbrh2zck"; + sha256 = "sha256-WAUPB4hhvroE1/8nQcgLVWgGyXcFh7qxdFg6UtQzM9A="; }; - cargoSha256 = "1ddbhy1plag4ckbmlyj47wnky7vgmfa68msl3hl25h1lwmzaf1aq"; + cargoSha256 = "sha256-wt6ClN9fpEAETk3kYeQRieTXnZQe4JEnQiA8CG4ZLog="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ diff --git a/pkgs/development/tools/the-way/default.nix b/pkgs/development/tools/the-way/default.nix index 1e88cfcdcc1..e8f52fa8334 100644 --- a/pkgs/development/tools/the-way/default.nix +++ b/pkgs/development/tools/the-way/default.nix @@ -2,20 +2,20 @@ rustPlatform.buildRustPackage rec { pname = "the-way"; - version = "0.12.1"; + version = "0.13.0"; src = fetchFromGitHub { owner = "out-of-cheese-error"; repo = pname; rev = "v${version}"; - sha256 = "0lvkrfszmn594n9qkf518c38c0fwzm32y997wlf28l3hpj6yqddq"; + sha256 = "sha256-OqJceRO1RFOLgNi3SbTKLw62tSfJSO7T2/u0RTX89AM="; }; nativeBuildInputs = [ installShellFiles ]; buildInputs = lib.optionals stdenv.isDarwin [ AppKit Security ]; - cargoSha256 = "1aiyfsvmrqcmlw0z1944i9s5g3yxc39na5mf16pb9a4bhw8zcwjr"; + cargoSha256 = "sha256-jTZso61Lyt6jprBxBAhvchgOsgM9y1qBleTxUx1jCnE="; checkFlagsArray = lib.optionals stdenv.isDarwin [ "--skip=copy" ]; cargoParallelTestThreads = false; diff --git a/pkgs/games/0verkill/default.nix b/pkgs/games/0verkill/default.nix new file mode 100644 index 00000000000..69a371f09d9 --- /dev/null +++ b/pkgs/games/0verkill/default.nix @@ -0,0 +1,39 @@ +{ lib +, stdenv +, fetchFromGitHub +, autoreconfHook +, xorgproto +, libX11 +, libXpm +}: + +stdenv.mkDerivation rec { + pname = "0verkill"; + version = "unstable-2011-01-13"; + + src = fetchFromGitHub { + owner = "hackndev"; + repo = pname; + rev = "522f11a3e40670bbf85e0fada285141448167968"; + sha256 = "WO7PN192HhcDl6iHIbVbH7MVMi1Tl2KyQbDa9DWRO6M="; + }; + + nativeBuildInputs = [ autoreconfHook ]; + buildInputs = [ libX11 xorgproto libXpm ]; + + configureFlags = [ "--with-x" ]; + + preAutoreconf = '' + autoupdate + ''; + + hardeningDisable = [ "all" ]; # Someday the upstream will update the code... + + meta = with lib; { + homepage = "https://github.com/hackndev/0verkill"; + description = "ASCII-ART bloody 2D action deathmatch-like game"; + license = with licenses; gpl2Only; + maintainers = with maintainers; [ AndersonTorres ]; + platforms = with platforms; unix; + }; +} diff --git a/pkgs/games/abuse/abuse.sh b/pkgs/games/abuse/abuse.sh new file mode 100644 index 00000000000..de837d27181 --- /dev/null +++ b/pkgs/games/abuse/abuse.sh @@ -0,0 +1,18 @@ +#! @shell@ + +if grep datadir ~/.abuse/abuserc &>/dev/null; then + if [ ! -d "$(grep datadir ~/.abuse/abuserc | cut -d= -f2)" ]; then + echo "Warning: ~/.abuse/abuserc references a datadir which is not existent." >&2 + echo "Try removing ~/.abuse/abuserc, else abuse will most likely not run." >&2 + echo >&2 + # This can happen if the build hash of abuse changes and the older version + # is garbage-collected. The correct path of the datadir is compiled into + # the binary, but unfortunately abuse writes out the path into abuserc on + # first start. This entry may later become stale. + fi +fi + +# The timidity bundled into SDL_mixer looks in . and in several global places +# like /etc for its configuration file. +cd @out@/etc +exec @out@/bin/.abuse-bin "$@" diff --git a/pkgs/games/abuse/default.nix b/pkgs/games/abuse/default.nix new file mode 100644 index 00000000000..2e863022a68 --- /dev/null +++ b/pkgs/games/abuse/default.nix @@ -0,0 +1,54 @@ +{ lib, stdenv, fetchurl, makeDesktopItem, copyDesktopItems, SDL, SDL_mixer, freepats }: + +stdenv.mkDerivation rec { + pname = "abuse"; + version = "0.8"; + + src = fetchurl { + url = "http://abuse.zoy.org/raw-attachment/wiki/download/${pname}-${version}.tar.gz"; + sha256 = "0104db5fd2695c9518583783f7aaa7e5c0355e27c5a803840a05aef97f9d3488"; + }; + + configureFlags = [ + "--with-x" + "--with-assetdir=$(out)/orig" + # The "--enable-debug" is to work around a segfault on start, see https://bugs.archlinux.org/task/52915. + "--enable-debug" + ]; + + desktopItems = [ (makeDesktopItem { + name = "abuse"; + exec = "abuse"; + icon = "abuse"; + desktopName = "Abuse"; + comment = "Side-scroller action game that pits you against ruthless alien killers"; + categories = "Game;ActionGame;"; + }) ]; + + postInstall = '' + mkdir $out/etc + echo -e "dir ${freepats}\nsource ${freepats}/freepats.cfg" > $out/etc/timidity.cfg + + mv $out/bin/abuse $out/bin/.abuse-bin + substituteAll "${./abuse.sh}" $out/bin/abuse + chmod +x $out/bin/abuse + + install -Dm644 doc/abuse.png $out/share/pixmaps/abuse.png + ''; + + nativeBuildInputs = [ copyDesktopItems ]; + buildInputs = [ SDL SDL_mixer freepats ]; + + meta = with lib; { + description = "Side-scroller action game that pits you against ruthless alien killers"; + homepage = "http://abuse.zoy.org/"; + license = with licenses; [ unfree ]; + # Most of abuse is free (public domain, GPL2+, WTFPL), however the creator + # of its sfx and music only gave Debian permission to redistribute the + # files. Our friends from Debian thought about it some more: + # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648272 + maintainers = with maintainers; [ iblech ]; + platforms = platforms.unix; + broken = stdenv.isDarwin; + }; +} diff --git a/pkgs/games/freeciv/default.nix b/pkgs/games/freeciv/default.nix index f9938eaca31..647a87d571b 100644 --- a/pkgs/games/freeciv/default.nix +++ b/pkgs/games/freeciv/default.nix @@ -12,13 +12,13 @@ let in stdenv.mkDerivation rec { pname = "freeciv"; - version = "2.6.2.1"; + version = "2.6.3"; src = fetchFromGitHub { owner = "freeciv"; repo = "freeciv"; rev = "R${builtins.replaceStrings [ "." ] [ "_" ] version}"; - sha256 = "1nra6b6sk2gciaw1fpwx7qa20hky8cwcdwlshcl1zsikg577hyg5"; + sha256 = "sha256-tRjik2LONwKFZOcIuyFDoE1fD23UnZHMdNLo0DdYyOc="; }; postPatch = '' diff --git a/pkgs/games/osu-lazer/default.nix b/pkgs/games/osu-lazer/default.nix index 4ce123c78c0..e3c22ae7328 100644 --- a/pkgs/games/osu-lazer/default.nix +++ b/pkgs/games/osu-lazer/default.nix @@ -16,13 +16,13 @@ let in stdenv.mkDerivation rec { pname = "osu-lazer"; - version = "2021.129.0"; + version = "2021.205.1"; src = fetchFromGitHub { owner = "ppy"; repo = "osu"; rev = version; - sha256 = "AVx842Zq3mq59VCPdF94mcx5uOr70SmkV/tMNkNyMSY="; + sha256 = "US8auytRXqtYGGNi+vxIzxCxpetWYeUkBRjgtJkPpMs="; }; patches = [ ./bypass-tamper-detection.patch ]; diff --git a/pkgs/games/osu-lazer/deps.nix b/pkgs/games/osu-lazer/deps.nix index 9e61cb9674e..b670ce0c5ed 100644 --- a/pkgs/games/osu-lazer/deps.nix +++ b/pkgs/games/osu-lazer/deps.nix @@ -1,10 +1,5 @@ { fetchNuGet }: [ (fetchNuGet { - name = "Dapper"; - version = "2.0.78"; - sha256 = "13xgi8prsa3y67hx644yflamwakjv8vsk5m15v407clsl2r4g0bp"; - }) - (fetchNuGet { name = "DeltaCompressionDotNet"; version = "2.0.0.0"; sha256 = "0zhj7m3zaf9wcg51385in9qg1xgkvp8yyzgq3r5k4sagm7y68aqy"; @@ -16,8 +11,8 @@ }) (fetchNuGet { name = "DiscordRichPresence"; - version = "1.0.169"; - sha256 = "0rs9fjr65432qckmzx4djlwsnc2yqwwwnjszqwnm3z2pv8dm7zrf"; + version = "1.0.175"; + sha256 = "180sax976327d70qbinv07f65g3w2zbw80n49hckg8wd4rw209vd"; }) (fetchNuGet { name = "FFmpeg.AutoGen"; @@ -286,8 +281,13 @@ }) (fetchNuGet { name = "MessagePack"; - version = "1.7.3.7"; - sha256 = "1wyxl49i9crb247q3c84gnf4985gai8qxa8x3a22rcfxzzx29mjr"; + version = "2.2.85"; + sha256 = "1y0h8bd0drnlsqf1bvrdiv9j1892zqf1rmyclfjzs49klpf0xphk"; + }) + (fetchNuGet { + name = "MessagePack.Annotations"; + version = "2.2.85"; + sha256 = "00wajml6iy3wid8mixh3jmm6dapfjbccwq95m8qciika4pyd4lq9"; }) (fetchNuGet { name = "Microsoft.AspNetCore.App.Runtime.linux-x64"; @@ -296,73 +296,58 @@ }) (fetchNuGet { name = "Microsoft.AspNetCore.Connections.Abstractions"; - version = "3.1.10"; - sha256 = "05drcgbpzq700kvxnfxha10w3jgfp2jp0r2h4hpczjxj6cywbbi6"; - }) - (fetchNuGet { - name = "Microsoft.AspNetCore.Connections.Abstractions"; - version = "3.1.11"; - sha256 = "04f37gxcd8hpkfmz5sssgwa20hfr3y5b093bqqz7yaxcqvdn54x4"; + version = "5.0.2"; + sha256 = "0qy4wamhcpxi9aqwq9kivhsj4rvhbch2wfwv11610psygb5457vk"; }) (fetchNuGet { name = "Microsoft.AspNetCore.Http.Connections.Client"; - version = "3.1.10"; - sha256 = "1sni7hjpylamxaf98insalx3jj2k8skb02mhkmamxxj2488r2p9j"; + version = "5.0.2"; + sha256 = "0295a87ilrdg43sil5wli74x7jy4apibqdk1fxam8kzj99whl5sk"; }) (fetchNuGet { name = "Microsoft.AspNetCore.Http.Connections.Common"; - version = "3.1.10"; - sha256 = "19mddj0dpy4j6fwh8b1q7aznnckjrkpvbqiyq4sq4z7lcgw6pbq6"; - }) - (fetchNuGet { - name = "Microsoft.AspNetCore.Http.Features"; - version = "3.1.10"; - sha256 = "1y6zf2qgph6ga59272msywdv2xrycg56wz50bjm5pivmh6wv9240"; + version = "5.0.2"; + sha256 = "094zjf6h5dh87kznmmz7w4s1y37rw52vaz2h4jk4i4ik7hpijd0w"; }) (fetchNuGet { name = "Microsoft.AspNetCore.Http.Features"; - version = "3.1.11"; - sha256 = "07mv432cgr1sclvrw5ah70wajxfgqlaxgnf99vca4r9a9a1i185a"; + version = "5.0.2"; + sha256 = "1rprpj1aw9z501rpb9415maqcqnk6pirbdl8yv5n9wpqgcnjizk8"; }) (fetchNuGet { name = "Microsoft.AspNetCore.SignalR.Client"; - version = "3.1.10"; - sha256 = "1s352srycksfnvz5hhi7himpg2gn39iw2gizlc3g30w6pvy8p29c"; + version = "5.0.2"; + sha256 = "18pdw4h1j93wzcvlj87jy7n5sxkwlj69nnb7a2qxkc40jvm18ran"; }) (fetchNuGet { name = "Microsoft.AspNetCore.SignalR.Client.Core"; - version = "3.1.10"; - sha256 = "1289624ilk45ca8rkyvirqdjsg9jsnqn8dzbjr6f83641fi73s69"; + version = "5.0.2"; + sha256 = "1rg3cpqr3yx5hn233c6cmmiry5v49fglfii7ryi1cf6rwqpdqn5l"; }) (fetchNuGet { name = "Microsoft.AspNetCore.SignalR.Common"; - version = "3.1.10"; - sha256 = "0c6lim7my3alq43xxqkgykba068hjlzdcif6c956irailijc0smw"; - }) - (fetchNuGet { - name = "Microsoft.AspNetCore.SignalR.Common"; - version = "3.1.11"; - sha256 = "0za69spf44df7xl0s82bk4spi80yjqxqncgfs5aqa15rjncg3d6l"; + version = "5.0.2"; + sha256 = "1sbwp00hq0ng891wdj6yhah8hr9hw34zvqr1xzs86g3gpmssgcj5"; }) (fetchNuGet { name = "Microsoft.AspNetCore.SignalR.Protocols.Json"; - version = "3.1.10"; - sha256 = "0qzdpblmgqm3bl5wr14igkqp35zwx4wdkwlh55xm4v3hzhq6l46m"; + version = "5.0.2"; + sha256 = "0p9kv2iayhz8y68r30mhzssv0m087v243ai7aax7jd44rqiv1w5i"; }) (fetchNuGet { name = "Microsoft.AspNetCore.SignalR.Protocols.MessagePack"; - version = "3.1.11"; - sha256 = "15l2l5gmiwn90hl8d1w2lx2x5scx69rr7kph8liigs8vm3q95qx9"; + version = "5.0.2"; + sha256 = "1f0mjw0swiaxk4iqf7n598d51w40lwdbap4nlc0sv0vw3nklnlzp"; }) (fetchNuGet { name = "Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson"; - version = "3.1.10"; - sha256 = "114zrd732c452x3dy26ll7vhbsqkk9pdrb5f2jqn8nkhf2xg2bda"; + version = "5.0.2"; + sha256 = "01wi2q5sjazvax8d4gbcggsr7n801m4cx6jcqljv0r4cmz4y478a"; }) (fetchNuGet { name = "Microsoft.Bcl.AsyncInterfaces"; - version = "1.1.0"; - sha256 = "1dq5yw7cy6s42193yl4iqscfw5vzkjkgv0zyy32scr4jza6ni1a1"; + version = "1.0.0"; + sha256 = "00dx5armvkqjxvkldz3invdlck9nj7w21dlsr2aqp1rqbyrbsbbh"; }) (fetchNuGet { name = "Microsoft.Bcl.AsyncInterfaces"; @@ -370,6 +355,11 @@ sha256 = "0a1ahssqds2ympr7s4xcxv5y8jgxs7ahd6ah6fbgglj4rki1f1vw"; }) (fetchNuGet { + name = "Microsoft.Bcl.AsyncInterfaces"; + version = "5.0.0"; + sha256 = "0cp5jbax2mf6xr3dqiljzlwi05fv6n9a35z337s92jcljiq674kf"; + }) + (fetchNuGet { name = "Microsoft.Build.Framework"; version = "15.3.409"; sha256 = "1dhanwb9ihbfay85xj7cwn0byzmmdz94hqfi3q6r1ncwdjd8y1s2"; @@ -510,39 +500,24 @@ sha256 = "02250qrs3jqqbggfvd0mkim82817f79x6jh8fx2i7r58d0m66qkl"; }) (fetchNuGet { - name = "Microsoft.Extensions.Configuration"; - version = "3.1.10"; - sha256 = "04xjhi2pmvycx4yam7i3j2l2yjzzbzvxn4i12f00r39j4kkfwqsn"; - }) - (fetchNuGet { name = "Microsoft.Extensions.Configuration.Abstractions"; version = "2.2.0"; sha256 = "1fv5277hyhfqmc0gqszyqb1ilwnijm8kc9606yia6hwr8pxyg674"; }) (fetchNuGet { - name = "Microsoft.Extensions.Configuration.Abstractions"; - version = "3.1.10"; - sha256 = "1pj4n3c015ils13fwky2rfv5q8xza671ixb54vr479pc7an2fah3"; - }) - (fetchNuGet { name = "Microsoft.Extensions.Configuration.Binder"; version = "2.2.0"; sha256 = "10qyjdkymdmag3r807kvbnwag4j3nz65i4cwikbd77jjvz92ya3j"; }) (fetchNuGet { - name = "Microsoft.Extensions.Configuration.Binder"; - version = "3.1.10"; - sha256 = "004f9nshm5jg0g4n9f48phjx90pzmj88qbqyiimzgvwl0qkk870q"; - }) - (fetchNuGet { name = "Microsoft.Extensions.DependencyInjection"; version = "2.2.0"; sha256 = "0lvv45rvq1xbf47lz818rjydc776zk8mf7svpzh1dml4qwlx9zck"; }) (fetchNuGet { name = "Microsoft.Extensions.DependencyInjection"; - version = "3.1.10"; - sha256 = "0if1g8gj3ngvqf4ddkjhz30p4y2yax8m5vlbrjzgixq80g3apy6d"; + version = "5.0.1"; + sha256 = "06xig49mwyp3b2dvdx98j079ncg6p4c9x8yj4pzs6ppmi3jgaaqk"; }) (fetchNuGet { name = "Microsoft.Extensions.DependencyInjection.Abstractions"; @@ -551,13 +526,8 @@ }) (fetchNuGet { name = "Microsoft.Extensions.DependencyInjection.Abstractions"; - version = "3.1.10"; - sha256 = "0c9p32jd8fi5k02nbp7ilj0jmnl63kq2464acpsb6ajs4837c02q"; - }) - (fetchNuGet { - name = "Microsoft.Extensions.DependencyInjection.Abstractions"; - version = "3.1.11"; - sha256 = "097myz6cynk0y5xgashj9mkcliamdsljazg2hh3w407d197wzh6a"; + version = "5.0.0"; + sha256 = "17cz6s80va0ch0a6nqa1wbbbp3p8sqxb96lj4qcw67ivkp2yxiyj"; }) (fetchNuGet { name = "Microsoft.Extensions.DependencyModel"; @@ -571,8 +541,8 @@ }) (fetchNuGet { name = "Microsoft.Extensions.Logging"; - version = "3.1.10"; - sha256 = "1lf1hgpk0d5g9mv68f9b2cp6jhpnc4a6bflc1f2mn9x4dvmpv2wi"; + version = "5.0.0"; + sha256 = "1qa1l18q2jh9azya8gv1p8anzcdirjzd9dxxisb4911i9m1648i3"; }) (fetchNuGet { name = "Microsoft.Extensions.Logging.Abstractions"; @@ -581,8 +551,8 @@ }) (fetchNuGet { name = "Microsoft.Extensions.Logging.Abstractions"; - version = "3.1.10"; - sha256 = "1571q9iznbsmd7p87w420parmpdgi8zfjcs4kynmwv344dwdismz"; + version = "5.0.0"; + sha256 = "1yza38675dbv1qqnnhqm23alv2bbaqxp0pb7zinjmw8j2mr5r6wc"; }) (fetchNuGet { name = "Microsoft.Extensions.ObjectPool"; @@ -596,13 +566,8 @@ }) (fetchNuGet { name = "Microsoft.Extensions.Options"; - version = "3.1.10"; - sha256 = "0kmh12w0y4bf2jnmbbxk10mqnynjqa5qks5pa0zg4vsnfscj8i95"; - }) - (fetchNuGet { - name = "Microsoft.Extensions.Options"; - version = "3.1.11"; - sha256 = "1k78gc5mwcixjc99h7hvx1qal6i5y67lrciwqqzdl1xk7rl6pjw4"; + version = "5.0.0"; + sha256 = "1rdmgpg770x8qwaaa6ryc27zh93p697fcyvn5vkxp0wimlhqkbay"; }) (fetchNuGet { name = "Microsoft.Extensions.Primitives"; @@ -611,13 +576,8 @@ }) (fetchNuGet { name = "Microsoft.Extensions.Primitives"; - version = "3.1.10"; - sha256 = "0a3f35427hpai0wq1wlqpn4m5aacfddkq25hp71nwlz5zm1dqfmk"; - }) - (fetchNuGet { - name = "Microsoft.Extensions.Primitives"; - version = "3.1.11"; - sha256 = "1iy52c74jiki0i557qkjciywj7s6nnvbqx22i6p464fm925kwm4q"; + version = "5.0.0"; + sha256 = "0swqcknyh87ns82w539z1mvy804pfwhgzs97cr3nwqk6g5s42gd6"; }) (fetchNuGet { name = "Microsoft.NetCore.Analyzers"; @@ -646,11 +606,6 @@ }) (fetchNuGet { name = "Microsoft.NETCore.Platforms"; - version = "3.1.1"; - sha256 = "05hmaygd5131rnqi6ipv7agsbpi7ka18779vw45iw6b385l7n987"; - }) - (fetchNuGet { - name = "Microsoft.NETCore.Platforms"; version = "5.0.0"; sha256 = "0mwpwdflidzgzfx2dlpkvvnkgkr2ayaf0s80737h4wa35gaj11rc"; }) @@ -906,18 +861,8 @@ }) (fetchNuGet { name = "Sentry"; - version = "2.1.8"; - sha256 = "1ii62ynihr4j2v2agjizk38kfz3m9bdijkks9k7ydhcq1bcz7jbn"; - }) - (fetchNuGet { - name = "Sentry.PlatformAbstractions"; - version = "1.1.1"; - sha256 = "10mxyxmyjpr0y1ik2j55pp7ifn101sw319cbpf28i2xbfp0cvcaj"; - }) - (fetchNuGet { - name = "Sentry.Protocol"; - version = "2.1.8"; - sha256 = "04baw4yxc5lbcl83sfcdyjg5225719bf3sxpa3kjmhf58bjr143l"; + version = "3.0.1"; + sha256 = "1nmqwprp2xv9d8llfncyw94nfws9nwb7zj0sqrd6lv1mfgaxraql"; }) (fetchNuGet { name = "SharpCompress"; @@ -926,8 +871,8 @@ }) (fetchNuGet { name = "SharpCompress"; - version = "0.26.0"; - sha256 = "03cygf8p44j1bfn6z9cn2xrw6zhvhq17xac1sph5rgq7vq2m5iq5"; + version = "0.27.1"; + sha256 = "1lhljszs94i1ssl831ik1a51n2pshf27nsjm78acnw1y1qnkm5pd"; }) (fetchNuGet { name = "SharpFNT"; @@ -1120,6 +1065,11 @@ sha256 = "1y8m0p3127nak5yspapfnz25qc9x53gqpvwr3hdpsvrcd2r1pgyj"; }) (fetchNuGet { + name = "System.Diagnostics.DiagnosticSource"; + version = "5.0.0"; + sha256 = "0phd2qizshjvglhzws1jd0cq4m54gscz4ychzr3x6wbgl4vvfrga"; + }) + (fetchNuGet { name = "System.Diagnostics.Tools"; version = "4.0.1"; sha256 = "19cknvg07yhakcvpxg3cxa0bwadplin6kyxd8mpjjpwnp56nl85x"; @@ -1236,13 +1186,8 @@ }) (fetchNuGet { name = "System.IO.Pipelines"; - version = "4.7.3"; - sha256 = "0djp59x56klidi04xx8p5jc1nchv5zvd1d59diphqxwvgny3aawy"; - }) - (fetchNuGet { - name = "System.IO.Pipelines"; - version = "4.7.4"; - sha256 = "09gv2nz35vmmcjrfj1ppxx32v772i0mb369v7lwqr8mz14zhh86r"; + version = "5.0.1"; + sha256 = "1zvfcd2l1d5qxifsqd0cjyv57nr61a9ac2ca5jinyqmj32wgjd6v"; }) (fetchNuGet { name = "System.Linq"; @@ -1276,11 +1221,6 @@ }) (fetchNuGet { name = "System.Memory"; - version = "4.5.2"; - sha256 = "1g24dwqfcmf4gpbgbhaw1j49xmpsz389l6bw2xxbsmnzvsf860ld"; - }) - (fetchNuGet { - name = "System.Memory"; version = "4.5.3"; sha256 = "0naqahm3wljxb5a911d37mwjqjdxv9l0b49p5dmfyijvni2ppy8a"; }) @@ -1360,6 +1300,11 @@ sha256 = "11f8y3qfysfcrscjpjym9msk7lsfxkk4fmz9qq95kn3jd0769f74"; }) (fetchNuGet { + name = "System.Reflection.Emit"; + version = "4.6.0"; + sha256 = "18h375q5bn9h7swxnk4krrxym1dxmi9bm26p89xps9ygrj4q6zqw"; + }) + (fetchNuGet { name = "System.Reflection.Emit.ILGeneration"; version = "4.0.1"; sha256 = "1pcd2ig6bg144y10w7yxgc9d22r7c7ww7qn1frdfwgxr24j9wvv0"; @@ -1381,8 +1326,8 @@ }) (fetchNuGet { name = "System.Reflection.Emit.Lightweight"; - version = "4.7.0"; - sha256 = "0mbjfajmafkca47zr8v36brvknzks5a7pgb49kfq2d188pyv6iap"; + version = "4.6.0"; + sha256 = "0hry2k6b7kicg4zxnq0hhn0ys52711pxy7l9v5sp7gvp9cicwpgp"; }) (fetchNuGet { name = "System.Reflection.Extensions"; @@ -1465,6 +1410,11 @@ sha256 = "119br3pd85lq8zcgh4f60jzmv1g976q1kdgi3hvqdlhfbw6siz2j"; }) (fetchNuGet { + name = "System.Runtime.CompilerServices.Unsafe"; + version = "5.0.0"; + sha256 = "02k25ivn50dmqx5jn8hawwmz24yf0454fjd823qk6lygj9513q4x"; + }) + (fetchNuGet { name = "System.Runtime.Extensions"; version = "4.1.0"; sha256 = "0rw4rm4vsm3h3szxp9iijc3ksyviwsv6f63dng3vhqyg4vjdkc2z"; @@ -1520,11 +1470,6 @@ sha256 = "042rfjixknlr6r10vx2pgf56yming8lkjikamg3g4v29ikk78h7k"; }) (fetchNuGet { - name = "System.Runtime.Serialization.Primitives"; - version = "4.3.0"; - sha256 = "01vv2p8h4hsz217xxs0rixvb7f2xzbh6wv1gzbfykcbfrza6dvnf"; - }) - (fetchNuGet { name = "System.Security.AccessControl"; version = "5.0.0"; sha256 = "17n3lrrl6vahkqmhlpn3w20afgz09n7i6rv0r3qypngwi7wqdr5r"; @@ -1636,8 +1581,8 @@ }) (fetchNuGet { name = "System.Text.Encoding.CodePages"; - version = "4.7.1"; - sha256 = "1y1hdap9qbl7vp74j8s9zcbh3v1rnrrvcc55wj1hl6has2v3qh1r"; + version = "5.0.0"; + sha256 = "1bn2pzaaq4wx9ixirr8151vm5hynn3lmrljcgjx9yghmm4k677k0"; }) (fetchNuGet { name = "System.Text.Encoding.Extensions"; @@ -1651,13 +1596,18 @@ }) (fetchNuGet { name = "System.Text.Encodings.Web"; - version = "4.7.1"; - sha256 = "1wj7r07mjwbf9a79kapy2l9m8mcq8b3nbhg0zaprlsav09k85fmb"; + version = "5.0.0"; + sha256 = "144pgy65jc3bkar7d4fg1c0rq6qmkx68gj9k1ldk97558w22v1r1"; + }) + (fetchNuGet { + name = "System.Text.Json"; + version = "5.0.0"; + sha256 = "1gpgl18z6qrgmqrikgh99xkjwzb1didrjp77bch7nrlra21gr4ks"; }) (fetchNuGet { name = "System.Text.Json"; - version = "4.7.2"; - sha256 = "10xj1pw2dgd42anikvj9qm23ccssrcp7dpznpj4j7xjp1ikhy3y4"; + version = "5.0.1"; + sha256 = "1j7via4spxy73ipng754wdz1nb882gsb9qh26jqlql66vzbbm3j3"; }) (fetchNuGet { name = "System.Text.RegularExpressions"; @@ -1681,8 +1631,8 @@ }) (fetchNuGet { name = "System.Threading.Channels"; - version = "4.7.1"; - sha256 = "038fyrriypwzsj5fwgnkw79hm5ya0x63r724yizgahbxf512chr2"; + version = "5.0.0"; + sha256 = "11z28x3cawry60l5phkqrvavm0mshz84n4c79hrz0p65lq8jpxgs"; }) (fetchNuGet { name = "System.Threading.Tasks"; @@ -1706,6 +1656,11 @@ }) (fetchNuGet { name = "System.Threading.Tasks.Extensions"; + version = "4.5.3"; + sha256 = "0g7r6hm572ax8v28axrdxz1gnsblg6kszq17g51pj14a5rn2af7i"; + }) + (fetchNuGet { + name = "System.Threading.Tasks.Extensions"; version = "4.5.4"; sha256 = "0y6ncasgfcgnjrhynaf0lwpkpkmv4a07sswwkwbwb5h7riisj153"; }) @@ -1725,11 +1680,6 @@ sha256 = "1nx773nsx6z5whv8kaa1wjh037id2f1cxhb69pvgv12hd2b6qs56"; }) (fetchNuGet { - name = "System.ValueTuple"; - version = "4.3.0"; - sha256 = "1227k7fxbxapq7dms4lvwwjdf3pr1jcsmhy2nzzhj6g6hs530hxn"; - }) - (fetchNuGet { name = "System.Xml.ReaderWriter"; version = "4.0.11"; sha256 = "0c6ky1jk5ada9m94wcadih98l6k1fvf6vi7vhn1msjixaha419l5"; diff --git a/pkgs/games/performous/default.nix b/pkgs/games/performous/default.nix index b0fc9483629..dce771faec1 100644 --- a/pkgs/games/performous/default.nix +++ b/pkgs/games/performous/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub, cmake, pkg-config, gettext , glibmm, libxmlxx, pango, librsvg -, SDL2, glew, boost, libav, portaudio, epoxy +, SDL2, glew, boost, ffmpeg, portaudio, epoxy }: stdenv.mkDerivation rec { @@ -27,6 +27,6 @@ stdenv.mkDerivation rec { buildInputs = [ glibmm libxmlxx pango librsvg - SDL2 glew boost libav portaudio epoxy + SDL2 glew boost ffmpeg portaudio epoxy ]; } diff --git a/pkgs/games/pioneer/default.nix b/pkgs/games/pioneer/default.nix index 0d348e3fa9e..51eda72bdef 100644 --- a/pkgs/games/pioneer/default.nix +++ b/pkgs/games/pioneer/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "pioneer"; - version = "20200203"; + version = "20210203"; src = fetchFromGitHub{ owner = "pioneerspacesim"; repo = "pioneer"; rev = version; - sha256 = "1011xsi94jhw98mhm8kryq8ajig0qfbrdx5xdasi92bd4nk7lcp8"; + sha256 = "sha256-51HXbX15uB1Xf9Re7Qi41BnJ9OW+GeXQhylJ+HwP0f8="; }; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/pkgs/games/steam/fhsenv.nix b/pkgs/games/steam/fhsenv.nix index 57326667cb0..924714d802a 100644 --- a/pkgs/games/steam/fhsenv.nix +++ b/pkgs/games/steam/fhsenv.nix @@ -171,7 +171,7 @@ in buildFHSUserEnv rec { SDL2 libusb1 dbus-glib - libav + ffmpeg atk # Only libraries are needed from those two libudev0-shim diff --git a/pkgs/games/unciv/default.nix b/pkgs/games/unciv/default.nix index 917cf328e7e..af3740ae926 100644 --- a/pkgs/games/unciv/default.nix +++ b/pkgs/games/unciv/default.nix @@ -25,11 +25,11 @@ let in stdenv.mkDerivation rec { pname = "unciv"; - version = "3.12.8"; + version = "3.12.12"; src = fetchurl { url = "https://github.com/yairm210/Unciv/releases/download/${version}/Unciv.jar"; - sha256 = "178lasa6ahwg2s2hamm13yysg42qm13v6a9pgs6nm66np93nskc7"; + sha256 = "sha256-C5Mhn4v0dCAVGuYxi/3YMQKGUBkdBBXYGfsM1heJkQg="; }; dontUnpack = true; diff --git a/pkgs/misc/emulators/ppsspp/default.nix b/pkgs/misc/emulators/ppsspp/default.nix index 87dacd46d57..a50bc3eb3ec 100644 --- a/pkgs/misc/emulators/ppsspp/default.nix +++ b/pkgs/misc/emulators/ppsspp/default.nix @@ -16,14 +16,14 @@ mkDerivation rec { pname = "ppsspp"; - version = "1.10.3"; + version = "1.11"; src = fetchFromGitHub { owner = "hrydgard"; repo = pname; rev = "v${version}"; fetchSubmodules = true; - sha256 = "sha256-W41Poq5S+opkasIGYo13SQZWQF1HjfFnH7u9DW5HNA0="; + sha256 = "19948jzqpclf8zfzp3k7s580xfjgqcyfwlcp7x7xj8h8lyypzymx"; }; postPatch = '' diff --git a/pkgs/misc/screensavers/electricsheep/default.nix b/pkgs/misc/screensavers/electricsheep/default.nix index ea68e147ba7..74d9e3cffee 100644 --- a/pkgs/misc/screensavers/electricsheep/default.nix +++ b/pkgs/misc/screensavers/electricsheep/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, wxGTK30, libav, lua5_1, curl +{ lib, stdenv, fetchFromGitHub, autoreconfHook, wxGTK30, ffmpeg, lua5_1, curl , libpng, xorg, pkg-config, flam3, libgtop, boost, tinyxml, freeglut, libGLU, libGL , glee }: @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ - wxGTK30 libav lua5_1 curl libpng xorg.libXrender + wxGTK30 ffmpeg lua5_1 curl libpng xorg.libXrender flam3 libgtop boost tinyxml freeglut libGLU libGL glee ]; diff --git a/pkgs/misc/vscode-extensions/default.nix b/pkgs/misc/vscode-extensions/default.nix index 604a47e1ed4..11f38047630 100644 --- a/pkgs/misc/vscode-extensions/default.nix +++ b/pkgs/misc/vscode-extensions/default.nix @@ -1,4 +1,4 @@ -{ config, lib, callPackage, vscode-utils, nodePackages,llvmPackages_8, llvmPackages_latest }: +{ config, lib, callPackage, vscode-utils, nodePackages,llvmPackages_8 }: let inherit (vscode-utils) buildVscodeMarketplaceExtension; @@ -689,9 +689,7 @@ let }; }; - vadimcn.vscode-lldb = callPackage ./vscode-lldb { - lldb = llvmPackages_latest.lldb; - }; + vadimcn.vscode-lldb = callPackage ./vscode-lldb { }; vincaslt.highlight-matching-tag = buildVscodeMarketplaceExtension { mktplcRef = { diff --git a/pkgs/misc/vscode-extensions/vscode-lldb/build-deps/package.json b/pkgs/misc/vscode-extensions/vscode-lldb/build-deps/package.json index 6e73ee446d8..188fa67ede5 100644 --- a/pkgs/misc/vscode-extensions/vscode-lldb/build-deps/package.json +++ b/pkgs/misc/vscode-extensions/vscode-lldb/build-deps/package.json @@ -1,24 +1,24 @@ { - "name": "vscode-lldb", - "version": "1.5.3", - "dependencies": { - "@types/json5": "^0.0.30", - "@types/mocha": "^7.0.1", - "@types/node": "^8.10.50", - "@types/vscode": "^1.31.0", - "@types/yauzl": "^2.9.0", - "json5": "^2.1.0", - "memory-streams": "^0.1.3", - "mocha": "^7.0.1", - "source-map-support": "^0.5.12", - "string-argv": "^0.3.1", - "ts-loader": "^6.2.1", - "typescript": "^3.7.0", - "vsce": "^1.73.0", - "vscode-debugadapter-testsupport": "^1.35.0", - "vscode-debugprotocol": "^1.35.0", - "webpack": "^4.39.1", - "webpack-cli": "^3.3.7", - "yauzl": "^2.10.0" - } + "name": "vscode-lldb", + "version": "1.6.1", + "dependencies": { + "string-argv": "^0.3.1", + "yaml": "^1.10.0", + "yauzl": "^2.10.0", + "@types/vscode": "^1.31.0", + "@types/node": "^8.10.50", + "@types/mocha": "^7.0.1", + "@types/yauzl": "^2.9.0", + "@types/json5": "^0.0.30", + "typescript": "^3.7.0", + "mocha": "^7.0.1", + "source-map-support": "^0.5.12", + "memory-streams": "^0.1.3", + "vscode-debugprotocol": "^1.35.0", + "vscode-debugadapter-testsupport": "^1.35.0", + "vsce": "^1.73.0", + "webpack": "^4.39.1", + "webpack-cli": "^3.3.7", + "ts-loader": "^6.2.1" + } } diff --git a/pkgs/misc/vscode-extensions/vscode-lldb/cmake-build-extension-only.patch b/pkgs/misc/vscode-extensions/vscode-lldb/cmake-build-extension-only.patch index db62552b913..30ab3f9b21c 100644 --- a/pkgs/misc/vscode-extensions/vscode-lldb/cmake-build-extension-only.patch +++ b/pkgs/misc/vscode-extensions/vscode-lldb/cmake-build-extension-only.patch @@ -1,35 +1,25 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 890abd4..157a8a1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -9,13 +9,6 @@ include(cmake/CopyFiles.cmake) - set(CMAKE_CXX_STANDARD 11) - set(CMAKE_INSTALL_PREFIX $ENV{HOME}/.vscode/extensions/vscode-lldb CACHE PATH "Install location") - --set(LLDB_ROOT $ENV{LLDB_ROOT} CACHE PATH "Root of LLDB build directory") --if (LLDB_ROOT) -- message("Using LLDB from ${LLDB_ROOT}") +@@ -16,13 +16,6 @@ endif() + set(VERSION "${VERSION}${VERSION_SUFFIX}") + message("Version ${VERSION}") + +-set(LLDB_PACKAGE $ENV{LLDB_PACKAGE} CACHE PATH "Zip archive containing LLDB files") +-if (LLDB_PACKAGE) +- message("Using LLDB_PACKAGE=${LLDB_PACKAGE}") -else() -- message(FATAL_ERROR "LLDB_ROOT not set." ) +- message(FATAL_ERROR "LLDB_PACKAGE not set." ) -endif() - + set(TEST_TIMEOUT 5000 CACHE STRING "Test timeout [ms]") + # General OS-specific definitions - if (${CMAKE_SYSTEM_NAME} STREQUAL "Linux") - set(DylibPrefix lib) -@@ -64,8 +57,9 @@ set(UpdateFile ${CMAKE_COMMAND} -E copy_if_different) - - # Adapter - --add_subdirectory(adapter) --add_subdirectory(lldb) -+add_custom_target(adapter) -+add_custom_target(lldb) -+add_custom_target(codelldb) - - # Extension package content - -@@ -74,16 +68,6 @@ configure_file(package.json ${CMAKE_CURRENT_BINARY_DIR}/package.json @ONLY) +@@ -87,16 +80,6 @@ configure_file(package.json ${CMAKE_CURRENT_BINARY_DIR}/package.json @ONLY) configure_file(webpack.config.js ${CMAKE_CURRENT_BINARY_DIR}/webpack.config.js @ONLY) file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/package-lock.json DESTINATION ${CMAKE_CURRENT_BINARY_DIR}) - + -# Run 'npm install' -execute_process( - COMMAND ${NPM} install @@ -42,4 +32,3 @@ - # Copy it back, so we can commit the lock file. file(COPY ${CMAKE_CURRENT_BINARY_DIR}/package-lock.json DESTINATION ${CMAKE_CURRENT_SOURCE_DIR}) - \ No newline at end of file diff --git a/pkgs/misc/vscode-extensions/vscode-lldb/default.nix b/pkgs/misc/vscode-extensions/vscode-lldb/default.nix index f22c9df36a1..c4d22828103 100644 --- a/pkgs/misc/vscode-extensions/vscode-lldb/default.nix +++ b/pkgs/misc/vscode-extensions/vscode-lldb/default.nix @@ -1,100 +1,94 @@ -{ lib, stdenv, vscode-utils, fetchFromGitHub, rustPlatform, makeWrapper, jq -, nodePackages, cmake, nodejs, unzip, python3, lldb, breakpointHook -, setDefaultLldbPath ? true +{ lib, stdenv, fetchFromGitHub, rustPlatform, makeWrapper, jq, callPackage +, nodePackages, cmake, nodejs, unzip, python3 }: assert lib.versionAtLeast python3.version "3.5"; let publisher = "vadimcn"; - name = "vscode-lldb"; - version = "1.5.3"; - - dylibExt = stdenv.hostPlatform.extensions.sharedLibrary; + pname = "vscode-lldb"; + version = "1.6.1"; src = fetchFromGitHub { owner = "vadimcn"; repo = "vscode-lldb"; rev = "v${version}"; - sha256 = "1139945j3z0fxc3nlyvd81k0ypymqsj051idrbgbibwshpi86y93"; + sha256 = "sha256-mi+AeHg9zO0vjF0OZCufPkliInqxTvDGV350wqAwe90="; fetchSubmodules = true; }; + lldb = callPackage ./lldb.nix {}; + adapter = rustPlatform.buildRustPackage { - pname = "${name}-adapter"; + pname = "${pname}-adapter"; inherit version src; - cargoSha256 = "0jl4msf2jcjxddwqkx8fr0c35wg4vwvg5c19mihri1v34i09zc5r"; - # It will pollute the build environment of `buildRustPackage`. cargoPatches = [ ./reset-cargo-config.patch ]; + cargoSha256 = "sha256-HPVbqYsst/iFrHn5wvmWtqeVHOHR7JT8lu+/xZq1lK0="; + nativeBuildInputs = [ makeWrapper ]; buildAndTestSubdir = "adapter"; - # Hack: Need a nightly compiler. - RUSTC_BOOTSTRAP = 1; - - # `adapter` expects a special hierarchy to resolve everything well. - postInstall = '' - mkdir -p $out/adapter - mv -t $out/adapter \ - $out/bin/* \ - $out/lib/* \ - ./adapter/*.py \ - ./formatters/*.py - rmdir $out/{bin,lib} - ''; - - postFixup = '' - wrapProgram $out/adapter/codelldb \ - --prefix PATH : "${python3}/bin" \ - --prefix LD_LIBRARY_PATH : "${python3}/lib" - ''; + cargoFlags = [ + "--lib" + "--bin=codelldb" + "--features=weak-linkage" + ]; + + # Tests are linked to liblldb but it is not available here. + doCheck = false; }; - build-deps = nodePackages."vscode-lldb-build-deps-../../misc/vscode-extensions/vscode-lldb/build-deps"; + nodeDeps = nodePackages."vscode-lldb-build-deps-../../misc/vscode-extensions/vscode-lldb/build-deps"; - vsix = stdenv.mkDerivation { - name = "${name}-${version}-vsix"; - inherit src; +in stdenv.mkDerivation rec { + name = "vscode-extension-${pname}"; + inherit src; + vscodeExtUniqueId = "${publisher}.${pname}"; + installPrefix = "share/vscode/extensions/${vscodeExtUniqueId}"; - # Only build the extension. We handle `adapter` and `lldb` with nix. - patches = [ ./cmake-build-extension-only.patch ]; + nativeBuildInputs = [ cmake nodejs unzip makeWrapper ]; - nativeBuildInputs = [ cmake nodejs unzip breakpointHook ]; + patches = [ ./cmake-build-extension-only.patch ]; - postConfigure = '' - cp -r ${build-deps}/lib/node_modules/vscode-lldb/{node_modules,package-lock.json} . - ''; + postConfigure = '' + cp -r ${nodeDeps}/lib/node_modules/vscode-lldb/{node_modules,package-lock.json} . + ''; - makeFlags = [ "vsix_bootstrap" ]; + cmakeFlags = [ + # Do not append timestamp to version. + "-DVERSION_SUFFIX=" + ]; + makeFlags = [ "vsix_bootstrap" ]; - installPhase = '' - unzip ./codelldb-bootstrap.vsix 'extension/*' -d ./vsix-extracted - mv vsix-extracted/extension $out + installPhase = '' + ext=$out/$installPrefix + runHook preInstall - ln -s ${adapter}/adapter $out - # Mark that adapter and lldb are installed. - touch $out/platform.ok - ''; + unzip ./codelldb-bootstrap.vsix 'extension/*' -d ./vsix-extracted - dontStrip = true; - dontPatchELF = true; - }; + mkdir -p $ext/{adapter,formatters} + mv -t $ext vsix-extracted/extension/* + cp -t $ext/adapter ${adapter}/{bin,lib}/* ../adapter/*.py + cp -t $ext/formatters ../formatters/*.py + ln -s ${lldb} $ext/lldb + # Mark that all components are installed. + touch $ext/platform.ok -in vscode-utils.buildVscodeExtension { - inherit name; - src = vsix; + runHook postInstall + ''; - nativeBuildInputs = lib.optional setDefaultLldbPath jq; - postUnpack = lib.optionalString setDefaultLldbPath '' - jq '.contributes.configuration.properties."lldb.library".default = $s' \ - --arg s "${lldb}/lib/liblldb.so" \ - $sourceRoot/package.json >$sourceRoot/package.json.new - mv $sourceRoot/package.json.new $sourceRoot/package.json + # `adapter` will find python binary and libraries at runtime. + fixupPhase = '' + wrapProgram $out/$installPrefix/adapter/codelldb \ + --prefix PATH : "${python3}/bin" \ + --prefix LD_LIBRARY_PATH : "${python3}/lib" ''; - vscodeExtUniqueId = "${publisher}.${name}"; + passthru = { + inherit lldb adapter; + }; meta = with lib; { description = "A native debugger extension for VSCode based on LLDB"; @@ -102,5 +96,6 @@ in vscode-utils.buildVscodeExtension { license = with licenses; [ mit ]; maintainers = with maintainers; [ oxalica ]; platforms = platforms.all; + broken = stdenv.isDarwin; # Build failed on x86_64-darwin currently. }; } diff --git a/pkgs/misc/vscode-extensions/vscode-lldb/lldb.nix b/pkgs/misc/vscode-extensions/vscode-lldb/lldb.nix new file mode 100644 index 00000000000..2ec90b1931e --- /dev/null +++ b/pkgs/misc/vscode-extensions/vscode-lldb/lldb.nix @@ -0,0 +1,23 @@ +# Patched lldb for Rust language support. +{ lldb_11, fetchFromGitHub }: +let + llvmSrc = fetchFromGitHub { + owner = "vadimcn"; + repo = "llvm-project"; + rev = "dd7efd9ea2d38e3227bc2e83a99772aceeb44242"; + sha256 = "sha256-XY8J8Ie1cWb6ok72Gju/KUxZ4fIFQVitYVnuCezGRKQ="; + }; +in lldb_11.overrideAttrs (oldAttrs: { + src = "${llvmSrc}/lldb"; + + passthru = (oldAttrs.passthru or {}) // { + inherit llvmSrc; + }; + + doInstallCheck = true; + postInstallCheck = (oldAttrs.postInstallCheck or "") + '' + versionOutput="$($out/bin/lldb --version)" + echo "'lldb --version' returns: $versionOutput" + echo "$versionOutput" | grep -q 'rust-enabled' + ''; +}) diff --git a/pkgs/misc/vscode-extensions/vscode-lldb/update.sh b/pkgs/misc/vscode-extensions/vscode-lldb/update.sh new file mode 100755 index 00000000000..0f3e407ddde --- /dev/null +++ b/pkgs/misc/vscode-extensions/vscode-lldb/update.sh @@ -0,0 +1,35 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p jq nix-prefetch +set -eo pipefail +cd "$(dirname "${BASH_SOURCE[0]}")" +if [[ $# -ne 1 ]]; then + echo "Usage: ./update.sh <version>" + exit 1 +fi + +echo " +FIXME: This script doesn't update patched lldb. Please manually check branches +of https://github.com/vadimcn/llvm-project and update lldb with correct version of LLVM. +" + +nixpkgs=../../../.. +nixFile=./default.nix +owner=vadimcn +repo=vscode-lldb +version="$1" + +sed -E 's/\bversion = ".*?"/version = "'$version'"/' --in-place "$nixFile" +srcHash=$(nix-prefetch fetchFromGitHub --owner vadimcn --repo vscode-lldb --rev "v$version" --fetchSubmodules) +sed -E 's/\bsha256 = ".*?"/sha256 = "'$srcHash'"/' --in-place "$nixFile" +cargoHash=$(nix-prefetch "{ sha256 }: (import $nixpkgs {}).vscode-extensions.vadimcn.vscode-lldb.adapter.cargoDeps.overrideAttrs (_: { outputHash = sha256; })") +sed -E 's#\bcargoSha256 = ".*?"#cargoSha256 = "'$cargoHash'"#' --in-place "$nixFile" + +src="$(nix-build $nixpkgs -A vscode-extensions.vadimcn.vscode-lldb.src --no-out-link)" +jq '{ name, version: $version, dependencies: (.dependencies + .devDependencies) }' \ + --arg version "$version" \ + "$src/package.json" \ + > build-deps/package.json + +# Regenerate nodePackages. +cd "$nixpkgs/pkgs/development/node-packages" +exec ./generate.sh diff --git a/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix b/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix index 4fd1cf7ef1a..6801256c7d3 100644 --- a/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix +++ b/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix @@ -2,12 +2,12 @@ stdenvNoCC.mkDerivation rec { pname = "firmware-linux-nonfree"; - version = "2020-12-18"; + version = "2021-02-08"; src = fetchgit { url = "https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git"; rev = lib.replaceStrings ["-"] [""] version; - sha256 = "1rb5b3fzxk5bi6kfqp76q1qszivi0v1kdz1cwj2llp5sd9ns03b5"; + sha256 = "0c85cd659312isfz1r87qswsgfhy0rljagcwspnvjljqrh9bsgzq"; }; installFlags = [ "DESTDIR=$(out)" ]; @@ -17,7 +17,7 @@ stdenvNoCC.mkDerivation rec { outputHashMode = "recursive"; outputHashAlgo = "sha256"; - outputHash = "1p7vn2hfwca6w69jhw5zq70w44ji8mdnibm1z959aalax6ndy146"; + outputHash = "0l4xsgxdvjffad7a98n42nyqy3ihs6m6hy3qsfkqin9z10413x5n"; meta = with lib; { description = "Binary firmware collection packaged by kernel.org"; diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index 9c0f261d0c9..030e367348c 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -1,26 +1,26 @@ { "4.14": { "extra": "-hardened1", - "name": "linux-hardened-4.14.219-hardened1.patch", - "sha256": "0pgpb7phjgil01xbpwqdwyk8k3pv5qlikw4721cmy10aj97plpqw", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.219-hardened1/linux-hardened-4.14.219-hardened1.patch" + "name": "linux-hardened-4.14.220-hardened1.patch", + "sha256": "083jc9lwr8lwxyfk4r39jcncf2g89srd50crj17jw9ysrp1jpyks", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.220-hardened1/linux-hardened-4.14.220-hardened1.patch" }, "4.19": { "extra": "-hardened1", - "name": "linux-hardened-4.19.173-hardened1.patch", - "sha256": "19ikdwvp3mjh6cl2anhlpzmk1ha4lw1lf9rmvls7pzc7d1bmlwi0", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.173-hardened1/linux-hardened-4.19.173-hardened1.patch" + "name": "linux-hardened-4.19.174-hardened1.patch", + "sha256": "1ggh7rjqm68gih41a9z2pzm1wm483165lvmigdp604p152157974", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.174-hardened1/linux-hardened-4.19.174-hardened1.patch" }, "5.10": { "extra": "-hardened1", - "name": "linux-hardened-5.10.13-hardened1.patch", - "sha256": "1pn6ddkpairsij8p5130h8iwqq65v6ngn0c3pf6rlavy4az1sw82", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.13-hardened1/linux-hardened-5.10.13-hardened1.patch" + "name": "linux-hardened-5.10.14-hardened1.patch", + "sha256": "1l84hmwdkyd1nkby0w7vy9j0jhg866bpiw6hriav208dw2r0binx", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.14-hardened1/linux-hardened-5.10.14-hardened1.patch" }, "5.4": { "extra": "-hardened1", - "name": "linux-hardened-5.4.95-hardened1.patch", - "sha256": "04c54xk75gb4p4yfrmjam25jafqz47cqapr38jw2v1plwc98ng4m", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.95-hardened1/linux-hardened-5.4.95-hardened1.patch" + "name": "linux-hardened-5.4.96-hardened1.patch", + "sha256": "05cb303llr2m5ik5f4v5ykr8ycldkrdb8gvjdr02zm8g0as7agil", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.96-hardened1/linux-hardened-5.4.96-hardened1.patch" } } diff --git a/pkgs/os-specific/linux/kernel/linux-4.14.nix b/pkgs/os-specific/linux/kernel/linux-4.14.nix index d387e2fd03d..dd1692c0331 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.14.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.14.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "4.14.219"; + version = "4.14.220"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1p81p2g1dax225mbc704g1yl96i93nq19j9fpkrzr4f066kwmvkm"; + sha256 = "1qip0c8nvfximgg4fj9xai741cgvi9f141bsps3zmrryjd796i6h"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-4.19.nix b/pkgs/os-specific/linux/kernel/linux-4.19.nix index f0d84e36fa8..8110c107054 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.19.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.19.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "4.19.173"; + version = "4.19.174"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0pqr8k0kfnaklb31y29xvqdmgn0pak4qd9pl77lsh6pkwqvd5zfj"; + sha256 = "1rcy0hfbc3ny52mfrfysknm1q2scqz0g8l28j0qlyw8cx41wgxhg"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-4.4.nix b/pkgs/os-specific/linux/kernel/linux-4.4.nix index 3b8cea54f34..44614f47dfc 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.4.nix @@ -1,11 +1,11 @@ { buildPackages, fetchurl, perl, buildLinux, ... } @ args: buildLinux (args // rec { - version = "4.4.255"; + version = "4.4.256"; extraMeta.branch = "4.4"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0l45csywd30qrs8gwzjjijr5hwpd5s05rbyrxb37vck78znk0f1g"; + sha256 = "1z7vfy4h0mjvv0rcvvpb55x5fl16c6cgpcafz5gpjp0pw1p2lva8"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-4.9.nix b/pkgs/os-specific/linux/kernel/linux-4.9.nix index 4591018ee94..c03cfaabb30 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.9.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.9.nix @@ -1,11 +1,11 @@ { buildPackages, fetchurl, perl, buildLinux, ... } @ args: buildLinux (args // rec { - version = "4.9.255"; + version = "4.9.256"; extraMeta.branch = "4.9"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "066101fzq5lr1pznw1hwlvsdgqpv8n7b2yi09qpv3xi0r41jvpxg"; + sha256 = "15qlv4m56dzv195xjy4yp8qsrkbmv51vwfg0qcm664hkrb4i32y4"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-5.10.nix b/pkgs/os-specific/linux/kernel/linux-5.10.nix index 719f9ee40f1..cceb8eeafa6 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.10.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.10.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.10.13"; + version = "5.10.14"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "1wp1vy9y50ncwlx5yqgya5gy0vdqgzn0icffg6dzmvjwwc68qs86"; + sha256 = "0ahxga1jdgn8kxln0pn8j42qxx0dhrhm9vcpwilyjnwb36gvf9zs"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-5.4.nix b/pkgs/os-specific/linux/kernel/linux-5.4.nix index b5564815436..ba6e1bbd2b2 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.4.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.4.95"; + version = "5.4.96"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "0jfl2jwq9z6iymn6sfrdcf9w63nijdzf3ncxc77a5gs6yd2fa2h3"; + sha256 = "1q7mz69wzk1ps5770l9bj556qyndiz2frjjsl7pigsy5brlxwa7p"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-libre.nix b/pkgs/os-specific/linux/kernel/linux-libre.nix index a84828aa0c1..057027d3c88 100644 --- a/pkgs/os-specific/linux/kernel/linux-libre.nix +++ b/pkgs/os-specific/linux/kernel/linux-libre.nix @@ -1,8 +1,8 @@ { stdenv, lib, fetchsvn, linux , scripts ? fetchsvn { url = "https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/branches/"; - rev = "17812"; - sha256 = "150rh6qakyfzr6afzchf7c05z0dvc39gj0rpfb4ggr7xqpzhxrcc"; + rev = "17873"; + sha256 = "1r1c8wagbq3cgxys7ylvsg6bnxiky66xgx9l0282zsmnn3gh83l7"; } , ... }: diff --git a/pkgs/os-specific/linux/libsemanage/default.nix b/pkgs/os-specific/linux/libsemanage/default.nix index d7255ac4587..11a6f2755d4 100644 --- a/pkgs/os-specific/linux/libsemanage/default.nix +++ b/pkgs/os-specific/linux/libsemanage/default.nix @@ -30,6 +30,16 @@ stdenv.mkDerivation rec { "DEFAULT_SEMANAGE_CONF_LOCATION=$(out)/etc/selinux/semanage.conf" ]; + # The following turns the 'clobbered' error into a warning + # which should fix the following error: + # + # semanage_store.c: In function 'semanage_exec_prog': + # semanage_store.c:1278:6: error: variable 'i' might be clobbered by 'longjmp' or 'vfork' [8;;https://gcc.gnu.org/onlinedocs/gcc/Warning-Options.html#index-Wclobbered-Werror=clobbered8;;] + # 1278 | int i; + # | ^ + # cc1: all warnings being treated as errors + NIX_CFLAGS_COMPILE = [ "-Wno-error=clobbered" ]; + installTargets = [ "install" ] ++ optionals enablePython [ "install-pywrap" ]; meta = removeAttrs libsepol.meta ["outputsToInstall"] // { diff --git a/pkgs/os-specific/linux/power-profiles-daemon/default.nix b/pkgs/os-specific/linux/power-profiles-daemon/default.nix new file mode 100644 index 00000000000..c477e6f3679 --- /dev/null +++ b/pkgs/os-specific/linux/power-profiles-daemon/default.nix @@ -0,0 +1,66 @@ +{ stdenv +, lib +, pkg-config +, meson +, ninja +, fetchFromGitLab +, libgudev +, glib +, gobject-introspection +, gettext +, gtk-doc +, docbook-xsl-nons +, docbook_xml_dtd_412 +, libxml2 +, libxslt +, upower +, systemd +}: + +stdenv.mkDerivation rec { + pname = "power-profiles-daemon"; + version = "0.1"; + + outputs = [ "out" "devdoc" ]; + + src = fetchFromGitLab { + domain = "gitlab.freedesktop.org"; + owner = "hadess"; + repo = "power-profiles-daemon"; + rev = version; + sha256 = "012w3aryw5d43dr9jj5i6wy2a0n21jidr4ggs9ix7d4z9byr175w"; + }; + + nativeBuildInputs = [ + pkg-config + meson + ninja + gettext + gtk-doc + docbook-xsl-nons + docbook_xml_dtd_412 + libxml2 # for xmllint for stripping GResources + libxslt # for xsltproc for building docs + gobject-introspection + ]; + + buildInputs = [ + libgudev + systemd + upower + glib + ]; + + mesonFlags = [ + "-Dsystemdsystemunitdir=${placeholder "out"}/lib/systemd/system" + "-Dgtk_doc=true" + ]; + + meta = with lib; { + homepage = "https://gitlab.freedesktop.org/hadess/power-profiles-daemon"; + description = "Makes user-selected power profiles handling available over D-Bus"; + platforms = platforms.linux; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ mvnetbiz ]; + }; +} diff --git a/pkgs/os-specific/solo5/default.nix b/pkgs/os-specific/solo5/default.nix index 19d1aa3b5eb..baba0ecdf0a 100644 --- a/pkgs/os-specific/solo5/default.nix +++ b/pkgs/os-specific/solo5/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchurl, pkg-config, libseccomp, util-linux, qemu }: -let version = "0.6.7"; +let version = "0.6.8"; in stdenv.mkDerivation { pname = "solo5"; inherit version; @@ -11,7 +11,7 @@ in stdenv.mkDerivation { src = fetchurl { url = "https://github.com/Solo5/solo5/releases/download/v${version}/solo5-v${version}.tar.gz"; - sha256 = "05k9adg3440zk5baa6ry8z5dj8d8r8hvzafh2469pdgcnr6h45gr"; + sha256 = "sha256-zrxNCXJIuEbtE3YNRK8Bxu2koHsQkcF+xItoIyhj9Uc="; }; hardeningEnable = [ "pie" ]; diff --git a/pkgs/servers/gemini/agate/default.nix b/pkgs/servers/gemini/agate/default.nix new file mode 100644 index 00000000000..558efe2fb01 --- /dev/null +++ b/pkgs/servers/gemini/agate/default.nix @@ -0,0 +1,29 @@ +{ lib, fetchFromGitHub, rustPlatform, installShellFiles }: + +rustPlatform.buildRustPackage rec { + pname = "agate"; + version = "2.3.0"; + + src = fetchFromGitHub { + owner = "mbrubeck"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-rwoEZnxh0x+xaggJuoeSjE1ctF43ChW5awcDJyoWioA="; + }; + + cargoSha256 = "sha256-ey/fUHkPoWjWlLjh1WNpwMKOkdQKgFYcLwQdx2RQ3CI="; + + meta = with lib; { + homepage = "https://proxy.vulpes.one/gemini/gem.limpet.net/agate"; + changelog = "https://proxy.vulpes.one/gemini/gem.limpet.net/agate"; + description = "Very simple server for the Gemini hypertext protocol"; + longDescription = '' + Agate is a server for the Gemini network protocol, built with the Rust + programming language. Agate has very few features, and can only serve + static files. It uses async I/O, and should be quite efficient even when + running on low-end hardware and serving many concurrent requests. + ''; + license = licenses.asl20; + maintainers = with maintainers; [ jk ]; + }; +} diff --git a/pkgs/servers/gerbera/default.nix b/pkgs/servers/gerbera/default.nix index f81cc6600f1..7736ed1a014 100644 --- a/pkgs/servers/gerbera/default.nix +++ b/pkgs/servers/gerbera/default.nix @@ -2,18 +2,17 @@ , cmake, pkg-config # required , libupnp, libuuid, pugixml, libiconv, sqlite, zlib, spdlog, fmt -, pkgs # options -, enableDuktape ? true -, enableCurl ? true -, enableTaglib ? true -, enableLibmagic ? true -, enableLibmatroska ? true -, enableAvcodec ? false -, enableLibexif ? true -, enableExiv2 ? false -, enableFFmpegThumbnailer ? false -, enableInotifyTools ? true +, enableDuktape ? true, duktape +, enableCurl ? true, curl +, enableTaglib ? true, taglib +, enableLibmagic ? true, file +, enableLibmatroska ? true, libmatroska, libebml +, enableAvcodec ? false, ffmpeg +, enableLibexif ? true, libexif +, enableExiv2 ? false, exiv2 +, enableFFmpegThumbnailer ? false, ffmpegthumbnailer +, enableInotifyTools ? true, inotify-tools }: with lib; @@ -51,16 +50,16 @@ in stdenv.mkDerivation rec { libupnp libuuid pugixml libiconv sqlite zlib fmt.dev spdlog ] - ++ optionals enableDuktape [ pkgs.duktape ] - ++ optionals enableCurl [ pkgs.curl ] - ++ optionals enableTaglib [ pkgs.taglib ] - ++ optionals enableLibmagic [ pkgs.file ] - ++ optionals enableLibmatroska [ pkgs.libmatroska pkgs.libebml ] - ++ optionals enableAvcodec [ pkgs.libav.dev ] - ++ optionals enableLibexif [ pkgs.libexif ] - ++ optionals enableExiv2 [ pkgs.exiv2 ] - ++ optionals enableInotifyTools [ pkgs.inotify-tools ] - ++ optionals enableFFmpegThumbnailer [ pkgs.ffmpegthumbnailer ]; + ++ optionals enableDuktape [ duktape ] + ++ optionals enableCurl [ curl ] + ++ optionals enableTaglib [ taglib ] + ++ optionals enableLibmagic [ file ] + ++ optionals enableLibmatroska [ libmatroska libebml ] + ++ optionals enableAvcodec [ ffmpeg.dev ] + ++ optionals enableLibexif [ libexif ] + ++ optionals enableExiv2 [ exiv2 ] + ++ optionals enableInotifyTools [ inotify-tools ] + ++ optionals enableFFmpegThumbnailer [ ffmpegthumbnailer ]; meta = with lib; { diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index d6aebd0cd45..95506e378f2 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -195,7 +195,7 @@ "dwd_weather_warnings" = ps: with ps; [ ]; # missing inputs: dwdwfsapi "dweet" = ps: with ps; [ ]; # missing inputs: dweepy "dynalite" = ps: with ps; [ ]; # missing inputs: dynalite_devices - "dyson" = ps: with ps; [ aiohttp-cors zeroconf ]; # missing inputs: libpurecool + "dyson" = ps: with ps; [ aiohttp-cors libpurecool zeroconf ]; "eafm" = ps: with ps; [ aioeafm ]; "ebox" = ps: with ps; [ ]; # missing inputs: pyebox "ebusd" = ps: with ps; [ ]; # missing inputs: ebusdpy @@ -561,7 +561,7 @@ "nsw_rural_fire_service_feed" = ps: with ps; [ ]; # missing inputs: aio_geojson_nsw_rfs_incidents "nuheat" = ps: with ps; [ ]; # missing inputs: nuheat "nuimo_controller" = ps: with ps; [ ]; # missing inputs: --only-binary=all nuimo - "nuki" = ps: with ps; [ ]; # missing inputs: pynuki + "nuki" = ps: with ps; [ pynuki ]; "numato" = ps: with ps; [ ]; # missing inputs: numato-gpio "number" = ps: with ps; [ ]; "nut" = ps: with ps; [ ]; # missing inputs: pynut2 @@ -592,7 +592,7 @@ "opensensemap" = ps: with ps; [ opensensemap-api ]; "opensky" = ps: with ps; [ ]; "opentherm_gw" = ps: with ps; [ ]; # missing inputs: pyotgw - "openuv" = ps: with ps; [ ]; # missing inputs: pyopenuv + "openuv" = ps: with ps; [ pyopenuv ]; "openweathermap" = ps: with ps; [ pyowm ]; "opnsense" = ps: with ps; [ pyopnsense ]; "opple" = ps: with ps; [ ]; # missing inputs: pyoppleio diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 977c58906ac..86d19a1694e 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -199,6 +199,8 @@ in with py.pkgs; buildPythonApplication rec { # keyring.errors.NoKeyringError: No recommended backend was available. "test_secrets_from_unrelated_fails" "test_secrets_credstash" + # system_log/test_init.py: assert 0 == 1 where 0 = len([]) + "test_error_posted_as_event" ]; preCheck = '' diff --git a/pkgs/servers/http/nginx/modules.nix b/pkgs/servers/http/nginx/modules.nix index 71bc969bbea..0725b674a39 100644 --- a/pkgs/servers/http/nginx/modules.nix +++ b/pkgs/servers/http/nginx/modules.nix @@ -22,6 +22,17 @@ in fastcgi-cache-purge = throw "fastcgi-cache-purge was renamed to cache-purge"; ngx_aws_auth = throw "ngx_aws_auth was renamed to aws-auth"; + akamai-token-validate = { + src = fetchFromGitHub { + name = "akamai-token-validate"; + owner = "kaltura"; + repo = "nginx-akamai-token-validate-module"; + rev = "34fd0c94d2c43c642f323491c4f4a226cd83b962"; + sha256 = "0yf34s11vgkcl03wbl6gjngm3p9hs8vvm7hkjkwhjh39vkk2a7cy"; + }; + inputs = [ pkgs.openssl ]; + }; + aws-auth = { src = fetchFromGitHub { name = "aws-auth"; @@ -320,6 +331,17 @@ in }; }; + secure-token = { + src = fetchFromGitHub { + name = "secure-token"; + owner = "kaltura"; + repo = "nginx-secure-token-module"; + rev = "95bdc0d1aca06ea7fe42555f71e65910bd74914d"; + sha256 = "19wzck1xzq4kz7nyabcwzlank1k7wi7w2wn2c1mwz374c79g8ggp"; + }; + inputs = [ pkgs.openssl ]; + }; + set-misc = { src = fetchFromGitHub { name = "set-misc"; @@ -370,6 +392,16 @@ in }; }; + spnego-http-auth = { + src = fetchFromGitHub { + name = "spnego-http-auth"; + owner = "stnoonan"; + repo = "spnego-http-auth-nginx-module"; + rev = "72c8ee04c81f929ec84d5a6d126f789b77781a8c"; + sha256 = "05rw3a7cv651951li995r5l1yzz6kwkm2xpbd59jsfzd74bw941i"; + }; + }; + statsd = { src = fetchFromGitHub { name = "statsd"; @@ -462,6 +494,17 @@ in inputs = [ pkgs.ffmpeg_3 ]; }; + vod = { + src = fetchFromGitHub { + name = "vod"; + owner = "kaltura"; + repo = "nginx-vod-module"; + rev = "e46079f51282d5a378e6911714b5f3a533bb7700"; + sha256 = "0pzzq4xcq7jg8mxwnz7srj1nczg9ajd1b8q58qlm03lny8nd2hr5"; + }; + inputs = [ pkgs.ffmpeg_3 pkgs.fdk_aac pkgs.openssl pkgs.libxml2 pkgs.libiconv ]; + }; + vts = { src = fetchFromGitHub { name = "vts"; diff --git a/pkgs/servers/irc/ngircd/default.nix b/pkgs/servers/irc/ngircd/default.nix index b89837e5942..870a7836fe4 100644 --- a/pkgs/servers/irc/ngircd/default.nix +++ b/pkgs/servers/irc/ngircd/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "ngircd"; - version = "26"; + version = "26.1"; src = fetchurl { url = "https://ngircd.barton.de/pub/ngircd/${pname}-${version}.tar.xz"; - sha256 = "1ijmv18fa648y7apxb9vp4j9iq6fxq850kz5v36rysaq614cdp2n"; + sha256 = "sha256-VcFv0mAJ9vxqAH3076yHoC4SL2gGEs2hzibhehjYYlQ="; }; configureFlags = [ diff --git a/pkgs/servers/monitoring/prometheus/promscale.nix b/pkgs/servers/monitoring/prometheus/promscale.nix index a4ba3cee620..965b33aa337 100644 --- a/pkgs/servers/monitoring/prometheus/promscale.nix +++ b/pkgs/servers/monitoring/prometheus/promscale.nix @@ -5,20 +5,29 @@ buildGoModule rec { pname = "promscale"; - version = "0.1.4"; + version = "0.2.0"; src = fetchFromGitHub { owner = "timescale"; repo = pname; rev = version; - sha256 = "0179sw5zx552y14lr56adxcgas642xvxpqly6y4m9pi33r1gs8lj"; + sha256 = "sha256-rXOAAd08NTWFRGnJoAY9xllw6dAA7Xu3qcImIVq9ewE="; }; - vendorSha256 = "sha256:04gzf0siz96ar4qdkcw6daswy14i1zvl7ir200adhw1c5phppab6"; + vendorSha256 = "sha256-/woSbtrOI3BVBhh+A2kO1CB1BLzBciwOqvSbGkFeMEU="; buildFlagsArray = [ "-ldflags=-s -w -X github.com/timescale/promscale/pkg/version.Version=${version} -X github.com/timescale/promscale/pkg/version.CommitHash=${src.rev}" ]; doCheck = false; # Requires access to a docker daemon + doInstallCheck = true; + installCheckPhase = '' + if [[ "$("$out/bin/${pname}" -version)" == "${version}" ]]; then + echo '${pname} smoke check passed' + else + echo '${pname} smoke check failed' + exit 1 + fi + ''; meta = with lib; { description = "An open-source analytical platform for Prometheus metrics"; diff --git a/pkgs/servers/monitoring/thanos/default.nix b/pkgs/servers/monitoring/thanos/default.nix index 755dc151775..2b0be2803e2 100644 --- a/pkgs/servers/monitoring/thanos/default.nix +++ b/pkgs/servers/monitoring/thanos/default.nix @@ -1,16 +1,16 @@ { lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "thanos"; - version = "0.17.2"; + version = "0.18.0"; src = fetchFromGitHub { rev = "v${version}"; owner = "thanos-io"; repo = "thanos"; - sha256 = "1zxx6vyf0fhrz8yqnlakszwziyq20k3kprshh414qxdpqfj9jax6"; + sha256 = "sha256-GJKTQGMmFJeUQn02GWP4KKpKdM8eT+VxDBDzST+5NXk="; }; - vendorSha256 = "1j3gnzas0hpb5dljf5m97nw2v4r1bp3l99z36gbqkm6lqzr6hqk8"; + vendorSha256 = "sha256-s11iJFcJ1Ez6TkhCU3VD2ThU5/9otHz5rDF8z9ux79E="; doCheck = false; diff --git a/pkgs/servers/nextcloud/default.nix b/pkgs/servers/nextcloud/default.nix index e146adbe12c..a40dd71fafd 100644 --- a/pkgs/servers/nextcloud/default.nix +++ b/pkgs/servers/nextcloud/default.nix @@ -58,7 +58,7 @@ in { }; nextcloud20 = generic { - version = "20.0.6"; - sha256 = "859167170402b876b6ef1a37fa4aaa5617b6bf847bb5d50a94f636bae65a34b9"; + version = "20.0.7"; + sha256 = "sha256-jO2Ct3K/CvZ9W+EyPkD5d0KbwKK8yGQJXvx4dnUAtys="; }; } diff --git a/pkgs/servers/nosql/influxdb2/default.nix b/pkgs/servers/nosql/influxdb2/default.nix index 627cd6d627d..bace331e05c 100644 --- a/pkgs/servers/nosql/influxdb2/default.nix +++ b/pkgs/servers/nosql/influxdb2/default.nix @@ -73,28 +73,12 @@ let --replace /out $out ''; }; - - # Can't use the nixpkgs version of go-bindata, it's an ancient - # ancestor of this more modern one. - bindata = buildGoPackage { - pname = "go-bindata"; - version = "v3.22.0"; - src = fetchFromGitHub { - owner = "kevinburke"; - repo = "go-bindata"; - rev = "v3.22.0"; - sha256 = "10dq77dml5jvvq2jkdq81a9yjg7rncq8iw8r84cc3dz6l9hxzj0x"; - }; - - goPackagePath = "github.com/kevinburke/go-bindata"; - subPackages = [ "go-bindata" ]; - }; in buildGoModule { pname = "influxdb"; version = version; src = src; - nativeBuildInputs = [ bindata pkg-config ]; + nativeBuildInputs = [ go-bindata pkg-config ]; vendorSha256 = "0lviz7l5zbghyfkp0lvlv8ykpak5hhkfal8d7xwvpsm8q3sghc8a"; subPackages = [ "cmd/influxd" "cmd/influx" ]; diff --git a/pkgs/servers/pg_tileserv/default.nix b/pkgs/servers/pg_tileserv/default.nix index 9f735664863..51a3ae1a7fe 100644 --- a/pkgs/servers/pg_tileserv/default.nix +++ b/pkgs/servers/pg_tileserv/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "pg_tileserv"; - version = "1.0.5"; + version = "1.0.6"; src = fetchFromGitHub { owner = "CrunchyData"; repo = pname; rev = "v${version}"; - sha256 = "sha256-62cJ0j/UfPW/ujKr0iA7Be8wZYlZ68mpJX8v1tAVREc="; + sha256 = "sha256-6KFYTZq126uvxQ5IOrMN+hpnAk/WtmS1Dam7w6Oif1M="; }; vendorSha256 = "sha256-qdlh9H039GwKTxOhx+dzyUHkzJbaOeuguKnBOyAPe/E="; diff --git a/pkgs/servers/plex/raw.nix b/pkgs/servers/plex/raw.nix index c49f930f542..ca0e41f76d2 100644 --- a/pkgs/servers/plex/raw.nix +++ b/pkgs/servers/plex/raw.nix @@ -12,16 +12,16 @@ # server, and the FHS userenv and corresponding NixOS module should # automatically pick up the changes. stdenv.mkDerivation rec { - version = "1.21.2.3943-a91458577"; + version = "1.21.3.4014-58bd20c02"; pname = "plexmediaserver"; # Fetch the source src = if stdenv.hostPlatform.system == "aarch64-linux" then fetchurl { url = "https://downloads.plex.tv/plex-media-server-new/${version}/debian/plexmediaserver_${version}_arm64.deb"; - sha256 = "1wgv37z1j8yh0jck8nawq8qk6vjvc2cap2dj2vdid9dafy9fl7yw"; + sha256 = "15zfhjvp5yzai5ylhljw221v6qm16fma0x0lay9zpgkxrwqw9iaw"; } else fetchurl { url = "https://downloads.plex.tv/plex-media-server-new/${version}/debian/plexmediaserver_${version}_amd64.deb"; - sha256 = "0bjxb2kmq43fi8026jvdbqn14lg33k2520n59l497la56l5d0h37"; + sha256 = "1gig4n6iijipf2njixgpw00pm3g5rgbq1vvd9ljy8cjpv1kb5z0z"; }; outputs = [ "out" "basedb" ]; diff --git a/pkgs/servers/roundcube/default.nix b/pkgs/servers/roundcube/default.nix index ce62b7d1fdc..75afedaa2dd 100644 --- a/pkgs/servers/roundcube/default.nix +++ b/pkgs/servers/roundcube/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "roundcube"; - version = "1.4.10"; + version = "1.4.11"; src = fetchurl { url = "https://github.com/roundcube/roundcubemail/releases/download/${version}/roundcubemail-${version}-complete.tar.gz"; - sha256 = "03sjvmnrspkiq0w73xvp1w61pcxhv0djrdm3mvs8h0dp9pfc1n53"; + sha256 = "sha256-rHMZBwwwX8LIjHcjYFVi2GBwMHMr7ukxzbQJHPBeabc="; }; patches = [ ./0001-Don-t-resolve-symlinks-when-trying-to-find-INSTALL_P.patch ]; diff --git a/pkgs/servers/samba/4.x.nix b/pkgs/servers/samba/4.x.nix index c125732cafc..0c422970d56 100644 --- a/pkgs/servers/samba/4.x.nix +++ b/pkgs/servers/samba/4.x.nix @@ -158,7 +158,8 @@ stdenv.mkDerivation rec { description = "The standard Windows interoperability suite of programs for Linux and Unix"; license = licenses.gpl3; platforms = platforms.unix; - broken = stdenv.isDarwin; + # N.B. enableGlusterFS does not build + broken = stdenv.isDarwin || enableGlusterFS; maintainers = with maintainers; [ aneeshusa ]; }; } diff --git a/pkgs/servers/swego/default.nix b/pkgs/servers/swego/default.nix index 4c7c9d76450..91b0995466a 100644 --- a/pkgs/servers/swego/default.nix +++ b/pkgs/servers/swego/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "swego"; - version = "0.7"; + version = "0.9"; src = fetchFromGitHub { owner = "nodauf"; repo = "Swego"; rev = "v${version}"; - sha256 = "14qww4ndvrxmrgkggr8hyvfpz2v7fw0vq6s8715mxa28f8pfi78b"; + sha256 = "sha256-Wt+2spZfgBWzZEQP+SiDYI5DdLKrwFMgYT1ukbF4x0I="; }; - vendorSha256 = "068drahh0aysrm8cr5pgik27jqyk28bsx5130mc2v3xd0xmk8yp1"; + vendorSha256 = "sha256-EPcyhnTis7g0uVl+cJdG7iMbisjh7iuMhpzM/SSOeFI="; postInstall = '' mv $out/bin/src $out/bin/$pname diff --git a/pkgs/servers/tracing/tempo/default.nix b/pkgs/servers/tracing/tempo/default.nix index 6e5ae662b01..22c1df884b4 100644 --- a/pkgs/servers/tracing/tempo/default.nix +++ b/pkgs/servers/tracing/tempo/default.nix @@ -1,14 +1,14 @@ { lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { - version = "0.4.0"; + version = "0.5.0"; pname = "tempo"; src = fetchFromGitHub { rev = "v${version}"; owner = "grafana"; repo = "tempo"; - sha256 = "16hrvhnlciaf06l34p3bb3nvmxr8zwbh7zql13zja1hs0kvwxv5c"; + sha256 = "sha256-Har0JJqr6mkliKh25n+F4tork+bzfI/bv19H/rIRb9g="; }; vendorSha256 = null; diff --git a/pkgs/servers/traefik/default.nix b/pkgs/servers/traefik/default.nix index 340bad6bdc8..d0125278176 100644 --- a/pkgs/servers/traefik/default.nix +++ b/pkgs/servers/traefik/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "traefik"; - version = "2.3.4"; + version = "2.4.2"; src = fetchzip { url = "https://github.com/traefik/traefik/releases/download/v${version}/traefik-v${version}.src.tar.gz"; - sha256 = "1vdnd6nb8bfiwd51rrqhrc9p8lh3fhny49lapgbzk36ynqc97bi5"; + sha256 = "sha256-W6NtlIxeRg432RTiaJHu25Izv1VWNqYetzilCr2gPjU="; stripRoot = false; }; - vendorSha256 = "0h3j0b034yh70c9bscj1k1jy8igsr7p0i014yr0zl7wlc6s6c9bp"; + vendorSha256 = "sha256-kwA0MtmlUEO1eQFr4NpdsMikEFQc3N3Meolw/xw9dgM="; doCheck = false; diff --git a/pkgs/servers/web-apps/wallabag/default.nix b/pkgs/servers/web-apps/wallabag/default.nix index c8722fbe8f7..44f207e3b86 100644 --- a/pkgs/servers/web-apps/wallabag/default.nix +++ b/pkgs/servers/web-apps/wallabag/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "wallabag"; - version = "2.4.0"; + version = "2.4.1"; # remember to rm -r var/cache/* after a rebuild or unexpected errors will occur src = fetchurl { url = "https://static.wallabag.org/releases/wallabag-release-${version}.tar.gz"; - sha256 = "11vda7aqq82kpr88v4hr7zg19zfq970n3z4qp25my8b1fvlgdjhi"; + sha256 = "1dqf5ia66kjsnfad2xkm8w6jgs976mf9x0dcd73jybqfgs4j09kj"; }; outputs = [ "out" ]; diff --git a/pkgs/shells/oil/default.nix b/pkgs/shells/oil/default.nix index 0896b8a5046..d633faea1cb 100644 --- a/pkgs/shells/oil/default.nix +++ b/pkgs/shells/oil/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "oil"; - version = "0.8.5"; + version = "0.8.6"; src = fetchurl { url = "https://www.oilshell.org/download/oil-${version}.tar.xz"; - sha256 = "1z0p08q4808h78bp6nwdszpfavhr4y7n313bp0gg5qdbssnciq1v"; + sha256 = "sha256-fX1miI8yXzn/T9cbbZ/7E6/tLs3RXsX3PgfC7sBxIjU="; }; postPatch = '' diff --git a/pkgs/shells/zsh/zplugin/default.nix b/pkgs/shells/zsh/zinit/default.nix index c148f60b2ee..d59f50ce3b9 100644 --- a/pkgs/shells/zsh/zplugin/default.nix +++ b/pkgs/shells/zsh/zinit/default.nix @@ -1,12 +1,13 @@ { stdenvNoCC, lib, fetchFromGitHub, installShellFiles }: + stdenvNoCC.mkDerivation rec { - pname = "zplugin"; - version = "2.3"; + pname = "zinit"; + version = "3.7"; src = fetchFromGitHub { owner = "zdharma"; repo = pname; rev = "v${version}"; - sha256 = "0qqv5p19s8jb06d6h55dm4acji9x2rpxb2ni3h7fb0q43iz6y85w"; + hash = "sha256-B+cTGz+U8MR22l6xXdRAAjDr+ulCk+CJ9GllFMK0axE="; }; # adapted from https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=zsh-zplugin-git dontBuild = true; @@ -18,11 +19,12 @@ stdenvNoCC.mkDerivation rec { # Zplugin's source files install -dm0755 "$outdir" - install -m0644 zplugin{,-side,-install,-autoload}.zsh "$outdir" + # Installing also backward compatibility layer + install -m0644 z{plugin,init}{,-side,-install,-autoload}.zsh "$outdir" install -m0755 git-process-output.zsh "$outdir" # Zplugin autocompletion - installShellCompletion --zsh _zplugin + installShellCompletion --zsh _zinit #TODO:Zplugin-module files # find zmodules/ -type d -exec install -dm 755 "{}" "$outdir/{}" \; @@ -32,7 +34,7 @@ stdenvNoCC.mkDerivation rec { #TODO:doc output meta = with lib; { - homepage = "https://github.com/zdharma/zplugin"; + homepage = "https://github.com/zdharma/zinit"; description = "Flexible zsh plugin manager"; license = licenses.mit; maintainers = with maintainers; [ pasqui23 ]; diff --git a/pkgs/stdenv/freebsd/default.nix b/pkgs/stdenv/freebsd/default.nix index 38b168c0e72..5aadfd81a20 100644 --- a/pkgs/stdenv/freebsd/default.nix +++ b/pkgs/stdenv/freebsd/default.nix @@ -1,11 +1,170 @@ { lib -, localSystem, crossSystem, config, overlays +, localSystem, crossSystem, config, overlays, crossOverlays ? [] }: assert crossSystem == localSystem; -let inherit (localSystem) system; in - - +let inherit (localSystem) system; + fetchURL = import <nix/fetchurl.nix>; + trivialBuilder = (import ./trivial-builder.nix); + make = trivialBuilder rec { + inherit (localSystem) system; + name = "make"; + ver = "4.3"; + url = "https://ftp.gnu.org/gnu/${name}/${name}-${ver}.tar.gz"; + sha256 = "06cfqzpqsvdnsxbysl5p2fgdgxgl9y4p7scpnrfa8z2zgkjdspz0"; + configureArgs = [ "--disable-nls" + "--without-libintl-prefix" + "--without-libiconv-prefix" + ]; + }; + bash = trivialBuilder rec { + inherit (localSystem) system; + name = "bash"; + ver = "4.4.18"; + url = "https://ftp.gnu.org/gnu/${name}/${name}-${ver}.tar.gz"; + sha256 = "08vz660768mnnax7n8d4d85jxafwdmsxsi7fh0hzvmafbvn9wkb0"; + configureArgs = [ "--disable-nls" + "--without-libintl-prefix" + "--without-libiconv-prefix" + ]; + }; + coreutils = trivialBuilder rec { + inherit (localSystem) system; + name = "coreutils"; + ver = "8.31"; + url = "https://ftp.gnu.org/gnu/${name}/${name}-${ver}.tar.xz"; + sha256 = "1zg9m79x1i2nifj4kb0waf9x3i5h6ydkypkjnbsb9rnwis8rqypz"; + configureArgs = [ "--disable-nls" + "--without-libintl-prefix" + "--without-libiconv-prefix" + "--without-gmp" + "--without-libpth-prefix" + ]; + }; + findutils = trivialBuilder rec { + inherit (localSystem) system; + name = "findutils"; + ver = "4.7.0"; + url = "https://ftp.gnu.org/gnu/${name}/${name}-${ver}.tar.xz"; + sha256 = "16kqz9yz98dasmj70jwf5py7jk558w96w0vgp3zf9xsqk3gzpzn5"; + configureArgs = [ "--disable-nls" + "--without-libintl-prefix" + "--without-libiconv-prefix" + "--without-gmp" + "--without-libpth-prefix" + ]; + }; + diffutils = trivialBuilder rec { + inherit (localSystem) system; + name = "diffutils"; + ver = "3.7"; + url = "https://ftp.gnu.org/gnu/${name}/${name}-${ver}.tar.xz"; + sha256 = "09isrg0isjinv8c535nxsi1s86wfdfzml80dbw41dj9x3hiad9xk"; + configureArgs = [ "--disable-nls" + "--without-libintl-prefix" + "--without-libiconv-prefix" + "--without-libsigsegv-prefix" + ]; + }; + grep = trivialBuilder rec { + inherit (localSystem) system; + name = "grep"; + ver = "3.4"; + url = "https://ftp.gnu.org/gnu/${name}/${name}-${ver}.tar.xz"; + sha256 = "1yy33kiwrxrwj2nxa4fg15bvmwyghqbs8qwkdvy5phm784f7brjq"; + configureArgs = [ "--disable-nls" + "--without-libintl-prefix" + "--without-libiconv-prefix" + "--disable-perl-regexp" + "--without-libsegsegv-prefix" + ]; + }; + patch = trivialBuilder rec { + inherit (localSystem) system; + name = "patch"; + ver = "2.7.6"; + url = "https://ftp.gnu.org/gnu/${name}/${name}-${ver}.tar.xz"; + sha256 = "1zfqy4rdcy279vwn2z1kbv19dcfw25d2aqy9nzvdkq5bjzd0nqdc"; + }; + gawk = trivialBuilder rec { + inherit (localSystem) system; + name = "gawk"; + ver = "5.0.1"; + url = "https://ftp.gnu.org/gnu/${name}/${name}-${ver}.tar.xz"; + sha256 = "15570p7g2x54asvr2fsc56sxzmm08fbk4mzpcs5n92fp9vq8cklf"; + configureArgs = [ "--disable-nls" + "--disable-mpfr" + "--without-libintl-prefix" + "--without-libiconv-prefix" + "--without-libsegsegv-prefix" + ]; + }; + cpio = trivialBuilder rec { + inherit (localSystem) system; + name = "cpio"; + ver = "2.13"; + url = "https://ftp.gnu.org/gnu/${name}/${name}-${ver}.tar.gz"; + sha256 = "126vyg4a8wcdwh6npgvxy6gq433bzgz3ph37hmjpycc4r7cp0x78"; + configureArgs = [ "--disable-nls" + "--without-libintl-prefix" + "--without-libiconv-prefix" + ]; + }; + sed = trivialBuilder rec { + inherit (localSystem) system; + name = "sed"; + ver = "4.8"; + url = "https://ftp.gnu.org/gnu/${name}/${name}-${ver}.tar.xz"; + sha256 = "0cznxw73fzv1n3nj2zsq6nf73rvsbxndp444xkpahdqvlzz0r6zp"; + configureArgs = [ "--disable-nls" + "--without-libintl-prefix" + "--without-libiconv-prefix" + ]; + }; + cacert = fetchURL rec { + url = "https://curl.haxx.se/ca/cacert-2020-01-01.pem"; + sha256 = "07q808n307gzaga93abpf6an7c3rd35p18psdc1dd83lspgp1xxd"; + executable = false; + }; + curl = trivialBuilder rec { + inherit (localSystem) system; + name = "curl"; + ver = "7.68.0"; + url = "https://curl.haxx.se/download/${name}-${ver}.tar.xz"; + sha256 = "0nh3j90w6b97wqcgxjfq55qhkz9s38955fbhwzv2fsi7483j895p"; + configureArgs = [ "--disable-nls" + "--disable-ares" + "--disable-debug" + "--disable-ldap" + "--disable-ldaps" + "--disable-rtsp" + "--disable-dict" + "--disable-telnet" + "--disable-tftp" + "--disable-pop3" + "--disable-imap" + "--disable-smb" + "--disable-smtp" + "--disable-gopher" + "--disable-manual" + "--disable-verbose" + "--disable-sspi" + "--disable-tls-srp" + "--disable-unix-sockets" + "--without-brotli" + "--without-gnutls" + "--without-mbedtls" + "--without-wolfssl" + "--without-bearssl" + "--without-libidn2" + "--without-librtmp" + "--without-nghttp2" + "--with-ssl=/usr" + "--with-ca-bundle=${cacert}" + ]; + }; + bashExe = "${bash}/bin/bash"; +in [ ({}: { @@ -13,11 +172,14 @@ let inherit (localSystem) system; in bootstrapTools = derivation { inherit system; + inherit make bash coreutils findutils + diffutils grep patch gawk cpio sed + curl; name = "trivial-bootstrap-tools"; - builder = "/usr/local/bin/bash"; + builder = bashExe; args = [ ./trivial-bootstrap.sh ]; - + buildInputs = [ make ]; mkdir = "/bin/mkdir"; ln = "/bin/ln"; }; @@ -52,6 +214,8 @@ let inherit (localSystem) system; in (prevStage: { __raw = true; + inherit (prevStage) bootstrapTools; + stdenv = import ../generic { name = "stdenv-freebsd-boot-0"; inherit config; @@ -66,7 +230,7 @@ let inherit (localSystem) system; in (prevStage: { inherit config overlays; - stdenv = import ../generic { + stdenv = import ../generic rec { name = "stdenv-freebsd-boot-3"; inherit config; @@ -75,16 +239,30 @@ let inherit (localSystem) system; in initialPath shell fetchurlBoot; cc = import ../../build-support/cc-wrapper { + inherit lib; nativeTools = true; nativePrefix = "/usr"; nativeLibc = true; stdenvNoCC = prevStage.stdenv; + buildPackages = { + inherit (prevStage) stdenv; + }; cc = { name = "clang-9.9.9"; cc = "/usr"; - outPath = "/usr"; + outPath = prevStage.bootstrapTools; }; isClang = true; + bintools = import ../../build-support/bintools-wrapper { + inherit lib; + stdenvNoCC = prevStage.stdenv; + nativeTools = true; + nativeLibc = true; + propagateDoc = false; + nativePrefix = "/usr"; + bintools = { name = "${name}-binutils"; + outPath = prevStage.bootstrapTools; }; + }; }; preHook = "export NIX_NO_SELF_RPATH=1"; diff --git a/pkgs/stdenv/freebsd/trivial-bootstrap.sh b/pkgs/stdenv/freebsd/trivial-bootstrap.sh index fbff4575e5a..34b4dbabc2b 100644 --- a/pkgs/stdenv/freebsd/trivial-bootstrap.sh +++ b/pkgs/stdenv/freebsd/trivial-bootstrap.sh @@ -3,9 +3,9 @@ set -o nounset set -o pipefail echo Building the trivial bootstrap environment... -echo -echo Needed FreeBSD packages: -echo findutils gcpio gawk gnugrep coreutils bash gsed gtar gmake xar binutils gpatch lbzip2 diffutils +#echo +#echo Needed FreeBSD packages: +#echo findutils gcpio gawk gnugrep coreutils bash gsed gtar gmake xar binutils gpatch lbzip2 diffutils $mkdir -p $out/bin @@ -28,14 +28,36 @@ ln () { fi } -ln /usr/local/bin/bash -ln /bin/sh - -ln /usr/local/bin/gmake make +ln $bash/bin/bash +ln $make/bin/make -ln /usr/local/bin/lbzip2 +ln /bin/sh -ln /usr/local/bin/gdiff diff +for i in b2sum base32 base64 basename basenc cat chcon chgrp chmod \ + chown chroot cksum comm cp csplit cut date dd df dir dircolors \ + dirname du echo env expand expr factor false fmt fold install \ + groups head hostid id join kill link ln logname ls md5sum mkdir \ + mkfifo mknod mktemp mv nice nl nohup nproc numfmt od paste pathchk \ + pinky pr printenv printf ptx pwd readlink realpath rm rmdir runcon \ + seq sha1sum sha224sum sha256sum sha384sum sha512sum shred shuf \ + sleep sort split stat stdbuf stty sum sync tac tee test timeout \ + touch tr true truncate tsort tty uname unexpand uniq unlink uptime \ + users vdir wc who whoami yes +do + ln "$coreutils/bin/$i" "$i" +done + +for i in find xargs; do + ln "$findutils/bin/$i" "$i" +done + +for i in diff diff3 sdiff; do + ln "$diffutils/bin/$i" "$i" +done + +for i in grep egrep fgrep; do + ln "$grep/bin/$i" "$i" +done ln /usr/bin/locale @@ -45,160 +67,52 @@ ln /usr/bin/hexdump # for bitcoin ln /usr/bin/bzip2 ln /usr/bin/bunzip2 -ln /usr/bin/bzcat ln /usr/bin/bzip2recover ln /usr/bin/xz ln /usr/bin/unxz -ln /usr/bin/xzcat ln /usr/bin/lzma ln /usr/bin/unlzma -ln /usr/bin/lzcat - -ln /usr/local/bin/gcp cp -ln /usr/local/bin/gdd dd -ln /usr/local/bin/gmv mv -ln /usr/local/bin/grm rm -ln /usr/local/bin/gls ls -ln /bin/ps ps -ln /usr/local/bin/gcat cat -ln /usr/local/bin/gecho echo -ln /usr/local/bin/gexpr expr -ln /usr/local/bin/gtest test -ln /usr/local/bin/gdate date -ln /usr/local/bin/gchmod chmod -ln /usr/local/bin/grmdir rmdir -ln /usr/local/bin/gsleep sleep -ln /bin/hostname hostname - -ln /usr/local/bin/gid id -ln /usr/local/bin/god od -ln /usr/local/bin/gtr tr -ln /usr/local/bin/gwc wc -ln /usr/local/bin/gcut cut -ln /usr/bin/cmp cmp -ln /usr/local/bin/gsed sed -ln /usr/local/bin/gtar tar -ln /usr/local/bin/xar xar -ln /usr/local/bin/gawk awk -ln /usr/local/bin/genv env -ln /usr/local/bin/gtee tee -ln /usr/local/bin/gcomm comm -ln /usr/local/bin/gcpio cpio -ln /usr/local/bin/curl curl -ln /usr/local/bin/gfind find -ln /usr/local/bin/grep grep # other grep is in /usr/bin + +ln /bin/ps +ln /bin/hostname +ln /usr/bin/cmp +ln $sed/bin/sed +ln /usr/bin/tar tar +ln $gawk/bin/gawk +ln $gawk/bin/gawk awk +ln $cpio/bin/cpio +ln $curl/bin/curl curl ln /usr/bin/gzip ln /usr/bin/gunzip -ln /usr/bin/zcat -ln /usr/local/bin/ghead head ln /usr/bin/tail tail # note that we are not using gtail!!! -ln /usr/local/bin/guniq uniq ln /usr/bin/less less -ln /usr/local/bin/gtrue true -# ln /usr/bin/diff diff # we are using gdiff (see above) -ln /usr/local/bin/egrep egrep -ln /usr/local/bin/fgrep fgrep -ln /usr/local/bin/gpatch patch -ln /usr/local/bin/guname uname -ln /usr/local/bin/gtouch touch -ln /usr/local/bin/gsplit split -ln /usr/local/bin/gxargs xargs +ln $patch/bin/patch patch ln /usr/bin/which which -ln /usr/local/bin/ginstall install -ln /usr/local/bin/gbasename basename -ln /usr/local/bin/gdirname dirname -ln /usr/local/bin/greadlink readlink - -ln /usr/local/bin/gln ln -ln /usr/local/bin/gyes yes -ln /usr/local/bin/gwhoami whoami -ln /usr/local/bin/gvdir vdir -ln /usr/local/bin/gusers users -ln /usr/local/bin/guptime uptime -ln /usr/local/bin/gunlink unlink -ln /usr/local/bin/gtty tty -ln /usr/local/bin/gunexpand unexpand -ln /usr/local/bin/gtsort tsort -ln /usr/local/bin/gtruncate truncate -ln /usr/local/bin/gtimeout timeout -ln /usr/local/bin/gtac tac -ln /usr/local/bin/gsync sync -ln /usr/local/bin/gsum sum -ln /usr/local/bin/gstty stty -ln /usr/local/bin/gstdbuf stdbuf -ln /usr/local/bin/gsort sort -ln /usr/local/bin/gruncon runcon -ln /usr/local/bin/gseq seq -ln /usr/local/bin/gsha1sum sha1sum -ln /usr/local/bin/gsha224sum sha224sum -ln /usr/local/bin/gsha256sum sha256sum -ln /usr/local/bin/gsha384sum sha384sum -ln /usr/local/bin/gsha512sum sha512sum -ln /usr/local/bin/gshred shred -ln /usr/local/bin/gshuf shuf -ln /usr/local/bin/grealpath realpath -ln "/usr/local/bin/g[" "[" -ln /usr/local/bin/gbase64 base64 -ln /usr/local/bin/gchcon chcon -ln /usr/local/bin/gchgrp chgrp -ln /usr/local/bin/gchown chown -ln /usr/local/bin/gchroot chroot -ln /usr/local/bin/gcksum cksum -ln /usr/local/bin/gcsplit csplit -ln /usr/local/bin/gdf df -ln /usr/local/bin/gdircolors dircolors -ln /usr/local/bin/gdu du -ln /usr/local/bin/gexpand expand -ln /usr/local/bin/gfactor factor -ln /usr/local/bin/gfalse false -ln /usr/local/bin/gfmt fmt -ln /usr/local/bin/gfold fold -ln /usr/local/bin/ggroups groups -ln /usr/local/bin/ghostid hostid -ln /usr/local/bin/gjoin join -ln /usr/local/bin/gkill kill -ln /usr/local/bin/glink link -ln /usr/local/bin/glogname logname -ln /usr/local/bin/gmd5sum md5sum -ln /usr/local/bin/gmkdir mkdir -ln /usr/local/bin/gmkfifo mkfifo -ln /usr/local/bin/gmknod mknod -ln /usr/local/bin/gmktemp mktemp -ln /usr/local/bin/gnice nice -ln /usr/local/bin/gnl nl -ln /usr/local/bin/gnohup nohup -ln /usr/local/bin/gnproc nproc -ln /usr/local/bin/gnumfmt numfmt -ln /usr/local/bin/gnustat nustat -ln /usr/local/bin/gpaste paste -ln /usr/local/bin/gpathchk pathchk -ln /usr/local/bin/gpinky pinky -ln /usr/local/bin/gpr pr -ln /usr/local/bin/gprintenv printenv -ln /usr/local/bin/gprintf printf -ln /usr/local/bin/gptx ptx -ln /usr/local/bin/gpwd pwd - -# binutils + +## binutils # pkg info -l binutils | grep usr/local/bin -ln /usr/local/bin/addr2line -ln /usr/local/bin/ar -ln /usr/local/bin/as -ln /usr/local/bin/c++filt -ln /usr/local/bin/dwp -ln /usr/local/bin/elfedit -ln /usr/local/bin/gprof -ln /usr/local/bin/ld -ln /usr/local/bin/ld.bfd -ln /usr/local/bin/ld.gold -ln /usr/local/bin/nm -ln /usr/local/bin/objcopy -ln /usr/local/bin/objdump -ln /usr/local/bin/ranlib -ln /usr/local/bin/readelf -ln /usr/local/bin/size -ln /usr/local/bin/strings -ln /usr/local/bin/strip +ln /usr/bin/addr2line +ln /usr/bin/ar +ln /usr/bin/as +ln /usr/bin/c++filt +#ln /usr/bin/dwp +#ln /usr/bin/elfedit +ln /usr/bin/gprof +ln /usr/bin/ld +#ln /usr/bin/ld.bfd +#ln /usr/bin/ld.gold +ln /usr/bin/nm +ln /usr/bin/objcopy +ln /usr/bin/objdump +ln /usr/bin/ranlib +ln /usr/bin/readelf +ln /usr/bin/size +ln /usr/bin/strings +ln /usr/bin/strip + +ln /usr/bin/cc +ln /usr/bin/cpp +ln /usr/bin/c++ #pkg info -l llvm37 | grep usr/local/bin diff --git a/pkgs/stdenv/freebsd/trivial-builder.nix b/pkgs/stdenv/freebsd/trivial-builder.nix new file mode 100644 index 00000000000..64265081f54 --- /dev/null +++ b/pkgs/stdenv/freebsd/trivial-builder.nix @@ -0,0 +1,13 @@ +{ system, name, ver, url, sha256, configureArgs ? [], executable ? false } : + +let fetchURL = import <nix/fetchurl.nix>; + +in derivation { + inherit system configureArgs; + name = "trivial-bootstrap-${name}-${ver}"; + dname = "${name}-${ver}"; + src = fetchURL { + inherit url sha256 executable; + }; + builder = ./trivial-builder.sh; +} diff --git a/pkgs/stdenv/freebsd/trivial-builder.sh b/pkgs/stdenv/freebsd/trivial-builder.sh new file mode 100755 index 00000000000..ac5601b5ba0 --- /dev/null +++ b/pkgs/stdenv/freebsd/trivial-builder.sh @@ -0,0 +1,10 @@ +#!/bin/sh + +export PATH=/bin:/sbin:/usr/bin:/usr/sbin + +tar -zxvf $src +cd $dname +mkdir -p $out/bin +./configure --prefix=$out $configureArgs +make +make install diff --git a/pkgs/stdenv/generic/default.nix b/pkgs/stdenv/generic/default.nix index 52d57a6dece..3aa8850ebee 100644 --- a/pkgs/stdenv/generic/default.nix +++ b/pkgs/stdenv/generic/default.nix @@ -152,12 +152,12 @@ let inherit lib config stdenv; }) mkDerivation; - # Slated for deprecation in 21.11 - lib = builtins.trace + # Slated for removal in 21.11 + lib = if config.allowAliases or true then builtins.trace ( "Warning: `stdenv.lib` is deprecated and will be removed in the next release." + " Please use `pkgs.lib` instead." + " For more information see https://github.com/NixOS/nixpkgs/issues/108938") - lib; + lib else throw "`stdenv.lib` is a deprecated alias for `pkgs.lib`"; inherit fetchurlBoot; diff --git a/pkgs/tools/X11/wmutils-core/default.nix b/pkgs/tools/X11/wmutils-core/default.nix index c8f3bd52c3e..9250a10064f 100644 --- a/pkgs/tools/X11/wmutils-core/default.nix +++ b/pkgs/tools/X11/wmutils-core/default.nix @@ -1,15 +1,15 @@ -{ lib, stdenv, fetchurl, libxcb }: +{ lib, stdenv, fetchurl, libxcb, xcbutil, xcb-util-cursor }: stdenv.mkDerivation rec { pname = "wmutils-core"; - version = "1.1"; + version = "1.5"; src = fetchurl { url = "https://github.com/wmutils/core/archive/v${version}.tar.gz"; - sha256 = "0aq95khs154j004b79w9rgm80vpggxfqynha5rckm2cx20d1fa5s"; + sha256 = "0wk39aq2lrnc0wjs8pv3cigw3lwy2qzaw0v61bwknd5wabm25bvj"; }; - buildInputs = [ libxcb ]; + buildInputs = [ libxcb xcbutil xcb-util-cursor ]; installFlags = [ "PREFIX=$(out)" ]; diff --git a/pkgs/tools/admin/exoscale-cli/default.nix b/pkgs/tools/admin/exoscale-cli/default.nix index 8913bed39d5..89b96824607 100644 --- a/pkgs/tools/admin/exoscale-cli/default.nix +++ b/pkgs/tools/admin/exoscale-cli/default.nix @@ -2,13 +2,13 @@ buildGoPackage rec { pname = "exoscale-cli"; - version = "1.23.0"; + version = "1.24.0"; src = fetchFromGitHub { owner = "exoscale"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-LVWUfaACdDp9xsuXHysPO/8QMdaDqS+yhP2U9cc4jh4="; + sha256 = "sha256-uriXZ4fEUswSBh9hv122wkAPHOnmt6+AodKkCHAMSh8="; }; goPackagePath = "github.com/exoscale/cli"; diff --git a/pkgs/tools/admin/trivy/default.nix b/pkgs/tools/admin/trivy/default.nix index 0a4bf934d80..d2d2a138d65 100644 --- a/pkgs/tools/admin/trivy/default.nix +++ b/pkgs/tools/admin/trivy/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "trivy"; - version = "0.15.0"; + version = "0.16.0"; src = fetchFromGitHub { owner = "aquasecurity"; repo = pname; rev = "v${version}"; - sha256 = "11fd32qb69g23lxrynsnfy8a783sl60rzknvq4shdg41p2ikigdk"; + sha256 = "sha256-E/tPjVc+XLDCFYzloAipwWjB4I86kAe/6NVoJSCrY2M="; }; - vendorSha256 = "09birwc8x90l2y0znf4fwny3phnmq0cz0l2z3xzwg0j3msrdl2np"; + vendorSha256 = "sha256-YoQF0Eug747LhsR3V0IplwXgm0ndDqK1pUVjguOhjOU="; subPackages = [ "cmd/trivy" ]; diff --git a/pkgs/tools/backup/dump/default.nix b/pkgs/tools/backup/dump/default.nix index a709d84a610..75a449a1276 100644 --- a/pkgs/tools/backup/dump/default.nix +++ b/pkgs/tools/backup/dump/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { pname = "dump"; - version = "0.4b46"; + version = "0.4b47"; src = fetchurl { url = "mirror://sourceforge/dump/dump-${version}.tar.gz"; - sha256 = "15rg5y15ak0ppqlhcih78layvg7cwp6hc16p3c58xs8svlkxjqc0"; + sha256 = "sha256-0CGs3k+77T2T662YFCL2cfSNZrKeyI196DZC7Pv/T9A="; }; buildInputs = [ e2fsprogs pkg-config ncurses readline ]; diff --git a/pkgs/tools/compression/pigz/default.nix b/pkgs/tools/compression/pigz/default.nix index 7517e599e73..a4cdcc08549 100644 --- a/pkgs/tools/compression/pigz/default.nix +++ b/pkgs/tools/compression/pigz/default.nix @@ -1,14 +1,14 @@ { lib, stdenv, fetchurl, zlib, util-linux }: let name = "pigz"; - version = "2.4"; + version = "2.6"; in stdenv.mkDerivation { name = name + "-" + version; src = fetchurl { url = "https://www.zlib.net/${name}/${name}-${version}.tar.gz"; - sha256 = "0wsgw5vwl23jrnpsvd8v3xcp5k4waw5mk0164fynjhkv58i1dy54"; + sha256 = "sha256-Lu17DXRJ0dcJA/KmLNYAXSYus6jJ6YaHvIy7WAnbKn0="; }; enableParallelBuilding = true; diff --git a/pkgs/tools/filesystems/squashfs-tools-ng/default.nix b/pkgs/tools/filesystems/squashfs-tools-ng/default.nix index 593004d552c..322f57fdca9 100644 --- a/pkgs/tools/filesystems/squashfs-tools-ng/default.nix +++ b/pkgs/tools/filesystems/squashfs-tools-ng/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "squashfs-tools-ng"; - version = "1.0.1"; + version = "1.0.4"; src = fetchurl { url = "https://infraroot.at/pub/squashfs/squashfs-tools-ng-${version}.tar.xz"; - sha256 = "120x2hlbhpm90bzxz70z764552ffrjpidmp1y6gafx70zp0hrks4"; + sha256 = "04zvpws1nk3r2kr1k5in9di9fhn4zzciyndgnxnijmhiqpyrx072"; }; nativeBuildInputs = [ doxygen graphviz pkg-config perl ]; diff --git a/pkgs/tools/graphics/gifski/default.nix b/pkgs/tools/graphics/gifski/default.nix index 526300f2dd8..de866221267 100644 --- a/pkgs/tools/graphics/gifski/default.nix +++ b/pkgs/tools/graphics/gifski/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "gifski"; - version = "1.3.1"; + version = "1.3.3"; src = fetchFromGitHub { owner = "ImageOptim"; repo = "gifski"; rev = version; - sha256 = "sha256-sB8W5n3FvRAB9ygFg63NecSZgUw8FGk4pzviIbRF2vk="; + sha256 = "sha256-dBgDIS6U2iKzyo5nO0NOD488zfEbaZJH7luJN6khrnc="; }; - cargoSha256 = "sha256-0cFk1GnEJxMfY9GvQTdI5tkgtxGkH3ZQFTloo4/C+sY="; + cargoSha256 = "sha256-/i5ZBCWFlhoheHsCI5f9yJ7sa6l/DB4AJckq5orinwI="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/tools/graphics/luxcorerender/default.nix b/pkgs/tools/graphics/luxcorerender/default.nix index c4b8622f479..75e69a5d499 100644 --- a/pkgs/tools/graphics/luxcorerender/default.nix +++ b/pkgs/tools/graphics/luxcorerender/default.nix @@ -1,64 +1,58 @@ -{ lib, stdenv, fetchFromGitHub, cmake, boost165, pkg-config, python36 -, tbb, openimageio, libjpeg, libpng, zlib, libtiff, ilmbase -, freetype, openexr, libXdmcp, libxkbcommon, epoxy, at-spi2-core -, dbus, doxygen, qt5, c-blosc, libGLU, gnome3, dconf, gtk3, pcre -, bison, flex, libpthreadstubs, libX11 -, embree2, makeWrapper, gsettings-desktop-schemas, glib -, withOpenCL ? true , opencl-headers, ocl-icd, opencl-clhpp, rocm-opencl-runtime -}: +{ lib, config, stdenv, fetchFromGitHub, symlinkJoin, wrapGAppsHook, cmake, boost172 +, pkg-config, flex, bison, libpng, libtiff, zlib, python3, embree, openexr +, openimagedenoise, openimageio, tbb, c-blosc, gtk3, pcre, doxygen +# OpenCL Support +, withOpenCL ? true, ocl-icd +# Cuda Support +, withCuda ? config.cudaSupport or false, cudatoolkit }: let - python = python36; - - boost_static = boost165.override { - inherit python; - enableStatic = true; - enablePython = true; - }; + boostWithPython = boost172.override { + enablePython = true; + enableNumpy = true; + python = python3; + }; - version = "2.0"; - sha256 = "15nn39ybsfjf3cw3xgkbarvxn4a9ymfd579ankm7yjxkw5gcif38"; + # Requires a version number like "<MAJOR><MINOR>" + pythonVersion = (lib.versions.major python3.version) + + (lib.versions.minor python3.version); -in stdenv.mkDerivation { +in stdenv.mkDerivation rec { pname = "luxcorerender"; - inherit version; + version = "2.4"; src = fetchFromGitHub { owner = "LuxCoreRender"; repo = "LuxCore"; rev = "luxcorerender_v${version}"; - inherit sha256; + sha256 = "0xvivw79719fa1q762b76nyvzawfd3hmp8y5j04bax8a7f8mfa9k"; }; - nativeBuildInputs = [ cmake flex bison doxygen makeWrapper pkg-config ]; + nativeBuildInputs = [ pkg-config cmake flex bison doxygen wrapGAppsHook ]; + buildInputs = [ - embree2 zlib boost_static libjpeg - libtiff libpng ilmbase freetype openexr openimageio - tbb qt5.full c-blosc libGLU pcre - libX11 libpthreadstubs python libXdmcp libxkbcommon - epoxy at-spi2-core dbus - # needed for GSETTINGS_SCHEMAS_PATH - gsettings-desktop-schemas glib gtk3 - # needed for XDG_ICON_DIRS - gnome3.adwaita-icon-theme - (lib.getLib dconf) - ] ++ lib.optionals withOpenCL [ opencl-headers ocl-icd opencl-clhpp rocm-opencl-runtime ]; + libpng + libtiff + zlib + boostWithPython.dev + python3 + embree + openexr + openimagedenoise + tbb + c-blosc + gtk3 + pcre + openimageio.dev + openimageio.out + ] ++ lib.optionals withOpenCL [ ocl-icd ] + ++ lib.optionals withCuda [ cudatoolkit ]; - cmakeFlags = [ - "-DOpenEXR_Iex_INCLUDE_DIR=${openexr.dev}/include/OpenEXR" - "-DOpenEXR_IlmThread_INCLUDE_DIR=${ilmbase.dev}/include/OpenEXR" - "-DOpenEXR_Imath_INCLUDE_DIR=${openexr.dev}/include/OpenEXR" - "-DOpenEXR_half_INCLUDE_DIR=${ilmbase.dev}/include" - "-DPYTHON_LIBRARY=${python}/lib/libpython3.so" - "-DPYTHON_INCLUDE_DIR=${python}/include/python${python.pythonVersion}" - "-DEMBREE_INCLUDE_PATH=${embree2}/include" - "-DEMBREE_LIBRARY=${embree2}/lib/libembree.so" - "-DBoost_PYTHON_LIBRARY_RELEASE=${boost_static}/lib/libboost_python3-mt.so" - ] ++ lib.optional withOpenCL - "-DOPENCL_INCLUDE_DIR=${opencl-headers}/include"; + cmakeFlags = [ "-DPYTHON_V=${pythonVersion}" ] + ++ lib.optional (!withOpenCL) "-DLUXRAYS_DISABLE_OPENCL=1" + ++ lib.optional (!withCuda) "-DLUXRAYS_DISABLE_CUDA=1"; preConfigure = '' - NIX_CFLAGS_COMPILE+=" -isystem ${python}/include/python${python.pythonVersion}" NIX_LDFLAGS+=" -lpython3" ''; @@ -69,13 +63,6 @@ in stdenv.mkDerivation { cp -va lib/* $out/lib ''; - preFixup = '' - wrapProgram "$out/bin/luxcoreui" \ - --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" \ - --suffix XDG_DATA_DIRS : '${gnome3.adwaita-icon-theme}/share' \ - --prefix GIO_EXTRA_MODULES : "${lib.getLib dconf}/lib/gio/modules" - ''; - meta = with lib; { description = "Open source, physically based, unbiased rendering engine"; homepage = "https://luxcorerender.org/"; @@ -85,7 +72,6 @@ in stdenv.mkDerivation { }; } - # TODO (might not be necessary): # # luxcoreui still gives warnings like: "failed to commit changes to diff --git a/pkgs/tools/graphics/scrot/default.nix b/pkgs/tools/graphics/scrot/default.nix index 2fd56d0737d..aa525abacb0 100644 --- a/pkgs/tools/graphics/scrot/default.nix +++ b/pkgs/tools/graphics/scrot/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "scrot"; - version = "1.4"; + version = "1.5"; src = fetchFromGitHub { owner = "resurrecting-open-source-projects"; repo = pname; rev = version; - sha256 = "12xq6glg70icwsvbnfw9gm4dahlbnrc7b6adpd0mpf89h4sj2gds"; + sha256 = "sha256-4vguodLnCj0sOBLM4oJXTfX1p8hIo3WTwIuViPtZxHQ="; }; nativeBuildInputs = [ autoreconfHook autoconf-archive ]; diff --git a/pkgs/tools/graphics/unpaper/default.nix b/pkgs/tools/graphics/unpaper/default.nix index dd6ecb473e9..20dfe15dc6c 100644 --- a/pkgs/tools/graphics/unpaper/default.nix +++ b/pkgs/tools/graphics/unpaper/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, libav, libxslt }: +{ lib, stdenv, fetchurl, pkg-config, ffmpeg, libxslt }: stdenv.mkDerivation rec { pname = "unpaper"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ libav libxslt ]; + buildInputs = [ ffmpeg libxslt ]; meta = with lib; { homepage = "https://www.flameeyes.eu/projects/unpaper"; diff --git a/pkgs/tools/graphics/viu/default.nix b/pkgs/tools/graphics/viu/default.nix index 39b12326e80..39aa8fe06e0 100644 --- a/pkgs/tools/graphics/viu/default.nix +++ b/pkgs/tools/graphics/viu/default.nix @@ -2,18 +2,19 @@ rustPlatform.buildRustPackage rec { pname = "viu"; - version = "1.2.1"; + version = "1.3.0"; src = fetchFromGitHub { owner = "atanunq"; repo = "viu"; rev = "v${version}"; - sha256 = "1q248jnbv64mkvg18465dpvjkw2v2hfqyvdvdixyrwyrnlv5cicv"; + sha256 = "1n1qwlh1zinq5ngx04cvs69z8zr12yywr70vbrc946kbh4hx6pk9"; }; - # tests are failing, reported at upstream: https://github.com/atanunq/viu/issues/40 + + # tests need an interactive terminal doCheck = false; - cargoSha256 = "18rskn8fchlgk295yk8sc2g1x6h43rmhqif871hgzdx1i35sbajr"; + cargoSha256 = "0bdjfcyx2cwz68gcx0393h4ysccarfp02pvvp0a5xgkq11bad0r0"; meta = with lib; { description = "A command-line application to view images from the terminal written in Rust"; diff --git a/pkgs/tools/misc/chezmoi/default.nix b/pkgs/tools/misc/chezmoi/default.nix index 48d8b7c8930..dc1a49a40bf 100644 --- a/pkgs/tools/misc/chezmoi/default.nix +++ b/pkgs/tools/misc/chezmoi/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "chezmoi"; - version = "1.8.10"; + version = "1.8.11"; src = fetchFromGitHub { owner = "twpayne"; repo = "chezmoi"; rev = "v${version}"; - sha256 = "sha256-S1bnzuOZGQLdVJUH+A29KxF84dj2OeLJ4XajfTDdjUY="; + sha256 = "sha256-aWq36wQFxAyORifi5/9MOnqmR5FRyDAQj1tVFqoiFvA="; }; - vendorSha256 = "sha256-X1h0EcUf8MWt929huNjt0WnhFqhVZu07JGi7c5hdXoY="; + vendorSha256 = "sha256-ASTPb8Va3Gl/VtmPJIdlnlU3OspAxzZ5iSHVcZOh8CY="; doCheck = false; diff --git a/pkgs/tools/misc/ddcutil/default.nix b/pkgs/tools/misc/ddcutil/default.nix index 4f519d6858d..e092961a762 100644 --- a/pkgs/tools/misc/ddcutil/default.nix +++ b/pkgs/tools/misc/ddcutil/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "ddcutil"; - version = "0.9.9"; + version = "1.0.0"; src = fetchFromGitHub { owner = "rockowitz"; repo = "ddcutil"; rev = "v${version}"; - sha256 = "1ppiddnrvkbb9iir28kl9hzpww0hpgb05jfxzf07xsqkdfb4qv71"; + sha256 = "sha256-+HxezUWQHyL9r4QZkJyWzWnjquq/ux5W5j2B5prH8Fg="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; diff --git a/pkgs/tools/misc/docker-ls/default.nix b/pkgs/tools/misc/docker-ls/default.nix index b8483068117..a56107ebce1 100644 --- a/pkgs/tools/misc/docker-ls/default.nix +++ b/pkgs/tools/misc/docker-ls/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "docker-ls"; - version = "0.5.0"; + version = "0.5.1"; src = fetchFromGitHub { owner = "mayflower"; repo = "docker-ls"; rev = "v${version}"; - sha256 = "sha256-VyVrCBdIZAQ+p0leD6i4sMxD4p6nEXG9Si+nJGdUQPM="; + sha256 = "sha256-4+REt0NH4S367qFsyJncVedUrC4t1zw5o0CLTiQfIz8="; }; vendorSha256 = "sha256-UulcjQOLEIP++eoYQTEIbCJW51jyE312dMxB8+AKcdU="; diff --git a/pkgs/tools/misc/edir/default.nix b/pkgs/tools/misc/edir/default.nix new file mode 100644 index 00000000000..7cd621be76a --- /dev/null +++ b/pkgs/tools/misc/edir/default.nix @@ -0,0 +1,19 @@ +{ lib, python3Packages }: + +python3Packages.buildPythonApplication rec { + pname = "edir"; + version = "2.7.3"; + + src = python3Packages.fetchPypi { + inherit pname version; + sha256 = "06nsy9ikljc437368l38hsw75whacn3j6jwmdgg766q61pnifhkp"; + }; + + meta = with lib; { + description = "Program to rename and remove files and directories using your editor"; + homepage = "https://github.com/bulletmark/edir"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ guyonvarch ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/tools/misc/geekbench/default.nix b/pkgs/tools/misc/geekbench/default.nix index d6b0c84b61f..17e67c0bc75 100644 --- a/pkgs/tools/misc/geekbench/default.nix +++ b/pkgs/tools/misc/geekbench/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "geekbench"; - version = "5.3.1"; + version = "5.3.2"; src = fetchurl { url = "https://cdn.geekbench.com/Geekbench-${version}-Linux.tar.gz"; - sha256 = "0hil3mvrwpwy60x9s16bf8vgvfv11sdarcbk45zjlgjzfhh8h2qr"; + sha256 = "sha256-SdmcyOgK8k07pkjOVWLbNj36ktJnkQWJ8ObPiMgcMYk="; }; dontConfigure = true; diff --git a/pkgs/tools/misc/jdupes/default.nix b/pkgs/tools/misc/jdupes/default.nix index 4f13d0a17af..c42abee5e23 100644 --- a/pkgs/tools/misc/jdupes/default.nix +++ b/pkgs/tools/misc/jdupes/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "jdupes"; - version = "1.19.0"; + version = "1.19.1"; src = fetchFromGitHub { owner = "jbruchon"; repo = "jdupes"; rev = "v${version}"; - sha256 = "1f6qv701c4c9s4hliha7kp8wraq4jfx1jdk86ii10akkm07fkdlz"; + sha256 = "sha256-1gx3rStqIxLt/iRgpdp5z7tX1/wA0miZ1y5WTeGQ1Vs="; # Unicode file names lead to different checksums on HFS+ vs. other # filesystems because of unicode normalisation. The testdir # directories have such files and will be removed. diff --git a/pkgs/tools/misc/oppai-ng/default.nix b/pkgs/tools/misc/oppai-ng/default.nix index 922ef65be24..ef464e7b755 100644 --- a/pkgs/tools/misc/oppai-ng/default.nix +++ b/pkgs/tools/misc/oppai-ng/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "oppai-ng"; - version = "3.3.0"; + version = "4.0.0"; src = fetchFromGitHub { owner = "Francesco149"; repo = pname; rev = version; - sha256 = "0ymprwyv92pr58851wzryymhfznnpwcbg4m1yri0c9cyzvabwmfk"; + sha256 = "sha256-fUtyQaHcNBmDs1BPbFGieKY/CFyETqBxYzzIXSERFJY="; }; buildPhase = '' diff --git a/pkgs/tools/misc/phoronix-test-suite/default.nix b/pkgs/tools/misc/phoronix-test-suite/default.nix index da69d5a8b93..348670c3bb1 100644 --- a/pkgs/tools/misc/phoronix-test-suite/default.nix +++ b/pkgs/tools/misc/phoronix-test-suite/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "phoronix-test-suite"; - version = "10.2.0"; + version = "10.2.1"; src = fetchurl { url = "https://phoronix-test-suite.com/releases/${pname}-${version}.tar.gz"; - sha256 = "sha256-eoKHgbSyOEkwzki5wWuZlOAmZljxOMXcztA/g8TtutQ="; + sha256 = "sha256-2HB4TPbyG+cTY6O1k0tRPrnKyg41SYnVM919Hii3gpg="; }; buildInputs = [ php ]; diff --git a/pkgs/tools/misc/topgrade/default.nix b/pkgs/tools/misc/topgrade/default.nix index 6a21bc56789..139be092dd5 100644 --- a/pkgs/tools/misc/topgrade/default.nix +++ b/pkgs/tools/misc/topgrade/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "topgrade"; - version = "6.0.2"; + version = "6.3.2"; src = fetchFromGitHub { owner = "r-darwish"; repo = pname; rev = "v${version}"; - sha256 = "1pqf7rs9b8j54rwg8i8alvf65c4jfp5q2hv3yr60aiidfjrawp34"; + sha256 = "sha256-yKNHUH+oLQ99oH3yKYQCGAfX3tOI3ghLzLUpPzU6M0k="; }; - cargoSha256 = "1wh7xywp92h3in9a2nr6sia6l3852kw4s688sr1c2wjdf2i58lsg"; + cargoSha256 = "sha256-kSxnEIAKF5Xf/x1LgtEj1u6IchbThtp3Sti5wnezlRA="; buildInputs = lib.optional stdenv.isDarwin Foundation; diff --git a/pkgs/tools/misc/upterm/default.nix b/pkgs/tools/misc/upterm/default.nix new file mode 100644 index 00000000000..533ef192e8d --- /dev/null +++ b/pkgs/tools/misc/upterm/default.nix @@ -0,0 +1,39 @@ +{ lib +, buildGoModule +, fetchFromGitHub +, installShellFiles }: + +buildGoModule rec { + pname = "upterm"; + version = "0.5.2"; + + src = fetchFromGitHub { + owner = "owenthereal"; + repo = "upterm"; + rev = "v${version}"; + sha256 = "007hgkkn1cq1i0rkn45i3bz5q9irzm67cz0j5glr6f6d4s0nkjiq"; + }; + + vendorSha256 = null; + + nativeBuildInputs = [ installShellFiles ]; + + postInstall = '' + $out/bin/gendoc + rm $out/bin/gendoc + installManPage etc/man/man*/* + installShellCompletion --bash --name upterm.bash etc/completion/upterm.bash_completion.sh + installShellCompletion --zsh --name _upterm etc/completion/upterm.zsh_completion + ''; + + doCheck = true; + + __darwinAllowLocalNetworking = true; + + meta = with lib; { + description = "Secure terminal-session sharing"; + homepage = "https://upterm.dev"; + license = licenses.asl20; + maintainers = with maintainers; [ hax404 ]; + }; +} diff --git a/pkgs/tools/misc/vsh/default.nix b/pkgs/tools/misc/vsh/default.nix index 2220c026c49..f3eb1f9ad8e 100644 --- a/pkgs/tools/misc/vsh/default.nix +++ b/pkgs/tools/misc/vsh/default.nix @@ -2,17 +2,21 @@ buildGoModule rec { pname = "vsh"; - version = "0.8.0"; + version = "0.9.0"; src = fetchFromGitHub { owner = "fishi0x01"; repo = "vsh"; rev = "v${version}"; - sha256 = "0s4i4x8kd9s2igdshgsbs6n3k670h7r6g1mn1pzlj0kpmggnhfik"; + sha256 = "1f6szcdakfx3zap1zpkrcs134plv7vnyilzcxs5jbhrrbr6q1807"; }; - # vendor dir is already part of repository - vendorSha256 = null; + vendorSha256 = "0a2kjql4ibglxkq5dgzr2sxxxm38nf83s4rsk2gd1cf7v0flr02j"; + + # vendor dir in vsh repo is incomplete + deleteVendor = true; + + runVend = true; # make sure version gets set at compile time buildFlagsArray = [ "-ldflags=-s -w -X main.vshVersion=v${version}" ]; diff --git a/pkgs/tools/misc/wob/default.nix b/pkgs/tools/misc/wob/default.nix index cbc09b0ce64..e0622e5416a 100644 --- a/pkgs/tools/misc/wob/default.nix +++ b/pkgs/tools/misc/wob/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "wob"; - version = "0.10"; + version = "0.11"; src = fetchFromGitHub { owner = "francma"; repo = pname; rev = version; - sha256 = "0v7xm8zd9237v5j5h79pd0x6dkal5fgg1ly9knssjpv3hswwyv40"; + sha256 = "13mx6nzab6msp57s9mv9ambz53a4zkafms9v97xv5zvd6xarnrya"; }; nativeBuildInputs = [ meson ninja pkg-config scdoc wayland ]; diff --git a/pkgs/tools/networking/haproxy/default.nix b/pkgs/tools/networking/haproxy/default.nix index 5e09ddd430b..6ff8ba096b4 100644 --- a/pkgs/tools/networking/haproxy/default.nix +++ b/pkgs/tools/networking/haproxy/default.nix @@ -11,11 +11,11 @@ assert usePcre -> pcre != null; stdenv.mkDerivation rec { pname = "haproxy"; - version = "2.3.4"; + version = "2.3.5"; src = fetchurl { url = "https://www.haproxy.org/download/${lib.versions.majorMinor version}/src/${pname}-${version}.tar.gz"; - sha256 = "sha256-YBSM3+3WsZxAHbzXXM12pTwgvHbEkDK6Mq+YoKXEle0="; + sha256 = "sha256-eSRTlTC79VWCnH9Yhr4Lf8+NnI/+CGe3AQvrZwq/vks="; }; buildInputs = [ openssl zlib ] diff --git a/pkgs/tools/networking/ht-rust/default.nix b/pkgs/tools/networking/ht-rust/default.nix new file mode 100644 index 00000000000..629cf4ed11e --- /dev/null +++ b/pkgs/tools/networking/ht-rust/default.nix @@ -0,0 +1,34 @@ +{ stdenv, lib, rustPlatform, fetchFromGitHub, Security }: + +rustPlatform.buildRustPackage rec { + pname = "ht-rust"; + version = "0.5.0"; + + src = fetchFromGitHub { + owner = "ducaale"; + repo = "ht"; + rev = "v${version}"; + sha256 = "cr/iavCRdFYwVR6Iemm1hLKqd0OFG1iDmxpQ9fiwOmU="; + }; + + cargoSha256 = "uB23/9AjPwCwf9ljE8ai7zJQZqE0SoBPzRqqBOXa9QA="; + + buildInputs = [ ] ++ lib.optional stdenv.isDarwin Security; + + # Symlink to avoid conflict with pre-existing ht package + postInstall = '' + ln -s $out/bin/ht $out/bin/ht-rust + ''; + + doInstallCheck = true; + postInstallCheck = '' + $out/bin/ht-rust --help > /dev/null + ''; + + meta = with lib; { + description = "Yet another HTTPie clone in Rust"; + homepage = "https://github.com/ducaale/ht"; + license = licenses.mit; + maintainers = [ maintainers.payas ]; + }; +} diff --git a/pkgs/tools/networking/httpie/default.nix b/pkgs/tools/networking/httpie/default.nix index c5e12317fd7..a323087575b 100644 --- a/pkgs/tools/networking/httpie/default.nix +++ b/pkgs/tools/networking/httpie/default.nix @@ -1,31 +1,24 @@ -{ lib, fetchFromGitHub, python3Packages, docutils, fetchpatch }: +{ lib, fetchFromGitHub, python3Packages, docutils }: python3Packages.buildPythonApplication rec { pname = "httpie"; - version = "2.2.0"; + version = "2.4.0"; src = fetchFromGitHub { - owner = "jakubroztocil"; + owner = "httpie"; repo = "httpie"; rev = version; - sha256 = "0caazv24jr0844c4mdx77vzwwi5m869n10wa42cydb08ppx1xxj6"; + sha256 = "00lafjqg9nfnak0nhcr2l2hzzkwn2y6qv0wdkm6r6f69snizy3hf"; }; - outputs = [ "out" "doc" "man" ]; - - propagatedBuildInputs = with python3Packages; [ pygments requests setuptools ]; - dontUseSetuptoolsCheck = true; patches = [ ./strip-venv.patch - - # Fix `test_ciphers_none_can_be_selected` - # TODO: remove on next release - (fetchpatch { - url = "https://github.com/jakubroztocil/httpie/commit/49e71d252f54871a6bc49cb1cba103d385a543b8.patch"; - sha256 = "13b2faf50gimj7f17dlx4gmd8ph8ipgihpzfqbvmfjlbf1v95fsj"; - }) ]; + outputs = [ "out" "doc" "man" ]; + + propagatedBuildInputs = with python3Packages; [ pygments requests requests-toolbelt setuptools ]; + checkInputs = with python3Packages; [ mock pytest @@ -70,15 +63,6 @@ python3Packages.buildPythonApplication rec { toHtml CHANGELOG.rst $docdir/html/CHANGELOG.html toHtml CONTRIBUTING.rst $docdir/html/CONTRIBUTING.html - # change a few links to the local files - substituteInPlace $docdir/html/index.html \ - --replace \ - 'https://github.com/jakubroztocil/httpie/blob/master/CHANGELOG.rst' \ - "CHANGELOG.html" \ - --replace \ - 'https://github.com/jakubroztocil/httpie/blob/master/CONTRIBUTING.rst' \ - "CONTRIBUTING.html" - ${docutils}/bin/rst2man \ --strip-elements-with-class=no-web \ --title=http \ @@ -94,10 +78,14 @@ python3Packages.buildPythonApplication rec { export PATH=${docutils}/bin:$PATH ''; - meta = { + checkPhase = '' + py.test ./httpie ./tests --doctest-modules --verbose ./httpie ./tests -k 'not test_chunked and not test_verbose_chunked and not test_multipart_chunked and not test_request_body_from_file_by_path_chunked' + ''; + + meta = with lib; { description = "A command line HTTP client whose goal is to make CLI human-friendly"; homepage = "https://httpie.org/"; - license = lib.licenses.bsd3; - maintainers = with lib.maintainers; [ antono relrod schneefux ]; + license = licenses.bsd3; + maintainers = with maintainers; [ antono relrod schneefux SuperSandro2000 ]; }; } diff --git a/pkgs/tools/networking/httpie/strip-venv.patch b/pkgs/tools/networking/httpie/strip-venv.patch index 99ea80a3f56..9cfddbfdf78 100644 --- a/pkgs/tools/networking/httpie/strip-venv.patch +++ b/pkgs/tools/networking/httpie/strip-venv.patch @@ -1,11 +1,11 @@ diff --git a/tests/test_docs.py b/tests/test_docs.py -index 7a41822..720ecf6 100644 +index 340e64d..a6b4dc9 100644 --- a/tests/test_docs.py +++ b/tests/test_docs.py -@@ -41,12 +41,10 @@ assert filenames - +@@ -42,15 +42,10 @@ assert filenames # HACK: hardcoded paths, venv should be irrelevant, etc. - # TODO: replaces the process with Python code + # TODO: simplify by using the Python API instead of a subprocess + # then we wont’t need the paths. -VENV_BIN = Path(__file__).parent.parent / 'venv/bin' -VENV_PYTHON = VENV_BIN / 'python' -VENV_RST2PSEUDOXML = VENV_BIN / 'rst2pseudoxml.py' @@ -13,7 +13,10 @@ index 7a41822..720ecf6 100644 +VENV_RST2PSEUDOXML = 'rst2pseudoxml.py' --@pytest.mark.skipif(not os.path.exists(VENV_RST2PSEUDOXML), reason='docutils not installed') +-@pytest.mark.skipif( +- not VENV_RST2PSEUDOXML.exists(), +- reason='docutils not installed', +-) @pytest.mark.parametrize('filename', filenames) def test_rst_file_syntax(filename): p = subprocess.Popen( diff --git a/pkgs/tools/networking/privoxy/default.nix b/pkgs/tools/networking/privoxy/default.nix index 0b5a0d96ae5..efb57e7d247 100644 --- a/pkgs/tools/networking/privoxy/default.nix +++ b/pkgs/tools/networking/privoxy/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "privoxy"; - version = "3.0.30"; + version = "3.0.31"; src = fetchurl { url = "mirror://sourceforge/ijbswa/Sources/${version}%20%28stable%29/${pname}-${version}-stable-src.tar.gz"; - sha256 = "sha256-pP4kHF2nAQsoS/ienp4xoyHx8+scx5ZVnT+6ublBXuE="; + sha256 = "sha256-B3cpo6rHkiKk6NiKZQ2QKNFv1LDWA42o9fXkcSDQBOs="; }; hardeningEnable = [ "pie" ]; diff --git a/pkgs/tools/networking/tendermint/default.nix b/pkgs/tools/networking/tendermint/default.nix index 36269327e81..059c531cc61 100644 --- a/pkgs/tools/networking/tendermint/default.nix +++ b/pkgs/tools/networking/tendermint/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "tendermint"; - version = "0.34.0"; + version = "0.34.3"; src = fetchFromGitHub { owner = "tendermint"; repo = pname; rev = "v${version}"; - sha256 = "1fnykdk35937ld8dyzjs571klz187jr8wlj8ljn78pajx1cd84k6"; + sha256 = "sha256-tkIoLYfqlnyyAAgEKyQgE317uwyhc8xRTCTUXi+9r9s="; }; - vendorSha256 = "19qx7ab6ar609cxxdsb9i2c3h7icqgf5bhi28lnsdk3bdjxr27vz"; + vendorSha256 = "sha256-DviK+MkJwcv2Dhwmqra5G/fTaWxXFbUSUVnAkSHjeII="; doCheck = false; diff --git a/pkgs/tools/networking/termshark/default.nix b/pkgs/tools/networking/termshark/default.nix index 65ba8d17bcb..7b9a3c42d60 100644 --- a/pkgs/tools/networking/termshark/default.nix +++ b/pkgs/tools/networking/termshark/default.nix @@ -2,19 +2,19 @@ buildGoModule rec { pname = "termshark"; - version = "2.1.1"; + version = "2.2.0"; src = fetchFromGitHub { owner = "gcla"; repo = "termshark"; rev = "v${version}"; - sha256 = "14h548apg3zvjvq6yy22hpw2ziy5vmwyr04vv59ls1mjg4qf2v8b"; + sha256 = "sha256-vS6j8Mcri3SI/6HqtFX/EzVl8S0lx8fWU+0ddjzJz8g="; }; nativeBuildInputs = [ makeWrapper ]; buildInputs = [ wireshark-cli ]; - vendorSha256 = "14apff3vcbndr30765lzi4qswakavb4396bjixxvpxv6i5c04dq7"; + vendorSha256 = "sha256-md9HHiYOsBimCBjD1FyjTqnskCZksQiEggWd5UW0RPM="; doCheck = false; diff --git a/pkgs/tools/networking/tox-node/default.nix b/pkgs/tools/networking/tox-node/default.nix index 3ef125382b6..f250b8d6b65 100644 --- a/pkgs/tools/networking/tox-node/default.nix +++ b/pkgs/tools/networking/tox-node/default.nix @@ -7,13 +7,13 @@ with rustPlatform; buildRustPackage rec { pname = "tox-node"; - version = "0.1.0"; + version = "0.1.1"; src = fetchFromGitHub { owner = "tox-rs"; repo = "tox-node"; rev = "v${version}"; - sha256 = "0bar42nigjwn7dq48rmg74sm3gnfqvb6gnd9g1n0i8nmynd00wvn"; + sha256 = "sha256-tB6v2NEBdTNHf89USdQOr/pV0mbxxb8ftOYPPJMvz5Y="; }; buildInputs = [ libsodium openssl ]; @@ -31,7 +31,7 @@ buildRustPackage rec { doCheck = false; - cargoSha256 = "087ccb824hmmxmnn5c2bzww2q888a8zy6y7rwgsdfr8rbay2c909"; + cargoSha256 = "sha256-kCT2ulB+c2OlsABkyXyzrHfD/G92EPCdTO34FR5oSws="; meta = with lib; { description = "A server application to run tox node written in pure Rust"; diff --git a/pkgs/tools/package-management/apk-tools/default.nix b/pkgs/tools/package-management/apk-tools/default.nix index c1141362f82..fed7de01b98 100644 --- a/pkgs/tools/package-management/apk-tools/default.nix +++ b/pkgs/tools/package-management/apk-tools/default.nix @@ -1,20 +1,29 @@ -{ stdenv, lib, fetchurl, lua, openssl, pkg-config, zlib }: +{ lib, stdenv, fetchFromGitLab, pkg-config, scdoc, openssl, zlib +, luaSupport ? stdenv.hostPlatform == stdenv.buildPlatform, lua +}: stdenv.mkDerivation rec { pname = "apk-tools"; - version = "2.10.5"; + version = "2.12.2"; - src = fetchurl { - url = "https://dev.alpinelinux.org/archive/apk-tools/apk-tools-${version}.tar.xz"; - sha256 = "00z3fqnv8vk2czdm4p2q4sldq0n8sxyf2qfwppyk7wj59d2sq8dp"; + src = fetchFromGitLab { + domain = "gitlab.alpinelinux.org"; + owner = "alpine"; + repo = "apk-tools"; + rev = "v${version}"; + sha256 = "1crx2xlswi7i0mwgzrfphpf49ghfnh79fi5dn1sl611j9sy9wa29"; }; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ lua openssl zlib ]; + nativeBuildInputs = [ pkg-config scdoc ] + ++ lib.optionals luaSupport [ lua lua.pkgs.lua-zlib ]; + buildInputs = [ openssl zlib ] ++ lib.optional luaSupport lua; + strictDeps = true; makeFlags = [ + "CROSS_COMPILE=${stdenv.cc.targetPrefix}" "SBINDIR=$(out)/bin" "LIBDIR=$(out)/lib" + "LUA=${if luaSupport then "lua" else "no"}" "LUA_LIBDIR=$(out)/lib/lua/${lib.versions.majorMinor lua.version}" "MANDIR=$(out)/share/man" "DOCDIR=$(out)/share/doc/apk" @@ -30,7 +39,7 @@ stdenv.mkDerivation rec { homepage = "https://gitlab.alpinelinux.org/alpine/apk-tools"; description = "Alpine Package Keeper"; maintainers = with maintainers; [ qyliss ]; - license = licenses.gpl2; + license = licenses.gpl2Only; platforms = platforms.unix; broken = stdenv.isDarwin; }; diff --git a/pkgs/tools/package-management/nixops/default.nix b/pkgs/tools/package-management/nixops/default.nix index 96e6ec3f55a..0dcbeb8abfe 100644 --- a/pkgs/tools/package-management/nixops/default.nix +++ b/pkgs/tools/package-management/nixops/default.nix @@ -1,16 +1,70 @@ -{ callPackage, fetchurl, fetchpatch }: +{ lib, python2Packages, libxslt, docbook_xsl_ns, openssh, cacert, nixopsAzurePackages ? [] +, fetchurl, fetchpatch +}: -callPackage ./generic.nix (rec { +let version = "1.7"; + +in python2Packages.buildPythonApplication { + pname = "nixops"; + inherit version; + src = fetchurl { url = "https://nixos.org/releases/nixops/nixops-${version}/nixops-${version}.tar.bz2"; sha256 = "091c0b5bca57d4aa20be20e826ec161efe3aec9c788fbbcf3806a734a517f0f3"; }; + patches = [ - # follow redirect in nixos-infect. Remove with the next release. (fetchpatch { url = "https://github.com/NixOS/nixops/commit/fb6d4665e8efd858a215bbaaf079ec3f5ebc49b8.patch"; sha256 = "1hbhykl811zsqlaj3y5m9d8lfsal6ps6n5p16ah6lqy2s18ap9d0"; }) + ./optional-virtd.patch ]; -}) + + buildInputs = [ libxslt ]; + + pythonPath = with python2Packages; + [ prettytable + boto + boto3 + hetzner + libcloud + adal + # Go back to sqlite once Python 2.7.13 is released + pysqlite + datadog + digital-ocean + typing + ] + ++ lib.optional (!libvirt.passthru.libvirt.meta.insecure or true) libvirt + ++ nixopsAzurePackages; + + checkPhase = + # Ensure, that there are no (python) import errors + '' + SSL_CERT_FILE=${cacert}/etc/ssl/certs/ca-bundle.crt \ + HOME=$(pwd) \ + $out/bin/nixops --version + ''; + + postInstall = '' + make -C doc/manual install nixops.1 docbookxsl=${docbook_xsl_ns}/xml/xsl/docbook \ + docdir=$out/share/doc/nixops mandir=$out/share/man + + mkdir -p $out/share/nix/nixops + cp -av "nix/"* $out/share/nix/nixops + + # Add openssh to nixops' PATH. On some platforms, e.g. CentOS and RHEL + # the version of openssh is causing errors when have big networks (40+) + wrapProgram $out/bin/nixops --prefix PATH : "${openssh}/bin" + ''; + + meta = { + homepage = "https://github.com/NixOS/nixops"; + description = "NixOS cloud provisioning and deployment tool"; + maintainers = with lib.maintainers; [ aminechikhaoui eelco rob domenkozar ]; + platforms = lib.platforms.unix; + license = lib.licenses.lgpl3; + }; +} diff --git a/pkgs/tools/package-management/nixops/generic.nix b/pkgs/tools/package-management/nixops/generic.nix deleted file mode 100644 index 564256de35d..00000000000 --- a/pkgs/tools/package-management/nixops/generic.nix +++ /dev/null @@ -1,56 +0,0 @@ -{ lib, python2Packages, libxslt, docbook_xsl_ns, openssh, cacert, nixopsAzurePackages ? [] -# version args -, src, version -, meta ? {} -, patches ? null -}: - -python2Packages.buildPythonApplication { - name = "nixops-${version}"; - inherit version src patches; - - buildInputs = [ libxslt ]; - - pythonPath = with python2Packages; - [ prettytable - boto - boto3 - hetzner - libcloud - adal - # Go back to sqlite once Python 2.7.13 is released - pysqlite - datadog - digital-ocean - libvirt - typing - ] ++ nixopsAzurePackages; - - checkPhase = - # Ensure, that there are no (python) import errors - '' - SSL_CERT_FILE=${cacert}/etc/ssl/certs/ca-bundle.crt \ - HOME=$(pwd) \ - $out/bin/nixops --version - ''; - - postInstall = '' - make -C doc/manual install nixops.1 docbookxsl=${docbook_xsl_ns}/xml/xsl/docbook \ - docdir=$out/share/doc/nixops mandir=$out/share/man - - mkdir -p $out/share/nix/nixops - cp -av "nix/"* $out/share/nix/nixops - - # Add openssh to nixops' PATH. On some platforms, e.g. CentOS and RHEL - # the version of openssh is causing errors when have big networks (40+) - wrapProgram $out/bin/nixops --prefix PATH : "${openssh}/bin" - ''; - - meta = { - homepage = "https://github.com/NixOS/nixops"; - description = "NixOS cloud provisioning and deployment tool"; - maintainers = with lib.maintainers; [ aminechikhaoui eelco rob domenkozar ]; - platforms = lib.platforms.unix; - license = lib.licenses.lgpl3; - } // meta; -} diff --git a/pkgs/tools/package-management/nixops/nixops-v1_6_1.nix b/pkgs/tools/package-management/nixops/nixops-v1_6_1.nix deleted file mode 100644 index dc0c733ca7b..00000000000 --- a/pkgs/tools/package-management/nixops/nixops-v1_6_1.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ callPackage, newScope, pkgs, fetchurl }: - -callPackage ./generic.nix (rec { - version = "1.6.1"; - src = fetchurl { - url = "https://nixos.org/releases/nixops/nixops-${version}/nixops-${version}.tar.bz2"; - sha256 = "0lfx5fhyg3z6725ydsk0ibg5qqzp5s0x9nbdww02k8s307axiah3"; - }; - nixopsAzurePackages = with python2Packages; [ - azure-storage - azure-mgmt-compute - azure-mgmt-network - azure-mgmt-resource - azure-mgmt-storage - ]; - # nixops is incompatible with the most recent versions of listed - # azure-mgmt-* packages, therefore we are pinning them to - # package-private versions, so that they don't get trampled by - # updates. - # see - # https://github.com/NixOS/nixops/issues/1065 - python2Packages = pkgs.python2Packages.override { - overrides = (self: super: let callPackage = newScope self; in { - azure-mgmt-compute = callPackage ./azure-mgmt-compute { }; - azure-mgmt-network = callPackage ./azure-mgmt-network { }; - azure-mgmt-nspkg = callPackage ./azure-mgmt-nspkg { }; - azure-mgmt-resource = callPackage ./azure-mgmt-resource { }; - azure-mgmt-storage = callPackage ./azure-mgmt-storage { }; - azure-storage = callPackage ./azure-storage { }; - }); - }; -}) diff --git a/pkgs/tools/package-management/nixops/optional-virtd.patch b/pkgs/tools/package-management/nixops/optional-virtd.patch new file mode 100644 index 00000000000..3697fdde8f2 --- /dev/null +++ b/pkgs/tools/package-management/nixops/optional-virtd.patch @@ -0,0 +1,24 @@ +diff --git a/nixops/backends/libvirtd.py b/nixops/backends/libvirtd.py +index bc5f4af7..edd1348b 100644 +--- a/nixops/backends/libvirtd.py ++++ b/nixops/backends/libvirtd.py +@@ -8,12 +8,18 @@ import shutil + import string + import subprocess + import time +-import libvirt + + from nixops.backends import MachineDefinition, MachineState + import nixops.known_hosts + import nixops.util + ++try: ++ import libvirt ++except: ++ class libvirt(object): ++ def __getattribute__(self, name): ++ raise ValueError("The libvirt backend has been disabled because of security issues.") ++ + # to prevent libvirt errors from appearing on screen, see + # https://www.redhat.com/archives/libvirt-users/2017-August/msg00011.html + diff --git a/pkgs/tools/package-management/protontricks/default.nix b/pkgs/tools/package-management/protontricks/default.nix index e4e60442c8f..ec5017c54c7 100644 --- a/pkgs/tools/package-management/protontricks/default.nix +++ b/pkgs/tools/package-management/protontricks/default.nix @@ -11,13 +11,13 @@ buildPythonApplication rec { pname = "protontricks"; - version = "1.4.3"; + version = "1.4.4"; src = fetchFromGitHub { owner = "Matoking"; repo = pname; rev = version; - sha256 = "0a5727igwafwvj8rr5lv0lx8rlfji3qkzmrbp0d15w5dc4fhknp0"; + sha256 = "0i7p0jj7avmq3b2qlcpwcflipndrnwsvwvhc5aal7rm95aa7xhja"; }; patches = [ diff --git a/pkgs/tools/package-management/protontricks/steam-run.patch b/pkgs/tools/package-management/protontricks/steam-run.patch index 536072cafc4..619d80bd8a7 100644 --- a/pkgs/tools/package-management/protontricks/steam-run.patch +++ b/pkgs/tools/package-management/protontricks/steam-run.patch @@ -1,5 +1,5 @@ diff --git a/src/protontricks/cli.py b/src/protontricks/cli.py -index 6506dae..2f762c9 100755 +index fec0563..d158b96 100755 --- a/src/protontricks/cli.py +++ b/src/protontricks/cli.py @@ -14,7 +14,7 @@ import os @@ -38,7 +38,7 @@ index 6506dae..2f762c9 100755 else: logger.info("Steam Runtime disabled.") -@@ -194,7 +189,7 @@ def main(args=None): +@@ -201,7 +196,7 @@ def main(args=None): winetricks_path=winetricks_path, proton_app=proton_app, steam_app=steam_app, @@ -46,8 +46,8 @@ index 6506dae..2f762c9 100755 + steam_runtime=steam_runtime, command=[winetricks_path, "--gui"] ) - return -@@ -261,7 +256,7 @@ def main(args=None): + +@@ -269,7 +264,7 @@ def main(args=None): winetricks_path=winetricks_path, proton_app=proton_app, steam_app=steam_app, @@ -56,7 +56,7 @@ index 6506dae..2f762c9 100755 command=[winetricks_path] + args.winetricks_command) elif args.command: run_command( -@@ -269,7 +264,7 @@ def main(args=None): +@@ -277,7 +272,7 @@ def main(args=None): proton_app=proton_app, steam_app=steam_app, command=args.command, @@ -66,7 +66,7 @@ index 6506dae..2f762c9 100755 # escaping it cwd=steam_app.install_path, diff --git a/src/protontricks/steam.py b/src/protontricks/steam.py -index 215b31d..aa545b8 100644 +index fa5772d..4f30cd3 100644 --- a/src/protontricks/steam.py +++ b/src/protontricks/steam.py @@ -11,7 +11,7 @@ from .util import lower_dict @@ -78,7 +78,7 @@ index 215b31d..aa545b8 100644 "find_appid_proton_prefix", "get_steam_lib_paths", "get_steam_apps", "get_custom_proton_installations" ) -@@ -245,37 +245,6 @@ def find_steam_path(): +@@ -254,37 +254,6 @@ def find_steam_path(): return None, None @@ -117,7 +117,7 @@ index 215b31d..aa545b8 100644 APPINFO_STRUCT_SECTION = "<LLLLQ20sL" diff --git a/src/protontricks/util.py b/src/protontricks/util.py -index a850427..390fc01 100644 +index d513b46..c48e41f 100644 --- a/src/protontricks/util.py +++ b/src/protontricks/util.py @@ -6,7 +6,7 @@ import stat @@ -129,7 +129,7 @@ index a850427..390fc01 100644 logger = logging.getLogger("protontricks") -@@ -25,70 +25,10 @@ def lower_dict(d): +@@ -25,93 +25,10 @@ def lower_dict(d): return {k.lower(): v for k, v in d.items()} @@ -155,26 +155,49 @@ index a850427..390fc01 100644 - return ":".join(paths) - - +-RUNTIME_ROOT_GLOB_PATTERNS = ( +- "var/*/files/", +- "*/files/" +-) +- +- -def get_runtime_library_paths(steam_runtime_path, proton_app): - """ - Get LD_LIBRARY_PATH value to run a command using Steam Runtime - """ -- if proton_app.required_tool_app: +- def find_runtime_app_root(runtime_app): +- """ +- Find the runtime root (the directory containing the root fileystem +- used for the container) for separately installed Steam Runtime app +- """ +- for pattern in RUNTIME_ROOT_GLOB_PATTERNS: +- try: +- return next( +- runtime_app.install_path.glob(pattern) +- ) +- except StopIteration: +- pass +- +- raise RuntimeError( +- "Could not find Steam Runtime runtime root for {}".format( +- runtime_app.name +- ) +- ) +- +- if proton_app.required_tool_appid: - # bwrap based Steam Runtime is used for Proton installations that - # use separate Steam runtimes - # TODO: Try to run the Wine binaries inside an user namespace somehow. - # Newer Steam Runtime environments may rely on a newer glibc than what - # is available on the host system, which may cause potential problems - # otherwise. -- runtime_root = next( -- proton_app.required_tool_app.install_path.glob("*/files/") -- ) +- runtime_root = find_runtime_app_root(proton_app.required_tool_app) - return "".join([ - str(proton_app.install_path / "dist" / "lib"), os.pathsep, - str(proton_app.install_path / "dist" / "lib64"), os.pathsep, - get_host_library_paths(), os.pathsep, -- str(runtime_root / "i686-pc-linux-gnu" / "lib"), os.pathsep, -- str(runtime_root / "x86_64-pc-linux-gnu" / "lib") +- str(runtime_root / "lib" / "i386-linux-gnu"), os.pathsep, +- str(runtime_root / "lib" / "x86_64-linux-gnu") - ]) - - # Traditional LD_LIBRARY_PATH based Steam Runtime is used otherwise @@ -202,7 +225,7 @@ index a850427..390fc01 100644 ) -@@ -149,7 +89,7 @@ def create_wine_bin_dir(proton_app): +@@ -172,7 +89,7 @@ def create_wine_bin_dir(proton_app): def run_command( winetricks_path, proton_app, steam_app, command, @@ -211,16 +234,23 @@ index a850427..390fc01 100644 **kwargs): """Run an arbitrary command with the correct environment variables for the given Proton app -@@ -157,7 +97,7 @@ def run_command( +@@ -180,13 +97,13 @@ def run_command( The environment variables are set for the duration of the call and restored afterwards - If 'steam_runtime_path' is provided, run the command using Steam Runtime + If 'steam_runtime' is provided, run the command using Steam Runtime """ - # Make a copy of the environment variables to restore later - environ_copy = os.environ.copy() -@@ -200,7 +140,7 @@ def run_command( + # Check for incomplete Steam Runtime installation + runtime_install_incomplete = \ + proton_app.required_tool_appid and not proton_app.required_tool_app + +- if steam_runtime_path and runtime_install_incomplete: ++ if steam_runtime and runtime_install_incomplete: + raise RuntimeError( + "{} is missing the required Steam Runtime. You may need to launch " + "a Steam app using this Proton version to finish the " +@@ -234,7 +151,7 @@ def run_command( os.environ.pop("WINEARCH", "") wine_bin_dir = None @@ -229,7 +259,7 @@ index a850427..390fc01 100644 if proton_app.required_tool_app: runtime_name = proton_app.required_tool_app.name logger.info( -@@ -217,8 +157,6 @@ def run_command( +@@ -251,8 +168,6 @@ def run_command( # that load the underlying Proton Wine executables with Steam Runtime # and Proton libraries instead of system libraries wine_bin_dir = create_wine_bin_dir(proton_app=proton_app) @@ -239,10 +269,10 @@ index a850427..390fc01 100644 str(wine_bin_dir), os.pathsep, os.environ["PATH"] ]) diff --git a/tests/test_cli.py b/tests/test_cli.py -index 19e1137..2ef56d6 100644 +index b612dfa..c4d1de0 100644 --- a/tests/test_cli.py +++ b/tests/test_cli.py -@@ -114,9 +114,6 @@ class TestCLIRun: +@@ -115,9 +115,6 @@ class TestCLIRun: assert str(command.args[0]).endswith(".local/bin/winetricks") assert command.args[1] == "winecfg" assert command.env["PATH"].startswith(str(wine_bin_dir)) diff --git a/pkgs/tools/security/gnupg/22.nix b/pkgs/tools/security/gnupg/22.nix index 90ae4300fa6..1030ce3e791 100644 --- a/pkgs/tools/security/gnupg/22.nix +++ b/pkgs/tools/security/gnupg/22.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { sed -i 's/$SOURCE_DATE_EPOCH/''${SOURCE_DATE_EPOCH}/' doc/Makefile.in '' + lib.optionalString ( stdenv.isLinux && pcsclite != null) '' sed -i 's,"libpcsclite\.so[^"]*","${lib.getLib pcsclite}/lib/libpcsclite.so",g' scd/scdaemon.c - ''; #" fix Emacs syntax highlighting :-( + ''; pinentryBinaryPath = pinentry.binaryPath or "bin/pinentry"; configureFlags = [ diff --git a/pkgs/tools/security/metasploit/Gemfile b/pkgs/tools/security/metasploit/Gemfile index 71f6b1a4c6d..7ffbb5c0323 100644 --- a/pkgs/tools/security/metasploit/Gemfile +++ b/pkgs/tools/security/metasploit/Gemfile @@ -1,4 +1,4 @@ # frozen_string_literal: true source "https://rubygems.org" -gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.0.28" +gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.0.29" diff --git a/pkgs/tools/security/metasploit/Gemfile.lock b/pkgs/tools/security/metasploit/Gemfile.lock index a42529d4efc..926d955d2e8 100644 --- a/pkgs/tools/security/metasploit/Gemfile.lock +++ b/pkgs/tools/security/metasploit/Gemfile.lock @@ -1,9 +1,9 @@ GIT remote: https://github.com/rapid7/metasploit-framework - revision: 84ecddbbed1f1957b8684c2027bb8a3e5eb163a0 - ref: refs/tags/6.0.28 + revision: f54a838fa686f495854a71cb32fadcb1853b6201 + ref: refs/tags/6.0.29 specs: - metasploit-framework (6.0.28) + metasploit-framework (6.0.29) actionpack (~> 5.2.2) activerecord (~> 5.2.2) activesupport (~> 5.2.2) @@ -31,9 +31,9 @@ GIT metasploit-concern metasploit-credential metasploit-model - metasploit-payloads (= 2.0.27) + metasploit-payloads (= 2.0.28) metasploit_data_models - metasploit_payloads-mettle (= 1.0.5) + metasploit_payloads-mettle (= 1.0.6) mqtt msgpack nessus_rest @@ -124,23 +124,23 @@ GEM arel-helpers (2.12.0) activerecord (>= 3.1.0, < 7) aws-eventstream (1.1.0) - aws-partitions (1.422.0) - aws-sdk-core (3.111.2) + aws-partitions (1.424.0) + aws-sdk-core (3.112.0) aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.239.0) aws-sigv4 (~> 1.1) jmespath (~> 1.0) - aws-sdk-ec2 (1.221.0) - aws-sdk-core (~> 3, >= 3.109.0) + aws-sdk-ec2 (1.224.0) + aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-iam (1.46.0) - aws-sdk-core (~> 3, >= 3.109.0) + aws-sdk-iam (1.47.0) + aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-kms (1.41.0) - aws-sdk-core (~> 3, >= 3.109.0) + aws-sdk-kms (1.42.0) + aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.87.0) - aws-sdk-core (~> 3, >= 3.109.0) + aws-sdk-s3 (1.88.0) + aws-sdk-core (~> 3, >= 3.112.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.1) aws-sigv4 (1.2.2) @@ -183,10 +183,10 @@ GEM hrr_rb_ssh (0.3.0.pre2) ed25519 (~> 1.2) http_parser.rb (0.6.0) - i18n (1.8.7) + i18n (1.8.8) concurrent-ruby (~> 1.0) io-console (0.5.7) - irb (1.3.2) + irb (1.3.3) reline (>= 0.1.5) jmespath (1.4.0) jsobfu (0.4.2) @@ -214,7 +214,7 @@ GEM activemodel (~> 5.2.2) activesupport (~> 5.2.2) railties (~> 5.2.2) - metasploit-payloads (2.0.27) + metasploit-payloads (2.0.28) metasploit_data_models (4.1.1) activerecord (~> 5.2.2) activesupport (~> 5.2.2) @@ -224,7 +224,7 @@ GEM pg railties (~> 5.2.2) recog (~> 2.0) - metasploit_payloads-mettle (1.0.5) + metasploit_payloads-mettle (1.0.6) method_source (1.0.0) mini_portile2 (2.5.0) minitest (5.14.3) @@ -238,7 +238,7 @@ GEM net-ssh (6.1.0) network_interface (0.0.2) nexpose (7.2.1) - nio4r (2.5.4) + nio4r (2.5.5) nokogiri (1.11.1) mini_portile2 (~> 2.5.0) racc (~> 1.4) @@ -260,7 +260,7 @@ GEM ttfunk pg (1.2.3) public_suffix (4.0.6) - puma (5.2.0) + puma (5.2.1) nio4r (~> 2.0) racc (1.5.2) rack (2.2.3) @@ -281,10 +281,10 @@ GEM thor (>= 0.19.0, < 2.0) rake (13.0.3) rb-readline (0.5.5) - recog (2.3.18) + recog (2.3.19) nokogiri redcarpet (3.5.1) - reline (0.2.2) + reline (0.2.3) io-console (~> 0.5) rex-arch (0.1.14) rex-text @@ -294,7 +294,7 @@ GEM rex-core rex-struct2 rex-text - rex-core (0.1.14) + rex-core (0.1.15) rex-encoder (0.1.5) metasm rex-arch @@ -374,6 +374,7 @@ GEM unf_ext (0.0.7.7) warden (1.2.9) rack (>= 2.0.9) + webrick (1.7.0) websocket-driver (0.7.3) websocket-extensions (>= 0.1.0) websocket-extensions (0.1.5) @@ -381,7 +382,8 @@ GEM xdr (3.0.2) activemodel (>= 4.2, < 7.0) activesupport (>= 4.2, < 7.0) - xmlrpc (0.3.1) + xmlrpc (0.3.2) + webrick zeitwerk (2.4.2) PLATFORMS diff --git a/pkgs/tools/security/metasploit/default.nix b/pkgs/tools/security/metasploit/default.nix index f50c29aebb7..e11b1dd2990 100644 --- a/pkgs/tools/security/metasploit/default.nix +++ b/pkgs/tools/security/metasploit/default.nix @@ -8,13 +8,13 @@ let }; in stdenv.mkDerivation rec { pname = "metasploit-framework"; - version = "6.0.28"; + version = "6.0.29"; src = fetchFromGitHub { owner = "rapid7"; repo = "metasploit-framework"; rev = version; - sha256 = "sha256-EX3rwg8aMEb1opw/y1+Dai/1SmrfmZye5TWM3w9YiuM="; + sha256 = "sha256-QDgInLW/uOBGf0ioPPBMUZv/c9tA7OtTOfp2CEAjf24="; }; buildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/security/metasploit/gemset.nix b/pkgs/tools/security/metasploit/gemset.nix index e8d8e01b6d5..d33ca7ce03f 100644 --- a/pkgs/tools/security/metasploit/gemset.nix +++ b/pkgs/tools/security/metasploit/gemset.nix @@ -114,60 +114,60 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "01j13abaxzi32gbdrm1v292kh331rlgcr6w1jl78hpcw6hp74r99"; + sha256 = "1dxyx3pnih7g23hq794ldapsszddcmldxf6pq3z99q4d8rg8rrqp"; type = "gem"; }; - version = "1.422.0"; + version = "1.424.0"; }; aws-sdk-core = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0bfj1cnpp0ljr9jc44kljdwl5399cbqlvlqkz6fxq5i4r6ckggi4"; + sha256 = "15lynby6r91p9hh5h92pg4jr8xgnjr52px5ax0p0wncdw4vz0skp"; type = "gem"; }; - version = "3.111.2"; + version = "3.112.0"; }; aws-sdk-ec2 = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0mwd98gmnakz9bkn5kqn5wbk5q2iz7hsbd1xi8256f6ppw07wzi3"; + sha256 = "1lg8vh124viba77b0qhi5j8xx8b4wxdiyycl4kaawmddwhr33zx9"; type = "gem"; }; - version = "1.221.0"; + version = "1.224.0"; }; aws-sdk-iam = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1j0llz7m9qymfn54vim99k0fjg6vsw71ylcagz1csay6qkjxipg7"; + sha256 = "16152qidkisakl2iqvghrjnccq279pahb953q5a4q0ipk5imw2c1"; type = "gem"; }; - version = "1.46.0"; + version = "1.47.0"; }; aws-sdk-kms = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "02f70a4rr5h2na7navjhaf3n15ifq95zdl1avsryyxdvqzm5gzwm"; + sha256 = "00wgf83cdy6z77b2y0ld0aqiidfyldi71hx0z8b73gxjdlbwpq1i"; type = "gem"; }; - version = "1.41.0"; + version = "1.42.0"; }; aws-sdk-s3 = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0capqhvm08ngq74n33ym0khixkdj342jpikssw57avdmd8g6kaq7"; + sha256 = "029iqr52fxxz8d6jb2g4k76i7nnjyspvjdlx52xah25zzhp3bx7v"; type = "gem"; }; - version = "1.87.0"; + version = "1.88.0"; }; aws-sigv4 = { groups = ["default"]; @@ -424,10 +424,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1kr0bx9323fv5ys6nlhsy05kmwcbs94h6ac7ka9qqywy0vbdvrrv"; + sha256 = "0k7q3pwm0l1qvx6sc3d4dxmdxqx2pc63lbfjwv0k0higq94rinvs"; type = "gem"; }; - version = "1.8.7"; + version = "1.8.8"; }; io-console = { groups = ["default"]; @@ -444,10 +444,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "166xravh6r82w46d8hcjrg55gnyjdf0501g16lb48i2h06k363l2"; + sha256 = "00c95xk8c9wzcs5imsrm85jk06y8l4dbnzhvqap98nprr9mxxnvl"; type = "gem"; }; - version = "1.3.2"; + version = "1.3.3"; }; jmespath = { groups = ["default"]; @@ -524,12 +524,12 @@ platforms = []; source = { fetchSubmodules = false; - rev = "84ecddbbed1f1957b8684c2027bb8a3e5eb163a0"; - sha256 = "1qwab07xz31mwng9r6fzd95gabvahdgwngwwlbslcc0s1z1fnz8i"; + rev = "f54a838fa686f495854a71cb32fadcb1853b6201"; + sha256 = "0vkz4d00hxps759ypv20vdrzz6si9kq3ra28gx3f1f5znnf0hf20"; type = "git"; url = "https://github.com/rapid7/metasploit-framework"; }; - version = "6.0.28"; + version = "6.0.29"; }; metasploit-model = { groups = ["default"]; @@ -546,10 +546,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1c3jn9gjy1bknyd7wrwwfbcjwlmijd6nnsjzyqc7yszjjy0yqca2"; + sha256 = "1xln6zgdiimrbwjbdhi9008bjhmwqm13zky4310pvr7g8riffwqx"; type = "gem"; }; - version = "2.0.27"; + version = "2.0.28"; }; metasploit_data_models = { groups = ["default"]; @@ -566,10 +566,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0z6gnidpcpdm80vvl0yw1h10kchkaw9whcsv2kwy7ih6247l7nbq"; + sha256 = "1mxhybic6myh993fs4jmp0hz998ryf362y0b33wqanff1n8aj75k"; type = "gem"; }; - version = "1.0.5"; + version = "1.0.6"; }; method_source = { groups = ["default"]; @@ -696,10 +696,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1cbwp1kbv6b2qfxv8sarv0d0ilb257jihlvdqj8f5pdm0ksq1sgk"; + sha256 = "0xbrmq1pvmszrwf40lzwmf8krs2b56720i7wsz9gh274qljkzklf"; type = "gem"; }; - version = "2.5.4"; + version = "2.5.5"; }; nokogiri = { groups = ["default"]; @@ -816,10 +816,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0fmcz4dp7ggkv1h4n51vn1gq0r4zbkw7sr2ssl4ws1khb86grkv5"; + sha256 = "10kj484ppkjdg1j8jac4bxdv1082bd6g6xhrj70chlp7lkgl8ggh"; type = "gem"; }; - version = "5.2.0"; + version = "5.2.1"; }; racc = { groups = ["default"]; @@ -916,10 +916,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0inz904fbsjscjs71lxxj4070lm1klm27m9prmrhqybc0hr95l69"; + sha256 = "00czf392immsaff10snjxky2vpnfck1bgszpckx15y2kydag5k9i"; type = "gem"; }; - version = "2.3.18"; + version = "2.3.19"; }; redcarpet = { groups = ["default"]; @@ -936,10 +936,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0zinl7l63gzy6y477j8w1azfm5655h2026hxl49w4c73qcfdjj3x"; + sha256 = "18xpix2hn4x4hihn0fjsv6i7jr7zjfbwzs94hwn48klyq3yrym2h"; type = "gem"; }; - version = "0.2.2"; + version = "0.2.3"; }; rex-arch = { groups = ["default"]; @@ -966,10 +966,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0mmsckkrds6jvg1b4sdq4cv9s1q0idjiy1k8kjfvgylz96ap0vlw"; + sha256 = "1bjz0mhxijvfq535hpzswr83yrq3ghkkmqna63yjsabh61qpxx16"; type = "gem"; }; - version = "0.1.14"; + version = "0.1.15"; }; rex-encoder = { groups = ["default"]; @@ -1341,6 +1341,16 @@ }; version = "1.2.9"; }; + webrick = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1d4cvgmxhfczxiq5fr534lmizkhigd15bsx5719r5ds7k7ivisc7"; + type = "gem"; + }; + version = "1.7.0"; + }; websocket-driver = { groups = ["default"]; platforms = []; @@ -1386,10 +1396,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0yihlrbipgiivgpkbx06qx8wgbic0jm26by6jymdwxb01zsd0yj1"; + sha256 = "1xa79ry3976ylap38cr5g6q3m81plm611flqd3dwgnmgbkycb6jp"; type = "gem"; }; - version = "0.3.1"; + version = "0.3.2"; }; zeitwerk = { groups = ["default"]; diff --git a/pkgs/tools/security/sequoia/default.nix b/pkgs/tools/security/sequoia/default.nix index 706c9edc481..b0172ff1d50 100644 --- a/pkgs/tools/security/sequoia/default.nix +++ b/pkgs/tools/security/sequoia/default.nix @@ -23,16 +23,18 @@ assert pythonSupport -> pythonPackages != null; rustPlatform.buildRustPackage rec { pname = "sequoia"; - version = "1.0.0"; + # Upstream has separate version numbering for the library and the CLI frontend. + # This derivation provides the CLI frontend, and thus uses its version number. + version = "0.24.0"; src = fetchFromGitLab { owner = "sequoia-pgp"; repo = "sequoia"; - rev = "v${version}"; - sha256 = "0y80bl786m29ww3272qsl1ql0xc3pwd6iiqlkv3nmhnjsmygbn0d"; + rev = "sq/v${version}"; + sha256 = "0zavkf0grkqljyiywcprsiv8igidk8vc3yfj3fzqvbhm43vnnbdw"; }; - cargoSha256 = "03ngywa5z0c7qmdmhynk13xcivhg8gpivvpzg2gxp34gfr7j438l"; + cargoSha256 = "172f0gsy5hssrqv0l1np3c0qd1ayp6nqbpqmgwrkc4l37y5fn232"; nativeBuildInputs = [ pkg-config diff --git a/pkgs/tools/security/terrascan/default.nix b/pkgs/tools/security/terrascan/default.nix index fddd10da618..b37273aeb1d 100644 --- a/pkgs/tools/security/terrascan/default.nix +++ b/pkgs/tools/security/terrascan/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "terrascan"; - version = "1.2.0"; + version = "1.3.2"; src = fetchFromGitHub { owner = "accurics"; repo = pname; rev = "v${version}"; - sha256 = "1kjis0ylvmv1gvzp5qvi9a7x4611bjv8yx5mb6nkc0a8lscwb4c3"; + sha256 = "sha256-RZFh9RVU8RwtLGIP7OWnf0yNsXfElqWSXieljqp8ahU="; }; - vendorSha256 = "0yfybzwjvnan4qf5w25k22iwh5hp9v8si93p4jv9bx25rw91swws"; + vendorSha256 = "sha256-Ya/33ocPhY5OSnCEyULsOIHaxwb1yNEle3JEYo/7/Yk="; # tests want to download a vulnerable Terraform project doCheck = false; diff --git a/pkgs/tools/security/tor/default.nix b/pkgs/tools/security/tor/default.nix index ca68f8b71fc..8766e957aaf 100644 --- a/pkgs/tools/security/tor/default.nix +++ b/pkgs/tools/security/tor/default.nix @@ -30,11 +30,11 @@ let in stdenv.mkDerivation rec { pname = "tor"; - version = "0.4.4.6"; + version = "0.4.4.7"; src = fetchurl { url = "https://dist.torproject.org/${pname}-${version}.tar.gz"; - sha256 = "1p0zpqmbskygx0wmiijhprg8r45n2wqbbjl7kv4gbb83b0alq5az"; + sha256 = "1vh5kdx7s74il8a6gr7jydbpv0an01nla4y2r8w7h33z2wk2jv9j"; }; outputs = [ "out" "geoip" ]; diff --git a/pkgs/tools/security/vault/default.nix b/pkgs/tools/security/vault/default.nix index 4d9893e103f..51261768550 100644 --- a/pkgs/tools/security/vault/default.nix +++ b/pkgs/tools/security/vault/default.nix @@ -2,13 +2,13 @@ buildGoPackage rec { pname = "vault"; - version = "1.6.1"; + version = "1.6.2"; src = fetchFromGitHub { owner = "hashicorp"; repo = "vault"; rev = "v${version}"; - sha256 = "1pgyyl2zgnr3wy4k8c5xsk2s5dpl97xdfq67lpfss7fz1bij8x47"; + sha256 = "1g6fz6dl90cb5pnvvmkndqgncfjy50j9jw3xzn8s91yzvvld8ds7"; }; goPackagePath = "github.com/hashicorp/vault"; diff --git a/pkgs/tools/security/vault/vault-bin.nix b/pkgs/tools/security/vault/vault-bin.nix index 775bd8c6951..b30f8d1af13 100644 --- a/pkgs/tools/security/vault/vault-bin.nix +++ b/pkgs/tools/security/vault/vault-bin.nix @@ -1,26 +1,26 @@ { lib, stdenv, fetchurl, unzip }: let - version = "1.6.1"; + version = "1.6.2"; sources = let base = "https://releases.hashicorp.com/vault/${version}"; in { x86_64-linux = fetchurl { url = "${base}/vault_${version}_linux_amd64.zip"; - sha256 = "1la2pylcj9y5gr7hr4aaa49427y3lgxi2phhl46pqmr7an62pkbm"; + sha256 = "1vcxnky8qnn2ib33r9604cbjrgm939ddrhwqcjylbv217cmc9alf"; }; i686-linux = fetchurl { url = "${base}/vault_${version}_linux_386.zip"; - sha256 = "1a2rhv5bpv43qp74a49msrwr7djzy86irsn73jl0xnkh0k6ijci1"; + sha256 = "0mcav36dcmvky8v4y65jvh837i72aqz7arv2ivjpajym3gf7qrq1"; }; x86_64-darwin = fetchurl { url = "${base}/vault_${version}_darwin_amd64.zip"; - sha256 = "0snswwai2ya26crm3ksifrmbdnajr36v4vamh7g65plg6vzban9a"; + sha256 = "1is7s445jc4ll2lyfxgjwwl89fly1l8kskqp2p8z179d8hhgd0ms"; }; aarch64-linux = fetchurl { url = "${base}/vault_${version}_linux_arm64.zip"; - sha256 = "0ix99da3xd4z200dgvpfc2h1sfx6l8cipichvfjlj39md45grs89"; + sha256 = "0i5d87a393464r68rjv83bjhg51yaysccqbwaaydmzk1m45icg7x"; }; }; diff --git a/pkgs/tools/system/gotop/default.nix b/pkgs/tools/system/gotop/default.nix index 0c27e9e4e71..1cc0ba87739 100644 --- a/pkgs/tools/system/gotop/default.nix +++ b/pkgs/tools/system/gotop/default.nix @@ -2,17 +2,19 @@ buildGoModule rec { pname = "gotop"; - version = "4.1.0"; + version = "4.1.1"; src = fetchFromGitHub { owner = "xxxserxxx"; repo = pname; rev = "v${version}"; - sha256 = "09cs97fjjxcjxzsl2kh8j607cs5zy2hnrh1pb21pggzhg7dzsz0w"; + sha256 = "sha256-3t6I4ah9gUmPlIBRL86BdgiUaMNiKNEeoUSRMASz1Yc="; }; runVend = true; - vendorSha256 = "1mbjl7b49naaqkr2j658j17z9ryf5g3x6q34gvmrm7n9y082ggnz"; + vendorSha256 = "sha256-GcIaUIuTiSY1aKxRtclfl7hMNaZZx4uoVG7ahjF/4Hs="; + + buildFlagsArray = [ "-ldflags=-s -w -X main.Version=v${version}" ]; preCheck = '' export HOME=$(mktemp -d) diff --git a/pkgs/tools/system/hwinfo/default.nix b/pkgs/tools/system/hwinfo/default.nix index 925b60d5434..9048aa966f7 100644 --- a/pkgs/tools/system/hwinfo/default.nix +++ b/pkgs/tools/system/hwinfo/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "hwinfo"; - version = "21.71"; + version = "21.72"; src = fetchFromGitHub { owner = "opensuse"; repo = "hwinfo"; rev = version; - sha256 = "1g671fvkg6r30n9vwwlqpdd6yn6jf7n9ynjmslblk7kbnabzayby"; + sha256 = "sha256-T/netiZqox+qa19wH+h8cbsGbiM+9VrSEIjccrPYqws="; }; patchPhase = '' diff --git a/pkgs/tools/system/netdata/default.nix b/pkgs/tools/system/netdata/default.nix index 44c5e42a490..68afd288e23 100644 --- a/pkgs/tools/system/netdata/default.nix +++ b/pkgs/tools/system/netdata/default.nix @@ -15,14 +15,14 @@ with lib; let go-d-plugin = callPackage ./go.d.plugin.nix {}; in stdenv.mkDerivation rec { - version = "1.28.0"; + version = "1.29.0"; pname = "netdata"; src = fetchFromGitHub { owner = "netdata"; repo = "netdata"; rev = "v${version}"; - sha256 = "1266jbfw55r1zh00xi6c90j2fs9hw8hmsb7686rh04l8mffny9f4"; + sha256 = "sha256-Bkap0Ld5zz+HxEjkZrmPZieUpyim4/gpE8oL0q9LGqk="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; diff --git a/pkgs/tools/system/thinkfan/default.nix b/pkgs/tools/system/thinkfan/default.nix index c9af119fb73..97c61d2da0e 100644 --- a/pkgs/tools/system/thinkfan/default.nix +++ b/pkgs/tools/system/thinkfan/default.nix @@ -1,5 +1,13 @@ -{ lib, stdenv, fetchFromGitHub, cmake, libyamlcpp, pkg-config -, smartSupport ? false, libatasmart }: +{ lib +, stdenv +, fetchFromGitHub +, cmake +, libyamlcpp +, pkg-config +, procps +, coreutils +, smartSupport ? false, libatasmart +}: stdenv.mkDerivation rec { pname = "thinkfan"; @@ -12,36 +20,40 @@ stdenv.mkDerivation rec { sha256 = "18vgm5w5pjnpipa34j4x87q10695w2jnqwvc2f027afy7mnzw7kz"; }; + postPatch = '' + # fix hardcoded install path + substituteInPlace CMakeLists.txt --replace /etc $out/etc + + # fix command paths in unit files + for unit in rcscripts/systemd/*; do + substituteInPlace "$unit" \ + --replace /bin/kill ${procps}/bin/kill \ + --replace /usr/bin/pkill ${procps}/bin/pkill \ + --replace /usr/bin/sleep ${coreutils}/bin/sleep + done + ''; + cmakeFlags = [ "-DCMAKE_INSTALL_DOCDIR=share/doc/${pname}" "-DUSE_NVML=OFF" + # force install unit files + "-DSYSTEMD_FOUND=ON" ] ++ lib.optional smartSupport "-DUSE_ATASMART=ON"; nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ libyamlcpp ] ++ lib.optional smartSupport libatasmart; - installPhase = '' - runHook preInstall - - install -Dm755 {.,$out/bin}/thinkfan - - cd "$NIX_BUILD_TOP"; cd "$sourceRoot" # attempt to be a bit robust - install -Dm644 {.,$out/share/doc/thinkfan}/README.md - cp -R examples $out/share/doc/thinkfan - install -Dm644 {src,$out/share/man/man1}/thinkfan.1 - - runHook postInstall - ''; - - meta = with lib; { - description = "A minimalist fan control program"; - longDescription = "A minimalist fan control program. Originally designed -specifically for IBM/Lenovo Thinkpads, it now supports any kind of system via -the sysfs hwmon interface (/sys/class/hwmon)."; - license = licenses.gpl3; + meta = { + description = "A simple, lightweight fan control program"; + longDescription = '' + Thinkfan is a minimalist fan control program. Originally designed + specifically for IBM/Lenovo Thinkpads, it now supports any kind of + system via the sysfs hwmon interface (/sys/class/hwmon). + ''; + license = lib.licenses.gpl3Plus; homepage = "https://github.com/vmatare/thinkfan"; - maintainers = with maintainers; [ domenkozar ]; - platforms = platforms.linux; + maintainers = with lib.maintainers; [ domenkozar rnhmjoj ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/tools/system/tuptime/default.nix b/pkgs/tools/system/tuptime/default.nix index 92878c5386b..0d3b6f4d6b8 100644 --- a/pkgs/tools/system/tuptime/default.nix +++ b/pkgs/tools/system/tuptime/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "tuptime"; - version = "5.0.1"; + version = "5.0.2"; src = fetchFromGitHub { owner = "rfrail3"; repo = "tuptime"; rev = version; - sha256 = "0nk3yyjavgmc435vj3f0siw4y5nwipsbcsvsf5m7mgvq0xi8f3ls"; + sha256 = "sha256-2Q1czKvwdVq+2+64k4SOghw05CUlT5HdZpvKMRbGdDY="; }; nativeBuildInputs = [ makeWrapper installShellFiles ]; diff --git a/pkgs/tools/text/ocrmypdf/0001-Make-compatible-with-pdfminer.six-version-20200720.patch b/pkgs/tools/text/ocrmypdf/0001-Make-compatible-with-pdfminer.six-version-20200720.patch deleted file mode 100644 index 967bcd3948c..00000000000 --- a/pkgs/tools/text/ocrmypdf/0001-Make-compatible-with-pdfminer.six-version-20200720.patch +++ /dev/null @@ -1,52 +0,0 @@ -From 4315b58e0bffedd145cec61f96062292cd98278e Mon Sep 17 00:00:00 2001 -From: Pascal Bach <pascal.bach@nextrem.ch> -Date: Thu, 23 Jul 2020 21:37:33 +0200 -Subject: [PATCH] Make compatible with pdfminer.six version 20200720 - ---- - setup.py | 2 +- - src/ocrmypdf/pdfinfo/layout.py | 8 ++++++-- - 2 files changed, 7 insertions(+), 3 deletions(-) - -diff --git a/setup.py b/setup.py -index bd95ed9..d1f4ab1 100644 ---- a/setup.py -+++ b/setup.py -@@ -83,7 +83,7 @@ setup( - 'cffi >= 1.9.1', # must be a setup and install requirement - 'coloredlogs >= 14.0', # strictly optional - 'img2pdf >= 0.3.0, < 0.4', # pure Python, so track HEAD closely -- 'pdfminer.six >= 20191110, <= 20200517', -+ 'pdfminer.six >= 20191110, <= 20200720', - 'pikepdf >= 1.14.0, < 2', - 'Pillow >= 7.0.0', - 'pluggy >= 0.13.0', -diff --git a/src/ocrmypdf/pdfinfo/layout.py b/src/ocrmypdf/pdfinfo/layout.py -index 98bd82e..8b41e14 100644 ---- a/src/ocrmypdf/pdfinfo/layout.py -+++ b/src/ocrmypdf/pdfinfo/layout.py -@@ -26,7 +26,11 @@ import pdfminer.pdfdevice - import pdfminer.pdfinterp - from pdfminer.converter import PDFLayoutAnalyzer - from pdfminer.layout import LAParams, LTChar, LTPage, LTTextBox --from pdfminer.pdfdocument import PDFTextExtractionNotAllowed -+try: -+ from pdfminer.pdfdocument import PDFTextExtractionNotAllowedError -+except ImportError: -+ # Fallback for pdfminer < 20200720 -+ from pdfminer.pdfdocument import PDFTextExtractionNotAllowed as PDFTextExtractionNotAllowedError - from pdfminer.pdffont import PDFSimpleFont, PDFUnicodeNotDefined - from pdfminer.pdfpage import PDFPage - from pdfminer.utils import bbox2str, matrix2str -@@ -239,7 +243,7 @@ def get_page_analysis(infile, pageno, pscript5_mode): - with Path(infile).open('rb') as f: - page = PDFPage.get_pages(f, pagenos=[pageno], maxpages=0) - interp.process_page(next(page)) -- except PDFTextExtractionNotAllowed: -+ except PDFTextExtractionNotAllowedError: - raise EncryptedPdfError() - finally: - if pscript5_mode: --- -2.27.0 - diff --git a/pkgs/tools/text/ocrmypdf/default.nix b/pkgs/tools/text/ocrmypdf/default.nix index f68e1558139..6843e945fd9 100644 --- a/pkgs/tools/text/ocrmypdf/default.nix +++ b/pkgs/tools/text/ocrmypdf/default.nix @@ -7,7 +7,8 @@ , python3 , python3Packages , qpdf -, lib, stdenv +, lib +, stdenv , tesseract4 , unpaper , substituteAll @@ -29,18 +30,17 @@ let in buildPythonApplication rec { pname = "ocrmypdf"; - version = "11.3.3"; + version = "11.6.0"; disabled = ! python3Packages.isPy3k; src = fetchFromGitHub { owner = "jbarlow83"; repo = "OCRmyPDF"; rev = "v${version}"; - sha256 = "0qv34clid65p11dgqalyk7b7myn5ibiz8i9xxhxkmjblw297p6ak"; + sha256 = "0inmmpam0vcm5n4sm6lh9p5swk44clknvm1cdwk9cax01mdqljza"; }; nativeBuildInputs = with python3Packages; [ - pytestrunner setuptools setuptools-scm-git-archive setuptools_scm @@ -65,8 +65,7 @@ buildPythonApplication rec { pytest pytest-helpers-namespace pytest_xdist - pytestcov - pytestrunner + pytest-cov python-xmp-toolkit pytestCheckHook ] ++ runtimeDeps; @@ -83,7 +82,7 @@ buildPythonApplication rec { meta = with lib; { homepage = "https://github.com/jbarlow83/OCRmyPDF"; description = "Adds an OCR text layer to scanned PDF files, allowing them to be searched"; - license = licenses.gpl3; + license = with licenses; [ mpl20 mit ]; platforms = platforms.linux; maintainers = [ maintainers.kiwi ]; }; diff --git a/pkgs/tools/text/reckon/Gemfile.lock b/pkgs/tools/text/reckon/Gemfile.lock index 6c3ce51c6ac..b1bfe4aaa8b 100644 --- a/pkgs/tools/text/reckon/Gemfile.lock +++ b/pkgs/tools/text/reckon/Gemfile.lock @@ -4,7 +4,7 @@ GEM chronic (0.10.2) highline (2.0.3) rchardet (1.8.0) - reckon (0.6.0) + reckon (0.7.1) chronic (>= 0.3.0) highline (>= 1.5.2) rchardet (>= 1.8.0) @@ -16,4 +16,4 @@ DEPENDENCIES reckon BUNDLED WITH - 2.1.4 + 1.17.2 diff --git a/pkgs/tools/text/reckon/default.nix b/pkgs/tools/text/reckon/default.nix index 261149229b6..bbefa94637d 100644 --- a/pkgs/tools/text/reckon/default.nix +++ b/pkgs/tools/text/reckon/default.nix @@ -15,8 +15,10 @@ stdenv.mkDerivation rec { gemdir = ./.; }; in '' + runHook preInstall mkdir -p $out/bin makeWrapper ${env}/bin/reckon $out/bin/reckon + runHook postInstall ''; passthru.updateScript = bundlerUpdateScript "reckon"; diff --git a/pkgs/tools/text/reckon/gemset.nix b/pkgs/tools/text/reckon/gemset.nix index 50802ccd805..09a4e704d08 100644 --- a/pkgs/tools/text/reckon/gemset.nix +++ b/pkgs/tools/text/reckon/gemset.nix @@ -1,5 +1,7 @@ { chronic = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "1hrdkn4g8x7dlzxwb1rfgr8kw3bp4ywg5l4y4i9c2g5cwv62yvvn"; @@ -11,7 +13,7 @@ groups = ["default"]; platforms = []; source = { - remotes = ["http://rubygems.org"]; + remotes = ["https://rubygems.org"]; sha256 = "0yclf57n2j3cw8144ania99h1zinf8q3f5zrhqa754j6gl95rp9d"; type = "gem"; }; @@ -21,7 +23,7 @@ groups = ["default"]; platforms = []; source = { - remotes = ["http://rubygems.org"]; + remotes = ["https://rubygems.org"]; sha256 = "1isj1b3ywgg2m1vdlnr41lpvpm3dbyarf1lla4dfibfmad9csfk9"; type = "gem"; }; @@ -33,9 +35,9 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0zkbmwx5bp2dr54bwhkn831918ijwh022rq45qg38wz2skih7izp"; + sha256 = "0hsmzjxj1f5ma816gag1b3bdjbynhj2szgar955fcs3gbbzv4sk7"; type = "gem"; }; - version = "0.6.0"; + version = "0.7.1"; }; } diff --git a/pkgs/tools/text/robodoc/default.nix b/pkgs/tools/text/robodoc/default.nix new file mode 100644 index 00000000000..e30e8739797 --- /dev/null +++ b/pkgs/tools/text/robodoc/default.nix @@ -0,0 +1,48 @@ +{ lib +, stdenv +, fetchFromGitHub +, autoreconfHook +}: + +stdenv.mkDerivation rec { + pname = "robodoc"; + version = "4.99.44"; + + src = fetchFromGitHub { + owner = "gumpu"; + repo = "ROBODoc"; + rev = "v${version}"; + sha256 = "l3prSdaGhOvXmZfCPbsZJNocO7y20zJjLQpajRTJOqE="; + }; + + nativeBuildInputs = [ autoreconfHook ]; + + hardeningDisable = [ "format" ]; + + meta = with lib; { + homepage = "https://github.com/gumpu/ROBODoc"; + description = "Documentation Extraction Tool"; + longDescription = '' + ROBODoc is program documentation tool. The idea is to include for every + function or procedure a standard header containing all sorts of + information about the procedure or function. ROBODoc extracts these + headers from the source file and puts them in a separate + autodocs-file. ROBODoc thus allows you to include the program + documentation in the source code and avoid having to maintain two separate + documents. Or as Petteri puts it: "robodoc is very useful - especially for + programmers who don't like writing documents with Word or some other + strange tool." + + ROBODoc can format the headers in a number of different formats: HTML, + RTF, LaTeX, or XML DocBook. In HTML mode it can generate cross links + between headers. You can even include parts of your source code. + + ROBODoc works with many programming languages: For instance C, Pascal, + Shell Scripts, Assembler, COBOL, Occam, Postscript, Forth, Tcl/Tk, C++, + Java -- basically any program in which you can use remarks/comments. + ''; + license = with licenses; gpl3Plus; + maintainers = with maintainers; [ AndersonTorres ]; + platforms = with platforms; all; + }; +} diff --git a/pkgs/tools/text/vale/default.nix b/pkgs/tools/text/vale/default.nix index bc7c43ca6ec..59f5e7c0c0f 100644 --- a/pkgs/tools/text/vale/default.nix +++ b/pkgs/tools/text/vale/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "vale"; - version = "2.8.1"; + version = "2.9.1"; subPackages = [ "cmd/vale" ]; outputs = [ "out" "data" ]; @@ -11,7 +11,7 @@ buildGoModule rec { owner = "errata-ai"; repo = "vale"; rev = "v${version}"; - sha256 = "0xvsg5j0nv6p6wskxg4gz79di6p495c78xbwl3xmh0wyk7g78lkx"; + sha256 = "sha256-ItkWmBq1mBVZfHcnqDp8koEAWBH3k9Et2bFA2mNYjVY="; }; vendorSha256 = null; diff --git a/pkgs/tools/typesetting/lowdown/default.nix b/pkgs/tools/typesetting/lowdown/default.nix index 40606199b83..4da6bf77451 100644 --- a/pkgs/tools/typesetting/lowdown/default.nix +++ b/pkgs/tools/typesetting/lowdown/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "lowdown"; - version = "0.7.9"; + version = "0.8.0"; outputs = [ "out" "lib" "dev" "man" ]; src = fetchurl { url = "https://kristaps.bsd.lv/lowdown/snapshots/lowdown-${version}.tar.gz"; - sha512 = "18q8i8lh8w127vzw697n0bzv4mchhna1p4s672hjvy39l3ls8rlj5nwq5npr5fry06yil62sjmq4652vw29r8l49wwk5j82a8l2nr7c"; + sha512 = "17w0hldlg7x0f4946bz1pmgkpp08dha3myz8pk0rx8n2lqlw76f3n9giq69kw82sgzg7qqy31sl9mxvgaxyf6hcdgmxnkr7h8d9xmak"; }; nativeBuildInputs = [ which ] diff --git a/pkgs/tools/video/untrunc/default.nix b/pkgs/tools/video/untrunc/default.nix deleted file mode 100644 index 3ef025f5875..00000000000 --- a/pkgs/tools/video/untrunc/default.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ lib, stdenv, gcc, libav_12, fetchFromGitHub }: - -stdenv.mkDerivation { - pname = "untrunc"; - version = "2020.02.09"; - - src = fetchFromGitHub { - owner = "ponchio"; - repo = "untrunc"; - rev = "4eed44283168c727ace839ff7590092fda2e0848"; - sha256 = "0nfj67drc6bxqlkf8a1iazqhi0w38a7rjrb2bpa74gwq6xzygvbr"; - }; - - buildInputs = [ gcc libav_12 ]; - - # Untrunc uses the internal libav headers 'h264dec.h' and 'config.h'. - # The latter must be created through 'configure'. - libavConfiguredSrc = libav_12.overrideAttrs (oldAttrs: { - name = "libav-configured-src"; - outputs = [ "out" ]; - phases = [ "unpackPhase" "patchPhase" "configurePhase" "installPhase" ]; - installPhase = "cp -r . $out"; - }); - - buildCommand = '' - mkdir -p $out/bin - g++ -o $out/bin/untrunc \ - -Wno-deprecated-declarations \ - $src/file.cpp $src/main.cpp $src/track.cpp $src/atom.cpp $src/mp4.cpp \ - -I$libavConfiguredSrc -lavformat -lavcodec -lavutil - ''; - - meta = with lib; { - description = "Restore a damaged (truncated) mp4, m4v, mov, 3gp video from a similar, undamaged video"; - license = licenses.gpl2; - homepage = "https://github.com/ponchio/untrunc"; - maintainers = [ maintainers.earvstedt ]; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index fbd30aea40a..27c2b48e66b 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -709,6 +709,7 @@ mapAliases ({ ultrastardx-beta = ultrastardx; # added 2017-08-12 unicorn-emu = unicorn; # added 2020-10-29 unifiStable = unifi6; # added 2020-12-28 + untrunc = untrunc-anthwlock; # added 2021-02-01 usb_modeswitch = usb-modeswitch; # added 2016-05-10 usbguard-nox = usbguard; # added 2019-09-04 utillinux = util-linux; # added 2020-11-24 @@ -848,6 +849,8 @@ mapAliases ({ /* Added 2021-01-02 */ ttyrec = ovh-ttyrec; + zplugin = zinit; # Added 2021-01-30 + /* If these are in the scope of all-packages.nix, they cause collisions between mixed versions of qt. See: https://github.com/NixOS/nixpkgs/pull/101369 */ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4839d14e006..a800e795289 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -705,6 +705,8 @@ in afpfs-ng = callPackage ../tools/filesystems/afpfs-ng { }; + agate = callPackage ../servers/gemini/agate { }; + agda-pkg = callPackage ../development/tools/agda-pkg { }; agrep = callPackage ../tools/text/agrep { }; @@ -1112,6 +1114,8 @@ in bmap-tools = callPackage ../tools/misc/bmap-tools { }; + bonnmotion = callPackage ../development/tools/misc/bonnmotion { }; + bonnie = callPackage ../tools/filesystems/bonnie { }; bonfire = callPackage ../tools/misc/bonfire { }; @@ -2664,8 +2668,6 @@ in pbgopy = callPackage ../tools/text/pbgopy { }; - pbpst = callPackage ../applications/misc/pbpst { }; - pbzx = callPackage ../tools/compression/pbzx { }; pcb2gcode = callPackage ../tools/misc/pcb2gcode { }; @@ -3738,6 +3740,8 @@ in edid-generator = callPackage ../tools/misc/edid-generator { }; + edir = callPackage ../tools/misc/edir { }; + editres = callPackage ../tools/graphics/editres { }; edit = callPackage ../applications/editors/edit { }; @@ -4828,6 +4832,8 @@ in inherit (darwin.apple_sdk.frameworks) Security; }; + robodoc = callPackage ../tools/text/robodoc { }; + ucg = callPackage ../tools/text/ucg { }; grive2 = callPackage ../tools/filesystems/grive2 { }; @@ -5826,6 +5832,8 @@ in np2kai = callPackage ../misc/emulators/np2kai { }; + ox = callPackage ../applications/editors/ox { }; + file-rename = callPackage ../tools/filesystems/file-rename { }; kcollectd = libsForQt5.callPackage ../tools/misc/kcollectd {}; @@ -6052,7 +6060,7 @@ in lzip = callPackage ../tools/compression/lzip { }; - luxcorerender = callPackage ../tools/graphics/luxcorerender { qt5 = qt514; }; + luxcorerender = callPackage ../tools/graphics/luxcorerender { }; xz = callPackage ../tools/compression/xz { }; lzma = xz; # TODO: move to aliases.nix @@ -7173,6 +7181,8 @@ in povray = callPackage ../tools/graphics/povray { }; + power-profiles-daemon = callPackage ../os-specific/linux/power-profiles-daemon { }; + ppl = callPackage ../development/libraries/ppl { }; pplatex = callPackage ../tools/typesetting/tex/pplatex { }; @@ -7991,6 +8001,8 @@ in stubby = callPackage ../tools/networking/stubby { }; + surface-control = callPackage ../applications/misc/surface-control { }; + syntex = callPackage ../tools/graphics/syntex {}; sl = callPackage ../tools/misc/sl { stdenv = gccStdenv; }; @@ -8555,12 +8567,12 @@ in untex = callPackage ../tools/text/untex { }; - untrunc = callPackage ../tools/video/untrunc { }; - untrunc-anthwlock = callPackage ../tools/video/untrunc-anthwlock { }; up = callPackage ../tools/misc/up { }; + upterm = callPackage ../tools/misc/upterm { }; + upx = callPackage ../tools/compression/upx { }; uq = callPackage ../misc/uq { }; @@ -9231,7 +9243,7 @@ in zplug = callPackage ../shells/zsh/zplug { }; - zplugin = callPackage ../shells/zsh/zplugin {} ; + zinit = callPackage ../shells/zsh/zinit {} ; zsh-autoenv = callPackage ../tools/misc/zsh-autoenv { }; @@ -11687,6 +11699,8 @@ in avrdude = callPackage ../development/tools/misc/avrdude { }; + b4 = callPackage ../development/tools/b4 { }; + babeltrace = callPackage ../development/tools/misc/babeltrace { }; bam = callPackage ../development/tools/build-managers/bam {}; @@ -13775,6 +13789,10 @@ in rev = "v${version}"; sha256 = "09jz2fzv0zl5058s0g1cpnw87a2rgg8wnjwlygi18i2n9nn6m0ad"; }; + meta.knownVulnerabilities = [ + "CVE-2020-12278" + "CVE-2020-12279" + ]; }); libgit2-glib = callPackage ../development/libraries/libgit2-glib { }; @@ -16606,6 +16624,8 @@ in shapelib = callPackage ../development/libraries/shapelib { }; + sharness = callPackage ../development/libraries/sharness { }; + shibboleth-sp = callPackage ../development/libraries/shibboleth-sp { }; skaffold = callPackage ../development/tools/skaffold { }; @@ -22658,6 +22678,10 @@ in ht = callPackage ../applications/editors/ht { }; + ht-rust = callPackage ../tools/networking/ht-rust { + inherit (darwin.apple_sdk.frameworks) Security; + }; + hubstaff = callPackage ../applications/misc/hubstaff { }; hue-cli = callPackage ../tools/networking/hue-cli { }; @@ -23058,6 +23082,8 @@ in k4dirstat = libsForQt5.callPackage ../applications/misc/k4dirstat { }; + kbibtex = libsForQt5.callPackage ../applications/office/kbibtex { }; + kdevelop-pg-qt = libsForQt5.callPackage ../applications/editors/kdevelop5/kdevelop-pg-qt.nix { }; kdevelop-unwrapped = libsForQt5.callPackage ../applications/editors/kdevelop5/kdevelop.nix { @@ -23530,6 +23556,8 @@ in mmsd = callPackage ../tools/networking/mmsd { }; + mmtc = callPackage ../applications/audio/mmtc { }; + moc = callPackage ../applications/audio/moc { }; mod-distortion = callPackage ../applications/audio/mod-distortion { }; @@ -23588,6 +23616,7 @@ in mopidy-soundcloud mopidy-spotify mopidy-spotify-tunigo + mopidy-subidy mopidy-tunein mopidy-youtube; @@ -25163,7 +25192,9 @@ in ticpp = callPackage ../development/libraries/ticpp { }; - tickrs = callPackage ../applications/misc/tickrs { }; + tickrs = callPackage ../applications/misc/tickrs { + inherit (darwin.apple_sdk.frameworks) Security; + }; tig = callPackage ../applications/version-management/git-and-tools/tig { }; @@ -25528,7 +25559,9 @@ in volnoti = callPackage ../applications/misc/volnoti { }; - vorbis-tools = callPackage ../applications/audio/vorbis-tools { }; + vorbis-tools = callPackage ../applications/audio/vorbis-tools { + autoreconfHook = buildPackages.autoreconfHook269; + }; vscode = callPackage ../applications/editors/vscode/vscode.nix { }; @@ -26324,6 +26357,8 @@ in abbaye-des-morts = callPackage ../games/abbaye-des-morts { }; + abuse = callPackage ../games/abuse { }; + adom = callPackage ../games/adom { }; airstrike = callPackage ../games/airstrike { }; @@ -27319,6 +27354,8 @@ in zeroad = zeroadPackages.zeroad; + _0verkill = callPackage ../games/0verkill { }; + ### DESKTOP ENVIRONMENTS cdesktopenv = callPackage ../desktops/cdesktopenv { }; @@ -28769,8 +28806,6 @@ in nixops = callPackage ../tools/package-management/nixops { }; - nixops_1_6_1 = callPackage ../tools/package-management/nixops/nixops-v1_6_1.nix {}; - nixopsUnstable = lowPrio (callPackage ../applications/networking/cluster/nixops { }); nixops-dns = callPackage ../tools/package-management/nixops/nixops-dns.nix { }; diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index b979599e630..c0faba640a2 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -506,6 +506,8 @@ let kafka = callPackage ../development/ocaml-modules/kafka { }; + kafka_lwt = callPackage ../development/ocaml-modules/kafka/lwt.nix { }; + ke = callPackage ../development/ocaml-modules/ke { }; lablgl = callPackage ../development/ocaml-modules/lablgl { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 3d66eaaa5b0..5129ce5c1bf 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -204,6 +204,8 @@ in { aioamqp = callPackage ../development/python-modules/aioamqp { }; + ailment = callPackage ../development/python-modules/ailment { }; + aiocoap = callPackage ../development/python-modules/aiocoap { }; aioconsole = callPackage ../development/python-modules/aioconsole { }; @@ -3660,6 +3662,8 @@ in { inherit python; })).py; + libpurecool = callPackage ../development/python-modules/libpurecool { }; + libredwg = toPythonModule (pkgs.libredwg.override { enablePython = true; inherit (self) python libxml2; @@ -4890,6 +4894,10 @@ in { inherit (pkgs.libsForQt5) soqt; }; + pixelmatch = callPackage ../development/python-modules/pixelmatch { }; + + pkce = callPackage ../development/python-modules/pkce { }; + pkgconfig = callPackage ../development/python-modules/pkgconfig { inherit (pkgs) pkg-config; }; pkginfo = callPackage ../development/python-modules/pkginfo { }; @@ -4898,8 +4906,12 @@ in { pynndescent = callPackage ../development/python-modules/pynndescent { }; + pynuki = callPackage ../development/python-modules/pynuki { }; + pysbd = callPackage ../development/python-modules/pysbd { }; + pyshark = callPackage ../development/python-modules/pyshark { }; + python-codon-tables = callPackage ../development/python-modules/python-codon-tables { }; python-csxcad = callPackage ../development/python-modules/python-csxcad { }; @@ -5719,6 +5731,8 @@ in { pyopenssl = callPackage ../development/python-modules/pyopenssl { }; + pyopenuv = callPackage ../development/python-modules/pyopenuv { }; + pyopnsense = callPackage ../development/python-modules/pyopnsense { }; pyosf = callPackage ../development/python-modules/pyosf { }; @@ -6508,6 +6522,8 @@ in { pyvera = callPackage ../development/python-modules/pyvera { }; + pyvex = callPackage ../development/python-modules/pyvex { }; + pyviz-comms = callPackage ../development/python-modules/pyviz-comms { }; pyvips = callPackage ../development/python-modules/pyvips { |