diff options
Diffstat (limited to 'pkgs/applications')
597 files changed, 25132 insertions, 8122 deletions
diff --git a/pkgs/applications/audio/ams-lv2/default.nix b/pkgs/applications/audio/ams-lv2/default.nix index 34f5667bfcaa3..a978b67c5dc7e 100644 --- a/pkgs/applications/audio/ams-lv2/default.nix +++ b/pkgs/applications/audio/ams-lv2/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, cairo, fftw, gtkmm2, lv2, lvtk, pkgconfig -, wafHook }: +, wafHook, python3 }: stdenv.mkDerivation rec { pname = "ams-lv2"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "1lz2mvk4gqsyf92yxd3aaldx0d0qi28h4rnnvsaz4ls0ccqm80nk"; }; - nativeBuildInputs = [ pkgconfig wafHook ]; + nativeBuildInputs = [ pkgconfig wafHook python3 ]; buildInputs = [ cairo fftw gtkmm2 lv2 lvtk ]; meta = with stdenv.lib; { diff --git a/pkgs/applications/audio/audacity/default.nix b/pkgs/applications/audio/audacity/default.nix index 20526c8c6c564..1a29ed8b9785e 100644 --- a/pkgs/applications/audio/audacity/default.nix +++ b/pkgs/applications/audio/audacity/default.nix @@ -1,8 +1,8 @@ { stdenv, fetchzip, wxGTK30, pkgconfig, file, gettext, libvorbis, libmad, libjack2, lv2, lilv, serd, sord, sratom, suil, alsaLib, libsndfile, soxr, flac, lame, expat, libid3tag, ffmpeg_3, soundtouch, /*, portaudio - given up fighting their portaudio.patch */ - autoconf, automake, libtool - }: + cmake +}: with stdenv.lib; @@ -15,16 +15,8 @@ stdenv.mkDerivation rec { sha256 = "1xk0piv72d2xd3p7igr916fhcbrm76fhjr418k1rlqdzzg1hfljn"; }; - preConfigure = /* we prefer system-wide libs */ '' - autoreconf -vi # use system libraries - - # we will get a (possibly harmless) warning during configure without this - substituteInPlace configure \ - --replace /usr/bin/file ${file}/bin/file - ''; - - configureFlags = [ - "--with-libsamplerate" + cmakeFlags = [ + "-DCMAKE_BUILD_TYPE=Release" ]; # audacity only looks for lame and ffmpeg at runtime, so we need to link them in manually @@ -43,15 +35,13 @@ stdenv.mkDerivation rec { "-lswscale" ]; - nativeBuildInputs = [ pkgconfig autoconf automake libtool ]; + nativeBuildInputs = [ pkgconfig cmake ]; buildInputs = [ file gettext wxGTK30 expat alsaLib libsndfile soxr libid3tag libjack2 lv2 lilv serd sord sratom suil wxGTK30.gtk ffmpeg_3 libmad lame libvorbis flac soundtouch ]; #ToDo: detach sbsms - enableParallelBuilding = true; - dontDisableStatic = true; doCheck = false; # Test fails diff --git a/pkgs/applications/audio/bitwig-studio/bitwig-studio3.nix b/pkgs/applications/audio/bitwig-studio/bitwig-studio3.nix index 6841cd6e75d99..1e2a61a169af5 100644 --- a/pkgs/applications/audio/bitwig-studio/bitwig-studio3.nix +++ b/pkgs/applications/audio/bitwig-studio/bitwig-studio3.nix @@ -1,23 +1,77 @@ -{ fetchurl, bitwig-studio1, pulseaudio, libjack2, xorg }: +{ stdenv, fetchurl, alsaLib, cairo, dpkg, freetype +, gdk-pixbuf, glib, gtk3, lib, xorg +, libglvnd, libjack2, ffmpeg_3 +, libxkbcommon, xdg_utils, zlib, pulseaudio +, wrapGAppsHook, makeWrapper }: -bitwig-studio1.overrideAttrs (oldAttrs: rec { - name = "bitwig-studio-${version}"; - version = "3.2.8"; +stdenv.mkDerivation rec { + pname = "bitwig-studio"; + version = "3.3.1"; src = fetchurl { - url = "https://downloads.bitwig.com/stable/${version}/bitwig-studio-${version}.deb"; - sha256 = "18ldgmnv7bigb4mch888kjpf4abalpiwmlhwd7rjb9qf6p72fhpj"; + url = "https://downloads.bitwig.com/stable/${version}/${pname}-${version}.deb"; + sha256 = "0f7xysk0cl48q7i28m25hasmrp30grgm3kah0s7xmkjgm33887pi"; }; - buildInputs = oldAttrs.buildInputs ++ [ xorg.libXtst ]; + nativeBuildInputs = [ dpkg makeWrapper wrapGAppsHook ]; - runtimeDependencies = [ pulseaudio libjack2 ]; + unpackCmd = '' + mkdir -p root + dpkg-deb -x $curSrc root + ''; + + dontBuild = true; + dontWrapGApps = true; # we only want $gappsWrapperArgs here + + buildInputs = with xorg; [ + alsaLib cairo freetype gdk-pixbuf glib gtk3 libxcb xcbutil xcbutilwm zlib libXtst libxkbcommon pulseaudio libjack2 libX11 libglvnd libXcursor stdenv.cc.cc.lib + ]; + + binPath = lib.makeBinPath [ + xdg_utils ffmpeg_3 + ]; + + ldLibraryPath = lib.strings.makeLibraryPath buildInputs; installPhase = '' - ${oldAttrs.installPhase} + mkdir -p $out/bin + cp -r opt/bitwig-studio $out/libexec + ln -s $out/libexec/bitwig-studio $out/bin/bitwig-studio + cp -r usr/share $out/share + substitute usr/share/applications/bitwig-studio.desktop \ + $out/share/applications/bitwig-studio.desktop \ + --replace /usr/bin/bitwig-studio $out/bin/bitwig-studio + ''; + + postFixup = '' + # patchelf fails to set rpath on BitwigStudioEngine, so we use + # the LD_LIBRARY_PATH way + + find $out -type f -executable \ + -not -name '*.so.*' \ + -not -name '*.so' \ + -not -name '*.jar' \ + -not -path '*/resources/*' | \ + while IFS= read -r f ; do + patchelf --set-interpreter "${stdenv.cc.bintools.dynamicLinker}" $f + wrapProgram $f \ + "''${gappsWrapperArgs[@]}" \ + --prefix PATH : "${binPath}" \ + --prefix LD_LIBRARY_PATH : "${ldLibraryPath}" + done - # recover commercial jre - rm -f $out/libexec/lib/jre - cp -r opt/bitwig-studio/lib/jre $out/libexec/lib ''; -}) + + meta = with stdenv.lib; { + description = "A digital audio workstation"; + longDescription = '' + Bitwig Studio is a multi-platform music-creation system for + production, performance and DJing, with a focus on flexible + editing tools and a super-fast workflow. + ''; + homepage = "https://www.bitwig.com/"; + license = licenses.unfree; + platforms = [ "x86_64-linux" ]; + maintainers = with maintainers; [ bfortz michalrus mrVanDalo ]; + }; +} diff --git a/pkgs/applications/audio/bs1770gain/default.nix b/pkgs/applications/audio/bs1770gain/default.nix deleted file mode 100644 index 76a789356193b..0000000000000 --- a/pkgs/applications/audio/bs1770gain/default.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ stdenv, fetchurl, ffmpeg, sox }: - -stdenv.mkDerivation rec { - pname = "bs1770gain"; - version = "0.5.2"; - - src = fetchurl { - url = "mirror://sourceforge/bs1770gain/${pname}-${version}.tar.gz"; - sha256 = "1p6yz5q7czyf9ard65sp4kawdlkg40cfscr3b24znymmhs3p7rbk"; - }; - - buildInputs = [ ffmpeg sox ]; - - NIX_CFLAGS_COMPILE = "-Wno-error"; - - meta = with stdenv.lib; { - description = "A audio/video loudness scanner implementing ITU-R BS.1770"; - license = licenses.gpl2Plus; - homepage = "http://bs1770gain.sourceforge.net/"; - platforms = platforms.all; - }; -} diff --git a/pkgs/applications/audio/ecasound/default.nix b/pkgs/applications/audio/ecasound/default.nix index adb6f6b742742..505e5a604ca29 100644 --- a/pkgs/applications/audio/ecasound/default.nix +++ b/pkgs/applications/audio/ecasound/default.nix @@ -1,5 +1,6 @@ { stdenv , fetchurl +, pkg-config , alsaLib , audiofile , libjack2 @@ -9,9 +10,14 @@ , libsndfile , lilv , lv2 +, ncurses +, readline }: -# TODO: fix readline, ncurses, lilv, liblo, liboil and python. See configure log. +# TODO: fix python. See configure log. +# fix -Dnullptr=0 cludge below. +# The error is +# /nix/store/*-lilv-0.24.10/include/lilv-0/lilv/lilvmm.hpp:272:53: error: 'nullptr' was not declared in this scope stdenv.mkDerivation rec { pname = "ecasound"; @@ -22,7 +28,34 @@ stdenv.mkDerivation rec { sha256 = "1m7njfjdb7sqf0lhgc4swihgdr4snkg8v02wcly08wb5ar2fr2s6"; }; - buildInputs = [ alsaLib audiofile libjack2 liblo liboil libsamplerate libsndfile lilv lv2 ]; + nativeBuildInputs = [ + pkg-config + ]; + + buildInputs = [ + alsaLib + audiofile + libjack2 + liblo + liboil + libsamplerate + libsndfile + lilv + lv2 + ncurses + readline + ]; + + strictDeps = true; + + configureFlags = "--enable-liblilv --with-extra-cppflags=-Dnullptr=0"; + + postPatch = '' + sed -i -e ' + s@^#include <readline.h>@#include <readline/readline.h>@ + s@^#include <history.h>@#include <readline/history.h>@ + ' ecasound/eca-curses.cpp + ''; meta = { description = "Software package designed for multitrack audio processing"; diff --git a/pkgs/applications/audio/espeak-ng/default.nix b/pkgs/applications/audio/espeak-ng/default.nix index 32cec811d002c..a284be4383250 100644 --- a/pkgs/applications/audio/espeak-ng/default.nix +++ b/pkgs/applications/audio/espeak-ng/default.nix @@ -21,15 +21,16 @@ stdenv.mkDerivation rec { preConfigure = "./autogen.sh"; - postInstall = '' + postInstall = lib.optionalString stdenv.isLinux '' patchelf --set-rpath "$(patchelf --print-rpath $out/bin/espeak-ng)" $out/bin/speak-ng ''; meta = with stdenv.lib; { description = "Open source speech synthesizer that supports over 70 languages, based on eSpeak"; - homepage = src.meta.homepage; + homepage = "https://github.com/espeak-ng/espeak-ng"; + changelog = "https://github.com/espeak-ng/espeak-ng/blob/${version}/CHANGELOG.md"; license = licenses.gpl3; maintainers = with maintainers; [ aske ]; - platforms = platforms.linux; + platforms = platforms.all; }; } diff --git a/pkgs/applications/audio/game-music-emu/default.nix b/pkgs/applications/audio/game-music-emu/default.nix index 51f895ea2d5ff..7cc431583edd0 100644 --- a/pkgs/applications/audio/game-music-emu/default.nix +++ b/pkgs/applications/audio/game-music-emu/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, cmake }: stdenv.mkDerivation rec { - version = "0.6.1"; + version = "0.6.3"; pname = "game-music-emu"; src = fetchurl { - url = "https://bitbucket.org/mpyne/game-music-emu/downloads/${pname}-${version}.tar.bz2"; - sha256 = "08fk7zddpn7v93d0fa7fcypx7hvgwx9b5psj9l6m8b87k2hbw4fw"; + url = "https://bitbucket.org/mpyne/game-music-emu/downloads/${pname}-${version}.tar.xz"; + sha256 = "07857vdkak306d9s5g6fhmjyxk7vijzjhkmqb15s7ihfxx9lx8xb"; }; buildInputs = [ cmake ]; @@ -16,6 +16,6 @@ stdenv.mkDerivation rec { description = "A collection of video game music file emulators"; license = licenses.lgpl21Plus; platforms = platforms.all; - maintainers = [ ]; + maintainers = with maintainers; [ luc65r ]; }; } diff --git a/pkgs/applications/audio/geonkick/default.nix b/pkgs/applications/audio/geonkick/default.nix index 804aaf75febe3..0e6f45194e551 100644 --- a/pkgs/applications/audio/geonkick/default.nix +++ b/pkgs/applications/audio/geonkick/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "geonkick"; - version = "2.5.1"; + version = "2.6.1"; src = fetchFromGitLab { owner = "iurie-sw"; repo = pname; rev = "v${version}"; - sha256 = "14svwrxqw15j6wjy3x8s28yyrafa31bm7d1ns5h6gvpndccwc1kw"; + sha256 = "1l647j11pb9lkknnh4q99mmfcvr644b02lfcdjh98z60vqm1s54c"; }; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/pkgs/applications/audio/gpodder/default.nix b/pkgs/applications/audio/gpodder/default.nix index 4a21868f09727..b153298d978bc 100644 --- a/pkgs/applications/audio/gpodder/default.nix +++ b/pkgs/applications/audio/gpodder/default.nix @@ -5,14 +5,14 @@ python3Packages.buildPythonApplication rec { pname = "gpodder"; - version = "3.10.16"; + version = "3.10.17"; format = "other"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "0pbpaasd7kj6y25nm45y1qyb9sxd4570f7g6zkfcpf6pa3nx7qkq"; + sha256 = "0wrk8d4q6ricbcjzlhk10vrk1qg9hi323kgyyd0c8nmh7a82h8pd"; }; patches = [ diff --git a/pkgs/applications/audio/helio-workstation/default.nix b/pkgs/applications/audio/helio-workstation/default.nix index 5fbfdc787eb74..a4f586712831a 100644 --- a/pkgs/applications/audio/helio-workstation/default.nix +++ b/pkgs/applications/audio/helio-workstation/default.nix @@ -5,14 +5,14 @@ stdenv.mkDerivation rec { pname = "helio-workstation"; - version = "3.1"; + version = "3.3"; src = fetchFromGitHub { owner = "helio-fm"; repo = pname; rev = version; fetchSubmodules = true; - sha256 = "10pna4k43g648gapviykq2zk82iwy5rqff4lbfh5vzxqpg5v4ma6"; + sha256 = "sha256-meeNqV1jKUwWc7P3p/LicPsbpzpKKFmQ1wP9DuXc9NY="; }; buildInputs = [ @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "One music sequencer for all major platforms, both desktop and mobile"; homepage = "https://helio.fm/"; - license = licenses.gpl3; + license = licenses.gpl3Only; maintainers = [ maintainers.suhr ]; platforms = [ "x86_64-linux" ]; }; diff --git a/pkgs/applications/audio/mda-lv2/default.nix b/pkgs/applications/audio/mda-lv2/default.nix index 2464abb6585c1..6e96bf45294ea 100644 --- a/pkgs/applications/audio/mda-lv2/default.nix +++ b/pkgs/applications/audio/mda-lv2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fftwSinglePrec, lv2, pkgconfig, wafHook }: +{ stdenv, fetchurl, fftwSinglePrec, lv2, pkgconfig, wafHook, python3 }: stdenv.mkDerivation rec { pname = "mda-lv2"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1a3cv6w5xby9yn11j695rbh3c4ih7rxfxmkca9s1324ljphh06m8"; }; - nativeBuildInputs = [ pkgconfig wafHook ]; + nativeBuildInputs = [ pkgconfig wafHook python3 ]; buildInputs = [ fftwSinglePrec lv2 ]; meta = with stdenv.lib; { diff --git a/pkgs/applications/audio/milkytracker/default.nix b/pkgs/applications/audio/milkytracker/default.nix index 405787e887144..5a76e55d667fd 100644 --- a/pkgs/applications/audio/milkytracker/default.nix +++ b/pkgs/applications/audio/milkytracker/default.nix @@ -2,14 +2,14 @@ , SDL2, alsaLib, libjack2, lhasa, perl, rtmidi, zlib, zziplib }: stdenv.mkDerivation rec { - version = "1.02.00"; + version = "1.03.00"; pname = "milkytracker"; src = fetchFromGitHub { owner = "milkytracker"; repo = "MilkyTracker"; rev = "v${version}"; - sha256 = "05a6d7l98k9i82dwrgi855dnccm3f2lkb144gi244vhk1156n0ca"; + sha256 = "025fj34gq2kmkpwcswcyx7wdxb89vm944dh685zi4bxx0hz16vvk"; }; nativeBuildInputs = [ cmake pkgconfig makeWrapper ]; diff --git a/pkgs/applications/audio/mopidy/default.nix b/pkgs/applications/audio/mopidy/default.nix index fc532482cba43..f4d4e416de404 100644 --- a/pkgs/applications/audio/mopidy/default.nix +++ b/pkgs/applications/audio/mopidy/default.nix @@ -14,9 +14,9 @@ let mopidy-gmusic = callPackage ./gmusic.nix { }; - mopidy-local = callPackage ./local.nix { }; + mopidy-iris = callPackage ./iris.nix { }; - mopidy-spotify = callPackage ./spotify.nix { }; + mopidy-local = callPackage ./local.nix { }; mopidy-moped = callPackage ./moped.nix { }; @@ -26,20 +26,21 @@ let mopidy-mpris = callPackage ./mpris.nix { }; - mopidy-somafm = callPackage ./somafm.nix { }; + mopidy-musicbox-webclient = callPackage ./musicbox-webclient.nix { }; - mopidy-spotify-tunigo = callPackage ./spotify-tunigo.nix { }; + mopidy-scrobbler = callPackage ./scrobbler.nix { }; - mopidy-youtube = callPackage ./youtube.nix { }; + mopidy-somafm = callPackage ./somafm.nix { }; mopidy-soundcloud = callPackage ./soundcloud.nix { }; - mopidy-musicbox-webclient = callPackage ./musicbox-webclient.nix { }; + mopidy-spotify = callPackage ./spotify.nix { }; - mopidy-iris = callPackage ./iris.nix { }; + mopidy-spotify-tunigo = callPackage ./spotify-tunigo.nix { }; mopidy-tunein = callPackage ./tunein.nix { }; + mopidy-youtube = callPackage ./youtube.nix { }; }; in self diff --git a/pkgs/applications/audio/mopidy/iris.nix b/pkgs/applications/audio/mopidy/iris.nix index 48f955fd7137d..a8530a30458ff 100644 --- a/pkgs/applications/audio/mopidy/iris.nix +++ b/pkgs/applications/audio/mopidy/iris.nix @@ -2,11 +2,11 @@ python3Packages.buildPythonApplication rec { pname = "Mopidy-Iris"; - version = "3.50.0"; + version = "3.54.0"; src = python3Packages.fetchPypi { inherit pname version; - sha256 = "04miwf0dqb8jir9g7xkfnn3l62bdn74ap03kqzz2v3byg64f1p0g"; + sha256 = "0qnshn77dv7fl6smwnpnbq67mbc1vic9gf85skiqnqy8v8w5829f"; }; propagatedBuildInputs = [ diff --git a/pkgs/applications/audio/mopidy/local.nix b/pkgs/applications/audio/mopidy/local.nix index 43554280565e2..de748ea7b325d 100644 --- a/pkgs/applications/audio/mopidy/local.nix +++ b/pkgs/applications/audio/mopidy/local.nix @@ -1,15 +1,16 @@ { lib , mopidy , python3Packages +, fetchpatch }: python3Packages.buildPythonApplication rec { pname = "Mopidy-Local"; - version = "3.1.1"; + version = "3.2.0"; src = python3Packages.fetchPypi { inherit pname version; - sha256 = "13m0iz14lyplnpm96gfpisqvv4n89ls30kmkg21z7v238lm0h19j"; + sha256 = "14f78sb3wkg83dg3xcqlq77dh059zzcwry5l9ilyhnmvmyrkhqx0"; }; propagatedBuildInputs = [ @@ -21,6 +22,14 @@ python3Packages.buildPythonApplication rec { python3Packages.pytestCheckHook ]; + patches = [ + # Fix tests for Mopidy≥3.1.0. Remove with the next release. + (fetchpatch { + url = "https://github.com/mopidy/mopidy-local/commit/f1d7598d3a9587f0823acb97ecb615f4f4817fd2.patch"; + sha256 = "193kd5zwsr0qpp2y8icdy13vqpglmjdm7x1rw5hliwyq18a34vjp"; + }) + ]; + meta = with lib; { homepage = "https://github.com/mopidy/mopidy-local"; description = "Mopidy extension for playing music from your local music archive"; diff --git a/pkgs/applications/audio/mopidy/mopidy.nix b/pkgs/applications/audio/mopidy/mopidy.nix index eb5672fe135b4..6f7ee0c857ae0 100644 --- a/pkgs/applications/audio/mopidy/mopidy.nix +++ b/pkgs/applications/audio/mopidy/mopidy.nix @@ -4,13 +4,13 @@ pythonPackages.buildPythonApplication rec { pname = "mopidy"; - version = "3.0.2"; + version = "3.1.1"; src = fetchFromGitHub { owner = "mopidy"; repo = "mopidy"; rev = "v${version}"; - sha256 = "1n9lpgq0p112cjgsrc1cd6mnffk56y36g2c5skk9cqzw27qrkd15"; + sha256 = "14m80z9spi2vhfs2bbff7ky80mr6bksl4550y17hwd7zpkid60za"; }; nativeBuildInputs = [ wrapGAppsHook ]; @@ -38,10 +38,6 @@ pythonPackages.buildPythonApplication rec { # There are no tests doCheck = false; - preFixup = '' - gappsWrapperArgs+=(--prefix GST_PLUGIN_SYSTEM_PATH : "$GST_PLUGIN_SYSTEM_PATH") - ''; - meta = with stdenv.lib; { homepage = "https://www.mopidy.com/"; description = '' diff --git a/pkgs/applications/audio/mopidy/scrobbler.nix b/pkgs/applications/audio/mopidy/scrobbler.nix new file mode 100644 index 0000000000000..19c5a29c8a478 --- /dev/null +++ b/pkgs/applications/audio/mopidy/scrobbler.nix @@ -0,0 +1,24 @@ +{ stdenv, python3Packages, mopidy }: + +python3Packages.buildPythonApplication rec { + pname = "Mopidy-Scrobbler"; + version = "2.0.1"; + + src = python3Packages.fetchPypi { + inherit pname version; + sha256 = "11vxgax4xgkggnq4fr1rh2rcvzspkkimck5p3h4phdj3qpnj0680"; + }; + + propagatedBuildInputs = with python3Packages; [ mopidy pylast ]; + + # no tests implemented + doCheck = false; + pythonImportsCheck = [ "mopidy_scrobbler" ]; + + meta = with stdenv.lib; { + homepage = "https://github.com/mopidy/mopidy-scrobbler"; + description = "Mopidy extension for scrobbling played tracks to Last.fm."; + license = licenses.asl20; + maintainers = with maintainers; [ jakeisnt ]; + }; +} diff --git a/pkgs/applications/audio/mopidy/soundcloud.nix b/pkgs/applications/audio/mopidy/soundcloud.nix index 8002feb0f9016..fb2e9474b1fab 100644 --- a/pkgs/applications/audio/mopidy/soundcloud.nix +++ b/pkgs/applications/audio/mopidy/soundcloud.nix @@ -2,13 +2,13 @@ pythonPackages.buildPythonApplication rec { pname = "mopidy-soundcloud"; - version = "2.1.0"; + version = "3.0.1"; src = fetchFromGitHub { owner = "mopidy"; repo = "mopidy-soundcloud"; rev = "v${version}"; - sha256 = "131qdm9i0j3ayff0js11qcmbjv50ws5s6iiqr6x5b66ymjl4scfv"; + sha256 = "18wiiv4rca9vibvnc27f3q4apf8n61kbp7mdbm2pmz86qwmd47pa"; }; propagatedBuildInputs = [ mopidy ]; diff --git a/pkgs/applications/audio/mopidy/tunein.nix b/pkgs/applications/audio/mopidy/tunein.nix index 9ab0323205283..90deea7c02bac 100644 --- a/pkgs/applications/audio/mopidy/tunein.nix +++ b/pkgs/applications/audio/mopidy/tunein.nix @@ -2,21 +2,18 @@ python3Packages.buildPythonApplication rec { pname = "mopidy-tunein"; - version = "1.0.0"; + version = "1.0.2"; src = python3Packages.fetchPypi { inherit version; pname = "Mopidy-TuneIn"; - sha256 = "0insasf4w8ajsqjh5zmax7pkzmrk1p245vh4y8ddicldj45p6qfj"; + sha256 = "1mvfhka8wi835yk9869yn3b6mdkfwqkylp14vpjkbm42d0kj4lkc"; }; propagatedBuildInputs = [ mopidy ]; - # tests fail with "ValueError: Namespace Gst not available" in mopidy itself - doCheck = false; - pythonImportsCheck = [ "mopidy_tunein.tunein" ]; meta = with stdenv.lib; { diff --git a/pkgs/applications/audio/mp3gain/default.nix b/pkgs/applications/audio/mp3gain/default.nix index f2b4564c7ccf5..4502acfa11317 100644 --- a/pkgs/applications/audio/mp3gain/default.nix +++ b/pkgs/applications/audio/mp3gain/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, unzip, mpg123 }: +{ stdenv, fetchurl, fetchpatch, unzip, mpg123 }: stdenv.mkDerivation { name = "mp3gain-1.6.2"; @@ -11,17 +11,25 @@ stdenv.mkDerivation { sourceRoot = "."; + patches = [ + (fetchpatch { + name = "0001-fix-security-bugs.patch"; + url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/media-sound/mp3gain/files/mp3gain-1.6.2-CVE-2019-18359-plus.patch?id=36f8689f7903548f5d89827a6e7bdf70a9882cee"; + sha256 = "10n53wm0xynlcxqlnaqfgamjzcpfz41q1jlg0bhw4kq1kzhs4yyw"; + }) + ]; + buildFlags = [ "OSTYPE=linux" ]; installPhase = '' install -vD mp3gain "$out/bin/mp3gain" ''; - meta = { + meta = with stdenv.lib; { description = "Lossless mp3 normalizer with statistical analysis"; homepage = "http://mp3gain.sourceforge.net/"; - license = stdenv.lib.licenses.lgpl21; - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.devhell ]; + license = licenses.lgpl21; + platforms = platforms.unix; + maintainers = with maintainers; [ devhell ]; }; } diff --git a/pkgs/applications/audio/ncmpcpp/default.nix b/pkgs/applications/audio/ncmpcpp/default.nix index f8adc522fcb5e..33308ebc61ab6 100644 --- a/pkgs/applications/audio/ncmpcpp/default.nix +++ b/pkgs/applications/audio/ncmpcpp/default.nix @@ -12,11 +12,11 @@ assert taglibSupport -> (taglib != null); with stdenv.lib; stdenv.mkDerivation rec { pname = "ncmpcpp"; - version = "0.8.2"; + version = "0.9.1"; src = fetchurl { - url = "https://ncmpcpp.rybczak.net/stable/${pname}-${version}.tar.bz2"; - sha256 = "0m0mjb049sl62vx13h9waavysa30mk0rphacksnvf94n13la62v5"; + url = "https://rybczak.net/ncmpcpp/stable/${pname}-${version}.tar.bz2"; + sha256 = "0x35nd4v31sma8fliqdbn1nxpjyi8hv472318sfb3xbmr4wlm0fb"; }; configureFlags = [ "BOOST_LIB_SUFFIX=" ] @@ -33,7 +33,8 @@ stdenv.mkDerivation rec { meta = { description = "A featureful ncurses based MPD client inspired by ncmpc"; - homepage = "https://ncmpcpp.rybczak.net/"; + homepage = "https://rybczak.net/ncmpcpp/"; + changelog = "https://github.com/ncmpcpp/ncmpcpp/blob/${version}/CHANGELOG.md"; license = licenses.gpl2Plus; maintainers = with maintainers; [ jfrankenau koral lovek323 ]; platforms = platforms.all; diff --git a/pkgs/applications/audio/ncspot/default.nix b/pkgs/applications/audio/ncspot/default.nix index 623682f417382..a1019880318ec 100644 --- a/pkgs/applications/audio/ncspot/default.nix +++ b/pkgs/applications/audio/ncspot/default.nix @@ -14,16 +14,16 @@ let in rustPlatform.buildRustPackage rec { pname = "ncspot"; - version = "0.2.5"; + version = "0.2.6"; src = fetchFromGitHub { owner = "hrkfdn"; repo = "ncspot"; rev = "v${version}"; - sha256 = "19jy1ma2viqnyfbqdpm4cf8mpdrc0xyxrk7sayx1b7dqmkxcyp5c"; + sha256 = "0x40qzgw9zcih4q6mzclb7gqkw8h76hrmqzmg6nimpla29jcdxss"; }; - cargoSha256 = "0lgd4ff70qsjplm847hkx1hgs3kpwv2ahmgyhsld3mng3k7qfm09"; + cargoSha256 = "1pfl7cblf7d4ci514vlkdh1ybgby71x4aszxmlsrqmn92bq56jys"; cargoBuildFlags = [ "--no-default-features" "--features" "${lib.concatStringsSep "," features}" ]; diff --git a/pkgs/applications/audio/netease-music-tui/cargo-lock.patch b/pkgs/applications/audio/netease-music-tui/cargo-lock.patch new file mode 100644 index 0000000000000..2b3366476d639 --- /dev/null +++ b/pkgs/applications/audio/netease-music-tui/cargo-lock.patch @@ -0,0 +1,2309 @@ +diff --git a/Cargo.lock b/Cargo.lock +new file mode 100644 +index 0000000..45720a8 +--- /dev/null ++++ b/Cargo.lock +@@ -0,0 +1,2303 @@ ++# This file is automatically @generated by Cargo. ++# It is not intended for manual editing. ++[[package]] ++name = "addr2line" ++version = "0.14.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "7c0929d69e78dd9bf5408269919fcbcaeb2e35e5d43e5815517cdc6a8e11a423" ++dependencies = [ ++ "gimli", ++] ++ ++[[package]] ++name = "adler" ++version = "0.2.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ee2a4ec343196209d6594e19543ae87a39f96d5534d7174822a3ad825dd6ed7e" ++ ++[[package]] ++name = "aho-corasick" ++version = "0.7.15" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "7404febffaa47dac81aa44dba71523c9d069b1bdc50a77db41195149e17f68e5" ++dependencies = [ ++ "memchr", ++] ++ ++[[package]] ++name = "alsa-sys" ++version = "0.1.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b0edcbbf9ef68f15ae1b620f722180b82a98b6f0628d30baa6b8d2a5abc87d58" ++dependencies = [ ++ "libc", ++ "pkg-config", ++] ++ ++[[package]] ++name = "arrayref" ++version = "0.3.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "a4c527152e37cf757a3f78aae5a06fbeefdb07ccc535c980a3208ee3060dd544" ++ ++[[package]] ++name = "arrayvec" ++version = "0.5.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b" ++ ++[[package]] ++name = "async-compression" ++version = "0.3.7" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b72c1f1154e234325b50864a349b9c8e56939e266a4c307c0f159812df2f9537" ++dependencies = [ ++ "bytes 0.5.6", ++ "flate2", ++ "futures-core", ++ "memchr", ++ "pin-project-lite 0.2.0", ++] ++ ++[[package]] ++name = "autocfg" ++version = "1.0.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a" ++ ++[[package]] ++name = "backtrace" ++version = "0.3.55" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ef5140344c85b01f9bbb4d4b7288a8aa4b3287ccef913a14bcc78a1063623598" ++dependencies = [ ++ "addr2line", ++ "cfg-if 1.0.0", ++ "libc", ++ "miniz_oxide", ++ "object", ++ "rustc-demangle", ++] ++ ++[[package]] ++name = "base-x" ++version = "0.2.8" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "a4521f3e3d031370679b3b140beb36dfe4801b09ac77e30c61941f97df3ef28b" ++ ++[[package]] ++name = "base64" ++version = "0.11.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b41b7ea54a0c9d92199de89e20e58d49f02f8e699814ef3fdf266f6f748d15c7" ++ ++[[package]] ++name = "base64" ++version = "0.13.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd" ++ ++[[package]] ++name = "bindgen" ++version = "0.56.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "2da379dbebc0b76ef63ca68d8fc6e71c0f13e59432e0987e508c1820e6ab5239" ++dependencies = [ ++ "bitflags", ++ "cexpr", ++ "clang-sys", ++ "lazy_static 1.4.0", ++ "lazycell", ++ "peeking_take_while", ++ "proc-macro2", ++ "quote", ++ "regex", ++ "rustc-hash", ++ "shlex", ++] ++ ++[[package]] ++name = "bitflags" ++version = "1.2.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693" ++ ++[[package]] ++name = "blake2b_simd" ++version = "0.5.11" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "afa748e348ad3be8263be728124b24a24f268266f6f5d58af9d75f6a40b5c587" ++dependencies = [ ++ "arrayref", ++ "arrayvec", ++ "constant_time_eq", ++] ++ ++[[package]] ++name = "bumpalo" ++version = "3.4.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "2e8c087f005730276d1096a652e92a8bacee2e2472bcc9715a74d2bec38b5820" ++ ++[[package]] ++name = "byteorder" ++version = "1.3.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "08c48aae112d48ed9f069b33538ea9e3e90aa263cfa3d1c24309612b1f7472de" ++ ++[[package]] ++name = "bytes" ++version = "0.4.12" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "206fdffcfa2df7cbe15601ef46c813fce0965eb3286db6b56c583b814b51c81c" ++dependencies = [ ++ "byteorder", ++ "iovec", ++] ++ ++[[package]] ++name = "bytes" ++version = "0.5.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "0e4cec68f03f32e44924783795810fa50a7035d8c8ebe78580ad7e6c703fba38" ++ ++[[package]] ++name = "cassowary" ++version = "0.3.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "df8670b8c7b9dae1793364eafadf7239c40d669904660c5960d74cfd80b46a53" ++ ++[[package]] ++name = "cc" ++version = "1.0.66" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "4c0496836a84f8d0495758516b8621a622beb77c0fed418570e50764093ced48" ++ ++[[package]] ++name = "cexpr" ++version = "0.4.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f4aedb84272dbe89af497cf81375129abda4fc0a9e7c5d317498c15cc30c0d27" ++dependencies = [ ++ "nom 5.1.2", ++] ++ ++[[package]] ++name = "cfg-if" ++version = "0.1.10" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822" ++ ++[[package]] ++name = "cfg-if" ++version = "1.0.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" ++ ++[[package]] ++name = "chrono" ++version = "0.4.19" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "670ad68c9088c2a963aaa298cb369688cf3f9465ce5e2d4ca10e6e0098a1ce73" ++dependencies = [ ++ "libc", ++ "num-integer", ++ "num-traits 0.2.14", ++ "time 0.1.44", ++ "winapi 0.3.9", ++] ++ ++[[package]] ++name = "clang-sys" ++version = "1.0.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "0659001ab56b791be01d4b729c44376edc6718cf389a502e579b77b758f3296c" ++dependencies = [ ++ "glob", ++ "libc", ++ "libloading", ++] ++ ++[[package]] ++name = "claxon" ++version = "0.4.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "4bfbf56724aa9eca8afa4fcfadeb479e722935bb2a0900c2d37e0cc477af0688" ++ ++[[package]] ++name = "config" ++version = "0.9.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f9107d78ed62b3fa5a86e7d18e647abed48cfd8f8fab6c72f4cdb982d196f7e6" ++dependencies = [ ++ "lazy_static 1.4.0", ++ "nom 4.2.3", ++ "rust-ini", ++ "serde 1.0.118", ++ "serde-hjson", ++ "serde_json", ++ "toml", ++ "yaml-rust", ++] ++ ++[[package]] ++name = "const_fn" ++version = "0.4.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "cd51eab21ab4fd6a3bf889e2d0958c0a6e3a61ad04260325e919e652a2a62826" ++ ++[[package]] ++name = "constant_time_eq" ++version = "0.1.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc" ++ ++[[package]] ++name = "cookie" ++version = "0.14.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "784ad0fbab4f3e9cef09f20e0aea6000ae08d2cb98ac4c0abc53df18803d702f" ++dependencies = [ ++ "percent-encoding", ++ "time 0.2.23", ++ "version_check 0.9.2", ++] ++ ++[[package]] ++name = "cookie_store" ++version = "0.12.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "3818dfca4b0cb5211a659bbcbb94225b7127407b2b135e650d717bfb78ab10d3" ++dependencies = [ ++ "cookie", ++ "idna", ++ "log", ++ "publicsuffix", ++ "serde 1.0.118", ++ "serde_json", ++ "time 0.2.23", ++ "url", ++] ++ ++[[package]] ++name = "core-foundation" ++version = "0.9.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "0a89e2ae426ea83155dccf10c0fa6b1463ef6d5fcb44cee0b224a408fa640a62" ++dependencies = [ ++ "core-foundation-sys 0.8.2", ++ "libc", ++] ++ ++[[package]] ++name = "core-foundation-sys" ++version = "0.6.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "e7ca8a5221364ef15ce201e8ed2f609fc312682a8f4e0e3d4aa5879764e0fa3b" ++ ++[[package]] ++name = "core-foundation-sys" ++version = "0.8.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ea221b5284a47e40033bf9b66f35f984ec0ea2931eb03505246cd27a963f981b" ++ ++[[package]] ++name = "coreaudio-rs" ++version = "0.9.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f229761965dad3e9b11081668a6ea00f1def7aa46062321b5ec245b834f6e491" ++dependencies = [ ++ "bitflags", ++ "coreaudio-sys", ++] ++ ++[[package]] ++name = "coreaudio-sys" ++version = "0.2.8" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "2b7e3347be6a09b46aba228d6608386739fb70beff4f61e07422da87b0bb31fa" ++dependencies = [ ++ "bindgen", ++] ++ ++[[package]] ++name = "cpal" ++version = "0.10.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "3ded070249be850b5b59e1e3a44a70b8ae395e0e5c65b487131d8909a8208120" ++dependencies = [ ++ "alsa-sys", ++ "core-foundation-sys 0.6.2", ++ "coreaudio-rs", ++ "failure", ++ "lazy_static 1.4.0", ++ "libc", ++ "num-traits 0.2.14", ++ "stdweb 0.1.3", ++ "winapi 0.3.9", ++] ++ ++[[package]] ++name = "crc32fast" ++version = "1.2.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "81156fece84ab6a9f2afdb109ce3ae577e42b1228441eded99bd77f627953b1a" ++dependencies = [ ++ "cfg-if 1.0.0", ++] ++ ++[[package]] ++name = "crossbeam-utils" ++version = "0.8.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "02d96d1e189ef58269ebe5b97953da3274d83a93af647c2ddd6f9dab28cedb8d" ++dependencies = [ ++ "autocfg", ++ "cfg-if 1.0.0", ++ "lazy_static 1.4.0", ++] ++ ++[[package]] ++name = "dbus" ++version = "0.7.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "add8dd36d6d34a084220eb9fe216d3e230d52b37c31702e1ffda4fb2d4ef950e" ++dependencies = [ ++ "libc", ++ "libdbus-sys", ++] ++ ++[[package]] ++name = "dirs" ++version = "2.0.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "13aea89a5c93364a98e9b37b2fa237effbb694d5cfe01c5b70941f7eb087d5e3" ++dependencies = [ ++ "cfg-if 0.1.10", ++ "dirs-sys", ++] ++ ++[[package]] ++name = "dirs-sys" ++version = "0.3.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "8e93d7f5705de3e49895a2b5e0b8855a1c27f080192ae9c32a6432d50741a57a" ++dependencies = [ ++ "libc", ++ "redox_users", ++ "winapi 0.3.9", ++] ++ ++[[package]] ++name = "discard" ++version = "1.0.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "212d0f5754cb6769937f4501cc0e67f4f4483c8d2c3e1e922ee9edbe4ab4c7c0" ++ ++[[package]] ++name = "dtoa" ++version = "0.4.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "134951f4028bdadb9b84baf4232681efbf277da25144b9b0ad65df75946c422b" ++ ++[[package]] ++name = "either" ++version = "1.6.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457" ++ ++[[package]] ++name = "encoding_rs" ++version = "0.8.26" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "801bbab217d7f79c0062f4f7205b5d4427c6d1a7bd7aafdd1475f7c59d62b283" ++dependencies = [ ++ "cfg-if 1.0.0", ++] ++ ++[[package]] ++name = "error-chain" ++version = "0.12.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "2d2f06b9cac1506ece98fe3231e3cc9c4410ec3d5b1f24ae1c8946f0742cdefc" ++dependencies = [ ++ "version_check 0.9.2", ++] ++ ++[[package]] ++name = "failure" ++version = "0.1.8" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d32e9bd16cc02eae7db7ef620b392808b89f6a5e16bb3497d159c6b92a0f4f86" ++dependencies = [ ++ "backtrace", ++ "failure_derive", ++] ++ ++[[package]] ++name = "failure_derive" ++version = "0.1.8" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "aa4da3c766cd7a0db8242e326e9e4e081edd567072893ed320008189715366a4" ++dependencies = [ ++ "proc-macro2", ++ "quote", ++ "syn", ++ "synstructure", ++] ++ ++[[package]] ++name = "flate2" ++version = "1.0.19" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "7411863d55df97a419aa64cb4d2f167103ea9d767e2c54a1868b7ac3f6b47129" ++dependencies = [ ++ "cfg-if 1.0.0", ++ "crc32fast", ++ "libc", ++ "miniz_oxide", ++] ++ ++[[package]] ++name = "fnv" ++version = "1.0.7" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" ++ ++[[package]] ++name = "foreign-types" ++version = "0.3.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" ++dependencies = [ ++ "foreign-types-shared", ++] ++ ++[[package]] ++name = "foreign-types-shared" ++version = "0.1.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" ++ ++[[package]] ++name = "form_urlencoded" ++version = "1.0.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ece68d15c92e84fa4f19d3780f1294e5ca82a78a6d515f1efaabcc144688be00" ++dependencies = [ ++ "matches", ++ "percent-encoding", ++] ++ ++[[package]] ++name = "fuchsia-zircon" ++version = "0.3.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "2e9763c69ebaae630ba35f74888db465e49e259ba1bc0eda7d06f4a067615d82" ++dependencies = [ ++ "bitflags", ++ "fuchsia-zircon-sys", ++] ++ ++[[package]] ++name = "fuchsia-zircon-sys" ++version = "0.3.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "3dcaa9ae7725d12cdb85b3ad99a434db70b468c09ded17e012d86b5c1010f7a7" ++ ++[[package]] ++name = "futures" ++version = "0.3.8" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "9b3b0c040a1fe6529d30b3c5944b280c7f0dcb2930d2c3062bca967b602583d0" ++dependencies = [ ++ "futures-channel", ++ "futures-core", ++ "futures-executor", ++ "futures-io", ++ "futures-sink", ++ "futures-task", ++ "futures-util", ++] ++ ++[[package]] ++name = "futures-channel" ++version = "0.3.8" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "4b7109687aa4e177ef6fe84553af6280ef2778bdb7783ba44c9dc3399110fe64" ++dependencies = [ ++ "futures-core", ++ "futures-sink", ++] ++ ++[[package]] ++name = "futures-core" ++version = "0.3.8" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "847ce131b72ffb13b6109a221da9ad97a64cbe48feb1028356b836b47b8f1748" ++ ++[[package]] ++name = "futures-executor" ++version = "0.3.8" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "4caa2b2b68b880003057c1dd49f1ed937e38f22fcf6c212188a121f08cf40a65" ++dependencies = [ ++ "futures-core", ++ "futures-task", ++ "futures-util", ++] ++ ++[[package]] ++name = "futures-io" ++version = "0.3.8" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "611834ce18aaa1bd13c4b374f5d653e1027cf99b6b502584ff8c9a64413b30bb" ++ ++[[package]] ++name = "futures-macro" ++version = "0.3.8" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "77408a692f1f97bcc61dc001d752e00643408fbc922e4d634c655df50d595556" ++dependencies = [ ++ "proc-macro-hack", ++ "proc-macro2", ++ "quote", ++ "syn", ++] ++ ++[[package]] ++name = "futures-sink" ++version = "0.3.8" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f878195a49cee50e006b02b93cf7e0a95a38ac7b776b4c4d9cc1207cd20fcb3d" ++ ++[[package]] ++name = "futures-task" ++version = "0.3.8" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "7c554eb5bf48b2426c4771ab68c6b14468b6e76cc90996f528c3338d761a4d0d" ++dependencies = [ ++ "once_cell", ++] ++ ++[[package]] ++name = "futures-util" ++version = "0.3.8" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d304cff4a7b99cfb7986f7d43fbe93d175e72e704a8860787cc95e9ffd85cbd2" ++dependencies = [ ++ "futures-channel", ++ "futures-core", ++ "futures-io", ++ "futures-macro", ++ "futures-sink", ++ "futures-task", ++ "memchr", ++ "pin-project 1.0.2", ++ "pin-utils", ++ "proc-macro-hack", ++ "proc-macro-nested", ++ "slab", ++] ++ ++[[package]] ++name = "getrandom" ++version = "0.1.15" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "fc587bc0ec293155d5bfa6b9891ec18a1e330c234f896ea47fbada4cadbe47e6" ++dependencies = [ ++ "cfg-if 0.1.10", ++ "libc", ++ "wasi 0.9.0+wasi-snapshot-preview1", ++] ++ ++[[package]] ++name = "gimli" ++version = "0.23.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f6503fe142514ca4799d4c26297c4248239fe8838d827db6bd6065c6ed29a6ce" ++ ++[[package]] ++name = "glob" ++version = "0.3.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574" ++ ++[[package]] ++name = "h2" ++version = "0.2.7" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "5e4728fd124914ad25e99e3d15a9361a879f6620f63cb56bbb08f95abb97a535" ++dependencies = [ ++ "bytes 0.5.6", ++ "fnv", ++ "futures-core", ++ "futures-sink", ++ "futures-util", ++ "http", ++ "indexmap", ++ "slab", ++ "tokio", ++ "tokio-util", ++ "tracing", ++ "tracing-futures", ++] ++ ++[[package]] ++name = "hashbrown" ++version = "0.9.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d7afe4a420e3fe79967a00898cc1f4db7c8a49a9333a29f8a4bd76a253d5cd04" ++ ++[[package]] ++name = "hermit-abi" ++version = "0.1.17" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "5aca5565f760fb5b220e499d72710ed156fdb74e631659e99377d9ebfbd13ae8" ++dependencies = [ ++ "libc", ++] ++ ++[[package]] ++name = "hex" ++version = "0.4.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "644f9158b2f133fd50f5fb3242878846d9eb792e445c893805ff0e3824006e35" ++ ++[[package]] ++name = "hound" ++version = "3.4.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "8a164bb2ceaeff4f42542bdb847c41517c78a60f5649671b2a07312b6e117549" ++ ++[[package]] ++name = "http" ++version = "0.2.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "84129d298a6d57d246960ff8eb831ca4af3f96d29e2e28848dae275408658e26" ++dependencies = [ ++ "bytes 0.5.6", ++ "fnv", ++ "itoa", ++] ++ ++[[package]] ++name = "http-body" ++version = "0.3.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "13d5ff830006f7646652e057693569bfe0d51760c0085a071769d142a205111b" ++dependencies = [ ++ "bytes 0.5.6", ++ "http", ++] ++ ++[[package]] ++name = "httparse" ++version = "1.3.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "cd179ae861f0c2e53da70d892f5f3029f9594be0c41dc5269cd371691b1dc2f9" ++ ++[[package]] ++name = "httpdate" ++version = "0.3.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "494b4d60369511e7dea41cf646832512a94e542f68bb9c49e54518e0f468eb47" ++ ++[[package]] ++name = "hyper" ++version = "0.13.9" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f6ad767baac13b44d4529fcf58ba2cd0995e36e7b435bc5b039de6f47e880dbf" ++dependencies = [ ++ "bytes 0.5.6", ++ "futures-channel", ++ "futures-core", ++ "futures-util", ++ "h2", ++ "http", ++ "http-body", ++ "httparse", ++ "httpdate", ++ "itoa", ++ "pin-project 1.0.2", ++ "socket2", ++ "tokio", ++ "tower-service", ++ "tracing", ++ "want", ++] ++ ++[[package]] ++name = "hyper-tls" ++version = "0.4.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d979acc56dcb5b8dddba3917601745e877576475aa046df3226eabdecef78eed" ++dependencies = [ ++ "bytes 0.5.6", ++ "hyper", ++ "native-tls", ++ "tokio", ++ "tokio-tls", ++] ++ ++[[package]] ++name = "idna" ++version = "0.2.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "02e2673c30ee86b5b96a9cb52ad15718aa1f966f5ab9ad54a8b95d5ca33120a9" ++dependencies = [ ++ "matches", ++ "unicode-bidi", ++ "unicode-normalization", ++] ++ ++[[package]] ++name = "indexmap" ++version = "1.6.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "4fb1fa934250de4de8aef298d81c729a7d33d8c239daa3a7575e6b92bfc7313b" ++dependencies = [ ++ "autocfg", ++ "hashbrown", ++] ++ ++[[package]] ++name = "iovec" ++version = "0.1.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b2b3ea6ff95e175473f8ffe6a7eb7c00d054240321b84c57051175fe3c1e075e" ++dependencies = [ ++ "libc", ++] ++ ++[[package]] ++name = "ipnet" ++version = "2.3.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "47be2f14c678be2fdcab04ab1171db51b2762ce6f0a8ee87c8dd4a04ed216135" ++ ++[[package]] ++name = "itertools" ++version = "0.8.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f56a2d0bc861f9165be4eb3442afd3c236d8a98afd426f65d92324ae1091a484" ++dependencies = [ ++ "either", ++] ++ ++[[package]] ++name = "itoa" ++version = "0.4.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "dc6f3ad7b9d11a0c00842ff8de1b60ee58661048eb8049ed33c73594f359d7e6" ++ ++[[package]] ++name = "js-sys" ++version = "0.3.46" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "cf3d7383929f7c9c7c2d0fa596f325832df98c3704f2c60553080f7127a58175" ++dependencies = [ ++ "wasm-bindgen", ++] ++ ++[[package]] ++name = "kernel32-sys" ++version = "0.2.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d" ++dependencies = [ ++ "winapi 0.2.8", ++ "winapi-build", ++] ++ ++[[package]] ++name = "lazy_static" ++version = "0.2.11" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "76f033c7ad61445c5b347c7382dd1237847eb1bce590fe50365dcb33d546be73" ++ ++[[package]] ++name = "lazy_static" ++version = "1.4.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" ++ ++[[package]] ++name = "lazycell" ++version = "1.3.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" ++ ++[[package]] ++name = "lewton" ++version = "0.9.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "8d542c1a317036c45c2aa1cf10cc9d403ca91eb2d333ef1a4917e5cb10628bd0" ++dependencies = [ ++ "byteorder", ++ "ogg", ++ "smallvec", ++] ++ ++[[package]] ++name = "libc" ++version = "0.2.81" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "1482821306169ec4d07f6aca392a4681f66c75c9918aa49641a2595db64053cb" ++ ++[[package]] ++name = "libdbus-sys" ++version = "0.2.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "dc12a3bc971424edbbf7edaf6e5740483444db63aa8e23d3751ff12a30f306f0" ++dependencies = [ ++ "pkg-config", ++] ++ ++[[package]] ++name = "libloading" ++version = "0.6.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "e9367bdfa836b7e3cf895867f7a570283444da90562980ec2263d6e1569b16bc" ++dependencies = [ ++ "cfg-if 1.0.0", ++ "winapi 0.3.9", ++] ++ ++[[package]] ++name = "linked-hash-map" ++version = "0.3.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "6d262045c5b87c0861b3f004610afd0e2c851e2908d08b6c870cbb9d5f494ecd" ++dependencies = [ ++ "serde 0.8.23", ++ "serde_test", ++] ++ ++[[package]] ++name = "linked-hash-map" ++version = "0.5.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "8dd5a6d5999d9907cda8ed67bbd137d3af8085216c2ac62de5be860bd41f304a" ++ ++[[package]] ++name = "log" ++version = "0.4.11" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "4fabed175da42fed1fa0746b0ea71f412aa9d35e76e95e59b192c64b9dc2bf8b" ++dependencies = [ ++ "cfg-if 0.1.10", ++] ++ ++[[package]] ++name = "log-panics" ++version = "2.0.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ae0136257df209261daa18d6c16394757c63e032e27aafd8b07788b051082bef" ++dependencies = [ ++ "log", ++] ++ ++[[package]] ++name = "mach" ++version = "0.3.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b823e83b2affd8f40a9ee8c29dbc56404c1e34cd2710921f2801e2cf29527afa" ++dependencies = [ ++ "libc", ++] ++ ++[[package]] ++name = "matches" ++version = "0.1.8" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08" ++ ++[[package]] ++name = "maybe-uninit" ++version = "2.0.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "60302e4db3a61da70c0cb7991976248362f30319e88850c487b9b95bbf059e00" ++ ++[[package]] ++name = "memchr" ++version = "2.3.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "0ee1c47aaa256ecabcaea351eae4a9b01ef39ed810004e298d2511ed284b1525" ++ ++[[package]] ++name = "mime" ++version = "0.3.16" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "2a60c7ce501c71e03a9c9c0d35b861413ae925bd979cc7a4e30d060069aaac8d" ++ ++[[package]] ++name = "mime_guess" ++version = "2.0.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "2684d4c2e97d99848d30b324b00c8fcc7e5c897b7cbb5819b09e7c90e8baf212" ++dependencies = [ ++ "mime", ++ "unicase", ++] ++ ++[[package]] ++name = "minimp3" ++version = "0.3.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "dce0cff6a0bfd3f8b6b2350819bbddd63bc65cc45e53888bdd0ff49dde16d2d5" ++dependencies = [ ++ "minimp3-sys", ++ "slice-deque", ++] ++ ++[[package]] ++name = "minimp3-sys" ++version = "0.3.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "e21c73734c69dc95696c9ed8926a2b393171d98b3f5f5935686a26a487ab9b90" ++dependencies = [ ++ "cc", ++] ++ ++[[package]] ++name = "miniz_oxide" ++version = "0.4.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "0f2d26ec3309788e423cfbf68ad1800f061638098d76a83681af979dc4eda19d" ++dependencies = [ ++ "adler", ++ "autocfg", ++] ++ ++[[package]] ++name = "mio" ++version = "0.6.23" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "4afd66f5b91bf2a3bc13fad0e21caedac168ca4c707504e75585648ae80e4cc4" ++dependencies = [ ++ "cfg-if 0.1.10", ++ "fuchsia-zircon", ++ "fuchsia-zircon-sys", ++ "iovec", ++ "kernel32-sys", ++ "libc", ++ "log", ++ "miow", ++ "net2", ++ "slab", ++ "winapi 0.2.8", ++] ++ ++[[package]] ++name = "miow" ++version = "0.2.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ebd808424166322d4a38da87083bfddd3ac4c131334ed55856112eb06d46944d" ++dependencies = [ ++ "kernel32-sys", ++ "net2", ++ "winapi 0.2.8", ++ "ws2_32-sys", ++] ++ ++[[package]] ++name = "mp3-duration" ++version = "0.1.10" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "348bdc7300502f0801e5b57c448815713cd843b744ef9bda252a2698fdf90a0f" ++dependencies = [ ++ "thiserror", ++] ++ ++[[package]] ++name = "native-tls" ++version = "0.2.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "6fcc7939b5edc4e4f86b1b4a04bb1498afaaf871b1a6691838ed06fcb48d3a3f" ++dependencies = [ ++ "lazy_static 1.4.0", ++ "libc", ++ "log", ++ "openssl", ++ "openssl-probe", ++ "openssl-sys", ++ "schannel", ++ "security-framework", ++ "security-framework-sys", ++ "tempfile", ++] ++ ++[[package]] ++name = "net2" ++version = "0.2.37" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "391630d12b68002ae1e25e8f974306474966550ad82dac6886fb8910c19568ae" ++dependencies = [ ++ "cfg-if 0.1.10", ++ "libc", ++ "winapi 0.3.9", ++] ++ ++[[package]] ++name = "netease_music_tui" ++version = "0.1.1" ++dependencies = [ ++ "base64 0.11.0", ++ "byteorder", ++ "bytes 0.4.12", ++ "chrono", ++ "config", ++ "dbus", ++ "dirs", ++ "failure", ++ "futures", ++ "hex", ++ "lazy_static 1.4.0", ++ "log", ++ "log-panics", ++ "mp3-duration", ++ "num-bigint", ++ "openssl", ++ "rand", ++ "regex", ++ "reqwest", ++ "rodio", ++ "serde 1.0.118", ++ "serde_derive", ++ "serde_json", ++ "serde_urlencoded 0.6.1", ++ "simple-logging", ++ "tempfile", ++ "termion", ++ "tokio", ++ "tui", ++ "unicode-width", ++] ++ ++[[package]] ++name = "nom" ++version = "4.2.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "2ad2a91a8e869eeb30b9cb3119ae87773a8f4ae617f41b1eb9c154b2905f7bd6" ++dependencies = [ ++ "memchr", ++ "version_check 0.1.5", ++] ++ ++[[package]] ++name = "nom" ++version = "5.1.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ffb4262d26ed83a1c0a33a38fe2bb15797329c85770da05e6b828ddb782627af" ++dependencies = [ ++ "memchr", ++ "version_check 0.9.2", ++] ++ ++[[package]] ++name = "num-bigint" ++version = "0.2.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "090c7f9998ee0ff65aa5b723e4009f7b217707f1fb5ea551329cc4d6231fb304" ++dependencies = [ ++ "autocfg", ++ "num-integer", ++ "num-traits 0.2.14", ++] ++ ++[[package]] ++name = "num-integer" ++version = "0.1.44" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d2cc698a63b549a70bc047073d2949cce27cd1c7b0a4a862d08a8031bc2801db" ++dependencies = [ ++ "autocfg", ++ "num-traits 0.2.14", ++] ++ ++[[package]] ++name = "num-traits" ++version = "0.1.43" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "92e5113e9fd4cc14ded8e499429f396a20f98c772a47cc8622a736e1ec843c31" ++dependencies = [ ++ "num-traits 0.2.14", ++] ++ ++[[package]] ++name = "num-traits" ++version = "0.2.14" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "9a64b1ec5cda2586e284722486d802acf1f7dbdc623e2bfc57e65ca1cd099290" ++dependencies = [ ++ "autocfg", ++] ++ ++[[package]] ++name = "num_cpus" ++version = "1.13.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "05499f3756671c15885fee9034446956fff3f243d6077b91e5767df161f766b3" ++dependencies = [ ++ "hermit-abi", ++ "libc", ++] ++ ++[[package]] ++name = "numtoa" ++version = "0.1.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b8f8bdf33df195859076e54ab11ee78a1b208382d3a26ec40d142ffc1ecc49ef" ++ ++[[package]] ++name = "object" ++version = "0.22.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "8d3b63360ec3cb337817c2dbd47ab4a0f170d285d8e5a2064600f3def1402397" ++ ++[[package]] ++name = "ogg" ++version = "0.7.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "13e571c3517af9e1729d4c63571a27edd660ade0667973bfc74a67c660c2b651" ++dependencies = [ ++ "byteorder", ++] ++ ++[[package]] ++name = "once_cell" ++version = "1.5.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "13bd41f508810a131401606d54ac32a467c97172d74ba7662562ebba5ad07fa0" ++ ++[[package]] ++name = "openssl" ++version = "0.10.32" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "038d43985d1ddca7a9900630d8cd031b56e4794eecc2e9ea39dd17aa04399a70" ++dependencies = [ ++ "bitflags", ++ "cfg-if 1.0.0", ++ "foreign-types", ++ "lazy_static 1.4.0", ++ "libc", ++ "openssl-sys", ++] ++ ++[[package]] ++name = "openssl-probe" ++version = "0.1.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "77af24da69f9d9341038eba93a073b1fdaaa1b788221b00a69bce9e762cb32de" ++ ++[[package]] ++name = "openssl-sys" ++version = "0.9.60" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "921fc71883267538946025deffb622905ecad223c28efbfdef9bb59a0175f3e6" ++dependencies = [ ++ "autocfg", ++ "cc", ++ "libc", ++ "pkg-config", ++ "vcpkg", ++] ++ ++[[package]] ++name = "peeking_take_while" ++version = "0.1.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099" ++ ++[[package]] ++name = "percent-encoding" ++version = "2.1.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e" ++ ++[[package]] ++name = "pin-project" ++version = "0.4.27" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "2ffbc8e94b38ea3d2d8ba92aea2983b503cd75d0888d75b86bb37970b5698e15" ++dependencies = [ ++ "pin-project-internal 0.4.27", ++] ++ ++[[package]] ++name = "pin-project" ++version = "1.0.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "9ccc2237c2c489783abd8c4c80e5450fc0e98644555b1364da68cc29aa151ca7" ++dependencies = [ ++ "pin-project-internal 1.0.2", ++] ++ ++[[package]] ++name = "pin-project-internal" ++version = "0.4.27" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "65ad2ae56b6abe3a1ee25f15ee605bacadb9a764edaba9c2bf4103800d4a1895" ++dependencies = [ ++ "proc-macro2", ++ "quote", ++ "syn", ++] ++ ++[[package]] ++name = "pin-project-internal" ++version = "1.0.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f8e8d2bf0b23038a4424865103a4df472855692821aab4e4f5c3312d461d9e5f" ++dependencies = [ ++ "proc-macro2", ++ "quote", ++ "syn", ++] ++ ++[[package]] ++name = "pin-project-lite" ++version = "0.1.11" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "c917123afa01924fc84bb20c4c03f004d9c38e5127e3c039bbf7f4b9c76a2f6b" ++ ++[[package]] ++name = "pin-project-lite" ++version = "0.2.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "6b063f57ec186e6140e2b8b6921e5f1bd89c7356dda5b33acc5401203ca6131c" ++ ++[[package]] ++name = "pin-utils" ++version = "0.1.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" ++ ++[[package]] ++name = "pkg-config" ++version = "0.3.19" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "3831453b3449ceb48b6d9c7ad7c96d5ea673e9b470a1dc578c2ce6521230884c" ++ ++[[package]] ++name = "ppv-lite86" ++version = "0.2.10" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ac74c624d6b2d21f425f752262f42188365d7b8ff1aff74c82e45136510a4857" ++ ++[[package]] ++name = "proc-macro-hack" ++version = "0.5.19" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "dbf0c48bc1d91375ae5c3cd81e3722dff1abcf81a30960240640d223f59fe0e5" ++ ++[[package]] ++name = "proc-macro-nested" ++version = "0.1.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "eba180dafb9038b050a4c280019bbedf9f2467b61e5d892dcad585bb57aadc5a" ++ ++[[package]] ++name = "proc-macro2" ++version = "1.0.24" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "1e0704ee1a7e00d7bb417d0770ea303c1bccbabf0ef1667dae92b5967f5f8a71" ++dependencies = [ ++ "unicode-xid", ++] ++ ++[[package]] ++name = "publicsuffix" ++version = "1.5.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "3bbaa49075179162b49acac1c6aa45fb4dafb5f13cf6794276d77bc7fd95757b" ++dependencies = [ ++ "error-chain", ++ "idna", ++ "lazy_static 1.4.0", ++ "regex", ++ "url", ++] ++ ++[[package]] ++name = "quote" ++version = "1.0.8" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "991431c3519a3f36861882da93630ce66b52918dcf1b8e2fd66b397fc96f28df" ++dependencies = [ ++ "proc-macro2", ++] ++ ++[[package]] ++name = "rand" ++version = "0.7.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03" ++dependencies = [ ++ "getrandom", ++ "libc", ++ "rand_chacha", ++ "rand_core", ++ "rand_hc", ++] ++ ++[[package]] ++name = "rand_chacha" ++version = "0.2.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402" ++dependencies = [ ++ "ppv-lite86", ++ "rand_core", ++] ++ ++[[package]] ++name = "rand_core" ++version = "0.5.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19" ++dependencies = [ ++ "getrandom", ++] ++ ++[[package]] ++name = "rand_hc" ++version = "0.2.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c" ++dependencies = [ ++ "rand_core", ++] ++ ++[[package]] ++name = "redox_syscall" ++version = "0.1.57" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "41cc0f7e4d5d4544e8861606a285bb08d3e70712ccc7d2b84d7c0ccfaf4b05ce" ++ ++[[package]] ++name = "redox_termios" ++version = "0.1.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "7e891cfe48e9100a70a3b6eb652fef28920c117d366339687bd5576160db0f76" ++dependencies = [ ++ "redox_syscall", ++] ++ ++[[package]] ++name = "redox_users" ++version = "0.3.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "de0737333e7a9502c789a36d7c7fa6092a49895d4faa31ca5df163857ded2e9d" ++dependencies = [ ++ "getrandom", ++ "redox_syscall", ++ "rust-argon2", ++] ++ ++[[package]] ++name = "regex" ++version = "1.4.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "38cf2c13ed4745de91a5eb834e11c00bcc3709e773173b2ce4c56c9fbde04b9c" ++dependencies = [ ++ "aho-corasick", ++ "memchr", ++ "regex-syntax", ++ "thread_local", ++] ++ ++[[package]] ++name = "regex-syntax" ++version = "0.6.21" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "3b181ba2dcf07aaccad5448e8ead58db5b742cf85dfe035e2227f137a539a189" ++ ++[[package]] ++name = "remove_dir_all" ++version = "0.5.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "3acd125665422973a33ac9d3dd2df85edad0f4ae9b00dafb1a05e43a9f5ef8e7" ++dependencies = [ ++ "winapi 0.3.9", ++] ++ ++[[package]] ++name = "reqwest" ++version = "0.10.10" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "0718f81a8e14c4dbb3b34cf23dc6aaf9ab8a0dfec160c534b3dbca1aaa21f47c" ++dependencies = [ ++ "async-compression", ++ "base64 0.13.0", ++ "bytes 0.5.6", ++ "cookie", ++ "cookie_store", ++ "encoding_rs", ++ "futures-core", ++ "futures-util", ++ "http", ++ "http-body", ++ "hyper", ++ "hyper-tls", ++ "ipnet", ++ "js-sys", ++ "lazy_static 1.4.0", ++ "log", ++ "mime", ++ "mime_guess", ++ "native-tls", ++ "percent-encoding", ++ "pin-project-lite 0.2.0", ++ "serde 1.0.118", ++ "serde_urlencoded 0.7.0", ++ "time 0.2.23", ++ "tokio", ++ "tokio-socks", ++ "tokio-tls", ++ "url", ++ "wasm-bindgen", ++ "wasm-bindgen-futures", ++ "web-sys", ++ "winreg", ++] ++ ++[[package]] ++name = "rodio" ++version = "0.10.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "1e0e0dfa7c8b17c6428f6e992a22ea595922cc86f946191b6b59e7ce96b77262" ++dependencies = [ ++ "claxon", ++ "cpal", ++ "hound", ++ "lazy_static 1.4.0", ++ "lewton", ++ "minimp3", ++] ++ ++[[package]] ++name = "rust-argon2" ++version = "0.8.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "4b18820d944b33caa75a71378964ac46f58517c92b6ae5f762636247c09e78fb" ++dependencies = [ ++ "base64 0.13.0", ++ "blake2b_simd", ++ "constant_time_eq", ++ "crossbeam-utils", ++] ++ ++[[package]] ++name = "rust-ini" ++version = "0.13.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "3e52c148ef37f8c375d49d5a73aa70713125b7f19095948a923f80afdeb22ec2" ++ ++[[package]] ++name = "rustc-demangle" ++version = "0.1.18" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "6e3bad0ee36814ca07d7968269dd4b7ec89ec2da10c4bb613928d3077083c232" ++ ++[[package]] ++name = "rustc-hash" ++version = "1.1.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" ++ ++[[package]] ++name = "rustc_version" ++version = "0.2.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a" ++dependencies = [ ++ "semver", ++] ++ ++[[package]] ++name = "ryu" ++version = "1.0.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "71d301d4193d031abdd79ff7e3dd721168a9572ef3fe51a1517aba235bd8f86e" ++ ++[[package]] ++name = "schannel" ++version = "0.1.19" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "8f05ba609c234e60bee0d547fe94a4c7e9da733d1c962cf6e59efa4cd9c8bc75" ++dependencies = [ ++ "lazy_static 1.4.0", ++ "winapi 0.3.9", ++] ++ ++[[package]] ++name = "security-framework" ++version = "2.0.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "c1759c2e3c8580017a484a7ac56d3abc5a6c1feadf88db2f3633f12ae4268c69" ++dependencies = [ ++ "bitflags", ++ "core-foundation", ++ "core-foundation-sys 0.8.2", ++ "libc", ++ "security-framework-sys", ++] ++ ++[[package]] ++name = "security-framework-sys" ++version = "2.0.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f99b9d5e26d2a71633cc4f2ebae7cc9f874044e0c351a27e17892d76dce5678b" ++dependencies = [ ++ "core-foundation-sys 0.8.2", ++ "libc", ++] ++ ++[[package]] ++name = "semver" ++version = "0.9.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403" ++dependencies = [ ++ "semver-parser", ++] ++ ++[[package]] ++name = "semver-parser" ++version = "0.7.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" ++ ++[[package]] ++name = "serde" ++version = "0.8.23" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "9dad3f759919b92c3068c696c15c3d17238234498bbdcc80f2c469606f948ac8" ++ ++[[package]] ++name = "serde" ++version = "1.0.118" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "06c64263859d87aa2eb554587e2d23183398d617427327cf2b3d0ed8c69e4800" ++dependencies = [ ++ "serde_derive", ++] ++ ++[[package]] ++name = "serde-hjson" ++version = "0.8.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "0b833c5ad67d52ced5f5938b2980f32a9c1c5ef047f0b4fb3127e7a423c76153" ++dependencies = [ ++ "lazy_static 0.2.11", ++ "linked-hash-map 0.3.0", ++ "num-traits 0.1.43", ++ "regex", ++ "serde 0.8.23", ++] ++ ++[[package]] ++name = "serde_derive" ++version = "1.0.118" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "c84d3526699cd55261af4b941e4e725444df67aa4f9e6a3564f18030d12672df" ++dependencies = [ ++ "proc-macro2", ++ "quote", ++ "syn", ++] ++ ++[[package]] ++name = "serde_json" ++version = "1.0.60" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "1500e84d27fe482ed1dc791a56eddc2f230046a040fa908c08bda1d9fb615779" ++dependencies = [ ++ "itoa", ++ "ryu", ++ "serde 1.0.118", ++] ++ ++[[package]] ++name = "serde_test" ++version = "0.8.23" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "110b3dbdf8607ec493c22d5d947753282f3bae73c0f56d322af1e8c78e4c23d5" ++dependencies = [ ++ "serde 0.8.23", ++] ++ ++[[package]] ++name = "serde_urlencoded" ++version = "0.6.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "9ec5d77e2d4c73717816afac02670d5c4f534ea95ed430442cad02e7a6e32c97" ++dependencies = [ ++ "dtoa", ++ "itoa", ++ "serde 1.0.118", ++ "url", ++] ++ ++[[package]] ++name = "serde_urlencoded" ++version = "0.7.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "edfa57a7f8d9c1d260a549e7224100f6c43d43f9103e06dd8b4095a9b2b43ce9" ++dependencies = [ ++ "form_urlencoded", ++ "itoa", ++ "ryu", ++ "serde 1.0.118", ++] ++ ++[[package]] ++name = "sha1" ++version = "0.6.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "2579985fda508104f7587689507983eadd6a6e84dd35d6d115361f530916fa0d" ++ ++[[package]] ++name = "shlex" ++version = "0.1.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "7fdf1b9db47230893d76faad238fd6097fd6d6a9245cd7a4d90dbd639536bbd2" ++ ++[[package]] ++name = "simple-logging" ++version = "2.0.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b00d48e85675326bb182a2286ea7c1a0b264333ae10f27a937a72be08628b542" ++dependencies = [ ++ "lazy_static 1.4.0", ++ "log", ++ "thread-id", ++] ++ ++[[package]] ++name = "slab" ++version = "0.4.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "c111b5bd5695e56cffe5129854aa230b39c93a305372fdbb2668ca2394eea9f8" ++ ++[[package]] ++name = "slice-deque" ++version = "0.3.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "31ef6ee280cdefba6d2d0b4b78a84a1c1a3f3a4cec98c2d4231c8bc225de0f25" ++dependencies = [ ++ "libc", ++ "mach", ++ "winapi 0.3.9", ++] ++ ++[[package]] ++name = "smallvec" ++version = "0.6.13" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f7b0758c52e15a8b5e3691eae6cc559f08eee9406e548a4477ba4e67770a82b6" ++dependencies = [ ++ "maybe-uninit", ++] ++ ++[[package]] ++name = "socket2" ++version = "0.3.19" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "122e570113d28d773067fab24266b66753f6ea915758651696b6e35e49f88d6e" ++dependencies = [ ++ "cfg-if 1.0.0", ++ "libc", ++ "winapi 0.3.9", ++] ++ ++[[package]] ++name = "standback" ++version = "0.2.13" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "cf906c8b8fc3f6ecd1046e01da1d8ddec83e48c8b08b84dcc02b585a6bedf5a8" ++dependencies = [ ++ "version_check 0.9.2", ++] ++ ++[[package]] ++name = "stdweb" ++version = "0.1.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ef5430c8e36b713e13b48a9f709cc21e046723fe44ce34587b73a830203b533e" ++ ++[[package]] ++name = "stdweb" ++version = "0.4.20" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d022496b16281348b52d0e30ae99e01a73d737b2f45d38fed4edf79f9325a1d5" ++dependencies = [ ++ "discard", ++ "rustc_version", ++ "stdweb-derive", ++ "stdweb-internal-macros", ++ "stdweb-internal-runtime", ++ "wasm-bindgen", ++] ++ ++[[package]] ++name = "stdweb-derive" ++version = "0.5.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "c87a60a40fccc84bef0652345bbbbbe20a605bf5d0ce81719fc476f5c03b50ef" ++dependencies = [ ++ "proc-macro2", ++ "quote", ++ "serde 1.0.118", ++ "serde_derive", ++ "syn", ++] ++ ++[[package]] ++name = "stdweb-internal-macros" ++version = "0.2.9" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "58fa5ff6ad0d98d1ffa8cb115892b6e69d67799f6763e162a1c9db421dc22e11" ++dependencies = [ ++ "base-x", ++ "proc-macro2", ++ "quote", ++ "serde 1.0.118", ++ "serde_derive", ++ "serde_json", ++ "sha1", ++ "syn", ++] ++ ++[[package]] ++name = "stdweb-internal-runtime" ++version = "0.1.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "213701ba3370744dcd1a12960caa4843b3d68b4d1c0a5d575e0d65b2ee9d16c0" ++ ++[[package]] ++name = "syn" ++version = "1.0.55" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "a571a711dddd09019ccc628e1b17fe87c59b09d513c06c026877aa708334f37a" ++dependencies = [ ++ "proc-macro2", ++ "quote", ++ "unicode-xid", ++] ++ ++[[package]] ++name = "synstructure" ++version = "0.12.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b834f2d66f734cb897113e34aaff2f1ab4719ca946f9a7358dba8f8064148701" ++dependencies = [ ++ "proc-macro2", ++ "quote", ++ "syn", ++ "unicode-xid", ++] ++ ++[[package]] ++name = "tempfile" ++version = "3.1.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "7a6e24d9338a0a5be79593e2fa15a648add6138caa803e2d5bc782c371732ca9" ++dependencies = [ ++ "cfg-if 0.1.10", ++ "libc", ++ "rand", ++ "redox_syscall", ++ "remove_dir_all", ++ "winapi 0.3.9", ++] ++ ++[[package]] ++name = "termion" ++version = "1.5.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "c22cec9d8978d906be5ac94bceb5a010d885c626c4c8855721a4dbd20e3ac905" ++dependencies = [ ++ "libc", ++ "numtoa", ++ "redox_syscall", ++ "redox_termios", ++] ++ ++[[package]] ++name = "thiserror" ++version = "1.0.22" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "0e9ae34b84616eedaaf1e9dd6026dbe00dcafa92aa0c8077cb69df1fcfe5e53e" ++dependencies = [ ++ "thiserror-impl", ++] ++ ++[[package]] ++name = "thiserror-impl" ++version = "1.0.22" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "9ba20f23e85b10754cd195504aebf6a27e2e6cbe28c17778a0c930724628dd56" ++dependencies = [ ++ "proc-macro2", ++ "quote", ++ "syn", ++] ++ ++[[package]] ++name = "thread-id" ++version = "3.3.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "c7fbf4c9d56b320106cd64fd024dadfa0be7cb4706725fc44a7d7ce952d820c1" ++dependencies = [ ++ "libc", ++ "redox_syscall", ++ "winapi 0.3.9", ++] ++ ++[[package]] ++name = "thread_local" ++version = "1.0.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d40c6d1b69745a6ec6fb1ca717914848da4b44ae29d9b3080cbee91d72a69b14" ++dependencies = [ ++ "lazy_static 1.4.0", ++] ++ ++[[package]] ++name = "time" ++version = "0.1.44" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "6db9e6914ab8b1ae1c260a4ae7a49b6c5611b40328a735b21862567685e73255" ++dependencies = [ ++ "libc", ++ "wasi 0.10.0+wasi-snapshot-preview1", ++ "winapi 0.3.9", ++] ++ ++[[package]] ++name = "time" ++version = "0.2.23" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "bcdaeea317915d59b2b4cd3b5efcd156c309108664277793f5351700c02ce98b" ++dependencies = [ ++ "const_fn", ++ "libc", ++ "standback", ++ "stdweb 0.4.20", ++ "time-macros", ++ "version_check 0.9.2", ++ "winapi 0.3.9", ++] ++ ++[[package]] ++name = "time-macros" ++version = "0.1.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "957e9c6e26f12cb6d0dd7fc776bb67a706312e7299aed74c8dd5b17ebb27e2f1" ++dependencies = [ ++ "proc-macro-hack", ++ "time-macros-impl", ++] ++ ++[[package]] ++name = "time-macros-impl" ++version = "0.1.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "e5c3be1edfad6027c69f5491cf4cb310d1a71ecd6af742788c6ff8bced86b8fa" ++dependencies = [ ++ "proc-macro-hack", ++ "proc-macro2", ++ "quote", ++ "standback", ++ "syn", ++] ++ ++[[package]] ++name = "tinyvec" ++version = "1.1.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ccf8dbc19eb42fba10e8feaaec282fb50e2c14b2726d6301dbfeed0f73306a6f" ++dependencies = [ ++ "tinyvec_macros", ++] ++ ++[[package]] ++name = "tinyvec_macros" ++version = "0.1.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" ++ ++[[package]] ++name = "tokio" ++version = "0.2.24" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "099837d3464c16a808060bb3f02263b412f6fafcb5d01c533d309985fbeebe48" ++dependencies = [ ++ "bytes 0.5.6", ++ "fnv", ++ "futures-core", ++ "iovec", ++ "lazy_static 1.4.0", ++ "memchr", ++ "mio", ++ "num_cpus", ++ "pin-project-lite 0.1.11", ++ "slab", ++ "tokio-macros", ++] ++ ++[[package]] ++name = "tokio-macros" ++version = "0.2.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "e44da00bfc73a25f814cd8d7e57a68a5c31b74b3152a0a1d1f590c97ed06265a" ++dependencies = [ ++ "proc-macro2", ++ "quote", ++ "syn", ++] ++ ++[[package]] ++name = "tokio-socks" ++version = "0.3.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d611fd5d241872372d52a0a3d309c52d0b95a6a67671a6c8f7ab2c4a37fb2539" ++dependencies = [ ++ "bytes 0.4.12", ++ "either", ++ "futures", ++ "thiserror", ++ "tokio", ++] ++ ++[[package]] ++name = "tokio-tls" ++version = "0.3.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "9a70f4fcd7b3b24fb194f837560168208f669ca8cb70d0c4b862944452396343" ++dependencies = [ ++ "native-tls", ++ "tokio", ++] ++ ++[[package]] ++name = "tokio-util" ++version = "0.3.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "be8242891f2b6cbef26a2d7e8605133c2c554cd35b3e4948ea892d6d68436499" ++dependencies = [ ++ "bytes 0.5.6", ++ "futures-core", ++ "futures-sink", ++ "log", ++ "pin-project-lite 0.1.11", ++ "tokio", ++] ++ ++[[package]] ++name = "toml" ++version = "0.4.10" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "758664fc71a3a69038656bee8b6be6477d2a6c315a6b81f7081f591bffa4111f" ++dependencies = [ ++ "serde 1.0.118", ++] ++ ++[[package]] ++name = "tower-service" ++version = "0.3.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "e987b6bf443f4b5b3b6f38704195592cca41c5bb7aedd3c3693c7081f8289860" ++ ++[[package]] ++name = "tracing" ++version = "0.1.22" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "9f47026cdc4080c07e49b37087de021820269d996f581aac150ef9e5583eefe3" ++dependencies = [ ++ "cfg-if 1.0.0", ++ "log", ++ "pin-project-lite 0.2.0", ++ "tracing-core", ++] ++ ++[[package]] ++name = "tracing-core" ++version = "0.1.17" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f50de3927f93d202783f4513cda820ab47ef17f624b03c096e86ef00c67e6b5f" ++dependencies = [ ++ "lazy_static 1.4.0", ++] ++ ++[[package]] ++name = "tracing-futures" ++version = "0.2.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ab7bb6f14721aa00656086e9335d363c5c8747bae02ebe32ea2c7dece5689b4c" ++dependencies = [ ++ "pin-project 0.4.27", ++ "tracing", ++] ++ ++[[package]] ++name = "try-lock" ++version = "0.2.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642" ++ ++[[package]] ++name = "tui" ++version = "0.6.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "73b422ff4986065d33272b587907654f918a3fe8702786a8110bf68dede0d8ee" ++dependencies = [ ++ "bitflags", ++ "cassowary", ++ "either", ++ "itertools", ++ "log", ++ "termion", ++ "unicode-segmentation", ++ "unicode-width", ++] ++ ++[[package]] ++name = "unicase" ++version = "2.6.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "50f37be617794602aabbeee0be4f259dc1778fabe05e2d67ee8f79326d5cb4f6" ++dependencies = [ ++ "version_check 0.9.2", ++] ++ ++[[package]] ++name = "unicode-bidi" ++version = "0.3.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "49f2bd0c6468a8230e1db229cff8029217cf623c767ea5d60bfbd42729ea54d5" ++dependencies = [ ++ "matches", ++] ++ ++[[package]] ++name = "unicode-normalization" ++version = "0.1.16" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "a13e63ab62dbe32aeee58d1c5408d35c36c392bba5d9d3142287219721afe606" ++dependencies = [ ++ "tinyvec", ++] ++ ++[[package]] ++name = "unicode-segmentation" ++version = "1.7.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "bb0d2e7be6ae3a5fa87eed5fb451aff96f2573d2694942e40543ae0bbe19c796" ++ ++[[package]] ++name = "unicode-width" ++version = "0.1.8" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "9337591893a19b88d8d87f2cec1e73fad5cdfd10e5a6f349f498ad6ea2ffb1e3" ++ ++[[package]] ++name = "unicode-xid" ++version = "0.2.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f7fe0bb3479651439c9112f72b6c505038574c9fbb575ed1bf3b797fa39dd564" ++ ++[[package]] ++name = "url" ++version = "2.2.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "5909f2b0817350449ed73e8bcd81c8c3c8d9a7a5d8acba4b27db277f1868976e" ++dependencies = [ ++ "form_urlencoded", ++ "idna", ++ "matches", ++ "percent-encoding", ++] ++ ++[[package]] ++name = "vcpkg" ++version = "0.2.11" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b00bca6106a5e23f3eee943593759b7fcddb00554332e856d990c893966879fb" ++ ++[[package]] ++name = "version_check" ++version = "0.1.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "914b1a6776c4c929a602fafd8bc742e06365d4bcbe48c30f9cca5824f70dc9dd" ++ ++[[package]] ++name = "version_check" ++version = "0.9.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b5a972e5669d67ba988ce3dc826706fb0a8b01471c088cb0b6110b805cc36aed" ++ ++[[package]] ++name = "want" ++version = "0.3.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "1ce8a968cb1cd110d136ff8b819a556d6fb6d919363c61534f6860c7eb172ba0" ++dependencies = [ ++ "log", ++ "try-lock", ++] ++ ++[[package]] ++name = "wasi" ++version = "0.9.0+wasi-snapshot-preview1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" ++ ++[[package]] ++name = "wasi" ++version = "0.10.0+wasi-snapshot-preview1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f" ++ ++[[package]] ++name = "wasm-bindgen" ++version = "0.2.69" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "3cd364751395ca0f68cafb17666eee36b63077fb5ecd972bbcd74c90c4bf736e" ++dependencies = [ ++ "cfg-if 1.0.0", ++ "serde 1.0.118", ++ "serde_json", ++ "wasm-bindgen-macro", ++] ++ ++[[package]] ++name = "wasm-bindgen-backend" ++version = "0.2.69" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "1114f89ab1f4106e5b55e688b828c0ab0ea593a1ea7c094b141b14cbaaec2d62" ++dependencies = [ ++ "bumpalo", ++ "lazy_static 1.4.0", ++ "log", ++ "proc-macro2", ++ "quote", ++ "syn", ++ "wasm-bindgen-shared", ++] ++ ++[[package]] ++name = "wasm-bindgen-futures" ++version = "0.4.19" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "1fe9756085a84584ee9457a002b7cdfe0bfff169f45d2591d8be1345a6780e35" ++dependencies = [ ++ "cfg-if 1.0.0", ++ "js-sys", ++ "wasm-bindgen", ++ "web-sys", ++] ++ ++[[package]] ++name = "wasm-bindgen-macro" ++version = "0.2.69" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "7a6ac8995ead1f084a8dea1e65f194d0973800c7f571f6edd70adf06ecf77084" ++dependencies = [ ++ "quote", ++ "wasm-bindgen-macro-support", ++] ++ ++[[package]] ++name = "wasm-bindgen-macro-support" ++version = "0.2.69" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b5a48c72f299d80557c7c62e37e7225369ecc0c963964059509fbafe917c7549" ++dependencies = [ ++ "proc-macro2", ++ "quote", ++ "syn", ++ "wasm-bindgen-backend", ++ "wasm-bindgen-shared", ++] ++ ++[[package]] ++name = "wasm-bindgen-shared" ++version = "0.2.69" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "7e7811dd7f9398f14cc76efd356f98f03aa30419dea46aa810d71e819fc97158" ++ ++[[package]] ++name = "web-sys" ++version = "0.3.46" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "222b1ef9334f92a21d3fb53dc3fd80f30836959a90f9274a626d7e06315ba3c3" ++dependencies = [ ++ "js-sys", ++ "wasm-bindgen", ++] ++ ++[[package]] ++name = "winapi" ++version = "0.2.8" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a" ++ ++[[package]] ++name = "winapi" ++version = "0.3.9" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" ++dependencies = [ ++ "winapi-i686-pc-windows-gnu", ++ "winapi-x86_64-pc-windows-gnu", ++] ++ ++[[package]] ++name = "winapi-build" ++version = "0.1.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "2d315eee3b34aca4797b2da6b13ed88266e6d612562a0c46390af8299fc699bc" ++ ++[[package]] ++name = "winapi-i686-pc-windows-gnu" ++version = "0.4.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" ++ ++[[package]] ++name = "winapi-x86_64-pc-windows-gnu" ++version = "0.4.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" ++ ++[[package]] ++name = "winreg" ++version = "0.7.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "0120db82e8a1e0b9fb3345a539c478767c0048d842860994d96113d5b667bd69" ++dependencies = [ ++ "winapi 0.3.9", ++] ++ ++[[package]] ++name = "ws2_32-sys" ++version = "0.2.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d59cefebd0c892fa2dd6de581e937301d8552cb44489cdff035c6187cb63fa5e" ++dependencies = [ ++ "winapi 0.2.8", ++ "winapi-build", ++] ++ ++[[package]] ++name = "yaml-rust" ++version = "0.4.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "39f0c922f1a334134dc2f7a8b67dc5d25f0735263feec974345ff706bcf20b0d" ++dependencies = [ ++ "linked-hash-map 0.5.3", ++] diff --git a/pkgs/applications/audio/netease-music-tui/default.nix b/pkgs/applications/audio/netease-music-tui/default.nix new file mode 100644 index 0000000000000..0322459685f2f --- /dev/null +++ b/pkgs/applications/audio/netease-music-tui/default.nix @@ -0,0 +1,28 @@ +{ fetchFromGitHub, rustPlatform, lib, alsaLib, pkg-config, openssl }: + +rustPlatform.buildRustPackage rec { + pname = "netease-music-tui"; + version = "v0.1.2"; + + src = fetchFromGitHub { + owner = "betta-cyber"; + repo = "netease-music-tui"; + rev = version; + sha256 = "0m5b3q493d32kxznm4apn56216l07b1c49km236i03mpfvdw7m1f"; + }; + + cargoPatches = [ ./cargo-lock.patch ]; + + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ alsaLib openssl ]; + + cargoSha256 = "1kfbnwy3lkbhz0ggxwr5n6qd1plipkr1ycr3z2r7c0amrzzbkc7l"; + verifyCargoDeps = true; + + meta = with lib; { + homepage = "https://github.com/betta-cyber/netease-music-tui"; + description = "netease cloud music terminal client by rust"; + maintainers = with maintainers; [ vonfry ]; + license = licenses.mit; + }; +} diff --git a/pkgs/applications/audio/new-session-manager/default.nix b/pkgs/applications/audio/new-session-manager/default.nix new file mode 100644 index 0000000000000..e4cabe0c4831f --- /dev/null +++ b/pkgs/applications/audio/new-session-manager/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchFromGitHub, meson, pkg-config, ninja, liblo, libjack2, fltk }: + +stdenv.mkDerivation rec { + pname = "new-session-manager"; + version = "1.4.0"; + + src = fetchFromGitHub { + owner = "linuxaudio"; + repo = "new-session-manager"; + rev = "v${version}"; + sha256 = "PqOv4tx3NLxL2+GWIUVgL72EQYMyDPIMrAkyby3TZ+0="; + }; + + nativeBuildInputs = [ meson pkg-config ninja ]; + + buildInputs = [ liblo libjack2 fltk ]; + + hardeningDisable = [ "format" ]; + + meta = with stdenv.lib; { + homepage = "https://linuxaudio.github.io/new-session-manager/"; + description = "A session manager designed for audio applications."; + maintainers = [ maintainers._6AA4FD ]; + license = licenses.gpl3Plus; + platforms = ["x86_64-linux"]; + }; +} diff --git a/pkgs/applications/audio/noisetorch/default.nix b/pkgs/applications/audio/noisetorch/default.nix index 1932f239cfd7a..1796927f52983 100644 --- a/pkgs/applications/audio/noisetorch/default.nix +++ b/pkgs/applications/audio/noisetorch/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "NoiseTorch"; - version = "0.8.2"; + version = "0.9.0"; src = fetchFromGitHub { owner = "lawl"; repo = "NoiseTorch"; rev = version; - sha256 = "14i04rmraxbddcvk0k9c6ak9invln7002g5jms54kcjzv9p39hbf"; + sha256 = "1a4g112h83m55pga8kq2a1wzxpycj59v4bygyjfyi1s09q1y97qg"; }; - patches = [ ./version.patch ./embedlibrnnoise.patch ]; + patches = [ ./version.patch ]; vendorSha256 = null; @@ -21,6 +21,8 @@ buildGoModule rec { buildInputs = [ rnnoise-plugin ]; + postPatch = "substituteInPlace main.go --replace 'librnnoise_ladspa/bin/ladspa/librnnoise_ladspa.so' '$RNNOISE_LADSPA_PLUGIN'"; + preBuild = '' export RNNOISE_LADSPA_PLUGIN="${rnnoise-plugin}/lib/ladspa/librnnoise_ladspa.so"; go generate; diff --git a/pkgs/applications/audio/noisetorch/embedlibrnnoise.patch b/pkgs/applications/audio/noisetorch/embedlibrnnoise.patch deleted file mode 100644 index b1782efb8b355..0000000000000 --- a/pkgs/applications/audio/noisetorch/embedlibrnnoise.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/scripts/embedlibrnnoise.go b/scripts/embedlibrnnoise.go -index 43daf80..0b3004b 100644 ---- a/scripts/embedlibrnnoise.go -+++ b/scripts/embedlibrnnoise.go -@@ -8,7 +8,7 @@ import ( - ) - - func main() { -- b, err := ioutil.ReadFile("librnnoise_ladspa/bin/ladspa/librnnoise_ladspa.so") -+ b, err := ioutil.ReadFile(os.Getenv("RNNOISE_LADSPA_PLUGIN")) - if err != nil { - fmt.Printf("Couldn't read librnnoise_ladspa.so: %v\n", err) - os.Exit(1) diff --git a/pkgs/applications/audio/opustags/default.nix b/pkgs/applications/audio/opustags/default.nix index 8e5546aec8b6c..4e26c9b77523b 100644 --- a/pkgs/applications/audio/opustags/default.nix +++ b/pkgs/applications/audio/opustags/default.nix @@ -1,24 +1,49 @@ -{ stdenv, lib, cmake, pkgconfig, libogg, fetchFromGitHub, libiconv }: +{ stdenv, fetchFromGitHub, fetchpatch, cmake, pkg-config, libiconv, libogg +, ffmpeg, glibcLocales, perl, perlPackages }: + stdenv.mkDerivation rec { pname = "opustags"; - version = "1.4.0"; + version = "1.5.1"; src = fetchFromGitHub { owner = "fmang"; repo = "opustags"; rev = version; - sha256 = "1y0czl72paawy342ff9ickaamkih43k59yfcdw7bnddypyfa7nbg"; + sha256 = "1dicv4s395b9gb4jpr0rnxdq9azr45pid62q3x08lb7cvyq3yxbh"; }; + patches = [ + # Fix building on darwin + (fetchpatch { + url = "https://github.com/fmang/opustags/commit/64fc6f8f6d20e034892e89abff0236c85cae98dc.patch"; + sha256 = "1djifzqhf1w51gbpqbndsh3gnl9iizp6hppxx8x2a92i9ns22zpg"; + }) + (fetchpatch { + url = "https://github.com/fmang/opustags/commit/f98208c1a1d10c15f98b127bbfdf88a7b15b08dc.patch"; + sha256 = "1h3v0r336fca0y8zq1vl2wr8gaqs3vvrrckx7pvji4k1jpiqvp38"; + }) + ]; + buildInputs = [ libogg ]; - nativeBuildInputs = [ cmake pkgconfig ] ++ lib.optional stdenv.isDarwin libiconv; + nativeBuildInputs = [ cmake pkg-config ] ++ stdenv.lib.optional stdenv.isDarwin libiconv; + + doCheck = true; + + checkInputs = [ ffmpeg glibcLocales perl ] ++ (with perlPackages; [ ListMoreUtils ]); + + checkPhase = '' + export LANG="en_US.UTF-8" + export LC_ALL="en_US.UTF-8" + make check + ''; - meta = with lib; { + meta = with stdenv.lib; { homepage = "https://github.com/fmang/opustags"; description = "Ogg Opus tags editor"; platforms = platforms.all; - maintainers = [ maintainers.kmein ]; + broken = stdenv.isDarwin; + maintainers = with maintainers; [ kmein SuperSandro2000 ]; license = licenses.bsd3; }; } diff --git a/pkgs/applications/audio/pavucontrol/default.nix b/pkgs/applications/audio/pavucontrol/default.nix index 301e44168d39b..f0a0956f662bf 100644 --- a/pkgs/applications/audio/pavucontrol/default.nix +++ b/pkgs/applications/audio/pavucontrol/default.nix @@ -1,5 +1,5 @@ -{ fetchurl, stdenv, pkgconfig, intltool, libpulseaudio, gtkmm3 -, libcanberra-gtk3, gnome3, wrapGAppsHook }: +{ fetchurl, fetchpatch, stdenv, pkgconfig, intltool, libpulseaudio, +gtkmm3 , libcanberra-gtk3, gnome3, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "pavucontrol"; @@ -10,6 +10,15 @@ stdenv.mkDerivation rec { sha256 = "1qhlkl3g8d7h72xjskii3g1l7la2cavwp69909pzmbi2jyn5pi4g"; }; + patches = [ + # Can be removed with the next version bump + # https://gitlab.freedesktop.org/pulseaudio/pavucontrol/-/merge_requests/20 + (fetchpatch { + name = "streamwidget-fix-drop-down-wayland.patch"; + url = "https://gitlab.freedesktop.org/pulseaudio/pavucontrol/-/commit/ae278b8643cf1089f66df18713c8154208d9a505.patch"; + sha256 = "066vhxjz6gmi2sp2n4pa1cdsxjnq6yml5js094g5n7ld34p84dpj"; + })]; + buildInputs = [ libpulseaudio gtkmm3 libcanberra-gtk3 gnome3.adwaita-icon-theme ]; diff --git a/pkgs/applications/audio/picard/default.nix b/pkgs/applications/audio/picard/default.nix index fb6f59d0ded74..69debfa2ea888 100644 --- a/pkgs/applications/audio/picard/default.nix +++ b/pkgs/applications/audio/picard/default.nix @@ -12,13 +12,13 @@ let ; in pythonPackages.buildPythonApplication rec { pname = "picard"; - version = "2.5.2"; + version = "2.5.6"; src = fetchFromGitHub { owner = "metabrainz"; repo = pname; rev = "release-${version}"; - sha256 = "193pk6fhrqar2ra8krj6xdd7sm5qfw0p708iazzwk4b8c8g0q72j"; + sha256 = "1mkbg44bm642mlpfxsdlw947var6a3sf9m6c897b4n0742hsdkbc"; }; nativeBuildInputs = [ gettext qt5.wrapQtAppsHook qt5.qtbase ] diff --git a/pkgs/applications/audio/plujain-ramp/default.nix b/pkgs/applications/audio/plujain-ramp/default.nix new file mode 100644 index 0000000000000..2523c5a565780 --- /dev/null +++ b/pkgs/applications/audio/plujain-ramp/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchFromGitHub, lv2 }: + +stdenv.mkDerivation rec { + version = "v1.1.3"; + pname = "plujain-ramp"; + + src = fetchFromGitHub { + owner = "Houston4444"; + repo = "plujain-ramp"; + rev = "1bc1fed211e140c7330d6035122234afe78e5257"; + sha256 = "1k7qpr8c15d623c4zqxwdklp98amildh03cqsnqq5ia9ba8z3016"; + }; + + buildInputs = [ + lv2 + ]; + + installFlags = [ "INSTALL_PATH=$(out)/lib/lv2" ]; + + meta = with stdenv.lib; { + description = "A mono rhythmic tremolo LV2 Audio Plugin"; + homepage = "https://github.com/Houston4444/plujain-ramp"; + license = licenses.gpl2Only; + platforms = platforms.linux; + maintainers = [ maintainers.hirenashah ]; + }; +} diff --git a/pkgs/applications/audio/pt2-clone/default.nix b/pkgs/applications/audio/pt2-clone/default.nix index bc89505a1fe24..c73c356276862 100644 --- a/pkgs/applications/audio/pt2-clone/default.nix +++ b/pkgs/applications/audio/pt2-clone/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "pt2-clone"; - version = "1.26_fix"; + version = "1.28"; src = fetchFromGitHub { owner = "8bitbubsy"; repo = "pt2-clone"; rev = "v${version}"; - sha256 = "1ikhgagniiq4irsy8i3g64m6cl61lnfvs163n8gs4hm426yckyb8"; + sha256 = "1c2x43f46l7556kl9y9qign0g6ywdkh7ywkzv6c9y63n68ph20x2"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/applications/audio/qjackctl/default.nix b/pkgs/applications/audio/qjackctl/default.nix index 8cb28dcfd5af4..4ac64afe85477 100644 --- a/pkgs/applications/audio/qjackctl/default.nix +++ b/pkgs/applications/audio/qjackctl/default.nix @@ -1,14 +1,20 @@ -{ stdenv, mkDerivation, fetchurl, pkgconfig, alsaLib, libjack2, dbus, qtbase, qttools, qtx11extras }: +{ stdenv, mkDerivation, fetchFromGitHub +, pkg-config, cmake, alsaLib, libjack2, dbus, qtbase, qttools, qtx11extras +# Enable jack session support +, jackSession ? false +}: mkDerivation rec { - version = "0.6.3"; + version = "0.9.0"; pname = "qjackctl"; # some dependencies such as killall have to be installed additionally - src = fetchurl { - url = "mirror://sourceforge/qjackctl/${pname}-${version}.tar.gz"; - sha256 = "0zbb4jlx56qvcqyhx34mbagkqf3wbxgj84hk0ppf5cmcrxv67d4x"; + src = fetchFromGitHub { + owner = "rncbc"; + repo = "qjackctl"; + rev = "${pname}_${stdenv.lib.replaceChars ["."] ["_"] version}"; + sha256 = "044kgwk7pfywad4myza0s2kvfkl21zkqq5wgny7n3c43qlcgs3zr"; }; buildInputs = [ @@ -20,13 +26,19 @@ mkDerivation rec { dbus ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ + cmake + pkg-config + ]; - configureFlags = [ "--enable-jack-version" ]; + cmakeFlags = [ + "-DCONFIG_JACK_VERSION=1" + "-DCONFIG_JACK_SESSION=${toString jackSession}" + ]; meta = with stdenv.lib; { description = "A Qt application to control the JACK sound server daemon"; - homepage = "http://qjackctl.sourceforge.net/"; + homepage = "https://github.com/rncbc/qjackctl"; license = licenses.gpl2Plus; maintainers = [ maintainers.goibhniu ]; platforms = platforms.linux; diff --git a/pkgs/applications/audio/qtractor/default.nix b/pkgs/applications/audio/qtractor/default.nix index 961314088d1a0..f2d5ae1c80920 100644 --- a/pkgs/applications/audio/qtractor/default.nix +++ b/pkgs/applications/audio/qtractor/default.nix @@ -1,35 +1,79 @@ -{ alsaLib, autoconf, automake, dssi, fetchurl, libjack2 -, ladspaH, ladspaPlugins, liblo, libmad, libsamplerate, libsndfile -, libtool, libvorbis, lilv, lv2, pkgconfig, qttools, qtbase, rubberband, serd -, sord, sratom, stdenv, suil, wrapQtAppsHook }: +{ alsaLib +, aubio +, cmake +, dssi +, fetchurl +, flac +, libjack2 +, ladspaH +, ladspaPlugins +, liblo +, libmad +, libsamplerate +, libsndfile +, libtool +, libvorbis +, lilv +, lv2 +, mkDerivation +, opusfile +, pkg-config +, qttools +, qtbase +, rubberband +, serd +, sord +, sratom +, stdenv +, suil +}: -stdenv.mkDerivation rec { +mkDerivation rec { pname = "qtractor"; - version = "0.9.18"; + version = "0.9.19"; src = fetchurl { url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.gz"; - sha256 = "121vmygdzp37p6f93f8dbbg2m2r55j7amyiapzkqgypgn4vfdbwr"; + sha256 = "sha256-98/trRZRvNRPEA4ASS81qp2rMevpo5TIrtsU1TYMuT0="; }; nativeBuildInputs = [ - autoconf automake libtool pkgconfig qttools wrapQtAppsHook + cmake + libtool + pkg-config + qttools ]; - buildInputs = - [ alsaLib dssi libjack2 ladspaH - ladspaPlugins liblo libmad libsamplerate libsndfile libtool - libvorbis lilv lv2 qtbase rubberband serd sord sratom - suil - ]; - - enableParallelBuilding = true; + buildInputs = [ + alsaLib + aubio + dssi + flac + libjack2 + ladspaH + ladspaPlugins + liblo + libmad + libsamplerate + libsndfile + libtool + libvorbis + lilv + lv2 + opusfile + qtbase + rubberband + serd + sord + sratom + suil + ]; meta = with stdenv.lib; { description = "Audio/MIDI multi-track sequencer"; - homepage = "http://qtractor.sourceforge.net"; + homepage = "https://qtractor.sourceforge.io"; license = licenses.gpl2Plus; + maintainers = with maintainers; [ goibhniu ]; platforms = platforms.linux; - maintainers = [ maintainers.goibhniu ]; }; } diff --git a/pkgs/applications/audio/redoflacs/default.nix b/pkgs/applications/audio/redoflacs/default.nix index 140b163e25cd1..879acdf3a17b2 100644 --- a/pkgs/applications/audio/redoflacs/default.nix +++ b/pkgs/applications/audio/redoflacs/default.nix @@ -5,8 +5,6 @@ , installShellFiles , flac , sox -, withAucdtect ? false -, aucdtect ? null }: stdenv.mkDerivation rec { @@ -36,7 +34,7 @@ stdenv.mkDerivation rec { postFixup = '' wrapProgram $out/bin/redoflacs \ - --prefix PATH : ${stdenv.lib.makeBinPath ([ flac sox ] ++ lib.optional withAucdtect aucdtect)} + --prefix PATH : ${stdenv.lib.makeBinPath ([ flac sox ])} ''; meta = with lib; { diff --git a/pkgs/applications/audio/rkrlv2/default.nix b/pkgs/applications/audio/rkrlv2/default.nix index 59979c4108386..2eb3dc3d7e5c1 100644 --- a/pkgs/applications/audio/rkrlv2/default.nix +++ b/pkgs/applications/audio/rkrlv2/default.nix @@ -1,26 +1,26 @@ -{ stdenv, fetchFromGitHub, -automake, pkgconfig, lv2, fftw, cmake, xorg, libjack2, libsamplerate, libsndfile -}: +{ stdenv, fetchFromGitHub, pkg-config, lv2, fftw, cmake, libXpm +, libXft, libjack2, libsamplerate, libsndfile }: stdenv.mkDerivation rec { - repo = "rkrlv2"; - name = "${repo}-b2.0"; + pname = "rkrlv2"; + version = "beta_3"; src = fetchFromGitHub { owner = "ssj71"; - inherit repo; - rev = "beta_2"; - sha256 = "128jcilbrd1l65c01w2bazsb21x78mng0jjkhi3x9crf1n9qbh2m"; + repo = pname; + rev = version; + sha256 = "WjpPNUEYw4aGrh57J+7kkxKFXgCJWNaWAmueFbNUJJo="; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = with xorg; [ automake lv2 fftw cmake libXpm libjack2 libsamplerate libsndfile libXft ]; + nativeBuildInputs = [ cmake pkg-config ]; + buildInputs = [ libXft libXpm lv2 fftw libjack2 libsamplerate libsndfile ]; - meta = { + meta = with stdenv.lib; { description = "Rakarrak effects ported to LV2"; homepage = "https://github.com/ssj71/rkrlv2"; - license = stdenv.lib.licenses.gpl3; - maintainers = [ stdenv.lib.maintainers.joelmo ]; - platforms = stdenv.lib.platforms.linux; + license = licenses.gpl2Only; + maintainers = [ maintainers.joelmo ]; + platforms = platforms.unix; + broken = stdenv.isAarch64; # g++: error: unrecognized command line option '-mfpmath=sse' }; } diff --git a/pkgs/applications/audio/sc68/default.nix b/pkgs/applications/audio/sc68/default.nix new file mode 100644 index 0000000000000..683aa9c36bcab --- /dev/null +++ b/pkgs/applications/audio/sc68/default.nix @@ -0,0 +1,39 @@ +{ stdenv +, fetchsvn +, pkg-config +, which +, autoconf +, automake +, libtool +, hexdump +, libao +, zlib +, curl +}: + +stdenv.mkDerivation rec { + pname = "sc68"; + version = "unstable-2020-05-18"; + + src = fetchsvn { + url = "svn://svn.code.sf.net/p/sc68/code/"; + rev = "693"; + sha256 = "0liz5yjwiy41y160ag83zz9s5l8mk72fscxgvjv9g5qf4gwffnfa"; + }; + + preConfigure = "tools/svn-bootstrap.sh"; + + enableParallelBuilding = true; + + nativeBuildInputs = [ pkg-config which autoconf automake libtool hexdump ]; + + buildInputs = [ libao zlib curl ]; + + meta = with stdenv.lib; { + description = "Atari ST and Amiga music player"; + homepage = "http://sc68.atari.org/project.html"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ OPNA2608 ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/applications/audio/sonata/default.nix b/pkgs/applications/audio/sonata/default.nix index cf3f173a096e9..afb0276896021 100644 --- a/pkgs/applications/audio/sonata/default.nix +++ b/pkgs/applications/audio/sonata/default.nix @@ -5,13 +5,13 @@ let inherit (python3Packages) buildPythonApplication isPy3k dbus-python pygobject3 mpd2 setuptools; in buildPythonApplication rec { pname = "sonata"; - version = "1.7b1"; + version = "1.7.0"; src = fetchFromGitHub { owner = "multani"; repo = "sonata"; rev = "v${version}"; - sha256 = "1npbxlrg6k154qybfd250nq2p96kxdsdkj9wwnp93gljnii3g8wh"; + sha256 = "0rl8w7s2asff626clzfvyz987l2k4ml5dg417mqp9v8a962q0v2x"; }; disabled = !isPy3k; diff --git a/pkgs/applications/audio/spotify-tui/default.nix b/pkgs/applications/audio/spotify-tui/default.nix index a2001996c9887..4eb6288e4ee70 100644 --- a/pkgs/applications/audio/spotify-tui/default.nix +++ b/pkgs/applications/audio/spotify-tui/default.nix @@ -1,27 +1,34 @@ -{ stdenv, fetchFromGitHub, rustPlatform, pkgconfig, openssl, python3, libxcb, AppKit, Security }: +{ stdenv, fetchFromGitHub, rustPlatform, installShellFiles, pkgconfig, openssl, python3, libxcb, AppKit, Security }: rustPlatform.buildRustPackage rec { pname = "spotify-tui"; - version = "0.22.0"; + version = "0.23.0"; src = fetchFromGitHub { owner = "Rigellute"; repo = "spotify-tui"; rev = "v${version}"; - sha256 = "0w1y37qh9n3936d59hvqzjz2878x2nwxqxc4s7mp4f9xqcfl0c5r"; + sha256 = "082y5m2vglzx9kdc2088zynz0njcnljnb0y170igmlsxq9wkrgg2"; }; - cargoSha256 = "1ri054p08si95x1gh2bkh4fk50ja79c5izzjnkvs0yhfj1wzbghi"; + cargoSha256 = "100c7x603qyhav3p24clwfal4ngh0258x9lqsi84kcj4wq2f3i8f"; - nativeBuildInputs = stdenv.lib.optionals stdenv.isLinux [ pkgconfig python3 ]; + nativeBuildInputs = [ installShellFiles ] ++ stdenv.lib.optionals stdenv.isLinux [ pkgconfig python3 ]; buildInputs = [ ] ++ stdenv.lib.optionals stdenv.isLinux [ openssl libxcb ] ++ stdenv.lib.optionals stdenv.isDarwin [ AppKit Security ]; + postInstall = '' + for shell in bash fish zsh; do + $out/bin/spt --completions $shell > spt.$shell + installShellCompletion spt.$shell + done + ''; + meta = with stdenv.lib; { description = "Spotify for the terminal written in Rust"; homepage = "https://github.com/Rigellute/spotify-tui"; - changelog = "https://github.com/Rigellute/spotify-tui/releases/tag/v${version}"; + changelog = "https://github.com/Rigellute/spotify-tui/blob/v${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ jwijenbergh ]; }; diff --git a/pkgs/applications/audio/stochas/default.nix b/pkgs/applications/audio/stochas/default.nix new file mode 100644 index 0000000000000..402d3f1b6fa2b --- /dev/null +++ b/pkgs/applications/audio/stochas/default.nix @@ -0,0 +1,33 @@ +{ stdenv, fetchFromGitHub, cmake, pkg-config, libX11, libXrandr, libXinerama, libXext, libXcursor, freetype, alsaLib, libjack2 }: + +stdenv.mkDerivation rec { + pname = "stochas"; + version = "1.3.4"; + + src = fetchFromGitHub { + owner = "surge-synthesizer"; + repo = pname; + rev = "v${version}"; + sha256 = "0b26mbj727dnygavz4kihnhmnnvwsr9l145w6kydq7bd7nwiw7lq"; + fetchSubmodules = true; + }; + + nativeBuildInputs = [ cmake pkg-config ]; + + buildInputs = [ + libX11 libXrandr libXinerama libXext libXcursor freetype alsaLib libjack2 + ]; + + installPhase = '' + mkdir -p $out/lib/vst3 + cp -r stochas_artefacts/Release/VST3/Stochas.vst3 $out/lib/vst3 + ''; + + meta = with stdenv.lib; { + description = "Probabilistic polyrhythmic sequencer plugin"; + homepage = "https://stochas.org/"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ magnetophon ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/applications/audio/strawberry/default.nix b/pkgs/applications/audio/strawberry/default.nix index c2f1a0db701c5..53a4cc96437c0 100644 --- a/pkgs/applications/audio/strawberry/default.nix +++ b/pkgs/applications/audio/strawberry/default.nix @@ -35,13 +35,13 @@ mkDerivation rec { pname = "strawberry"; - version = "0.8.4"; + version = "0.8.5"; src = fetchFromGitHub { owner = "jonaski"; repo = pname; rev = version; - sha256 = "145djlfvbkx2b1wqipk51mz82dhm27vmh9x00lkn24q1xz1y6h5n"; + sha256 = "sha256-+ZQ80J94Teqt4Gy6fw/pS7FwILK/TPehtJDy72Bdy1E="; }; buildInputs = [ diff --git a/pkgs/applications/audio/sublime-music/default.nix b/pkgs/applications/audio/sublime-music/default.nix index 7e3c1b9164f1b..1f74998166fbe 100644 --- a/pkgs/applications/audio/sublime-music/default.nix +++ b/pkgs/applications/audio/sublime-music/default.nix @@ -1,5 +1,4 @@ { lib, python3Packages, gobject-introspection, gtk3, pango, wrapGAppsHook - , chromecastSupport ? false , serverSupport ? false , keyringSupport ? true @@ -51,6 +50,10 @@ python3Packages.buildPythonApplication rec { # https://github.com/NixOS/nixpkgs/issues/56943 strictDeps = false; + # no tests + doCheck = false; + pythonImportsCheck = [ "sublime" ]; + meta = with lib; { description = "GTK3 Subsonic/Airsonic client"; homepage = "https://sublimemusic.app/"; diff --git a/pkgs/applications/audio/sunvox/default.nix b/pkgs/applications/audio/sunvox/default.nix index 2cd48806f7d02..1b3b476d70373 100644 --- a/pkgs/applications/audio/sunvox/default.nix +++ b/pkgs/applications/audio/sunvox/default.nix @@ -13,11 +13,11 @@ let in stdenv.mkDerivation rec { pname = "SunVox"; - version = "1.9.5d"; + version = "1.9.6c"; src = fetchurl { url = "http://www.warmplace.ru/soft/sunvox/sunvox-${version}.zip"; - sha256 = "04f7psm0lvc09nw7d2wp0sncf37bym2v7hhxp4v8c8gdgayj7k8m"; + sha256 = "0lqzr68n2c6aifw2vbyars91wn1chmgb9xfdk463g4vjqiava3ih"; }; buildInputs = [ unzip ]; diff --git a/pkgs/applications/audio/vcv-rack/default.nix b/pkgs/applications/audio/vcv-rack/default.nix index 18d8f7415b56c..a94cfd3a7cc3f 100644 --- a/pkgs/applications/audio/vcv-rack/default.nix +++ b/pkgs/applications/audio/vcv-rack/default.nix @@ -1,4 +1,4 @@ -{ stdenv, makeWrapper, fetchFromBitbucket, fetchFromGitHub, pkgconfig +{ stdenv, makeWrapper, fetchzip, fetchFromGitHub, pkgconfig , alsaLib, curl, glew, glfw, gtk2-x11, jansson, libjack2, libXext, libXi , libzip, rtaudio, rtmidi, speex, libsamplerate }: @@ -7,10 +7,8 @@ let # Others are downloaded with `make deps`. Due to previous issues with the # `glfw` submodule (see above) and because we can not access the network when # building in a sandbox, we fetch the dependency source manually. - pfft-source = fetchFromBitbucket { - owner = "jpommier"; - repo = "pffft"; - rev = "74d7261be17cf659d5930d4830609406bd7553e3"; + pfft-source = fetchzip { + url = "https://vcvrack.com/downloads/dep/pffft.zip"; sha256 = "084csgqa6f1a270bhybjayrh3mpyi2jimc87qkdgsqcp8ycsx1l1"; }; nanovg-source = fetchFromGitHub { diff --git a/pkgs/applications/audio/zynaddsubfx/default.nix b/pkgs/applications/audio/zynaddsubfx/default.nix index 9a432f73d3f04..3d5f392205f9c 100644 --- a/pkgs/applications/audio/zynaddsubfx/default.nix +++ b/pkgs/applications/audio/zynaddsubfx/default.nix @@ -1,30 +1,117 @@ -{ stdenv, fetchurl, alsaLib, cairo, cmake, libjack2, fftw, fltk13, lash, libjpeg -, libXpm, minixml, ntk, pkgconfig, zlib, liblo +{ lib +, stdenv +, fetchFromGitHub +, callPackage + + # Required build tools +, cmake +, makeWrapper +, pkg-config + + # Required dependencies +, fftw +, liblo +, minixml +, zlib + + # Optional dependencies +, alsaSupport ? true +, alsaLib +, dssiSupport ? false +, dssi +, ladspaH +, jackSupport ? true +, libjack2 +, lashSupport ? false +, lash +, ossSupport ? true +, portaudioSupport ? true +, portaudio + + # Optional GUI dependencies +, guiModule ? "off" +, cairo +, fltk13 +, libGL +, libjpeg +, libX11 +, libXpm +, ntk + + # Test dependencies +, cxxtest }: -stdenv.mkDerivation rec { +assert builtins.any (g: guiModule == g) [ "fltk" "ntk" "zest" "off" ]; + +let + guiName = { + "fltk" = "FLTK"; + "ntk" = "NTK"; + "zest" = "Zyn-Fusion"; + }.${guiModule}; + mruby-zest = callPackage ./mruby-zest { }; +in stdenv.mkDerivation rec { pname = "zynaddsubfx"; version = "3.0.5"; - src = fetchurl { - url = "mirror://sourceforge/zynaddsubfx/zynaddsubfx-${version}.tar.bz2"; - sha256 = "0qwzg14h043rmyf9jqdylxhyfy4sl0vsr0gjql51wjhid0i34ivl"; + src = fetchFromGitHub { + owner = pname; + repo = pname; + rev = version; + sha256 = "1vh1gszgjxwn8m32rk5222z1j2cnjax0bqpag7b47v6i36p2q4x8"; + fetchSubmodules = true; }; - buildInputs = [ alsaLib cairo libjack2 fftw fltk13 lash libjpeg libXpm minixml ntk zlib liblo ]; - nativeBuildInputs = [ cmake pkgconfig ]; - - patchPhase = '' + postPatch = '' substituteInPlace src/Misc/Config.cpp --replace /usr $out ''; - hardeningDisable = [ "format" ]; + nativeBuildInputs = [ cmake makeWrapper pkg-config ]; + + buildInputs = [ fftw liblo minixml zlib ] + ++ lib.optionals alsaSupport [ alsaLib ] + ++ lib.optionals dssiSupport [ dssi ladspaH ] + ++ lib.optionals jackSupport [ libjack2 ] + ++ lib.optionals lashSupport [ lash ] + ++ lib.optionals portaudioSupport [ portaudio ] + ++ lib.optionals (guiModule == "fltk") [ fltk13 libjpeg libXpm ] + ++ lib.optionals (guiModule == "ntk") [ ntk cairo libXpm ] + ++ lib.optionals (guiModule == "zest") [ libGL libX11 ]; + + cmakeFlags = [ "-DGuiModule=${guiModule}" ] + # OSS library is included in glibc. + # Must explicitly disable if support is not wanted. + ++ lib.optional (!ossSupport) "-DOssEnable=OFF" + # Find FLTK without requiring an OpenGL library in buildInputs + ++ lib.optional (guiModule == "fltk") "-DFLTK_SKIP_OPENGL=ON"; + + doCheck = true; + checkInputs = [ cxxtest ]; + + # When building with zest GUI, patch plugins + # and standalone executable to properly locate zest + postFixup = lib.optional (guiModule == "zest") '' + patchelf --set-rpath "${mruby-zest}:$(patchelf --print-rpath "$out/lib/lv2/ZynAddSubFX.lv2/ZynAddSubFX_ui.so")" \ + "$out/lib/lv2/ZynAddSubFX.lv2/ZynAddSubFX_ui.so" + + patchelf --set-rpath "${mruby-zest}:$(patchelf --print-rpath "$out/lib/vst/ZynAddSubFX.so")" \ + "$out/lib/vst/ZynAddSubFX.so" + + wrapProgram "$out/bin/zynaddsubfx" \ + --prefix PATH : ${mruby-zest} \ + --prefix LD_LIBRARY_PATH : ${mruby-zest} + ''; + + meta = with lib; { + description = "High quality software synthesizer (${guiName} GUI)"; + homepage = + if guiModule == "zest" + then "https://zynaddsubfx.sourceforge.io/zyn-fusion.html" + else "https://zynaddsubfx.sourceforge.io"; - meta = with stdenv.lib; { - description = "High quality software synthesizer"; - homepage = "http://zynaddsubfx.sourceforge.net"; license = licenses.gpl2; + maintainers = with maintainers; [ goibhniu metadark ]; platforms = platforms.linux; - maintainers = [ maintainers.goibhniu maintainers.nico202 ]; }; } diff --git a/pkgs/applications/audio/zynaddsubfx/mruby-zest/default.nix b/pkgs/applications/audio/zynaddsubfx/mruby-zest/default.nix new file mode 100644 index 0000000000000..0f00e6244d1d6 --- /dev/null +++ b/pkgs/applications/audio/zynaddsubfx/mruby-zest/default.nix @@ -0,0 +1,109 @@ +{ stdenv +, fetchFromGitHub +, bison +, git +, python2 +, rake +, ruby +, libGL +, libuv +, libX11 +}: + +let + mgem-list = fetchFromGitHub { + owner = "mruby"; + repo = "mgem-list"; + rev = "2033837203c8a141b1f9d23bb781fe0cbaefbd24"; + sha256 = "0igf2nsx5i6g0yf7sjxxkngyriv213d0sjs3yidrflrabiywpxmm"; + }; + + mruby-dir = fetchFromGitHub { + owner = "iij"; + repo = "mruby-dir"; + rev = "89dceefa1250fb1ae868d4cb52498e9e24293cd1"; + sha256 = "0zrhiy9wmwmc9ls62iyb2z86j2ijqfn7rn4xfmrbrfxygczarsm9"; + }; + + mruby-errno = fetchFromGitHub { + owner = "iij"; + repo = "mruby-errno"; + rev = "b4415207ff6ea62360619c89a1cff83259dc4db0"; + sha256 = "12djcwjjw0fygai5kssxbfs3pzh3cpnq07h9m2h5b51jziw380xj"; + }; + + mruby-file-stat = fetchFromGitHub { + owner = "ksss"; + repo = "mruby-file-stat"; + rev = "aa474589f065c71d9e39ab8ba976f3bea6f9aac2"; + sha256 = "1clarmr67z133ivkbwla1a42wcjgj638j9w0mlv5n21mhim9rid5"; + }; + + mruby-process = fetchFromGitHub { + owner = "iij"; + repo = "mruby-process"; + rev = "fe171fbe2a6cc3c2cf7d713641bddde71024f7c8"; + sha256 = "00yrzc371f90gl5m1gbkw0qq8c394bpifssjr8p1wh5fmzhxqyml"; + }; + + mruby-pack = fetchFromGitHub { + owner = "iij"; + repo = "mruby-pack"; + rev = "383a9c79e191d524a9a2b4107cc5043ecbf6190b"; + sha256 = "003glxgxifk4ixl12sy4gn9bhwvgb79b4wga549ic79isgv81w2d"; + }; +in +stdenv.mkDerivation rec { + pname = "mruby-zest"; + version = "3.0.5"; + + src = fetchFromGitHub { + owner = pname; + repo = "${pname}-build"; + rev = version; + sha256 = "0fxljrgamgz2rm85mclixs00b0f2yf109jc369039n1vf0l5m57d"; + fetchSubmodules = true; + }; + + nativeBuildInputs = [ bison git python2 rake ruby ]; + buildInputs = [ libGL libuv libX11 ]; + + patches = [ + ./force-gcc-as-linker.patch + ./system-libuv.patch + ]; + + # Add missing dependencies of deps/mruby-dir-glob/mrbgem.rake + # Should be fixed in next release, see bcadb0a5490bd6d599f1a0e66ce09b46363c9dae + postPatch = '' + mkdir -p mruby/build/mrbgems + ln -s ${mgem-list} mruby/build/mrbgems/mgem-list + ln -s ${mruby-dir} mruby/build/mrbgems/mruby-dir + ln -s ${mruby-errno} mruby/build/mrbgems/mruby-errno + ln -s ${mruby-file-stat} mruby/build/mrbgems/mruby-file-stat + ln -s ${mruby-process} mruby/build/mrbgems/mruby-process + ln -s ${mruby-pack} mruby/build/mrbgems/mruby-pack + ''; + + installTargets = [ "pack" ]; + + postInstall = '' + ln -s "$out/zest" "$out/zyn-fusion" + cp -a package/{font,libzest.so,schema,zest} "$out" + + # mruby-widget-lib/src/api.c requires MainWindow.qml as part of a + # sanity check, even though qml files are compiled into the binary + # https://github.com/mruby-zest/mruby-zest-build/tree/3.0.5/src/mruby-widget-lib/src/api.c#L99-L116 + # https://github.com/mruby-zest/mruby-zest-build/tree/3.0.5/linux-pack.sh#L17-L18 + mkdir -p "$out/qml" + touch "$out/qml/MainWindow.qml" + ''; + + meta = with stdenv.lib; { + description = "The Zest Framework used in ZynAddSubFX's UI"; + homepage = "https://github.com/mruby-zest"; + license = licenses.lgpl21; + maintainers = with maintainers; [ metadark ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/applications/audio/zynaddsubfx/mruby-zest/force-gcc-as-linker.patch b/pkgs/applications/audio/zynaddsubfx/mruby-zest/force-gcc-as-linker.patch new file mode 100644 index 0000000000000..c521d24077405 --- /dev/null +++ b/pkgs/applications/audio/zynaddsubfx/mruby-zest/force-gcc-as-linker.patch @@ -0,0 +1,13 @@ +diff --git a/mruby/tasks/toolchains/gcc.rake b/mruby/tasks/toolchains/gcc.rake +index f370c0ab..e5ab9f60 100644 +--- a/mruby/tasks/toolchains/gcc.rake ++++ b/mruby/tasks/toolchains/gcc.rake +@@ -22,7 +22,7 @@ MRuby::Toolchain.new(:gcc) do |conf, _params| + end + + conf.linker do |linker| +- linker.command = ENV['LD'] || 'gcc' ++ linker.command = 'gcc' + linker.flags = [ENV['LDFLAGS'] || %w()] + linker.libraries = %w(m) + linker.library_paths = [] diff --git a/pkgs/applications/audio/zynaddsubfx/mruby-zest/system-libuv.patch b/pkgs/applications/audio/zynaddsubfx/mruby-zest/system-libuv.patch new file mode 100644 index 0000000000000..b7050abc12358 --- /dev/null +++ b/pkgs/applications/audio/zynaddsubfx/mruby-zest/system-libuv.patch @@ -0,0 +1,113 @@ +diff --git a/Makefile b/Makefile +index f3e3be2..2398852 100644 +--- a/Makefile ++++ b/Makefile +@@ -1,8 +1,3 @@ +-UV_DIR = libuv-v1.9.1 +-UV_FILE = $(UV_DIR).tar.gz +-UV_URL = http://dist.libuv.org/dist/v1.9.1/$(UV_FILE) +- +- + all: + ruby ./rebuild-fcache.rb + cd deps/nanovg/src && $(CC) nanovg.c -c -fPIC +@@ -10,12 +5,12 @@ all: + # cd deps/pugl && python2 ./waf configure --no-cairo --static + cd deps/pugl && python2 ./waf configure --no-cairo --static --debug + cd deps/pugl && python2 ./waf +- cd src/osc-bridge && CFLAGS="-I ../../deps/$(UV_DIR)/include " make lib ++ cd src/osc-bridge && make lib + cd mruby && MRUBY_CONFIG=../build_config.rb rake + $(CC) -shared -o libzest.so `find mruby/build/host -type f | grep -e "\.o$$" | grep -v bin` ./deps/libnanovg.a \ + ./deps/libnanovg.a \ + src/osc-bridge/libosc-bridge.a \ +- ./deps/$(UV_DIR)/.libs/libuv.a -lm -lX11 -lGL -lpthread ++ -luv -lm -lX11 -lGL -lpthread + $(CC) test-libversion.c deps/pugl/build/libpugl-0.a -ldl -o zest -lX11 -lGL -lpthread -I deps/pugl -std=gnu99 + + osx: +@@ -25,12 +20,12 @@ osx: + cd deps/pugl && python2 ./waf configure --no-cairo --static + # cd deps/pugl && python2 ./waf configure --no-cairo --static --debug + cd deps/pugl && python2 ./waf +- cd src/osc-bridge && CFLAGS="-I ../../deps/$(UV_DIR)/include " make lib ++ cd src/osc-bridge && make lib + cd mruby && MRUBY_CONFIG=../build_config.rb rake + $(CC) -shared -o libzest.so `find mruby/build/host -type f | grep -e "\.o$$" | grep -v bin` ./deps/libnanovg.a \ + ./deps/libnanovg.a \ + src/osc-bridge/libosc-bridge.a \ +- ./deps/$(UV_DIR)/.libs/libuv.a -lm -framework OpenGL -lpthread ++ -luv -lm -framework OpenGL -lpthread + $(CC) test-libversion.c deps/pugl/build/libpugl-0.a -ldl -o zest -framework OpenGL -framework AppKit -lpthread -I deps/pugl -std=gnu99 + + windows: +@@ -38,38 +33,14 @@ windows: + $(AR) rc deps/libnanovg.a deps/nanovg/src/*.o + cd deps/pugl && CFLAGS="-mstackrealign" python2 ./waf configure --no-cairo --static --target=win32 + cd deps/pugl && python2 ./waf +- cd src/osc-bridge && CFLAGS="-mstackrealign -I ../../deps/$(UV_DIR)/include " make lib ++ cd src/osc-bridge && CFLAGS="-mstackrealign" make lib + cd mruby && WINDOWS=1 MRUBY_CONFIG=../build_config.rb rake + $(CC) -mstackrealign -shared -o libzest.dll -static-libgcc `find mruby/build/w64 -type f | grep -e "\.o$$" | grep -v bin` \ + ./deps/libnanovg.a \ + src/osc-bridge/libosc-bridge.a \ +- ./deps/libuv-win.a \ +- -lm -lpthread -lws2_32 -lkernel32 -lpsapi -luserenv -liphlpapi -lglu32 -lgdi32 -lopengl32 ++ -luv -lm -lpthread -lws2_32 -lkernel32 -lpsapi -luserenv -liphlpapi -lglu32 -lgdi32 -lopengl32 + $(CC) -mstackrealign -DWIN32 test-libversion.c deps/pugl/build/libpugl-0.a -o zest.exe -lpthread -I deps/pugl -std=c99 -lws2_32 -lkernel32 -lpsapi -luserenv -liphlpapi -lglu32 -lgdi32 -lopengl32 + +- +-builddep: deps/libuv.a +-deps/libuv.a: +- cd deps/$(UV_DIR) && ./autogen.sh +- cd deps/$(UV_DIR) && CFLAGS=-fPIC ./configure +- cd deps/$(UV_DIR) && CFLAGS=-fPIC make +- cp deps/$(UV_DIR)/.libs/libuv.a deps/ +- +-builddepwin: deps/libuv-win.a +-deps/libuv-win.a: +- cd deps/$(UV_DIR) && ./autogen.sh +- cd deps/$(UV_DIR) && CFLAGS="-mstackrealign" ./configure --host=x86_64-w64-mingw32 +- cd deps/$(UV_DIR) && LD=x86_64-w64-mingw32-gcc make +- cp deps/$(UV_DIR)/.libs/libuv.a deps/libuv-win.a +- +-deps/$(UV_DIR): +- cd deps && wget -4 $(UV_URL) && tar xvf $(UV_FILE) +-setup: deps/$(UV_DIR) +- +-setupwin: +- cd deps && wget -4 $(UV_URL) +- cd deps && tar xvf $(UV_FILE) +- + push: + cd src/osc-bridge && git push + cd src/mruby-qml-parse && git push +diff --git a/build_config.rb b/build_config.rb +index 00f1f69..11ac15b 100644 +--- a/build_config.rb ++++ b/build_config.rb +@@ -96,7 +96,6 @@ build_type.new(build_name) do |conf| + conf.cc do |cc| + cc.include_paths << "#{`pwd`.strip}/../deps/nanovg/src" + cc.include_paths << "#{`pwd`.strip}/../deps/pugl/" +- cc.include_paths << "#{`pwd`.strip}/../deps/libuv-v1.9.1/include/" + cc.include_paths << "/usr/share/mingw-w64/include/" if windows + cc.include_paths << "/usr/x86_64-w64-mingw32/include/" if windows + cc.flags << "-DLDBL_EPSILON=1e-6" if windows +@@ -117,14 +116,14 @@ build_type.new(build_name) do |conf| + linker.flags_after_libraries << "#{`pwd`.strip}/../deps/pugl/build/libpugl-0.a" + linker.flags_after_libraries << "#{`pwd`.strip}/../deps/libnanovg.a" + if(!windows) +- linker.flags_after_libraries << "#{`pwd`.strip}/../deps/libuv.a" ++ linker.flags_after_libraries << "-luv" + if(ENV['OS'] != "Mac") + linker.libraries << 'GL' + linker.libraries << 'X11' + end + linker.flags_after_libraries << "-lpthread -ldl -lm" + else +- linker.flags_after_libraries << "#{`pwd`.strip}/../deps/libuv-win.a" ++ linker.flags_after_libraries << "-luv" + linker.flags_after_libraries << "-lws2_32 -lkernel32 -lpsapi -luserenv -liphlpapi" + linker.flags_after_libraries << "-lglu32 -lgdi32 -lopengl32" + end diff --git a/pkgs/applications/blockchains/ledger-live-desktop/default.nix b/pkgs/applications/blockchains/ledger-live-desktop/default.nix index 4c64c595fefb7..bb2fc89339933 100644 --- a/pkgs/applications/blockchains/ledger-live-desktop/default.nix +++ b/pkgs/applications/blockchains/ledger-live-desktop/default.nix @@ -2,12 +2,12 @@ let pname = "ledger-live-desktop"; - version = "2.18.0"; + version = "2.19.0"; name = "${pname}-${version}"; src = fetchurl { url = "https://github.com/LedgerHQ/${pname}/releases/download/v${version}/${pname}-${version}-linux-x86_64.AppImage"; - sha256 = "19sx9n5mij68v07vy65h1c16rgbpll3kagr437cjb7r95k3nk2zn"; + sha256 = "13z4v64z58b8fxph3rgjqy1z1y2agmarfr8cihlkf0ndssicasdl"; }; appimageContents = appimageTools.extractType2 { diff --git a/pkgs/applications/blockchains/lndconnect/default.nix b/pkgs/applications/blockchains/lndconnect/default.nix new file mode 100644 index 0000000000000..0d6f33ca3ac8d --- /dev/null +++ b/pkgs/applications/blockchains/lndconnect/default.nix @@ -0,0 +1,25 @@ +{ lib, buildGoPackage, fetchFromGitHub }: +buildGoPackage rec { + pname = "lndconnect"; + version = "0.2.0"; + + goPackagePath = "github.com/LN-Zap/lndconnect"; + + src = fetchFromGitHub { + owner = "LN-Zap"; + repo = pname; + rev = "v${version}"; + sha256 = "0zp23vp4i4csc6x1b6z39rqcmknxd508x6clr8ckdj2fwjwkyf5a"; + }; + + goDeps = ./deps.nix; + + meta = with lib; { + description = "Generate QRCode to connect apps to lnd Resources"; + license = licenses.mit; + homepage = "https://github.com/LN-Zap/lndconnect"; + maintainers = [ maintainers.xwvvvvwx ]; + platforms = platforms.linux; + }; +} + diff --git a/pkgs/applications/blockchains/lndconnect/deps.nix b/pkgs/applications/blockchains/lndconnect/deps.nix new file mode 100644 index 0000000000000..5a31f0d570577 --- /dev/null +++ b/pkgs/applications/blockchains/lndconnect/deps.nix @@ -0,0 +1,129 @@ +[ + { + goPackagePath = "github.com/Baozisoftware/qrcode-terminal-go"; + fetch = { + type = "git"; + url = "https://github.com/Baozisoftware/qrcode-terminal-go"; + rev = "c0650d8dff0f053901ff16185217b950d5e7743c"; + sha256 = "166h9zy9y7ygayhybg7d080hpdcf1mvkf3rwnq5lqg8i3cg71s7b"; + }; + } + { + goPackagePath = "github.com/btcsuite/btcd"; + fetch = { + type = "git"; + url = "https://github.com/btcsuite/btcd"; + rev = "e9a51e8dcd673c563a549676ebd4384b0318a9b7"; + sha256 = "053pdhhycls7cpygg4rhc0y2p937ni4cgxylgxd1zpwffqdjsxrs"; + }; + } + { + goPackagePath = "github.com/btcsuite/btclog"; + fetch = { + type = "git"; + url = "https://github.com/btcsuite/btclog"; + rev = "84c8d2346e9fc8c7b947e243b9c24e6df9fd206a"; + sha256 = "02dl46wcnfpg9sqvg0ipipkpnd7lrf4fnvb9zy56jqa7mfcwc7wk"; + }; + } + { + goPackagePath = "github.com/btcsuite/btcutil"; + fetch = { + type = "git"; + url = "https://github.com/btcsuite/btcutil"; + rev = "063c4115b3a9a7201e82447875383890698abcb6"; + sha256 = "12dpy5ipmd751xb71hcmrl9xyl89r5rflnrvypnz1irairfqwjwm"; + }; + } + { + goPackagePath = "github.com/glendc/go-external-ip"; + fetch = { + type = "git"; + url = "https://github.com/glendc/go-external-ip"; + rev = "c872357d968e33d5d9c47ea2c603f3b411150ecc"; + sha256 = "1h9cdhab4fapa2p1r8sgl1pxv4qi1zskw8x0pj93a81y03zzr2l1"; + }; + } + { + goPackagePath = "github.com/jessevdk/go-flags"; + fetch = { + type = "git"; + url = "https://github.com/jessevdk/go-flags"; + rev = "c17162fe8fd74f119ff938c5c67af63e3bac5ded"; + sha256 = "0byp3f79b0399n7g6nm59afb6gj9cknfqgfqadvpppv7lvnd34jf"; + }; + } + { + goPackagePath = "github.com/lightningnetwork/lnd"; + fetch = { + type = "git"; + url = "https://github.com/lightningnetwork/lnd"; + rev = "fd962d322ae2a913cc357dbb63382f22a9a0a6ce"; + sha256 = "0yj2vqb9qg5v0rbchkpwhhw51rp31z76zchhhbc837sz8l8lryra"; + }; + } + { + goPackagePath = "github.com/mattn/go-colorable"; + fetch = { + type = "git"; + url = "https://github.com/mattn/go-colorable"; + rev = "f6c00982823144337e56cdb71c712eaac151d29c"; + sha256 = "08y5c01bvyqxraj3wc0di80gbp87178rsshb74x0p3m7wwfv82l3"; + }; + } + { + goPackagePath = "github.com/mattn/go-isatty"; + fetch = { + type = "git"; + url = "https://github.com/mattn/go-isatty"; + rev = "cb30d6282491c185f77d9bec5d25de1bb61a06bc"; + sha256 = "0v59mv94acd2m72q8adhigxkx1vn38l5h0d8hp0nxga2v9f3v8kd"; + }; + } + { + goPackagePath = "github.com/miekg/dns"; + fetch = { + type = "git"; + url = "https://github.com/miekg/dns"; + rev = "7a5f1127f7f4e461b7400d6a9df1bc523e7448fd"; + sha256 = "1xwg6zwlxwkm1x121b3idir76h7wr9wmcdmg4vgj9hma903s63md"; + }; + } + { + goPackagePath = "github.com/skip2/go-qrcode"; + fetch = { + type = "git"; + url = "https://github.com/skip2/go-qrcode"; + rev = "da1b6568686e89143e94f980a98bc2dbd5537f13"; + sha256 = "0pghd6y2x8a5fqy4rjn4d8j5jcslb236naycdza5an7vyvinsgs9"; + }; + } + { + goPackagePath = "golang.org/x/crypto"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/crypto"; + rev = "5c72a883971a4325f8c62bf07b6d38c20ea47a6a"; + sha256 = "1cimmqpajys001x6yq8ycklc4w34y7iwrksv7ayv7m7fgzhcjn3d"; + }; + } + { + goPackagePath = "golang.org/x/net"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/net"; + rev = "05aa5d4ee32165add31ddef9d5d3946713e5dc5e"; + sha256 = "1v532mdb32h2gan6lc9ssya2v1lk6nzyzqvxn5nkbxij9x4v1jkl"; + }; + } + { + goPackagePath = "golang.org/x/sys"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/sys"; + rev = "9d91bd62050c7b3011b7df0d2a4daa0042684420"; + sha256 = "0d2jjd7r0zwakd1d2g2qm59w6jc6sgg0sal5gc626i8nn9adj2jg"; + }; + } +] + diff --git a/pkgs/applications/blockchains/monero-gui/default.nix b/pkgs/applications/blockchains/monero-gui/default.nix index fb6753f79a50d..cffbdde8f0036 100644 --- a/pkgs/applications/blockchains/monero-gui/default.nix +++ b/pkgs/applications/blockchains/monero-gui/default.nix @@ -4,6 +4,7 @@ , qtbase, qtdeclarative, qtgraphicaleffects , qtmultimedia, qtxmlpatterns , qtquickcontrols, qtquickcontrols2 +, qtmacextras , monero, miniupnpc, unbound, readline , boost, libunwind, libsodium, pcsclite , randomx, zeromq, libgcrypt, libgpgerror @@ -27,13 +28,13 @@ in stdenv.mkDerivation rec { pname = "monero-gui"; - version = "0.17.1.6"; + version = "0.17.1.8"; src = fetchFromGitHub { owner = "monero-project"; repo = "monero-gui"; rev = "v${version}"; - sha256 = "0kn5wvx2psbdaqmy1cxlbf5l1mdpvh0b6hh9drah3s7nj3654a3r"; + sha256 = "13cjrfdkr7c2ff8j2rg8hvhlc00af38vcs67wlx2109i2baq4pp3"; }; nativeBuildInputs = [ @@ -49,7 +50,8 @@ stdenv.mkDerivation rec { randomx libgcrypt libgpgerror boost libunwind libsodium pcsclite zeromq hidapi rapidjson - ] ++ optionals trezorSupport [ libusb1 protobuf python3 ]; + ] ++ optionals trezorSupport [ libusb1 protobuf python3 ] + ++ optionals stdenv.isDarwin [ qtmacextras ]; postUnpack = '' # copy monero sources here @@ -105,7 +107,6 @@ stdenv.mkDerivation rec { homepage = "https://getmonero.org/"; license = licenses.bsd3; platforms = platforms.all; - badPlatforms = platforms.darwin; maintainers = with maintainers; [ rnhmjoj ]; }; } diff --git a/pkgs/applications/blockchains/monero/default.nix b/pkgs/applications/blockchains/monero/default.nix index 51dedba969bd1..d45f5a2e5ca69 100644 --- a/pkgs/applications/blockchains/monero/default.nix +++ b/pkgs/applications/blockchains/monero/default.nix @@ -17,13 +17,13 @@ assert trezorSupport -> all (x: x!=null) [ libusb1 protobuf python3 ]; stdenv.mkDerivation rec { pname = "monero"; - version = "0.17.1.6"; + version = "0.17.1.8"; src = fetchFromGitHub { owner = "monero-project"; repo = "monero"; rev = "v${version}"; - sha256 = "0b6zyr3mzqvcxf48i2g45gr649x6nhppik5598jsvg0z7i2hxb9q"; + sha256 = "10blazbk1602slx3wrmw4jfgkdry55iclrhm5drdficc5v3h735g"; fetchSubmodules = true; }; diff --git a/pkgs/applications/blockchains/zcash/default.nix b/pkgs/applications/blockchains/zcash/default.nix index 9cccbd7b7e46d..6a8bebf6178e2 100644 --- a/pkgs/applications/blockchains/zcash/default.nix +++ b/pkgs/applications/blockchains/zcash/default.nix @@ -1,39 +1,55 @@ -{ stdenv, libsodium, fetchFromGitHub, wget, pkgconfig, autoreconfHook, openssl, db62, boost17x -, zlib, gtest, gmock, callPackage, gmp, qt4, util-linux, protobuf, qrencode, libevent }: - -let librustzcash = callPackage ./librustzcash {}; -in -with stdenv.lib; -stdenv.mkDerivation rec { +{ rust, rustPlatform, stdenv, lib, fetchFromGitHub, autoreconfHook, makeWrapper +, cargo, pkg-config +, bash, curl, coreutils, boost17x, db62, libsodium, libevent, utf8cpp, util-linux +}: +rustPlatform.buildRustPackage rec { pname = "zcash"; - version = "2.1.1-1"; + version = "4.1.1"; src = fetchFromGitHub { owner = "zcash"; repo = "zcash"; rev = "v${version}"; - sha256 = "1g5zlfzfp31my8w8nlg5fncpr2y95iv9fm04x57sjb93rgmjdh5n"; + sha256 = "185zrw276g545np0niw5hlhlppkjbf5a1r4rwhnbaimdjdii2dil"; }; - patchPhase = '' - sed -i"" 's,-fvisibility=hidden,,g' src/Makefile.am - ''; + cargoSha256 = "0qxr6asf8zsya0f1ri39z2cnfpjk96hgwjchz2c7j87vibbvg6dc"; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; - buildInputs = [ gtest gmock gmp openssl wget db62 boost17x zlib - protobuf libevent libsodium librustzcash ] - ++ optionals stdenv.isLinux [ util-linux ]; + nativeBuildInputs = [ autoreconfHook cargo makeWrapper pkg-config ]; + buildInputs = [ bash boost17x db62 libevent libsodium utf8cpp ]; - configureFlags = [ "--with-boost-libdir=${boost17x.out}/lib" ]; + # Use the stdenv default phases (./configure; make) instead of the + # ones from buildRustPackage. + configurePhase = "configurePhase"; + buildPhase = "buildPhase"; + checkPhase = "checkPhase"; + installPhase = "installPhase"; - postInstall = '' - cp zcutil/fetch-params.sh $out/bin/zcash-fetch-params + postPatch = '' + # Have to do this here instead of in preConfigure because + # cargoDepsCopy gets unset after postPatch. + configureFlagsArray+=("RUST_VENDORED_SOURCES=$NIX_BUILD_TOP/$cargoDepsCopy") ''; + configureFlags = [ + "--disable-tests" + "--with-boost-libdir=${lib.getLib boost17x}/lib" + "CXXFLAGS=-I${lib.getDev utf8cpp}/include/utf8cpp" + "RUST_TARGET=${rust.toRustTargetSpec stdenv.hostPlatform}" + ]; + enableParallelBuilding = true; - meta = { + # Requires hundreds of megabytes of zkSNARK parameters. + doCheck = false; + + postInstall = '' + wrapProgram $out/bin/zcash-fetch-params \ + --set PATH ${lib.makeBinPath [ coreutils curl util-linux ]} + ''; + + meta = with lib; { description = "Peer-to-peer, anonymous electronic cash system"; homepage = "https://z.cash/"; maintainers = with maintainers; [ rht tkerber ]; diff --git a/pkgs/applications/blockchains/zcash/librustzcash/default.nix b/pkgs/applications/blockchains/zcash/librustzcash/default.nix deleted file mode 100644 index 526adc715d45a..0000000000000 --- a/pkgs/applications/blockchains/zcash/librustzcash/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ stdenv, fetchFromGitHub, rustPlatform }: - -rustPlatform.buildRustPackage rec { - pname = "librustzcash"; - version = "0.1.0"; - - src = fetchFromGitHub { - owner = "zcash"; - repo = "librustzcash"; - rev = version; - sha256 = "0d28k29sgzrg9clynz29kpw50kbkp0a4dfdayqhmpjmsh05y6261"; - }; - - cargoSha256 = "1wzyrcmcbrna6rjzw19c4lq30didzk4w6fs6wmvxp0xfg4qqdlax"; - - installPhase = '' - mkdir -p $out/lib - cp $releaseDir/librustzcash.a $out/lib/ - mkdir -p $out/include - cp librustzcash/include/librustzcash.h $out/include/ - ''; - - # The tests do pass, but they take an extremely long time to run. - doCheck = false; - - meta = with stdenv.lib; { - description = "Rust-language assets for Zcash"; - homepage = "https://github.com/zcash/librustzcash"; - maintainers = with maintainers; [ rht tkerber ]; - license = with licenses; [ mit asl20 ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/applications/editors/android-studio/common.nix b/pkgs/applications/editors/android-studio/common.nix index 605d810b3d9c6..cbd156d78e0ee 100644 --- a/pkgs/applications/editors/android-studio/common.nix +++ b/pkgs/applications/editors/android-studio/common.nix @@ -1,4 +1,4 @@ -{ channel, pname, version, build, sha256Hash }: +{ channel, pname, version, build ? null, sha256Hash }: { alsaLib , bash @@ -53,11 +53,13 @@ let drvName = "android-studio-${channel}-${version}"; + filename = "android-studio-" + (if (build != null) then "ide-${build}" else version) + "-linux.tar.gz"; + androidStudio = stdenv.mkDerivation { name = "${drvName}-unwrapped"; src = fetchurl { - url = "https://dl.google.com/dl/android/studio/ide-zips/${version}/android-studio-ide-${build}-linux.tar.gz"; + url = "https://dl.google.com/dl/android/studio/ide-zips/${version}/${filename}"; sha256 = sha256Hash; }; diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix index d94ad070536ae..d1eb7e58ef83d 100644 --- a/pkgs/applications/editors/android-studio/default.nix +++ b/pkgs/applications/editors/android-studio/default.nix @@ -14,14 +14,13 @@ let sha256Hash = "sha256-aAMhhJWcVFdvEZt8fI3tF12Eg3TzlU+kUFMNeCYN1os="; }; betaVersion = { - version = "4.2.0.17"; # "Android Studio 4.2 Beta 1" - build = "202.6987402"; - sha256Hash = "07qr0b1zdzpc1nsi6593518dxp89dcjfp4lznb1d3id8vbqla4i7"; + version = "4.2.0.18"; # "Android Studio 4.2 Beta 2" + build = "202.7008469"; + sha256Hash = "0323i4mcib84z7bsy801640gadd2k8ps7vr9jbdpb6i9gma6klmh"; }; latestVersion = { # canary & dev - version = "2020.3.1.2"; # "Android Studio Arctic Fox Canary 2" - build = "202.7006259"; - sha256Hash = "1d4brfx1fh1vlcjkb0x8hjj2qgz2dl5wbaiy8dj8w03vcf493nc5"; + version = "2020.3.1.3"; # "Android Studio Arctic Fox Canary 3" + sha256Hash = "1nx78j3pqr8qgwprnzfy17w9jmkgiqnlbsw91jnslr9p9fd0ixcx"; }; in { # Attributes are named by their corresponding release channels diff --git a/pkgs/applications/editors/cudatext/default.nix b/pkgs/applications/editors/cudatext/default.nix index af3f087dae263..bcdff1eff1fbf 100644 --- a/pkgs/applications/editors/cudatext/default.nix +++ b/pkgs/applications/editors/cudatext/default.nix @@ -38,13 +38,13 @@ let in stdenv.mkDerivation rec { pname = "cudatext"; - version = "1.115.0"; + version = "1.118.2"; src = fetchFromGitHub { owner = "Alexey-T"; repo = "CudaText"; rev = version; - sha256 = "0q7gfpzc97fvyvabjdb9a4d3c2qhm4zf5bqgnsj73vkly80kgww8"; + sha256 = "0d6f4qfs7vifz7qkw2vkdjgd5w717wfpnxbc4qa4hs4g6y86ywmm"; }; patches = [ @@ -106,6 +106,7 @@ stdenv.mkDerivation rec { Search and replace with RegEx. Extendable by Python plugins and themes. ''; homepage = "http://www.uvviewsoft.com/cudatext/"; + changelog = "http://uvviewsoft.com/cudatext/history.txt"; license = licenses.mpl20; maintainers = with maintainers; [ sikmir ]; platforms = platforms.linux; diff --git a/pkgs/applications/editors/cudatext/deps.json b/pkgs/applications/editors/cudatext/deps.json index 02418d25842dc..fc82ec4b8d150 100644 --- a/pkgs/applications/editors/cudatext/deps.json +++ b/pkgs/applications/editors/cudatext/deps.json @@ -11,18 +11,18 @@ }, "ATFlatControls": { "owner": "Alexey-T", - "rev": "2020.09.20", - "sha256": "09svn8yyqp6znvfpcxrsybkclh828h5rvah7nhbhk7nrfzj8i63x" + "rev": "2020.11.02", + "sha256": "0shihlm1hg74m04qyrj2iic2ik0x7qggihmnylvvdry3y79d07fy" }, "ATSynEdit": { "owner": "Alexey-T", - "rev": "2020.10.12", - "sha256": "07vznwwfa3c1jr1cd32yppw0mmmm1ja9bmsxhxlcbnc2nb30n9zr" + "rev": "6560bc35a2cf31399be8713ac189216afabf9f01", + "sha256": "1bjnd6pcd9ddkvl7ma05z7f8svq609kljwc7gvbszc76hdb8d54x" }, "ATSynEdit_Cmp": { "owner": "Alexey-T", - "rev": "2020.10.11", - "sha256": "11vx685i85izp7wzb34dalcwlkmkbz1vzva5j9cf2yz1jff1v4qw" + "rev": "2459ea2a2e50050f7e6ee59a17a52aae05ca4433", + "sha256": "155cwcmr9f23j4x13pidvb3vcgglawkxxpizjw90ajwhmg831acr" }, "EControl": { "owner": "Alexey-T", @@ -36,8 +36,8 @@ }, "Python-for-Lazarus": { "owner": "Alexey-T", - "rev": "2020.07.31", - "sha256": "0qbs51h6gw8qd3h06kwy1j7db35shbg7r2rayrhvvw0vzr9n330j" + "rev": "2020.10.23", + "sha256": "1lljldqnixlh0j05fh594gccwzkgcxa50byq8wr9ld5ik5sf8khn" }, "Emmet-Pascal": { "owner": "Alexey-T", @@ -51,7 +51,7 @@ }, "bgrabitmap": { "owner": "bgrabitmap", - "rev": "v11.2.4", - "sha256": "1zk88crfn07md16wg6af4i8nlx4ikkhxq9gfk49jirwimgwbf1md" + "rev": "v11.3.1", + "sha256": "1f95rdpfwqy9fipzybi17nbhq46zj45yjps21p2hplhinrr49n2p" } } diff --git a/pkgs/applications/editors/eclipse/default.nix b/pkgs/applications/editors/eclipse/default.nix index 2c175f32d628c..586e2343cd3ef 100644 --- a/pkgs/applications/editors/eclipse/default.nix +++ b/pkgs/applications/editors/eclipse/default.nix @@ -12,13 +12,13 @@ assert stdenv ? glibc; # find the downloads needed for new versions # # to test: -# $ for e in cpp modeling platform sdk java committers; do nix build -f default.nix pkgs.eclipses.eclipse-${e} -o eclipse-${e}; done +# $ for e in cpp modeling platform sdk java committers rcp rust; do nix build -f default.nix pkgs.eclipses.eclipse-${e} -o eclipse-${e}; done let platform_major = "4"; - platform_minor = "17"; + platform_minor = "18"; year = "2020"; - month = "09"; + month = "12"; timestamp = "${year}${month}021800"; gtk = gtk3; in rec { @@ -37,7 +37,7 @@ in rec { src = fetchurl { url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-cpp-${year}-${month}-R-linux-gtk-x86_64.tar.gz"; - sha512 = "270pk7vvfvanig49xkrail01nf967zlp7xf8rvyh2ya7s0y0akj2bi0y4yms4gwijmingm8y2ir9qynd360mzwl8mnc1c31ykf9l3lh"; + sha512 = "MR6ddNmBKyXCyVGlGPfq6K2zJRywy4I5QDXji3rh81eJQ6zkEguo+VvD75i/szg/+FbCVA09vDVV06JgL4SHwQ=="; }; }; @@ -49,7 +49,7 @@ in rec { src = fetchurl { url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-modeling-${year}-${month}-R-linux-gtk-x86_64.tar.gz"; - sha512 = "26bb6cbnw94ml585aqrs8wpfksd2883njlqi48klpbn5n1bwpnpwvymx9q46i49piiyp0r1pa8ghdcgiwcakvri5nzldlh522fs7h5y"; + sha512 = "hSi3IL+fWhlUfEJYv4LFO7WNbZpiofAgNGZbEOIBS0VpeHfJ5Y6UKMKMLfQlG3hlkAL5jg/cEJKb/ad4DxHbjQ=="; }; }; @@ -61,7 +61,7 @@ in rec { src = fetchurl { url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops${platform_major}/R-${platform_major}.${platform_minor}-${timestamp}/eclipse-platform-${platform_major}.${platform_minor}-linux-gtk-x86_64.tar.gz"; - sha512 = "2i3gjxmq1i4p70q2l5749b96z1r4nv15dii17fywbyby3kbggwhfvaydizy7z5p6kn0y91dw13p7gmg3qpr9d46mb8f8h3sxks7fyl9"; + sha512 = "cPRa7ICogpcuwzOlzSSCEcWpwpUhQuIv6lGBKuAu9mOwj7Nz0TPaWVWNqN1541uVRXVTzcWX+mwc2UBPzWUPxg=="; }; }; @@ -86,7 +86,7 @@ in rec { src = fetchurl { url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops${platform_major}/R-${platform_major}.${platform_minor}-${timestamp}/eclipse-SDK-${platform_major}.${platform_minor}-linux-gtk-x86_64.tar.gz"; - sha512 = "1c29r7qwjrjv86q2c4bhlrmmh50690lrq164jzrlisys9vnxb6wii0gwb34p9m1xqr3lgba1zhffb4jx18prrk0x8xbd78mp0lvya3k"; + sha512 = "iN6z5iSJ2bhE1IH3uJj7aiaF/nSIgIAqadvaTBpE4gkgLAXgtfraFAzgcw0zJr5m2u5mULfW45hLkmIXselniQ=="; }; }; @@ -98,7 +98,7 @@ in rec { src = fetchurl { url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-java-${year}-${month}-R-linux-gtk-x86_64.tar.gz"; - sha512 = "3rkpngrk6423i2pcf241wbr9jfzwxm2qwm57ipjpjw6705w1rapcws4bibqjznlf34lqvnynkw2wihy51j1ryw25z9fc2jsvyj67c1q"; + sha512 = "HVqsWUVNNRdcaziGdNI96R9F2VMUE4nYK1VX1G3pK+srFDlkJ7+rj2sZjtWL7WcJR1XSbT03nJJzPyp01RsCvQ=="; }; }; @@ -110,7 +110,7 @@ in rec { src = fetchurl { url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-committers-${year}-${month}-R-linux-gtk-x86_64.tar.gz"; - sha512 = "3gnqamrn3x2gr4dfcgl7ppxpyi1q422l0sm7sh0vmipbs9l1c58plm3p14j9rjsyjlly2xjci6dg7sb9mj6259vc640wafnzcs89ii1"; + sha512 = "UtI4piLNRM3TsM9PzbGgsPqTkiurJ+7Q7jVra45an4YJHtfWcGTxxwUNnRzay6cHT49AjrWtVf1bovWSDXMiQA=="; }; }; @@ -122,7 +122,19 @@ in rec { src = fetchurl { url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-rcp-${year}-${month}-R-linux-gtk-x86_64.tar.gz"; - sha512 = "216g805fgpb7vwbgk36xkf467vijvaa3x0gk4d94pi92d9wdh5dph6wjjr4ka9rvg0pzxxr8y3sgbfqqzqpc82bgiz5qqr93sprh9bj"; + sha512 = "9DqNjSx1Ypdzpt1jIOJ9KFx8y+cG55K6bqkWTqnGjjDr4h4mWSzvGjHGUtFrKl92WRzQZKjNPxzVreDMcUkc/g=="; + }; + }; + + ### Eclipse IDE for Rust Developers + + eclipse-rust = buildEclipse { + name = "eclipse-rust-${platform_major}.${platform_minor}"; + description = "Eclipse IDE for Rust Developers"; + src = + fetchurl { + url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-rust-${year}-${month}-R-linux-gtk-x86_64.tar.gz"; + sha512 = "QbaG1knCMFnVQkPeApcIamJMXPyL8zUQa0ZsTJOuTgU/fD1RiHN7/WS6ax5azzIJhpjEtj2LMU4XV+MwkzResw=="; }; }; diff --git a/pkgs/applications/editors/eclipse/plugins.nix b/pkgs/applications/editors/eclipse/plugins.nix index 43ab2a796ebd7..04b8a1de159a2 100644 --- a/pkgs/applications/editors/eclipse/plugins.nix +++ b/pkgs/applications/editors/eclipse/plugins.nix @@ -255,12 +255,12 @@ rec { cdt = buildEclipseUpdateSite rec { name = "cdt-${version}"; # find current version at https://www.eclipse.org/cdt/downloads.php - version = "10.0.1"; + version = "10.1.0"; src = fetchzip { stripRoot = false; - url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/tools/cdt/releases/10.0/${name}/${name}.zip"; - sha256 = "1smi1yc4l627bb01zp0pcilm6d0hysxk440hy4n55gz3jxilygx5"; + url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/tools/cdt/releases/10.1/${name}/${name}.zip"; + sha256 = "1hbswcar3a5cw20mwrj82w9pvpkvvj6jrvqqf1lincva0r5sl7h8"; }; meta = with stdenv.lib; { @@ -472,12 +472,12 @@ rec { jdt = buildEclipseUpdateSite rec { name = "jdt-${version}"; - version = "4.17"; + version = "4.18"; src = fetchzip { stripRoot = false; - url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-${version}-202009021800/org.eclipse.jdt-${version}.zip"; - sha256 = "16vb88ywqfh0rix5krp2g39yhisv4i797g9c03aayzy5lynqm3ky"; + url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-${version}-202012021800/org.eclipse.jdt-${version}.zip"; + sha256 = "q0O6OE2u0bdz1+nOkzXDrrOOzoEbVaXnejx4lX7uZgk="; }; meta = with stdenv.lib; { diff --git a/pkgs/applications/editors/emacs-modes/elpa-generated.nix b/pkgs/applications/editors/emacs-modes/elpa-generated.nix index b473eb99c3904..ea776ed4cec04 100644 --- a/pkgs/applications/editors/emacs-modes/elpa-generated.nix +++ b/pkgs/applications/editors/emacs-modes/elpa-generated.nix @@ -223,10 +223,10 @@ elpaBuild { pname = "auctex"; ename = "auctex"; - version = "12.3.1"; + version = "13.0.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/auctex-12.3.1.tar"; - sha256 = "0kn48mmsvp1yp8fjcl4lriymhyskv5s70wscmf596xf56s7mqas4"; + url = "https://elpa.gnu.org/packages/auctex-13.0.1.tar"; + sha256 = "1y5q3phd0xr7342i757hr4hic8nad4kkdf1zk56mlj5snwr0g0w7"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -264,16 +264,16 @@ license = lib.licenses.free; }; }) {}; - auto-overlays = callPackage ({ elpaBuild, fetchurl, lib }: + auto-overlays = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }: elpaBuild { pname = "auto-overlays"; ename = "auto-overlays"; - version = "0.10.9"; + version = "0.10.10"; src = fetchurl { - url = "https://elpa.gnu.org/packages/auto-overlays-0.10.9.tar"; - sha256 = "0aqjp3bkd7mi191nm971z857s09py390ikcd93hyhmknblk0v14p"; + url = "https://elpa.gnu.org/packages/auto-overlays-0.10.10.tar"; + sha256 = "0wln6b4j3pd3mhx6sx0bnz74c4n6fidmkg77cqfpxs4j5l1zjp2z"; }; - packageRequires = []; + packageRequires = [ cl-lib ]; meta = { homepage = "https://elpa.gnu.org/packages/auto-overlays.html"; license = lib.licenses.free; @@ -437,10 +437,10 @@ elpaBuild { pname = "chess"; ename = "chess"; - version = "2.0.4"; + version = "2.0.5"; src = fetchurl { - url = "https://elpa.gnu.org/packages/chess-2.0.4.tar"; - sha256 = "1sq1bjmp513vldfh7hc2bbfc54665abqiz0kqgqq3gijckaxn5js"; + url = "https://elpa.gnu.org/packages/chess-2.0.5.tar"; + sha256 = "1a4iwjdh6k348df6qywjws9z9f862d62m0b2sz57z4xhywiyxpr7"; }; packageRequires = [ cl-lib ]; meta = { @@ -685,10 +685,10 @@ elpaBuild { pname = "csv-mode"; ename = "csv-mode"; - version = "1.13"; + version = "1.14"; src = fetchurl { - url = "https://elpa.gnu.org/packages/csv-mode-1.13.tar"; - sha256 = "0g9rj8sgdbzqnqqvhx3022zz665wqam2nlxsbhzz2393cz11y0d2"; + url = "https://elpa.gnu.org/packages/csv-mode-1.14.tar"; + sha256 = "1jz4134pk8dwzsqih9wybx4l9yl244cgcilw8rdnnqmm8i6vxgrp"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -790,10 +790,10 @@ elpaBuild { pname = "dict-tree"; ename = "dict-tree"; - version = "0.14"; + version = "0.16"; src = fetchurl { - url = "https://elpa.gnu.org/packages/dict-tree-0.14.el"; - sha256 = "1k00k3510bgq7rijvrxbx4b7qlq2abq1dyyn51zgm8q0qk68p5jq"; + url = "https://elpa.gnu.org/packages/dict-tree-0.16.tar"; + sha256 = "1myf26g3jjk2v8yp3k2n8m45vi20452wd7w2bja8csfkk0qx3300"; }; packageRequires = [ heap tNFA trie ]; meta = { @@ -805,10 +805,10 @@ elpaBuild { pname = "diff-hl"; ename = "diff-hl"; - version = "1.8.7"; + version = "1.8.8"; src = fetchurl { - url = "https://elpa.gnu.org/packages/diff-hl-1.8.7.tar"; - sha256 = "1qcwicflvm6dxcflnlg891hyzwp2q79fdkdbdwp1440a0j09riam"; + url = "https://elpa.gnu.org/packages/diff-hl-1.8.8.tar"; + sha256 = "10g1333xvki8aw5vhyijkpjn62jh9k3n4a5sh1z69hsfvxih5lqk"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -1026,21 +1026,24 @@ license = lib.licenses.free; }; }) {}; - eglot = callPackage ({ elpaBuild + eglot = callPackage ({ eldoc + , elpaBuild , emacs , fetchurl , flymake ? null , jsonrpc - , lib }: + , lib + , project + , xref }: elpaBuild { pname = "eglot"; ename = "eglot"; - version = "1.6"; + version = "1.7"; src = fetchurl { - url = "https://elpa.gnu.org/packages/eglot-1.6.tar"; - sha256 = "15hd6sx7qrpvlvhwwkcgdiki8pswwf4mm7hkm0xvznskfcp44spx"; + url = "https://elpa.gnu.org/packages/eglot-1.7.tar"; + sha256 = "1zvs144hxq2mmq1h0ynx9hy7yyccb46f3pjg9mgq8v9cw5y678vk"; }; - packageRequires = [ emacs flymake jsonrpc ]; + packageRequires = [ eldoc emacs flymake jsonrpc project xref ]; meta = { homepage = "https://elpa.gnu.org/packages/eglot.html"; license = lib.licenses.free; @@ -1130,10 +1133,10 @@ elpaBuild { pname = "emms"; ename = "emms"; - version = "6.2"; + version = "6.3"; src = fetchurl { - url = "https://elpa.gnu.org/packages/emms-6.2.tar"; - sha256 = "0d95sjrh9vpl41vz26y8clgji987z15lj4ky2kr9yrl0zpa8yv35"; + url = "https://elpa.gnu.org/packages/emms-6.3.tar"; + sha256 = "12cfq503li0gcqmm5bmqz8yjvfdif5xvz0l9vx3g5jl6ljygwgmf"; }; packageRequires = [ cl-lib seq ]; meta = { @@ -1746,10 +1749,10 @@ elpaBuild { pname = "ivy-posframe"; ename = "ivy-posframe"; - version = "0.5.3"; + version = "0.5.5"; src = fetchurl { - url = "https://elpa.gnu.org/packages/ivy-posframe-0.5.3.el"; - sha256 = "03ydfb155p5lak7nw4s79ab9zadwsjw1zggzwxgnlydsqdqbr6l6"; + url = "https://elpa.gnu.org/packages/ivy-posframe-0.5.5.tar"; + sha256 = "184730grclxmlw6nfs41d4g6fvz9c6xnclvwgqx1ii0xm7p9xy95"; }; packageRequires = [ emacs ivy posframe ]; meta = { @@ -1791,10 +1794,10 @@ elpaBuild { pname = "js2-mode"; ename = "js2-mode"; - version = "20190219"; + version = "20201220"; src = fetchurl { - url = "https://elpa.gnu.org/packages/js2-mode-20190219.tar"; - sha256 = "0jgqs7cwykw5ihdq9wp5qc05y6br9gsyfiylqhjq43z59673chcc"; + url = "https://elpa.gnu.org/packages/js2-mode-20201220.tar"; + sha256 = "0zdrp8lap1ijrmsn9jsnvm44b6vxlgh9vcla5ysh1ga95zkjxrwm"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -1847,6 +1850,21 @@ license = lib.licenses.free; }; }) {}; + kiwix = callPackage ({ elpaBuild, emacs, fetchurl, lib, request }: + elpaBuild { + pname = "kiwix"; + ename = "kiwix"; + version = "1.0.1"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/kiwix-1.0.1.tar"; + sha256 = "1dly6pilf71hq3mra9kc63i6iynzkxjmp9gwy0rhnvhq4b4qr01d"; + }; + packageRequires = [ emacs request ]; + meta = { + homepage = "https://elpa.gnu.org/packages/kiwix.html"; + license = lib.licenses.free; + }; + }) {}; kmb = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "kmb"; @@ -2430,10 +2448,10 @@ elpaBuild { pname = "org"; ename = "org"; - version = "9.4"; + version = "9.4.4"; src = fetchurl { - url = "https://elpa.gnu.org/packages/org-9.4.tar"; - sha256 = "1awkrh3y90q7c0as3327rqj0zylf5cpjzr1pyvbzymli16irhwb6"; + url = "https://elpa.gnu.org/packages/org-9.4.4.tar"; + sha256 = "05ma8n6hr10323d85ay8ai0xrpc9q2m93n8avqh7j9fmmb3bhr0b"; }; packageRequires = []; meta = { @@ -2460,10 +2478,10 @@ elpaBuild { pname = "org-translate"; ename = "org-translate"; - version = "0.1.2"; + version = "0.1.3"; src = fetchurl { - url = "https://elpa.gnu.org/packages/org-translate-0.1.2.el"; - sha256 = "1087h6l5d8946dl4bg7g7is5pwc6004l4k9i2qcki4ahglvzdkz4"; + url = "https://elpa.gnu.org/packages/org-translate-0.1.3.el"; + sha256 = "0m52vv1961kf8f1gw8c4n02hxcvhdw3wgzmcxvjcdijfnjkarm33"; }; packageRequires = [ emacs org ]; meta = { @@ -2670,10 +2688,10 @@ elpaBuild { pname = "project"; ename = "project"; - version = "0.5.2"; + version = "0.5.3"; src = fetchurl { - url = "https://elpa.gnu.org/packages/project-0.5.2.el"; - sha256 = "181hls4phhj8kgpfcky6h0mgzpl9xj616abvcvx8mrn4nmpyh655"; + url = "https://elpa.gnu.org/packages/project-0.5.3.el"; + sha256 = "0cpf69m41h8gfcqnq72h11925zdk35b7hw7bfy83xm83xwp12rxx"; }; packageRequires = [ emacs xref ]; meta = { @@ -2715,10 +2733,10 @@ elpaBuild { pname = "python"; ename = "python"; - version = "0.27"; + version = "0.27.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/python-0.27.el"; - sha256 = "03k527p1jp47hmm7rmld3cn9dls1smyspvgii2xn95jfvrp9klvv"; + url = "https://elpa.gnu.org/packages/python-0.27.1.el"; + sha256 = "0jygl2w8x73v22w0rzq75i2hnm3f46dzgg5x1ckz720nznvwwkka"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -3040,10 +3058,10 @@ elpaBuild { pname = "rt-liberation"; ename = "rt-liberation"; - version = "1.31"; + version = "2.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/rt-liberation-1.31.tar"; - sha256 = "0qqqqwdkb0h8137rqsr08179skl1475cg4hl7a987rmccys0j83c"; + url = "https://elpa.gnu.org/packages/rt-liberation-2.1.tar"; + sha256 = "1ahl1ys72rvqs2bf9zv9648h65fx0283ibqlk1b8ayahc04w6qbl"; }; packageRequires = []; meta = { @@ -3076,10 +3094,10 @@ elpaBuild { pname = "scanner"; ename = "scanner"; - version = "0.1"; + version = "0.2"; src = fetchurl { - url = "https://elpa.gnu.org/packages/scanner-0.1.tar"; - sha256 = "0hv4w7yzfdnz8vrfhw6i6agj9hs09vzsqr63nrp6dd93q0gk71mw"; + url = "https://elpa.gnu.org/packages/scanner-0.2.tar"; + sha256 = "1nbfpgndjkv7mr81bxy58k4y13lc4cidyz9mbwh7433r8rfhymb5"; }; packageRequires = [ dash emacs ]; meta = { @@ -3147,21 +3165,6 @@ license = lib.licenses.free; }; }) {}; - shell-command-plus = callPackage ({ elpaBuild, emacs, fetchurl, lib }: - elpaBuild { - pname = "shell-command-plus"; - ename = "shell-command+"; - version = "2.0.0"; - src = fetchurl { - url = "https://elpa.gnu.org/packages/shell-command+-2.0.0.tar"; - sha256 = "1l8lwami4rbp94sbb1k4dvv7z0dvf51s0992xragpn9b9jbx5qd6"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://elpa.gnu.org/packages/shell-command+.html"; - license = lib.licenses.free; - }; - }) {}; shen-mode = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "shen-mode"; @@ -3545,10 +3548,10 @@ elpaBuild { pname = "tramp"; ename = "tramp"; - version = "2.4.4.4"; + version = "2.5.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/tramp-2.4.4.4.tar"; - sha256 = "1f2d02xz3kpy50186wcy688lx76dv0gmrbkj2qdvifcwhyc26sz8"; + url = "https://elpa.gnu.org/packages/tramp-2.5.0.tar"; + sha256 = "1jpnqyk108nksaym2b9v243y5zkpr4px9d070wsb9cwm3xrcd8rh"; }; packageRequires = [ emacs ]; meta = { @@ -3590,10 +3593,10 @@ elpaBuild { pname = "trie"; ename = "trie"; - version = "0.4"; + version = "0.5"; src = fetchurl { - url = "https://elpa.gnu.org/packages/trie-0.4.el"; - sha256 = "0869fh3bghxil94wd9vgbb5bk1hx2qkh75vbvp0psmcima8dgzgw"; + url = "https://elpa.gnu.org/packages/trie-0.5.tar"; + sha256 = "1qbzxw7h3p3k3r3fzq66pj223vjiw20dvaljkb8w3r5q16fnav3p"; }; packageRequires = [ heap tNFA ]; meta = { @@ -3704,10 +3707,10 @@ elpaBuild { pname = "vcard"; ename = "vcard"; - version = "0.1"; + version = "0.2.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/vcard-0.1.tar"; - sha256 = "1awcm2s292r2nkyz5bwjaga46jsh5rn92469wrg1ag843mlyxbd0"; + url = "https://elpa.gnu.org/packages/vcard-0.2.1.tar"; + sha256 = "0nfrh1mz2h7h259kf7sj13z30kmjywfvs83ax5qjkfwxhqm03abf"; }; packageRequires = [ emacs ]; meta = { @@ -4074,10 +4077,10 @@ elpaBuild { pname = "xref"; ename = "xref"; - version = "1.0.3"; + version = "1.0.4"; src = fetchurl { - url = "https://elpa.gnu.org/packages/xref-1.0.3.el"; - sha256 = "1r531gl73y1br8g4n77gxbyj26yiaw7snjad21fgs5m80cka8fi3"; + url = "https://elpa.gnu.org/packages/xref-1.0.4.el"; + sha256 = "0hkm59qqlsfw3w9ws9xhpmmz30ylifmh05a00ba58zvv1kz04x1g"; }; packageRequires = [ emacs ]; meta = { diff --git a/pkgs/applications/editors/emacs-modes/emacs2nix.nix b/pkgs/applications/editors/emacs-modes/emacs2nix.nix index b4b9adfa619e5..e29a19713bdd9 100644 --- a/pkgs/applications/editors/emacs-modes/emacs2nix.nix +++ b/pkgs/applications/editors/emacs-modes/emacs2nix.nix @@ -4,8 +4,8 @@ let src = pkgs.fetchgit { url = "https://github.com/ttuegel/emacs2nix.git"; fetchSubmodules = true; - rev = "798542b34dc8d7f5c110119350bd9bafef9f8439"; - sha256 = "1lna9z90sxjnanggjh2si018cfzp60xsrissnv9bbkc8wish1537"; + rev = "b815a9323c1f58f6c163a1f968939c57a8b6cfa0"; + sha256 = "183xlmhjmj4z2zssc0pw990h7bf3bam8zqswnf1zcsyp8z7yrl5g"; }; in pkgs.mkShell { diff --git a/pkgs/applications/editors/emacs-modes/melpa-packages.nix b/pkgs/applications/editors/emacs-modes/melpa-packages.nix index 5a02c97b6d01d..e7bd38f67b0de 100644 --- a/pkgs/applications/editors/emacs-modes/melpa-packages.nix +++ b/pkgs/applications/editors/emacs-modes/melpa-packages.nix @@ -143,11 +143,6 @@ let flycheck-rtags = fix-rtags super.flycheck-rtags; - gnuplot = super.gnuplot.overrideAttrs (old: { - nativeBuildInputs = - (old.nativeBuildInputs or [ ]) ++ [ pkgs.autoreconfHook ]; - }); - pdf-tools = super.pdf-tools.overrideAttrs (old: { nativeBuildInputs = [ external.pkgconfig ]; buildInputs = with external; old.buildInputs ++ [ autoconf automake libpng zlib poppler ]; diff --git a/pkgs/applications/editors/emacs-modes/org-generated.nix b/pkgs/applications/editors/emacs-modes/org-generated.nix index 23d36573bc2b3..d2dc41bcf044c 100644 --- a/pkgs/applications/editors/emacs-modes/org-generated.nix +++ b/pkgs/applications/editors/emacs-modes/org-generated.nix @@ -4,10 +4,10 @@ elpaBuild { pname = "org"; ename = "org"; - version = "20201207"; + version = "20201228"; src = fetchurl { - url = "https://orgmode.org/elpa/org-20201207.tar"; - sha256 = "0hryicg3nbvc17ypwdcx08kl8samd979388hw7jwbp5sw3v95y0c"; + url = "https://orgmode.org/elpa/org-20201228.tar"; + sha256 = "0rv98v3zbdbc4yfq9mymrxrcj422xpfhvw31xrspydwgpxqgsf99"; }; packageRequires = []; meta = { @@ -19,10 +19,10 @@ elpaBuild { pname = "org-plus-contrib"; ename = "org-plus-contrib"; - version = "20201207"; + version = "20201228"; src = fetchurl { - url = "https://orgmode.org/elpa/org-plus-contrib-20201207.tar"; - sha256 = "07xmnxrn63ini3c8hfrgv13b28dh91x2lpf875fhi5wz70w0a9s4"; + url = "https://orgmode.org/elpa/org-plus-contrib-20201228.tar"; + sha256 = "0libzh2a51m9l0kb01zjw2fai2nbxqw9r01i8fkjy94hq0lbw7cc"; }; packageRequires = []; meta = { diff --git a/pkgs/applications/editors/emacs-modes/recipes-archive-melpa.json b/pkgs/applications/editors/emacs-modes/recipes-archive-melpa.json index a8d79b3d8cad0..18b7852158677 100644 --- a/pkgs/applications/editors/emacs-modes/recipes-archive-melpa.json +++ b/pkgs/applications/editors/emacs-modes/recipes-archive-melpa.json @@ -1110,20 +1110,20 @@ "auto-complete", "rtags" ], - "commit": "63a7d9b733def9fe76568f81321a65a450829575", - "sha256": "1nnjhfz7xm1ax38xkz0jvgzhfczlc4r9xlpzc24sisabkvlkivyw" + "commit": "39339388256df662d0084b4a094d03e52748f9e8", + "sha256": "0wp4mygsxzibra2p3m5rn9m0yd3fscd795k5xa0wxi5pwddv7dlg" }, "stable": { "version": [ - 2, - 38 + 3, + 23 ], "deps": [ "auto-complete", "rtags" ], - "commit": "9687ccdb9e539981e7934e768ea5c84464a61139", - "sha256": "1r6l7dgr2ch586zrdi5l8fhdj4qdva8ldz7cjvi2byc2pd2xs8rx" + "commit": "7169ed577d676690a3c6f0025b54e8477d80eacf", + "sha256": "1i94dizg3wvkvq8c2pf5bzkx8zwzcfi4p3l73c779y145bygssnq" } }, { @@ -1871,8 +1871,8 @@ "annotation", "eri" ], - "commit": "fdace3b9c446a1d621858dc343f5ed80422d0ea1", - "sha256": "0gx3a0gcr9x9zzgr1xa4lgwl0zwcqhmxn8gscmyspbx6dj4akvg0" + "commit": "c45dc6b2729a53653df2874b6ea8b3500793da78", + "sha256": "03a49iifi5dl2fcsi288l68frmga3qiw2prd0vfr9xzmyqmfaz6z" }, "stable": { "version": [ @@ -1899,8 +1899,8 @@ "deps": [ "dash" ], - "commit": "2d65d925318006e2f6fa261ad192fbc2d212877b", - "sha256": "0x4630lz9s59hidpf4pqc3697fgd09ac3zjax0xq3kk1993hrpa2" + "commit": "4a620e62b5e645a48b0a818bf4eb19daea4977df", + "sha256": "0gy8x78av6z6hp5jccz7pnh6n0fnpfs5vfhfbxggj2qjfyxbvw1r" } }, { @@ -1953,11 +1953,11 @@ "repo": "takaxp/ah", "unstable": { "version": [ - 20191212, - 652 + 20201213, + 218 ], - "commit": "3ca848bcf1fc4c18b4a5329d1439c5effb7dcb97", - "sha256": "1lgxwhq5359qrn3zv5m9sssz93vbqa6bp49z526pck1bkf80s3vx" + "commit": "869219e7853510aeb00af3580aede0e5d49b324a", + "sha256": "02i6nrkbqf1bj2m4h81p5z1mi9lm92g9vm1mi6qny83zs64m2607" } }, { @@ -2398,14 +2398,14 @@ "repo": "seagle0128/all-the-icons-ibuffer", "unstable": { "version": [ - 20201027, - 758 + 20201218, + 356 ], "deps": [ "all-the-icons" ], - "commit": "c41e12033712969bfa2e3e9f1c62feae866a48ac", - "sha256": "0v8vqgblqf1yq3rgr3lxnzjqq22lvmkjhgpd78acxd6ivq8fzqs4" + "commit": "0260cd194d150126bcb81823742ab53036942c73", + "sha256": "1snxbi5wv5qa78vx487rdrarpydrabxz3s6a9ck54wkf91mkbcvv" }, "stable": { "version": [ @@ -2460,15 +2460,15 @@ "repo": "seagle0128/all-the-icons-ivy-rich", "unstable": { "version": [ - 20200811, - 838 + 20201215, + 1647 ], "deps": [ "all-the-icons", "ivy-rich" ], - "commit": "6428cb39729b7290368c5b95f563a320c98f972d", - "sha256": "0b9d1cs39j8x238s14b1smrhanapwai123dvpplmgb07wmrwwwwg" + "commit": "6eb63a158cd5e1b47635704ebdd3e010e7b914f8", + "sha256": "1xvcgylx2h9mrpm56icqsflyxvy88mprgxrs6byhkvkm3p7jzin2" }, "stable": { "version": [ @@ -2979,8 +2979,8 @@ "repo": "davidshepherd7/anki-mode", "unstable": { "version": [ - 20200703, - 736 + 20201223, + 719 ], "deps": [ "dash", @@ -2988,8 +2988,8 @@ "request", "s" ], - "commit": "3918e4f7b2f14e485cc3acc927abe6563695963f", - "sha256": "16fx2w1nz6jxsrc9naykah3valab46xnwsmjz5lm9zl38g4ypyna" + "commit": "d9b84028cd6a1ae040fb5604080a8b5fa8138562", + "sha256": "0imx5g615lfz71jjrb3hm84ll8p0bkrfi6w1qwxjsqgrwbw77s14" }, "stable": { "version": [ @@ -3064,11 +3064,11 @@ "repo": "bastibe/annotate.el", "unstable": { "version": [ - 20201123, - 1732 + 20201216, + 1526 ], - "commit": "9320918b91c5ab3ee63f812a0479423233f95821", - "sha256": "16xffyf3ch7l644r50pdk7s82mppxhp5v7kz6m47gz81nnyd8kis" + "commit": "44ac24f63dab3a5e052248d384082414b7af5f1d", + "sha256": "1np5kqfdxaq76gs6fwrlqv5sv6ii1w6f6rbp74j9hsir34kfpbv7" }, "stable": { "version": [ @@ -3106,8 +3106,8 @@ 20200914, 644 ], - "commit": "fdace3b9c446a1d621858dc343f5ed80422d0ea1", - "sha256": "0gx3a0gcr9x9zzgr1xa4lgwl0zwcqhmxn8gscmyspbx6dj4akvg0" + "commit": "c71681368fdedcc83a136b4dc7b01e08b8a938ba", + "sha256": "1i9xp35vrksmalrr0y0ybsrb9qxxwyzgxhxz297488czxw8cfvz0" }, "stable": { "version": [ @@ -3512,6 +3512,21 @@ } }, { + "ename": "apparmor-mode", + "commit": "6dece118970184e7fc2cfd3e26f97f2028d7f5f2", + "sha256": "1ilp4srliacwgvzkbkky6ka0p60ni6v4na270iniklmjglbbs5f0", + "fetcher": "github", + "repo": "alexmurray/apparmor-mode", + "unstable": { + "version": [ + 20201213, + 1118 + ], + "commit": "8c0c20b6896bba65c7f6cfe0a21e22b21a12c5f9", + "sha256": "1pr2qpvwfmqd0qysbdvaz0r0y7zznifridy0jyd8lwkddyi8jypf" + } + }, + { "ename": "apples-mode", "commit": "5ca765a6a2f312f585624ec8b82dc9eb6b9bbc0c", "sha256": "05ssnxs9ybc26jhr69xl9jpb41bz1688minmlc9msq2nvyfnj97s", @@ -3727,15 +3742,14 @@ "repo": "stardiviner/arduino-mode", "unstable": { "version": [ - 20200819, - 103 + 20201231, + 214 ], "deps": [ - "cl-lib", "spinner" ], - "commit": "16955f579c5caca223c0ba825075e3573dcf2288", - "sha256": "1vf3ahvs81i0fa3rbwz3i67ahf3x169pv879p5igxk93xf6whqnp" + "commit": "10af99792c8e4b97ea542c55bfed246781fdd1ba", + "sha256": "1gz4hmmijlilqqh7scyidh5kbbmyvq12dhnjgnn9h6y9q5qabibq" } }, { @@ -4470,15 +4484,15 @@ "repo": "auto-complete/auto-complete", "unstable": { "version": [ - 20201011, - 1341 + 20201213, + 1255 ], "deps": [ "cl-lib", "popup" ], - "commit": "51a2ea092d280ec4956dc4a104467f8b83b5e0de", - "sha256": "0hp0z6s2a6y7gkwjarihqdlx897p4ji1ddz3a5167whp3wb2dfrn" + "commit": "6bbb6c7ab8e5aa2d389807fce65bbc5ce7065900", + "sha256": "0cxs9is3ifn9grqaw50dvpsjkkmwh398a6lqc93fny7p6d1hd9ja" }, "stable": { "version": [ @@ -5248,8 +5262,8 @@ 20190331, 2230 ], - "commit": "d5909f4e237c27f638ef06725d04dd17f72d4740", - "sha256": "1bknlb9p576f0xrghh4paa23xkiyzlmlv97fr308mwwqs2g8d7ck" + "commit": "5bb073fe751d6a839e33c4a7fd043be16a3dbeb2", + "sha256": "0pyjds57kc0y1h6qligxzdx7m61wxzv57bp7al5cvqlg225dswa0" } }, { @@ -5340,11 +5354,11 @@ "repo": "avkoval/avk-emacs-themes", "unstable": { "version": [ - 20201120, - 1316 + 20201223, + 750 ], - "commit": "d35a50520c0ddfcf04a0d72eb64fead68039e8d8", - "sha256": "15n2vqz6apfrb9bn48989knzyffjzp30100x4q96pk2xic1zixri" + "commit": "d5471776c01a2bdf2a1fa255a79447489cf68e65", + "sha256": "1m1s7fzl8hxzkx0672l62jpkak0v8vdyb7l6nmw9648rww78gzyl" } }, { @@ -5355,14 +5369,14 @@ "repo": "abo-abo/avy", "unstable": { "version": [ - 20200624, - 1148 + 20201226, + 1734 ], "deps": [ "cl-lib" ], - "commit": "bbf1e7339eba06784dfe86643bb0fbddf5bb0342", - "sha256": "0jmjjckrmivfy2r527vynq9x0mzwcgcyclydar9fa2xb1wn669pd" + "commit": "e92cb37457b43336b765630dbfbea8ba4be601fa", + "sha256": "1w7421h9arxj39w4q3000avcbasl1c95r0hys7rchmlbkqas32cb" }, "stable": { "version": [ @@ -5572,11 +5586,11 @@ "url": "https://bitbucket.org/pdo/axiom-environment", "unstable": { "version": [ - 20201118, - 1816 + 20201212, + 1109 ], - "commit": "9ef86ca16098050da4362f5aadaea64b0a093fc1", - "sha256": "0hyaa1nskm95scypdpbndmmdasq6cas85y6i2q1f8nq8a3qd5585" + "commit": "47d6dffc29286badb2b1d7143b219e5c1be15bdb", + "sha256": "1dppyda9jkwh6fj8m4kziq84w0b5yzxrhq87jhkv54jjra6yxbb4" } }, { @@ -5602,11 +5616,11 @@ "repo": "juergenhoetzel/babel", "unstable": { "version": [ - 20181201, - 919 + 20201210, + 1626 ], - "commit": "c25dedb5c7f2465b122102f02cd9845668818c20", - "sha256": "1ydb8zbg8n56wf5hb8i3i2s40mspqfkszfdd8v8jjqb5wm8q32rc" + "commit": "5db131f1edb85a31202fd77ed2fb8f68c0233845", + "sha256": "0s1p3w62hmpk1ifr0ciwhxfwdi5m48qqr4glqqbkfbhr8yv60r2h" }, "stable": { "version": [ @@ -6229,22 +6243,22 @@ }, { "ename": "bbdb-csv-import", - "commit": "76ac7178ee5381e08ae881f3fc6061106eeb1c1d", - "sha256": "0r7pc2ypd1ydqrnvcqmsg69rm047by7k0zhm563538ra82597wnm", - "fetcher": "gitlab", - "repo": "iankelling/bbdb-csv-import", + "commit": "950d78ae6586db7572291a21fa6fa3ef05259bfc", + "sha256": "0qy78yh4xyfah5wcndqly5rnddcdzj0yq2xh91vh39vhkl53kkgr", + "fetcher": "git", + "url": "https://git.sr.ht/~iank/bbdb-csv-import", "unstable": { "version": [ - 20180122, - 49 + 20140802, + 1142 ], "deps": [ "bbdb", "dash", "pcsv" ], - "commit": "dbc2e0fe9e8ae65e494011044d905ae79b3cee3e", - "sha256": "0n52arydcsmarkpqqwxvw686cypl7iz73kzizirdjhcqmzimx9pl" + "commit": "dc9e722d1c1fcd55b71625ee3f05a4921851d186", + "sha256": "0jkrznrfdh562bwy0adg1pzmqh6i766b5ki41g4pr9wcbmh937sn" } }, { @@ -6378,26 +6392,28 @@ "repo": "Sodaware/beeminder.el", "unstable": { "version": [ - 20200610, - 2311 + 20201227, + 1533 ], "deps": [ - "org" + "org", + "seq" ], - "commit": "8f86ae34ebd17324d98146a2b3a532d56dd1cdd0", - "sha256": "0jw62l1nnnnz4gr7jrk10jlf8ayjngyx9wm97fd339spiygld5pr" + "commit": "161d9c94c594614a01cb08219693d9e000af4f69", + "sha256": "0cfjrn4hkpxhmg07kdff6ifvv1aqaq6dah5bvdc0xhzlqznx72j4" }, "stable": { "version": [ 1, - 1, + 2, 0 ], "deps": [ - "org" + "org", + "seq" ], - "commit": "3e95a669474e27cd51a16caea030456377f83062", - "sha256": "1bj9yzjvglnb0f4glh8fg478xlm5nqmd9jqm1casdj5m30i4kafn" + "commit": "161d9c94c594614a01cb08219693d9e000af4f69", + "sha256": "0cfjrn4hkpxhmg07kdff6ifvv1aqaq6dah5bvdc0xhzlqznx72j4" } }, { @@ -6595,11 +6611,11 @@ "repo": "gilbertw1/better-jumper", "unstable": { "version": [ - 20201008, - 2001 + 20201230, + 2104 ], - "commit": "fe548d22c9228b60d9c8a2a452a6c2e03dfdf238", - "sha256": "0zcm80z3fq5185p676rcpdbhib2d6267j0jqp1wjj88pszyc035i" + "commit": "e3a6546aa626b9a79ae451c88f44cf26f9d1a919", + "sha256": "0pijmc496m1mlzhny8zzklh5idpkipv552h8774rkdsn0c6d9jna" } }, { @@ -6868,8 +6884,8 @@ "parsebib", "s" ], - "commit": "8d84d8beb3bfafaa060d7e956fcc569ecf010d9c", - "sha256": "1fnhi9dwq99jva3fmjknzlsklpm379ks8am7076xchv35609rgix" + "commit": "1bb81d77e08296a50de7ebfe5cf5b0c715b7f3d6", + "sha256": "1n5539hivg65gkr041mq8h96bn489fhvbxrh1manxacf6xi6b2am" }, "stable": { "version": [ @@ -7068,14 +7084,14 @@ "repo": "rnkn/binder", "unstable": { "version": [ - 20201208, - 1429 + 20201222, + 1603 ], "deps": [ "seq" ], - "commit": "bc63f9fdfe10fcf799abab3f8d8deb38c51e9f80", - "sha256": "1wcwb3m5i4z1dkkcj8xl1rlkkbf9scyx0mpdhi086dw70afrqwy3" + "commit": "8a10a66116797e132b19f57026a1976753d332e9", + "sha256": "0qjrcvmmhirzw08r81jnxl79kmgiwwhjnvif16amkf1l8r8qiawq" }, "stable": { "version": [ @@ -8102,25 +8118,25 @@ "repo": "plandes/bshell", "unstable": { "version": [ - 20190617, - 238 + 20201219, + 139 ], "deps": [ "buffer-manage" ], - "commit": "5cdffa393ec3f923736bc6459bc958829a321327", - "sha256": "0nfj00fgg7lsd5201qds7pniyn9lbnmmdbps5lkiqmbp6phksba9" + "commit": "469c841f19f28c271b4f172b40f3f9ca830254df", + "sha256": "0hchii00gi2cpzmb8n8r7dh6fr4x8x5p2n6c5d62wxwm6wpppyzp" }, "stable": { "version": [ 0, - 9 + 10 ], "deps": [ "buffer-manage" ], - "commit": "8d359f8a76749dcd5ca046b280a11fdb3f87cd23", - "sha256": "10nidam7zyqxc085v6f4mzz5d62p92k88vvcrv95i1sbzma7lz4f" + "commit": "469c841f19f28c271b4f172b40f3f9ca830254df", + "sha256": "0hchii00gi2cpzmb8n8r7dh6fr4x8x5p2n6c5d62wxwm6wpppyzp" } }, { @@ -8260,27 +8276,27 @@ "repo": "plandes/buffer-manage", "unstable": { "version": [ - 20191015, - 1730 + 20201221, + 122 ], "deps": [ "choice-program", "dash" ], - "commit": "4fd0e6f9f3da31bc805be2000adf2c91088dd39b", - "sha256": "1an2w2s2xnmcj2knnax4mpv4wzcq31bvqcbhwasm39yzjlz7j5s9" + "commit": "800f22e024a2f364ac69d9efddd25ea0ac7c49c0", + "sha256": "04bpqd8rrg32y0z912d6x5bb55asp47vh6lnlwbs5ia0q53fqkgd" }, "stable": { "version": [ 0, - 10 + 12 ], "deps": [ "choice-program", "dash" ], - "commit": "f21bac39b3c890704a7b1b50e8d6bc39e6417a3d", - "sha256": "0hs3glwwp1b0i1gxp0ypyjwaw8pyi26a66y9dqv7sz0xsvnm3zbs" + "commit": "800f22e024a2f364ac69d9efddd25ea0ac7c49c0", + "sha256": "04bpqd8rrg32y0z912d6x5bb55asp47vh6lnlwbs5ia0q53fqkgd" } }, { @@ -8321,8 +8337,8 @@ "deps": [ "cl-lib" ], - "commit": "4a4ccb0d6916c3e9fba737bb7b48e8aac921954e", - "sha256": "1rg6iwswi82w8938pavwhvvr2z3ismb42asam2fkad47h2sgn0gz" + "commit": "bc84c2f79a33609cccf3c996101125859b2e26ab", + "sha256": "0xw3fs8v3ciw0kvdb2nvs4wk5fjpl012hisv9ypx0nhszzyggrs6" } }, { @@ -8411,8 +8427,8 @@ "repo": "alphapapa/bufler.el", "unstable": { "version": [ - 20201108, - 1800 + 20201226, + 2149 ], "deps": [ "dash", @@ -8421,8 +8437,8 @@ "magit-section", "pretty-hydra" ], - "commit": "d623605be961316be378ffcd1e97a85069f2f7cc", - "sha256": "0vysawxmzvdnk7s5i44644pvi5y6gxyvbnspn45vl8y0ifddv2g2" + "commit": "097f4349920215bdd829fceabc1afdbba172c32a", + "sha256": "1a4y3p7cwygw09b9f9j9m821aiyjiji55mrm83pvv0xzc9rhwd3h" }, "stable": { "version": [ @@ -8637,14 +8653,14 @@ "repo": "alphapapa/burly.el", "unstable": { "version": [ - 20201118, - 1308 + 20201211, + 58 ], "deps": [ "map" ], - "commit": "7c03d63500b3164d157f5760619e25d731d68802", - "sha256": "1jxrbw9p5i7x0q8v0gy5w0nb4c1mxr274qjdb3ipdggfh6amzl29" + "commit": "291c2b34eee255f64c0fd889b67dc11a3b69ef12", + "sha256": "0a9k47xn9fhhw6rl73gri2ykzag5c68drfc7c4r0f1nqp61smkkv" }, "stable": { "version": [ @@ -9254,21 +9270,21 @@ "repo": "chenyanming/calibredb.el", "unstable": { "version": [ - 20201115, - 617 + 20201225, + 854 ], "deps": [ "dash", "s", "transient" ], - "commit": "3f4ed7868bed75f633a8bc86909251a7b070dd55", - "sha256": "09j387rb8hdf5a0ivdr5mkwkcalvl2m9fvd99gjcrylby5xa25zw" + "commit": "1f38fc34a8c159846450d18b1ee50cc960349ee7", + "sha256": "18m8g9scjllckq1c71z2dl1khgjq02d65vjakxbiyp0c049f40mq" }, "stable": { "version": [ 2, - 7, + 8, 0 ], "deps": [ @@ -9276,8 +9292,8 @@ "s", "transient" ], - "commit": "4cd701c0ae63fb7c0bd6326b1acbaefaeb9d705a", - "sha256": "1w3kz9iny72gk54jdafz8sy5sv6hnpm3rw4fn1r8aznx4p00f9dy" + "commit": "a62d7de582b16490b1af5add7b24a67022be531b", + "sha256": "19gc05k2p1l8wlkrqij9cw6d61hzknd6a9n64kzlpi87cpbav3lv" } }, { @@ -9459,15 +9475,15 @@ "repo": "kwrooijen/cargo.el", "unstable": { "version": [ - 20200826, - 1537 + 20201213, + 1943 ], "deps": [ "markdown-mode", "rust-mode" ], - "commit": "91ccfef6e36ff9e96352a03c4a057b5ee181438d", - "sha256": "1hyz834hwashcxpv5kxlzn3n0h7a50lniwdwrb62390d0x8pm6vy" + "commit": "b18e1ecc7ef4b0d813ad6775af00f1297efd2804", + "sha256": "04zxafczac13lygdh05glrgqks5zn2l1aajckjcla7ad6naknmar" }, "stable": { "version": [ @@ -9935,15 +9951,15 @@ "repo": "ema2159/centaur-tabs", "unstable": { "version": [ - 20201129, - 1538 + 20201213, + 949 ], "deps": [ "cl-lib", "powerline" ], - "commit": "b172646b49d00c7e11fe4a4eaa80bbf026e58ab5", - "sha256": "0g24drzxrdd84kz4dsvawj25wb3v92aanhixvdnpkkwq71clcq3r" + "commit": "23eda0a0292a84c7e0a0aa2b598f9e29c7e5b54f", + "sha256": "1zk0vf7yckv3zaws9z0svgbkvs94b2js1r9vjl6pxgxa2qc0khd6" }, "stable": { "version": [ @@ -9996,11 +10012,11 @@ "repo": "abo-abo/centimacro", "unstable": { "version": [ - 20140306, - 1427 + 20201225, + 1132 ], - "commit": "1b97a9b558ed9c49d5da1bfbf29b2506575c2742", - "sha256": "0zqrpaq9c3lm12jxnvysh8f3m3193k22zaj0ycscdqd1jpq4wcgh" + "commit": "0149877584b333c4f1953f0767f0cae23881b0df", + "sha256": "0w1qzn3jrxl7f6nrycpybx8jyz570yr58ayrf5nj6b3kj0v9n5cb" } }, { @@ -10070,8 +10086,8 @@ 20171115, 2108 ], - "commit": "bf0858085ae6afc02f87573a77ff4795517fd288", - "sha256": "0rch5z0mnv98bvc7w7p48pj1w7lgnwgfh4zy6n097vkbwp4lfcjg" + "commit": "412acbdcff7c296f5980ad26e66a7b9235059035", + "sha256": "077rv9hv52rl3hdm3s3csf9wxgjvmd28ndyjwfn3fgshriwhh9dr" }, "stable": { "version": [ @@ -10124,27 +10140,27 @@ "repo": "plandes/cframe", "unstable": { "version": [ - 20190616, - 1946 + 20201222, + 1930 ], "deps": [ "buffer-manage", "dash" ], - "commit": "38026cbd004231c5525bea31723ced39311bb408", - "sha256": "1j5g1gdd1fhqfwxgjjvy7ywhb3cfvdl5rxlklacy5qfs4dva8z06" + "commit": "38544521e82befc06e397123a118dd96dda2c6b6", + "sha256": "04bgmh4rknfkfash1igav55hflkkrnkchbph6z61w36dqam06381" }, "stable": { "version": [ 0, - 1 + 4 ], "deps": [ "buffer-manage", "dash" ], - "commit": "bb99672502046e87c8f029ce98c637f762a4fc54", - "sha256": "088px3wlvr4km913y7hajrjqnxnv6n325rk6353bkbah2d75vxq4" + "commit": "38544521e82befc06e397123a118dd96dda2c6b6", + "sha256": "04bgmh4rknfkfash1igav55hflkkrnkchbph6z61w36dqam06381" } }, { @@ -10155,29 +10171,30 @@ "repo": "Alexander-Miller/cfrs", "unstable": { "version": [ - 20191125, - 2007 + 20201227, + 1135 ], "deps": [ "dash", "posframe", "s" ], - "commit": "fc5effdc25a926eada4936e5506dcccdf3902137", - "sha256": "1d18wvx2szmpvj5v26qqp2qkdmb764sfkp2f864by2hpad0rx034" + "commit": "6477fc50513ac5a5fe2bee8c76109a026d30b6a8", + "sha256": "0nw1sl8yy1l25jjwcr918ynf9aax5ilp0xjk5n9iw8c0d4lzgdla" }, "stable": { "version": [ 1, - 3 + 3, + 2 ], "deps": [ "dash", "posframe", "s" ], - "commit": "de83b587affe374d1cf6e6c2d747696e6c33a817", - "sha256": "130g09i38k77y2kyirg54dglksl6vrypdhh4h2j8hzy1mipc5a43" + "commit": "6477fc50513ac5a5fe2bee8c76109a026d30b6a8", + "sha256": "0nw1sl8yy1l25jjwcr918ynf9aax5ilp0xjk5n9iw8c0d4lzgdla" } }, { @@ -10188,11 +10205,11 @@ "repo": "emacsmirror/cg", "unstable": { "version": [ - 20200305, - 1845 + 20201211, + 1238 ], - "commit": "b0e4cca3d8a28054b3af2f592b528903c7e7c111", - "sha256": "06ff0blmixn38z013pxj0a5qqn6aw09kv50zzyx5prdyzb57fx6h" + "commit": "6e0ad3007ab39e8438baaf87bde11aa72c6606f2", + "sha256": "152iqasjabrskwiyhik7v8vh2x14bglng3yg7yqx7xbw4jli4p8f" } }, { @@ -10203,11 +10220,11 @@ "repo": "challenger-deep-theme/emacs", "unstable": { "version": [ - 20191114, - 1339 + 20201214, + 1705 ], - "commit": "b8427b5c87948a183e2dd2b8920a54fbaae2738b", - "sha256": "05vgax8arz6l0a4x0gsh7gs0qasjf09xj973nb7k3w8gyzmy1z95" + "commit": "b0d5f103db8ee846580617cc3a2f44f89edd5a6d", + "sha256": "03k4bvidvhcfqvk3hqni546pfz6lb8jwhxynsyacq1vcmvx1j8xw" } }, { @@ -10296,8 +10313,8 @@ 20200616, 1418 ], - "commit": "feac50b87d2a596c5e5b7b82b79ddd65b6dedd8c", - "sha256": "1pms4s1qnf60d3amhx1lfa255ln5wypq0q6w918whhzi4l7mdyz4" + "commit": "a810347b43b024a86167ab9be935dcf56c122743", + "sha256": "0ljwjqsa76mv23fl13m2fclhjlpnw5pinjpphh4ldppz2xirwl0k" }, "stable": { "version": [ @@ -10623,22 +10640,25 @@ "repo": "plandes/choice-program", "unstable": { "version": [ - 20201208, - 313 + 20201217, + 1751 ], - "commit": "f95321f5e317225cd33824c32520fe7abb972e29", - "sha256": "02d6f2rqd5s5nbrg03n6lwbxdzyyb9m7ycckyj2qha8j4bpv6r0r" + "deps": [ + "dash" + ], + "commit": "b8b1b6c5568f8778783454d5747912487c8e69b8", + "sha256": "022xpsngfn0pjsgmpb24pg428xzkpk97yhfqjc7ppncizr61n5cv" }, "stable": { "version": [ 0, - 9 + 13 ], "deps": [ - "cl-lib" + "dash" ], - "commit": "215e8ab6acc47f240b12bd11ab387da7f5de885d", - "sha256": "14sp47l7j7sv3bsrnwzqz6mzn3wwv4s75r5my6vjh39pn0qshfh1" + "commit": "27d7219b775f3061536fdca6eb52142d6a21781c", + "sha256": "0az845mxnkzwsz5l2gkr8cwfvgmqbf4fxjxds46zax6701m3hy9b" } }, { @@ -10664,8 +10684,8 @@ "repo": "contrapunctus-1/chronometrist", "unstable": { "version": [ - 20200905, - 1617 + 20201222, + 1500 ], "deps": [ "anaphora", @@ -10674,14 +10694,14 @@ "seq", "ts" ], - "commit": "ad2a7fffed94c093e6d83a6938115f66e4e888f3", - "sha256": "0raa34888cyjqhr4562gbjdi4j4k5lpp0f4zwlxxrvfwn6yxwhm1" + "commit": "551a750cae4030d7f4ff92eebc26da6c4aae9af6", + "sha256": "1jhdr4b2y92982rbbhwmrd3h4bm17px0adglhsc1w4h02zdm54iy" }, "stable": { "version": [ 0, 5, - 5 + 6 ], "deps": [ "anaphora", @@ -10690,8 +10710,8 @@ "seq", "ts" ], - "commit": "2331edbf00cf56f28905d5a91334af4b902cdb68", - "sha256": "1zccyfpgq68ixrcl8jq2r38165ngkqrb42y2hkyab6gxhvh4wkpl" + "commit": "6e310163b3b43844a45ee93cb37d093f66860ede", + "sha256": "0g54pxvid1hlynlnfx99sl027q2mr2f4axsvnf0vb3v48zm0n5cw" } }, { @@ -10782,8 +10802,8 @@ "repo": "clojure-emacs/cider", "unstable": { "version": [ - 20201209, - 1121 + 20201230, + 1039 ], "deps": [ "clojure-mode", @@ -10794,14 +10814,14 @@ "sesman", "spinner" ], - "commit": "b197dbcf2b74a2f8e80d65bcd0318d6b302370a5", - "sha256": "0kfldq02i7jh10xy54za88xa3fspkb9nkf8vaagzj00292x4sl53" + "commit": "02518bc16bd0fbf56bcade491fbf5c36cedc5b8e", + "sha256": "0a82m5rnam34xkjh466ds84n6d09w9z8q162x61dvl2qnyn0ma3f" }, "stable": { "version": [ + 1, 0, - 26, - 1 + 0 ], "deps": [ "clojure-mode", @@ -10812,8 +10832,8 @@ "sesman", "spinner" ], - "commit": "a89b694cc3cec0294d84bf9dbe1163ad2373e8db", - "sha256": "0m77jbxl380dp1wyj12m82bb06r80js8yxl530ryp1mwvy74f00d" + "commit": "140b062e62165e536dcdb878a00f492a1d5b3518", + "sha256": "143kh9k34yk0g6kdlkma6g432kmb2r9r1lhyq4irsw6d3vaql7dj" } }, { @@ -10986,14 +11006,14 @@ "repo": "jorgenschaefer/circe", "unstable": { "version": [ - 20201207, - 1 + 20201225, + 1707 ], "deps": [ "cl-lib" ], - "commit": "107b74c9f4318eaa385819876cd8772ef650d1f4", - "sha256": "03whhp90wvbjc43qvbsraqi47dsi29mqbwrgxfhacjzqf73qffzx" + "commit": "0472cda711252b06fc07be184449b31933578148", + "sha256": "1ad1aqjmj1imh5zmnmdnwc06sn3rgd3xmksypyi2hnh07r79ynf4" }, "stable": { "version": [ @@ -12042,8 +12062,8 @@ "s", "seq" ], - "commit": "3bc3b359a88db47fc20978bd1e9a6cbe0326ec31", - "sha256": "1g5fzzvjlr5jais11qdpqbgdvfq2c9k211lphdhwi0m26wqfdp3g" + "commit": "2330f91e51e6cf8a46ce595be3deb0feda223f75", + "sha256": "0y5wbnf1pkzi7jvbvfhybwvbymg13fknpsyychb6f9mdkzcmik4j" }, "stable": { "version": [ @@ -12067,20 +12087,20 @@ "url": "https://gitlab.kitware.com/cmake/cmake.git", "unstable": { "version": [ - 20201119, - 1544 + 20201217, + 1410 ], - "commit": "d5b12ddcbca4d0919056c7815a9335087e9f2638", - "sha256": "1hvqmdn3xf3x2gkr2zpsh0yn26zq5g1ch7m7cmhrki1dzkfm7jhd" + "commit": "95c59252c4116c185e898762d82b49d7a4f42445", + "sha256": "08c4q1nllcc8d5zjcdjg0ms2ia75rar1xxm8sd036pl74bns7ra8" }, "stable": { "version": [ 3, 19, - 1 + 2 ], - "commit": "64fb825438a2fecb9eab9933d5d1b926bf6f294b", - "sha256": "16vdm76bx9a9viha4v4sgszin2qrvkqr7j4n671r8xm7cdiyc8b7" + "commit": "0932b1c2b29f4ad1228fa71bf4f5c089474d9882", + "sha256": "0c6vncdqps7i1a3gxm94pp0wrgs8xvq77br178xna398f3ckf26p" } }, { @@ -12250,14 +12270,14 @@ "repo": "xuchunyang/code-stats-emacs", "unstable": { "version": [ - 20200216, - 2020 + 20201209, + 2135 ], "deps": [ "request" ], - "commit": "0d5be395d4233ea533e6eddf50af725c51304205", - "sha256": "12b2skhp9x17ffh1jxpl0nw7cybq9a2iyqmp3fwmvrr51mdg6va1" + "commit": "9a467dfd6a3cef849468623e1c085cbf59dac154", + "sha256": "1ggmm2jnz4z247kgx87i6km5ya5jayr5qy2dmshfay5pnql12fz6" }, "stable": { "version": [ @@ -12437,14 +12457,14 @@ "repo": "ankurdave/color-identifiers-mode", "unstable": { "version": [ - 20201029, - 2325 + 20201216, + 2223 ], "deps": [ "dash" ], - "commit": "09684e62f0d28b22e60f3f6f50c5941549315134", - "sha256": "1kbb519h8ba0a428charybhwscggqza4j2wqghibkz2cgik99n2p" + "commit": "ca52e957254a07411c06716d2155968375943a12", + "sha256": "01g1x652gckzhihgiqx7jx58fd0ilv0yialfh3f8l1fsqw6cggqc" }, "stable": { "version": [ @@ -12580,11 +12600,11 @@ "repo": "purcell/color-theme-sanityinc-tomorrow", "unstable": { "version": [ - 20201013, - 551 + 20201225, + 2110 ], - "commit": "65dcfc9329c2eb228c12438e3831e3aeeb449470", - "sha256": "1l4dwn6fddix655ka9rlaqd9zyx62sxxa8nm9zwzp8nh5zdd93j4" + "commit": "b70046e4bf23583af39ddd0534470358eab0ff9d", + "sha256": "15bn6y75mr7g7l36hxfmz0fmcdpysacp29ib04az4mn6bkylns4x" }, "stable": { "version": [ @@ -12621,11 +12641,11 @@ "url": "https://git.sr.ht/~lthms/colorless-themes.el", "unstable": { "version": [ - 20201009, - 1533 + 20201225, + 1334 ], - "commit": "46d477ec5a367beb6c8e75e017ae2c3a31250136", - "sha256": "05c6ywzamnq1frmb8i07wjxrncl3fpkmns8dnc3v8si234gq3m72" + "commit": "92ae2775ac9ae2fd3d1172ffdf706e18db55963c", + "sha256": "06cp84bi3x33il119gfk8blikbqdmakvj7h64dr9crh0v11lg7ds" }, "stable": { "version": [ @@ -13024,11 +13044,11 @@ "repo": "company-mode/company-mode", "unstable": { "version": [ - 20201120, - 1115 + 20201230, + 2332 ], - "commit": "97cfbc3967c195fb4ccb171735b9b1dea97e681a", - "sha256": "16rb3giggnnkpla29c7p5r8hnaiyqvjjjd9idv18pqahs7w4cy7y" + "commit": "123b604297b64c69aeec3018722c75e03d18c23a", + "sha256": "0s5afwzdy31ws7qcjxnijsnm8nsxvqs2pmaz2bxf5ph8cyaxzdvj" }, "stable": { "version": [ @@ -13166,8 +13186,8 @@ "axiom-environment", "company" ], - "commit": "9ef86ca16098050da4362f5aadaea64b0a093fc1", - "sha256": "0hyaa1nskm95scypdpbndmmdasq6cas85y6i2q1f8nq8a3qd5585" + "commit": "47d6dffc29286badb2b1d7143b219e5c1be15bdb", + "sha256": "1dppyda9jkwh6fj8m4kziq84w0b5yzxrhq87jhkv54jjra6yxbb4" } }, { @@ -13443,28 +13463,28 @@ "repo": "dunn/company-emoji", "unstable": { "version": [ - 20201020, - 554 + 20201212, + 2325 ], "deps": [ "cl-lib", "company" ], - "commit": "514b33c29ff384188e90aceceabf305205837081", - "sha256": "0pa67yfcr8lrxdbvln8hs663gsxz38ggwpva7121ngascqgx42wp" + "commit": "4ba7dc60ba67f736e698a5fa0b754b866f36a646", + "sha256": "1rhf2hr345953mkn52i58aiq8j16ps2ckapd5f7jxmhkcpzxxfhk" }, "stable": { "version": [ 2, 6, - 0 + 1 ], "deps": [ "cl-lib", "company" ], - "commit": "514b33c29ff384188e90aceceabf305205837081", - "sha256": "0pa67yfcr8lrxdbvln8hs663gsxz38ggwpva7121ngascqgx42wp" + "commit": "4ba7dc60ba67f736e698a5fa0b754b866f36a646", + "sha256": "1rhf2hr345953mkn52i58aiq8j16ps2ckapd5f7jxmhkcpzxxfhk" } }, { @@ -13952,6 +13972,40 @@ } }, { + "ename": "company-maxima", + "commit": "f4bac452d61b22312d1a4cd0bb29d2fdc6e1e1f6", + "sha256": "1sn6dw0w21v294mrxjzgb9dwfydz1rdghplkkvx4wdj1pvc78ffq", + "fetcher": "gitlab", + "repo": "sasanidas/maxima", + "unstable": { + "version": [ + 20201207, + 2204 + ], + "deps": [ + "company", + "maxima", + "seq" + ], + "commit": "1600cfc059a80ed8fa0d381b88f29ba658811cc5", + "sha256": "030sg31xh46vrmsafvn04sdvyv4vzqf8rf5ghrlina1gav6kybfd" + }, + "stable": { + "version": [ + 0, + 7, + 6 + ], + "deps": [ + "company", + "maxima", + "seq" + ], + "commit": "8d643a1776523ef1a6e0bff0bb0a390772fcc77d", + "sha256": "17m9x3yy0k63j59vx1sf25jcfb6b9yj0ggp2jiq1mih4b62rp97d" + } + }, + { "ename": "company-nand2tetris", "commit": "90421372b3f60b59762279ac805c61a984606d11", "sha256": "1g2i33jjh7kbpzk835kbnqicf0w4cq5rqv934bqzz5kavj9cg886", @@ -14257,15 +14311,15 @@ "repo": "tumashu/company-posframe", "unstable": { "version": [ - 20201127, - 239 + 20201214, + 52 ], "deps": [ "company", "posframe" ], - "commit": "86428bf9ce50a14326f38942b9f1467dd5b483df", - "sha256": "05ays6xkqbxcfplvx7wfc2slflmwc3aw7vkixvabk0ilvisndvgm" + "commit": "5ea0b565972ca8d80f29a40068c65bab97384748", + "sha256": "18zlwcp1vcz82573nmkix1rixv54p9sjj0fhddmf3yc8hsy2mp4g" }, "stable": { "version": [ @@ -14296,8 +14350,8 @@ "company", "prescient" ], - "commit": "5d139e5b1fe03ccaddff8c250ab8e9d795071b95", - "sha256": "11hqy8chh29lrzk04dp3rwkvf4bj0xvg9hli3w1zx968x98lfvj0" + "commit": "2af94ce194f9b8d7087f7b49ecd986083f7eb753", + "sha256": "19wwnl72gh4ar2q6gcp6k6n4gdvamdjj6lgc0n4mk7j1qrylp3hf" }, "stable": { "version": [ @@ -14485,20 +14539,20 @@ "company", "rtags" ], - "commit": "63a7d9b733def9fe76568f81321a65a450829575", - "sha256": "1nnjhfz7xm1ax38xkz0jvgzhfczlc4r9xlpzc24sisabkvlkivyw" + "commit": "39339388256df662d0084b4a094d03e52748f9e8", + "sha256": "0wp4mygsxzibra2p3m5rn9m0yd3fscd795k5xa0wxi5pwddv7dlg" }, "stable": { "version": [ - 2, - 38 + 3, + 23 ], "deps": [ "company", "rtags" ], - "commit": "9687ccdb9e539981e7934e768ea5c84464a61139", - "sha256": "1r6l7dgr2ch586zrdi5l8fhdj4qdva8ldz7cjvi2byc2pd2xs8rx" + "commit": "7169ed577d676690a3c6f0025b54e8477d80eacf", + "sha256": "1i94dizg3wvkvq8c2pf5bzkx8zwzcfi4p3l73c779y145bygssnq" } }, { @@ -14979,14 +15033,14 @@ "repo": "daviderestivo/comware-router-mode", "unstable": { "version": [ - 20201112, - 1629 + 20201229, + 1706 ], "deps": [ "dash" ], - "commit": "471cde874999cc50b03d7c906802369ea5a5ffa4", - "sha256": "14cjnc09ms4cfp9nyp904gcp6rd5aflgp9vhb42gh4lzfzm3ppzj" + "commit": "f0f884f0fe9ab2c3420e62d27eadc59ac2209a4a", + "sha256": "1zcvpj7bxry2v8whijgpqw773l3l64nrgaxdwyd053ahl0nv7mpf" } }, { @@ -15203,17 +15257,55 @@ }, { "ename": "consult", - "commit": "488a72b896992984b048cc6ce4796ade11849bb0", - "sha256": "02z6h0x346230ayncsb8phks9mmjdq5mj9ja68380hl6gkic3407", + "commit": "1a1fbbfebeb88dab2d032e994ec21c976f059d22", + "sha256": "1jkqrc9wzk2dhajnd84avppynqcmly9vc35xhaqi4skhx5il24wb", "fetcher": "github", "repo": "minad/consult", "unstable": { "version": [ - 20201209, - 824 + 20201231, + 1259 + ], + "commit": "815360376ba93e731ff715520a79fdbf2424a0f1", + "sha256": "0djnhrf2radvxfbdx3wimrsrhdkqqrhnyr0jnfasw1jyr832s64x" + } + }, + { + "ename": "consult-flycheck", + "commit": "1a1fbbfebeb88dab2d032e994ec21c976f059d22", + "sha256": "0gf7nb2zylmm53xszd53qp7byvlppd2j9lh61p8syanjssqy4j67", + "fetcher": "github", + "repo": "minad/consult", + "unstable": { + "version": [ + 20201226, + 12 ], - "commit": "dadc87fe73a93d2ecc34a0f82636729e8fe2dcd7", - "sha256": "07ibxpbsv7mfxg8b04fw7517i54yky4y7h0wyg7f6lfmhb0zadq3" + "deps": [ + "consult", + "flycheck" + ], + "commit": "815360376ba93e731ff715520a79fdbf2424a0f1", + "sha256": "0djnhrf2radvxfbdx3wimrsrhdkqqrhnyr0jnfasw1jyr832s64x" + } + }, + { + "ename": "consult-selectrum", + "commit": "1a1fbbfebeb88dab2d032e994ec21c976f059d22", + "sha256": "08zhnzj70c3j4jkxa75a4wsaz1g35sc0wl7vkhjnhlpqhwidb2p5", + "fetcher": "github", + "repo": "minad/consult", + "unstable": { + "version": [ + 20201230, + 942 + ], + "deps": [ + "consult", + "selectrum" + ], + "commit": "815360376ba93e731ff715520a79fdbf2424a0f1", + "sha256": "0djnhrf2radvxfbdx3wimrsrhdkqqrhnyr0jnfasw1jyr832s64x" } }, { @@ -15529,14 +15621,14 @@ "repo": "abo-abo/swiper", "unstable": { "version": [ - 20201208, - 1022 + 20201227, + 1327 ], "deps": [ "swiper" ], - "commit": "ae9b121b834a68d11f79ca27b1e5c8790149ba2f", - "sha256": "160qs77b4sama17h8lhq60my44qh4c9aj1qj9jk02n64jfn44fm6" + "commit": "d2891aab7b816aebf21ebd01ce33933a6ac6244f", + "sha256": "12bm5w073mgpj7kvk6596fnw8809nl6vkv288l7vvzx7iimaqzpl" }, "stable": { "version": [ @@ -15676,26 +15768,26 @@ "repo": "redguardtoo/counsel-etags", "unstable": { "version": [ - 20201117, - 113 + 20201228, + 741 ], "deps": [ "counsel" ], - "commit": "89ed187095be956dbf97e813a7bbfdb87ee125ba", - "sha256": "02dhj8qry2j5v47cfr3f6yv5kzxwf1m1w9055ar4x74akgm7901w" + "commit": "c10951946d6dd935e4ab5d18db5da228e1c22806", + "sha256": "09n0mpp0pchb85f7qkizd686rpkfagmr7sd0sxsh81xhzdavam47" }, "stable": { "version": [ 1, 9, - 15 + 16 ], "deps": [ "counsel" ], - "commit": "d391b550a9d874409560e71d74cd13c14aacc6ab", - "sha256": "1kkck3cdq404czih8rhinammillhmy2iz10469z7iyzc35wrljyk" + "commit": "894cd7e25a2f96e29b70897ab799e7dd9e4f85fd", + "sha256": "01si554r0s6m7ypx1m2n0z6j6q6yihifz76dha6q6v56ixdlv626" } }, { @@ -15743,15 +15835,15 @@ "repo": "FelipeLema/emacs-counsel-gtags", "unstable": { "version": [ - 20201130, - 1401 + 20201211, + 1755 ], "deps": [ "counsel", "seq" ], - "commit": "1c0a0102931b73e0073307ba10ebfc47b2b145af", - "sha256": "137i0mwi12hfrdlb4h0vh9vwjw5yyq2p69ib9pfs4y8frhv350ad" + "commit": "e4a662c38cd217bae9c0bd80f2c9b53cc2cffcb7", + "sha256": "0gb8gbphckyk834mxl704fawvykigmk0cl8klmyfap0nb55h846b" }, "stable": { "version": [ @@ -15773,15 +15865,15 @@ "repo": "200ok-ch/counsel-jq", "unstable": { "version": [ - 20201203, - 901 + 20201230, + 1703 ], "deps": [ "ivy", "swiper" ], - "commit": "aaf33fc2447096cd0d03b77395fe2a95c9fe1481", - "sha256": "10rz0qm8a4bl0m86kx19zq8lri047p4sxqyny08bgm9pbam0wvwn" + "commit": "153d70b576df1d572c56d84039cb40749310cfe7", + "sha256": "1r8bbdbvxczbcw8359v9s451fnpcsna0hqg43k26cbwba137vxl7" }, "stable": { "version": [ @@ -16052,16 +16144,16 @@ "repo": "AdamNiederer/cov", "unstable": { "version": [ - 20201025, - 425 + 20201214, + 550 ], "deps": [ "elquery", "f", "s" ], - "commit": "d6cd3f6a857622f73779ffb2250902fc0c00f7f8", - "sha256": "1kazdbwdidwqi0zj3dxh0h53pw22pvvn8nhkkk6xkjiigjz85n89" + "commit": "5efa13e7d3e06f206b29879d8f66afd6b0d26f52", + "sha256": "01d7kgsdv09lllmhi2dvywb61n2aj3j665xcxqjidwfl03vsw16g" } }, { @@ -16511,11 +16603,11 @@ "repo": "crystal-lang-tools/emacs-crystal-mode", "unstable": { "version": [ - 20191121, - 1447 + 20201228, + 1539 ], - "commit": "f9e4db16ff9fdc6a296363aa35d19cfb4926e472", - "sha256": "1x0lmb48bza2w52s15288hpbipafs87lj5lv0ldd1q4r9yv0i102" + "commit": "15998140b0a4172cd4b4d14d0377fba96a8917fc", + "sha256": "0bdzffwp9hliy9bkvqn1p432yy161g7n7bl814mmi6zj4sfn1sy1" }, "stable": { "version": [ @@ -16562,26 +16654,26 @@ }, { "ename": "csharp-mode", - "commit": "736716bbcfd9c9fb1d10ce290cb4f66fe1c68f44", - "sha256": "17j84qrprq492dsn103dji8mvh29mbdlqlpsszbgfdgnpvfr1rv0", + "commit": "704aa5b8132a72770b5a3cf4f81d1dc154709fdf", + "sha256": "1s8bv738k3rz0lkpnlcg209qpqd28vx1np4zgas01mp9fhgyivkn", "fetcher": "github", - "repo": "josteink/csharp-mode", + "repo": "emacs-csharp/csharp-mode", "unstable": { "version": [ - 20201209, - 1122 + 20201231, + 1103 ], - "commit": "a6caa85b914ade93310da17f669a57c6f7ff94bb", - "sha256": "0k6y0ngpk0993p8y65a7yp377izzf1jjs6bpxmw0mc45sjwiqmwa" + "commit": "74644d4534beae372f7f05b2464a201383588f59", + "sha256": "0k1zm83w6d6dw2w68d8frpcadacsrar09vv996xrax68i16ggcp5" }, "stable": { "version": [ 0, - 10, + 11, 0 ], - "commit": "80238e862dec17e3553e04e6f101a0cc42019f84", - "sha256": "0vwkbla2gkfa9dzxfvrvr7hd2z16769iwbycl7k6l701dnwli1fw" + "commit": "84664285a6d215998da763dc5d286d4f941df81e", + "sha256": "0aq6ln92jr3hcrd1592n4s5cb079fly7qaj2hm510p9zckyfx230" } }, { @@ -17180,8 +17272,8 @@ 20190111, 2150 ], - "commit": "cedbd5840fde2c63549b64c35cd05ea5fb9fc524", - "sha256": "1l5j4phhmlzr14zczk9h63m8rw3z0avlvgs6pbhch5fvhs8fv4zi" + "commit": "e6f92c1753fd8b07c5beb040fb8be1c4a8b0591c", + "sha256": "1cbq2sigqvqrpllli2qlasm5j96ssx96smjr3pj51i6ndi81gp04" }, "stable": { "version": [ @@ -17401,8 +17493,8 @@ "posframe", "s" ], - "commit": "e582ff90c104703ed65c1f3174d4c4690e9cf1fd", - "sha256": "05rcpxg982amzk8abrrhzig2ax6rwm2bj1xvy29r8imvpayfm14f" + "commit": "041db8eb7f0ceb9477ffff1730b5940814001158", + "sha256": "0cjr2dhqh8k76il9iiajszr7vra1phhksf0zw946chg7sa12chh1" }, "stable": { "version": [ @@ -17559,14 +17651,14 @@ "repo": "emacsfodder/emacs-theme-darktooth", "unstable": { "version": [ - 20190412, - 142 + 20201215, + 822 ], "deps": [ "autothemer" ], - "commit": "5cc7fbfb08d2f1a33b85eac92b6450407b915119", - "sha256": "164y8hrdz46gg1b6sfi7gdv7pj54hrin0lcmhxp6gc9x5dg3l354" + "commit": "ec03b30ee7f43f89ca4c382bb3fe4ee560c028a8", + "sha256": "00ijwqchvrwln2wl3nfcq5v3i2p232z4qsy67x1v51q20876mc9j" }, "stable": { "version": [ @@ -17655,11 +17747,11 @@ "repo": "magnars/dash.el", "unstable": { "version": [ - 20200803, - 1520 + 20201230, + 348 ], - "commit": "0f238a9a466879ee96e5db0482019453718f342d", - "sha256": "0nnqkwcy66wjpynpm47kyzgv9wsb5vdfragy672s8wfagyf4331v" + "commit": "e47ecb822f6bb10c196ca00030b0e6f5e176495e", + "sha256": "0p6qj7ambff7r7s8kab2rrl0mlgjz46k1f98x5msn6ajl3zdv9n6" }, "stable": { "version": [ @@ -17728,14 +17820,14 @@ "repo": "magnars/dash.el", "unstable": { "version": [ - 20200617, - 702 + 20201215, + 40 ], "deps": [ "dash" ], - "commit": "0f238a9a466879ee96e5db0482019453718f342d", - "sha256": "0nnqkwcy66wjpynpm47kyzgv9wsb5vdfragy672s8wfagyf4331v" + "commit": "e47ecb822f6bb10c196ca00030b0e6f5e176495e", + "sha256": "0p6qj7ambff7r7s8kab2rrl0mlgjz46k1f98x5msn6ajl3zdv9n6" }, "stable": { "version": [ @@ -17758,14 +17850,14 @@ "repo": "emacs-dashboard/emacs-dashboard", "unstable": { "version": [ - 20201209, - 1003 + 20201229, + 426 ], "deps": [ "page-break-lines" ], - "commit": "197d9285c473afa524c45c737f4f61ea1caf8f0d", - "sha256": "18sqfs845xp16yqan4pbks4iy3z26988s7idby58333ky506lpl2" + "commit": "c4283b7be41d5c047dfea4e3e8ca4d03c8f63c12", + "sha256": "0w44lf194smcm8ppgl2nsji246sg8n12mm0jaiqrjnk7rcirivbn" }, "stable": { "version": [ @@ -18323,6 +18415,21 @@ } }, { + "ename": "default-font-presets", + "commit": "3b8b731674a5c5d4f83d998258a5d4c9aabb2048", + "sha256": "0hracb7krwgpnispnjgi86zaywq08mc3c8cyaxl82lc8jc9b05j2", + "fetcher": "gitlab", + "repo": "ideasman42/emacs-default-font-presets", + "unstable": { + "version": [ + 20201227, + 2319 + ], + "commit": "dd143e7e6cf5384d203a76e50fe677a77f1cd615", + "sha256": "1zpf35x1w4ldijqx3a2qlykhy9xgw3mqzxhfv0r3qn37k7lg0m58" + } + }, + { "ename": "default-text-scale", "commit": "db5e0b70e2d9c80aa41ae2c397f822789c2d3cc2", "sha256": "18r90ic38fnlsbg4gi3r962vban398x2bf3rqhrc6z4jk4aiv3mi", @@ -18665,11 +18772,11 @@ "repo": "DamienCassou/desktop-environment", "unstable": { "version": [ - 20201117, - 1653 + 20201229, + 1107 ], - "commit": "d8560e4fe98d75a47ab652ef44ced8660c956fb8", - "sha256": "1xsqhvprjd1097mdig14z83psi3jzfm6k8pdw43g9pqih404lg40" + "commit": "9ece03e3e687ff97d79eb2a9f6cc506a932f89ca", + "sha256": "1hsjzwwlhqxqgp5ii8a23wq2fc7a8dzfnqhjyakn39wp7dm925sz" }, "stable": { "version": [ @@ -18764,8 +18871,8 @@ "deps": [ "reformatter" ], - "commit": "97524f934556d561c6c9268ed719f027ed9f55e9", - "sha256": "1c8dzk19f3n5v1r43iaynd1cs2valypz0ldh8l22cdbg82smva1b" + "commit": "ad259c8a2292fb398dff1ce7d25c686edb02945d", + "sha256": "1vp8cjkkiih7cz5d8kcpc2ysq3iz4wr5wi2lkkkhp94k04jl5h1r" } }, { @@ -18945,26 +19052,26 @@ "repo": "dgutov/diff-hl", "unstable": { "version": [ - 20201201, - 1956 + 20201220, + 1006 ], "deps": [ "cl-lib" ], - "commit": "c31af59cce04fdcf9d05da54a43d236a4869c251", - "sha256": "191vqwnalbynpj0r1v5v7qd35dih8k99kvm2gvpgpv5kg28gq3hm" + "commit": "a0028d9d3ef28513b0b2cec145199bf088169563", + "sha256": "0g8gia8wbxyx37302is50i4jp863k23fpb75j4ndrv4k0pj6cr20" }, "stable": { "version": [ 1, 8, - 7 + 8 ], "deps": [ "cl-lib" ], - "commit": "374b1d4b34876219218da7a539e7301259b56958", - "sha256": "0i7x6qgr3nydcwhw72sbc8z9x9dfhgkf0dqj9nakvx36vn1bblbq" + "commit": "b8b4f43af73f109bf1af0453a076c274164488cf", + "sha256": "075klzf66z1rvhpxv4j694pdkmi7f4fpw6c8q4ncz0h4y5wdbl8w" } }, { @@ -19746,26 +19853,25 @@ "repo": "xuhdev/dired-quick-sort", "unstable": { "version": [ - 20201128, - 116 + 20201221, + 403 ], "deps": [ "hydra" ], - "commit": "9741bae65b5ca077a81589dcc6b3ca3c12f0f76f", - "sha256": "14chkh5zqrjs574jml8sq3d4xhq0fclbzifcnpph080vxspxr2xn" + "commit": "69b06f306a5fc2b38e707bae3ff1e35db2b39b6b", + "sha256": "01zdha3p7wsf98yayvwgpd4arcs7yhz62yk1nyq9n13hvmqg7dvk" }, "stable": { "version": [ 0, - 1, - 1 + 2 ], "deps": [ "hydra" ], - "commit": "868311eec176d9cc254730b305c1cab9ede82547", - "sha256": "0jngm5zrmbm2w45sq1kxf0bimkmrwxc2biyb5bx7422mqkcsg2fh" + "commit": "79e422be55c72bfe36d2ec8a838f19d1cc8d101a", + "sha256": "14hb3d76y4n8qvfl74v9hzgl6774bqdcmsa0npv3gs144fbx9prk" } }, { @@ -19867,27 +19973,27 @@ "repo": "stsquad/dired-rsync", "unstable": { "version": [ - 20201126, - 1319 + 20201224, + 2214 ], "deps": [ "dash", "s" ], - "commit": "fe5988154c843c70d080ae8a822f27ed83983d01", - "sha256": "1i2qsdbhmsrdx49lqn0fk69sk85ysdpa8c90gfz78vby4fjlb240" + "commit": "947a008387a939f466ca122bda2ea98bb17710e3", + "sha256": "19za6i96xrmczdh928n5ixd7j7pvy175sz1msaiwvdjwysjr8k51" }, "stable": { "version": [ 0, - 5 + 6 ], "deps": [ "dash", "s" ], - "commit": "707f527a5448f8fd881321f1d60e49821d3efe60", - "sha256": "1nq3d8py2zsji835wilg514z5j180k371pwqsqrmnnhq1cj4fkia" + "commit": "947a008387a939f466ca122bda2ea98bb17710e3", + "sha256": "19za6i96xrmczdh928n5ixd7j7pvy175sz1msaiwvdjwysjr8k51" } }, { @@ -20011,6 +20117,21 @@ } }, { + "ename": "diredc", + "commit": "abaea37c792e6593665dc536e8803e0f591f7359", + "sha256": "09wfizmqp2njb2xi532qixs5syccmadpc5bbm55i7xfqrr52d7zy", + "fetcher": "github", + "repo": "Boruch-Baum/emacs-diredc", + "unstable": { + "version": [ + 20201229, + 2025 + ], + "commit": "a240c7dee42dad03e0012bb7b6280194e31311ea", + "sha256": "19p6w6c6zrfmkbm5g2yisac8f6d8sjlba88syx5crx2cy02m8y51" + } + }, + { "ename": "diredfl", "commit": "3da86e18d423198766455929da1dcb3a9a3be381", "sha256": "0cybq15yq07x2mnrnwapy020d598yymcy8y9wwf1m7f59p3h9hvn", @@ -20400,8 +20521,8 @@ 20191130, 52 ], - "commit": "93aac853215d0902e7a30a6dd2b99d796da77df4", - "sha256": "186294rkmhwbh8x054w1hnqykp1iydxd490irl542j5alinv43qk" + "commit": "6abf276b8d66df4996c7e98e7a40cbad8747beb7", + "sha256": "17163bncxf11295bxzbmji09qy0klxzb0w8vxaazij6sxlk90mnm" } }, { @@ -21010,8 +21131,8 @@ "repo": "r0man/docopt.el", "unstable": { "version": [ - 20201121, - 1523 + 20201211, + 1008 ], "deps": [ "dash", @@ -21020,14 +21141,14 @@ "s", "transient" ], - "commit": "8a0e1777777d6ef7d144f1150b06ede9d9950220", - "sha256": "1m77nix3kwghwpbl5ins677f6qaxaczzg2k22ana3nsib8lvdkra" + "commit": "6e1105347decbf9b4b848d952858455f9b145c56", + "sha256": "0vkmgfgw8qica21hcqila62ivqxshkay2r2dyy4dxxj3xypk3083" }, "stable": { "version": [ 0, 1, - 0 + 1 ], "deps": [ "dash", @@ -21036,8 +21157,8 @@ "s", "transient" ], - "commit": "9546e43acc2c3193a58820a89814f1c580f0cb27", - "sha256": "0s4q1zk4aqz76392c030c4bs28nbngw1rw3mygrk3cqaqykg7mq4" + "commit": "6e1105347decbf9b4b848d952858455f9b145c56", + "sha256": "0vkmgfgw8qica21hcqila62ivqxshkay2r2dyy4dxxj3xypk3083" } }, { @@ -21048,11 +21169,11 @@ "repo": "progfolio/doct", "unstable": { "version": [ - 20200917, - 1712 + 20201229, + 2136 ], - "commit": "dabb30ebea866ef225b81561c8265d740b1e81c3", - "sha256": "0pbalf1a9jrfwb6h1zw3bxz16qn1md10w030hbcbm0dblafchz0y" + "commit": "36075595cf5cf6460f215735b1aa562d6a07a496", + "sha256": "1c8676b81dx8zhmbv3ymdyi21rx0x60a2v104i6p9l7c2yilq9c2" } }, { @@ -21167,16 +21288,16 @@ "repo": "seagle0128/doom-modeline", "unstable": { "version": [ - 20201128, - 1659 + 20201212, + 1823 ], "deps": [ "all-the-icons", "dash", "shrink-path" ], - "commit": "fb34eb5eb60f41ce1bc23c2bad6ac20de5669f22", - "sha256": "0swyhkzlz1znwddl0jzgxs7xyxz9shji5bnh91p5d5rq74j35f0k" + "commit": "af5f61888e7eb0aa521d2d29b42221302b717915", + "sha256": "1d1ad9c321ni6hsvcrc6rhd1vbxd0dhfgvz52cna91alg9nhxwmm" }, "stable": { "version": [ @@ -21201,14 +21322,14 @@ "repo": "hlissner/emacs-doom-themes", "unstable": { "version": [ - 20201121, - 2040 + 20201220, + 836 ], "deps": [ "cl-lib" ], - "commit": "74ebd778571a2ba2a490d45a3f4161ea7251e050", - "sha256": "0wj7ysyyv2ycjiibyd8gda24g2zj1p51sh4ani9r13bs0idnq910" + "commit": "3761dfce75144e49789b6576e187acd82e2731ee", + "sha256": "0a0lz9kkaaxj2r8xkcgyczz9pxq5hb4kd8mivqxmcj9572xs6v1r" }, "stable": { "version": [ @@ -21835,8 +21956,8 @@ 20191016, 1241 ], - "commit": "08d27d547f09d86cf5d7230f8a5cbe027708f979", - "sha256": "0h43hcx447vp811jxdgan0b3cz21pzc1azhd47srmyca5jsfpklq" + "commit": "133a6fedc217d9b66329cc8fce45ab0edddef538", + "sha256": "0ixmj378dvi2dh2vy6c47v0zqjkfyr7n5gzcyaplrxsydfwzr2j2" }, "stable": { "version": [ @@ -21928,11 +22049,11 @@ "repo": "dylan-lang/dylan-mode", "unstable": { "version": [ - 20200607, - 1911 + 20201212, + 2106 ], - "commit": "bdccb252dffa99a3a55dce446cc4a7ff4a8dc089", - "sha256": "09dgjwdsni936chj2b8r607bqa2vcav66mb49j5vi2lxiw60sg8m" + "commit": "6277d31e6ec896ceaa9533ed156cece26359ba17", + "sha256": "12wkm04smmd3hgx6k3waa0wma0p8r23nh1ksm484znd7gij2bcrl" } }, { @@ -22507,26 +22628,25 @@ "repo": "joostkremers/ebib", "unstable": { "version": [ - 20201203, - 927 + 20201223, + 2217 ], "deps": [ "parsebib" ], - "commit": "1274cba384a798faab6f6e1f20d349bbf3d48f94", - "sha256": "18ba50j42l4w33i3mbdy4d1izn724pa00zbyrcqd9hrhdma7hnhw" + "commit": "f4a36bd7629dd67ec5fdfdf4ea4d087d8e8c986d", + "sha256": "0qsl4qyscd29jkbnkp2acy3ww7lrmhfb60nbpcf03hq8mi3n51rp" }, "stable": { "version": [ 2, - 27, - 2 + 29 ], "deps": [ "parsebib" ], - "commit": "f6411b41bd612a3747816c40c933c28402dd0b03", - "sha256": "194pzhi8kylawsnc0p02nds9vk7ghw88s1dvd355b7m2vp92cnlf" + "commit": "dd18665862413fc1e1aea0becb318a9e6d281d10", + "sha256": "1d0xnhdcsz2ysq145k2l0f2r4vb0pkai1v6wl6sfba7xi5fc323i" } }, { @@ -22943,8 +23063,8 @@ 20181016, 1125 ], - "commit": "5f6352f98f9795ea0423cb46e9b01dc54e523ab1", - "sha256": "0khf51sbjkqij36l00lby004ca9nb67xvksjnbafzp2bvwcs356j" + "commit": "638c0d92ce7030e799c46aa712bbb3034c342e9c", + "sha256": "1qraxzw37jmzssyz2kcnnhh0l90d3fgw0rimx783ppn1h06844z4" }, "stable": { "version": [ @@ -22987,8 +23107,8 @@ "deps": [ "cl-lib" ], - "commit": "da844718bfe1ca51919c63fdffedaba5d0cc1bba", - "sha256": "05ydgbc6dmrs3qfahcg8lmrfm74f5ij9yxn9nm1c3r5zxf759ajy" + "commit": "d73333c224de783e42acd225a20330a667fe5191", + "sha256": "1w6ghpkhdy45aqfw01mzh90s437fx29iw3c9m4p7ish65rmxkqgk" }, "stable": { "version": [ @@ -23339,8 +23459,8 @@ "repo": "joaotavora/eglot", "unstable": { "version": [ - 20201103, - 1026 + 20201222, + 1735 ], "deps": [ "eldoc", @@ -23349,20 +23469,23 @@ "project", "xref" ], - "commit": "21726416e6e580b20dfa90833c6dab2a8a15ea48", - "sha256": "1al1a7np6127xw4ksqcwpm20v635pb83vfx8mr06wyzdbgls0plb" + "commit": "4c85df2b04e467b8ed0eca68bd202fd0e7b671f4", + "sha256": "1ibdxkhqjyzf3dyn0y56xjnp0aialfcbzjnmnjnwzik0m0qgw53p" }, "stable": { "version": [ 1, - 6 + 7 ], "deps": [ + "eldoc", "flymake", - "jsonrpc" + "jsonrpc", + "project", + "xref" ], - "commit": "e02479a8c20cd79c3dfeb553deaaecd7d6e97e51", - "sha256": "13r1ysdhnxkc025wypwi6w507v18hm5qf0x29qrycql46f8klrjb" + "commit": "4edd4782f1c16c0516533b52e16b02b772812d16", + "sha256": "17aamcda6h92rrg23vjllwr9qirb4fyxz9x7wcddzi1cawkhsh8k" } }, { @@ -23466,8 +23589,8 @@ "repo": "millejoh/emacs-ipython-notebook", "unstable": { "version": [ - 20201128, - 2101 + 20201231, + 101 ], "deps": [ "anaphora", @@ -23478,8 +23601,8 @@ "websocket", "with-editor" ], - "commit": "a019ee3994585e4ed4700d2591d693fda3232616", - "sha256": "0lks1pzp1rsb9xrf7fpfb6svzhrqzfmcahzij7psi02kxkq8zjyd" + "commit": "5525b345901f72652bc49e1acb77380ea05ea696", + "sha256": "13hl52xx2x2d1srjgs87x3y0z4jyjjskyqybx64hcggz2flsrali" }, "stable": { "version": [ @@ -23645,8 +23768,8 @@ 20200912, 1653 ], - "commit": "6138ce5b0a9df779e33ef42eadc4c15a5cf65f39", - "sha256": "19qfpv0f0xhj04f572a20a0yd7qqhrivxjx9mfp15g43pgdp9ajz" + "commit": "215ff5e56cedcc18866aba6e451b61c06a050e74", + "sha256": "0qnyzvvpvzy3cvnq07yfi1v13i91qwa6xfb4p9j9yr2r3gsgdc1g" }, "stable": { "version": [ @@ -23859,6 +23982,9 @@ 20140111, 2201 ], + "deps": [ + "cl-lib" + ], "commit": "e7c333d4fc31a90f4dca951efe21129164b42605", "sha256": "00wp2swrmalcifx9fsvhz9pgbf6ixvn8dpz1lq6k6pj9h24pq7wh" }, @@ -23868,6 +23994,9 @@ 3, 1 ], + "deps": [ + "cl-lib" + ], "commit": "e96541c1f32e0a3aca4ad0a0eb382bd898250163", "sha256": "1i6j44ssxm1xdg0mf91nh1lnprwsaxsx8vsrf720nan7mfr283h5" } @@ -24019,11 +24148,11 @@ "repo": "doublep/eldev", "unstable": { "version": [ - 20201125, - 1919 + 20201223, + 2049 ], - "commit": "aa4360bcd72ca64913b2bad0056b0521d7e125ab", - "sha256": "1mmplyqi6krjgrrlh905pxvjz32d2vdkd3lkz00j82bjgxfxis7f" + "commit": "9ca9abb3edca233ab52ada40531bec4ce3a8e642", + "sha256": "1nz2y9nqyxlb7bsg9chgdjkqmsfklh39shlvqhwl15im144ww9f7" }, "stable": { "version": [ @@ -24175,8 +24304,8 @@ "deps": [ "dash" ], - "commit": "677424d2c6b05e0a3b03eb2e5e4bacef141a0a77", - "sha256": "0wf452gssmpdmqrpi7zf63vkis48yqv0ha5ic5mr7vwyfpx3qmgb" + "commit": "9856ff8e1351086d0d738c1db300af63d6c085ba", + "sha256": "0wfgz1ry1gqwk941fs4i3z8gq6s53v1fr2lwhsi06hvgs8nxaqgm" }, "stable": { "version": [ @@ -24208,6 +24337,21 @@ } }, { + "ename": "elegant-agenda-mode", + "commit": "74218fda67e2c9c082cc9e28a1ddea8a80cf729f", + "sha256": "0058brrv5kk2gqnj1ii0ahqf6jmjx6zv21mlmzszazqgxlgy3nfg", + "fetcher": "github", + "repo": "justinbarclay/elegant-agenda-mode", + "unstable": { + "version": [ + 20201118, + 558 + ], + "commit": "c72f42e0f551c3dd81e68262f07a96c0ec90a589", + "sha256": "0f8qk3vd41ffbkfqw5nks3bld0qpjrlnk9sb46wcbsyfnrs2v082" + } + }, + { "ename": "elein", "commit": "855ea20024b606314f8590129259747cac0bcc97", "sha256": "01y5yrmm3biyrfgnl3qjfpn1xvjk2nabwjr8cls53ds697qpz5x2", @@ -24254,11 +24398,11 @@ "repo": "skeeto/elfeed", "unstable": { "version": [ - 20201205, - 134 + 20201220, + 1359 ], - "commit": "cc9d3b2196fb1f43e081aac0759678e8c5ae1c3e", - "sha256": "04yp98jpm98c18pmrb07cwvg5xyhskszfwrypxw95m6wmhnij2x5" + "commit": "de4b64b3f5d9fd41d9dc72023632ae535dc912e2", + "sha256": "04x3589jc39j3q2la82cidw3zpph10p5sj57m1kfz3ajyvh7rlm0" }, "stable": { "version": [ @@ -24271,6 +24415,24 @@ } }, { + "ename": "elfeed-dashboard", + "commit": "339127464845e86419c6a88004fc16b60d675f57", + "sha256": "1ykg8gcsl7gf1w2xvd1wm088fw1l1mbsamx7drrvkdnpwxx6xiga", + "fetcher": "github", + "repo": "Manoj321/elfeed-dashboard", + "unstable": { + "version": [ + 20201218, + 347 + ], + "deps": [ + "elfeed" + ], + "commit": "9e8e212da9ea471bdc58bc0a1f5932833029bb38", + "sha256": "182kr8nqrnf1lpiqbl04qm6871yvk0z53dxxdjc2y9xnh6dvx460" + } + }, + { "ename": "elfeed-goodies", "commit": "e6ebb8d23961fd9bfe101f7917caa3b405493f31", "sha256": "0zpk6nx757hasgzcww90fzkcdn078my33p7yax7xslvi4msm37bi", @@ -24355,26 +24517,26 @@ "repo": "sp1ff/elfeed-score", "unstable": { "version": [ - 20201101, - 1835 + 20201219, + 2359 ], "deps": [ "elfeed" ], - "commit": "2de8fd1f40780282f4c36bc47963f207d2257918", - "sha256": "0i1qh6rjdaqjrfn3n9hyf5f1c9ls0i75xl9pam61l1ngaq1w6r8z" + "commit": "5fff4152bdb2a5f38ab83f7fa6b2943647935f94", + "sha256": "18jwg4a2ssswvbw50z9b84ca76i3q6vmv0ab90p432pjywpkwh73" }, "stable": { "version": [ 0, - 5, - 5 + 6, + 4 ], "deps": [ "elfeed" ], - "commit": "2de8fd1f40780282f4c36bc47963f207d2257918", - "sha256": "0i1qh6rjdaqjrfn3n9hyf5f1c9ls0i75xl9pam61l1ngaq1w6r8z" + "commit": "5fff4152bdb2a5f38ab83f7fa6b2943647935f94", + "sha256": "18jwg4a2ssswvbw50z9b84ca76i3q6vmv0ab90p432pjywpkwh73" } }, { @@ -24392,8 +24554,8 @@ "elfeed", "simple-httpd" ], - "commit": "cc9d3b2196fb1f43e081aac0759678e8c5ae1c3e", - "sha256": "04yp98jpm98c18pmrb07cwvg5xyhskszfwrypxw95m6wmhnij2x5" + "commit": "de4b64b3f5d9fd41d9dc72023632ae535dc912e2", + "sha256": "04x3589jc39j3q2la82cidw3zpph10p5sj57m1kfz3ajyvh7rlm0" }, "stable": { "version": [ @@ -24462,29 +24624,29 @@ "repo": "Wilfred/elisp-def", "unstable": { "version": [ - 20200528, - 633 + 20201215, + 706 ], "deps": [ "dash", "f", "s" ], - "commit": "da1f76391ac0d277e3c5758203e0150f6bae0beb", - "sha256": "17zpil3zgi2j7a63lv5vas3ad6bvh45d9vnf2nb37z3id62rjdkd" + "commit": "679fa7d2d702263b6a55f30a1b8cfbb2fd817549", + "sha256": "0xzb89zk13db34kis68xc2b0b649335hxlnvjr4q1inf3yyzmiav" }, "stable": { "version": [ 1, - 0 + 1 ], "deps": [ "dash", "f", "s" ], - "commit": "5e0d766a5db537f4e7145c2053c22829d736ceba", - "sha256": "0l9az09yw40rr2xrvf01c3idfqplddr1kk880qscnzj8v9p06l4x" + "commit": "e374dfa1724c7ee34376305a94c5a31a052f4e3b", + "sha256": "1zd79yh8d5k2izkvd06splmw8b9pkqjnanzpmszngy83rnqzpyy0" } }, { @@ -24690,14 +24852,14 @@ "repo": "elixir-editors/emacs-elixir", "unstable": { "version": [ - 20201128, - 2057 + 20201216, + 1838 ], "deps": [ "pkg-info" ], - "commit": "b78e7f733be7bf2af35807d759e53b7d52323193", - "sha256": "1jrflpfxxxs9kvrf7qm149wp1br7bb2dxx0pyzdgny3zpif4vakh" + "commit": "9de08c17d54e190d220aa03cca58bd41497f44b6", + "sha256": "0v6w2qkw52zrq0wwly0dli7gii2g64194m5169zslfrhk9rymkyp" }, "stable": { "version": [ @@ -25367,28 +25529,28 @@ "repo": "aki-s/elscreen-tab", "unstable": { "version": [ - 20190203, - 1619 + 20201229, + 1428 ], "deps": [ "dash", "elscreen" ], - "commit": "51360259326b8b4a5395a9f37dea8bf71ef2428a", - "sha256": "0472mr7r4ac8f16bq7zcybaxdvn2rqgaijckkbrcccivz3v1hky8" + "commit": "6ad77f972bde05e4e3d44f0d33b68ac41655e5f1", + "sha256": "0az5csc243p48g7mbx5yv16kg3171ykqy1zyw9wi3dwv07gqhyyb" }, "stable": { "version": [ 1, - 0, + 1, 0 ], "deps": [ "dash", "elscreen" ], - "commit": "29d7a65c3e134dd476049c9aebc8d029238e71f7", - "sha256": "0303i61m1qg65d3i3hsy7pzdhw0icpx3im99qkfmy6lxi4h9nd0p" + "commit": "6ad77f972bde05e4e3d44f0d33b68ac41655e5f1", + "sha256": "0az5csc243p48g7mbx5yv16kg3171ykqy1zyw9wi3dwv07gqhyyb" } }, { @@ -25740,6 +25902,29 @@ } }, { + "ename": "embark", + "commit": "d5174ca91e266dbb9467c962e269ff411bbbfa90", + "sha256": "1dps8p4qrzw2az9ccsgjmz0fwqqgj08qcw1f99n5absb3xmyrnf7", + "fetcher": "github", + "repo": "oantolin/embark", + "unstable": { + "version": [ + 20201231, + 910 + ], + "commit": "e9aa0d7a941c1fc31cfd9112f2446701201aceed", + "sha256": "0mac0cawis29lywhrvryaafks0fprc5bx6rwl05kx9ziia0640bk" + }, + "stable": { + "version": [ + 0, + 9 + ], + "commit": "8b1291dfd6187815158299d25dc32b0bbc5af71d", + "sha256": "0b1p3pmdy21bix3fh57c2kb5mp0bmrwdc5q9vfdb9pni9sxw3n6v" + } + }, + { "ename": "ember-mode", "commit": "9ac1eef4ad87b1b6b6d8e63d340ba03dc013425b", "sha256": "0fwd34cim29dg802ibsfd120px9sj54d4wzp3ggmjjzwkl9ky7dx", @@ -25891,27 +26076,27 @@ "url": "https://git.savannah.gnu.org/git/emms.git", "unstable": { "version": [ - 20201105, - 2351 + 20201230, + 2142 ], "deps": [ "cl-lib", "seq" ], - "commit": "6995bf6ee0cb87a36d2ac462c329326603f8662e", - "sha256": "0dp1cfgng2nhi1jfp88q2hp1k5xbd72p02prqj6iv3xd8dh1qjgk" + "commit": "a2738fe1a9013f641eeba31300e828e88b468b14", + "sha256": "0r2krmrhmwqcw3sdmy7z9rw4l222ja4jz8an8av11qjhpacr8v98" }, "stable": { "version": [ 6, - 2 + 3 ], "deps": [ "cl-lib", "seq" ], - "commit": "6985faba91b9d48c48da55d2adf4a54ca332c1cb", - "sha256": "0pcg9g11y6mjcc035wqlnn87gh4d1gmaz7dxy9ll3nksj5vwyllm" + "commit": "a2738fe1a9013f641eeba31300e828e88b468b14", + "sha256": "0r2krmrhmwqcw3sdmy7z9rw4l222ja4jz8an8av11qjhpacr8v98" } }, { @@ -26391,11 +26576,11 @@ "repo": "zenspider/enhanced-ruby-mode", "unstable": { "version": [ - 20200729, - 634 + 20201222, + 858 ], - "commit": "f0bffbe4b32bb59680f897731169442cce5a1eec", - "sha256": "0zjx6mz8kql9d09rzqircbqd9rcpfsn1k7nz9vwijp59m6mnjw1h" + "commit": "28f30c056cfe2fd7135a71576c183d242dff3b52", + "sha256": "1jslhi3nzn6b16481fkmq1mqrg7f8p5mqi4hqdkywpprqcygrwn1" }, "stable": { "version": [ @@ -26524,7 +26709,7 @@ "stable": { "version": [ 0, - 5, + 6, 0 ], "deps": [ @@ -26533,8 +26718,8 @@ "magit", "s" ], - "commit": "11c99f7e1e2c1c7d70cbda496cb5b6c7f6e4082a", - "sha256": "1c5kzq3h7gr0459z364dyq5m8vq0ydclw5wphqj9fyg28mxjj6ns" + "commit": "6fa16c4ccaaebaef64dca0d3d29904c45fd6597d", + "sha256": "1y6n5b9pk4c3badzhwm7qv1jw60p34z55ljwhaaqlnmv7nq1qnj3" } }, { @@ -26595,14 +26780,14 @@ "repo": "emacscollective/epkg", "unstable": { "version": [ - 20201203, - 1723 + 20201219, + 1947 ], "deps": [ "closql" ], - "commit": "e5c3541b0a85b3a30ca4eaf578f1d0927e67a10e", - "sha256": "0h90q5g44xkq2r4vrvib2k55b7sm7v5bpksxy5pblv1m2vdsmwvk" + "commit": "f721e3801cf92ea4265d645ac077365dc5c49d41", + "sha256": "167ghzv772i0x8ndldgsagpqkkr768dcm83ajagkppaw7rgkvg0r" }, "stable": { "version": [ @@ -26748,17 +26933,17 @@ }, { "ename": "eradio", - "commit": "b5c8621acac2bfb7859bf0b830994fc867ecdaa2", - "sha256": "0kan4ia1g9xsb53gkj43c6sn2009a9cm49x2c30ccj2gl999szq2", + "commit": "533c3f130d94335bf18907fefe2b5f1e047cdfbe", + "sha256": "0dxlsikgz1fbsypxxzczp6m4bbqh4kqv0f7w058z2sgzplybq3m4", "fetcher": "github", - "repo": "olav35/eradio", + "repo": "fossegrim/eradio", "unstable": { "version": [ - 20201204, - 2035 + 20201220, + 1010 ], - "commit": "893d499ef67065f56ef464fa8ede2e49d4597fe4", - "sha256": "0sxxkdsnz21pb1cn24c9qf3lypbgvr6z3bqda4k168ml4pbg4rlj" + "commit": "d9dcf81cfc5b0278a2ae51e77b3d44fa50e92ce8", + "sha256": "0i20g5c8sx8m5slldb765lbsxg3qdda1dqjl61s9idncp8dlllcl" } }, { @@ -27236,8 +27421,8 @@ 20200914, 644 ], - "commit": "fdace3b9c446a1d621858dc343f5ed80422d0ea1", - "sha256": "0gx3a0gcr9x9zzgr1xa4lgwl0zwcqhmxn8gscmyspbx6dj4akvg0" + "commit": "c71681368fdedcc83a136b4dc7b01e08b8a938ba", + "sha256": "1i9xp35vrksmalrr0y0ybsrb9qxxwyzgxhxz297488czxw8cfvz0" }, "stable": { "version": [ @@ -27258,20 +27443,20 @@ "repo": "erlang/otp", "unstable": { "version": [ - 20201112, - 1915 + 20201215, + 830 ], - "commit": "6b1435b92389bb6ce2d2613b66267c3a48abd0d6", - "sha256": "1xncnyp0904n287633dcl0f8mh5zhhq8shdjnjnb9fklglsbiad8" + "commit": "e0e9d8bad472fa94f4919e6db798e45913dc9eec", + "sha256": "0pbj8hafvzg5ydrhf6q3knir5gv265x815amx4vrz0y740w1pzab" }, "stable": { "version": [ 23, - 1, - 5 + 2, + 1 ], - "commit": "600506690a10215a6c7e21eefbf855216cda4c33", - "sha256": "0pxf8h6dd1a1i7vlklc5jqbb6ab91axnldgg3vmvgff6a554xd7x" + "commit": "2c89431fa867d5b1cc56f26a9282bcfb6fcdec58", + "sha256": "1xya7rv9j2528w7x0kivb3zl0rdzdwv82xp22yh7bw22vhfyrk4y" } }, { @@ -28108,11 +28293,11 @@ "repo": "emacs-ess/ESS", "unstable": { "version": [ - 20201208, - 1047 + 20201230, + 1711 ], - "commit": "a23b04599bad080ed15c630469c113b2cb591507", - "sha256": "1y5gvza93wvf5ihncfdvfghz0zgnsmy1pq1rjbi0pv4gc39rifbj" + "commit": "161db4922680b3d3e21acb858b4b1ef38a6b0b1d", + "sha256": "0q055pw86jqpfr8lkn0f7rlrdx928i1iq1xcycin16lc52fhsjw6" }, "stable": { "version": [ @@ -28313,8 +28498,8 @@ "cl-lib", "s" ], - "commit": "0ef8b536253c11da44a6788cc2c6e4d0ba7bbd6e", - "sha256": "1wg3hqq2faq20s5qmccz84jjwyjlygz0rrhz2rawck8srwwz45g5" + "commit": "fa1413737b8d5173a4db8c18d8de9ac798365d53", + "sha256": "1barvpcxw9v0gy16drcrmq2izmasm0icahnzrpyzdfnvcmvp3al7" }, "stable": { "version": [ @@ -28337,11 +28522,11 @@ "repo": "tali713/esxml", "unstable": { "version": [ - 20201130, - 809 + 20201226, + 2146 ], - "commit": "265646046b084621900767682adff6581933f044", - "sha256": "0hmmxchhqg6vipscn9ycbfm5p8bix22hipa2cl155wyqrm0cl7iz" + "commit": "f3d60206eda3cd66bea07c903198d12c4761e326", + "sha256": "1gyydxm1dja4qn9al7b5g9gm7y75qwbn516migxiy20vdzhvksfx" }, "stable": { "version": [ @@ -28493,8 +28678,8 @@ "let-alist", "request" ], - "commit": "bfb8b4bfacbf16bb23e09a2b64b5383dd9cb9a47", - "sha256": "0fj9zn136izbq8r1p4b2ca9zzvxw5jl7h2gi4v3wf1wa15fkjzf5" + "commit": "36956db9fa65ff88f3213a80b11f1fad0765d972", + "sha256": "1aqwnfdp3cb7zc38iy37hyvzr0qii182c6w6z7k9rq1arjg1vs2b" } }, { @@ -28874,15 +29059,15 @@ "repo": "emacs-evil/evil-collection", "unstable": { "version": [ - 20201207, - 1906 + 20201227, + 1057 ], "deps": [ "annalist", "evil" ], - "commit": "c9ccc3065f46c1654f1cc0d41cd2f5cff184d273", - "sha256": "1di2kc1ikrcvzf1p4nshlxdq5ndbg209kvhhdq3576xjw0ir90v5" + "commit": "16e14ea9c58aa1224c09d02e40ad3edde72c820a", + "sha256": "1k4lk23yzs0qz6fds5d6brabsh6k9dma4jr4adxhpm4i20b0sv8j" }, "stable": { "version": [ @@ -29026,6 +29211,10 @@ 20180910, 1234 ], + "deps": [ + "cl-lib", + "evil" + ], "commit": "f4e9116bfbaac8c9d210c17ad488e0982291245f", "sha256": "1whppnlzkjig1yrz0fjvp8cy86215gjahgh88166nzk95wlc3pvf" }, @@ -29468,14 +29657,14 @@ "repo": "redguardtoo/evil-matchit", "unstable": { "version": [ - 20201129, - 1241 + 20201216, + 114 ], "deps": [ "evil" ], - "commit": "6254f7c81284dd7d8249f81a6601069710432be7", - "sha256": "16s78wg904jrpa0nr9ahf6jpwd2rs9igsn4km24abdhiaxgkw04b" + "commit": "0fd65c463b991e81c6775147385badfafade52e7", + "sha256": "1l572lq6ys9v7yl51p7j3ryas2738imk2hdcbw6sf62q6yvcv1ih" }, "stable": { "version": [ @@ -29697,14 +29886,14 @@ "repo": "Somelauw/evil-org-mode", "unstable": { "version": [ - 20200922, - 1933 + 20201222, + 2023 ], "deps": [ "evil" ], - "commit": "a629fb705b0ac704580d5a5833a64716284074e7", - "sha256": "004098pxli12x75j9z0i650rvsf4al7rv3gj6r7mayv29939w8w7" + "commit": "80ef38fb378541937f6ddfe836809e76eda1e355", + "sha256": "19028laqnsl0h5nii7ykfh39srg94zhydhj1rcv52fs9nlg6c6dq" }, "stable": { "version": [ @@ -29733,8 +29922,8 @@ "deps": [ "evil" ], - "commit": "713b898b214a2e5ef2a4189674a2f21e72a55769", - "sha256": "084f6s6vfs5wx1h9wa6xazi9rjx3gfnini71cjqqrn51gahp5c9a" + "commit": "7d21ba71685b4b829c733288865054cc12783b8f", + "sha256": "1087rfvvqv9bp33vjbiwka511iha7468y86xigyvmy5wa729blzd" }, "stable": { "version": [ @@ -30423,8 +30612,8 @@ "deps": [ "evil" ], - "commit": "bc25cae9fa5ab0ba1507827f0944f52ce0ca7462", - "sha256": "0xz2yjgz6h2d6h7gfhnvrylh8gj0s7vf45bvqa450j5579gz5sqz" + "commit": "290b5323542c46af364ec485c8ec9000040acf90", + "sha256": "0dr4dc9gbavbfmij399ac09mb109fwpf1xkfk8g4xzmphh4chcnz" } }, { @@ -30821,14 +31010,14 @@ "repo": "purcell/exec-path-from-shell", "unstable": { "version": [ - 20201105, - 2236 + 20201215, + 33 ], "deps": [ "cl-lib" ], - "commit": "4ea306a76f0f8371053dd12d77a3b5b4438974d3", - "sha256": "1s6raprqgyn64fhfbjiyp874nzxysr1ycdm5064721w3iz9rzzw0" + "commit": "d14d6d2966efe5a1409f84a6b9d998268f74761d", + "sha256": "0jgy17s7gkjpdls8ql8qfpncd5vrwm50i3svmnlqic6ds4mkc7s0" }, "stable": { "version": [ @@ -31496,19 +31685,19 @@ "repo": "WJCFerguson/emacs-faff-theme", "unstable": { "version": [ - 20201208, - 2051 + 20201227, + 2240 ], - "commit": "780460d8cbac2b2cca3d2914db317e1b6b807986", - "sha256": "0x8nqj4szgyvfmjifippri3jqw1kjhjysbqwli1dwi5lq9y4dx5v" + "commit": "37f396ec57c28249af3fb10d84231afb44581df8", + "sha256": "1jlm81s8rximvbh95sk0xazp57skfgs6382gkw0yqw63ikc5x60c" }, "stable": { "version": [ 2, - 13 + 15 ], - "commit": "780460d8cbac2b2cca3d2914db317e1b6b807986", - "sha256": "0x8nqj4szgyvfmjifippri3jqw1kjhjysbqwli1dwi5lq9y4dx5v" + "commit": "37f396ec57c28249af3fb10d84231afb44581df8", + "sha256": "1jlm81s8rximvbh95sk0xazp57skfgs6382gkw0yqw63ikc5x60c" } }, { @@ -31657,11 +31846,11 @@ "url": "https://framagit.org/steckerhalter/emacs-fasd.git", "unstable": { "version": [ - 20200925, - 1549 + 20201226, + 923 ], - "commit": "38555b501430bb684feb58901ede5347dca287c7", - "sha256": "0wncbk910c7nw3wi602psx5hc6cwzigim5ahyqmkm8gry3vhwbyd" + "commit": "c4c04873fd0c8e916186f38a75cd4ab7f8b7ad59", + "sha256": "1vh5aaljjal62jv3pdl64jkzwszv1hxk7f3lrm873lr84785pc41" } }, { @@ -31849,11 +32038,11 @@ "repo": "yqrashawn/fd-dired", "unstable": { "version": [ - 20201124, - 126 + 20201217, + 547 ], - "commit": "313def22c88519e61279e858b4f53bb84a93da36", - "sha256": "0sp3a01qvxrszmcvdzplrhkiax4lhssz4idw78sxmm28j59m8p7x" + "commit": "9fb966df33e7dde9360b8707f7a0197694f46abd", + "sha256": "0gx84kr8fnx8nic3iasqjdi1z6g9shfghin13kh5i9h7d8n83xkq" }, "stable": { "version": [ @@ -31971,11 +32160,11 @@ "repo": "technomancy/fennel-mode", "unstable": { "version": [ - 20201114, - 132 + 20201221, + 543 ], - "commit": "fa56106eeb27de8c8f063f53e139e9bcf6004274", - "sha256": "1ph0x8qp736nr2zs3ffznmxd6hycgk1gv2hpw4kls3qkbcail387" + "commit": "bebc9dd58a845928114082c5ab4538b9869b4fc7", + "sha256": "1dyzfxcaq0gzw957386gapha4kai2y0hv6qqpv7gs4hsilvr8vzb" }, "stable": { "version": [ @@ -32144,11 +32333,11 @@ "repo": "davidshepherd7/fill-function-arguments", "unstable": { "version": [ - 20190710, - 929 + 20201223, + 819 ], - "commit": "295d55d6056e6f79b68283f7631f6438ea8a7b5f", - "sha256": "0nx3krpqn1c0xvr81504m4s84bkxpq42s97igmg6jfsjy7dphp2k" + "commit": "a0a2f8538c80ac08e497dea784fcb90c93ab465b", + "sha256": "0d9scijcr8qj7hqz6iicpkwhfs99ai1qxhx9rbgcs5gdp3xkrhw9" }, "stable": { "version": [ @@ -32270,14 +32459,14 @@ "repo": "technomancy/find-file-in-project", "unstable": { "version": [ - 20201111, - 407 + 20201217, + 527 ], "deps": [ "ivy" ], - "commit": "c4dee37e0454cc169330c251a06e892e4a24f45a", - "sha256": "1yn4hjhaa74b67kfh7n24vic6yz3w0l5w7spchh2lbyr7s8mz90x" + "commit": "f2f537476bb3579dcdf0587dfd2bac034cc5e719", + "sha256": "1zdc73w3649xrm902ah8vr2x8xbk17cacpspif3hrbabqpaihvh9" }, "stable": { "version": [ @@ -32925,27 +33114,27 @@ "repo": "plandes/flex-compile", "unstable": { "version": [ - 20201110, - 122 + 20201218, + 1549 ], "deps": [ "buffer-manage", "dash" ], - "commit": "fdc8bb4d4030abd678d85be153f7849723e0601d", - "sha256": "047nl793p4nimw12hplmpvklbz4wgq1ii7z0jz7yip73sb69dwbq" + "commit": "bc1f0804f089686260b64d5e4dde80c0c9f6df21", + "sha256": "0l9dxh9578gsczhq944id0lacwdr4k7383d5i147v7c6l7s8d7sw" }, "stable": { "version": [ 0, - 6 + 7 ], "deps": [ "buffer-manage", "dash" ], - "commit": "9b09f830897e323b155ef857961ef838fdcf98b9", - "sha256": "17dv0zjma0h62p7nhshb63sigg8nyxhj98dknxjdrq0kgzziqfwi" + "commit": "bc1f0804f089686260b64d5e4dde80c0c9f6df21", + "sha256": "0l9dxh9578gsczhq944id0lacwdr4k7383d5i147v7c6l7s8d7sw" } }, { @@ -33272,8 +33461,8 @@ "repo": "flycheck/flycheck", "unstable": { "version": [ - 20201105, - 423 + 20201228, + 2104 ], "deps": [ "dash", @@ -33281,8 +33470,8 @@ "pkg-info", "seq" ], - "commit": "79c9245ee0bd1722d41c865fef69aa2b1ac08fde", - "sha256": "1rmyr04fikdplc3f1wybw8hqagcwhi5ld30a6aa2fm83iamyxzpf" + "commit": "01396a5eff9fa494285e0d3139838231c05e3948", + "sha256": "0s740sbchr84yddcg0zbs4v4s52smy178f8fq5y07i3vsdnfly8m" }, "stable": { "version": [ @@ -33372,8 +33561,8 @@ "deps": [ "flycheck" ], - "commit": "2e754a1ec8c423a3356443ab8128aa43a1a860b7", - "sha256": "0zhk3lx24rv28qp7qriria5ybbz6ajhwk1ks67srzs9lczvpx63j" + "commit": "99f5fa5b3d2f67807fba67754c77ddc63e9cf441", + "sha256": "09wx5xnjd1rrv1z1pv959wl67ihccvn7rbvjsrldar80jn4nhpmx" } }, { @@ -33733,8 +33922,8 @@ "deps": [ "flycheck" ], - "commit": "f9e4db16ff9fdc6a296363aa35d19cfb4926e472", - "sha256": "1x0lmb48bza2w52s15288hpbipafs87lj5lv0ldd1q4r9yv0i102" + "commit": "15998140b0a4172cd4b4d14d0377fba96a8917fc", + "sha256": "0bdzffwp9hliy9bkvqn1p432yy161g7n7bl814mmi6zj4sfn1sy1" }, "stable": { "version": [ @@ -34436,8 +34625,8 @@ "deps": [ "flycheck" ], - "commit": "0662c314bd819f9b46f8b2b13f0c650445b3a8c5", - "sha256": "1wlvwi8y5pb3gy3j061v7krxfb1766yw5iika5ymk4zjg9g057vn" + "commit": "8e00b4c5951a9515a450a14aefe92e9f6ddcfbde", + "sha256": "1s505lk5rdc3p40w5g4cpzviaksclvfdisl457gpwjpjv0m7fwd4" } }, { @@ -34795,8 +34984,8 @@ "deps": [ "flycheck" ], - "commit": "cea2b5f58da85a53a846da7e12de32fc146b58be", - "sha256": "09qvg74fyfbhsi748vv4kl7b7vbnc224ark5vllm1ldjhnj2dq19" + "commit": "cf45af2a71f6e7a21e01c556613c5b5cdc983ac9", + "sha256": "1qhix0i8d9qrc0jg3r17v6fmrz07pjw5kk04fm72i8n4c16vb6r1" }, "stable": { "version": [ @@ -35321,20 +35510,20 @@ "flycheck", "rtags" ], - "commit": "63a7d9b733def9fe76568f81321a65a450829575", - "sha256": "1nnjhfz7xm1ax38xkz0jvgzhfczlc4r9xlpzc24sisabkvlkivyw" + "commit": "39339388256df662d0084b4a094d03e52748f9e8", + "sha256": "0wp4mygsxzibra2p3m5rn9m0yd3fscd795k5xa0wxi5pwddv7dlg" }, "stable": { "version": [ - 2, - 38 + 3, + 23 ], "deps": [ "flycheck", "rtags" ], - "commit": "9687ccdb9e539981e7934e768ea5c84464a61139", - "sha256": "1r6l7dgr2ch586zrdi5l8fhdj4qdva8ldz7cjvi2byc2pd2xs8rx" + "commit": "7169ed577d676690a3c6f0025b54e8477d80eacf", + "sha256": "1i94dizg3wvkvq8c2pf5bzkx8zwzcfi4p3l73c779y145bygssnq" } }, { @@ -35480,8 +35669,8 @@ "deps": [ "flycheck" ], - "commit": "3fa1615dd67c53b8ce69b8d3beaf412162b89f65", - "sha256": "1ss7s9s43wy90vjrck3i710blmarys1w4kqs57190nk1igay0lna" + "commit": "77a000095b321ac5d2378cf03ccf2377ccc37f59", + "sha256": "1rp0v681kvdsi84lk4m1lj8bfllwqw1ivl53q3zy34ja186xviww" }, "stable": { "version": [ @@ -35773,11 +35962,11 @@ "repo": "leotaku/flycheck-aspell", "unstable": { "version": [ - 20200902, - 2226 + 20201212, + 1038 ], - "commit": "2e754a1ec8c423a3356443ab8128aa43a1a860b7", - "sha256": "0zhk3lx24rv28qp7qriria5ybbz6ajhwk1ks67srzs9lczvpx63j" + "commit": "99f5fa5b3d2f67807fba67754c77ddc63e9cf441", + "sha256": "09wx5xnjd1rrv1z1pv959wl67ihccvn7rbvjsrldar80jn4nhpmx" } }, { @@ -37453,8 +37642,8 @@ "repo": "magit/forge", "unstable": { "version": [ - 20201209, - 57 + 20201229, + 939 ], "deps": [ "closql", @@ -37466,8 +37655,8 @@ "markdown-mode", "transient" ], - "commit": "aef11e481988073a0b842ec1fbe40440540db8bd", - "sha256": "0pia5lgfjj04gyq2nvwkfjpwz6l9rrq58mh1j2ql61zzfpfpy46n" + "commit": "c4ae0f2bdd3ecd3dacb303bd7687ecb111af8c9b", + "sha256": "17fwrcaq61qi0067nfs266dbn193lkf47630mf6bdsi2h3d2fxr6" }, "stable": { "version": [ @@ -37522,14 +37711,14 @@ "repo": "lassik/emacs-format-all-the-code", "unstable": { "version": [ - 20201123, - 839 + 20201230, + 2354 ], "deps": [ "language-id" ], - "commit": "c4ef7a266838cd3598b6b84e49f2267bb8c64d56", - "sha256": "0bz32aca3kvnpbdfyzarh6wd7i0vwc1z6ighk3dbag4dmkk6l47s" + "commit": "f51cca79d89f27c65e43f4e4cae2fbec6098304b", + "sha256": "0ix0p3bwp2slcqp7v8lbjr9a2jp1xj3firvvssldiy0d2bfykya4" }, "stable": { "version": [ @@ -37666,26 +37855,26 @@ "repo": "rnkn/fountain-mode", "unstable": { "version": [ - 20201126, - 716 + 20201226, + 1636 ], "deps": [ "seq" ], - "commit": "d29675d585c12abfa39b8f736384382c7423667d", - "sha256": "0gj5zsa271zwbd8n8l6kkan4x3xxs952hdnr8fghc9sfdizd497k" + "commit": "c7ac77fef71fc20c4c7bee73516ec3c0f656a91a", + "sha256": "00m4x3nylvwsaki6m7gvk1grcaap96rnx10mpsxlapkpbrydhpk0" }, "stable": { "version": [ 3, - 3, - 3 + 4, + 0 ], "deps": [ "seq" ], - "commit": "e46c5ce6b6d97493d73823deec088760446caaa3", - "sha256": "095nrkg2bap6rcg9hy3bh0nis4v2f8w8d9hnahkzsa3njlpqa4ka" + "commit": "3e7ef35fae455f77abb63c34e926c2d0e3070d7f", + "sha256": "161wn66gc2z7fd4f89827dpww6hjmnassbi15yis5rqbklj1h2z6" } }, { @@ -37747,15 +37936,15 @@ "repo": "alphapapa/frame-purpose.el", "unstable": { "version": [ - 20190114, - 1403 + 20201219, + 1340 ], "deps": [ "dash", "dash-functional" ], - "commit": "78f978f13589ec5c5370187c008c8aa83e6e71b4", - "sha256": "0zd981jsbf8fj5a3s7agbg32f6x3s7g87jlz13msgpgmkfhpx3gx" + "commit": "b4a259fa077671e2dcf33d11b42955c91e395b8b", + "sha256": "033vbvv4rrjbsfw0bbhhzx2754r96vy9h4n1y8jmxrqzs9wi5mmq" }, "stable": { "version": [ @@ -37803,8 +37992,8 @@ "dash", "s" ], - "commit": "3cd98cbf80b04ae2ebca1c67c52ba756116f6784", - "sha256": "0smyic3x3b98ipwhb9pw47nnymccy4w7k3dbng2g2zhgwi5pyc1k" + "commit": "187753b095a94f423763fe893408e1318fb7b2dc", + "sha256": "0b4aqilpxby3ac7rmcb4r6yhhlyjkrh47zhrshk8f3ndlyxbz9ch" }, "stable": { "version": [ @@ -37888,15 +38077,15 @@ "url": "https://git.launchpad.net/frecentf.el", "unstable": { "version": [ - 20200624, - 1534 + 20201217, + 2150 ], "deps": [ "frecency", "persist" ], - "commit": "d9d093365ffe12c46e81d16ee81850abd86a2177", - "sha256": "06w17km8hmlr2mrxi26g51mnfvcvilw91b17y52pmx09jgnqa9ac" + "commit": "23a41b8d06b1e345e6b99d1efd38a219f376faff", + "sha256": "1sgsi7kdk3r1lh0iilpyz241qpzj46xp4ifhbszjxs6p2gcwi5y9" } }, { @@ -37985,8 +38174,8 @@ "friendly-tramp-path", "with-shell-interpreter" ], - "commit": "5eecd7bb2c145fd4139f5c2538afc15b821ec102", - "sha256": "15q6q5w1wlda5wmyw8bd9bm7cqan28y5vzzr54rp02gbzc61v399" + "commit": "ad4ac00662829fa18858be02b322753ad091ffe3", + "sha256": "0xf71bvz4252y2jxkn9dpcmg5fvf9i049bbm8bvs7s9f6bcplba6" }, "stable": { "version": [ @@ -38012,15 +38201,16 @@ "repo": "p3r7/friendly-shell", "unstable": { "version": [ - 20200828, - 1218 + 20201212, + 2302 ], "deps": [ "cl-lib", + "dash", "with-shell-interpreter" ], - "commit": "5eecd7bb2c145fd4139f5c2538afc15b821ec102", - "sha256": "15q6q5w1wlda5wmyw8bd9bm7cqan28y5vzzr54rp02gbzc61v399" + "commit": "ad4ac00662829fa18858be02b322753ad091ffe3", + "sha256": "0xf71bvz4252y2jxkn9dpcmg5fvf9i049bbm8bvs7s9f6bcplba6" }, "stable": { "version": [ @@ -38052,8 +38242,8 @@ "dash", "with-shell-interpreter" ], - "commit": "5eecd7bb2c145fd4139f5c2538afc15b821ec102", - "sha256": "15q6q5w1wlda5wmyw8bd9bm7cqan28y5vzzr54rp02gbzc61v399" + "commit": "ad4ac00662829fa18858be02b322753ad091ffe3", + "sha256": "0xf71bvz4252y2jxkn9dpcmg5fvf9i049bbm8bvs7s9f6bcplba6" }, "stable": { "version": [ @@ -38265,8 +38455,8 @@ "deps": [ "cl-lib" ], - "commit": "d78ae037780ee687b654ac0e8fc8f1b954493164", - "sha256": "0q5vff4mw77864igj5mqspdirc1q22rxa9sg7zcm9kskv8c4r4is" + "commit": "aa4babe4f25d218fb4f50ac7b804cbde83e5fb4c", + "sha256": "183kbv6i23zh8dqha4l9crzgx0p5g5vc71d2kkfcpnxh83l3dhmm" }, "stable": { "version": [ @@ -38749,11 +38939,11 @@ "repo": "wavexx/gcode-mode.el", "unstable": { "version": [ - 20201011, - 1745 + 20201218, + 2109 ], - "commit": "2192ec743b49d9adfb9116ab410b195725dc886a", - "sha256": "0q53795cprhj8g0dkh2njxmpgpgm7a66g4kqdh179m3xn1kinw50" + "commit": "a1e2c6cbf4e364991ab2209d5cd5a3b698d459d9", + "sha256": "0x6aqh415gbn9x7qyb74zmw5v1ghi7y0lknlbdccxx3j62fmmv8w" } }, { @@ -38767,8 +38957,8 @@ 20201026, 1319 ], - "commit": "75fe658ab88adbec95f226d24fd9d41c33c68dd5", - "sha256": "1b5k5wrlgsmvlfxy8whc26b462vyqqyk6vgsim00nn8ds0p3810n" + "commit": "20fc7e438170b8a2e03378956c1a501fbc49aee4", + "sha256": "16k4vdmip6fmz51070w2vz9dqbh1vlsiwq0a7wikmgzz7yv8micd" }, "stable": { "version": [ @@ -39076,8 +39266,8 @@ "repo": "thisch/gerrit.el", "unstable": { "version": [ - 20201114, - 420 + 20201216, + 2245 ], "deps": [ "dash", @@ -39085,8 +39275,8 @@ "magit", "s" ], - "commit": "4c4fbd2b1b38202f701081ea8e892bd8e1a9042f", - "sha256": "1j62kwkpi5v84dvv0amacg1kgxh0asbwfq7iygrh6x3xlj3pg288" + "commit": "00b0201cef4fd2ade108289a8444e1b354a882f6", + "sha256": "0k9bwxqd2zs3bbikqgfnshk7snycfxkzlipih4m0pcnpk1fdp6sv" } }, { @@ -39196,29 +39386,30 @@ "repo": "sigma/gh.el", "unstable": { "version": [ - 20180308, - 2138 + 20201222, + 438 ], "deps": [ "logito", "marshal", "pcache" ], - "commit": "f029fc11f345ef04ab62ee91c38657e29c462fea", - "sha256": "1rgdpi8ld5hi2rp30p8sxbrl6z95nvq80jfp3zsr7cmsniwz0vv3" + "commit": "4b2dd0667ebe9c684c1de5bc96961c2ab0885c07", + "sha256": "11qjlwsiicnmgcy0yvpvagpcl31rrv5qzm18hlh16cyis4z3vngi" }, "stable": { "version": [ + 1, 0, - 10, - 0 + 1 ], "deps": [ "logito", + "marshal", "pcache" ], - "commit": "d0471dd1ba279072cbf8caf6368f3008d7120f25", - "sha256": "099msgsxdqyjrd18jv2mfkpaylp2scq18782354lcpr3fbp8vbsl" + "commit": "fa8d65f4ddc390d256eb76dd3f7e3afae02f23e7", + "sha256": "11qjlwsiicnmgcy0yvpvagpcl31rrv5qzm18hlh16cyis4z3vngi" } }, { @@ -39374,28 +39565,28 @@ "repo": "magit/ghub", "unstable": { "version": [ - 20201208, - 2056 + 20201211, + 1717 ], "deps": [ "let-alist", "treepy" ], - "commit": "a72a171b3c686b98ea2b5db11ad159b0febbf545", - "sha256": "02dh8wyq4ikix7awvib3h2imp6bq25l49yz9n7sjzcvc7b4wf92n" + "commit": "5fae5e31586a11a2025168030e0eb3876502611c", + "sha256": "0i19h9zl8wky1296f0d7dcx9dpfmfixinnaf4l1w1bf4p2xmyfiw" }, "stable": { "version": [ 3, 5, - 0 + 1 ], "deps": [ "let-alist", "treepy" ], - "commit": "47948b2482517d25d7412df34ae8be0a9f475f37", - "sha256": "0lqphkbxrayrcwkwkghfw39wwmc87fdayhl3fy790z7367ilsd1v" + "commit": "5fae5e31586a11a2025168030e0eb3876502611c", + "sha256": "0i19h9zl8wky1296f0d7dcx9dpfmfixinnaf4l1w1bf4p2xmyfiw" } }, { @@ -39725,16 +39916,16 @@ "repo": "magit/magit", "unstable": { "version": [ - 20201115, - 2313 + 20201222, + 1527 ], "deps": [ "dash", "transient", "with-editor" ], - "commit": "9e9f7cb3d260bd14e15307831a2820112c9a77ac", - "sha256": "1snbjfp35znmpa02mq0g75b24if74717f1lbij2h634pm7l5ndi1" + "commit": "c5e11811197ef8c667a605e5d9dd8ec77247bd13", + "sha256": "0i4la1sncgn2hgpgd26x0igc90q4c4jkgkng8la96hjaw09qsv23" }, "stable": { "version": [ @@ -39758,34 +39949,32 @@ "repo": "emacs-stuff/git-commit-insert-issue", "unstable": { "version": [ - 20201008, - 955 + 20201230, + 1721 ], "deps": [ "bitbucket", - "github-issues", - "gitlab", + "ghub", "projectile", "s" ], - "commit": "aff85933e35eb36df28720d21f2c5b0a21e3646e", - "sha256": "1xms52rd8si208vlxp00asz5bs8s7ax1mywa1b1856gil0ygr7qh" + "commit": "8a403005ea7f7611bb1bfd829eeefe5a4f10bb40", + "sha256": "0w5xl9r7sbhlwxzg391x50pnsjmjjakn761v3qg0lj6xhv23sdl5" }, "stable": { "version": [ 0, - 3, - 2 + 4, + 1 ], "deps": [ "bitbucket", - "github-issues", - "gitlab", + "ghub", "projectile", "s" ], - "commit": "a3cc128595eb6040713da308ac53c2d20259ca14", - "sha256": "0wxb5dqwvy82vgx6kl8yfg6sn0fi9mi6ghx93hxvayjb6x74p5c3" + "commit": "8a403005ea7f7611bb1bfd829eeefe5a4f10bb40", + "sha256": "0w5xl9r7sbhlwxzg391x50pnsjmjjakn761v3qg0lj6xhv23sdl5" } }, { @@ -39946,16 +40135,16 @@ "repo": "akirak/git-identity.el", "unstable": { "version": [ - 20200810, - 1106 + 20201223, + 948 ], "deps": [ "dash", "f", "hydra" ], - "commit": "6bf8b2cd72061eac5a4d247ba2fabdd8deafdea7", - "sha256": "1p6if6fvz6m7nnd7fl1j2dxg830ax06ln9wvm5anpsdky0lqwqyr" + "commit": "1c35e1693bbb7de41a8aac820a080a7299c13c17", + "sha256": "136j6gbpg8qx6ry1ryh4aal41b3c8pz7g2xisyipjj6p9lmykvqi" }, "stable": { "version": [ @@ -40019,20 +40208,20 @@ "repo": "sshaw/git-link", "unstable": { "version": [ - 20201124, - 155 + 20201214, + 2330 ], - "commit": "151df174a662ae6711f26f160e7759ea014f1a3c", - "sha256": "1h28gn5bvjpxqapd66dzlf1gp1nwpd5iajvv2fbldmrlxrilrcz6" + "commit": "9a3e893751791b17db85d691444e50e346cb2bd3", + "sha256": "1jdgkjiv6pn2whim71fsyfady8lv180y56j9z6bfx3gg3pp2dcbd" }, "stable": { "version": [ 0, 8, - 1 + 2 ], - "commit": "9ac2ed9c73176b8bd014fdbb1c500f44fa02e7de", - "sha256": "1rs7r8ig6xg0r2gcbya0dgbhmwxrhijfz4z5ayw57c2wqq5p6np7" + "commit": "9a3e893751791b17db85d691444e50e346cb2bd3", + "sha256": "1jdgkjiv6pn2whim71fsyfady8lv180y56j9z6bfx3gg3pp2dcbd" } }, { @@ -40588,6 +40777,24 @@ } }, { + "ename": "gitignore-snippets", + "commit": "b1d03ee45e45fc6ec30936a5f4bd8b756728da31", + "sha256": "0mj0rrcd65py4w0ahy6l3yx6pmki2lqjhmi8hlxbjv0zzks71wy3", + "fetcher": "github", + "repo": "sei40kr/gitignore-snippets", + "unstable": { + "version": [ + 20201118, + 1551 + ], + "deps": [ + "yasnippet" + ], + "commit": "0de6945ff0fc6943eebcf92d1cbb66b6a1d8fa60", + "sha256": "07qrlyb0n9h3r3b9lvqbd1fi97g3xb27836lgbdpphvvyw92975q" + } + }, + { "ename": "gitignore-templates", "commit": "4c9aa71eac2e68eb1925ed00a2c659c4375bd39c", "sha256": "17zx52pmpd4yqlnj39v7ym728i710mdl0by3lc8zk6ljfz77933w", @@ -40904,14 +41111,15 @@ "url": "https://git.launchpad.net/global-tags.el", "unstable": { "version": [ - 20201204, - 1812 + 20201215, + 1900 ], "deps": [ - "async" + "async", + "project" ], - "commit": "5e7738524789d5b95498e3b88621a3877eef5c50", - "sha256": "0qw3zi42kgf73k5f41h6dgssa49qp4bpxvw404f7627k4bxjw700" + "commit": "8f46692749e05113d4d14870dd67c6efa06626c7", + "sha256": "1sjv3ydqv1gv2nqbdwywj52xc2b2ix9f8sjb14022v0bwywk3v2j" } }, { @@ -41140,11 +41348,11 @@ "repo": "emacsorphanage/gnuplot", "unstable": { "version": [ - 20201207, - 1056 + 20201223, + 2347 ], - "commit": "fbb15b630de35b8f1396db6f26e966e9996a5a4f", - "sha256": "153sqq9i0ry4949nc33gl9w95kl1xkzf75djspz3lgfhpcs1rsvq" + "commit": "df47e871f7fc2f2c53bfed96e5a315281806396d", + "sha256": "1lkkx5ir095ffbdwkvj036x7z0ypxhxd60y3r2y7jq6986mzllka" }, "stable": { "version": [ @@ -41223,8 +41431,8 @@ "repo": "deusmax/gnus-notes", "unstable": { "version": [ - 20201010, - 1228 + 20201225, + 1617 ], "deps": [ "async", @@ -41235,14 +41443,14 @@ "org", "s" ], - "commit": "0c87d6300e50124489f46577776319f8935612c8", - "sha256": "0vjgk9m0pw254ivpr1db6lzs4a5h820pja174vslzh7dbby4rjg5" + "commit": "08687b98403cc165d7d62ceea9d50480f12e7bfb", + "sha256": "07fl52djky3v3gigjdzsi79rlq9ddpiarrmzsbdp0wadp524d4n7" }, "stable": { "version": [ 0, - 3, - 2 + 4, + 0 ], "deps": [ "async", @@ -41253,8 +41461,8 @@ "org", "s" ], - "commit": "56403ee22242fd479c2aff85f4cf4133e32ca90a", - "sha256": "0g26ygcmbcmxbafvyw04xcqzg2dlava2rqa5m2lv0cxyi6rnvdhj" + "commit": "f34e5fc1077e2558e5059876d0a22b35331f7b93", + "sha256": "0nc1chp5h495v3bpbmi00f2wahr9c9p4y7gn6rdr1xx0gnl6v2gk" } }, { @@ -42056,11 +42264,11 @@ "repo": "emacsorphanage/god-mode", "unstable": { "version": [ - 20200708, - 2200 + 20201216, + 2023 ], - "commit": "f51c8f60e55393cced8cb0bd4a5bf0ab1612caa4", - "sha256": "03n6zhxbgqzlrwl7jkmw3d5b78z2yw3qk8xk20x3wk3j58g9kk0j" + "commit": "f6eb3428e6a17a97e6e9f0783ce17ced004b98c3", + "sha256": "0qjsyp488qqjn6vwzxy23aywhv8ckx797l2zah70d23zrf79qmxc" }, "stable": { "version": [ @@ -42104,11 +42312,11 @@ "repo": "minad/goggles", "unstable": { "version": [ - 20201205, - 957 + 20201221, + 1418 ], - "commit": "a5c527fbf904bac1c73d8b823202ca1f8a0318c9", - "sha256": "02kc4vjkf15za7mbcaq60125w6qp2gdgy5jia82hhni2q4h76nvn" + "commit": "d6e584a2c9487d3df4aee818c43485e437cb87ef", + "sha256": "1mi5cnii7zbhzq6pyfaxsfixhilqmmx6v5milmkzwx6mwxxgjv87" } }, { @@ -42619,14 +42827,14 @@ "magit-popup", "s" ], - "commit": "b59d258e04802f51b9c9e733f0febda6a7e1ffa4", - "sha256": "0cbm2bg7r19a8qgbqkpdnv5pdj8lrd0aklssv7lj0bwrm8330jna" + "commit": "1ec59a7c0002598c594fb58e03907d7ff0ca84b4", + "sha256": "0bz01ybpj1lk7g34n6wwy53aaa4jvs3xhsv50y34z5wvxa8ypdsj" }, "stable": { "version": [ 0, - 23, - 1 + 24, + 0 ], "deps": [ "dash", @@ -42634,8 +42842,8 @@ "magit-popup", "s" ], - "commit": "cfbe1d59b449be9b5378251bc6e52c65bc5e1cbd", - "sha256": "05f6i7v8v9g3w3cmz8c952djl652mj6qcwjx9iyl23h6knd1d9b1" + "commit": "1ec59a7c0002598c594fb58e03907d7ff0ca84b4", + "sha256": "0bz01ybpj1lk7g34n6wwy53aaa4jvs3xhsv50y34z5wvxa8ypdsj" } }, { @@ -43235,8 +43443,8 @@ 20200725, 725 ], - "commit": "91da46f29c455c3cd24b2a6b20ff2db2c4ce8cd6", - "sha256": "08bw5mllx3hsgz8b43dlqdqh2y8asw735623r174prhv84rnq1cq" + "commit": "7a37b76342ebcc30b08b1a6a7d8a043d7fede5b2", + "sha256": "0mcyj8g1d124zpif9m4x911d877fdf3hahdpp76grsvn2qpzq2az" }, "stable": { "version": [ @@ -43367,20 +43575,20 @@ "repo": "ROCKTAKEY/grugru", "unstable": { "version": [ - 20201116, - 430 + 20201225, + 638 ], - "commit": "521d51a02a3fb76b01b35090ee102d0562cba0e4", - "sha256": "105gcz6wmli73s68ha1lqp66p9w8qqfzn190rylrzmwhnar4kkaq" + "commit": "5f1cffb6d5970988c49b89f29bfaf308f7dd8834", + "sha256": "09hn4ilvhh10sc1dypj1gpcyz07nli5lpbiazsx2gw61y2fgrc40" }, "stable": { "version": [ 1, - 14, + 15, 0 ], - "commit": "ce3cc60a3ff3dc2fdc0e3edef7cc51fd4ccb3411", - "sha256": "0g8dz1p4gmd3lq8mjmpim5132l4wvc0r0aymiqffjcbmplsil3qx" + "commit": "e4ccfd416de6a5f70e3f1c718f773b9fa2e8e17a", + "sha256": "1gx1j5l0g7n706ri8rg20v6kkl393gbhh9wx8szzmcw0xjrawdzj" } }, { @@ -43423,14 +43631,14 @@ "repo": "greduan/emacs-theme-gruvbox", "unstable": { "version": [ - 20200807, - 855 + 20201224, + 554 ], "deps": [ "autothemer" ], - "commit": "d4129a18e6cf476a472b4dc7dc12e8aafc17beca", - "sha256": "1yr8k4ymr8hinq4mrlxngsk39616p7k43n1brqww1xc84b4pvw00" + "commit": "46de195e194ebbd21a925c33db9d498c30c342af", + "sha256": "0xyysxn31xsbckxixi6cmz3yrws86cqycd5f9p06p2ahqh8xahxs" }, "stable": { "version": [ @@ -43597,14 +43805,14 @@ "repo": "tmalsburg/guess-language.el", "unstable": { "version": [ - 20201124, - 1136 + 20201229, + 1021 ], "deps": [ "cl-lib" ], - "commit": "6aa88cf267593f85b63a770a890bb93f04dd53c2", - "sha256": "0nqqnvdchlflg01if4v5qrc214q8s8d1y02xkal627a0yy4lz2a2" + "commit": "afbc3456ebdfe4bb5f8754a91c8398f8b5b7636c", + "sha256": "1x0f3v98p6lxb31rgkv2a9kr5jqrmvpsa7nqr960s41rkyx4wvi6" } }, { @@ -43679,8 +43887,8 @@ "repo": "alezost/guix.el", "unstable": { "version": [ - 20201025, - 1644 + 20201222, + 907 ], "deps": [ "bui", @@ -43689,8 +43897,8 @@ "geiser", "magit-popup" ], - "commit": "41fba4eec845e050be92bfe76c0f7980bbe821bd", - "sha256": "058s6nq1px7xzcq3mhyh3qfg81kcv579rnih9bha66jidxb7dggj" + "commit": "bb2a0539f8d68b2292b3d0f3174c139b4c304028", + "sha256": "1qf584slf4lqg4qgxj7vblmx0f0jgas03m5cc93a3wfkgkfm19w6" }, "stable": { "version": [ @@ -43838,14 +44046,14 @@ "repo": "abrochard/emacs-habitica", "unstable": { "version": [ - 20190721, - 1620 + 20201210, + 1933 ], "deps": [ "org" ], - "commit": "c45c602ddf9d6cbb0e3baf5cb3e1b7ef90f2759d", - "sha256": "0wgnzn3z98bl28jgqi7xklw9fwx2wwgihj3mq0jb8ah4vn70d0j3" + "commit": "eeb0209fd638192f0b833526deb222f9f61361cb", + "sha256": "10z24hh1g9bf00maiwkjs324da55qqzxrz196rzs53i8lkli0xkd" } }, { @@ -44304,11 +44512,11 @@ "repo": "haskell/haskell-mode", "unstable": { "version": [ - 20201120, - 755 + 20201230, + 342 ], - "commit": "0d39c847fddddc5b76fe3c706e34ab45439760bc", - "sha256": "1rbl2yalcipqp7k2161ygmrmy2dr96jlkyk35jqb5i143gyg59w2" + "commit": "3a019e65b504861d7ea23afbfecd14e5ef63e846", + "sha256": "011x9mp4ili0g9dq6ql33dq7xgv479di37phai0q282hkh5487q0" }, "stable": { "version": [ @@ -44638,16 +44846,16 @@ "repo": "emacs-helm/helm", "unstable": { "version": [ - 20201117, - 815 + 20201228, + 517 ], "deps": [ "async", "helm-core", "popup" ], - "commit": "75562eec4879e7f72119ceee40ab5087c705267e", - "sha256": "0d9jgp2pf61w52563dx84226gpskyp0j4rhw0fplcswm6fj0ggd3" + "commit": "830f03683d99a1e771277cac6f2a1110b8936334", + "sha256": "14bwzr1icv7px3din86z20vmcig0dm8dhhld6795cgbj9q99gmjf" }, "stable": { "version": [ @@ -44952,16 +45160,16 @@ "repo": "tmalsburg/helm-bibtex", "unstable": { "version": [ - 20200429, - 1606 + 20201214, + 2111 ], "deps": [ "bibtex-completion", "cl-lib", "helm" ], - "commit": "8d84d8beb3bfafaa060d7e956fcc569ecf010d9c", - "sha256": "1fnhi9dwq99jva3fmjknzlsklpm379ks8am7076xchv35609rgix" + "commit": "1bb81d77e08296a50de7ebfe5cf5b0c715b7f3d6", + "sha256": "1n5539hivg65gkr041mq8h96bn489fhvbxrh1manxacf6xi6b2am" }, "stable": { "version": [ @@ -45122,15 +45330,15 @@ "repo": "alphapapa/bufler.el", "unstable": { "version": [ - 20200409, - 1253 + 20201216, + 826 ], "deps": [ "bufler", "helm" ], - "commit": "d623605be961316be378ffcd1e97a85069f2f7cc", - "sha256": "0vysawxmzvdnk7s5i44644pvi5y6gxyvbnspn45vl8y0ifddv2g2" + "commit": "097f4349920215bdd829fceabc1afdbba172c32a", + "sha256": "1a4y3p7cwygw09b9f9j9m821aiyjiji55mrm83pvv0xzc9rhwd3h" }, "stable": { "version": [ @@ -45566,14 +45774,14 @@ "repo": "emacs-helm/helm", "unstable": { "version": [ - 20201019, - 715 + 20201225, + 1456 ], "deps": [ "async" ], - "commit": "75562eec4879e7f72119ceee40ab5087c705267e", - "sha256": "0d9jgp2pf61w52563dx84226gpskyp0j4rhw0fplcswm6fj0ggd3" + "commit": "830f03683d99a1e771277cac6f2a1110b8936334", + "sha256": "14bwzr1icv7px3din86z20vmcig0dm8dhhld6795cgbj9q99gmjf" }, "stable": { "version": [ @@ -47519,8 +47727,8 @@ "repo": "emacs-helm/helm-navi", "unstable": { "version": [ - 20200401, - 904 + 20201220, + 1823 ], "deps": [ "helm", @@ -47528,8 +47736,8 @@ "navi-mode", "s" ], - "commit": "9bba79119edd8959d26484326c2f6868b7d942c0", - "sha256": "136shiqwr7k95gqywrlqqykx1pgpvyjbfzggwj7q1akqjslxfffn" + "commit": "c5666cc171288d1fa892900ee66fba2a1c892c81", + "sha256": "1vs33n6fga8q4s129pl25bvbka5h0dalmbd8a92d92c9kmmb2m3q" } }, { @@ -47673,8 +47881,8 @@ "org-multi-wiki", "org-ql" ], - "commit": "8c0f56703d301cef6c41feb65bf60cc0da1518cb", - "sha256": "0zq8h2bl4gcanqvq730iip93h37rmj1j1w916yqr8rn7wap4pgls" + "commit": "8e38e1f3c06593b729f6401b6413856efd0264f4", + "sha256": "1jrlngyvbgy6ra59krgdn9gbfpg0aznaaridd95xkr6z78ad1ql7" }, "stable": { "version": [ @@ -47708,8 +47916,8 @@ "org-ql", "s" ], - "commit": "1389ccb46be0db0252196f52ee1337dc65dc1a2a", - "sha256": "17smsqy5y2sk3sasgl8dn49nk6s2z8wpr6h1b8g7ds62vc61rz7l" + "commit": "208e103ecc146db71d878df3bd09c6eb60c2797d", + "sha256": "09vdndp3935iy4flynbjpkvfax7vs1ppswl19wx4nn2rp7hdz8kp" }, "stable": { "version": [ @@ -47728,8 +47936,8 @@ "repo": "alphapapa/org-recent-headings", "unstable": { "version": [ - 20201118, - 737 + 20201213, + 837 ], "deps": [ "dash", @@ -47738,8 +47946,8 @@ "org-recent-headings", "s" ], - "commit": "11430626f7d83b8eafbaf34bb5eeeff458035187", - "sha256": "1z2rad7rvh125a91z2xnwd3zslqs2v5bwhb8p0lvnw3b7z6qy91y" + "commit": "5da516a1586675992c0122ed32978c18dda06318", + "sha256": "1xnhahgs1q6y7w0rrc33qbkdagjm6q71a4i0msi4gsfnnzwn4vam" } }, { @@ -48062,16 +48270,16 @@ "repo": "bbatsov/helm-projectile", "unstable": { "version": [ - 20201208, - 1837 + 20201217, + 908 ], "deps": [ "cl-lib", "helm", "projectile" ], - "commit": "e3d541c59505cd8c5843bbcf237c12e3d3288990", - "sha256": "171cykxdn38245fjphx9qx3zcdgrc5wvnp89bq53pvqjqk6b32d2" + "commit": "58123f14c392021714fc5d23b9f95c7f95ce07f1", + "sha256": "0w8267l136l9ci9b0rz0mshh8wcj7za9izvm64ks17lr8avm2his" }, "stable": { "version": [ @@ -48460,20 +48668,20 @@ "helm", "rtags" ], - "commit": "63a7d9b733def9fe76568f81321a65a450829575", - "sha256": "1nnjhfz7xm1ax38xkz0jvgzhfczlc4r9xlpzc24sisabkvlkivyw" + "commit": "39339388256df662d0084b4a094d03e52748f9e8", + "sha256": "0wp4mygsxzibra2p3m5rn9m0yd3fscd795k5xa0wxi5pwddv7dlg" }, "stable": { "version": [ - 2, - 38 + 3, + 23 ], "deps": [ "helm", "rtags" ], - "commit": "9687ccdb9e539981e7934e768ea5c84464a61139", - "sha256": "1r6l7dgr2ch586zrdi5l8fhdj4qdva8ldz7cjvi2byc2pd2xs8rx" + "commit": "7169ed577d676690a3c6f0025b54e8477d80eacf", + "sha256": "1i94dizg3wvkvq8c2pf5bzkx8zwzcfi4p3l73c779y145bygssnq" } }, { @@ -48641,25 +48849,25 @@ "repo": "emacs-helm/helm-selector", "unstable": { "version": [ - 20200808, - 858 + 20201219, + 1639 ], "deps": [ "helm" ], - "commit": "a1920a885830693dd9b1d6af3dd60f1915d976f4", - "sha256": "134rxm4zicn565k3q5q15iiqcvcyiq6lsvmsqr53ifjjbq8pd9y6" + "commit": "6a943b9952c749c2a83c284cfcf5b56f5f6622ad", + "sha256": "0msc8byspjd0ygpbnxkiv2g9qv5kxpcp2vh2sjg7yxrfbishj8hq" }, "stable": { "version": [ 0, - 3 + 5 ], "deps": [ "helm" ], - "commit": "a1920a885830693dd9b1d6af3dd60f1915d976f4", - "sha256": "134rxm4zicn565k3q5q15iiqcvcyiq6lsvmsqr53ifjjbq8pd9y6" + "commit": "7542a6dffe338db8109b0233e4d4c8f4b22354a0", + "sha256": "1cv659sqmrvk316fp7mjc58vvbcg1j6s2q4rwgqrpbyszrxl3i63" } }, { @@ -48886,6 +49094,36 @@ } }, { + "ename": "helm-switch-to-repl", + "commit": "55308cb8dbedc704ab78aa7e1b08b3f34e316118", + "sha256": "1kb8my50ay6g8i6iq5kg9pp6yar3xx7yhqj1q1xzjhlm00dbcr8a", + "fetcher": "github", + "repo": "emacs-helm/helm-switch-to-repl", + "unstable": { + "version": [ + 20201214, + 1216 + ], + "deps": [ + "helm" + ], + "commit": "e6cae905c9d224bcca02437696afae7d6633c4a9", + "sha256": "1zwzpar34b98p0fiwy9q1bxrb67nv79pv9cz4kmyypclrmrhgqa2" + }, + "stable": { + "version": [ + 0, + 1, + 1 + ], + "deps": [ + "helm" + ], + "commit": "e6cae905c9d224bcca02437696afae7d6633c4a9", + "sha256": "1zwzpar34b98p0fiwy9q1bxrb67nv79pv9cz4kmyypclrmrhgqa2" + } + }, + { "ename": "helm-swoop", "commit": "7a4e84530b4607a277fc3b678fe7b34b1c5e3b4f", "sha256": "0dbn0mzzsjhpxh0dpxrrzqam9hl2sjsp1izq2qv3z11iv2hylzx4", @@ -49766,11 +50004,11 @@ "repo": "dgutov/highlight-escape-sequences", "unstable": { "version": [ - 20171117, - 1237 + 20201214, + 1730 ], - "commit": "08d846a7aa748209d65fecead2b6a766c3e5cb41", - "sha256": "05mc3w1f8ykf80914a1yddw6j8cmh0h57llm07xh89s53821v2is" + "commit": "fae976568c04b6fe8a9f2d854c8fe23b357a6878", + "sha256": "1a1jcmfijipxl5frkbliav06qd0r5yb1l7a8w2gx33bc6q09yahx" } }, { @@ -50358,16 +50596,16 @@ "repo": "narendraj9/hledger-mode", "unstable": { "version": [ - 20191012, - 1046 + 20201212, + 2121 ], "deps": [ "async", "htmlize", "popup" ], - "commit": "8206f3c5d8e5b9b084733879191ec3724b60494d", - "sha256": "16y3xb8kc4j72gv1d59g4jw21q53i474hiksa6dzxvxkzva4wzf9" + "commit": "bad680b33c2ca20a6088986a10735a5df3cb9996", + "sha256": "0vd2fn011l5iqi1ja8j3l0wq90wr70b8dk75mh3xrrl8jp55xwxl" } }, { @@ -50741,14 +50979,14 @@ "url": "https://scm.osdn.net/gitroot/howm/howm.git", "unstable": { "version": [ - 20201015, - 1133 + 20201231, + 1042 ], "deps": [ "cl-lib" ], - "commit": "ce77dfbb50815d55081b2462541954d11a76f308", - "sha256": "05z1473s63qjsn41y32zk9hli9mcy4nfx3iv79a6yl5yp4x0ivg6" + "commit": "c11a6b7ad3d683d2910572fa7f2a87ffdf503317", + "sha256": "0fjwgxaf7lzby6hz96xz9b97mv4vhczs14cq6j6vxygrkykafwam" } }, { @@ -51081,11 +51319,11 @@ "repo": "humanoid-colors/emacs-humanoid-themes", "unstable": { "version": [ - 20201208, - 1625 + 20201211, + 1320 ], - "commit": "d1d12a59daa4ba542854e9b59d73f1763219fb54", - "sha256": "1mxjx5ib5xzjmr0dbk0bsjr8mkxiq4yjwrhfah3xw7lm51j0d74n" + "commit": "5a2638b95f93ededa625187dee76946a60e7b9d4", + "sha256": "063vrr73zsvvfcsda5z8b7hpkhql2smbi40dp10nqsyih26f6ahh" } }, { @@ -51199,11 +51437,11 @@ "repo": "Riyyi/emacs-hybrid-reverse", "unstable": { "version": [ - 20200830, - 331 + 20201213, + 1504 ], - "commit": "a28044a1dc42920b5107986dadef8322877c3d81", - "sha256": "0fxybcmnrgfa0xyj562nng6ff6jm9dk78bwdc8vs6ffyccd6dmij" + "commit": "4c7a3813bc3fb8753de9edbc1d6296428d3a2601", + "sha256": "13lx5ghi939xx47d3plpznhrs4qlzsgicp8rcvm47li04j56db9h" } }, { @@ -51635,19 +51873,19 @@ "repo": "oantolin/icomplete-vertical", "unstable": { "version": [ - 20201206, - 759 + 20201213, + 2230 ], - "commit": "ef12199fdf53c4a0fe7691850e133dabba58b147", - "sha256": "04zfnjyy7v4acgh6bhkd71vmwhsghjncjyvn945jm6lx473k3j35" + "commit": "a4c65f213bd3d8be94fe8cb28ecf7ff3b44405d1", + "sha256": "02v190pb802vck7di39jyf5prvmfsgcxln8mgwsls2b4clx9da97" }, "stable": { "version": [ 0, - 2 + 3 ], - "commit": "2c328a19f617b538986977a897d3af051ae7f355", - "sha256": "1bm02qd71r3j35b861rgbxkv3kcmg2458c70vwfaw9sjjba0ssng" + "commit": "a4c65f213bd3d8be94fe8cb28ecf7ff3b44405d1", + "sha256": "02v190pb802vck7di39jyf5prvmfsgcxln8mgwsls2b4clx9da97" } }, { @@ -51658,28 +51896,27 @@ "repo": "plandes/icsql", "unstable": { "version": [ - 20201110, - 512 + 20201219, + 224 ], "deps": [ "buffer-manage", "choice-program" ], - "commit": "155051cc4122cc71e5b72c1e330b5115fe2dfde5", - "sha256": "04jrlkks3s3yri86vy3dk173yz76h4bnbk0vmby5lqpx2r1zvgh5" + "commit": "dbe4957b08b70e157a05a7d8db84a51aeb9400ca", + "sha256": "0rkby252cyj2dxs89qgifysk615wwr0cm4zdnmamyyqcwpc4c223" }, "stable": { "version": [ 0, - 0, - 1 + 2 ], "deps": [ "buffer-manage", "choice-program" ], - "commit": "415cfb7473537ea5a0f156c35f4dce0d2c49d124", - "sha256": "078cgskyzdx6sbyry20p6f3y5idd8fi8jhgm5bcyrj626nkf60f2" + "commit": "f4d40c48f770df68540934a3dfabd07d0edc081c", + "sha256": "1j70rljhmzh6ixxbf4cj8qkjkkl4l2mlj45dqls3b5h6kzxwg5cy" } }, { @@ -52536,6 +52773,30 @@ } }, { + "ename": "imenu-extra", + "commit": "2ea763417b23f39519ea1bd333f407909293ebd9", + "sha256": "0w5w7pjh41xv1lwd157s4vk20w0hf3m2pl92kr0b2andrsakg783", + "fetcher": "github", + "repo": "redguardtoo/imenu-extra", + "unstable": { + "version": [ + 20201229, + 1035 + ], + "commit": "68b0aaaefc18b267e4e383df36a8dfb7448bc83c", + "sha256": "1mf8drn4acf0r2sjpprbjp4wv75jzy5j8b9p9snnj3991fk66yby" + }, + "stable": { + "version": [ + 0, + 0, + 1 + ], + "commit": "2bd6d28fa25ef8f9b477cad9d8d806ce9fbb9d52", + "sha256": "1qhpwdz3x7gd484db5x6gf777snxfpvk3f08dr0qbr5n1743qky7" + } + }, + { "ename": "imenu-list", "commit": "86dea881a5b2d0458449f08b82c2614ad9abd068", "sha256": "092fsn7hnbfabcyakbqyk20pk62sr8xrs45aimkv1l91681np98s", @@ -53094,11 +53355,11 @@ "repo": "nonsequitur/inf-ruby", "unstable": { "version": [ - 20200826, - 1458 + 20201228, + 1237 ], - "commit": "b0124578db09b64902c8ca981b02e74bec92ef36", - "sha256": "0ivk80x6sfns4c5s21sr4qrg1zysqq3s8rz2hx8s55f7jbq4k51w" + "commit": "1fc972ecda6a2155806d75d202481327703a0681", + "sha256": "0kv98g30kgfpyd0ghiclk17ac2y17j7bi77km59gdw5i1b5k1a27" }, "stable": { "version": [ @@ -54170,6 +54431,21 @@ } }, { + "ename": "ispc-mode", + "commit": "9ab74e0895e879a54fe80eb3afccd1c4cd9ef70d", + "sha256": "09ljkivgfwxx2c24a8c1080rzlimf5bck4rp41lgc5pk02p0y9rd", + "fetcher": "github", + "repo": "Munksgaard/ispc-mode", + "unstable": { + "version": [ + 20201215, + 852 + ], + "commit": "722fdc45da2714f8fe0757968589cdb5ccacc8a0", + "sha256": "1lv15306wy34a1l3a2lq2y8lpzg1jna0rzdjbddhdanf2b0rhs83" + } + }, + { "ename": "iss-mode", "commit": "ecc9f618b9f065f593b91c1c1221a550ab752bae", "sha256": "1my4vi1x07hg0dva97i685lx6m6fcbfk16j1zy93zriyd7z5plkc", @@ -54300,11 +54576,11 @@ "repo": "abo-abo/swiper", "unstable": { "version": [ - 20201110, - 1021 + 20201218, + 1222 ], - "commit": "ae9b121b834a68d11f79ca27b1e5c8790149ba2f", - "sha256": "160qs77b4sama17h8lhq60my44qh4c9aj1qj9jk02n64jfn44fm6" + "commit": "d2891aab7b816aebf21ebd01ce33933a6ac6244f", + "sha256": "12bm5w073mgpj7kvk6596fnw8809nl6vkv288l7vvzx7iimaqzpl" }, "stable": { "version": [ @@ -54331,8 +54607,8 @@ "avy", "ivy" ], - "commit": "ae9b121b834a68d11f79ca27b1e5c8790149ba2f", - "sha256": "160qs77b4sama17h8lhq60my44qh4c9aj1qj9jk02n64jfn44fm6" + "commit": "d2891aab7b816aebf21ebd01ce33933a6ac6244f", + "sha256": "12bm5w073mgpj7kvk6596fnw8809nl6vkv288l7vvzx7iimaqzpl" } }, { @@ -54351,8 +54627,8 @@ "cl-lib", "swiper" ], - "commit": "8d84d8beb3bfafaa060d7e956fcc569ecf010d9c", - "sha256": "1fnhi9dwq99jva3fmjknzlsklpm379ks8am7076xchv35609rgix" + "commit": "1bb81d77e08296a50de7ebfe5cf5b0c715b7f3d6", + "sha256": "1n5539hivg65gkr041mq8h96bn489fhvbxrh1manxacf6xi6b2am" }, "stable": { "version": [ @@ -54550,6 +54826,40 @@ } }, { + "ename": "ivy-file-preview", + "commit": "545ee0661388b1535ea58b526cecdd06b30ad48d", + "sha256": "0svw9sdlblv4m0dylrlyr0rvddhj1kkrilf3316vqsngnrwqj3vp", + "fetcher": "github", + "repo": "jcs-elpa/ivy-file-preview", + "unstable": { + "version": [ + 20201127, + 629 + ], + "deps": [ + "f", + "ivy", + "s" + ], + "commit": "402b4b915bc7daa14d16a48b47a2e453ce80dcd3", + "sha256": "0z1czcqdkdxn1c92fa640idacc8c1b9ykfk8r94d2174ki93jd9j" + }, + "stable": { + "version": [ + 0, + 4, + 3 + ], + "deps": [ + "f", + "ivy", + "s" + ], + "commit": "4727ac0dd7906807c830e2abdd3e081812105ad6", + "sha256": "0ia0a38f3dfiqz96fc405ax472zyj92yn61qs9mpdz8ql3pv2dwb" + } + }, + { "ename": "ivy-fuz", "commit": "578c150cb8f61058f8003554d372944a990d7a7d", "sha256": "1z7r4fw1kl4vnfd5n6d628xwqhlr1768yfpj55gg28bq5lfx725h", @@ -54652,8 +54962,8 @@ "hydra", "ivy" ], - "commit": "ae9b121b834a68d11f79ca27b1e5c8790149ba2f", - "sha256": "160qs77b4sama17h8lhq60my44qh4c9aj1qj9jk02n64jfn44fm6" + "commit": "d2891aab7b816aebf21ebd01ce33933a6ac6244f", + "sha256": "12bm5w073mgpj7kvk6596fnw8809nl6vkv288l7vvzx7iimaqzpl" }, "stable": { "version": [ @@ -54689,6 +54999,38 @@ } }, { + "ename": "ivy-migemo", + "commit": "78f8c6a81e7e8428b125413148e6bfe64c8ec7bd", + "sha256": "0ri8l9rb605fx5hhnpkmyaqflz73n4jsmzb42fsspwg2rwjfyafl", + "fetcher": "github", + "repo": "ROCKTAKEY/ivy-migemo", + "unstable": { + "version": [ + 20201214, + 307 + ], + "deps": [ + "ivy", + "migemo" + ], + "commit": "0f34245dae2f890c685be767e3dc2c24c65dfe28", + "sha256": "1d013v8nb83g1hkfc5vxf5y7m67fi8346xm912hyyy03871kb469" + }, + "stable": { + "version": [ + 1, + 1, + 0 + ], + "deps": [ + "ivy", + "migemo" + ], + "commit": "fc4f44750466ba9385e3313c85adf83a8e55a1fa", + "sha256": "0lax72js89k5g007ra6ngy9gnphny4bgjggnl9d3j3mizw9cynvn" + } + }, + { "ename": "ivy-mpdel", "commit": "bb25443752e18e47afc63d5497cc5052c388a607", "sha256": "1v9xiy4bs7r24li6fwi5dfqav8dfr3dy0xhj3wnzvcgwxp5ji56r", @@ -54787,28 +55129,28 @@ "repo": "tumashu/ivy-posframe", "unstable": { "version": [ - 20201124, - 404 + 20201215, + 39 ], "deps": [ "ivy", "posframe" ], - "commit": "08a00b81747c6b623dd1adc7491a1e2a4c3a3d2a", - "sha256": "123dmbdkad5dbsrgj75n6zpxrqzz5fbkqpa5il64zmlcq6jqy1kr" + "commit": "83047d440ff132d5a45acde5955f71853edeefb9", + "sha256": "03n1a9qzc53i3lx0ywayc2v8p0n4ydl7ly6niaj9dj15ik0nzxsp" }, "stable": { "version": [ 0, 5, - 3 + 5 ], "deps": [ "ivy", "posframe" ], - "commit": "08a00b81747c6b623dd1adc7491a1e2a4c3a3d2a", - "sha256": "123dmbdkad5dbsrgj75n6zpxrqzz5fbkqpa5il64zmlcq6jqy1kr" + "commit": "83047d440ff132d5a45acde5955f71853edeefb9", + "sha256": "03n1a9qzc53i3lx0ywayc2v8p0n4ydl7ly6niaj9dj15ik0nzxsp" } }, { @@ -54826,8 +55168,8 @@ "ivy", "prescient" ], - "commit": "5d139e5b1fe03ccaddff8c250ab8e9d795071b95", - "sha256": "11hqy8chh29lrzk04dp3rwkvf4bj0xvg9hli3w1zx968x98lfvj0" + "commit": "2af94ce194f9b8d7087f7b49ecd986083f7eb753", + "sha256": "19wwnl72gh4ar2q6gcp6k6n4gdvamdjj6lgc0n4mk7j1qrylp3hf" }, "stable": { "version": [ @@ -54881,14 +55223,14 @@ "repo": "Yevgnen/ivy-rich", "unstable": { "version": [ - 20201125, - 433 + 20201224, + 4 ], "deps": [ "ivy" ], - "commit": "c0a164ce42920df0629c87dad5ea1bddc79ceac3", - "sha256": "0x2q8gnj324rnpyryyas8b1b9sljsp7dgwhn9rv0kjn99j1vaphy" + "commit": "f8a1f5c90d2a113b597ef5903634c089fce3365b", + "sha256": "1bwp26b7m3zxl00ywav7qfwlszxms3z00w41k7nvb47a4s0cvffl" }, "stable": { "version": [ @@ -54918,20 +55260,20 @@ "ivy", "rtags" ], - "commit": "63a7d9b733def9fe76568f81321a65a450829575", - "sha256": "1nnjhfz7xm1ax38xkz0jvgzhfczlc4r9xlpzc24sisabkvlkivyw" + "commit": "39339388256df662d0084b4a094d03e52748f9e8", + "sha256": "0wp4mygsxzibra2p3m5rn9m0yd3fscd795k5xa0wxi5pwddv7dlg" }, "stable": { "version": [ - 2, - 38 + 3, + 23 ], "deps": [ "ivy", "rtags" ], - "commit": "9687ccdb9e539981e7934e768ea5c84464a61139", - "sha256": "1r6l7dgr2ch586zrdi5l8fhdj4qdva8ldz7cjvi2byc2pd2xs8rx" + "commit": "7169ed577d676690a3c6f0025b54e8477d80eacf", + "sha256": "1i94dizg3wvkvq8c2pf5bzkx8zwzcfi4p3l73c779y145bygssnq" } }, { @@ -55275,14 +55617,14 @@ "repo": "emacs-jp/japanese-holidays", "unstable": { "version": [ - 20201030, - 1053 + 20201229, + 755 ], "deps": [ "cl-lib" ], - "commit": "a2075babc0c2158addeb6bec4fb4be604e75002c", - "sha256": "1n91ipgzxy36s96lv9w36wqcmlw2mjcm7rkj61z1infpgs6rm3v9" + "commit": "324b6bf2f55ec050bef49e001caedaabaf4fa35d", + "sha256": "1bxbxczsf0b7jiim2anjh16h243khyrcv4k07qg0yy8c9zrl18aq" } }, { @@ -55949,11 +56291,11 @@ "repo": "Michael-Allan/Java_Mode_Tamed", "unstable": { "version": [ - 20201205, - 2020 + 20201222, + 2048 ], - "commit": "c2a0d4aec1dfbc12a705dccb42d33259aef63690", - "sha256": "05hyjiskwki6ls2yfbjvs9qdy2d4zzkm9rhd5v4lpdpshdgdwj07" + "commit": "b028d48d22d72129b2b49d93298f65241de206fd", + "sha256": "1ky9vzvib9rp4k46n80hilff2yr5bg4ham1cx083nnaxshdw8n3b" } }, { @@ -55983,11 +56325,11 @@ "repo": "SebastianMeisel/journalctl-mode", "unstable": { "version": [ - 20200607, - 754 + 20201217, + 1625 ], - "commit": "e8e057f387266d1c11f8fb68023ceb9607404948", - "sha256": "1l9z0w8kb15vsfpwcl9rfhflmvy8illsssfqjxkcwl8d7pzfhm8n" + "commit": "c5bca1a5f42d2fe2a00fdf52fe480137ace971d3", + "sha256": "0m0d5kzw5cymnmnilm688dlkhh0g64d7qyv3nd6mxbgrii559v9r" }, "stable": { "version": [ @@ -56128,8 +56470,8 @@ 20180807, 1352 ], - "commit": "9d9460b17f59e4e7a4e5cc34576ba72b2ca56524", - "sha256": "0hil53mzvxz71l908wm6804migvm7hm0nwm8qpyy2dgnfzl996hg" + "commit": "aa3175de7da5e1243dfd1ad9a17dcfe85740415e", + "sha256": "01z9nq0yp47qcps7c7jzrb1fmcx7qbhr7ig056sp20jq7yn9r3dy" }, "stable": { "version": [ @@ -56319,24 +56661,24 @@ "repo": "mooz/js2-mode", "unstable": { "version": [ - 20201209, - 225 + 20201220, + 1718 ], "deps": [ "cl-lib" ], - "commit": "f7816bdd3e8e84ed1d64b6a13c9ba488363b7e91", - "sha256": "05j8m9bdljzscbl343aqqfcjxgvshrlygzqhd2wi8089mby7f59y" + "commit": "29979e5f3301796ba606759e39ee0b1b6a2a24f3", + "sha256": "1pvdzinxfd3b08d92cf5v0fk88dzlyw5r5g3hablh6gcfc9i57xx" }, "stable": { "version": [ - 20190219 + 20201220 ], "deps": [ "cl-lib" ], - "commit": "ed955e7f1608cfd2d2713129d65f5fd734842ae4", - "sha256": "0766bbr4piia9vfr4ivd2gwi8dxah654adv6h28ylz4q8xmfzm1b" + "commit": "f9564769e81c612b43f99802d6a2c5e6b1f8fca4", + "sha256": "00jy917cgp5xzfgs4m0spzlbqk8mg63layin8nxmn2647rfjnik4" } }, { @@ -56877,25 +57219,25 @@ "repo": "shg/julia-vterm.el", "unstable": { "version": [ - 20201202, - 845 + 20201223, + 741 ], "deps": [ "vterm" ], - "commit": "d4d5c50f1542d1128e334d32ce385891e0dca7e2", - "sha256": "13qi16qlx860a32bfl4l68szfgphv1vr0cd2k151zvqhdsf7fach" + "commit": "06ee45bffb6e711278a7af5207899d2b4316706c", + "sha256": "1zwhbwm285gqy9bfhlaaa9wp3lz959i3d1s41msl70jxbrnjz7pw" }, "stable": { "version": [ 0, - 10 + 11 ], "deps": [ "vterm" ], - "commit": "f7b790a49e15644fd4f36795efa412c59e33e49b", - "sha256": "1bdhkcy6pr387wf3s13vd5gyy4dwwy8blfdpk83lf7hw7grqzph2" + "commit": "06ee45bffb6e711278a7af5207899d2b4316706c", + "sha256": "1zwhbwm285gqy9bfhlaaa9wp3lz959i3d1s41msl70jxbrnjz7pw" } }, { @@ -57096,14 +57438,14 @@ "repo": "TxGVNN/emacs-k8s-mode", "unstable": { "version": [ - 20200803, - 1549 + 20201215, + 1656 ], "deps": [ "yaml-mode" ], - "commit": "bbceb256bf2b6a56c86aed5963102fb4898aadc9", - "sha256": "16ani1d8c9g3v1zpwxcczm5bjbkymd86i1adcvc9xcaz46v7sb3w" + "commit": "9d37e64b9bdc1778481687ca04e2ee5a96bc0474", + "sha256": "054pasvk5xspdndsc962z3d3z5jgpd28ysag5pxa8dfh3yz65vxq" }, "stable": { "version": [ @@ -57387,28 +57729,28 @@ "repo": "ogdenwebb/emacs-kaolin-themes", "unstable": { "version": [ - 20201206, - 914 + 20201216, + 717 ], "deps": [ "autothemer", "cl-lib" ], - "commit": "65e46afa01da61506d23c16266fa4065b25aec6d", - "sha256": "1k3l0yvhkwv0mjhb0z5bq187ixw7avsjf2hyqq46dn3lp1xm0wyv" + "commit": "5694f27f6e17bf2d840fa04728d392b5df77e20c", + "sha256": "1c5hdr654f012lj3ssxsavbnij0i109nykwcsgl2c2pb9yxqr5rw" }, "stable": { "version": [ 1, 6, - 1 + 2 ], "deps": [ "autothemer", "cl-lib" ], - "commit": "1114a8d84b60eaf8cadb628a29e0eaf6b5906f69", - "sha256": "0hfwxbsq9hdascs2vp56yw86m0ha9148596gm27yiqm6di51l571" + "commit": "5694f27f6e17bf2d840fa04728d392b5df77e20c", + "sha256": "1c5hdr654f012lj3ssxsavbnij0i109nykwcsgl2c2pb9yxqr5rw" } }, { @@ -57600,11 +57942,11 @@ "repo": "emacsorphanage/key-chord", "unstable": { "version": [ - 20160227, - 1238 + 20201222, + 2030 ], - "commit": "72443e9ff3c4f1c3ccaced3130236801efde3d83", - "sha256": "15jfpysyydcvqlvdannxg2s4bh4i9z6i950fad1qlq43jfmq7k55" + "commit": "7f7fd7c5bd2b996fa054779357e1566f7989e07d", + "sha256": "18bmd510yksskf67hj7jzcqh8gaaf1ipq044k49469p5f8fhjy2l" }, "stable": { "version": [ @@ -57721,11 +58063,11 @@ "repo": "tarsius/keycast", "unstable": { "version": [ - 20201117, - 1552 + 20201229, + 1006 ], - "commit": "16d9961d15536054632be1eff75fd0fb1a4420f8", - "sha256": "1g9arjdhdpvsw47ny9gi5k758ya37yza4mr0rhbf02yvrqyfsrgr" + "commit": "b02892ec77ef8b83c957652c7859422d6f46e051", + "sha256": "1ggl3k2h9y7nwhawpddl0mk9smm5bpq42fyp1pq64z67zrb4217l" }, "stable": { "version": [ @@ -58156,19 +58498,17 @@ 20180702, 2029 ], - "commit": "e16794aa7d98f5b849222971f7a56fe8ab9a3d9c", - "sha256": "0chaxdwnbxwn0zx6w8bwx6sc3adb835rbppmbj1mdbj2hcx0zghd" + "commit": "e205c97ebd8e3cf4d432bc6e1a7e028ebe70f7d9", + "sha256": "1m171sjcckxca2fdcy32s5m488931dsmfbj81j9c7g92v8bw72hb" }, "stable": { "version": [ 2, 0, - 0, - -1, - 4 + 0 ], - "commit": "d74461b200a2182581f229082b041a4c70a673cb", - "sha256": "0ymk105915prhmxw3nmmgr756hzxpxwds860x5aim8jjgxhky446" + "commit": "dedcb6bcabe3d8d6758dcee607e8c33b174d782b", + "sha256": "1v3iqh13lcn9jvw8ldymyp35j1k44wrqnhdmki220q940mar5cgz" } }, { @@ -58179,15 +58519,14 @@ "repo": "stardiviner/kiwix.el", "unstable": { "version": [ - 20200714, - 1357 + 20201231, + 209 ], "deps": [ - "cl-lib", "request" ], - "commit": "cb3e2531a55b896b9b41f38f97a597c26433da8e", - "sha256": "077bng1mwnd1m8ji4a44aqly94d07k09grwk0j52kgxlhvv3p3di" + "commit": "1ea9239189d8c8687375f877e2b4966616001d6f", + "sha256": "0p72yl0h24j8snl630hyn7jqzqh7r1dqfiym6f2p5r0rlwwrrvq9" }, "stable": { "version": [ @@ -58444,8 +58783,8 @@ "repo": "abrochard/kubel", "unstable": { "version": [ - 20201111, - 1534 + 20201223, + 1730 ], "deps": [ "dash", @@ -58453,8 +58792,8 @@ "transient", "yaml-mode" ], - "commit": "746c990d05af22942136b8f9ebe91e40ec044cec", - "sha256": "0rh6m7zp4phq826lxy950hwc1z8p8f3hrjwyny0r8wvwvqw4iwdd" + "commit": "9b1aa4830a4470ff8f11ecc0bc80b5cdaee473fd", + "sha256": "1n1z8w2n7raxfmd4la2knzvs9vnprcdhxjlp21k6r757k75na3qn" }, "stable": { "version": [ @@ -58479,15 +58818,15 @@ "repo": "abrochard/kubel", "unstable": { "version": [ - 20200312, - 1349 + 20201223, + 1657 ], "deps": [ "evil", "kubel" ], - "commit": "746c990d05af22942136b8f9ebe91e40ec044cec", - "sha256": "0rh6m7zp4phq826lxy950hwc1z8p8f3hrjwyny0r8wvwvqw4iwdd" + "commit": "9b1aa4830a4470ff8f11ecc0bc80b5cdaee473fd", + "sha256": "1n1z8w2n7raxfmd4la2knzvs9vnprcdhxjlp21k6r757k75na3qn" }, "stable": { "version": [ @@ -58741,16 +59080,16 @@ "repo": "Deducteam/lambdapi", "unstable": { "version": [ - 20200929, - 612 + 20201230, + 859 ], "deps": [ "eglot", "highlight", "math-symbol-lists" ], - "commit": "75449aee4864f46dd75738206ce01ea6f54c1d7f", - "sha256": "0r1mrhvqs65a2v12ymp88viz6dybrrac4ym98g0alnmr19nqrq2d" + "commit": "5ca13281fc98741bddef6b500bbce34a0f7f44b6", + "sha256": "0qd2nyx7zjxw06qd885zlqghqg9d1pcm2yabiv3743akflpgcs6p" } }, { @@ -58857,26 +59196,25 @@ "repo": "lassik/emacs-language-id", "unstable": { "version": [ - 20201109, - 1105 + 20201217, + 1633 ], "deps": [ "cl-lib" ], - "commit": "61907b8a8d2ad99ba184ae9611b51dc2a48ac2c1", - "sha256": "0vp9mm9gvwpabz9vz14vji2wmg2wdbzysarffq3n1i6044axdqzn" + "commit": "3f0ad28202207c266bd8fc7904b224db69ceccf6", + "sha256": "0rc6hggdqpfvcq1kx6ghnzqzn7842331b0qfng42vmqn44mk9skx" }, "stable": { "version": [ 0, - 8, - 1 + 10 ], "deps": [ "cl-lib" ], - "commit": "61907b8a8d2ad99ba184ae9611b51dc2a48ac2c1", - "sha256": "0vp9mm9gvwpabz9vz14vji2wmg2wdbzysarffq3n1i6044axdqzn" + "commit": "3f0ad28202207c266bd8fc7904b224db69ceccf6", + "sha256": "0rc6hggdqpfvcq1kx6ghnzqzn7842331b0qfng42vmqn44mk9skx" } }, { @@ -58917,8 +59255,8 @@ "repo": "mihaiolteanu/lastfm.el", "unstable": { "version": [ - 20201203, - 640 + 20201212, + 836 ], "deps": [ "anaphora", @@ -58927,8 +59265,8 @@ "request", "s" ], - "commit": "31e889476d2003da9a088848ca5212efceb31f7e", - "sha256": "0wp9j6ly3sylxzsbmx5nfj815wp2gxh8q5ka1xmfi2y1gy0vw3gp" + "commit": "276c30a16518e545c95b7d693bada3ec01ddd207", + "sha256": "1n58f9g5xgicmm9j3bdik1cpqcfs0pjrxqwnb1sfrck9c00482fk" }, "stable": { "version": [ @@ -58954,15 +59292,15 @@ "repo": "storvik/emacs-lastpass", "unstable": { "version": [ - 20200320, - 2117 + 20201229, + 2109 ], "deps": [ "cl-lib", "seq" ], - "commit": "ac472f844bd1e109c62479253cbc40bb5e50ed8f", - "sha256": "07bh7vkczzpmkbxxyyhn912b5rjm975a49y1bq08y4vd006zsq4x" + "commit": "2366de7824b6c5f8e9ec6811d219dc06794e8630", + "sha256": "065nbgcs2q8gqw8alfa6lbabma6vjsqzl4mfkfpzgk566dan2x1p" } }, { @@ -59157,14 +59495,14 @@ "url": "https://git.sr.ht/~lthms/colorless-themes.el", "unstable": { "version": [ - 20200213, - 2057 + 20201222, + 1627 ], "deps": [ "colorless-themes" ], - "commit": "46d477ec5a367beb6c8e75e017ae2c3a31250136", - "sha256": "05c6ywzamnq1frmb8i07wjxrncl3fpkmns8dnc3v8si234gq3m72" + "commit": "92ae2775ac9ae2fd3d1172ffdf706e18db55963c", + "sha256": "06cp84bi3x33il119gfk8blikbqdmakvj7h64dr9crh0v11lg7ds" }, "stable": { "version": [ @@ -59239,11 +59577,11 @@ "repo": "conao3/leaf.el", "unstable": { "version": [ - 20201110, - 1438 + 20201211, + 412 ], - "commit": "ef0bdd4c4b51e498ad20ded8db3bd81f57054966", - "sha256": "1x1192vs2gss5j0722bw296xsvs25f12m3faj26z5dsb8kiw7kgv" + "commit": "e0c4b7484ab6ee3bbf8413f620ccb99af4328d2f", + "sha256": "18vvl8a5s6n1kky31n0khnv89998gy9vfk5q58hkczfadc6nss76" }, "stable": { "version": [ @@ -59283,14 +59621,14 @@ "repo": "conao3/leaf-keywords.el", "unstable": { "version": [ - 20201204, - 1545 + 20201225, + 1406 ], "deps": [ "leaf" ], - "commit": "ef29ef0ba8e0168f14e5255491c1668673269a37", - "sha256": "04z5yir4anb0wnspya8gvcbyjb1qnwkhvb4k0dxivh5l35vr34v8" + "commit": "64c5ec702b7fab83770c539d613d8c6610ce510d", + "sha256": "0qzmnbn91g02g6vhilx081xz6n1360a3ri64rpzd8avcgmrkb1vr" }, "stable": { "version": [ @@ -59481,11 +59819,11 @@ "repo": "ledger/ledger-mode", "unstable": { "version": [ - 20200530, - 1710 + 20201226, + 1721 ], - "commit": "805507fd6c14839be4efc7aee2017f9c03e36834", - "sha256": "1sil9kdkcb0r165qm8vpxll0ikfnm0cqjd3gmj8vi6k8n6awv9zv" + "commit": "9c418079c244bc984f01b48e2bf360ed764d3261", + "sha256": "1zwmkm6s52dh1vb0d6r845j160i98v2p002iwwhwk28m2v5adbj1" }, "stable": { "version": [ @@ -59712,17 +60050,17 @@ }, { "ename": "leuven-theme", - "commit": "b09451f4eb2be820e94d3fecbf4ec7cecd2cabdc", - "sha256": "0pm5majr9cmj6g4zr7vb55ypk9fmfbvxx78mgmgignknbasq9g9a", + "commit": "c75a5db2c9724a513ad3f64fc138d8565d608eeb", + "sha256": "0468jbv04gwxhh9ag3yblzv1y1rxfr6yqr6dqfp11x6j8c910byr", "fetcher": "github", "repo": "fniessen/emacs-leuven-theme", "unstable": { "version": [ - 20201115, - 1052 + 20201207, + 2103 ], - "commit": "dd56f8df0d134c40f93abcfd2382cfddd97c7cad", - "sha256": "0d466z7ggcgh8rhx7245jl7zf1cd1dmpg1z3kq46yxqai4wzvdxv" + "commit": "898c1426c29abbb1c86a715b1323669e30d4699e", + "sha256": "0ijd0p6k9c2va19wrp1kpj2x4bzyj3vh244ka8jdmsmwmqfmvb2z" }, "stable": { "version": [ @@ -59775,8 +60113,8 @@ 20201007, 2214 ], - "commit": "f7c80281c7005ba5965a8fc410708c08119cfee6", - "sha256": "1k6zxyyq0ah3z3gicyxlhj95rnh1rylap33ff945y3h2nl32wlsi" + "commit": "75a30e55501ffc70712bc8176fe47eaf9ca1dbe6", + "sha256": "04ah4ps11lsmclisx2rfbgayznlw0c2blpdvy13b5c8ii7bqjccb" }, "stable": { "version": [ @@ -59962,8 +60300,8 @@ "deps": [ "yasnippet" ], - "commit": "6014e9f4ce1fa2054309343f08bd6751620b56a5", - "sha256": "0mrcxczz6j7alpq3fb2fcs24pl4y54i6rm8ly8xb0ib1r98kp874" + "commit": "a729748b7d7f38a916fe61f23db6e7446c0a5e8f", + "sha256": "1kld7xg1kxb9mq1g20rzay5zdnjyaw4ss7xksr97qik018vf22y8" } }, { @@ -60364,8 +60702,8 @@ "repo": "abo-abo/lispy", "unstable": { "version": [ - 20201109, - 1728 + 20201226, + 1746 ], "deps": [ "ace-window", @@ -60374,8 +60712,8 @@ "iedit", "zoutline" ], - "commit": "5c8a59ae7dd3dd342e7c86a8c0acdbd13e2989f3", - "sha256": "0738v9bp4dlxbwsnykvc35yh4dl4pvw25jl8srb7r3744ydvgyii" + "commit": "1ad128be0afc04b58967c1158439d99931becef4", + "sha256": "15an4nbpri49imvkbhhynsmczkzhl4i037r8hcg4mam3w5nw14y8" }, "stable": { "version": [ @@ -60641,14 +60979,14 @@ "repo": "sulami/literate-calc-mode.el", "unstable": { "version": [ - 20201025, - 2003 + 20201214, + 1221 ], "deps": [ "s" ], - "commit": "a50e897a816cb5580ad6ec867eeaae212e0e4798", - "sha256": "0z6y5f1rj28lbr30m6g4a9l6ahs66whi8861g4cx9xzhs84nwv5g" + "commit": "1cf4fa18731248c6519667c16a6832b616b2b86f", + "sha256": "19icc2c3s4jmn0i55dfllpvbwm6f3wmscfp8nrgini2wk89260jl" } }, { @@ -60788,11 +61126,11 @@ "repo": "donkirkby/live-py-plugin", "unstable": { "version": [ - 20200709, - 422 + 20201229, + 139 ], - "commit": "185da3530e3145b7fea7d15e33a8b581bbe3a111", - "sha256": "1w32nzp0ym16wsagj933595wic7x8iswgr0fwpv4hkagvcgbqzn2" + "commit": "40a5c9cef3ecae289fef73d76d0e3fd006051a21", + "sha256": "0dafnxqfhxmq4fkrxwalixxb0cmd3mgvx49jwvnmdcaghwxgr1jv" }, "stable": { "version": [ @@ -60880,6 +61218,21 @@ } }, { + "ename": "ll-debug", + "commit": "6449c1e4a9fd8dffcfea6e7245220012d1098ccc", + "sha256": "16nywhy0628lx6jb6kw7526r1qzaha1daf9vr16dwnrajn6q4a0w", + "fetcher": "github", + "repo": "replrep/ll-debug", + "unstable": { + "version": [ + 20201211, + 2010 + ], + "commit": "f551a7e1d5ecd64608db744d0f0e24aa0b8645fe", + "sha256": "1d8m7pbfny0bkbaq609k1m8y5cd2lm0w1dnl53lls9ahyz60hdk4" + } + }, + { "ename": "lms", "commit": "7d6c24152f88dad15ef9f304c0016a97ede71dab", "sha256": "1nksla9i7b4nmnzppyw6fq5kzh8jyqjfxn45g60c4mi2mn3p95a1", @@ -60887,11 +61240,11 @@ "url": "https://hg.serna.eu/emacs/lms", "unstable": { "version": [ - 20201011, - 1051 + 20201214, + 1852 ], - "commit": "ee479b60f2a4a49389c5962021e897eb686e7c20", - "sha256": "08k0d3rbf00w7056bsbrk782iaji19vhfw9dy2s41dwcd4v1w4ql" + "commit": "e6dae7465423a5304d0e38e92625383d07fe6f52", + "sha256": "1axxfh96pl2s0c301ak1gjh10k744wafnza3qx4sqaxcka5f6hc9" } }, { @@ -60902,14 +61255,14 @@ "repo": "daviderestivo/load-bash-alias", "unstable": { "version": [ - 20200106, - 2015 + 20201229, + 1711 ], "deps": [ "seq" ], - "commit": "999c613898085b37b9e16b60be1cbeaa9986d368", - "sha256": "1qhcx7c954q1liw3glhvbg5bph96j9bwf808g6l066n04xj5347i" + "commit": "7ff80e4507a1dd71865440cf009bfe0c33323fc2", + "sha256": "14rbsvyami7h7f5yjg731ppjv7fxp3aq8a9gpdzg61cilxv93dpj" } }, { @@ -61110,25 +61463,20 @@ "repo": "sigma/logito", "unstable": { "version": [ - 20120225, - 2055 - ], - "deps": [ - "eieio" + 20201226, + 534 ], - "commit": "824acb89d2cc18cb47281a4fbddd81ad244a2052", - "sha256": "0jpyd2f33pk984kg0q9hxdl4615jb7sxsggnb30mpz7a2ws479xr" + "commit": "d5934ce10ba3a70d3fcfb94d742ce3b9136ce124", + "sha256": "0bnkc6smvaq37q08q1wbrxw9mlcfbrax304fxw4fx7pc1587av0d" }, "stable": { "version": [ 0, - 1 - ], - "deps": [ - "eieio" + 2, + 0 ], - "commit": "824acb89d2cc18cb47281a4fbddd81ad244a2052", - "sha256": "0jpyd2f33pk984kg0q9hxdl4615jb7sxsggnb30mpz7a2ws479xr" + "commit": "d5934ce10ba3a70d3fcfb94d742ce3b9136ce124", + "sha256": "0bnkc6smvaq37q08q1wbrxw9mlcfbrax304fxw4fx7pc1587av0d" } }, { @@ -61502,15 +61850,15 @@ "repo": "emacs-lsp/lsp-haskell", "unstable": { "version": [ - 20201011, - 1941 + 20201210, + 1702 ], "deps": [ "haskell-mode", "lsp-mode" ], - "commit": "4d85cb3693d893ec34d8a0be9794d468a0a28b7b", - "sha256": "1pz07l4iywvcfmgfymh8avz5lp0yirqxbrv14ncl8p6dv9yrfwyb" + "commit": "592e883026288677f4042333b51efc7a40b9a68a", + "sha256": "1dar5iapnx55z8875sr05p4b9nklmqdx6vfxhisy2hsgkp8iq8fc" } }, { @@ -61728,8 +62076,8 @@ "repo": "emacs-lsp/lsp-metals", "unstable": { "version": [ - 20201123, - 851 + 20201230, + 706 ], "deps": [ "dap-mode", @@ -61741,8 +62089,8 @@ "lsp-treemacs", "treemacs" ], - "commit": "31dafff1ebcddb860567e9b0681731adf25b54e6", - "sha256": "0r2mhns4r58fcsyrb25610ayzll9qhza9rfjh3cz7kl6dzvpwv2l" + "commit": "c76eeb6b580fadf6a16357be8c22c197d22574fd", + "sha256": "0r1sihiximsgjf7dyh9rndxwy26d5kfz04y13b0gq2lhvrgjbbkv" }, "stable": { "version": [ @@ -61771,8 +62119,8 @@ "repo": "emacs-lsp/lsp-mode", "unstable": { "version": [ - 20201209, - 735 + 20201231, + 1252 ], "deps": [ "dash", @@ -61783,8 +62131,8 @@ "markdown-mode", "spinner" ], - "commit": "597febf55bffd5b30e3fac58ede4d0fe1f297f1a", - "sha256": "02agyi2599brzp3z936x0nwj8ylk0cackbq78dghnyrvm2438vri" + "commit": "51138a029cd2cb5b530ab0e98030e24b830da943", + "sha256": "0l8y3ypb8sl96vqrn8za1bdkkj1w1ip8nya75iqj4h0gcmcdw04z" }, "stable": { "version": [ @@ -61940,8 +62288,8 @@ "ht", "lsp-mode" ], - "commit": "d9e7d3cf1bdc8ee0395c8df4408b05ee3ba9c22a", - "sha256": "092ivkhyhqwyzf94k8bjzykzx28lazyipi8ghz4lbkc57wwmjx39" + "commit": "71ff088ac4c93b0edd012f305a3dfd1602c5d21e", + "sha256": "03fgw10fq1s98xrmfzg8y9xv14yig3lgjc44x7mvlc5awsmv5lxa" } }, { @@ -62034,8 +62382,8 @@ "repo": "emacs-lsp/lsp-treemacs", "unstable": { "version": [ - 20201208, - 932 + 20201230, + 2214 ], "deps": [ "dash", @@ -62045,8 +62393,8 @@ "lsp-mode", "treemacs" ], - "commit": "642e922e16fd2b2c3cc075d7cba68448f1aaa006", - "sha256": "1c7w7p0xczaliq8snryi2rwhnvm6qg0yqrkjkpwsr6smami7g31b" + "commit": "64e375fcc700d4d47cf52ad912e6863d479e3bfa", + "sha256": "19wy4xk0ll8pxdyq74a0zjlqkssc6ww21ac79zihndv90604c5km" }, "stable": { "version": [ @@ -62082,8 +62430,8 @@ "lsp-mode", "markdown-mode" ], - "commit": "49bc5134c15d92b866c389c16e8e551a9285961a", - "sha256": "0if4rkpym0zp44m4hrw24yzg6wzrpz7nvvgqq2s1limjjsw1rzk1" + "commit": "72034bdd65f66b43d10e6106e82dfa4718557e1a", + "sha256": "0dz2rz6fl87yr2jj324b8v1kw0kr4021lj245l60nqy5pnj7gz2y" }, "stable": { "version": [ @@ -62527,8 +62875,8 @@ "repo": "magit/magit", "unstable": { "version": [ - 20201207, - 1723 + 20201225, + 4 ], "deps": [ "async", @@ -62537,8 +62885,8 @@ "transient", "with-editor" ], - "commit": "9e9f7cb3d260bd14e15307831a2820112c9a77ac", - "sha256": "1snbjfp35znmpa02mq0g75b24if74717f1lbij2h634pm7l5ndi1" + "commit": "2fb44690b4de28ada77571b1a7acabbe7718fdbd", + "sha256": "1l6pl8wy1k9ywk45ywyjc11gbm6bjh8g3z1sd3bar21381dnm0w8" }, "stable": { "version": [ @@ -62884,8 +63232,8 @@ "libgit", "magit" ], - "commit": "9e9f7cb3d260bd14e15307831a2820112c9a77ac", - "sha256": "1snbjfp35znmpa02mq0g75b24if74717f1lbij2h634pm7l5ndi1" + "commit": "c5e11811197ef8c667a605e5d9dd8ec77247bd13", + "sha256": "0i4la1sncgn2hgpgd26x0igc90q4c4jkgkng8la96hjaw09qsv23" } }, { @@ -63033,14 +63381,14 @@ "repo": "magit/magit", "unstable": { "version": [ - 20201201, - 1702 + 20201221, + 2057 ], "deps": [ "dash" ], - "commit": "9e9f7cb3d260bd14e15307831a2820112c9a77ac", - "sha256": "1snbjfp35znmpa02mq0g75b24if74717f1lbij2h634pm7l5ndi1" + "commit": "2fb44690b4de28ada77571b1a7acabbe7718fdbd", + "sha256": "1l6pl8wy1k9ywk45ywyjc11gbm6bjh8g3z1sd3bar21381dnm0w8" }, "stable": { "version": [ @@ -63695,9 +64043,7 @@ 1106 ], "deps": [ - "git", "github-clone", - "magit", "org" ], "commit": "d65dbaa329ecf931f4142be72862972ea6a24e63", @@ -63831,11 +64177,11 @@ "repo": "minad/marginalia", "unstable": { "version": [ - 20201209, - 619 + 20201230, + 1926 ], - "commit": "31ba78b6c65be172aae2dde9bc0e6e91e229b082", - "sha256": "0f5ifm31zis7jh6r7a0jj8p439l1j2lh4hmn9ll08kms5almlbr6" + "commit": "3c8042845c62b565c211e11d54defa093153b715", + "sha256": "0vl1hb1drchqzxbvf6iil1q6sg6qw9yq8163jaz0cw5rjzjjafb2" } }, { @@ -63861,26 +64207,25 @@ "repo": "plandes/mark-thing-at", "unstable": { "version": [ - 20200427, - 1453 + 20201219, + 231 ], "deps": [ "choice-program" ], - "commit": "a69696635616c10184a3289d459d8eb532f04f47", - "sha256": "0iiwa5cv43177irm4kj9jzfr1jzkw0gw0rmy9vnnbggfgmklzxrq" + "commit": "a622d128afc8d2d67de897666a1e2eccba8d7818", + "sha256": "1zb0ynwficxninyw89z53qf78s1ns60nh4cyzk96m05jlcaa1s44" }, "stable": { "version": [ 0, - 0, - 2 + 3 ], "deps": [ "choice-program" ], - "commit": "a69696635616c10184a3289d459d8eb532f04f47", - "sha256": "0iiwa5cv43177irm4kj9jzfr1jzkw0gw0rmy9vnnbggfgmklzxrq" + "commit": "a622d128afc8d2d67de897666a1e2eccba8d7818", + "sha256": "1zb0ynwficxninyw89z53qf78s1ns60nh4cyzk96m05jlcaa1s44" } }, { @@ -63944,11 +64289,11 @@ "repo": "jrblevin/markdown-mode", "unstable": { "version": [ - 20201115, - 635 + 20201220, + 253 ], - "commit": "dcad5572a30fce51b97963d3c869cce227c223a1", - "sha256": "1c8c6lwmpysg8l1lvsyg0f0h65kkcdmijk2500xh2s0fhbbjb2s0" + "commit": "e250a8465f805644d372c264eb0572f569d7f2a1", + "sha256": "0ffx65gq10i56bxcg4baffrhr2xj5vk1051cljvzlffcq56hx98g" }, "stable": { "version": [ @@ -64209,30 +64554,26 @@ "repo": "sigma/marshal.el", "unstable": { "version": [ - 20180124, - 1239 + 20201223, + 1853 ], "deps": [ - "eieio", - "ht", - "json" + "ht" ], - "commit": "f038689cbd5b3680b80b44edd0c7a63ca3038e26", - "sha256": "1n79im1r7h1ilvppn9alqwl96zhyxbm5hk7kbmqh022dggw0cx15" + "commit": "490496d974d03906f784707ecc2e0ac36ed84b96", + "sha256": "13yf61sw5rmqb8dshk1v9j348jkdfqql55dqvs9srb3ypj8b02v9" }, "stable": { "version": [ 0, - 8, - 2 + 9, + 1 ], "deps": [ - "eieio", - "ht", - "json" + "ht" ], - "commit": "d714219aeb388ded88582c47940f2c6febae333c", - "sha256": "1mr5p2yiad1k15byrlk0a784kj7rvibpn4li5phk4rnm0zg1xy9s" + "commit": "490496d974d03906f784707ecc2e0ac36ed84b96", + "sha256": "13yf61sw5rmqb8dshk1v9j348jkdfqql55dqvs9srb3ypj8b02v9" } }, { @@ -64297,19 +64638,39 @@ "repo": "cpaulik/emacs-material-theme", "unstable": { "version": [ - 20201116, - 1613 + 20201224, + 916 ], - "commit": "bd5b244715a2232fe016efb691425e12a2e3e108", - "sha256": "0rgvfaplcf1riqxv7kyjs4chhmqk9hppiqrv25fmvi6rmm6cw2a8" + "commit": "67a496c937542f6ee7c4a2164d23f0296ef3a645", + "sha256": "14n0s4yn76b7a0qifabp1lp9g0zq82xwahz1wb5wfyfc3d0px9ck" }, "stable": { "version": [ 1, - 3 + 4 + ], + "commit": "67a496c937542f6ee7c4a2164d23f0296ef3a645", + "sha256": "14n0s4yn76b7a0qifabp1lp9g0zq82xwahz1wb5wfyfc3d0px9ck" + } + }, + { + "ename": "math-preview", + "commit": "23d52ef76491c4f674e5a40dec1af1bf096e2a35", + "sha256": "1l80shb16vdmpyhnvi4n0xvkbfvkxrjx7mgv0agyrvdac35db3ii", + "fetcher": "gitlab", + "repo": "matsievskiysv/math-preview", + "unstable": { + "version": [ + 20201213, + 646 + ], + "deps": [ + "dash", + "dash-functional", + "s" ], - "commit": "2710e61ecee1bbec943538305c26af4fe4fca68a", - "sha256": "1qg59w216iv1yk594xjgazfqx5qhw3jgjqf32pcwwbkcnyj5f6zw" + "commit": "61554599f839a6d00cd4037d373bfde7b280c1c3", + "sha256": "0mrrb5wf3drpd5ywacq3bj2kcvsijysb37p5asz5pmdpg8s8nr6v" } }, { @@ -64441,15 +64802,15 @@ "repo": "sasanidas/maxima", "unstable": { "version": [ - 20201207, - 2204 + 20201226, + 1538 ], "deps": [ "s", "test-simple" ], - "commit": "878132db3c9e0b5675888eedece1c7aa4246df43", - "sha256": "1a24hdnxlic5c473szvj2ard3sl3lm9g5p2x5xqk7pymqj72nan4" + "commit": "1600cfc059a80ed8fa0d381b88f29ba658811cc5", + "sha256": "030sg31xh46vrmsafvn04sdvyv4vzqf8rf5ghrlina1gav6kybfd" }, "stable": { "version": [ @@ -64879,15 +65240,16 @@ "repo": "DogLooksGood/meow", "unstable": { "version": [ - 20200727, - 851 + 20201231, + 748 ], "deps": [ "cl-lib", - "dash" + "dash", + "s" ], - "commit": "c9296491e923a678ac9a42a2743f21ce1e0552c4", - "sha256": "00636in9cgcnij1sz6vj5y5vijdd13g5akwj1facf0v4lrlvacpn" + "commit": "9d745c8336a39dc1bd47aec4b3f9d2c034a0574f", + "sha256": "0s306wwns2zzpbw1008ga224mncc55jdbd31v9qp147wsnhd11s3" } }, { @@ -64901,8 +65263,8 @@ 20191025, 851 ], - "commit": "3dd8eec9cb1f66811e8b3db3e492a2f4b5ea51bc", - "sha256": "1w3ypkzg3vp76ab4l1gm4g333f5bniarbc80mslam0jmwswr83z1" + "commit": "47ebe5e6186e70584ef5f92c9191bd7bbcb6c1da", + "sha256": "1vinlgqljdsv91dd5briak2v747fbml72xdgr859j6v514hap2rz" }, "stable": { "version": [ @@ -65039,6 +65401,47 @@ } }, { + "ename": "metal-archives", + "commit": "6415e204d910ffb09faca4cf190989bebbecc730", + "sha256": "0vwq2qdnq1vvmsgxzhyxbgx7rf53yjxwh6nwbpjva5ipxf21j0ci", + "fetcher": "github", + "repo": "seblemaguer/metal-archives.el", + "unstable": { + "version": [ + 20201214, + 1027 + ], + "deps": [ + "alert", + "ht", + "request" + ], + "commit": "a7602a32e7fd3c7779bc5b5c5e398ea31713ee45", + "sha256": "0s7lzhnafw98447kgpwimlmvfwqaaljvnqwvqppgkqglk551lmd4" + } + }, + { + "ename": "metal-archives-shopping-list", + "commit": "1541b23e96898b11d24a309a69a732a88d99212b", + "sha256": "0lhq6lz1gnl8jgci28hc4nf7bdkrh94ni1xfjbd825rf7mg21n80", + "fetcher": "github", + "repo": "seblemaguer/metal-archives.el", + "unstable": { + "version": [ + 20201229, + 949 + ], + "deps": [ + "alert", + "ht", + "metal-archives", + "org-ml" + ], + "commit": "a7602a32e7fd3c7779bc5b5c5e398ea31713ee45", + "sha256": "0s7lzhnafw98447kgpwimlmvfwqaaljvnqwvqppgkqglk551lmd4" + } + }, + { "ename": "metalheart-theme", "commit": "204dd67b24bf4f2305a14efb925c8fe004026694", "sha256": "1xqql1mcwp52plm1gp6q4m9zij2w360y15lnjsz9xgjqvslr7gy5", @@ -65243,14 +65646,14 @@ "repo": "yoshinari-nomura/mhc", "unstable": { "version": [ - 20201113, - 3 + 20201227, + 406 ], "deps": [ "calfw" ], - "commit": "33d8ca1a1beb2b63e720e17525bdda3cc878e5ed", - "sha256": "1786r9jfxdsnbb7icy0ndg28p8srkr6mn3zs2r7iibr2ysk3rjvp" + "commit": "1cd9cbc7f8cfe40833d1af726644ae45a3d07dc0", + "sha256": "1cm7y1nfbl8625rpk5i9zcmp9p6rzqdzxy9wcjs8yrdfsc0biq3q" }, "stable": { "version": [ @@ -65426,11 +65829,11 @@ "repo": "muffinmad/emacs-mini-frame", "unstable": { "version": [ - 20201113, - 838 + 20201223, + 1013 ], - "commit": "31380e7688c5e82965f72e5707cbff3ec2712ba9", - "sha256": "1a5vyff17lj3f6xkzkp8fy0dli1w5dnp0bvm6cppjp3x1gnj7aj2" + "commit": "0912cf4f500403be32735bc50e331fd06910471f", + "sha256": "1hnhgx1nyhj814dlcg8mgijnfh30a5vzzinivh2ywgr151wv3b9w" } }, { @@ -65456,14 +65859,14 @@ "repo": "kiennq/emacs-mini-modeline", "unstable": { "version": [ - 20200801, - 1554 + 20201221, + 1825 ], "deps": [ "dash" ], - "commit": "a4455fb70c6b4062c63ce61af09d2af99683b492", - "sha256": "0bwlx937hx11d4mj5cqp5rg7dh02499z85irgaylwvnsnx5sbni4" + "commit": "7dcd0ab81bb7c298377708061176f5c5a50f77db", + "sha256": "1bik23ci0h9gki7ysw7r5wj5z9ib56167qzk7sac2wqw9xmi8dbb" }, "stable": { "version": [ @@ -66023,28 +66426,20 @@ "repo": "sigma/mocker.el", "unstable": { "version": [ - 20150917, - 154 - ], - "deps": [ - "eieio", - "el-x" + 20201223, + 658 ], - "commit": "6a1d7c9189bd721debd1a60707526e43a733f537", - "sha256": "0i96fn5ji1z78in4nr316sgfp2mc8lmxijslw3k9q1v50j91bcya" + "commit": "5d739d5170ff42e841cd2755b68151918052da2b", + "sha256": "1dc514cqbfmg33sb3j90s5jmw6jnm3wzvs0zhw3maz13bp7w6z48" }, "stable": { "version": [ 0, - 3, - 1 - ], - "deps": [ - "eieio", - "el-x" + 5, + 0 ], - "commit": "55b078b53ea49e48bd1821d96f0fb86f794fdc6c", - "sha256": "1lav7am41v63xgavq8pr88y828jmd1cxd4prjq7jlbxm6nvrwxh2" + "commit": "5d739d5170ff42e841cd2755b68151918052da2b", + "sha256": "1dc514cqbfmg33sb3j90s5jmw6jnm3wzvs0zhw3maz13bp7w6z48" } }, { @@ -66252,11 +66647,11 @@ "repo": "protesilaos/modus-themes", "unstable": { "version": [ - 20201209, - 847 + 20201231, + 1237 ], - "commit": "50c926dd2f94a1ef95e2b7763ff25b1b51452f7a", - "sha256": "03ismi6m336fga3qp93nxipaf53bdzqzn7ad1v5ak5zhvyp2j0xi" + "commit": "cc61cc3d034f87a6a7a0dd6266c11c5c79d97981", + "sha256": "1ldj36rp2mjcblawvgq2xxx48bmpvy4j6ny3gwgrqj4ggjjmqjv3" }, "stable": { "version": [ @@ -66375,14 +66770,14 @@ "repo": "jpablobr/emacs-monkeytype", "unstable": { "version": [ - 20201208, - 1918 + 20201221, + 1355 ], "deps": [ - "async" + "quick-peek" ], - "commit": "919b24f3b18d70be8c43e792a4e81476d76166cc", - "sha256": "0fgdx8zm6lbp8dn9wrfgpm146h7p1hmz0r32mwb5y9wvwkglvqla" + "commit": "8a01436eda0f2174c0174af097591de76eda4d1b", + "sha256": "11p91p1w84rbvgvb8f9xj3r2nnr34i9ka5hvz82ri4cfx1hwr9hk" }, "stable": { "version": [ @@ -66405,11 +66800,11 @@ "repo": "ananthakumaran/monky", "unstable": { "version": [ - 20190619, - 1637 + 20201226, + 1950 ], - "commit": "9d379a2306a8b7cd9c4faba20490480acdc1d763", - "sha256": "0dvywqas1vx0f0qlly8259772zj64sygv3hnmm9yqzy4v725qbhp" + "commit": "e04632277ef24acacc029ae29db1fadc458ae83b", + "sha256": "0xzn9fgxvbpgx5wky8vdhd3bw7hy6h6hngx7l8a0qspg560r7hz1" }, "stable": { "version": [ @@ -66473,11 +66868,11 @@ "repo": "oneKelvinSmith/monokai-emacs", "unstable": { "version": [ - 20200918, - 1348 + 20201229, + 1001 ], - "commit": "791baae69b02ee007cde779a80abc1a6b5962cf7", - "sha256": "00r5i98lplsra7fwrvir9pr7mbc1kia0xlmrlgs0vmn4bhxa2fpc" + "commit": "c5a7978bfc2ad2aa90882e6b2583668dc7b3e1a5", + "sha256": "0p22mfb84ja35v52v4x5inzndcl1ac3g9vvl3s2m5zq68ljy2p18" }, "stable": { "version": [ @@ -66731,10 +67126,10 @@ }, { "ename": "most-used-words", - "commit": "5c240664b29e0e455d3d2503381b9db1ed0ea20f", - "sha256": "1129wbn7myzqijzcs1bsy3fh6iizijfpkpa1mw6j9s618anj282p", - "fetcher": "git", - "url": "https://github.com/udyantw/most-used-words.git", + "commit": "934e64df7fba95b6dc06e76382013dc4a9ced82f", + "sha256": "0dbjhqf5jxmicwl9allsr2vhqp4z6gkrwkdmnyphvn1kgr01kmjj", + "fetcher": "github", + "repo": "udyantw/most-used-words", "unstable": { "version": [ 20200808, @@ -66943,8 +67338,8 @@ 20200822, 1229 ], - "commit": "91cc1e19ef34aeb12888b697fefa52907f1a834d", - "sha256": "17dxx75z5fqvv0ams0mbj6p0wgjn4dnx61i9zljbg6l2fxbd7mwx" + "commit": "9ba59b64d53365c1fe93c1c245b4ec3e35bdadf0", + "sha256": "07fmvwlv77za6k67myfn297hx44j8dn47xsx8mw8xaw5gpin6d3c" }, "stable": { "version": [ @@ -67477,27 +67872,27 @@ "repo": "lordpretzel/mu4e-views", "unstable": { "version": [ - 20200830, - 1608 + 20201229, + 216 ], "deps": [ "ht", "xwidgets-reuse" ], - "commit": "af3916b2639a5a94676d4f11471e25b63ba76d0a", - "sha256": "1h0anxs5xammkjky1syy9ja8xgskbf3j7a8hf12ggmihk9qa1dvk" + "commit": "55e5467a25d424b2c10b5392e68b370164efa230", + "sha256": "1gagaxpb4psshs8x61icilx4576al2qjs612d65ss857gfmzachi" }, "stable": { "version": [ 0, - 4 + 5 ], "deps": [ "ht", "xwidgets-reuse" ], - "commit": "4977f6517cf12ac994859c4ba992d5e2999ae016", - "sha256": "07y96ii3ysqlikq7cixcwf1mr7ysazmmnp42wzah02zdchj9irzh" + "commit": "33fa9f584034978006108a4498566e933493f852", + "sha256": "01636rhmgnjz9z81xppqlrlwwg0jcy48k9p3hh865wncp1q2jsb5" } }, { @@ -67759,14 +68154,14 @@ "repo": "magnars/multiple-cursors.el", "unstable": { "version": [ - 20201018, - 538 + 20201215, + 1559 ], "deps": [ "cl-lib" ], - "commit": "83abb0533a9d9635bc86d6d52a4e7641b0eaaf63", - "sha256": "1p9wz300x9hpkl2lhh6xdcbn46aka5wrqmf20cs5w8dm7205yznc" + "commit": "a9d7764f80b241978f3d4e76bc981ef10bab5d70", + "sha256": "0r5dgzra3wimny5kaqhkfj1723mbwsdjabi26jp77hxkrhx7v905" }, "stable": { "version": [ @@ -67972,15 +68367,15 @@ "repo": "agzam/mw-thesaurus.el", "unstable": { "version": [ - 20190620, - 2330 + 20201212, + 2250 ], "deps": [ "dash", "request" ], - "commit": "8327bae11588bcad5d73dcfbeb5e8d10f623d6b6", - "sha256": "0snv5v4c5f0hnixrii16xp55w0faw3hirmaj19fnf76shnpg4kwy" + "commit": "4117f49b9f40d119f9ed0888458ce5495510226e", + "sha256": "0i2r54rzvfiiap7vg2fx4py62xng7n9hjblih0ybb2b0saqmpvgd" } }, { @@ -68592,15 +68987,15 @@ "repo": "alphapapa/navi", "unstable": { "version": [ - 20190720, - 2003 + 20201220, + 1727 ], "deps": [ "outorg", "outshine" ], - "commit": "7eb7cf0c4a6ee537ec462f5ec90f00d12e3ca9c2", - "sha256": "0ajmbsdz825v5fidnp30yv1jwl415vc67hlm05a65f92bhs6m3zq" + "commit": "cf97e1e338815ad3a4d0bbbf4ff6dd1a4e322ca8", + "sha256": "12nb7rha3fh29djwnnc28k8g5bnwk2cvijym1i4m4q1fpymfm4ri" }, "stable": { "version": [ @@ -68935,8 +69330,8 @@ "repo": "felko/neuron-mode", "unstable": { "version": [ - 20201204, - 1517 + 20201229, + 1005 ], "deps": [ "company", @@ -68944,8 +69339,8 @@ "markdown-mode", "s" ], - "commit": "dad8804d050ce4532053b739dcecb1f4d97ea3e4", - "sha256": "0xwfclszwjg12kp3bdp92yjc59d527w48awj9x4dz3ps438ia75z" + "commit": "81ed1f3288eab9aed2cb0b1eb11af69f988b7d0b", + "sha256": "1dgvlk0apd7ddzzg5jcpsrdhps37my59jyvkv1sqp31km0nby6qk" } }, { @@ -69176,11 +69571,11 @@ "repo": "m-cat/nimbus-theme", "unstable": { "version": [ - 20200812, - 915 + 20201222, + 1503 ], - "commit": "1a828c1fa0574503014afe8dda3229fb76a4bf64", - "sha256": "1qapsq7mxayjjr7y376p9vb7k871rwjgmyvmv756xg98lf7vm3fb" + "commit": "5ff56a6a68cde7cd0a67fc60e3e993be52604a6d", + "sha256": "1073x878gdg97xym31mx3l7zpbc51pkspigpxqlpq48q62llcigj" } }, { @@ -69194,8 +69589,8 @@ 20181024, 1439 ], - "commit": "58f77f972bcece256c16ca1cc4a933270b1ea1c1", - "sha256": "128mfqqz0p2skxsgzsvq320nscpqqgzibq4idcsszk43ynksihzf" + "commit": "68f971460bb21abd59dfe6253e35a55c3e1cfc64", + "sha256": "1isbay1i23jjw24a7nxjhsdhvnff2108gr98s90jfwwiymr1fp81" }, "stable": { "version": [ @@ -69293,11 +69688,11 @@ "repo": "NixOS/nix-mode", "unstable": { "version": [ - 20201202, - 1618 + 20201229, + 138 ], - "commit": "e32c6bf7ad6dfe1d7ef9ee07d4da6e50174037bf", - "sha256": "1qihka6vzlnd4ks4az2bj7zmbfxjcvhbadb3xwswzbyc87lgkr0g" + "commit": "53ea839a52335d089699d3530bae8ea5914cdbb6", + "sha256": "1gmsq0simdrk8w1ywls3bn224wxgc0v8dmcch75zjp34rx9fg11n" }, "stable": { "version": [ @@ -69592,26 +69987,26 @@ "repo": "emacscollective/no-littering", "unstable": { "version": [ - 20201130, - 1511 + 20201222, + 1537 ], "deps": [ "cl-lib" ], - "commit": "f14d5548211109b0e5e850706d8d2cc182dc60be", - "sha256": "0x43c749jbb9amkz4mpl0yn4b32v5wbzx8snig9700dvayjb4k89" + "commit": "96ed5b8ecad8bcdcd212aacd9957276be3cf128e", + "sha256": "00chkzpjcdll907vpzfzmf9p3jprisnr8i0h1x5gixidwbfc2whi" }, "stable": { "version": [ 1, 2, - 0 + 1 ], "deps": [ "cl-lib" ], - "commit": "de7a73579659a97ebf67f82c500d0059a4b6a9df", - "sha256": "1hma9var0nmrmjlh16s49hbfc1s4jvfd2prqxf14lxfd51404niw" + "commit": "96ed5b8ecad8bcdcd212aacd9957276be3cf128e", + "sha256": "00chkzpjcdll907vpzfzmf9p3jprisnr8i0h1x5gixidwbfc2whi" } }, { @@ -69839,14 +70234,14 @@ "url": "https://git.sr.ht/~lthms/colorless-themes.el", "unstable": { "version": [ - 20200213, - 2057 + 20201222, + 1627 ], "deps": [ "colorless-themes" ], - "commit": "46d477ec5a367beb6c8e75e017ae2c3a31250136", - "sha256": "05c6ywzamnq1frmb8i07wjxrncl3fpkmns8dnc3v8si234gq3m72" + "commit": "92ae2775ac9ae2fd3d1172ffdf706e18db55963c", + "sha256": "06cp84bi3x33il119gfk8blikbqdmakvj7h64dr9crh0v11lg7ds" }, "stable": { "version": [ @@ -69898,20 +70293,20 @@ "url": "https://git.notmuchmail.org/git/notmuch", "unstable": { "version": [ - 20201206, - 2023 + 20201225, + 1832 ], - "commit": "adfded9ed0a5a4b06886f462314cd4511cb72d47", - "sha256": "1a3dmzxwl8b31m9rwjvqhgkk4cac2yg2blapp39szxmbb9vs768x" + "commit": "0f37509cc7e92f2c09fcd7d7f3e2b477e4f29401", + "sha256": "1g3l7hyr8zcddwvcdjxmblzkw3dzrdhp8kc31j81m22g9napjxya" }, "stable": { "version": [ 0, 31, - 2 + 3 ], - "commit": "02a7b026d938f53d9fd9b183ca2b3c44c92489f2", - "sha256": "0rbzpr03z8lsx660ciayy3fj872s2561yvam1wgjbb21phd8hacw" + "commit": "d812256aeb91646b5b1c644fa67f07c483cca651", + "sha256": "1wm1myzacz1dcg7vdfd3akia3xan7ssfspf1fflrwm18hdalss5v" } }, { @@ -70566,8 +70961,8 @@ "deps": [ "axiom-environment" ], - "commit": "9ef86ca16098050da4362f5aadaea64b0a093fc1", - "sha256": "0hyaa1nskm95scypdpbndmmdasq6cas85y6i2q1f8nq8a3qd5585" + "commit": "47d6dffc29286badb2b1d7143b219e5c1be15bdb", + "sha256": "1dppyda9jkwh6fj8m4kziq84w0b5yzxrhq87jhkv54jjra6yxbb4" } }, { @@ -70918,15 +71313,15 @@ "repo": "jdormit/ob-graphql", "unstable": { "version": [ - 20200108, - 2228 + 20201222, + 1515 ], "deps": [ "graphql-mode", "request" ], - "commit": "ced37c6761d69e1ff206ff0ebd633f0e4fd2ac54", - "sha256": "0575w89sr97dv4ccygbhj4k7rpk2934q9f0p3q0hxf8a5wikf493" + "commit": "7c35419f9eec5dc44967cbcfa13c7135b9a96bfc", + "sha256": "07syadvvdjrxbsgwil2pqcji2rznm64pz0cqb0d4g7kjbxby37gw" } }, { @@ -71216,8 +71611,8 @@ "deps": [ "restclient" ], - "commit": "f7449b2068498fe9d8ab9589e0a638148861533f", - "sha256": "0s3931w9ab3yfml2pmq71rw21yf6hpg7m3vihxyy3vs6zli1cvmq" + "commit": "0ebfc7c5ebf96d2fe1a476439831363a5a43b9b6", + "sha256": "0sc6rljlzm7g4v4l4ziqrr0ydbsyypbq0h19f9xafvnb2pn40j84" } }, { @@ -71573,8 +71968,8 @@ 20201204, 945 ], - "commit": "58f933600606f519b2c22eb2536a62298aadcbf7", - "sha256": "1i33m5cb21v5q4bdvih8hv8227awif87j4kl8w7yl9prn6mcs2w1" + "commit": "3910c34756adf38f35ccad9650d1454d2ba5f735", + "sha256": "0h8kwlwff76ry9rps83hgvsx4h8sf6nm9jjcj54z8q8r7j9sh276" }, "stable": { "version": [ @@ -71767,14 +72162,14 @@ "repo": "oer/oer-reveal", "unstable": { "version": [ - 20201207, - 1202 + 20201221, + 909 ], "deps": [ "org-re-reveal" ], - "commit": "62c6d91bd5045f2ecb817fdea69d98b03126b715", - "sha256": "0pnsq52bggd1wk783mljza5sm8ymb1j5dqhv00n3l98061wbql9h" + "commit": "63a3b7744e1820bfc832f3f2ba03e7a9231e806d", + "sha256": "0yfx5brpf45v8nskfgxrflxw0bdjj4xbfvr48gncfs6np6s3w2fb" }, "stable": { "version": [ @@ -72101,8 +72496,8 @@ "repo": "OmniSharp/omnisharp-emacs", "unstable": { "version": [ - 20201002, - 1600 + 20201220, + 906 ], "deps": [ "auto-complete", @@ -72114,8 +72509,8 @@ "popup", "s" ], - "commit": "2aead2d276cb6bd6f01dac7845a593d25a469c41", - "sha256": "006wxbr0hb917zqp67hin6x8ag5aa90n5shwzwspq2sxhdy9819j" + "commit": "8ec59296b2e2a12d8ea146fb7056091fbb7bdd10", + "sha256": "02kx5gx1hk5r3lks3y9myq3x90zcz0snhckyf7sx45ydgnjxm5j4" }, "stable": { "version": [ @@ -72441,11 +72836,11 @@ "repo": "abo-abo/orca", "unstable": { "version": [ - 20200122, - 1511 + 20201216, + 950 ], - "commit": "654f185861ed4fedfe1394db48a83639a0be57f6", - "sha256": "1dwps9zv1jnc7m75j5cdla14pnv2vnivm5bq0zcvqfsvilvd38ds" + "commit": "e2a20d6069b8217b5d9386ea15c0c56f40885c26", + "sha256": "0z60vi3qyagr43vnbh80ygcvxcr44pd183dhyacysqv0mif5bvrj" } }, { @@ -72618,6 +73013,25 @@ } }, { + "ename": "org-anki", + "commit": "9b79d06c02a7fa4d7d7255b07a3bf0d080b512d1", + "sha256": "0ydqymvhyi9xrx9x4j9l77if7cknybpz57ahqspylyg7p6v8qx06", + "fetcher": "github", + "repo": "eyeinsky/org-anki", + "unstable": { + "version": [ + 20201220, + 2144 + ], + "deps": [ + "ox-slimhtml", + "request" + ], + "commit": "43c3d6418cc91d3e6fe880d02fc498345bd11ae3", + "sha256": "1nbjxcasw14jvmn10cy0ch0k79r7lvaznnh504qq2nhbxkqz22n6" + } + }, + { "ename": "org-attach-screenshot", "commit": "f545cd8d1da39e7fbd61020e178de30053ba774b", "sha256": "0108kahyd499q87wzvirv5d6p7jrb7ckz8r96pwqzgflj3njbnmn", @@ -72809,14 +73223,14 @@ "repo": "Kungsgeten/org-brain", "unstable": { "version": [ - 20201120, - 2132 + 20201214, + 822 ], "deps": [ "org" ], - "commit": "1ae4fd46165fc56f34f36ce38cb2ae816b07e207", - "sha256": "1y80j75w80rlz1100lhxjr0bd5bzs4kak116zfw8sydvlr2q0px0" + "commit": "2f36f303e96e384e17d156e0d6489211808d4a36", + "sha256": "1dm672s30i31103wgp56dlwjb9gdc4g6jhjznz22s6rqrr6wkkhp" } }, { @@ -72966,15 +73380,15 @@ "repo": "atheriel/org-clock-csv", "unstable": { "version": [ - 20200714, - 2109 + 20201222, + 1506 ], "deps": [ "org", "s" ], - "commit": "499b961f26e1f9a9898bf0b1725b49d783893639", - "sha256": "08li6il9rhbm62pcb15cd40b6vjqjlywk07jcs9m85q589v6q2yg" + "commit": "af94b58c2e179a5bcc938f339e93de0eee3da99c", + "sha256": "0637skvjs90cfd713q8dhl3xrya4hfy79x0nn1y51cp9lrniw6q2" }, "stable": { "version": [ @@ -73097,21 +73511,21 @@ "s", "seq" ], - "commit": "a3734368cd5a36541dab2fa8f7404cb850991b5b", - "sha256": "0vsi5z9n18w88q4k17p2iviqmg1bqy0ficw67ry4l9lalnq5x569" + "commit": "bab77ede4b1aaf879e7c24e0522da624ee23bf2e", + "sha256": "1bcvdl5h4nz2x1zvrq700vf2mbkyhvrslfkabmirhs7hd2q0n41n" }, "stable": { "version": [ 0, - 3 + 4 ], "deps": [ "dash", "s", "seq" ], - "commit": "e0fb2c04a55c55cbf59a85a0b2e23ef18370ca61", - "sha256": "1q5s2gj1968z23qf7ds2ychvvnzmlayh1v16krf0lf3zj7a3k20s" + "commit": "bab77ede4b1aaf879e7c24e0522da624ee23bf2e", + "sha256": "1bcvdl5h4nz2x1zvrq700vf2mbkyhvrslfkabmirhs7hd2q0n41n" } }, { @@ -73475,26 +73889,26 @@ "repo": "io12/org-fragtog", "unstable": { "version": [ - 20200703, - 229 + 20201231, + 505 ], "deps": [ "org" ], - "commit": "92119e3ae7c9a0ae2b5c9d9e4801b5fdc4804ad7", - "sha256": "0hyhwbfhb7gj3wjv0722gmz637pd3l0k0gnk4z100v3crnk9rfs6" + "commit": "0151cabc7aa9f244f82e682b87713b344d780c23", + "sha256": "1szkx3n9gk6799rxv0jb3096pn2ssz82536x9a98xqwbimy4kvn6" }, "stable": { "version": [ 0, - 2, - 0 + 3, + 1 ], "deps": [ "org" ], - "commit": "92119e3ae7c9a0ae2b5c9d9e4801b5fdc4804ad7", - "sha256": "0hyhwbfhb7gj3wjv0722gmz637pd3l0k0gnk4z100v3crnk9rfs6" + "commit": "0151cabc7aa9f244f82e682b87713b344d780c23", + "sha256": "1szkx3n9gk6799rxv0jb3096pn2ssz82536x9a98xqwbimy4kvn6" } }, { @@ -73632,8 +74046,8 @@ "org-agenda-property", "org-edna" ], - "commit": "4716603f3719acd89a268fb907b91fd3d6af311a", - "sha256": "1sjdgdg0j8j7qd5scls9rbyk445bcmkf84iz4kgiyca7bb7rap57" + "commit": "8d7acda24a00ef94fd14a4e2ebe2606009eb46e9", + "sha256": "1h9gfy2assjl2l9dfyp40ypkdm541cisx84vnapjnr6i1bxsvdck" }, "stable": { "version": [ @@ -73742,6 +74156,35 @@ } }, { + "ename": "org-inline-pdf", + "commit": "d069aa75232fff5d8b5db485f037191181d8c4b6", + "sha256": "00f8gd34lsp96j20s6sax4hjwqsnrz4647xdchzxav7cpqjmky8m", + "fetcher": "github", + "repo": "shg/org-inline-pdf.el", + "unstable": { + "version": [ + 20201229, + 512 + ], + "deps": [ + "org" + ], + "commit": "d1f0aae00adf7e64b8ddbb181eded6d811dd38c6", + "sha256": "0kyf4dqjs16m007ydl27x73scl4isy44n2x38585g592rqn25x6a" + }, + "stable": { + "version": [ + 0, + 2 + ], + "deps": [ + "org" + ], + "commit": "015c70a7305c251b72709b6e8dce4e1230e681c5", + "sha256": "1qc92xvgxmnwjixk8bxwbc1l1jj0qk9dg73jyaip6lk4g0wjk6xf" + } + }, + { "ename": "org-iv", "commit": "e7db0c34f0f6fb9c3b9e581a74304cc9a26ed342", "sha256": "1akhabp6mdw1h7zms6ahlfvwizl07fwsizwxpdzi4viggfccsfwx", @@ -73803,14 +74246,14 @@ "repo": "bastibe/org-journal", "unstable": { "version": [ - 20201101, - 1438 + 20201222, + 750 ], "deps": [ "org" ], - "commit": "14ce0119fe2d89f2f2207788be2edce0b9372822", - "sha256": "0ba1rzgk1mw27jzb0bjvwgxjxim4mgs710jfazms2f7gdi328gbg" + "commit": "c0836483ae43e525bf7547b7a789d171eda84c84", + "sha256": "100w9z2kphxn3r1ybvvin8gcrfv4851niv2sapgqgsllyx0ql2nr" }, "stable": { "version": [ @@ -73910,8 +74353,8 @@ "posframe", "s" ], - "commit": "e9d30ec4b1cbf4532051d0790948a95e1bd681c1", - "sha256": "182djf213raagpc8rhj1vxbn6imsp6lpabcsfajq9vxlvyx360xk" + "commit": "d8be05fd6857c72a1766e3fa9dafa1602ccf88e3", + "sha256": "0vidxcv07brz4adik1826g0v7zyyz80r84kzz01rcxcc471fl957" } }, { @@ -73922,14 +74365,14 @@ "repo": "stardiviner/org-link-beautify", "unstable": { "version": [ - 20201129, - 736 + 20201230, + 1243 ], "deps": [ "all-the-icons" ], - "commit": "2c5f504cd3674db9f7ddd9aff0dd8b9ebdd8f0b3", - "sha256": "0yzidf1liw4nnd03sw8qsflplg1lc1w8y4kaklpbbk99rv5jf76s" + "commit": "621ff93a7229cce9f6090cdabeb318e857278c4c", + "sha256": "1xic8fh8pnaw0xi1hcsn0xy7mc4d07cmw1zr6ncbk9df0vgz6agf" } }, { @@ -74052,14 +74495,14 @@ "repo": "org-mime/org-mime", "unstable": { "version": [ - 20201105, - 2322 + 20201224, + 1404 ], "deps": [ "cl-lib" ], - "commit": "3974bd41902a810d18a787e49f07cddd7849c693", - "sha256": "0vchyd80ybvr6317dwm50nxcgxfrpc0bz6259vnrh24p5sb8shbj" + "commit": "b47811562ba5c0882e9bacf9124b18fb5d0f4a61", + "sha256": "0xnrgf5p9l920lfzfxa7msjfgm6ic7xfn4mycxjv9jmdnkdm85hw" }, "stable": { "version": [ @@ -74101,30 +74544,30 @@ "repo": "ndwarshuis/org-ml", "unstable": { "version": [ - 20201207, - 638 + 20201229, + 418 ], "deps": [ "dash", "org", "s" ], - "commit": "b644fdcc85090fd83827fb480482681409a3033e", - "sha256": "0b5shcqydxdp6hwfpxjcwzlmyhqb3jcmvysgk1kdvzjm5jcqz0y6" + "commit": "d856ac6f0afed0299a47ed77830c676fd0fa9e55", + "sha256": "1rydmbjzq24vzfpfrb93ad4wibhpc4rnk7crqbx1p11sdby85h95" }, "stable": { "version": [ 5, - 4, - 1 + 5, + 3 ], "deps": [ "dash", "org", "s" ], - "commit": "66354a0d4a50def2bc88e91a0301fd929a66e00a", - "sha256": "1risdrrqnj5fcnpybaqczavwd30dcfk89xd4sb578p8h8fz3hy0f" + "commit": "a396e4a11394b5e00aef1450488b61aeddbd9b55", + "sha256": "1rydmbjzq24vzfpfrb93ad4wibhpc4rnk7crqbx1p11sdby85h95" } }, { @@ -74177,14 +74620,14 @@ "repo": "jeremy-compostella/org-msg", "unstable": { "version": [ - 20201010, - 1531 + 20201229, + 27 ], "deps": [ "htmlize" ], - "commit": "5f0f1a7a79245646bc1c85757f3277c35d6df007", - "sha256": "1c8qa01w3953d858s8r0z60xlvgqxhm0l1svfydl4anghq22wc48" + "commit": "20aac1b7254627c393f3a9e52395ee4d3546d586", + "sha256": "0wvav4g1adqymn6viwf6jmwl41vb6cjkai4n80yk0v4lndw6b1pl" } }, { @@ -74195,8 +74638,8 @@ "repo": "akirak/org-multi-wiki", "unstable": { "version": [ - 20201203, - 847 + 20201212, + 949 ], "deps": [ "dash", @@ -74204,8 +74647,8 @@ "org-ql", "s" ], - "commit": "8c0f56703d301cef6c41feb65bf60cc0da1518cb", - "sha256": "0zq8h2bl4gcanqvq730iip93h37rmj1j1w916yqr8rn7wap4pgls" + "commit": "8e38e1f3c06593b729f6401b6413856efd0264f4", + "sha256": "1jrlngyvbgy6ra59krgdn9gbfpg0aznaaridd95xkr6z78ad1ql7" }, "stable": { "version": [ @@ -74469,10 +74912,10 @@ }, { "ename": "org-password-manager", - "commit": "fba84d698f7d16ffc0dc16618efcd1cdc0b39d79", - "sha256": "0wxvl6ypgn6ky1z3dh33ya3rh73znkh5f8qhqwfmwp7hy2mbl4la", - "fetcher": "git", - "url": "https://github.com/leafac/org-password-manager", + "commit": "38249f32d150d10b6ed86679361d99ace2375a02", + "sha256": "148rv5kzmnqlfn8z2474wn0bxir49d4mb40mjrv76kvyzyj7nly9", + "fetcher": "github", + "repo": "leafac/org-password-manager", "unstable": { "version": [ 20180227, @@ -74769,8 +75212,8 @@ "repo": "alphapapa/org-ql", "unstable": { "version": [ - 20201204, - 414 + 20201213, + 1358 ], "deps": [ "dash", @@ -74785,8 +75228,8 @@ "transient", "ts" ], - "commit": "1389ccb46be0db0252196f52ee1337dc65dc1a2a", - "sha256": "17smsqy5y2sk3sasgl8dn49nk6s2z8wpr6h1b8g7ds62vc61rz7l" + "commit": "208e103ecc146db71d878df3bd09c6eb60c2797d", + "sha256": "09vdndp3935iy4flynbjpkvfax7vs1ppswl19wx4nn2rp7hdz8kp" }, "stable": { "version": [ @@ -74886,28 +75329,28 @@ "repo": "oer/org-re-reveal", "unstable": { "version": [ - 20201114, - 622 + 20201231, + 909 ], "deps": [ "htmlize", "org" ], - "commit": "0062756e9a5b6ec96c7de5ca94372cc6495296a1", - "sha256": "1lm5aymzbbb5syffm2lh6alaqapjdigl7r5c1qcvyh7hzil36rsx" + "commit": "8f31c73a8950b0e45f244f33274c8e5a32d7f757", + "sha256": "0gnz4vjj968x203j8z8gr98vf4ipgrq8abfmx0xll0i0gynpmyzf" }, "stable": { "version": [ 3, - 4, - 3 + 5, + 0 ], "deps": [ "htmlize", "org" ], - "commit": "0062756e9a5b6ec96c7de5ca94372cc6495296a1", - "sha256": "1lm5aymzbbb5syffm2lh6alaqapjdigl7r5c1qcvyh7hzil36rsx" + "commit": "8f31c73a8950b0e45f244f33274c8e5a32d7f757", + "sha256": "0gnz4vjj968x203j8z8gr98vf4ipgrq8abfmx0xll0i0gynpmyzf" } }, { @@ -74950,8 +75393,8 @@ "repo": "alphapapa/org-recent-headings", "unstable": { "version": [ - 20201118, - 737 + 20201213, + 747 ], "deps": [ "dash", @@ -74960,8 +75403,8 @@ "org", "s" ], - "commit": "11430626f7d83b8eafbaf34bb5eeeff458035187", - "sha256": "1z2rad7rvh125a91z2xnwd3zslqs2v5bwhb8p0lvnw3b7z6qy91y" + "commit": "5da516a1586675992c0122ed32978c18dda06318", + "sha256": "1xnhahgs1q6y7w0rrc33qbkdagjm6q71a4i0msi4gsfnnzwn4vam" }, "stable": { "version": [ @@ -75018,8 +75461,8 @@ "repo": "jkitchin/org-ref", "unstable": { "version": [ - 20201126, - 1924 + 20201230, + 2020 ], "deps": [ "dash", @@ -75033,8 +75476,8 @@ "pdf-tools", "s" ], - "commit": "120509c38929cc25d814e9a42092c44cb34ec34e", - "sha256": "0l1il3dh4rcw5ylia2ywszmj6fpdfbvmr496scsdw4w0skrjpljw" + "commit": "5e6c1c7319adfdad6bd67debcf332a478e6812df", + "sha256": "1n08ssdq6m2k5721wgnbdniiyc4gp0g7rmxaw17plbkzj6x6qcbf" }, "stable": { "version": [ @@ -75160,8 +75603,8 @@ "repo": "org-roam/org-roam", "unstable": { "version": [ - 20201128, - 1144 + 20201225, + 543 ], "deps": [ "dash", @@ -75171,8 +75614,8 @@ "org", "s" ], - "commit": "be95b42d32d9707309ab373f1d8182c84db41c5c", - "sha256": "17djynwjl11jmgx986f9zr0zd4sanadv6m9q4hg3ll46933mj8jx" + "commit": "65c0f0dc8cc36261858c31b8c9d1a7fba4ed083c", + "sha256": "08m1lm091nkwmf1462yf7rqmsvxyb2x9qa3wbmr3q86wiw7i5pca" }, "stable": { "version": [ @@ -75200,15 +75643,15 @@ "repo": "org-roam/org-roam-bibtex", "unstable": { "version": [ - 20201207, - 741 + 20201220, + 1653 ], "deps": [ "bibtex-completion", "org-roam" ], - "commit": "c002d63fdb5cdb388dc376b14e8c1e599ffcb3b6", - "sha256": "0cll1pbpk6jldkv6apxmpzdy6dd9nyh72kbg7w1r4jrjmjzr9wx0" + "commit": "9ba15069c3f7ecd1080873cd3a7d587eb7c72d08", + "sha256": "0nfsrrca1p5xlildcbjisfhhrwiwgd6jv0nfn4a2gdpxd77v39d6" }, "stable": { "version": [ @@ -75232,8 +75675,8 @@ "repo": "org-roam/org-roam-server", "unstable": { "version": [ - 20201203, - 2002 + 20201213, + 1924 ], "deps": [ "dash", @@ -75243,8 +75686,8 @@ "s", "simple-httpd" ], - "commit": "6cfb8d60abfecd985975f683e48e87d03a0f0212", - "sha256": "1rvlmldhvd2vr72j6sh9dn718c99rmzk7wdpra4lvs1x95rbvcp6" + "commit": "93b673209d141953547fc0732506bb0efa68f804", + "sha256": "0dlw8997d1p6yvgnskimj5nkv1rv9fkf13k3prq0399y9mqyvh0x" }, "stable": { "version": [ @@ -75289,8 +75732,8 @@ "repo": "tyler-dodge/org-runbook", "unstable": { "version": [ - 20200523, - 2004 + 20201229, + 1905 ], "deps": [ "dash", @@ -75300,14 +75743,14 @@ "s", "seq" ], - "commit": "27dafe2a470d54a2c664164b5f9cbd2a1e5d921e", - "sha256": "1bl8f7azkr2657izhcwxy8w8jz7qs2wkk843q2bzzdzixqadlabs" + "commit": "63cf17f35d81f78f9ce10f8c99288b978982d4dc", + "sha256": "16axy433zz8mvbvihj4ks4mq2wn28j2jg5b3vgi9mbrv1pybdm1l" }, "stable": { "version": [ 1, 1, - 2 + 4 ], "deps": [ "dash", @@ -75317,8 +75760,8 @@ "s", "seq" ], - "commit": "27dafe2a470d54a2c664164b5f9cbd2a1e5d921e", - "sha256": "1bl8f7azkr2657izhcwxy8w8jz7qs2wkk843q2bzzdzixqadlabs" + "commit": "e5d1e30a05552ce1d63d13ada1487643a41b92cb", + "sha256": "093jbpanvpwxxdyb9136r804ai1147rbq1gfb7pdy0iymhrv3d9r" } }, { @@ -75446,8 +75889,8 @@ "repo": "alhassy/org-special-block-extras", "unstable": { "version": [ - 20201130, - 1159 + 20201222, + 234 ], "deps": [ "dash", @@ -75455,12 +75898,12 @@ "org", "s" ], - "commit": "90bcb2dbc09854d9599eeba5d503a079e7129bd0", - "sha256": "1czkasfmgsf5s2xq1a9xddvn5gbbhk1jgg56wg459n5zqpnz5s8f" + "commit": "61ff797d068947a4f1c172bb83aaf5cf897febf1", + "sha256": "112nbh12qgq3wy3p736k8hjzpaa621zv4x2rdbxhaib1il7x7i7p" }, "stable": { "version": [ - 1 + 2 ], "deps": [ "dash", @@ -75468,8 +75911,8 @@ "org", "s" ], - "commit": "d1054754d0701296bc0cde1fb022619b1f38dfde", - "sha256": "1fy1sgj3jg7l6fjl00dxb7npf7x8ldcbs81cs8w4b4ciklp30mzr" + "commit": "61ff797d068947a4f1c172bb83aaf5cf897febf1", + "sha256": "112nbh12qgq3wy3p736k8hjzpaa621zv4x2rdbxhaib1il7x7i7p" } }, { @@ -75480,30 +75923,30 @@ "repo": "ndwarshuis/org-sql", "unstable": { "version": [ - 20201121, - 2021 + 20201222, + 206 ], "deps": [ "dash", "org-ml", "s" ], - "commit": "0dc17dcf669abc0c5257abedc00b3e2a4116fcf8", - "sha256": "0cw2x9gnbsqg864p4w7whjpy8v9m5rgz3j9ca4l6y5arh03167xj" + "commit": "ddbab360a49d4c0cab964cd1fdb80d2135a10272", + "sha256": "0rhc5sb6drzndxay52qb3f1kbxfnwvz99i1jpjs4adsmyhx35xai" }, "stable": { "version": [ 1, - 0, - 3 + 1, + 0 ], "deps": [ "dash", "org-ml", "s" ], - "commit": "0dc17dcf669abc0c5257abedc00b3e2a4116fcf8", - "sha256": "0cw2x9gnbsqg864p4w7whjpy8v9m5rgz3j9ca4l6y5arh03167xj" + "commit": "6160de13bcef3ad91c706d8a7b1601703b424616", + "sha256": "0rhc5sb6drzndxay52qb3f1kbxfnwvz99i1jpjs4adsmyhx35xai" } }, { @@ -75578,11 +76021,11 @@ "repo": "bastibe/org-static-blog", "unstable": { "version": [ - 20201123, - 1409 + 20201221, + 1630 ], - "commit": "b104911cdded2547d5186d1765190857cca2587d", - "sha256": "09s519mjgmy5k0n4psf3x4gs5w6k77kpvpqb2s8fjplgf5ymhzm6" + "commit": "1dd66614cc54a2051646324c7910e3e295d1cc40", + "sha256": "18fawppxij4yd2w5s1h223v0jpv44dpxbja32w0n9975ip5ciir0" }, "stable": { "version": [ @@ -75602,26 +76045,25 @@ "repo": "alphapapa/org-sticky-header", "unstable": { "version": [ - 20191117, - 549 + 20201223, + 143 ], "deps": [ "org" ], - "commit": "1053ebdeb3bd14fc8d4538643532efb86d18b73c", - "sha256": "171j10ngngra45sxmlkzrcmhhqf2b6yjqq0r5gl16zcbgggg936a" + "commit": "79136b8c54c48547ba8a07a72a9790cb8e23ecbd", + "sha256": "1ijfy4yr39rrg58w5506pcb0xnqf2l5ammwl4z8r4mmknznysp9i" }, "stable": { "version": [ 1, - 0, 1 ], "deps": [ "org" ], - "commit": "2847035ec559a46bd7b555f220f819c88371d538", - "sha256": "0g6hdg11jzzpw7h0f6p795l5aj6pag2nhhfbx90cg28j61d28vwh" + "commit": "79136b8c54c48547ba8a07a72a9790cb8e23ecbd", + "sha256": "1ijfy4yr39rrg58w5506pcb0xnqf2l5ammwl4z8r4mmknznysp9i" } }, { @@ -75632,8 +76074,8 @@ "repo": "alphapapa/org-super-agenda", "unstable": { "version": [ - 20201121, - 941 + 20201211, + 918 ], "deps": [ "dash", @@ -75642,8 +76084,8 @@ "s", "ts" ], - "commit": "ac7f2ef05c161b10390141b6863b431dc9360edc", - "sha256": "0n4dg0hhb4nsfh65jm5q1jypxk9dnnm8gzw7gj6bxf4dm9677n99" + "commit": "f5e80e4d0da6b2eeda9ba21e021838fa6a495376", + "sha256": "18q1af3hjjbsny9lxqjsq68qjzzpdjqgx7npg7pl7k3hzdjaj42f" }, "stable": { "version": [ @@ -76033,11 +76475,11 @@ "repo": "takaxp/org-tree-slide", "unstable": { "version": [ - 20200611, - 1143 + 20201215, + 1117 ], - "commit": "18034c476038adcc1c4697168b8068f4d0ce62fe", - "sha256": "0mibyph6db08llgjcpzbrsj75zwrlg8rn2ckyq69c10gkxsq8dkk" + "commit": "d6e8e91433dfe4968f1343b483f2680f45a77d52", + "sha256": "1zz12xk8vl2qic5hpvl0jcwysbmrfb6rfigvf8hr3nhdm9fp36aw" }, "stable": { "version": [ @@ -76050,6 +76492,36 @@ } }, { + "ename": "org-tree-slide-pauses", + "commit": "87a76bfd2a6baccb18be6e7917087ab1c7fbf948", + "sha256": "07idjfwrgmql504nmzkpx3z7695y2hbqk2r8fc73bgb2p29nzvkv", + "fetcher": "github", + "repo": "cnngimenez/org-tree-slide-pauses", + "unstable": { + "version": [ + 20201215, + 146 + ], + "deps": [ + "org-tree-slide" + ], + "commit": "f02af7102e9ecef7c3dac0d376d85bbb8c4de4cc", + "sha256": "0fzif0ss5yhvhj7q041qbpdb91az03zjf4rgs43a81g6a8qwi803" + }, + "stable": { + "version": [ + 0, + 1, + 0 + ], + "deps": [ + "org-tree-slide" + ], + "commit": "80d6e9279fad10bcff15fbce75726bb002da73c0", + "sha256": "03qhlgsj5m31q40vq196fxz5232mz2mwl9bbk22rlcj91k8b1j8r" + } + }, + { "ename": "org-treescope", "commit": "2db07414d2d39b2d40a2ae91491032844b82d801", "sha256": "08b17gx9119gfz7mkkjigai0zjj3mj5y054skvvl57vlgd7lygqd", @@ -76188,8 +76660,8 @@ "repo": "alphapapa/org-web-tools", "unstable": { "version": [ - 20191217, - 1459 + 20201212, + 1058 ], "deps": [ "dash", @@ -76198,8 +76670,8 @@ "request", "s" ], - "commit": "ebc7888f4f4cad26ec1298edd7bf606a5ea2d564", - "sha256": "09ihqas9rx7c6146zmb3p0q395gxkfscxixlmz4v05smrhka1xz8" + "commit": "b94a07add8558ef7b0666173dbb8a2554f1d41a6", + "sha256": "08z5qc0gki5ci4cf2j4b7190vi2wpsb9qpq9768ifkhhm82mfawr" }, "stable": { "version": [ @@ -76484,11 +76956,11 @@ "repo": "kostafey/organic-green-theme", "unstable": { "version": [ - 20201010, - 1720 + 20201216, + 2240 ], - "commit": "debd4305ee29592eb5c2a87e1c78abdd30139043", - "sha256": "1si084giyf2r6069nsvyg1gcyx9lk85yzlf0ifjhkw6cv2gkfwgy" + "commit": "0ed99a9c0cf14be0a1f491518821f0e9b7e88b88", + "sha256": "1l70vvyv8walqjk96jgr8047fi0yiqz0lm3r0vh6xrh6phna5mcd" } }, { @@ -77524,6 +77996,21 @@ } }, { + "ename": "ox-gemini", + "commit": "d2d6a5503a853523ffbbdc4c0db5e76bb3ec7308", + "sha256": "15lsyyshardfs24qcwq4psriip02mprc3yvilqmcv3k72x05mh6c", + "fetcher": "git", + "url": "https://git.sr.ht/~abrahms/ox-gemini", + "unstable": { + "version": [ + 20201125, + 1716 + ], + "commit": "5b50b6e8d1372955503f01f13ea5c02e4ca16af4", + "sha256": "00jkrnqbkh9nsbjpb7gykgdzzgcq73i4rya6pz4kjvqs76v4npnd" + } + }, + { "ename": "ox-gfm", "commit": "10e90430f29ce213fe57c507f06371ea0b29b66b", "sha256": "065ngmzfd3g2h8n903hc4d363hz4z5rrdgizh2xpz03kf3plca6q", @@ -77607,8 +78094,8 @@ "deps": [ "org" ], - "commit": "f24c9bd522ae22bee2327c2b53858d0a5066707d", - "sha256": "1f48j4zpcamdcxjrz7mcrlavmn4qmnnwf871h0qw3v2ad8nk4jpk" + "commit": "661eb223fd50b0f3bd683aba92d7fd661b78c2cf", + "sha256": "0kkqg5y0f4bnykv37nvccrq1v745xhj0bs2yknvdji7kx8fs9lns" }, "stable": { "version": [ @@ -77782,8 +78269,8 @@ "ox-gfm", "s" ], - "commit": "8a00843a2a58e0c43cb53080d1005c619e4a9c88", - "sha256": "1kk13mj8bn6kvck95j7wx41maip4b9kpwdln00m5rj6z3d51nrly" + "commit": "e79c4c4429f64fe61cfa673dcd33273bba30f9db", + "sha256": "153sr1pnnlglzmsz9kx8d8h604j01anf85n57pdz2dnbh6wr2wak" } }, { @@ -77938,8 +78425,8 @@ 20201208, 1749 ], - "commit": "e153f4ff541fead4bce9d59820e7929debd0ce11", - "sha256": "1dmqaid08vhw4x1yapisqzga97nmvnbp9wnb6wd5kpmvyxwcamwn" + "commit": "b7b1d682a724ef4ea729327395aa6577cba27133", + "sha256": "1cznkrcxi0pfs7i1fvz6zg8b3z2axcmqmjw62s15p0fhn4d2czxf" }, "stable": { "version": [ @@ -77958,14 +78445,14 @@ "repo": "yjwen/org-reveal", "unstable": { "version": [ - 20201025, - 952 + 20201211, + 1518 ], "deps": [ "org" ], - "commit": "6542658d67965a24c0641845ca7cc0759c4a1fd2", - "sha256": "01c4q0hlr67kmxr0x53ic3dzfh5fmydri6hp14qr396jfbfw39z1" + "commit": "e8673f4825b1c6e97f8ba895ccaf8c460cba5a09", + "sha256": "08gsb4c7a3hvkp3vdzad2wbs3n6ldxddhqp7bxsgsw7z3gfb4snv" } }, { @@ -77976,14 +78463,14 @@ "repo": "choppsv1/org-rfc-export", "unstable": { "version": [ - 20190926, - 851 + 20201218, + 1356 ], "deps": [ "org" ], - "commit": "b86c9e6f21d99ea657b4f2224f816300485ed73f", - "sha256": "1lg4bs0dr4srcgqxv9qi6v53aqq9i8inc1q024ndag4bis2x1q01" + "commit": "1a49535cf927cd52ffa05c815b890888c4addf86", + "sha256": "001dv3zxsvh5zgrwn5jmib82bns4phbbd5kcy5mvmk7nyayrmq9p" } }, { @@ -78079,11 +78566,11 @@ "repo": "dantecatalfamo/ox-ssh", "unstable": { "version": [ - 20201017, - 2209 + 20201217, + 317 ], - "commit": "27f311382c6bc9192c6771f219d176836bd23286", - "sha256": "0vsk50d969yipywpc0imjsaj5d4d3x070klxpqccawziy60qdppf" + "commit": "1b39849e3a315de95543eb3cf69c42fa33a8f5cd", + "sha256": "0hcm91fh3qcxp6n40363sxdk3hz87vsmbw032d7iwb2wmdfwh6b4" } }, { @@ -78353,20 +78840,20 @@ "repo": "zenspider/package", "unstable": { "version": [ - 20201206, - 446 + 20201222, + 255 ], - "commit": "e612385c90eff5e347a9c449e233aed3a54e1a3d", - "sha256": "1w79apm5gg57np1mb0vkbvlgycp701f051k1lwg7njbqnfxp9cng" + "commit": "59b0f6daf219a2e0a0a0389d56471eb2a876f21d", + "sha256": "139ffhhjv45fbxqjasv46v0057sjbynqi9x6g7vikrph0js7bnja" }, "stable": { "version": [ 1, - 2, - 1 + 3, + 0 ], - "commit": "e612385c90eff5e347a9c449e233aed3a54e1a3d", - "sha256": "1w79apm5gg57np1mb0vkbvlgycp701f051k1lwg7njbqnfxp9cng" + "commit": "59b0f6daf219a2e0a0a0389d56471eb2a876f21d", + "sha256": "139ffhhjv45fbxqjasv46v0057sjbynqi9x6g7vikrph0js7bnja" } }, { @@ -78377,14 +78864,14 @@ "repo": "melpa/package-build", "unstable": { "version": [ - 20201206, - 2137 + 20201231, + 1321 ], "deps": [ "cl-lib" ], - "commit": "2807a0a434616c4c7a7039316f7b1e3a352c0c58", - "sha256": "0msl4vkxv7hl3k1ffy4j8g93zm8ba7wn81gbm8s6b1ggzyy4pk1s" + "commit": "126565141704faaad428bc82ca4379701d0c7c04", + "sha256": "1advai81xwvahilbj11g2g3rhxzxi7nmfpaq5dlm8g6qi5814n1x" }, "stable": { "version": [ @@ -78586,11 +79073,11 @@ "repo": "kadena-io/pact-mode", "unstable": { "version": [ - 20191117, - 2337 + 20201219, + 2223 ], - "commit": "220bf985cb31d60f47042d5f424de8b9a589e544", - "sha256": "0cz87z2y54lqvsl2xhpjmndccj7051f2v9qpqrjr3qdwmfr6azsw" + "commit": "f48a4faf5f8f8435423bda3888eca6ee67ee13a9", + "sha256": "1cmw2pxnzdd3y3f78a6l6770z2nmh0f8mydfw13fh5yfqdhv4vgx" }, "stable": { "version": [ @@ -78732,16 +79219,16 @@ "repo": "abo-abo/pamparam", "unstable": { "version": [ - 20201201, - 1621 + 20201228, + 1117 ], "deps": [ - "hydra", + "ivy-posframe", "lispy", "worf" ], - "commit": "aab22e32fcdc8e83fecbe248bb35f4583739f955", - "sha256": "1kdv5gj2ddiwzy79k4hszc5i3110171bs23vlajq9y31cszjn8jz" + "commit": "66827c3fe86a3e50aa2d594e80cccc0fc1064f3b", + "sha256": "09yawvlhgb03077q1ypjizccps4bjr3vizgbjch4gjxvg14j9948" } }, { @@ -79357,16 +79844,16 @@ "repo": "NicolasPetton/pass", "unstable": { "version": [ - 20190830, - 2017 + 20201230, + 1556 ], "deps": [ "f", "password-store", "password-store-otp" ], - "commit": "919d8e3826d556433ab67d4ee21a509d209d1baa", - "sha256": "03cf7d51p7d5a9nmlzp1k0n68j4n0di0nmpmcx3vlfd62lk3rs2p" + "commit": "a095d24cf06a7b0fbc3add480c101304a91cf788", + "sha256": "1nv6xs90zkv3qd0jxjwxlx132cz0ias0i7n2kvih6fp5gfkrzdci" }, "stable": { "version": [ @@ -79767,26 +80254,20 @@ "repo": "sigma/pcache", "unstable": { "version": [ - 20170105, - 2214 - ], - "deps": [ - "eieio" + 20201226, + 634 ], - "commit": "1f31433ad0b37a2e68d60ee043a8188ef1ce3176", - "sha256": "1bk6rg9qaaasbng6m6mdkjbwdm68zkr7mfwj18l34ivlz0f05sxw" + "commit": "893d2a637423bae2cc5e72c559e3a9d1518797c9", + "sha256": "1xxbi4lp4ygvciqmy8lp6zn47k954ziz5d95qz1l7a2jix3rxf1p" }, "stable": { "version": [ 0, - 4, - 2 - ], - "deps": [ - "eieio" + 5, + 1 ], - "commit": "025ef2411fa1bf82a9ac61dfdb7bd4cedaf2d740", - "sha256": "1jkdyacpcvbsm1g2rjpnk6hfr01r3j5ibgh09441scz41v6xk248" + "commit": "e2f17133e624237f852a3b8c0d7c136252cb8c1a", + "sha256": "0zmw3m86illywfn7kn9jgiq4b0hglj34mz0jji834iayjhkpkvr7" } }, { @@ -80094,6 +80575,24 @@ } }, { + "ename": "peertube", + "commit": "b6757bf92dc0f8bd1b96a3fd036f76c91b045b6e", + "sha256": "0y8vwz7l6aips9ldkd6lyx9l70c89kjwgzi3k6ajq7aw4r23wvlh", + "fetcher": "git", + "url": "https://git.sr.ht/~yoctocell/peertube", + "unstable": { + "version": [ + 20201222, + 1655 + ], + "deps": [ + "transmission" + ], + "commit": "3ce0df17465bcf4ed1a478f7346dbd8a1a2363af", + "sha256": "1p4phw90l91c6xax187011n1n45byyf1pjvsd7mlz0gif78lqz6h" + } + }, + { "ename": "pelican-mode", "commit": "aede5994c2e76c7fd860661c1e3252fb741f9228", "sha256": "0z6w5j3qwb58pndqbmpsvy1l77w9jv90bss9qq9hicil8nlk4pvi", @@ -80370,14 +80869,14 @@ "repo": "nex3/perspective-el", "unstable": { "version": [ - 20201203, - 633 + 20201218, + 4 ], "deps": [ "cl-lib" ], - "commit": "7d747f50464e5c518bc6963e66d6d378ac3e9add", - "sha256": "1y4mjbhig9x0xy7xvd16spgzzrj7jm6izfj04q4d5gv41xpqxfy3" + "commit": "94830c4fc18ac460a217be7c46da4272b2217f43", + "sha256": "1prymf64fhn69mzwnhqnxlid6b7mz0zgxcsc1q5jcbmgns5qm382" }, "stable": { "version": [ @@ -81225,6 +81724,21 @@ } }, { + "ename": "pikchr-mode", + "commit": "602e3c99f100286d52a9022800e9aac0b7fa97c5", + "sha256": "0rgmy0rckd84jiw3z0ll7pghfyczp4g75rlsda0n6bfdxg7dfk16", + "fetcher": "github", + "repo": "kljohann/pikchr-mode", + "unstable": { + "version": [ + 20201212, + 2228 + ], + "commit": "dd4bb08f189c96039128dddceba26bfdabd1431b", + "sha256": "0w964qn9qag4pfwrs9pyv226ivmy1lw4s068hyi9f0jkm2fhd2za" + } + }, + { "ename": "pillar", "commit": "bff55f1182f3bd0bc8a8773921f703168d87de21", "sha256": "1lklky3shyvm1iygp621hbldpx37m0a9vd5l6mxs4y60ksj6z0js", @@ -81584,11 +82098,11 @@ "repo": "juergenhoetzel/pkgbuild-mode", "unstable": { "version": [ - 20200818, - 1742 + 20201230, + 1310 ], - "commit": "887c01cb06420501c7780fb01a8a76bdb0864cca", - "sha256": "17v71sd1i7wyvjzz0nir7p28cskzgws4dcpm83ch1khhljh3r7kl" + "commit": "284c78151a73b4813e8d0ff329456826a9fb5622", + "sha256": "1hpnydm6c4rw01cmph16d9rqlnb377v9l9r3gcbj4axfnffgr4py" }, "stable": { "version": [ @@ -81607,14 +82121,14 @@ "repo": "abo-abo/plain-org-wiki", "unstable": { "version": [ - 20200617, - 828 + 20201217, + 1027 ], "deps": [ "ivy" ], - "commit": "5e32e7e6216e24d515624008fa0898077403aa7f", - "sha256": "0d3nhvkzzharjv54w3rinqcpwhqb61flgvvcngfdxkrgs1yazaqk" + "commit": "faeeb54ca808bbf0f4380a938e75805b7a78dbf7", + "sha256": "02nv0rsky418zd69icxbim1xw66n8rs586i0lnl1nczjdx8vcmr9" } }, { @@ -81655,6 +82169,24 @@ } }, { + "ename": "planemo-mode", + "commit": "a6d5c914a3cfa2e1c975b429f22a086c6da908ed", + "sha256": "0nvynr73q42l6kd9cj4pai95qpyirq7amsb518f9c45q5y175rfc", + "fetcher": "gitlab", + "repo": "mtekman/planemo-mode.el", + "unstable": { + "version": [ + 20201216, + 1122 + ], + "deps": [ + "dash" + ], + "commit": "9a981f79a2727f87689ae5a07368c41d35902a67", + "sha256": "1hx1mdbb25hggg4kwga97m3wysm0yj11hnnycmbwa85c9rn96jzv" + } + }, + { "ename": "planet-theme", "commit": "855ea20024b606314f8590129259747cac0bcc97", "sha256": "1hr5m08qn51r9804jd0k95ryz3frzkk1dp6wpybil6bf67a2l5lr", @@ -82994,15 +83526,15 @@ "repo": "kostafey/popup-switcher", "unstable": { "version": [ - 20200701, - 2034 + 20201216, + 2229 ], "deps": [ "cl-lib", "popup" ], - "commit": "68bbe23f7ceaca889529be95762925ac29515545", - "sha256": "18nfrhmdjsgmrpr82qqmxj3rdv85ml2pkssrkrljzzgaxavx5ind" + "commit": "166a90c13310b829bd392235bf7cc1e45188faff", + "sha256": "1sgsryc5g2sxsr0mz8r8gs5i4kfh2mnxqs0vpkbmlsbcl40inm0k" } }, { @@ -83114,11 +83646,11 @@ "repo": "tumashu/posframe", "unstable": { "version": [ - 20201201, - 659 + 20201224, + 2318 ], - "commit": "e1552c82dffaadc5e7de09a44880a498197ffbee", - "sha256": "0qzi4ivmv65x0gn6wbfz8w2m6pg476vk0041l599mnrh0g87dfw7" + "commit": "ae8ac91744010c8975f07cf18282f58ce56605d0", + "sha256": "1y6d4h0lzgg9xmhswkd0d7rjrqs08mpngylqypycqn90rz0gb6hd" }, "stable": { "version": [ @@ -83397,11 +83929,11 @@ "repo": "raxod502/prescient.el", "unstable": { "version": [ - 20201125, - 1428 + 20201214, + 230 ], - "commit": "5d139e5b1fe03ccaddff8c250ab8e9d795071b95", - "sha256": "11hqy8chh29lrzk04dp3rwkvf4bj0xvg9hli3w1zx968x98lfvj0" + "commit": "2af94ce194f9b8d7087f7b49ecd986083f7eb753", + "sha256": "19wwnl72gh4ar2q6gcp6k6n4gdvamdjj6lgc0n4mk7j1qrylp3hf" }, "stable": { "version": [ @@ -83465,15 +83997,15 @@ "repo": "jscheid/prettier.el", "unstable": { "version": [ - 20201209, - 837 + 20201222, + 953 ], "deps": [ "iter2", "nvm" ], - "commit": "673698ed70f2205230a052dd98f2cd2f1dd0c21f", - "sha256": "1r6prwaf3w6s2byzb10zzs2n105dayz998gh0ifmlla0mw58rnhy" + "commit": "5b584f21b8dd9a53ceb7745c2d91c513358892e7", + "sha256": "1m5298i60s1rdy2r8wnyialkfbafd99wp9q0bzsbr7grq3cdp2ic" }, "stable": { "version": [ @@ -83617,26 +84149,26 @@ "repo": "alphapapa/prism.el", "unstable": { "version": [ - 20200407, - 1148 + 20201228, + 141 ], "deps": [ "dash" ], - "commit": "b618f2cea2dbf7c13d8b4fec1760c346eb9ab036", - "sha256": "1fn6514ii2z1xbjzmp0h1mhxl1yaqqk4n6zgswhxdywni34cb6hs" + "commit": "e746822cd7d8a0dcf56902d32fbadb3297690590", + "sha256": "09pskvha06picdlgclvwijng712s3xd5mr3kxxpp6gb02qsiy3yy" }, "stable": { "version": [ 0, 2, - 2 + 3 ], "deps": [ "dash" ], - "commit": "b618f2cea2dbf7c13d8b4fec1760c346eb9ab036", - "sha256": "1fn6514ii2z1xbjzmp0h1mhxl1yaqqk4n6zgswhxdywni34cb6hs" + "commit": "d1d8121eb552a7c29c25cfa9ace19cba4ae1902c", + "sha256": "0m0jrgk09dp1n1l8nf1mlvhwrk8gnv4yclmh12vf9nmxidgdwspp" } }, { @@ -84031,14 +84563,14 @@ "repo": "bbatsov/projectile", "unstable": { "version": [ - 20201208, - 2044 + 20201227, + 1430 ], "deps": [ "pkg-info" ], - "commit": "0ff73ecf7f25f47382e2d28c8ab232c18609d515", - "sha256": "1fbsvl74271hrlii73lc9g0hk67mrp0dm1zbhbrc9b2cnc2nh88j" + "commit": "1f2887696ec4fa7ecc005f258da276c445db039c", + "sha256": "05xrf805slj793mszkzgckhcwf13lbkr4ns2rkqw59cclj3yly1l" }, "stable": { "version": [ @@ -84462,11 +84994,11 @@ "repo": "ProofGeneral/PG", "unstable": { "version": [ - 20201207, - 2131 + 20201226, + 2208 ], - "commit": "ad5105b58374f9ed5f83d5272688f5475bc0293b", - "sha256": "1iwhaa16nxd943lhzq85d4i8d1cjp2phb5qmn6jdk19yc5c40dvc" + "commit": "2d94aa0aabf0aa7087f8833e1c61d95a034e2d13", + "sha256": "0gbh8cpz4cd03892jg1rfl2azs3ahbbk7mcsq3pwczf7v4vllqkl" }, "stable": { "version": [ @@ -84569,8 +85101,8 @@ 20200619, 1742 ], - "commit": "26c0fbc15bd2ed8371df3f737951804f0a92db4b", - "sha256": "0p65cxzw8rlg36fva5is6kxgiwzshjaf0jk3l6vaylipq4gv86br" + "commit": "635156e40637d65650e91a21afec10ad8fac5c19", + "sha256": "1xkjb57rbrrhy5fidfmqjhij891i4k3j0cm900464z44s9mq2ypf" }, "stable": { "version": [ @@ -84621,11 +85153,11 @@ "repo": "stardiviner/proxy-mode", "unstable": { "version": [ - 20200913, - 38 + 20201214, + 727 ], - "commit": "efe2ad19a20898c145fd63b5f85f25b662f6ea43", - "sha256": "11l8v3igwwx0n0l3a069zzwzzj9q0p99l9x91sxzgw8v0g438vjx" + "commit": "dbf163413e9e404c652cc0ea7185c623016a38e1", + "sha256": "1c5m0gb4qms28vahvi5kam1qf1hnpd9v1f6cwxiqdj8aka9ll8sd" } }, { @@ -84813,14 +85345,14 @@ "repo": "nbfalcon/ptemplate", "unstable": { "version": [ - 20201126, - 1936 + 20201213, + 1355 ], "deps": [ "yasnippet" ], - "commit": "af370c74f5c2a780c0dfd2bb3e4a2388c11202cc", - "sha256": "0na5lrx3kn2j76vbc84qns3kym2pn67zv2s4b5whm1bpwqsr5ayl" + "commit": "7caca3ed9f2c1bce77943d8ef3db6721e2b027e5", + "sha256": "0p23rlhv7xqwhzd0a2ybvn799xpr2n7jdinx5r07sdxmsjrmgzv9" } }, { @@ -84837,8 +85369,8 @@ "deps": [ "ptemplate" ], - "commit": "17c3f270a97ea3f018536a7b8fb81101e46b1090", - "sha256": "1qmcvy5dwln2c7r6xw5z00d0h80ln799jv2qhbhcga24mz2f21zd" + "commit": "40cf3031f0fb5bbb75e1f35db3186fd1aabe7262", + "sha256": "046wmvhj5bf68klb4gzb0ijgib89pw2hmm9yrykpi8c8fnvzgdb0" } }, { @@ -85585,8 +86117,8 @@ 20200503, 1624 ], - "commit": "6e1cca143f2e0c6f20643573bfddb53ec02e66b4", - "sha256": "160aiz82wf6j6dv90rnzmlx79ijf0cl6xzixa7pa1nh77nqd1pq6" + "commit": "3a065a16f0826f3d46025209b11d30a1fd5b3b49", + "sha256": "1p9q5bnkv7jwy4f7d0fq6c72z7qqcl7vwgq55wh46pzhnrvl4f3d" } }, { @@ -85827,11 +86359,11 @@ "repo": "python-mode-devs/python-mode", "unstable": { "version": [ - 20201203, - 2019 + 20201230, + 2132 ], - "commit": "429c52ae6564c3e6d9cebd69e9726784eaf41b81", - "sha256": "1fkc7994hgw4iprklixyy962yw3p2mby202kcs9bnjq696j25kh7" + "commit": "41b123b4d4906cce7591900a952bb75a38c5296c", + "sha256": "1dl6vpwqxrdy26gh8kw5xkyj1ka88plm60c6ka2g6ji2s851b6ki" }, "stable": { "version": [ @@ -85985,11 +86517,11 @@ "repo": "jorgenschaefer/pyvenv", "unstable": { "version": [ - 20201202, - 1040 + 20201227, + 1623 ], - "commit": "0bf4b87068e9040fc99afa85af1992247dd7aacd", - "sha256": "10dcigv25bs115d3m5nibvh1sxg99ni32cy5pyz616f2wz1zbph4" + "commit": "9b3678bc29192d2dba64df90fbdb17393ef8d877", + "sha256": "1pxinj6gc0mga0sl7y5ys3xsy94c33cbgahw418c36lhj8xxx21n" }, "stable": { "version": [ @@ -86008,11 +86540,11 @@ "repo": "psaris/q-mode", "unstable": { "version": [ - 20201011, - 103 + 20201231, + 140 ], - "commit": "df2123d4fe5c05a995721af8e8da98ff4a1f0717", - "sha256": "074lhq3qkran6kxk9lm6a095gspyxrq79xvsqzm50q87xk6ala3a" + "commit": "e4499e7fcdfafd8d1825eb705c34a7748ca5ee64", + "sha256": "1bb9w75rxvsx024y0yx41rrskkmhpyfslw3xi414d2w5wmh82zbm" } }, { @@ -86093,11 +86625,11 @@ "repo": "LesleyLai/emacs-qtcreator-theme", "unstable": { "version": [ - 20201129, - 1620 + 20201215, + 1523 ], - "commit": "ca5fd9a4552a7fc004579ed59c69fbc8f0083ac4", - "sha256": "1askzfnysv9nccf1mrkzk834ak5lja416b5mi5z5p7mrnn9vfn2d" + "commit": "515532b05063898459157d2ba5c10ec0d5a4b1bd", + "sha256": "00p7fapvprfkah14j1isrwnbq8npgn3yw3k4z8ki14mqhgras4hf" } }, { @@ -86149,8 +86681,8 @@ 20201022, 638 ], - "commit": "8e59bf825629388384324b3eea5d51958d7fd34e", - "sha256": "1hrhhiz0dd6403yv8jnjq6zjl1zjjaqxq97yvpwd4l0sx1sx0h6m" + "commit": "6aceac05fb8ab23838adc0d5956c0fc439cc84ce", + "sha256": "1f0wqrqqal6a4grcgxxxn0h6bv7riqhi2gcdh0rnwb19qdaqczdn" }, "stable": { "version": [ @@ -86442,15 +86974,15 @@ "repo": "greghendershott/racket-mode", "unstable": { "version": [ - 20201123, - 1623 + 20201220, + 1343 ], "deps": [ "faceup", "pos-tip" ], - "commit": "3563081f7de57198d5adba856a79f67b3b5ad675", - "sha256": "061q7sb1a9q0gipfw4na4418cpd5wdfgn4iwpdaf61g0w20y0qm2" + "commit": "6ec7c4c17b2cd7603df6d0e267d99edbdde65794", + "sha256": "19gsxwxdmzis97v7m035abrg028qn5rjsjbwy21mhh3kq0anzryg" } }, { @@ -86563,14 +87095,14 @@ "repo": "stardiviner/emacs-rainbow-fart", "unstable": { "version": [ - 20201130, - 639 + 20201228, + 6 ], "deps": [ "flycheck" ], - "commit": "fe5b01ec36bc5db7f578ba94593ac92fd653ea5e", - "sha256": "067zfgsbq7whg1mvwbp2j5f8i1x128nmv1b75vhgqvfykbxr0b47" + "commit": "63b6a77a38235e7917d200886922156506853c42", + "sha256": "1pfpinplhkn5d91rlbgh359w4d7hp399vpximipj69bnx3nizic6" } }, { @@ -87121,16 +87653,16 @@ "repo": "realgud/realgud", "unstable": { "version": [ - 20200923, - 610 + 20201221, + 1435 ], "deps": [ "load-relative", "loc-changes", "test-simple" ], - "commit": "ff660011c82c6af504915833e2d981a547b7ad58", - "sha256": "1cqzrp1fk4hk28fh0q9d448cjv47qgvxy2z786x2hpmb42izrc76" + "commit": "f73c039a340579a98e6716c901fd4e80e7eaa2eb", + "sha256": "0v6dysd9rzhb8aw3ws3wayprrx9ll59g3isib7ni2fl6krmvyjlx" }, "stable": { "version": [ @@ -87573,6 +88105,21 @@ } }, { + "ename": "recomplete", + "commit": "4a3938f413ff1ceeb7ed6aedf0e3067073208068", + "sha256": "0ym5l5cpx464hxzww4m35rrlr4c5h8kl6090w2a7hck47kwyv8ni", + "fetcher": "gitlab", + "repo": "ideasman42/emacs-recomplete", + "unstable": { + "version": [ + 20201202, + 126 + ], + "commit": "d0e61f19a29108d676849e0925f00d002a26d32d", + "sha256": "1r3fmc5c2aqfqpfzdxkj6qi86j8vwmrj1gk3xz263pl3q96pzcya" + } + }, + { "ename": "recover-buffers", "commit": "43b33cfb794c35de78fde6eabb71ffe01049d23d", "sha256": "0g40d7440hzlc9b45v63ng0anvmgip4dhbd9wcm2sn8qjfr4w11b", @@ -87656,11 +88203,11 @@ "repo": "minad/recursion-indicator", "unstable": { "version": [ - 20201206, - 139 + 20201219, + 1739 ], - "commit": "7f737f667441f538c283cc1933e95cea844f1b04", - "sha256": "1lbfb8gl5jzfl4j5p5ab8ybgsa2zhg0ix3ld726ch0p8pcrjl3f9" + "commit": "1f46a5ca366f0320dcd5ef9ee84de6e14e162101", + "sha256": "1jixzkswqa8zbj3jf0m8jh5964ffjflm92iwjq7b7py6hyq2ksnk" } }, { @@ -88599,28 +89146,28 @@ "repo": "jcs-elpa/reveal-in-folder", "unstable": { "version": [ - 20201022, - 533 + 20201224, + 1242 ], "deps": [ "f", "s" ], - "commit": "30d9db25ca84e1bf3f4f8eda1a5fa23bb8e69182", - "sha256": "0hx77c7cygax0xqk12rj6ci9rvq5r9xyynhlfapb9ldzzp31g0dw" + "commit": "29240e4845a44d10134652b427580301318f1288", + "sha256": "0ckaq8z38mj17abzarvq0awsqvwnff22mxa6pgsl7ks67hzq5kb4" }, "stable": { "version": [ 0, 1, - 0 + 1 ], "deps": [ "f", "s" ], - "commit": "30d9db25ca84e1bf3f4f8eda1a5fa23bb8e69182", - "sha256": "0hx77c7cygax0xqk12rj6ci9rvq5r9xyynhlfapb9ldzzp31g0dw" + "commit": "29240e4845a44d10134652b427580301318f1288", + "sha256": "0ckaq8z38mj17abzarvq0awsqvwnff22mxa6pgsl7ks67hzq5kb4" } }, { @@ -88708,11 +89255,11 @@ "repo": "mswift42/reykjavik-theme", "unstable": { "version": [ - 20180823, - 1544 + 20201219, + 947 ], - "commit": "2cd0043ae6d046f812a95bb26398ea23141beccc", - "sha256": "0rk0fw5b1lz7if779h3bngc86iix8v9k8bz3zw8icwfwmjsgg1fh" + "commit": "f6d8e83946633603234cd1dac725e17447f40bce", + "sha256": "07bbn4r4ry439b8cnqbzq20nh1w0n3rxsjsir9cfznp5rnc1b174" } }, { @@ -88750,15 +89297,15 @@ "repo": "dajva/rg.el", "unstable": { "version": [ - 20201018, - 1400 + 20201226, + 1050 ], "deps": [ "transient", "wgrep" ], - "commit": "151f3ed7dd0d5829a8aacc0e911d445ad00046cd", - "sha256": "13c9hlf3hrvqzcmbaqqbr91fz9wcf7fll4czvxsc3c58bhfqcsan" + "commit": "7055a673b557de8b886e08e15f9578676d729195", + "sha256": "0jf0z8n292qc3xahj18gl8jj41fdhhbkgi0yjmvv9lmmnj874waz" }, "stable": { "version": [ @@ -88907,8 +89454,8 @@ "repo": "DogLooksGood/emacs-rime", "unstable": { "version": [ - 20201129, - 1748 + 20201227, + 717 ], "deps": [ "cl-lib", @@ -88916,8 +89463,8 @@ "popup", "posframe" ], - "commit": "0faa6e40d272fa79a4ce4f39901a811fc8191de0", - "sha256": "10hqalawki31q0z66n46sw57cc30iaf7hgcjkplnk79vp4290xph" + "commit": "c797c443886aca6083737a3644e45af51f5b6760", + "sha256": "12r94srq41sxnss4b9bqvgccmvmzjgy3hgncb5p4vq26iln2cbxm" }, "stable": { "version": [ @@ -89122,14 +89669,14 @@ "repo": "dgutov/robe", "unstable": { "version": [ - 20201119, - 316 + 20201214, + 2255 ], "deps": [ "inf-ruby" ], - "commit": "f04dcc7f8d4c14ad4761bd534bf58a49a5f2957f", - "sha256": "0yl9casjj9sya03mgcyans5fh3kbrkl1g7g566nlf4n77yrajqwm" + "commit": "596d27e37440cad6cd65dcf83d03c502efc01eb4", + "sha256": "09gc6yy2d5z75s37zw1xiv0qh44nvf4j24w8qd15270wkaczfixa" }, "stable": { "version": [ @@ -89361,15 +89908,15 @@ "repo": "pezra/rspec-mode", "unstable": { "version": [ - 20200615, - 1443 + 20201228, + 1319 ], "deps": [ "cl-lib", "ruby-mode" ], - "commit": "f1029cad2a8d9fd096e9a0f1ae9e7d7e2c8bd1ec", - "sha256": "02818knhbnqqnfmlhzr2ak0i6cv6pmbxw2icns2lg8vfr430c286" + "commit": "92ef785010f6a68cbf73861e75ac6cf4e1832291", + "sha256": "1di1b9psmaqzhp0ik3niwgy43i0vj16m5fx7xnsyi0bvwv45cab8" }, "stable": { "version": [ @@ -89392,19 +89939,19 @@ "repo": "Andersbakken/rtags", "unstable": { "version": [ - 20201008, - 1707 + 20201218, + 1821 ], - "commit": "63a7d9b733def9fe76568f81321a65a450829575", - "sha256": "1nnjhfz7xm1ax38xkz0jvgzhfczlc4r9xlpzc24sisabkvlkivyw" + "commit": "39339388256df662d0084b4a094d03e52748f9e8", + "sha256": "0wp4mygsxzibra2p3m5rn9m0yd3fscd795k5xa0wxi5pwddv7dlg" }, "stable": { "version": [ - 2, - 38 + 3, + 23 ], - "commit": "9687ccdb9e539981e7934e768ea5c84464a61139", - "sha256": "1r6l7dgr2ch586zrdi5l8fhdj4qdva8ldz7cjvi2byc2pd2xs8rx" + "commit": "7169ed577d676690a3c6f0025b54e8477d80eacf", + "sha256": "1i94dizg3wvkvq8c2pf5bzkx8zwzcfi4p3l73c779y145bygssnq" } }, { @@ -89421,8 +89968,8 @@ "deps": [ "rtags" ], - "commit": "63a7d9b733def9fe76568f81321a65a450829575", - "sha256": "1nnjhfz7xm1ax38xkz0jvgzhfczlc4r9xlpzc24sisabkvlkivyw" + "commit": "39339388256df662d0084b4a094d03e52748f9e8", + "sha256": "0wp4mygsxzibra2p3m5rn9m0yd3fscd795k5xa0wxi5pwddv7dlg" }, "stable": { "version": [ @@ -89940,24 +90487,22 @@ "repo": "brotzeit/rustic", "unstable": { "version": [ - 20201202, - 846 + 20201219, + 1952 ], "deps": [ - "async", "dash", "f", "ht", "let-alist", "markdown-mode", - "projectile", "s", "seq", "spinner", "xterm-color" ], - "commit": "91ad5db27b86bb2ba6f3019b764d0f45ec93f484", - "sha256": "02d6kn7lj1ql6yycvprzdicxb0n6ilb2xbc2qq9q7yn1ibyfymdj" + "commit": "25d14f1794e55b7ceba4f7560c1fc27b53bcc32d", + "sha256": "0vvqlsmi9idkirz5i1clffrh0jcliigplbib7ayjwpyrbqqlacpx" } }, { @@ -89968,20 +90513,20 @@ "repo": "senny/rvm.el", "unstable": { "version": [ - 20201026, - 424 + 20201222, + 17 ], - "commit": "b2498a4a6952a32301544e103b31dc3b8df271ee", - "sha256": "0w6h02z82iyjxx9ra05yw6389mlfwmzmb6bh2vcy5093f2yfpk7w" + "commit": "c1f2642434b0f68d9baa0687127079ecd884ba12", + "sha256": "1fmrll8ffa90hi62a1kkxf8z952xglzmf2qb4l4j5wkh0yzyvnln" }, "stable": { "version": [ 1, 4, - 1 + 2 ], - "commit": "b2498a4a6952a32301544e103b31dc3b8df271ee", - "sha256": "0w6h02z82iyjxx9ra05yw6389mlfwmzmb6bh2vcy5093f2yfpk7w" + "commit": "16617c1fc7c0513e514cd658a93b5e5be2ff618f", + "sha256": "1j508b4frig410svh9cl4zrqgcp4z3p33r6mih6iil3n20akvyxn" } }, { @@ -90108,16 +90653,16 @@ "repo": "sagemath/sage-shell-mode", "unstable": { "version": [ - 20201108, - 943 + 20201225, + 1011 ], "deps": [ "cl-lib", "deferred", "let-alist" ], - "commit": "c19c3c681142154d6068d1e0236fea825eda2fe2", - "sha256": "10fmm38rlirbrjrkxp73x2wvcb1nkvp0pbg7czwzd6pilxlwsvcq" + "commit": "7fc47d5eab0efac009d5a9316e3dfa223595ab5a", + "sha256": "05r8z8wvsdwkbhsv5czrjwg5fq7232vsfcvkk7vj8arkfnhyg1yz" }, "stable": { "version": [ @@ -90332,14 +90877,14 @@ "repo": "nicolaisingh/saveplace-pdf-view", "unstable": { "version": [ - 20201130, - 222 + 20201216, + 934 ], "deps": [ "pdf-tools" ], - "commit": "88e07be656544bcdfa332d25880abff168ca1423", - "sha256": "0zn6mhq2cqjfir91w9zry6pi5r8jp4i2437lq8xfjdirrpa55lmy" + "commit": "b0370912049222f3a4c943856de3d69d48d53a35", + "sha256": "1ky1d3aycc1r96z3fy484p99xlmry9y9z61s7l7mw0m231k7kpbd" } }, { @@ -90430,8 +90975,8 @@ 20200830, 301 ], - "commit": "1896c18602265c9b41ff9c1b320699dd0b9b813c", - "sha256": "1d3r0r7932w7m3nmv435s0m8qv0ph3a40jpqi412yg7406l920l4" + "commit": "4cfbf9985ed25b8ed919d0e59d5af31acdcbe21a", + "sha256": "0a6c6d0gq1v21nxdjrxnbhhfag6lfx452vxjb67syibiplbigndj" } }, { @@ -91186,11 +91731,11 @@ "repo": "raxod502/selectrum", "unstable": { "version": [ - 20201207, - 1851 + 20201226, + 1908 ], - "commit": "632a22cd5edc34611d74eee3cd95fcaa19e699b4", - "sha256": "143chfxkbwa096l4r01pcj3slzzhvd8b0vvgvb8h0g4af90yfksn" + "commit": "4106b216f9b3ccf8960abe89fb9863c570a6f376", + "sha256": "045khkm5b62yagvw0588mmj91b6qapjmp7pzmj0x5i622k83zdxn" }, "stable": { "version": [ @@ -91209,15 +91754,15 @@ "repo": "raxod502/prescient.el", "unstable": { "version": [ - 20201026, - 1413 + 20201214, + 227 ], "deps": [ "prescient", "selectrum" ], - "commit": "5d139e5b1fe03ccaddff8c250ab8e9d795071b95", - "sha256": "11hqy8chh29lrzk04dp3rwkvf4bj0xvg9hli3w1zx968x98lfvj0" + "commit": "2af94ce194f9b8d7087f7b49ecd986083f7eb753", + "sha256": "19wwnl72gh4ar2q6gcp6k6n4gdvamdjj6lgc0n4mk7j1qrylp3hf" }, "stable": { "version": [ @@ -92161,8 +92706,8 @@ 20201021, 552 ], - "commit": "267d4220715eabacca1ad1661d76be5ceed7072c", - "sha256": "0xyrvvrckn8agg86kkr6821bj07s5an8w226k964f148jn84n86q" + "commit": "085de54acae027e7f0d0b9bf34d3142993234fd3", + "sha256": "14klj49iwykqj1j1q03fvhpj44fg0h4rzh0mbn7xzm4iv0z3222c" } }, { @@ -92471,13 +93016,13 @@ "version": [ 0, 3, - 2 + 3 ], "deps": [ "cl-lib" ], - "commit": "dccd8f7d6af2dde96718f557b37bc25adc61dd12", - "sha256": "103yvfgkj78i4bnv1fwk76izsa8h4wyj3vwj1vq7xggj607hkxzq" + "commit": "081d6b01e3ba0e60326558e545c4019219e046ce", + "sha256": "1bnmrwrhra6cpc3jjgwwzrydj5ps7q2dlkh2ag4j7rkyv4dlk351" } }, { @@ -92723,11 +93268,11 @@ "repo": "gexplorer/simple-modeline", "unstable": { "version": [ - 20201130, - 844 + 20201218, + 840 ], - "commit": "6bb96a00c5fcce48e681d8e75b000b4047815181", - "sha256": "0fgsrbpn8ybksrb0f1z7dzg1v5pshijv9ndr21hdhcwl1cwcv9f1" + "commit": "38973dec2912e2136d8fde5f2667063863fee15a", + "sha256": "0y70hc3x8rxr8b5x8d0a23gpcadzrn43wmrsvqqxmmkqqp45n7gj" }, "stable": { "version": [ @@ -92915,14 +93460,14 @@ "repo": "laishulu/emacs-smart-input-source", "unstable": { "version": [ - 20201125, - 1155 + 20201223, + 547 ], "deps": [ "terminal-focus-reporting" ], - "commit": "20479e5f4f26d18bd99c32bb0d6fb49d30904812", - "sha256": "1slrkkwc1fampcqaqc88d77kdcmanv3zj7qq6p59bqh9ynpsgy40" + "commit": "0f2dcbeef2f924b7ae57a198472b2e059c92cee0", + "sha256": "05fpzg98a3s2rngyjqk4mp6rwln0x78nkqbsx5izivvx85ss26sq" } }, { @@ -93167,27 +93712,28 @@ "repo": "slime/slime", "unstable": { "version": [ - 20200810, - 224 + 20201216, + 2342 ], "deps": [ "cl-lib", "macrostep" ], - "commit": "fb12bac676ab51b75be19197e21ab4674479d627", - "sha256": "1lqd6mk87kmmyb83qf4h0i5wpq3mnqwzl9gdcjildy7afsp3f1fk" + "commit": "15cf0609d30255405957bf0612fd6291fea438bc", + "sha256": "11zb8aaay1yirql638ssbap4rnxdf6a4lwmqm761grgssk44rqpd" }, "stable": { "version": [ 2, - 26 + 26, + 1 ], "deps": [ "cl-lib", "macrostep" ], - "commit": "fb12bac676ab51b75be19197e21ab4674479d627", - "sha256": "1lqd6mk87kmmyb83qf4h0i5wpq3mnqwzl9gdcjildy7afsp3f1fk" + "commit": "15cf0609d30255405957bf0612fd6291fea438bc", + "sha256": "11zb8aaay1yirql638ssbap4rnxdf6a4lwmqm761grgssk44rqpd" } }, { @@ -93392,19 +93938,20 @@ "repo": "joaotavora/sly", "unstable": { "version": [ - 20201208, - 1836 + 20201218, + 2227 ], - "commit": "41b1cc8087a435ea646e0b45feaaea1da14f5e29", - "sha256": "0bvr2rp5bc11f2fzw3r8y0625lk7z770c12ljbvhf5bm5m82h56y" + "commit": "613f597ecf72eb5719d4e13a4bfdbeb91373bf09", + "sha256": "0xayq42akw3aliagxxbnfqx6s0q3k6hbjn3r1481fpycs0ifpg9c" }, "stable": { "version": [ 2, - 22 + 26, + 1 ], - "commit": "8d9fdf34fe542ec280ee042ee7bdea16e512d3c0", - "sha256": "0zsliqfd92ivg2y2w1z6scn6i3w658x8bi1wd0rvf6mddc74lvj6" + "commit": "15cf0609d30255405957bf0612fd6291fea438bc", + "sha256": "11zb8aaay1yirql638ssbap4rnxdf6a4lwmqm761grgssk44rqpd" } }, { @@ -93723,14 +94270,14 @@ "repo": "daviderestivo/smart-mode-line-atom-one-dark-theme", "unstable": { "version": [ - 20200106, - 2016 + 20201229, + 1711 ], "deps": [ "smart-mode-line" ], - "commit": "e281b52b164a477fcdb6a468976e8a1bdde1ca26", - "sha256": "0m4c63anrmbbdaf0chiagzgkcgbi30bhkjx3v7c4i9nk98yz9zkw" + "commit": "0c360f390cbeea59dceb99e8c499e0db7c323510", + "sha256": "1hm2mg4360p19fjmagds3bimclsxx6c0qy5z0f25fdk8zzzccmak" } }, { @@ -93902,15 +94449,15 @@ "repo": "Fuco1/smartparens", "unstable": { "version": [ - 20201128, - 2212 + 20201229, + 1937 ], "deps": [ "cl-lib", "dash" ], - "commit": "b8bdd9265e6950e038bbcd68ead5582c6964baf2", - "sha256": "1dlyp801fw3cmpi6ks3sq1kpz3wqzgh4i114pn333hifgbzl5p23" + "commit": "63695c64233d215a92bf08e762f643cdb595bdd9", + "sha256": "0yx9xamrpjpn6qshcdzc43pj3avb0nq4q40nmid28vb4giab4927" }, "stable": { "version": [ @@ -94245,15 +94792,15 @@ "repo": "kyleam/snakemake-mode", "unstable": { "version": [ - 20201109, - 315 + 20201224, + 1744 ], "deps": [ "cl-lib", "magit-popup" ], - "commit": "0e4ef118ca3af4a6851fe670cf8fe7472ba18393", - "sha256": "0cl956wav9vnsxz0ky0ykcjxa3m43zld8ybn24r5yy54kr00nicm" + "commit": "592901893f297099ffb759b4d1359bcd3411d1a9", + "sha256": "0rmvzrkx56zrlziln9cbq9p7lpm7jlv6i1mfrzrqhri239xlybn4" }, "stable": { "version": [ @@ -94390,6 +94937,21 @@ } }, { + "ename": "snow", + "commit": "4c8024abdb9843296860aaaf1528bc9dfbfbc6c7", + "sha256": "00wmb43znvqp57b5risznd4mwkvwfy65vfp922ix761hav6k0dpy", + "fetcher": "github", + "repo": "alphapapa/snow.el", + "unstable": { + "version": [ + 20201226, + 2348 + ], + "commit": "d3d7509c89c598be73f912aca34097ad4898794c", + "sha256": "0m3wfjmjnswhvki05jp6ih7k65qg8gj91x1nhvavg7pczd398r29" + } + }, + { "ename": "soar-mode", "commit": "818113ef6f93cc86fd30441d508012e5baa71893", "sha256": "0jm4vllbppzs2vvkky96hwdv581142dxdfssrp6wsd56j38nr9sd", @@ -95229,6 +95791,21 @@ } }, { + "ename": "spdx", + "commit": "fb570e4a9a89319443c0df08980e7427aad7f1a0", + "sha256": "1yg5rks9j4rbx14fh6d8gyggmw62gc9jfnid10175czd4nzj8vab", + "fetcher": "github", + "repo": "condy0919/spdx.el", + "unstable": { + "version": [ + 20201219, + 1245 + ], + "commit": "883b3e32573fad834ee4697924c8e57ac3007344", + "sha256": "09h26kwhh95xngb0p8y88xp8nq5vw4rp1mv960kyx41v5x7mmma6" + } + }, + { "ename": "speech-tagger", "commit": "db80aa5d95846ee02a9d762aa68325ab5e37dcf7", "sha256": "0sqil949ny9qjxq7kpb4zmjd7770r0qvq4sz80agw6a27mqnaajc", @@ -95567,16 +96144,16 @@ }, { "ename": "spray", - "commit": "e4f5053aa4e1af3f636febe9c3ce8c6ae20c090d", - "sha256": "1h8lngcqa343mlc091zs419frgsla65khfj93lv9fil3xbgrm7m9", - "fetcher": "gitlab", - "repo": "iankelling/spray", + "commit": "b89bd1ada947b64f6c42dda14e626ef55127f8e5", + "sha256": "03f3zrgk7b36srdvd15m0b067577crjf605lw392sqhrarmw4rw6", + "fetcher": "git", + "url": "https://git.sr.ht/~iank/spray", "unstable": { "version": [ 20160304, 2220 ], - "commit": "00638bc916227f2f961013543d10e85a43a32e29", + "commit": "74d9dcfa2e8b38f96a43de9ab0eb13364300cb46", "sha256": "1avbfr32dvff26kgvd5vgan99nb5c6al9kv5xbmy2rcls17py7r2" } }, @@ -95805,11 +96382,19 @@ "repo": "cnngimenez/sqlite.el", "unstable": { "version": [ - 20180708, - 1711 + 20201227, + 1822 ], - "commit": "dad42b8bbca4994be1871343dd18fd6528ee5797", - "sha256": "06ln4vijl8kii3nzc5cscgsadx1fqgxksflijd3ain83bn8g4wrd" + "commit": "f3da716302c929b9df4ba0c281968f72a9d1d188", + "sha256": "00fkjsc01fymhjrzlx3anl9vj85yw4jlxvh77d0mvchwzym8wi8l" + }, + "stable": { + "version": [ + 1, + 0 + ], + "commit": "f3da716302c929b9df4ba0c281968f72a9d1d188", + "sha256": "00fkjsc01fymhjrzlx3anl9vj85yw4jlxvh77d0mvchwzym8wi8l" } }, { @@ -95929,11 +96514,11 @@ "repo": "srfi-explorations/emacs-srfi", "unstable": { "version": [ - 20201129, - 2137 + 20201222, + 709 ], - "commit": "22657a98d4cd7d0690dac0d437a27ec3eef6f1df", - "sha256": "0jdl6raw9nyylfdla40xlzxcacfk5nv4hr8279djyd68sjn62gbd" + "commit": "f26b37d8c32a033ab4dd7d5c707fd2f2dfccf85e", + "sha256": "0f59v8hmk9j0bfyga8h7ph6xxp72h88ky0g9qq8xisilw209lzji" }, "stable": { "version": [ @@ -96046,11 +96631,11 @@ "repo": "jhgorrell/ssh-config-mode-el", "unstable": { "version": [ - 20201103, - 334 + 20201223, + 1051 ], - "commit": "87e61e92501c1a976c37c0bb874f1929e2b7e7e6", - "sha256": "01z3wf2v8r584gdw6l05cvv344l6acarb57lm59m4y2kqqkw85jc" + "commit": "a236e04f2950bd9d7f7c79ad992d1f8b57df950d", + "sha256": "0d5vx8k18avnja6mlhzrsj3z5brs70fj3s7151zgjq5i12n6aqm2" } }, { @@ -96357,8 +96942,8 @@ 20200606, 1308 ], - "commit": "93c90734d7073bc68285dca5e450034f96376703", - "sha256": "022avhxsw50zs4i901zj56w15fzkpfgcwj8mr40lmbcmb6q7bbj0" + "commit": "417b344e3c97beb2e50c2c919b0d01cb0d4ed9a5", + "sha256": "105va5nb5wgqkw25rdc2d591c6fcd9wa3dzsyvg3y83fcxhqgi7g" }, "stable": { "version": [ @@ -96953,11 +97538,11 @@ "repo": "mvarela/Sunburn-Theme", "unstable": { "version": [ - 20201203, - 1732 + 20201216, + 1539 ], - "commit": "cf2faed6fe96a8af18b1bc2121937cfb3a84018d", - "sha256": "1l2bai0dqhn763psavnraamyb4kvhw6r6g3hf4q6b6821h70b05k" + "commit": "6b5c14c76dcdfdb099102ef7a388b2f0c6f1951d", + "sha256": "0rnr2lwq5aw19c94h169i9d9rmd8wf387k7wjnx7r4llh990ajl8" } }, { @@ -97317,14 +97902,14 @@ "repo": "swift-emacs/swift-mode", "unstable": { "version": [ - 20201128, - 1029 + 20201231, + 1204 ], "deps": [ "seq" ], - "commit": "0bc8d8d80736d6d874edf8f59c0b37618368b183", - "sha256": "1srbbpp7dqzpfjk0a5l6li749qzwpb1vbqbf5jwiy7h99y43fa4q" + "commit": "95ff0041370660e839ed06aa92330694d8590d62", + "sha256": "14yfdcz78iygxzykwv21fy059ml2kwm9khrn0ysyjwnxnddvpc50" }, "stable": { "version": [ @@ -97407,8 +97992,8 @@ "deps": [ "ivy" ], - "commit": "ae9b121b834a68d11f79ca27b1e5c8790149ba2f", - "sha256": "160qs77b4sama17h8lhq60my44qh4c9aj1qj9jk02n64jfn44fm6" + "commit": "d2891aab7b816aebf21ebd01ce33933a6ac6244f", + "sha256": "12bm5w073mgpj7kvk6596fnw8809nl6vkv288l7vvzx7iimaqzpl" }, "stable": { "version": [ @@ -97648,16 +98233,16 @@ "repo": "bgwines/symbol-navigation-hydra", "unstable": { "version": [ - 20201205, - 1846 + 20201223, + 2054 ], "deps": [ "auto-highlight-symbol", "hydra", "multiple-cursors" ], - "commit": "9bbea3931348a69b3a05621296a7b096d7588456", - "sha256": "01n8q7pdmxq0lfianhywm94326x56v93bh03yr8s402y1i9ggca3" + "commit": "ed65cd9c22550e59f723d7fc36ecc313aedc83da", + "sha256": "19a5l2g5j58rfyws78jdnfd4g3dbc5chhq59xps7kghbzm0nmvvv" } }, { @@ -97723,54 +98308,44 @@ "repo": "countvajhula/symex.el", "unstable": { "version": [ - 20201205, - 2143 + 20201229, + 352 ], "deps": [ - "cider", - "cl-lib", "dash-functional", "evil", "evil-cleverparens", "evil-surround", - "geiser", "hydra", "lispy", "paredit", - "racket-mode", "seq", - "slime", "smartparens", "undo-tree" ], - "commit": "3cec3695ada5283c9de22496e0f8f37f92e2feb6", - "sha256": "0b1djw550790l45a774p9mqhf36m3k56ry85j5n5vcldqvy4v7yq" + "commit": "a0db2c80ccb6895981a6dfda7ef79fab201825cc", + "sha256": "1rpmxnz5xd02g0cfrn4l2ixh5bb6f9yvpp6n58mpriwdy99ndamn" }, "stable": { "version": [ 0, 8, - 0 + 1 ], "deps": [ - "cider", - "cl-lib", "dash-functional", "evil", "evil-cleverparens", "evil-surround", - "geiser", "hydra", "lispy", "paredit", - "racket-mode", "seq", - "slime", "smartparens", "undo-tree" ], - "commit": "3cec3695ada5283c9de22496e0f8f37f92e2feb6", - "sha256": "0b1djw550790l45a774p9mqhf36m3k56ry85j5n5vcldqvy4v7yq" + "commit": "2c9d94cf44ffc1337729db13f7ea3e3e8c470dbd", + "sha256": "02848n7b0gswdv01mk85xz3khkf24c4y1c0rsw09arnjjkhjgzwh" } }, { @@ -98350,11 +98925,11 @@ "repo": "11111000000/tao-theme-emacs", "unstable": { "version": [ - 20200325, - 344 + 20201222, + 602 ], - "commit": "34917843cde086943816d8a48977658c663a784e", - "sha256": "1ks4pnwp5fg2vswr93hrli2shfd7rrf3nwqwr1qwmqxhq1600f3x" + "commit": "468ee4f6ba7afb9dbfc8855ae2c333cb16ca4408", + "sha256": "0yqibx6wcdsj5k6130c3qp0hmj6zwhfjrrvw98lny23ksw6k0s3s" }, "stable": { "version": [ @@ -98377,8 +98952,8 @@ 20201207, 1629 ], - "commit": "d80c86c0842f77ba524867bf9e53b28a8627a665", - "sha256": "10rjnfqqgzbmzmfrgyqrx3hnrxr57knq8698azfyc46jvysrfhy3" + "commit": "d0199992b268784425b1724bf5899fc2dd22bc2e", + "sha256": "124qnfdcrwqnhpi7l2vgr56jik8yfv0d2rvhmpkv07h4kljrgwli" }, "stable": { "version": [ @@ -98565,28 +99140,28 @@ "repo": "zevlg/telega.el", "unstable": { "version": [ - 20201206, - 1235 + 20201231, + 918 ], "deps": [ "rainbow-identifiers", "visual-fill-column" ], - "commit": "223e56eee186f4403b03196b3191f0c0d4353dce", - "sha256": "1jmyc6kask9ja07gqzi0rq6lrlj1hm85v7q6x4llbqch7ngb04l6" + "commit": "3c290b48934a84cff271c10cf60b3b0afe007db0", + "sha256": "0kvi1azzcs25lvibakdqfqcfcjs843mg69nbis8bd92sadgbpzp7" }, "stable": { "version": [ 0, - 6, - 28 + 7, + 1 ], "deps": [ "rainbow-identifiers", "visual-fill-column" ], - "commit": "e53996777570a5bed84d21f6c8defd4f51c8e255", - "sha256": "058x6svgy33lyqjqq0l3byv8bysqig9jmh3kx8shaqr0ypfrjhi3" + "commit": "1d28dc209e2acf1a3bf2852cc620b6e412ea73f9", + "sha256": "0h6kj3r36x26v6p4gkzg5s6fv0brlvrf6ycsdwnz27fw5sdb99k7" } }, { @@ -98707,8 +99282,8 @@ 20201206, 302 ], - "commit": "8c4ba0d5db5280a78d94bb1cc3dbd2f1abd37e9e", - "sha256": "177m72c2gdmp2jq55z1sgff8izpv39n1s7qsin2bfl4p9ccwywmr" + "commit": "3243c632bf3062eb1c576dd424378a9f419f6013", + "sha256": "1ggid3vfns9j9bxz33cik270fh0m170bal3044xs0mkfncah1q5a" }, "stable": { "version": [ @@ -99010,8 +99585,8 @@ 20180830, 719 ], - "commit": "8b84bf18f4c5f1b59a11692eb706f13c3598d9a5", - "sha256": "0bbcl0mq62f22n2aipgzx93164x81bgybfd0x7gvsfva76qs8pc4" + "commit": "6b1dbb2e96b3ff680dbe88153c4c569adbbd64ce", + "sha256": "05h62b06k2nfslh822mq3a7q0xvnm8whnj5xbnv3291i4a4v5x2b" } }, { @@ -99022,14 +99597,11 @@ "repo": "davidshepherd7/terminal-here", "unstable": { "version": [ - 20200617, - 714 - ], - "deps": [ - "cl-lib" + 20201230, + 1219 ], - "commit": "d8b95302abe6e4a8a91a4526441a1c5d51b886a6", - "sha256": "0b05arm8b95dkzj6m2kx7wb37z00y0bdsj3z34sjny75srph3c0c" + "commit": "cb561b5feb37a03a1c35708c3eebf9b51b01f7a0", + "sha256": "02vmy0xbssqvs97f7ypmk50hiyb7qdsbrmmnlf3mlm55c2abk73s" }, "stable": { "version": [ @@ -99477,11 +100049,11 @@ "repo": "hadronzoo/theme-changer", "unstable": { "version": [ - 20200919, - 2307 + 20201226, + 2256 ], - "commit": "13adb7d0cf0e8dfbb79b0f649d33474ddf4301a2", - "sha256": "0f8b81ck229z3gf34ic9v27w776fal16wg17mbiqxzj0pqfl6y9n" + "commit": "57b8c579f134374a45bec9043feff6b29bb4f108", + "sha256": "01c3n5ngbyw2p8h82hi00pjjfkaqm5lz8mnj2c0v504v23zvs3kk" }, "stable": { "version": [ @@ -99644,18 +100216,18 @@ 20200212, 1903 ], - "commit": "35d5f61e460a48a7f8e7813a91729a597b938e7a", - "sha256": "0xarzygijicc3a5m4vzmhkcrfjawfq3593rwkqdwfg3cgyskkh5j" + "commit": "20bcade0c3554aefca82e52b982997f2ae5f3aed", + "sha256": "1gpkykhhcs5ccavicym2w7rhg2n9as1cxdcpdapnb8l735pz16sw" }, "stable": { "version": [ 2020, 12, - 7, + 21, 0 ], - "commit": "1aa52cbe490307cab99aaee5ff74e470576d35ea", - "sha256": "02z6cjfnq7mvgiw5qj2b0cilm064a6n8f80jsrqn086ikfhf8r1h" + "commit": "9f04619abf9ecea78df57fcdc1d0cbe2e4c1f1eb", + "sha256": "1jy54salpfjanvr3qyz23z5lqkfl6m81r1d63v9gvr3hpvbsa801" } }, { @@ -99711,8 +100283,8 @@ "deps": [ "haskell-mode" ], - "commit": "efba2f81cbd79f081cc5b84c98215aeb47d071de", - "sha256": "1mrhbcr5f4qif7kb1ywz07gvh4g4aafrh9991df6wicddlczrq5s" + "commit": "4c79a3314dacd77d3e1327a3cc54361da8dffeec", + "sha256": "0fx7km09f70y7f5wmqs3j126jgryzxp66vbkvri6kcimxja36914" }, "stable": { "version": [ @@ -99735,8 +100307,8 @@ "repo": "ananthakumaran/tide", "unstable": { "version": [ - 20201031, - 539 + 20201223, + 432 ], "deps": [ "cl-lib", @@ -99745,8 +100317,8 @@ "s", "typescript-mode" ], - "commit": "a43a37bfa23bd482cd96e55c0c39973f83128c57", - "sha256": "09c8pqlsi472mvxibh16k1b6398c2lwc4qlcm6irw1gf4w9q0xhj" + "commit": "ba09882d88dd0191e9c02c9b4e0fcd74199ff3cc", + "sha256": "1ivr9wj289zhsc4kkzmlbpxvl5nyhj6a0ir23i05fh5j93wc1da0" }, "stable": { "version": [ @@ -100221,8 +100793,8 @@ "deps": [ "cl-lib" ], - "commit": "d5909f4e237c27f638ef06725d04dd17f72d4740", - "sha256": "1bknlb9p576f0xrghh4paa23xkiyzlmlv97fr308mwwqs2g8d7ck" + "commit": "5bb073fe751d6a839e33c4a7fd043be16a3dbeb2", + "sha256": "0pyjds57kc0y1h6qligxzdx7m61wxzv57bp7al5cvqlg225dswa0" } }, { @@ -100590,8 +101162,8 @@ 20201101, 1045 ], - "commit": "107b74c9f4318eaa385819876cd8772ef650d1f4", - "sha256": "03whhp90wvbjc43qvbsraqi47dsi29mqbwrgxfhacjzqf73qffzx" + "commit": "0472cda711252b06fc07be184449b31933578148", + "sha256": "1ad1aqjmj1imh5zmnmdnwc06sn3rgd3xmksypyi2hnh07r79ynf4" }, "stable": { "version": [ @@ -100694,11 +101266,11 @@ "repo": "magit/transient", "unstable": { "version": [ - 20201205, - 1610 + 20201220, + 1911 ], - "commit": "0d79ccfaf899f6192151d1191fbc234795489923", - "sha256": "077q180qx8q7r8pjqii823l3xpxaz8dfqy3rr31maynhbr1w46g3" + "commit": "4a2b7fdf75c6940b5b311d930ea26f7e85a08cd4", + "sha256": "0l0pabisi4x61svnrv8namlyc3nl7zpk3pkmfb4s5lx3rqdg8myf" }, "stable": { "version": [ @@ -100736,14 +101308,14 @@ "repo": "holomorph/transmission", "unstable": { "version": [ - 20201209, - 458 + 20201217, + 1922 ], "deps": [ "let-alist" ], - "commit": "deb7090e1e3faf50b691c5b73148be690575c76b", - "sha256": "16bn8y2sd7kzihp8bxh4vyay16y91q3yc0gcd0bzywcx3hijqlfc" + "commit": "8e7e020cda8513c1dfeba911d0942640c7650348", + "sha256": "0ndcsyfbyhjvpg9asv0awa7dfj2fhzwhg42qx01kyr3bkb6gkjd0" }, "stable": { "version": [ @@ -100904,26 +101476,45 @@ "repo": "ubolonton/emacs-tree-sitter", "unstable": { "version": [ - 20201107, - 1648 + 20201229, + 1403 ], "deps": [ "tsc" ], - "commit": "887ad56d5c755d0007905d874e48eeedb2e8a383", - "sha256": "0fwl3m310l7f4cz58jak0ap2ilkml93my6w2fvyayv97ygn934r4" + "commit": "a3aef9113365032d55fedbbe08ab7b04f5268d14", + "sha256": "1n8mxd7fhs2brblrfr5892j5xqgh247d8ngnkhwq6acn8hfxn7qf" }, "stable": { "version": [ 0, - 12, - 1 + 13, + 0 ], "deps": [ "tsc" ], - "commit": "68757fb6f0ab7f2661b9abc8fda876453f27e3cd", - "sha256": "0vyd3j0wqric5b49f5pbrmlplpffw9wadmsl9h4wvgq61sn2ck3p" + "commit": "a3aef9113365032d55fedbbe08ab7b04f5268d14", + "sha256": "1n8mxd7fhs2brblrfr5892j5xqgh247d8ngnkhwq6acn8hfxn7qf" + } + }, + { + "ename": "tree-sitter-indent", + "commit": "fddb298f3020cd2eb7628f6282e0f35628a3eb17", + "sha256": "0krj3jqsmbi36jfzkic6g0h2zbqwwdp3yp0i034avjcb669l9fwj", + "fetcher": "git", + "url": "https://codeberg.org/FelipeLema/tree-sitter-indent.el.git", + "unstable": { + "version": [ + 20201229, + 1827 + ], + "deps": [ + "seq", + "tree-sitter" + ], + "commit": "a1eddfabb41375eda84178531b944472599c25e7", + "sha256": "179zz3qw0iq7j6xjw9ga6wp5k52s71w7yfnmx0cy5afxn4wivfdi" } }, { @@ -100934,26 +101525,26 @@ "repo": "ubolonton/emacs-tree-sitter", "unstable": { "version": [ - 20201205, - 431 + 20201221, + 1340 ], "deps": [ "tree-sitter" ], - "commit": "887ad56d5c755d0007905d874e48eeedb2e8a383", - "sha256": "0fwl3m310l7f4cz58jak0ap2ilkml93my6w2fvyayv97ygn934r4" + "commit": "a3aef9113365032d55fedbbe08ab7b04f5268d14", + "sha256": "1n8mxd7fhs2brblrfr5892j5xqgh247d8ngnkhwq6acn8hfxn7qf" }, "stable": { "version": [ 0, - 12, - 1 + 13, + 0 ], "deps": [ "tree-sitter" ], - "commit": "68757fb6f0ab7f2661b9abc8fda876453f27e3cd", - "sha256": "0vyd3j0wqric5b49f5pbrmlplpffw9wadmsl9h4wvgq61sn2ck3p" + "commit": "a3aef9113365032d55fedbbe08ab7b04f5268d14", + "sha256": "1n8mxd7fhs2brblrfr5892j5xqgh247d8ngnkhwq6acn8hfxn7qf" } }, { @@ -101000,11 +101591,12 @@ "repo": "Alexander-Miller/treemacs", "unstable": { "version": [ - 20201128, - 1158 + 20201230, + 1245 ], "deps": [ "ace-window", + "cfrs", "cl-lib", "dash", "f", @@ -101013,8 +101605,8 @@ "pfuture", "s" ], - "commit": "389bca1c3bdd4c4cf8245d6c4bdf8aa875e40d14", - "sha256": "0jbgmia6f610dsvjfccc06y90clradz3s5b867g5dbap4wxlwmfy" + "commit": "bffb1d88eef63434022d26d6f822fb33c929348b", + "sha256": "0i01sxdm0wn7rgjf3g4wazkxdsl4b553l8vmcmas15a9mhzd2ahd" }, "stable": { "version": [ @@ -101050,8 +101642,8 @@ "all-the-icons", "treemacs" ], - "commit": "389bca1c3bdd4c4cf8245d6c4bdf8aa875e40d14", - "sha256": "0jbgmia6f610dsvjfccc06y90clradz3s5b867g5dbap4wxlwmfy" + "commit": "6b045fd585421ab3c9e1185c2508d34af700490b", + "sha256": "0sifzkhyd4k2ffvf2gn6frg7qd28my8w7wy2cqqa4i9gxhbflbsj" } }, { @@ -101069,8 +101661,8 @@ "evil", "treemacs" ], - "commit": "389bca1c3bdd4c4cf8245d6c4bdf8aa875e40d14", - "sha256": "0jbgmia6f610dsvjfccc06y90clradz3s5b867g5dbap4wxlwmfy" + "commit": "6b045fd585421ab3c9e1185c2508d34af700490b", + "sha256": "0sifzkhyd4k2ffvf2gn6frg7qd28my8w7wy2cqqa4i9gxhbflbsj" }, "stable": { "version": [ @@ -101099,8 +101691,8 @@ "deps": [ "treemacs" ], - "commit": "389bca1c3bdd4c4cf8245d6c4bdf8aa875e40d14", - "sha256": "0jbgmia6f610dsvjfccc06y90clradz3s5b867g5dbap4wxlwmfy" + "commit": "6b045fd585421ab3c9e1185c2508d34af700490b", + "sha256": "0sifzkhyd4k2ffvf2gn6frg7qd28my8w7wy2cqqa4i9gxhbflbsj" }, "stable": { "version": [ @@ -101131,8 +101723,8 @@ "pfuture", "treemacs" ], - "commit": "389bca1c3bdd4c4cf8245d6c4bdf8aa875e40d14", - "sha256": "0jbgmia6f610dsvjfccc06y90clradz3s5b867g5dbap4wxlwmfy" + "commit": "6b045fd585421ab3c9e1185c2508d34af700490b", + "sha256": "0sifzkhyd4k2ffvf2gn6frg7qd28my8w7wy2cqqa4i9gxhbflbsj" }, "stable": { "version": [ @@ -101164,8 +101756,8 @@ "persp-mode", "treemacs" ], - "commit": "389bca1c3bdd4c4cf8245d6c4bdf8aa875e40d14", - "sha256": "0jbgmia6f610dsvjfccc06y90clradz3s5b867g5dbap4wxlwmfy" + "commit": "6b045fd585421ab3c9e1185c2508d34af700490b", + "sha256": "0sifzkhyd4k2ffvf2gn6frg7qd28my8w7wy2cqqa4i9gxhbflbsj" }, "stable": { "version": [ @@ -101197,8 +101789,8 @@ "perspective", "treemacs" ], - "commit": "389bca1c3bdd4c4cf8245d6c4bdf8aa875e40d14", - "sha256": "0jbgmia6f610dsvjfccc06y90clradz3s5b867g5dbap4wxlwmfy" + "commit": "6b045fd585421ab3c9e1185c2508d34af700490b", + "sha256": "0sifzkhyd4k2ffvf2gn6frg7qd28my8w7wy2cqqa4i9gxhbflbsj" } }, { @@ -101216,8 +101808,8 @@ "projectile", "treemacs" ], - "commit": "389bca1c3bdd4c4cf8245d6c4bdf8aa875e40d14", - "sha256": "0jbgmia6f610dsvjfccc06y90clradz3s5b867g5dbap4wxlwmfy" + "commit": "6b045fd585421ab3c9e1185c2508d34af700490b", + "sha256": "0sifzkhyd4k2ffvf2gn6frg7qd28my8w7wy2cqqa4i9gxhbflbsj" }, "stable": { "version": [ @@ -101425,15 +102017,15 @@ "repo": "alphapapa/ts.el", "unstable": { "version": [ - 20191010, - 210 + 20201212, + 1041 ], "deps": [ "dash", "s" ], - "commit": "df48734ef046547c1aa0de0f4c07d11964ef1f7f", - "sha256": "0hi0dfcwrr0vxp26v3f6radpmmwxbiz3px3br0cydfi6axikw9xl" + "commit": "b7ca357a0ed57694e0b25ec1b1ca12e24a4ce541", + "sha256": "12p4k8x1p0h94xcdis7m0vkzf41k5k3ijkaj838ywb7i74myfdxb" }, "stable": { "version": [ @@ -101471,20 +102063,20 @@ "repo": "ubolonton/emacs-tree-sitter", "unstable": { "version": [ - 20201116, - 1148 + 20201229, + 1403 ], - "commit": "887ad56d5c755d0007905d874e48eeedb2e8a383", - "sha256": "0fwl3m310l7f4cz58jak0ap2ilkml93my6w2fvyayv97ygn934r4" + "commit": "a3aef9113365032d55fedbbe08ab7b04f5268d14", + "sha256": "1n8mxd7fhs2brblrfr5892j5xqgh247d8ngnkhwq6acn8hfxn7qf" }, "stable": { "version": [ 0, - 12, - 1 + 13, + 0 ], - "commit": "68757fb6f0ab7f2661b9abc8fda876453f27e3cd", - "sha256": "0vyd3j0wqric5b49f5pbrmlplpffw9wadmsl9h4wvgq61sn2ck3p" + "commit": "a3aef9113365032d55fedbbe08ab7b04f5268d14", + "sha256": "1n8mxd7fhs2brblrfr5892j5xqgh247d8ngnkhwq6acn8hfxn7qf" } }, { @@ -101803,8 +102395,8 @@ 20201002, 1109 ], - "commit": "54f14c482701c4f937bf51469f70812624e07f87", - "sha256": "0rl5i34rdg3rk5s2xidf1yz6j5y30mb8qm6l4myw3r973fyasvlr" + "commit": "1043025d42602d560949955410d3afa2562130ee", + "sha256": "1p25fjmv9g0a980zvr4bpjj56xksaziynf4h6cvc6wiw08a9xbcw" }, "stable": { "version": [ @@ -102230,11 +102822,11 @@ "repo": "ideasman42/emacs-undo-fu-session", "unstable": { "version": [ - 20201016, - 2319 + 20201218, + 400 ], - "commit": "56cdd3538a058c6916bdf2d9010c2179f2505829", - "sha256": "04wq1alrzzlidcb4mjb5j7pg68pks1vgv7kvvmi6dzb3l602mb2a" + "commit": "702210384a0c68f04aabc23e08ebd4d6f43ea2c7", + "sha256": "0brd92jln528j7hh8gyv5wz451cfpayvkz9fic7b0wisnwgvq26b" } }, { @@ -102321,6 +102913,18 @@ ], "commit": "a5fd4e326a0607acc3776c11f41826e60b6486c6", "sha256": "035k8fkvrcglqn15fqcd962jyr154b3y8iczddjjc6wfxp16i21x" + }, + "stable": { + "version": [ + 1, + 1, + 7 + ], + "deps": [ + "nadvice" + ], + "commit": "a5fd4e326a0607acc3776c11f41826e60b6486c6", + "sha256": "035k8fkvrcglqn15fqcd962jyr154b3y8iczddjjc6wfxp16i21x" } }, { @@ -102552,11 +103156,11 @@ "repo": "sindikat/unidecode", "unstable": { "version": [ - 20180312, - 1926 + 20201213, + 1449 ], - "commit": "5502ada9287b4012eabb879f12f5b0a9df52c5b7", - "sha256": "03x3nakbhmakwm977mwrf8jifvjnfwzpjv6wrwpizbqjnkgfchmn" + "commit": "525b51b38f5b0435642005957740fe22ecb2a53c", + "sha256": "1jfaxz6z5lb24hygd7nx2a55blfbcf03225lc8ni2fbmkxx4dkir" } }, { @@ -103063,8 +103667,8 @@ "deps": [ "s" ], - "commit": "e430695957011aeff51fe7e7ed1a154226f205f5", - "sha256": "09x64f7qqan6bdfqjfb6m29ql5hnsi6x2az6hpb0wpgdxgy1vbm6" + "commit": "74ab3e375f2f6ddf786d7a520319f95203a47d26", + "sha256": "0wjqy000kaqgkkjvg7bq8qnpnma1cy6vl7sqdfsdiqy2952s2wz0" }, "stable": { "version": [ @@ -103080,6 +103684,21 @@ } }, { + "ename": "utimeclock", + "commit": "f712b882b6961f3a83a9807e973fa6edc592c223", + "sha256": "1818i1b04mzx5015d5h5r1j9hbpg2x8xgszdq831c1sjhvnajh7z", + "fetcher": "gitlab", + "repo": "ideasman42/emacs-utimeclock", + "unstable": { + "version": [ + 20201213, + 438 + ], + "commit": "cd3ab3a419ed50f51a7746849c80cb69910b89ca", + "sha256": "0anmmy46cbph9sjngcz3hbyzir8glzb6fqzl36wzfnxj54rzcf7l" + } + }, + { "ename": "utop", "commit": "30489fe52b4031184e54f994770aa3291257bc9d", "sha256": "0lv16kl29gc9hdcpn04l85pf7x93vkl41s4mgqp678cllzyr0cq7", @@ -103243,11 +103862,11 @@ "repo": "rrthomas/vala-mode", "unstable": { "version": [ - 20201019, - 1317 + 20201218, + 2109 ], - "commit": "6fcc4d87108179f973273dbc44c57fed44b061ae", - "sha256": "03wmnlpwi2wjm34ycffikdd3wgzy14kiida5lqx37js2am769jzh" + "commit": "d696a8177e94c81ea557ad364a3b3dcc3abbc50f", + "sha256": "0g5pdq757z9d8rk489n5ilhqipdc4i4sfkjwwrxyvgjlapjc04c0" } }, { @@ -103415,19 +104034,19 @@ "repo": "muffinmad/emacs-vc-hgcmd", "unstable": { "version": [ - 20200615, - 1823 + 20201211, + 1339 ], - "commit": "5c735b3e3897b7ba52b5ac4e6a2f43ca283fd52d", - "sha256": "050xk0rs7k79ymchqdkdmgpg3s22wpbdnzl3pz2wsghihkskz6q1" + "commit": "d23de9d10ff68b4c2302ab956f3ba3bb5d3858ee", + "sha256": "14c2brvw6vnf1h3lbpap4jh5d7mjnzxrbny4jk77832v09mj2ria" }, "stable": { "version": [ 1, - 12 + 13 ], - "commit": "5c735b3e3897b7ba52b5ac4e6a2f43ca283fd52d", - "sha256": "050xk0rs7k79ymchqdkdmgpg3s22wpbdnzl3pz2wsghihkskz6q1" + "commit": "d23de9d10ff68b4c2302ab956f3ba3bb5d3858ee", + "sha256": "14c2brvw6vnf1h3lbpap4jh5d7mjnzxrbny4jk77832v09mj2ria" } }, { @@ -103438,26 +104057,26 @@ "repo": "redguardtoo/vc-msg", "unstable": { "version": [ - 20191128, - 1010 + 20201210, + 157 ], "deps": [ "popup" ], - "commit": "93794111daa95b809e46e6d961ad5f68eb8f78ed", - "sha256": "11xci11lbw06syz3y6zhrbh7984mj523i5fphrmdqh76iivkphwh" + "commit": "6c94578b5c692ade27c8b34bf5d99333ee7b4680", + "sha256": "1p54m71ypvz7x5wyzv0lfrxfsx23ipmb4zkq6dm0ppgh9al9hd7k" }, "stable": { "version": [ 1, - 0, - 3 + 1, + 0 ], "deps": [ "popup" ], - "commit": "76951fccc2cf66916af2ae006dfa758583e2415d", - "sha256": "0zmpc2w02ynm6ck01q5l9kv5flbl5zkgxhxyplqddh37ml31pka0" + "commit": "6c94578b5c692ade27c8b34bf5d99333ee7b4680", + "sha256": "1p54m71ypvz7x5wyzv0lfrxfsx23ipmb4zkq6dm0ppgh9al9hd7k" } }, { @@ -103778,11 +104397,11 @@ "repo": "federicotdn/verb", "unstable": { "version": [ - 20201127, - 2022 + 20201231, + 1142 ], - "commit": "ea6be4ad2bf9fdd2907df51b1cf51dd5bd356c40", - "sha256": "0k8s43pqwicws9qaaa5nz7qkzg0dymbzrsdcb7gg3x6jzg1wy119" + "commit": "9bdad040c342dfd513f0c65bde5d938f41da24e6", + "sha256": "0pxzl927pmz851fs3zlhggrk9dryh929sqn4kyql6arpf53jsyir" }, "stable": { "version": [ @@ -104216,10 +104835,10 @@ }, { "ename": "visible-mark", - "commit": "76ac7178ee5381e08ae881f3fc6061106eeb1c1d", - "sha256": "1rp0gnz28m1drwb1hhsf0mwxzdppdi88hscf788qw8cw65gckv80", - "fetcher": "gitlab", - "repo": "iankelling/visible-mark", + "commit": "9c101affbe6d0e794e3ec6889745e4d05cb7e4fc", + "sha256": "1rpj2hfh009zlp14xv0qqlw5qmx2y1d57irbwcmzvxfa6lgahiw5", + "fetcher": "git", + "url": "https://git.sr.ht/~iank/visible-mark", "unstable": { "version": [ 20150624, @@ -104260,19 +104879,19 @@ "repo": "joostkremers/visual-fill-column", "unstable": { "version": [ - 20201008, - 919 + 20201229, + 2303 ], - "commit": "598bc992f050575c48db6fb9ea50794a5ce5d065", - "sha256": "1dfsh48p2mcab9axff74vqb8d003f8v6j0hh26y2gdlada7fn75g" + "commit": "ad76c1692e822c0d032e926136011673e9b03aa4", + "sha256": "1j2fb7v8qvs9wkgrfqaddg7sy7w31r9ry25zd2xxhkvda1l80xx7" }, "stable": { "version": [ - 1, - 14 + 2, + 2 ], - "commit": "598bc992f050575c48db6fb9ea50794a5ce5d065", - "sha256": "1dfsh48p2mcab9axff74vqb8d003f8v6j0hh26y2gdlada7fn75g" + "commit": "68784162d758fbe6a91d04e9caa8f05683fb6ba9", + "sha256": "1wjb4zm9mx07v0qx2fxmclg4pg0ssgnf8lp89wc56kmc0s40jhii" } }, { @@ -104412,6 +105031,9 @@ 2, 0 ], + "deps": [ + "popup" + ], "commit": "224402532da28e45edd398fda61ecbddb97d22d3", "sha256": "0q1rwqjwqcnsr57s531pwlm464q8wx5vvdm5rj2xy9b3yi6phis1" } @@ -104547,11 +105169,11 @@ "repo": "jojojames/vscode-icon-emacs", "unstable": { "version": [ - 20191102, - 2010 + 20201214, + 2227 ], - "commit": "4304e9f0a47406048129dc62171f08b67325a2ed", - "sha256": "0dpmw1kg9ivrn92vis7bxs8nlb1ixk72fhd4s4f5c21k0j4s12rd" + "commit": "909151c8105861aa300f5601e333909d36d0ebf5", + "sha256": "1zxppynlapsc58hakmbc68x94qhvfrjc41y4ccl6vs0kvkcrs1kp" } }, { @@ -104764,11 +105386,11 @@ "repo": "emacs-w3m/emacs-w3m", "unstable": { "version": [ - 20201129, - 2228 + 20201224, + 4 ], - "commit": "267d4220715eabacca1ad1661d76be5ceed7072c", - "sha256": "0xyrvvrckn8agg86kkr6821bj07s5an8w226k964f148jn84n86q" + "commit": "085de54acae027e7f0d0b9bf34d3142993234fd3", + "sha256": "14klj49iwykqj1j1q03fvhpj44fg0h4rzh0mbn7xzm4iv0z3222c" } }, { @@ -104890,16 +105512,29 @@ "repo": "abrochard/walkman", "unstable": { "version": [ - 20201124, - 1725 + 20201229, + 1811 + ], + "deps": [ + "json-mode", + "org", + "transient" + ], + "commit": "00b4fd5cae7fe27085995dbb178828fb765c7edc", + "sha256": "1ya91159i58x4mccpnx429kq2k0xc04alikbly549qm8yw1y1hxg" + }, + "stable": { + "version": [ + 0, + 2 ], "deps": [ "json-mode", "org", "transient" ], - "commit": "ade5f2a7c4a4260b39cfc23d40112b4fcb7a572b", - "sha256": "1ldy46sylhlm6zjk55lachz3vyx2klz30nj2ycc1m27568n7b1jy" + "commit": "00b4fd5cae7fe27085995dbb178828fb765c7edc", + "sha256": "1ya91159i58x4mccpnx429kq2k0xc04alikbly549qm8yw1y1hxg" } }, { @@ -105221,11 +105856,11 @@ "repo": "fxbois/web-mode", "unstable": { "version": [ - 20201107, - 1152 + 20201227, + 1048 ], - "commit": "890e837f7ea49f54c02b107377036431cbe7adb6", - "sha256": "1mzxnzha4z1y4n1wr2kawidnlh30s4kvdbcavzicvvygvafdvc36" + "commit": "a3ce21f795e03c7a5489a24b2b3c4fce2d7a2f59", + "sha256": "1234cr8hd25z181vg64r10l4gmdc1nr7dij2qnp4xs9ag3zkdf1y" }, "stable": { "version": [ @@ -105314,11 +105949,11 @@ "repo": "eschulte/emacs-web-server", "unstable": { "version": [ - 20201030, - 1619 + 20201217, + 1252 ], - "commit": "7b517abf236e7fe718696a4cb7566d718ea68a3f", - "sha256": "0qbi6qwxvm1z5fws432jb7ir1x4abyy680i3ccpv7xpi81qwhw7i" + "commit": "4d865cc4720f668aed7a8c3bcfddfbf534ecfb67", + "sha256": "14kx3anbffs53hdcq7347b3rd33lk6ajvwrz5mhnnj1kmdxy7dxh" } }, { @@ -105521,11 +106156,11 @@ "repo": "jstaursky/weyland-yutani-theme", "unstable": { "version": [ - 20201208, - 1748 + 20201209, + 1505 ], - "commit": "5a68065a2b2d66aad75a832d19fc65b3d30ac0a0", - "sha256": "1s1j1lw1i98r1j7zsrhxpjjlvr7kqs3b03m4pj5mnd8g31ddvgb8" + "commit": "86c72ef8e3d25bee94c35254ad03b5d3e4836994", + "sha256": "148p1c6cwxcri2732ngbbmd27g1m61gsxbgs0f1qbpqhsy0pplz2" } }, { @@ -105695,11 +106330,11 @@ "repo": "justbur/emacs-which-key", "unstable": { "version": [ - 20200908, - 2301 + 20201216, + 1720 ], - "commit": "ca268fd313d3fb2bd03a8b5e4bdcca675ce58ca7", - "sha256": "0rvlhj05v5b67axv2l6mdz9112p5h8w465zii3xs2fpjhrpx6sxx" + "commit": "428aedfce0157920814fbb2ae5d00b4aea89df88", + "sha256": "116c3krgi7iyv708jwzqjz72wf1j1aczgv5cvkdscrn7zgpyvm8c" }, "stable": { "version": [ @@ -105880,14 +106515,14 @@ "repo": "purcell/whole-line-or-region", "unstable": { "version": [ - 20200924, - 129 + 20201214, + 650 ], "deps": [ "cl-lib" ], - "commit": "f0051d301f83d6dd26ce30a8ea039a8510c79cc0", - "sha256": "0y02938a02mb6imlljsz2i9d2ki37hiqyhlyq341la2dr6iwn8sl" + "commit": "4a1d44ec7b1421913cb39a6e83854329be910e68", + "sha256": "0az61n9c4mf2l68y67lmp34d678n13s06kpx62r4v5kaar2vhz8i" }, "stable": { "version": [ @@ -106731,8 +107366,8 @@ "repo": "abo-abo/worf", "unstable": { "version": [ - 20201114, - 1141 + 20201226, + 1859 ], "deps": [ "ace-link", @@ -106740,8 +107375,8 @@ "swiper", "zoutline" ], - "commit": "a341c87ab6e696968436b38c1c34488d50764f48", - "sha256": "14dlmpxxhhg3y55ysdgn4q65x3q94jk7xlmjhhz3abqc5xjbq127" + "commit": "7ddd86aa3c62955714c2d60decd7a78c06b4771a", + "sha256": "02ci6hnjv80n3gjl04lxkcjvc2bzvn34w0z721qira1g7m2ysa8a" }, "stable": { "version": [ @@ -106781,14 +107416,11 @@ "repo": "pashinin/workgroups2", "unstable": { "version": [ - 20200729, - 852 - ], - "deps": [ - "dash" + 20201217, + 1159 ], - "commit": "737306531f6834227eee2f63b197a23401003d23", - "sha256": "0f16a4zz5havxbadiv4h6msa30c1yfdkfk56gic5wapz4i26z3x7" + "commit": "c9403c68a7e6491134110d7cacc130c34eae85a0", + "sha256": "0zkg6b45nc8ap8c8r95r25wyxymnslp3k1x2mmnmj0ivyi0bxjib" }, "stable": { "version": [ @@ -106918,25 +107550,25 @@ "repo": "joostkremers/writeroom-mode", "unstable": { "version": [ - 20201107, - 2227 + 20201229, + 2242 ], "deps": [ "visual-fill-column" ], - "commit": "92c47dfa659c418700d064a479e30590bcfc1904", - "sha256": "0bn2ff9j8gy2nb5km2r8w45avcs98gab8fsvr9ph220p58jk805c" + "commit": "b648b340172ce4e44307375697e190bc723203e0", + "sha256": "03dq65wsfwf4xdl6rj5zpk72gwzwydfdapfz8gh797jn2mp1dqnk" }, "stable": { "version": [ 3, - 10 + 11 ], "deps": [ "visual-fill-column" ], - "commit": "6552c056b85fd26a3ac509100d9d5c5c3c19515a", - "sha256": "0la4q2dm123l4rdfh0ry03b99ihvh324y7iw12az909198bcx335" + "commit": "b508843b04e1adc4e2cc9a04ca3ad53d8b1bbbb4", + "sha256": "0y4jcja9kml1lq88r8b9myk39dgaggh7q7f3a43sj828hvzlccb7" } }, { @@ -107082,14 +107714,14 @@ "repo": "Lompik/x-path-walker", "unstable": { "version": [ - 20160922, - 1835 + 20201220, + 628 ], "deps": [ "helm-core" ], - "commit": "3b01dbd7a039c6c84fdf8c8ee53ba72090ee950a", - "sha256": "1gb3lnl3gvckbakc4fy22fcvif3xdfkdaw334xmp33phjb8gjqvj" + "commit": "e553968b6ddebe39ea00904a2e9ff4cff6096985", + "sha256": "0iq8pglzzx83k4wcld250vy0x3n9vz8689bwpbqkapg5p3m8c6v1" } }, { @@ -107148,11 +107780,11 @@ "repo": "xahlee/xah-css-mode", "unstable": { "version": [ - 20201207, - 2036 + 20201229, + 837 ], - "commit": "3971ebee16fe57107261f6eda6438a234637dc36", - "sha256": "1cmlv344wpcvriybcc52hg8xg6pdl041xpgsw6shrgys9hq5jdzd" + "commit": "5d9db23bbb982c28cbcf351957ef96ecd80e4c0b", + "sha256": "0f1dwl1nljxw94g6jkqv7rsyxnr9na0xxj447jhmsjyd3iry3g7n" } }, { @@ -107178,11 +107810,11 @@ "repo": "xahlee/xah-find", "unstable": { "version": [ - 20190314, - 2039 + 20201219, + 552 ], - "commit": "a39f1ff9a7cf56e92b56c6f179741569b9172a48", - "sha256": "16d2dh08dxdm06ik3sfx00filxqpy646vv1qh5kb36zs8ydzjg3z" + "commit": "c66b54d4c683289a41db823df5da73174184c12b", + "sha256": "071y34n995a391v59n0mdz0y210gkx8p4r4p36yzazkrvhmqkjk3" } }, { @@ -107193,11 +107825,11 @@ "repo": "xahlee/xah-fly-keys", "unstable": { "version": [ - 20201208, - 2351 + 20201228, + 107 ], - "commit": "e6162ebb8ca24e1ae025e3cc125dfdc99e6ec622", - "sha256": "0zih4ynhq3jn0as9v22cbi5f097qxqkgj1y43ydlk4szixx952kf" + "commit": "4e273efcc6f94535e58461c2e9cb0d14fd6d7f6d", + "sha256": "0lwyd9kif0lgm1gawv19jmhraabnrqsqpmvh7pd3g1cmyn2chnkh" } }, { @@ -107268,11 +107900,11 @@ "repo": "xahlee/xah-replace-pairs", "unstable": { "version": [ - 20180508, - 249 + 20201219, + 741 ], - "commit": "4d845cfbce32d45befd7c454e3476c3ce40d2b43", - "sha256": "1mkglrc8mbsjag3pc9zrmqa9x3n009hza1p1jvn3n97wjpc1qxlk" + "commit": "fa239bf4eaf30858bb40fc8d3c1fa1372faacc42", + "sha256": "1rjclwr4wq7k1bqf9di0smjqyh6aqhzvy7xzj2w28iy6al1b80zw" } }, { @@ -107389,8 +108021,8 @@ "repo": "dandavison/xenops", "unstable": { "version": [ - 20201111, - 1643 + 20201223, + 923 ], "deps": [ "aio", @@ -107401,8 +108033,8 @@ "f", "s" ], - "commit": "fd9a8ba23727170db9baef98950d51f4bfd99d34", - "sha256": "1g2bxwvhhn919wzgl4nlkisyl0886fs8bbdl0dn2ry7i3a732jbc" + "commit": "902b909cf637dc84178abe897b12ac175f8638fc", + "sha256": "0zl4f64v9avpwfn15lbziangd69f83v7n9hvbsh4d4ipdb3yx9x6" } }, { @@ -107435,6 +108067,25 @@ } }, { + "ename": "xmind-org", + "commit": "9bff1f465c7c1b97bb4debb9acb53b6192831631", + "sha256": "0ilb2l0zp60cv6igvrbyhjcvihm9gvy9q8zs7frxqgsadshx45jn", + "fetcher": "github", + "repo": "akirak/xmind-org-el", + "unstable": { + "version": [ + 20201202, + 1605 + ], + "deps": [ + "dash", + "org-ml" + ], + "commit": "ee09e382b3fefb67ccf3cd4db96a8dd2acc34045", + "sha256": "1icjdgyv5i640p8q8y06h7nhzi7is4szj19j3vbhh6yxbwzdhbn9" + } + }, + { "ename": "xml+", "commit": "244388d158efda6fe8c1362a65b89b352c444422", "sha256": "0xgqyfdn6kkp89zj4h54r009a44sbff0nrhh582zw5rlklypwdz1", @@ -107626,8 +108277,8 @@ 20200907, 811 ], - "commit": "bfbe9a70fb9fc7fdd24dcfa7085b16fb01f14501", - "sha256": "1bmsrj24apag8lwqzgs3gyfmxwmraq4psfcr8szib1f71yzq9sli" + "commit": "885184298ce1b6eb5d18922ea331623973082a15", + "sha256": "04pq8xffpj16kifkxr4w64kh77a1cghvy2725w5qbj75v95w6078" }, "stable": { "version": [ @@ -108071,11 +108722,11 @@ "repo": "Kungsgeten/yankpad", "unstable": { "version": [ - 20201118, - 844 + 20201228, + 1208 ], - "commit": "7aea1769d206c0051a014622ee64be4f4f1f0494", - "sha256": "08na5qixdhkdkbhssk12mspqalnbss8f77a2qgia3cwb0gm5ijvz" + "commit": "06d85f04133fbd49a6469174032f4c10a0abe98d", + "sha256": "16a4qfliym93rj7bsjijzwlv8r8h9kbxrd53wdk9fb6vgdk2vv9h" }, "stable": { "version": [ @@ -108266,14 +108917,14 @@ "repo": "AndreaCrotti/yasnippet-snippets", "unstable": { "version": [ - 20201118, - 2148 + 20201221, + 849 ], "deps": [ "yasnippet" ], - "commit": "9fc9c2144aa3db4d85fdd35f7df28e58aa1801b3", - "sha256": "1a0wf16ai4rlm3z3b7kk5000izq1xkjwc7cvjmxgmy02sa8bif69" + "commit": "1f90ffb80e1da458a8cccf09add2f5fd952f1642", + "sha256": "0yg435j6wv4jalfpndqhy8xb0cviak9kpv38yby9zjzcjc9dcsg7" }, "stable": { "version": [ @@ -108951,15 +109602,15 @@ "repo": "EFLS/zetteldeft", "unstable": { "version": [ - 20201207, - 852 + 20201230, + 2127 ], "deps": [ "ace-window", "deft" ], - "commit": "cd5e0a9ef748ed9d0484f8bc1e123c50017882b6", - "sha256": "0ifcs6x3wx5jah223wchs03r8fmcjsza50shm2dbk8zzzfk6zv1k" + "commit": "ca3793959669b577296e1787aa029effa29a15c5", + "sha256": "1rxp0nwnjpwz3j44yj7afjj04hx4y3157a7vrgy0dlivhjzmdgag" }, "stable": { "version": [ @@ -109256,11 +109907,11 @@ "repo": "cyrus-and/zoom", "unstable": { "version": [ - 20200708, - 1105 + 20201215, + 1913 ], - "commit": "a373e7eed59ad93315e5ae88c816ca70404d2d34", - "sha256": "0dmpin0rlwib659s3g7qp48qmma50amj7zdk281b4j0bl6p3zkyc" + "commit": "c7beef180bc4037404e2d56b9ab9b7c76d1713a0", + "sha256": "0vzrg5vfb4rnripdxlnl2gs6mm85ysiwnn8rclsaljrmk5xrp5ls" }, "stable": { "version": [ diff --git a/pkgs/applications/editors/emacs/generic.nix b/pkgs/applications/editors/emacs/generic.nix index a84cb41bf30f5..101dbdaa2e943 100644 --- a/pkgs/applications/editors/emacs/generic.nix +++ b/pkgs/applications/editors/emacs/generic.nix @@ -42,7 +42,12 @@ assert withXwidgets -> withGTK3 && webkitgtk != null; let -in stdenv.mkDerivation { +in stdenv.mkDerivation (lib.optionalAttrs nativeComp { + NATIVE_FULL_AOT = "1"; + LIBRARY_PATH = "${lib.getLib stdenv.cc.libc}/lib"; +} // lib.optionalAttrs stdenv.isDarwin { + CFLAGS = "-DMAC_OS_X_VERSION_MAX_ALLOWED=101200"; +} // { inherit pname version patches; src = fetchurl { @@ -88,10 +93,6 @@ in stdenv.mkDerivation { "" ]; - CFLAGS = "-DMAC_OS_X_VERSION_MAX_ALLOWED=101200"; - - LIBRARY_PATH = if nativeComp then "${lib.getLib stdenv.cc.libc}/lib" else ""; - nativeBuildInputs = [ pkgconfig makeWrapper ] ++ lib.optionals srcRepo [ autoreconfHook texinfo ] ++ lib.optional (withX && (withGTK3 || withXwidgets)) wrapGAppsHook; @@ -155,6 +156,11 @@ in stdenv.mkDerivation { mv nextstep/Emacs.app $out/Applications '' + lib.optionalString (nativeComp && withNS) '' ln -snf $out/lib/emacs/*/native-lisp $out/Applications/Emacs.app/Contents/native-lisp + '' + lib.optionalString nativeComp '' + mkdir -p $out/share/emacs/native-lisp + $out/bin/emacs --batch \ + --eval "(add-to-list 'comp-eln-load-path \"$out/share/emacs/native-lisp\")" \ + -f batch-native-compile $out/share/emacs/site-lisp/site-start.el ''; postFixup = lib.concatStringsSep "\n" [ @@ -195,4 +201,4 @@ in stdenv.mkDerivation { separately. ''; }; -} +}) diff --git a/pkgs/applications/editors/emacs/site-start.el b/pkgs/applications/editors/emacs/site-start.el index 86cad1132f641..01a6422d731fa 100644 --- a/pkgs/applications/editors/emacs/site-start.el +++ b/pkgs/applications/editors/emacs/site-start.el @@ -34,6 +34,25 @@ least specific (the system profile)" (setenv "EMACSLOADPATH" (when new-env-list (mapconcat 'identity new-env-list ":")))))) +(let ((wrapper-site-lisp (getenv "emacsWithPackages_siteLispNative")) + (env-load-path (getenv "EMACSNATIVELOADPATH"))) + (when wrapper-site-lisp + (setenv "emacsWithPackages_siteLispNative" nil)) + (when (and wrapper-site-lisp env-load-path) + (let* ((env-list (split-string env-load-path ":")) + (new-env-list (delete wrapper-site-lisp env-list))) + (setenv "EMACSNATIVELOADPATH" (when new-env-list + (mapconcat 'identity new-env-list ":")))))) + +;;; Set up native-comp load path. +(when (featurep 'comp) + ;; Append native-comp subdirectories from `NIX_PROFILES'. + (setq comp-eln-load-path + (append (mapcar (lambda (profile-dir) + (concat profile-dir "/share/emacs/native-lisp/")) + (nix--profile-paths)) + comp-eln-load-path))) + ;;; Make `woman' find the man pages (defvar woman-manpath) (eval-after-load 'woman diff --git a/pkgs/applications/editors/ghostwriter/default.nix b/pkgs/applications/editors/ghostwriter/default.nix index 8c1b95a1d26e0..aa67124c1146f 100644 --- a/pkgs/applications/editors/ghostwriter/default.nix +++ b/pkgs/applications/editors/ghostwriter/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "ghostwriter"; - version = "1.8.1"; + version = "2.0.0-rc3"; src = fetchFromGitHub { owner = "wereturtle"; repo = pname; - rev = "v${version}"; - sha256 = "0jc6szfh5sdnafhwsr1xv7cn1fznniq58bix41hb9wlbkvq7wzi6"; + rev = version; + sha256 = "sha256-Ag97iE++f3nG2zlwqn0qxSL9RpF8O3XWH9NtQ5kFuWg="; }; nativeBuildInputs = [ qmake pkgconfig qttools ]; @@ -20,6 +20,7 @@ mkDerivation rec { homepage = src.meta.homepage; license = licenses.gpl3Plus; platforms = platforms.unix; - maintainers = with maintainers; [ dotlambda ]; + maintainers = with maintainers; [ dotlambda erictapen ]; + broken = stdenv.isDarwin; }; } diff --git a/pkgs/applications/editors/glow/default.nix b/pkgs/applications/editors/glow/default.nix index d941c85e2c6f7..06013b50d63bd 100644 --- a/pkgs/applications/editors/glow/default.nix +++ b/pkgs/applications/editors/glow/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "glow"; - version = "1.2.1"; + version = "1.3.0"; src = fetchFromGitHub { owner = "charmbracelet"; repo = "glow"; rev = "v${version}"; - sha256 = "1jf9d8zwhvg9pc5g29lwz2r0lc59h1smwb5mjswxlvljpgbj7jwh"; + sha256 = "1y5cdqmyc2z2qk74l0r2c4mnw0jfibrf2ry7qcnmh96nhalq9m7j"; }; - vendorSha256 = "1p50qr7hbc8vyifa23z7xr43b4fpmwdzg7hqs503c124kpbpk45z"; + vendorSha256 = "11x6hshbqg1a39a1hwpfivgrhyk7ykw2aqylira3dqv039b1f639"; doCheck = false; @@ -20,6 +20,7 @@ buildGoModule rec { meta = with lib; { description = "Render markdown on the CLI, with pizzazz!"; homepage = "https://github.com/charmbracelet/glow"; + changelog = "https://github.com/charmbracelet/glow/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ Br1ght0ne penguwin ]; }; diff --git a/pkgs/applications/editors/jetbrains/common.nix b/pkgs/applications/editors/jetbrains/common.nix index 07776bebe4258..43dbd137f784e 100644 --- a/pkgs/applications/editors/jetbrains/common.nix +++ b/pkgs/applications/editors/jetbrains/common.nix @@ -1,5 +1,6 @@ -{ stdenv, lib, makeDesktopItem, makeWrapper, patchelf +{ stdenv, lib, makeDesktopItem, makeWrapper, patchelf, writeText , coreutils, gnugrep, which, git, unzip, libsecret, libnotify +, vmopts ? null }: { name, product, version, src, wmClass, jdk, meta }: @@ -9,6 +10,11 @@ with stdenv.lib; let loName = toLower product; hiName = toUpper product; execName = concatStringsSep "-" (init (splitString "-" name)); + vmoptsName = loName + + ( if (with stdenv.hostPlatform; (is32bit || isDarwin)) + then "" + else "64" ) + + ".vmoptions"; in with stdenv; lib.makeOverridable mkDerivation rec { @@ -26,6 +32,8 @@ with stdenv; lib.makeOverridable mkDerivation rec { ''; }; + vmoptsFile = optionalString (vmopts != null) (writeText vmoptsName vmopts); + nativeBuildInputs = [ makeWrapper patchelf unzip ]; patchPhase = lib.optionalString (!stdenv.isDarwin) '' @@ -72,7 +80,8 @@ with stdenv; lib.makeOverridable mkDerivation rec { --set JDK_HOME "$jdk" \ --set ${hiName}_JDK "$jdk" \ --set ANDROID_JAVA_HOME "$jdk" \ - --set JAVA_HOME "$jdk" + --set JAVA_HOME "$jdk" \ + --set ${hiName}_VM_OPTIONS ${vmoptsFile} ln -s "$item/share/applications" $out/share ''; diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix index 78e6ad30b7111..9d743b197e63e 100644 --- a/pkgs/applications/editors/jetbrains/default.nix +++ b/pkgs/applications/editors/jetbrains/default.nix @@ -2,12 +2,13 @@ , python , jdk, cmake, libxml2, zlib, python3, ncurses5 , dotnet-sdk_3 +, vmopts ? null }: with stdenv.lib; let - mkJetBrainsProduct = callPackage ./common.nix { }; + mkJetBrainsProduct = callPackage ./common.nix { inherit vmopts; }; # Sorted alphabetically buildClion = { name, version, src, license, description, wmClass, ... }: @@ -48,7 +49,7 @@ let patchelf \ --set-rpath "${lib.makeLibraryPath [ stdenv.cc.cc.lib ]}:$lldbLibPath" \ - bin/lldb/linux/lib/python3.*/lib-dynload/zlib.cpython-*m-x86_64-linux-gnu.so + bin/lldb/linux/lib/python3.*/lib-dynload/zlib.cpython-*-x86_64-linux-gnu.so patchelf \ --set-rpath "${lib.makeLibraryPath [ libxml2 zlib stdenv.cc.cc.lib python3 ]}:$lldbLibPath" \ @@ -268,12 +269,12 @@ in clion = buildClion rec { name = "clion-${version}"; - version = "2020.2.5"; /* updated by script */ + version = "2020.3.1"; /* updated by script */ description = "C/C++ IDE. New. Intelligent. Cross-platform"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/cpp/CLion-${version}.tar.gz"; - sha256 = "0j7gxh8wqshn2i1f22bl9099sx8a4092qwkp4fwny4649rbkfyrz"; /* updated by script */ + sha256 = "1jfvwir79s0kcqmlx6bbkmc42bplgl7814mnqfcsdzni1qv62pws"; /* updated by script */ }; wmClass = "jetbrains-clion"; update-channel = "CLion RELEASE"; # channel's id as in http://www.jetbrains.com/updates/updates.xml @@ -281,12 +282,12 @@ in datagrip = buildDataGrip rec { name = "datagrip-${version}"; - version = "2020.3"; /* updated by script */ + version = "2020.3.1"; /* updated by script */ description = "Your Swiss Army Knife for Databases and SQL"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/datagrip/${name}.tar.gz"; - sha256 = "1j0mlsiqh80mspi2x9mi0h5hxhg5gw6395hyl9w33q8dxm95mx2d"; /* updated by script */ + sha256 = "0jk7ywxk983ld5x71a59dh1hvlnli3sbvg7fbicahas5ml8clxfv"; /* updated by script */ }; wmClass = "jetbrains-datagrip"; update-channel = "DataGrip RELEASE"; @@ -294,12 +295,12 @@ in goland = buildGoland rec { name = "goland-${version}"; - version = "2020.2.3"; /* updated by script */ + version = "2020.3.1"; /* updated by script */ description = "Up and Coming Go IDE"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/go/${name}.tar.gz"; - sha256 = "18mzlqibgc6lzwhbmyrni56464qhzla9mss27d45hv0mbv087jn0"; /* updated by script */ + sha256 = "12gi1a2bmafmy7qgqwv3a7b5b46dlhw4ahmkm5pkq6pmxl4y6dmk"; /* updated by script */ }; wmClass = "jetbrains-goland"; update-channel = "GoLand RELEASE"; @@ -307,12 +308,12 @@ in idea-community = buildIdea rec { name = "idea-community-${version}"; - version = "2020.3"; /* updated by script */ + version = "2020.3.1"; /* updated by script */ description = "Integrated Development Environment (IDE) by Jetbrains, community edition"; license = stdenv.lib.licenses.asl20; src = fetchurl { url = "https://download.jetbrains.com/idea/ideaIC-${version}.tar.gz"; - sha256 = "0x1nsjw1m03iq7sd9i2qqlyribrzgi8yh6k5hnb630kvrxr8pxy6"; /* updated by script */ + sha256 = "0am4h8w1dmjl08iphqy78ivb91vkrvskg95dgm24zcj0n8rwmaq6"; /* updated by script */ }; wmClass = "jetbrains-idea-ce"; update-channel = "IntelliJ IDEA RELEASE"; @@ -320,12 +321,12 @@ in idea-ultimate = buildIdea rec { name = "idea-ultimate-${version}"; - version = "2020.3"; /* updated by script */ + version = "2020.3.1"; /* updated by script */ description = "Integrated Development Environment (IDE) by Jetbrains, requires paid license"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/idea/ideaIU-${version}-no-jbr.tar.gz"; - sha256 = "1l6bvfgzp27113rjy1y3jvp09cqx8gpnbgpwp83vsph7x0dhx8a3"; /* updated by script */ + sha256 = "1kwz0aq4b664awppakj4syppk218nynwxv4ngc7pa3k9v4g2sdah"; /* updated by script */ }; wmClass = "jetbrains-idea"; update-channel = "IntelliJ IDEA RELEASE"; @@ -346,12 +347,12 @@ in phpstorm = buildPhpStorm rec { name = "phpstorm-${version}"; - version = "2020.2.4"; /* updated by script */ + version = "2020.3.1"; /* updated by script */ description = "Professional IDE for Web and PHP developers"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/webide/PhpStorm-${version}.tar.gz"; - sha256 = "111dr1a6695msh13cd484yk671jnh2ps6q1k2dl0kmryk9dqnvhd"; /* updated by script */ + sha256 = "1c5j3mbg8scsl4c90cjahdk5gs5q72y5a8fhkqa9zmy6di42k99x"; /* updated by script */ }; wmClass = "jetbrains-phpstorm"; update-channel = "PhpStorm RELEASE"; @@ -359,12 +360,12 @@ in pycharm-community = buildPycharm rec { name = "pycharm-community-${version}"; - version = "2020.2.5"; /* updated by script */ + version = "2020.3.2"; /* updated by script */ description = "PyCharm Community Edition"; license = stdenv.lib.licenses.asl20; src = fetchurl { url = "https://download.jetbrains.com/python/${name}.tar.gz"; - sha256 = "0jkc26y3v94jj8q7dxq1py59is2whh45b890iac5adg6x670z3s6"; /* updated by script */ + sha256 = "1z3w6aah635fdrhrzp5af6sgj269jk7mv8vgdd83gxillkx9vq9k"; /* updated by script */ }; wmClass = "jetbrains-pycharm-ce"; update-channel = "PyCharm RELEASE"; @@ -372,12 +373,12 @@ in pycharm-professional = buildPycharm rec { name = "pycharm-professional-${version}"; - version = "2020.2.5"; /* updated by script */ + version = "2020.3.2"; /* updated by script */ description = "PyCharm Professional Edition"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/python/${name}.tar.gz"; - sha256 = "04imfgr45gvicjjgqzdcdmbnbiszjma3s40k2pgqs5nn6wbrw3dd"; /* updated by script */ + sha256 = "1fbb8v40q7vgn5v5dyxb211abr8swnxa3gw18kh3vlk6yc2crzfw"; /* updated by script */ }; wmClass = "jetbrains-pycharm"; update-channel = "PyCharm RELEASE"; @@ -385,12 +386,12 @@ in rider = buildRider rec { name = "rider-${version}"; - version = "2020.2.4"; /* updated by script */ + version = "2020.3.2"; /* updated by script */ description = "A cross-platform .NET IDE based on the IntelliJ platform and ReSharper"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/rider/JetBrains.Rider-${version}.tar.gz"; - sha256 = "1anl48ifv5ayqn876dqckxc1b5fw1271pvamzf1vvk501wv6dpaf"; /* updated by script */ + sha256 = "1dkgbd2nqkjcswf7j3pnrsaq9n5wk42abz2c4wgkrh1zrpgihd0j"; /* updated by script */ }; wmClass = "jetbrains-rider"; update-channel = "Rider RELEASE"; @@ -398,12 +399,12 @@ in ruby-mine = buildRubyMine rec { name = "ruby-mine-${version}"; - version = "2020.3"; /* updated by script */ + version = "2020.3.1"; /* updated by script */ description = "The Most Intelligent Ruby and Rails IDE"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/ruby/RubyMine-${version}.tar.gz"; - sha256 = "0ij6j9bxfqzj8gnrhhdgai22s1n5swd4waxd5zjvmv7q9j9cb2l5"; /* updated by script */ + sha256 = "0drxzz6k0cmhir4szg8nwmsi9qh380vrryghmpvx9w83yrcain4c"; /* updated by script */ }; wmClass = "jetbrains-rubymine"; update-channel = "RubyMine RELEASE"; @@ -411,12 +412,12 @@ in webstorm = buildWebStorm rec { name = "webstorm-${version}"; - version = "2020.3"; /* updated by script */ + version = "2020.3.1"; /* updated by script */ description = "Professional IDE for Web and JavaScript development"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/webstorm/WebStorm-${version}.tar.gz"; - sha256 = "0sk7slwfr9jasid09hxw81sik5srn35vif3pbzpybig3yszbv6ld"; /* updated by script */ + sha256 = "1bfq3xwnfz6f04d0lq584q7pg775a8y35b1b62w81dbfh43l4fj0"; /* updated by script */ }; wmClass = "jetbrains-webstorm"; update-channel = "WebStorm RELEASE"; diff --git a/pkgs/applications/editors/joe/default.nix b/pkgs/applications/editors/joe/default.nix index bb227512387d2..9470c7940d67b 100644 --- a/pkgs/applications/editors/joe/default.nix +++ b/pkgs/applications/editors/joe/default.nix @@ -1,8 +1,8 @@ { stdenv, fetchurl } : stdenv.mkDerivation rec { - version = "4.6"; pname = "joe"; + version = "4.6"; src = fetchurl { url = "mirror://sourceforge/joe-editor/${pname}-${version}.tar.gz"; @@ -11,8 +11,36 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A full featured terminal-based screen editor"; + longDescription = '' + JOE (Joe's Own Editor) is a full featured terminal-based screen editor + which is distributed under the GNU General Public License (GPL). JOE has + been around since 1988 and comes standard with many Linux distributions. + + JOE is being maintained by its original author Joseph Allen, plus all of + the people who send bug reports, feature suggestions and patches to the + project web site. JOE is hosted by SourceForge.net and its source code is + controlled under Mercurial. + + JOE is a blending of MicroPro's venerable microcomputer word processor + WordStar and Richard Stallman's famous LISP based text editor GNU-EMACS + (but it does not use code from either program): most of the basic editing + keys are the same as in WordStar as is the overall feel of the editor. JOE + also has some of the key bindings and many of the powerful features of + EMACS. + + JOE is written in C and its only dependency is libc. This makes JOE very + easy to build (just "configure" and "make install"), making it feasible to + include on small systems and recovery disks. The compiled binary is about + 300K in x86. Note that JOE can use either the termcap or terminfo terminal + capabilities databases (or a built-in termcap entry for ANSI + terminals). The choice is controlled by a "configure" option. If terminfo + is used, a library is required to access the database (on some systems + this library is ncurses, but JOE does not use curses to control the + terminal - it has its own code for this). + ''; homepage = "https://joe-editor.sourceforge.io"; - license = licenses.gpl2; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ AndersonTorres ]; platforms = platforms.unix; }; } diff --git a/pkgs/applications/editors/kakoune/default.nix b/pkgs/applications/editors/kakoune/default.nix index f1f8110665973..67a2ac5fac77c 100644 --- a/pkgs/applications/editors/kakoune/default.nix +++ b/pkgs/applications/editors/kakoune/default.nix @@ -25,9 +25,9 @@ stdenv.mkDerivation rec { export version="v${version}" ''; - doInstallCheckPhase = true; + doInstallCheck = true; installCheckPhase = '' - $out/bin/kak -ui json -E "kill 0" + $out/bin/kak -ui json -e "kill 0" ''; postInstall = '' diff --git a/pkgs/applications/editors/kdevelop5/kdev-php.nix b/pkgs/applications/editors/kdevelop5/kdev-php.nix index 524835402f4ef..23c8f0698cf07 100644 --- a/pkgs/applications/editors/kdevelop5/kdev-php.nix +++ b/pkgs/applications/editors/kdevelop5/kdev-php.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "kdev-php"; - version = "5.6.0"; + version = "5.6.1"; src = fetchurl { url = "https://github.com/KDE/${pname}/archive/v${version}.tar.gz"; - sha256 = "1j5m9mhjzp2r4wdwnnnckms8ic536s6y0iyry2zdndbsy215hqlz"; + sha256 = "0xjijkmp3drnfrx4gb4bwf8n1dgwk310c0mssm6drffwix7ljpbz"; }; nativeBuildInputs = [ cmake extra-cmake-modules ]; diff --git a/pkgs/applications/editors/kdevelop5/kdev-python.nix b/pkgs/applications/editors/kdevelop5/kdev-python.nix index 9af12b386a0ba..041c25f1728c0 100644 --- a/pkgs/applications/editors/kdevelop5/kdev-python.nix +++ b/pkgs/applications/editors/kdevelop5/kdev-python.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "kdev-python"; - version = "5.6.0"; + version = "5.6.1"; src = fetchurl { url = "https://github.com/KDE/${pname}/archive/v${version}.tar.gz"; - sha256 = "1bm6jk7gkl4vi579x99mja4znrzzp15zk66ss600dn8aq11jrxv2"; + sha256 = "1jma7j70imzxlyz8580m79jycif7zphga3zzfmqimn8syzz917hv"; }; cmakeFlags = [ diff --git a/pkgs/applications/editors/mindforger/build.patch b/pkgs/applications/editors/mindforger/build.patch index e2745cbce2d0b..e9b9244f8dbda 100644 --- a/pkgs/applications/editors/mindforger/build.patch +++ b/pkgs/applications/editors/mindforger/build.patch @@ -1,17 +1,8 @@ diff --git a/app/app.pro b/app/app.pro -index 4d47065..a39a320 100644 +index 29f9d9e..15fd2ff 100644 --- a/app/app.pro +++ b/app/app.pro -@@ -18,6 +18,8 @@ - TARGET = mindforger - TEMPLATE = app - -+include(../config.pri) -+ - QT += widgets - - mfner { -@@ -297,7 +299,7 @@ RESOURCES += \ +@@ -370,7 +370,7 @@ RESOURCES += \ # See http://doc.qt.io/qt-5/qmake-advanced-usage.html binfile.files += mindforger @@ -20,51 +11,11 @@ index 4d47065..a39a320 100644 INSTALLS += binfile # ######################################## -diff --git a/config.pri b/config.pri -new file mode 100644 -index 0000000..ce05df1 ---- /dev/null -+++ b/config.pri -@@ -0,0 +1,3 @@ -+isEmpty(PREFIX) { -+ PREFIX = /usr -+} -diff --git a/deps/discount/discount.pro b/deps/discount/discount.pro -index a8dfe35..ec16468 100644 ---- a/deps/discount/discount.pro -+++ b/deps/discount/discount.pro -@@ -5,6 +5,8 @@ - # Webpage: http://www.pell.portland.or.us/~orc/Code/discount/ - # - -+include(../../config.pri) -+ - QT -= core gui - - TARGET = discount -@@ -46,7 +48,7 @@ unix:!symbian { - maemo5 { - target.path = /opt/usr/lib - } else { -- target.path = /usr/lib -+ target.path = $$PREFIX/lib - } - INSTALLS += target - } diff --git a/mindforger.pro b/mindforger.pro -index ae627f2..0953856 100644 +index bd4f21d..6bb2dbc 100644 --- a/mindforger.pro +++ b/mindforger.pro -@@ -32,6 +32,8 @@ TEMPLATE = subdirs - - SUBDIRS = deps lib app - -+include(config.pri) -+ - # build dependencies - lib.depends = deps - app.depends = lib -@@ -44,20 +46,20 @@ app.depends = lib +@@ -43,20 +43,20 @@ app.depends = lib #IMPORTANT: binfile MUST be specified in app/app.pro (project next to/that builds binary) docfiles.files += doc/* diff --git a/pkgs/applications/editors/mindforger/default.nix b/pkgs/applications/editors/mindforger/default.nix index 82aa38c14499c..f7e244342257c 100644 --- a/pkgs/applications/editors/mindforger/default.nix +++ b/pkgs/applications/editors/mindforger/default.nix @@ -1,35 +1,34 @@ -{ mkDerivation, stdenv, fetchurl, qmake, qtbase, qtwebkit }: +{ mkDerivation +, cmark-gfm +, fetchurl +, qmake +, qtbase +, qtwebkit +, stdenv +, wrapGAppsHook +}: mkDerivation rec { pname = "mindforger"; - version = "1.48.2"; + version = "1.52.0"; src = fetchurl { - url = "https://github.com/dvorka/mindforger/releases/download/1.48.0/mindforger_${version}.tgz"; - sha256 = "1wlrl8hpjcpnq098l3n2d1gbhbjylaj4z366zvssqvmafr72iyw4"; + url = "https://github.com/dvorka/mindforger/releases/download/${version}/mindforger_${version}.tgz"; + sha256 = "1pghsw8kwvjhg3jpmjs0n892h2l0pm0cs6ymi8b23fwk0kfj67rd"; }; - nativeBuildInputs = [ qmake ] ; - buildInputs = [ qtbase qtwebkit ] ; + nativeBuildInputs = [ qmake wrapGAppsHook ] ; + buildInputs = [ qtbase qtwebkit cmark-gfm ] ; doCheck = true; - enableParallelBuilding = true ; - patches = [ ./build.patch ] ; postPatch = '' - substituteInPlace deps/discount/version.c.in --subst-var-by TABSTOP 4 + substituteInPlace lib/src/install/installer.cpp --replace /usr "$out" substituteInPlace app/resources/gnome-shell/mindforger.desktop --replace /usr "$out" ''; - preConfigure = '' - export AC_PATH="$PATH" - pushd deps/discount - ./configure.sh - popd - ''; - qmakeFlags = [ "-r mindforger.pro" "CONFIG+=mfnoccache" ] ; meta = with stdenv.lib; { @@ -41,5 +40,6 @@ mkDerivation rec { homepage = "https://www.mindforger.com"; license = licenses.gpl2Plus; platforms = platforms.all; + maintainers = with maintainers; [ cyplo ]; }; } diff --git a/pkgs/applications/editors/moe/default.nix b/pkgs/applications/editors/moe/default.nix index 060abda33d0d1..d6dbe10065285 100644 --- a/pkgs/applications/editors/moe/default.nix +++ b/pkgs/applications/editors/moe/default.nix @@ -1,16 +1,16 @@ -{ stdenv, fetchurl -, lzip, ncurses +{ stdenv +, fetchurl +, ncurses +, lzip }: -with stdenv.lib; stdenv.mkDerivation rec { - pname = "moe"; - version = "1.10"; + version = "1.11"; src = fetchurl { url = "mirror://gnu/moe/${pname}-${version}.tar.lz"; - sha256 = "0fymywdiy9xqppcmvgs7mf7d3gfrky3jp5jkxs2l3v93asml9zcc"; + sha256 = "sha256-DvvLz1pKjZZlQcbLCZugq2QWeANm286C2f+ZWoWl4vk="; }; prePatch = '' @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ lzip ]; buildInputs = [ ncurses ]; - meta = { + meta = with stdenv.lib; { description = "A small, 8-bit clean editor"; longDescription = '' GNU moe is a powerful, 8-bit clean, console text editor for ISO-8859 and diff --git a/pkgs/applications/editors/texstudio/default.nix b/pkgs/applications/editors/texstudio/default.nix index 7f92c4d492cb5..101c9bc59f9cc 100644 --- a/pkgs/applications/editors/texstudio/default.nix +++ b/pkgs/applications/editors/texstudio/default.nix @@ -3,13 +3,13 @@ mkDerivation rec { pname = "texstudio"; - version = "3.0.1"; + version = "3.0.3"; src = fetchFromGitHub { owner = "${pname}-org"; repo = pname; rev = version; - sha256 = "18ad85y4hrsvp7gs50dfg08cz40vbakb9hs8gw4cvi7r17vds5ar"; + sha256 = "05q70wbdaldhrlapss4agmvz1cwqd229nd5amkj069v1wxrkvpb7"; }; nativeBuildInputs = [ qmake wrapQtAppsHook pkgconfig ]; @@ -24,9 +24,10 @@ mkDerivation rec { LaTeX editing with completion, structure viewer, preview, spell checking and support of any compilation chain. ''; - homepage = "http://texstudio.sourceforge.net"; + homepage = "https://texstudio.org"; + changelog = "https://github.com/texstudio-org/texstudio/blob/${version}/utilities/manual/CHANGELOG.txt"; license = licenses.gpl2Plus; - platforms = [ "x86_64-linux" ]; + platforms = platforms.linux; maintainers = with maintainers; [ ajs124 cfouche ]; }; } diff --git a/pkgs/applications/editors/thonny/default.nix b/pkgs/applications/editors/thonny/default.nix index 0f05bf23c071a..0808bf82390e5 100644 --- a/pkgs/applications/editors/thonny/default.nix +++ b/pkgs/applications/editors/thonny/default.nix @@ -4,13 +4,13 @@ with python3.pkgs; buildPythonApplication rec { pname = "thonny"; - version = "3.3.1"; + version = "3.3.2"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "0nk4kx6apmnd6fyd9zw77yprjzgjf7micvcws2i2sci0d9fff34c"; + sha256 = "1pzy7v48x4ip8v6aqm8hl5ywx7xiqbsfypxxifih8gnlangp1n8y"; }; propagatedBuildInputs = with python3.pkgs; [ diff --git a/pkgs/applications/editors/vscode/update-vscode.sh b/pkgs/applications/editors/vscode/update-vscode.sh index 4974eb7e43674..cb1400f048e09 100755 --- a/pkgs/applications/editors/vscode/update-vscode.sh +++ b/pkgs/applications/editors/vscode/update-vscode.sh @@ -27,3 +27,11 @@ sed -i "s/x86_64-linux = \".\{52\}\"/x86_64-linux = \"${VSCODE_LINUX_SHA256}\"/" VSCODE_DARWIN_URL="https://vscode-update.azurewebsites.net/${VSCODE_VER}/darwin/stable" VSCODE_DARWIN_SHA256=$(nix-prefetch-url ${VSCODE_DARWIN_URL}) sed -i "s/x86_64-darwin = \".\{52\}\"/x86_64-darwin = \"${VSCODE_DARWIN_SHA256}\"/" "$ROOT/vscode.nix" + +VSCODE_LINUX_AARCH64_URL="https://vscode-update.azurewebsites.net/${VSCODE_VER}/linux-arm64/stable" +VSCODE_LINUX_AARCH64_SHA256=$(nix-prefetch-url ${VSCODE_LINUX_AARCH64_URL}) +sed -i "s/aarch64-linux = \".\{52\}\"/aarch64-linux = \"${VSCODE_LINUX_AARCH64_SHA256}\"/" "$ROOT/vscode.nix" + +VSCODE_LINUX_ARMV7L_URL="https://vscode-update.azurewebsites.net/${VSCODE_VER}/linux-armhf/stable" +VSCODE_LINUX_ARMV7L_SHA256=$(nix-prefetch-url ${VSCODE_LINUX_ARMV7L_URL}) +sed -i "s/armv7l-linux = \".\{52\}\"/armv7l-linux = \"${VSCODE_LINUX_ARMV7L_SHA256}\"/" "$ROOT/vscode.nix" diff --git a/pkgs/applications/editors/vscode/update-vscodium.sh b/pkgs/applications/editors/vscode/update-vscodium.sh index 0ddab6063cad9..79c6b497ecc68 100755 --- a/pkgs/applications/editors/vscode/update-vscodium.sh +++ b/pkgs/applications/editors/vscode/update-vscodium.sh @@ -19,10 +19,18 @@ fi VSCODIUM_VER=$(curl -Ls -w %{url_effective} -o /dev/null https://github.com/VSCodium/vscodium/releases/latest | awk -F'/' '{print $NF}') sed -i "s/version = \".*\"/version = \"${VSCODIUM_VER}\"/" "$ROOT/vscodium.nix" -VSCODIUM_LINUX_URL="https://github.com/VSCodium/vscodium/releases/download/${VSCODIUM_VER}/VSCodium-linux-x64-${VSCODIUM_VER}.tar.gz" -VSCODIUM_LINUX_SHA256=$(nix-prefetch-url ${VSCODIUM_LINUX_URL}) -sed -i "s/x86_64-linux = \".\{52\}\"/x86_64-linux = \"${VSCODIUM_LINUX_SHA256}\"/" "$ROOT/vscodium.nix" +VSCODIUM_LINUX_X64_URL="https://github.com/VSCodium/vscodium/releases/download/${VSCODIUM_VER}/VSCodium-linux-x64-${VSCODIUM_VER}.tar.gz" +VSCODIUM_LINUX_X64_SHA256=$(nix-prefetch-url ${VSCODIUM_LINUX_X64_URL}) +sed -i "s/x86_64-linux = \".\{52\}\"/x86_64-linux = \"${VSCODIUM_LINUX_X64_SHA256}\"/" "$ROOT/vscodium.nix" -VSCODIUM_DARWIN_URL="https://github.com/VSCodium/vscodium/releases/download/${VSCODIUM_VER}/VSCodium-darwin-${VSCODIUM_VER}.zip" -VSCODIUM_DARWIN_SHA256=$(nix-prefetch-url ${VSCODIUM_DARWIN_URL}) -sed -i "s/x86_64-darwin = \".\{52\}\"/x86_64-darwin = \"${VSCODIUM_DARWIN_SHA256}\"/" "$ROOT/vscodium.nix" +VSCODIUM_DARWIN_X64_URL="https://github.com/VSCodium/vscodium/releases/download/${VSCODIUM_VER}/VSCodium-darwin-x64-${VSCODIUM_VER}.zip" +VSCODIUM_DARWIN_X64_SHA256=$(nix-prefetch-url ${VSCODIUM_DARWIN_X64_URL}) +sed -i "s/x86_64-darwin = \".\{52\}\"/x86_64-darwin = \"${VSCODIUM_DARWIN_X64_SHA256}\"/" "$ROOT/vscodium.nix" + +VSCODIUM_LINUX_AARCH64_URL="https://github.com/VSCodium/vscodium/releases/download/${VSCODIUM_VER}/VSCodium-linux-arm64-${VSCODIUM_VER}.tar.gz" +VSCODIUM_LINUX_AARCH64_SHA256=$(nix-prefetch-url ${VSCODIUM_LINUX_AARCH64_URL}) +sed -i "s/aarch64-linux = \".\{52\}\"/aarch64-linux = \"${VSCODIUM_LINUX_AARCH64_SHA256}\"/" "$ROOT/vscodium.nix" + +VSCODIUM_LINUX_ARMV7L_URL="https://github.com/VSCodium/vscodium/releases/download/${VSCODIUM_VER}/VSCodium-linux-armhf-${VSCODIUM_VER}.tar.gz" +VSCODIUM_LINUX_ARMV7L_SHA256=$(nix-prefetch-url ${VSCODIUM_LINUX_ARMV7L_URL}) +sed -i "s/armv7l-linux = \".\{52\}\"/armv7l-linux = \"${VSCODIUM_LINUX_ARMV7L_SHA256}\"/" "$ROOT/vscodium.nix" diff --git a/pkgs/applications/editors/vscode/vscode.nix b/pkgs/applications/editors/vscode/vscode.nix index 70f621177105e..911b497e8f023 100644 --- a/pkgs/applications/editors/vscode/vscode.nix +++ b/pkgs/applications/editors/vscode/vscode.nix @@ -6,13 +6,17 @@ let plat = { x86_64-linux = "linux-x64"; x86_64-darwin = "darwin"; + aarch64-linux = "linux-arm64"; + armv7l-linux = "linux-armhf"; }.${system}; archive_fmt = if system == "x86_64-darwin" then "zip" else "tar.gz"; sha256 = { - x86_64-linux = "0yv6584y4idkl9vvmpxj5ix5brshm1vadiwf7ima84snm0fipb0n"; - x86_64-darwin = "0igndxkwkxyjc9rkf9hbj8903hvfv7ab41q0s3gw8w5qh4b8s48x"; + x86_64-linux = "1kbjbqb03yapz7067q589gaa7d6cqaipj7hmp1l3nh0bmggzsc4c"; + x86_64-darwin = "1qgadm52c5lzkvgvqrz0n8brm4qbjg8hf1dk6a2ynqhqjxcwbj4r"; + aarch64-linux = "0i3yl9rx9h7qkl3k9qk6gg35nhz737qzzbvzvdwkqjaacsbpfgf8"; + armv7l-linux = "19iz2bxcq6y8sklr6zcnbp47kki9l00x3nvr213lkk3kj08l0afv"; }.${system}; in callPackage ./generic.nix rec { @@ -21,7 +25,7 @@ in # Please backport all compatible updates to the stable release. # This is important for the extension ecosystem. - version = "1.51.1"; + version = "1.52.1"; pname = "vscode"; executableName = "code" + lib.optionalString isInsiders "-insiders"; @@ -52,6 +56,6 @@ in downloadPage = "https://code.visualstudio.com/Updates"; license = licenses.unfree; maintainers = with maintainers; [ eadwu synthetica ]; - platforms = [ "x86_64-linux" "x86_64-darwin" ]; + platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-linux" "armv7l-linux" ]; }; } diff --git a/pkgs/applications/editors/vscode/vscodium.nix b/pkgs/applications/editors/vscode/vscodium.nix index b8ca7e3f262e7..c3d8c4ee46c5e 100644 --- a/pkgs/applications/editors/vscode/vscodium.nix +++ b/pkgs/applications/editors/vscode/vscodium.nix @@ -5,19 +5,25 @@ let plat = { x86_64-linux = "linux-x64"; - x86_64-darwin = "darwin"; + x86_64-darwin = "darwin-x64"; + aarch64-linux = "linux-arm64"; + armv7l-linux = "linux-armhf"; }.${system}; archive_fmt = if system == "x86_64-darwin" then "zip" else "tar.gz"; sha256 = { - x86_64-linux = "0hn4pqmabz3qf3bbqnn1fz7fcgzdkp2lwr2yzgmx8hhh3cff8bnb"; - x86_64-darwin = "1x3wx0d99ihyya0n89qclc3jlhh0m72hs8hj7l0h3z6zmh6q2vzv"; + x86_64-linux = "1ckg279vvg8h1n8ippa9vlyw4vk3frinb6fvvi47zggs31168m7b"; + x86_64-darwin = "168g34v2b8r1pdbnqrs0c0k9aa60n5rspixziywnq7m61i23nlgd"; + aarch64-linux = "1cd4sg6k7sqmj3yzmprq1rz928bvc3zrch8agfd8zfap1d6nfaal"; + armv7l-linux = "0f8z4lws027dyqhcrkzm9rvifwid5m0icprg0xk01l7y18n3q923"; }.${system}; sourceRoot = { x86_64-linux = "."; x86_64-darwin = ""; + aarch64-linux = "."; + armv7l-linux = "."; }.${system}; in callPackage ./generic.nix rec { @@ -27,7 +33,7 @@ in # Please backport all compatible updates to the stable release. # This is important for the extension ecosystem. - version = "1.51.1"; + version = "1.52.1"; pname = "vscodium"; executableName = "codium"; @@ -55,6 +61,6 @@ in downloadPage = "https://github.com/VSCodium/vscodium/releases"; license = licenses.mit; maintainers = with maintainers; [ synthetica turion ]; - platforms = [ "x86_64-linux" "x86_64-darwin" ]; + platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-linux" "armv7l-linux" ]; }; } diff --git a/pkgs/applications/gis/qgis/unwrapped.nix b/pkgs/applications/gis/qgis/unwrapped.nix index 54d3d59875974..6f395640f5002 100644 --- a/pkgs/applications/gis/qgis/unwrapped.nix +++ b/pkgs/applications/gis/qgis/unwrapped.nix @@ -1,8 +1,9 @@ { mkDerivation, lib, fetchFromGitHub, cmake, ninja, flex, bison, proj, geos, xlibsWrapper, sqlite, gsl , qwt, fcgi, python3Packages, libspatialindex, libspatialite, postgresql , txt2tags, openssl, libzip, hdf5, netcdf, exiv2 -, qtbase, qtwebkit, qtsensors, qca-qt5, qtkeychain, qscintilla, qtserialport, qtxmlpatterns +, qtbase, qtsensors, qca-qt5, qtkeychain, qscintilla, qtserialport, qtxmlpatterns , withGrass ? true, grass +, withWebKit ? true, qtwebkit }: with lib; let @@ -10,7 +11,7 @@ let [ qscintilla-qt5 gdal jinja2 numpy psycopg2 chardet dateutil pyyaml pytz requests urllib3 pygments pyqt5 sip owslib six ]; in mkDerivation rec { - version = "3.10.11"; + version = "3.10.13"; pname = "qgis"; name = "${pname}-unwrapped-${version}"; @@ -18,7 +19,7 @@ in mkDerivation rec { owner = "qgis"; repo = "QGIS"; rev = "final-${lib.replaceStrings ["."] ["_"] version}"; - sha256 = "157hwi9sgnsf0csbfg4x3c7vh0zgf1hnqgn04lhg9xa1n8jjbv2q"; + sha256 = "0za77znk1phrxzy2cgxpwrld3d0pi0xvhsg78rg4wkb23vaqv6zb"; }; passthru = { @@ -28,8 +29,10 @@ in mkDerivation rec { buildInputs = [ openssl proj geos xlibsWrapper sqlite gsl qwt exiv2 fcgi libspatialindex libspatialite postgresql txt2tags libzip hdf5 netcdf - qtbase qtwebkit qtsensors qca-qt5 qtkeychain qscintilla qtserialport qtxmlpatterns] ++ - (lib.optional withGrass grass) ++ pythonBuildInputs; + qtbase qtsensors qca-qt5 qtkeychain qscintilla qtserialport qtxmlpatterns ] + ++ lib.optional withGrass grass + ++ lib.optional withWebKit qtwebkit + ++ pythonBuildInputs; nativeBuildInputs = [ cmake flex bison ninja ]; @@ -44,17 +47,15 @@ in mkDerivation rec { cmakeFlags = [ "-DCMAKE_SKIP_BUILD_RPATH=OFF" "-DPYQT5_SIP_DIR=${python3Packages.pyqt5}/share/sip/PyQt5" - "-DQSCI_SIP_DIR=${python3Packages.qscintilla-qt5}/share/sip/PyQt5" ] ++ - lib.optional withGrass "-DGRASS_PREFIX7=${grass}/${grass.name}"; + "-DQSCI_SIP_DIR=${python3Packages.qscintilla-qt5}/share/sip/PyQt5" ] + ++ lib.optional (!withWebKit) "-DWITH_QTWEBKIT=OFF" + ++ lib.optional withGrass "-DGRASS_PREFIX7=${grass}/${grass.name}"; meta = { description = "A Free and Open Source Geographic Information System"; - homepage = "http://www.qgis.org"; + homepage = "https://www.qgis.org"; license = lib.licenses.gpl2Plus; platforms = with lib.platforms; linux; - maintainers = with lib.maintainers; [ lsix ]; - # Our 3.10 LTS cannot use a newer Qt (5.15) version because it requires qtwebkit - # and our qtwebkit fails to build with 5.15. 01bcfd3579219d60e5d07df309a000f96b2b658b - broken = true; + maintainers = with lib.maintainers; [ lsix sikmir ]; }; } diff --git a/pkgs/applications/gis/saga/default.nix b/pkgs/applications/gis/saga/default.nix index 50df22c186c90..96c2e8066820f 100644 --- a/pkgs/applications/gis/saga/default.nix +++ b/pkgs/applications/gis/saga/default.nix @@ -32,11 +32,11 @@ mkDerivation rec { pname = "saga"; - version = "7.8.1"; + version = "7.8.2"; src = fetchurl { - url = "https://sourceforge.net/projects/saga-gis/files/SAGA%20-%20${lib.versions.major version}/SAGA%20-%20${version}/saga-${version}.tar.gz"; - sha256 = "qwjuimeoadwf254bwJ7h2vSKaELkcaJdFrGj1WtvnbM="; + url = "mirror://sourceforge/saga-gis/SAGA%20-%20${lib.versions.major version}/SAGA%20-%20${version}/saga-${version}.tar.gz"; + sha256 = "1008l8f4733vsxy3y6d1yg8m4h8pp65d2p48ljc9kp5nyrg5vfy5"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/graphics/darktable/default.nix b/pkgs/applications/graphics/darktable/default.nix index 71c2de08a5693..27d4a4ab0e2e5 100644 --- a/pkgs/applications/graphics/darktable/default.nix +++ b/pkgs/applications/graphics/darktable/default.nix @@ -7,12 +7,12 @@ }: stdenv.mkDerivation rec { - version = "3.2.1"; + version = "3.4.0"; pname = "darktable"; src = fetchurl { url = "https://github.com/darktable-org/darktable/releases/download/release-${version}/darktable-${version}.tar.xz"; - sha256 = "035rvqmw386hm0jpi14lf4dnpr5rjkalzjkyprqh42nwi3m86dkf"; + sha256 = "6dd3de1f5ea9f94af92838c0be5ff30fdaa599aa1d737dcb562f9e0b2b2dbdda"; }; nativeBuildInputs = [ cmake ninja llvm pkgconfig intltool perl desktop-file-utils wrapGAppsHook ]; diff --git a/pkgs/applications/graphics/digikam/default.nix b/pkgs/applications/graphics/digikam/default.nix index 1e4b397db231e..5832e97d4399e 100644 --- a/pkgs/applications/graphics/digikam/default.nix +++ b/pkgs/applications/graphics/digikam/default.nix @@ -116,6 +116,7 @@ mkDerivation rec { "-DENABLE_INTERNALMYSQL=1" "-DENABLE_MEDIAPLAYER=1" "-DENABLE_QWEBENGINE=on" + "-DENABLE_APPSTYLES=on" ]; dontWrapGApps = true; diff --git a/pkgs/applications/graphics/drawio/default.nix b/pkgs/applications/graphics/drawio/default.nix index 892d81753e655..0bb4364d6fa9a 100644 --- a/pkgs/applications/graphics/drawio/default.nix +++ b/pkgs/applications/graphics/drawio/default.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation rec { pname = "drawio"; - version = "13.9.9"; + version = "14.1.5"; src = fetchurl { url = "https://github.com/jgraph/drawio-desktop/releases/download/v${version}/draw.io-x86_64-${version}.rpm"; - hash = "sha256-+rNbLHpkFnvM7gDFbZ9AItPIA2IVTmscz+gTXF8riIY="; + hash = "sha256-dM/DGtUDnJBD4Cfhm/zbxfgBhUcIlEzlF4z3cmQuW14="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/graphics/emulsion/default.nix b/pkgs/applications/graphics/emulsion/default.nix new file mode 100644 index 0000000000000..ba7ebfcfdff69 --- /dev/null +++ b/pkgs/applications/graphics/emulsion/default.nix @@ -0,0 +1,85 @@ +{ stdenv +, lib +, fetchFromGitHub +, rustPlatform +, installShellFiles +, makeWrapper +, pkg-config +, python3 +, libGL +, libX11 +, libXcursor +, libXi +, libXrandr +, libXxf86vm +, libxcb +, libxkbcommon +, wayland +, xdg_utils +, AppKit +, CoreGraphics +, CoreServices +, Foundation +, OpenGL +}: +let + rpathLibs = [ + libGL + libX11 + libXcursor + libXi + libXrandr + libXxf86vm + libxcb + ] ++ lib.optionals stdenv.isLinux [ + libxkbcommon + wayland + ]; +in +rustPlatform.buildRustPackage rec { + pname = "emulsion"; + version = "7.2"; + + src = fetchFromGitHub { + owner = "ArturKovacs"; + repo = pname; + rev = "v${version}"; + sha256 = "1king04p5j4gsvprrfppwaxa5jn4ga4nc0v63wl6fvq2ngwnkg4g"; + }; + + cargoSha256 = "19vb2q5w3063l7349p1b8q40n97a4hxdvc7h7qsx1iiwp75knbd0"; + + nativeBuildInputs = [ + installShellFiles + makeWrapper + pkg-config + python3 + ]; + + buildInputs = rpathLibs ++ lib.optionals stdenv.isDarwin [ + AppKit + CoreGraphics + CoreServices + Foundation + OpenGL + ]; + + installPhase = '' + runHook preInstall + install -D $releaseDir/emulsion $out/bin/emulsion + '' + lib.optionalString stdenv.isLinux '' + patchelf --set-rpath "${lib.makeLibraryPath rpathLibs}" $out/bin/emulsion + '' + '' + runHook postInstall + ''; + + dontPatchELF = true; + + meta = with lib; { + description = "A fast and minimalistic image viewer"; + homepage = "https://arturkovacs.github.io/emulsion-website/"; + maintainers = [ maintainers.magnetophon ]; + platforms = platforms.unix; + license = licenses.mit; + }; +} diff --git a/pkgs/applications/graphics/evilpixie/default.nix b/pkgs/applications/graphics/evilpixie/default.nix index 1f6a52aa0b0ca..4c47283c42ac3 100644 --- a/pkgs/applications/graphics/evilpixie/default.nix +++ b/pkgs/applications/graphics/evilpixie/default.nix @@ -22,13 +22,13 @@ let in mkDerivation rec { pname = "evilpixie"; - version = "0.2"; + version = "0.2.1"; src = fetchFromGitHub { owner = "bcampbell"; repo = "evilpixie"; rev = "v${version}"; - sha256 = "1yg4ic3kcxqmr7k5bbvrv5iavlnhpdx6510z5wha9k9k5q9c4dvh"; + sha256 = "0dwgfr8kmkfppgf5wx9i5f7fjz3gxk0ji1l06x1z4r3vj52hdbph"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/graphics/imv/default.nix b/pkgs/applications/graphics/imv/default.nix index faf7487305839..71e156881c40d 100644 --- a/pkgs/applications/graphics/imv/default.nix +++ b/pkgs/applications/graphics/imv/default.nix @@ -1,61 +1,102 @@ -{ asciidoc +{ stdenv +, lib +, fetchFromGitHub +, asciidoc , cmocka , docbook_xsl -, fetchFromGitHub +, libxslt , fontconfig -, freeimage +, meson +, ninja +, pkgconfig , icu +, pango +, inih +, withWindowSystem ? "all" +, xorg +, libxkbcommon , libGLU -, libheif +, wayland +, withBackends ? [ "freeimage" "libtiff" "libjpeg" "libpng" "librsvg" "libnsgif" "libheif" ] +, freeimage +, libtiff , libjpeg_turbo , libpng , librsvg -, libtiff -, libxkbcommon -, libxslt , netsurf -, pango -, pkgconfig -, stdenv -, wayland +, libheif }: +let + windowSystems = { + all = windowSystems.x11 ++ windowSystems.wayland; + x11 = [ libGLU xorg.libxcb xorg.libX11 ]; + wayland = [ wayland ]; + }; + + backends = { + inherit freeimage libtiff libpng librsvg libheif; + libjpeg = libjpeg_turbo; + inherit (netsurf) libnsgif; + }; + + backendFlags = builtins.map + (b: if builtins.elem b withBackends + then "-D${b}=enabled" + else "-D${b}=disabled") + (builtins.attrNames backends); +in + +# check that given window system is valid +assert lib.assertOneOf "withWindowSystem" withWindowSystem + (builtins.attrNames windowSystems); +# check that every given backend is valid +assert builtins.all + (b: lib.assertOneOf "each backend" b (builtins.attrNames backends)) + withBackends; + stdenv.mkDerivation rec { pname = "imv"; - version = "4.1.0"; + version = "4.2.0"; src = fetchFromGitHub { owner = "eXeC64"; repo = "imv"; rev = "v${version}"; - sha256 = "0gk8g178i961nn3bls75a8qpv6wvfvav6hd9lxca1skaikd33zdx"; + sha256 = "07pcpppmfvvj0czfvp1cyq03ha0jdj4whl13lzvw37q3vpxs5qqh"; }; - nativeBuildInputs = [ asciidoc cmocka docbook_xsl libxslt ]; + mesonFlags = [ + "-Dwindows=${withWindowSystem}" + "-Dtest=enabled" + "-Dman=enabled" + ] ++ backendFlags; + + nativeBuildInputs = [ + asciidoc + cmocka + docbook_xsl + libxslt + meson + ninja + pkgconfig + ]; buildInputs = [ - freeimage icu - libGLU - libjpeg_turbo - librsvg libxkbcommon - netsurf.libnsgif pango - pkgconfig - wayland - ]; - - installFlags = [ "PREFIX=$(out)" "CONFIGPREFIX=$(out)/etc" ]; - - makeFlags = [ "BACKEND_LIBJPEG=yes" "BACKEND_LIBNSGIF=yes" ]; + inih + ] ++ windowSystems."${withWindowSystem}" + ++ builtins.map (b: backends."${b}") withBackends; - postFixup = '' + postFixup = lib.optionalString (withWindowSystem == "all") '' # The `bin/imv` script assumes imv-wayland or imv-x11 in PATH, # so we have to fix those to the binaries we installed into the /nix/store - sed -i "s|\bimv-wayland\b|$out/bin/imv-wayland|" $out/bin/imv - sed -i "s|\bimv-x11\b|$out/bin/imv-x11|" $out/bin/imv + substituteInPlace "$out/bin/imv" \ + --replace "imv-wayland" "$out/bin/imv-wayland" \ + --replace "imv-x11" "$out/bin/imv-x11" ''; doCheck = true; diff --git a/pkgs/applications/graphics/monado/default.nix b/pkgs/applications/graphics/monado/default.nix new file mode 100644 index 0000000000000..61343b3b1b466 --- /dev/null +++ b/pkgs/applications/graphics/monado/default.nix @@ -0,0 +1,101 @@ +{ stdenv +, fetchFromGitLab +, fetchpatch +, cmake +, pkg-config +, python3 +, SDL2 +, dbus +, eigen +, ffmpeg +, glslang +, hidapi +, libGL +, libXau +, libXdmcp +, libXrandr +, libffi +# , librealsense +, libsurvive +, libusb1 +, libuvc +, libv4l +, libxcb +, opencv4 +, openhmd +, udev +, vulkan-headers +, vulkan-loader +, wayland +, wayland-protocols +, zlib +}: + +stdenv.mkDerivation rec { + pname = "monado"; + version = "0.4.1"; + + src = fetchFromGitLab { + domain = "gitlab.freedesktop.org"; + owner = pname; + repo = pname; + rev = "v${version}"; + sha256 = "114aif79dqyn2qg07mkv6lzmqn15k6fdcii818rdf5g4bp7zzzgm"; + }; + + patches = [ + # fix libsurvive autodetection, drop with the next version update + (fetchpatch { + url = "https://gitlab.freedesktop.org/monado/monado/-/commit/345e9eab56e2de9e8b07cf72c2a67cf2ebd01e62.patch"; + sha256 = "17c110an6sxc8rn7dfz30rfkbayg64w68licicwc8cqabi6cgrm3"; + }) + ]; + + nativeBuildInputs = [ cmake pkg-config python3 ]; + + buildInputs = [ + SDL2 + dbus + eigen + ffmpeg + glslang + hidapi + libGL + libXau + libXdmcp + libXrandr + libffi + # librealsense.dev - see below + libsurvive + libusb1 + libuvc + libv4l + libxcb + opencv4 + openhmd + udev + vulkan-headers + vulkan-loader + wayland + wayland-protocols + zlib + ]; + + # realsense is disabled, the build ends with the following error: + # + # CMake Error in src/xrt/drivers/CMakeLists.txt: + # Imported target "realsense2::realsense2" includes non-existent path + # "/nix/store/2v95aps14hj3jy4ryp86vl7yymv10mh0-librealsense-2.41.0/include" + # in its INTERFACE_INCLUDE_DIRECTORIES. + # + # for some reason cmake is trying to use ${librealsense}/include + # instead of ${librealsense.dev}/include as an include directory + + meta = with stdenv.lib; { + description = "Open source XR runtime"; + homepage = "https://monado.freedesktop.org/"; + license = licenses.boost; + maintainers = with maintainers; [ prusnak ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/graphics/mtpaint/default.nix b/pkgs/applications/graphics/mtpaint/default.nix index 91278c9881fef..c002e2a8d0549 100644 --- a/pkgs/applications/graphics/mtpaint/default.nix +++ b/pkgs/applications/graphics/mtpaint/default.nix @@ -1,26 +1,28 @@ { stdenv, fetchFromGitHub -, pkgconfig -, freetype, giflib, gtk2, lcms2, libjpeg, libpng, libtiff, openjpeg, gifsicle +, pkg-config +, freetype, giflib, gtk3, lcms2, libjpeg, libpng, libtiff, openjpeg, gifsicle }: stdenv.mkDerivation rec { p_name = "mtPaint"; - ver_maj = "3.49"; - ver_min = "12"; + ver_maj = "3.50"; + ver_min = "01"; name = "${p_name}-${ver_maj}.${ver_min}"; src = fetchFromGitHub { owner = "wjaguar"; repo = p_name; - rev = "6aed1b0441f99055fc7d475942f8bd5cb23c41f8"; - sha256 = "0bvf623g0n2ifijcxv1nw0z3wbs2vhhdky4n04ywsbjlykm44nd1"; + rev = "a4675ff5cd9fcd57d291444cb9f332b48f11243f"; + sha256 = "04wqxz8i655gz5rnz90cksy8v6m2jhcn1j8rzhqpp5xhawlmq24y"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ - freetype giflib gtk2 lcms2 libjpeg libpng libtiff openjpeg gifsicle + freetype giflib gtk3 lcms2 libjpeg libpng libtiff openjpeg gifsicle ]; + configureFlags = [ "gtk3" "intl" "man" ]; + meta = { description = "A simple GTK painting program"; longDescription = '' @@ -33,7 +35,7 @@ stdenv.mkDerivation rec { GNU/Linux, Windows and older PC hardware. ''; homepage = "http://mtpaint.sourceforge.net/"; - license = stdenv.lib.licenses.gpl3; + license = stdenv.lib.licenses.gpl3Plus; platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.vklquevs ]; }; diff --git a/pkgs/applications/graphics/nufraw/default.nix b/pkgs/applications/graphics/nufraw/default.nix new file mode 100644 index 0000000000000..678bc12278df6 --- /dev/null +++ b/pkgs/applications/graphics/nufraw/default.nix @@ -0,0 +1,71 @@ +{ stdenv +, fetchurl +, lib + +, autoreconfHook +, bzip2 +, cfitsio +, exiv2 +, gettext +, gtk2 +, gtkimageview +, lcms2 +, lensfun +, libjpeg +, libtiff +, perl +, pkg-config +, zlib + +, addThumbnailer ? false +}: + +stdenv.mkDerivation rec { + pname = "nufraw"; + version = "0.43-3"; + + src = fetchurl { + url = "mirror://sourceforge/nufraw/nufraw-${version}.tar.gz"; + sha256 = "0b63qvw9r8kaqw36bk3a9zwxc41h8fr6498indkw4glrj0awqz9c"; + }; + + nativeBuildInputs = [ autoreconfHook gettext perl pkg-config ]; + + buildInputs = [ + bzip2 + cfitsio + exiv2 + gtk2 + gtkimageview + lcms2 + lensfun + libjpeg + libtiff + zlib + ]; + + configureFlags = [ + "--enable-contrast" + "--enable-dst-correction" + ]; + + postInstall = lib.optionalString addThumbnailer '' + mkdir -p $out/share/thumbnailers + substituteAll ${./nufraw.thumbnailer} $out/share/thumbnailers/${pname}.thumbnailer + ''; + + meta = with stdenv.lib; { + homepage = "https://nufraw.sourceforge.io/"; + description = "Utility to read and manipulate raw images from digital cameras"; + longDescription = + '' + A new version of the popular raw digital images manipulator ufraw. + Forks from the version 0.23 of ufraw (that's why the first nufraw version is the 0.24). + Nufraw offers the same features (gimp plugin, batch, ecc) and the same quality of + ufraw in a brand new improved user interface. + ''; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ asbachb ]; + platforms = [ "x86_64-linux" "i686-linux" ]; + }; +} diff --git a/pkgs/applications/graphics/nufraw/nufraw.thumbnailer b/pkgs/applications/graphics/nufraw/nufraw.thumbnailer new file mode 100644 index 0000000000000..34b2adc43aee8 --- /dev/null +++ b/pkgs/applications/graphics/nufraw/nufraw.thumbnailer @@ -0,0 +1,4 @@ +[Thumbnailer Entry] +TryExec=@out@/bin/nufraw-batch +Exec=@out@/bin/nufraw-batch --silent --size %s --out-type=png --noexif --output=%o --embedded-image %i +MimeType=image/x-canon-cr2;image/x-canon-crw;image/x-minolta-mrw;image/x-nikon-nef;image/x-pentax-pef;image/x-panasonic-rw2;image/x-panasonic-raw2;image/x-samsung-srw;image/x-olympus-orf;image/x-sony-arw diff --git a/pkgs/applications/graphics/ocrfeeder/default.nix b/pkgs/applications/graphics/ocrfeeder/default.nix new file mode 100644 index 0000000000000..28fe58183faec --- /dev/null +++ b/pkgs/applications/graphics/ocrfeeder/default.nix @@ -0,0 +1,73 @@ +{ stdenv +, fetchurl +, pkg-config +, gtk3 +, gtkspell3 +, isocodes +, goocanvas2 +, intltool +, itstool +, libxml2 +, gnome3 +, python3 +, gobject-introspection +, wrapGAppsHook +, tesseract4 +, extraOcrEngines ? [] # other supported engines are: ocrad gocr cuneiform +}: + +stdenv.mkDerivation rec { + pname = "ocrfeeder"; + version = "0.8.3"; + + src = fetchurl { + url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "12f5gnq92ffnd5zaj04df7jrnsdz1zn4zcgpbf5p9qnd21i2y529"; + }; + + nativeBuildInputs = [ + pkg-config + wrapGAppsHook + intltool + itstool + libxml2 + ]; + + buildInputs = [ + gtk3 + gobject-introspection + goocanvas2 + gtkspell3 + isocodes + (python3.withPackages(ps: with ps; [ + pyenchant + sane + pillow + reportlab + odfpy + pygobject3 + ])) + ]; + + # https://gitlab.gnome.org/GNOME/ocrfeeder/-/issues/22 + postConfigure = '' + substituteInPlace src/ocrfeeder/util/constants.py \ + --replace /usr/share/xml/iso-codes ${isocodes}/share/xml/iso-codes + ''; + + enginesPath = stdenv.lib.makeBinPath ([ + tesseract4 + ] ++ extraOcrEngines); + + preFixup = '' + gappsWrapperArgs+=(--prefix PATH : "${enginesPath}") + ''; + + meta = with stdenv.lib; { + homepage = "https://wiki.gnome.org/Apps/OCRFeeder"; + description = "Complete Optical Character Recognition and Document Analysis and Recognition program"; + maintainers = with maintainers; [ doronbehar ]; + license = licenses.gpl3Plus; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/graphics/paraview/default.nix b/pkgs/applications/graphics/paraview/default.nix index b201f9dbf0daf..d0c8d1c9ee941 100644 --- a/pkgs/applications/graphics/paraview/default.nix +++ b/pkgs/applications/graphics/paraview/default.nix @@ -66,7 +66,6 @@ mkDerivation rec { libGLU libGL libXt openmpi - (python3.withPackages (ps: with ps; [ numpy matplotlib mpi4py ])) tbb boost ffmpeg @@ -78,6 +77,10 @@ mkDerivation rec { qtsvg ]; + propagatedBuildInputs = [ + (python3.withPackages (ps: with ps; [ numpy matplotlib mpi4py ])) + ]; + meta = with stdenv.lib; { homepage = "https://www.paraview.org/"; description = "3D Data analysis and visualization application"; diff --git a/pkgs/applications/graphics/qvge/default.nix b/pkgs/applications/graphics/qvge/default.nix index d8080e6fbb444..ba7e94521426b 100644 --- a/pkgs/applications/graphics/qvge/default.nix +++ b/pkgs/applications/graphics/qvge/default.nix @@ -9,13 +9,13 @@ mkDerivation rec { pname = "qvge"; - version = "0.6.1"; + version = "0.6.2"; src = fetchFromGitHub { owner = "ArsMasiuk"; repo = pname; rev = "v${version}"; - sha256 = "0j4ih03nl6iihhnxrfldkarg9hvxb62lpr58xspn417d3gj6xjll"; + sha256 = "0qy73dngl1xm6mr2306ddzbbrzk6yszp3y15phs861bfxynzkqjz"; }; prePatch = "cd src"; diff --git a/pkgs/applications/graphics/xournalpp/default.nix b/pkgs/applications/graphics/xournalpp/default.nix index da453b4267869..c21d0ed20545a 100644 --- a/pkgs/applications/graphics/xournalpp/default.nix +++ b/pkgs/applications/graphics/xournalpp/default.nix @@ -4,7 +4,7 @@ , cmake , gettext , wrapGAppsHook -, pkgconfig +, pkg-config , glib , gsettings-desktop-schemas @@ -22,16 +22,16 @@ stdenv.mkDerivation rec { pname = "xournalpp"; - version = "1.0.19"; + version = "1.0.20"; src = fetchFromGitHub { owner = "xournalpp"; repo = pname; rev = version; - sha256 = "05nx4cmrka6hwdn7r91yy4h46qpa9k7iy9dkgaq3hrkh9z3fxlkq"; + sha256 = "1c7n03xm3m4lwcwxgplkn25i8c6s3i7rijbkcx86br1j4jadcs3k"; }; - nativeBuildInputs = [ cmake gettext pkgconfig wrapGAppsHook ]; + nativeBuildInputs = [ cmake gettext pkg-config wrapGAppsHook ]; buildInputs = [ glib gsettings-desktop-schemas @@ -50,8 +50,6 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; - enableParallelBuilding = true; - meta = with stdenv.lib; { description = "Xournal++ is a handwriting Notetaking software with PDF annotation support"; homepage = "https://xournalpp.github.io/"; diff --git a/pkgs/applications/kde/akonadi-calendar.nix b/pkgs/applications/kde/akonadi-calendar.nix index 121e93d3f5c01..474672dfd7d9e 100644 --- a/pkgs/applications/kde/akonadi-calendar.nix +++ b/pkgs/applications/kde/akonadi-calendar.nix @@ -6,7 +6,7 @@ }: mkDerivation { - name = "akonadi-calendar"; + pname = "akonadi-calendar"; meta = { license = with lib.licenses; [ gpl2 lgpl21 ]; maintainers = kdepimTeam; diff --git a/pkgs/applications/kde/akonadi-contacts.nix b/pkgs/applications/kde/akonadi-contacts.nix index b09058b60be95..2076723a372bd 100644 --- a/pkgs/applications/kde/akonadi-contacts.nix +++ b/pkgs/applications/kde/akonadi-contacts.nix @@ -8,7 +8,7 @@ }: mkDerivation { - name = "akonadi-contacts"; + pname = "akonadi-contacts"; meta = { license = with lib.licenses; [ gpl2 lgpl21 ]; maintainers = kdepimTeam; diff --git a/pkgs/applications/kde/akonadi-import-wizard.nix b/pkgs/applications/kde/akonadi-import-wizard.nix index cc1acbc6dd05e..26b373fb33018 100644 --- a/pkgs/applications/kde/akonadi-import-wizard.nix +++ b/pkgs/applications/kde/akonadi-import-wizard.nix @@ -6,7 +6,7 @@ }: mkDerivation { - name = "akonadi-import-wizard"; + pname = "akonadi-import-wizard"; meta = { license = with lib.licenses; [ gpl2Plus lgpl21Plus fdl12 ]; maintainers = kdepimTeam; diff --git a/pkgs/applications/kde/akonadi-mime.nix b/pkgs/applications/kde/akonadi-mime.nix index 0ed958b4e770d..fbd028b1ec289 100644 --- a/pkgs/applications/kde/akonadi-mime.nix +++ b/pkgs/applications/kde/akonadi-mime.nix @@ -5,7 +5,7 @@ }: mkDerivation { - name = "akonadi-mime"; + pname = "akonadi-mime"; meta = { license = with lib.licenses; [ gpl2 lgpl21 ]; maintainers = kdepimTeam; diff --git a/pkgs/applications/kde/akonadi-notes.nix b/pkgs/applications/kde/akonadi-notes.nix index 72c4d799239cf..6db7e00be9b0c 100644 --- a/pkgs/applications/kde/akonadi-notes.nix +++ b/pkgs/applications/kde/akonadi-notes.nix @@ -5,7 +5,7 @@ }: mkDerivation { - name = "akonadi-notes"; + pname = "akonadi-notes"; meta = { license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; maintainers = kdepimTeam; diff --git a/pkgs/applications/kde/akonadi-search.nix b/pkgs/applications/kde/akonadi-search.nix index 23ee6b1b9cc48..495b63abd4435 100644 --- a/pkgs/applications/kde/akonadi-search.nix +++ b/pkgs/applications/kde/akonadi-search.nix @@ -6,7 +6,7 @@ }: mkDerivation { - name = "akonadi-search"; + pname = "akonadi-search"; meta = { license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; maintainers = kdepimTeam; diff --git a/pkgs/applications/kde/akonadi/default.nix b/pkgs/applications/kde/akonadi/default.nix index 6ffe1e2de8aa0..d24e19f89e7e2 100644 --- a/pkgs/applications/kde/akonadi/default.nix +++ b/pkgs/applications/kde/akonadi/default.nix @@ -1,12 +1,13 @@ { mkDerivation, lib, kdepimTeam, - extra-cmake-modules, shared-mime-info, qtbase, - boost, kcompletion, kconfigwidgets, kcrash, kdbusaddons, kdesignerplugin, - ki18n, kiconthemes, kio, kitemmodels, kwindowsystem, mysql, qttools, + extra-cmake-modules, shared-mime-info, qtbase, accounts-qt, + boost, kaccounts-integration, kcompletion, kconfigwidgets, kcrash, kdbusaddons, + kdesignerplugin, ki18n, kiconthemes, kio, kitemmodels, kwindowsystem, mysql, qttools, + signond, }: mkDerivation { - name = "akonadi"; + pname = "akonadi"; meta = { license = [ lib.licenses.lgpl21 ]; maintainers = kdepimTeam; @@ -19,8 +20,8 @@ mkDerivation { ]; nativeBuildInputs = [ extra-cmake-modules shared-mime-info ]; buildInputs = [ - kcompletion kconfigwidgets kcrash kdbusaddons kdesignerplugin ki18n - kiconthemes kio kwindowsystem qttools + kaccounts-integration kcompletion kconfigwidgets kcrash kdbusaddons kdesignerplugin + ki18n kiconthemes kio kwindowsystem accounts-qt qttools signond ]; propagatedBuildInputs = [ boost kitemmodels ]; outputs = [ "out" "dev" ]; diff --git a/pkgs/applications/kde/akonadiconsole.nix b/pkgs/applications/kde/akonadiconsole.nix index a02400847bb48..76e5ca480b47f 100644 --- a/pkgs/applications/kde/akonadiconsole.nix +++ b/pkgs/applications/kde/akonadiconsole.nix @@ -7,7 +7,7 @@ }: mkDerivation { - name = "akonadiconsole"; + pname = "akonadiconsole"; meta = { license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; maintainers = kdepimTeam; diff --git a/pkgs/applications/kde/akregator.nix b/pkgs/applications/kde/akregator.nix index 98d53bc808385..5cacfe0c04f01 100644 --- a/pkgs/applications/kde/akregator.nix +++ b/pkgs/applications/kde/akregator.nix @@ -10,7 +10,7 @@ }: mkDerivation { - name = "akregator"; + pname = "akregator"; meta = { license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; maintainers = kdepimTeam; diff --git a/pkgs/applications/kde/ark/default.nix b/pkgs/applications/kde/ark/default.nix index 76cc423f5460b..69a56254d65be 100644 --- a/pkgs/applications/kde/ark/default.nix +++ b/pkgs/applications/kde/ark/default.nix @@ -20,7 +20,7 @@ let in mkDerivation { - name = "ark"; + pname = "ark"; meta = { description = "Graphical file compression/decompression utility"; license = with lib.licenses; diff --git a/pkgs/applications/kde/baloo-widgets.nix b/pkgs/applications/kde/baloo-widgets.nix index 3479b6600fc96..887e7ea29860b 100644 --- a/pkgs/applications/kde/baloo-widgets.nix +++ b/pkgs/applications/kde/baloo-widgets.nix @@ -5,7 +5,7 @@ }: mkDerivation { - name = "baloo-widgets"; + pname = "baloo-widgets"; meta = { license = [ lib.licenses.lgpl21 ]; maintainers = [ lib.maintainers.ttuegel ]; diff --git a/pkgs/applications/kde/bomber.nix b/pkgs/applications/kde/bomber.nix index f42a6a01871bd..c2a5329ee2a32 100644 --- a/pkgs/applications/kde/bomber.nix +++ b/pkgs/applications/kde/bomber.nix @@ -4,7 +4,7 @@ }: mkDerivation { - name = "bomber"; + pname = "bomber"; meta = with lib; { homepage = "https://kde.org/applications/en/games/org.kde.bomber"; description = "A single player arcade game"; diff --git a/pkgs/applications/kde/bovo.nix b/pkgs/applications/kde/bovo.nix index 4bd3113a051f4..989a80aa29f5e 100644 --- a/pkgs/applications/kde/bovo.nix +++ b/pkgs/applications/kde/bovo.nix @@ -4,7 +4,7 @@ }: mkDerivation { - name = "bovo"; + pname = "bovo"; meta = with lib; { homepage = "https://kde.org/applications/en/games/org.kde.bovo"; description = "Five in a row application"; diff --git a/pkgs/applications/kde/calendarsupport.nix b/pkgs/applications/kde/calendarsupport.nix index 1537bd25d55e8..b316ab4e56893 100644 --- a/pkgs/applications/kde/calendarsupport.nix +++ b/pkgs/applications/kde/calendarsupport.nix @@ -1,16 +1,23 @@ { - mkDerivation, lib, kdepimTeam, + mkDerivation, lib, kdepimTeam, fetchpatch, extra-cmake-modules, kdoctools, akonadi, akonadi-calendar, akonadi-mime, akonadi-notes, kcalutils, kdepim-apps-libs, kholidays, kidentitymanagement, kmime, pimcommon, qttools, }: mkDerivation { - name = "calendarsupport"; + pname = "calendarsupport"; meta = { license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; maintainers = kdepimTeam; }; + patches = [ + # Patch for Qt 5.15.2 until version 20.12.0 + (fetchpatch { + url = "https://invent.kde.org/pim/calendarsupport/-/commit/b4193facb223bd5b73a65318dec8ced51b66adf7.patch"; + sha256 = "sha256:1da11rqbxxrl06ld3avc41p064arz4n6w5nxq8r008v8ws3s64dy"; + }) + ]; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ akonadi akonadi-mime akonadi-notes kcalutils kdepim-apps-libs kholidays pimcommon qttools diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix index 315a5b3588554..33f392fdccc71 100644 --- a/pkgs/applications/kde/default.nix +++ b/pkgs/applications/kde/default.nix @@ -35,15 +35,13 @@ let mkDerivation = args: let - inherit (args) name; - sname = args.sname or name; - inherit (srcs.${sname}) src version; + inherit (args) pname; + inherit (srcs.${pname}) src version; mkDerivation = libsForQt5.callPackage ({ mkDerivation }: mkDerivation) {}; in mkDerivation (args // { - name = "${name}-${version}"; - inherit src; + inherit pname version src; outputs = args.outputs or [ "out" ]; @@ -88,6 +86,7 @@ let gwenview = callPackage ./gwenview.nix {}; incidenceeditor = callPackage ./incidenceeditor.nix {}; k3b = callPackage ./k3b.nix {}; + kaccounts-integration = callPackage ./kaccounts-integration.nix {}; kaddressbook = callPackage ./kaddressbook.nix {}; kalarm = callPackage ./kalarm.nix {}; kalarmcal = callPackage ./kalarmcal.nix {}; diff --git a/pkgs/applications/kde/dolphin-plugins.nix b/pkgs/applications/kde/dolphin-plugins.nix index 5580952f40a0e..37613f86a7f76 100644 --- a/pkgs/applications/kde/dolphin-plugins.nix +++ b/pkgs/applications/kde/dolphin-plugins.nix @@ -5,7 +5,7 @@ }: mkDerivation { - name = "dolphin-plugins"; + pname = "dolphin-plugins"; meta = { license = [ lib.licenses.gpl2 ]; maintainers = [ lib.maintainers.ttuegel ]; diff --git a/pkgs/applications/kde/dolphin.nix b/pkgs/applications/kde/dolphin.nix index 76d4e989e8c31..3774c7e00b63c 100644 --- a/pkgs/applications/kde/dolphin.nix +++ b/pkgs/applications/kde/dolphin.nix @@ -9,7 +9,7 @@ }: mkDerivation { - name = "dolphin"; + pname = "dolphin"; meta = { license = with lib.licenses; [ gpl2 fdl12 ]; maintainers = [ lib.maintainers.ttuegel ]; diff --git a/pkgs/applications/kde/dragon.nix b/pkgs/applications/kde/dragon.nix index 9dd55ec4b9c13..0ce6459e3f65e 100644 --- a/pkgs/applications/kde/dragon.nix +++ b/pkgs/applications/kde/dragon.nix @@ -8,7 +8,7 @@ }: mkDerivation { - name = "dragon"; + pname = "dragon"; meta = { license = with lib.licenses; [ gpl2 fdl12 ]; description = "A simple media player for KDE"; diff --git a/pkgs/applications/kde/elisa.nix b/pkgs/applications/kde/elisa.nix index 9a51aa786fac3..6252e53078f34 100644 --- a/pkgs/applications/kde/elisa.nix +++ b/pkgs/applications/kde/elisa.nix @@ -19,7 +19,7 @@ }: mkDerivation rec { - name = "elisa"; + pname = "elisa"; buildInputs = [ libvlc ]; @@ -43,6 +43,6 @@ mkDerivation rec { description = "A simple media player for KDE"; license = licenses.gpl3; maintainers = with maintainers; [ peterhoeg ]; - broken = lib.versionOlder qtbase.version "5.14"; + broken = lib.versionOlder qtbase.version "5.15"; }; } diff --git a/pkgs/applications/kde/eventviews.nix b/pkgs/applications/kde/eventviews.nix index 495491f6d3c1a..1a6cc9442b96b 100644 --- a/pkgs/applications/kde/eventviews.nix +++ b/pkgs/applications/kde/eventviews.nix @@ -6,7 +6,7 @@ }: mkDerivation { - name = "eventviews"; + pname = "eventviews"; meta = { license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; maintainers = kdepimTeam; diff --git a/pkgs/applications/kde/fetch.sh b/pkgs/applications/kde/fetch.sh index dc023c57a7e68..e3bba77f97284 100644 --- a/pkgs/applications/kde/fetch.sh +++ b/pkgs/applications/kde/fetch.sh @@ -1 +1 @@ -WGET_ARGS=(http://download.kde.org/stable/release-service/20.08.2/src) +WGET_ARGS=( http://download.kde.org/stable/release-service/20.08.3/src -A '*.tar.xz' ) diff --git a/pkgs/applications/kde/ffmpegthumbs.nix b/pkgs/applications/kde/ffmpegthumbs.nix index 225efba3768a5..2a8b82352b40b 100644 --- a/pkgs/applications/kde/ffmpegthumbs.nix +++ b/pkgs/applications/kde/ffmpegthumbs.nix @@ -5,7 +5,7 @@ }: mkDerivation { - name = "ffmpegthumbs"; + pname = "ffmpegthumbs"; meta = { license = with lib.licenses; [ gpl2 bsd3 ]; maintainers = [ lib.maintainers.ttuegel ]; diff --git a/pkgs/applications/kde/filelight.nix b/pkgs/applications/kde/filelight.nix index a3be5be7f0a29..1aeff531862fa 100644 --- a/pkgs/applications/kde/filelight.nix +++ b/pkgs/applications/kde/filelight.nix @@ -5,7 +5,7 @@ }: mkDerivation { - name = "filelight"; + pname = "filelight"; meta = { license = with lib.licenses; [ gpl2 ]; maintainers = with lib.maintainers; [ fridh vcunat ]; diff --git a/pkgs/applications/kde/granatier.nix b/pkgs/applications/kde/granatier.nix index c02fa0fef2e7b..b4aa2168e0d1d 100644 --- a/pkgs/applications/kde/granatier.nix +++ b/pkgs/applications/kde/granatier.nix @@ -4,7 +4,7 @@ }: mkDerivation { - name = "granatier"; + pname = "granatier"; meta = with lib; { homepage = "https://kde.org/applications/en/games/org.kde.granatier"; description = "Clone of the classic Bomberman game"; diff --git a/pkgs/applications/kde/grantleetheme/default.nix b/pkgs/applications/kde/grantleetheme/default.nix index 6204919a32858..517cb072f74d6 100644 --- a/pkgs/applications/kde/grantleetheme/default.nix +++ b/pkgs/applications/kde/grantleetheme/default.nix @@ -5,10 +5,11 @@ }: mkDerivation { - name = "grantleetheme"; + pname = "grantleetheme"; meta = { license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; maintainers = kdepimTeam; + broken = lib.versionOlder qtbase.version "5.13.0"; }; output = [ "out" "dev" ]; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; diff --git a/pkgs/applications/kde/gwenview.nix b/pkgs/applications/kde/gwenview.nix index 3d03d1dea3e72..0cd884d5401d9 100644 --- a/pkgs/applications/kde/gwenview.nix +++ b/pkgs/applications/kde/gwenview.nix @@ -7,7 +7,7 @@ }: mkDerivation { - name = "gwenview"; + pname = "gwenview"; meta = { license = with lib.licenses; [ gpl2 fdl12 ]; maintainers = [ lib.maintainers.ttuegel ]; diff --git a/pkgs/applications/kde/incidenceeditor.nix b/pkgs/applications/kde/incidenceeditor.nix index 30955d1c27438..981c184d15150 100644 --- a/pkgs/applications/kde/incidenceeditor.nix +++ b/pkgs/applications/kde/incidenceeditor.nix @@ -6,7 +6,7 @@ }: mkDerivation { - name = "incidenceeditor"; + pname = "incidenceeditor"; meta = { license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; maintainers = kdepimTeam; diff --git a/pkgs/applications/kde/k3b.nix b/pkgs/applications/kde/k3b.nix index 35d55787ec78b..cc9763961f851 100644 --- a/pkgs/applications/kde/k3b.nix +++ b/pkgs/applications/kde/k3b.nix @@ -8,7 +8,7 @@ }: mkDerivation { - name = "k3b"; + pname = "k3b"; meta = with lib; { license = with licenses; [ gpl2Plus ]; maintainers = with maintainers; [ sander phreedom ]; diff --git a/pkgs/applications/kde/kaccounts-integration.nix b/pkgs/applications/kde/kaccounts-integration.nix new file mode 100644 index 0000000000000..ef69f564f128b --- /dev/null +++ b/pkgs/applications/kde/kaccounts-integration.nix @@ -0,0 +1,23 @@ +{ mkDerivation, lib, extra-cmake-modules, kdoctools, kcmutils, kcoreaddons, kwallet, accounts-qt, signond }: + +mkDerivation { + pname = "kaccounts-integration"; + meta = with lib; { + homepage = "https://community.kde.org/KTp/Setting_up_KAccounts"; + description = "Online accounts integration"; + maintainers = with maintainers; [ freezeboy ]; + license = licenses.gpl2Plus; + platforms = platforms.linux; + }; + nativeBuildInputs = [ + extra-cmake-modules + ]; + buildInputs = [ + kcmutils + kcoreaddons + kdoctools + kwallet + accounts-qt + signond + ]; +} diff --git a/pkgs/applications/kde/kaddressbook.nix b/pkgs/applications/kde/kaddressbook.nix index b4b0450e78bf0..452c5142157d1 100644 --- a/pkgs/applications/kde/kaddressbook.nix +++ b/pkgs/applications/kde/kaddressbook.nix @@ -1,5 +1,5 @@ { - mkDerivation, lib, kdepimTeam, + mkDerivation, lib, kdepimTeam, fetchpatch, extra-cmake-modules, kdoctools, akonadi, akonadi-search, grantlee, grantleetheme, kcmutils, kcompletion, kcrash, kdbusaddons, kdepim-apps-libs, ki18n, kontactinterface, kparts, @@ -8,11 +8,18 @@ }: mkDerivation { - name = "kaddressbook"; + pname = "kaddressbook"; meta = { license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; maintainers = kdepimTeam; }; + patches = [ + # Patch for Qt 5.15.2 until version 20.12.0 + (fetchpatch { + url = "https://invent.kde.org/pim/kaddressbook/-/commit/8aee8d40ae2a1c920d3520163d550d3b49720226.patch"; + sha256 = "sha256:0dsy119cd5w9khiwgk6fb7xnjzmj94rfphf327k331lf15zq4853"; + }) + ]; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ akonadi akonadi-search grantlee grantleetheme kcmutils kcompletion kcrash diff --git a/pkgs/applications/kde/kalarm.nix b/pkgs/applications/kde/kalarm.nix index a1dec1179cc6c..70ee3f7418543 100644 --- a/pkgs/applications/kde/kalarm.nix +++ b/pkgs/applications/kde/kalarm.nix @@ -16,7 +16,7 @@ }: mkDerivation { - name = "kalarm"; + pname = "kalarm"; meta = { license = with lib.licenses; [ gpl2 ]; maintainers = [ lib.maintainers.rittelle ]; diff --git a/pkgs/applications/kde/kalarmcal.nix b/pkgs/applications/kde/kalarmcal.nix index 356c1e4812d6f..5671174e9b1f2 100644 --- a/pkgs/applications/kde/kalarmcal.nix +++ b/pkgs/applications/kde/kalarmcal.nix @@ -6,7 +6,7 @@ }: mkDerivation { - name = "kalarmcal"; + pname = "kalarmcal"; meta = { license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; maintainers = kdepimTeam; diff --git a/pkgs/applications/kde/kalzium.nix b/pkgs/applications/kde/kalzium.nix index cf579caa9cc8b..3f51f068815b7 100644 --- a/pkgs/applications/kde/kalzium.nix +++ b/pkgs/applications/kde/kalzium.nix @@ -1,7 +1,7 @@ { mkDerivation, lib, extra-cmake-modules, kdoctools, ki18n, kio, openbabel, avogadro, qtscript, kparts, kplotting, kunitconversion }: mkDerivation { - name = "kalzium"; + pname = "kalzium"; meta = with lib; { homepage = "https://kde.org/applications/en/utilities/org.kde.kalzium"; description = "Program that shows you the Periodic Table of Elements"; diff --git a/pkgs/applications/kde/kapman.nix b/pkgs/applications/kde/kapman.nix index 5f4cc40138c0c..01fa984e59332 100644 --- a/pkgs/applications/kde/kapman.nix +++ b/pkgs/applications/kde/kapman.nix @@ -1,7 +1,7 @@ { mkDerivation, lib, extra-cmake-modules, kdoctools, ki18n, kio, libkdegames }: mkDerivation { - name = "kapman"; + pname = "kapman"; meta = with lib; { homepage = "https://kde.org/applications/en/games/org.kde.kapman"; description = "Clone of the well known game Pac-Man"; diff --git a/pkgs/applications/kde/kapptemplate.nix b/pkgs/applications/kde/kapptemplate.nix index a5e211318a26c..7251648be09d5 100644 --- a/pkgs/applications/kde/kapptemplate.nix +++ b/pkgs/applications/kde/kapptemplate.nix @@ -8,7 +8,7 @@ }: mkDerivation { - name = "kapptemplate"; + pname = "kapptemplate"; nativeBuildInputs = [ extra-cmake-modules cmake ]; diff --git a/pkgs/applications/kde/kate.nix b/pkgs/applications/kde/kate.nix index e0d0273efde19..1cc16496d1210 100644 --- a/pkgs/applications/kde/kate.nix +++ b/pkgs/applications/kde/kate.nix @@ -8,7 +8,7 @@ }: mkDerivation { - name = "kate"; + pname = "kate"; meta = { license = with lib.licenses; [ gpl3 lgpl3 lgpl2 ]; maintainers = [ lib.maintainers.ttuegel ]; diff --git a/pkgs/applications/kde/katomic.nix b/pkgs/applications/kde/katomic.nix index 2690cfc058971..aa00d58c417e4 100644 --- a/pkgs/applications/kde/katomic.nix +++ b/pkgs/applications/kde/katomic.nix @@ -1,7 +1,7 @@ { mkDerivation, lib, extra-cmake-modules, kdoctools, ki18n, kio, libkdegames, knewstuff }: mkDerivation { - name = "katomic"; + pname = "katomic"; meta = with lib; { homepage = "https://kde.org/applications/en/games/org.kde.katomic"; description = "Fun educational game built around molecular geometry"; diff --git a/pkgs/applications/kde/kblackbox.nix b/pkgs/applications/kde/kblackbox.nix index ce0d8e36b91b5..9f2f652f55865 100644 --- a/pkgs/applications/kde/kblackbox.nix +++ b/pkgs/applications/kde/kblackbox.nix @@ -1,7 +1,7 @@ { mkDerivation, lib, extra-cmake-modules, kdoctools, ki18n, kio, libkdegames }: mkDerivation { - name = "kblackbox"; + pname = "kblackbox"; meta = with lib; { homepage = "https://kde.org/applications/en/games/org.kde.kblackbox"; description = "Game of hide and seek played on a grid of boxes"; diff --git a/pkgs/applications/kde/kblocks.nix b/pkgs/applications/kde/kblocks.nix index a11a6e2574409..971901687f029 100644 --- a/pkgs/applications/kde/kblocks.nix +++ b/pkgs/applications/kde/kblocks.nix @@ -1,7 +1,7 @@ { mkDerivation, lib, extra-cmake-modules, kdoctools, ki18n, kio, libkdegames }: mkDerivation { - name = "kblocks"; + pname = "kblocks"; meta = with lib; { homepage = "https://kde.org/applications/en/games/org.kde.kblocks"; description = "Classic falling blocks game"; diff --git a/pkgs/applications/kde/kbounce.nix b/pkgs/applications/kde/kbounce.nix index b67e3ce02173d..d96c0f7f82734 100644 --- a/pkgs/applications/kde/kbounce.nix +++ b/pkgs/applications/kde/kbounce.nix @@ -1,7 +1,7 @@ { mkDerivation, lib, extra-cmake-modules, libkdegames, kconfig, kcrash, kio, ki18n }: mkDerivation { - name = "kbounce"; + pname = "kbounce"; meta = with lib; { homepage = "https://kde.org/applications/en/games/org.kde.kbounce"; description = "Single player arcade game with the elements of puzzle"; diff --git a/pkgs/applications/kde/kbreakout.nix b/pkgs/applications/kde/kbreakout.nix index fbcddd46ca856..cf60ada3c00d4 100644 --- a/pkgs/applications/kde/kbreakout.nix +++ b/pkgs/applications/kde/kbreakout.nix @@ -10,7 +10,7 @@ }: mkDerivation { - name = "kbreakout"; + pname = "kbreakout"; meta.license = with lib.licenses; [ lgpl21 gpl3 ]; outputs = [ "out" "dev" ]; nativeBuildInputs = [ diff --git a/pkgs/applications/kde/kcachegrind.nix b/pkgs/applications/kde/kcachegrind.nix index 16fc6c5177743..308ed35dc4ed7 100644 --- a/pkgs/applications/kde/kcachegrind.nix +++ b/pkgs/applications/kde/kcachegrind.nix @@ -6,7 +6,7 @@ }: mkDerivation { - name = "kcachegrind"; + pname = "kcachegrind"; meta = { license = with lib.licenses; [ gpl2 ]; maintainers = with lib.maintainers; [ orivej ]; diff --git a/pkgs/applications/kde/kcalc.nix b/pkgs/applications/kde/kcalc.nix index 4e2a308b17f55..b24046df5f5f9 100644 --- a/pkgs/applications/kde/kcalc.nix +++ b/pkgs/applications/kde/kcalc.nix @@ -6,7 +6,7 @@ }: mkDerivation { - name = "kcalc"; + pname = "kcalc"; meta = { license = with lib.licenses; [ gpl2 ]; maintainers = [ lib.maintainers.fridh ]; diff --git a/pkgs/applications/kde/kcalutils.nix b/pkgs/applications/kde/kcalutils.nix index 2e389ec4ac7de..1fce68e7f4647 100644 --- a/pkgs/applications/kde/kcalutils.nix +++ b/pkgs/applications/kde/kcalutils.nix @@ -6,7 +6,7 @@ }: mkDerivation { - name = "kcalutils"; + pname = "kcalutils"; meta = { license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; maintainers = kdepimTeam; diff --git a/pkgs/applications/kde/kcharselect.nix b/pkgs/applications/kde/kcharselect.nix index 4af712b1d5a56..d35ee5ee670c0 100644 --- a/pkgs/applications/kde/kcharselect.nix +++ b/pkgs/applications/kde/kcharselect.nix @@ -5,7 +5,7 @@ }: mkDerivation { - name = "kcharselect"; + pname = "kcharselect"; meta = { license = lib.licenses.gpl2Plus; maintainers = [ lib.maintainers.schmittlauch ]; diff --git a/pkgs/applications/kde/kcolorchooser.nix b/pkgs/applications/kde/kcolorchooser.nix index 45b32fbe832c6..87ab227156158 100644 --- a/pkgs/applications/kde/kcolorchooser.nix +++ b/pkgs/applications/kde/kcolorchooser.nix @@ -5,7 +5,7 @@ }: mkDerivation { - name = "kcolorchooser"; + pname = "kcolorchooser"; meta = { license = with lib.licenses; [ mit ]; maintainers = [ lib.maintainers.ttuegel ]; diff --git a/pkgs/applications/kde/kdebugsettings.nix b/pkgs/applications/kde/kdebugsettings.nix index a58e1b25a2ee8..f4dd7ec145d06 100644 --- a/pkgs/applications/kde/kdebugsettings.nix +++ b/pkgs/applications/kde/kdebugsettings.nix @@ -7,7 +7,7 @@ }: mkDerivation { - name = "kdebugsettings"; + pname = "kdebugsettings"; meta = { license = with lib.licenses; [ gpl2 ]; maintainers = [ lib.maintainers.rittelle ]; diff --git a/pkgs/applications/kde/kdeconnect-kde.nix b/pkgs/applications/kde/kdeconnect-kde.nix index 83e54d1fa80c5..8c7b2b635c097 100644 --- a/pkgs/applications/kde/kdeconnect-kde.nix +++ b/pkgs/applications/kde/kdeconnect-kde.nix @@ -26,15 +26,7 @@ }: mkDerivation { - name = "kdeconnect-kde"; - - patches = [ - # https://invent.kde.org/network/kdeconnect-kde/-/merge_requests/328 - (fetchpatch { - url = "https://invent.kde.org/network/kdeconnect-kde/-/commit/6101ef3ad07d865958d58a3d2736f5536f1c5719.diff"; - sha256 = "17mr7k13226vzcgxlmfs6q2mdc5j7vwp4iri9apmh6xlf6r591ac"; - }) - ]; + pname = "kdeconnect-kde"; buildInputs = [ kcmutils diff --git a/pkgs/applications/kde/kdegraphics-mobipocket.nix b/pkgs/applications/kde/kdegraphics-mobipocket.nix index e5f5b88ec440f..bdfe5102c01a1 100644 --- a/pkgs/applications/kde/kdegraphics-mobipocket.nix +++ b/pkgs/applications/kde/kdegraphics-mobipocket.nix @@ -5,7 +5,7 @@ }: mkDerivation { - name = "kdegraphics-mobipocket"; + pname = "kdegraphics-mobipocket"; meta = { license = [ lib.licenses.gpl2Plus ]; maintainers = [ lib.maintainers.ttuegel ]; diff --git a/pkgs/applications/kde/kdegraphics-thumbnailers.nix b/pkgs/applications/kde/kdegraphics-thumbnailers.nix index 2e7887582f951..10280be3c30ef 100644 --- a/pkgs/applications/kde/kdegraphics-thumbnailers.nix +++ b/pkgs/applications/kde/kdegraphics-thumbnailers.nix @@ -4,7 +4,7 @@ }: mkDerivation { - name = "kdegraphics-thumbnailers"; + pname = "kdegraphics-thumbnailers"; meta = { license = [ lib.licenses.lgpl21 ]; maintainers = [ lib.maintainers.ttuegel ]; diff --git a/pkgs/applications/kde/kdenetwork-filesharing.nix b/pkgs/applications/kde/kdenetwork-filesharing.nix index d251eb74f274a..94656b026710f 100644 --- a/pkgs/applications/kde/kdenetwork-filesharing.nix +++ b/pkgs/applications/kde/kdenetwork-filesharing.nix @@ -5,7 +5,7 @@ }: mkDerivation { - name = "kdenetwork-filesharing"; + pname = "kdenetwork-filesharing"; meta = { license = [ lib.licenses.gpl2 lib.licenses.lgpl21 ]; maintainers = [ lib.maintainers.ttuegel ]; diff --git a/pkgs/applications/kde/kdenlive.nix b/pkgs/applications/kde/kdenlive.nix index b2abee5793962..47afcd0a67e39 100644 --- a/pkgs/applications/kde/kdenlive.nix +++ b/pkgs/applications/kde/kdenlive.nix @@ -35,7 +35,7 @@ }: mkDerivation { - name = "kdenlive"; + pname = "kdenlive"; nativeBuildInputs = [ extra-cmake-modules kdoctools diff --git a/pkgs/applications/kde/kdepim-addons.nix b/pkgs/applications/kde/kdepim-addons.nix index e47aae89e6034..0939b0ecd26ff 100644 --- a/pkgs/applications/kde/kdepim-addons.nix +++ b/pkgs/applications/kde/kdepim-addons.nix @@ -9,7 +9,7 @@ }: mkDerivation { - name = "kdepim-addons"; + pname = "kdepim-addons"; meta = { license = with lib.licenses; [ gpl2Plus lgpl21Plus ]; maintainers = kdepimTeam; diff --git a/pkgs/applications/kde/kdepim-apps-libs/default.nix b/pkgs/applications/kde/kdepim-apps-libs/default.nix index 57c02ea4e84ce..19f476fd781ec 100644 --- a/pkgs/applications/kde/kdepim-apps-libs/default.nix +++ b/pkgs/applications/kde/kdepim-apps-libs/default.nix @@ -6,7 +6,7 @@ }: mkDerivation { - name = "kdepim-apps-libs"; + pname = "kdepim-apps-libs"; meta = { license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; maintainers = kdepimTeam; diff --git a/pkgs/applications/kde/kdepim-runtime/default.nix b/pkgs/applications/kde/kdepim-runtime/default.nix index e0a5d43e654fd..335284aa6c4d3 100644 --- a/pkgs/applications/kde/kdepim-runtime/default.nix +++ b/pkgs/applications/kde/kdepim-runtime/default.nix @@ -9,7 +9,7 @@ }: mkDerivation { - name = "kdepim-runtime"; + pname = "kdepim-runtime"; meta = { license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; maintainers = kdepimTeam; diff --git a/pkgs/applications/kde/kdf.nix b/pkgs/applications/kde/kdf.nix index eef94fd5eb240..5c196d6a3b129 100644 --- a/pkgs/applications/kde/kdf.nix +++ b/pkgs/applications/kde/kdf.nix @@ -5,7 +5,7 @@ }: mkDerivation { - name = "kdf"; + pname = "kdf"; meta = { license = with lib.licenses; [ gpl2 ]; maintainers = [ lib.maintainers.peterhoeg ]; diff --git a/pkgs/applications/kde/kdialog.nix b/pkgs/applications/kde/kdialog.nix index df301af0cbac8..192bfda4c27b0 100644 --- a/pkgs/applications/kde/kdialog.nix +++ b/pkgs/applications/kde/kdialog.nix @@ -5,7 +5,7 @@ }: mkDerivation { - name = "kdialog"; + pname = "kdialog"; meta = { license = with lib.licenses; [ gpl2 fdl12 ]; diff --git a/pkgs/applications/kde/kdiamond.nix b/pkgs/applications/kde/kdiamond.nix index 6c124f9450eae..040806fd08e06 100644 --- a/pkgs/applications/kde/kdiamond.nix +++ b/pkgs/applications/kde/kdiamond.nix @@ -1,7 +1,7 @@ { mkDerivation, lib, extra-cmake-modules, kdoctools, ki18n, kio, libkdegames, kconfig, knotifyconfig }: mkDerivation { - name = "kdiamond"; + pname = "kdiamond"; meta = with lib; { homepage = "https://kde.org/applications/en/games/org.kde.kdiamond"; description = "A single player puzzle game"; diff --git a/pkgs/applications/kde/keditbookmarks.nix b/pkgs/applications/kde/keditbookmarks.nix index efe247df73763..9deb1a3c01588 100644 --- a/pkgs/applications/kde/keditbookmarks.nix +++ b/pkgs/applications/kde/keditbookmarks.nix @@ -5,7 +5,7 @@ }: mkDerivation { - name = "keditbookmarks"; + pname = "keditbookmarks"; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ kio kparts kwindowsystem ]; meta = with lib; { diff --git a/pkgs/applications/kde/kfind.nix b/pkgs/applications/kde/kfind.nix index 10932b38032ca..fa0ef1c92203a 100644 --- a/pkgs/applications/kde/kfind.nix +++ b/pkgs/applications/kde/kfind.nix @@ -5,7 +5,7 @@ }: mkDerivation { - name = "kfind"; + pname = "kfind"; meta = { license = with lib.licenses; [ gpl2 ]; maintainers = [ lib.maintainers.iblech ]; diff --git a/pkgs/applications/kde/kfloppy.nix b/pkgs/applications/kde/kfloppy.nix index a8747047f42fe..a88fd9283e064 100644 --- a/pkgs/applications/kde/kfloppy.nix +++ b/pkgs/applications/kde/kfloppy.nix @@ -1,7 +1,7 @@ { mkDerivation, lib, extra-cmake-modules, kdoctools, kcompletion, kxmlgui }: mkDerivation { - name = "kfloppy"; + pname = "kfloppy"; meta = with lib; { homepage = "https://kde.org/applications/en/utilities/org.kde.kfloppy"; description = "Utility to format 3.5\" and 5.25\" floppy disks"; diff --git a/pkgs/applications/kde/kgeography.nix b/pkgs/applications/kde/kgeography.nix index c96c198cca9c6..7a5d5516b5ef0 100644 --- a/pkgs/applications/kde/kgeography.nix +++ b/pkgs/applications/kde/kgeography.nix @@ -5,7 +5,7 @@ }: mkDerivation { - name = "kgeography"; + pname = "kgeography"; meta = { license = with lib.licenses; [ gpl2 ]; maintainers = [ lib.maintainers.globin ]; diff --git a/pkgs/applications/kde/kget.nix b/pkgs/applications/kde/kget.nix index 6a50f1d08d1ce..b03246eacd593 100644 --- a/pkgs/applications/kde/kget.nix +++ b/pkgs/applications/kde/kget.nix @@ -6,7 +6,7 @@ }: mkDerivation { - name = "kget"; + pname = "kget"; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; diff --git a/pkgs/applications/kde/kgpg.nix b/pkgs/applications/kde/kgpg.nix index 944cff47e0d64..32ba95231cdb8 100644 --- a/pkgs/applications/kde/kgpg.nix +++ b/pkgs/applications/kde/kgpg.nix @@ -7,7 +7,7 @@ }: mkDerivation { - name = "kgpg"; + pname = "kgpg"; nativeBuildInputs = [ extra-cmake-modules kdoctools makeWrapper ]; buildInputs = [ akonadi-contacts gnupg karchive kcodecs kcontacts kcoreaddons kcrash diff --git a/pkgs/applications/kde/khelpcenter.nix b/pkgs/applications/kde/khelpcenter.nix index 69b629bbeb90f..77f30d8e69b65 100644 --- a/pkgs/applications/kde/khelpcenter.nix +++ b/pkgs/applications/kde/khelpcenter.nix @@ -6,7 +6,7 @@ }: mkDerivation { - name = "khelpcenter"; + pname = "khelpcenter"; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ grantlee kcmutils kconfig kcoreaddons kdbusaddons kdelibs4support khtml diff --git a/pkgs/applications/kde/kidentitymanagement.nix b/pkgs/applications/kde/kidentitymanagement.nix index 92fcc23877978..789206a16390c 100644 --- a/pkgs/applications/kde/kidentitymanagement.nix +++ b/pkgs/applications/kde/kidentitymanagement.nix @@ -6,7 +6,7 @@ }: mkDerivation { - name = "kidentitymanagement"; + pname = "kidentitymanagement"; meta = { license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; maintainers = kdepimTeam; diff --git a/pkgs/applications/kde/kig.nix b/pkgs/applications/kde/kig.nix index 7b85890779521..1ca57d91c1970 100644 --- a/pkgs/applications/kde/kig.nix +++ b/pkgs/applications/kde/kig.nix @@ -6,7 +6,7 @@ }: mkDerivation { - name = "kig"; + pname = "kig"; meta = { license = with lib.licenses; [ gpl2 ]; maintainers = with lib.maintainers; [ raskin ]; diff --git a/pkgs/applications/kde/kigo.nix b/pkgs/applications/kde/kigo.nix index 6585f943f2a16..238158b524b37 100644 --- a/pkgs/applications/kde/kigo.nix +++ b/pkgs/applications/kde/kigo.nix @@ -1,7 +1,7 @@ { mkDerivation, lib, extra-cmake-modules, kdoctools, ki18n, kio, libkdegames, knewstuff }: mkDerivation { - name = "kigo"; + pname = "kigo"; meta = with lib; { homepage = "https://kde.org/applications/en/games/org.kde.kigo"; description = "An open-source implementation of the popular Go game"; diff --git a/pkgs/applications/kde/killbots.nix b/pkgs/applications/kde/killbots.nix index ec9b6de82c905..ef81c3b5ec111 100644 --- a/pkgs/applications/kde/killbots.nix +++ b/pkgs/applications/kde/killbots.nix @@ -1,7 +1,7 @@ { mkDerivation, lib, extra-cmake-modules, kdoctools, ki18n, kio, libkdegames }: mkDerivation { - name = "killbots"; + pname = "killbots"; meta = with lib; { homepage = "https://kde.org/applications/en/games/org.kde.killbots"; description = "A game where you avoid robots"; diff --git a/pkgs/applications/kde/kimap.nix b/pkgs/applications/kde/kimap.nix index 9e42c5710583f..e93804bd885da 100644 --- a/pkgs/applications/kde/kimap.nix +++ b/pkgs/applications/kde/kimap.nix @@ -5,7 +5,7 @@ }: mkDerivation { - name = "kimap"; + pname = "kimap"; meta = { license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; maintainers = kdepimTeam; diff --git a/pkgs/applications/kde/kio-extras.nix b/pkgs/applications/kde/kio-extras.nix index a803ba72982d5..fdc531d5d12d1 100644 --- a/pkgs/applications/kde/kio-extras.nix +++ b/pkgs/applications/kde/kio-extras.nix @@ -7,7 +7,7 @@ }: mkDerivation { - name = "kio-extras"; + pname = "kio-extras"; meta = { license = with lib.licenses; [ gpl2 lgpl21 ]; maintainers = [ lib.maintainers.ttuegel ]; diff --git a/pkgs/applications/kde/kipi-plugins.nix b/pkgs/applications/kde/kipi-plugins.nix index 180d066a87cf4..d79980a3a6f15 100644 --- a/pkgs/applications/kde/kipi-plugins.nix +++ b/pkgs/applications/kde/kipi-plugins.nix @@ -6,7 +6,7 @@ }: mkDerivation { - name = "kipi-plugins"; + pname = "kipi-plugins"; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ diff --git a/pkgs/applications/kde/kitinerary.nix b/pkgs/applications/kde/kitinerary.nix index 303ea6162ba49..cc71307f1acb3 100644 --- a/pkgs/applications/kde/kitinerary.nix +++ b/pkgs/applications/kde/kitinerary.nix @@ -6,7 +6,7 @@ }: mkDerivation { - name = "kitinerary"; + pname = "kitinerary"; meta = { license = with lib.licenses; [ lgpl21 ]; maintainers = [ lib.maintainers.bkchr ]; diff --git a/pkgs/applications/kde/kldap.nix b/pkgs/applications/kde/kldap.nix index 14a8aea5e67ae..888ac59ddfb64 100644 --- a/pkgs/applications/kde/kldap.nix +++ b/pkgs/applications/kde/kldap.nix @@ -5,7 +5,7 @@ }: mkDerivation { - name = "kldap"; + pname = "kldap"; meta = { license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; maintainers = kdepimTeam; diff --git a/pkgs/applications/kde/kleopatra.nix b/pkgs/applications/kde/kleopatra.nix index c15c6eb78d692..f1f8ae9b375be 100644 --- a/pkgs/applications/kde/kleopatra.nix +++ b/pkgs/applications/kde/kleopatra.nix @@ -6,7 +6,7 @@ }: mkDerivation { - name = "kleopatra"; + pname = "kleopatra"; meta = { license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; maintainers = kdepimTeam; diff --git a/pkgs/applications/kde/klettres.nix b/pkgs/applications/kde/klettres.nix index aaddceb7bd6d8..ca63c4f456e15 100644 --- a/pkgs/applications/kde/klettres.nix +++ b/pkgs/applications/kde/klettres.nix @@ -1,7 +1,7 @@ { mkDerivation, lib, extra-cmake-modules, kdoctools, ki18n, kio, phonon, knewstuff }: mkDerivation { - name = "klettres"; + pname = "klettres"; meta = with lib; { homepage = "https://kde.org/applications/en/utilities/org.kde.klettres"; description = "An application specially designed to help the user to learn an alphabet"; diff --git a/pkgs/applications/kde/klines.nix b/pkgs/applications/kde/klines.nix index 7fadf409bd3d7..336ea9a2506e6 100644 --- a/pkgs/applications/kde/klines.nix +++ b/pkgs/applications/kde/klines.nix @@ -1,7 +1,7 @@ { mkDerivation, lib, extra-cmake-modules, kdoctools, ki18n, kio, libkdegames }: mkDerivation { - name = "klines"; + pname = "klines"; meta = with lib; { homepage = "https://kde.org/applications/en/games/org.kde.klines"; description = "A simple but highly addictive one player game"; diff --git a/pkgs/applications/kde/kmag.nix b/pkgs/applications/kde/kmag.nix index fdac690cf22f9..ba1bb8d18515c 100644 --- a/pkgs/applications/kde/kmag.nix +++ b/pkgs/applications/kde/kmag.nix @@ -1,7 +1,7 @@ { mkDerivation, lib, extra-cmake-modules, kdoctools, ki18n, kio }: mkDerivation { - name = "kmag"; + pname = "kmag"; meta = with lib; { homepage = "https://kde.org/applications/en/utilities/org.kde.kmag"; description = "A small Linux utility to magnify a part of the screen"; diff --git a/pkgs/applications/kde/kmahjongg.nix b/pkgs/applications/kde/kmahjongg.nix index 93588b241e11a..285cf8adff521 100644 --- a/pkgs/applications/kde/kmahjongg.nix +++ b/pkgs/applications/kde/kmahjongg.nix @@ -9,7 +9,7 @@ }: mkDerivation { - name = "kmahjongg"; + pname = "kmahjongg"; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ kdeclarative libkmahjongg knewstuff libkdegames ]; meta = { diff --git a/pkgs/applications/kde/kmail-account-wizard.nix b/pkgs/applications/kde/kmail-account-wizard.nix index f380315cce903..c0ab4ff947e9c 100644 --- a/pkgs/applications/kde/kmail-account-wizard.nix +++ b/pkgs/applications/kde/kmail-account-wizard.nix @@ -7,7 +7,7 @@ }: mkDerivation { - name = "kmail-account-wizard"; + pname = "kmail-account-wizard"; meta = { license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; maintainers = kdepimTeam; diff --git a/pkgs/applications/kde/kmail.nix b/pkgs/applications/kde/kmail.nix index d225eba822340..fa3fe033035f5 100644 --- a/pkgs/applications/kde/kmail.nix +++ b/pkgs/applications/kde/kmail.nix @@ -11,7 +11,7 @@ }: mkDerivation { - name = "kmail"; + pname = "kmail"; meta = { license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; maintainers = kdepimTeam; diff --git a/pkgs/applications/kde/kmailtransport.nix b/pkgs/applications/kde/kmailtransport.nix index d5832db570cc5..5efdc959afb5d 100644 --- a/pkgs/applications/kde/kmailtransport.nix +++ b/pkgs/applications/kde/kmailtransport.nix @@ -7,7 +7,7 @@ }: mkDerivation { - name = "kmailtransport"; + pname = "kmailtransport"; meta = { license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; maintainers = kdepimTeam; diff --git a/pkgs/applications/kde/kmbox.nix b/pkgs/applications/kde/kmbox.nix index c1348edf3f6fb..6f3db970b942b 100644 --- a/pkgs/applications/kde/kmbox.nix +++ b/pkgs/applications/kde/kmbox.nix @@ -5,7 +5,7 @@ }: mkDerivation { - name = "kmbox"; + pname = "kmbox"; meta = { license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; maintainers = kdepimTeam; diff --git a/pkgs/applications/kde/kmime.nix b/pkgs/applications/kde/kmime.nix index 4523a69fc1be0..51e78b5f64976 100644 --- a/pkgs/applications/kde/kmime.nix +++ b/pkgs/applications/kde/kmime.nix @@ -5,7 +5,7 @@ }: mkDerivation { - name = "kmime"; + pname = "kmime"; meta = { license = [ lib.licenses.lgpl21 ]; maintainers = kdepimTeam; @@ -13,4 +13,5 @@ mkDerivation { nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ kcodecs ki18n qtbase ]; outputs = [ "out" "dev" ]; + meta.broken = lib.versionOlder qtbase.version "5.15.0"; } diff --git a/pkgs/applications/kde/kmines.nix b/pkgs/applications/kde/kmines.nix index edf3114244b9f..66131df26c16a 100644 --- a/pkgs/applications/kde/kmines.nix +++ b/pkgs/applications/kde/kmines.nix @@ -1,7 +1,7 @@ { mkDerivation, lib, extra-cmake-modules, libkdegames, kconfig, kcrash, kdoctools, ki18n, kio }: mkDerivation { - name = "kmines"; + pname = "kmines"; meta = with lib; { homepage = "https://kde.org/applications/en/games/org.kde.kmines"; description = "A classic Minesweeper game"; diff --git a/pkgs/applications/kde/kmix.nix b/pkgs/applications/kde/kmix.nix index 8010c57d92783..207fba8e77b56 100644 --- a/pkgs/applications/kde/kmix.nix +++ b/pkgs/applications/kde/kmix.nix @@ -6,7 +6,7 @@ }: mkDerivation { - name = "kmix"; + pname = "kmix"; meta = { license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; maintainers = [ lib.maintainers.rongcuid ]; diff --git a/pkgs/applications/kde/kmplot.nix b/pkgs/applications/kde/kmplot.nix index c0c00f2134008..04ccb809c79b1 100644 --- a/pkgs/applications/kde/kmplot.nix +++ b/pkgs/applications/kde/kmplot.nix @@ -3,7 +3,7 @@ }: mkDerivation { - name = "kmplot"; + pname = "kmplot"; meta = { license = with lib.licenses; [ gpl2Plus fdl12 ]; maintainers = [ lib.maintainers.orivej ]; diff --git a/pkgs/applications/kde/knavalbattle.nix b/pkgs/applications/kde/knavalbattle.nix index 669f9961a4978..155faf4e5399b 100644 --- a/pkgs/applications/kde/knavalbattle.nix +++ b/pkgs/applications/kde/knavalbattle.nix @@ -1,7 +1,7 @@ { mkDerivation, lib, extra-cmake-modules, kdoctools, ki18n, kio, libkdegames, kdnssd }: mkDerivation { - name = "knavalbattle"; + pname = "knavalbattle"; meta = with lib; { homepage = "https://kde.org/applications/en/games/org.kde.knavalbattle"; description = "Naval Battle is a ship sinking game"; diff --git a/pkgs/applications/kde/knetwalk.nix b/pkgs/applications/kde/knetwalk.nix index f34bb84f0a064..3a863b40a1c6e 100644 --- a/pkgs/applications/kde/knetwalk.nix +++ b/pkgs/applications/kde/knetwalk.nix @@ -1,7 +1,7 @@ { mkDerivation, lib, extra-cmake-modules, kdoctools, ki18n, kio, libkdegames }: mkDerivation { - name = "knetwalk"; + pname = "knetwalk"; meta = with lib; { homepage = "https://kde.org/applications/en/games/org.kde.knetwalk"; description = "A single player logic game"; diff --git a/pkgs/applications/kde/knights.nix b/pkgs/applications/kde/knights.nix index 8b71493ff1868..084a2349fc1f2 100644 --- a/pkgs/applications/kde/knights.nix +++ b/pkgs/applications/kde/knights.nix @@ -1,7 +1,7 @@ { mkDerivation, lib, extra-cmake-modules, kdoctools, ki18n, kio, kplotting, plasma-framework, libkdegames }: mkDerivation { - name = "knights"; + pname = "knights"; meta = with lib; { homepage = "https://kde.org/applications/en/games/org.kde.knights"; description = "A chess game"; diff --git a/pkgs/applications/kde/knotes.nix b/pkgs/applications/kde/knotes.nix index 2dc2f48c14975..75b92eb07bba0 100644 --- a/pkgs/applications/kde/knotes.nix +++ b/pkgs/applications/kde/knotes.nix @@ -13,7 +13,7 @@ }: mkDerivation { - name = "knotes"; + pname = "knotes"; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ kcompletion kconfig kconfigwidgets kcoreaddons kcrash diff --git a/pkgs/applications/kde/kolf.nix b/pkgs/applications/kde/kolf.nix index f9fa31b665b2f..2f1189855be98 100644 --- a/pkgs/applications/kde/kolf.nix +++ b/pkgs/applications/kde/kolf.nix @@ -6,7 +6,7 @@ }: mkDerivation { - name = "kolf"; + pname = "kolf"; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ libkdegames kio ktextwidgets ]; meta = { diff --git a/pkgs/applications/kde/kollision.nix b/pkgs/applications/kde/kollision.nix index 6cb9995459a42..806b2f5923388 100644 --- a/pkgs/applications/kde/kollision.nix +++ b/pkgs/applications/kde/kollision.nix @@ -1,7 +1,7 @@ { mkDerivation, lib, extra-cmake-modules, kdoctools, ki18n, kio, libkdegames }: mkDerivation { - name = "kollision"; + pname = "kollision"; meta = with lib; { homepage = "https://kde.org/applications/en/games/org.kde.kollision"; description = "A casual game"; diff --git a/pkgs/applications/kde/kolourpaint.nix b/pkgs/applications/kde/kolourpaint.nix index 4501324a87178..66746cf466dcf 100644 --- a/pkgs/applications/kde/kolourpaint.nix +++ b/pkgs/applications/kde/kolourpaint.nix @@ -7,7 +7,7 @@ }: mkDerivation { - name = "kolourpaint"; + pname = "kolourpaint"; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ kdelibs4support libkexiv2 ]; meta = { diff --git a/pkgs/applications/kde/kompare.nix b/pkgs/applications/kde/kompare.nix index bbaad3a02f83b..a449a1e4f51e6 100644 --- a/pkgs/applications/kde/kompare.nix +++ b/pkgs/applications/kde/kompare.nix @@ -1,15 +1,26 @@ { mkDerivation, lib, extra-cmake-modules, kdoctools, - kiconthemes, kparts, ktexteditor, kwidgetsaddons, libkomparediff2 + kiconthemes, kparts, ktexteditor, kwidgetsaddons, libkomparediff2, + fetchpatch }: mkDerivation { - name = "kompare"; + pname = "kompare"; meta = { license = with lib.licenses; [ gpl2 ]; }; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ kiconthemes kparts ktexteditor kwidgetsaddons libkomparediff2 ]; + + patches = [ + (fetchpatch { + # Portaway from Obsolete methods of QPrinter + # Part of v20.12.0 + url = "https://invent.kde.org/sdk/kompare/-/commit/68d3eee36c48a2f44ccfd3f9e5a36311b829104b.patch"; + sha256 = "B2i5n5cUDjCqTEF0OyTb1+LhPa5yWCnFycwijf35kwU="; + }) + ]; + outputs = [ "out" "dev" ]; } diff --git a/pkgs/applications/kde/konqueror.nix b/pkgs/applications/kde/konqueror.nix index 62ed3db063ea2..72fcf8ff220a8 100644 --- a/pkgs/applications/kde/konqueror.nix +++ b/pkgs/applications/kde/konqueror.nix @@ -6,7 +6,7 @@ }: mkDerivation { - name = "konqueror"; + pname = "konqueror"; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ kdelibs4support kcmutils khtml kdesu diff --git a/pkgs/applications/kde/konquest.nix b/pkgs/applications/kde/konquest.nix index cfef018de6cc0..7802b9c66c392 100644 --- a/pkgs/applications/kde/konquest.nix +++ b/pkgs/applications/kde/konquest.nix @@ -8,7 +8,7 @@ }: mkDerivation { - name = "konquest"; + pname = "konquest"; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ kdelibs4support libkdegames qtquickcontrols ]; meta = { diff --git a/pkgs/applications/kde/konsole.nix b/pkgs/applications/kde/konsole.nix index ed26dc08bb6c3..b49507e0b8e31 100644 --- a/pkgs/applications/kde/konsole.nix +++ b/pkgs/applications/kde/konsole.nix @@ -8,7 +8,7 @@ }: mkDerivation { - name = "konsole"; + pname = "konsole"; meta = { license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; maintainers = with lib.maintainers; [ ttuegel turion ]; diff --git a/pkgs/applications/kde/kontact.nix b/pkgs/applications/kde/kontact.nix index eb28458392ce2..3dfa28e9dfe7f 100644 --- a/pkgs/applications/kde/kontact.nix +++ b/pkgs/applications/kde/kontact.nix @@ -8,7 +8,7 @@ }: mkDerivation { - name = "kontact"; + pname = "kontact"; meta = { license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; maintainers = kdepimTeam; diff --git a/pkgs/applications/kde/kontactinterface.nix b/pkgs/applications/kde/kontactinterface.nix index f2df628f30187..b7e033deb0a09 100644 --- a/pkgs/applications/kde/kontactinterface.nix +++ b/pkgs/applications/kde/kontactinterface.nix @@ -5,7 +5,7 @@ }: mkDerivation { - name = "kontactinterface"; + pname = "kontactinterface"; meta = { license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; maintainers = kdepimTeam; diff --git a/pkgs/applications/kde/korganizer.nix b/pkgs/applications/kde/korganizer.nix index 2f37a1bac0fd7..f28e0406b134c 100644 --- a/pkgs/applications/kde/korganizer.nix +++ b/pkgs/applications/kde/korganizer.nix @@ -11,7 +11,7 @@ }: mkDerivation { - name = "korganizer"; + pname = "korganizer"; meta = { license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; maintainers = kdepimTeam; diff --git a/pkgs/applications/kde/kpat.nix b/pkgs/applications/kde/kpat.nix index 9ee5735323784..d1e47af6b7245 100644 --- a/pkgs/applications/kde/kpat.nix +++ b/pkgs/applications/kde/kpat.nix @@ -8,7 +8,7 @@ }: mkDerivation { - name = "kpat"; + pname = "kpat"; nativeBuildInputs = [ extra-cmake-modules shared-mime-info diff --git a/pkgs/applications/kde/kpimtextedit.nix b/pkgs/applications/kde/kpimtextedit.nix index 4ede854d54602..2948075f6963f 100644 --- a/pkgs/applications/kde/kpimtextedit.nix +++ b/pkgs/applications/kde/kpimtextedit.nix @@ -2,15 +2,16 @@ mkDerivation, lib, kdepimTeam, extra-cmake-modules, kdoctools, grantlee, kcodecs, kconfigwidgets, kemoticons, ki18n, kiconthemes, kio, - kdesignerplugin, ktextwidgets, sonnet, syntax-highlighting, qttools, + kdesignerplugin, ktextwidgets, sonnet, syntax-highlighting, qtbase, qttools, qtspeech }: mkDerivation { - name = "kpimtextedit"; + pname = "kpimtextedit"; meta = { license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; maintainers = kdepimTeam; + broken = lib.versionOlder qtbase.version "5.13.0"; }; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ diff --git a/pkgs/applications/kde/kpkpass.nix b/pkgs/applications/kde/kpkpass.nix index 15dfe7f2e49e4..e7b8147712202 100644 --- a/pkgs/applications/kde/kpkpass.nix +++ b/pkgs/applications/kde/kpkpass.nix @@ -4,11 +4,11 @@ }: mkDerivation { - name = "kpkpass"; + pname = "kpkpass"; meta = { license = with lib.licenses; [ lgpl21 ]; maintainers = [ lib.maintainers.bkchr ]; - broken = lib.versionOlder qtbase.version "5.13"; + broken = lib.versionOlder qtbase.version "5.15"; }; nativeBuildInputs = [ extra-cmake-modules shared-mime-info ]; buildInputs = [ qtbase karchive ]; diff --git a/pkgs/applications/kde/kqtquickcharts.nix b/pkgs/applications/kde/kqtquickcharts.nix index 2b3dc5313d9a8..669a38e37ca63 100644 --- a/pkgs/applications/kde/kqtquickcharts.nix +++ b/pkgs/applications/kde/kqtquickcharts.nix @@ -5,7 +5,7 @@ }: mkDerivation { - name = "kqtquickcharts"; + pname = "kqtquickcharts"; meta = { license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; maintainers = [ lib.maintainers.ttuegel ]; diff --git a/pkgs/applications/kde/krdc.nix b/pkgs/applications/kde/krdc.nix index 2b0a1a5c51413..01cc39d9895d8 100644 --- a/pkgs/applications/kde/krdc.nix +++ b/pkgs/applications/kde/krdc.nix @@ -6,7 +6,7 @@ }: mkDerivation { - name = "krdc"; + pname = "krdc"; nativeBuildInputs = [ extra-cmake-modules kdoctools makeWrapper ]; buildInputs = [ kcmutils kcompletion kconfig kdnssd knotifyconfig kwallet kwidgetsaddons diff --git a/pkgs/applications/kde/kreversi.nix b/pkgs/applications/kde/kreversi.nix index 9f4be46738beb..351555b5f338e 100644 --- a/pkgs/applications/kde/kreversi.nix +++ b/pkgs/applications/kde/kreversi.nix @@ -1,7 +1,7 @@ { mkDerivation, lib, extra-cmake-modules, libkdegames, kdeclarative }: mkDerivation { - name = "kreversi"; + pname = "kreversi"; meta = with lib; { homepage = "https://kde.org/applications/en/games/org.kde.kreversi"; description = "A simple one player strategy game played against the computer"; diff --git a/pkgs/applications/kde/krfb.nix b/pkgs/applications/kde/krfb.nix index d2b96bf6100e8..aa280d019b1d7 100644 --- a/pkgs/applications/kde/krfb.nix +++ b/pkgs/applications/kde/krfb.nix @@ -5,7 +5,7 @@ }: mkDerivation { - name = "krfb"; + pname = "krfb"; meta = { license = with lib.licenses; [ gpl2 fdl12 ]; maintainers = with lib.maintainers; [ jerith666 ]; diff --git a/pkgs/applications/kde/kruler.nix b/pkgs/applications/kde/kruler.nix index 2018245cfcb2b..460675e8cb156 100644 --- a/pkgs/applications/kde/kruler.nix +++ b/pkgs/applications/kde/kruler.nix @@ -5,7 +5,7 @@ }: mkDerivation { - name = "kruler"; + pname = "kruler"; meta = { license = with lib.licenses; [ gpl2 ]; maintainers = [ lib.maintainers.vandenoever ]; diff --git a/pkgs/applications/kde/kshisen.nix b/pkgs/applications/kde/kshisen.nix index 5be17bb8ee08f..791e95af6905f 100644 --- a/pkgs/applications/kde/kshisen.nix +++ b/pkgs/applications/kde/kshisen.nix @@ -1,7 +1,7 @@ { mkDerivation, lib, extra-cmake-modules, kdoctools, ki18n, kio, libkdegames, libkmahjongg }: mkDerivation { - name = "kshisen"; + pname = "kshisen"; meta = with lib; { homepage = "https://kde.org/applications/en/games/org.kde.kshisen"; description = "A solitaire-like game played using the standard set of Mahjong tiles"; diff --git a/pkgs/applications/kde/ksmtp/default.nix b/pkgs/applications/kde/ksmtp/default.nix index 6a5f51a17bfe9..3bf80f4abf528 100644 --- a/pkgs/applications/kde/ksmtp/default.nix +++ b/pkgs/applications/kde/ksmtp/default.nix @@ -5,7 +5,7 @@ }: mkDerivation { - name = "ksmtp"; + pname = "ksmtp"; meta = { license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; maintainers = kdepimTeam; diff --git a/pkgs/applications/kde/kspaceduel.nix b/pkgs/applications/kde/kspaceduel.nix index b18a3e7cf8f73..49ef76151eab4 100644 --- a/pkgs/applications/kde/kspaceduel.nix +++ b/pkgs/applications/kde/kspaceduel.nix @@ -10,10 +10,10 @@ }: mkDerivation { - name = "kspaceduel"; + pname = "kspaceduel"; meta.license = with lib.licenses; [ lgpl21 gpl3 ]; outputs = [ "out" "dev" ]; - nativeBuildInputs = [ + nativeBuildInputs = [ cmake extra-cmake-modules ]; propagatedBuildInputs = [ diff --git a/pkgs/applications/kde/ksquares.nix b/pkgs/applications/kde/ksquares.nix index 12d989befe191..b48ee473523c5 100644 --- a/pkgs/applications/kde/ksquares.nix +++ b/pkgs/applications/kde/ksquares.nix @@ -1,7 +1,7 @@ { mkDerivation, lib, extra-cmake-modules, kdoctools, libkdegames, kconfig, kcrash, kxmlgui }: mkDerivation { - name = "ksquares"; + pname = "ksquares"; meta = with lib; { homepage = "https://kde.org/applications/en/games/org.kde.ksquares"; description = "A game of Dots and Boxes"; diff --git a/pkgs/applications/kde/ksudoku.nix b/pkgs/applications/kde/ksudoku.nix index 678c21d5870ee..bf59c6e94c389 100644 --- a/pkgs/applications/kde/ksudoku.nix +++ b/pkgs/applications/kde/ksudoku.nix @@ -8,7 +8,7 @@ }: mkDerivation { - name = "ksudoku"; + pname = "ksudoku"; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ libGLU kdeclarative libkdegames ]; meta = { diff --git a/pkgs/applications/kde/ksystemlog.nix b/pkgs/applications/kde/ksystemlog.nix index bec92d55966d8..08f7ffb7e05c3 100644 --- a/pkgs/applications/kde/ksystemlog.nix +++ b/pkgs/applications/kde/ksystemlog.nix @@ -5,7 +5,7 @@ }: mkDerivation { - name = "ksystemlog"; + pname = "ksystemlog"; nativeBuildInputs = [ extra-cmake-modules gettext kdoctools ]; propagatedBuildInputs = [ karchive kconfig kio ]; diff --git a/pkgs/applications/kde/kteatime.nix b/pkgs/applications/kde/kteatime.nix index 812a13aa118be..639bd933103f1 100644 --- a/pkgs/applications/kde/kteatime.nix +++ b/pkgs/applications/kde/kteatime.nix @@ -1,7 +1,7 @@ { mkDerivation, lib, extra-cmake-modules, kdoctools, ki18n, kconfig, kcrash, kiconthemes, knotifyconfig }: mkDerivation { - name = "kteatime"; + pname = "kteatime"; meta = with lib; { homepage = "https://kde.org/applications/en/utilities/org.kde.kteatime"; description = "A handy timer for steeping tea"; diff --git a/pkgs/applications/kde/ktimer.nix b/pkgs/applications/kde/ktimer.nix index bdb8f2c687b14..7eab059f1a720 100644 --- a/pkgs/applications/kde/ktimer.nix +++ b/pkgs/applications/kde/ktimer.nix @@ -1,7 +1,7 @@ { mkDerivation, lib, extra-cmake-modules, kdoctools, ki18n, kio }: mkDerivation { - name = "ktimer"; + pname = "ktimer"; meta = with lib; { homepage = "https://kde.org/applications/en/utilities/org.kde.ktimer"; description = "A little tool to execute programs after some time"; diff --git a/pkgs/applications/kde/ktnef.nix b/pkgs/applications/kde/ktnef.nix index 61f8672e47d90..c264e0b53ca22 100644 --- a/pkgs/applications/kde/ktnef.nix +++ b/pkgs/applications/kde/ktnef.nix @@ -5,7 +5,7 @@ }: mkDerivation { - name = "ktnef"; + pname = "ktnef"; meta = { license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; maintainers = kdepimTeam; diff --git a/pkgs/applications/kde/ktouch.nix b/pkgs/applications/kde/ktouch.nix index 7e300ea7157e7..9d31d4ec62b08 100644 --- a/pkgs/applications/kde/ktouch.nix +++ b/pkgs/applications/kde/ktouch.nix @@ -9,7 +9,7 @@ mkDerivation { - name = "ktouch"; + pname = "ktouch"; meta = { license = lib.licenses.gpl2; maintainers = [ lib.maintainers.schmittlauch ]; diff --git a/pkgs/applications/kde/kturtle.nix b/pkgs/applications/kde/kturtle.nix index c495b16fef79a..d178f6515450b 100644 --- a/pkgs/applications/kde/kturtle.nix +++ b/pkgs/applications/kde/kturtle.nix @@ -1,7 +1,7 @@ { mkDerivation, lib, extra-cmake-modules, kdoctools, ki18n, kio, knewstuff }: mkDerivation { - name = "kturtle"; + pname = "kturtle"; meta = with lib; { homepage = "https://kde.org/applications/en/utilities/org.kde.kturtle"; description = "An educational programming environment for learning how to program"; diff --git a/pkgs/applications/kde/kwalletmanager.nix b/pkgs/applications/kde/kwalletmanager.nix index e39e7e5157d2a..b5799a24e36ac 100644 --- a/pkgs/applications/kde/kwalletmanager.nix +++ b/pkgs/applications/kde/kwalletmanager.nix @@ -13,7 +13,7 @@ }: mkDerivation { - name = "kwalletmanager"; + pname = "kwalletmanager"; meta = { license = with lib.licenses; [ gpl2 ]; maintainers = with lib.maintainers; [ fridh ]; diff --git a/pkgs/applications/kde/kwave.nix b/pkgs/applications/kde/kwave.nix index 1a831c7c8dd84..125e79c2c3cf4 100644 --- a/pkgs/applications/kde/kwave.nix +++ b/pkgs/applications/kde/kwave.nix @@ -3,7 +3,7 @@ , libogg, libmad, libopus, libvorbis, fftw, librsvg, qtbase }: mkDerivation { - name = "kwave"; + pname = "kwave"; meta = with lib; { homepage = "https://kde.org/applications/en/multimedia/org.kde.kwave"; diff --git a/pkgs/applications/kde/libgravatar.nix b/pkgs/applications/kde/libgravatar.nix index 69a1b9e99cbbf..51e3391b8e772 100644 --- a/pkgs/applications/kde/libgravatar.nix +++ b/pkgs/applications/kde/libgravatar.nix @@ -5,7 +5,7 @@ }: mkDerivation { - name = "libgravatar"; + pname = "libgravatar"; meta = { license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; maintainers = kdepimTeam; diff --git a/pkgs/applications/kde/libkcddb.nix b/pkgs/applications/kde/libkcddb.nix index 3fd4860565428..3dde496050253 100644 --- a/pkgs/applications/kde/libkcddb.nix +++ b/pkgs/applications/kde/libkcddb.nix @@ -3,7 +3,7 @@ , libmusicbrainz5 }: mkDerivation { - name = "libkcddb"; + pname = "libkcddb"; meta = with lib; { license = with licenses; [ gpl2 lgpl21 bsd3 ]; maintainers = with maintainers; [ peterhoeg ]; diff --git a/pkgs/applications/kde/libkdcraw.nix b/pkgs/applications/kde/libkdcraw.nix index 70e3cb0e19565..1419fb0e980b2 100644 --- a/pkgs/applications/kde/libkdcraw.nix +++ b/pkgs/applications/kde/libkdcraw.nix @@ -1,7 +1,7 @@ { mkDerivation, lib, extra-cmake-modules, libraw, qtbase }: mkDerivation { - name = "libkdcraw"; + pname = "libkdcraw"; meta = { license = with lib.licenses; [ gpl2 lgpl21 bsd3 ]; maintainers = [ lib.maintainers.ttuegel ]; diff --git a/pkgs/applications/kde/libkdegames.nix b/pkgs/applications/kde/libkdegames.nix index 494b193b8326e..830837756b8ba 100644 --- a/pkgs/applications/kde/libkdegames.nix +++ b/pkgs/applications/kde/libkdegames.nix @@ -13,7 +13,7 @@ }: mkDerivation { - name = "libkdegames"; + pname = "libkdegames"; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ kdelibs4support qtdeclarative kdeclarative kdnssd knewstuff openal libsndfile diff --git a/pkgs/applications/kde/libkdepim.nix b/pkgs/applications/kde/libkdepim.nix index 92716e40a34f3..cc0c15a9e060f 100644 --- a/pkgs/applications/kde/libkdepim.nix +++ b/pkgs/applications/kde/libkdepim.nix @@ -7,7 +7,7 @@ }: mkDerivation { - name = "libkdepim"; + pname = "libkdepim"; meta = { license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; maintainers = kdepimTeam; diff --git a/pkgs/applications/kde/libkexiv2.nix b/pkgs/applications/kde/libkexiv2.nix index 8c8d244d6f6e6..8d9b3a8203299 100644 --- a/pkgs/applications/kde/libkexiv2.nix +++ b/pkgs/applications/kde/libkexiv2.nix @@ -1,7 +1,7 @@ { mkDerivation, lib, exiv2, extra-cmake-modules, qtbase }: mkDerivation { - name = "libkexiv2"; + pname = "libkexiv2"; meta = { license = with lib.licenses; [ gpl2 lgpl21 bsd3 ]; maintainers = [ lib.maintainers.ttuegel ]; diff --git a/pkgs/applications/kde/libkgapi.nix b/pkgs/applications/kde/libkgapi.nix index 9d2d41c41d7f9..979ca7e2f458d 100644 --- a/pkgs/applications/kde/libkgapi.nix +++ b/pkgs/applications/kde/libkgapi.nix @@ -1,15 +1,16 @@ { mkDerivation, lib, kdepimTeam, extra-cmake-modules, kdoctools, - qtwebengine, kio, kcalendarcore, kcontacts, + qtbase, qtwebengine, kio, kcalendarcore, kcontacts, cyrus_sasl }: mkDerivation { - name = "libkgapi"; + pname = "libkgapi"; meta = { license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; maintainers = kdepimTeam; + broken = lib.versionOlder qtbase.version "5.14.0"; }; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ qtwebengine kio kcalendarcore kcontacts cyrus_sasl ]; diff --git a/pkgs/applications/kde/libkipi.nix b/pkgs/applications/kde/libkipi.nix index c70d8407fc74f..e94f0e6c4a824 100644 --- a/pkgs/applications/kde/libkipi.nix +++ b/pkgs/applications/kde/libkipi.nix @@ -1,7 +1,7 @@ { mkDerivation, lib, extra-cmake-modules, kconfig, ki18n, kservice, kxmlgui }: mkDerivation { - name = "libkipi"; + pname = "libkipi"; meta = { license = with lib.licenses; [ gpl2 lgpl21 bsd3 ]; maintainers = [ lib.maintainers.ttuegel ]; diff --git a/pkgs/applications/kde/libkleo.nix b/pkgs/applications/kde/libkleo.nix index 0958a0e605f7d..dd17345c5f17a 100644 --- a/pkgs/applications/kde/libkleo.nix +++ b/pkgs/applications/kde/libkleo.nix @@ -6,7 +6,7 @@ }: mkDerivation { - name = "libkleo"; + pname = "libkleo"; meta = { license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; maintainers = kdepimTeam; diff --git a/pkgs/applications/kde/libkmahjongg.nix b/pkgs/applications/kde/libkmahjongg.nix index 295b97842686a..b14e50f32bcc7 100644 --- a/pkgs/applications/kde/libkmahjongg.nix +++ b/pkgs/applications/kde/libkmahjongg.nix @@ -6,7 +6,7 @@ }: mkDerivation { - name = "libkmahjongg"; + pname = "libkmahjongg"; meta = { license = with lib.licenses; [ gpl2 ]; maintainers = with lib.maintainers; [ ]; diff --git a/pkgs/applications/kde/libkomparediff2.nix b/pkgs/applications/kde/libkomparediff2.nix index cae2aec5668d3..93ac12d97d620 100644 --- a/pkgs/applications/kde/libkomparediff2.nix +++ b/pkgs/applications/kde/libkomparediff2.nix @@ -1,7 +1,7 @@ { mkDerivation, extra-cmake-modules, ki18n, kxmlgui, kcodecs, kio }: mkDerivation { - name = "libkomparediff2"; + pname = "libkomparediff2"; nativeBuildInputs = [ extra-cmake-modules ]; propagatedBuildInputs = [ kcodecs ki18n kxmlgui kio ]; } diff --git a/pkgs/applications/kde/libksane.nix b/pkgs/applications/kde/libksane.nix index f92f21de7fb8a..33a2ef48f90ba 100644 --- a/pkgs/applications/kde/libksane.nix +++ b/pkgs/applications/kde/libksane.nix @@ -6,7 +6,7 @@ }: mkDerivation { - name = "libksane"; + pname = "libksane"; meta = with lib; { license = licenses.gpl2; maintainers = with maintainers; [ pshendry ]; diff --git a/pkgs/applications/kde/libksieve.nix b/pkgs/applications/kde/libksieve.nix index dd33f759c3135..209647a4791fa 100644 --- a/pkgs/applications/kde/libksieve.nix +++ b/pkgs/applications/kde/libksieve.nix @@ -7,7 +7,7 @@ }: mkDerivation { - name = "libksieve"; + pname = "libksieve"; meta = { license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; maintainers = kdepimTeam; diff --git a/pkgs/applications/kde/mailcommon.nix b/pkgs/applications/kde/mailcommon.nix index 44edea8f55e90..c3a8659a735b2 100644 --- a/pkgs/applications/kde/mailcommon.nix +++ b/pkgs/applications/kde/mailcommon.nix @@ -7,7 +7,7 @@ }: mkDerivation { - name = "mailcommon"; + pname = "mailcommon"; meta = { license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; maintainers = kdepimTeam; diff --git a/pkgs/applications/kde/mailimporter.nix b/pkgs/applications/kde/mailimporter.nix index 5de58658777a7..b1e0461a9593a 100644 --- a/pkgs/applications/kde/mailimporter.nix +++ b/pkgs/applications/kde/mailimporter.nix @@ -6,7 +6,7 @@ }: mkDerivation { - name = "mailimporter"; + pname = "mailimporter"; meta = { license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; maintainers = kdepimTeam; diff --git a/pkgs/applications/kde/marble.nix b/pkgs/applications/kde/marble.nix index f690e453361bd..525289bdc3b7d 100644 --- a/pkgs/applications/kde/marble.nix +++ b/pkgs/applications/kde/marble.nix @@ -6,7 +6,7 @@ }: mkDerivation { - name = "marble"; + pname = "marble"; meta.license = with lib.licenses; [ lgpl21 gpl3 ]; outputs = [ "out" "dev" ]; nativeBuildInputs = [ extra-cmake-modules kdoctools perl ]; diff --git a/pkgs/applications/kde/mbox-importer.nix b/pkgs/applications/kde/mbox-importer.nix index 0704003353aed..eadb27f05bc99 100644 --- a/pkgs/applications/kde/mbox-importer.nix +++ b/pkgs/applications/kde/mbox-importer.nix @@ -5,7 +5,7 @@ }: mkDerivation { - name = "mbox-importer"; + pname = "mbox-importer"; meta = { license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; maintainers = kdepimTeam; diff --git a/pkgs/applications/kde/messagelib.nix b/pkgs/applications/kde/messagelib.nix index e31e61d35ca30..d47a5504417ae 100644 --- a/pkgs/applications/kde/messagelib.nix +++ b/pkgs/applications/kde/messagelib.nix @@ -9,7 +9,7 @@ }: mkDerivation { - name = "messagelib"; + pname = "messagelib"; meta = { license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; maintainers = kdepimTeam; diff --git a/pkgs/applications/kde/minuet.nix b/pkgs/applications/kde/minuet.nix index 2c0f0a5092d8b..ca7d6124ed591 100644 --- a/pkgs/applications/kde/minuet.nix +++ b/pkgs/applications/kde/minuet.nix @@ -6,7 +6,7 @@ }: mkDerivation { - name = "minuet"; + pname = "minuet"; meta = with lib; { license = with licenses; [ lgpl21 gpl3 ]; maintainers = with maintainers; [ peterhoeg HaoZeke ]; diff --git a/pkgs/applications/kde/okular.nix b/pkgs/applications/kde/okular.nix index 288b2ceb807f9..12537eba270a2 100644 --- a/pkgs/applications/kde/okular.nix +++ b/pkgs/applications/kde/okular.nix @@ -9,7 +9,7 @@ }: mkDerivation { - name = "okular"; + pname = "okular"; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ breeze-icons discount djvulibre ebook_tools kactivities karchive kbookmarks diff --git a/pkgs/applications/kde/picmi.nix b/pkgs/applications/kde/picmi.nix index dd09e8f9cd80f..25734e318ab43 100644 --- a/pkgs/applications/kde/picmi.nix +++ b/pkgs/applications/kde/picmi.nix @@ -4,7 +4,7 @@ }: mkDerivation { - name = "picmi"; + pname = "picmi"; meta = with lib; { description = "Nonogram game"; longDescription = ''The goal is to reveal the hidden pattern in the board by coloring or diff --git a/pkgs/applications/kde/pim-data-exporter.nix b/pkgs/applications/kde/pim-data-exporter.nix index 82cdf19df948f..746bb2aec2ad9 100644 --- a/pkgs/applications/kde/pim-data-exporter.nix +++ b/pkgs/applications/kde/pim-data-exporter.nix @@ -8,7 +8,7 @@ }: mkDerivation { - name = "pim-data-exporter"; + pname = "pim-data-exporter"; meta = { license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; maintainers = kdepimTeam; diff --git a/pkgs/applications/kde/pim-sieve-editor.nix b/pkgs/applications/kde/pim-sieve-editor.nix index c83df2e0e4988..1f3f1542cdba0 100644 --- a/pkgs/applications/kde/pim-sieve-editor.nix +++ b/pkgs/applications/kde/pim-sieve-editor.nix @@ -6,7 +6,7 @@ }: mkDerivation { - name = "pim-sieve-editor"; + pname = "pim-sieve-editor"; meta = { license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; maintainers = kdepimTeam; diff --git a/pkgs/applications/kde/pimcommon.nix b/pkgs/applications/kde/pimcommon.nix index 2e74f528aeb17..dff5e883cb5e4 100644 --- a/pkgs/applications/kde/pimcommon.nix +++ b/pkgs/applications/kde/pimcommon.nix @@ -8,7 +8,7 @@ }: mkDerivation { - name = "pimcommon"; + pname = "pimcommon"; meta = { license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; maintainers = kdepimTeam; diff --git a/pkgs/applications/kde/print-manager.nix b/pkgs/applications/kde/print-manager.nix index f0501ffadee48..2ea662419b17c 100644 --- a/pkgs/applications/kde/print-manager.nix +++ b/pkgs/applications/kde/print-manager.nix @@ -8,7 +8,7 @@ }: mkDerivation { - name = "print-manager"; + pname = "print-manager"; meta = { license = [ lib.licenses.gpl2 ]; maintainers = [ lib.maintainers.ttuegel ]; diff --git a/pkgs/applications/kde/rocs.nix b/pkgs/applications/kde/rocs.nix index feae7ca81dec9..45362d556a72a 100644 --- a/pkgs/applications/kde/rocs.nix +++ b/pkgs/applications/kde/rocs.nix @@ -6,7 +6,7 @@ }: mkDerivation { - name = "rocs"; + pname = "rocs"; meta = with lib; { homepage = "https://edu.kde.org/rocs/"; diff --git a/pkgs/applications/kde/spectacle.nix b/pkgs/applications/kde/spectacle.nix index b980ea21df2e5..c6861b218debc 100644 --- a/pkgs/applications/kde/spectacle.nix +++ b/pkgs/applications/kde/spectacle.nix @@ -8,7 +8,7 @@ }: mkDerivation { - name = "spectacle"; + pname = "spectacle"; meta = with lib; { maintainers = with maintainers; [ ttuegel ]; }; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ diff --git a/pkgs/applications/kde/srcs.nix b/pkgs/applications/kde/srcs.nix index 6966c07ec0af9..5ff13eaf24088 100644 --- a/pkgs/applications/kde/srcs.nix +++ b/pkgs/applications/kde/srcs.nix @@ -4,1731 +4,1731 @@ { akonadi = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/akonadi-20.08.2.tar.xz"; - sha256 = "d3a4b3b3f543734ad5428ca0e573b8dbf9e05f42d51e1aab39b5b5266c16be7d"; - name = "akonadi-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/akonadi-20.08.3.tar.xz"; + sha256 = "1hwaan45cyw2nmfmdp5pbhvm00xdxy9la68ms3sa8a67zcsfljhl"; + name = "akonadi-20.08.3.tar.xz"; }; }; akonadi-calendar = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/akonadi-calendar-20.08.2.tar.xz"; - sha256 = "20173d00dc764f6a1e8e0b433d96b982ceadcb17e9bd067caf2967fd5440eb51"; - name = "akonadi-calendar-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/akonadi-calendar-20.08.3.tar.xz"; + sha256 = "18rwvn5i6i4ng335rxpwx3a2m4vyq96w9m3fa1gvmr8ls7vkaqrk"; + name = "akonadi-calendar-20.08.3.tar.xz"; }; }; akonadi-calendar-tools = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/akonadi-calendar-tools-20.08.2.tar.xz"; - sha256 = "2069cc3a12f0da3f10181c13d19b1048d8f2e0c0f4a4e14309a7e6f08aa74ab9"; - name = "akonadi-calendar-tools-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/akonadi-calendar-tools-20.08.3.tar.xz"; + sha256 = "1pnm3xi26bnbjmnv9zwi9w5rkr1pdry50hzy3gxw7b0g11zz036w"; + name = "akonadi-calendar-tools-20.08.3.tar.xz"; }; }; akonadiconsole = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/akonadiconsole-20.08.2.tar.xz"; - sha256 = "dc03a1986b6e7af0d26af927009d567da1e1835cc2bb5cc1b5732ffca3ecde9d"; - name = "akonadiconsole-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/akonadiconsole-20.08.3.tar.xz"; + sha256 = "061r0p9pj22x0hiz6piz4vramll3w5xy92sx8nfhcp2gmnvj9890"; + name = "akonadiconsole-20.08.3.tar.xz"; }; }; akonadi-contacts = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/akonadi-contacts-20.08.2.tar.xz"; - sha256 = "e4a2696e0e0cf69926d34f160a4581131a1da8244355787564b75dec06db1b30"; - name = "akonadi-contacts-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/akonadi-contacts-20.08.3.tar.xz"; + sha256 = "18n9x41fmh4q9q9lfv882iwk6j1hvgpl11y4qn873vwr9sdrcf4s"; + name = "akonadi-contacts-20.08.3.tar.xz"; }; }; akonadi-import-wizard = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/akonadi-import-wizard-20.08.2.tar.xz"; - sha256 = "639d72ae3d32f681ddb046a87d625871b485785602cf35b817e89004def4dc5e"; - name = "akonadi-import-wizard-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/akonadi-import-wizard-20.08.3.tar.xz"; + sha256 = "0gny0rxvyks5w4rdb73ly06lyvz7kcfvff1268bn6i96xr83kmim"; + name = "akonadi-import-wizard-20.08.3.tar.xz"; }; }; akonadi-mime = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/akonadi-mime-20.08.2.tar.xz"; - sha256 = "5699a1d44a9812c9530bc61af5822ff34a573b168d72230cd8261c05065c06e3"; - name = "akonadi-mime-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/akonadi-mime-20.08.3.tar.xz"; + sha256 = "12ps633y64mj72iryd9z2nmrf7lxbkqj7xnzj28549cvg6jizgl7"; + name = "akonadi-mime-20.08.3.tar.xz"; }; }; akonadi-notes = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/akonadi-notes-20.08.2.tar.xz"; - sha256 = "4897ca92d6b68f75254e1c419438275a94fa678c9f062dcd91c0267129886ca7"; - name = "akonadi-notes-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/akonadi-notes-20.08.3.tar.xz"; + sha256 = "1z90r37lqc7ydmily730idd4s8rcbr6i3a8x9m647snbala16z36"; + name = "akonadi-notes-20.08.3.tar.xz"; }; }; akonadi-search = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/akonadi-search-20.08.2.tar.xz"; - sha256 = "618400950fa44f0c578ab51c3b311a47e0b2df47203f754e50bcc363201a9fc7"; - name = "akonadi-search-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/akonadi-search-20.08.3.tar.xz"; + sha256 = "0izpkvjybp6r79rai0p5j74bm0f8ksgsl3z34ggb51j6vj9rla7h"; + name = "akonadi-search-20.08.3.tar.xz"; }; }; akregator = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/akregator-20.08.2.tar.xz"; - sha256 = "4de4bd31dede5c09e0eb9e14d1da1d1979409eb1e28df5f95963086d4a49edc9"; - name = "akregator-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/akregator-20.08.3.tar.xz"; + sha256 = "1gqh820s5by3r9lz7r16r0krh916idsks6sgy26hcrwfmva45wn5"; + name = "akregator-20.08.3.tar.xz"; }; }; analitza = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/analitza-20.08.2.tar.xz"; - sha256 = "2fad01bf48199e3671559ec9a619f0d590af331922899c793f96fc90860ec487"; - name = "analitza-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/analitza-20.08.3.tar.xz"; + sha256 = "16s6kjyclj73lq8z8mvrbsl75h1nrnv7syp6wpip6gvfs5ynai90"; + name = "analitza-20.08.3.tar.xz"; }; }; ark = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/ark-20.08.2.tar.xz"; - sha256 = "ec061ac07687b5a3541af293e3bc2aa7bedcfe0ef38ba6e57e2704068a726ffc"; - name = "ark-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/ark-20.08.3.tar.xz"; + sha256 = "03kwjp2nj570k9ph8bgj042sjj4x0h9jwv8nwx0pfpcxkgxv5pzy"; + name = "ark-20.08.3.tar.xz"; }; }; artikulate = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/artikulate-20.08.2.tar.xz"; - sha256 = "66545d85e25aa67816deea4b2b89b485181458a5bc117dad9588671d8b48b41c"; - name = "artikulate-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/artikulate-20.08.3.tar.xz"; + sha256 = "0bx97qi6zi7jmlzm3g7qamnzg0966g4w9xpskbxbr4cgjr312x19"; + name = "artikulate-20.08.3.tar.xz"; }; }; audiocd-kio = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/audiocd-kio-20.08.2.tar.xz"; - sha256 = "5f38c549fe8c3a4659ac8291c223327b765834e7668bc15a96047e20cdb11f01"; - name = "audiocd-kio-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/audiocd-kio-20.08.3.tar.xz"; + sha256 = "01n4nyda7l7by1nyx2sgxdl8qkdfndk0w6hj0qc6a7fllcfj5cpb"; + name = "audiocd-kio-20.08.3.tar.xz"; }; }; baloo-widgets = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/baloo-widgets-20.08.2.tar.xz"; - sha256 = "e1d14b8dba911ebc1cee76dbcd44fa200418ba959d86ce567093b5fc3b700a07"; - name = "baloo-widgets-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/baloo-widgets-20.08.3.tar.xz"; + sha256 = "0ciidrsvwc3ppxhw7w5116q4lfbsvij9jsvyzm292pmjln2vikrg"; + name = "baloo-widgets-20.08.3.tar.xz"; }; }; blinken = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/blinken-20.08.2.tar.xz"; - sha256 = "c6e74033ab8ece83618c5cda0ab3cf327514b8e2e6b0e9daf484ce88f671a65e"; - name = "blinken-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/blinken-20.08.3.tar.xz"; + sha256 = "1gfw0w66nm3sx81bnr0p0yz1bhjj63lvd3cr86x3b2pny5rcw1da"; + name = "blinken-20.08.3.tar.xz"; }; }; bomber = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/bomber-20.08.2.tar.xz"; - sha256 = "27c226b31bcdbbda0c9e304e428ca7451614c397a038e830f8052c381dae7215"; - name = "bomber-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/bomber-20.08.3.tar.xz"; + sha256 = "1nw1a9cf0nqgk00hvzcqch3bl97lx6bih0wsax5q0z1kzwlz0kgr"; + name = "bomber-20.08.3.tar.xz"; }; }; bovo = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/bovo-20.08.2.tar.xz"; - sha256 = "936cab24a13900765f0c5a5afb6f155cb5a05bdb067f86b77e33af5f0e4c37d2"; - name = "bovo-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/bovo-20.08.3.tar.xz"; + sha256 = "06pbivyvfgjx6zkadvwfwnrg9vjy4rf52k2a74qjcnl2ms16sr1g"; + name = "bovo-20.08.3.tar.xz"; }; }; calendarsupport = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/calendarsupport-20.08.2.tar.xz"; - sha256 = "83bcdd36689f762363a95b688b9377a3335b4fd58ad1d5efad36ad2b0cf7cc10"; - name = "calendarsupport-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/calendarsupport-20.08.3.tar.xz"; + sha256 = "09w06n745764fs440nh0piy5sahfn50kh3zrljhgzadcij6165vd"; + name = "calendarsupport-20.08.3.tar.xz"; }; }; cantor = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/cantor-20.08.2.tar.xz"; - sha256 = "aca92b6e40a9e05282eae2b55f7cc6bf88612ffa9b3dde1a239648be8e5bdc59"; - name = "cantor-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/cantor-20.08.3.tar.xz"; + sha256 = "1njqycx0v3zq5mdcvfdfgxs8vgl01v80s27qgapsxxrgr9hgxbhl"; + name = "cantor-20.08.3.tar.xz"; }; }; cervisia = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/cervisia-20.08.2.tar.xz"; - sha256 = "b3444ecd1078b92fad9b00297496dd3d92366a9c0bb56cfa138f28cc15db1389"; - name = "cervisia-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/cervisia-20.08.3.tar.xz"; + sha256 = "1bsc72kxcmzx25408ngzqzj4a0168vqfr3a2gvmm6d8klbgpm3gv"; + name = "cervisia-20.08.3.tar.xz"; }; }; dolphin = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/dolphin-20.08.2.tar.xz"; - sha256 = "bd13574610fc2108b9b04249cff70ca99958fe57a42fbf260ed16e5e377071bc"; - name = "dolphin-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/dolphin-20.08.3.tar.xz"; + sha256 = "107n763qix95b1hgy86hddpj9x2clzhaiw8q8yjn9lzj1rz5facx"; + name = "dolphin-20.08.3.tar.xz"; }; }; dolphin-plugins = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/dolphin-plugins-20.08.2.tar.xz"; - sha256 = "7eabeb295ae2932958992bf7273afcb8164fbe90a2574064983fb2ecbc57eeaf"; - name = "dolphin-plugins-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/dolphin-plugins-20.08.3.tar.xz"; + sha256 = "0fmay0sycfj9s7zyxbldgcal5lj2psi0n9zrgq812s5qr4rb5c8c"; + name = "dolphin-plugins-20.08.3.tar.xz"; }; }; dragon = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/dragon-20.08.2.tar.xz"; - sha256 = "cf7cce288fdeb12a0c86739741c6b901859e9b36d8fc9e7478c46f53cc74dd6c"; - name = "dragon-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/dragon-20.08.3.tar.xz"; + sha256 = "14qsb7h8w58i9jsh1gpcj8pwjgy7y3mqfy51hca82yrd82z5b9rn"; + name = "dragon-20.08.3.tar.xz"; }; }; elisa = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/elisa-20.08.2.tar.xz"; - sha256 = "6c04377dfd5e82b2b67b3a43cc3ffd3b206f24ab75c3fe18298ec80876dcc268"; - name = "elisa-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/elisa-20.08.3.tar.xz"; + sha256 = "0893nbj0jsapnfd09cp961k2m7lq6sjvzynpa4hfp9ch1jbc912c"; + name = "elisa-20.08.3.tar.xz"; }; }; eventviews = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/eventviews-20.08.2.tar.xz"; - sha256 = "ecac9ac6e6a6ed835b28048d8bfc09bac9a1e7a57c5dd0eba6f4360301b32af9"; - name = "eventviews-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/eventviews-20.08.3.tar.xz"; + sha256 = "158j5g3i0wbbxpg9jmr50dvbpms4c4vgcnpmn3b3vfbszzwsy6rg"; + name = "eventviews-20.08.3.tar.xz"; }; }; ffmpegthumbs = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/ffmpegthumbs-20.08.2.tar.xz"; - sha256 = "af5b3de86487d3ddccda34c5165a34427ef97fe1090108781eb38babc101740f"; - name = "ffmpegthumbs-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/ffmpegthumbs-20.08.3.tar.xz"; + sha256 = "186hpq949r3xx2a64nqjy4pcn67d6kdvsy80zr238lgb9qqcqygi"; + name = "ffmpegthumbs-20.08.3.tar.xz"; }; }; filelight = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/filelight-20.08.2.tar.xz"; - sha256 = "65f5f90d56d3449722647286324f8aae54754ec2a46c9aaa2e3bad92bae3433e"; - name = "filelight-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/filelight-20.08.3.tar.xz"; + sha256 = "1jljsnjdhnqphh1kanj6hi2rswq3i9119iah1j33jy5pladcyf5q"; + name = "filelight-20.08.3.tar.xz"; }; }; granatier = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/granatier-20.08.2.tar.xz"; - sha256 = "bb79b84b485bb194bf4edaa833e7705ec9fc0275301c70df78498b872de9ee57"; - name = "granatier-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/granatier-20.08.3.tar.xz"; + sha256 = "195bc2rcz11v76c0cwa9mb7rfixjn7sb0a52wrzz0sf9624m0rcs"; + name = "granatier-20.08.3.tar.xz"; }; }; grantlee-editor = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/grantlee-editor-20.08.2.tar.xz"; - sha256 = "353b2c58d169e8b3c91367a7ce8939ede39c289036e3617da019ae1045a81c7b"; - name = "grantlee-editor-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/grantlee-editor-20.08.3.tar.xz"; + sha256 = "1k2rdicd68jdk3pazyn3q0vj99n0vnkpzkrnacpymkjy85cjgrv9"; + name = "grantlee-editor-20.08.3.tar.xz"; }; }; grantleetheme = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/grantleetheme-20.08.2.tar.xz"; - sha256 = "8cb4d2f698cf7f44bf70322669809f07900021f215175c8db120abc0f2debf62"; - name = "grantleetheme-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/grantleetheme-20.08.3.tar.xz"; + sha256 = "07b7v5v2vyz3vyj1jjzryzaak8bbqg8a2caxwb6s7cwhy19y6my5"; + name = "grantleetheme-20.08.3.tar.xz"; }; }; gwenview = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/gwenview-20.08.2.tar.xz"; - sha256 = "580df49eb6852db4b1229f0326372dc7da7a08140d552da59a62ece08b03cc9d"; - name = "gwenview-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/gwenview-20.08.3.tar.xz"; + sha256 = "09mwp3z97hgd7c15w0hz8k61qn5icb81rj27nxzy877ph1xnrixc"; + name = "gwenview-20.08.3.tar.xz"; }; }; incidenceeditor = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/incidenceeditor-20.08.2.tar.xz"; - sha256 = "e9c24390b5951ef9f504a4dc432fea52ed7487288c424f073446e6c07e70c69a"; - name = "incidenceeditor-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/incidenceeditor-20.08.3.tar.xz"; + sha256 = "15kkl8z1nig9qyxfrq54c3sqh1xs1lzlbm5rphj34y0yb8dbn8kx"; + name = "incidenceeditor-20.08.3.tar.xz"; }; }; juk = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/juk-20.08.2.tar.xz"; - sha256 = "b19f59ad8c80c4c335469fbddde6db92112e286b1699964eab39a3d826c7ec60"; - name = "juk-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/juk-20.08.3.tar.xz"; + sha256 = "1jvj0r4grm55cnck4apnh4fh44mv1ycm0pprrkh57iwj1dlf7kif"; + name = "juk-20.08.3.tar.xz"; }; }; k3b = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/k3b-20.08.2.tar.xz"; - sha256 = "6370be558e93fed4605b7870b1d7ea324713c5a52370eab9c05d85fc3b76acd5"; - name = "k3b-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/k3b-20.08.3.tar.xz"; + sha256 = "0qg2p6gdg0clgv6qab5vr0i451m9hqqmpwq335w8m9nwb6wg30cx"; + name = "k3b-20.08.3.tar.xz"; }; }; kaccounts-integration = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/kaccounts-integration-20.08.2.tar.xz"; - sha256 = "6678ee7d394b69a37e6a220a6cba3804f999997da5803da4bab1d8f329ff30fe"; - name = "kaccounts-integration-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/kaccounts-integration-20.08.3.tar.xz"; + sha256 = "006cglw5ai274a1r5jbk109mdrvw8v6fp3cdyi1kbrq7lp3123a2"; + name = "kaccounts-integration-20.08.3.tar.xz"; }; }; kaccounts-providers = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/kaccounts-providers-20.08.2.tar.xz"; - sha256 = "c719d7840ab118ff591e75e12869afc3118e5cdeb5c0415eba5b1f6993664c90"; - name = "kaccounts-providers-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/kaccounts-providers-20.08.3.tar.xz"; + sha256 = "1vpv366bzj0sk7dqyxrq06a8ixgaaqi125mf2gmybvhj5yvrn3fp"; + name = "kaccounts-providers-20.08.3.tar.xz"; }; }; kaddressbook = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/kaddressbook-20.08.2.tar.xz"; - sha256 = "8d2e5849dd8878806e8566ce43c139633c37f027f677603600c8acc0d0d41198"; - name = "kaddressbook-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/kaddressbook-20.08.3.tar.xz"; + sha256 = "00mia1jh2c5rcnsyx3wizjdg65pvpazfb8ayppjzv4rrc2nhr9nn"; + name = "kaddressbook-20.08.3.tar.xz"; }; }; kajongg = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/kajongg-20.08.2.tar.xz"; - sha256 = "1eb534ac6d1d3ca14b73bd6e5b626b988acafc30b168f54d48a493adc715ecde"; - name = "kajongg-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/kajongg-20.08.3.tar.xz"; + sha256 = "0wr045xqm1q03vy0jbgrldpdc9k3lgnhd39yhi574la367ayffpa"; + name = "kajongg-20.08.3.tar.xz"; }; }; kalarm = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/kalarm-20.08.2.tar.xz"; - sha256 = "e783c041ac4b162cf5254e37e53854835eda6c61ef3ae2358466000a8650a4da"; - name = "kalarm-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/kalarm-20.08.3.tar.xz"; + sha256 = "0194rapyvnpmhkba0rgclrai1ywx9anr8dski0j6z1yg0kgav8df"; + name = "kalarm-20.08.3.tar.xz"; }; }; kalarmcal = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/kalarmcal-20.08.2.tar.xz"; - sha256 = "0398a37f412eb03b5cbf2488ce7e0c38a069f1806bda4ea9bfce4fc67311a9a6"; - name = "kalarmcal-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/kalarmcal-20.08.3.tar.xz"; + sha256 = "1i9hi3y4j2pmdmlj13kl13vfplxrh8w23fxz0mmawi1wn533fp66"; + name = "kalarmcal-20.08.3.tar.xz"; }; }; kalgebra = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/kalgebra-20.08.2.tar.xz"; - sha256 = "c934dc8d92917e31c17efa5b64dbec4795439a5f26762e2f214b49028bfe264d"; - name = "kalgebra-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/kalgebra-20.08.3.tar.xz"; + sha256 = "0k7miil5ilrw68j6xl9g6cf3zfw7g52h0gfwd5j248nx2nxr150c"; + name = "kalgebra-20.08.3.tar.xz"; }; }; kalzium = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/kalzium-20.08.2.tar.xz"; - sha256 = "474f74cbb478d3f5f69b5785711ed969ac15d5e92aee5308c6118a9d12611016"; - name = "kalzium-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/kalzium-20.08.3.tar.xz"; + sha256 = "1r80bnpdrybsdwcblpj7cg32dv90l79gs0i42gpm6inilfr3vp5n"; + name = "kalzium-20.08.3.tar.xz"; }; }; kamera = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/kamera-20.08.2.tar.xz"; - sha256 = "ba28cab34267ce203b4b70f4a2c2b6a75849aec83dd2d73f6903894c5c125fdf"; - name = "kamera-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/kamera-20.08.3.tar.xz"; + sha256 = "06fwxdgbyywdrf1r0w17w3chfr0s8jhqswz9chmdfds9f2bb45cr"; + name = "kamera-20.08.3.tar.xz"; }; }; kamoso = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/kamoso-20.08.2.tar.xz"; - sha256 = "e7d0af2781ff077261886a1683aff1d518a17f9b6d83f84fa95a7633a00f1516"; - name = "kamoso-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/kamoso-20.08.3.tar.xz"; + sha256 = "0zhl3va65ajz3hdggg0jvvgvj14s461pjw9adw9bnfcbs4jzkl2y"; + name = "kamoso-20.08.3.tar.xz"; }; }; kanagram = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/kanagram-20.08.2.tar.xz"; - sha256 = "3f3f961aa847f26ac875104e82b8e7e73bbc049f20460117f849df91ba9b42e2"; - name = "kanagram-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/kanagram-20.08.3.tar.xz"; + sha256 = "1cyx8yq03xaw34ic69ghz9gafk8l30qinp0kkp9a1wh4pry8rnxf"; + name = "kanagram-20.08.3.tar.xz"; }; }; kapman = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/kapman-20.08.2.tar.xz"; - sha256 = "932bd697f2ca0e44af6be983dae3e13df9435642b91f0e1ebba7fd50291c2cbd"; - name = "kapman-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/kapman-20.08.3.tar.xz"; + sha256 = "0nh1f0v026rib5ahj1mhvs99yabrgdq71bis465vfpm4favnirzy"; + name = "kapman-20.08.3.tar.xz"; }; }; kapptemplate = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/kapptemplate-20.08.2.tar.xz"; - sha256 = "3bda6d9f6127e19357f071ca6f9f05890c35a6aaf86e54bce39381f0045b6b0c"; - name = "kapptemplate-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/kapptemplate-20.08.3.tar.xz"; + sha256 = "1r98ym9sazjzknxfw58hjiyxhmi49fyhrdn02v0b8fm711vprxab"; + name = "kapptemplate-20.08.3.tar.xz"; }; }; kate = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/kate-20.08.2.tar.xz"; - sha256 = "718e8230edfa16f93f54380c4e214a0f25f8a398fe74ad23f12b7dcffae419d0"; - name = "kate-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/kate-20.08.3.tar.xz"; + sha256 = "1m7ximinknc0l9zqv4p25ybn6zysz59l4vvdb9xkhjp53aqskdz9"; + name = "kate-20.08.3.tar.xz"; }; }; katomic = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/katomic-20.08.2.tar.xz"; - sha256 = "bb94e81cb1122b57d2601f701bc51ff8fa27ac07a5de34e5c49928d50d46ed85"; - name = "katomic-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/katomic-20.08.3.tar.xz"; + sha256 = "1v31x6371r9ccvc676vq5dlpkp4829xf0r37dnvdxlfm22mgsdnk"; + name = "katomic-20.08.3.tar.xz"; }; }; kbackup = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/kbackup-20.08.2.tar.xz"; - sha256 = "bb97dd10a64c42ae80c9c87442d3a06d3c18f4f5997bd3b6d1460dec655b3e0a"; - name = "kbackup-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/kbackup-20.08.3.tar.xz"; + sha256 = "1sayzvj46ckhn5zgp7qi6zmrmd7bjh5mg05mcl5pfwv4dcvxkrng"; + name = "kbackup-20.08.3.tar.xz"; }; }; kblackbox = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/kblackbox-20.08.2.tar.xz"; - sha256 = "714a8749a49d1a7938b74372138ae3e5bafef50de61207e63a6d2c60b6bfded2"; - name = "kblackbox-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/kblackbox-20.08.3.tar.xz"; + sha256 = "0vka2pswbza1z8f97nhxcjrczx4w1x0qyjpzs9ycn9a14smqpsrh"; + name = "kblackbox-20.08.3.tar.xz"; }; }; kblocks = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/kblocks-20.08.2.tar.xz"; - sha256 = "c82f8b6e722308a236d0057028d644ebf8105c9c902d799bc2fb3e1c1ff7c188"; - name = "kblocks-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/kblocks-20.08.3.tar.xz"; + sha256 = "1jc063xn6dphydf49kv0izzy0nv06dr412xxjvkp7vccwv9qd5gf"; + name = "kblocks-20.08.3.tar.xz"; }; }; kbounce = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/kbounce-20.08.2.tar.xz"; - sha256 = "371fbaf7c1faeacf1c74441ec1a58f1ced862f741e67123d2eb105f1d4f9b8e2"; - name = "kbounce-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/kbounce-20.08.3.tar.xz"; + sha256 = "0863vlirljvf101mdv6jxprj9axs4cikrnld3wvxrcqw3w2dy6wy"; + name = "kbounce-20.08.3.tar.xz"; }; }; kbreakout = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/kbreakout-20.08.2.tar.xz"; - sha256 = "b58b9dd26eff3960bc664076ddf4d0c81c7dfd5380be1d058b86de2d3f55d2ef"; - name = "kbreakout-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/kbreakout-20.08.3.tar.xz"; + sha256 = "14nd1dnbdyxv59y8iildhydhxgal38hvj7bk6544glwl8yalak8z"; + name = "kbreakout-20.08.3.tar.xz"; }; }; kbruch = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/kbruch-20.08.2.tar.xz"; - sha256 = "54c5997a8d6405439448dd929bf16017c9e5db052b30c9bf144c656c6d8b9e0b"; - name = "kbruch-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/kbruch-20.08.3.tar.xz"; + sha256 = "03s1hl4h8rsx0gn7wqfssi1ga4igx48jb47gpw6f9rfjm8f199vb"; + name = "kbruch-20.08.3.tar.xz"; }; }; kcachegrind = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/kcachegrind-20.08.2.tar.xz"; - sha256 = "e6b84a323a21ae7975ccc07154bcdc6eef1bc92818b800cfc5d546ada7f0387c"; - name = "kcachegrind-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/kcachegrind-20.08.3.tar.xz"; + sha256 = "17j06z9cpj5qhfbp1xgw4qmhi4jckf2i99c9brys4ifb3p0rkbrs"; + name = "kcachegrind-20.08.3.tar.xz"; }; }; kcalc = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/kcalc-20.08.2.tar.xz"; - sha256 = "76b6c8e44c789090c0155f79878df8f27c96d2df4273443b0f05a42ec81902cf"; - name = "kcalc-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/kcalc-20.08.3.tar.xz"; + sha256 = "1mk30fkv51w3fqlpkzgm1yj5sp98h26kkphplqkjva5v6s1jzmjy"; + name = "kcalc-20.08.3.tar.xz"; }; }; kcalutils = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/kcalutils-20.08.2.tar.xz"; - sha256 = "fccae5166b627f654412344d0090000ecd270af54b0cedb8648e35af26369cae"; - name = "kcalutils-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/kcalutils-20.08.3.tar.xz"; + sha256 = "1i2yh4gvdwlylj7f7p32g1z7lzh3p19rrbd96l1gqhy700f2whpw"; + name = "kcalutils-20.08.3.tar.xz"; }; }; kcharselect = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/kcharselect-20.08.2.tar.xz"; - sha256 = "9438e723469b6bf0d87b23965c6d925800ff35b2cc2214a7eeb5fb41009489e0"; - name = "kcharselect-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/kcharselect-20.08.3.tar.xz"; + sha256 = "1p6rijjfa2jk4vr0ivjn6p5qf2ys5kvhw0cwfyjs45ff7zg0s2ga"; + name = "kcharselect-20.08.3.tar.xz"; }; }; kcolorchooser = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/kcolorchooser-20.08.2.tar.xz"; - sha256 = "f314c31932704e7136b5fff89efe95e84e4215f3902089f9d838411f0fbc0c72"; - name = "kcolorchooser-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/kcolorchooser-20.08.3.tar.xz"; + sha256 = "1874qa04whiivyydxfcn0f1xch515ga1af4ym42zqz64j3kq7i47"; + name = "kcolorchooser-20.08.3.tar.xz"; }; }; kcron = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/kcron-20.08.2.tar.xz"; - sha256 = "ce72bb7c48606b0611cfe46a545224cca131d34a4b678c86d9ac473071833f83"; - name = "kcron-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/kcron-20.08.3.tar.xz"; + sha256 = "1piwssyg9fvah25gql6w0n8xf634f6gy475cz52gb1bl7rp72q6j"; + name = "kcron-20.08.3.tar.xz"; }; }; kdebugsettings = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/kdebugsettings-20.08.2.tar.xz"; - sha256 = "78502b1a52f9f81ff848e5b210b37a3a74da7c0032de2513f23c1d25cf801283"; - name = "kdebugsettings-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/kdebugsettings-20.08.3.tar.xz"; + sha256 = "11xnvr9qib3hnp48whsw659c724s2114p5dr3fswvhm3hkw1aky7"; + name = "kdebugsettings-20.08.3.tar.xz"; }; }; kdeconnect-kde = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/kdeconnect-kde-20.08.2.tar.xz"; - sha256 = "6d43e38620987de1ddcfdfa7d4e6e31ff383b806139ba02e69a99c3ddfb4ee67"; - name = "kdeconnect-kde-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/kdeconnect-kde-20.08.3.tar.xz"; + sha256 = "0x10ga81qlsahavmv356xzjxyds41y2b4v338rqcyqkxvfmxj01k"; + name = "kdeconnect-kde-20.08.3.tar.xz"; }; }; kde-dev-scripts = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/kde-dev-scripts-20.08.2.tar.xz"; - sha256 = "ff1a819991903b09bef3637b579d215e087310e39b98a1a6928e15f193aec056"; - name = "kde-dev-scripts-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/kde-dev-scripts-20.08.3.tar.xz"; + sha256 = "0x8ba4mlxx17vk674738xln2dy696b148fa3s87za4yb4jj9gc5n"; + name = "kde-dev-scripts-20.08.3.tar.xz"; }; }; kde-dev-utils = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/kde-dev-utils-20.08.2.tar.xz"; - sha256 = "21a4a11e102cbbd9fed955720966d7be2f7a615f57c9bf1dfc94ce973d25ffc3"; - name = "kde-dev-utils-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/kde-dev-utils-20.08.3.tar.xz"; + sha256 = "0k7zb1km89nnqfi2p1mhp6dvwkhmgbcgw89301acag34yy954dvn"; + name = "kde-dev-utils-20.08.3.tar.xz"; }; }; kdeedu-data = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/kdeedu-data-20.08.2.tar.xz"; - sha256 = "9030c39b92a7500254e8303ce246d2535cd66a203bb96b2670defd5288294ad1"; - name = "kdeedu-data-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/kdeedu-data-20.08.3.tar.xz"; + sha256 = "1k164h4n8r4yjlll5900fz764lr0qiy3q1fpcpkr8f1n7qs7f797"; + name = "kdeedu-data-20.08.3.tar.xz"; }; }; kdegraphics-mobipocket = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/kdegraphics-mobipocket-20.08.2.tar.xz"; - sha256 = "8972079756633abe8cbfaa39cdff9d56f89958861e6e418738311bcdc52771a5"; - name = "kdegraphics-mobipocket-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/kdegraphics-mobipocket-20.08.3.tar.xz"; + sha256 = "0ifxbwn7pmxr7y4ri617a303b27nqwqa418isgfrfk11jc4yyxhq"; + name = "kdegraphics-mobipocket-20.08.3.tar.xz"; }; }; kdegraphics-thumbnailers = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/kdegraphics-thumbnailers-20.08.2.tar.xz"; - sha256 = "977cf6c40ba00a8a391a951aab80c55d9615927a1ef4a7bb5eea2f6a83373532"; - name = "kdegraphics-thumbnailers-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/kdegraphics-thumbnailers-20.08.3.tar.xz"; + sha256 = "0mbzkw7pxcfmkpb8ivhahnxkkrkjhmbjqy2l9gqx35gp5855gmxf"; + name = "kdegraphics-thumbnailers-20.08.3.tar.xz"; }; }; kdenetwork-filesharing = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/kdenetwork-filesharing-20.08.2.tar.xz"; - sha256 = "f909ee8433baf906b6c23af4747d83ae3e151e213585abe01282213012228b3a"; - name = "kdenetwork-filesharing-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/kdenetwork-filesharing-20.08.3.tar.xz"; + sha256 = "0id19wmiivdrx10r1hwbwi7bx6g1v9g5lpbhlmfrapvy82ijfmbg"; + name = "kdenetwork-filesharing-20.08.3.tar.xz"; }; }; kdenlive = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/kdenlive-20.08.2.tar.xz"; - sha256 = "535df45a148f0f94271e045ef0c93575fded83da7a2b727aeaf90e61e1d7c418"; - name = "kdenlive-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/kdenlive-20.08.3.tar.xz"; + sha256 = "187d5khqq9ckmqp8amd7ghlvig1z97w2jzm9s4zsfhjzyqv3d3wz"; + name = "kdenlive-20.08.3.tar.xz"; }; }; kdepim-addons = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/kdepim-addons-20.08.2.tar.xz"; - sha256 = "f7ab0d9ee2b9351959199f8903c447c6cb82fd58d642b7039cd2b8e324038b01"; - name = "kdepim-addons-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/kdepim-addons-20.08.3.tar.xz"; + sha256 = "17m8pwiig46pc6x4ylvymb3b6c7xcm2df3vjma665kcir1dr0q7p"; + name = "kdepim-addons-20.08.3.tar.xz"; }; }; kdepim-apps-libs = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/kdepim-apps-libs-20.08.2.tar.xz"; - sha256 = "8c3ebdf7072d3a5a6ea2921697b28aa27e51ba43db152ea83a07b4b13c282434"; - name = "kdepim-apps-libs-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/kdepim-apps-libs-20.08.3.tar.xz"; + sha256 = "08iw1p9mv4jic7pk6skxc5anp7k46lhcdqxpq1i6wlhbrk6bpsvg"; + name = "kdepim-apps-libs-20.08.3.tar.xz"; }; }; kdepim-runtime = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/kdepim-runtime-20.08.2.tar.xz"; - sha256 = "3b475dfd394d5c09991eb4e1f0ddb3e2aa1f586ed75aa7961b159ef712d80132"; - name = "kdepim-runtime-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/kdepim-runtime-20.08.3.tar.xz"; + sha256 = "0zz2zwq3gr177vgkwz6b70q4n2ra4ym58f167pgvi9kxv3884fib"; + name = "kdepim-runtime-20.08.3.tar.xz"; }; }; kdesdk-kioslaves = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/kdesdk-kioslaves-20.08.2.tar.xz"; - sha256 = "5e79532675d717d906f6b43eea1cac20fe1513bcf497696251c00fe74e2f0f58"; - name = "kdesdk-kioslaves-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/kdesdk-kioslaves-20.08.3.tar.xz"; + sha256 = "1kwzms0qha058cm92d4f8pr89r3bqaqx5zfw6gz05s6lg892j5in"; + name = "kdesdk-kioslaves-20.08.3.tar.xz"; }; }; kdesdk-thumbnailers = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/kdesdk-thumbnailers-20.08.2.tar.xz"; - sha256 = "0b6809e2469d7057b6d674d5950fd4f6243a1d3d185452212522880c714c1c63"; - name = "kdesdk-thumbnailers-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/kdesdk-thumbnailers-20.08.3.tar.xz"; + sha256 = "10fc0agpvzpqdxqynd70vzya0g1nbdw0ylbnl9w35n9jhww42jff"; + name = "kdesdk-thumbnailers-20.08.3.tar.xz"; }; }; kdf = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/kdf-20.08.2.tar.xz"; - sha256 = "b33c043c18ae7b80b40e73c0a34759540724fa81815a6afa1e91e3ad44aec27e"; - name = "kdf-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/kdf-20.08.3.tar.xz"; + sha256 = "02k5nhsf1zzkx9cl3r2500pj2zfmvjhlfsb3smgpka6in7iivxyp"; + name = "kdf-20.08.3.tar.xz"; }; }; kdialog = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/kdialog-20.08.2.tar.xz"; - sha256 = "1bb808c2d01680e2396f282b798d9e22d2c1722f992c672eaf7451bf83a5d459"; - name = "kdialog-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/kdialog-20.08.3.tar.xz"; + sha256 = "0knl6176bjazjiacg1qqaldlqcjlb3bi829sliq1sdh4lzzwrbzk"; + name = "kdialog-20.08.3.tar.xz"; }; }; kdiamond = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/kdiamond-20.08.2.tar.xz"; - sha256 = "7bfc2b24d86c663bff719156ba20cd36017f1df647ee6769b5101aa6ab3e3e21"; - name = "kdiamond-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/kdiamond-20.08.3.tar.xz"; + sha256 = "0ls1kg3wank1al46knq12jilmp8gaa4rn7zbgflcrhgy5gw8l5px"; + name = "kdiamond-20.08.3.tar.xz"; }; }; keditbookmarks = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/keditbookmarks-20.08.2.tar.xz"; - sha256 = "87d72e78c907e7829a642364f3a49dd0f0dea0c76e7a5c524a67f957dca94b9b"; - name = "keditbookmarks-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/keditbookmarks-20.08.3.tar.xz"; + sha256 = "0m8ap5hvjgldj9hdk6shpkv8xylhhjla2xn1zs86pvj4la3zh4f8"; + name = "keditbookmarks-20.08.3.tar.xz"; }; }; kfind = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/kfind-20.08.2.tar.xz"; - sha256 = "2381bbe7793a666fa9463aead1246dc4244409f68375f6d75e1423be15b42d74"; - name = "kfind-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/kfind-20.08.3.tar.xz"; + sha256 = "10i5mw6q2parq5w7pi955kgfvdlw8hwis2p7r9vkvabjdk69nkdr"; + name = "kfind-20.08.3.tar.xz"; }; }; kfloppy = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/kfloppy-20.08.2.tar.xz"; - sha256 = "7f624d03dc3dc5099ac1479148800043195fa6c0e3bb6d7efcb452a76e99e191"; - name = "kfloppy-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/kfloppy-20.08.3.tar.xz"; + sha256 = "1cp0pwgldscc7va508gk43im3fv0lsxd5sbhpw8kxlzjlpbwlp8v"; + name = "kfloppy-20.08.3.tar.xz"; }; }; kfourinline = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/kfourinline-20.08.2.tar.xz"; - sha256 = "aed2ecdb40b2e3d5452b183a1817216373d32a0aab4eff02f6c823a6f8d801eb"; - name = "kfourinline-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/kfourinline-20.08.3.tar.xz"; + sha256 = "0h1n44dncr2siw447n7b0gkx3380vajvqjsgjvapkg7m7bmz7nsv"; + name = "kfourinline-20.08.3.tar.xz"; }; }; kgeography = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/kgeography-20.08.2.tar.xz"; - sha256 = "82c4798f3184c77d0be63aeb5e86c84240c9cb0aa0e66ff57f92c0b5c3748f19"; - name = "kgeography-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/kgeography-20.08.3.tar.xz"; + sha256 = "1mk5cip55chc8pmh8wfl7an5x076ywisr0i7isqcjaij2cv54283"; + name = "kgeography-20.08.3.tar.xz"; }; }; kget = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/kget-20.08.2.tar.xz"; - sha256 = "42993095d6325e921b6ed36f4b0a2153ffd5d68cfa3e6d3ced2db09e2a6aabb8"; - name = "kget-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/kget-20.08.3.tar.xz"; + sha256 = "144ydk8bbfirph464mkkvwpnynj465i2ynhm8n9d330kcrhnaxd0"; + name = "kget-20.08.3.tar.xz"; }; }; kgoldrunner = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/kgoldrunner-20.08.2.tar.xz"; - sha256 = "4bbcfcf5cf810e0b1f78e1a88d222631c07401187fb327deaa5ab6658483d351"; - name = "kgoldrunner-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/kgoldrunner-20.08.3.tar.xz"; + sha256 = "101cdl04wb6xbq95b51ax36570y9ahkcy5gccqsyvc307ij9yg7r"; + name = "kgoldrunner-20.08.3.tar.xz"; }; }; kgpg = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/kgpg-20.08.2.tar.xz"; - sha256 = "fc4ec5c38c3bdb02a399f0eb1e75da356a523ada369d5410c2f4e7f5f14a508f"; - name = "kgpg-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/kgpg-20.08.3.tar.xz"; + sha256 = "1ip21yal37yxg5i5sfy6lgfb3sz9lld0dwa7a1w4lbddf9w3akd6"; + name = "kgpg-20.08.3.tar.xz"; }; }; khangman = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/khangman-20.08.2.tar.xz"; - sha256 = "7ff30ecbab7c9e8f44b7e8c3887ec78a918c919ce902005aeb7fb969ac995b28"; - name = "khangman-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/khangman-20.08.3.tar.xz"; + sha256 = "1zwdd2gpjkld3vkawp0lj83il257ryxf8wpmbgzn1wz8sxxi01jj"; + name = "khangman-20.08.3.tar.xz"; }; }; khelpcenter = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/khelpcenter-20.08.2.tar.xz"; - sha256 = "36051a4352a05dd9b74b4e325c0e16e30d6bd8b48d6c3d13980b39a77aab4e2d"; - name = "khelpcenter-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/khelpcenter-20.08.3.tar.xz"; + sha256 = "1xan4awwgs08k7ksfy80rfcxqd6bi8i1fjdgy55hh7wshv76zf5r"; + name = "khelpcenter-20.08.3.tar.xz"; }; }; kidentitymanagement = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/kidentitymanagement-20.08.2.tar.xz"; - sha256 = "17a1fd47d91289519cafb12c0d917b4775496ada447cb6f4ba56dc42446152ec"; - name = "kidentitymanagement-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/kidentitymanagement-20.08.3.tar.xz"; + sha256 = "0vkydvf4yw3qlqrg9m1zdm6j0c1crxdvc7l24yls9fjbj957vbls"; + name = "kidentitymanagement-20.08.3.tar.xz"; }; }; kig = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/kig-20.08.2.tar.xz"; - sha256 = "401832d384e47ea6daf310f7e823ae6b8a55bc117b7570bd4bf36261d01587f5"; - name = "kig-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/kig-20.08.3.tar.xz"; + sha256 = "1dvizdfkvl7p7hr4xm4zh51lpr8qr3s5j5zz162s7arr7sws4w8h"; + name = "kig-20.08.3.tar.xz"; }; }; kigo = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/kigo-20.08.2.tar.xz"; - sha256 = "b9e6edd2e35e57edb3d89bb76f1d7e4a9e7f8fb64644b58012543a367834aa60"; - name = "kigo-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/kigo-20.08.3.tar.xz"; + sha256 = "0sx3klivzn8h96mpnbkiv2nbi2l6w0j6fclj7q3ql3cm81jh6n15"; + name = "kigo-20.08.3.tar.xz"; }; }; killbots = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/killbots-20.08.2.tar.xz"; - sha256 = "332ebd24be6ea62c8621aeaa5b200d6ebf03ae0198a06693b36b2c80cac89d95"; - name = "killbots-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/killbots-20.08.3.tar.xz"; + sha256 = "1j41my0brpqpvd8xibv39z4x4kmw1sqz7wy7ibhh0zir3jh64n83"; + name = "killbots-20.08.3.tar.xz"; }; }; kimagemapeditor = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/kimagemapeditor-20.08.2.tar.xz"; - sha256 = "fd8272978a7c3a1d95b20a5ec57ccf00d740a8d6eb483f0a204d03669215309c"; - name = "kimagemapeditor-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/kimagemapeditor-20.08.3.tar.xz"; + sha256 = "1m9mrksdl08ijmpmx3lhdysnm70mrnqz9rlbcn1h95p2sq0bk8cg"; + name = "kimagemapeditor-20.08.3.tar.xz"; }; }; kimap = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/kimap-20.08.2.tar.xz"; - sha256 = "bda4f4b4e94481b70cec270655c0fd2888da51106d80c0388ae5c0dc5d36e092"; - name = "kimap-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/kimap-20.08.3.tar.xz"; + sha256 = "16paglkqgnyzwjydhn02qw7zg0d4casir4bsfch15wdmqv389mrg"; + name = "kimap-20.08.3.tar.xz"; }; }; kio-extras = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/kio-extras-20.08.2.tar.xz"; - sha256 = "9d4b9cb5a4002ad2127c5c5c4d25ff95d53de32ea08348e8dc40fe83d950076e"; - name = "kio-extras-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/kio-extras-20.08.3.tar.xz"; + sha256 = "0i7k9asc97r9z4lfk5hyf7mcbx0za7j6v4dhqn43j5v4x2i0201c"; + name = "kio-extras-20.08.3.tar.xz"; }; }; kio-gdrive = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/kio-gdrive-20.08.2.tar.xz"; - sha256 = "71047e9f8e5ad9317cc3dbf1de2d121f322b5d968d3685351ef0d2aabe2f46ca"; - name = "kio-gdrive-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/kio-gdrive-20.08.3.tar.xz"; + sha256 = "0pp0nvsnfdm8vskw194qjfac4agnlsjm44w1704b5sqx6i27dafy"; + name = "kio-gdrive-20.08.3.tar.xz"; }; }; kipi-plugins = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/kipi-plugins-20.08.2.tar.xz"; - sha256 = "89de8f75dd01e2130c1e651bd04717ce4d35768202ae3e825c93c75c8312e583"; - name = "kipi-plugins-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/kipi-plugins-20.08.3.tar.xz"; + sha256 = "1pplhv8yjfl1ifx9ykf4w2lgma8jvshihmd5c5mz9liqk3lawq15"; + name = "kipi-plugins-20.08.3.tar.xz"; }; }; kirigami-gallery = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/kirigami-gallery-20.08.2.tar.xz"; - sha256 = "0b4a5cec32bdfaef42b790f1d249d227c9daf56e0f3c1e302d33ccaa485c28e5"; - name = "kirigami-gallery-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/kirigami-gallery-20.08.3.tar.xz"; + sha256 = "0l100ng8ai55s0vl8nkpq4vysy2nc6sk1dbisc2mp7br74ykyfp9"; + name = "kirigami-gallery-20.08.3.tar.xz"; }; }; kiriki = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/kiriki-20.08.2.tar.xz"; - sha256 = "42081e39c045bd830c6a79938a83690ea5641aa9e5437645234441da2d29b053"; - name = "kiriki-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/kiriki-20.08.3.tar.xz"; + sha256 = "1gddjii84cbz1dg8k0pnd3dyzar4lvj03j9v84vabggjjjbpir0f"; + name = "kiriki-20.08.3.tar.xz"; }; }; kiten = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/kiten-20.08.2.tar.xz"; - sha256 = "a7285d5880611da2202d0e3f8f2bf860f275932d3da54ff7aecc793225f7ad7d"; - name = "kiten-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/kiten-20.08.3.tar.xz"; + sha256 = "0n9mq86gcl6s2f45l8lbp4gsdj356l78xjkdvm14f6qlh81vsqlc"; + name = "kiten-20.08.3.tar.xz"; }; }; kitinerary = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/kitinerary-20.08.2.tar.xz"; - sha256 = "69d8b5f64774860e5098c1dbfb06d274da4379c04383c4f0f0e412481c48fa27"; - name = "kitinerary-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/kitinerary-20.08.3.tar.xz"; + sha256 = "169pmy5fyjkbya8r2kdkd9s83sim0jplc3lx8bv2xh6r10mvzgm6"; + name = "kitinerary-20.08.3.tar.xz"; }; }; kjumpingcube = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/kjumpingcube-20.08.2.tar.xz"; - sha256 = "0edba227e24b8aeda4e75bc6c25ad25b50ac624b5319a64ce20d6c3f7691a48a"; - name = "kjumpingcube-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/kjumpingcube-20.08.3.tar.xz"; + sha256 = "19246jwwd686x8i0jrvz2c8mpkf6qhm7rnskzin59dqzr76xrpgz"; + name = "kjumpingcube-20.08.3.tar.xz"; }; }; kldap = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/kldap-20.08.2.tar.xz"; - sha256 = "dfc8bd59d837766e741b33cf8486256b7bd5ffc33ff2aab240d47b4766ec8489"; - name = "kldap-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/kldap-20.08.3.tar.xz"; + sha256 = "1ihaazsnb9r30m2qhzcp2ns9f5fs7l3agsc9f9wxi4cyw73bq0n3"; + name = "kldap-20.08.3.tar.xz"; }; }; kleopatra = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/kleopatra-20.08.2.tar.xz"; - sha256 = "70ffa2d1549b6b4674a9cd92052174002d81fb236cfbf872187c6e3616191ba2"; - name = "kleopatra-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/kleopatra-20.08.3.tar.xz"; + sha256 = "1r879g7hw3c5cww58z0kvqj47pgzbiq1vpgxz847smrylqajcpyi"; + name = "kleopatra-20.08.3.tar.xz"; }; }; klettres = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/klettres-20.08.2.tar.xz"; - sha256 = "9cef7dea479d27644e4812157d4cf3993dc3ee84b847377a17cec305a03a3156"; - name = "klettres-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/klettres-20.08.3.tar.xz"; + sha256 = "0irc0f7vjznlsczan30zzprbnvgnbg19vabr97cw9rkkfa28azx9"; + name = "klettres-20.08.3.tar.xz"; }; }; klickety = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/klickety-20.08.2.tar.xz"; - sha256 = "90665c5aeda52f55af8dcf3936e557ba431d9e48c6be361eaeb82117b6213a33"; - name = "klickety-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/klickety-20.08.3.tar.xz"; + sha256 = "1qsm9grmy0bnalpdghg48xi68zzk6ysmg6n0d74ldmmnirv3r0zf"; + name = "klickety-20.08.3.tar.xz"; }; }; klines = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/klines-20.08.2.tar.xz"; - sha256 = "8e8b897cdc3c31fada1dd2635da211def507f47c8062c6458f559283ae470edb"; - name = "klines-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/klines-20.08.3.tar.xz"; + sha256 = "1l95ph1sjp3r1q065k3rj18lm36krl7bh41zgqh021p692ywc48c"; + name = "klines-20.08.3.tar.xz"; }; }; kmag = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/kmag-20.08.2.tar.xz"; - sha256 = "8e933e8ebbf0ab956e2a251312e3d4e027848dc2f2b4e8a7c7250b8fdf10ca05"; - name = "kmag-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/kmag-20.08.3.tar.xz"; + sha256 = "0y44gz3qn91vl840xz25l5kc5jj82k5qqxkgsvvyld2s99rif84k"; + name = "kmag-20.08.3.tar.xz"; }; }; kmahjongg = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/kmahjongg-20.08.2.tar.xz"; - sha256 = "98e34794560a062bd22950acc583b77a6f8d1d28aceb863604f5a6c98c6cc80d"; - name = "kmahjongg-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/kmahjongg-20.08.3.tar.xz"; + sha256 = "0wgp9m7xzf5ysmrrnyng4p4jypvzfnqkyw62gknl0qhk531cgq3h"; + name = "kmahjongg-20.08.3.tar.xz"; }; }; kmail = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/kmail-20.08.2.tar.xz"; - sha256 = "ff179b89836236174cd587ce4ea2a4320e58345d45582cb157186cfbb01e58f2"; - name = "kmail-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/kmail-20.08.3.tar.xz"; + sha256 = "0g59s7wl0n4bp8kw559rdlamlqxl47qvwfms9kr9ign35rvs0ghg"; + name = "kmail-20.08.3.tar.xz"; }; }; kmail-account-wizard = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/kmail-account-wizard-20.08.2.tar.xz"; - sha256 = "7cdb9b60b1a646f0c5c0d0e7dfbe357a9f66bb305afbccbb4b421ee6f6941df8"; - name = "kmail-account-wizard-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/kmail-account-wizard-20.08.3.tar.xz"; + sha256 = "0vama5a02dfgxrl4iz88lbi8dvq3d9b055xil770d90pwp0sljcz"; + name = "kmail-account-wizard-20.08.3.tar.xz"; }; }; kmailtransport = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/kmailtransport-20.08.2.tar.xz"; - sha256 = "8b12836b1ca0243819680cba73c809c491c5e7a8d1ea9d9dc23e7338aed69a0c"; - name = "kmailtransport-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/kmailtransport-20.08.3.tar.xz"; + sha256 = "07552qj3ngwvyss7f8cy87c0gmzc47agn54wk85qq0v1fwr73n6z"; + name = "kmailtransport-20.08.3.tar.xz"; }; }; kmbox = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/kmbox-20.08.2.tar.xz"; - sha256 = "4fa1ad98368130dcdc8ad71dba3084c489130b1e8fc4a2b119ffc6f56595ba73"; - name = "kmbox-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/kmbox-20.08.3.tar.xz"; + sha256 = "0ipmwcicn3qklybqy9v41lh7byn7j62ja8b0xf06z9nliwkk4b0b"; + name = "kmbox-20.08.3.tar.xz"; }; }; kmime = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/kmime-20.08.2.tar.xz"; - sha256 = "9f23e2814e62ae6c4a67fd3223315ef875776f9d098b4d11c7d06a726a725435"; - name = "kmime-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/kmime-20.08.3.tar.xz"; + sha256 = "1ndbx712vm4v0fi7p8j28d8z35h3bmsixc97z5r9dg03v1kzd36v"; + name = "kmime-20.08.3.tar.xz"; }; }; kmines = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/kmines-20.08.2.tar.xz"; - sha256 = "6b07a812497a665505b6b1e3a84ac0818f1a5e5757146cdbceec55e94bb41753"; - name = "kmines-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/kmines-20.08.3.tar.xz"; + sha256 = "1mn5hip3vnzmkk1hy14glsplp7f5pm56yv0d5mz25icfgw0xa6lp"; + name = "kmines-20.08.3.tar.xz"; }; }; kmix = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/kmix-20.08.2.tar.xz"; - sha256 = "73453f02a72384382fd7449215189e22b5e1600e9ef0c9cc910f3fddd09beb85"; - name = "kmix-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/kmix-20.08.3.tar.xz"; + sha256 = "00gm93faqmqx0hhkxi3k2pn6sq82k2f622vqgk7mwznkpg66mf4k"; + name = "kmix-20.08.3.tar.xz"; }; }; kmousetool = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/kmousetool-20.08.2.tar.xz"; - sha256 = "c1f70c172dc2ad7d937db5e6355522082f924ba45e7aac1bbb1c04e230f1d406"; - name = "kmousetool-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/kmousetool-20.08.3.tar.xz"; + sha256 = "09qznykysr42rzz5cmqvhvz91cr8dbzwjd73hwaib2lfs3c2cgbl"; + name = "kmousetool-20.08.3.tar.xz"; }; }; kmouth = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/kmouth-20.08.2.tar.xz"; - sha256 = "d206afecdbe5f063dfbf805956f475e95c7b0fd548fd5f1b4fd7376ea6747e96"; - name = "kmouth-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/kmouth-20.08.3.tar.xz"; + sha256 = "0ajhnl1sjllfb42nyafpirmlgcs6waqp8qxvgsz5dk5zkb8daqmr"; + name = "kmouth-20.08.3.tar.xz"; }; }; kmplot = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/kmplot-20.08.2.tar.xz"; - sha256 = "c3bc34a2d1bf4620745009b49b6541a16ac64eb3d1e6cf1ba936b14aa5d02e2b"; - name = "kmplot-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/kmplot-20.08.3.tar.xz"; + sha256 = "0cv7q1wmbb3fkf4s6ns4q1il5zr4q02b3xghpp661ma82d8jhjcy"; + name = "kmplot-20.08.3.tar.xz"; }; }; knavalbattle = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/knavalbattle-20.08.2.tar.xz"; - sha256 = "2cd91ee61193810eee62e47f38f590e81b03287083f31564e0ebfd893d339ac9"; - name = "knavalbattle-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/knavalbattle-20.08.3.tar.xz"; + sha256 = "1028i8zl5ynm3vvqajsms2hq8gmmjmjc5dc6r3jyh6r964vxq3nq"; + name = "knavalbattle-20.08.3.tar.xz"; }; }; knetwalk = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/knetwalk-20.08.2.tar.xz"; - sha256 = "4a97f4b1af463e5e50698e8ac089cf6933fb66f25dd9b0fae3f1b1a51cbca3c0"; - name = "knetwalk-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/knetwalk-20.08.3.tar.xz"; + sha256 = "13pspvi2p68irpbr3f2ck78qmvfl3vahm5qjw2fwhidhpindf9nl"; + name = "knetwalk-20.08.3.tar.xz"; }; }; knights = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/knights-20.08.2.tar.xz"; - sha256 = "b62dda6e8b5bb85cc814f7244e39806e38c266be1bf3090eb6de59c8141fc1d4"; - name = "knights-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/knights-20.08.3.tar.xz"; + sha256 = "0zqb87mr2x085hi3r9cvdrx2kvxmclh4ffi1ajcb8v1f79wiwzin"; + name = "knights-20.08.3.tar.xz"; }; }; knotes = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/knotes-20.08.2.tar.xz"; - sha256 = "1e61f2c8b5fe9075f07be16543e3a7310bf533b6c2446f162f7196b41e3e6ecb"; - name = "knotes-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/knotes-20.08.3.tar.xz"; + sha256 = "0ysw8js2s6njilg4v4vqrl1bzcmqvk42l68pzvyflr112zviqz28"; + name = "knotes-20.08.3.tar.xz"; }; }; kolf = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/kolf-20.08.2.tar.xz"; - sha256 = "834c1c6cdc62e650c7b0d36db26387cc4ebe2bb4b2e8fa06c0bf461e3a1e8c64"; - name = "kolf-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/kolf-20.08.3.tar.xz"; + sha256 = "1ywyny8iq2sxglsvpgw6p3w3w567k6cw6waywfcfy0lcnfarg1n0"; + name = "kolf-20.08.3.tar.xz"; }; }; kollision = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/kollision-20.08.2.tar.xz"; - sha256 = "9b6829f49d9baa89596ef8649996724db72c3c8eb793b9b6afc80dc0d07c0421"; - name = "kollision-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/kollision-20.08.3.tar.xz"; + sha256 = "1l8a32bni40jz5jna0ip9ggbx7zp1hhiw2mip7v8f6qc4arbknl8"; + name = "kollision-20.08.3.tar.xz"; }; }; kolourpaint = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/kolourpaint-20.08.2.tar.xz"; - sha256 = "fbcd875a4a407d9b1e5a637d4947bacfb50f39e10af3327f30fdbb953528aae0"; - name = "kolourpaint-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/kolourpaint-20.08.3.tar.xz"; + sha256 = "0d64gnnb553rxscr8710h5bx8ijxd87jrbix07k41y79i5x60irh"; + name = "kolourpaint-20.08.3.tar.xz"; }; }; kompare = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/kompare-20.08.2.tar.xz"; - sha256 = "4e52cb2c9e35e90fe77bfb23bd10c1931c56b11e3fec06c215730d60c47e8550"; - name = "kompare-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/kompare-20.08.3.tar.xz"; + sha256 = "0r9m2vcw9hbdkfdy24pfpqs2b5r0jyxh1ma2h66hfv4ycd470ilc"; + name = "kompare-20.08.3.tar.xz"; }; }; konqueror = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/konqueror-20.08.2.tar.xz"; - sha256 = "f0622aa67ad0028e28bd6129688aab8946fb49492f0b335f6624ab7d4ef239d7"; - name = "konqueror-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/konqueror-20.08.3.tar.xz"; + sha256 = "1ssjj83jcbcq8i7wx5zd12z7crh2zg6awbpy38maq3c7747nqz7k"; + name = "konqueror-20.08.3.tar.xz"; }; }; konquest = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/konquest-20.08.2.tar.xz"; - sha256 = "cf97a6961b15b39f5bcdf541e52c137f1d67d0fa5ee259922b4e762edc4491eb"; - name = "konquest-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/konquest-20.08.3.tar.xz"; + sha256 = "1wq0j02dzdah6yhx8r2cg191617hid9fs780yr317fprkwkgb8cb"; + name = "konquest-20.08.3.tar.xz"; }; }; konsole = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/konsole-20.08.2.tar.xz"; - sha256 = "af08ac7666f1ba7c407205f32aaaf015329621247502e80d8df4abe103148951"; - name = "konsole-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/konsole-20.08.3.tar.xz"; + sha256 = "0jjidy756x8n456qbm977a73l8229kk8i489jh52296k8pkh6yjx"; + name = "konsole-20.08.3.tar.xz"; }; }; kontact = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/kontact-20.08.2.tar.xz"; - sha256 = "232d9880df74ce0c7697f08b53ef9512ac9c11c3b04142ba7ba4b95091cb5396"; - name = "kontact-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/kontact-20.08.3.tar.xz"; + sha256 = "0qasgxvq7xps0zxk4hf2sizmy90mxyq70m2pq49pq17ij2pa9ynl"; + name = "kontact-20.08.3.tar.xz"; }; }; kontactinterface = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/kontactinterface-20.08.2.tar.xz"; - sha256 = "72d53dbea9db0b1f5654e13c18b4da3d256c6b9d08dfe4581cdf73e3552d2a07"; - name = "kontactinterface-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/kontactinterface-20.08.3.tar.xz"; + sha256 = "1ah2814js08sm49ykarqdw7z03w4fbym5cc4vwmzimcvh2bc78j3"; + name = "kontactinterface-20.08.3.tar.xz"; }; }; kopete = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/kopete-20.08.2.tar.xz"; - sha256 = "05f5d6236d4c96b9ce7ba5f24f4e06d7263a78cac27368a7e6b3e5075d42fbb1"; - name = "kopete-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/kopete-20.08.3.tar.xz"; + sha256 = "1lsab66k0xq1g0w0cxcpadmf9kkc09x8wwbv4i8y3aj2mn7849gh"; + name = "kopete-20.08.3.tar.xz"; }; }; korganizer = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/korganizer-20.08.2.tar.xz"; - sha256 = "4f719ec12c52fc313997a187439dc6888fd030a4a1b2357db000abc0a19527b2"; - name = "korganizer-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/korganizer-20.08.3.tar.xz"; + sha256 = "112h6vn2y9d3q3z62cwg3zrak3xgx9affibc9cvr6fzhp4z0x9ps"; + name = "korganizer-20.08.3.tar.xz"; }; }; kpat = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/kpat-20.08.2.tar.xz"; - sha256 = "e4aaed4e876212a926a05d252dab9d01f240d829e383c6072e168a4f78e6d446"; - name = "kpat-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/kpat-20.08.3.tar.xz"; + sha256 = "1id4b9jkphi8pp29gc2vb3n9f0g8kl9yy5v8cnyv3jq673aj0fs9"; + name = "kpat-20.08.3.tar.xz"; }; }; kpimtextedit = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/kpimtextedit-20.08.2.tar.xz"; - sha256 = "2dfbcdd53669c812234346b4d31b61af9c510bb4cb0b9912decea8d3c4d406a6"; - name = "kpimtextedit-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/kpimtextedit-20.08.3.tar.xz"; + sha256 = "1m4r5zbhbjvj3za78xfp3dibyf7mp9gan5ir5zd0k2p7adp3i652"; + name = "kpimtextedit-20.08.3.tar.xz"; }; }; kpkpass = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/kpkpass-20.08.2.tar.xz"; - sha256 = "ed699c75128ef299f06d699c80c69ac9529fa044db6f18a39d54a5e70d85108c"; - name = "kpkpass-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/kpkpass-20.08.3.tar.xz"; + sha256 = "0zw3xx5mi38za0xbvld97f5bqvwwgyz47kybyrdm7jrhvmmiiiis"; + name = "kpkpass-20.08.3.tar.xz"; }; }; kqtquickcharts = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/kqtquickcharts-20.08.2.tar.xz"; - sha256 = "2ba593a65c143cb56a3030f7ee0cced2df7c7e9431cebf1ae93be51c68b4c3b4"; - name = "kqtquickcharts-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/kqtquickcharts-20.08.3.tar.xz"; + sha256 = "0l7v8vrc7by0w0yshnh21jaqhspmhkvm5cd0hpay6jc9v2azkcf3"; + name = "kqtquickcharts-20.08.3.tar.xz"; }; }; krdc = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/krdc-20.08.2.tar.xz"; - sha256 = "52ddd68bdb1b356be341cf3bc5405cb965f4e4f3da8bf4b28bfb62c7db21ac5f"; - name = "krdc-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/krdc-20.08.3.tar.xz"; + sha256 = "1g9lxdldljh5a2s4g7g9b98lij168l99ah0vr6nvdl53n35pfr8n"; + name = "krdc-20.08.3.tar.xz"; }; }; kreversi = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/kreversi-20.08.2.tar.xz"; - sha256 = "22824dca9c8f07145a6fd9b7386867d8a8efff0fda6752f377230381a1cc71c2"; - name = "kreversi-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/kreversi-20.08.3.tar.xz"; + sha256 = "0d3y072q61xcik9lf0pz0c9njvarwlvf6hqv5fp5jyqaf2902pmi"; + name = "kreversi-20.08.3.tar.xz"; }; }; krfb = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/krfb-20.08.2.tar.xz"; - sha256 = "5e90fb4f3bcf2c48b15ec33634d61464323ab5ce1c156a499f089d862dd041d4"; - name = "krfb-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/krfb-20.08.3.tar.xz"; + sha256 = "13nypbcdhh53wq72w59z5q46a09g1w4yyi1pmsjwa8r7jnk8cafk"; + name = "krfb-20.08.3.tar.xz"; }; }; kross-interpreters = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/kross-interpreters-20.08.2.tar.xz"; - sha256 = "82da0302d2d292e86fa924c8bd1d4effb21f763c42c57affaddeff4777c43951"; - name = "kross-interpreters-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/kross-interpreters-20.08.3.tar.xz"; + sha256 = "0mr5vpbbcv66s6dyrrypy1ai6ba744z8cn4r0iwys35p6am075qj"; + name = "kross-interpreters-20.08.3.tar.xz"; }; }; kruler = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/kruler-20.08.2.tar.xz"; - sha256 = "ede45d9cdf1b514fb20ed3a97877689ec75904438b94735706eb638ba01ca778"; - name = "kruler-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/kruler-20.08.3.tar.xz"; + sha256 = "1vhl8acccdqfdj7lci8r2mig9qf1js4f8v7b4fqljpnc3gdg8749"; + name = "kruler-20.08.3.tar.xz"; }; }; kshisen = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/kshisen-20.08.2.tar.xz"; - sha256 = "d11030b101a409324661adf664d4298f34cc320abff80dba72d112cc3ae2d25d"; - name = "kshisen-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/kshisen-20.08.3.tar.xz"; + sha256 = "1vy8qh8s60a4ikyw3sh4cbr3p3fk35d4dwdqc263gn4skyrsb1l9"; + name = "kshisen-20.08.3.tar.xz"; }; }; ksirk = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/ksirk-20.08.2.tar.xz"; - sha256 = "b7766f0976b3cc112d4c599d91c07d321829c9b1e8ef34d3d21ec4964026854a"; - name = "ksirk-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/ksirk-20.08.3.tar.xz"; + sha256 = "1kxc1b05r8x6pvaiwpvjpgrr88qkm5qs4d3s1ym8rki60c724qpl"; + name = "ksirk-20.08.3.tar.xz"; }; }; ksmtp = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/ksmtp-20.08.2.tar.xz"; - sha256 = "5f51e0c025b192719709ae763feeac94df893007b62b5a69b7b95ae9f2fdd8ee"; - name = "ksmtp-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/ksmtp-20.08.3.tar.xz"; + sha256 = "1p9clzvmsym2fijwvs3s0zqx57bk82mlks52j5ni3il6lvklaayc"; + name = "ksmtp-20.08.3.tar.xz"; }; }; ksnakeduel = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/ksnakeduel-20.08.2.tar.xz"; - sha256 = "b6f0f51f8fad795cd134f9426b1f1ba8ccceb72e304e8ba55e60af471ad282cc"; - name = "ksnakeduel-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/ksnakeduel-20.08.3.tar.xz"; + sha256 = "03ydbwknn20gadjpwcw0z8zw777hgj8j10w4gvp2dwpb07rdg1pn"; + name = "ksnakeduel-20.08.3.tar.xz"; }; }; kspaceduel = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/kspaceduel-20.08.2.tar.xz"; - sha256 = "62b9526c031662c049aa90b06ed3e5e2ce8ae774f271e1f29430f23c1f6cd787"; - name = "kspaceduel-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/kspaceduel-20.08.3.tar.xz"; + sha256 = "1ii3lnxd11d3ihl8j1abh9qn9q0qq8ra9hbrwjs5df2kk36bnirj"; + name = "kspaceduel-20.08.3.tar.xz"; }; }; ksquares = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/ksquares-20.08.2.tar.xz"; - sha256 = "e1f9fdfa9a4a8348a65e66d48b7389784a1db6c8799cea453d6da3a2a57aca59"; - name = "ksquares-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/ksquares-20.08.3.tar.xz"; + sha256 = "1ch7lbylzb9ngdzvpzqq5f30gkm2l4rzk6iqa8xm53rawr7jjqcy"; + name = "ksquares-20.08.3.tar.xz"; }; }; ksudoku = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/ksudoku-20.08.2.tar.xz"; - sha256 = "6fed393f734eb27d6c36ad7516bf29ff648d319f08d9f8bdc17a8030842d8e33"; - name = "ksudoku-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/ksudoku-20.08.3.tar.xz"; + sha256 = "0hnqbd3krxi3zwj8p4n9ydhwfwhw8wljhjdfv0llv0nhj1wb89p9"; + name = "ksudoku-20.08.3.tar.xz"; }; }; ksystemlog = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/ksystemlog-20.08.2.tar.xz"; - sha256 = "63c6a520b63f148de2e3996250a2fef22e1a3ce18e744a699ae21de96a2c4e53"; - name = "ksystemlog-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/ksystemlog-20.08.3.tar.xz"; + sha256 = "11fc2mn4hkcibpxp7s2gihpp05yix7ws84a0bm6vjiqlidmrk192"; + name = "ksystemlog-20.08.3.tar.xz"; }; }; kteatime = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/kteatime-20.08.2.tar.xz"; - sha256 = "d8e69fdb124e8689c72e4b9fe39226cc49b1ca990478fbb68e02b37f0cd861ac"; - name = "kteatime-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/kteatime-20.08.3.tar.xz"; + sha256 = "1vj738s2a7nnrvxi847mdmn1vg79kh9k8gqaflcwnvyxanf6n4f7"; + name = "kteatime-20.08.3.tar.xz"; }; }; ktimer = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/ktimer-20.08.2.tar.xz"; - sha256 = "69293b7296643c6543d0646d14f9c75479f29f129924258957a407b77539a4c2"; - name = "ktimer-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/ktimer-20.08.3.tar.xz"; + sha256 = "1rc1z93s24b7p2ixr4xbpg0sj8ls90gzfijwj9f8b0lrwd905ysv"; + name = "ktimer-20.08.3.tar.xz"; }; }; ktnef = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/ktnef-20.08.2.tar.xz"; - sha256 = "ab73736e386c2b52a14fb56f1184479ed1c83c0571e9e8518d2b94b1dcd2e47d"; - name = "ktnef-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/ktnef-20.08.3.tar.xz"; + sha256 = "1lj93sqyi522k91jiyf7d26vx5sgn5njhyaf8plsfz5rj82dw1m4"; + name = "ktnef-20.08.3.tar.xz"; }; }; ktouch = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/ktouch-20.08.2.tar.xz"; - sha256 = "1b073a92343c9a2c772cfaac4e9fa7b6e85750586e3a57da413e33cdba34b5f4"; - name = "ktouch-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/ktouch-20.08.3.tar.xz"; + sha256 = "1ssxd7f75866rn5k192bnm016d8674q13ibcgmaxqsmr7wqkyd39"; + name = "ktouch-20.08.3.tar.xz"; }; }; ktp-accounts-kcm = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/ktp-accounts-kcm-20.08.2.tar.xz"; - sha256 = "df709ee612ff4c71a43197762b8a9d296b5a43f6e0afe4d9c8d0bd88eef81465"; - name = "ktp-accounts-kcm-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/ktp-accounts-kcm-20.08.3.tar.xz"; + sha256 = "0039svbzx7fphyk6cw4hb8k4h7l6q31pbwvp6pvls450rycz8i8y"; + name = "ktp-accounts-kcm-20.08.3.tar.xz"; }; }; ktp-approver = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/ktp-approver-20.08.2.tar.xz"; - sha256 = "054db02db679d0a4600632700cdd57cae539159a0a8f01f479ea337d33d8a6bd"; - name = "ktp-approver-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/ktp-approver-20.08.3.tar.xz"; + sha256 = "1kqsdw7vkcd0ka98y2r7qz7dp5hsrr2m8k1xlh3gpj7fdxpla2bh"; + name = "ktp-approver-20.08.3.tar.xz"; }; }; ktp-auth-handler = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/ktp-auth-handler-20.08.2.tar.xz"; - sha256 = "a61557efa800d42fd8ed14efdb09d43310212976d737a4fd5272f502bacbc371"; - name = "ktp-auth-handler-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/ktp-auth-handler-20.08.3.tar.xz"; + sha256 = "0wbhg458ysipwma8sygimasq71sbrzmx3vwqi51ai8y5hwrx04j4"; + name = "ktp-auth-handler-20.08.3.tar.xz"; }; }; ktp-call-ui = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/ktp-call-ui-20.08.2.tar.xz"; - sha256 = "ecd38d8b9f24cf620b8c9c1935328af3142199c6aa87e69c734e43096e492ac5"; - name = "ktp-call-ui-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/ktp-call-ui-20.08.3.tar.xz"; + sha256 = "1fh8bz9kc6f8v28x12xp3vw19swgcq07zyjzhd6qcnwf1bv6gl7i"; + name = "ktp-call-ui-20.08.3.tar.xz"; }; }; ktp-common-internals = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/ktp-common-internals-20.08.2.tar.xz"; - sha256 = "807fcd6f9c415a0799057435f997e143e9584a94577f9afaa7fcc6a4197e7cb0"; - name = "ktp-common-internals-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/ktp-common-internals-20.08.3.tar.xz"; + sha256 = "193yx4g1fwlwysy5scb7m24wqmvwmfyyb9sv7arw7zn5czlg480z"; + name = "ktp-common-internals-20.08.3.tar.xz"; }; }; ktp-contact-list = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/ktp-contact-list-20.08.2.tar.xz"; - sha256 = "214d73532dc855a8a4b68730adf5cbd046aae89f2ee2ad5d9a4c25b4eff6acb0"; - name = "ktp-contact-list-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/ktp-contact-list-20.08.3.tar.xz"; + sha256 = "0093z17r1xqlb1zlgxfayrnrkyl8zmnnasfd8i97dx712wmbbxxa"; + name = "ktp-contact-list-20.08.3.tar.xz"; }; }; ktp-contact-runner = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/ktp-contact-runner-20.08.2.tar.xz"; - sha256 = "8e40e4ab7ce2c1c382b109a15f88f5e1c7d147c76ed36ca05ef6d9f3f58d3d45"; - name = "ktp-contact-runner-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/ktp-contact-runner-20.08.3.tar.xz"; + sha256 = "063jylnq3gm0s0jh1xs6b591a161sb6gdi840l40mqlhhg7i8x55"; + name = "ktp-contact-runner-20.08.3.tar.xz"; }; }; ktp-desktop-applets = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/ktp-desktop-applets-20.08.2.tar.xz"; - sha256 = "b0884360be80f89dee3852b023055220e3cdab2f422cc3812eda31169fba6298"; - name = "ktp-desktop-applets-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/ktp-desktop-applets-20.08.3.tar.xz"; + sha256 = "1i69qzfa455phjnd5ycflyggcbq7ycn2cc7a3ni5195isjzq6r6s"; + name = "ktp-desktop-applets-20.08.3.tar.xz"; }; }; ktp-filetransfer-handler = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/ktp-filetransfer-handler-20.08.2.tar.xz"; - sha256 = "c2ec5fd2a5746dd8ce1371c503c51feee206d8dfe7ca8cdaa71b8e925636a97c"; - name = "ktp-filetransfer-handler-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/ktp-filetransfer-handler-20.08.3.tar.xz"; + sha256 = "0a26ziacl3fkd0a0h1579jnwjzjlsz0zymj9k4da4sb60zad5y72"; + name = "ktp-filetransfer-handler-20.08.3.tar.xz"; }; }; ktp-kded-module = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/ktp-kded-module-20.08.2.tar.xz"; - sha256 = "307285b2d4e04c244691a6f2a285aec8ada26e0b01eb1fdbf2bc1da57b05828a"; - name = "ktp-kded-module-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/ktp-kded-module-20.08.3.tar.xz"; + sha256 = "105vh6b7a0v02arksbwxn30slpcg11cpvb7dqmvf041iyr13sqsv"; + name = "ktp-kded-module-20.08.3.tar.xz"; }; }; ktp-send-file = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/ktp-send-file-20.08.2.tar.xz"; - sha256 = "6c3fb09112d439ce2f0db3acdbc766e8a914d4dc7cbb6ab709922f8e95f2f0e1"; - name = "ktp-send-file-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/ktp-send-file-20.08.3.tar.xz"; + sha256 = "08pp3029jplc6rcbav40cgy787gn3jjl312gbgvnwzglxaqvcg4b"; + name = "ktp-send-file-20.08.3.tar.xz"; }; }; ktp-text-ui = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/ktp-text-ui-20.08.2.tar.xz"; - sha256 = "0f10612e08bc1ee04fb0a538337d760d7b79b5dac37bb58275998d16dbb5415c"; - name = "ktp-text-ui-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/ktp-text-ui-20.08.3.tar.xz"; + sha256 = "1anxl9wa5ndyi9r9w0kpivx8nv1xpx28xjvkdplkc75cc1wl88sw"; + name = "ktp-text-ui-20.08.3.tar.xz"; }; }; ktuberling = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/ktuberling-20.08.2.tar.xz"; - sha256 = "f9e4a0de3b92d015f8e7b862badf4bbf11b3ce2727aa607384a009247e7b7fad"; - name = "ktuberling-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/ktuberling-20.08.3.tar.xz"; + sha256 = "0q6ynmn6w5q65a77fq8n9vxqswrimln22b1zfgxmb2i3qwnhkrmz"; + name = "ktuberling-20.08.3.tar.xz"; }; }; kturtle = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/kturtle-20.08.2.tar.xz"; - sha256 = "ca9bf47b2ec34744492f218c922b10d613b19fbbd2c75b6ddba157eef21337c7"; - name = "kturtle-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/kturtle-20.08.3.tar.xz"; + sha256 = "0riv76vwvz94zixqhhwkxw8sz2r2xqai39yh9hr31d28q9rza384"; + name = "kturtle-20.08.3.tar.xz"; }; }; kubrick = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/kubrick-20.08.2.tar.xz"; - sha256 = "02fed26a7246feffd668fbda939893295557c0571da64fdf195db93474653224"; - name = "kubrick-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/kubrick-20.08.3.tar.xz"; + sha256 = "03k73gr33dr3va69vc70fsfcdwkqz70bg87yk2l2j33x8wsgl4wx"; + name = "kubrick-20.08.3.tar.xz"; }; }; kwalletmanager = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/kwalletmanager-20.08.2.tar.xz"; - sha256 = "7950e250c5351a9b8e3b36165fa2003baa044bb2d3553a32360000a322bddad8"; - name = "kwalletmanager-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/kwalletmanager-20.08.3.tar.xz"; + sha256 = "1l07vxl2x3jl8553rbvr3p0k3rc95nmrw4vhxxynl3102xshrg5i"; + name = "kwalletmanager-20.08.3.tar.xz"; }; }; kwave = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/kwave-20.08.2.tar.xz"; - sha256 = "6e15a67022ef96f07b9825139cc7aaacbc6f60729570c31ce6cb25184602b434"; - name = "kwave-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/kwave-20.08.3.tar.xz"; + sha256 = "0zk8ik03qcc6y0vhpih8sk2jpkxwxalmqmaan2767k9h92grdpc8"; + name = "kwave-20.08.3.tar.xz"; }; }; kwordquiz = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/kwordquiz-20.08.2.tar.xz"; - sha256 = "57aa012f3aad128579f067668db1344306e2e23d6a89b47d413d6eee0da0e238"; - name = "kwordquiz-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/kwordquiz-20.08.3.tar.xz"; + sha256 = "1kiqk3xyd0l7kqdxqjqs8mw4drcdbdri9xxi5gcav57ndcinknqb"; + name = "kwordquiz-20.08.3.tar.xz"; }; }; libgravatar = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/libgravatar-20.08.2.tar.xz"; - sha256 = "4c0a2eb073ef42a26813b93bd76aaa9e26a040a966329e6e3cf371d7de1e55f7"; - name = "libgravatar-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/libgravatar-20.08.3.tar.xz"; + sha256 = "09dvx2rb1j7q4r0gkbhz0vjk8ya3njqprpjqdhwcq7xwc2j9h0hr"; + name = "libgravatar-20.08.3.tar.xz"; }; }; libkcddb = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/libkcddb-20.08.2.tar.xz"; - sha256 = "545cf54ac454845c524ba7cd7ec289ac952fa1ce2bbae01411ba71c66a5ed08a"; - name = "libkcddb-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/libkcddb-20.08.3.tar.xz"; + sha256 = "0r36hs79hmq0znsds0d04lj7ffs6l2d866kyn1z1fdwr9b3crirg"; + name = "libkcddb-20.08.3.tar.xz"; }; }; libkcompactdisc = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/libkcompactdisc-20.08.2.tar.xz"; - sha256 = "37534f67af69775d6f786917920d2810a5d20f28df57e1a17aee9a7b30bbe302"; - name = "libkcompactdisc-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/libkcompactdisc-20.08.3.tar.xz"; + sha256 = "1nglk3kbx5czqla3cnpnf1fk71pf2cl9h6rgb40ak1xw4z31d456"; + name = "libkcompactdisc-20.08.3.tar.xz"; }; }; libkdcraw = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/libkdcraw-20.08.2.tar.xz"; - sha256 = "6fbf1a5ca5a439fabb01648cde4b57e1f3de2372b7f3b56ccae03f653490f1b2"; - name = "libkdcraw-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/libkdcraw-20.08.3.tar.xz"; + sha256 = "1806i99qsrmixdg5b0hyi8h55fk00q6wxsnrblbwcmsb268jddp7"; + name = "libkdcraw-20.08.3.tar.xz"; }; }; libkdegames = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/libkdegames-20.08.2.tar.xz"; - sha256 = "d9f0ab87dc4671a55ad8d2b7d3a54cbc444201c11ebae436e0107fe7067fb983"; - name = "libkdegames-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/libkdegames-20.08.3.tar.xz"; + sha256 = "1ccbcwwqb53bgqlr1rq9plpw21mipxp8rsi1f7l0p1jzpw054p08"; + name = "libkdegames-20.08.3.tar.xz"; }; }; libkdepim = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/libkdepim-20.08.2.tar.xz"; - sha256 = "3558c9af95c22bb4ce0ceeec483fada9e8e9f27de4ac34ffe44a4eb3b6d21101"; - name = "libkdepim-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/libkdepim-20.08.3.tar.xz"; + sha256 = "1v77g02v5sdqprh8psx5xpjgf8v91il60ca59yivm5jvc3hdf3f6"; + name = "libkdepim-20.08.3.tar.xz"; }; }; libkeduvocdocument = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/libkeduvocdocument-20.08.2.tar.xz"; - sha256 = "ef8e0b359e3cf1b3303da3795add1ced405d230f51895abe10d5a7989be03923"; - name = "libkeduvocdocument-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/libkeduvocdocument-20.08.3.tar.xz"; + sha256 = "0ghkx6x5sn5fl934ybhl32knwv9zky0n1vkjw2w93lpms45xmw76"; + name = "libkeduvocdocument-20.08.3.tar.xz"; }; }; libkexiv2 = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/libkexiv2-20.08.2.tar.xz"; - sha256 = "793c4d11bb1b60beca7b25a2427650b3f358364c55be022dfd4a7ccfd889578d"; - name = "libkexiv2-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/libkexiv2-20.08.3.tar.xz"; + sha256 = "1lh3947w6xgzl2r1wm6m4kd478q6bv89f0c3c38ldv30imfw7rfl"; + name = "libkexiv2-20.08.3.tar.xz"; }; }; libkgapi = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/libkgapi-20.08.2.tar.xz"; - sha256 = "f3fb015e8b8ac92c138e8a59e8e8b9333500e0ea314180cc1ad14e31248312df"; - name = "libkgapi-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/libkgapi-20.08.3.tar.xz"; + sha256 = "1kmgf9v9rvb67l7aw5xsx7v44l4pz8rl6p09lk26irq7gd4k68la"; + name = "libkgapi-20.08.3.tar.xz"; }; }; libkgeomap = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/libkgeomap-20.08.2.tar.xz"; - sha256 = "7149095aa0df4e3a184bb2a6fb8322e27e3a34eb3bc40cf370a09b21fb2a6ea0"; - name = "libkgeomap-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/libkgeomap-20.08.3.tar.xz"; + sha256 = "14ipksxnvgk2s1sw7a70153iy9aik9mf4i7k8y3pzdr3l3155ayk"; + name = "libkgeomap-20.08.3.tar.xz"; }; }; libkipi = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/libkipi-20.08.2.tar.xz"; - sha256 = "87ffa30b23779313a94953afe57d1b19515c3a2f311a2dea6449c9d96b09e5b1"; - name = "libkipi-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/libkipi-20.08.3.tar.xz"; + sha256 = "1b5qby7xm926qnzrf1zpb89fwx1a2syhqnznmdjxifj499p1jqjb"; + name = "libkipi-20.08.3.tar.xz"; }; }; libkleo = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/libkleo-20.08.2.tar.xz"; - sha256 = "34537b35e22cef85650ae6f9bf197518bb5a59e9614d6d86ba86f085fddd97c4"; - name = "libkleo-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/libkleo-20.08.3.tar.xz"; + sha256 = "1d6dal4qnrikg6ma2ird4b2sdivqqkkhamvd3s1srcxppc3aiq79"; + name = "libkleo-20.08.3.tar.xz"; }; }; libkmahjongg = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/libkmahjongg-20.08.2.tar.xz"; - sha256 = "032ac6d9e96cd9156f5153c01f881d0e442fda9de90398df320846095ba2c40a"; - name = "libkmahjongg-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/libkmahjongg-20.08.3.tar.xz"; + sha256 = "0xabp1vzbzs52m3bb9nzm1d9md1n4j4pr13izn6nv28ja7477nnm"; + name = "libkmahjongg-20.08.3.tar.xz"; }; }; libkomparediff2 = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/libkomparediff2-20.08.2.tar.xz"; - sha256 = "91b0b72d5c4e2ddd863636cca299660bfbb5b7a55773cbc51000fe9c1ca91a98"; - name = "libkomparediff2-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/libkomparediff2-20.08.3.tar.xz"; + sha256 = "0nk0jkf0jwaz1yqzzp44c6xyjgw42gclkcvw8w61w1f8sdl40wb8"; + name = "libkomparediff2-20.08.3.tar.xz"; }; }; libksane = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/libksane-20.08.2.tar.xz"; - sha256 = "21bb577d78e020281dfc6c993ab7fe286d648e72c851e45463a32969fbb35aa6"; - name = "libksane-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/libksane-20.08.3.tar.xz"; + sha256 = "0d2cnmvk16g1vnx9jd7jvp3bpw07ss54khmhqip8iskkvcfll9j0"; + name = "libksane-20.08.3.tar.xz"; }; }; libksieve = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/libksieve-20.08.2.tar.xz"; - sha256 = "589e4dc27d1d91d8c16879fa99aab45f3847a74e3e9357e3e037503e5515ee2e"; - name = "libksieve-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/libksieve-20.08.3.tar.xz"; + sha256 = "0bhpdqynazssql2iivvpb9l8npa441345gcn59fc0va6barl9sam"; + name = "libksieve-20.08.3.tar.xz"; }; }; lokalize = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/lokalize-20.08.2.tar.xz"; - sha256 = "c11616bc02763fb1f3b1abf0b2ba70d0c6c550435c94ff25c5096f9a90375e23"; - name = "lokalize-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/lokalize-20.08.3.tar.xz"; + sha256 = "0iab8sd1qh7h0zna7lc3v43z6rcmxba9v4nynhl5miiac4r6ddr8"; + name = "lokalize-20.08.3.tar.xz"; }; }; lskat = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/lskat-20.08.2.tar.xz"; - sha256 = "78f152f7af46345f65c3800f9c591fb204e917595c1f803c9c15148ef39c42b8"; - name = "lskat-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/lskat-20.08.3.tar.xz"; + sha256 = "1rcmh592w5gd5b69czfxycypidj74y2d91cw92rccariadz9vnjz"; + name = "lskat-20.08.3.tar.xz"; }; }; mailcommon = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/mailcommon-20.08.2.tar.xz"; - sha256 = "a4170ab9ff7680fb26c61474f42d5424716f4e91c1a5e9275cc1222491c9564d"; - name = "mailcommon-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/mailcommon-20.08.3.tar.xz"; + sha256 = "0bhs60cz4qcrqkmw2sm6cd2laq8lzj9vcwi8kjqkajsidh342wdv"; + name = "mailcommon-20.08.3.tar.xz"; }; }; mailimporter = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/mailimporter-20.08.2.tar.xz"; - sha256 = "a255b60378c1cf77e517919d072cb44bd8c25e8ed8f07429763bb7915b3cc711"; - name = "mailimporter-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/mailimporter-20.08.3.tar.xz"; + sha256 = "0w6yfgqx0adlkwx32vmb23kl6n50737jiabmad3pnhqw8rv41h80"; + name = "mailimporter-20.08.3.tar.xz"; }; }; marble = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/marble-20.08.2.tar.xz"; - sha256 = "f44ac10de33dc31ce1cb99635131fe2c7bf3f60f09204b2061f81042a725475c"; - name = "marble-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/marble-20.08.3.tar.xz"; + sha256 = "1xpxgy724z97k063fdk0l3mrl8i6nvnhj35b4987jqji76i92ffb"; + name = "marble-20.08.3.tar.xz"; }; }; mbox-importer = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/mbox-importer-20.08.2.tar.xz"; - sha256 = "3b3bee33683c534974255616f3b2f3baebf85363b2c24bbee9cc195ddf35ca9a"; - name = "mbox-importer-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/mbox-importer-20.08.3.tar.xz"; + sha256 = "1qh0f93df228cqlcqdwc7g6im3g0gkfmzir3ccsmb5iv0ygvjl6f"; + name = "mbox-importer-20.08.3.tar.xz"; }; }; messagelib = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/messagelib-20.08.2.tar.xz"; - sha256 = "5cf3a3f2b6473e60a7c2af10aa4eb1cfba25a4786132ee87b657b0dafb9f5028"; - name = "messagelib-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/messagelib-20.08.3.tar.xz"; + sha256 = "16amni6qrq96h8jr313gc7k9frwr20d4pk9y2i61a1xm2w3xsqd4"; + name = "messagelib-20.08.3.tar.xz"; }; }; minuet = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/minuet-20.08.2.tar.xz"; - sha256 = "24383168e2a0b7b319ecb37e2b1f3b039ad790a7e0f49385657f049565f1ef84"; - name = "minuet-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/minuet-20.08.3.tar.xz"; + sha256 = "1l45g7labnyz0pkwcfhjl5a3ypr7cy3bsshr06ab85364yjwazvi"; + name = "minuet-20.08.3.tar.xz"; }; }; okular = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/okular-20.08.2.tar.xz"; - sha256 = "6f1885ed8050a55bb2cbf05089b452f555852e003ec7fe89fe472c0dbc92e65b"; - name = "okular-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/okular-20.08.3.tar.xz"; + sha256 = "1q59ikcwsfgjc0202daingxv15iarnzba6szdncznzcafd6hhk9z"; + name = "okular-20.08.3.tar.xz"; }; }; palapeli = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/palapeli-20.08.2.tar.xz"; - sha256 = "a31b0db2f3e77eac8f527d26f8ed0400fe5bcdb3a3970b925f14886bd1bcd63e"; - name = "palapeli-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/palapeli-20.08.3.tar.xz"; + sha256 = "107z3izfznrq7g5aqb5a7r8a4ibaia90g334d7wwvd7prm7hdgfp"; + name = "palapeli-20.08.3.tar.xz"; }; }; parley = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/parley-20.08.2.tar.xz"; - sha256 = "cf2f00925730d8baec66d422f058e4b3e979678e79c57898ceffd8650720bda6"; - name = "parley-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/parley-20.08.3.tar.xz"; + sha256 = "0wli09zkk5z50y1gzp5wc9k056xjaadlq97j09lf6lqyg6kb56ya"; + name = "parley-20.08.3.tar.xz"; }; }; picmi = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/picmi-20.08.2.tar.xz"; - sha256 = "35f2bf3d8375618f97aee01c8f2421521b2cd5c11d7b14fc9a376026d74c82a5"; - name = "picmi-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/picmi-20.08.3.tar.xz"; + sha256 = "1lkpazsi9dyb2y9q5bk56d80x7x035rf4hdap25i8qfj3ilykv3w"; + name = "picmi-20.08.3.tar.xz"; }; }; pimcommon = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/pimcommon-20.08.2.tar.xz"; - sha256 = "cba9e66153d36debe3f046363af7ff40a4ba263f33bfe20c7ec10b5bf9183deb"; - name = "pimcommon-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/pimcommon-20.08.3.tar.xz"; + sha256 = "0mpl7li2y5xjzk4hdb85d1x7cz15cicd91c1krlw74q7pbrjinlq"; + name = "pimcommon-20.08.3.tar.xz"; }; }; pim-data-exporter = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/pim-data-exporter-20.08.2.tar.xz"; - sha256 = "54b09a3f763004c805cc0dce8ab2e665116b7ef29419f22ad413aa250dcb4ac0"; - name = "pim-data-exporter-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/pim-data-exporter-20.08.3.tar.xz"; + sha256 = "0f08c16d3730fbdsbrwlr9w5c4l9xcmd1bdbv5m38h5r2ddlkvzr"; + name = "pim-data-exporter-20.08.3.tar.xz"; }; }; pim-sieve-editor = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/pim-sieve-editor-20.08.2.tar.xz"; - sha256 = "e8c590a0fddc5292172115b11fb75c5f847347079100617dbf321875642d7098"; - name = "pim-sieve-editor-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/pim-sieve-editor-20.08.3.tar.xz"; + sha256 = "1falzw2a2v912fdzlyljsw9rcy1whrn9ys9ccrskkpvjn8y444x4"; + name = "pim-sieve-editor-20.08.3.tar.xz"; }; }; poxml = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/poxml-20.08.2.tar.xz"; - sha256 = "67d260349489e92ebce20253f9a3ccde5bb75eb13eb4d1a08a86c18c82e4a2a9"; - name = "poxml-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/poxml-20.08.3.tar.xz"; + sha256 = "0gzg3vbsjrfhs1jg59g7b3gf3b4qajiffkb94njkz8v1f0fadlxp"; + name = "poxml-20.08.3.tar.xz"; }; }; print-manager = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/print-manager-20.08.2.tar.xz"; - sha256 = "de21f8c428198b906f4ae438d6ced8d707b12c15578409c2aa2f7b2f73feb990"; - name = "print-manager-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/print-manager-20.08.3.tar.xz"; + sha256 = "18nl9gpmzz4g9fqzyvbh858nxz23b2vyi505qacqvcrz13r0l78z"; + name = "print-manager-20.08.3.tar.xz"; }; }; rocs = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/rocs-20.08.2.tar.xz"; - sha256 = "2d8efd62b89dd36033bb3d818c82fee67e6efa2d2bb98dda0d4eab13baaee485"; - name = "rocs-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/rocs-20.08.3.tar.xz"; + sha256 = "0bd9x7kh2s4z79ff9byd3ly7k040c574zwrrgi8sq21yd531hxhj"; + name = "rocs-20.08.3.tar.xz"; }; }; signon-kwallet-extension = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/signon-kwallet-extension-20.08.2.tar.xz"; - sha256 = "a271f4d09511171dcf1ebcdaf0b7205f9ee6a75b20ef0801f36d136f7b4a70dd"; - name = "signon-kwallet-extension-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/signon-kwallet-extension-20.08.3.tar.xz"; + sha256 = "1s0syq9aw2q34k1wxrpjqqi12xay1h0vc4s2d8l184hzzg8qq71i"; + name = "signon-kwallet-extension-20.08.3.tar.xz"; }; }; spectacle = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/spectacle-20.08.2.tar.xz"; - sha256 = "9a467ea3b05981d588d39573cca375636b825ad8cab8a36ce48dbbc12425ab0d"; - name = "spectacle-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/spectacle-20.08.3.tar.xz"; + sha256 = "16dwbsk9hik7gmz9s4x78hibz4x9d1fpx8x2i2giry5hwzknfcw4"; + name = "spectacle-20.08.3.tar.xz"; }; }; step = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/step-20.08.2.tar.xz"; - sha256 = "a52e4b6f281ba1a7afd4ab3ac7307080464147c4052ee222399135fe61ac7958"; - name = "step-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/step-20.08.3.tar.xz"; + sha256 = "05ljsmgpra1az64yddy8idi46cv3afaf2v4n7d5j81a8vvlz7fj1"; + name = "step-20.08.3.tar.xz"; }; }; svgpart = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/svgpart-20.08.2.tar.xz"; - sha256 = "3a46b5bd9acf5372f73b602d155517f0dff47f3337bd8a46a580aae7480dd771"; - name = "svgpart-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/svgpart-20.08.3.tar.xz"; + sha256 = "0wwq576dblqmfknr0qs8kskw7nar6hah95fqicdn97xdy4nvzhc6"; + name = "svgpart-20.08.3.tar.xz"; }; }; sweeper = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/sweeper-20.08.2.tar.xz"; - sha256 = "0c255ef15c1e32eb561b26f5b73a6c154730be583efbc5ee713aaed17de14091"; - name = "sweeper-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/sweeper-20.08.3.tar.xz"; + sha256 = "0i4zvbljdzkj47vh8kizam7vsc9k7mvf8dqd2j6ixr4p0cqvw5a8"; + name = "sweeper-20.08.3.tar.xz"; }; }; umbrello = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/umbrello-20.08.2.tar.xz"; - sha256 = "0357b44646c750253e3e7ee323b9e49e854c4c8cdf340eb5a11b2d42edfc4cd7"; - name = "umbrello-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/umbrello-20.08.3.tar.xz"; + sha256 = "1hh5gyggb4f3pjip8dfvx00hi83gj65c92jgzkzahj7p35mkplgl"; + name = "umbrello-20.08.3.tar.xz"; }; }; yakuake = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/yakuake-20.08.2.tar.xz"; - sha256 = "8a0aa3a97a9fdc781887a6cb6480cba5079cf8aacd3345b63f5eb6be4d91665a"; - name = "yakuake-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/yakuake-20.08.3.tar.xz"; + sha256 = "05zd2xm5vgrgz0bxbkh1mpiknlqzpzk5jb74lnd5x7wn5b80ngv0"; + name = "yakuake-20.08.3.tar.xz"; }; }; zeroconf-ioslave = { - version = "20.08.2"; + version = "20.08.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.08.2/src/zeroconf-ioslave-20.08.2.tar.xz"; - sha256 = "0ad34f8361ee3ecd669e396265135b534239994d3bec5e9e6a43b7b7bf5c04e4"; - name = "zeroconf-ioslave-20.08.2.tar.xz"; + url = "${mirror}/stable/release-service/20.08.3/src/zeroconf-ioslave-20.08.3.tar.xz"; + sha256 = "1afga0liiy9n98kb0gmxzbb6ckhdgbrdc4ig1x9pwp98wr1fzmcg"; + name = "zeroconf-ioslave-20.08.3.tar.xz"; }; }; } diff --git a/pkgs/applications/kde/yakuake.nix b/pkgs/applications/kde/yakuake.nix index cb7f7070b24a1..10bf27038ae9d 100644 --- a/pkgs/applications/kde/yakuake.nix +++ b/pkgs/applications/kde/yakuake.nix @@ -1,15 +1,15 @@ { mkDerivation, lib, kdoctools, extra-cmake-modules, karchive, kcrash, kdbusaddons, ki18n, kiconthemes, knewstuff, knotifications, - knotifyconfig, konsole, kparts, kwindowsystem, qtx11extras + knotifyconfig, konsole, kparts, kwayland, kwindowsystem, qtx11extras }: mkDerivation { - name = "yakuake"; + pname = "yakuake"; buildInputs = [ karchive kcrash kdbusaddons ki18n kiconthemes knewstuff knotifications - knotifyconfig kparts kwindowsystem qtx11extras + knotifyconfig kparts kwayland kwindowsystem qtx11extras ]; propagatedBuildInputs = [ diff --git a/pkgs/applications/misc/1password/default.nix b/pkgs/applications/misc/1password/default.nix index 34b9b21f57d52..e6a55421a9164 100644 --- a/pkgs/applications/misc/1password/default.nix +++ b/pkgs/applications/misc/1password/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "1password"; - version = "1.7.0"; + version = "1.8.0"; src = if stdenv.isLinux then fetchzip { url = { @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { "x86_64-linux" = "https://cache.agilebits.com/dist/1P/op/pkg/v${version}/op_linux_amd64_v${version}.zip"; }.${stdenv.hostPlatform.system}; sha256 = { - "i686-linux" = "0fvi9pfcm6pfy628q2lg62bkikrgsisynrk3kkjisb9ldcyjgabw"; - "x86_64-linux" = "1iskhls8g8w2zhk79gprz4vzrmm7r7fq87gwgd4xmj5md4nkzran"; + "i686-linux" = "teoxscan+EZ76Q0sfKT6nt1w/LSsmDoiN2oh+NGO/4A="; + "x86_64-linux" = "nRK2GSwhQe5OgcAdR1fg0vUp3fzEkhwU/teIwsEEemw="; }.${stdenv.hostPlatform.system}; stripRoot = false; } else fetchurl { url = "https://cache.agilebits.com/dist/1P/op/pkg/v${version}/op_darwin_amd64_v${version}.pkg"; - sha256 = "0x6s26zgjryzmcg9qxmv5s2vml06q96yqbapasjfxqc3l205lnnn"; + sha256 = "0pycia75vdfh6gxfd2hr32cxrryfxydid804n0v76l2fpr9v9v3d"; }; buildInputs = stdenv.lib.optionals stdenv.isDarwin [ xar cpio ]; diff --git a/pkgs/applications/misc/archivy/default.nix b/pkgs/applications/misc/archivy/default.nix index 09779f8876f8d..635cd9a991a62 100644 --- a/pkgs/applications/misc/archivy/default.nix +++ b/pkgs/applications/misc/archivy/default.nix @@ -5,25 +5,25 @@ watchdog, wtforms }: python3.pkgs.buildPythonApplication rec { pname = "archivy"; - version = "0.9.2"; + version = "0.9.3"; src = fetchPypi { inherit pname version; - sha256 = "5cb760da57dc9dcdd62c0af824993d1715ec7035915629b4046d8bf50442756c"; + sha256 = "b6ff08a9ecd0a929663c36c73844ac5cb4dc847e69aae639a450c64d4320a506"; }; # Relax some dependencies postPatch = '' substituteInPlace requirements.txt \ - --replace 'validators ==' 'validators >=' \ - --replace 'elasticsearch ==' 'elasticsearch >=' \ - --replace 'python-dotenv ==' 'python-dotenv >=' \ - --replace 'beautifulsoup4 ==' 'beautifulsoup4 >=' \ --replace 'WTForms ==' 'WTForms >=' \ - --replace 'python_dotenv ==' 'python_dotenv >=' \ --replace 'attrs == 20.2.0' 'attrs' \ + --replace 'beautifulsoup4 ==' 'beautifulsoup4 >=' \ + --replace 'elasticsearch ==' 'elasticsearch >=' \ + --replace 'python_dotenv ==' 'python_dotenv >=' \ --replace 'python_frontmatter == 0.5.0' 'python_frontmatter' \ - --replace 'requests ==' 'requests >=' + --replace 'requests ==' 'requests >=' \ + --replace 'validators ==' 'validators >=' \ + --replace 'watchdog ==' 'watchdog >=' ''; propagatedBuildInputs = [ diff --git a/pkgs/applications/misc/buku/default.nix b/pkgs/applications/misc/buku/default.nix index 9b8f531e800e0..459b2159a93f5 100644 --- a/pkgs/applications/misc/buku/default.nix +++ b/pkgs/applications/misc/buku/default.nix @@ -1,14 +1,14 @@ { stdenv, python3, fetchFromGitHub }: with python3.pkgs; buildPythonApplication rec { - version = "4.4"; + version = "4.5"; pname = "buku"; src = fetchFromGitHub { owner = "jarun"; repo = "buku"; rev = "v${version}"; - sha256 = "10r5f1n0vcxxmqqqsgmlvibwg1xffijrr2id6r140rgiyhprz556"; + sha256 = "1lcq5fk8d5j2kfhn9m5l2hk46v7nj4vfa22m1psz35c9zpw4px8q"; }; checkInputs = [ diff --git a/pkgs/applications/misc/clipmenu/default.nix b/pkgs/applications/misc/clipmenu/default.nix index 3227792d6a2f2..f616e86c5b774 100644 --- a/pkgs/applications/misc/clipmenu/default.nix +++ b/pkgs/applications/misc/clipmenu/default.nix @@ -1,33 +1,43 @@ -{ clipnotify, makeWrapper, xsel, dmenu, util-linux, gawk, stdenv, fetchFromGitHub, fetchpatch, lib }: -let - runtimePath = lib.makeBinPath [ clipnotify xsel dmenu util-linux gawk ]; -in +{ stdenv +, lib +, fetchFromGitHub +, makeWrapper +, clipnotify +, coreutils +, dmenu +, gawk +, util-linux +, xdotool +, xsel +}: stdenv.mkDerivation rec { pname = "clipmenu"; - version = "6.1.0"; + version = "6.2.0"; src = fetchFromGitHub { owner = "cdown"; repo = "clipmenu"; rev = version; - sha256 = "0ddj5xcwrdb2qvrndvhv8j6swcqc8dvv5i00pqk35rfk5mrl4hwv"; + sha256 = "sha256-nvctEwyho6kl4+NXi76jT2kG7nchmI2a7mgxlgjXA5A="; }; - - patches = [ - (fetchpatch { - url = "https://github.com/cdown/clipmenu/commit/443b58583ef216e2405e4a38d401f7c36386d21e.patch"; - sha256 = "12m4rpw7jbr31c919llbsmn8dcf7yh9aijln4iym6h2lylzqzzdz"; - }) - ]; - + + postPatch = '' + sed -i init/clipmenud.service \ + -e "s,/usr/bin,$out/bin," + ''; + makeFlags = [ "PREFIX=$(out)" ]; buildInputs = [ makeWrapper ]; nativeBuildInputs = [ xsel clipnotify ]; - installPhase = '' - for bin in $out/bin/*; do - wrapProgram "$bin" --prefix PATH : "${runtimePath}" - done + postFixup = '' + sed -i "$out/bin/clipctl" -e 's,clipmenud\$,\.clipmenud-wrapped\$,' + + wrapProgram "$out/bin/clipmenu" \ + --prefix PATH : "${lib.makeBinPath [ xsel ]}" + + wrapProgram "$out/bin/clipmenud" \ + --set PATH "${lib.makeBinPath [ clipnotify coreutils gawk util-linux xdotool xsel ]}" ''; meta = with stdenv.lib; { diff --git a/pkgs/applications/misc/ctodo/default.nix b/pkgs/applications/misc/ctodo/default.nix index 602fe43081607..0c6a42fccdc54 100644 --- a/pkgs/applications/misc/ctodo/default.nix +++ b/pkgs/applications/misc/ctodo/default.nix @@ -1,25 +1,24 @@ -{ stdenv, cmake, fetchurl, ncurses, readline }: +{ stdenv, fetchFromGitHub, cmake, ncurses, readline }: stdenv.mkDerivation rec { pname = "ctodo"; version = "1.3"; - src = fetchurl { - url = "https://github.com/Acolarh/ctodo/archive/v${version}.tar.gz"; - sha256 = "1k3raigcgpwa0h8zkv5x9rycnn2iqkb9qim4q9ydqy9wbv3m32jb"; + src = fetchFromGitHub { + owner = "Acolarh"; + repo = pname; + rev = "v${version}"; + sha256 = "0mqy5b35cbdwfpbs91ilsgz3wc4cky38xfz9pnr4q88q1vybigna"; }; - buildInputs = [ stdenv cmake ncurses readline ]; + nativeBuildInputs = [ cmake ]; + buildInputs = [ ncurses readline ]; - configurePhase = '' - cmake -DCMAKE_INSTALL_PREFIX=$out . - ''; - - meta = { + meta = with stdenv.lib; { homepage = "http://ctodo.apakoh.dk/"; description = "A simple ncurses-based task list manager"; - license = stdenv.lib.licenses.mit; - maintainers = [ stdenv.lib.maintainers.matthiasbeyer ]; - platforms = stdenv.lib.platforms.linux; + license = licenses.mit; + maintainers = [ maintainers.matthiasbeyer ]; + platforms = platforms.unix; }; } diff --git a/pkgs/applications/misc/dasel/default.nix b/pkgs/applications/misc/dasel/default.nix index d76cf9b106e7d..c8f7016435ef2 100644 --- a/pkgs/applications/misc/dasel/default.nix +++ b/pkgs/applications/misc/dasel/default.nix @@ -5,21 +5,32 @@ buildGoModule rec { pname = "dasel"; - version = "1.8.0"; + version = "1.12.2"; src = fetchFromGitHub { owner = "TomWright"; repo = pname; rev = "v${version}"; - sha256 = "sha256-N27XmrbZTLeNkNvGDsChqKZrAagkQoGFaJeeZ1/Qnkw="; + sha256 = "/WB/SsOih0N5P4cUAD6zkCajplzZ/Jez0H80+CG08rc="; }; - vendorSha256 = "1552k85z4s6gv7sss7dccv3h8x22j2sr12icp6s7s0a3i4iwyksw"; + vendorSha256 = "BdX4DO77mIf/+aBdkNVFUzClsIml1UMcgvikDbbdgcY="; buildFlagsArray = '' -ldflags=-s -w -X github.com/tomwright/dasel/internal.Version=${version} ''; + doInstallCheck = true; + installCheckPhase = '' + if [[ "$("$out/bin/${pname}" --version)" == "${pname} version ${version}" ]]; then + echo "" | $out/bin/dasel put object -p yaml -t string -t int "my.favourites" colour=red number=3 | grep -q red + echo '${pname} smoke check passed' + else + echo '${pname} smoke check failed' + return 1 + fi + ''; + meta = with stdenv.lib; { description = "Query and update data structures from the command line"; longDescription = '' diff --git a/pkgs/applications/misc/dbeaver/default.nix b/pkgs/applications/misc/dbeaver/default.nix index 4e928ff34f06b..f14f5aec8cb68 100644 --- a/pkgs/applications/misc/dbeaver/default.nix +++ b/pkgs/applications/misc/dbeaver/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { pname = "dbeaver-ce"; - version = "7.3.0"; + version = "7.3.2"; desktopItem = makeDesktopItem { name = "dbeaver"; @@ -30,10 +30,13 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://dbeaver.io/files/${version}/dbeaver-ce-${version}-linux.gtk.x86_64.tar.gz"; - sha256 = "sha256-JhEF2/97vo2FgzpCFkuc31aLl9qjKHV8RYXO5oBU1no="; + sha256 = "sha256-4BVXcR8/E4uIrPQJe9KU9577j4XLTxJWTO8g0vCHWts="; }; installPhase = '' + # remove bundled jre + rm -rf jre + mkdir -p $out/ cp -r . $out/dbeaver diff --git a/pkgs/applications/misc/dfilemanager/default.nix b/pkgs/applications/misc/dfilemanager/default.nix index 69c7f0dc17fb0..44e9fe8828346 100644 --- a/pkgs/applications/misc/dfilemanager/default.nix +++ b/pkgs/applications/misc/dfilemanager/default.nix @@ -1,15 +1,14 @@ -{ stdenv, mkDerivation, fetchgit, cmake, file, qtbase, qttools, solid }: +{ stdenv, mkDerivation, fetchFromGitHub, cmake, file, qtbase, qttools, solid }: -let - version = "git-2016-01-10"; -in mkDerivation { pname = "dfilemanager"; - inherit version; - src = fetchgit { - url = "git://git.code.sf.net/p/dfilemanager/code"; - rev = "2c5078b05e0ad74c037366be1ab3e6a03492bde4"; - sha256 = "1qwhnlcc2j8sr1f3v63sxs3m7q7w1xy6c2jqsnznjgm23b5h3hxd"; + version = "git-2020-09-04"; + + src = fetchFromGitHub { + owner = "probonopd"; + repo = "dfilemanager"; + rev = "c592d643d76942dc2c2ccb6e4bfdf53f5e805e48"; + sha256 = "7hIgaWjjOck5i4QbeVeQK7yrjK4yDoAZ5qY9RhM5ABY="; }; buildInputs = [ cmake qtbase qttools file solid ]; diff --git a/pkgs/applications/misc/electrum/default.nix b/pkgs/applications/misc/electrum/default.nix index 3322fbee7127f..ac963c890dcfd 100644 --- a/pkgs/applications/misc/electrum/default.nix +++ b/pkgs/applications/misc/electrum/default.nix @@ -19,7 +19,7 @@ }: let - version = "4.0.7"; + version = "4.0.9"; libsecp256k1_name = if stdenv.isLinux then "libsecp256k1.so.0" @@ -35,7 +35,7 @@ let owner = "spesmilo"; repo = "electrum"; rev = version; - sha256 = "06vcbj9p96d8v4xjlygzr74lqllb9adn8k0racajzq61ijb0imi2"; + sha256 = "0cmdyfabllw4wnpqpdxp3l6hjnm0cvkwxn0z8ph4x54sf4zq9iz3"; extraPostFetch = '' mv $out ./all @@ -50,7 +50,7 @@ python3.pkgs.buildPythonApplication { src = fetchurl { url = "https://download.electrum.org/${version}/Electrum-${version}.tar.gz"; - sha256 = "0k5xf97ga3ixd02g1y6v84hbxd8yhvpj5iz2rhxs8wfnkfwibzh4"; + sha256 = "1fvjiagi78f32nxgr2rx8jas8hxfvpp1c8fpfcalvykmlhdc2gva"; }; postUnpack = '' diff --git a/pkgs/applications/misc/elfx86exts/cargo-lock.patch b/pkgs/applications/misc/elfx86exts/cargo-lock.patch new file mode 100644 index 0000000000000..4f56b82368fa6 --- /dev/null +++ b/pkgs/applications/misc/elfx86exts/cargo-lock.patch @@ -0,0 +1,1091 @@ +diff --git a/Cargo.lock b/Cargo.lock +new file mode 100644 +index 0000000..55e4495 +--- /dev/null ++++ b/Cargo.lock +@@ -0,0 +1,1085 @@ ++# This file is automatically @generated by Cargo. ++# It is not intended for manual editing. ++[[package]] ++name = "aho-corasick" ++version = "0.7.10" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "memchr 2.3.3 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "arrayvec" ++version = "0.4.12" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "nodrop 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "atk" ++version = "0.7.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "atk-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "glib 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "glib-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "gobject-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.68 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "atk-sys" ++version = "0.9.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "glib-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "gobject-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.68 (registry+https://github.com/rust-lang/crates.io-index)", ++ "pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "autocfg" ++version = "1.0.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "backtrace" ++version = "0.3.41" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "backtrace-sys 0.1.35 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.68 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rustc-demangle 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "backtrace-sys" ++version = "0.1.35" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "cc 1.0.50 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.68 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "bitflags" ++version = "1.2.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "cairo-rs" ++version = "0.7.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cairo-sys-rs 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "glib 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "glib-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "gobject-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.68 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "cairo-sys-rs" ++version = "0.9.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "glib-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.68 (registry+https://github.com/rust-lang/crates.io-index)", ++ "pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "cc" ++version = "1.0.50" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "cfg-if" ++version = "0.1.9" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "chrono" ++version = "0.4.11" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "num-integer 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)", ++ "num-traits 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", ++ "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "effitask" ++version = "0.1.0" ++dependencies = [ ++ "cairo-rs 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "chrono 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)", ++ "gdk 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "gdk-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "glib 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "gtk 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "human-panic 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "notify 4.0.15 (registry+https://github.com/rust-lang/crates.io-index)", ++ "pulldown-cmark 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "regex 1.3.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "relm 0.18.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "relm-attributes 0.16.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "relm-derive 0.18.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "todo-txt 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "xdg 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "filetime" ++version = "0.2.9" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.68 (registry+https://github.com/rust-lang/crates.io-index)", ++ "redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "fragile" ++version = "0.3.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "fsevent" ++version = "0.4.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "fsevent-sys 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "fsevent-sys" ++version = "2.0.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "libc 0.2.68 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "fuchsia-zircon" ++version = "0.3.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "fuchsia-zircon-sys 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "fuchsia-zircon-sys" ++version = "0.3.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "gdk" ++version = "0.11.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cairo-rs 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cairo-sys-rs 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "gdk-pixbuf 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "gdk-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "gio 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "gio-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "glib 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "glib-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "gobject-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.68 (registry+https://github.com/rust-lang/crates.io-index)", ++ "pango 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "gdk-pixbuf" ++version = "0.7.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "gdk-pixbuf-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "gio 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "gio-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "glib 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "glib-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "gobject-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.68 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "gdk-pixbuf-sys" ++version = "0.9.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "gio-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "glib-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "gobject-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.68 (registry+https://github.com/rust-lang/crates.io-index)", ++ "pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "gdk-sys" ++version = "0.9.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "cairo-sys-rs 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "gdk-pixbuf-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "gio-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "glib-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "gobject-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.68 (registry+https://github.com/rust-lang/crates.io-index)", ++ "pango-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "getopts" ++version = "0.2.21" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "unicode-width 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "getrandom" ++version = "0.1.14" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.68 (registry+https://github.com/rust-lang/crates.io-index)", ++ "wasi 0.9.0+wasi-snapshot-preview1 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "gio" ++version = "0.7.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "fragile 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "gio-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "glib 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "glib-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "gobject-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.68 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "gio-sys" ++version = "0.9.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "glib-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "gobject-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.68 (registry+https://github.com/rust-lang/crates.io-index)", ++ "pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "glib" ++version = "0.8.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "glib-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "gobject-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.68 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "glib-sys" ++version = "0.9.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "libc 0.2.68 (registry+https://github.com/rust-lang/crates.io-index)", ++ "pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "gobject-sys" ++version = "0.9.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "glib-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.68 (registry+https://github.com/rust-lang/crates.io-index)", ++ "pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "gtk" ++version = "0.7.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "atk 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cairo-rs 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cairo-sys-rs 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cc 1.0.50 (registry+https://github.com/rust-lang/crates.io-index)", ++ "gdk 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "gdk-pixbuf 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "gdk-pixbuf-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "gdk-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "gio 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "gio-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "glib 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "glib-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "gobject-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "gtk-sys 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.68 (registry+https://github.com/rust-lang/crates.io-index)", ++ "pango 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "pango-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "gtk-sys" ++version = "0.9.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "atk-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cairo-sys-rs 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "gdk-pixbuf-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "gdk-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "gio-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "glib-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "gobject-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.68 (registry+https://github.com/rust-lang/crates.io-index)", ++ "pango-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "human-panic" ++version = "1.0.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "backtrace 0.3.41 (registry+https://github.com/rust-lang/crates.io-index)", ++ "os_type 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "serde 1.0.106 (registry+https://github.com/rust-lang/crates.io-index)", ++ "serde_derive 1.0.106 (registry+https://github.com/rust-lang/crates.io-index)", ++ "termcolor 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "toml 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "uuid 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "inotify" ++version = "0.7.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "inotify-sys 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.68 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "inotify-sys" ++version = "0.1.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "libc 0.2.68 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "iovec" ++version = "0.1.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "libc 0.2.68 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "kernel32-sys" ++version = "0.2.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "lazy_static" ++version = "1.4.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "lazycell" ++version = "1.2.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "lexical-core" ++version = "0.6.7" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "arrayvec 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)", ++ "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "ryu 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "static_assertions 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "libc" ++version = "0.2.68" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "log" ++version = "0.4.8" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "memchr" ++version = "2.3.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "mio" ++version = "0.6.21" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", ++ "fuchsia-zircon 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "fuchsia-zircon-sys 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "iovec 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", ++ "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.68 (registry+https://github.com/rust-lang/crates.io-index)", ++ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "miow 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "net2 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)", ++ "slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "mio-extras" ++version = "2.0.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "lazycell 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "mio 0.6.21 (registry+https://github.com/rust-lang/crates.io-index)", ++ "slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "miow" ++version = "0.2.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "net2 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "ws2_32-sys 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "net2" ++version = "0.2.33" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.68 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "nodrop" ++version = "0.1.14" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "nom" ++version = "5.1.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "lexical-core 0.6.7 (registry+https://github.com/rust-lang/crates.io-index)", ++ "memchr 2.3.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "version_check 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "notify" ++version = "4.0.15" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "filetime 0.2.9 (registry+https://github.com/rust-lang/crates.io-index)", ++ "fsevent 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "fsevent-sys 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "inotify 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.68 (registry+https://github.com/rust-lang/crates.io-index)", ++ "mio 0.6.21 (registry+https://github.com/rust-lang/crates.io-index)", ++ "mio-extras 2.0.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "walkdir 2.3.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "num-integer" ++version = "0.1.42" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "autocfg 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "num-traits 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "num-traits" ++version = "0.2.11" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "autocfg 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "os_type" ++version = "2.2.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "regex 1.3.6 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "pango" ++version = "0.7.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "glib 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "glib-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "gobject-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.68 (registry+https://github.com/rust-lang/crates.io-index)", ++ "pango-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "pango-sys" ++version = "0.9.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "glib-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "gobject-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.68 (registry+https://github.com/rust-lang/crates.io-index)", ++ "pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "pkg-config" ++version = "0.3.17" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "ppv-lite86" ++version = "0.2.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "proc-macro2" ++version = "0.4.30" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "proc-macro2" ++version = "1.0.10" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "pulldown-cmark" ++version = "0.6.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "getopts 0.2.21 (registry+https://github.com/rust-lang/crates.io-index)", ++ "memchr 2.3.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "unicase 2.6.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "quote" ++version = "0.6.13" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "quote" ++version = "1.0.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "proc-macro2 1.0.10 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "rand" ++version = "0.7.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "getrandom 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.68 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand_chacha 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand_hc 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "rand_chacha" ++version = "0.2.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "ppv-lite86 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "rand_core" ++version = "0.5.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "getrandom 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "rand_hc" ++version = "0.2.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "redox_syscall" ++version = "0.1.56" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "regex" ++version = "1.3.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "aho-corasick 0.7.10 (registry+https://github.com/rust-lang/crates.io-index)", ++ "memchr 2.3.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "regex-syntax 0.6.17 (registry+https://github.com/rust-lang/crates.io-index)", ++ "thread_local 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "regex-syntax" ++version = "0.6.17" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "relm" ++version = "0.18.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "cairo-rs 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "glib 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "glib-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "gobject-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "gtk 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.68 (registry+https://github.com/rust-lang/crates.io-index)", ++ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)", ++ "syn 0.15.44 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "relm-attributes" ++version = "0.16.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)", ++ "relm-gen-widget 0.16.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "syn 0.15.44 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "relm-derive" ++version = "0.18.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)", ++ "quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)", ++ "syn 0.15.44 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "relm-gen-widget" ++version = "0.16.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)", ++ "quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)", ++ "syn 0.15.44 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "rustc-demangle" ++version = "0.1.16" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "rustc_version" ++version = "0.2.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "ryu" ++version = "1.0.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "same-file" ++version = "1.0.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "winapi-util 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "semver" ++version = "0.9.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "semver-parser 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "semver-parser" ++version = "0.7.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "serde" ++version = "1.0.106" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "serde_derive" ++version = "1.0.106" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "proc-macro2 1.0.10 (registry+https://github.com/rust-lang/crates.io-index)", ++ "quote 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "syn 1.0.17 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "slab" ++version = "0.4.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "static_assertions" ++version = "0.3.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "syn" ++version = "0.15.44" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)", ++ "quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)", ++ "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "syn" ++version = "1.0.17" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "proc-macro2 1.0.10 (registry+https://github.com/rust-lang/crates.io-index)", ++ "quote 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "termcolor" ++version = "1.1.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "winapi-util 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "thread_local" ++version = "1.0.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "time" ++version = "0.1.42" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "libc 0.2.68 (registry+https://github.com/rust-lang/crates.io-index)", ++ "redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "todo-txt" ++version = "1.4.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "chrono 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)", ++ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "nom 5.1.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "regex 1.3.6 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "toml" ++version = "0.5.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "serde 1.0.106 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "unicase" ++version = "2.6.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "version_check 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "unicode-width" ++version = "0.1.7" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "unicode-xid" ++version = "0.1.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "unicode-xid" ++version = "0.2.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "uuid" ++version = "0.8.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "rand 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "version_check" ++version = "0.9.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "walkdir" ++version = "2.3.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "same-file 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi-util 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "wasi" ++version = "0.9.0+wasi-snapshot-preview1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "winapi" ++version = "0.2.8" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "winapi" ++version = "0.3.8" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "winapi-build" ++version = "0.1.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "winapi-i686-pc-windows-gnu" ++version = "0.4.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "winapi-util" ++version = "0.1.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "winapi-x86_64-pc-windows-gnu" ++version = "0.4.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] ++name = "ws2_32-sys" ++version = "0.2.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "xdg" ++version = "2.2.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[metadata] ++"checksum aho-corasick 0.7.10 (registry+https://github.com/rust-lang/crates.io-index)" = "8716408b8bc624ed7f65d223ddb9ac2d044c0547b6fa4b0d554f3a9540496ada" ++"checksum arrayvec 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)" = "cd9fd44efafa8690358b7408d253adf110036b88f55672a933f01d616ad9b1b9" ++"checksum atk 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "86b7499272acf036bb5820c6e346bbfb5acc5dceb104bc2c4fd7e6e33dfcde6a" ++"checksum atk-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)" = "e552c1776737a4c80110d06b36d099f47c727335f9aaa5d942a72b6863a8ec6f" ++"checksum autocfg 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f8aac770f1885fd7e387acedd76065302551364496e46b3dd00860b2f8359b9d" ++"checksum backtrace 0.3.41 (registry+https://github.com/rust-lang/crates.io-index)" = "a4ed64ae6d9ebfd9893193c4b2532b1292ec97bd8271c9d7d0fa90cd78a34cba" ++"checksum backtrace-sys 0.1.35 (registry+https://github.com/rust-lang/crates.io-index)" = "7de8aba10a69c8e8d7622c5710229485ec32e9d55fdad160ea559c086fdcd118" ++"checksum bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693" ++"checksum cairo-rs 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)" = "e05db47de3b0f09a222fa4bba2eab957d920d4243962a86b2d77ab401e4a359c" ++"checksum cairo-sys-rs 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)" = "ff65ba02cac715be836f63429ab00a767d48336efc5497c5637afb53b4f14d63" ++"checksum cc 1.0.50 (registry+https://github.com/rust-lang/crates.io-index)" = "95e28fa049fda1c330bcf9d723be7663a899c4679724b34c81e9f5a326aab8cd" ++"checksum cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)" = "b486ce3ccf7ffd79fdeb678eac06a9e6c09fc88d33836340becb8fffe87c5e33" ++"checksum chrono 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)" = "80094f509cf8b5ae86a4966a39b3ff66cd7e2a3e594accec3743ff3fabeab5b2" ++"checksum filetime 0.2.9 (registry+https://github.com/rust-lang/crates.io-index)" = "f59efc38004c988e4201d11d263b8171f49a2e7ec0bdbb71773433f271504a5e" ++"checksum fragile 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "05f8140122fa0d5dcb9fc8627cfce2b37cc1500f752636d46ea28bc26785c2f9" ++"checksum fsevent 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5ab7d1bd1bd33cc98b0889831b72da23c0aa4df9cec7e0702f46ecea04b35db6" ++"checksum fsevent-sys 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "f41b048a94555da0f42f1d632e2e19510084fb8e303b0daa2816e733fb3644a0" ++"checksum fuchsia-zircon 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "2e9763c69ebaae630ba35f74888db465e49e259ba1bc0eda7d06f4a067615d82" ++"checksum fuchsia-zircon-sys 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "3dcaa9ae7725d12cdb85b3ad99a434db70b468c09ded17e012d86b5c1010f7a7" ++"checksum gdk 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "6243e995f41f3a61a31847e54cc719edce93dd9140c89dca3b9919be1cfe22d5" ++"checksum gdk-pixbuf 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "9726408ee1bbada83094326a99b9c68fea275f9dbb515de242a69e72051f4fcc" ++"checksum gdk-pixbuf-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d8991b060a9e9161bafd09bf4a202e6fd404f5b4dd1a08d53a1e84256fb34ab0" ++"checksum gdk-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)" = "6adf679e91d1bff0c06860287f80403e7db54c2d2424dce0a470023b56c88fbb" ++"checksum getopts 0.2.21 (registry+https://github.com/rust-lang/crates.io-index)" = "14dbbfd5c71d70241ecf9e6f13737f7b5ce823821063188d7e46c41d371eebd5" ++"checksum getrandom 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)" = "7abc8dd8451921606d809ba32e95b6111925cd2906060d2dcc29c070220503eb" ++"checksum gio 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "6261b5d34c30c2d59f879e643704cf54cb44731f3a2038000b68790c03e360e3" ++"checksum gio-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)" = "4fad225242b9eae7ec8a063bb86974aca56885014672375e5775dc0ea3533911" ++"checksum glib 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)" = "be27232841baa43e0fd5ae003f7941925735b2f733a336dc75f07b9eff415e7b" ++"checksum glib-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)" = "95856f3802f446c05feffa5e24859fe6a183a7cb849c8449afc35c86b1e316e2" ++"checksum gobject-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)" = "31d1a804f62034eccf370006ccaef3708a71c31d561fee88564abe71177553d9" ++"checksum gtk 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "709f1074259d4685b96133f92b75c7f35b504715b0fcdc96ec95de2607296a60" ++"checksum gtk-sys 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)" = "53def660c7b48b00b510c81ef2d2fbd3c570f1527081d8d7947f471513e1a4c1" ++"checksum human-panic 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "39f357a500abcbd7c5f967c1d45c8838585b36743823b9d43488f24850534e36" ++"checksum inotify 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "24e40d6fd5d64e2082e0c796495c8ef5ad667a96d03e5aaa0becfd9d47bcbfb8" ++"checksum inotify-sys 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "e74a1aa87c59aeff6ef2cc2fa62d41bc43f54952f55652656b18a02fd5e356c0" ++"checksum iovec 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "b2b3ea6ff95e175473f8ffe6a7eb7c00d054240321b84c57051175fe3c1e075e" ++"checksum kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d" ++"checksum lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" ++"checksum lazycell 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "b294d6fa9ee409a054354afc4352b0b9ef7ca222c69b8812cbea9e7d2bf3783f" ++"checksum lexical-core 0.6.7 (registry+https://github.com/rust-lang/crates.io-index)" = "f86d66d380c9c5a685aaac7a11818bdfa1f733198dfd9ec09c70b762cd12ad6f" ++"checksum libc 0.2.68 (registry+https://github.com/rust-lang/crates.io-index)" = "dea0c0405123bba743ee3f91f49b1c7cfb684eef0da0a50110f758ccf24cdff0" ++"checksum log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)" = "14b6052be84e6b71ab17edffc2eeabf5c2c3ae1fdb464aae35ac50c67a44e1f7" ++"checksum memchr 2.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "3728d817d99e5ac407411fa471ff9800a778d88a24685968b36824eaf4bee400" ++"checksum mio 0.6.21 (registry+https://github.com/rust-lang/crates.io-index)" = "302dec22bcf6bae6dfb69c647187f4b4d0fb6f535521f7bc022430ce8e12008f" ++"checksum mio-extras 2.0.6 (registry+https://github.com/rust-lang/crates.io-index)" = "52403fe290012ce777c4626790c8951324a2b9e3316b3143779c72b029742f19" ++"checksum miow 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "8c1f2f3b1cf331de6896aabf6e9d55dca90356cc9960cca7eaaf408a355ae919" ++"checksum net2 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)" = "42550d9fb7b6684a6d404d9fa7250c2eb2646df731d1c06afc06dcee9e1bcf88" ++"checksum nodrop 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)" = "72ef4a56884ca558e5ddb05a1d1e7e1bfd9a68d9ed024c21704cc98872dae1bb" ++"checksum nom 5.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "0b471253da97532da4b61552249c521e01e736071f71c1a4f7ebbfbf0a06aad6" ++"checksum notify 4.0.15 (registry+https://github.com/rust-lang/crates.io-index)" = "80ae4a7688d1fab81c5bf19c64fc8db920be8d519ce6336ed4e7efe024724dbd" ++"checksum num-integer 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)" = "3f6ea62e9d81a77cd3ee9a2a5b9b609447857f3d358704331e4ef39eb247fcba" ++"checksum num-traits 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)" = "c62be47e61d1842b9170f0fdeec8eba98e60e90e5446449a0545e5152acd7096" ++"checksum os_type 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7edc011af0ae98b7f88cf7e4a83b70a54a75d2b8cb013d6efd02e5956207e9eb" ++"checksum pango 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "393fa071b144f8ffb83ede273758983cf414ca3c0b1d2a5a9ce325b3ba3dd786" ++"checksum pango-sys 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)" = "86b93d84907b3cf0819bff8f13598ba72843bee579d5ebc2502e4b0367b4be7d" ++"checksum pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)" = "05da548ad6865900e60eaba7f589cc0783590a92e940c26953ff81ddbab2d677" ++"checksum ppv-lite86 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)" = "74490b50b9fbe561ac330df47c08f3f33073d2d00c150f719147d7c54522fa1b" ++"checksum proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)" = "cf3d2011ab5c909338f7887f4fc896d35932e29146c12c8d01da6b22a80ba759" ++"checksum proc-macro2 1.0.10 (registry+https://github.com/rust-lang/crates.io-index)" = "df246d292ff63439fea9bc8c0a270bed0e390d5ebd4db4ba15aba81111b5abe3" ++"checksum pulldown-cmark 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)" = "1c205cc82214f3594e2d50686730314f817c67ffa80fe800cf0db78c3c2b9d9e" ++"checksum quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)" = "6ce23b6b870e8f94f81fb0a363d65d86675884b34a09043c81e5562f11c1f8e1" ++"checksum quote 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "2bdc6c187c65bca4260c9011c9e3132efe4909da44726bad24cf7572ae338d7f" ++"checksum rand 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)" = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03" ++"checksum rand_chacha 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402" ++"checksum rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19" ++"checksum rand_hc 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c" ++"checksum redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)" = "2439c63f3f6139d1b57529d16bc3b8bb855230c8efcc5d3a896c8bea7c3b1e84" ++"checksum regex 1.3.6 (registry+https://github.com/rust-lang/crates.io-index)" = "7f6946991529684867e47d86474e3a6d0c0ab9b82d5821e314b1ede31fa3a4b3" ++"checksum regex-syntax 0.6.17 (registry+https://github.com/rust-lang/crates.io-index)" = "7fe5bd57d1d7414c6b5ed48563a2c855d995ff777729dcd91c369ec7fea395ae" ++"checksum relm 0.18.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d4127341a75eb96dc99ba39b87a2783bb011b20fbdbafc25ed2f58216d2ff714" ++"checksum relm-attributes 0.16.0 (registry+https://github.com/rust-lang/crates.io-index)" = "4a8db24611fee7bb021f3aad7c4eaaba6d360947860b78b933a4d3ef86079b7f" ++"checksum relm-derive 0.18.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ec66397054dc1ea6c658159866b9978add6a90655aba5dd4a90c34d2e63f9d69" ++"checksum relm-gen-widget 0.16.0 (registry+https://github.com/rust-lang/crates.io-index)" = "49ad47b054bdc12c90fb6b37c81ef785ee2a4a8a92c4e150b18325052766fbb0" ++"checksum rustc-demangle 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)" = "4c691c0e608126e00913e33f0ccf3727d5fc84573623b8d65b2df340b5201783" ++"checksum rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a" ++"checksum ryu 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "535622e6be132bccd223f4bb2b8ac8d53cda3c7a6394944d3b2b33fb974f9d76" ++"checksum same-file 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)" = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502" ++"checksum semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403" ++"checksum semver-parser 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" ++"checksum serde 1.0.106 (registry+https://github.com/rust-lang/crates.io-index)" = "36df6ac6412072f67cf767ebbde4133a5b2e88e76dc6187fa7104cd16f783399" ++"checksum serde_derive 1.0.106 (registry+https://github.com/rust-lang/crates.io-index)" = "9e549e3abf4fb8621bd1609f11dfc9f5e50320802273b12f3811a67e6716ea6c" ++"checksum slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "c111b5bd5695e56cffe5129854aa230b39c93a305372fdbb2668ca2394eea9f8" ++"checksum static_assertions 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "7f3eb36b47e512f8f1c9e3d10c2c1965bc992bd9cdb024fa581e2194501c83d3" ++"checksum syn 0.15.44 (registry+https://github.com/rust-lang/crates.io-index)" = "9ca4b3b69a77cbe1ffc9e198781b7acb0c7365a883670e8f1c1bc66fba79a5c5" ++"checksum syn 1.0.17 (registry+https://github.com/rust-lang/crates.io-index)" = "0df0eb663f387145cab623dea85b09c2c5b4b0aef44e945d928e682fce71bb03" ++"checksum termcolor 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "bb6bfa289a4d7c5766392812c0a1f4c1ba45afa1ad47803c11e1f407d846d75f" ++"checksum thread_local 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d40c6d1b69745a6ec6fb1ca717914848da4b44ae29d9b3080cbee91d72a69b14" ++"checksum time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)" = "db8dcfca086c1143c9270ac42a2bbd8a7ee477b78ac8e45b19abfb0cbede4b6f" ++"checksum todo-txt 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "0d77aa2f90bd72b990bb2b8de52289b7a34f51cf035627df5e3ce361b321b417" ++"checksum toml 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)" = "ffc92d160b1eef40665be3a05630d003936a3bc7da7421277846c2613e92c71a" ++"checksum unicase 2.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "50f37be617794602aabbeee0be4f259dc1778fabe05e2d67ee8f79326d5cb4f6" ++"checksum unicode-width 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "caaa9d531767d1ff2150b9332433f32a24622147e5ebb1f26409d5da67afd479" ++"checksum unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fc72304796d0818e357ead4e000d19c9c174ab23dc11093ac919054d20a6a7fc" ++"checksum unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "826e7639553986605ec5979c7dd957c7895e93eabed50ab2ffa7f6128a75097c" ++"checksum uuid 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "9fde2f6a4bea1d6e007c4ad38c6839fa71cbb63b6dbf5b595aa38dc9b1093c11" ++"checksum version_check 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)" = "078775d0255232fb988e6fccf26ddc9d1ac274299aaedcedce21c6f72cc533ce" ++"checksum walkdir 2.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "777182bc735b6424e1a57516d35ed72cb8019d85c8c9bf536dccb3445c1a2f7d" ++"checksum wasi 0.9.0+wasi-snapshot-preview1 (registry+https://github.com/rust-lang/crates.io-index)" = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" ++"checksum winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a" ++"checksum winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)" = "8093091eeb260906a183e6ae1abdba2ef5ef2257a21801128899c3fc699229c6" ++"checksum winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "2d315eee3b34aca4797b2da6b13ed88266e6d612562a0c46390af8299fc699bc" ++"checksum winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" ++"checksum winapi-util 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "fa515c5163a99cc82bab70fd3bfdd36d827be85de63737b40fcef2ce084a436e" ++"checksum winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" ++"checksum ws2_32-sys 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d59cefebd0c892fa2dd6de581e937301d8552cb44489cdff035c6187cb63fa5e" ++"checksum xdg 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d089681aa106a86fade1b0128fb5daf07d5867a509ab036d99988dec80429a57" diff --git a/pkgs/applications/misc/elfx86exts/default.nix b/pkgs/applications/misc/elfx86exts/default.nix new file mode 100644 index 0000000000000..56a3751a0bfb9 --- /dev/null +++ b/pkgs/applications/misc/elfx86exts/default.nix @@ -0,0 +1,30 @@ +{ stdenv +, rustPlatform +, fetchFromGitHub +}: + +rustPlatform.buildRustPackage rec { + pname = "elfx86exts"; + version = "0.4.3"; + + src = fetchFromGitHub { + owner = "pkgw"; + repo = pname; + rev = "${pname}@${version}"; + sha256 = "1j9ca2lyxjsrf0rsfv83xi53vj6jz5nb76xibh367brcsc26mvd6"; + }; + + cargoSha256 = "1dfhx40jr5llqa554wifd920mqdbm8s5fns98m6vcqdjxzan4nr2"; + + meta = with stdenv.lib; { + description = "Decode x86 binaries and print out which instruction set extensions they use."; + longDescription = '' + Disassemble a binary containing x86 instructions and print out which extensions it uses. + Despite the utterly misleading name, this tool supports ELF and MachO binaries, and + perhaps PE-format ones as well. (It used to be more limited.) + ''; + homepage = "https://github.com/pkgw/elfx86exts"; + maintainers = with maintainers; [ rmcgibbo ]; + license = with licenses; [ mit ]; + }; +} diff --git a/pkgs/applications/misc/gallery-dl/default.nix b/pkgs/applications/misc/gallery-dl/default.nix index 906c458fbaf6f..398cec3a2bb69 100644 --- a/pkgs/applications/misc/gallery-dl/default.nix +++ b/pkgs/applications/misc/gallery-dl/default.nix @@ -2,11 +2,11 @@ buildPythonApplication rec { pname = "gallery_dl"; - version = "1.16.0"; + version = "1.16.1"; src = fetchPypi { inherit pname version; - sha256 = "35df7605a21a05c3290f4324289fd6f584029f4135a8220dec7d490c4e742a1c"; + sha256 = "51d789aac43013e25c1fad553f214cb1f43b1ae02e0651b640f102c5b9280aea"; }; propagatedBuildInputs = [ requests ]; diff --git a/pkgs/applications/misc/geoipupdate/default.nix b/pkgs/applications/misc/geoipupdate/default.nix index 1f2c275b13d11..707a7adb8a18b 100644 --- a/pkgs/applications/misc/geoipupdate/default.nix +++ b/pkgs/applications/misc/geoipupdate/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "geoipupdate"; - version = "4.5.0"; + version = "4.6.0"; src = fetchFromGitHub { owner = "maxmind"; repo = "geoipupdate"; rev = "v${version}"; - sha256 = "0lhz7i4lprsik3s41y19vphsyc29vz6cbxikmvkmy6xjn40khjfr"; + sha256 = "1rzc8kidm8nr9pbcbq96kax3cbf39afrk5vzpl04lzpw3jbbakjq"; }; vendorSha256 = "1f858k8cl0dgiw124jv0p9jhi9aqxnc3nmc7hksw70fla2nzjrv0"; diff --git a/pkgs/applications/misc/gpsbabel/default.nix b/pkgs/applications/misc/gpsbabel/default.nix index 70862bb61e793..a95ffbbb59aa7 100644 --- a/pkgs/applications/misc/gpsbabel/default.nix +++ b/pkgs/applications/misc/gpsbabel/default.nix @@ -1,14 +1,14 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, zlib, which, IOKit, qtbase, libusb-compat-0_1 }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, libusb1, qtbase, zlib, IOKit, which, expat }: stdenv.mkDerivation rec { pname = "gpsbabel"; - version = "1.6.0"; + version = "1.7.0"; src = fetchFromGitHub { owner = "gpsbabel"; repo = "gpsbabel"; rev = "gpsbabel_${lib.replaceStrings ["."] ["_"] version}"; - sha256 = "0q17jhmaf7z5lld2ff7h6jb3v1yz8hbwd2rmaq2dsamc53dls8iw"; + sha256 = "010g0vd2f5knpq5p7qfnl31kv3r8m5sjdsafcinbj5gh02j2nzpy"; }; patches = [ @@ -18,9 +18,11 @@ stdenv.mkDerivation rec { }) ]; - buildInputs = [ zlib qtbase which libusb-compat-0_1 ] + buildInputs = [ libusb1 qtbase zlib ] ++ lib.optionals stdenv.isDarwin [ IOKit ]; + checkInputs = [ expat.dev which ]; # Avoid ./testo.d/kml.test: line 74: which: command not found. Skipping KML validation phase. + /* FIXME: Building the documentation, with "make doc", requires this: [ libxml2 libxslt perl docbook_xml_dtd_412 docbook_xsl fop ] @@ -41,6 +43,8 @@ stdenv.mkDerivation rec { patchShebangs testo substituteInPlace testo \ --replace "-x /usr/bin/hexdump" "" + + rm -v testo.d/alantrl.test '' # The raymarine and gtm tests fail on i686 despite -ffloat-store. + lib.optionalString stdenv.isi686 "rm -v testo.d/raymarine.test testo.d/gtm.test;" diff --git a/pkgs/applications/misc/gpxsee/default.nix b/pkgs/applications/misc/gpxsee/default.nix index a081076ac83fa..5374a18b154ae 100644 --- a/pkgs/applications/misc/gpxsee/default.nix +++ b/pkgs/applications/misc/gpxsee/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "gpxsee"; - version = "7.37"; + version = "8.0"; src = fetchFromGitHub { owner = "tumic0"; repo = "GPXSee"; rev = version; - sha256 = "0fpb43smh0kwic5pdxs46c0hkqj8g084h72pa024x1my6w12y9b8"; + sha256 = "01ggakpzmiwkqdzc9xqc93xmynd53kzpwl99q3l9z2hpqyzlnj2a"; }; patches = (substituteAll { @@ -37,7 +37,7 @@ mkDerivation rec { ''; homepage = "https://www.gpxsee.org/"; changelog = "https://build.opensuse.org/package/view_file/home:tumic:GPXSee/gpxsee/gpxsee.changes"; - license = licenses.gpl3; + license = licenses.gpl3Only; maintainers = with maintainers; [ womfoo sikmir ]; platforms = with platforms; linux ++ darwin; }; diff --git a/pkgs/applications/misc/gpxsee/fix-qttranslations-path.diff b/pkgs/applications/misc/gpxsee/fix-qttranslations-path.diff index 3b546338d209d..757d9b8c65714 100644 --- a/pkgs/applications/misc/gpxsee/fix-qttranslations-path.diff +++ b/pkgs/applications/misc/gpxsee/fix-qttranslations-path.diff @@ -1,18 +1,18 @@ diff --git i/src/GUI/app.cpp w/src/GUI/app.cpp -index 10e84d5..1e0abbe 100644 +index 37e9d3f..d4a065c 100644 --- i/src/GUI/app.cpp +++ w/src/GUI/app.cpp -@@ -34,11 +34,10 @@ App::App(int &argc, char **argv) : QApplication(argc, argv) - installTranslator(gpxsee); +@@ -35,11 +35,10 @@ App::App(int &argc, char **argv) : QApplication(argc, argv) + installTranslator(gpxsee); QTranslator *qt = new QTranslator(this); -#if defined(Q_OS_WIN32) || defined(Q_OS_MAC) +#if defined(Q_OS_WIN32) - qt->load(QLocale::system(), "qt", "_", ProgramPaths::translationsDir()); + if (qt->load(QLocale::system(), "qt", "_", ProgramPaths::translationsDir())) #else // Q_OS_WIN32 || Q_OS_MAC -- qt->load(QLocale::system(), "qt", "_", QLibraryInfo::location( -- QLibraryInfo::TranslationsPath)); -+ qt->load(QLocale::system(), "qt", "_", QLatin1String("@qttranslations@/translations")); +- if (qt->load(QLocale::system(), "qt", "_", QLibraryInfo::location( +- QLibraryInfo::TranslationsPath))) ++ if (qt->load(QLocale::system(), "qt", "_", QLatin1String("@qttranslations@/translations"))) #endif // Q_OS_WIN32 || Q_OS_MAC - installTranslator(qt); + installTranslator(qt); diff --git a/pkgs/applications/misc/gramps/default.nix b/pkgs/applications/misc/gramps/default.nix index 1ef00efaf7b48..6d28abb737f51 100644 --- a/pkgs/applications/misc/gramps/default.nix +++ b/pkgs/applications/misc/gramps/default.nix @@ -12,8 +12,8 @@ in buildPythonApplication rec { version = "5.1.3"; pname = "gramps"; - nativeBuildInputs = [ wrapGAppsHook gettext ]; - buildInputs = [ intltool gtk3 gobject-introspection pango gexiv2 ] + nativeBuildInputs = [ wrapGAppsHook intltool gettext ]; + buildInputs = [ gtk3 gobject-introspection pango gexiv2 ] # Map support ++ stdenv.lib.optional enableOSM osm-gps-map # Graphviz support diff --git a/pkgs/applications/misc/herbe/default.nix b/pkgs/applications/misc/herbe/default.nix new file mode 100644 index 0000000000000..0d05228b63eb3 --- /dev/null +++ b/pkgs/applications/misc/herbe/default.nix @@ -0,0 +1,33 @@ +{ stdenv, lib, fetchFromGitHub, libX11, libXft, freetype, patches ? [ ], + extraLibs ? [ ] }: + +stdenv.mkDerivation rec { + pname = "herbe"; + version = "1.0.0"; + + src = fetchFromGitHub { + owner = "dudik"; + repo = pname; + rev = version; + sha256 = "0358i5jmmlsvy2j85ij7m1k4ar2jr5lsv7y1c58dlf9710h186cv"; + }; + + inherit patches; + + postPatch = '' + sed -i 's_/usr/include/freetype2_${freetype.dev}/include/freetype2_' Makefile + ''; + + buildInputs = [ libX11 libXft freetype ] ++ extraLibs; + + makeFlags = [ "PREFIX=$(out)" ]; + + meta = with lib; { + description = "Daemon-less notifications without D-Bus"; + homepage = "https://github.com/dudik/herbe"; + license = licenses.mit; + # NOTE: Could also work on 'unix'. + platforms = platforms.linux; + maintainers = with maintainers; [ wishfort36 ]; + }; +} diff --git a/pkgs/applications/misc/hstr/default.nix b/pkgs/applications/misc/hstr/default.nix index 421d02e97b91d..c58f87d1ab8f4 100644 --- a/pkgs/applications/misc/hstr/default.nix +++ b/pkgs/applications/misc/hstr/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { description = "Shell history suggest box - easily view, navigate, search and use your command history"; license = stdenv.lib.licenses.asl20; maintainers = [ stdenv.lib.maintainers.matthiasbeyer ]; - platforms = with stdenv.lib.platforms; linux; # Cannot test others + platforms = with stdenv.lib.platforms; linux ++ darwin; }; } diff --git a/pkgs/applications/misc/hubstaff/revision.json b/pkgs/applications/misc/hubstaff/revision.json index 2fd29444dade5..9b0ffe67f0cd7 100644 --- a/pkgs/applications/misc/hubstaff/revision.json +++ b/pkgs/applications/misc/hubstaff/revision.json @@ -1,5 +1,5 @@ { - "url": "https://hubstaff-production.s3.amazonaws.com/downloads/HubstaffClient/Builds/Release/1.5.2-bead991b/Hubstaff-1.5.2-bead991b.sh", - "version": "1.5.2-bead991b", - "sha256": "068b0q94ydldyjmzbka1j94vr1xdxvkxq79pp7ria81hvpp68yxf" + "url": "https://hubstaff-production.s3.amazonaws.com/downloads/HubstaffClient/Builds/Release/1.5.15-28673d1c/Hubstaff-1.5.15-28673d1c.sh", + "version": "1.5.15-28673d1c", + "sha256": "0ging41l3a3sdj6bggh913h71gqmb8l3rplp4civpgclnfzv7fg2" } diff --git a/pkgs/applications/misc/inkcut/avoid-name-clash-between-inkcut-and-extension.patch b/pkgs/applications/misc/inkcut/avoid-name-clash-between-inkcut-and-extension.patch deleted file mode 100644 index 34e4e6f0e7fb8..0000000000000 --- a/pkgs/applications/misc/inkcut/avoid-name-clash-between-inkcut-and-extension.patch +++ /dev/null @@ -1,85 +0,0 @@ -From ddc1f9e63e7a769c71131b56f6a2a011c649635c Mon Sep 17 00:00:00 2001 -From: Arnout Engelen <arnout@bzzt.net> -Date: Tue, 24 Nov 2020 15:34:40 +0100 -Subject: [PATCH] Avoid name clash between inkscape plugin and inkcut itself - -Ohterwise, with an unfortunate PYTONPATH, inkcut would no longer -start since it'd try to invoke the inkcut.py from the extension -instead of the main application ---- - plugins/inkscape/{inkcut.py => inkcut4inkscape.py} | 2 +- - plugins/inkscape/inkcut_cut.inx | 2 +- - plugins/inkscape/inkcut_cut.py | 2 +- - plugins/inkscape/inkcut_open.inx | 2 +- - plugins/inkscape/inkcut_open.py | 2 +- - 5 files changed, 5 insertions(+), 5 deletions(-) - rename plugins/inkscape/{inkcut.py => inkcut4inkscape.py} (98%) - -diff --git a/plugins/inkscape/inkcut.py b/plugins/inkscape/inkcut4inkscape.py -similarity index 98% -rename from plugins/inkscape/inkcut.py -rename to plugins/inkscape/inkcut4inkscape.py -index 5b90475..7dc8d86 100644 ---- a/plugins/inkscape/inkcut.py -+++ b/plugins/inkscape/inkcut4inkscape.py -@@ -2,7 +2,7 @@ - # -*- coding: utf-8 -*- - """ - Inkcut, Plot HPGL directly from Inkscape. -- inkcut.py -+ inkcut4inkscape.py - - Copyright 2018 The Inkcut Team - -diff --git a/plugins/inkscape/inkcut_cut.inx b/plugins/inkscape/inkcut_cut.inx -index 4b44ae5..3db8721 100644 ---- a/plugins/inkscape/inkcut_cut.inx -+++ b/plugins/inkscape/inkcut_cut.inx -@@ -2,7 +2,7 @@ - <_name>Cut selection...</_name> - <id>org.ekips.filter.inkcut.cut</id> - <dependency type="executable" location="extensions">inkcut_cut.py</dependency> -- <dependency type="executable" location="extensions">inkcut.py</dependency> -+ <dependency type="executable" location="extensions">inkcut4inkscape.py</dependency> - <dependency type="executable" location="extensions">inkex.py</dependency> - <effect> - <object-type>all</object-type> -diff --git a/plugins/inkscape/inkcut_cut.py b/plugins/inkscape/inkcut_cut.py -index acaf812..777629a 100644 ---- a/plugins/inkscape/inkcut_cut.py -+++ b/plugins/inkscape/inkcut_cut.py -@@ -37,7 +37,7 @@ - else: - inkex.localize() - import subprocess --from inkcut import contains_text, convert_objects_to_paths -+from inkcut4inkscape import contains_text, convert_objects_to_paths - - - -diff --git a/plugins/inkscape/inkcut_open.inx b/plugins/inkscape/inkcut_open.inx -index 45ee585..2dcd38e 100644 ---- a/plugins/inkscape/inkcut_open.inx -+++ b/plugins/inkscape/inkcut_open.inx -@@ -2,7 +2,7 @@ - <_name>Open current document...</_name> - <id>org.ekips.filter.inkcut.open</id> - <dependency type="executable" location="extensions">inkcut_open.py</dependency> -- <dependency type="executable" location="extensions">inkcut.py</dependency> -+ <dependency type="executable" location="extensions">inkcut4inkscape.py</dependency> - <dependency type="executable" location="extensions">inkex.py</dependency> - <effect> - <object-type>all</object-type> -diff --git a/plugins/inkscape/inkcut_open.py b/plugins/inkscape/inkcut_open.py -index b4652eb..e4c2d62 100644 ---- a/plugins/inkscape/inkcut_open.py -+++ b/plugins/inkscape/inkcut_open.py -@@ -38,7 +38,7 @@ - inkex.localize() - import subprocess - --from inkcut import convert_objects_to_paths -+from inkcut4inkscape import convert_objects_to_paths - - DEBUG = False - try: diff --git a/pkgs/applications/misc/inkcut/default.nix b/pkgs/applications/misc/inkcut/default.nix index 481069feac07d..4ca373ee2751b 100644 --- a/pkgs/applications/misc/inkcut/default.nix +++ b/pkgs/applications/misc/inkcut/default.nix @@ -8,21 +8,15 @@ with python3Packages; buildPythonApplication rec { pname = "inkcut"; - version = "2.1.2"; + version = "2.1.3"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "1zn5i69f3kimcwdd2qkqd3hd1hq76a6i5wxxfb91ih2hj04vdbmx"; + sha256 = "0px0xdv6kyzkkpmvryrdfavv1qy2xrqdxkpmhvx1gj649xcabv32"; }; - patches = [ - # https://github.com/inkcut/inkcut/pull/292 but downloaded - # because of https://github.com/NixOS/nixpkgs/issues/32084 - ./avoid-name-clash-between-inkcut-and-extension.patch - ]; - nativeBuildInputs = [ wrapQtAppsHook ]; propagatedBuildInputs = [ diff --git a/pkgs/applications/misc/jekyll/basic/Gemfile.lock b/pkgs/applications/misc/jekyll/basic/Gemfile.lock index ffc7c0e2aebf7..65c747c40a504 100644 --- a/pkgs/applications/misc/jekyll/basic/Gemfile.lock +++ b/pkgs/applications/misc/jekyll/basic/Gemfile.lock @@ -1,17 +1,17 @@ GEM remote: https://rubygems.org/ specs: - activesupport (6.0.3.2) + activesupport (6.1.0) concurrent-ruby (~> 1.0, >= 1.0.2) - i18n (>= 0.7, < 2) - minitest (~> 5.1) - tzinfo (~> 1.1) - zeitwerk (~> 2.2, >= 2.2.2) + i18n (>= 1.6, < 2) + minitest (>= 5.1) + tzinfo (~> 2.0) + zeitwerk (~> 2.3) addressable (2.7.0) public_suffix (>= 2.0.2, < 5.0) colorator (1.1.0) concurrent-ruby (1.1.7) - em-websocket (0.5.1) + em-websocket (0.5.2) eventmachine (>= 0.12.9) http_parser.rb (~> 0.6.0) eventmachine (1.2.7) @@ -24,21 +24,21 @@ GEM http_parser.rb (0.6.0) i18n (1.8.5) concurrent-ruby (~> 1.0) - jekyll (4.1.1) + jekyll (4.2.0) addressable (~> 2.4) colorator (~> 1.0) em-websocket (~> 0.5) i18n (~> 1.0) jekyll-sass-converter (~> 2.0) jekyll-watch (~> 2.0) - kramdown (~> 2.1) + kramdown (~> 2.3) kramdown-parser-gfm (~> 1.0) liquid (~> 4.0) mercenary (~> 0.4.0) pathutil (~> 0.9) rouge (~> 3.0) safe_yaml (~> 1.0) - terminal-table (~> 1.8) + terminal-table (~> 2.0) jekyll-avatar (0.7.0) jekyll (>= 3.0, < 5.0) jekyll-mentions (1.6.0) @@ -46,8 +46,8 @@ GEM jekyll (>= 3.7, < 5.0) jekyll-sass-converter (2.1.0) sassc (> 2.0.1, < 3.0) - jekyll-seo-tag (2.6.1) - jekyll (>= 3.3, < 5.0) + jekyll-seo-tag (2.7.1) + jekyll (>= 3.8, < 5.0) jekyll-sitemap (1.4.0) jekyll (>= 3.7, < 5.0) jekyll-watch (2.2.1) @@ -61,32 +61,31 @@ GEM kramdown-parser-gfm (1.1.0) kramdown (~> 2.0) liquid (4.0.3) - listen (3.2.1) + listen (3.3.3) rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) mercenary (0.4.0) mini_portile2 (2.4.0) - minitest (5.14.1) + minitest (5.14.2) nokogiri (1.10.10) mini_portile2 (~> 2.4.0) pathutil (0.16.2) forwardable-extended (~> 2.6) - public_suffix (4.0.5) + public_suffix (4.0.6) rb-fsevent (0.10.4) rb-inotify (0.10.1) ffi (~> 1.0) rexml (3.2.4) - rouge (3.22.0) + rouge (3.26.0) safe_yaml (1.0.5) sassc (2.4.0) ffi (~> 1.9) - terminal-table (1.8.0) + terminal-table (2.0.0) unicode-display_width (~> 1.1, >= 1.1.1) - thread_safe (0.3.6) - tzinfo (1.2.7) - thread_safe (~> 0.1) + tzinfo (2.0.3) + concurrent-ruby (~> 1.0) unicode-display_width (1.7.0) - zeitwerk (2.4.0) + zeitwerk (2.4.2) PLATFORMS ruby diff --git a/pkgs/applications/misc/jekyll/basic/gemset.nix b/pkgs/applications/misc/jekyll/basic/gemset.nix index b14b27f3756b4..9f33cdc53eb32 100644 --- a/pkgs/applications/misc/jekyll/basic/gemset.nix +++ b/pkgs/applications/misc/jekyll/basic/gemset.nix @@ -5,10 +5,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "02sh4q8izyfdnh7z2nj5mn5sklfvqgx9rrag5j3l51y8aqkrg2yk"; + sha256 = "1pflc2fch1bbgzk1rqgj21l6mgx025l92kd9arxjls98nf5am44v"; type = "gem"; }; - version = "6.0.3.2"; + version = "6.1.0"; }; addressable = { dependencies = ["public_suffix"]; @@ -47,10 +47,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1bsw8vjz0z267j40nhbmrvfz7dvacq4p0pagvyp17jif6mj6v7n3"; + sha256 = "1mg1mx735a0k1l8y14ps2mxdwhi5r01ikydf34b0sp60v66nvbkb"; type = "gem"; }; - version = "0.5.1"; + version = "0.5.2"; }; eventmachine = { groups = ["default"]; @@ -130,10 +130,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "192k1ggw99slpqpxb4xamcvcm2pdahgnmygl746hmkrar0i3xa5r"; + sha256 = "0cqkh78jw8scrajyx5nla0vwm9fvp2qql3kdcvvplcq9mazy8snq"; type = "gem"; }; - version = "4.1.1"; + version = "4.2.0"; }; jekyll-avatar = { dependencies = ["jekyll"]; @@ -174,10 +174,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1p9fl2r4ni10lbx143zp41caldjs4hg27az5wg42sbwzb7s6z66m"; + sha256 = "0fsi75hymk2wswy216fs224p5ycrzjw1kshw1bsl5czhv42wr2w3"; type = "gem"; }; - version = "2.6.1"; + version = "2.7.1"; }; jekyll-sitemap = { dependencies = ["jekyll"]; @@ -250,10 +250,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1w923wmdi3gyiky0asqdw5dnh3gcjs2xyn82ajvjfjwh6sn0clgi"; + sha256 = "1zpcgha7g33wvy2xbbc663cbjyvg9l1325lg3gzgcn3baydr9rha"; type = "gem"; }; - version = "3.2.1"; + version = "3.3.3"; }; mercenary = { groups = ["default"]; @@ -280,10 +280,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "09bz9nsznxgaf06cx3b5z71glgl0hdw469gqx3w7bqijgrb55p5g"; + sha256 = "170y2cvx51gm3cm3nhdf7j36sxnkh6vv8ls36p90ric7w8w16h4v"; type = "gem"; }; - version = "5.14.1"; + version = "5.14.2"; }; nokogiri = { dependencies = ["mini_portile2"]; @@ -312,10 +312,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0vywld400fzi17cszwrchrzcqys4qm6sshbv73wy5mwcixmrgg7g"; + sha256 = "1xqcgkl7bwws1qrlnmxgh8g4g9m10vg60bhlw40fplninb3ng6d9"; type = "gem"; }; - version = "4.0.5"; + version = "4.0.6"; }; rb-fsevent = { groups = ["default"]; @@ -353,10 +353,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1wcz7i009wdbymlfsamagqi18m6ih8j60bii0k18f21g70r72i0m"; + sha256 = "0b4b300i3m4m4kw7w1n9wgxwy16zccnb7271miksyzd0wq5b9pm3"; type = "gem"; }; - version = "3.22.0"; + version = "3.26.0"; }; safe_yaml = { groups = ["default"]; @@ -385,31 +385,21 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1512cngw35hsmhvw4c05rscihc59mnj09m249sm9p3pik831ydqk"; + sha256 = "18rbrh464ysqbdv53iwj0r8frshn65566kyj044cp3x9c2754jwh"; type = "gem"; }; - version = "1.8.0"; - }; - thread_safe = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0nmhcgq6cgz44srylra07bmaw99f5271l0dpsvl5f75m44l0gmwy"; - type = "gem"; - }; - version = "0.3.6"; + version = "2.0.0"; }; tzinfo = { - dependencies = ["thread_safe"]; + dependencies = ["concurrent-ruby"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1i3jh086w1kbdj3k5l60lc3nwbanmzdf8yjj3mlrx9b2gjjxhi9r"; + sha256 = "1av5jzdij6vriwmf8crfvwaz2kik721ymg8svpxj3kx47kfha5vg"; type = "gem"; }; - version = "1.2.7"; + version = "2.0.3"; }; unicode-display_width = { groups = ["default"]; @@ -426,9 +416,9 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0jvn50k76kl14fpymk4hdsf9sk00jl84yxzl783xhnw4dicp0m0k"; + sha256 = "1746czsjarixq0x05f7p3hpzi38ldg6wxnxxw74kbjzh1sdjgmpl"; type = "gem"; }; - version = "2.4.0"; + version = "2.4.2"; }; } \ No newline at end of file diff --git a/pkgs/applications/misc/jekyll/full/Gemfile b/pkgs/applications/misc/jekyll/full/Gemfile index 8e7499bad61a3..2e72350f7e5e7 100644 --- a/pkgs/applications/misc/jekyll/full/Gemfile +++ b/pkgs/applications/misc/jekyll/full/Gemfile @@ -14,6 +14,7 @@ gem "jekyll-coffeescript" gem "jekyll-feed", "~> 0.9" gem "jekyll-gist" gem "jekyll-paginate" +gem "jekyll-polyglot" gem "jekyll-redirect-from" gem "kramdown-syntax-coderay" gem "mime-types", "~> 3.0" diff --git a/pkgs/applications/misc/jekyll/full/Gemfile.lock b/pkgs/applications/misc/jekyll/full/Gemfile.lock index d795507206588..969909ca6d0a7 100644 --- a/pkgs/applications/misc/jekyll/full/Gemfile.lock +++ b/pkgs/applications/misc/jekyll/full/Gemfile.lock @@ -1,12 +1,12 @@ GEM remote: https://rubygems.org/ specs: - activesupport (6.0.3.2) + activesupport (6.1.0) concurrent-ruby (~> 1.0, >= 1.0.2) - i18n (>= 0.7, < 2) - minitest (~> 5.1) - tzinfo (~> 1.1) - zeitwerk (~> 2.2, >= 2.2.2) + i18n (>= 1.6, < 2) + minitest (>= 5.1) + tzinfo (~> 2.0) + zeitwerk (~> 2.3) addressable (2.7.0) public_suffix (>= 2.0.2, < 5.0) classifier-reborn (2.2.0) @@ -18,13 +18,14 @@ GEM coffee-script-source (1.12.2) colorator (1.1.0) concurrent-ruby (1.1.7) - em-websocket (0.5.1) + em-websocket (0.5.2) eventmachine (>= 0.12.9) http_parser.rb (~> 0.6.0) eventmachine (1.2.7) execjs (2.7.0) - faraday (1.0.1) + faraday (1.1.0) multipart-post (>= 1.2, < 3) + ruby2_keywords fast-stemmer (1.0.2) ffi (1.13.1) forwardable-extended (2.6.0) @@ -35,27 +36,27 @@ GEM http_parser.rb (0.6.0) i18n (1.8.5) concurrent-ruby (~> 1.0) - jekyll (4.1.1) + jekyll (4.2.0) addressable (~> 2.4) colorator (~> 1.0) em-websocket (~> 0.5) i18n (~> 1.0) jekyll-sass-converter (~> 2.0) jekyll-watch (~> 2.0) - kramdown (~> 2.1) + kramdown (~> 2.3) kramdown-parser-gfm (~> 1.0) liquid (~> 4.0) mercenary (~> 0.4.0) pathutil (~> 0.9) rouge (~> 3.0) safe_yaml (~> 1.0) - terminal-table (~> 1.8) + terminal-table (~> 2.0) jekyll-avatar (0.7.0) jekyll (>= 3.0, < 5.0) jekyll-coffeescript (2.0.0) coffee-script (~> 2.2) coffee-script-source (~> 1.12) - jekyll-feed (0.15.0) + jekyll-feed (0.15.1) jekyll (>= 3.7, < 5.0) jekyll-gist (1.5.0) octokit (~> 4.2) @@ -63,12 +64,14 @@ GEM html-pipeline (~> 2.3) jekyll (>= 3.7, < 5.0) jekyll-paginate (1.1.0) + jekyll-polyglot (1.3.3) + jekyll (>= 3.0) jekyll-redirect-from (0.16.0) jekyll (>= 3.3, < 5.0) jekyll-sass-converter (2.1.0) sassc (> 2.0.1, < 3.0) - jekyll-seo-tag (2.6.1) - jekyll (>= 3.3, < 5.0) + jekyll-seo-tag (2.7.1) + jekyll (>= 3.8, < 5.0) jekyll-sitemap (1.4.0) jekyll (>= 3.7, < 5.0) jekyll-watch (2.2.1) @@ -87,45 +90,45 @@ GEM liquid (4.0.3) liquid-c (4.0.0) liquid (>= 3.0.0) - listen (3.2.1) + listen (3.3.3) rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) mercenary (0.4.0) mime-types (3.3.1) mime-types-data (~> 3.2015) - mime-types-data (3.2020.0512) + mime-types-data (3.2020.1104) mini_portile2 (2.4.0) - minitest (5.14.1) + minitest (5.14.2) multipart-post (2.1.1) nokogiri (1.10.10) mini_portile2 (~> 2.4.0) - octokit (4.18.0) + octokit (4.19.0) faraday (>= 0.9) sawyer (~> 0.8.0, >= 0.5.3) pathutil (0.16.2) forwardable-extended (~> 2.6) - public_suffix (4.0.5) + public_suffix (4.0.6) rb-fsevent (0.10.4) rb-inotify (0.10.1) ffi (~> 1.0) rdoc (6.2.1) rexml (3.2.4) - rouge (3.22.0) + rouge (3.26.0) + ruby2_keywords (0.0.2) safe_yaml (1.0.5) sassc (2.4.0) ffi (~> 1.9) sawyer (0.8.2) addressable (>= 2.3.5) faraday (> 0.8, < 2.0) - terminal-table (1.8.0) + terminal-table (2.0.0) unicode-display_width (~> 1.1, >= 1.1.1) - thread_safe (0.3.6) tomlrb (1.3.0) - tzinfo (1.2.7) - thread_safe (~> 0.1) + tzinfo (2.0.3) + concurrent-ruby (~> 1.0) unicode-display_width (1.7.0) yajl-ruby (1.4.1) - zeitwerk (2.4.0) + zeitwerk (2.4.2) PLATFORMS ruby @@ -139,6 +142,7 @@ DEPENDENCIES jekyll-gist jekyll-mentions jekyll-paginate + jekyll-polyglot jekyll-redirect-from jekyll-seo-tag jekyll-sitemap diff --git a/pkgs/applications/misc/jekyll/full/gemset.nix b/pkgs/applications/misc/jekyll/full/gemset.nix index aa0bc9bcdcc57..bfbe428c861de 100644 --- a/pkgs/applications/misc/jekyll/full/gemset.nix +++ b/pkgs/applications/misc/jekyll/full/gemset.nix @@ -5,10 +5,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "02sh4q8izyfdnh7z2nj5mn5sklfvqgx9rrag5j3l51y8aqkrg2yk"; + sha256 = "1pflc2fch1bbgzk1rqgj21l6mgx025l92kd9arxjls98nf5am44v"; type = "gem"; }; - version = "6.0.3.2"; + version = "6.1.0"; }; addressable = { dependencies = ["public_suffix"]; @@ -101,10 +101,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1bsw8vjz0z267j40nhbmrvfz7dvacq4p0pagvyp17jif6mj6v7n3"; + sha256 = "1mg1mx735a0k1l8y14ps2mxdwhi5r01ikydf34b0sp60v66nvbkb"; type = "gem"; }; - version = "0.5.1"; + version = "0.5.2"; }; eventmachine = { groups = ["default"]; @@ -127,15 +127,15 @@ version = "2.7.0"; }; faraday = { - dependencies = ["multipart-post"]; + dependencies = ["multipart-post" "ruby2_keywords"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0wwks9652xwgjm7yszcq5xr960pjypc07ivwzbjzpvy9zh2fw6iq"; + sha256 = "16dapwi5pivrl25r4lkr1mxjrzkznj4wlcb08fzkmxnj4g5c6y35"; type = "gem"; }; - version = "1.0.1"; + version = "1.1.0"; }; fast-stemmer = { groups = ["default"]; @@ -227,10 +227,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "192k1ggw99slpqpxb4xamcvcm2pdahgnmygl746hmkrar0i3xa5r"; + sha256 = "0cqkh78jw8scrajyx5nla0vwm9fvp2qql3kdcvvplcq9mazy8snq"; type = "gem"; }; - version = "4.1.1"; + version = "4.2.0"; }; jekyll-avatar = { dependencies = ["jekyll"]; @@ -260,10 +260,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1mgc1ik2cq2g8g7z9ql2i6ydzy771m2i4qrd1q77x8cf2sprlb0z"; + sha256 = "1zxqkrnix0xiw98531h5ga6h69jhzlx2jh9qhvcl67p8nq3sgza9"; type = "gem"; }; - version = "0.15.0"; + version = "0.15.1"; }; jekyll-gist = { dependencies = ["octokit"]; @@ -297,6 +297,17 @@ }; version = "1.1.0"; }; + jekyll-polyglot = { + dependencies = ["jekyll"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "4ad9140733250b65bc1ffab84650c588d036d23129e82f0349d31e56f1fe10a8"; + type = "gem"; + }; + version = "1.3.3"; + }; jekyll-redirect-from = { dependencies = ["jekyll"]; groups = ["default"]; @@ -325,10 +336,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1p9fl2r4ni10lbx143zp41caldjs4hg27az5wg42sbwzb7s6z66m"; + sha256 = "0fsi75hymk2wswy216fs224p5ycrzjw1kshw1bsl5czhv42wr2w3"; type = "gem"; }; - version = "2.6.1"; + version = "2.7.1"; }; jekyll-sitemap = { dependencies = ["jekyll"]; @@ -447,10 +458,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1w923wmdi3gyiky0asqdw5dnh3gcjs2xyn82ajvjfjwh6sn0clgi"; + sha256 = "1zpcgha7g33wvy2xbbc663cbjyvg9l1325lg3gzgcn3baydr9rha"; type = "gem"; }; - version = "3.2.1"; + version = "3.3.3"; }; mercenary = { groups = ["default"]; @@ -478,10 +489,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1z75svngyhsglx0y2f9rnil2j08f9ab54b3l95bpgz67zq2if753"; + sha256 = "0ipjyfwn9nlvpcl8knq3jk4g5f12cflwdbaiqxcq1s7vwfwfxcag"; type = "gem"; }; - version = "3.2020.0512"; + version = "3.2020.1104"; }; mini_portile2 = { groups = ["default"]; @@ -498,10 +509,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "09bz9nsznxgaf06cx3b5z71glgl0hdw469gqx3w7bqijgrb55p5g"; + sha256 = "170y2cvx51gm3cm3nhdf7j36sxnkh6vv8ls36p90ric7w8w16h4v"; type = "gem"; }; - version = "5.14.1"; + version = "5.14.2"; }; multipart-post = { groups = ["default"]; @@ -530,10 +541,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0zvfr9njmj5svi39fcsi2b0g7pcxb0vamw9dlyas8bg814jlzhi6"; + sha256 = "1dz8na8fk445yqrwpkl31fimnap7p4xf9m9qm9i7cpvaxxgk2n24"; type = "gem"; }; - version = "4.18.0"; + version = "4.19.0"; }; pathutil = { dependencies = ["forwardable-extended"]; @@ -551,10 +562,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0vywld400fzi17cszwrchrzcqys4qm6sshbv73wy5mwcixmrgg7g"; + sha256 = "1xqcgkl7bwws1qrlnmxgh8g4g9m10vg60bhlw40fplninb3ng6d9"; type = "gem"; }; - version = "4.0.5"; + version = "4.0.6"; }; rb-fsevent = { groups = ["default"]; @@ -602,10 +613,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1wcz7i009wdbymlfsamagqi18m6ih8j60bii0k18f21g70r72i0m"; + sha256 = "0b4b300i3m4m4kw7w1n9wgxwy16zccnb7271miksyzd0wq5b9pm3"; + type = "gem"; + }; + version = "3.26.0"; + }; + ruby2_keywords = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "17pcc0wgvh3ikrkr7bm3nx0qhyiqwidd13ij0fa50k7gsbnr2p0l"; type = "gem"; }; - version = "3.22.0"; + version = "0.0.2"; }; safe_yaml = { groups = ["default"]; @@ -645,20 +666,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1512cngw35hsmhvw4c05rscihc59mnj09m249sm9p3pik831ydqk"; - type = "gem"; - }; - version = "1.8.0"; - }; - thread_safe = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0nmhcgq6cgz44srylra07bmaw99f5271l0dpsvl5f75m44l0gmwy"; + sha256 = "18rbrh464ysqbdv53iwj0r8frshn65566kyj044cp3x9c2754jwh"; type = "gem"; }; - version = "0.3.6"; + version = "2.0.0"; }; tomlrb = { groups = ["default"]; @@ -671,15 +682,15 @@ version = "1.3.0"; }; tzinfo = { - dependencies = ["thread_safe"]; + dependencies = ["concurrent-ruby"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1i3jh086w1kbdj3k5l60lc3nwbanmzdf8yjj3mlrx9b2gjjxhi9r"; + sha256 = "1av5jzdij6vriwmf8crfvwaz2kik721ymg8svpxj3kx47kfha5vg"; type = "gem"; }; - version = "1.2.7"; + version = "2.0.3"; }; unicode-display_width = { groups = ["default"]; @@ -718,9 +729,9 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0jvn50k76kl14fpymk4hdsf9sk00jl84yxzl783xhnw4dicp0m0k"; + sha256 = "1746czsjarixq0x05f7p3hpzi38ldg6wxnxxw74kbjzh1sdjgmpl"; type = "gem"; }; - version = "2.4.0"; + version = "2.4.2"; }; -} \ No newline at end of file +} diff --git a/pkgs/applications/misc/josm/default.nix b/pkgs/applications/misc/josm/default.nix index eab2519ad08ee..30e7882b60b72 100644 --- a/pkgs/applications/misc/josm/default.nix +++ b/pkgs/applications/misc/josm/default.nix @@ -1,20 +1,20 @@ { stdenv, fetchurl, fetchsvn, makeWrapper, unzip, jre, libXxf86vm }: let pname = "josm"; - version = "17329"; + version = "17428"; srcs = { jar = fetchurl { url = "https://josm.openstreetmap.de/download/josm-snapshot-${version}.jar"; - sha256 = "0hra146akadqz9acj1xa2vzrmipfzf8li7sgsmk169xr991y653k"; + sha256 = "0fhnq0836jp72br808hhw1ki70zc9wqcwfhnizb8pzjvs4wgx36w"; }; macosx = fetchurl { url = "https://josm.openstreetmap.de/download/macosx/josm-macosx-${version}.zip"; - sha256 = "0i09jnfqbcirmic9vayrp78lnyk4mfh7ax3v3cs8kyqhk930pscf"; + sha256 = "126yy6y7mkpqzkrkqkzzn3mwnl1yjkmd5k895k7mmk2inmcsvqgm"; }; pkg = fetchsvn { url = "https://josm.openstreetmap.de/svn/trunk/native/linux/tested"; rev = version; - sha256 = "0ybjca6dhnbwl3xqwrc91c444fzs1zrlnz7qr3l79s1vll9r4qd1"; + sha256 = "198kq490y5wzxz0a5prb9anykq6dzg0imxfkchsas233inbzggql"; }; }; in diff --git a/pkgs/applications/misc/keeweb/default.nix b/pkgs/applications/misc/keeweb/default.nix index 8c1c56dacdc3f..801e5841c1ba1 100644 --- a/pkgs/applications/misc/keeweb/default.nix +++ b/pkgs/applications/misc/keeweb/default.nix @@ -4,19 +4,21 @@ let throwSystem = throw "Unsupported system: ${system}"; pname = "keeweb"; - version = "1.16.0"; + version = "1.16.5"; name = "${pname}-${version}"; suffix = { x86_64-linux = "linux.AppImage"; - x86_64-darwin = "mac.dmg"; + x86_64-darwin = "mac.x64.dmg"; + aarch64-darwin = "mac.arm64.dmg"; }.${system} or throwSystem; src = fetchurl { url = "https://github.com/keeweb/keeweb/releases/download/v${version}/KeeWeb-${version}.${suffix}"; sha256 = { - x86_64-linux = "1pivic7n5nv00s8bb51i2jz2mxgjn92hkc8n0p8662ai1cdng47g"; - x86_64-darwin = "0q6k0qgkgzid9yjbfsfpp8l9dr0n8xp25a4jf2bxwickm4irs9mz"; + x86_64-linux = "18qcr8zyn20n5zrrha0qwgq2ic10bp189fps87lbnmcjknrkac9g"; + x86_64-darwin = "0crpjkcqgs7q5c814bx2npjh9kpyyb87yagm5wcy9j21kwrbqv6k"; + aarch64-darwin = "1wkf9inrm5qg0c4xrk0s97mx5j21xvlqwwkvydl513gyfzi2g9gp"; }.${system} or throwSystem; }; @@ -29,7 +31,7 @@ let homepage = "https://keeweb.info/"; license = licenses.mit; maintainers = with maintainers; [ sikmir ]; - platforms = [ "x86_64-linux" "x86_64-darwin" ]; + platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-darwin" ]; }; linux = appimageTools.wrapType2 rec { diff --git a/pkgs/applications/misc/keystore-explorer/default.nix b/pkgs/applications/misc/keystore-explorer/default.nix new file mode 100644 index 0000000000000..613b96d1731c6 --- /dev/null +++ b/pkgs/applications/misc/keystore-explorer/default.nix @@ -0,0 +1,40 @@ +{ fetchzip, stdenv, jdk8, runtimeShell }: + +stdenv.mkDerivation rec { + version = "5.4.4"; + pname = "keystore-explorer"; + src = fetchzip { + url = "https://github.com/kaikramer/keystore-explorer/releases/download/v${version}/kse-544.zip"; + sha256 = "01kpa8g6p6vcqq9y70w5bm8jbw4kp55pbywj2zrhgjibrhgjqi0b"; + }; + + installPhase = '' + runHook preInstall + + mkdir -p $out/bin + mkdir -p $out/share/keystore-explorer + cp -R icons licenses lib kse.jar $out/share/keystore-explorer/ + + # keystore-explorer's kse.sh tries to detect the path of Java by using + # Python on Darwin; just write our own start script to avoid unnecessary dependencies + cat > $out/bin/keystore-explorer <<EOF + #!${runtimeShell} + export JAVA_HOME=${jdk8.home} + exec ${jdk8}/bin/java -jar $out/share/keystore-explorer/kse.jar "\$@" + EOF + chmod +x $out/bin/keystore-explorer + + runHook postInstall + ''; + + dontStrip = true; + dontBuild = true; + dontConfigure = true; + + meta = { + description = "Open source GUI replacement for the Java command-line utilities keytool and jarsigner"; + license = stdenv.lib.licenses.gpl3Only; + maintainers = [ stdenv.lib.maintainers.numinit ]; + platforms = stdenv.lib.platforms.unix; + }; +} diff --git a/pkgs/applications/misc/koreader/default.nix b/pkgs/applications/misc/koreader/default.nix index 4ffd3f6fbf650..54d6a66fc0883 100644 --- a/pkgs/applications/misc/koreader/default.nix +++ b/pkgs/applications/misc/koreader/default.nix @@ -11,12 +11,12 @@ let font-droid = nerdfonts.override { fonts = [ "DroidSansMono" ]; }; in stdenv.mkDerivation rec { pname = "koreader"; - version = "2020.11"; + version = "2020.12"; src = fetchurl { url = "https://github.com/koreader/koreader/releases/download/v${version}/koreader-${version}-amd64.deb"; - sha256 = "15nw8kyjyhqlr742gkpzn1b9906rdm6cssnc6jbbph5pjdlzspc4"; + sha256 = "0x97mm7h8kr1jps0hzdgl9irakma85ikrhzr18wc1plmffgv6kwm"; }; sourceRoot = "."; @@ -46,7 +46,7 @@ in stdenv.mkDerivation rec { description = "An ebook reader application supporting PDF, DjVu, EPUB, FB2 and many more formats, running on Cervantes, Kindle, Kobo, PocketBook and Android devices"; platforms = intersectLists platforms.x86_64 platforms.linux; - license = licenses.agpl3; - maintainers = [ maintainers.contrun ]; + license = licenses.agpl3Only; + maintainers = with maintainers; [ contrun neonfuz]; }; } diff --git a/pkgs/applications/misc/ksmoothdock/default.nix b/pkgs/applications/misc/ksmoothdock/default.nix index 9538329bf9b5d..e5cb6f5816e32 100644 --- a/pkgs/applications/misc/ksmoothdock/default.nix +++ b/pkgs/applications/misc/ksmoothdock/default.nix @@ -25,6 +25,11 @@ mkDerivation rec { url = "https://github.com/dangvd/ksmoothdock/commit/00799bef8a1c1fe61ef9274866267d9fe9194041.patch"; sha256 = "1nmb7gf1ggzicxz8k4fd67xhwjy404myqzjpgjym66wqxm0arni4"; }) + # Pull request to fix build on Qt 5.15 https://github.com/dangvd/ksmoothdock/pull/123 + (fetchpatch { + url = "https://github.com/dangvd/ksmoothdock/commit/259527aacadb0fd9110d4425b9bf41a15bedce72.patch"; + sha256 = "12nj58v9qqrynarn3gpywih3w27mr4n51z1b8mh0rfbnd2kib8dc"; + }) ]; nativeBuildInputs = [ cmake extra-cmake-modules ]; diff --git a/pkgs/applications/misc/librecad/default.nix b/pkgs/applications/misc/librecad/default.nix index 0df0f86ef4568..6f7967dfdfd53 100644 --- a/pkgs/applications/misc/librecad/default.nix +++ b/pkgs/applications/misc/librecad/default.nix @@ -1,5 +1,6 @@ { boost , fetchFromGitHub +, fetchpatch , installShellFiles , mkDerivationWith , muparser @@ -16,7 +17,7 @@ let stdenv = gcc8Stdenv; in -# Doesn't build with gcc9 + # Doesn't build with gcc9 mkDerivationWith stdenv.mkDerivation rec { pname = "librecad"; version = "2.2.0-rc1"; @@ -30,6 +31,13 @@ mkDerivationWith stdenv.mkDerivation rec { patches = [ ./fix_qt_5_11_build.patch + ( + fetchpatch { + # Fix missing app name and icon on Wayland. + url = "https://github.com/LibreCAD/LibreCAD/commit/a17f8281093403f0c7c36996232665ed21906688.patch"; + sha256 = "1x46psh4bcx2hxck4l83ki43g1252vb033i2x94h4rpai9hww4d5"; + } + ) ]; postPatch = '' diff --git a/pkgs/applications/misc/llpp/default.nix b/pkgs/applications/misc/llpp/default.nix index c16322ad84fac..8b3dfa35ff402 100644 --- a/pkgs/applications/misc/llpp/default.nix +++ b/pkgs/applications/misc/llpp/default.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { homepage = "https://repo.or.cz/w/llpp.git"; description = "A MuPDF based PDF pager written in OCaml"; platforms = platforms.linux; - maintainers = with maintainers; [ pSub enzime ]; + maintainers = with maintainers; [ pSub ]; license = licenses.gpl3; }; } diff --git a/pkgs/applications/misc/mapproxy/default.nix b/pkgs/applications/misc/mapproxy/default.nix index 41ae683548d08..48e2a3960ee76 100644 --- a/pkgs/applications/misc/mapproxy/default.nix +++ b/pkgs/applications/misc/mapproxy/default.nix @@ -1,38 +1,15 @@ { lib , pkgs -, python +, python3 }: -let - py = python.override { - packageOverrides = self: super: { - pyproj = super.pyproj.overridePythonAttrs (oldAttrs: rec { - version = "1.9.6"; - src = pkgs.fetchFromGitHub { - owner = "pyproj4"; - repo = "pyproj"; - rev = "v${version}rel"; - sha256 = "18v4h7jx4mcc0x2xy8y7dfjq9bzsyxs8hdb6v67cabvlz2njziqy"; - }; - nativeBuildInputs = with python.pkgs; [ cython ]; - patches = [ ]; - checkPhase = '' - runHook preCheck - pushd unittest # changing directory should ensure we're importing the global pyproj - ${python.interpreter} test.py && ${python.interpreter} -c "import doctest, pyproj, sys; sys.exit(doctest.testmod(pyproj)[0])" - popd - runHook postCheck - ''; - }); - }; - }; -in -with py.pkgs; + +with python3.pkgs; buildPythonApplication rec { pname = "MapProxy"; - version = "1.12.0"; + version = "1.13.0"; src = fetchPypi { inherit pname version; - sha256 = "622e3a7796ef861ba21e42231b49c18d00d75f03eaf3f01a2b7687be7568e2ec"; + sha256 = "0qi63ap8yi5g2cas33jv4jsmdrl6yv3qp6bh0zxrfpkb704lcng4"; }; prePatch = '' substituteInPlace mapproxy/util/ext/serving.py --replace "args = [sys.executable] + sys.argv" "args = sys.argv" diff --git a/pkgs/applications/misc/mediaelch/default.nix b/pkgs/applications/misc/mediaelch/default.nix new file mode 100644 index 0000000000000..c4ed0c975eabd --- /dev/null +++ b/pkgs/applications/misc/mediaelch/default.nix @@ -0,0 +1,41 @@ +{ stdenv +, mkDerivation +, fetchFromGitHub +, qmake +, curl +, ffmpeg +, libmediainfo +, libzen +, qtbase +, qtdeclarative +, qtmultimedia +}: + +mkDerivation rec { + pname = "mediaelch"; + version = "2.8.2"; + + src = fetchFromGitHub { + owner = "Komet"; + repo = "MediaElch"; + rev = "v${version}"; + sha256 = "0y26vfgrdym461lzmm5x3z5ai9ky09vlk3cy4sq6hwlj7mzcz0k7"; + fetchSubmodules = true; + }; + + nativeBuildInputs = [ qmake ]; + + buildInputs = [ curl libmediainfo libzen ffmpeg qtbase qtdeclarative qtmultimedia ]; + + prePatch = '' + substituteInPlace MediaElch.pro --replace "/usr" "$out" + ''; + + meta = with stdenv.lib; { + homepage = "https://mediaelch.de/mediaelch/"; + description = "Media Manager for Kodi"; + license = licenses.lgpl3Only; + maintainers = with maintainers; [ stunkymonkey ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/misc/merkaartor/default.nix b/pkgs/applications/misc/merkaartor/default.nix index 79ee45b4c1c4f..e73805f67b3a2 100644 --- a/pkgs/applications/misc/merkaartor/default.nix +++ b/pkgs/applications/misc/merkaartor/default.nix @@ -1,18 +1,25 @@ -{ stdenv, fetchFromGitHub, makeWrapper, qmake, pkgconfig, boost, gdal, proj -, qtbase, qtsvg, qtwebview, qtwebkit }: +{ mkDerivation, lib, fetchFromGitHub, qmake, pkgconfig, fetchpatch +, boost, gdal, proj, qtbase, qtsvg, qtwebview, qtwebkit }: -stdenv.mkDerivation rec { +mkDerivation rec { pname = "merkaartor"; - version = "unstable-2019-11-12"; + version = "0.18.4"; src = fetchFromGitHub { owner = "openstreetmap"; repo = "merkaartor"; - rev = "29b3388680a03f1daac0037a2b504ea710da879a"; - sha256 = "0h3d3srzl06p2ajq911j05zr4vkl88qij18plydx45yqmvyvh0xz"; + rev = version; + sha256 = "vwO4/a7YF9KbpxcFGTFCdG6SfwEyhISlEtcA+rMebUA="; }; - nativeBuildInputs = [ makeWrapper qmake pkgconfig ]; + patches = [ + (fetchpatch { + url = "https://github.com/openstreetmap/merkaartor/commit/e72553a7ea2c7ba0634cc3afcd27a9f7cfef089c.patch"; + sha256 = "NAisplnS3xHSlRpX+fH15NpbaD+uM57OCsTYGKlIR7U="; + }) + ]; + + nativeBuildInputs = [ qmake pkgconfig ]; buildInputs = [ boost gdal proj qtbase qtsvg qtwebview qtwebkit ]; @@ -20,12 +27,7 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = "-DACCEPT_USE_OF_DEPRECATED_PROJ_API_H"; - postInstall = '' - wrapProgram $out/bin/merkaartor \ - --set QT_QPA_PLATFORM_PLUGIN_PATH ${qtbase.bin}/lib/qt-*/plugins/platforms - ''; - - meta = with stdenv.lib; { + meta = with lib; { description = "OpenStreetMap editor"; homepage = "http://merkaartor.be/"; license = licenses.gpl2Plus; diff --git a/pkgs/applications/misc/mob/default.nix b/pkgs/applications/misc/mob/default.nix new file mode 100644 index 0000000000000..821dc1ccc3cef --- /dev/null +++ b/pkgs/applications/misc/mob/default.nix @@ -0,0 +1,22 @@ +{ lib, buildGoPackage, fetchFromGitHub}: + +buildGoPackage rec { + pname = "mob"; + version = "0.0.25"; + goPackagePath = "github.com/remotemobprogramming/mob"; + + src = fetchFromGitHub { + rev = "v${version}"; + owner = "remotemobprogramming"; + repo = pname; + sha256 = "1gs0mv4j66278srrck7llvi5gnfdqxz3a489qn5sx3mw46yx5q93"; + }; + + meta = with lib; { + description = "Tool for swift git handover"; + homepage = "https://github.com/remotemobprogramming/mob"; + license = licenses.mit; + maintainers = [ maintainers.ericdallo ]; + platforms = platforms.linux ++ platforms.darwin; + }; +} diff --git a/pkgs/applications/misc/moolticute/default.nix b/pkgs/applications/misc/moolticute/default.nix index bc825b94facba..804ba33209afb 100644 --- a/pkgs/applications/misc/moolticute/default.nix +++ b/pkgs/applications/misc/moolticute/default.nix @@ -9,13 +9,13 @@ mkDerivation rec { pname = "moolticute"; - version = "0.44.17"; + version = "0.44.21"; src = fetchFromGitHub { owner = "mooltipass"; repo = pname; rev = "v${version}"; - sha256 = "1bqp99n8cqr7kjiffbs39v0dd280f50hid5py3c4zgc7aqj9k0bx"; + sha256 = "1m3iy2v8mimyb25xisr7i4ga6qlggv1i2aji9qfgagns7ffp53nf"; }; outputs = [ "out" "udev" ]; diff --git a/pkgs/applications/misc/mwic/default.nix b/pkgs/applications/misc/mwic/default.nix index 3be02e7c41c2a..dffc27bd40b08 100644 --- a/pkgs/applications/misc/mwic/default.nix +++ b/pkgs/applications/misc/mwic/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = with pythonPackages; [ pyenchant regex ]; postFixup = '' - buildPythonPath "$out" + wrapPythonPrograms ''; meta = with stdenv.lib; { diff --git a/pkgs/applications/misc/obsidian/default.nix b/pkgs/applications/misc/obsidian/default.nix index b6fd295ba82f0..bfe215487afaa 100644 --- a/pkgs/applications/misc/obsidian/default.nix +++ b/pkgs/applications/misc/obsidian/default.nix @@ -30,12 +30,12 @@ let in stdenv.mkDerivation rec { pname = "obsidian"; - version = "0.9.20"; + version = "0.10.6"; src = fetchurl { url = "https://github.com/obsidianmd/obsidian-releases/releases/download/v${version}/obsidian-${version}.asar.gz"; - sha256 = "19yhmqaz5mynl879q38g338q4w8mwx75fnl25bhwrvy7yy3aa23l"; + sha256 = "KfGVc3nXu5ilYKQPLc5qaksTwsdhSVtty9CfjSoiCU8="; }; nativeBuildInputs = [ makeWrapper graphicsmagick ]; diff --git a/pkgs/applications/misc/orca/default.nix b/pkgs/applications/misc/orca/default.nix index 377f00d1c166a..e438fd0762fab 100644 --- a/pkgs/applications/misc/orca/default.nix +++ b/pkgs/applications/misc/orca/default.nix @@ -35,13 +35,13 @@ buildPythonApplication rec { pname = "orca"; - version = "3.38.1"; + version = "3.38.2"; format = "other"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1sqmq9xhcm3rc3mbhj1bdn55bkpzbk72xhmgka75syxh77gzz0ld"; + sha256 = "UAX/LhHdH3E/WswZA6JwEZvFjDD9uMn4K8rHFJfGwjw="; }; patches = [ diff --git a/pkgs/applications/misc/overmind/default.nix b/pkgs/applications/misc/overmind/default.nix index ca05facaa48fd..537ae3741ef1d 100644 --- a/pkgs/applications/misc/overmind/default.nix +++ b/pkgs/applications/misc/overmind/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "overmind"; - version = "2.1.1"; + version = "2.2.0"; goPackagePath = "github.com/DarthSim/overmind"; nativeBuildInputs = [ makeWrapper ]; @@ -15,7 +15,7 @@ buildGoPackage rec { owner = "DarthSim"; repo = pname; rev = "v${version}"; - sha256 = "0akqn8s1mgk5q00gzh3ymq7nrnkyi6avyaxxvbxnjyq9bxsqz327"; + sha256 = "00v6l4138vv32bqfkzrhk4hfl52a00rlg9ywhp4difgrnz7zj6xb"; }; goDeps = ./deps.nix; diff --git a/pkgs/applications/misc/overmind/deps.nix b/pkgs/applications/misc/overmind/deps.nix index afcc8d9726fe4..b4c9211a24a16 100644 --- a/pkgs/applications/misc/overmind/deps.nix +++ b/pkgs/applications/misc/overmind/deps.nix @@ -46,15 +46,6 @@ }; } { - goPackagePath = "github.com/pkg/term"; - fetch = { - type = "git"; - url = "https://github.com/pkg/term"; - rev = "aa71e9d9e942"; - sha256 = "1gyxnj4jq3z2k4gjwwlz8hn56c1ys8jvafdd61nd6qs8jwp6iqp3"; - }; - } - { goPackagePath = "github.com/pmezard/go-difflib"; fetch = { type = "git"; @@ -127,15 +118,6 @@ }; } { - goPackagePath = "gopkg.in/urfave/cli.v1"; - fetch = { - type = "git"; - url = "https://gopkg.in/urfave/cli.v1"; - rev = "v1.20.0"; - sha256 = "0y6f4sbzkiiwrxbl15biivj8c7qwxnvm3zl2dd3mw4wzg4x10ygj"; - }; - } - { goPackagePath = "gopkg.in/yaml.v2"; fetch = { type = "git"; diff --git a/pkgs/applications/misc/pdfpc/default.nix b/pkgs/applications/misc/pdfpc/default.nix index fc0bf62f1e9f8..216f8c4b8b8e1 100644 --- a/pkgs/applications/misc/pdfpc/default.nix +++ b/pkgs/applications/misc/pdfpc/default.nix @@ -1,16 +1,17 @@ { stdenv, fetchFromGitHub, cmake, pkgconfig, vala, gtk3, libgee, fetchpatch -, poppler, libpthreadstubs, gstreamer, gst-plugins-base, gst-plugins-good, gst-libav, librsvg, pcre, gobject-introspection, wrapGAppsHook }: +, poppler, libpthreadstubs, gstreamer, gst-plugins-base, gst-plugins-good, gst-libav, librsvg, pcre, gobject-introspection, wrapGAppsHook +, webkitgtk, discount, json-glib }: stdenv.mkDerivation rec { name = "${product}-${version}"; product = "pdfpc"; - version = "4.4.1"; + version = "4.5.0"; src = fetchFromGitHub { repo = product; owner = product; rev = "v${version}"; - sha256 = "11n925c5jj3yfwnqkgxzqrmsrpqh8ls1g4idmqqzpsanpam1xvna"; + sha256 = "0bmy51w6ypz927hxwp5g7wapqvzqmsi3w32rch6i3f94kg1152ck"; }; nativeBuildInputs = [ @@ -27,6 +28,9 @@ stdenv.mkDerivation rec { gst-plugins-base (gst-plugins-good.override { gtkSupport = true; }) gst-libav + webkitgtk + discount + json-glib ]; cmakeFlags = stdenv.lib.optional stdenv.isDarwin "-DMOVIES=OFF"; diff --git a/pkgs/applications/misc/pgmodeler/default.nix b/pkgs/applications/misc/pgmodeler/default.nix index 7532c6e9bc915..a690e72d3e785 100644 --- a/pkgs/applications/misc/pgmodeler/default.nix +++ b/pkgs/applications/misc/pgmodeler/default.nix @@ -1,21 +1,26 @@ -{ stdenv, lib, fetchFromGitHub, pkgconfig, qmake, mkDerivation, - qtsvg, - libxml2, postgresql }: +{ stdenv +, lib +, fetchFromGitHub +, pkg-config +, qmake +, mkDerivation +, qtsvg +, libxml2 +, postgresql +}: mkDerivation rec { pname = "pgmodeler"; - version = "0.9.2"; + version = "0.9.3"; src = fetchFromGitHub { owner = "pgmodeler"; repo = "pgmodeler"; rev = "v${version}"; - sha256 = "1wkvg20krfwkziz7skgmwlinx07jm5nl3455payg5brv69zf60kl"; + sha256 = "1bci5x418dbnkny7hn0b5q5lxyajrgl3frv41ji0hcw9vivrds2g"; }; - enableParallelBuilding = true; - - nativeBuildInputs = [ pkgconfig qmake ]; + nativeBuildInputs = [ pkg-config qmake ]; qmakeFlags = [ "pgmodeler.pro" "CONFIG+=release" ]; # todo: libpq would suffice here. Unfortunately this won't work, if one uses only postgresql.lib here. @@ -23,7 +28,6 @@ mkDerivation rec { meta = with stdenv.lib; { description = "A database modeling tool for PostgreSQL"; - longDescription = ''pgModeler (PostgreSQL Database Modeler) is an open source database modeling tool designed for PostgreSQL.''; homepage = "https://pgmodeler.io/"; license = licenses.gpl3; maintainers = [ maintainers.esclear ]; diff --git a/pkgs/applications/misc/polybar/default.nix b/pkgs/applications/misc/polybar/default.nix index df08de7a4a224..940cd1cdc9191 100644 --- a/pkgs/applications/misc/polybar/default.nix +++ b/pkgs/applications/misc/polybar/default.nix @@ -27,13 +27,13 @@ assert i3GapsSupport -> ! i3Support && jsoncpp != null && i3-gaps != null; stdenv.mkDerivation rec { pname = "polybar"; - version = "3.5.0"; + version = "3.5.2"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "1kga98cgllsjcq692l27y01sgl8ii4wxp70kmdcwxkrliylg3dji"; + sha256 = "1ir8fdnzrba9fkkjfvax5szx5h49lavwgl9pabjzrpbvif328g3x"; fetchSubmodules = true; }; diff --git a/pkgs/applications/misc/printrun/default.nix b/pkgs/applications/misc/printrun/default.nix index cadd98c742602..c8f454c3545d4 100644 --- a/pkgs/applications/misc/printrun/default.nix +++ b/pkgs/applications/misc/printrun/default.nix @@ -1,13 +1,14 @@ { stdenv, python27Packages, fetchFromGitHub }: python27Packages.buildPythonApplication rec { - name = "printrun-20150310"; + pname = "printrun"; + version = "1.6.0"; src = fetchFromGitHub { owner = "kliment"; repo = "Printrun"; - rev = name; - sha256 = "09ijv8h4k5h15swg64s7igamvynawz7gdi7hiymzrzywdvr0zwsa"; + rev = "${pname}-${version}"; + sha256 = "0nhcx1bi1hals0a6d6994y0kcwsfqx3hplwbmn9136hgrplg0l2l"; }; propagatedBuildInputs = with python27Packages; [ diff --git a/pkgs/applications/misc/redshift/default.nix b/pkgs/applications/misc/redshift/default.nix index a450b2e3eb771..99d65eb090a7c 100644 --- a/pkgs/applications/misc/redshift/default.nix +++ b/pkgs/applications/misc/redshift/default.nix @@ -10,7 +10,7 @@ , withGeolocation ? true , withCoreLocation ? withGeolocation && stdenv.isDarwin, CoreLocation, Foundation, Cocoa , withGeoclue ? withGeolocation && stdenv.isLinux, geoclue -, withAppIndicator ? true, libappindicator +, withAppIndicator ? stdenv.isLinux, libappindicator, libayatana-appindicator }: let @@ -41,6 +41,9 @@ let "--enable-drm=${if withDrm then "yes" else "no"}" "--enable-quartz=${if withQuartz then "yes" else "no"}" "--enable-corelocation=${if withCoreLocation then "yes" else "no"}" + ] ++ stdenv.lib.optionals (pname == "gammastep") [ + "--with-systemduserunitdir=${placeholder "out"}/share/systemd/user/" + "--enable-apparmor" ]; buildInputs = [ @@ -52,7 +55,9 @@ let ++ stdenv.lib.optional withDrm libdrm ++ stdenv.lib.optional withQuartz ApplicationServices ++ stdenv.lib.optionals withCoreLocation [ CoreLocation Foundation Cocoa ] - ++ stdenv.lib.optional withAppIndicator libappindicator + ++ stdenv.lib.optional withAppIndicator (if (pname != "gammastep") + then libappindicator + else libayatana-appindicator) ; pythonPath = [ pygobject3 pyxdg ]; @@ -127,13 +132,13 @@ rec { gammastep = mkRedshift rec { pname = "gammastep"; - version = "2.0.5"; + version = "2.0.6"; src = fetchFromGitLab { owner = "chinstrap"; repo = pname; rev = "v${version}"; - sha256 = "1l3x4gnichwzbb0529bhm723xpryn5svhhsfdiwlw122q1vmz2q7"; + sha256 = "00s457yajnm7vq6jfanyri52pq000jbyjiy6wz2i3f0rq7cc01ya"; }; meta = redshift.meta // { diff --git a/pkgs/applications/misc/rootbar/default.nix b/pkgs/applications/misc/rootbar/default.nix new file mode 100644 index 0000000000000..2eb3170b88cb8 --- /dev/null +++ b/pkgs/applications/misc/rootbar/default.nix @@ -0,0 +1,45 @@ +{ stdenv +, fetchhg +, pkg-config +, meson +, ninja +, gtk3 +, json_c +, libpulseaudio +, wayland +, wrapGAppsHook +}: + +stdenv.mkDerivation rec { + pname = "rootbar"; + version = "unstable-2020-11-13"; + + src = fetchhg { + url = "https://hg.sr.ht/~scoopta/rootbar"; + rev = "a018e10cfc5e"; + sha256 = "sha256-t6oDIYCVaCxaYy4bS1vxESaFDNxsx5JQLQK77eVuafE="; + }; + + nativeBuildInputs = [ + meson ninja pkg-config wrapGAppsHook + ]; + + buildInputs = [ + gtk3 + json_c + libpulseaudio + wayland + ]; + + meta = with stdenv.lib; { + homepage = "https://github.com/alexays/waybar"; + description = "A bar for Wayland WMs"; + longDescription = '' + Root Bar is a bar for wlroots based wayland compositors such as sway and + was designed to address the lack of good bars for wayland. + ''; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ AndersonTorres ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/applications/misc/synergy/default.nix b/pkgs/applications/misc/synergy/default.nix index b0722e18eeaad..3b1d04f3d38b6 100644 --- a/pkgs/applications/misc/synergy/default.nix +++ b/pkgs/applications/misc/synergy/default.nix @@ -82,7 +82,7 @@ stdenv.mkDerivation rec { description = "Share one mouse and keyboard between multiple computers"; homepage = "http://synergy-project.org/"; license = licenses.gpl2; - maintainers = with maintainers; [ enzime ]; + maintainers = with maintainers; [ ]; platforms = platforms.all; }; } diff --git a/pkgs/applications/misc/tasknc/default.nix b/pkgs/applications/misc/tasknc/default.nix index 46378aec33aed..9080bec753de8 100644 --- a/pkgs/applications/misc/tasknc/default.nix +++ b/pkgs/applications/misc/tasknc/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, makeWrapper, perl, ncurses5, taskwarrior }: stdenv.mkDerivation rec { - version = "2017-05-15"; + version = "2020-12-17"; pname = "tasknc"; src = fetchFromGitHub { owner = "lharding"; repo = "tasknc"; - rev = "c41d0240e9b848e432f01de735f28de93b934ae7"; - sha256 = "0f7l7fy06p33vw6f6sjnjxfhw951664pmwhjl573jvmh6gi2h1yr"; + rev = "a182661fbcc097a933d5e8cce3922eb1734a563e"; + sha256 = "0jrv2k1yizfdjndbl06lmy2bb62ky2rjdk308967j31c5kqqnw56"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/taskwarrior-tui/default.nix b/pkgs/applications/misc/taskwarrior-tui/default.nix new file mode 100644 index 0000000000000..682bc920a0e6f --- /dev/null +++ b/pkgs/applications/misc/taskwarrior-tui/default.nix @@ -0,0 +1,28 @@ +{ stdenv +, rustPlatform +, fetchFromGitHub +}: + +rustPlatform.buildRustPackage rec { + pname = "taskwarrior-tui"; + version = "0.9.5"; + + src = fetchFromGitHub { + owner = "kdheepak"; + repo = "taskwarrior-tui"; + rev = "v${version}"; + sha256 = "1348ypjphm5f46civbrcxbbahwwl2j47z1hg8ndq1cg2bh5wb8kg"; + }; + + # Because there's a test that requires terminal access + doCheck = false; + + cargoSha256 = "11zpy3whzir9mlbvf0jyscqwj9z44a6s5i1bc2cnxyciqy9b57md"; + + meta = with stdenv.lib; { + description = "A terminal user interface for taskwarrior "; + homepage = "https://github.com/kdheepak/taskwarrior-tui"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ matthiasbeyer ]; + }; +} diff --git a/pkgs/applications/misc/terminal-typeracer/default.nix b/pkgs/applications/misc/terminal-typeracer/default.nix new file mode 100644 index 0000000000000..bfa84ebbb6c0a --- /dev/null +++ b/pkgs/applications/misc/terminal-typeracer/default.nix @@ -0,0 +1,34 @@ +{ stdenv +, fetchFromGitLab +, rustPlatform +, pkg-config +, openssl +, sqlite +, libiconv +, Security +}: + +rustPlatform.buildRustPackage rec { + pname = "terminal-typeracer"; + version = "2.0.4"; + + src = fetchFromGitLab { + owner = "ttyperacer"; + repo = pname; + rev = "v${version}"; + sha256 = "RjGHY6KN6thxbg9W5FRwaAmUeD+5/WCeMCvzFHqZ+J4="; + }; + + cargoSha256 = "VSwku0rtQECirCHx2CXe72gCA+p3DdPC4YYwEYu8WfM="; + + buildInputs = [ openssl sqlite ] ++ stdenv.lib.optionals stdenv.isDarwin [ libiconv Security ]; + nativeBuildInputs = [ pkg-config ]; + + meta = with stdenv.lib; { + description = "An open source terminal based version of Typeracer written in rust"; + homepage = "https://gitlab.com/ttyperacer/terminal-typeracer"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ yoctocell ]; + platforms = platforms.x86_64; + }; +} diff --git a/pkgs/applications/misc/tiramisu/default.nix b/pkgs/applications/misc/tiramisu/default.nix new file mode 100644 index 0000000000000..e5cc9a1c17830 --- /dev/null +++ b/pkgs/applications/misc/tiramisu/default.nix @@ -0,0 +1,36 @@ +{ stdenv, fetchFromGitHub, pkg-config, glib }: + +stdenv.mkDerivation rec { + pname = "tiramisu"; + version = "1.0"; + + src = fetchFromGitHub { + owner = "Sweets"; + repo = pname; + rev = version; + sha256 = "0aw17riwgrhsmcndzh7sw2zw8xvn3d203c2gcrqi9nk5pa7fwp9m"; + }; + + postPatch = '' + sed -i 's/printf(element_delimiter)/printf("%s", element_delimiter)/' src/output.c + ''; + + buildInputs = [ glib ]; + + nativeBuildInputs = [ pkg-config ]; + + makeFlags = [ "PREFIX=$(out)" ]; + + meta = with stdenv.lib; { + description = "Desktop notifications, the UNIX way"; + longDescription = '' + tiramisu is a notification daemon based on dunst that outputs notifications + to STDOUT in order to allow the user to process notifications any way they + prefer. + ''; + homepage = "https://github.com/Sweets/tiramisu"; + license = licenses.mit; + platforms = platforms.linux; + maintainers = with maintainers; [ wishfort36 ]; + }; +} diff --git a/pkgs/applications/misc/tty-share/default.nix b/pkgs/applications/misc/tty-share/default.nix new file mode 100644 index 0000000000000..a9fcb969f675e --- /dev/null +++ b/pkgs/applications/misc/tty-share/default.nix @@ -0,0 +1,24 @@ +{ stdenv, buildGoPackage, fetchFromGitHub }: + +# Upstream has a `./vendor` directory with all deps which we rely upon. +buildGoPackage rec { + pname = "tty-share"; + version = "2.0.0"; + + src = fetchFromGitHub { + owner = "elisescu"; + repo = "tty-share"; + rev = "v${version}"; + sha256 = "1d2vd3d1lb4n0jq4s0p5mii1vz4r3z36hykr5mnx53srsni1wsj5"; + }; + + goPackagePath = "github.com/elisescu/tty-share"; + + meta = with stdenv.lib; { + homepage = "https://tty-share.com"; + description = "Share terminal via browser for remote work or shared sessions"; + platforms = platforms.linux; + license = licenses.mit; + maintainers = with maintainers; [ andys8 ]; + }; +} diff --git a/pkgs/applications/misc/ulauncher/default.nix b/pkgs/applications/misc/ulauncher/default.nix index f1439dc7d161c..d2522360a7532 100644 --- a/pkgs/applications/misc/ulauncher/default.nix +++ b/pkgs/applications/misc/ulauncher/default.nix @@ -20,13 +20,13 @@ python3Packages.buildPythonApplication rec { pname = "ulauncher"; - version = "5.8.0"; + version = "5.9.0"; disabled = python3Packages.isPy27; src = fetchurl { url = "https://github.com/Ulauncher/Ulauncher/releases/download/${version}/ulauncher_${version}.tar.gz"; - sha256 = "1czxzcxix9iwv1sir1q64j5aavc7lzjjwqpisgdc1kidkwnk05zp"; + sha256 = "sha256-jRCrkJcjUHDd3wF+Hkxg0QaW7YgIh7zM/KZ4TAH84/U="; }; nativeBuildInputs = with python3Packages; [ diff --git a/pkgs/applications/misc/upwork/default.nix b/pkgs/applications/misc/upwork/default.nix index 5d4247f3869d9..18c2bc129ccc0 100644 --- a/pkgs/applications/misc/upwork/default.nix +++ b/pkgs/applications/misc/upwork/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { pname = "upwork"; - version = "5.4.7.1"; + version = "5.4.9.6"; src = fetchurl { - url = "https://updates-desktopapp.upwork.com/binaries/v5_4_7_1_81f361962c74427d/${pname}_5.4.7.1_amd64.deb"; - sha256 = "c443724d37bca942ca126b8b207846a5adb94a92ff9490370f2fe055feee347b"; + url = "https://upwork-usw2-desktopapp.upwork.com/binaries/v5_4_9_6_2565cdd0547940a2/${pname}_${version}_amd64.deb"; + sha256 = "ff6246b3b4a1ed79cc9bca2934652fefb40bdac4b7e95997f3a46e354ce52456"; }; dontWrapGApps = true; diff --git a/pkgs/applications/misc/variety/default.nix b/pkgs/applications/misc/variety/default.nix index 4241f9153293a..2366d04b9ca1f 100644 --- a/pkgs/applications/misc/variety/default.nix +++ b/pkgs/applications/misc/variety/default.nix @@ -1,31 +1,28 @@ -{ - fehSupport ? false, feh -, imagemagickSupport ? true, imagemagick -, stdenv -, lib +{ stdenv, lib, fetchFromGitHub , python37Packages -, fetchFromGitHub +, fehSupport ? false, feh +, imagemagickSupport ? true, imagemagick , intltool , gtk3 , gexiv2 , libnotify -, wrapGAppsHook , gobject-introspection , hicolor-icon-theme , librsvg +, wrapGAppsHook }: with python37Packages; buildPythonApplication rec { pname = "variety"; - version = "0.7.2-96-g3afe3ab"; + version = "0.8.5"; src = fetchFromGitHub { owner = "varietywalls"; repo = "variety"; - rev = "3afe3abf725e5db2aec0db575a17c9907ab20de1"; - sha256 = "10vw0202dwrwi497nsbq077v4qd3qn5b8cmkfcsgbvvjwlz7ldm5"; + rev = version; + sha256 = "sha256-6dLz4KXavXwnk5GizBH46d2EHMHPjRo0WnnUuVMtI1M="; }; nativeBuildInputs = [ intltool wrapGAppsHook ]; @@ -43,31 +40,43 @@ buildPythonApplication rec { --replace /bin/bash ${stdenv.shell} ''; - propagatedBuildInputs = - [ gtk3 - gexiv2 - libnotify - beautifulsoup4 - lxml - pycairo - pygobject3 - configobj - pillow - setuptools - requests - httplib2 - dbus-python - gobject-introspection - hicolor-icon-theme - librsvg - ] - ++ lib.optional fehSupport feh + propagatedBuildInputs = [ + beautifulsoup4 + configobj + dbus-python + gexiv2 + gobject-introspection + gtk3 + hicolor-icon-theme + httplib2 + libnotify + librsvg + lxml + pillow + pycairo + pygobject3 + requests + setuptools + ] ++ lib.optional fehSupport feh ++ lib.optional imagemagickSupport imagemagick; meta = with lib; { - description = "A wallpaper manager for Linux systems. It supports numerous desktops and wallpaper sources, including local files and online services: Flickr, Wallhaven, Unsplash, and more"; homepage = "https://github.com/varietywalls/variety"; + description = "A wallpaper manager for Linux systems"; + longDescription = '' + Variety is a wallpaper manager for Linux systems. It supports numerous + desktops and wallpaper sources, including local files and online services: + Flickr, Wallhaven, Unsplash, and more. + + Where supported, Variety sits as a tray icon to allow easy pausing and + resuming. Otherwise, its desktop entry menu provides a similar set of + options. + + Variety also includes a range of image effects, such as oil painting and + blur, as well as options to layer quotes and a clock onto the background. + ''; license = licenses.gpl3; - maintainers = [ maintainers.zfnmxt ]; + maintainers = with maintainers; [ AndersonTorres zfnmxt ]; + platforms = with platforms; linux; }; } diff --git a/pkgs/applications/misc/visidata/default.nix b/pkgs/applications/misc/visidata/default.nix index 450be72a28cbf..2d0a55983430a 100644 --- a/pkgs/applications/misc/visidata/default.nix +++ b/pkgs/applications/misc/visidata/default.nix @@ -15,13 +15,13 @@ }: buildPythonApplication rec { pname = "visidata"; - version = "2.1"; + version = "2.1.1"; src = fetchFromGitHub { owner = "saulpw"; repo = "visidata"; rev = "v${version}"; - sha256 = "1psb3ycrb7k00b5blg9zr52bzdxs1mkdc7rpjn4m9kh09yfs3sx4"; + sha256 = "018z06bfcw0l4k2zdwbgxna9fss4wdqj64ckw5qjis14sb3zkr28"; }; propagatedBuildInputs = [ diff --git a/pkgs/applications/misc/xdg-launch/default.nix b/pkgs/applications/misc/xdg-launch/default.nix new file mode 100644 index 0000000000000..257b15387baa3 --- /dev/null +++ b/pkgs/applications/misc/xdg-launch/default.nix @@ -0,0 +1,57 @@ +{ stdenv +, lib +, fetchFromGitHub +, autoconf +, automake +, gettext +, libtool +, perl +, pkg-config +, glib +, xorg +}: +stdenv.mkDerivation rec { + pname = "xdg-launch"; + version = "1.10"; + + postPatch = '' + # fix gettext configuration + echo 'AM_GNU_GETTEXT_VERSION' >> configure.ac + echo 'AM_GNU_GETTEXT([external])' >> configure.ac + + sed -i data/*.desktop \ + -e "s,/usr/bin,/$out/bin,g" + ''; + + src = fetchFromGitHub { + owner = "bbidulock"; + repo = pname; + rev = version; + sha256 = "sha256-WY1TAPnXAn5GOaP9aMHar761m1MkKm4vavLlWELWUu8="; + }; + + preConfigure = "./autogen.sh"; + + buildInputs = [ + xorg.libX11 + xorg.libXrandr + glib # can be optional + ]; + + nativeBuildInputs = [ + autoconf + automake + gettext + libtool + perl # pod2man + pkg-config + ]; + + meta = with lib; { + homepage = "https://github.com/bbidulock/xdg-launch"; + description = "A command line XDG compliant launcher and tools"; + license = licenses.gpl3; + platforms = platforms.linux; + maintainers = [ maintainers.ck3d ]; + }; +} diff --git a/pkgs/applications/misc/zathura/wrapper.nix b/pkgs/applications/misc/zathura/wrapper.nix index 7cd52e0c74f10..60e3bb9fd535d 100644 --- a/pkgs/applications/misc/zathura/wrapper.nix +++ b/pkgs/applications/misc/zathura/wrapper.nix @@ -7,10 +7,19 @@ symlinkJoin { buildInputs = [ makeWrapper ]; - postBuild = '' + postBuild = let + fishCompletion = "share/fish/vendor_completions.d/zathura.fish"; + in '' makeWrapper ${zathura_core.bin}/bin/zathura $out/bin/zathura \ --prefix PATH ":" "${lib.makeBinPath [ file ]}" \ --add-flags --plugins-dir="$out/lib/zathura" + + # zathura fish completion references the zathura_core derivation to + # check for supported plugins which live in the wrapper derivation, + # so we need to fix the path to reference $out instead. + rm "$out/${fishCompletion}" + substitute "${zathura_core.out}/${fishCompletion}" "$out/${fishCompletion}" \ + --replace "${zathura_core.out}" "$out" ''; meta = with lib; { diff --git a/pkgs/applications/networking/Sylk/default.nix b/pkgs/applications/networking/Sylk/default.nix index 9f5378d761aa8..7391ad4c688c0 100644 --- a/pkgs/applications/networking/Sylk/default.nix +++ b/pkgs/applications/networking/Sylk/default.nix @@ -2,7 +2,7 @@ let pname = "Sylk"; - version = "2.9.3"; + version = "2.9.4"; in appimageTools.wrapType2 rec { @@ -10,7 +10,7 @@ appimageTools.wrapType2 rec { src = fetchurl { url = "http://download.ag-projects.com/Sylk/Sylk-${version}-x86_64.AppImage"; - hash = "sha256-JH/TUGAYZTIb/L926CoYb5yzPtbOKVmnWRmHO6DxDyY="; + hash = "sha256-LnJ8Pd+AHIrHrYpIx+rxnFKZ1uh2viDHC5TaU1BL62s="; }; profile = '' diff --git a/pkgs/applications/networking/apache-directory-studio/default.nix b/pkgs/applications/networking/apache-directory-studio/default.nix index 141bbe654b7a2..94359bdd22714 100644 --- a/pkgs/applications/networking/apache-directory-studio/default.nix +++ b/pkgs/applications/networking/apache-directory-studio/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, jdk14, makeWrapper, autoPatchelfHook, makeDesktopItem, glib, libsecret }: +{ stdenv, fetchurl, jdk, makeWrapper, autoPatchelfHook, makeDesktopItem, glib, libsecret }: let desktopItem = makeDesktopItem { @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { makeWrapper "$dest/ApacheDirectoryStudio" \ "$out/bin/ApacheDirectoryStudio" \ - --prefix PATH : "${jdk14}/bin" + --prefix PATH : "${jdk}/bin" install -D icon.xpm "$out/share/pixmaps/apache-directory-studio.xpm" install -D -t "$out/share/applications" ${desktopItem}/share/applications/* ''; diff --git a/pkgs/applications/networking/appgate-sdp/default.nix b/pkgs/applications/networking/appgate-sdp/default.nix new file mode 100644 index 0000000000000..c56a6eb658257 --- /dev/null +++ b/pkgs/applications/networking/appgate-sdp/default.nix @@ -0,0 +1,169 @@ +{ alsaLib +, at-spi2-atk +, at-spi2-core +, atk +, bash +, cairo +, coreutils +, cups +, curl +, dbus +, dnsmasq +, dpkg +, e2fsprogs +, expat +, fetchurl +, gdk-pixbuf +, glib +, gtk3 +, icu +, iproute +, krb5 +, lib +, libX11 +, libXScrnSaver +, libXcomposite +, libXcursor +, libXdamage +, libXext +, libXfixes +, libXi +, libXrandr +, libXrender +, libXtst +, libsecret +, libuuid +, libxcb +, lttng-ust +, makeWrapper +, networkmanager +, nspr +, nss +, openssl +, pango +, procps +, python37 +, python37Packages +, stdenv +, systemd +, zlib +}: +with stdenv.lib; +let + deps = [ + alsaLib + at-spi2-atk + at-spi2-core + atk + cairo + cups + curl + dbus + expat + gdk-pixbuf + glib + gtk3 + icu + krb5 + libX11 + libXScrnSaver + libXcomposite + libXcursor + libXdamage + libXext + libXfixes + libXi + libXrandr + libXrender + libXtst + libsecret + libuuid + libxcb + lttng-ust + nspr + nss + openssl + pango + stdenv.cc.cc + systemd + zlib + ]; + rpath = stdenv.lib.makeLibraryPath deps ; +in +stdenv.mkDerivation rec { + pname = "appgate-sdp"; + version = "5.1.2"; + + src = fetchurl { + url = "https://bin.appgate-sdp.com/5.1/client/appgate-sdp_${version}_amd64.deb"; + sha256 = "0v4vfibg1giml3vfz2w7qypqzymvfchi5qm6vfagah2vfbkw7xc2"; + }; + + dontConfigure = true; + dontBuild = true; + enableParallelBuilding = true; + + buildInputs = [ + python37 + python37Packages.dbus-python + ]; + + nativeBuildInputs = [ + makeWrapper + dpkg + ]; + + unpackPhase = '' + dpkg-deb -x $src $out + ''; + + installPhase = '' + mkdir -p $out/bin + ln -s "$out/opt/appgate/appgate" "$out/bin/appgate" + cp -r $out/usr/share $out/share + + for file in $out/opt/appgate/linux/appgate-resolver.pre \ + $out/opt/appgate/linux/appgate-dumb-resolver.pre \ + $out/lib/systemd/system/appgatedriver.service \ + $out/lib/systemd/system/appgate-dumb-resolver.service \ + $out/lib/systemd/system/appgate-resolver.service + do + substituteInPlace $file \ + --replace "/bin/sh" "${bash}/bin/sh" \ + --replace "/opt/" "$out/opt/" \ + --replace "/usr/sbin/dnsmasq" "${dnsmasq}/bin/dnsmasq" \ + --replace "InaccessiblePaths=/mnt /srv /boot /media" "InaccessiblePaths=-/mnt -/srv -/boot -/media" \ + --replace "cat" "${coreutils}/bin/cat" \ + --replace "chattr" "${e2fsprogs}/bin/chattr" \ + --replace "mv" "${coreutils}/bin/mv" \ + --replace "pkill" "${procps}/bin/pkill" + done + + substituteInPlace $out/opt/appgate/linux/nm.py --replace "/usr/sbin/dnsmasq" "${dnsmasq}/bin/dnsmasq" + substituteInPlace $out/opt/appgate/linux/set_dns \ + --replace "service appgate-resolver stop" "${systemd.out}/bin/systemctl stop appgate-resolver" \ + --replace "/etc/appgate.conf" "$out/etc/appgate.conf" + + ''; + + postFixup = '' + find $out -type f -name "*.so" -exec patchelf --set-rpath '$ORIGIN:${rpath}' {} \; + for binary in $out/opt/appgate/appgate-driver \ + $out/opt/appgate/appgate \ + $out/opt/appgate/service/createdump \ + $out/opt/appgate/service/appgateservice.bin + do + patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" --set-rpath "$ORIGIN:$out/opt/appgate/service/:$out/opt/appgate/:${rpath}" $binary + done + + wrapProgram $out/opt/appgate/appgate-driver --prefix PATH : ${stdenv.lib.makeBinPath [ iproute networkmanager dnsmasq ]} + wrapProgram $out/opt/appgate/linux/set_dns --set PYTHONPATH $PYTHONPATH + ''; + meta = with stdenv.lib; { + description = "Appgate SDP (Software Defined Perimeter) desktop client"; + homepage = https://www.appgate.com/support/software-defined-perimeter-support; + license = licenses.unfree; + platforms = platforms.linux; + maintainers = with maintainers; [ ymatsiuk ]; + }; +} diff --git a/pkgs/applications/networking/browsers/brave/default.nix b/pkgs/applications/networking/browsers/brave/default.nix index d76dd8b9daa7a..92177183b0cab 100644 --- a/pkgs/applications/networking/browsers/brave/default.nix +++ b/pkgs/applications/networking/browsers/brave/default.nix @@ -70,7 +70,6 @@ rpath = lib.makeLibraryPath [ libXext libXfixes libXi - libxkbcommon libXrandr libXrender libXtst @@ -89,16 +88,17 @@ in stdenv.mkDerivation rec { pname = "brave"; - version = "1.17.73"; + version = "1.18.77"; src = fetchurl { url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb"; - sha256 = "18bd6kgzfza5r0y2ggfy82pdpnfr2hzgjcfy9vxqq658z7q3jpqy"; + sha256 = "AV3bqtWaoy6AVnt8K/Qo+7hguAIsPJPZhgLSeOvJ7JY="; }; dontConfigure = true; dontBuild = true; dontPatchELF = true; + doInstallCheck = true; nativeBuildInputs = [ dpkg wrapGAppsHook ]; @@ -148,6 +148,13 @@ stdenv.mkDerivation rec { ln -sf ${xdg_utils}/bin/xdg-mime $out/opt/brave.com/brave/xdg-mime ''; + installCheckPhase = '' + # Bypass upstream wrapper which suppresses errors + $out/opt/brave.com/brave/brave --version + ''; + + passthru.updateScript = ./update.sh; + meta = with stdenv.lib; { homepage = "https://brave.com/"; description = "Privacy-oriented browser for Desktop and Laptop computers"; diff --git a/pkgs/applications/networking/browsers/brave/update.sh b/pkgs/applications/networking/browsers/brave/update.sh new file mode 100755 index 0000000000000..b7d974ad259da --- /dev/null +++ b/pkgs/applications/networking/browsers/brave/update.sh @@ -0,0 +1,5 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p curl gnused common-updater-scripts + +version="$(curl -sL https://brave-browser-apt-release.s3.brave.com/dists/stable/main/binary-amd64/Packages | sed -r -n 's/^Version: (.*)/\1/p' | head -n1)" +update-source-version brave "$version" diff --git a/pkgs/applications/networking/browsers/chromium/README.md b/pkgs/applications/networking/browsers/chromium/README.md index 8e4eae75f960c..5b7c9fe55040d 100644 --- a/pkgs/applications/networking/browsers/chromium/README.md +++ b/pkgs/applications/networking/browsers/chromium/README.md @@ -36,9 +36,6 @@ 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`). -After updating, please also update pkgs/development/tools/selenium/chromedriver/default.nix -to a matching version. - ## Backports All updates are considered security critical and should be ported to the stable diff --git a/pkgs/applications/networking/browsers/chromium/browser.nix b/pkgs/applications/networking/browsers/chromium/browser.nix index d3953da71d284..b9a42e825f31c 100644 --- a/pkgs/applications/networking/browsers/chromium/browser.nix +++ b/pkgs/applications/networking/browsers/chromium/browser.nix @@ -1,4 +1,4 @@ -{ stdenv, mkChromiumDerivation, channel, enableWideVine }: +{ stdenv, mkChromiumDerivation, channel, enableWideVine, ungoogled }: with stdenv.lib; @@ -69,18 +69,25 @@ mkChromiumDerivation (base: rec { requiredSystemFeatures = [ "big-parallel" ]; meta = { - description = "An open source web browser from Google"; + description = "An open source web browser from Google" + + optionalString ungoogled ", with dependencies on Google web services removed"; longDescription = '' Chromium is an open source web browser from Google that aims to build a safer, faster, and more stable way for all Internet users to experience the web. It has a minimalist user interface and provides the vast majority of source code for Google Chrome (which has some additional features). ''; - homepage = "https://www.chromium.org/"; - maintainers = with maintainers; [ primeos thefloweringash bendlas ]; # See README.md + homepage = if ungoogled + then "https://github.com/Eloston/ungoogled-chromium" + else "https://www.chromium.org/"; + maintainers = with maintainers; if ungoogled + then [ squalus primeos ] + else [ primeos thefloweringash bendlas ]; license = if enableWideVine then licenses.unfree else licenses.bsd3; platforms = platforms.linux; - hydraPlatforms = if channel == "stable" then ["aarch64-linux" "x86_64-linux"] else []; + hydraPlatforms = if (channel == "stable" || channel == "ungoogled-chromium") + then ["aarch64-linux" "x86_64-linux"] + else []; timeout = 172800; # 48 hours (increased from the Hydra default of 10h) }; }) diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index 0c16d0c9ec60c..d7b1a017d31dd 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -13,7 +13,7 @@ , bison, gperf , glib, gtk3, dbus-glib , glibc -, libXScrnSaver, libXcursor, libXtst, libGLU, libGL +, libXScrnSaver, libXcursor, libXtst, libxshmfence, libGLU, libGL , protobuf, speechd, libXdamage, cups , ffmpeg, libxslt, libxml2, at-spi2-core , jre8 @@ -31,6 +31,7 @@ , proprietaryCodecs ? true , cupsSupport ? true , pulseSupport ? false, libpulseaudio ? null +, ungoogled ? false, ungoogled-chromium , channel , upstream-info @@ -109,6 +110,10 @@ let result else result; + ungoogler = ungoogled-chromium { + inherit (upstream-info.deps.ungoogled-patches) rev sha256; + }; + base = rec { name = "${packageName}-unwrapped-${version}"; inherit (upstream-info) version; @@ -131,7 +136,7 @@ let util-linux alsaLib bison gperf kerberos glib gtk3 dbus-glib - libXScrnSaver libXcursor libXtst libGLU libGL + libXScrnSaver libXcursor libXtst libxshmfence libGLU libGL pciutils protobuf speechd libXdamage at-spi2-core jre pipewire_0_2 @@ -208,6 +213,10 @@ let '' + optionalString stdenv.isAarch64 '' substituteInPlace build/toolchain/linux/BUILD.gn \ --replace 'toolprefix = "aarch64-linux-gnu-"' 'toolprefix = ""' + '' + optionalString ungoogled '' + ${ungoogler}/utils/prune_binaries.py . ${ungoogler}/pruning.list || echo "some errors" + ${ungoogler}/utils/patches.py . ${ungoogler}/patches + ${ungoogler}/utils/domain_substitution.py apply -r ${ungoogler}/domain_regex.list -f ${ungoogler}/domain_substitution.list -c ./ungoogled-domsubcache.tar.gz . ''; gnFlags = mkGnFlags ({ @@ -260,6 +269,24 @@ let use_system_minigbm = true; use_system_libdrm = true; system_wayland_scanner_path = "${wayland}/bin/wayland-scanner"; + } // optionalAttrs ungoogled { + chrome_pgo_phase = 0; + enable_hangout_services_extension = false; + enable_js_type_check = false; + enable_mdns = false; + enable_nacl_nonsfi = false; + enable_one_click_signin = false; + enable_reading_list = false; + enable_remoting = false; + enable_reporting = false; + enable_service_discovery = false; + exclude_unwind_tables = true; + google_api_key = ""; + google_default_client_id = ""; + google_default_client_secret = ""; + safe_browsing_mode = 0; + use_official_google_api_keys = false; + use_unofficial_version_number = false; } // (extraAttrs.gnFlags or {})); configurePhase = '' diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index e35e4d945dde2..fd89f3160084a 100644 --- a/pkgs/applications/networking/browsers/chromium/default.nix +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -15,6 +15,7 @@ , enablePepperFlash ? false , enableWideVine ? false , enableVaapi ? false # Disabled by default due to unofficial support +, ungoogled ? false # Whether to build chromium or ungoogled-chromium , cupsSupport ? true , pulseSupport ? config.pulseaudio or stdenv.isLinux , commandLineArgs ? "" @@ -33,7 +34,7 @@ let mkChromiumDerivation = callPackage ./common.nix ({ inherit channel gnome gnomeSupport gnomeKeyringSupport proprietaryCodecs - cupsSupport pulseSupport; + cupsSupport pulseSupport ungoogled; gnChromium = gn.overrideAttrs (oldAttrs: { inherit (upstream-info.deps.gn) version; src = fetchgit { @@ -42,14 +43,17 @@ let }); }); - browser = callPackage ./browser.nix { inherit channel enableWideVine; }; + browser = callPackage ./browser.nix { inherit channel enableWideVine ungoogled; }; plugins = callPackage ./plugins.nix { inherit enablePepperFlash; }; + + ungoogled-chromium = callPackage ./ungoogled.nix {}; }; - pkgSuffix = if channel == "dev" then "unstable" else channel; + pkgSuffix = if channel == "dev" then "unstable" else + (if channel == "ungoogled-chromium" then "stable" else channel); pkgName = "google-chrome-${pkgSuffix}"; chromeSrc = fetchurl { urls = map (repo: "${repo}/${pkgName}/${pkgName}_${version}-1_amd64.deb") [ @@ -71,7 +75,7 @@ let unpackCmd = let widevineCdmPath = - if channel == "stable" then + if (channel == "stable" || channel == "ungoogled-chromium") then "./opt/google/chrome/WidevineCdm" else if channel == "beta" then "./opt/google/chrome-beta/WidevineCdm" @@ -113,7 +117,9 @@ let }; }; - suffix = if channel != "stable" then "-" + channel else ""; + suffix = if (channel == "stable" || channel == "ungoogled-chromium") + then "" + else "-" + channel; sandboxExecutableName = chromium.browser.passthru.sandboxExecutableName; @@ -133,7 +139,8 @@ let else browser; in stdenv.mkDerivation { - name = "chromium${suffix}-${version}"; + name = lib.optionalString ungoogled "ungoogled-" + + "chromium${suffix}-${version}"; inherit version; buildInputs = [ diff --git a/pkgs/applications/networking/browsers/ungoogled-chromium/ungoogled.nix b/pkgs/applications/networking/browsers/chromium/ungoogled.nix index 17418c90af490..299b19f2f4f67 100644 --- a/pkgs/applications/networking/browsers/ungoogled-chromium/ungoogled.nix +++ b/pkgs/applications/networking/browsers/chromium/ungoogled.nix @@ -4,6 +4,7 @@ , makeWrapper , patch }: + { rev , sha256 }: diff --git a/pkgs/applications/networking/browsers/chromium/update.py b/pkgs/applications/networking/browsers/chromium/update.py index 9e1f0aec598da..2b9f9232c24d6 100755 --- a/pkgs/applications/networking/browsers/chromium/update.py +++ b/pkgs/applications/networking/browsers/chromium/update.py @@ -1,6 +1,9 @@ #! /usr/bin/env nix-shell #! nix-shell -i python -p python3 nix nix-prefetch-git +"""This script automatically updates chromium, google-chrome, chromedriver, and ungoogled-chromium +via upstream-info.json.""" + import csv import json import re @@ -19,41 +22,54 @@ BUCKET_URL = 'https://commondatastorage.googleapis.com/chromium-browser-official JSON_PATH = dirname(abspath(__file__)) + '/upstream-info.json' + def load_json(path): + """Loads the given JSON file.""" with open(path, 'r') as f: return json.load(f) + def nix_prefetch_url(url, algo='sha256'): + """Prefetches the content of the given URL.""" print(f'nix-prefetch-url {url}') out = subprocess.check_output(['nix-prefetch-url', '--type', algo, url]) return out.decode('utf-8').rstrip() + def nix_prefetch_git(url, rev): + """Prefetches the requested Git revision of the given repository URL.""" print(f'nix-prefetch-git {url} {rev}') out = subprocess.check_output(['nix-prefetch-git', '--quiet', '--url', url, '--rev', rev]) return json.loads(out) + def get_file_revision(revision, file_path): + """Fetches the requested Git revision of the given Chromium file.""" url = f'https://raw.githubusercontent.com/chromium/chromium/{revision}/{file_path}' with urlopen(url) as http_response: return http_response.read() + def get_matching_chromedriver(version): + """Gets the matching chromedriver version for the given Chromium version.""" # See https://chromedriver.chromium.org/downloads/version-selection build = re.sub('.[0-9]+$', '', version) chromedriver_version_url = f'https://chromedriver.storage.googleapis.com/LATEST_RELEASE_{build}' with urlopen(chromedriver_version_url) as http_response: chromedriver_version = http_response.read().decode() def get_chromedriver_url(system): - return f'https://chromedriver.storage.googleapis.com/{chromedriver_version}/chromedriver_{system}.zip' + return ('https://chromedriver.storage.googleapis.com/' + + f'{chromedriver_version}/chromedriver_{system}.zip') return { 'version': chromedriver_version, 'sha256_linux': nix_prefetch_url(get_chromedriver_url('linux64')), 'sha256_darwin': nix_prefetch_url(get_chromedriver_url('mac64')) } -def get_channel_dependencies(channel): - deps = get_file_revision(channel['version'], 'DEPS') + +def get_channel_dependencies(version): + """Gets all dependencies for the given Chromium version.""" + deps = get_file_revision(version, 'DEPS') gn_pattern = b"'gn_version': 'git_revision:([0-9a-f]{40})'" gn_commit = re.search(gn_pattern, deps).group(1).decode() gn = nix_prefetch_git('https://gn.googlesource.com/gn', gn_commit) @@ -66,12 +82,35 @@ def get_channel_dependencies(channel): } } + +def get_latest_ungoogled_chromium_tag(): + """Returns the latest ungoogled-chromium tag using the GitHub API.""" + api_tag_url = 'https://api.github.com/repos/Eloston/ungoogled-chromium/tags?per_page=1' + with urlopen(api_tag_url) as http_response: + tag_data = json.load(http_response) + return tag_data[0]['name'] + + +def get_latest_ungoogled_chromium_build(): + """Returns a dictionary for the latest ungoogled-chromium build.""" + tag = get_latest_ungoogled_chromium_tag() + version = tag.split('-')[0] + return { + 'channel': 'ungoogled-chromium', + 'version': version, + 'ungoogled_tag': tag + } + + channels = {} last_channels = load_json(JSON_PATH) + print(f'GET {HISTORY_URL}', file=sys.stderr) with urlopen(HISTORY_URL) as resp: builds = csv.DictReader(iterdecode(resp, 'utf-8')) + builds = list(builds) + builds.append(get_latest_ungoogled_chromium_build()) for build in builds: channel_name = build['channel'] @@ -88,34 +127,50 @@ with urlopen(HISTORY_URL) as resp: continue channel = {'version': build['version']} - suffix = 'unstable' if channel_name == 'dev' else channel_name + if channel_name == 'dev': + google_chrome_suffix = 'unstable' + elif channel_name == 'ungoogled-chromium': + google_chrome_suffix = 'stable' + else: + google_chrome_suffix = channel_name try: channel['sha256'] = nix_prefetch_url(f'{BUCKET_URL}/chromium-{build["version"]}.tar.xz') - channel['sha256bin64'] = nix_prefetch_url(f'{DEB_URL}/google-chrome-{suffix}/google-chrome-{suffix}_{build["version"]}-1_amd64.deb') + channel['sha256bin64'] = nix_prefetch_url( + f'{DEB_URL}/google-chrome-{google_chrome_suffix}/' + + f'google-chrome-{google_chrome_suffix}_{build["version"]}-1_amd64.deb') except subprocess.CalledProcessError: # This build isn't actually available yet. Continue to # the next one. continue - channel['deps'] = get_channel_dependencies(channel) + channel['deps'] = get_channel_dependencies(channel['version']) if channel_name == 'stable': channel['chromedriver'] = get_matching_chromedriver(channel['version']) + elif channel_name == 'ungoogled-chromium': + ungoogled_repo_url = 'https://github.com/Eloston/ungoogled-chromium.git' + channel['deps']['ungoogled-patches'] = { + 'rev': build['ungoogled_tag'], + 'sha256': nix_prefetch_git(ungoogled_repo_url, build['ungoogled_tag'])['sha256'] + } channels[channel_name] = channel + with open(JSON_PATH, 'w') as out: def get_channel_key(item): + """Orders Chromium channels by their name.""" channel_name = item[0] if channel_name == 'stable': return 0 - elif channel_name == 'beta': + if channel_name == 'beta': return 1 - elif channel_name == 'dev': + if channel_name == 'dev': return 2 - else: - print(f'Error: Unexpected channel: {channel_name}', file=sys.stderr) - sys.exit(1) + if channel_name == 'ungoogled-chromium': + return 3 + print(f'Error: Unexpected channel: {channel_name}', file=sys.stderr) + sys.exit(1) sorted_channels = OrderedDict(sorted(channels.items(), key=get_channel_key)) json.dump(sorted_channels, out, indent=2) out.write('\n') diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index 3b64e601eba64..660682e17a7f2 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -1,8 +1,8 @@ { "stable": { - "version": "87.0.4280.88", - "sha256": "1h09g9b2zxad85vd146ymvg3w2kpngpi78yig3dn1vrmhwr4aiiy", - "sha256bin64": "0n3fm6wf8zfkv135d50xl8xxrnng3q55vyxkck1da8jyvh18bijb", + "version": "87.0.4280.141", + "sha256": "0x9k809m36pfirnw2vnr9pk93nxdbgrvna0xf1rs3q91zkbr2x8l", + "sha256bin64": "0wq3yi0qyxzcid390w5rh4xjq92fjajvlifjl70g6sqnbk6vgvdp", "deps": { "gn": { "version": "2020-09-09", @@ -13,14 +13,14 @@ }, "chromedriver": { "version": "87.0.4280.88", - "sha256_linux": "11plh2hs2zpa14ymlbnj92pa58krl28yw4c0s55wk8qsxvzvl02m", + "sha256_linux": "1insh1imi25sj4hdkbll5rzwnag8wvfxv4ckshpq8akl8r13p6lj", "sha256_darwin": "048hsqp6575r980m769lzznvxypmfcwn89f1d3ik751ymzmb5r78" } }, "beta": { - "version": "88.0.4324.41", - "sha256": "06hnawylr7fl1zav6cyg1yfw2z04qrpnj4n3v07qx7ya6p8qyp2g", - "sha256bin64": "1iq4qd5x7ivypcxh47d6av45hyqdgga2s80idyhf1f51f660h2vc", + "version": "88.0.4324.79", + "sha256": "1xmssngzg370gazvqngw5mzhfq476fan5y3sp4ggs8fx5anh6jlz", + "sha256bin64": "16m2k4kr92236yvfnl276cy77d5324b7ca3grsw990c0b2kgizq7", "deps": { "gn": { "version": "2020-11-05", @@ -31,9 +31,9 @@ } }, "dev": { - "version": "89.0.4350.4", - "sha256": "1jh3r227j70imjzj0gm7cf1mv25zcdd2waa9qvim0p3g6wbdacmq", - "sha256bin64": "06963r7a1xc9vjlwgn0wgzqfj6mavfks20lzf49axw6izrxf8sbr", + "version": "89.0.4356.6", + "sha256": "1jq0wbaaz07kz2190rq3vl2b5spx3qfda4al9ygkm8man817d2nr", + "sha256bin64": "0dgvp2my328s4ah0hmp1hg1c3x21gkrz9mjvbfs54r2pjb7y5sbl", "deps": { "gn": { "version": "2020-11-05", @@ -42,5 +42,22 @@ "sha256": "1xcm07qjk6m2czi150fiqqxql067i832adck6zxrishm70c9jbr9" } } + }, + "ungoogled-chromium": { + "version": "87.0.4280.88", + "sha256": "1h09g9b2zxad85vd146ymvg3w2kpngpi78yig3dn1vrmhwr4aiiy", + "sha256bin64": "0n3fm6wf8zfkv135d50xl8xxrnng3q55vyxkck1da8jyvh18bijb", + "deps": { + "gn": { + "version": "2020-09-09", + "url": "https://gn.googlesource.com/gn", + "rev": "e002e68a48d1c82648eadde2f6aafa20d08c36f2", + "sha256": "0x4c7amxwzxs39grqs3dnnz0531mpf1p75niq7zhinyfqm86i4dk" + }, + "ungoogled-patches": { + "rev": "87.0.4280.88-1", + "sha256": "0w2137w8hfcgl6f938hqnb4ffp33v5r8vdzxrvs814w7dszkiqgg" + } + } } } diff --git a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix index 98cf28ec3e184..9bf5e837bf5d2 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix @@ -1,965 +1,965 @@ { - version = "84.0b4"; + version = "85.0b4"; sources = [ - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/ach/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/ach/firefox-85.0b4.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha256 = "da9290899d245d86b3d2d378072af403106596ae1e02a36d40a93deea9e57000"; + sha256 = "04d5c5b64e906438122cfcd13c6a06d58bb1c0a2d2eaf66f52f91e103a5534ae"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/af/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/af/firefox-85.0b4.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "28810946bde4c2335714c0f8b0dffad1a1650c167370e38c6eb5e2ee5d2e54be"; + sha256 = "57bdfd3e6efe3c667ddb4c1e2421c191eedc407f578ee307b1ed916815726837"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/an/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/an/firefox-85.0b4.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha256 = "d32e9e13b2c1f484686d9394f20a87e2c1d833703e0115de1f9c8c552d1e9d8a"; + sha256 = "7ceb815590071691a3faa6f1d8215963b48c54c220c512499fb9642efc1492d4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/ar/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/ar/firefox-85.0b4.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "de8348caf98ca0551f3f080eb32ef94c00706676bc8df1723377d98f10221e56"; + sha256 = "ce8b25f9ba3d21e87f660a17a90e770417e658f7280d0e41d0a5ff41164a2d43"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/ast/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/ast/firefox-85.0b4.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "104cc96b0e14c030848be4bc07a1b2b836a241e9ddba581b9ca24018c54356ee"; + sha256 = "a220440bebd1c1179e6e2a483ae148ada05f86c3c5d68946bb3b14d301301a78"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/az/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/az/firefox-85.0b4.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha256 = "e96087b52f1dc18c8bd29d486faa00ad06a2165d1e14cbd47e37cafb40602a87"; + sha256 = "b79a3e03d476d3667c28ed83dd84fb375013597d58e9e13f431eba13b509422f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/be/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/be/firefox-85.0b4.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "d67c2c1556b6859e0acae5b69b3b7eeac77b3bb1594b48682a97a72742c79d05"; + sha256 = "c8e00ae8a6d66a427212c1323a0f4860c25058c1d27fc0d3bb56612f0f2b785e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/bg/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/bg/firefox-85.0b4.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "b3bad1b330a5d4c515b37cddb3e89e538c5cd66ffce68dbf8d1e9adaf4881431"; + sha256 = "cc63fb7773dfe6a9b84a7ddd80873c6f8fab3b0f12e15a0db862bac9006d86c4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/bn/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/bn/firefox-85.0b4.tar.bz2"; locale = "bn"; arch = "linux-x86_64"; - sha256 = "9c50c4e12061279133177ade4b22b7e2bb7e14dcc1875464f57efb7c7e360bf7"; + sha256 = "9fdd2e50b1fd74a3cabe55c23ca44253e9b5a2791461a2f15713cab6f4700e6f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/br/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/br/firefox-85.0b4.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "79eb76af707b26fa4d46acf11d0be25ccd144abda6c853373c9ec0cc872c2a8f"; + sha256 = "44d99c74041f227252989570c9fe1dc2a1519e195e6386d0dc78fbf43ec41e88"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/bs/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/bs/firefox-85.0b4.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha256 = "2cbf15a604f90c4a6212f5da251372d09e2247f5ed338193ff93a94695bca308"; + sha256 = "7c3b4beb800c8e023fbc5655e6435b11f6ebf11c3d82a5b6a1df76df682f0666"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/ca-valencia/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/ca-valencia/firefox-85.0b4.tar.bz2"; locale = "ca-valencia"; arch = "linux-x86_64"; - sha256 = "a9b6cacf6ee8a6a1f733f3ff3741c1bb12eff823664279205906e8e59b646679"; + sha256 = "b0676d544d8d2cc6c37a192adcd4e61038106c0e84066e68895642afc8e158a4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/ca/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/ca/firefox-85.0b4.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "1ea49a5d59129c820f359fbad2253e051adbb260cedd4b62bb20122562466bfd"; + sha256 = "8f170b9356761ec175be3f417df624a78e939af931376f52d36f19b019c05338"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/cak/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/cak/firefox-85.0b4.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "b18651df9ae2e16ea9855c30fa393dd34103cf338a515d41d3c1802e52fb92a1"; + sha256 = "ca966b90035591d3e5f886814664d2f203bc0b65e781f46566a51269811efcdd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/cs/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/cs/firefox-85.0b4.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "4dca051e5349372d6caf5a7f6e8e6e12fe42bf96110a1c6e2f7f6e408f365b80"; + sha256 = "31e19d69e03821c646d21969b48e5ba01c52b2d5d2538f7bd7e7b93c9a6f7bb8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/cy/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/cy/firefox-85.0b4.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "3117d47bcec1cf0f5a547a33c62ca5ecfee34435c13a478f23d1d9f0ac187f4f"; + sha256 = "dfe3974d2328fa535b79f3e18d699b8d62a053efd0248cc88d1152ff92604166"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/da/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/da/firefox-85.0b4.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "34a38c76997bdd41e6b12cebf08345e7cd19838bd92f5a8d082ba3087cb063c7"; + sha256 = "86ba3d548eb3a6408b9234c382389c0fb5907c98eeab25cc39e810727570d2ae"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/de/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/de/firefox-85.0b4.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "65e417603cf383d92058b8976c1f6499dc5804d02a22bb639e416c4e730b4a62"; + sha256 = "1cb610280c07e7af82df2dd283a6d35c1f63afe6f11a0fd7797efc4128ad126a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/dsb/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/dsb/firefox-85.0b4.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "08dacb91773d7b49eb8f08668627badae2967193c441ff2fb6b9d88063c5ffb9"; + sha256 = "555300937cd2d6e25085d5d3f4b699704ba3630ba4ce667a9ed3d67a9c9f5143"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/el/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/el/firefox-85.0b4.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "78e870b673c204e4d9fca2a3fbab06031c724a8b0696a3b6e2dea5ac07a5bb88"; + sha256 = "b2bf744cbe21d23a1ed16310fe552197b129964a75aca4fc1c3759fb59782d7f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/en-CA/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/en-CA/firefox-85.0b4.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "4c862eb5c53e65af1ddc212a093eb23e33653341fa7db53d935ed8482637aed8"; + sha256 = "422cbea99fd390c31868b0cf0e6bc8344cca9dc9540dd58b8b315f519a3c53cd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/en-GB/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/en-GB/firefox-85.0b4.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "f505cf16328603d0164e330fcef60fcfeccdad186d1f91e0b4cee1b8cc7c740d"; + sha256 = "a996f6ea769ad846a69ab692b967ea23c4de461a922add22864fce6f97d04e30"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/en-US/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/en-US/firefox-85.0b4.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "f0561469f04ab83dd52ae4e3a8ca451d6569845e37d9e04c5a91085654661f8a"; + sha256 = "aefbbe66cd209bdd9a1720562127560212f257229b799c45de5feb4173f10232"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/eo/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/eo/firefox-85.0b4.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha256 = "c64d227d6b21876ea48182795d6fd8ec3ca486e5328629a0bbfb936e8463b0a8"; + sha256 = "8237d0bdc5a0ed6873c4178a20e77bb2c86f833f02e6872852d8e35e36978459"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/es-AR/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/es-AR/firefox-85.0b4.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "73b45f6b8d1e53bef003b3e77cc1217b8a85dde49cb0900b4fa2991895e5c184"; + sha256 = "6d8b15775127619f923e7c255a01afcfd81d9d7bb01c0152e3aac3ef327b9ff2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/es-CL/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/es-CL/firefox-85.0b4.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha256 = "e7025e4c5fc311aae2798da99ec5e5863bca5ad8b8460981cef86e29ae37d74a"; + sha256 = "26dedb44f4dd064005a2cb935444acd0f6a99a451b87263775cad4506503bccf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/es-ES/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/es-ES/firefox-85.0b4.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "e819644eb6337255004fda8286e1f2ed898423c4b97694c8355c28f4d449da61"; + sha256 = "96d8444ee16d78bbde1fca5a69d5f404bdb2199757c566cdf44416ef43761715"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/es-MX/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/es-MX/firefox-85.0b4.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha256 = "07de091ca3b06b94e35b84add7fbc5c8fa6ea84ddfe548e5f55b3bc7980a9bd3"; + sha256 = "ac4a2e7490b448a2654a0999b77e4e3e6e8dcd96c4239654dc8cc748f54d2ebc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/et/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/et/firefox-85.0b4.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "d6af9ab39f1a13efc772cbb63dd731dcf988c10f13649f348d7ddb3f6ab6ca60"; + sha256 = "d44ba8376fccea9feae2054a50db58a5d4abca559ebfe854821cca9342f05f42"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/eu/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/eu/firefox-85.0b4.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "110e667568429dd2b0c752962e1148884c44aaef9939926c6b0f49ba5bdb1182"; + sha256 = "d7f2131c7125fa6ee78a978e11d0f5c4ebbd55f5fa9fd8ac644aa0a9f68d60bd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/fa/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/fa/firefox-85.0b4.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha256 = "f7a783f12bb08ccb06074f903bb2eaaab13b348c6a2950a9699beee28ad97b5e"; + sha256 = "2f63087cb94dee9a97cdf0641478b076f119bdf30dc0e3d35b9db67dd1e75cfb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/ff/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/ff/firefox-85.0b4.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha256 = "b2e47bc8ae8d1e54a1b5799a87b4742d049696edd9913f0cc6beb52a89cc261d"; + sha256 = "e8bd39fe41b98ce4fd1e630d376e263815b60339947344d82a7fddfc4ac331d8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/fi/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/fi/firefox-85.0b4.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "f5ee09f1b9d41506ad1023ad05dbdee95ac049eb4bfd38dd99c06cf682e111a8"; + sha256 = "d743df7df584c30ab237771778df1a06a01cb8801ad57233738a9e7ee7b5a453"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/fr/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/fr/firefox-85.0b4.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "f8c33819a6ceab041bed80f1663d94a80ee3bdb6e859eab1eb8ec9d0b67f4222"; + sha256 = "9426e988190c0f65cd87cb502064cc2cfa8146e1edc15aaff7ad3a28e8c30ae0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/fy-NL/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/fy-NL/firefox-85.0b4.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "6ed233042e570e9a04ecc1e25f6211deb7685c117db75f32a541076d95d1cebf"; + sha256 = "80896d31f83bfbee9ac2b585894fbe0332c2516c7cb9eb06b10dd8169fb0a50b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/ga-IE/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/ga-IE/firefox-85.0b4.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "b28337429a0c1d26653fda1d93b59ea0383061a253be5b763442166fdb21bbca"; + sha256 = "678c24f47dda38562f15889bfef5de79e1375a85c8158697c37846252d55f4e9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/gd/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/gd/firefox-85.0b4.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "546bf2f1a4a8a643b161554bc92e771644ff9ae46c6b10fb2a60b920a2454f44"; + sha256 = "87d924efdea12fa98ebbe88d42afa5944b821c4081ee0a549e66393d69c1eb53"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/gl/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/gl/firefox-85.0b4.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "cfc32d3e7e3ba5379895a8b348d9399bd3962a819d0677f14a365f6e0c314676"; + sha256 = "61cb992a445cee2689e19415da53d5611d68f65acd8aceaada76b0999e50ec13"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/gn/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/gn/firefox-85.0b4.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha256 = "b2b5e826540d3f9b52d67e092fa755b26a34ea9acd0cb1c69eb6f0bc332354d0"; + sha256 = "95c3467048e7250dddfcb018ae8b8bcdb9de78b3a01076c4e1aefc937f4bc3b1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/gu-IN/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/gu-IN/firefox-85.0b4.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha256 = "497b8a954ed2c9fa13e207462730dd39d2d0de10a38e3762dac3ef1fbd36282c"; + sha256 = "1bdcef358bd0ac242dd0607545fc65ad98d0785898a6a53394d04c74c8ee0a22"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/he/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/he/firefox-85.0b4.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "8cdac2e9d2cf10171f2744727ddd80e21a4d46e2082947e49f4a255f174db968"; + sha256 = "5f240e3754fb368288cab3f37ab250d6815dd1b792b77180fa5590e4d9c6acca"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/hi-IN/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/hi-IN/firefox-85.0b4.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha256 = "d37c55e60329220de3d792894d7b801adf7dc7ab8ff4ab39bd2e24b59443b973"; + sha256 = "9b0eb6eb03eeeeebc78c652f4e5bf511335ebad3afed9b31eeef8f5c830b0e1b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/hr/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/hr/firefox-85.0b4.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "bebb6709dd3be119be45d9fdb0bac41b81514d78a384a221e2ffbb51b46dbea8"; + sha256 = "53bd72eed8eda15e3dd1a070b221535bda8aee3930a713b121b84b64a2f95a3d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/hsb/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/hsb/firefox-85.0b4.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "c43aea7fdd8a57653d6d9af4aa7c0be6e860f5292366ddd91c5860dfde2ee1bf"; + sha256 = "e233c7ab46d0f3dece1d580c8a615156bb70df6937d47286c3a54b4d15cebac9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/hu/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/hu/firefox-85.0b4.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "71e6b509dd3a6937d9851c262fc7a1bc9e551cbe0515089586fc22098bc51151"; + sha256 = "2ffbc88d33631a5c0ebbc29b8f36c6b7f043b8faf0600398e24d48546d699eac"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/hy-AM/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/hy-AM/firefox-85.0b4.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "c92eaf9f6bfa97651075d2342e45b988ae89c1a4cb55559dad71bfae5912ee83"; + sha256 = "f6cbd70bd95642caf737684c8c429342e8f567061bfb680732382b5c5f93f1a2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/ia/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/ia/firefox-85.0b4.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha256 = "3c71aafb7dddcd3f9bcc8e169281614ac1087400d1d0ba02afb18c68b1914128"; + sha256 = "ae7c96c3120c1727c4d8ed4f9978aafe64740d49111bb6bd507e4a9e14d7dab2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/id/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/id/firefox-85.0b4.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "8075ef0b1d7eb2fc6141262cbb0d3831c3d8508eb43d3e9e142d96946ed2036d"; + sha256 = "680f5f3dc843b7acf86c79fb3238796ce3d28b60da3b76f55a37652d1a11c176"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/is/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/is/firefox-85.0b4.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "5ef96d77bea5c94e7147a5657d76eb5c7f206208a0464245242cca3fc7fb79f0"; + sha256 = "ca40b8a9e99234faa67141732a5ef70e416e9aae08b4e8cbf6fe2ada9f0b7b4e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/it/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/it/firefox-85.0b4.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "eb76a1f3bd1ac065772d4ea4a435c53b5f7b1d5b643c7b62b7ccfee205ea4e81"; + sha256 = "ac8f5d43fc30760e68be4802514bf09fdb4940336d48844fe833d9290a10506c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/ja/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/ja/firefox-85.0b4.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "80b644648b9e40ed592ab9ea2b9d7f1e2abcf8d6b0f925aa57cd6cf28d53dcf0"; + sha256 = "13c66340765699d336926872065ce0edf7e14f43b2f16dc99aa277f5d64f2275"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/ka/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/ka/firefox-85.0b4.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "03c34e7b08a8b6140e612739118c35b05dcdef1257b4857d2fda87a1cf8852ff"; + sha256 = "16ef31cb13dc3c54196ed3dd6209bfdbed14460c38d3fc8cdce4ee7801322ac0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/kab/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/kab/firefox-85.0b4.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "419a4758cf2e2e24968f4da384dbfb03ef8398713c6070ab29ce379772168f18"; + sha256 = "68aa1a647c86f2e9fe63bab675f7d851a08fb22d5ed72b10f2e6710e03e02672"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/kk/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/kk/firefox-85.0b4.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "cfe96420e125dd12c9a9e79e45a8d7ee260d1957abddab5ed887afd1a1e3f499"; + sha256 = "8603847204461f9370447c6c546c4bf985926353597aa7d9ecee9d46a810ba95"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/km/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/km/firefox-85.0b4.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha256 = "4b3599a9b30132b6105e4bbda7de370e54e21d8e498bb3c4c3d9807282fbf246"; + sha256 = "d552b9301ca160577d24267584fa3b8c45a1c6eb82cf540778a617eaebbff6e5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/kn/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/kn/firefox-85.0b4.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha256 = "5da3ddc9d9824e3ba59e1cdc89ee3fb8900c661faec1f539c829d0917be5d4d1"; + sha256 = "b5f4259baa11d5010fdde27dbd583f56b0c9fafaeab9c7f31be87b9645478e6e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/ko/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/ko/firefox-85.0b4.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "2db9a494693091832e578959144d172d5135b82bbf44c041949da8ffec2de9dc"; + sha256 = "e73be57006747f673e979741203537cbbd8f9fb6f4fb77cfc88a7d0c85c7a7de"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/lij/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/lij/firefox-85.0b4.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha256 = "2219d5235f0ed9d2015ead5782976727d2b7103afd987eb445f3f274856e6af6"; + sha256 = "3190c816b7a2973aa7d2a0640fa4e174b02b62a62c28eed7e0df3b377242aec3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/lt/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/lt/firefox-85.0b4.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "a335e0d835bcc7ae9563bb3efe6b926ad71e08f3ccbd164aa2b9f257acd1341d"; + sha256 = "95a68d2d1a98bdda38e86f4c14c28669d2a11792fab561d6a8295c017d1a5068"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/lv/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/lv/firefox-85.0b4.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "1f89f8f2715254ef335af9b01ca1503caecb1c93b1a900ee1643c3f9e00c6821"; + sha256 = "3460fb2356584ad3cd02905b9b3a70a569ef78666a69bff754fbd0b0eba0cd1f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/mk/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/mk/firefox-85.0b4.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha256 = "86eb9f1e8189ce45c03925337a90f1b204dbdc902c1c4a817a924410a26b0048"; + sha256 = "864d8ae602b06c75ebf0d0bb4b8fcc5722840db373bac1a5656a968df7aea6d8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/mr/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/mr/firefox-85.0b4.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha256 = "d5214647403f85c5f7a95871e8d6fb4d4c448af92e6475841fd8474857f21067"; + sha256 = "09e63b52ae1de354e73838dd0a60de360fcffeaeedd8af316174866a43c49293"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/ms/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/ms/firefox-85.0b4.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "23af07562748448a35242a6cd77bce25a5576d2b71177fb682da58adb21671e3"; + sha256 = "c1e47d112d887922d81458bba8a7afa0a706444624738df92cdbe395f4bc9d0f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/my/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/my/firefox-85.0b4.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha256 = "bfec2f3ad0853fb36ec4aac9ad97ba14d30a275eff2582c2e9df600b5940c004"; + sha256 = "d78413226f8b87af0ef5baecad2ab4b9ced69358cca969635b4f71df645ccacc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/nb-NO/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/nb-NO/firefox-85.0b4.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "32be6fe8aa661f6098b4600d824846738664f254ecd4ab0d0a1e705b28a94e74"; + sha256 = "5ecff68265d8ce7c5a59da0366570adafc69b8c05fc323e619a7ce08fdeb7108"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/ne-NP/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/ne-NP/firefox-85.0b4.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha256 = "dfa3e6b9f31fa716a2c80fda07c24717a526ef96033b5b1861fcdad43c99b29e"; + sha256 = "00824ae4fa57e98fba5fb1a46b86853a289e24341b94d2ede9e8e7d358d29e9a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/nl/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/nl/firefox-85.0b4.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "e253d963b66855c44f41c43baba1b5c952b37dd1b83aac8243c60581ca674a49"; + sha256 = "a0b3a25bdc123bf9ea441456b7d1b3c6fe78ef1589b69742dc38f50d3d92d700"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/nn-NO/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/nn-NO/firefox-85.0b4.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "5d9b90cdee03a544a78f44d4f0566b5b59ae802af4fa60367a1a4836c01197f1"; + sha256 = "00f599f8850af9df078c5d296bfd50a7bdb012f7978e83828000371fbdd93509"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/oc/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/oc/firefox-85.0b4.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha256 = "b37f9a283d9dd2ff9e8998d83e0c147bfbb75e4b64b3936cb344243e1277c370"; + sha256 = "d03638662bd89dfaa1af08312b5361da04d5cb9c93f6eea9b2442bdde25d1eb3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/pa-IN/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/pa-IN/firefox-85.0b4.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "68f6bae2e6f064e22503145b5fd57d027899f23fcf109010a98397dd8c0d7cf6"; + sha256 = "2b7d9ed3aca15e5bb22f3fcc5fa0e6289729e5a88d8a43602a9adf38c4e0a8a1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/pl/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/pl/firefox-85.0b4.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "789d6925c3b17f96bb92eef54c05fc8787f32ce2c9846931e185dc5a1de9f303"; + sha256 = "afe081f1f64aee140eecf24b413f44fa04d999f3bb97a2862a8469732489e94c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/pt-BR/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/pt-BR/firefox-85.0b4.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "329eecf74dc8d9d1d8f4578389553d92a368c972fcb2468e0b936f21508bd1bc"; + sha256 = "9e643c670efe00e9144529aa65c8f10ea2c8f7d5374a2d93c439a56cabad7d2f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/pt-PT/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/pt-PT/firefox-85.0b4.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "b30ba75dbd5f5ff3ff709722acdf36acf4de9993d230eb27996e81406779dd0a"; + sha256 = "98cf63382a586b649b30685bee8591085edf46d747860fae751a5dc4ed183979"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/rm/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/rm/firefox-85.0b4.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "ad90ce4fbcd094bebf77b36a63e38326c613bffb580743c9a4c19df845907dfb"; + sha256 = "e000820f06aef69922eb0305e4d70cdd1820f86a1bbb60cd0888cc5b5d6ce0b7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/ro/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/ro/firefox-85.0b4.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "8f7864bc6577724f20829ad79901d92775200860dd8c43bb2443c7bf22d7a435"; + sha256 = "daf8f2419a8122ac4da0dd585bc466d404f9a1cceb82aea8732aa4ec112219b2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/ru/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/ru/firefox-85.0b4.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "8b52d5eaee53805422bb2fd6dd8b2e0c7a5b01feccbc6fb6c77e4fb8678d30a9"; + sha256 = "c081fddcc21b73b421516d529d7abb6d463c804f1875b4b755d34c0be34cfb05"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/si/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/si/firefox-85.0b4.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha256 = "a71df756e97f58271715f3d79a86c0407487dd5820500127cbd9373361bd016f"; + sha256 = "607f0debcaeba1a5a6bc270e4a45793b56d4fb15580da6e264659fc3d4ed6577"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/sk/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/sk/firefox-85.0b4.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "71eefff1538a2978d9e4e65fdd5a2322ad81ddfee33464c0d70b95eda1649fda"; + sha256 = "d3a06cb060f6ec2131705a75187dd5ca62fae91a22258c59f93c308151ff7b00"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/sl/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/sl/firefox-85.0b4.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "91b2938be8230b6301fe3d15c6d9ba3f031c1e5fca886da228f47a2e0a2cd144"; + sha256 = "eb9c21cb4c577500464c8fde4091207a93ab96cd4a6119feac815242e846e65d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/son/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/son/firefox-85.0b4.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha256 = "57e456cd14418c41c2e5f8eb0ec6b0807459f41e15207f6997c7742fd3dc8a1a"; + sha256 = "ce5449dfb0201d3a2c4891519284903af46177739feeea4353720d108107ccc6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/sq/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/sq/firefox-85.0b4.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "0f343e2442523f0e422309cc36518484a242db4116f0e6b7dcfe251cdfea76cf"; + sha256 = "65ab1b97653e2cb416d60f65d6fd7696cf7b5f63bb3b80d13fd199829247ca58"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/sr/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/sr/firefox-85.0b4.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "cf8fb723611506fff356cabd91a0ca3fdd9cc5d806167df6dd385438d467eeff"; + sha256 = "16c5e71c6dc86688d3cddc0330fcc98a7e948773833c3f1d856b194541fecc3a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/sv-SE/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/sv-SE/firefox-85.0b4.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "258020bbc7a75139fee340e50d41676d234be19c931f0228485f06fcab2eef81"; + sha256 = "7bcae95e5c57d1b380458ab30e2dec9a7bd2c1bc6c2712fa44a9245639ac083e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/ta/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/ta/firefox-85.0b4.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha256 = "7783166c0f9ceed0f7d037c1e92b988818a70522945af2c96db958966eed8b66"; + sha256 = "6f35fc2329ea0a96049c9cadaf925ed064e0f4b60bf12082029898396ab34dc6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/te/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/te/firefox-85.0b4.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha256 = "02662946b3506da6432c48eb1c7e0f522ffaed2abcfcc474332a799ef3be2b92"; + sha256 = "9f4c691b6943f715e6d6a1db9a36cc745614ac99a33767080157f852d8cae594"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/th/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/th/firefox-85.0b4.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "1592b372b8e767e5b7369f356fb733a2daf51b4f45c8c4c94041845d63b3c604"; + sha256 = "c15b8db3bbf1bd9362bb5f024daf0aee7ef3df8cd7864dbeec6a824449722063"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/tl/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/tl/firefox-85.0b4.tar.bz2"; locale = "tl"; arch = "linux-x86_64"; - sha256 = "2b831feaae729c674e8a9ee207dea007df100bbbd8cf7553791aee3eede37224"; + sha256 = "98837a0ce69e67b9bcc518c9953763331757870c5cf1ecaadb1cb37cb30338b4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/tr/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/tr/firefox-85.0b4.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "aedf8b7684f204109e42a3797ba00bd7a8c5bd3f827c31ea3fd4eea1679d8af5"; + sha256 = "cec9efb3c0ffd4f7438964efd34d78b377f117fb0f9d051e103663a676d6a6cb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/trs/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/trs/firefox-85.0b4.tar.bz2"; locale = "trs"; arch = "linux-x86_64"; - sha256 = "232cae54f6120a47455fdd7e0d88dde1f64d5a1931bcd7d54f6bf8bd376583e8"; + sha256 = "151687f7ed062ad3d0b46b113a26931c41dd375d324aa7055952492fd497c445"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/uk/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/uk/firefox-85.0b4.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "e00de7cbe1f00aa082f9a448857cc19f011bb1d5b579e79457bb0dfc72b7a12d"; + sha256 = "c0335c927cb343b3a48739949c3d8d1a813eb5caad4a989dd9a3fec16e4c5688"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/ur/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/ur/firefox-85.0b4.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha256 = "7ece4d8af476eef174c0c175b65841da8d826702fb255587c2e1d259bb9ef3ba"; + sha256 = "5b4a20c279161d910dd6730f1691d4a4bb8319a3e365bfbcc553a47e96d9db30"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/uz/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/uz/firefox-85.0b4.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "09c7e7d641f703404aa7927860f2924e6be376b2e39b1f0fe012dc87469edb62"; + sha256 = "8fd7881da8c03c3b9313509047ee453d175c271fd086e27710bd0aba3fd319d3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/vi/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/vi/firefox-85.0b4.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "18121867e6b8c2a52c5324f653f82afbae97481b5ac3df811e881ec39bbb3b0e"; + sha256 = "7dcdea1143af2cfaf9974640d520fec1e44cc156d085432f52318b745dd21f6c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/xh/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/xh/firefox-85.0b4.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha256 = "04f5bb96ef9002eeb0869236f70168e7cbd7842b8e12b66dd6d5d67db9acd28a"; + sha256 = "f502767929505209d05830b7d0075fcf8186349afe07e793afee560eed9aafc3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/zh-CN/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/zh-CN/firefox-85.0b4.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "142286cf9136bcb9b6af7ea1df3cf77821c0793ab7b9fe533a2963c453f45a7d"; + sha256 = "9d8c003da5dc117cda204487ffd0dd95d9677d7e30e5f868e3a39d3146569da1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-x86_64/zh-TW/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-x86_64/zh-TW/firefox-85.0b4.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "fef32e5817140bbcb6d1b614a72a29523235606192078eb04420ff7a2453cb9a"; + sha256 = "ebdf6822810a97381e63c6c2bb08baea4c239c35b4c75e714da367f982080863"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/ach/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/ach/firefox-85.0b4.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha256 = "40e9b7a738e06cec731c69b659b14ca48b119ae20016e0214e1160edf03919b0"; + sha256 = "e63b45c8a34d286097825d2830b3697a2205fc8f62e7f7b19fa5569294d4fd3c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/af/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/af/firefox-85.0b4.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "9bb05361a51f836b2de5614127f8df768e504f4d5bc136e3f169741098f0bcbd"; + sha256 = "93f0fa71381f937d07764ed4bbdb1ea167664fdb1ed40d063b4fb079ed485dea"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/an/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/an/firefox-85.0b4.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha256 = "ee62418444c76b709204962ed47af8ef3d61b80e628600201b5a12293651c70d"; + sha256 = "1ce6d8e8ba3409b7b5886f87633609a8568ceabdef45beef623ebf74e4bdbd76"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/ar/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/ar/firefox-85.0b4.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "10b5d4f1616e078bf83ab5ff942dabe89a8eaca63f24e96b53726dfb2bc9e36b"; + sha256 = "990905d68a82f3eee04a9a8df4b291eb425469e6bf045a3a126bee08af2b785d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/ast/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/ast/firefox-85.0b4.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "a4e5ccae125edaa0696b696a5342320707f0c39c8985437b6aed60faede71de0"; + sha256 = "606c37c4eda9d1f55e8a8fde0f8df822186995cef190e1644bcbe465cc1a0f54"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/az/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/az/firefox-85.0b4.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha256 = "c13d9ed183c7b9256801708014f38405749cdfcead9f243e80eef78d06a9b78e"; + sha256 = "0d2cd416e309ae19af4f3704823de50b560863dc1f1939e75663e9976cbb5c8f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/be/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/be/firefox-85.0b4.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "57d8eafc3d45784dbad71eb49d5a4c0483d939719b43b0f16e4db1d5a96ff4a8"; + sha256 = "fcf922756a6830d9bf76bed71579f4b6e2e47edafbb843ee2a490552cfc88f86"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/bg/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/bg/firefox-85.0b4.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "0a65ad71cc9d97277535f07a8dbc7ca248508c24dea8520f92fecbb806f87a31"; + sha256 = "9d40f252156d646363e65aca32ae4ebbeffe147dccb3d4989e79a57a4dca57fe"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/bn/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/bn/firefox-85.0b4.tar.bz2"; locale = "bn"; arch = "linux-i686"; - sha256 = "3cead08f4d746def6cfb909107f4739400498c970f10fbd542259c04b84b5852"; + sha256 = "9471636ffff7f11db45001af18d86ae0d930517e09cd2aebb0a850a946b44917"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/br/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/br/firefox-85.0b4.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "40c6e963e8e52ef51cd4d4e63d501f2a6cecec1800541941458b896ad90e5b93"; + sha256 = "4482fe50747f7fbf4db5ffb0b3c16bc0245fc0397f582e73c609a8cbbd48c1f8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/bs/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/bs/firefox-85.0b4.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha256 = "1e9df53642c442ead4318b0cc886653fdfcecf5275d6e7218acb390bb13e0021"; + sha256 = "5357a4fb56a4aeeb43d98f5ace310000532da9088ca0cd06c818d3852fb38452"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/ca-valencia/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/ca-valencia/firefox-85.0b4.tar.bz2"; locale = "ca-valencia"; arch = "linux-i686"; - sha256 = "3b5699dad93291921979fc6da21d16f94ef471e9a8ef3d877001400ba4abe316"; + sha256 = "1a22b215fa50f947afd5657ec702419ec708133f89f372d7667d12fe0e3b85eb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/ca/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/ca/firefox-85.0b4.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "c52b9cc25dc72eeb6ef3e7c3add4066c005399afdba2cd0964e695a891a1d314"; + sha256 = "fd335110bb31eed1e1854d24c74c51b8ded826008e49d8ed6b1f7be85ef05753"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/cak/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/cak/firefox-85.0b4.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "355df19615fddd85c51b033a413a3de524f19fb2d97a2ba77f3b8001b231338f"; + sha256 = "b852765dd3dc4530c1d1d00232c6a615472d721d1f69cf303ddfd6d6b26d2745"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/cs/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/cs/firefox-85.0b4.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "e10f35795f19ea10c4de34687eacad6f9bd863002e9d66b87cbace01b97c8628"; + sha256 = "747f697ca9aca2b1982a95a3d05f4549d3f1b276cdac39e17670c0b101f8b704"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/cy/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/cy/firefox-85.0b4.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "f2fd90b19e8c4ac98bd6ee262084ef7842e52a304abe10cfcda2fc14ccb5ce30"; + sha256 = "4bf87e33539d8bc383715b89a5fa5e1f5d1e272a7899689585f9fdb711a5e259"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/da/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/da/firefox-85.0b4.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "01e468f3a445276aea85425b4b8a58e44a2e4cf8552a02aa3d4d31775bff9575"; + sha256 = "bf9961aef493ceb1613c91d79ef1c7b718dc5e39fa3ad8dbfb012d51c16b1e5f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/de/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/de/firefox-85.0b4.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "9dd3d806a4ff60c9cfd5b81cdf212f72c281f75ce554555cfd443f0696f700d5"; + sha256 = "e4e85f2d49dfd9b4bf62e4ee2e77d03660f0b6ae9ce7ee827a17f2f067768b59"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/dsb/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/dsb/firefox-85.0b4.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "eb26cbad496bc1c4f97e6027a1f2cd9166d479a503a3f0ac566a766c86bdf8b5"; + sha256 = "71a3307575c45643d8121b64a345c19a6dbfa0924fa7d91b5913d52ce7a5d663"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/el/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/el/firefox-85.0b4.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "e173622f06f64156d749d0f56d98be72f067077c3e41090aa16a3b0c6d7a5e43"; + sha256 = "75bdc62ba592d48f172af3b072158e14ce0f433c7ee3b44f9bb0f4e0f9c71834"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/en-CA/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/en-CA/firefox-85.0b4.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "c1c6aa503e1565cb0c0239d562f11322265a7bce4005211b8007579f8f56c318"; + sha256 = "c7e2bb86941274de33368c78122cb14bc52c4177de2b9cc757d269d9d7cff40d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/en-GB/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/en-GB/firefox-85.0b4.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "57b2670f515e2a17c10df602d93a6960e5c4710462098d89568efd446e4480e5"; + sha256 = "46c5821f9e973a599c74445ab4a44ca31b3f76e18597f4e0d77479c1cd0d3841"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/en-US/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/en-US/firefox-85.0b4.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "81cf4a4fe610de3342bdea340d450ff67c594e7e4924a08b6b69de75510da698"; + sha256 = "4cd2facaa0b33b02228405e74689770516e6af6f07de8dac096bc66ca9a238bc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/eo/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/eo/firefox-85.0b4.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha256 = "dd61c4bacfe39f7887c6d21d139df6a2df17f263c4be5689f5f9dd6bb4ee6e63"; + sha256 = "6966ac14fa72fb627955e9281c6e54f23eb03b83647cd52934304d672adb6d5e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/es-AR/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/es-AR/firefox-85.0b4.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "3ae8695c57befa3552033bcb867b48f9ba491a08e31168ba22901fcb3276a3af"; + sha256 = "ff32191b95dfba73d85caab8aca47e32b2579f92c9fedce14f6e16a6e42c2178"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/es-CL/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/es-CL/firefox-85.0b4.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha256 = "5ae14208cdbf0dd50edecb8a56bfe7dba0e7520f2ef135abb092761acc8630ae"; + sha256 = "a7c7a9f646492e8de8474f1869075c568774ccc0118c340721b70c06e5471a5a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/es-ES/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/es-ES/firefox-85.0b4.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "d786cf3b623a05e5156b020a436897525e80117ab7fa9f25ca42fca9fb4c0eba"; + sha256 = "71e78fc680de3dbd91b77bb13b113ee5f34463aaa4791a3b0a445a292e5d0732"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/es-MX/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/es-MX/firefox-85.0b4.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha256 = "c2ec749bb5befffd81189503d87a57bda462897bba858904924ae999923a4e42"; + sha256 = "9c357beab45fad0e56f957fa73b8900a916c6cbcc8b18bd5389c0a977ddcd18e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/et/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/et/firefox-85.0b4.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "7a2e1078ff1a3bb975baa5488f89e8161e20354d7f55b98c964efa5bfce6f696"; + sha256 = "a3de258fcfc4d633529566d2d8f7bb582683d6dc22cb3c9ad13a4914b84b6100"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/eu/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/eu/firefox-85.0b4.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "c635006a367f68bfabad7a3874f3333ac3f486f0001ca9641ac8ce12dd9bd01e"; + sha256 = "092cb149621ff664ff4462c39266ea352971b30f5dfb0db163b62cd3af4e0fcb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/fa/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/fa/firefox-85.0b4.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha256 = "f897a5d316c436fc20d8c2737902e29dfd0ece3c9ffdb90fda2fa454ad398257"; + sha256 = "083d17daa3f86af4651cf433180750bcea6d00758ada3ade80bf2f713b3c04f7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/ff/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/ff/firefox-85.0b4.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha256 = "3a31d43cb5242a0aec516d8fe99dc916144e8b7250b81c7de0b1361b19f067fa"; + sha256 = "7de0cfa6bbdd1061cad1a72d80f5f504dd163a066c9911e1c44428f02b1942d7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/fi/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/fi/firefox-85.0b4.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "50261499bd4725f08684c9042056c9da2029f55b0dee4a856a9de661412c06e8"; + sha256 = "d718ce1837fcf64bf2b324724603559124697e58ddce8324c79e582c7f644205"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/fr/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/fr/firefox-85.0b4.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "7b793590a975a64b6fcfcccb4e6c07cd5346ec457af1ae31b5fb1032d4217c64"; + sha256 = "74e2ab8182100b7e69c62698bcf5b03cb127f4e90dcbeb35bba7d66b58a711e1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/fy-NL/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/fy-NL/firefox-85.0b4.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "468c7463503a34de44a74ff6a751e8614abbe6bd23f39f50308f23000614331e"; + sha256 = "135317f51eb93e2bbc18401c8e5fd2c070b3688fc6a9bb54e9e78bb7f37c676c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/ga-IE/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/ga-IE/firefox-85.0b4.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "92b49316d122c8c91995766e28387d5587955e022f844c7a85fe491ca602e222"; + sha256 = "77fc52e186c1f823067a7fdb549232a080753c813afdece12f49444bffa6507b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/gd/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/gd/firefox-85.0b4.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "4bd2901b705f99bd1889b21f4af9ba7dd022f608960807f96f115a110c96a80a"; + sha256 = "abcaca790054b035687a78e9ae8151459af4b7f2d9d561d6ae41c87a0308c694"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/gl/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/gl/firefox-85.0b4.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "391d62de840d53d531130fef0018c71add0ef7134fbc758eb869da7c1cc3b5f3"; + sha256 = "291adca54f86591fdb67c6a958eb7784b5d5d4996858ae8936a5615c89e2fb4a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/gn/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/gn/firefox-85.0b4.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha256 = "d51f75a7718e78bfb1e9d0974db0a404294e577e186794d3480778c7facce418"; + sha256 = "0c8dc262e96c0a912cc8aae7e1ec76da36091cea47ed535eddb8039564ed24d8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/gu-IN/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/gu-IN/firefox-85.0b4.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha256 = "7cbbf4846153f79fc72e217872fd64b92ed8968aaf618eeededa375ac268a12e"; + sha256 = "2fb8fe3c39353ae9b03018ab17a3531ae20e1a6794871a7ff02108484f641801"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/he/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/he/firefox-85.0b4.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "44c0bfad535a4e3c225d948d87935e08e5d77ea22638e971cc833877462edc32"; + sha256 = "3222cc40ba99d0833a3a8c5bd2e9e8c74ffe0e2209891899e9d37b6a35bd8e41"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/hi-IN/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/hi-IN/firefox-85.0b4.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha256 = "fc64673429972967238b5bb101beb2117cfdb0360e405d4d3b53f013791c0b8c"; + sha256 = "bb633eeadb00cf6913190221e5720c68da8d7a7d5e51b5f1d32621ab35fdf7ad"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/hr/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/hr/firefox-85.0b4.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "f256eb4e655a14b1a084af7f72ef4673d33b42d1c23ffc1ff3b4ede42d966246"; + sha256 = "21a8dd0e511ff658e09a5497925fba833c32d1bf6537f11e53eafb07d6bd8854"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/hsb/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/hsb/firefox-85.0b4.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "9e1e478e501875ac259e22287aece77f1bbc1f898355ab1c29fa26543b38acbb"; + sha256 = "c862804fc9602884bc8074631d51e091866177682a6767e5b4935a3315b2ea82"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/hu/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/hu/firefox-85.0b4.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "e8605e1b9d2c92c2eafa35cbe647bdda6af22eb030d8656262473b0b17650de9"; + sha256 = "bf92592b0f3697e828c9b07d24c5394ef6cd980c94248ceaaeb0181a1d0ddb24"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/hy-AM/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/hy-AM/firefox-85.0b4.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "be21fea69e27ce54498b6b003c1db20b42d7d52702ac56d1a1fc2c6fc24558f1"; + sha256 = "fe5686fbc9c1a173c4ce11695675a4aab2efb7d340bccef797d8a20eedadfbc4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/ia/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/ia/firefox-85.0b4.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha256 = "039f50fc10d95bdef4468174a8486f45bbf9313e1b9b6cecb0d094bb3766ca9c"; + sha256 = "791423722d872ecf6c45e0f16b74626e19764c003cc5f2ac2fbe3e1bacea9422"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/id/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/id/firefox-85.0b4.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "ecd6f3e031529e1fed8fb7ae77bf6e0497c9ad0e4996e31a86c4b79489ba9811"; + sha256 = "df4b06f6d4946d2dcd55130df46b7cf5e391ba433eef792854ef8338dbcd891c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/is/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/is/firefox-85.0b4.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "1f6fbf55f1384141826a4b6a39ec617cc798b0c0a0e1ee02d6cd65a79d6784a9"; + sha256 = "d60f08191a68e5f4cfaf5848c6d0a755c9033e853e6da08eab6b74362c220ab1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/it/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/it/firefox-85.0b4.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "73eebb1d351b5d746d3447c7a68d7a906c4db6df8cd257c6a048ea16cf908e64"; + sha256 = "a1d38ce8785cc3f15d777e226aba48fa1448da021092d9aac340cd02ccfb5669"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/ja/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/ja/firefox-85.0b4.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "ff1c630c6c41cd31c8ecab5fc48e8879dbc4aa295492368cae93061de6558b64"; + sha256 = "02626394737a87d0dc80365b7ff7829bb1d1191a65a063d4d079735199ce2731"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/ka/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/ka/firefox-85.0b4.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "b6976def40cfd05543b70597347ea7c632c591660a2dd08332f81411a6ce6723"; + sha256 = "4581ada66c25d45db22d4cd41356e30b0b9fa88132758e219e15ed70dc4055a2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/kab/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/kab/firefox-85.0b4.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "403bd985ff7ab44324d12c8c7f1386eec9fbae97ac9a0597d12d09d387686db4"; + sha256 = "24b4d9cb927322b3805e930a54020fa84e3925d824363ef824501ff2769cb015"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/kk/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/kk/firefox-85.0b4.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "3860b0e8d53655669afcb4bece7637e9a1c0daa66d453e9548b2336eb45d94ad"; + sha256 = "868d5959ba761e578b5a2d00a29c244cfec0108a294fd52b18682cf31173b9c4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/km/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/km/firefox-85.0b4.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha256 = "5753474371c7b8663d45f7f9591958afb9e9e2777df3e89840f6f34894ddf491"; + sha256 = "e5f63ff912c920d92d7608e2746d429737f0868bc5fe33d3c460ee1f745e242b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/kn/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/kn/firefox-85.0b4.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha256 = "d0dbeceacf93c3a581cc581e09507e401636350b763c8c9f5342b33a0640bd8e"; + sha256 = "65d45e29f289cdefecb369862fee62be698abad2b8452687507a52149b4d1de1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/ko/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/ko/firefox-85.0b4.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "095930063eae8e3d6a78a6d9adb3d28cff0bb0c9ccdec977c8c80765a4c60560"; + sha256 = "83a516bbf83574f20339382778378a889016e5947c882fab63aadb728023465d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/lij/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/lij/firefox-85.0b4.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha256 = "587bced8e4480eba25e8597ab6b838a4f18553dd44b4f0ff48f245406f78e896"; + sha256 = "690522d1a0d67c5538d567accde52effeba8b16cb4c36920aef230a62e1f655d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/lt/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/lt/firefox-85.0b4.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "e214c23914e05152973428f5ed1df20054df054848d99ff23e5eb09e19b4557c"; + sha256 = "f586dd3c96aa61d9aa19ad734f4a61c9e1f6a530795ad486a2a1ff4cb18f0854"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/lv/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/lv/firefox-85.0b4.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha256 = "67657d4abb394ef76d37c321625d99dcf228ee00cc109e6d1c80cb3659db9879"; + sha256 = "002bdcaf29f65d2c81b607e36c280f73a08cefa32f9e878ca2c834b80eb69435"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/mk/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/mk/firefox-85.0b4.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha256 = "bac0e98b7a68dda441195cbebcdbea583f104188112449b14723c1086c3c4f19"; + sha256 = "06179e95fce7f93f410983664077e4213f31272ea626a8b3fefe1e78dd0b7fa3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/mr/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/mr/firefox-85.0b4.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha256 = "125a63c875f4be6e246fa01289386295172d999e0e523c1171578adea24b022e"; + sha256 = "532c17600a7ccc995424759043f0dcf0df5a10870bd7daa92c39f3a2a0b11c68"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/ms/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/ms/firefox-85.0b4.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "6dc44f34449c915e93bf9c012ce7286b16d6418ca8f576d8a008b7ceb90bcb13"; + sha256 = "b315e64474d410e4c6c403b1083b98fe5bba5f20fa4fcb115671c58075e1ad65"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/my/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/my/firefox-85.0b4.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha256 = "af5e2f1f9dcca84f41d3701035a00fc6b581aee2bf00f9f926928b99ab42d06e"; + sha256 = "848b472edef05971e5d6b003a1d3241c0d34a3f0b2a54ff97ed3a7f2ac96bdde"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/nb-NO/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/nb-NO/firefox-85.0b4.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "d168631cc1518e17cc9cd85f481f1047f6ae7df593d9197de5710fca0d87965b"; + sha256 = "ca2e64f608b908b752413d9da7c8ec2cf23ab2f49df6362ce381b0d31e9caf56"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/ne-NP/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/ne-NP/firefox-85.0b4.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha256 = "4b6065882ddd9e02441eff830808b31e6104d076cefed8386cff4ec7cb12330a"; + sha256 = "3386312e032b56457483fb46d935773adf12f3a3938ac4c6eb5b0c12242d93ce"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/nl/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/nl/firefox-85.0b4.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "96298283a2dbd9e3242c27551ee29829b21c8b9a32ca33b85da3142c47084dd5"; + sha256 = "7bbf63a4acf403611daf55e6663d796a46201349d29531245261aa5a8457e4c7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/nn-NO/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/nn-NO/firefox-85.0b4.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "19475301d3d93a633a1555b4436d63546a71160a992daa760a8c76a808791b89"; + sha256 = "f126bb842ae56504ff25f9ee0765cccf7b9a4bce1d45d382f6c13d23792bbf47"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/oc/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/oc/firefox-85.0b4.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha256 = "48af4af195173b541d76bb623acc357c3a2a8d03227406a21de89ab2d6c8c757"; + sha256 = "3f4045cfe03eb4fcd16215b5693913577f6c5fc68ba74528c6575a5573528241"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/pa-IN/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/pa-IN/firefox-85.0b4.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "582ec12fbe2f8b07f8f4ae11ddf05c62db2d84508ee63ad6bfead9493a1424cc"; + sha256 = "cd4e81e714f78303603c390b490144e27f5f83ad436e610842aa04c242c8a549"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/pl/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/pl/firefox-85.0b4.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "df8fcb5fe32325d45fbc1c9349065cd2d7f283e6a33d944282f3ed948c1174ee"; + sha256 = "9147013773bab5f5da15e021becda90d63daf7f7068d7947f9d7eae3bdb0e124"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/pt-BR/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/pt-BR/firefox-85.0b4.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "fa48bc301c9b7dac4802b50980c573039648eb41bf0c0fb3ef75d0ba1dce9b67"; + sha256 = "20efb971aaaebe780b337d1525eac527dde028eadecd5247321a5db5f0217143"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/pt-PT/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/pt-PT/firefox-85.0b4.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "b0075346738d9a5f61fe4c3265c3a50f639f017551d3bdb2479e622d9561bd33"; + sha256 = "765cbe09264ffc15115da555500ae376bc1a91458c872ad7e4876701aab6f10b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/rm/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/rm/firefox-85.0b4.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "c9ad20ff328c8c0693cab58fbfb1d6c1f85bb63fdd20eb8d371e82d4df5c2e50"; + sha256 = "93f5d6ed649d275ad4ee1f9a7075e8b4270abe6275b57eca0759b2a8efb08cff"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/ro/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/ro/firefox-85.0b4.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "7816302b6f70c0e24b848d3d396876ee0d870d90561c37e440bb8b7722f54ff2"; + sha256 = "aa44ba543a08a56f46e220f41695da4aa0fc97c9569563ff0555f308117cc983"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/ru/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/ru/firefox-85.0b4.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "8f4969a16f4e70b59dd2da78b73532ff39589c984512d16fcd7106d2cf503342"; + sha256 = "6a17313ad121e9821a766115259a8f29ace0ae683d18a86c844073e671a4b0cc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/si/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/si/firefox-85.0b4.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha256 = "0dfc4c1c797366ac9e65489b07de756a1b03b5498c9e4a6a10ac0d3a60345471"; + sha256 = "2766789c614ca35f6ec7177464c5cd2f5df5ec1ccde71e1835efd6f3635e0de5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/sk/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/sk/firefox-85.0b4.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "5e16b451058d64ea0cb61fa92e17fd72e591009803170b0b220237cac7180167"; + sha256 = "7de262a9caaf141c37d819f89eb3b1ee7ab932b10e345e7f9a50db7f1e8cdfa9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/sl/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/sl/firefox-85.0b4.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "36216a3b474d3fd1d27886495f92eca83d24a465690efe7356ca9e7e4c08163d"; + sha256 = "e31fdd4a192daefe7a3946976c7682e15ebb61b598c5dcf8bb7a870efd3a9e27"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/son/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/son/firefox-85.0b4.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha256 = "1116bbb70b7ff8538d3ce4e7df190bd152c98889d1612fa8485cb0197a83868c"; + sha256 = "532dd0db390b3d8da03cb5f01e26dbc0752365e782e0b2d11925c14f5dfd8f0d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/sq/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/sq/firefox-85.0b4.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "006948f771f4964f5f4f078615cbb85aee23051e371ff7b871caee7c4659fe64"; + sha256 = "35c59d0543506c625fd6ab0c181566c5f370aee2504970fd37b50d0d34ed0e8e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/sr/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/sr/firefox-85.0b4.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "20b0b9d605603e525d046424d290e6b2a0c963c0eae2a9a6c6ccdb72a9803e9e"; + sha256 = "a6f9d8fdcfcb4b4a89e14b84e6a88bfdb0d6b578ee8e4129dc1f82bd933ecdcd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/sv-SE/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/sv-SE/firefox-85.0b4.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "a132b97019c75aa8929830f873974e1ab36b69ca7e3c9ab44dd2a5b11bbe4f7f"; + sha256 = "664b8b51429c0267a745a69906f32757a28a4ae8b23bc2f591d3b190a3091379"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/ta/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/ta/firefox-85.0b4.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha256 = "3f24d965ee5c89edd447e8a52a0241a5d1cedb0aae6ed1ad1c212ba4dbed210a"; + sha256 = "05679379a0abe41cf46ab182018810ca42cf8b81686f48c3c644928db85d4c76"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/te/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/te/firefox-85.0b4.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha256 = "2b65c7bb7df93b2bdffa687bd4309352f0d73ecdd66767db0db860f33f17c6a6"; + sha256 = "1c884e460b6e5a0e0c27e087b3f81a3c4245f6a5ba5ea2784b2b0b61114462dd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/th/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/th/firefox-85.0b4.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "21e2dca4e194a38de97b9b717150441bdd32466ee43e721f41afde004bc8e3e2"; + sha256 = "9ea2b02fba273e970bd2140e713468b300fda7cf50451f5f4f840220b782e1d7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/tl/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/tl/firefox-85.0b4.tar.bz2"; locale = "tl"; arch = "linux-i686"; - sha256 = "9f4dc351f5244b0837a95d4afbfa0af373fe056e5eb106a2b177a57ba4c85ee7"; + sha256 = "ea9334cdbae5921720974575477da6310fb75c02eb068cb13d700b71df1596f9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/tr/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/tr/firefox-85.0b4.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "50cabe6fea43e2212d0b0a9a5a382e085fdabc3ff6b6b0694b8f9d3d327c3ffc"; + sha256 = "c2314d1159313ae8d330244150cfafb5345d7515c5062c62ae31d916f69bf4ea"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/trs/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/trs/firefox-85.0b4.tar.bz2"; locale = "trs"; arch = "linux-i686"; - sha256 = "c4db90a9a0677430fa591cc387bf1255f260208a4907cb760649cd7a6db03808"; + sha256 = "769acc367c1dacee2617e784a98d4c546857123690f902783ed9f97c10062f8c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/uk/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/uk/firefox-85.0b4.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "7c92d619dd827a9f7ef9297f784cff582aba44684dca91c3b9873337b4318fb3"; + sha256 = "d9c179bc63a3c9d8ec4722afb4cf4a3cd4175d01542477fc132147521d7be0b4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/ur/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/ur/firefox-85.0b4.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha256 = "ef46130577072c6fe6b14aa0710c75344dea46124093f483db47cbc8c9cb4ec6"; + sha256 = "ed365cdf1f3ca389b308a2b9ee405917da0dd0cd1536c9c7a4e13949b118a2ca"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/uz/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/uz/firefox-85.0b4.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "34c28440a7772a7fcf7f920be760f92057d813648372fe7cb8ae9f2c3fb3a846"; + sha256 = "b6437d5c406edfbe0c3a114d230a5b9beaefec04e48c92d01a7cf900f6dabd56"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/vi/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/vi/firefox-85.0b4.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "c02c1737b56e1ae4f20ffa9abd392fb69f19d68348341977d0f39bfefab465b6"; + sha256 = "1d6f91d852f0b20e357e1accc6c43ad93bcfe2e5a92f04a89c1d4bace70285cc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/xh/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/xh/firefox-85.0b4.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha256 = "6be6defb443480c536639d99d124d8c636d70f049f126a793d627c131035c9c2"; + sha256 = "597a04402d0d34f10c6e3fbd0f629eb45c6b3b8eba2c63917074bb34c47e8cf1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/zh-CN/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/zh-CN/firefox-85.0b4.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "454af78f3ea4aa00676c4b97dff278dd404116e1da7993b5a2593167d11db885"; + sha256 = "e4df77f3447615bbbcb21904f15d2d18936ef7216c047a62c6901be00343df6d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/84.0b4/linux-i686/zh-TW/firefox-84.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/85.0b4/linux-i686/zh-TW/firefox-85.0b4.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "7e6b1b0ad56916759b01df06b23bb6a23b0c59815538cb1edb3e95edf7b772d7"; + sha256 = "f0d9f95b465bf5a60bb0ec5906354acb705e78ab7dcfdcf0c09a3f26e4fc7bfc"; } ]; } diff --git a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix index 431ed105f0dc9..1620bc6063d70 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 = "83.0"; + version = "84.0.1"; sources = [ - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/ach/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/ach/firefox-84.0.1.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha256 = "cea6ad61bd402e6c84a81a3f504f1b9292079c9d48d2353b51db4f03a8837fb6"; + sha256 = "576e937824252ead56b4b4472aaaf8e3553107c547bbff74457a0a1d33b721fa"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/af/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/af/firefox-84.0.1.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "d4bd0a9579f38d53f559412cc3cc04f11871ba22c81eee54dd9ab16c56303513"; + sha256 = "ef9509ce8cc5f766aa3072c78750babf1bc26b4211f0f5ac7a4c88a29cdac875"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/an/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/an/firefox-84.0.1.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha256 = "10741a6921210643250013c45e9e21bc295da8e41f2bb5c5fadcd86c0e828c80"; + sha256 = "7bdc125a9ed334f2b3989d40bcbbb526ef583823be5bbba590bdd7fb9562d32e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/ar/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/ar/firefox-84.0.1.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "3fd4aeef281e5aafdda572d4814e70295c018b7fae6d214c40dabcac367ace69"; + sha256 = "710d77fc45c4164c96194209d2dd615ce4cbe3583440f8f8eaef8697ec53a078"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/ast/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/ast/firefox-84.0.1.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "237e8ff5b3fbc9d7c4095951ca014a5c26cc076305aee705ca943d81e72541dd"; + sha256 = "910c6c17015632c3f996b4e7732fcc895eb9f966037f53934cb1810856c3e292"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/az/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/az/firefox-84.0.1.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha256 = "79ca0c798243841cc34281f917aad06c2f546a5e11b443a96e5030aefb8de9b3"; + sha256 = "3c636e6b006c7ffdc01bafcb048fd15de7b414e63968e278a37be8faffa89fe1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/be/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/be/firefox-84.0.1.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "c15b0f929b3e3c6ad5618ccf6f9f6b143f893b6f77e176b52ecc608ca3157ab8"; + sha256 = "aa691e814c2452bef9cb7f75098ab94cdbe742b3d25c456178badd68169b3b2b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/bg/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/bg/firefox-84.0.1.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "fd2094c59a057e8c35054f7d09c31699aeef927cf9688a87559a8ba69a93f600"; + sha256 = "f6aeefe5aa099ac804bdd10bdd180d101c634ced146ed42cc025180a6bb9ea69"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/bn/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/bn/firefox-84.0.1.tar.bz2"; locale = "bn"; arch = "linux-x86_64"; - sha256 = "c9755c408ca1a4f426f1432339020ef3d7c675d426fae9d8697cded4c7d493f4"; + sha256 = "91ffef38c34407d455294fd69e93fdb40256da5d06ac6a300cb48902991fb172"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/br/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/br/firefox-84.0.1.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "d47b889d31b945a5b768b3bbb336fdc43d62c9cc86f13916225cbfe68a560972"; + sha256 = "d3735936296f33773e8fce3f3beb3a183a5db1ab7d1f1163dd451ffa43bfa0d2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/bs/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/bs/firefox-84.0.1.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha256 = "c36da445560b989ae9cf16a1ec72cd2cae82db670f90d27abe0499f8cc025eee"; + sha256 = "a2fda7eed9a3fabb46a9e3049c1560f486fabf426a868b083b3c7d11447428ac"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/ca-valencia/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/ca-valencia/firefox-84.0.1.tar.bz2"; locale = "ca-valencia"; arch = "linux-x86_64"; - sha256 = "ef5ee80cc0d6b1b299bc8bb6577b8e26f5de8b541530ddda231e2fafa863e6a1"; + sha256 = "b1430d43b273e1dbf7899c537d93dce0c0674633ad50726611eb1bbd5397843b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/ca/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/ca/firefox-84.0.1.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "7c349aa7406899835bc9e70893f28c8109e17ee9ef018e7a723085117f8dd32f"; + sha256 = "d06da0cc13e1bbd04f9bb0659fa4745da08d410710793c2dd52086b10ea82cef"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/cak/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/cak/firefox-84.0.1.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "3e7aabe665ce423bd47e7d0474039d7bfeb9958849c18e98c37f28def5fae1aa"; + sha256 = "66cbce52e16178231cfd884e88443f4d5825079c9df74a3f6ef5ad226ec87025"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/cs/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/cs/firefox-84.0.1.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "97d5e4c255fc87430751c81edc62186e1b4ec901ccf17bfdad7a8ef918077bc1"; + sha256 = "7c3243b48f437ac0d95de2f819f6088d882c52f09e74f910f8c7cd21dc57b7b4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/cy/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/cy/firefox-84.0.1.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "c1856b51dedc5788b40671faee8f8cb996108eb514d1263de998043377f2f7c2"; + sha256 = "9bda66606c45b90de3ccef2c51d3a26d3456e312d145906070923924db2ee58a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/da/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/da/firefox-84.0.1.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "990da1f47d04ec9200d41fa401b23d9607a8e4c11d7cc78989e81785b9633cb0"; + sha256 = "13727d086205c7ed560af7ec5fb4db2025dc24e327ad20c55244d9bcd0d54627"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/de/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/de/firefox-84.0.1.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "94ad875d88a18f24ae38f20b324d074a367969368e660ea2b4b0645e31300c94"; + sha256 = "50167ebb8277c08d6c13c07c5ae871222ded9f42295ba7604836ac550d3890a9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/dsb/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/dsb/firefox-84.0.1.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "c3edd46c44bae1b00803e587e6f52560b28ddc2fc935c1fe62714bf16fa72d80"; + sha256 = "62b96a0abcdff8e1299c01fb3ef1aa8de6bd895adfd20698b52d0dc2522c0160"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/el/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/el/firefox-84.0.1.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "3572a260ec17f76631ca627747ed53d1911ee1180d3e574051b3baf0afd9dcd1"; + sha256 = "6d22ca0a28bf6c752772b778239d42060ca2a9ab97f6f82c5f88a53f717d3496"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/en-CA/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/en-CA/firefox-84.0.1.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "e3c9363e8b93c625234624ac5c3ab0274055c5b8f4f854da955409b9bdf28d52"; + sha256 = "22b40400ffe16f3bc9e9a720170f65d58464b0f0e2ebaf9fc3217edbab5e1fa8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/en-GB/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/en-GB/firefox-84.0.1.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "240a732c034bf2ac286cefc33b02b56df205c4e175457cd84adb7666418e0be4"; + sha256 = "169edb75ae396aa19fee5472731ada83faa351a2fa0d4d291cd394fe00a9b92e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/en-US/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/en-US/firefox-84.0.1.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "93ff827fdcba92ddb71851c46ac8192a727ed61402e896c6262943e382f92412"; + sha256 = "077cb7a8954ad544692a03bde4edd31751e1a819bd229413e35508984abee5ac"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/eo/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/eo/firefox-84.0.1.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha256 = "456933a6c1fb1e6ad5b2217a7e3730bd54ff037d3d718414b2c92557fea3659d"; + sha256 = "619667619bed6f5bc99b373e779af6ec98e21218e0d0d2b0d703cb16dfb1f171"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/es-AR/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/es-AR/firefox-84.0.1.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "040e8a4a74b8bc77e1d485c3376690f4c5ba85015b360f679ceacd848b0ca574"; + sha256 = "e7ae3b3415db29b8779f69ff557409f64ed7f031201c942cbee2fcd0e08abbb0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/es-CL/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/es-CL/firefox-84.0.1.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha256 = "80e8189ce09c736af1d9927d4943e08e30bc70e9aa7e116f150f14c0dab3fb15"; + sha256 = "7948825f75236751066a96e793b159538ee82c2315f07b9972f2204d27bd763f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/es-ES/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/es-ES/firefox-84.0.1.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "f48489abac5358a10d8ed36b77398493b6a9189a8327bf61bec6ceaca51ab696"; + sha256 = "3f6ea39596f93e5625d79ba544d9f476158757931f3f7c59bad85d169ef99ccc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/es-MX/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/es-MX/firefox-84.0.1.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha256 = "0d4805b30f05fb8a65b81a42337a8a3732c7664b322557e844929d2b049d0111"; + sha256 = "aa220edf6cbf85e7605a0cde21fc7871939501a8459295b2142e4507e8699cab"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/et/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/et/firefox-84.0.1.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "eb4a463b9271fdde45bddad28ce871953739b55126ae5613963a69a319908fb2"; + sha256 = "63fcb11eac26f26721d6a60c1001d867bceaa21eee2c81efbea8e00253412082"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/eu/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/eu/firefox-84.0.1.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "3a662c575554d3a542e65950352c527cc51e82ae7a8f9d7ca1b69e30a683731e"; + sha256 = "f49a421799e0691f475da2419ab786ac29caf67ed7413cb5b3736d7961309d17"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/fa/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/fa/firefox-84.0.1.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha256 = "b5ad3a5d39674d60b6e97cd656c77d7d2fb90943a66a590a29e4d42ec1e18c42"; + sha256 = "ef1e5342a658923452bc839258f292619c2edff304448ab9d85d9215ace907d3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/ff/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/ff/firefox-84.0.1.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha256 = "2db83d638474186f52fde5fe1ee25201e84b198e44397074203d7ce50e23e74c"; + sha256 = "73ff19b083e8d8d6ba6e5ed1efd27f18caa9a285fd02bb27ae01190245eca577"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/fi/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/fi/firefox-84.0.1.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "98bd9c50b5db43bf5fcdc829aa295975d3ec106bbc598fda3d7f26679c0ba08c"; + sha256 = "c576045a05d15ae4c8d6c82fd17036546825f9be1675197a1296a7c8d431992a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/fr/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/fr/firefox-84.0.1.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "ab3427f5cf7cc88d5108b8be21806197420bd775f33d3f2dc983f0f4dec44d5b"; + sha256 = "428270e0c4a3d80d810a106795986f2680c3e55faf7fc975ebf56fc90c0ce797"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/fy-NL/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/fy-NL/firefox-84.0.1.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "9f21d91d1529a05a2da7ba29cc8e875b23ffb4b453077b5e899133cf31813397"; + sha256 = "0e272ab1540690cd688561b4efdf7429298ad087b51afeb1b735f8b7efbaae28"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/ga-IE/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/ga-IE/firefox-84.0.1.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "4c22b166cccede0bcea4e75f826e100dfa4f2def01f904fbffcef789d2d61695"; + sha256 = "99e5381bfca90d1ebabbe00df75da91901f113ecd6e2aee1b16b5acef91bfaaf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/gd/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/gd/firefox-84.0.1.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "6ca04d381205121dc695dff78ff646499a21976ae64c110763845eda0598b414"; + sha256 = "ddde6096a541ff100d38929cefa87c93128d10131a4cf42717e9a169b5f99caa"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/gl/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/gl/firefox-84.0.1.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "d08f4ea821af5e38c21364037c17b8c97c775d60f0697eb0817dcfc7c6d4c7dd"; + sha256 = "98019391cc205449df19365459995d9711a1f73e94db226d7ae8c2172a14c8a0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/gn/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/gn/firefox-84.0.1.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha256 = "90a8b2fdf1d3471311671761e81637d6771a61744eb480c0788cf03d295c30ee"; + sha256 = "ca5a642179426bed73c4e3ebfb66c287ee57b3cbbdb35df35b1aebc024c9c8ee"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/gu-IN/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/gu-IN/firefox-84.0.1.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha256 = "bfe65e5c9795ecdff4dc947d2e2e84d01da894b0ae55c08d73f9397c5730ce17"; + sha256 = "2c4f645de88f4db3a2274a67876372baea53e3d0bd275d6d67ef60ed2ced0ca4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/he/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/he/firefox-84.0.1.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "2dc01c5a929aa79056a66feb522d50cbbb567bc85589f8106e553c9ddfc02a7c"; + sha256 = "f2e5ad70f26d393562cf4e0c3743dc01b1dc4ab9f77d88f92419acf8072d3ff0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/hi-IN/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/hi-IN/firefox-84.0.1.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha256 = "ef2a61dce3ee713a4be3cee5a9dda8498095a7db69304a7d6585ac674970958a"; + sha256 = "368a469ac2b44c0cb23adbf45c654ce2188e2674bc526a106f90159fdf35224c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/hr/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/hr/firefox-84.0.1.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "ab8357cc1f36965ccbd6f4298ffdbb3d77b09cc4b789a3be708d2c51468402bd"; + sha256 = "4cc283202d36f691ed24e0295a9edd51369c996f4a6782ea2a38b57011310dff"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/hsb/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/hsb/firefox-84.0.1.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "6a34074a96be7911672b7e83151244f1f963a8cc8930c8d1d113afe8a49c9529"; + sha256 = "cdce15a29c601de89923f77b334ffacf2e2f3474e054499d03aaaa95aa4285c5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/hu/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/hu/firefox-84.0.1.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "ffec1646df872a757b771a03c00e3e6df3397e7f4af46bd1d6c0fcab242b1721"; + sha256 = "0def021e54c67a80d5416cff8da4fba48b5d47f1d8c6bd673ac2fc7a64200116"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/hy-AM/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/hy-AM/firefox-84.0.1.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "1b9da538ced466302584fef4ecf415aeae5bee51a87d38bd0a6bb3ea155af66d"; + sha256 = "f6a3cfbd4490d2d0cbc09f3ac15f9d723d485c64603549adb8a4c33d5af7823d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/ia/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/ia/firefox-84.0.1.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha256 = "5f8582508155f858c7e52e623579daa7da1aa77bb4e41c2c46d3e6ae8ace6b1e"; + sha256 = "69c93ac33a54358f1cb35204b5acbf3a818a4031737aea44684bf3bdadd93acc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/id/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/id/firefox-84.0.1.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "e5690dcc6b933ddbd27fcfb22f8ab9fc4e4c999d935b6088da38c87af2c567d1"; + sha256 = "59236a0a6024013e7b4b21394f66a9d2b3ddfb27ce54c37a227127defec2bc09"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/is/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/is/firefox-84.0.1.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "3776fe6aad623e9b74807a48e105d1619143e78e122906360c4efbc73c2891ee"; + sha256 = "f13500ac51becd6cbfefb43cd98d3a6530dbb92bc88ad15b1714af775bc3e1c0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/it/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/it/firefox-84.0.1.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "eb54c4596602150c619db6d0d5572a59f7d9c4def68a34cb874cbc6535939e2a"; + sha256 = "77beebceeb36f1eaa00838f3e3739dd9549a7a02e15bbbd83454a1e86bc83c9c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/ja/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/ja/firefox-84.0.1.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "54b70bef0507611ad1ea7560668b46385661b5275c7a0ecaad723db44fd8af88"; + sha256 = "bbb98b2bad26a554493d9fbefe1b4061f14dacf59a14cb8ccd92e728d906a676"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/ka/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/ka/firefox-84.0.1.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "56e72349133297d61dfdec4933a01c2cd8fa3d0da3d784e0598506c2db05938c"; + sha256 = "20fc38d941e3aba6017143ac6865a5f210450b773a9d50c195a9b951e65ccdc2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/kab/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/kab/firefox-84.0.1.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "45f554342449405990c84e910dc6436489046acd00fdc4a0ddabb4b28d7c1284"; + sha256 = "003d7d9d1f2b5f958e29168c698568f6c1e2c7c5c1ec652fab6f2b824828c0be"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/kk/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/kk/firefox-84.0.1.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "3463c4ea5df4e072dfca22e8983fdc016adbe2326bf186a0168ea9ee2c36b3bd"; + sha256 = "e16d8e9f41fbefc2b863978627eb66e1c82d53a9dc4b1acac912309d633f972f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/km/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/km/firefox-84.0.1.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha256 = "3bb7d2c3e5278d9c51b87d8140096ae01532e99160b866164d1920fb012c085c"; + sha256 = "e75aa98eba7a600e459e25b7e6d1311a00c16ddade46eeec18ca37b799e7a492"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/kn/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/kn/firefox-84.0.1.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha256 = "c9086912382dbff66045c79130403385b9f075bf782220aeb84f03f62a563638"; + sha256 = "282f240fae65764d4e1f5d5e3e0ec775ebd66dab4589b5ae9f34bcfb81f50996"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/ko/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/ko/firefox-84.0.1.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "6f70169cd58ee1559ab224c3ea6f5309bf75267d9f315e389b7971e8e1feed09"; + sha256 = "2b5cc8a136b703db4fb59a2bf8ac24ab39416ff44f35836ff70b93e378727706"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/lij/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/lij/firefox-84.0.1.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha256 = "0b089e6f7954f4d99e9e59bd25148c4be620f9486f8d36c3db68fec5ea700d94"; + sha256 = "4cb13be0d090d824b4b86e28f9c02d4c0875133603dec7a58b83ae67e86df30c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/lt/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/lt/firefox-84.0.1.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "b76c545aad6e5b66bd8ab34bf02f7d4f69ecee348381b16c271f4de0243c660d"; + sha256 = "b6fa373facf8e8d4a7d4bdb97955820d450748009becf166c33faf936fd34cc0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/lv/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/lv/firefox-84.0.1.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "8504d5c00c5569f008b2e308a9193cf62130e89a6e61b33fc842081e4d504322"; + sha256 = "5522a451edec23255b2a8fab65d2680e9b3854998290a7dd33183238cb17d33e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/mk/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/mk/firefox-84.0.1.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha256 = "636a421f6238de1fee37014c3af147220af6a1f3c04e2ce6ec9dd17898bc7c20"; + sha256 = "d0d96241bcbd32e000094008263a37543dfd4c5955b116f88118daff11759e0c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/mr/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/mr/firefox-84.0.1.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha256 = "1e00d369be11ad8bfb2dda0ceeb3b7b516fd66427d9e85bff4cc1d699ff3659f"; + sha256 = "06593e4a56e5f76ffb765b605684349fbf31c8a0747cc90ef991c532df38d411"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/ms/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/ms/firefox-84.0.1.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "0590f2bff7e43b9f6c081d57276299f8327df73415a8e2a2243e3c4ec9154200"; + sha256 = "ffa6d0f8534253c5ea94df7aba31a06cdf9e294500781d25a31b8dcad15d5132"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/my/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/my/firefox-84.0.1.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha256 = "ae43f0e8d4ff32274b25a1b78e0af44446ea6989edc4eb3c0d9fae36fcf80908"; + sha256 = "dafa195bca8536709110ecda82e988bed254b145f00581561b18827fa41149d7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/nb-NO/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/nb-NO/firefox-84.0.1.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "9c3a74fc7670e2202be1f4f75208f0113c115169ef70614af631cf16879e081f"; + sha256 = "9a8e5175bb17ae3110a4ba74dcc575dd4b0fb44981f7152cc521ad017db7e2a8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/ne-NP/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/ne-NP/firefox-84.0.1.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha256 = "d830f802cccc7351a447fc59ed64562cac1521d281ddf218c84d1c9af8a65cb3"; + sha256 = "4c2081207cfbc657d8f6a5ba781098f11adc5e159414036dc8217874a2c2d8b6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/nl/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/nl/firefox-84.0.1.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "ecfd03850a48ebf7c3ec9400838100514826b8f35744b0167f61c9086893ae66"; + sha256 = "947dc32c772a2205ab30fdd6d8bcf938642e9d734b58829d2dec5a1896ac6b4b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/nn-NO/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/nn-NO/firefox-84.0.1.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "ad0e4a89afabf1929d441129066dfcbf532d37da31c76bc79108d123cf5cc649"; + sha256 = "89096b5f2ce27ece10be949b495aa41cd882bfb4a742cc3abfc66f36130313b4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/oc/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/oc/firefox-84.0.1.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha256 = "9b9bbba334c4d7d3907f55a6647cecdf0bb2cd6294569a0008d866cd6eb70a35"; + sha256 = "50f603507e5d276c5f3237d1554269faab573d8c194a488353227743b677ccc0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/pa-IN/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/pa-IN/firefox-84.0.1.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "083266958874618042ee8f2a6162184cd71bc725a994aeb68158d59edb0cafaa"; + sha256 = "231739c85f20014f50a982b4ac0634a8a4147cb6de5ba39a9a11a944d4ff80ff"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/pl/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/pl/firefox-84.0.1.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "cb7c72fdc91cd9269a2e53725a26ee94db0e2e608a60ff1120fbe5c1627814bf"; + sha256 = "9487ffb5fdfc2f7040a7f9bf2585af324782e2f3dfa996db719103b20d02bf55"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/pt-BR/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/pt-BR/firefox-84.0.1.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "a2a188a222fc6054ca59d24370528e8c8d4d7dc8e4ab18f71510b415dde73d05"; + sha256 = "fd53dbc5724968b0bb2c2b78de96f3708d05758de63aeaa7fb942f9b64a0649f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/pt-PT/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/pt-PT/firefox-84.0.1.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "528e1893438ead94afd4013d3c4f4f51107a5d0c4b6d6e018a0687f0d25f9e53"; + sha256 = "39211dde1b183c0453643fd6253fe6eea4dcf2b006842b1cd61e1ce142991a44"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/rm/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/rm/firefox-84.0.1.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "e4d6e53b642da4de5c7f30297c6fec22b37921a55cb744962dc0d60e26812549"; + sha256 = "29cf408b9386907dd1e8a64f56aec2e0359de243c3d17fe2531c0f1c7285c205"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/ro/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/ro/firefox-84.0.1.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "04ffa3eda69ea0dfc6251564c4c6bc742d5f8e5dbaf6184b4ee9461226ce5c86"; + sha256 = "eced9ac8aa417dbb5dd725c952eaa977eca1b48a7271e9f8dcbe1ee46a4b1321"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/ru/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/ru/firefox-84.0.1.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "697ddeb8ec024b5459492ebd652a612cfa1911267071b230f5ea6ac78a1e3075"; + sha256 = "7abfd2a2b30eb7744d890ba3a0589ac5017a9536c43fe3e154e60339d7b41544"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/si/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/si/firefox-84.0.1.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha256 = "a3256c648ea75ce36009306a3c039af228e645ea2e54361fe239ad0cf0869ead"; + sha256 = "e9e8c21b64f7f434db99b30b6e7190fa55f3b23a63dcdef120118d228ed533aa"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/sk/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/sk/firefox-84.0.1.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "1ae0f898d34c74ea427228d93646ae47990834d14bc4f5563427409dba066f8d"; + sha256 = "dd2e17cf612de02aa71a933a8b1f26e403e1be4da54e63530667e81441d5f6e9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/sl/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/sl/firefox-84.0.1.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "9e14b4ad7bd9a8026074e0a3da3d3ba74dbb1be31a2e9cae787802d090c7a965"; + sha256 = "782e612494aa907990262c7ac7189e98d90336b270a806a8e191dcc1c8266218"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/son/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/son/firefox-84.0.1.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha256 = "1b928ca974133a346950ffc663fbed9d1876a4c0bca53fd807d8077d031531d5"; + sha256 = "7730614e4e22eb871dadcc13f62d0d2bc445aed89c1ab6eee2600aa6f7023fa1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/sq/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/sq/firefox-84.0.1.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "7bb9bcfe490bf5d577e55e9b612c932c93ac58252cef592b2af39c17987e700b"; + sha256 = "6726cc2fa9c7b40e92d512b83bc0a974c3668a3854ac91aafa334b4d30b71ee7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/sr/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/sr/firefox-84.0.1.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "90e496a5fe9c5d8c38dfcf5a1a07ea04be983fe78c68cb13a2b99067b0f02e7a"; + sha256 = "22b443987fa62f4d753efc04ae926e3ed69ce84c56a2fc653994d886da10f9e6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/sv-SE/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/sv-SE/firefox-84.0.1.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "eab8a1e51a90d36b58901db6175e724f38afb91270b05c51a93c03f8c51fe432"; + sha256 = "3c4d26bce8cd12a6531fe15e3e7251ac9046bc7d1670df3754f0c379bb63ef50"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/ta/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/ta/firefox-84.0.1.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha256 = "bb6d49500393d20134a6f749a77de1fc4cae2feba4e49261862f8a634b4b9276"; + sha256 = "edbfebceb857824f331c46eb7611dfa9adbfcf6cc7b80075478059261b0de6bf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/te/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/te/firefox-84.0.1.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha256 = "a1104e292f949976e423b587fe9728fc741b7a11e276e7d747afd3a93abe3eb5"; + sha256 = "06f342dd81f0ff481de67fbbbd5bbbefda27629be688d854a226d515c872d69c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/th/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/th/firefox-84.0.1.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "403e4a86b5f95cb22cdb2100372c55d92fcb4708e3f719da72b643637c711458"; + sha256 = "1ccc1da981cd49effc811b4dd85a09bc584316b3ff50fcb05502e4618c465ea9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/tl/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/tl/firefox-84.0.1.tar.bz2"; locale = "tl"; arch = "linux-x86_64"; - sha256 = "993cf86a1b045a477fd4c683e503314fc2aea5a0a52f1faaacd18a0fdc5c7def"; + sha256 = "b15095bba6ff763f01e7677359a0e8885164eedfee1836e0eb4e1822322050db"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/tr/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/tr/firefox-84.0.1.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "8e9e96d0b1a2014dc7374ea893fe72bc72f3840742d305a6e73417468dd6245b"; + sha256 = "e140a2196da9ae934134bd3ad3dafcf8766aa676f410047817ba01ab831b0ad0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/trs/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/trs/firefox-84.0.1.tar.bz2"; locale = "trs"; arch = "linux-x86_64"; - sha256 = "3590ebb4c888cf92ebd615df9eda2413fd0a3031293d68809fef74fc92fa759b"; + sha256 = "3a8c6dd94d17c8ce892f7eec395f8f6676bf4fb18174a6dfadde41868f9d3e21"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/uk/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/uk/firefox-84.0.1.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "7a3a2bae67ddd2afd2d6953f5f045a831595ea29e5cc6ad7083b8ac89e55917b"; + sha256 = "d66bcb1f09213c34f14ec0cbd3687d8b5918afceacb2164e81ff94e681c432e0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/ur/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/ur/firefox-84.0.1.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha256 = "445a599ba623d8673d71f6ebde70c64a93e28e57b6859e325b0151240f1d49e5"; + sha256 = "0d9094f14a25b0bb3c7656fd524cd330c0b7a6334ab23c86a01ecd1beca14988"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/uz/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/uz/firefox-84.0.1.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "b63e6c1c6afdc3694ee1d2b21175f4a5603c4454e43f0a08e87ccf800862b6bc"; + sha256 = "70d3cf8198442718cdb664dbd832c91d5252041fe1076faa0f790e63f0c22771"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/vi/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/vi/firefox-84.0.1.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "7127340d189ff601f96ba6f5e6a6175d850e822599e10762908d406b2174a256"; + sha256 = "17a0ee2e12c74e73fd1346257ae5f797c866f0c4081a154f6290e73f4be40f27"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/xh/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/xh/firefox-84.0.1.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha256 = "41772e457eaf385230086a461033854ad214b4160c6f99f7eb6c4df8dd137dc5"; + sha256 = "7383a176b5afc8319781586ece3eba752739499be2c6944050b57ef5b7b620f7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/zh-CN/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/zh-CN/firefox-84.0.1.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "013fe88aea216fbc4de9fdaaf559d65678ba389049bcff896540dae8d0a9564d"; + sha256 = "08881c7f4043a6e4bac11b4de388da773a374a6c83068723318ab6e1eb981fdf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-x86_64/zh-TW/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-x86_64/zh-TW/firefox-84.0.1.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "7e9eea2a326842f652aad4995f796af9550d03c034587d171e4b2a33da934645"; + sha256 = "ed3bb049a2a80cf294b4b4c4ca0e980b38b6f18c4e931a63ff78e5707fc2daf3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/ach/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/ach/firefox-84.0.1.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha256 = "9974b19f4f15d9aa33b5432cceea05efe44f31c4123596aca9fb5cd3dd734152"; + sha256 = "4bdaa5921976290cc5bb11f981d2f6559751a693a2bbe512b9e80eb5148b2e37"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/af/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/af/firefox-84.0.1.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "5600ad5fad398648d2e7a2d7bdf7901769fa428f9ef9f79046917133e12a7eb6"; + sha256 = "853d005f8ac8e2e5e31e3a24057b458f1441d6ac97a41f414c0831295b91fcd2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/an/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/an/firefox-84.0.1.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha256 = "d8e0843dafcaf1b010773b83a665fd593741858b60aaba61d4c308a86f765146"; + sha256 = "6409ce28faf1dd18f079891e373a61f0b1eb730b3d1c7559a13784192367577b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/ar/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/ar/firefox-84.0.1.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "952b2ad360662341b9281cfdd93a141fe2efd16f73baa4fc4be1de7b8f12c8c3"; + sha256 = "9c9da9daad627f4c5dbe5588667cdf90fe8a582adaff962c674c483a5d80dd6f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/ast/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/ast/firefox-84.0.1.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "a7728b09f7e96983a031a32b1b938fa362e1a1e58722b37ec03a4048a152f0b1"; + sha256 = "609de4719323b676dc1a15da8d0295d3c67bb4ee271f70f28db97dacaae87f4f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/az/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/az/firefox-84.0.1.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha256 = "c6019a3f7ef56583445acc5ab310770c937b44182a1bb3ed54ac452e6e19f8fc"; + sha256 = "f411a4a560d1a6db4daee06ee3a29d6a14cb5e6e1914aac54c19918b93569e3d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/be/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/be/firefox-84.0.1.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "12ead04878e308682f04afb6ac9ce9ab134a5a542af328e029cd973c14fe7444"; + sha256 = "46d73bb13f113dd6dda069ba571e623b3f20f2b6e76f55f307690ee01eb4dba7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/bg/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/bg/firefox-84.0.1.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "7134539d5c259cdf6dd316205b857acae87730ca01bd6ef2efcca75f9d06d027"; + sha256 = "0bbab0465efeac3cc3f72749242310e1456dbee915bfb08b7ff7e5f5c2fff0e8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/bn/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/bn/firefox-84.0.1.tar.bz2"; locale = "bn"; arch = "linux-i686"; - sha256 = "a97524e0d6f6f61045b2573ac2fe98e31fa372429f5f53c25fb4cb4d32a31940"; + sha256 = "c1d47ac9ed0e01a0ec77776bb6131ae38faa17a3da2d8bea723679e3cd158074"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/br/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/br/firefox-84.0.1.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "4619705703a6878fba4de4227d90143abb92237ba556a8c5f4a51c9701671821"; + sha256 = "b205df6c0016b2c3984b33c00c2153688c7ac162df1a3748b23ce081a87d46cb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/bs/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/bs/firefox-84.0.1.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha256 = "2131babd061761fa1119a536ae354145315875c5d8cd300405a35924bbbfcc34"; + sha256 = "85093f59d815cc1d45e6aa6f8ea6ea2972102248aa4973b4386e265f985c85a8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/ca-valencia/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/ca-valencia/firefox-84.0.1.tar.bz2"; locale = "ca-valencia"; arch = "linux-i686"; - sha256 = "73238eb95ac828f4bc2ac220e4b953b950a75b88600b457bf3bd528245574cd8"; + sha256 = "57b5054db2cb6987db174c1a32c5e87bc37f1de3ff3e1046421962fb50204af4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/ca/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/ca/firefox-84.0.1.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "73e65093a587c89c9a392e3b65375ad2158c88e2905ab116eaf8da7cc5841cda"; + sha256 = "f57a9469122e99537dfe11984c11425008d81b738fb939297be2c1104858d52f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/cak/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/cak/firefox-84.0.1.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "7f2dd3fdf1e0cae21a1517286b60bbbabd310dfc0dc18588fbe21ba671e97dd3"; + sha256 = "6a8d4e9b3555ebb7020e347bb59d426fb5ab0cb1fb5012fdd99d0e978675b994"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/cs/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/cs/firefox-84.0.1.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "5f639cc6d14b06ae62f73fc01b909182efea32710dfd817be60499f4da3eafd7"; + sha256 = "15d8e1ec0e3719228cd0d4f17667a08d4fadffdf2cae91abe47ddfe511d81046"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/cy/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/cy/firefox-84.0.1.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "7a3e9921b2e6e407ebeeb22f1ac4b529222a1f5fbdc84c44fc902b8db6aeb1ef"; + sha256 = "412d19fa8e4c47c892780b225e6d320bc24b3adf482cb023964599ac35350433"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/da/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/da/firefox-84.0.1.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "05dc3274927f692ec3c60f8353a30e2bcb1a36b54f4ddff90407e2818a497a38"; + sha256 = "8116eb1c33d26e589c7cc3b7999159f7893018f7bdcf627d9b892b0f96a55e9f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/de/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/de/firefox-84.0.1.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "c95affb4655b7a0ad6959651cf10090970035c74601ea141366cbb5d44f8a526"; + sha256 = "433b02ea3b1d50e9a8287e6e264d518520f656fcbb9851068de1240599e4c512"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/dsb/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/dsb/firefox-84.0.1.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "c9baf7df51fdebbb2521dd10830f759110a9c92dcdb579fad99d0c4112126e66"; + sha256 = "5d55fdf5976a0c1f3a79058b1993923ae67c063b6643695dee8bcb4faed06c74"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/el/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/el/firefox-84.0.1.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "52afcd2037b9cda2c66975dd184276bcccca27833cd7a6da989e32c591a06060"; + sha256 = "668a9f735be42cdd57a8b7395c37703e6e1b30264aaf9201a801efe711dd008e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/en-CA/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/en-CA/firefox-84.0.1.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "375d3a11f236560f06397f157209b1ce476197a0e7b327cf187dc2002d053c90"; + sha256 = "9c20e6c096e1a7ab910d91380083e400f35052ed9ae72860b8ba66ac750c5fee"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/en-GB/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/en-GB/firefox-84.0.1.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "610657a623b5680c2ea350a5f3d1ec676e9dac8720e0e67b3e627e37a58b0ad6"; + sha256 = "4de8ea0ba0e599529abde78983e04c509229bbae756c633fa929833b385f9519"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/en-US/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/en-US/firefox-84.0.1.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "ac4df9d78ac0321f6be266e7fbf6b79d80bee7cfdf1b00c433072d2283c5fdf8"; + sha256 = "6cf9fc509ef21c004a70810c8cd4c428593642edbdd5d4f4c455345391ba4def"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/eo/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/eo/firefox-84.0.1.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha256 = "f23479cb30cf27fa368e9e04591aad2051eedde5e69d105bfc9ba6168792b44b"; + sha256 = "1ed7915f1cafa19d36465bb0d5f9fca8e57b7f0f8652dabcf90a4e232c0cccdd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/es-AR/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/es-AR/firefox-84.0.1.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "5657636c105d301474cf5d2707733a35ac5f5687790002d5778dffb32a727adc"; + sha256 = "359234b846e364352a6af0a262db06b6e9f4a911c407bf35f1ad2f8460eff7ab"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/es-CL/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/es-CL/firefox-84.0.1.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha256 = "896f2ac45b98eccd487de64b6c5aa98733d97bd4422dd1a16d02883e3a06c132"; + sha256 = "eae445daf305820692b7ee9d20dbd69f0da509716925db6c12eb7c2e7a521416"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/es-ES/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/es-ES/firefox-84.0.1.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "9d337fc821dae150c4f3ce26c427ad0efa22c53f3b311b4ce7693b33c9ea4d7d"; + sha256 = "36a2f4eca19bff55f998e8e36718d4a4bdad0eea5c53af1825f857834dc6a1d7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/es-MX/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/es-MX/firefox-84.0.1.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha256 = "f9cbd03f9813157835ef7faf9fa2374e488144930ffdec765c370a95a9c72120"; + sha256 = "7f7f384bbe156e37af25cdc19a49ddf225692a2579ce5c7df37b8684f0318102"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/et/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/et/firefox-84.0.1.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "4f33cbb67003da1b4db4dc12ee2e7b9fe942bc6e6d770608361355ce7fcf8214"; + sha256 = "39288f46064d259f4ac1f11481480b189d945608d4b3ece922b774ca31fbf95e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/eu/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/eu/firefox-84.0.1.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "31970c98d028a83a6198dcee9c5f8191343cd84ec6a7fa032a31730db2cc7b00"; + sha256 = "7693f969f356f87db5d48266ac20a152bbb8946486ee60f5efa0225a83a25493"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/fa/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/fa/firefox-84.0.1.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha256 = "1125c534f2067e57701fab7ae3df55c52dc10693b069817021072c74b8b9bdcf"; + sha256 = "ff189730d71b2ad0e2694a364bc0c0ee4de50efe30f44935b1cef0d89488f8f2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/ff/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/ff/firefox-84.0.1.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha256 = "ef6c66b0d8a6edce0c982eaee55cd14a4ac4d365478976a0c4f1cd48a6c10c6d"; + sha256 = "b6f39b27d000fe98510da1d5be6b591e3a7cd1b6e2d2502bbe7e67b124822ed1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/fi/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/fi/firefox-84.0.1.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "bcd529c0227bd64403dc023ef91459556fbb186e072c12075b705d50293d86c3"; + sha256 = "ec33e3bc8a549c1c2d5bdc0f45113d96d3c959d1d9232d08417c09821cbd8e42"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/fr/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/fr/firefox-84.0.1.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "47c56fe2b88054d97622e9c0ff2043323b7a916da1e11541e96cf7b05c3e7d52"; + sha256 = "43e80f221e53db14a57da940d6ad98d639bffc94c71e08ff39501aafe319c3a3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/fy-NL/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/fy-NL/firefox-84.0.1.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "b0ed17e5022b0817d6b4f58ef990ce22774bde875151c60be1f7251ec90cb189"; + sha256 = "dbbe3af347ec5e8e856e4580889f99709231eb07631862ad4e8deb095f098390"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/ga-IE/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/ga-IE/firefox-84.0.1.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "380aad276cadff8221e4f675751278ba994e08ddb46a0ebde12d87b741c23263"; + sha256 = "4d5c8fec2f370840cf79c19774976585af0d8e09f13abcb4a594f3ebf9c52558"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/gd/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/gd/firefox-84.0.1.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "0489ed6e1e9150a0facb4e6fb59bea7673e89669d167806d5651224b939fada5"; + sha256 = "7ea8febc7443e1f7c732e07cc8bd027ed0a82eea018b6bf7c5979820821701ea"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/gl/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/gl/firefox-84.0.1.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "bc41c2b611ecb4ccdedbbf480138a3bc6326106d6c1641d6a06e40f502427af0"; + sha256 = "207dfe2ed822245d089a4f1848fcf6c92e27715b4463bcdcdea2127e8ac8fae3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/gn/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/gn/firefox-84.0.1.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha256 = "ade8fe9ab75b0a5f75ce80ba0f8065c4b4cbf54d7772f4c3be96886ca166b373"; + sha256 = "a07d734191885b4e5e66c1a5b2f64cbdcc133dd9a1cf8fdaea882a3a1ceec7ba"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/gu-IN/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/gu-IN/firefox-84.0.1.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha256 = "bc20ad60eee0e6a3d532e436d9b62175872fcb27dab4c9a5083ed6f4bda5f036"; + sha256 = "af4146f86e4f5aa81d10067e21653e657620d9b0b51d564dca83c4435f6cca82"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/he/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/he/firefox-84.0.1.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "a08862d8ebdfa2d6c4f038b91f264c9abe873537d1a7cd2997a1eb4d73bf6f4c"; + sha256 = "608652ef032ccbd0d61070a32a2931764b86ea0d25afb12617338136f3f29e42"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/hi-IN/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/hi-IN/firefox-84.0.1.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha256 = "8ed5b454bdc38f07c79924a1dc08e76e65a48bd671991744a441693185683916"; + sha256 = "1724879537c0472762dd93a2206f31767938881ab4113946076205342f8f5f7a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/hr/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/hr/firefox-84.0.1.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "97356a661d56d51a9210109db8ad75d61e3e00e4c7570d4e824712b52337af27"; + sha256 = "727f4a1d3ef4e531027c5188798b8fd1aeab98bffe4c1f7f67d919aa8855e6bb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/hsb/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/hsb/firefox-84.0.1.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "5706aa76b23161baf24b79d2b45dd706006fb73aeedd06f41f3273f8078f371b"; + sha256 = "6efd8dd2cf6f82b688632095a16c5e488578ac08227cbbcf2613f9b2852c9445"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/hu/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/hu/firefox-84.0.1.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "3b894beaef35012df54ba4c7509a06ece1a0cdf741308b3510ddc702c4eb3656"; + sha256 = "458e8452d89e61f8f4ac3d1ca3e41583fd26cfa897c4b36e0888a2174c853508"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/hy-AM/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/hy-AM/firefox-84.0.1.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "b2894092de59b7d6bd6dcd2111fa4591b1a4ed054fd107e2093bd0962edb4405"; + sha256 = "b58af31a6ab2e224f9f50e88c1e97c8f4af273f5189c59f025c10d5589fc2d41"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/ia/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/ia/firefox-84.0.1.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha256 = "9d9ee7e05a02078b7d4041c3b63e79f91f0a888b919cf726e2e69090ff05f71d"; + sha256 = "de6bab3cc3e08fed14584d57a58b9310829ce17906561d880c06968d3ca6a879"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/id/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/id/firefox-84.0.1.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "13e54589a23323e9043d4dac5586a31e5d43bdde0356b1a00a86f91ee5813eb2"; + sha256 = "31cd054f01b8050fe70a95def464b76bfddff2277993c759395e13c3829c2c70"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/is/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/is/firefox-84.0.1.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "955a8a4ff1c5ba7124593b3c8537201ffb1fe33ea5c3edd6ab30e80e6b28f60a"; + sha256 = "fbb17534672c6b7c89dc51eca97ac9c0f807fce84a68bbf75f077ce1c6202725"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/it/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/it/firefox-84.0.1.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "23927419191d7aee8b29da29d213ee9c7ff39363f3fc9171c70d801158cb895b"; + sha256 = "9fcfd33025b3d7b88238e6c51472a06b1b6bef56d1275a1aeecb66224f8d6d9b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/ja/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/ja/firefox-84.0.1.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "4ffaf6df345922bcd82942956a0f344c4b52ac49ec64879fef7307a0c34eb8e9"; + sha256 = "37a234db4a8618cb125215ef51700fe72e29f2ac9328c4f5a319516f32eac7f4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/ka/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/ka/firefox-84.0.1.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "df1027754efd054bae379b35228067799e75820b08ca7e6aff5a527fdaf046a8"; + sha256 = "0875616e42bb71c79427a31c5adac9e1d9112c0bbeae866725ae9bd87ca915f8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/kab/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/kab/firefox-84.0.1.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "6fc1e5d662ce742a48c003145b1b4b58cb296b43a20f718bdcffdc05e386078f"; + sha256 = "88b6430577c73965bc229cc2875b138db1cc47ab27c7aed6c6004559f296d819"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/kk/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/kk/firefox-84.0.1.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "52cb3ac3a33da1227c3aa5e47e04620be2cc020bc520fcf013fe11ad74ad6378"; + sha256 = "6de277b39e76394245aaab0dfd4ccdcea4af5812fce20ff61faf9d62c22bd34f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/km/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/km/firefox-84.0.1.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha256 = "c598fa97bb79f56d01afb30caeff29a2c7dd1f162d2fb49c0632ee259d0fe860"; + sha256 = "25c0e6752716e6fc4ed02b465b820661ec59ebf997bfaebdbfe172e2a18dc387"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/kn/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/kn/firefox-84.0.1.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha256 = "d6795f3f3c0978dbc399768fd824cceb6a3c1c883c153f65102ef476f74d6408"; + sha256 = "f61cf632f934daada5d6d2164279981b5536d078ddb5b19e7146a7beb0917e23"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/ko/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/ko/firefox-84.0.1.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "b4d0b62cdfd332d8e9878b75918a0362a7b68db0b62e4e4508dfa176e79b8ed7"; + sha256 = "9e9000032c24fd20dd188c9306364ad79fc2d47b3433d36914a2caea716ff230"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/lij/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/lij/firefox-84.0.1.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha256 = "257eec8bead076119b0c3679feb4f3de34c9cf66bd05215e7d76936e6d3ce052"; + sha256 = "1fd2f5ec8c3074845a27072d8eddf364384e7ce7494739af331a739249c34e4b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/lt/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/lt/firefox-84.0.1.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "326925d68306ec6e5b7334eb413cff395ce6a27abf5b0981dee25a7888c64079"; + sha256 = "e8b43ae1a3e3cf7d5fb955cfa772f5fbec525fc9c3deb0e81390b8fc53b70176"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/lv/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/lv/firefox-84.0.1.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha256 = "036264de51a7a81b3d636b8217db571db70631231d485f353e64e9f43f0192f4"; + sha256 = "00908977f480f6829761822a4f6f9800c3940faeac0362c46433813788ce1391"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/mk/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/mk/firefox-84.0.1.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha256 = "6d4966ae49ba7746395b17b98c158c07d33293b68a6c648d0238107812ccfc03"; + sha256 = "cc6a8e52d7e3940e2664b4659f4a33d452b1bea56d3d53c88c28afd604731118"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/mr/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/mr/firefox-84.0.1.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha256 = "88a90205bfd157fbcb0697efbd4884772a463f776f5110aae9903dbc1151fcbc"; + sha256 = "4a16e203e5b02b146879722a1fe909bd964d712795841cbbd268acc34d5073c6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/ms/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/ms/firefox-84.0.1.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "67d3651739404a73f263251896c129dc121808d4859169b3469b640345433e9e"; + sha256 = "2ebf161faa958992d3dbb9f7d70f7df058b93bc0627a4585fb3226a744c23ef6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/my/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/my/firefox-84.0.1.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha256 = "d7e9a1fe6d2e0e32c2ab9a773d198de241ac2a7d330d9eddce4f3afb9a67671b"; + sha256 = "43255bc0c5a5adc89bb89ea9267b3d4b38d7432555c7285722228b174bf909a2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/nb-NO/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/nb-NO/firefox-84.0.1.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "66c165884d4397db3e420151d2b6fa3d7bb7c6de790e6d284815cdcc323da3fe"; + sha256 = "153783b507cf3ec449e8a3d7db6ec523e956c23e1c01f9e26c0e6fc7547353b0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/ne-NP/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/ne-NP/firefox-84.0.1.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha256 = "f75832bd74f5ce8db3765201eee058f0386f196f407223e186c0be3d2a665fcf"; + sha256 = "8a3b9e8607565e6031f15a94ae4bcc6e6681d1705408f79483406cdfc04e6c4c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/nl/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/nl/firefox-84.0.1.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "beb68fb193dfcccbe22369f9adcbebe701fd4c9ab5943ec685d5d20398a1ea5d"; + sha256 = "7d87b9188f74dc3f910761fc0e1c493c121ed6ab077a0fcf1c88af94fbca22a5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/nn-NO/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/nn-NO/firefox-84.0.1.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "de2716b8f4c13c6ef76537ef52f1d0529016302ce220a90d9b5062af9becb5b7"; + sha256 = "5d0177a4c13faa2cf9aa0edacbbd381d1ff5eb9ad17ae44ab507f3c8e582c360"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/oc/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/oc/firefox-84.0.1.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha256 = "af2a788560a65cb9f3d2ce98acce4ecd3b3105b6c924c6a4de1a9deb6f2a4d42"; + sha256 = "cf8cd276252fccf07990c0a294e4628566ff3884cc062f26d6510dc042c6b5af"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/pa-IN/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/pa-IN/firefox-84.0.1.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "a3575371b20bab63a8bccc110343e0cd0736cffbc5c72dd7aa371c646a057060"; + sha256 = "75ab886eb9fe8d0a2cb9b0544090bd4b818e510ae4c3b137323782237d1a2a77"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/pl/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/pl/firefox-84.0.1.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "daa554b493ce1efa90a1b040e78d2f2e7ad8ca70c16ee19312c69ed4a12f00e3"; + sha256 = "9a2007a58e264731fbc1691213cf4aba07f360e5c3ee455c6a9abd85078f447f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/pt-BR/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/pt-BR/firefox-84.0.1.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "4f3fe4a1ce0e12383b37832f44b59fbb40b8fb6e95786edc57ea67ea3d5530bd"; + sha256 = "71b833c745a4fb334fc1aaa250b67d701cac46c3decec7b839e7554c30e4fbec"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/pt-PT/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/pt-PT/firefox-84.0.1.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "c16bcb116b845a6b28b72096ae43d50f19c7b9868c8bbb833db60eaaa70b001d"; + sha256 = "a56ada11b7681238a17c3e02c90122d4632070d8385624b34e03ebd2803328e7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/rm/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/rm/firefox-84.0.1.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "334d3dcf333a66f4bd169536f7f3b56ba4b257793dfd0837badff2a77b3668f4"; + sha256 = "c0cadeebef45884e11a67e1f45f0b36754fc6e2537b2575f06ec539a43986bce"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/ro/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/ro/firefox-84.0.1.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "1e6ad9735fe0046beaf80ac35d0a1831aade14f388d08991b9bc583135ebd94c"; + sha256 = "386f7557754cfb2887c7ff2be165d8b4cdc4cc4303fd26539b2d09de440b8c0f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/ru/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/ru/firefox-84.0.1.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "a252bcd66f01375fbc4ce040b89c853c34745e8dede116d200303c56d6307f15"; + sha256 = "62ee54d895760e7a024fc4836096ad97b95b9bc0ca9d5900d551f86b16071aeb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/si/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/si/firefox-84.0.1.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha256 = "ebc5ce83b456f75b671694ac954258ca480caee563e0cb395786692aedf24d88"; + sha256 = "37b2bf998d61de9ee9b372548d8ccc0a2b4cd098e26c7773829267379cf5bfc0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/sk/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/sk/firefox-84.0.1.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "28aac94a71298c459f14949c9c82b379762d3192a16d92e90605ab8925cb31ad"; + sha256 = "30429ca6601f9276339f925614fd79b03ac54573564307ea84f0f87359bac7f3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/sl/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/sl/firefox-84.0.1.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "7fe0eb68a898488bcb697120542fbdcfd1d972c658b4c361bba351a8f5eb76e0"; + sha256 = "412e8aed7694adc1870d4e2bd8eeef74eb63ba0699e815b1d2ec65d38de9b4ff"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/son/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/son/firefox-84.0.1.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha256 = "f9cb1327834b6a6e41d4abf531410391a40f33a8d168d562dc367faf31d9e042"; + sha256 = "864e49755554df5ba8d5669f1b3d683517f2eb44039a35097e3acada4b22171d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/sq/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/sq/firefox-84.0.1.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "15370cc0527797f451a5a1f47637c6663437c8f49fc5c056ccbc2e7510cd6c94"; + sha256 = "1449ff4fac39eb2c3f959a899d773e77e457639ebc4cb26dd9c4188395b9c831"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/sr/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/sr/firefox-84.0.1.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "c44773c36eb39067e429fb4a4b57676abc7eb9fcf45bd6654d96761f64747c6a"; + sha256 = "51813e4ef930533045632fa516752303430ea9fdb848653c1233ddd9ef6d26c5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/sv-SE/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/sv-SE/firefox-84.0.1.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "aa8d2dc50dce8a53a926c71a4a7a57023a017d5fbd54cd1e446ef74b5eef7dea"; + sha256 = "82e3ce190978b83da1f88b175bcf4f1c95a1539e15375c856c54516333b8fc5d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/ta/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/ta/firefox-84.0.1.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha256 = "5fc3e8a048ec24e49c4c4a0e36712b378687e927c30dc8ecb3ec63bcf983062a"; + sha256 = "09f104627061c25c188d6e945dc1915ac43af31c6a0a0a05e70f051915f3d2bc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/te/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/te/firefox-84.0.1.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha256 = "ff123410cec64c47d239a432d32eaefa494e7cd7fb0157cc45917fe04b2916ef"; + sha256 = "a58503877b476f20e176abfa0ca2e5406b8ae8877954924f63f6490c5be19526"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/th/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/th/firefox-84.0.1.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "cb7cbf97884a5b4f62c4e0932ead0e5de018c9623590ac3798a86986916258dc"; + sha256 = "722f4194231fb315a07e0efcc922c6d62a8969321eadfccf2f6b74754b563d2a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/tl/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/tl/firefox-84.0.1.tar.bz2"; locale = "tl"; arch = "linux-i686"; - sha256 = "0d55a23e2c0b7da80a6c042e50fc3c9364c3f24309cf255bfbe55a320ec2cf00"; + sha256 = "6299ac5b4b505549cea0dd465059191adbee72346cfec46b94c67e7f5e9bc399"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/tr/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/tr/firefox-84.0.1.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "bfc1adb570f79b4f095bc87ab5a54c6b5179579840ded61319a10ad5ff39d52f"; + sha256 = "3e4755c497512bcb225a6e35e426db6772f263008f9d6c8495a8311d6d5ebfd4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/trs/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/trs/firefox-84.0.1.tar.bz2"; locale = "trs"; arch = "linux-i686"; - sha256 = "05b5a2252380147ec47561e29514e3f994414b46aae3dd168909f03e7dec16ef"; + sha256 = "d6bc24f33f73fea25675a1bcb53a40d4dc123b6496f0087c25b4bd7f6ca717f0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/uk/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/uk/firefox-84.0.1.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "7e34b52f4d46a735e36f549295d0f9704113024058a7d8d69a8ee6a023d03755"; + sha256 = "37b48b8cf2e57a3bacc2d3a5c139ac1d465e246a68fd33b87891e8c844af0088"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/ur/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/ur/firefox-84.0.1.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha256 = "1d48e536c09f862bc00fcaf9a175eaeffac1e0aaff66d71ca49123c00cc885bc"; + sha256 = "b3a45eb2ad18d1af426e82163b426ceba5adc47957ff771121ee4b172037b53b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/uz/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/uz/firefox-84.0.1.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "1f1cf131b3196886aa0f923c5dbaa279b86c3473dc048ce23d58fe811ca1266c"; + sha256 = "67539a5475aa12d25f8b83655cddc804d46b980e03908bb44f5378753abb649f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/vi/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/vi/firefox-84.0.1.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "b98507cd809abd28c51514448bf995661dede7c727808ab8c2db46da8da0a164"; + sha256 = "ad894dd659f5c86e0b094b709d0d336516e29dea1d1d9ff35f264e6606e59938"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/xh/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/xh/firefox-84.0.1.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha256 = "73de4ec29cd09610359909ada39820a119a15c3ae0cc1658c2e9b874801a9015"; + sha256 = "a43b653ad3a3d865c410103ccb66d3603a08cc37177d5279a1b326381631dcf5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/zh-CN/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/zh-CN/firefox-84.0.1.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "fea085476f4456133c1f0973121319f1c3efadcc50134cbf5ccde351bbe2ff06"; + sha256 = "73e877c33aa5553f90ffc0c68b7416bb988477e55f53632d9f78526ca11a89ba"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/83.0/linux-i686/zh-TW/firefox-83.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/84.0.1/linux-i686/zh-TW/firefox-84.0.1.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "5aebd374f2e73f83bec4c14239555d9f2771d3379280fc55f90f1ae0909be009"; + sha256 = "7f448ee87156e73cba4a9edcdd52299f6f70ef7660bad9ee6b7c60375d83e1e6"; } ]; } diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix index 1fbfdc2a7da64..70fde21823a3e 100644 --- a/pkgs/applications/networking/browsers/firefox/common.nix +++ b/pkgs/applications/networking/browsers/firefox/common.nix @@ -118,8 +118,9 @@ buildStdenv.mkDerivation ({ patches = [ ./env_var_for_system_dir.patch - ./no-buildconfig-ffx76.patch ] ++ + lib.optional (lib.versionOlder ffversion "83") ./no-buildconfig-ffx76.patch ++ + lib.optional (lib.versionAtLeast ffversion "84") ./no-buildconfig-ffx84.patch ++ # there are two flavors of pipewire support # The patches for the ESR release and the patches for the current stable @@ -141,13 +142,7 @@ buildStdenv.mkDerivation ({ url = "https://src.fedoraproject.org/rpms/firefox/raw/${fedora_revision}/f/${spec.name}"; }; in map mkPWPatch [ - { name = "pw1.patch"; sha256 = "1a7zvngn3k7dg886zmi38kmrsdzh2rrr46aw59bhr1gfmq8wlwn0"; } - { name = "pw2.patch"; sha256 = "17irg3yb2mchcy0z0nr4k65mwvkps467cvvczr10fnm06lhkhw1l"; } - { name = "pw3.patch"; sha256 = "12p6ql5ff2lfzlni6xkpz63h2xr6n2a9zf8hhjl99fj56rif6706"; } - { name = "pw4.patch"; sha256 = "0rvysc92rdm98s47w5lvbnrklrf7d299k3918qnldniyb4b9p4mg"; } - { name = "pw5.patch"; sha256 = "0kk2yxq4qkfwc4px6m08jrn18a7a7dhrngfiaw84r9ga6sgn0z00"; } { name = "pw6.patch"; sha256 = "12lhx9wjpw0ahbfmw07wsx76bb223mr453q9cg8cq951vyskch3s"; } - { name = "pw7.patch"; sha256 = "0afw7cfd48vn62zb9y5kd2l26fg44s3aq1kyg3gm4q3rj34xidf6"; } ]) ++ patches; @@ -352,6 +347,10 @@ buildStdenv.mkDerivation ({ }/lib:$(patchelf --print-rpath "$out"/lib/${binaryName}*/libxul.so)" \ "$out"/lib/${binaryName}*/libxul.so patchelf --add-needed ${xorg.libXScrnSaver.out}/lib/libXss.so $out/lib/${binaryName}/${binaryName} + ${lib.optionalString (pipewireSupport && lib.versionAtLeast ffversion "83") '' + patchelf --add-needed "${lib.getLib pipewire}/lib/libpipewire-0.3.so" \ + "$out"/lib/${binaryName}/${binaryName} + ''} ''; doInstallCheck = true; diff --git a/pkgs/applications/networking/browsers/firefox/no-buildconfig-ffx84.patch b/pkgs/applications/networking/browsers/firefox/no-buildconfig-ffx84.patch new file mode 100644 index 0000000000000..c4187fcda39ee --- /dev/null +++ b/pkgs/applications/networking/browsers/firefox/no-buildconfig-ffx84.patch @@ -0,0 +1,25 @@ +diff --git a/docshell/base/nsAboutRedirector.cpp b/docshell/base/nsAboutRedirector.cpp +index 10ac77b..0125d9b 100644 +--- a/docshell/base/nsAboutRedirector.cpp ++++ b/docshell/base/nsAboutRedirector.cpp +@@ -63,8 +63,6 @@ static const RedirEntry kRedirMap[] = { + {"about", "chrome://global/content/aboutAbout.html", 0}, + {"addons", "chrome://mozapps/content/extensions/extensions.xhtml", + nsIAboutModule::ALLOW_SCRIPT}, +- {"buildconfig", "chrome://global/content/buildconfig.html", +- nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT}, + {"checkerboard", "chrome://global/content/aboutCheckerboard.html", + nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT | + nsIAboutModule::ALLOW_SCRIPT}, +diff --git a/toolkit/content/jar.mn b/toolkit/content/jar.mn +index c83b3e2..d543140 100644 +--- a/toolkit/content/jar.mn ++++ b/toolkit/content/jar.mn +@@ -40,7 +40,6 @@ toolkit.jar: + content/global/plugins.css + content/global/plugins.js + content/global/browser-child.js +-* content/global/buildconfig.html + content/global/buildconfig.css + content/global/contentAreaUtils.js + content/global/datepicker.xhtml diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix index 7f1d9763e4246..b4e0d9c582672 100644 --- a/pkgs/applications/networking/browsers/firefox/packages.nix +++ b/pkgs/applications/networking/browsers/firefox/packages.nix @@ -7,23 +7,12 @@ in rec { firefox = common rec { pname = "firefox"; - ffversion = "83.0"; + ffversion = "84.0.1"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz"; - sha512 = "3va5a9471677jfzkhqp8xkba45n0bcpphbabhqbcbnps6p85m3y98pl5jy9q7cpq3a6gxc4ax7bp90yz2nfvfq7i64iz397xpprri2a"; + sha512 = "0sl93h7pjiznabv6865pdbal08nlqncnv3g40l02mgwbphjh5iqrr1bz14khaf58h4v1la090cj7z0gmd0c10xfrx6z7wngm152zz75"; }; - patches = [ - # Fix compilation on aarch64 with newer rust version - # See https://bugzilla.mozilla.org/show_bug.cgi?id=1677690 - # and https://bugzilla.redhat.com/show_bug.cgi?id=1897675 - (fetchpatch { - name = "aarch64-simd-bgz-1677690.patch"; - url = "https://github.com/mozilla/gecko-dev/commit/71597faac0fde4f608a60dd610d0cefac4972cc3.patch"; - sha256 = "1f61nsgbv2c2ylgjs7wdahxrrlgc19gjy5nzs870zr1g832ybwin"; - }) - ]; - meta = { description = "A web browser built from Firefox source tree"; homepage = "http://www.mozilla.com/en-US/firefox/"; diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix index a9888c3c47bee..88fb6af4b0165 100644 --- a/pkgs/applications/networking/browsers/firefox/wrapper.nix +++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix @@ -1,5 +1,5 @@ { stdenv, lib, makeDesktopItem, makeWrapper, lndir, config -, replace, fetchurl, zip, unzip, jq, xdg_utils +, replace, fetchurl, zip, unzip, jq, xdg_utils, writeText ## various stuff that can be plugged in , flashplayer, hal-flash @@ -97,12 +97,17 @@ let # EXTRA PREF CHANGES # # # ######################### - policiesJson = builtins.toFile "policies.json" - (builtins.toJSON enterprisePolicies); + policiesJson = writeText "policies.json" (builtins.toJSON enterprisePolicies); usesNixExtensions = nixExtensions != null; - extensions = builtins.map (a: + nameArray = builtins.map(a: a.name) (if usesNixExtensions then nixExtensions else []); + + # Check that every extension has a unqiue .name attribute + # and an extid attribute + extensions = if nameArray != (lib.unique nameArray) then + throw "Firefox addon name needs to be unique" + else builtins.map (a: if ! (builtins.hasAttr "extid" a) then throw "nixExtensions has an invalid entry. Missing extid attribute. Please use fetchfirefoxaddon" else @@ -128,12 +133,19 @@ let }; } ) {} extensions; - } + } // + { + Extensions = { + Install = lib.foldr (e: ret: + ret ++ [ "${e.outPath}/${e.extid}.xpi" ] + ) [] extensions; + }; + } // extraPolicies; }; - mozillaCfg = builtins.toFile "mozilla.cfg" '' -// First line must be a comment + mozillaCfg = writeText "mozilla.cfg" '' + // First line must be a comment // Disables addon signature checking // to be able to install addons that do not have an extid @@ -320,18 +332,13 @@ let # preparing for autoconfig mkdir -p "$out/lib/${firefoxLibName}/defaults/pref" - cat > "$out/lib/${firefoxLibName}/defaults/pref/autoconfig.js" <<EOF - pref("general.config.filename", "mozilla.cfg"); - pref("general.config.obscure_value", 0); - EOF + echo 'pref("general.config.filename", "mozilla.cfg");' > "$out/lib/${firefoxLibName}/defaults/pref/autoconfig.js" + echo 'pref("general.config.obscure_value", 0);' >> "$out/lib/${firefoxLibName}/defaults/pref/autoconfig.js" cat > "$out/lib/${firefoxLibName}/mozilla.cfg" < ${mozillaCfg} mkdir -p $out/lib/${firefoxLibName}/distribution/extensions - for i in ${toString extensions}; do - ln -s -t $out/lib/${firefoxLibName}/distribution/extensions $i/* - done ############################# # # # END EXTRA PREF CHANGES # diff --git a/pkgs/applications/networking/browsers/palemoon/default.nix b/pkgs/applications/networking/browsers/palemoon/default.nix index 5d299f3349ed0..56acb453a80cd 100644 --- a/pkgs/applications/networking/browsers/palemoon/default.nix +++ b/pkgs/applications/networking/browsers/palemoon/default.nix @@ -1,6 +1,6 @@ { stdenv, lib, fetchFromGitHub, writeScript, desktop-file-utils -, pkgconfig, autoconf213, alsaLib, bzip2, cairo -, dbus, dbus-glib, ffmpeg_3, file, fontconfig, freetype +, pkg-config, autoconf213, alsaLib, bzip2, cairo +, dbus, dbus-glib, ffmpeg, file, fontconfig, freetype , gnome2, gnum4, gtk2, hunspell, libevent, libjpeg , libnotify, libstartup_notification, wrapGAppsHook , libGLU, libGL, perl, python2, libpulseaudio @@ -11,19 +11,19 @@ let - libPath = lib.makeLibraryPath [ ffmpeg_3 libpulseaudio ]; + libPath = lib.makeLibraryPath [ ffmpeg libpulseaudio ]; gtkVersion = if withGTK3 then "3" else "2"; in stdenv.mkDerivation rec { pname = "palemoon"; - version = "28.16.0"; + version = "28.17.0"; src = fetchFromGitHub { githubBase = "repo.palemoon.org"; owner = "MoonchildProductions"; repo = "Pale-Moon"; rev = "${version}_Release"; - sha256 = "1svwbiar7c38c8xfw249mwnvayqq5868nkks7cbv9nyf2m9yap56"; + sha256 = "0478xn5skpls91hkraykc308hppdc8vj9xbgvlm5wkv0y4dp7h5x"; fetchSubmodules = true; }; @@ -43,11 +43,11 @@ in stdenv.mkDerivation rec { ''; nativeBuildInputs = [ - desktop-file-utils file gnum4 perl pkgconfig python2 wget which wrapGAppsHook + desktop-file-utils file gnum4 perl pkg-config python2 wget which wrapGAppsHook ]; buildInputs = [ - alsaLib bzip2 cairo dbus dbus-glib ffmpeg_3 fontconfig freetype + alsaLib bzip2 cairo dbus dbus-glib ffmpeg fontconfig freetype gnome2.GConf gtk2 hunspell libevent libjpeg libnotify libstartup_notification libGLU libGL libpulseaudio unzip yasm zip zlib @@ -61,7 +61,7 @@ in stdenv.mkDerivation rec { enableParallelBuilding = true; configurePhase = '' - export MOZCONFIG=$(pwd)/mozconfig + export MOZCONFIG=$PWD/mozconfig export MOZ_NOSPAM=1 # Keep this similar to the official .mozconfig file, @@ -114,18 +114,18 @@ in stdenv.mkDerivation rec { ' ''; - buildPhase = "$src/mach build"; + buildPhase = "./mach build"; installPhase = '' - $src/mach install + ./mach install desktop-file-install --dir=$out/share/applications \ - $src/palemoon/branding/official/palemoon.desktop + ./palemoon/branding/official/palemoon.desktop for iconname in default{16,22,24,32,48,256} mozicon128; do n=''${iconname//[^0-9]/} size=$n"x"$n - install -Dm644 $src/palemoon/branding/official/$iconname.png $out/share/icons/hicolor/$size/apps/palemoon.png + install -Dm644 ./palemoon/branding/official/$iconname.png $out/share/icons/hicolor/$size/apps/palemoon.png done ''; diff --git a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix index 222b1b5b767cf..ab8a21c5b71b7 100644 --- a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix +++ b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix @@ -91,19 +91,19 @@ let fteLibPath = makeLibraryPath [ stdenv.cc.cc gmp ]; # Upstream source - version = "10.0.5"; + version = "10.0.7"; lang = "en-US"; srcs = { x86_64-linux = fetchurl { url = "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz"; - sha256 = "1cxh39x69m4lgqin5k5p67gs9g26w7cnlbdpjqi8dw47y0bpr9xw"; + sha256 = "1phqsdf9lav0s111chlgyh4xiq2rm5zcxbx676i9711lkmc5l053"; }; i686-linux = fetchurl { url = "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz"; - sha256 = "1cyg5ic7mrj6x1gxw5w609933d9ripa5b5gxyqnvnxfa23dkh608"; + sha256 = "1nkppwdcjbrx8nh3d6qvvkgd5by6ja5ckjgpbkhavyy2pqlxyqk8"; }; }; in diff --git a/pkgs/applications/networking/browsers/ungoogled-chromium/browser.nix b/pkgs/applications/networking/browsers/ungoogled-chromium/browser.nix deleted file mode 100644 index c23a8cead3a77..0000000000000 --- a/pkgs/applications/networking/browsers/ungoogled-chromium/browser.nix +++ /dev/null @@ -1,86 +0,0 @@ -{ stdenv, mkChromiumDerivation, channel, enableWideVine }: - -with stdenv.lib; - -mkChromiumDerivation (base: rec { - name = "chromium-browser"; - packageName = "chromium"; - buildTargets = [ "mksnapshot" "chrome_sandbox" "chrome" ]; - - outputs = ["out" "sandbox"]; - - sandboxExecutableName = "__chromium-suid-sandbox"; - - installPhase = '' - mkdir -p "$libExecPath" - cp -v "$buildPath/"*.so "$buildPath/"*.pak "$buildPath/"*.bin "$libExecPath/" - cp -v "$buildPath/icudtl.dat" "$libExecPath/" - cp -vLR "$buildPath/locales" "$buildPath/resources" "$libExecPath/" - cp -v "$buildPath/chrome" "$libExecPath/$packageName" - - # Swiftshader - # See https://stackoverflow.com/a/4264351/263061 for the find invocation. - if [ -n "$(find "$buildPath/swiftshader/" -maxdepth 1 -name '*.so' -print -quit)" ]; then - echo "Swiftshader files found; installing" - mkdir -p "$libExecPath/swiftshader" - cp -v "$buildPath/swiftshader/"*.so "$libExecPath/swiftshader/" - else - echo "Swiftshader files not found" - fi - - mkdir -p "$sandbox/bin" - cp -v "$buildPath/chrome_sandbox" "$sandbox/bin/${sandboxExecutableName}" - - mkdir -vp "$out/share/man/man1" - cp -v "$buildPath/chrome.1" "$out/share/man/man1/$packageName.1" - - for icon_file in chrome/app/theme/chromium/product_logo_*[0-9].png; do - num_and_suffix="''${icon_file##*logo_}" - icon_size="''${num_and_suffix%.*}" - expr "$icon_size" : "^[0-9][0-9]*$" || continue - logo_output_prefix="$out/share/icons/hicolor" - logo_output_path="$logo_output_prefix/''${icon_size}x''${icon_size}/apps" - mkdir -vp "$logo_output_path" - cp -v "$icon_file" "$logo_output_path/$packageName.png" - done - - # Install Desktop Entry - install -D chrome/installer/linux/common/desktop.template \ - $out/share/applications/chromium-browser.desktop - - substituteInPlace $out/share/applications/chromium-browser.desktop \ - --replace "@@MENUNAME@@" "Chromium" \ - --replace "@@PACKAGE@@" "chromium" \ - --replace "Exec=/usr/bin/@@USR_BIN_SYMLINK_NAME@@" "Exec=chromium" - - # Append more mime types to the end - sed -i '/^MimeType=/ s,$,x-scheme-handler/webcal;x-scheme-handler/mailto;x-scheme-handler/about;x-scheme-handler/unknown,' \ - $out/share/applications/chromium-browser.desktop - - # See https://github.com/NixOS/nixpkgs/issues/12433 - sed -i \ - -e '/\[Desktop Entry\]/a\' \ - -e 'StartupWMClass=chromium-browser' \ - $out/share/applications/chromium-browser.desktop - ''; - - passthru = { inherit sandboxExecutableName; }; - - requiredSystemFeatures = [ "big-parallel" ]; - - meta = { - description = "An open source web browser from Google, with dependencies on Google web services removed"; - longDescription = '' - Chromium is an open source web browser from Google that aims to build a - safer, faster, and more stable way for all Internet users to experience - the web. It has a minimalist user interface and provides the vast majority - of source code for Google Chrome (which has some additional features). - ''; - homepage = "https://github.com/Eloston/ungoogled-chromium"; - maintainers = with maintainers; [ squalus ]; - license = if enableWideVine then licenses.unfree else licenses.bsd3; - platforms = platforms.linux; - hydraPlatforms = if channel == "stable" then ["aarch64-linux" "x86_64-linux"] else []; - timeout = 172800; # 48 hours (increased from the Hydra default of 10h) - }; -}) diff --git a/pkgs/applications/networking/browsers/ungoogled-chromium/common.nix b/pkgs/applications/networking/browsers/ungoogled-chromium/common.nix deleted file mode 100644 index 17814c26caa4d..0000000000000 --- a/pkgs/applications/networking/browsers/ungoogled-chromium/common.nix +++ /dev/null @@ -1,345 +0,0 @@ -{ stdenv, lib, llvmPackages, gnChromium, ninja, which, nodejs, fetchpatch, fetchurl - -# default dependencies -, gnutar, bzip2, flac, speex, libopus -, libevent, expat, libjpeg, snappy -, libpng, libcap -, xdg_utils, yasm, nasm, minizip, libwebp -, libusb1, pciutils, nss, re2 - -, python2Packages, perl, pkgconfig -, nspr, systemd, kerberos -, util-linux, alsaLib -, bison, gperf -, glib, gtk3, dbus-glib -, glibc -, libXScrnSaver, libXcursor, libXtst, libGLU, libGL -, protobuf, speechd, libXdamage, cups -, ffmpeg, libxslt, libxml2, at-spi2-core -, jre8 -, pipewire_0_2 -, libva - -# optional dependencies -, libgcrypt ? null # gnomeSupport || cupsSupport -, libdrm ? null, wayland ? null, mesa ? null, libxkbcommon ? null # useOzone - -# package customization -, useOzone ? true -, gnomeSupport ? false, gnome ? null -, gnomeKeyringSupport ? false, libgnome-keyring3 ? null -, proprietaryCodecs ? true -, cupsSupport ? true -, pulseSupport ? false, libpulseaudio ? null -, ungoogled-chromium -, ungoogled ? false - -, channel -, upstream-info -}: - -buildFun: - -with stdenv.lib; - -let - jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 - - # The additional attributes for creating derivations based on the chromium - # source tree. - extraAttrs = buildFun base; - - githubPatch = commit: sha256: fetchpatch { - url = "https://github.com/chromium/chromium/commit/${commit}.patch"; - inherit sha256; - }; - - mkGnFlags = - let - # Serialize Nix types into GN types according to this document: - # https://source.chromium.org/gn/gn/+/master:docs/language.md - mkGnString = value: "\"${escape ["\"" "$" "\\"] value}\""; - sanitize = value: - if value == true then "true" - else if value == false then "false" - else if isList value then "[${concatMapStringsSep ", " sanitize value}]" - else if isInt value then toString value - else if isString value then mkGnString value - else throw "Unsupported type for GN value `${value}'."; - toFlag = key: value: "${key}=${sanitize value}"; - in attrs: concatStringsSep " " (attrValues (mapAttrs toFlag attrs)); - - # https://source.chromium.org/chromium/chromium/src/+/master:build/linux/unbundle/replace_gn_files.py - gnSystemLibraries = [ - "ffmpeg" - "flac" - "libjpeg" - "libpng" - "libwebp" - "libxslt" - "opus" - "snappy" - "zlib" - ]; - - opusWithCustomModes = libopus.override { - withCustomModes = true; - }; - - defaultDependencies = [ - bzip2 flac speex opusWithCustomModes - libevent expat libjpeg snappy - libpng libcap - xdg_utils minizip libwebp - libusb1 re2 - ffmpeg libxslt libxml2 - nasm - ]; - - # build paths and release info - packageName = extraAttrs.packageName or extraAttrs.name; - buildType = "Release"; - buildPath = "out/${buildType}"; - libExecPath = "$out/libexec/${packageName}"; - - versionRange = min-version: upto-version: - let inherit (upstream-info) version; - result = versionAtLeast version min-version && versionOlder version upto-version; - stable-version = (importJSON ./upstream-info.json).stable.version; - in if versionAtLeast stable-version upto-version - then warn "chromium: stable version ${stable-version} is newer than a patchset bounded at ${upto-version}. You can safely delete it." - result - else result; - - ungoogler = - let versionEntry = (import ./ungoogled-src.nix)."${upstream-info.version}"; - in ungoogled-chromium { - inherit (versionEntry) rev sha256; - }; - base = rec { - name = "${packageName}-unwrapped-${version}"; - inherit (upstream-info) version; - inherit channel packageName buildType buildPath; - - src = fetchurl { - url = "https://commondatastorage.googleapis.com/chromium-browser-official/chromium-${version}.tar.xz"; - inherit (upstream-info) sha256; - }; - - nativeBuildInputs = [ - llvmPackages.lldClang.bintools - ninja which python2Packages.python perl pkgconfig - python2Packages.ply python2Packages.jinja2 nodejs - gnutar python2Packages.setuptools - ]; - - buildInputs = defaultDependencies ++ [ - nspr nss systemd - util-linux alsaLib - bison gperf kerberos - glib gtk3 dbus-glib - libXScrnSaver libXcursor libXtst libGLU libGL - pciutils protobuf speechd libXdamage at-spi2-core - jre - pipewire_0_2 - libva - ] ++ optional gnomeKeyringSupport libgnome-keyring3 - ++ optionals gnomeSupport [ gnome.GConf libgcrypt ] - ++ optionals cupsSupport [ libgcrypt cups ] - ++ optional pulseSupport libpulseaudio - ++ optionals useOzone [ libdrm wayland mesa.drivers libxkbcommon ]; - - patches = [ - ./patches/no-build-timestamps.patch # Optional patch to use SOURCE_DATE_EPOCH in compute_build_timestamp.py (should be upstreamed) - ./patches/widevine-79.patch # For bundling Widevine (DRM), might be replaceable via bundle_widevine_cdm=true in gnFlags - # ++ optional (versionRange "68" "72") ( githubPatch "<patch>" "0000000000000000000000000000000000000000000000000000000000000000" ) - ]; - - postPatch = '' - # remove unused third-party - for lib in ${toString gnSystemLibraries}; do - if [ -d "third_party/$lib" ]; then - find "third_party/$lib" -type f \ - \! -path "third_party/$lib/chromium/*" \ - \! -path "third_party/$lib/google/*" \ - \! -path "third_party/harfbuzz-ng/utils/hb_scoped.h" \ - \! -regex '.*\.\(gn\|gni\|isolate\)' \ - -delete - fi - done - - # Required for patchShebangs (unsupported interpreter directive, basename: invalid option -- '*', etc.): - substituteInPlace native_client/SConstruct --replace "#! -*- python -*-" "" - if [ -e third_party/harfbuzz-ng/src/src/update-unicode-tables.make ]; then - substituteInPlace third_party/harfbuzz-ng/src/src/update-unicode-tables.make \ - --replace "/usr/bin/env -S make -f" "/usr/bin/make -f" - fi - - # We want to be able to specify where the sandbox is via CHROME_DEVEL_SANDBOX - substituteInPlace sandbox/linux/suid/client/setuid_sandbox_host.cc \ - --replace \ - 'return sandbox_binary;' \ - 'return base::FilePath(GetDevelSandboxPath());' - - substituteInPlace services/audio/audio_sandbox_hook_linux.cc \ - --replace \ - '/usr/share/alsa/' \ - '${alsaLib}/share/alsa/' \ - --replace \ - '/usr/lib/x86_64-linux-gnu/gconv/' \ - '${glibc}/lib/gconv/' \ - --replace \ - '/usr/share/locale/' \ - '${glibc}/share/locale/' - - sed -i -e 's@"\(#!\)\?.*xdg-@"\1${xdg_utils}/bin/xdg-@' \ - chrome/browser/shell_integration_linux.cc - - sed -i -e '/lib_loader.*Load/s!"\(libudev\.so\)!"${lib.getLib systemd}/lib/\1!' \ - device/udev_linux/udev?_loader.cc - - sed -i -e '/libpci_loader.*Load/s!"\(libpci\.so\)!"${pciutils}/lib/\1!' \ - gpu/config/gpu_info_collector_linux.cc - - # Allow to put extensions into the system-path. - sed -i -e 's,/usr,/run/current-system/sw,' chrome/common/chrome_paths.cc - - patchShebangs . - # use our own nodejs - mkdir -p third_party/node/linux/node-linux-x64/bin - ln -s "$(command -v node)" third_party/node/linux/node-linux-x64/bin/node - - # Allow building against system libraries in official builds - sed -i 's/OFFICIAL_BUILD/GOOGLE_CHROME_BUILD/' tools/generate_shim_headers/generate_shim_headers.py - - '' + optionalString stdenv.isAarch64 '' - substituteInPlace build/toolchain/linux/BUILD.gn \ - --replace 'toolprefix = "aarch64-linux-gnu-"' 'toolprefix = ""' - '' + optionalString ungoogled '' - ${ungoogler}/utils/prune_binaries.py . ${ungoogler}/pruning.list || echo "some errors" - ${ungoogler}/utils/patches.py . ${ungoogler}/patches - ${ungoogler}/utils/domain_substitution.py apply -r ${ungoogler}/domain_regex.list -f ${ungoogler}/domain_substitution.list -c ./ungoogled-domsubcache.tar.gz . - ''; - - gnFlags = mkGnFlags ({ - custom_toolchain = "//build/toolchain/linux/unbundle:default"; - host_toolchain = "//build/toolchain/linux/unbundle:default"; - is_official_build = true; - - use_vaapi = !stdenv.isAarch64; # TODO: Remove once M88 is released - use_sysroot = false; - use_gnome_keyring = gnomeKeyringSupport; - use_gio = gnomeSupport; - # ninja: error: '../../native_client/toolchain/linux_x86/pnacl_newlib/bin/x86_64-nacl-objcopy', - # needed by 'nacl_irt_x86_64.nexe', missing and no known rule to make it - enable_nacl = false; - # Enabling the Widevine component here doesn't affect whether we can - # redistribute the chromium package; the Widevine component is either - # added later in the wrapped -wv build or downloaded from Google. - enable_widevine = true; - use_cups = cupsSupport; - # Provides the enable-webrtc-pipewire-capturer flag to support Wayland screen capture. - rtc_use_pipewire = true; - - treat_warnings_as_errors = false; - clang_use_chrome_plugins = false; - blink_symbol_level = 0; - symbol_level = 0; - fieldtrial_testing_like_official_build = true; - - # Google API keys, see: - # http://www.chromium.org/developers/how-tos/api-keys - # Note: These are for NixOS/nixpkgs use ONLY. For your own distribution, - # please get your own set of keys. - google_api_key = "AIzaSyDGi15Zwl11UNe6Y-5XW_upsfyw31qwZPI"; - google_default_client_id = "404761575300.apps.googleusercontent.com"; - google_default_client_secret = "9rIFQjfnkykEmqb6FfjJQD1D"; - } // optionalAttrs proprietaryCodecs { - # enable support for the H.264 codec - proprietary_codecs = true; - enable_hangout_services_extension = true; - ffmpeg_branding = "Chrome"; - } // optionalAttrs pulseSupport { - use_pulseaudio = true; - link_pulseaudio = true; - } // optionalAttrs useOzone { - use_ozone = true; - use_xkbcommon = true; - use_glib = true; - use_gtk = true; - use_system_libwayland = true; - use_system_minigbm = true; - use_system_libdrm = true; - system_wayland_scanner_path = "${wayland}/bin/wayland-scanner"; - } // optionalAttrs ungoogled { - chrome_pgo_phase = 0; - enable_hangout_services_extension = false; - enable_js_type_check = false; - enable_mdns = false; - enable_nacl_nonsfi = false; - enable_one_click_signin = false; - enable_reading_list = false; - enable_remoting = false; - enable_reporting = false; - enable_service_discovery = false; - exclude_unwind_tables = true; - google_api_key = ""; - google_default_client_id = ""; - google_default_client_secret = ""; - safe_browsing_mode = 0; - use_official_google_api_keys = false; - use_unofficial_version_number = false; - } // (extraAttrs.gnFlags or {})); - - configurePhase = '' - runHook preConfigure - - # This is to ensure expansion of $out. - libExecPath="${libExecPath}" - python build/linux/unbundle/replace_gn_files.py --system-libraries ${toString gnSystemLibraries} - ${gnChromium}/bin/gn gen --args=${escapeShellArg gnFlags} out/Release | tee gn-gen-outputs.txt - - # Fail if `gn gen` contains a WARNING. - grep -o WARNING gn-gen-outputs.txt && echo "Found gn WARNING, exiting nix build" && exit 1 - - runHook postConfigure - ''; - - # Don't spam warnings about unknown warning options. This is useful because - # our Clang is always older than Chromium's and the build logs have a size - # of approx. 25 MB without this option (and this saves e.g. 66 %). - NIX_CFLAGS_COMPILE = "-Wno-unknown-warning-option"; - - buildPhase = let - buildCommand = target: '' - ninja -C "${buildPath}" -j$NIX_BUILD_CORES -l$NIX_BUILD_CORES "${target}" - ( - source chrome/installer/linux/common/installer.include - PACKAGE=$packageName - MENUNAME="Chromium" - process_template chrome/app/resources/manpage.1.in "${buildPath}/chrome.1" - ) - ''; - targets = extraAttrs.buildTargets or []; - commands = map buildCommand targets; - in concatStringsSep "\n" commands; - - postFixup = '' - # Make sure that libGLESv2 is found by dlopen (if using EGL). - chromiumBinary="$libExecPath/$packageName" - origRpath="$(patchelf --print-rpath "$chromiumBinary")" - patchelf --set-rpath "${libGL}/lib:$origRpath" "$chromiumBinary" - ''; - - passthru = { - updateScript = ./update.py; - chromiumDeps = { - gn = gnChromium; - }; - }; - }; - -# Remove some extraAttrs we supplied to the base attributes already. -in stdenv.mkDerivation (base // removeAttrs extraAttrs [ - "name" "gnFlags" "buildTargets" -] // { passthru = base.passthru // (extraAttrs.passthru or {}); }) diff --git a/pkgs/applications/networking/browsers/ungoogled-chromium/default.nix b/pkgs/applications/networking/browsers/ungoogled-chromium/default.nix deleted file mode 100644 index b75d271ace55d..0000000000000 --- a/pkgs/applications/networking/browsers/ungoogled-chromium/default.nix +++ /dev/null @@ -1,214 +0,0 @@ -{ newScope, config, stdenv, fetchurl, makeWrapper -, llvmPackages_11, ed, gnugrep, coreutils, xdg_utils -, glib, gtk3, gnome3, gsettings-desktop-schemas, gn, fetchgit -, libva ? null -, pipewire_0_2 -, gcc, nspr, nss, runCommand -, lib - -# package customization -# Note: enable* flags should not require full rebuilds (i.e. only affect the wrapper) -, channel ? "stable" -, gnomeSupport ? false, gnome ? null -, gnomeKeyringSupport ? false -, proprietaryCodecs ? true -, enablePepperFlash ? false -, enableWideVine ? false -, enableVaapi ? false # Disabled by default due to unofficial support -, ungoogled ? true -, cupsSupport ? true -, pulseSupport ? config.pulseaudio or stdenv.isLinux -, commandLineArgs ? "" -}: - -let - llvmPackages = llvmPackages_11; - stdenv = llvmPackages.stdenv; - - callPackage = newScope chromium; - - chromium = rec { - inherit stdenv llvmPackages; - - upstream-info = (lib.importJSON ./upstream-info.json).${channel}; - - mkChromiumDerivation = callPackage ./common.nix ({ - inherit channel gnome gnomeSupport gnomeKeyringSupport proprietaryCodecs - cupsSupport pulseSupport; - inherit ungoogled; - gnChromium = gn.overrideAttrs (oldAttrs: { - inherit (upstream-info.deps.gn) version; - src = fetchgit { - inherit (upstream-info.deps.gn) url rev sha256; - }; - }); - }); - - browser = callPackage ./browser.nix { inherit channel enableWideVine; }; - - plugins = callPackage ./plugins.nix { - inherit enablePepperFlash; - }; - - ungoogled-chromium = callPackage ./ungoogled.nix {}; - }; - - pkgSuffix = if channel == "dev" then "unstable" else channel; - pkgName = "google-chrome-${pkgSuffix}"; - chromeSrc = fetchurl { - urls = map (repo: "${repo}/${pkgName}/${pkgName}_${version}-1_amd64.deb") [ - "https://dl.google.com/linux/chrome/deb/pool/main/g" - "http://95.31.35.30/chrome/pool/main/g" - "http://mirror.pcbeta.com/google/chrome/deb/pool/main/g" - "http://repo.fdzh.org/chrome/deb/pool/main/g" - ]; - sha256 = chromium.upstream-info.sha256bin64; - }; - - mkrpath = p: "${lib.makeSearchPathOutput "lib" "lib64" p}:${lib.makeLibraryPath p}"; - widevineCdm = stdenv.mkDerivation { - name = "chrome-widevine-cdm"; - - src = chromeSrc; - - phases = [ "unpackPhase" "patchPhase" "installPhase" "checkPhase" ]; - - unpackCmd = let - widevineCdmPath = - if channel == "stable" then - "./opt/google/chrome/WidevineCdm" - else if channel == "beta" then - "./opt/google/chrome-beta/WidevineCdm" - else if channel == "dev" then - "./opt/google/chrome-unstable/WidevineCdm" - else - throw "Unknown chromium channel."; - in '' - # Extract just WidevineCdm from upstream's .deb file - ar p "$src" data.tar.xz | tar xJ "${widevineCdmPath}" - - # Move things around so that we don't have to reference a particular - # chrome-* directory later. - mv "${widevineCdmPath}" ./ - - # unpackCmd wants a single output directory; let it take WidevineCdm/ - rm -rf opt - ''; - - doCheck = true; - checkPhase = '' - ! find -iname '*.so' -exec ldd {} + | grep 'not found' - ''; - - PATCH_RPATH = mkrpath [ gcc.cc glib nspr nss ]; - - patchPhase = '' - patchelf --set-rpath "$PATCH_RPATH" _platform_specific/linux_x64/libwidevinecdm.so - ''; - - installPhase = '' - mkdir -p $out/WidevineCdm - cp -a * $out/WidevineCdm/ - ''; - - meta = { - platforms = [ "x86_64-linux" ]; - license = lib.licenses.unfree; - }; - }; - - suffix = if channel != "stable" then "-" + channel else ""; - - sandboxExecutableName = chromium.browser.passthru.sandboxExecutableName; - - version = chromium.browser.version; - - # We want users to be able to enableWideVine without rebuilding all of - # chromium, so we have a separate derivation here that copies chromium - # and adds the unfree WidevineCdm. - chromiumWV = let browser = chromium.browser; in if enableWideVine then - runCommand (browser.name + "-wv") { version = browser.version; } - '' - mkdir -p $out - cp -a ${browser}/* $out/ - chmod u+w $out/libexec/chromium - cp -a ${widevineCdm}/WidevineCdm $out/libexec/chromium/ - '' - else browser; - -in stdenv.mkDerivation { - name = "ungoogled-chromium${suffix}-${version}"; - inherit version; - - buildInputs = [ - makeWrapper ed - - # needed for GSETTINGS_SCHEMAS_PATH - gsettings-desktop-schemas glib gtk3 - - # needed for XDG_ICON_DIRS - gnome3.adwaita-icon-theme - ]; - - outputs = ["out" "sandbox"]; - - buildCommand = let - browserBinary = "${chromiumWV}/libexec/chromium/chromium"; - getWrapperFlags = plugin: "$(< \"${plugin}/nix-support/wrapper-flags\")"; - libPath = stdenv.lib.makeLibraryPath [ libva pipewire_0_2 ]; - - in with stdenv.lib; '' - mkdir -p "$out/bin" - - 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} - - ed -v -s "$out/bin/chromium" << EOF - 2i - - if [ -x "/run/wrappers/bin/${sandboxExecutableName}" ] - then - export CHROME_DEVEL_SANDBOX="/run/wrappers/bin/${sandboxExecutableName}" - else - export CHROME_DEVEL_SANDBOX="$sandbox/bin/${sandboxExecutableName}" - fi - - '' + lib.optionalString (libPath != "") '' - # To avoid loading .so files from cwd, LD_LIBRARY_PATH here must not - # contain an empty section before or after a colon. - export LD_LIBRARY_PATH="\$LD_LIBRARY_PATH\''${LD_LIBRARY_PATH:+:}${libPath}" - '' + '' - - # libredirect causes chromium to deadlock on startup - export LD_PRELOAD="\$(echo -n "\$LD_PRELOAD" | ${coreutils}/bin/tr ':' '\n' | ${gnugrep}/bin/grep -v /lib/libredirect\\\\.so$ | ${coreutils}/bin/tr '\n' ':')" - - export XDG_DATA_DIRS=$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH\''${XDG_DATA_DIRS:+:}\$XDG_DATA_DIRS - - # Mainly for xdg-open but also other xdg-* tools: - export PATH="${xdg_utils}/bin\''${PATH:+:}\$PATH" - - . - w - EOF - - ln -sv "${chromium.browser.sandbox}" "$sandbox" - - ln -s "$out/bin/chromium" "$out/bin/chromium-browser" - - mkdir -p "$out/share" - for f in '${chromium.browser}'/share/*; do # hello emacs */ - ln -s -t "$out/share/" "$f" - done - ''; - - inherit (chromium.browser) packageName; - meta = chromium.browser.meta; - passthru = { - inherit (chromium) upstream-info browser; - mkDerivation = chromium.mkChromiumDerivation; - inherit chromeSrc sandboxExecutableName; - updateScript = ./update.py; - }; -} diff --git a/pkgs/applications/networking/browsers/ungoogled-chromium/patches/no-build-timestamps.patch b/pkgs/applications/networking/browsers/ungoogled-chromium/patches/no-build-timestamps.patch deleted file mode 100644 index 6b788f43d29c0..0000000000000 --- a/pkgs/applications/networking/browsers/ungoogled-chromium/patches/no-build-timestamps.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- chromium-70.0.3538.67/build/compute_build_timestamp.py.orig 2018-11-02 16:00:34.368933077 +0200 -+++ chromium-70.0.3538.67/build/compute_build_timestamp.py 2018-11-08 04:06:21.658105129 +0200 -@@ -94,6 +94,14 @@ - 'build_type', help='The type of build', choices=('official', 'default')) - args = argument_parser.parse_args() - -+ # I don't trust LASTCHANGE magic, and I definelly want something deterministic here -+ SOURCE_DATE_EPOCH = os.getenv("SOURCE_DATE_EPOCH", None) -+ if SOURCE_DATE_EPOCH is not None: -+ print(SOURCE_DATE_EPOCH) -+ return 0 -+ else: -+ raise RuntimeError("SOURCE_DATE_EPOCH not set") -+ - # The mtime of the revision in build/util/LASTCHANGE is stored in a file - # next to it. Read it, to get a deterministic time close to "now". - # That date is then modified as described at the top of the file so that diff --git a/pkgs/applications/networking/browsers/ungoogled-chromium/patches/widevine-79.patch b/pkgs/applications/networking/browsers/ungoogled-chromium/patches/widevine-79.patch deleted file mode 100644 index 32f0ae2fb5e66..0000000000000 --- a/pkgs/applications/networking/browsers/ungoogled-chromium/patches/widevine-79.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/third_party/widevine/cdm/BUILD.gn b/third_party/widevine/cdm/BUILD.gn -index ed0e2f5208b..5b431a030d5 100644 ---- a/third_party/widevine/cdm/BUILD.gn -+++ b/third_party/widevine/cdm/BUILD.gn -@@ -14,7 +14,7 @@ buildflag_header("buildflags") { - - flags = [ - "ENABLE_WIDEVINE=$enable_widevine", -- "BUNDLE_WIDEVINE_CDM=$bundle_widevine_cdm", -+ "BUNDLE_WIDEVINE_CDM=true", - "ENABLE_WIDEVINE_CDM_COMPONENT=$enable_widevine_cdm_component", - ] - } diff --git a/pkgs/applications/networking/browsers/ungoogled-chromium/plugins.nix b/pkgs/applications/networking/browsers/ungoogled-chromium/plugins.nix deleted file mode 100644 index eef1c5ef38c28..0000000000000 --- a/pkgs/applications/networking/browsers/ungoogled-chromium/plugins.nix +++ /dev/null @@ -1,92 +0,0 @@ -{ stdenv, gcc -, jshon -, glib -, nspr -, nss -, fetchzip -, enablePepperFlash ? false - -, upstream-info -}: - -with stdenv.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 = stdenv.lib.licenses.unfree; - maintainers = with stdenv.lib.maintainers; [ taku0 ]; - platforms = platforms.x86_64; - }; - }; - -in { - enabled = optional enablePepperFlash flash; -} diff --git a/pkgs/applications/networking/browsers/ungoogled-chromium/ungoogled-src.nix b/pkgs/applications/networking/browsers/ungoogled-chromium/ungoogled-src.nix deleted file mode 100644 index 26f2f730a41d6..0000000000000 --- a/pkgs/applications/networking/browsers/ungoogled-chromium/ungoogled-src.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ - "87.0.4280.88" = { - rev = "87.0.4280.88-1"; - sha256 = "0w2137w8hfcgl6f938hqnb4ffp33v5r8vdzxrvs814w7dszkiqgg"; - }; -} diff --git a/pkgs/applications/networking/browsers/ungoogled-chromium/update.py b/pkgs/applications/networking/browsers/ungoogled-chromium/update.py deleted file mode 100755 index 9e1f0aec598da..0000000000000 --- a/pkgs/applications/networking/browsers/ungoogled-chromium/update.py +++ /dev/null @@ -1,121 +0,0 @@ -#! /usr/bin/env nix-shell -#! nix-shell -i python -p python3 nix nix-prefetch-git - -import csv -import json -import re -import subprocess -import sys - -from codecs import iterdecode -from collections import OrderedDict -from datetime import datetime -from os.path import abspath, dirname -from urllib.request import urlopen - -HISTORY_URL = 'https://omahaproxy.appspot.com/history?os=linux' -DEB_URL = 'https://dl.google.com/linux/chrome/deb/pool/main/g' -BUCKET_URL = 'https://commondatastorage.googleapis.com/chromium-browser-official' - -JSON_PATH = dirname(abspath(__file__)) + '/upstream-info.json' - -def load_json(path): - with open(path, 'r') as f: - return json.load(f) - -def nix_prefetch_url(url, algo='sha256'): - print(f'nix-prefetch-url {url}') - out = subprocess.check_output(['nix-prefetch-url', '--type', algo, url]) - return out.decode('utf-8').rstrip() - -def nix_prefetch_git(url, rev): - print(f'nix-prefetch-git {url} {rev}') - out = subprocess.check_output(['nix-prefetch-git', '--quiet', '--url', url, '--rev', rev]) - return json.loads(out) - -def get_file_revision(revision, file_path): - url = f'https://raw.githubusercontent.com/chromium/chromium/{revision}/{file_path}' - with urlopen(url) as http_response: - return http_response.read() - -def get_matching_chromedriver(version): - # See https://chromedriver.chromium.org/downloads/version-selection - build = re.sub('.[0-9]+$', '', version) - chromedriver_version_url = f'https://chromedriver.storage.googleapis.com/LATEST_RELEASE_{build}' - with urlopen(chromedriver_version_url) as http_response: - chromedriver_version = http_response.read().decode() - def get_chromedriver_url(system): - return f'https://chromedriver.storage.googleapis.com/{chromedriver_version}/chromedriver_{system}.zip' - return { - 'version': chromedriver_version, - 'sha256_linux': nix_prefetch_url(get_chromedriver_url('linux64')), - 'sha256_darwin': nix_prefetch_url(get_chromedriver_url('mac64')) - } - -def get_channel_dependencies(channel): - deps = get_file_revision(channel['version'], 'DEPS') - gn_pattern = b"'gn_version': 'git_revision:([0-9a-f]{40})'" - gn_commit = re.search(gn_pattern, deps).group(1).decode() - gn = nix_prefetch_git('https://gn.googlesource.com/gn', gn_commit) - return { - 'gn': { - 'version': datetime.fromisoformat(gn['date']).date().isoformat(), - 'url': gn['url'], - 'rev': gn['rev'], - 'sha256': gn['sha256'] - } - } - -channels = {} -last_channels = load_json(JSON_PATH) - -print(f'GET {HISTORY_URL}', file=sys.stderr) -with urlopen(HISTORY_URL) as resp: - builds = csv.DictReader(iterdecode(resp, 'utf-8')) - for build in builds: - channel_name = build['channel'] - - # If we've already found a newer build for this channel, we're - # no longer interested in it. - if channel_name in channels: - continue - - # If we're back at the last build we used, we don't need to - # keep going -- there's no new version available, and we can - # just reuse the info from last time. - if build['version'] == last_channels[channel_name]['version']: - channels[channel_name] = last_channels[channel_name] - continue - - channel = {'version': build['version']} - suffix = 'unstable' if channel_name == 'dev' else channel_name - - try: - channel['sha256'] = nix_prefetch_url(f'{BUCKET_URL}/chromium-{build["version"]}.tar.xz') - channel['sha256bin64'] = nix_prefetch_url(f'{DEB_URL}/google-chrome-{suffix}/google-chrome-{suffix}_{build["version"]}-1_amd64.deb') - except subprocess.CalledProcessError: - # This build isn't actually available yet. Continue to - # the next one. - continue - - channel['deps'] = get_channel_dependencies(channel) - if channel_name == 'stable': - channel['chromedriver'] = get_matching_chromedriver(channel['version']) - - channels[channel_name] = channel - -with open(JSON_PATH, 'w') as out: - def get_channel_key(item): - channel_name = item[0] - if channel_name == 'stable': - return 0 - elif channel_name == 'beta': - return 1 - elif channel_name == 'dev': - return 2 - else: - print(f'Error: Unexpected channel: {channel_name}', file=sys.stderr) - sys.exit(1) - sorted_channels = OrderedDict(sorted(channels.items(), key=get_channel_key)) - json.dump(sorted_channels, out, indent=2) - out.write('\n') diff --git a/pkgs/applications/networking/browsers/ungoogled-chromium/upstream-info.json b/pkgs/applications/networking/browsers/ungoogled-chromium/upstream-info.json deleted file mode 100644 index 6343dd4b2468c..0000000000000 --- a/pkgs/applications/networking/browsers/ungoogled-chromium/upstream-info.json +++ /dev/null @@ -1,46 +0,0 @@ -{ - "stable": { - "version": "87.0.4280.88", - "sha256": "1h09g9b2zxad85vd146ymvg3w2kpngpi78yig3dn1vrmhwr4aiiy", - "sha256bin64": "0n3fm6wf8zfkv135d50xl8xxrnng3q55vyxkck1da8jyvh18bijb", - "deps": { - "gn": { - "version": "2020-09-09", - "url": "https://gn.googlesource.com/gn", - "rev": "e002e68a48d1c82648eadde2f6aafa20d08c36f2", - "sha256": "0x4c7amxwzxs39grqs3dnnz0531mpf1p75niq7zhinyfqm86i4dk" - } - }, - "chromedriver": { - "version": "87.0.4280.88", - "sha256_linux": "141mr2jiy3nslwd3s43m4i6plkv9wv5fgi78cn7mz0ac9x6fpcgx", - "sha256_darwin": "048hsqp6575r980m769lzznvxypmfcwn89f1d3ik751ymzmb5r78" - } - }, - "beta": { - "version": "88.0.4324.27", - "sha256": "0mciiyh3sn2zrl8g6znylc2pm9sb0wzsclgavf7mmlknri5sjblc", - "sha256bin64": "0qf2j1j3p94s724rwh8fydpjn88cs9yxxhjf5axvqwi7q3h35cfx", - "deps": { - "gn": { - "version": "2020-11-05", - "url": "https://gn.googlesource.com/gn", - "rev": "53d92014bf94c3893886470a1c7c1289f8818db0", - "sha256": "1xcm07qjk6m2czi150fiqqxql067i832adck6zxrishm70c9jbr9" - } - } - }, - "dev": { - "version": "89.0.4343.0", - "sha256": "0jmc1l0lysl5zax98fjhzsfq3c1sqh3n3xscidafflx362wcfpwa", - "sha256bin64": "1v6xik8kf531y0g5xj0c8szjmak0qvh77kwkw7p7hqxqmnwwp06d", - "deps": { - "gn": { - "version": "2020-11-05", - "url": "https://gn.googlesource.com/gn", - "rev": "53d92014bf94c3893886470a1c7c1289f8818db0", - "sha256": "1xcm07qjk6m2czi150fiqqxql067i832adck6zxrishm70c9jbr9" - } - } - } -} diff --git a/pkgs/applications/networking/browsers/vieb/default.nix b/pkgs/applications/networking/browsers/vieb/default.nix new file mode 100644 index 0000000000000..ab894e7b7f062 --- /dev/null +++ b/pkgs/applications/networking/browsers/vieb/default.nix @@ -0,0 +1,58 @@ +{ mkYarnPackage, fetchFromGitHub, electron, makeWrapper, makeDesktopItem, lib }: + +mkYarnPackage rec { + pname = "vieb"; + version = "3.1.0"; + + src = fetchFromGitHub { + owner = "jelmerro"; + repo = pname; + rev = version; + sha256 = "10l36q75nmqv0azxhmwms6hjicbgyvpk8k6ljrh9d7zxryd3xwz0"; + }; + + packageJSON = ./package.json; + yarnLock = ./yarn.lock; + yarnNix = ./yarn.nix; + yarnFlags = [ "--production" "--offline" ]; + + nativeBuildInputs = [ makeWrapper ]; + + desktopItem = makeDesktopItem { + name = "vieb"; + exec = "vieb %U"; + icon = "vieb"; + desktopName = "Web Browser"; + genericName = "Web Browser"; + categories = "Network;WebBrowser;"; + mimeType = lib.concatStringsSep ";" [ + "text/html" + "application/xhtml+xml" + "x-scheme-handler/http" + "x-scheme-handler/https" + ]; + }; + + postInstall = '' + install -Dm0644 {${desktopItem},$out}/share/applications/vieb.desktop + + pushd $out/libexec/vieb/node_modules/vieb/app/img/icons + for file in *.png; do + install -Dm0644 $file $out/share/icons/hicolor/''${file//.png}/apps/vieb.png + done + popd + + makeWrapper ${electron}/bin/electron $out/bin/vieb \ + --add-flags $out/libexec/vieb/node_modules/vieb/app + ''; + + distPhase = ":"; # disable useless $out/tarballs directory + + meta = with lib; { + homepage = "https://vieb.dev/"; + description = "Vim Inspired Electron Browser"; + maintainers = with maintainers; [ gebner ]; + platforms = platforms.unix; + license = licenses.gpl3; + }; +} diff --git a/pkgs/applications/networking/browsers/vieb/package.json b/pkgs/applications/networking/browsers/vieb/package.json new file mode 100644 index 0000000000000..a03478bcd822a --- /dev/null +++ b/pkgs/applications/networking/browsers/vieb/package.json @@ -0,0 +1,45 @@ +{ + "name": "vieb", + "productName": "Vieb", + "version": "3.1.0", + "description": "Vim Inspired Electron Browser", + "main": "app/index.js", + "babel": { + "plugins": [ + "@babel/plugin-proposal-optional-chaining" + ] + }, + "scripts": { + "test": "jest -u && eslint .", + "start": "electron app", + "build": "node build.js", + "buildall": "node build.js --linux --win --mac", + "buildlinux": "node build.js --linux", + "buildwin": "node build.js --win", + "buildmac": "node build.js --mac" + }, + "repository": "https://github.com/Jelmerro/Vieb", + "homepage": "https://vieb.dev", + "keywords": [ + "Electron", + "Browser", + "Internet" + ], + "author": "Jelmer van Arnhem", + "email": "Jelmerro@users.noreply.github.com", + "license": "GPL-3.0+", + "devDependencies": { + "@babel/plugin-proposal-optional-chaining": "^7.12.7", + "archiver": "^5.0.2", + "electron": "^11.0.3", + "electron-builder": "^22.9.1", + "eslint": "^7.15.0", + "jest": "^26.6.3" + }, + "dependencies": { + "@cliqz/adblocker-electron": "^1.18.8", + "darkreader": "^4.9.26", + "is-svg": "^4.2.1", + "rimraf": "^3.0.2" + } +} diff --git a/pkgs/applications/networking/browsers/vieb/yarn.lock b/pkgs/applications/networking/browsers/vieb/yarn.lock new file mode 100644 index 0000000000000..a9266f10513ff --- /dev/null +++ b/pkgs/applications/networking/browsers/vieb/yarn.lock @@ -0,0 +1,5236 @@ +# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. +# yarn lockfile v1 + + +"7zip-bin@~5.0.3": + version "5.0.3" + resolved "https://registry.yarnpkg.com/7zip-bin/-/7zip-bin-5.0.3.tgz#bc5b5532ecafd923a61f2fb097e3b108c0106a3f" + integrity sha512-GLyWIFBbGvpKPGo55JyRZAo4lVbnBiD52cKlw/0Vt+wnmKvWJkpZvsjVoaIolyBXDeAQKSicRtqFNPem9w0WYA== + +"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.10.4": + version "7.10.4" + resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.10.4.tgz#168da1a36e90da68ae8d49c0f1b48c7c6249213a" + integrity sha512-vG6SvB6oYEhvgisZNFRmRCUkLz11c7rp+tbNTynGqc6mS1d5ATd/sGyV6W0KZZnXRKMTzZDRgQT3Ou9jhpAfUg== + dependencies: + "@babel/highlight" "^7.10.4" + +"@babel/core@^7.1.0", "@babel/core@^7.7.5": + version "7.12.10" + resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.12.10.tgz#b79a2e1b9f70ed3d84bbfb6d8c4ef825f606bccd" + integrity sha512-eTAlQKq65zHfkHZV0sIVODCPGVgoo1HdBlbSLi9CqOzuZanMv2ihzY+4paiKr1mH+XmYESMAmJ/dpZ68eN6d8w== + dependencies: + "@babel/code-frame" "^7.10.4" + "@babel/generator" "^7.12.10" + "@babel/helper-module-transforms" "^7.12.1" + "@babel/helpers" "^7.12.5" + "@babel/parser" "^7.12.10" + "@babel/template" "^7.12.7" + "@babel/traverse" "^7.12.10" + "@babel/types" "^7.12.10" + convert-source-map "^1.7.0" + debug "^4.1.0" + gensync "^1.0.0-beta.1" + json5 "^2.1.2" + lodash "^4.17.19" + semver "^5.4.1" + source-map "^0.5.0" + +"@babel/generator@^7.12.10": + version "7.12.10" + resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.12.10.tgz#2b188fc329fb8e4f762181703beffc0fe6df3460" + integrity sha512-6mCdfhWgmqLdtTkhXjnIz0LcdVCd26wS2JXRtj2XY0u5klDsXBREA/pG5NVOuVnF2LUrBGNFtQkIqqTbblg0ww== + dependencies: + "@babel/types" "^7.12.10" + jsesc "^2.5.1" + source-map "^0.5.0" + +"@babel/helper-function-name@^7.10.4": + version "7.10.4" + resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.10.4.tgz#d2d3b20c59ad8c47112fa7d2a94bc09d5ef82f1a" + integrity sha512-YdaSyz1n8gY44EmN7x44zBn9zQ1Ry2Y+3GTA+3vH6Mizke1Vw0aWDM66FOYEPw8//qKkmqOckrGgTYa+6sceqQ== + dependencies: + "@babel/helper-get-function-arity" "^7.10.4" + "@babel/template" "^7.10.4" + "@babel/types" "^7.10.4" + +"@babel/helper-get-function-arity@^7.10.4": + version "7.12.10" + resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.12.10.tgz#b158817a3165b5faa2047825dfa61970ddcc16cf" + integrity sha512-mm0n5BPjR06wh9mPQaDdXWDoll/j5UpCAPl1x8fS71GHm7HA6Ua2V4ylG1Ju8lvcTOietbPNNPaSilKj+pj+Ag== + dependencies: + "@babel/types" "^7.12.10" + +"@babel/helper-member-expression-to-functions@^7.12.1": + version "7.12.7" + resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.12.7.tgz#aa77bd0396ec8114e5e30787efa78599d874a855" + integrity sha512-DCsuPyeWxeHgh1Dus7APn7iza42i/qXqiFPWyBDdOFtvS581JQePsc1F/nD+fHrcswhLlRc2UpYS1NwERxZhHw== + dependencies: + "@babel/types" "^7.12.7" + +"@babel/helper-module-imports@^7.12.1": + version "7.12.5" + resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.12.5.tgz#1bfc0229f794988f76ed0a4d4e90860850b54dfb" + integrity sha512-SR713Ogqg6++uexFRORf/+nPXMmWIn80TALu0uaFb+iQIUoR7bOC7zBWyzBs5b3tBBJXuyD0cRu1F15GyzjOWA== + dependencies: + "@babel/types" "^7.12.5" + +"@babel/helper-module-transforms@^7.12.1": + version "7.12.1" + resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.12.1.tgz#7954fec71f5b32c48e4b303b437c34453fd7247c" + integrity sha512-QQzehgFAZ2bbISiCpmVGfiGux8YVFXQ0abBic2Envhej22DVXV9nCFaS5hIQbkyo1AdGb+gNME2TSh3hYJVV/w== + dependencies: + "@babel/helper-module-imports" "^7.12.1" + "@babel/helper-replace-supers" "^7.12.1" + "@babel/helper-simple-access" "^7.12.1" + "@babel/helper-split-export-declaration" "^7.11.0" + "@babel/helper-validator-identifier" "^7.10.4" + "@babel/template" "^7.10.4" + "@babel/traverse" "^7.12.1" + "@babel/types" "^7.12.1" + lodash "^4.17.19" + +"@babel/helper-optimise-call-expression@^7.10.4": + version "7.12.10" + resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.12.10.tgz#94ca4e306ee11a7dd6e9f42823e2ac6b49881e2d" + integrity sha512-4tpbU0SrSTjjt65UMWSrUOPZTsgvPgGG4S8QSTNHacKzpS51IVWGDj0yCwyeZND/i+LSN2g/O63jEXEWm49sYQ== + dependencies: + "@babel/types" "^7.12.10" + +"@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.8.0": + version "7.10.4" + resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.4.tgz#2f75a831269d4f677de49986dff59927533cf375" + integrity sha512-O4KCvQA6lLiMU9l2eawBPMf1xPP8xPfB3iEQw150hOVTqj/rfXz0ThTb4HEzqQfs2Bmo5Ay8BzxfzVtBrr9dVg== + +"@babel/helper-replace-supers@^7.12.1": + version "7.12.5" + resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.12.5.tgz#f009a17543bbbbce16b06206ae73b63d3fca68d9" + integrity sha512-5YILoed0ZyIpF4gKcpZitEnXEJ9UoDRki1Ey6xz46rxOzfNMAhVIJMoune1hmPVxh40LRv1+oafz7UsWX+vyWA== + dependencies: + "@babel/helper-member-expression-to-functions" "^7.12.1" + "@babel/helper-optimise-call-expression" "^7.10.4" + "@babel/traverse" "^7.12.5" + "@babel/types" "^7.12.5" + +"@babel/helper-simple-access@^7.12.1": + version "7.12.1" + resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.12.1.tgz#32427e5aa61547d38eb1e6eaf5fd1426fdad9136" + integrity sha512-OxBp7pMrjVewSSC8fXDFrHrBcJATOOFssZwv16F3/6Xtc138GHybBfPbm9kfiqQHKhYQrlamWILwlDCeyMFEaA== + dependencies: + "@babel/types" "^7.12.1" + +"@babel/helper-skip-transparent-expression-wrappers@^7.12.1": + version "7.12.1" + resolved "https://registry.yarnpkg.com/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.12.1.tgz#462dc63a7e435ade8468385c63d2b84cce4b3cbf" + integrity sha512-Mf5AUuhG1/OCChOJ/HcADmvcHM42WJockombn8ATJG3OnyiSxBK/Mm5x78BQWvmtXZKHgbjdGL2kin/HOLlZGA== + dependencies: + "@babel/types" "^7.12.1" + +"@babel/helper-split-export-declaration@^7.11.0": + version "7.11.0" + resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.11.0.tgz#f8a491244acf6a676158ac42072911ba83ad099f" + integrity sha512-74Vejvp6mHkGE+m+k5vHY93FX2cAtrw1zXrZXRlG4l410Nm9PxfEiVTn1PjDPV5SnmieiueY4AFg2xqhNFuuZg== + dependencies: + "@babel/types" "^7.11.0" + +"@babel/helper-validator-identifier@^7.10.4": + version "7.10.4" + resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.4.tgz#a78c7a7251e01f616512d31b10adcf52ada5e0d2" + integrity sha512-3U9y+43hz7ZM+rzG24Qe2mufW5KhvFg/NhnNph+i9mgCtdTCtMJuI1TMkrIUiK7Ix4PYlRF9I5dhqaLYA/ADXw== + +"@babel/helpers@^7.12.5": + version "7.12.5" + resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.12.5.tgz#1a1ba4a768d9b58310eda516c449913fe647116e" + integrity sha512-lgKGMQlKqA8meJqKsW6rUnc4MdUk35Ln0ATDqdM1a/UpARODdI4j5Y5lVfUScnSNkJcdCRAaWkspykNoFg9sJA== + dependencies: + "@babel/template" "^7.10.4" + "@babel/traverse" "^7.12.5" + "@babel/types" "^7.12.5" + +"@babel/highlight@^7.10.4": + version "7.10.4" + resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.10.4.tgz#7d1bdfd65753538fabe6c38596cdb76d9ac60143" + integrity sha512-i6rgnR/YgPEQzZZnbTHHuZdlE8qyoBNalD6F+q4vAFlcMEcqmkoG+mPqJYJCo63qPf74+Y1UZsl3l6f7/RIkmA== + dependencies: + "@babel/helper-validator-identifier" "^7.10.4" + chalk "^2.0.0" + js-tokens "^4.0.0" + +"@babel/parser@^7.1.0", "@babel/parser@^7.12.10", "@babel/parser@^7.12.7": + version "7.12.10" + resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.12.10.tgz#824600d59e96aea26a5a2af5a9d812af05c3ae81" + integrity sha512-PJdRPwyoOqFAWfLytxrWwGrAxghCgh/yTNCYciOz8QgjflA7aZhECPZAa2VUedKg2+QMWkI0L9lynh2SNmNEgA== + +"@babel/plugin-proposal-optional-chaining@^7.12.7": + version "7.12.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.12.7.tgz#e02f0ea1b5dc59d401ec16fb824679f683d3303c" + integrity sha512-4ovylXZ0PWmwoOvhU2vhnzVNnm88/Sm9nx7V8BPgMvAzn5zDou3/Awy0EjglyubVHasJj+XCEkr/r1X3P5elCA== + dependencies: + "@babel/helper-plugin-utils" "^7.10.4" + "@babel/helper-skip-transparent-expression-wrappers" "^7.12.1" + "@babel/plugin-syntax-optional-chaining" "^7.8.0" + +"@babel/plugin-syntax-async-generators@^7.8.4": + version "7.8.4" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz#a983fb1aeb2ec3f6ed042a210f640e90e786fe0d" + integrity sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw== + dependencies: + "@babel/helper-plugin-utils" "^7.8.0" + +"@babel/plugin-syntax-bigint@^7.8.3": + version "7.8.3" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-bigint/-/plugin-syntax-bigint-7.8.3.tgz#4c9a6f669f5d0cdf1b90a1671e9a146be5300cea" + integrity sha512-wnTnFlG+YxQm3vDxpGE57Pj0srRU4sHE/mDkt1qv2YJJSeUAec2ma4WLUnUPeKjyrfntVwe/N6dCXpU+zL3Npg== + dependencies: + "@babel/helper-plugin-utils" "^7.8.0" + +"@babel/plugin-syntax-class-properties@^7.8.3": + version "7.12.1" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.1.tgz#bcb297c5366e79bebadef509549cd93b04f19978" + integrity sha512-U40A76x5gTwmESz+qiqssqmeEsKvcSyvtgktrm0uzcARAmM9I1jR221f6Oq+GmHrcD+LvZDag1UTOTe2fL3TeA== + dependencies: + "@babel/helper-plugin-utils" "^7.10.4" + +"@babel/plugin-syntax-import-meta@^7.8.3": + version "7.10.4" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-import-meta/-/plugin-syntax-import-meta-7.10.4.tgz#ee601348c370fa334d2207be158777496521fd51" + integrity sha512-Yqfm+XDx0+Prh3VSeEQCPU81yC+JWZ2pDPFSS4ZdpfZhp4MkFMaDC1UqseovEKwSUpnIL7+vK+Clp7bfh0iD7g== + dependencies: + "@babel/helper-plugin-utils" "^7.10.4" + +"@babel/plugin-syntax-json-strings@^7.8.3": + version "7.8.3" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz#01ca21b668cd8218c9e640cb6dd88c5412b2c96a" + integrity sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA== + dependencies: + "@babel/helper-plugin-utils" "^7.8.0" + +"@babel/plugin-syntax-logical-assignment-operators@^7.8.3": + version "7.10.4" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz#ca91ef46303530448b906652bac2e9fe9941f699" + integrity sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig== + dependencies: + "@babel/helper-plugin-utils" "^7.10.4" + +"@babel/plugin-syntax-nullish-coalescing-operator@^7.8.3": + version "7.8.3" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz#167ed70368886081f74b5c36c65a88c03b66d1a9" + integrity sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ== + dependencies: + "@babel/helper-plugin-utils" "^7.8.0" + +"@babel/plugin-syntax-numeric-separator@^7.8.3": + version "7.10.4" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.4.tgz#b9b070b3e33570cd9fd07ba7fa91c0dd37b9af97" + integrity sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug== + dependencies: + "@babel/helper-plugin-utils" "^7.10.4" + +"@babel/plugin-syntax-object-rest-spread@^7.8.3": + version "7.8.3" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz#60e225edcbd98a640332a2e72dd3e66f1af55871" + integrity sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA== + dependencies: + "@babel/helper-plugin-utils" "^7.8.0" + +"@babel/plugin-syntax-optional-catch-binding@^7.8.3": + version "7.8.3" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz#6111a265bcfb020eb9efd0fdfd7d26402b9ed6c1" + integrity sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q== + dependencies: + "@babel/helper-plugin-utils" "^7.8.0" + +"@babel/plugin-syntax-optional-chaining@^7.8.0", "@babel/plugin-syntax-optional-chaining@^7.8.3": + version "7.8.3" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz#4f69c2ab95167e0180cd5336613f8c5788f7d48a" + integrity sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg== + dependencies: + "@babel/helper-plugin-utils" "^7.8.0" + +"@babel/plugin-syntax-top-level-await@^7.8.3": + version "7.12.1" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.12.1.tgz#dd6c0b357ac1bb142d98537450a319625d13d2a0" + integrity sha512-i7ooMZFS+a/Om0crxZodrTzNEPJHZrlMVGMTEpFAj6rYY/bKCddB0Dk/YxfPuYXOopuhKk/e1jV6h+WUU9XN3A== + dependencies: + "@babel/helper-plugin-utils" "^7.10.4" + +"@babel/template@^7.10.4", "@babel/template@^7.12.7", "@babel/template@^7.3.3": + version "7.12.7" + resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.12.7.tgz#c817233696018e39fbb6c491d2fb684e05ed43bc" + integrity sha512-GkDzmHS6GV7ZeXfJZ0tLRBhZcMcY0/Lnb+eEbXDBfCAcZCjrZKe6p3J4we/D24O9Y8enxWAg1cWwof59yLh2ow== + dependencies: + "@babel/code-frame" "^7.10.4" + "@babel/parser" "^7.12.7" + "@babel/types" "^7.12.7" + +"@babel/traverse@^7.1.0", "@babel/traverse@^7.12.1", "@babel/traverse@^7.12.10", "@babel/traverse@^7.12.5": + version "7.12.10" + resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.12.10.tgz#2d1f4041e8bf42ea099e5b2dc48d6a594c00017a" + integrity sha512-6aEtf0IeRgbYWzta29lePeYSk+YAFIC3kyqESeft8o5CkFlYIMX+EQDDWEiAQ9LHOA3d0oHdgrSsID/CKqXJlg== + dependencies: + "@babel/code-frame" "^7.10.4" + "@babel/generator" "^7.12.10" + "@babel/helper-function-name" "^7.10.4" + "@babel/helper-split-export-declaration" "^7.11.0" + "@babel/parser" "^7.12.10" + "@babel/types" "^7.12.10" + debug "^4.1.0" + globals "^11.1.0" + lodash "^4.17.19" + +"@babel/types@^7.0.0", "@babel/types@^7.10.4", "@babel/types@^7.11.0", "@babel/types@^7.12.1", "@babel/types@^7.12.10", "@babel/types@^7.12.5", "@babel/types@^7.12.7", "@babel/types@^7.3.0", "@babel/types@^7.3.3": + version "7.12.10" + resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.12.10.tgz#7965e4a7260b26f09c56bcfcb0498af1f6d9b260" + integrity sha512-sf6wboJV5mGyip2hIpDSKsr80RszPinEFjsHTalMxZAZkoQ2/2yQzxlcFN52SJqsyPfLtPmenL4g2KB3KJXPDw== + dependencies: + "@babel/helper-validator-identifier" "^7.10.4" + lodash "^4.17.19" + to-fast-properties "^2.0.0" + +"@bcoe/v8-coverage@^0.2.3": + version "0.2.3" + resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" + integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== + +"@cliqz/adblocker-content@^1.18.8": + version "1.18.8" + resolved "https://registry.yarnpkg.com/@cliqz/adblocker-content/-/adblocker-content-1.18.8.tgz#96473f14c098a20091298d34a6addcd430aceebd" + integrity sha512-YZ1xYBVG3LmxsdTYvTs/Bc7pzCw/Dy4HFo6N+oIuGP+Le/0aGSkACUl3ue5I2+Cx0WmL0Z8I4QonTKDc06HR+A== + +"@cliqz/adblocker-electron-preload@^1.18.8": + version "1.18.8" + resolved "https://registry.yarnpkg.com/@cliqz/adblocker-electron-preload/-/adblocker-electron-preload-1.18.8.tgz#c2058647e015b6f61c222e7d58040347324c63b0" + integrity sha512-/FAzyhNUj+8fwqSGth7ndaC+8huEANvVquYkDVmjM38uryxFgcJJI6Bij1l1zABIbskAaSN4G4RI3oERyd9/KQ== + dependencies: + "@cliqz/adblocker-content" "^1.18.8" + +"@cliqz/adblocker-electron@^1.18.8": + version "1.18.8" + resolved "https://registry.yarnpkg.com/@cliqz/adblocker-electron/-/adblocker-electron-1.18.8.tgz#5f697c5dc65cd936b3908078a6e4516ec995567a" + integrity sha512-CrsFjSwenWQogsAg4sHFaXZbu7hzs9dMdsZM5wxb+5QfZ3MSH3PBYAeAUnsmP3UOTZ423+6ErOUE1vzj3UrK9w== + dependencies: + "@cliqz/adblocker" "^1.18.8" + "@cliqz/adblocker-electron-preload" "^1.18.8" + tldts-experimental "^5.6.21" + +"@cliqz/adblocker@^1.18.8": + version "1.18.8" + resolved "https://registry.yarnpkg.com/@cliqz/adblocker/-/adblocker-1.18.8.tgz#f6e5724fe6573c2e68f2545d90bcce3e1ecfbae9" + integrity sha512-19m0GhlOcdSvQ/BqVuaMgbYkgQ4ys8koBRW4K7Ua4V5fFWL0t8ckdcZ/gBOqwECS2m8agXSpEbbyJjNmHBHpMQ== + dependencies: + "@remusao/guess-url-type" "^1.1.2" + "@remusao/small" "^1.1.2" + "@remusao/smaz" "^1.7.1" + "@types/chrome" "^0.0.126" + "@types/firefox-webext-browser" "^82.0.0" + tldts-experimental "^5.6.21" + +"@cnakazawa/watch@^1.0.3": + version "1.0.4" + resolved "https://registry.yarnpkg.com/@cnakazawa/watch/-/watch-1.0.4.tgz#f864ae85004d0fcab6f50be9141c4da368d1656a" + integrity sha512-v9kIhKwjeZThiWrLmj0y17CWoyddASLj9O2yvbZkbvw/N3rWOYy9zkV66ursAoVr0mV15bL8g0c4QZUE6cdDoQ== + dependencies: + exec-sh "^0.3.2" + minimist "^1.2.0" + +"@develar/schema-utils@~2.6.5": + version "2.6.5" + resolved "https://registry.yarnpkg.com/@develar/schema-utils/-/schema-utils-2.6.5.tgz#3ece22c5838402419a6e0425f85742b961d9b6c6" + integrity sha512-0cp4PsWQ/9avqTVMCtZ+GirikIA36ikvjtHweU4/j8yLtgObI0+JUPhYFScgwlteveGB1rt3Cm8UhN04XayDig== + dependencies: + ajv "^6.12.0" + ajv-keywords "^3.4.1" + +"@electron/get@^1.0.1": + version "1.12.2" + resolved "https://registry.yarnpkg.com/@electron/get/-/get-1.12.2.tgz#6442066afb99be08cefb9a281e4b4692b33764f3" + integrity sha512-vAuHUbfvBQpYTJ5wB7uVIDq5c/Ry0fiTBMs7lnEYAo/qXXppIVcWdfBr57u6eRnKdVso7KSiH6p/LbQAG6Izrg== + dependencies: + debug "^4.1.1" + env-paths "^2.2.0" + fs-extra "^8.1.0" + got "^9.6.0" + progress "^2.0.3" + sanitize-filename "^1.6.2" + sumchecker "^3.0.1" + optionalDependencies: + global-agent "^2.0.2" + global-tunnel-ng "^2.7.1" + +"@eslint/eslintrc@^0.2.2": + version "0.2.2" + resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-0.2.2.tgz#d01fc791e2fc33e88a29d6f3dc7e93d0cd784b76" + integrity sha512-EfB5OHNYp1F4px/LI/FEnGylop7nOqkQ1LRzCM0KccA2U8tvV8w01KBv37LbO7nW4H+YhKyo2LcJhRwjjV17QQ== + dependencies: + ajv "^6.12.4" + debug "^4.1.1" + espree "^7.3.0" + globals "^12.1.0" + ignore "^4.0.6" + import-fresh "^3.2.1" + js-yaml "^3.13.1" + lodash "^4.17.19" + minimatch "^3.0.4" + strip-json-comments "^3.1.1" + +"@istanbuljs/load-nyc-config@^1.0.0": + version "1.1.0" + resolved "https://registry.yarnpkg.com/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz#fd3db1d59ecf7cf121e80650bb86712f9b55eced" + integrity sha512-VjeHSlIzpv/NyD3N0YuHfXOPDIixcA1q2ZV98wsMqcYlPmv2n3Yb2lYP9XMElnaFVXg5A7YLTeLu6V84uQDjmQ== + dependencies: + camelcase "^5.3.1" + find-up "^4.1.0" + get-package-type "^0.1.0" + js-yaml "^3.13.1" + resolve-from "^5.0.0" + +"@istanbuljs/schema@^0.1.2": + version "0.1.2" + resolved "https://registry.yarnpkg.com/@istanbuljs/schema/-/schema-0.1.2.tgz#26520bf09abe4a5644cd5414e37125a8954241dd" + integrity sha512-tsAQNx32a8CoFhjhijUIhI4kccIAgmGhy8LZMZgGfmXcpMbPRUqn5LWmgRttILi6yeGmBJd2xsPkFMs0PzgPCw== + +"@jest/console@^26.6.2": + version "26.6.2" + resolved "https://registry.yarnpkg.com/@jest/console/-/console-26.6.2.tgz#4e04bc464014358b03ab4937805ee36a0aeb98f2" + integrity sha512-IY1R2i2aLsLr7Id3S6p2BA82GNWryt4oSvEXLAKc+L2zdi89dSkE8xC1C+0kpATG4JhBJREnQOH7/zmccM2B0g== + dependencies: + "@jest/types" "^26.6.2" + "@types/node" "*" + chalk "^4.0.0" + jest-message-util "^26.6.2" + jest-util "^26.6.2" + slash "^3.0.0" + +"@jest/core@^26.6.3": + version "26.6.3" + resolved "https://registry.yarnpkg.com/@jest/core/-/core-26.6.3.tgz#7639fcb3833d748a4656ada54bde193051e45fad" + integrity sha512-xvV1kKbhfUqFVuZ8Cyo+JPpipAHHAV3kcDBftiduK8EICXmTFddryy3P7NfZt8Pv37rA9nEJBKCCkglCPt/Xjw== + dependencies: + "@jest/console" "^26.6.2" + "@jest/reporters" "^26.6.2" + "@jest/test-result" "^26.6.2" + "@jest/transform" "^26.6.2" + "@jest/types" "^26.6.2" + "@types/node" "*" + ansi-escapes "^4.2.1" + chalk "^4.0.0" + exit "^0.1.2" + graceful-fs "^4.2.4" + jest-changed-files "^26.6.2" + jest-config "^26.6.3" + jest-haste-map "^26.6.2" + jest-message-util "^26.6.2" + jest-regex-util "^26.0.0" + jest-resolve "^26.6.2" + jest-resolve-dependencies "^26.6.3" + jest-runner "^26.6.3" + jest-runtime "^26.6.3" + jest-snapshot "^26.6.2" + jest-util "^26.6.2" + jest-validate "^26.6.2" + jest-watcher "^26.6.2" + micromatch "^4.0.2" + p-each-series "^2.1.0" + rimraf "^3.0.0" + slash "^3.0.0" + strip-ansi "^6.0.0" + +"@jest/environment@^26.6.2": + version "26.6.2" + resolved "https://registry.yarnpkg.com/@jest/environment/-/environment-26.6.2.tgz#ba364cc72e221e79cc8f0a99555bf5d7577cf92c" + integrity sha512-nFy+fHl28zUrRsCeMB61VDThV1pVTtlEokBRgqPrcT1JNq4yRNIyTHfyht6PqtUvY9IsuLGTrbG8kPXjSZIZwA== + dependencies: + "@jest/fake-timers" "^26.6.2" + "@jest/types" "^26.6.2" + "@types/node" "*" + jest-mock "^26.6.2" + +"@jest/fake-timers@^26.6.2": + version "26.6.2" + resolved "https://registry.yarnpkg.com/@jest/fake-timers/-/fake-timers-26.6.2.tgz#459c329bcf70cee4af4d7e3f3e67848123535aad" + integrity sha512-14Uleatt7jdzefLPYM3KLcnUl1ZNikaKq34enpb5XG9i81JpppDb5muZvonvKyrl7ftEHkKS5L5/eB/kxJ+bvA== + dependencies: + "@jest/types" "^26.6.2" + "@sinonjs/fake-timers" "^6.0.1" + "@types/node" "*" + jest-message-util "^26.6.2" + jest-mock "^26.6.2" + jest-util "^26.6.2" + +"@jest/globals@^26.6.2": + version "26.6.2" + resolved "https://registry.yarnpkg.com/@jest/globals/-/globals-26.6.2.tgz#5b613b78a1aa2655ae908eba638cc96a20df720a" + integrity sha512-85Ltnm7HlB/KesBUuALwQ68YTU72w9H2xW9FjZ1eL1U3lhtefjjl5c2MiUbpXt/i6LaPRvoOFJ22yCBSfQ0JIA== + dependencies: + "@jest/environment" "^26.6.2" + "@jest/types" "^26.6.2" + expect "^26.6.2" + +"@jest/reporters@^26.6.2": + version "26.6.2" + resolved "https://registry.yarnpkg.com/@jest/reporters/-/reporters-26.6.2.tgz#1f518b99637a5f18307bd3ecf9275f6882a667f6" + integrity sha512-h2bW53APG4HvkOnVMo8q3QXa6pcaNt1HkwVsOPMBV6LD/q9oSpxNSYZQYkAnjdMjrJ86UuYeLo+aEZClV6opnw== + dependencies: + "@bcoe/v8-coverage" "^0.2.3" + "@jest/console" "^26.6.2" + "@jest/test-result" "^26.6.2" + "@jest/transform" "^26.6.2" + "@jest/types" "^26.6.2" + chalk "^4.0.0" + collect-v8-coverage "^1.0.0" + exit "^0.1.2" + glob "^7.1.2" + graceful-fs "^4.2.4" + istanbul-lib-coverage "^3.0.0" + istanbul-lib-instrument "^4.0.3" + istanbul-lib-report "^3.0.0" + istanbul-lib-source-maps "^4.0.0" + istanbul-reports "^3.0.2" + jest-haste-map "^26.6.2" + jest-resolve "^26.6.2" + jest-util "^26.6.2" + jest-worker "^26.6.2" + slash "^3.0.0" + source-map "^0.6.0" + string-length "^4.0.1" + terminal-link "^2.0.0" + v8-to-istanbul "^7.0.0" + optionalDependencies: + node-notifier "^8.0.0" + +"@jest/source-map@^26.6.2": + version "26.6.2" + resolved "https://registry.yarnpkg.com/@jest/source-map/-/source-map-26.6.2.tgz#29af5e1e2e324cafccc936f218309f54ab69d535" + integrity sha512-YwYcCwAnNmOVsZ8mr3GfnzdXDAl4LaenZP5z+G0c8bzC9/dugL8zRmxZzdoTl4IaS3CryS1uWnROLPFmb6lVvA== + dependencies: + callsites "^3.0.0" + graceful-fs "^4.2.4" + source-map "^0.6.0" + +"@jest/test-result@^26.6.2": + version "26.6.2" + resolved "https://registry.yarnpkg.com/@jest/test-result/-/test-result-26.6.2.tgz#55da58b62df134576cc95476efa5f7949e3f5f18" + integrity sha512-5O7H5c/7YlojphYNrK02LlDIV2GNPYisKwHm2QTKjNZeEzezCbwYs9swJySv2UfPMyZ0VdsmMv7jIlD/IKYQpQ== + dependencies: + "@jest/console" "^26.6.2" + "@jest/types" "^26.6.2" + "@types/istanbul-lib-coverage" "^2.0.0" + collect-v8-coverage "^1.0.0" + +"@jest/test-sequencer@^26.6.3": + version "26.6.3" + resolved "https://registry.yarnpkg.com/@jest/test-sequencer/-/test-sequencer-26.6.3.tgz#98e8a45100863886d074205e8ffdc5a7eb582b17" + integrity sha512-YHlVIjP5nfEyjlrSr8t/YdNfU/1XEt7c5b4OxcXCjyRhjzLYu/rO69/WHPuYcbCWkz8kAeZVZp2N2+IOLLEPGw== + dependencies: + "@jest/test-result" "^26.6.2" + graceful-fs "^4.2.4" + jest-haste-map "^26.6.2" + jest-runner "^26.6.3" + jest-runtime "^26.6.3" + +"@jest/transform@^26.6.2": + version "26.6.2" + resolved "https://registry.yarnpkg.com/@jest/transform/-/transform-26.6.2.tgz#5ac57c5fa1ad17b2aae83e73e45813894dcf2e4b" + integrity sha512-E9JjhUgNzvuQ+vVAL21vlyfy12gP0GhazGgJC4h6qUt1jSdUXGWJ1wfu/X7Sd8etSgxV4ovT1pb9v5D6QW4XgA== + dependencies: + "@babel/core" "^7.1.0" + "@jest/types" "^26.6.2" + babel-plugin-istanbul "^6.0.0" + chalk "^4.0.0" + convert-source-map "^1.4.0" + fast-json-stable-stringify "^2.0.0" + graceful-fs "^4.2.4" + jest-haste-map "^26.6.2" + jest-regex-util "^26.0.0" + jest-util "^26.6.2" + micromatch "^4.0.2" + pirates "^4.0.1" + slash "^3.0.0" + source-map "^0.6.1" + write-file-atomic "^3.0.0" + +"@jest/types@^26.6.2": + version "26.6.2" + resolved "https://registry.yarnpkg.com/@jest/types/-/types-26.6.2.tgz#bef5a532030e1d88a2f5a6d933f84e97226ed48e" + integrity sha512-fC6QCp7Sc5sX6g8Tvbmj4XUTbyrik0akgRy03yjXbQaBWWNWGE7SGtJk98m0N8nzegD/7SggrUlivxo5ax4KWQ== + dependencies: + "@types/istanbul-lib-coverage" "^2.0.0" + "@types/istanbul-reports" "^3.0.0" + "@types/node" "*" + "@types/yargs" "^15.0.0" + chalk "^4.0.0" + +"@remusao/guess-url-type@^1.1.2": + version "1.2.0" + resolved "https://registry.yarnpkg.com/@remusao/guess-url-type/-/guess-url-type-1.2.0.tgz#fb1402b4c47266161501704d74427b8d49e4b3e4" + integrity sha512-alnTonifD/Ii/0pI9EA5nVgdk/eOihU4OOYMIXq4U4cS0NocnaYCozqV4OVkmArPPnz9s4ap4GM1ODftBpBW0w== + +"@remusao/small@^1.1.2": + version "1.2.0" + resolved "https://registry.yarnpkg.com/@remusao/small/-/small-1.2.0.tgz#1f56d59418d4c121cd8814e4bea5ed95dcf4b7a9" + integrity sha512-18Bwa/EjqQ5WfdERqmG3YgOohO7J2sS8+v31JgmYnEg3wAtcAOPVBRkD24IzVS0eJOQk1P2Yd++aP0ldirk7MQ== + +"@remusao/smaz-compress@^1.9.0": + version "1.9.0" + resolved "https://registry.yarnpkg.com/@remusao/smaz-compress/-/smaz-compress-1.9.0.tgz#ec79c87f5780865da616cd214b3b8978807d1e9a" + integrity sha512-PAze3aYCcUfX+a6E6sVMoxVtUkeQgX+oiY6DqbiRkNtUqzjtcl9JVyEAWGbBEgOuv2jdEATAlyIf0W18NKDEnw== + dependencies: + "@remusao/trie" "^1.4.0" + +"@remusao/smaz-decompress@^1.9.0": + version "1.9.0" + resolved "https://registry.yarnpkg.com/@remusao/smaz-decompress/-/smaz-decompress-1.9.0.tgz#9b3fba7c8e0c2045de63fd0ad0e5b37b447bb7cf" + integrity sha512-7uXEX8cSMWy+ai7j8sJpVQuY+CHj2e5D+PjxY//4wbAJlw1a/X+CYPt7BuxLBzpVoioB5Y7++1USjCkrw0pl8g== + +"@remusao/smaz@^1.7.1": + version "1.9.0" + resolved "https://registry.yarnpkg.com/@remusao/smaz/-/smaz-1.9.0.tgz#d02c2fb007483d4b4d050fb2fdaf523fcef08d40" + integrity sha512-HMMPam5jLhP0ymtMUQ8sm2p9zwDJwHD09krORXN/l/TR+NlSCdU2gSAoVNr9idD9OmMGfeXPFQYCofEUZfjbTQ== + dependencies: + "@remusao/smaz-compress" "^1.9.0" + "@remusao/smaz-decompress" "^1.9.0" + +"@remusao/trie@^1.4.0": + version "1.4.0" + resolved "https://registry.yarnpkg.com/@remusao/trie/-/trie-1.4.0.tgz#b439210445339f0ca95ff200d98b898d431a4ce1" + integrity sha512-mIr0m4/xj6qxHtJjAFb4I8tXXmjTniUYTB2Hv+xK5hXf/YWocEPlJ+V31bv5HJwo6ly64DUnZDBeBxolT3WE7w== + +"@sindresorhus/is@^0.14.0": + version "0.14.0" + resolved "https://registry.yarnpkg.com/@sindresorhus/is/-/is-0.14.0.tgz#9fb3a3cf3132328151f353de4632e01e52102bea" + integrity sha512-9NET910DNaIPngYnLLPeg+Ogzqsi9uM4mSboU5y6p8S5DzMTVEsJZrawi+BoDNUVBa2DhJqQYUFvMDfgU062LQ== + +"@sinonjs/commons@^1.7.0": + version "1.8.1" + resolved "https://registry.yarnpkg.com/@sinonjs/commons/-/commons-1.8.1.tgz#e7df00f98a203324f6dc7cc606cad9d4a8ab2217" + integrity sha512-892K+kWUUi3cl+LlqEWIDrhvLgdL79tECi8JZUyq6IviKy/DNhuzCRlbHUjxK89f4ypPMMaFnFuR9Ie6DoIMsw== + dependencies: + type-detect "4.0.8" + +"@sinonjs/fake-timers@^6.0.1": + version "6.0.1" + resolved "https://registry.yarnpkg.com/@sinonjs/fake-timers/-/fake-timers-6.0.1.tgz#293674fccb3262ac782c7aadfdeca86b10c75c40" + integrity sha512-MZPUxrmFubI36XS1DI3qmI0YdN1gks62JtFZvxR67ljjSNCeK6U08Zx4msEWOXuofgqUt6zPHSi1H9fbjR/NRA== + dependencies: + "@sinonjs/commons" "^1.7.0" + +"@szmarczak/http-timer@^1.1.2": + version "1.1.2" + resolved "https://registry.yarnpkg.com/@szmarczak/http-timer/-/http-timer-1.1.2.tgz#b1665e2c461a2cd92f4c1bbf50d5454de0d4b421" + integrity sha512-XIB2XbzHTN6ieIjfIMV9hlVcfPU26s2vafYWQcZHWXHOxiaRZYEDKEwdl129Zyg50+foYV2jCgtrqSA6qNuNSA== + dependencies: + defer-to-connect "^1.0.1" + +"@types/babel__core@^7.0.0", "@types/babel__core@^7.1.7": + version "7.1.12" + resolved "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.1.12.tgz#4d8e9e51eb265552a7e4f1ff2219ab6133bdfb2d" + integrity sha512-wMTHiiTiBAAPebqaPiPDLFA4LYPKr6Ph0Xq/6rq1Ur3v66HXyG+clfR9CNETkD7MQS8ZHvpQOtA53DLws5WAEQ== + dependencies: + "@babel/parser" "^7.1.0" + "@babel/types" "^7.0.0" + "@types/babel__generator" "*" + "@types/babel__template" "*" + "@types/babel__traverse" "*" + +"@types/babel__generator@*": + version "7.6.2" + resolved "https://registry.yarnpkg.com/@types/babel__generator/-/babel__generator-7.6.2.tgz#f3d71178e187858f7c45e30380f8f1b7415a12d8" + integrity sha512-MdSJnBjl+bdwkLskZ3NGFp9YcXGx5ggLpQQPqtgakVhsWK0hTtNYhjpZLlWQTviGTvF8at+Bvli3jV7faPdgeQ== + dependencies: + "@babel/types" "^7.0.0" + +"@types/babel__template@*": + version "7.4.0" + resolved "https://registry.yarnpkg.com/@types/babel__template/-/babel__template-7.4.0.tgz#0c888dd70b3ee9eebb6e4f200e809da0076262be" + integrity sha512-NTPErx4/FiPCGScH7foPyr+/1Dkzkni+rHiYHHoTjvwou7AQzJkNeD60A9CXRy+ZEN2B1bggmkTMCDb+Mv5k+A== + dependencies: + "@babel/parser" "^7.1.0" + "@babel/types" "^7.0.0" + +"@types/babel__traverse@*", "@types/babel__traverse@^7.0.4", "@types/babel__traverse@^7.0.6": + version "7.11.0" + resolved "https://registry.yarnpkg.com/@types/babel__traverse/-/babel__traverse-7.11.0.tgz#b9a1efa635201ba9bc850323a8793ee2d36c04a0" + integrity sha512-kSjgDMZONiIfSH1Nxcr5JIRMwUetDki63FSQfpTCz8ogF3Ulqm8+mr5f78dUYs6vMiB6gBusQqfQmBvHZj/lwg== + dependencies: + "@babel/types" "^7.3.0" + +"@types/chrome@^0.0.126": + version "0.0.126" + resolved "https://registry.yarnpkg.com/@types/chrome/-/chrome-0.0.126.tgz#f9f3436712f0c7c12ea9798abc9b95575ad7b23a" + integrity sha512-191z7uoyfbGU+z7/m45j9XbWugWqVHVPMM4hJV5cZ+3YzGCT9wFjMUHO3Wr3Xvo8aVodvRNu28u7lvEaAnfbzg== + dependencies: + "@types/filesystem" "*" + "@types/har-format" "*" + +"@types/debug@^4.1.5": + version "4.1.5" + resolved "https://registry.yarnpkg.com/@types/debug/-/debug-4.1.5.tgz#b14efa8852b7768d898906613c23f688713e02cd" + integrity sha512-Q1y515GcOdTHgagaVFhHnIFQ38ygs/kmxdNpvpou+raI9UO3YZcHDngBSYKQklcKlvA7iuQlmIKbzvmxcOE9CQ== + +"@types/filesystem@*": + version "0.0.29" + resolved "https://registry.yarnpkg.com/@types/filesystem/-/filesystem-0.0.29.tgz#ee3748eb5be140dcf980c3bd35f11aec5f7a3748" + integrity sha512-85/1KfRedmfPGsbK8YzeaQUyV1FQAvMPMTuWFQ5EkLd2w7szhNO96bk3Rh/SKmOfd9co2rCLf0Voy4o7ECBOvw== + dependencies: + "@types/filewriter" "*" + +"@types/filewriter@*": + version "0.0.28" + resolved "https://registry.yarnpkg.com/@types/filewriter/-/filewriter-0.0.28.tgz#c054e8af4d9dd75db4e63abc76f885168714d4b3" + integrity sha1-wFTor02d11205jq8dviFFocU1LM= + +"@types/firefox-webext-browser@^82.0.0": + version "82.0.0" + resolved "https://registry.yarnpkg.com/@types/firefox-webext-browser/-/firefox-webext-browser-82.0.0.tgz#4d0f5cfebd7321d2cbf0ccfb6032570f0138b958" + integrity sha512-zKHePkjMx42KIUUZCPcUiyu1tpfQXH9VR4iDYfns3HvmKVJzt/TAFT+DFVroos8BI9RH78YgF3Hi/wlC6R6cKA== + +"@types/fs-extra@^9.0.1": + version "9.0.5" + resolved "https://registry.yarnpkg.com/@types/fs-extra/-/fs-extra-9.0.5.tgz#2afb76a43a4bef80a363b94b314d0ca1694fc4f8" + integrity sha512-wr3t7wIW1c0A2BIJtdVp4EflriVaVVAsCAIHVzzh8B+GiFv9X1xeJjCs4upRXtzp7kQ6lP5xvskjoD4awJ1ZeA== + dependencies: + "@types/node" "*" + +"@types/graceful-fs@^4.1.2": + version "4.1.4" + resolved "https://registry.yarnpkg.com/@types/graceful-fs/-/graceful-fs-4.1.4.tgz#4ff9f641a7c6d1a3508ff88bc3141b152772e753" + integrity sha512-mWA/4zFQhfvOA8zWkXobwJvBD7vzcxgrOQ0J5CH1votGqdq9m7+FwtGaqyCZqC3NyyBkc9z4m+iry4LlqcMWJg== + dependencies: + "@types/node" "*" + +"@types/har-format@*": + version "1.2.5" + resolved "https://registry.yarnpkg.com/@types/har-format/-/har-format-1.2.5.tgz#4f6648814d0fdcb6a510e3364a9db439a753c4b1" + integrity sha512-IG8AE1m2pWtPqQ7wXhFhy6Q59bwwnLwO36v5Rit2FrbXCIp8Sk8E2PfUCreyrdo17STwFSKDAkitVuVYbpEHvQ== + +"@types/istanbul-lib-coverage@*", "@types/istanbul-lib-coverage@^2.0.0", "@types/istanbul-lib-coverage@^2.0.1": + version "2.0.3" + resolved "https://registry.yarnpkg.com/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.3.tgz#4ba8ddb720221f432e443bd5f9117fd22cfd4762" + integrity sha512-sz7iLqvVUg1gIedBOvlkxPlc8/uVzyS5OwGz1cKjXzkl3FpL3al0crU8YGU1WoHkxn0Wxbw5tyi6hvzJKNzFsw== + +"@types/istanbul-lib-report@*": + version "3.0.0" + resolved "https://registry.yarnpkg.com/@types/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz#c14c24f18ea8190c118ee7562b7ff99a36552686" + integrity sha512-plGgXAPfVKFoYfa9NpYDAkseG+g6Jr294RqeqcqDixSbU34MZVJRi/P+7Y8GDpzkEwLaGZZOpKIEmeVZNtKsrg== + dependencies: + "@types/istanbul-lib-coverage" "*" + +"@types/istanbul-reports@^3.0.0": + version "3.0.0" + resolved "https://registry.yarnpkg.com/@types/istanbul-reports/-/istanbul-reports-3.0.0.tgz#508b13aa344fa4976234e75dddcc34925737d821" + integrity sha512-nwKNbvnwJ2/mndE9ItP/zc2TCzw6uuodnF4EHYWD+gCQDVBuRQL5UzbZD0/ezy1iKsFU2ZQiDqg4M9dN4+wZgA== + dependencies: + "@types/istanbul-lib-report" "*" + +"@types/node@*": + version "14.14.13" + resolved "https://registry.yarnpkg.com/@types/node/-/node-14.14.13.tgz#9e425079799322113ae8477297ae6ef51b8e0cdf" + integrity sha512-vbxr0VZ8exFMMAjCW8rJwaya0dMCDyYW2ZRdTyjtrCvJoENMpdUHOT/eTzvgyA5ZnqRZ/sI0NwqAxNHKYokLJQ== + +"@types/node@^12.0.12": + version "12.19.9" + resolved "https://registry.yarnpkg.com/@types/node/-/node-12.19.9.tgz#990ad687ad8b26ef6dcc34a4f69c33d40c95b679" + integrity sha512-yj0DOaQeUrk3nJ0bd3Y5PeDRJ6W0r+kilosLA+dzF3dola/o9hxhMSg2sFvVcA2UHS5JSOsZp4S0c1OEXc4m1Q== + +"@types/normalize-package-data@^2.4.0": + version "2.4.0" + resolved "https://registry.yarnpkg.com/@types/normalize-package-data/-/normalize-package-data-2.4.0.tgz#e486d0d97396d79beedd0a6e33f4534ff6b4973e" + integrity sha512-f5j5b/Gf71L+dbqxIpQ4Z2WlmI/mPJ0fOkGGmFgtb6sAu97EPczzbS3/tJKxmcYDj55OX6ssqwDAWOHIYDRDGA== + +"@types/prettier@^2.0.0": + version "2.1.5" + resolved "https://registry.yarnpkg.com/@types/prettier/-/prettier-2.1.5.tgz#b6ab3bba29e16b821d84e09ecfaded462b816b00" + integrity sha512-UEyp8LwZ4Dg30kVU2Q3amHHyTn1jEdhCIE59ANed76GaT1Vp76DD3ZWSAxgCrw6wJ0TqeoBpqmfUHiUDPs//HQ== + +"@types/stack-utils@^2.0.0": + version "2.0.0" + resolved "https://registry.yarnpkg.com/@types/stack-utils/-/stack-utils-2.0.0.tgz#7036640b4e21cc2f259ae826ce843d277dad8cff" + integrity sha512-RJJrrySY7A8havqpGObOB4W92QXKJo63/jFLLgpvOtsGUqbQZ9Sbgl35KMm1DjC6j7AvmmU2bIno+3IyEaemaw== + +"@types/yargs-parser@*": + version "15.0.0" + resolved "https://registry.yarnpkg.com/@types/yargs-parser/-/yargs-parser-15.0.0.tgz#cb3f9f741869e20cce330ffbeb9271590483882d" + integrity sha512-FA/BWv8t8ZWJ+gEOnLLd8ygxH/2UFbAvgEonyfN6yWGLKc7zVjbpl2Y4CTjid9h2RfgPP6SEt6uHwEOply00yw== + +"@types/yargs@^15.0.0", "@types/yargs@^15.0.5": + version "15.0.11" + resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-15.0.11.tgz#361d7579ecdac1527687bcebf9946621c12ab78c" + integrity sha512-jfcNBxHFYJ4nPIacsi3woz1+kvUO6s1CyeEhtnDHBjHUMNj5UlW2GynmnSgiJJEdNg9yW5C8lfoNRZrHGv5EqA== + dependencies: + "@types/yargs-parser" "*" + +abab@^2.0.3: + version "2.0.5" + resolved "https://registry.yarnpkg.com/abab/-/abab-2.0.5.tgz#c0b678fb32d60fc1219c784d6a826fe385aeb79a" + integrity sha512-9IK9EadsbHo6jLWIpxpR6pL0sazTXV6+SQv25ZB+F7Bj9mJNaOc4nCRabwd5M/JwmUa8idz6Eci6eKfJryPs6Q== + +acorn-globals@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/acorn-globals/-/acorn-globals-6.0.0.tgz#46cdd39f0f8ff08a876619b55f5ac8a6dc770b45" + integrity sha512-ZQl7LOWaF5ePqqcX4hLuv/bLXYQNfNWw2c0/yX/TsPRKamzHcTGQnlCjHT3TsmkOUVEPS3crCxiPfdzE/Trlhg== + dependencies: + acorn "^7.1.1" + acorn-walk "^7.1.1" + +acorn-jsx@^5.3.1: + version "5.3.1" + resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.1.tgz#fc8661e11b7ac1539c47dbfea2e72b3af34d267b" + integrity sha512-K0Ptm/47OKfQRpNQ2J/oIN/3QYiK6FwW+eJbILhsdxh2WTLdl+30o8aGdTbm5JbffpFFAg/g+zi1E+jvJha5ng== + +acorn-walk@^7.1.1: + version "7.2.0" + resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-7.2.0.tgz#0de889a601203909b0fbe07b8938dc21d2e967bc" + integrity sha512-OPdCF6GsMIP+Az+aWfAAOEt2/+iVDKE7oy6lJ098aoe59oAmK76qV6Gw60SbZ8jHuG2wH058GF4pLFbYamYrVA== + +acorn@^7.1.1, acorn@^7.4.0: + version "7.4.1" + resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.4.1.tgz#feaed255973d2e77555b83dbc08851a6c63520fa" + integrity sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A== + +ajv-keywords@^3.4.1: + version "3.5.2" + resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.5.2.tgz#31f29da5ab6e00d1c2d329acf7b5929614d5014d" + integrity sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ== + +ajv@^6.10.0, ajv@^6.10.2, ajv@^6.12.0, ajv@^6.12.3, ajv@^6.12.4: + version "6.12.6" + resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.6.tgz#baf5a62e802b07d977034586f8c3baf5adf26df4" + integrity sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g== + dependencies: + fast-deep-equal "^3.1.1" + fast-json-stable-stringify "^2.0.0" + json-schema-traverse "^0.4.1" + uri-js "^4.2.2" + +ansi-align@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/ansi-align/-/ansi-align-3.0.0.tgz#b536b371cf687caaef236c18d3e21fe3797467cb" + integrity sha512-ZpClVKqXN3RGBmKibdfWzqCY4lnjEuoNzU5T0oEFpfd/z5qJHVarukridD4juLO2FXMiwUQxr9WqQtaYa8XRYw== + dependencies: + string-width "^3.0.0" + +ansi-colors@^4.1.1: + version "4.1.1" + resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-4.1.1.tgz#cbb9ae256bf750af1eab344f229aa27fe94ba348" + integrity sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA== + +ansi-escapes@^4.2.1: + version "4.3.1" + resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-4.3.1.tgz#a5c47cc43181f1f38ffd7076837700d395522a61" + integrity sha512-JWF7ocqNrp8u9oqpgV+wH5ftbt+cfvv+PTjOvKLT3AdYly/LmORARfEVT1iyjwN+4MqE5UmVKoAdIBqeoCHgLA== + dependencies: + type-fest "^0.11.0" + +ansi-regex@^4.1.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-4.1.0.tgz#8b9f8f08cf1acb843756a839ca8c7e3168c51997" + integrity sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg== + +ansi-regex@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.0.tgz#388539f55179bf39339c81af30a654d69f87cb75" + integrity sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg== + +ansi-styles@^3.2.0, ansi-styles@^3.2.1: + version "3.2.1" + resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d" + integrity sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA== + dependencies: + color-convert "^1.9.0" + +ansi-styles@^4.0.0, ansi-styles@^4.1.0: + version "4.3.0" + resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.3.0.tgz#edd803628ae71c04c85ae7a0906edad34b648937" + integrity sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg== + dependencies: + color-convert "^2.0.1" + +anymatch@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-2.0.0.tgz#bcb24b4f37934d9aa7ac17b4adaf89e7c76ef2eb" + integrity sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw== + dependencies: + micromatch "^3.1.4" + normalize-path "^2.1.1" + +anymatch@^3.0.3: + version "3.1.1" + resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.1.tgz#c55ecf02185e2469259399310c173ce31233b142" + integrity sha512-mM8522psRCqzV+6LhomX5wgp25YVibjh8Wj23I5RPkPppSVSjyKD2A2mBJmWGa+KN7f2D6LNh9jkBCeyLktzjg== + dependencies: + normalize-path "^3.0.0" + picomatch "^2.0.4" + +app-builder-bin@3.5.10: + version "3.5.10" + resolved "https://registry.yarnpkg.com/app-builder-bin/-/app-builder-bin-3.5.10.tgz#4a7f9999fccc0c435b6284ae1366bc76a17c4a7d" + integrity sha512-Jd+GW68lR0NeetgZDo47PdWBEPdnD+p0jEa7XaxjRC8u6Oo/wgJsfKUkORRgr2NpkD19IFKN50P6JYy04XHFLQ== + +app-builder-lib@22.9.1: + version "22.9.1" + resolved "https://registry.yarnpkg.com/app-builder-lib/-/app-builder-lib-22.9.1.tgz#ccb8f1a02b628514a5dfab9401fa2a976689415c" + integrity sha512-KfXim/fiNwFW2SKffsjEMdAU7RbbEXn62x5YyXle1b4j9X/wEHW9iwox8De6y0hJdR+/kCC/49lI+VgNwLhV7A== + dependencies: + "7zip-bin" "~5.0.3" + "@develar/schema-utils" "~2.6.5" + async-exit-hook "^2.0.1" + bluebird-lst "^1.0.9" + builder-util "22.9.1" + builder-util-runtime "8.7.2" + chromium-pickle-js "^0.2.0" + debug "^4.3.0" + ejs "^3.1.5" + electron-publish "22.9.1" + fs-extra "^9.0.1" + hosted-git-info "^3.0.5" + is-ci "^2.0.0" + isbinaryfile "^4.0.6" + js-yaml "^3.14.0" + lazy-val "^1.0.4" + minimatch "^3.0.4" + normalize-package-data "^2.5.0" + read-config-file "6.0.0" + sanitize-filename "^1.6.3" + semver "^7.3.2" + temp-file "^3.3.7" + +archiver-utils@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/archiver-utils/-/archiver-utils-2.1.0.tgz#e8a460e94b693c3e3da182a098ca6285ba9249e2" + integrity sha512-bEL/yUb/fNNiNTuUz979Z0Yg5L+LzLxGJz8x79lYmR54fmTIb6ob/hNQgkQnIUDWIFjZVQwl9Xs356I6BAMHfw== + dependencies: + glob "^7.1.4" + graceful-fs "^4.2.0" + lazystream "^1.0.0" + lodash.defaults "^4.2.0" + lodash.difference "^4.5.0" + lodash.flatten "^4.4.0" + lodash.isplainobject "^4.0.6" + lodash.union "^4.6.0" + normalize-path "^3.0.0" + readable-stream "^2.0.0" + +archiver@^5.0.2: + version "5.1.0" + resolved "https://registry.yarnpkg.com/archiver/-/archiver-5.1.0.tgz#05b0f6f7836f3e6356a0532763d2bb91017a7e37" + integrity sha512-iKuQUP1nuKzBC2PFlGet5twENzCfyODmvkxwDV0cEFXavwcLrIW5ssTuHi9dyTPvpWr6Faweo2eQaQiLIwyXTA== + dependencies: + archiver-utils "^2.1.0" + async "^3.2.0" + buffer-crc32 "^0.2.1" + readable-stream "^3.6.0" + readdir-glob "^1.0.0" + tar-stream "^2.1.4" + zip-stream "^4.0.4" + +argparse@^1.0.7: + version "1.0.10" + resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz#bcd6791ea5ae09725e17e5ad988134cd40b3d911" + integrity sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg== + dependencies: + sprintf-js "~1.0.2" + +arr-diff@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/arr-diff/-/arr-diff-4.0.0.tgz#d6461074febfec71e7e15235761a329a5dc7c520" + integrity sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA= + +arr-flatten@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/arr-flatten/-/arr-flatten-1.1.0.tgz#36048bbff4e7b47e136644316c99669ea5ae91f1" + integrity sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg== + +arr-union@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/arr-union/-/arr-union-3.1.0.tgz#e39b09aea9def866a8f206e288af63919bae39c4" + integrity sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ= + +array-unique@^0.3.2: + version "0.3.2" + resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.3.2.tgz#a894b75d4bc4f6cd679ef3244a9fd8f46ae2d428" + integrity sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg= + +asn1@~0.2.3: + version "0.2.4" + resolved "https://registry.yarnpkg.com/asn1/-/asn1-0.2.4.tgz#8d2475dfab553bb33e77b54e59e880bb8ce23136" + integrity sha512-jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg== + dependencies: + safer-buffer "~2.1.0" + +assert-plus@1.0.0, assert-plus@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-1.0.0.tgz#f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525" + integrity sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU= + +assign-symbols@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/assign-symbols/-/assign-symbols-1.0.0.tgz#59667f41fadd4f20ccbc2bb96b8d4f7f78ec0367" + integrity sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c= + +astral-regex@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/astral-regex/-/astral-regex-1.0.0.tgz#6c8c3fb827dd43ee3918f27b82782ab7658a6fd9" + integrity sha512-+Ryf6g3BKoRc7jfp7ad8tM4TtMiaWvbF/1/sQcZPkkS7ag3D5nMBCe2UfOTONtAkaG0tO0ij3C5Lwmf1EiyjHg== + +async-exit-hook@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/async-exit-hook/-/async-exit-hook-2.0.1.tgz#8bd8b024b0ec9b1c01cccb9af9db29bd717dfaf3" + integrity sha512-NW2cX8m1Q7KPA7a5M2ULQeZ2wR5qI5PAbw5L0UOMxdioVk9PMZ0h1TmyZEkPYrCvYjDlFICusOu1dlEKAAeXBw== + +async@0.9.x: + version "0.9.2" + resolved "https://registry.yarnpkg.com/async/-/async-0.9.2.tgz#aea74d5e61c1f899613bf64bda66d4c78f2fd17d" + integrity sha1-rqdNXmHB+JlhO/ZL2mbUx48v0X0= + +async@^3.2.0: + version "3.2.0" + resolved "https://registry.yarnpkg.com/async/-/async-3.2.0.tgz#b3a2685c5ebb641d3de02d161002c60fc9f85720" + integrity sha512-TR2mEZFVOj2pLStYxLht7TyfuRzaydfpxr3k9RpHIzMgw7A64dzsdqCxH1WJyQdoe8T10nDXd9wnEigmiuHIZw== + +asynckit@^0.4.0: + version "0.4.0" + resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79" + integrity sha1-x57Zf380y48robyXkLzDZkdLS3k= + +at-least-node@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/at-least-node/-/at-least-node-1.0.0.tgz#602cd4b46e844ad4effc92a8011a3c46e0238dc2" + integrity sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg== + +atob@^2.1.2: + version "2.1.2" + resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz#6d9517eb9e030d2436666651e86bd9f6f13533c9" + integrity sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg== + +aws-sign2@~0.7.0: + version "0.7.0" + resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.7.0.tgz#b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8" + integrity sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg= + +aws4@^1.8.0: + version "1.11.0" + resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.11.0.tgz#d61f46d83b2519250e2784daf5b09479a8b41c59" + integrity sha512-xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA== + +babel-jest@^26.6.3: + version "26.6.3" + resolved "https://registry.yarnpkg.com/babel-jest/-/babel-jest-26.6.3.tgz#d87d25cb0037577a0c89f82e5755c5d293c01056" + integrity sha512-pl4Q+GAVOHwvjrck6jKjvmGhnO3jHX/xuB9d27f+EJZ/6k+6nMuPjorrYp7s++bKKdANwzElBWnLWaObvTnaZA== + dependencies: + "@jest/transform" "^26.6.2" + "@jest/types" "^26.6.2" + "@types/babel__core" "^7.1.7" + babel-plugin-istanbul "^6.0.0" + babel-preset-jest "^26.6.2" + chalk "^4.0.0" + graceful-fs "^4.2.4" + slash "^3.0.0" + +babel-plugin-istanbul@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/babel-plugin-istanbul/-/babel-plugin-istanbul-6.0.0.tgz#e159ccdc9af95e0b570c75b4573b7c34d671d765" + integrity sha512-AF55rZXpe7trmEylbaE1Gv54wn6rwU03aptvRoVIGP8YykoSxqdVLV1TfwflBCE/QtHmqtP8SWlTENqbK8GCSQ== + dependencies: + "@babel/helper-plugin-utils" "^7.0.0" + "@istanbuljs/load-nyc-config" "^1.0.0" + "@istanbuljs/schema" "^0.1.2" + istanbul-lib-instrument "^4.0.0" + test-exclude "^6.0.0" + +babel-plugin-jest-hoist@^26.6.2: + version "26.6.2" + resolved "https://registry.yarnpkg.com/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-26.6.2.tgz#8185bd030348d254c6d7dd974355e6a28b21e62d" + integrity sha512-PO9t0697lNTmcEHH69mdtYiOIkkOlj9fySqfO3K1eCcdISevLAE0xY59VLLUj0SoiPiTX/JU2CYFpILydUa5Lw== + dependencies: + "@babel/template" "^7.3.3" + "@babel/types" "^7.3.3" + "@types/babel__core" "^7.0.0" + "@types/babel__traverse" "^7.0.6" + +babel-preset-current-node-syntax@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/babel-preset-current-node-syntax/-/babel-preset-current-node-syntax-1.0.0.tgz#cf5feef29551253471cfa82fc8e0f5063df07a77" + integrity sha512-mGkvkpocWJes1CmMKtgGUwCeeq0pOhALyymozzDWYomHTbDLwueDYG6p4TK1YOeYHCzBzYPsWkgTto10JubI1Q== + dependencies: + "@babel/plugin-syntax-async-generators" "^7.8.4" + "@babel/plugin-syntax-bigint" "^7.8.3" + "@babel/plugin-syntax-class-properties" "^7.8.3" + "@babel/plugin-syntax-import-meta" "^7.8.3" + "@babel/plugin-syntax-json-strings" "^7.8.3" + "@babel/plugin-syntax-logical-assignment-operators" "^7.8.3" + "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.3" + "@babel/plugin-syntax-numeric-separator" "^7.8.3" + "@babel/plugin-syntax-object-rest-spread" "^7.8.3" + "@babel/plugin-syntax-optional-catch-binding" "^7.8.3" + "@babel/plugin-syntax-optional-chaining" "^7.8.3" + "@babel/plugin-syntax-top-level-await" "^7.8.3" + +babel-preset-jest@^26.6.2: + version "26.6.2" + resolved "https://registry.yarnpkg.com/babel-preset-jest/-/babel-preset-jest-26.6.2.tgz#747872b1171df032252426586881d62d31798fee" + integrity sha512-YvdtlVm9t3k777c5NPQIv6cxFFFapys25HiUmuSgHwIZhfifweR5c5Sf5nwE3MAbfu327CYSvps8Yx6ANLyleQ== + dependencies: + babel-plugin-jest-hoist "^26.6.2" + babel-preset-current-node-syntax "^1.0.0" + +balanced-match@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767" + integrity sha1-ibTRmasr7kneFk6gK4nORi1xt2c= + +base64-js@^1.3.1: + version "1.5.1" + resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.5.1.tgz#1b1b440160a5bf7ad40b650f095963481903930a" + integrity sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA== + +base@^0.11.1: + version "0.11.2" + resolved "https://registry.yarnpkg.com/base/-/base-0.11.2.tgz#7bde5ced145b6d551a90db87f83c558b4eb48a8f" + integrity sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg== + dependencies: + cache-base "^1.0.1" + class-utils "^0.3.5" + component-emitter "^1.2.1" + define-property "^1.0.0" + isobject "^3.0.1" + mixin-deep "^1.2.0" + pascalcase "^0.1.1" + +bcrypt-pbkdf@^1.0.0: + version "1.0.2" + resolved "https://registry.yarnpkg.com/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz#a4301d389b6a43f9b67ff3ca11a3f6637e360e9e" + integrity sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4= + dependencies: + tweetnacl "^0.14.3" + +bl@^4.0.3: + version "4.0.3" + resolved "https://registry.yarnpkg.com/bl/-/bl-4.0.3.tgz#12d6287adc29080e22a705e5764b2a9522cdc489" + integrity sha512-fs4G6/Hu4/EE+F75J8DuN/0IpQqNjAdC7aEQv7Qt8MHGUH7Ckv2MwTEEeN9QehD0pfIDkMI1bkHYkKy7xHyKIg== + dependencies: + buffer "^5.5.0" + inherits "^2.0.4" + readable-stream "^3.4.0" + +bluebird-lst@^1.0.9: + version "1.0.9" + resolved "https://registry.yarnpkg.com/bluebird-lst/-/bluebird-lst-1.0.9.tgz#a64a0e4365658b9ab5fe875eb9dfb694189bb41c" + integrity sha512-7B1Rtx82hjnSD4PGLAjVWeYH3tHAcVUmChh85a3lltKQm6FresXh9ErQo6oAv6CqxttczC3/kEg8SY5NluPuUw== + dependencies: + bluebird "^3.5.5" + +bluebird@^3.5.5: + version "3.7.2" + resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.7.2.tgz#9f229c15be272454ffa973ace0dbee79a1b0c36f" + integrity sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg== + +boolean@^3.0.1: + version "3.0.2" + resolved "https://registry.yarnpkg.com/boolean/-/boolean-3.0.2.tgz#df1baa18b6a2b0e70840475e1d93ec8fe75b2570" + integrity sha512-RwywHlpCRc3/Wh81MiCKun4ydaIFyW5Ea6JbL6sRCVx5q5irDw7pMXBUFYF/jArQ6YrG36q0kpovc9P/Kd3I4g== + +boxen@^4.2.0: + version "4.2.0" + resolved "https://registry.yarnpkg.com/boxen/-/boxen-4.2.0.tgz#e411b62357d6d6d36587c8ac3d5d974daa070e64" + integrity sha512-eB4uT9RGzg2odpER62bBwSLvUeGC+WbRjjyyFhGsKnc8wp/m0+hQsMUvUe3H2V0D5vw0nBdO1hCJoZo5mKeuIQ== + dependencies: + ansi-align "^3.0.0" + camelcase "^5.3.1" + chalk "^3.0.0" + cli-boxes "^2.2.0" + string-width "^4.1.0" + term-size "^2.1.0" + type-fest "^0.8.1" + widest-line "^3.1.0" + +brace-expansion@^1.1.7: + version "1.1.11" + resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd" + integrity sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA== + dependencies: + balanced-match "^1.0.0" + concat-map "0.0.1" + +braces@^2.3.1: + version "2.3.2" + resolved "https://registry.yarnpkg.com/braces/-/braces-2.3.2.tgz#5979fd3f14cd531565e5fa2df1abfff1dfaee729" + integrity sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w== + dependencies: + arr-flatten "^1.1.0" + array-unique "^0.3.2" + extend-shallow "^2.0.1" + fill-range "^4.0.0" + isobject "^3.0.1" + repeat-element "^1.1.2" + snapdragon "^0.8.1" + snapdragon-node "^2.0.1" + split-string "^3.0.2" + to-regex "^3.0.1" + +braces@^3.0.1: + version "3.0.2" + resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107" + integrity sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A== + dependencies: + fill-range "^7.0.1" + +browser-process-hrtime@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/browser-process-hrtime/-/browser-process-hrtime-1.0.0.tgz#3c9b4b7d782c8121e56f10106d84c0d0ffc94626" + integrity sha512-9o5UecI3GhkpM6DrXr69PblIuWxPKk9Y0jHBRhdocZ2y7YECBFCsHm79Pr3OyR2AvjhDkabFJaDJMYRazHgsow== + +bser@2.1.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/bser/-/bser-2.1.1.tgz#e6787da20ece9d07998533cfd9de6f5c38f4bc05" + integrity sha512-gQxTNE/GAfIIrmHLUE3oJyp5FO6HRBfhjnw4/wMmA63ZGDJnWBmgY/lyQBpnDUkGmAhbSe39tx2d/iTOAfglwQ== + dependencies: + node-int64 "^0.4.0" + +buffer-crc32@^0.2.1, buffer-crc32@^0.2.13, buffer-crc32@~0.2.3: + version "0.2.13" + resolved "https://registry.yarnpkg.com/buffer-crc32/-/buffer-crc32-0.2.13.tgz#0d333e3f00eac50aa1454abd30ef8c2a5d9a7242" + integrity sha1-DTM+PwDqxQqhRUq9MO+MKl2ackI= + +buffer-from@^1.0.0: + version "1.1.1" + resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.1.tgz#32713bc028f75c02fdb710d7c7bcec1f2c6070ef" + integrity sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A== + +buffer@^5.5.0: + version "5.7.1" + resolved "https://registry.yarnpkg.com/buffer/-/buffer-5.7.1.tgz#ba62e7c13133053582197160851a8f648e99eed0" + integrity sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ== + dependencies: + base64-js "^1.3.1" + ieee754 "^1.1.13" + +builder-util-runtime@8.7.2: + version "8.7.2" + resolved "https://registry.yarnpkg.com/builder-util-runtime/-/builder-util-runtime-8.7.2.tgz#d93afc71428a12789b437e13850e1fa7da956d72" + integrity sha512-xBqv+8bg6cfnzAQK1k3OGpfaHg+QkPgIgpEkXNhouZ0WiUkyZCftuRc2LYzQrLucFywpa14Xbc6+hTbpq83yRA== + dependencies: + debug "^4.1.1" + sax "^1.2.4" + +builder-util@22.9.1: + version "22.9.1" + resolved "https://registry.yarnpkg.com/builder-util/-/builder-util-22.9.1.tgz#b7087a5cde477f90d718ca5d7fafb6ae261b16af" + integrity sha512-5hN/XOaYu4ZQUS6F+5CXE6jTo+NAnVqAxDuKGSaHWb9bejfv/rluChTLoY3/nJh7RFjkoyVjvFJv7zQDB1QmHw== + dependencies: + "7zip-bin" "~5.0.3" + "@types/debug" "^4.1.5" + "@types/fs-extra" "^9.0.1" + app-builder-bin "3.5.10" + bluebird-lst "^1.0.9" + builder-util-runtime "8.7.2" + chalk "^4.1.0" + debug "^4.3.0" + fs-extra "^9.0.1" + is-ci "^2.0.0" + js-yaml "^3.14.0" + source-map-support "^0.5.19" + stat-mode "^1.0.0" + temp-file "^3.3.7" + +cache-base@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/cache-base/-/cache-base-1.0.1.tgz#0a7f46416831c8b662ee36fe4e7c59d76f666ab2" + integrity sha512-AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ== + dependencies: + collection-visit "^1.0.0" + component-emitter "^1.2.1" + get-value "^2.0.6" + has-value "^1.0.0" + isobject "^3.0.1" + set-value "^2.0.0" + to-object-path "^0.3.0" + union-value "^1.0.0" + unset-value "^1.0.0" + +cacheable-request@^6.0.0: + version "6.1.0" + resolved "https://registry.yarnpkg.com/cacheable-request/-/cacheable-request-6.1.0.tgz#20ffb8bd162ba4be11e9567d823db651052ca912" + integrity sha512-Oj3cAGPCqOZX7Rz64Uny2GYAZNliQSqfbePrgAQ1wKAihYmCUnraBtJtKcGR4xz7wF+LoJC+ssFZvv5BgF9Igg== + dependencies: + clone-response "^1.0.2" + get-stream "^5.1.0" + http-cache-semantics "^4.0.0" + keyv "^3.0.0" + lowercase-keys "^2.0.0" + normalize-url "^4.1.0" + responselike "^1.0.2" + +callsites@^3.0.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/callsites/-/callsites-3.1.0.tgz#b3630abd8943432f54b3f0519238e33cd7df2f73" + integrity sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ== + +camelcase@^5.0.0, camelcase@^5.3.1: + version "5.3.1" + resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.3.1.tgz#e3c9b31569e106811df242f715725a1f4c494320" + integrity sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg== + +camelcase@^6.0.0: + version "6.2.0" + resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-6.2.0.tgz#924af881c9d525ac9d87f40d964e5cea982a1809" + integrity sha512-c7wVvbw3f37nuobQNtgsgG9POC9qMbNuMQmTCqZv23b6MIz0fcYpBiOlv9gEN/hdLdnZTDQhg6e9Dq5M1vKvfg== + +capture-exit@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/capture-exit/-/capture-exit-2.0.0.tgz#fb953bfaebeb781f62898239dabb426d08a509a4" + integrity sha512-PiT/hQmTonHhl/HFGN+Lx3JJUznrVYJ3+AQsnthneZbvW7x+f08Tk7yLJTLEOUvBTbduLeeBkxEaYXUOUrRq6g== + dependencies: + rsvp "^4.8.4" + +caseless@~0.12.0: + version "0.12.0" + resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc" + integrity sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw= + +chalk@^2.0.0, chalk@^2.4.2: + version "2.4.2" + resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424" + integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ== + dependencies: + ansi-styles "^3.2.1" + escape-string-regexp "^1.0.5" + supports-color "^5.3.0" + +chalk@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/chalk/-/chalk-3.0.0.tgz#3f73c2bf526591f574cc492c51e2456349f844e4" + integrity sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg== + dependencies: + ansi-styles "^4.1.0" + supports-color "^7.1.0" + +chalk@^4.0.0, chalk@^4.1.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.0.tgz#4e14870a618d9e2edd97dd8345fd9d9dc315646a" + integrity sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A== + dependencies: + ansi-styles "^4.1.0" + supports-color "^7.1.0" + +char-regex@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/char-regex/-/char-regex-1.0.2.tgz#d744358226217f981ed58f479b1d6bcc29545dcf" + integrity sha512-kWWXztvZ5SBQV+eRgKFeh8q5sLuZY2+8WUIzlxWVTg+oGwY14qylx1KbKzHd8P6ZYkAg0xyIDU9JMHhyJMZ1jw== + +chromium-pickle-js@^0.2.0: + version "0.2.0" + resolved "https://registry.yarnpkg.com/chromium-pickle-js/-/chromium-pickle-js-0.2.0.tgz#04a106672c18b085ab774d983dfa3ea138f22205" + integrity sha1-BKEGZywYsIWrd02YPfo+oTjyIgU= + +ci-info@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-2.0.0.tgz#67a9e964be31a51e15e5010d58e6f12834002f46" + integrity sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ== + +cjs-module-lexer@^0.6.0: + version "0.6.0" + resolved "https://registry.yarnpkg.com/cjs-module-lexer/-/cjs-module-lexer-0.6.0.tgz#4186fcca0eae175970aee870b9fe2d6cf8d5655f" + integrity sha512-uc2Vix1frTfnuzxxu1Hp4ktSvM3QaI4oXl4ZUqL1wjTu/BGki9TrCWoqLTg/drR1KwAEarXuRFCG2Svr1GxPFw== + +class-utils@^0.3.5: + version "0.3.6" + resolved "https://registry.yarnpkg.com/class-utils/-/class-utils-0.3.6.tgz#f93369ae8b9a7ce02fd41faad0ca83033190c463" + integrity sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg== + dependencies: + arr-union "^3.1.0" + define-property "^0.2.5" + isobject "^3.0.0" + static-extend "^0.1.1" + +cli-boxes@^2.2.0: + version "2.2.1" + resolved "https://registry.yarnpkg.com/cli-boxes/-/cli-boxes-2.2.1.tgz#ddd5035d25094fce220e9cab40a45840a440318f" + integrity sha512-y4coMcylgSCdVinjiDBuR8PCC2bLjyGTwEmPb9NHR/QaNU6EUOXcTY/s6VjGMD6ENSEaeQYHCY0GNGS5jfMwPw== + +cliui@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/cliui/-/cliui-6.0.0.tgz#511d702c0c4e41ca156d7d0e96021f23e13225b1" + integrity sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ== + dependencies: + string-width "^4.2.0" + strip-ansi "^6.0.0" + wrap-ansi "^6.2.0" + +cliui@^7.0.2: + version "7.0.4" + resolved "https://registry.yarnpkg.com/cliui/-/cliui-7.0.4.tgz#a0265ee655476fc807aea9df3df8df7783808b4f" + integrity sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ== + dependencies: + string-width "^4.2.0" + strip-ansi "^6.0.0" + wrap-ansi "^7.0.0" + +clone-response@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/clone-response/-/clone-response-1.0.2.tgz#d1dc973920314df67fbeb94223b4ee350239e96b" + integrity sha1-0dyXOSAxTfZ/vrlCI7TuNQI56Ws= + dependencies: + mimic-response "^1.0.0" + +co@^4.6.0: + version "4.6.0" + resolved "https://registry.yarnpkg.com/co/-/co-4.6.0.tgz#6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184" + integrity sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ= + +collect-v8-coverage@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/collect-v8-coverage/-/collect-v8-coverage-1.0.1.tgz#cc2c8e94fc18bbdffe64d6534570c8a673b27f59" + integrity sha512-iBPtljfCNcTKNAto0KEtDfZ3qzjJvqE3aTGZsbhjSBlorqpXJlaWWtPO35D+ZImoC3KWejX64o+yPGxhWSTzfg== + +collection-visit@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/collection-visit/-/collection-visit-1.0.0.tgz#4bc0373c164bc3291b4d368c829cf1a80a59dca0" + integrity sha1-S8A3PBZLwykbTTaMgpzxqApZ3KA= + dependencies: + map-visit "^1.0.0" + object-visit "^1.0.0" + +color-convert@^1.9.0: + version "1.9.3" + resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz#bb71850690e1f136567de629d2d5471deda4c1e8" + integrity sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg== + dependencies: + color-name "1.1.3" + +color-convert@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-2.0.1.tgz#72d3a68d598c9bdb3af2ad1e84f21d896abd4de3" + integrity sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ== + dependencies: + color-name "~1.1.4" + +color-name@1.1.3: + version "1.1.3" + resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25" + integrity sha1-p9BVi9icQveV3UIyj3QIMcpTvCU= + +color-name@~1.1.4: + version "1.1.4" + resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2" + integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA== + +combined-stream@^1.0.6, combined-stream@~1.0.6: + version "1.0.8" + resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.8.tgz#c3d45a8b34fd730631a110a8a2520682b31d5a7f" + integrity sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg== + dependencies: + delayed-stream "~1.0.0" + +component-emitter@^1.2.1: + version "1.3.0" + resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.3.0.tgz#16e4070fba8ae29b679f2215853ee181ab2eabc0" + integrity sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg== + +compress-commons@^4.0.2: + version "4.0.2" + resolved "https://registry.yarnpkg.com/compress-commons/-/compress-commons-4.0.2.tgz#d6896be386e52f37610cef9e6fa5defc58c31bd7" + integrity sha512-qhd32a9xgzmpfoga1VQEiLEwdKZ6Plnpx5UCgIsf89FSolyJ7WnifY4Gtjgv5WR6hWAyRaHxC5MiEhU/38U70A== + dependencies: + buffer-crc32 "^0.2.13" + crc32-stream "^4.0.1" + normalize-path "^3.0.0" + readable-stream "^3.6.0" + +concat-map@0.0.1: + version "0.0.1" + resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b" + integrity sha1-2Klr13/Wjfd5OnMDajug1UBdR3s= + +concat-stream@^1.6.2: + version "1.6.2" + resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.2.tgz#904bdf194cd3122fc675c77fc4ac3d4ff0fd1a34" + integrity sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw== + dependencies: + buffer-from "^1.0.0" + inherits "^2.0.3" + readable-stream "^2.2.2" + typedarray "^0.0.6" + +config-chain@^1.1.11: + version "1.1.12" + resolved "https://registry.yarnpkg.com/config-chain/-/config-chain-1.1.12.tgz#0fde8d091200eb5e808caf25fe618c02f48e4efa" + integrity sha512-a1eOIcu8+7lUInge4Rpf/n4Krkf3Dd9lqhljRzII1/Zno/kRtUWnznPO3jOKBmTEktkt3fkxisUcivoj0ebzoA== + dependencies: + ini "^1.3.4" + proto-list "~1.2.1" + +configstore@^5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/configstore/-/configstore-5.0.1.tgz#d365021b5df4b98cdd187d6a3b0e3f6a7cc5ed96" + integrity sha512-aMKprgk5YhBNyH25hj8wGt2+D52Sw1DRRIzqBwLp2Ya9mFmY8KPvvtvmna8SxVR9JMZ4kzMD68N22vlaRpkeFA== + dependencies: + dot-prop "^5.2.0" + graceful-fs "^4.1.2" + make-dir "^3.0.0" + unique-string "^2.0.0" + write-file-atomic "^3.0.0" + xdg-basedir "^4.0.0" + +convert-source-map@^1.4.0, convert-source-map@^1.6.0, convert-source-map@^1.7.0: + version "1.7.0" + resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.7.0.tgz#17a2cb882d7f77d3490585e2ce6c524424a3a442" + integrity sha512-4FJkXzKXEDB1snCFZlLP4gpC3JILicCpGbzG9f9G7tGqGCzETQ2hWPrcinA9oU4wtf2biUaEH5065UnMeR33oA== + dependencies: + safe-buffer "~5.1.1" + +copy-descriptor@^0.1.0: + version "0.1.1" + resolved "https://registry.yarnpkg.com/copy-descriptor/-/copy-descriptor-0.1.1.tgz#676f6eb3c39997c2ee1ac3a924fd6124748f578d" + integrity sha1-Z29us8OZl8LuGsOpJP1hJHSPV40= + +core-js@^3.6.5: + version "3.8.1" + resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.8.1.tgz#f51523668ac8a294d1285c3b9db44025fda66d47" + integrity sha512-9Id2xHY1W7m8hCl8NkhQn5CufmF/WuR30BTRewvCXc1aZd3kMECwNZ69ndLbekKfakw9Rf2Xyc+QR6E7Gg+obg== + +core-util-is@1.0.2, core-util-is@~1.0.0: + version "1.0.2" + resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7" + integrity sha1-tf1UIgqivFq1eqtxQMlAdUUDwac= + +crc-32@^1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/crc-32/-/crc-32-1.2.0.tgz#cb2db6e29b88508e32d9dd0ec1693e7b41a18208" + integrity sha512-1uBwHxF+Y/4yF5G48fwnKq6QsIXheor3ZLPT80yGBV1oEUwpPojlEhQbWKVw1VwcTQyMGHK1/XMmTjmlsmTTGA== + dependencies: + exit-on-epipe "~1.0.1" + printj "~1.1.0" + +crc32-stream@^4.0.1: + version "4.0.1" + resolved "https://registry.yarnpkg.com/crc32-stream/-/crc32-stream-4.0.1.tgz#0f047d74041737f8a55e86837a1b826bd8ab0067" + integrity sha512-FN5V+weeO/8JaXsamelVYO1PHyeCsuL3HcG4cqsj0ceARcocxalaShCsohZMSAF+db7UYFwBy1rARK/0oFItUw== + dependencies: + crc-32 "^1.2.0" + readable-stream "^3.4.0" + +cross-spawn@^6.0.0: + version "6.0.5" + resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-6.0.5.tgz#4a5ec7c64dfae22c3a14124dbacdee846d80cbc4" + integrity sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ== + dependencies: + nice-try "^1.0.4" + path-key "^2.0.1" + semver "^5.5.0" + shebang-command "^1.2.0" + which "^1.2.9" + +cross-spawn@^7.0.0, cross-spawn@^7.0.2: + version "7.0.3" + resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6" + integrity sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w== + dependencies: + path-key "^3.1.0" + shebang-command "^2.0.0" + which "^2.0.1" + +crypto-random-string@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/crypto-random-string/-/crypto-random-string-2.0.0.tgz#ef2a7a966ec11083388369baa02ebead229b30d5" + integrity sha512-v1plID3y9r/lPhviJ1wrXpLeyUIGAZ2SHNYTEapm7/8A9nLPoyvVp3RK/EPFqn5kEznyWgYZNsRtYYIWbuG8KA== + +cssom@^0.4.4: + version "0.4.4" + resolved "https://registry.yarnpkg.com/cssom/-/cssom-0.4.4.tgz#5a66cf93d2d0b661d80bf6a44fb65f5c2e4e0a10" + integrity sha512-p3pvU7r1MyyqbTk+WbNJIgJjG2VmTIaB10rI93LzVPrmDJKkzKYMtxxyAvQXR/NS6otuzveI7+7BBq3SjBS2mw== + +cssom@~0.3.6: + version "0.3.8" + resolved "https://registry.yarnpkg.com/cssom/-/cssom-0.3.8.tgz#9f1276f5b2b463f2114d3f2c75250af8c1a36f4a" + integrity sha512-b0tGHbfegbhPJpxpiBPU2sCkigAqtM9O121le6bbOlgyV+NyGyCmVfJ6QW9eRjz8CpNfWEOYBIMIGRYkLwsIYg== + +cssstyle@^2.2.0: + version "2.3.0" + resolved "https://registry.yarnpkg.com/cssstyle/-/cssstyle-2.3.0.tgz#ff665a0ddbdc31864b09647f34163443d90b0852" + integrity sha512-AZL67abkUzIuvcHqk7c09cezpGNcxUxU4Ioi/05xHk4DQeTkWmGYftIE6ctU6AEt+Gn4n1lDStOtj7FKycP71A== + dependencies: + cssom "~0.3.6" + +darkreader@^4.9.26: + version "4.9.26" + resolved "https://registry.yarnpkg.com/darkreader/-/darkreader-4.9.26.tgz#ad92139742f22fc406ae14d12ec6e5672a7eedde" + integrity sha512-8Mixd/u3VTXEjld7dl+Rtz6NvHkCDpp9JweZemLsxtS9o00YxRDLTH+lkJTGg2jD+qOQblh7ahyLvEby5JBNDw== + +dashdash@^1.12.0: + version "1.14.1" + resolved "https://registry.yarnpkg.com/dashdash/-/dashdash-1.14.1.tgz#853cfa0f7cbe2fed5de20326b8dd581035f6e2f0" + integrity sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA= + dependencies: + assert-plus "^1.0.0" + +data-urls@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/data-urls/-/data-urls-2.0.0.tgz#156485a72963a970f5d5821aaf642bef2bf2db9b" + integrity sha512-X5eWTSXO/BJmpdIKCRuKUgSCgAN0OwliVK3yPKbwIWU1Tdw5BRajxlzMidvh+gwko9AfQ9zIj52pzF91Q3YAvQ== + dependencies: + abab "^2.0.3" + whatwg-mimetype "^2.3.0" + whatwg-url "^8.0.0" + +debug@^2.2.0, debug@^2.3.3, debug@^2.6.9: + version "2.6.9" + resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f" + integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA== + dependencies: + ms "2.0.0" + +debug@^4.0.1, debug@^4.1.0, debug@^4.1.1, debug@^4.3.0: + version "4.3.1" + resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.1.tgz#f0d229c505e0c6d8c49ac553d1b13dc183f6b2ee" + integrity sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ== + dependencies: + ms "2.1.2" + +decamelize@^1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290" + integrity sha1-9lNNFRSCabIDUue+4m9QH5oZEpA= + +decimal.js@^10.2.0: + version "10.2.1" + resolved "https://registry.yarnpkg.com/decimal.js/-/decimal.js-10.2.1.tgz#238ae7b0f0c793d3e3cea410108b35a2c01426a3" + integrity sha512-KaL7+6Fw6i5A2XSnsbhm/6B+NuEA7TZ4vqxnd5tXz9sbKtrN9Srj8ab4vKVdK8YAqZO9P1kg45Y6YLoduPf+kw== + +decode-uri-component@^0.2.0: + version "0.2.0" + resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.0.tgz#eb3913333458775cb84cd1a1fae062106bb87545" + integrity sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU= + +decompress-response@^3.3.0: + version "3.3.0" + resolved "https://registry.yarnpkg.com/decompress-response/-/decompress-response-3.3.0.tgz#80a4dd323748384bfa248083622aedec982adff3" + integrity sha1-gKTdMjdIOEv6JICDYirt7Jgq3/M= + dependencies: + mimic-response "^1.0.0" + +deep-extend@^0.6.0: + version "0.6.0" + resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.6.0.tgz#c4fa7c95404a17a9c3e8ca7e1537312b736330ac" + integrity sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA== + +deep-is@^0.1.3, deep-is@~0.1.3: + version "0.1.3" + resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.3.tgz#b369d6fb5dbc13eecf524f91b070feedc357cf34" + integrity sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ= + +deepmerge@^4.2.2: + version "4.2.2" + resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-4.2.2.tgz#44d2ea3679b8f4d4ffba33f03d865fc1e7bf4955" + integrity sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg== + +defer-to-connect@^1.0.1: + version "1.1.3" + resolved "https://registry.yarnpkg.com/defer-to-connect/-/defer-to-connect-1.1.3.tgz#331ae050c08dcf789f8c83a7b81f0ed94f4ac591" + integrity sha512-0ISdNousHvZT2EiFlZeZAHBUvSxmKswVCEf8hW7KWgG4a8MVEu/3Vb6uWYozkjylyCxe0JBIiRB1jV45S70WVQ== + +define-properties@^1.1.3: + version "1.1.3" + resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.3.tgz#cf88da6cbee26fe6db7094f61d870cbd84cee9f1" + integrity sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ== + dependencies: + object-keys "^1.0.12" + +define-property@^0.2.5: + version "0.2.5" + resolved "https://registry.yarnpkg.com/define-property/-/define-property-0.2.5.tgz#c35b1ef918ec3c990f9a5bc57be04aacec5c8116" + integrity sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY= + dependencies: + is-descriptor "^0.1.0" + +define-property@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/define-property/-/define-property-1.0.0.tgz#769ebaaf3f4a63aad3af9e8d304c9bbe79bfb0e6" + integrity sha1-dp66rz9KY6rTr56NMEybvnm/sOY= + dependencies: + is-descriptor "^1.0.0" + +define-property@^2.0.2: + version "2.0.2" + resolved "https://registry.yarnpkg.com/define-property/-/define-property-2.0.2.tgz#d459689e8d654ba77e02a817f8710d702cb16e9d" + integrity sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ== + dependencies: + is-descriptor "^1.0.2" + isobject "^3.0.1" + +delayed-stream@~1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619" + integrity sha1-3zrhmayt+31ECqrgsp4icrJOxhk= + +detect-newline@^3.0.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/detect-newline/-/detect-newline-3.1.0.tgz#576f5dfc63ae1a192ff192d8ad3af6308991b651" + integrity sha512-TLz+x/vEXm/Y7P7wn1EJFNLxYpUD4TgMosxY6fAVJUnJMbupHBOncxyWUG9OpTaH9EBD7uFI5LfEgmMOc54DsA== + +detect-node@^2.0.4: + version "2.0.4" + resolved "https://registry.yarnpkg.com/detect-node/-/detect-node-2.0.4.tgz#014ee8f8f669c5c58023da64b8179c083a28c46c" + integrity sha512-ZIzRpLJrOj7jjP2miAtgqIfmzbxa4ZOr5jJc601zklsfEx9oTzmmj2nVpIPRpNlRTIh8lc1kyViIY7BWSGNmKw== + +diff-sequences@^26.6.2: + version "26.6.2" + resolved "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-26.6.2.tgz#48ba99157de1923412eed41db6b6d4aa9ca7c0b1" + integrity sha512-Mv/TDa3nZ9sbc5soK+OoA74BsS3mL37yixCvUAQkiuA4Wz6YtwP/K47n2rv2ovzHZvoiQeA5FTQOschKkEwB0Q== + +dmg-builder@22.9.1: + version "22.9.1" + resolved "https://registry.yarnpkg.com/dmg-builder/-/dmg-builder-22.9.1.tgz#64647224f37ee47fc9bd01947c21cc010a30511f" + integrity sha512-jc+DAirqmQrNT6KbDHdfEp8D1kD0DBTnsLhwUR3MX+hMBun5bT134LQzpdK0GKvd22GqF8L1Cz/NOgaVjscAXQ== + dependencies: + app-builder-lib "22.9.1" + builder-util "22.9.1" + fs-extra "^9.0.1" + iconv-lite "^0.6.2" + js-yaml "^3.14.0" + sanitize-filename "^1.6.3" + +doctrine@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-3.0.0.tgz#addebead72a6574db783639dc87a121773973961" + integrity sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w== + dependencies: + esutils "^2.0.2" + +domexception@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/domexception/-/domexception-2.0.1.tgz#fb44aefba793e1574b0af6aed2801d057529f304" + integrity sha512-yxJ2mFy/sibVQlu5qHjOkf9J3K6zgmCxgJ94u2EdvDOV09H+32LtRswEcUsmUWN72pVLOEnTSRaIVVzVQgS0dg== + dependencies: + webidl-conversions "^5.0.0" + +dot-prop@^5.2.0: + version "5.3.0" + resolved "https://registry.yarnpkg.com/dot-prop/-/dot-prop-5.3.0.tgz#90ccce708cd9cd82cc4dc8c3ddd9abdd55b20e88" + integrity sha512-QM8q3zDe58hqUqjraQOmzZ1LIH9SWQJTlEKCH4kJ2oQvLZk7RbQXvtDM2XEq3fwkV9CCvvH4LA0AV+ogFsBM2Q== + dependencies: + is-obj "^2.0.0" + +dotenv-expand@^5.1.0: + version "5.1.0" + resolved "https://registry.yarnpkg.com/dotenv-expand/-/dotenv-expand-5.1.0.tgz#3fbaf020bfd794884072ea26b1e9791d45a629f0" + integrity sha512-YXQl1DSa4/PQyRfgrv6aoNjhasp/p4qs9FjJ4q4cQk+8m4r6k4ZSiEyytKG8f8W9gi8WsQtIObNmKd+tMzNTmA== + +dotenv@^8.2.0: + version "8.2.0" + resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-8.2.0.tgz#97e619259ada750eea3e4ea3e26bceea5424b16a" + integrity sha512-8sJ78ElpbDJBHNeBzUbUVLsqKdccaa/BXF1uPTw3GrvQTBgrQrtObr2mUrE38vzYd8cEv+m/JBfDLioYcfXoaw== + +duplexer3@^0.1.4: + version "0.1.4" + resolved "https://registry.yarnpkg.com/duplexer3/-/duplexer3-0.1.4.tgz#ee01dd1cac0ed3cbc7fdbea37dc0a8f1ce002ce2" + integrity sha1-7gHdHKwO08vH/b6jfcCo8c4ALOI= + +ecc-jsbn@~0.1.1: + version "0.1.2" + resolved "https://registry.yarnpkg.com/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz#3a83a904e54353287874c564b7549386849a98c9" + integrity sha1-OoOpBOVDUyh4dMVkt1SThoSamMk= + dependencies: + jsbn "~0.1.0" + safer-buffer "^2.1.0" + +ejs@^3.1.5: + version "3.1.5" + resolved "https://registry.yarnpkg.com/ejs/-/ejs-3.1.5.tgz#aed723844dc20acb4b170cd9ab1017e476a0d93b" + integrity sha512-dldq3ZfFtgVTJMLjOe+/3sROTzALlL9E34V4/sDtUd/KlBSS0s6U1/+WPE1B4sj9CXHJpL1M6rhNJnc9Wbal9w== + dependencies: + jake "^10.6.1" + +electron-builder@^22.9.1: + version "22.9.1" + resolved "https://registry.yarnpkg.com/electron-builder/-/electron-builder-22.9.1.tgz#a2962db6f2757bc01d02489f38fafe0809f68f60" + integrity sha512-GXPt8l5Mxwm1QKYopUM6/Tdh9W3695G6Ax+IFyj5pQ51G4SD5L1uq4/RkPSsOgs3rP7jNSV6g6OfDzdtVufPdA== + dependencies: + "@types/yargs" "^15.0.5" + app-builder-lib "22.9.1" + bluebird-lst "^1.0.9" + builder-util "22.9.1" + builder-util-runtime "8.7.2" + chalk "^4.1.0" + dmg-builder "22.9.1" + fs-extra "^9.0.1" + is-ci "^2.0.0" + lazy-val "^1.0.4" + read-config-file "6.0.0" + sanitize-filename "^1.6.3" + update-notifier "^4.1.1" + yargs "^16.0.3" + +electron-publish@22.9.1: + version "22.9.1" + resolved "https://registry.yarnpkg.com/electron-publish/-/electron-publish-22.9.1.tgz#7cc76ac4cc53efd29ee31c1e5facb9724329068e" + integrity sha512-ducLjRJLEeU87FaTCWaUyDjCoLXHkawkltP2zqS/n2PyGke54ZIql0tBuUheht4EpR8AhFbVJ11spSn1gy8r6w== + dependencies: + "@types/fs-extra" "^9.0.1" + bluebird-lst "^1.0.9" + builder-util "22.9.1" + builder-util-runtime "8.7.2" + chalk "^4.1.0" + fs-extra "^9.0.1" + lazy-val "^1.0.4" + mime "^2.4.6" + +electron@^11.0.3: + version "11.1.0" + resolved "https://registry.yarnpkg.com/electron/-/electron-11.1.0.tgz#8dfdf579d1eb79feef3e3d2937fc022e72129c90" + integrity sha512-RFAhR/852VMaRd9NSe7jprwSoG9dLc6u1GwnqRWg+/3cy/8Zrwt1Betw1lXiZH7hGuB9K2cqju83Xv5Pq5ZSGA== + dependencies: + "@electron/get" "^1.0.1" + "@types/node" "^12.0.12" + extract-zip "^1.0.3" + +emittery@^0.7.1: + version "0.7.2" + resolved "https://registry.yarnpkg.com/emittery/-/emittery-0.7.2.tgz#25595908e13af0f5674ab419396e2fb394cdfa82" + integrity sha512-A8OG5SR/ij3SsJdWDJdkkSYUjQdCUx6APQXem0SaEePBSRg4eymGYwBkKo1Y6DU+af/Jn2dBQqDBvjnr9Vi8nQ== + +emoji-regex@^7.0.1: + version "7.0.3" + resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-7.0.3.tgz#933a04052860c85e83c122479c4748a8e4c72156" + integrity sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA== + +emoji-regex@^8.0.0: + version "8.0.0" + resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37" + integrity sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A== + +encodeurl@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59" + integrity sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k= + +end-of-stream@^1.1.0, end-of-stream@^1.4.1: + version "1.4.4" + resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.4.tgz#5ae64a5f45057baf3626ec14da0ca5e4b2431eb0" + integrity sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q== + dependencies: + once "^1.4.0" + +enquirer@^2.3.5: + version "2.3.6" + resolved "https://registry.yarnpkg.com/enquirer/-/enquirer-2.3.6.tgz#2a7fe5dd634a1e4125a975ec994ff5456dc3734d" + integrity sha512-yjNnPr315/FjS4zIsUxYguYUPP2e1NK4d7E7ZOLiyYCcbFBiTMyID+2wvm2w6+pZ/odMA7cRkjhsPbltwBOrLg== + dependencies: + ansi-colors "^4.1.1" + +env-paths@^2.2.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/env-paths/-/env-paths-2.2.0.tgz#cdca557dc009152917d6166e2febe1f039685e43" + integrity sha512-6u0VYSCo/OW6IoD5WCLLy9JUGARbamfSavcNXry/eu8aHVFei6CD3Sw+VGX5alea1i9pgPHW0mbu6Xj0uBh7gA== + +error-ex@^1.3.1: + version "1.3.2" + resolved "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.2.tgz#b4ac40648107fdcdcfae242f428bea8a14d4f1bf" + integrity sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g== + dependencies: + is-arrayish "^0.2.1" + +es6-error@^4.1.1: + version "4.1.1" + resolved "https://registry.yarnpkg.com/es6-error/-/es6-error-4.1.1.tgz#9e3af407459deed47e9a91f9b885a84eb05c561d" + integrity sha512-Um/+FxMr9CISWh0bi5Zv0iOD+4cFh5qLeks1qhAopKVAJw3drgKbKySikp7wGhDL0HPeaja0P5ULZrxLkniUVg== + +escalade@^3.1.1: + version "3.1.1" + resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.1.1.tgz#d8cfdc7000965c5a0174b4a82eaa5c0552742e40" + integrity sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw== + +escape-goat@^2.0.0: + version "2.1.1" + resolved "https://registry.yarnpkg.com/escape-goat/-/escape-goat-2.1.1.tgz#1b2dc77003676c457ec760b2dc68edb648188675" + integrity sha512-8/uIhbG12Csjy2JEW7D9pHbreaVaS/OpN3ycnyvElTdwM5n6GY6W6e2IPemfvGZeUMqZ9A/3GqIZMgKnBhAw/Q== + +escape-string-regexp@^1.0.5: + version "1.0.5" + resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4" + integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ= + +escape-string-regexp@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz#a30304e99daa32e23b2fd20f51babd07cffca344" + integrity sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w== + +escape-string-regexp@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz#14ba83a5d373e3d311e5afca29cf5bfad965bf34" + integrity sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA== + +escodegen@^1.14.1: + version "1.14.3" + resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-1.14.3.tgz#4e7b81fba61581dc97582ed78cab7f0e8d63f503" + integrity sha512-qFcX0XJkdg+PB3xjZZG/wKSuT1PnQWx57+TVSjIMmILd2yC/6ByYElPwJnslDsuWuSAp4AwJGumarAAmJch5Kw== + dependencies: + esprima "^4.0.1" + estraverse "^4.2.0" + esutils "^2.0.2" + optionator "^0.8.1" + optionalDependencies: + source-map "~0.6.1" + +eslint-scope@^5.1.1: + version "5.1.1" + resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-5.1.1.tgz#e786e59a66cb92b3f6c1fb0d508aab174848f48c" + integrity sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw== + dependencies: + esrecurse "^4.3.0" + estraverse "^4.1.1" + +eslint-utils@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-2.1.0.tgz#d2de5e03424e707dc10c74068ddedae708741b27" + integrity sha512-w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg== + dependencies: + eslint-visitor-keys "^1.1.0" + +eslint-visitor-keys@^1.1.0, eslint-visitor-keys@^1.3.0: + version "1.3.0" + resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz#30ebd1ef7c2fdff01c3a4f151044af25fab0523e" + integrity sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ== + +eslint-visitor-keys@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-2.0.0.tgz#21fdc8fbcd9c795cc0321f0563702095751511a8" + integrity sha512-QudtT6av5WXels9WjIM7qz1XD1cWGvX4gGXvp/zBn9nXG02D0utdU3Em2m/QjTnrsk6bBjmCygl3rmj118msQQ== + +eslint@^7.15.0: + version "7.15.0" + resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.15.0.tgz#eb155fb8ed0865fcf5d903f76be2e5b6cd7e0bc7" + integrity sha512-Vr64xFDT8w30wFll643e7cGrIkPEU50yIiI36OdSIDoSGguIeaLzBo0vpGvzo9RECUqq7htURfwEtKqwytkqzA== + dependencies: + "@babel/code-frame" "^7.0.0" + "@eslint/eslintrc" "^0.2.2" + ajv "^6.10.0" + chalk "^4.0.0" + cross-spawn "^7.0.2" + debug "^4.0.1" + doctrine "^3.0.0" + enquirer "^2.3.5" + eslint-scope "^5.1.1" + eslint-utils "^2.1.0" + eslint-visitor-keys "^2.0.0" + espree "^7.3.1" + esquery "^1.2.0" + esutils "^2.0.2" + file-entry-cache "^6.0.0" + functional-red-black-tree "^1.0.1" + glob-parent "^5.0.0" + globals "^12.1.0" + ignore "^4.0.6" + import-fresh "^3.0.0" + imurmurhash "^0.1.4" + is-glob "^4.0.0" + js-yaml "^3.13.1" + json-stable-stringify-without-jsonify "^1.0.1" + levn "^0.4.1" + lodash "^4.17.19" + minimatch "^3.0.4" + natural-compare "^1.4.0" + optionator "^0.9.1" + progress "^2.0.0" + regexpp "^3.1.0" + semver "^7.2.1" + strip-ansi "^6.0.0" + strip-json-comments "^3.1.0" + table "^5.2.3" + text-table "^0.2.0" + v8-compile-cache "^2.0.3" + +espree@^7.3.0, espree@^7.3.1: + version "7.3.1" + resolved "https://registry.yarnpkg.com/espree/-/espree-7.3.1.tgz#f2df330b752c6f55019f8bd89b7660039c1bbbb6" + integrity sha512-v3JCNCE64umkFpmkFGqzVKsOT0tN1Zr+ueqLZfpV1Ob8e+CEgPWa+OxCoGH3tnhimMKIaBm4m/vaRpJ/krRz2g== + dependencies: + acorn "^7.4.0" + acorn-jsx "^5.3.1" + eslint-visitor-keys "^1.3.0" + +esprima@^4.0.0, esprima@^4.0.1: + version "4.0.1" + resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71" + integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A== + +esquery@^1.2.0: + version "1.3.1" + resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.3.1.tgz#b78b5828aa8e214e29fb74c4d5b752e1c033da57" + integrity sha512-olpvt9QG0vniUBZspVRN6lwB7hOZoTRtT+jzR+tS4ffYx2mzbw+z0XCOk44aaLYKApNX5nMm+E+P6o25ip/DHQ== + dependencies: + estraverse "^5.1.0" + +esrecurse@^4.3.0: + version "4.3.0" + resolved "https://registry.yarnpkg.com/esrecurse/-/esrecurse-4.3.0.tgz#7ad7964d679abb28bee72cec63758b1c5d2c9921" + integrity sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag== + dependencies: + estraverse "^5.2.0" + +estraverse@^4.1.1, estraverse@^4.2.0: + version "4.3.0" + resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.3.0.tgz#398ad3f3c5a24948be7725e83d11a7de28cdbd1d" + integrity sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw== + +estraverse@^5.1.0, estraverse@^5.2.0: + version "5.2.0" + resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-5.2.0.tgz#307df42547e6cc7324d3cf03c155d5cdb8c53880" + integrity sha512-BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ== + +esutils@^2.0.2: + version "2.0.3" + resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.3.tgz#74d2eb4de0b8da1293711910d50775b9b710ef64" + integrity sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g== + +exec-sh@^0.3.2: + version "0.3.4" + resolved "https://registry.yarnpkg.com/exec-sh/-/exec-sh-0.3.4.tgz#3a018ceb526cc6f6df2bb504b2bfe8e3a4934ec5" + integrity sha512-sEFIkc61v75sWeOe72qyrqg2Qg0OuLESziUDk/O/z2qgS15y2gWVFrI6f2Qn/qw/0/NCfCEsmNA4zOjkwEZT1A== + +execa@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/execa/-/execa-1.0.0.tgz#c6236a5bb4df6d6f15e88e7f017798216749ddd8" + integrity sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA== + dependencies: + cross-spawn "^6.0.0" + get-stream "^4.0.0" + is-stream "^1.1.0" + npm-run-path "^2.0.0" + p-finally "^1.0.0" + signal-exit "^3.0.0" + strip-eof "^1.0.0" + +execa@^4.0.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/execa/-/execa-4.1.0.tgz#4e5491ad1572f2f17a77d388c6c857135b22847a" + integrity sha512-j5W0//W7f8UxAn8hXVnwG8tLwdiUy4FJLcSupCg6maBYZDpyBvTApK7KyuI4bKj8KOh1r2YH+6ucuYtJv1bTZA== + dependencies: + cross-spawn "^7.0.0" + get-stream "^5.0.0" + human-signals "^1.1.1" + is-stream "^2.0.0" + merge-stream "^2.0.0" + npm-run-path "^4.0.0" + onetime "^5.1.0" + signal-exit "^3.0.2" + strip-final-newline "^2.0.0" + +exit-on-epipe@~1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/exit-on-epipe/-/exit-on-epipe-1.0.1.tgz#0bdd92e87d5285d267daa8171d0eb06159689692" + integrity sha512-h2z5mrROTxce56S+pnvAV890uu7ls7f1kEvVGJbw1OlFH3/mlJ5bkXu0KRyW94v37zzHPiUd55iLn3DA7TjWpw== + +exit@^0.1.2: + version "0.1.2" + resolved "https://registry.yarnpkg.com/exit/-/exit-0.1.2.tgz#0632638f8d877cc82107d30a0fff1a17cba1cd0c" + integrity sha1-BjJjj42HfMghB9MKD/8aF8uhzQw= + +expand-brackets@^2.1.4: + version "2.1.4" + resolved "https://registry.yarnpkg.com/expand-brackets/-/expand-brackets-2.1.4.tgz#b77735e315ce30f6b6eff0f83b04151a22449622" + integrity sha1-t3c14xXOMPa27/D4OwQVGiJEliI= + dependencies: + debug "^2.3.3" + define-property "^0.2.5" + extend-shallow "^2.0.1" + posix-character-classes "^0.1.0" + regex-not "^1.0.0" + snapdragon "^0.8.1" + to-regex "^3.0.1" + +expect@^26.6.2: + version "26.6.2" + resolved "https://registry.yarnpkg.com/expect/-/expect-26.6.2.tgz#c6b996bf26bf3fe18b67b2d0f51fc981ba934417" + integrity sha512-9/hlOBkQl2l/PLHJx6JjoDF6xPKcJEsUlWKb23rKE7KzeDqUZKXKNMW27KIue5JMdBV9HgmoJPcc8HtO85t9IA== + dependencies: + "@jest/types" "^26.6.2" + ansi-styles "^4.0.0" + jest-get-type "^26.3.0" + jest-matcher-utils "^26.6.2" + jest-message-util "^26.6.2" + jest-regex-util "^26.0.0" + +extend-shallow@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-2.0.1.tgz#51af7d614ad9a9f610ea1bafbb989d6b1c56890f" + integrity sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8= + dependencies: + is-extendable "^0.1.0" + +extend-shallow@^3.0.0, extend-shallow@^3.0.2: + version "3.0.2" + resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-3.0.2.tgz#26a71aaf073b39fb2127172746131c2704028db8" + integrity sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg= + dependencies: + assign-symbols "^1.0.0" + is-extendable "^1.0.1" + +extend@~3.0.2: + version "3.0.2" + resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.2.tgz#f8b1136b4071fbd8eb140aff858b1019ec2915fa" + integrity sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g== + +extglob@^2.0.4: + version "2.0.4" + resolved "https://registry.yarnpkg.com/extglob/-/extglob-2.0.4.tgz#ad00fe4dc612a9232e8718711dc5cb5ab0285543" + integrity sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw== + dependencies: + array-unique "^0.3.2" + define-property "^1.0.0" + expand-brackets "^2.1.4" + extend-shallow "^2.0.1" + fragment-cache "^0.2.1" + regex-not "^1.0.0" + snapdragon "^0.8.1" + to-regex "^3.0.1" + +extract-zip@^1.0.3: + version "1.7.0" + resolved "https://registry.yarnpkg.com/extract-zip/-/extract-zip-1.7.0.tgz#556cc3ae9df7f452c493a0cfb51cc30277940927" + integrity sha512-xoh5G1W/PB0/27lXgMQyIhP5DSY/LhoCsOyZgb+6iMmRtCwVBo55uKaMoEYrDCKQhWvqEip5ZPKAc6eFNyf/MA== + dependencies: + concat-stream "^1.6.2" + debug "^2.6.9" + mkdirp "^0.5.4" + yauzl "^2.10.0" + +extsprintf@1.3.0: + version "1.3.0" + resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.3.0.tgz#96918440e3041a7a414f8c52e3c574eb3c3e1e05" + integrity sha1-lpGEQOMEGnpBT4xS48V06zw+HgU= + +extsprintf@^1.2.0: + version "1.4.0" + resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.4.0.tgz#e2689f8f356fad62cca65a3a91c5df5f9551692f" + integrity sha1-4mifjzVvrWLMplo6kcXfX5VRaS8= + +fast-deep-equal@^3.1.1: + version "3.1.3" + resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525" + integrity sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q== + +fast-json-stable-stringify@^2.0.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz#874bf69c6f404c2b5d99c481341399fd55892633" + integrity sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw== + +fast-levenshtein@^2.0.6, fast-levenshtein@~2.0.6: + version "2.0.6" + resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917" + integrity sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc= + +fb-watchman@^2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/fb-watchman/-/fb-watchman-2.0.1.tgz#fc84fb39d2709cf3ff6d743706157bb5708a8a85" + integrity sha512-DkPJKQeY6kKwmuMretBhr7G6Vodr7bFwDYTXIkfG1gjvNpaxBTQV3PbXg6bR1c1UP4jPOX0jHUbbHANL9vRjVg== + dependencies: + bser "2.1.1" + +fd-slicer@~1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/fd-slicer/-/fd-slicer-1.1.0.tgz#25c7c89cb1f9077f8891bbe61d8f390eae256f1e" + integrity sha1-JcfInLH5B3+IkbvmHY85Dq4lbx4= + dependencies: + pend "~1.2.0" + +file-entry-cache@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-6.0.0.tgz#7921a89c391c6d93efec2169ac6bf300c527ea0a" + integrity sha512-fqoO76jZ3ZnYrXLDRxBR1YvOvc0k844kcOg40bgsPrE25LAb/PDqTY+ho64Xh2c8ZXgIKldchCFHczG2UVRcWA== + dependencies: + flat-cache "^3.0.4" + +filelist@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/filelist/-/filelist-1.0.1.tgz#f10d1a3ae86c1694808e8f20906f43d4c9132dbb" + integrity sha512-8zSK6Nu0DQIC08mUC46sWGXi+q3GGpKydAG36k+JDba6VRpkevvOWUW5a/PhShij4+vHT9M+ghgG7eM+a9JDUQ== + dependencies: + minimatch "^3.0.4" + +fill-range@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-4.0.0.tgz#d544811d428f98eb06a63dc402d2403c328c38f7" + integrity sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc= + dependencies: + extend-shallow "^2.0.1" + is-number "^3.0.0" + repeat-string "^1.6.1" + to-regex-range "^2.1.0" + +fill-range@^7.0.1: + version "7.0.1" + resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.0.1.tgz#1919a6a7c75fe38b2c7c77e5198535da9acdda40" + integrity sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ== + dependencies: + to-regex-range "^5.0.1" + +find-up@^4.0.0, find-up@^4.1.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/find-up/-/find-up-4.1.0.tgz#97afe7d6cdc0bc5928584b7c8d7b16e8a9aa5d19" + integrity sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw== + dependencies: + locate-path "^5.0.0" + path-exists "^4.0.0" + +flat-cache@^3.0.4: + version "3.0.4" + resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-3.0.4.tgz#61b0338302b2fe9f957dcc32fc2a87f1c3048b11" + integrity sha512-dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg== + dependencies: + flatted "^3.1.0" + rimraf "^3.0.2" + +flatted@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.1.0.tgz#a5d06b4a8b01e3a63771daa5cb7a1903e2e57067" + integrity sha512-tW+UkmtNg/jv9CSofAKvgVcO7c2URjhTdW1ZTkcAritblu8tajiYy7YisnIflEwtKssCtOxpnBRoCB7iap0/TA== + +for-in@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80" + integrity sha1-gQaNKVqBQuwKxybG4iAMMPttXoA= + +forever-agent@~0.6.1: + version "0.6.1" + resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91" + integrity sha1-+8cfDEGt6zf5bFd60e1C2P2sypE= + +form-data@~2.3.2: + version "2.3.3" + resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.3.3.tgz#dcce52c05f644f298c6a7ab936bd724ceffbf3a6" + integrity sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ== + dependencies: + asynckit "^0.4.0" + combined-stream "^1.0.6" + mime-types "^2.1.12" + +fragment-cache@^0.2.1: + version "0.2.1" + resolved "https://registry.yarnpkg.com/fragment-cache/-/fragment-cache-0.2.1.tgz#4290fad27f13e89be7f33799c6bc5a0abfff0d19" + integrity sha1-QpD60n8T6Jvn8zeZxrxaCr//DRk= + dependencies: + map-cache "^0.2.2" + +fs-constants@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/fs-constants/-/fs-constants-1.0.0.tgz#6be0de9be998ce16af8afc24497b9ee9b7ccd9ad" + integrity sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow== + +fs-extra@^8.1.0: + version "8.1.0" + resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-8.1.0.tgz#49d43c45a88cd9677668cb7be1b46efdb8d2e1c0" + integrity sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g== + dependencies: + graceful-fs "^4.2.0" + jsonfile "^4.0.0" + universalify "^0.1.0" + +fs-extra@^9.0.1: + version "9.0.1" + resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-9.0.1.tgz#910da0062437ba4c39fedd863f1675ccfefcb9fc" + integrity sha512-h2iAoN838FqAFJY2/qVpzFXy+EBxfVE220PalAqQLDVsFOHLJrZvut5puAbCdNv6WJk+B8ihI+k0c7JK5erwqQ== + dependencies: + at-least-node "^1.0.0" + graceful-fs "^4.2.0" + jsonfile "^6.0.1" + universalify "^1.0.0" + +fs.realpath@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f" + integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8= + +fsevents@^2.1.2: + version "2.2.1" + resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.2.1.tgz#1fb02ded2036a8ac288d507a65962bd87b97628d" + integrity sha512-bTLYHSeC0UH/EFXS9KqWnXuOl/wHK5Z/d+ghd5AsFMYN7wIGkUCOJyzy88+wJKkZPGON8u4Z9f6U4FdgURE9qA== + +function-bind@^1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d" + integrity sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A== + +functional-red-black-tree@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz#1b0ab3bd553b2a0d6399d29c0e3ea0b252078327" + integrity sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc= + +gensync@^1.0.0-beta.1: + version "1.0.0-beta.2" + resolved "https://registry.yarnpkg.com/gensync/-/gensync-1.0.0-beta.2.tgz#32a6ee76c3d7f52d46b2b1ae5d93fea8580a25e0" + integrity sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg== + +get-caller-file@^2.0.1, get-caller-file@^2.0.5: + version "2.0.5" + resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e" + integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg== + +get-package-type@^0.1.0: + version "0.1.0" + resolved "https://registry.yarnpkg.com/get-package-type/-/get-package-type-0.1.0.tgz#8de2d803cff44df3bc6c456e6668b36c3926e11a" + integrity sha512-pjzuKtY64GYfWizNAJ0fr9VqttZkNiK2iS430LtIHzjBEr6bX8Am2zm4sW4Ro5wjWW5cAlRL1qAMTcXbjNAO2Q== + +get-stream@^4.0.0, get-stream@^4.1.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-4.1.0.tgz#c1b255575f3dc21d59bfc79cd3d2b46b1c3a54b5" + integrity sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w== + dependencies: + pump "^3.0.0" + +get-stream@^5.0.0, get-stream@^5.1.0: + version "5.2.0" + resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-5.2.0.tgz#4966a1795ee5ace65e706c4b7beb71257d6e22d3" + integrity sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA== + dependencies: + pump "^3.0.0" + +get-value@^2.0.3, get-value@^2.0.6: + version "2.0.6" + resolved "https://registry.yarnpkg.com/get-value/-/get-value-2.0.6.tgz#dc15ca1c672387ca76bd37ac0a395ba2042a2c28" + integrity sha1-3BXKHGcjh8p2vTesCjlbogQqLCg= + +getpass@^0.1.1: + version "0.1.7" + resolved "https://registry.yarnpkg.com/getpass/-/getpass-0.1.7.tgz#5eff8e3e684d569ae4cb2b1282604e8ba62149fa" + integrity sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo= + dependencies: + assert-plus "^1.0.0" + +glob-parent@^5.0.0: + version "5.1.1" + resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.1.tgz#b6c1ef417c4e5663ea498f1c45afac6916bbc229" + integrity sha512-FnI+VGOpnlGHWZxthPGR+QhR78fuiK0sNLkHQv+bL9fQi57lNNdquIbna/WrfROrolq8GK5Ek6BiMwqL/voRYQ== + dependencies: + is-glob "^4.0.1" + +glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4: + version "7.1.6" + resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.6.tgz#141f33b81a7c2492e125594307480c46679278a6" + integrity sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA== + dependencies: + fs.realpath "^1.0.0" + inflight "^1.0.4" + inherits "2" + minimatch "^3.0.4" + once "^1.3.0" + path-is-absolute "^1.0.0" + +global-agent@^2.0.2: + version "2.1.12" + resolved "https://registry.yarnpkg.com/global-agent/-/global-agent-2.1.12.tgz#e4ae3812b731a9e81cbf825f9377ef450a8e4195" + integrity sha512-caAljRMS/qcDo69X9BfkgrihGUgGx44Fb4QQToNQjsiWh+YlQ66uqYVAdA8Olqit+5Ng0nkz09je3ZzANMZcjg== + dependencies: + boolean "^3.0.1" + core-js "^3.6.5" + es6-error "^4.1.1" + matcher "^3.0.0" + roarr "^2.15.3" + semver "^7.3.2" + serialize-error "^7.0.1" + +global-dirs@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/global-dirs/-/global-dirs-2.0.1.tgz#acdf3bb6685bcd55cb35e8a052266569e9469201" + integrity sha512-5HqUqdhkEovj2Of/ms3IeS/EekcO54ytHRLV4PEY2rhRwrHXLQjeVEES0Lhka0xwNDtGYn58wyC4s5+MHsOO6A== + dependencies: + ini "^1.3.5" + +global-tunnel-ng@^2.7.1: + version "2.7.1" + resolved "https://registry.yarnpkg.com/global-tunnel-ng/-/global-tunnel-ng-2.7.1.tgz#d03b5102dfde3a69914f5ee7d86761ca35d57d8f" + integrity sha512-4s+DyciWBV0eK148wqXxcmVAbFVPqtc3sEtUE/GTQfuU80rySLcMhUmHKSHI7/LDj8q0gDYI1lIhRRB7ieRAqg== + dependencies: + encodeurl "^1.0.2" + lodash "^4.17.10" + npm-conf "^1.1.3" + tunnel "^0.0.6" + +globals@^11.1.0: + version "11.12.0" + resolved "https://registry.yarnpkg.com/globals/-/globals-11.12.0.tgz#ab8795338868a0babd8525758018c2a7eb95c42e" + integrity sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA== + +globals@^12.1.0: + version "12.4.0" + resolved "https://registry.yarnpkg.com/globals/-/globals-12.4.0.tgz#a18813576a41b00a24a97e7f815918c2e19925f8" + integrity sha512-BWICuzzDvDoH54NHKCseDanAhE3CeDorgDL5MT6LMXXj2WCnd9UC2szdk4AWLfjdgNBCXLUanXYcpBBKOSWGwg== + dependencies: + type-fest "^0.8.1" + +globalthis@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/globalthis/-/globalthis-1.0.1.tgz#40116f5d9c071f9e8fb0037654df1ab3a83b7ef9" + integrity sha512-mJPRTc/P39NH/iNG4mXa9aIhNymaQikTrnspeCa2ZuJ+mH2QN/rXwtX3XwKrHqWgUQFbNZKtHM105aHzJalElw== + dependencies: + define-properties "^1.1.3" + +got@^9.6.0: + version "9.6.0" + resolved "https://registry.yarnpkg.com/got/-/got-9.6.0.tgz#edf45e7d67f99545705de1f7bbeeeb121765ed85" + integrity sha512-R7eWptXuGYxwijs0eV+v3o6+XH1IqVK8dJOEecQfTmkncw9AV4dcw/Dhxi8MdlqPthxxpZyizMzyg8RTmEsG+Q== + dependencies: + "@sindresorhus/is" "^0.14.0" + "@szmarczak/http-timer" "^1.1.2" + cacheable-request "^6.0.0" + decompress-response "^3.3.0" + duplexer3 "^0.1.4" + get-stream "^4.1.0" + lowercase-keys "^1.0.1" + mimic-response "^1.0.1" + p-cancelable "^1.0.0" + to-readable-stream "^1.0.0" + url-parse-lax "^3.0.0" + +graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.4: + version "4.2.4" + resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.4.tgz#2256bde14d3632958c465ebc96dc467ca07a29fb" + integrity sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw== + +growly@^1.3.0: + version "1.3.0" + resolved "https://registry.yarnpkg.com/growly/-/growly-1.3.0.tgz#f10748cbe76af964b7c96c93c6bcc28af120c081" + integrity sha1-8QdIy+dq+WS3yWyTxrzCivEgwIE= + +har-schema@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-2.0.0.tgz#a94c2224ebcac04782a0d9035521f24735b7ec92" + integrity sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI= + +har-validator@~5.1.3: + version "5.1.5" + resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-5.1.5.tgz#1f0803b9f8cb20c0fa13822df1ecddb36bde1efd" + integrity sha512-nmT2T0lljbxdQZfspsno9hgrG3Uir6Ks5afism62poxqBM6sDnMEuPmzTq8XN0OEwqKLLdh1jQI3qyE66Nzb3w== + dependencies: + ajv "^6.12.3" + har-schema "^2.0.0" + +has-flag@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd" + integrity sha1-tdRU3CGZriJWmfNGfloH87lVuv0= + +has-flag@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b" + integrity sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ== + +has-value@^0.3.1: + version "0.3.1" + resolved "https://registry.yarnpkg.com/has-value/-/has-value-0.3.1.tgz#7b1f58bada62ca827ec0a2078025654845995e1f" + integrity sha1-ex9YutpiyoJ+wKIHgCVlSEWZXh8= + dependencies: + get-value "^2.0.3" + has-values "^0.1.4" + isobject "^2.0.0" + +has-value@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/has-value/-/has-value-1.0.0.tgz#18b281da585b1c5c51def24c930ed29a0be6b177" + integrity sha1-GLKB2lhbHFxR3vJMkw7SmgvmsXc= + dependencies: + get-value "^2.0.6" + has-values "^1.0.0" + isobject "^3.0.0" + +has-values@^0.1.4: + version "0.1.4" + resolved "https://registry.yarnpkg.com/has-values/-/has-values-0.1.4.tgz#6d61de95d91dfca9b9a02089ad384bff8f62b771" + integrity sha1-bWHeldkd/Km5oCCJrThL/49it3E= + +has-values@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/has-values/-/has-values-1.0.0.tgz#95b0b63fec2146619a6fe57fe75628d5a39efe4f" + integrity sha1-lbC2P+whRmGab+V/51Yo1aOe/k8= + dependencies: + is-number "^3.0.0" + kind-of "^4.0.0" + +has-yarn@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/has-yarn/-/has-yarn-2.1.0.tgz#137e11354a7b5bf11aa5cb649cf0c6f3ff2b2e77" + integrity sha512-UqBRqi4ju7T+TqGNdqAO0PaSVGsDGJUBQvk9eUWNGRY1CFGDzYhLWoM7JQEemnlvVcv/YEmc2wNW8BC24EnUsw== + +has@^1.0.3: + version "1.0.3" + resolved "https://registry.yarnpkg.com/has/-/has-1.0.3.tgz#722d7cbfc1f6aa8241f16dd814e011e1f41e8796" + integrity sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw== + dependencies: + function-bind "^1.1.1" + +hosted-git-info@^2.1.4: + version "2.8.8" + resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.8.tgz#7539bd4bc1e0e0a895815a2e0262420b12858488" + integrity sha512-f/wzC2QaWBs7t9IYqB4T3sR1xviIViXJRJTWBlx2Gf3g0Xi5vI7Yy4koXQ1c9OYDGHN9sBy1DQ2AB8fqZBWhUg== + +hosted-git-info@^3.0.5: + version "3.0.7" + resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-3.0.7.tgz#a30727385ea85acfcee94e0aad9e368c792e036c" + integrity sha512-fWqc0IcuXs+BmE9orLDyVykAG9GJtGLGuZAAqgcckPgv5xad4AcXGIv8galtQvlwutxSlaMcdw7BUtq2EIvqCQ== + dependencies: + lru-cache "^6.0.0" + +html-comment-regex@^1.1.2: + version "1.1.2" + resolved "https://registry.yarnpkg.com/html-comment-regex/-/html-comment-regex-1.1.2.tgz#97d4688aeb5c81886a364faa0cad1dda14d433a7" + integrity sha512-P+M65QY2JQ5Y0G9KKdlDpo0zK+/OHptU5AaBwUfAIDJZk1MYf32Frm84EcOytfJE0t5JvkAnKlmjsXDnWzCJmQ== + +html-encoding-sniffer@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/html-encoding-sniffer/-/html-encoding-sniffer-2.0.1.tgz#42a6dc4fd33f00281176e8b23759ca4e4fa185f3" + integrity sha512-D5JbOMBIR/TVZkubHT+OyT2705QvogUW4IBn6nHd756OwieSF9aDYFj4dv6HHEVGYbHaLETa3WggZYWWMyy3ZQ== + dependencies: + whatwg-encoding "^1.0.5" + +html-escaper@^2.0.0: + version "2.0.2" + resolved "https://registry.yarnpkg.com/html-escaper/-/html-escaper-2.0.2.tgz#dfd60027da36a36dfcbe236262c00a5822681453" + integrity sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg== + +http-cache-semantics@^4.0.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-4.1.0.tgz#49e91c5cbf36c9b94bcfcd71c23d5249ec74e390" + integrity sha512-carPklcUh7ROWRK7Cv27RPtdhYhUsela/ue5/jKzjegVvXDqM2ILE9Q2BGn9JZJh1g87cp56su/FgQSzcWS8cQ== + +http-signature@~1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/http-signature/-/http-signature-1.2.0.tgz#9aecd925114772f3d95b65a60abb8f7c18fbace1" + integrity sha1-muzZJRFHcvPZW2WmCruPfBj7rOE= + dependencies: + assert-plus "^1.0.0" + jsprim "^1.2.2" + sshpk "^1.7.0" + +human-signals@^1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-1.1.1.tgz#c5b1cd14f50aeae09ab6c59fe63ba3395fe4dfa3" + integrity sha512-SEQu7vl8KjNL2eoGBLF3+wAjpsNfA9XMlXAYj/3EdaNfAlxKthD1xjEQfGOUhllCGGJVNY34bRr6lPINhNjyZw== + +iconv-lite@0.4.24: + version "0.4.24" + resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b" + integrity sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA== + dependencies: + safer-buffer ">= 2.1.2 < 3" + +iconv-lite@^0.6.2: + version "0.6.2" + resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.6.2.tgz#ce13d1875b0c3a674bd6a04b7f76b01b1b6ded01" + integrity sha512-2y91h5OpQlolefMPmUlivelittSWy0rP+oYVpn6A7GwVHNE8AWzoYOBNmlwks3LobaJxgHCYZAnyNo2GgpNRNQ== + dependencies: + safer-buffer ">= 2.1.2 < 3.0.0" + +ieee754@^1.1.13: + version "1.2.1" + resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.2.1.tgz#8eb7a10a63fff25d15a57b001586d177d1b0d352" + integrity sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA== + +ignore@^4.0.6: + version "4.0.6" + resolved "https://registry.yarnpkg.com/ignore/-/ignore-4.0.6.tgz#750e3db5862087b4737ebac8207ffd1ef27b25fc" + integrity sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg== + +import-fresh@^3.0.0, import-fresh@^3.2.1: + version "3.2.2" + resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.2.2.tgz#fc129c160c5d68235507f4331a6baad186bdbc3e" + integrity sha512-cTPNrlvJT6twpYy+YmKUKrTSjWFs3bjYjAhCwm+z4EOCubZxAuO+hHpRN64TqjEaYSHs7tJAE0w1CKMGmsG/lw== + dependencies: + parent-module "^1.0.0" + resolve-from "^4.0.0" + +import-lazy@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/import-lazy/-/import-lazy-2.1.0.tgz#05698e3d45c88e8d7e9d92cb0584e77f096f3e43" + integrity sha1-BWmOPUXIjo1+nZLLBYTnfwlvPkM= + +import-local@^3.0.2: + version "3.0.2" + resolved "https://registry.yarnpkg.com/import-local/-/import-local-3.0.2.tgz#a8cfd0431d1de4a2199703d003e3e62364fa6db6" + integrity sha512-vjL3+w0oulAVZ0hBHnxa/Nm5TAurf9YLQJDhqRZyqb+VKGOB6LU8t9H1Nr5CIo16vh9XfJTOoHwU0B71S557gA== + dependencies: + pkg-dir "^4.2.0" + resolve-cwd "^3.0.0" + +imurmurhash@^0.1.4: + version "0.1.4" + resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea" + integrity sha1-khi5srkoojixPcT7a21XbyMUU+o= + +inflight@^1.0.4: + version "1.0.6" + resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9" + integrity sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk= + dependencies: + once "^1.3.0" + wrappy "1" + +inherits@2, inherits@^2.0.3, inherits@^2.0.4, inherits@~2.0.3: + version "2.0.4" + resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c" + integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ== + +ini@^1.3.4, ini@^1.3.5, ini@~1.3.0: + version "1.3.8" + resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.8.tgz#a29da425b48806f34767a4efce397269af28432c" + integrity sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew== + +ip-regex@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/ip-regex/-/ip-regex-2.1.0.tgz#fa78bf5d2e6913c911ce9f819ee5146bb6d844e9" + integrity sha1-+ni/XS5pE8kRzp+BnuUUa7bYROk= + +is-accessor-descriptor@^0.1.6: + version "0.1.6" + resolved "https://registry.yarnpkg.com/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz#a9e12cb3ae8d876727eeef3843f8a0897b5c98d6" + integrity sha1-qeEss66Nh2cn7u84Q/igiXtcmNY= + dependencies: + kind-of "^3.0.2" + +is-accessor-descriptor@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz#169c2f6d3df1f992618072365c9b0ea1f6878656" + integrity sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ== + dependencies: + kind-of "^6.0.0" + +is-arrayish@^0.2.1: + version "0.2.1" + resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz#77c99840527aa8ecb1a8ba697b80645a7a926a9d" + integrity sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0= + +is-buffer@^1.1.5: + version "1.1.6" + resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be" + integrity sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w== + +is-ci@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/is-ci/-/is-ci-2.0.0.tgz#6bc6334181810e04b5c22b3d589fdca55026404c" + integrity sha512-YfJT7rkpQB0updsdHLGWrvhBJfcfzNNawYDNIyQXJz0IViGf75O8EBPKSdvw2rF+LGCsX4FZ8tcr3b19LcZq4w== + dependencies: + ci-info "^2.0.0" + +is-core-module@^2.1.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.2.0.tgz#97037ef3d52224d85163f5597b2b63d9afed981a" + integrity sha512-XRAfAdyyY5F5cOXn7hYQDqh2Xmii+DEfIcQGxK/uNwMHhIkPWO0g8msXcbzLe+MpGoR951MlqM/2iIlU4vKDdQ== + dependencies: + has "^1.0.3" + +is-data-descriptor@^0.1.4: + version "0.1.4" + resolved "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz#0b5ee648388e2c860282e793f1856fec3f301b56" + integrity sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y= + dependencies: + kind-of "^3.0.2" + +is-data-descriptor@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz#d84876321d0e7add03990406abbbbd36ba9268c7" + integrity sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ== + dependencies: + kind-of "^6.0.0" + +is-descriptor@^0.1.0: + version "0.1.6" + resolved "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-0.1.6.tgz#366d8240dde487ca51823b1ab9f07a10a78251ca" + integrity sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg== + dependencies: + is-accessor-descriptor "^0.1.6" + is-data-descriptor "^0.1.4" + kind-of "^5.0.0" + +is-descriptor@^1.0.0, is-descriptor@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-1.0.2.tgz#3b159746a66604b04f8c81524ba365c5f14d86ec" + integrity sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg== + dependencies: + is-accessor-descriptor "^1.0.0" + is-data-descriptor "^1.0.0" + kind-of "^6.0.2" + +is-docker@^2.0.0: + version "2.1.1" + resolved "https://registry.yarnpkg.com/is-docker/-/is-docker-2.1.1.tgz#4125a88e44e450d384e09047ede71adc2d144156" + integrity sha512-ZOoqiXfEwtGknTiuDEy8pN2CfE3TxMHprvNer1mXiqwkOT77Rw3YVrUQ52EqAOU3QAWDQ+bQdx7HJzrv7LS2Hw== + +is-extendable@^0.1.0, is-extendable@^0.1.1: + version "0.1.1" + resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-0.1.1.tgz#62b110e289a471418e3ec36a617d472e301dfc89" + integrity sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik= + +is-extendable@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-1.0.1.tgz#a7470f9e426733d81bd81e1155264e3a3507cab4" + integrity sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA== + dependencies: + is-plain-object "^2.0.4" + +is-extglob@^2.1.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2" + integrity sha1-qIwCU1eR8C7TfHahueqXc8gz+MI= + +is-fullwidth-code-point@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz#a3b30a5c4f199183167aaab93beefae3ddfb654f" + integrity sha1-o7MKXE8ZkYMWeqq5O+764937ZU8= + +is-fullwidth-code-point@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz#f116f8064fe90b3f7844a38997c0b75051269f1d" + integrity sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg== + +is-generator-fn@^2.0.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/is-generator-fn/-/is-generator-fn-2.1.0.tgz#7d140adc389aaf3011a8f2a2a4cfa6faadffb118" + integrity sha512-cTIB4yPYL/Grw0EaSzASzg6bBy9gqCofvWN8okThAYIxKJZC+udlRAmGbM0XLeniEJSs8uEgHPGuHSe1XsOLSQ== + +is-glob@^4.0.0, is-glob@^4.0.1: + version "4.0.1" + resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.1.tgz#7567dbe9f2f5e2467bc77ab83c4a29482407a5dc" + integrity sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg== + dependencies: + is-extglob "^2.1.1" + +is-installed-globally@^0.3.1: + version "0.3.2" + resolved "https://registry.yarnpkg.com/is-installed-globally/-/is-installed-globally-0.3.2.tgz#fd3efa79ee670d1187233182d5b0a1dd00313141" + integrity sha512-wZ8x1js7Ia0kecP/CHM/3ABkAmujX7WPvQk6uu3Fly/Mk44pySulQpnHG46OMjHGXApINnV4QhY3SWnECO2z5g== + dependencies: + global-dirs "^2.0.1" + is-path-inside "^3.0.1" + +is-npm@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/is-npm/-/is-npm-4.0.0.tgz#c90dd8380696df87a7a6d823c20d0b12bbe3c84d" + integrity sha512-96ECIfh9xtDDlPylNPXhzjsykHsMJZ18ASpaWzQyBr4YRTcVjUvzaHayDAES2oU/3KpljhHUjtSRNiDwi0F0ig== + +is-number@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/is-number/-/is-number-3.0.0.tgz#24fd6201a4782cf50561c810276afc7d12d71195" + integrity sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU= + dependencies: + kind-of "^3.0.2" + +is-number@^7.0.0: + version "7.0.0" + resolved "https://registry.yarnpkg.com/is-number/-/is-number-7.0.0.tgz#7535345b896734d5f80c4d06c50955527a14f12b" + integrity sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng== + +is-obj@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/is-obj/-/is-obj-2.0.0.tgz#473fb05d973705e3fd9620545018ca8e22ef4982" + integrity sha512-drqDG3cbczxxEJRoOXcOjtdp1J/lyp1mNn0xaznRs8+muBhgQcrnbspox5X5fOw0HnMnbfDzvnEMEtqDEJEo8w== + +is-path-inside@^3.0.1: + version "3.0.2" + resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-3.0.2.tgz#f5220fc82a3e233757291dddc9c5877f2a1f3017" + integrity sha512-/2UGPSgmtqwo1ktx8NDHjuPwZWmHhO+gj0f93EkhLB5RgW9RZevWYYlIkS6zePc6U2WpOdQYIwHe9YC4DWEBVg== + +is-plain-object@^2.0.3, is-plain-object@^2.0.4: + version "2.0.4" + resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-2.0.4.tgz#2c163b3fafb1b606d9d17928f05c2a1c38e07677" + integrity sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og== + dependencies: + isobject "^3.0.1" + +is-potential-custom-element-name@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.0.tgz#0c52e54bcca391bb2c494b21e8626d7336c6e397" + integrity sha1-DFLlS8yjkbssSUsh6GJtczbG45c= + +is-stream@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44" + integrity sha1-EtSj3U5o4Lec6428hBc66A2RykQ= + +is-stream@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-2.0.0.tgz#bde9c32680d6fae04129d6ac9d921ce7815f78e3" + integrity sha512-XCoy+WlUr7d1+Z8GgSuXmpuUFC9fOhRXglJMx+dwLKTkL44Cjd4W1Z5P+BQZpr+cR93aGP4S/s7Ftw6Nd/kiEw== + +is-svg@^4.2.1: + version "4.2.1" + resolved "https://registry.yarnpkg.com/is-svg/-/is-svg-4.2.1.tgz#095b496e345fec9211c2a7d5d021003e040d6f81" + integrity sha512-PHx3ANecKsKNl5y5+Jvt53Y4J7MfMpbNZkv384QNiswMKAWIbvcqbPz+sYbFKJI8Xv3be01GSFniPmoaP+Ai5A== + dependencies: + html-comment-regex "^1.1.2" + +is-typedarray@^1.0.0, is-typedarray@~1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a" + integrity sha1-5HnICFjfDBsR3dppQPlgEfzaSpo= + +is-windows@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/is-windows/-/is-windows-1.0.2.tgz#d1850eb9791ecd18e6182ce12a30f396634bb19d" + integrity sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA== + +is-wsl@^2.2.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/is-wsl/-/is-wsl-2.2.0.tgz#74a4c76e77ca9fd3f932f290c17ea326cd157271" + integrity sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww== + dependencies: + is-docker "^2.0.0" + +is-yarn-global@^0.3.0: + version "0.3.0" + resolved "https://registry.yarnpkg.com/is-yarn-global/-/is-yarn-global-0.3.0.tgz#d502d3382590ea3004893746754c89139973e232" + integrity sha512-VjSeb/lHmkoyd8ryPVIKvOCn4D1koMqY+vqyjjUfc3xyKtP4dYOxM44sZrnqQSzSds3xyOrUTLTC9LVCVgLngw== + +isarray@1.0.0, isarray@~1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11" + integrity sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE= + +isbinaryfile@^4.0.6: + version "4.0.6" + resolved "https://registry.yarnpkg.com/isbinaryfile/-/isbinaryfile-4.0.6.tgz#edcb62b224e2b4710830b67498c8e4e5a4d2610b" + integrity sha512-ORrEy+SNVqUhrCaal4hA4fBzhggQQ+BaLntyPOdoEiwlKZW9BZiJXjg3RMiruE4tPEI3pyVPpySHQF/dKWperg== + +isexe@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10" + integrity sha1-6PvzdNxVb/iUehDcsFctYz8s+hA= + +isobject@^2.0.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/isobject/-/isobject-2.1.0.tgz#f065561096a3f1da2ef46272f815c840d87e0c89" + integrity sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk= + dependencies: + isarray "1.0.0" + +isobject@^3.0.0, isobject@^3.0.1: + version "3.0.1" + resolved "https://registry.yarnpkg.com/isobject/-/isobject-3.0.1.tgz#4e431e92b11a9731636aa1f9c8d1ccbcfdab78df" + integrity sha1-TkMekrEalzFjaqH5yNHMvP2reN8= + +isstream@~0.1.2: + version "0.1.2" + resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a" + integrity sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo= + +istanbul-lib-coverage@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-3.0.0.tgz#f5944a37c70b550b02a78a5c3b2055b280cec8ec" + integrity sha512-UiUIqxMgRDET6eR+o5HbfRYP1l0hqkWOs7vNxC/mggutCMUIhWMm8gAHb8tHlyfD3/l6rlgNA5cKdDzEAf6hEg== + +istanbul-lib-instrument@^4.0.0, istanbul-lib-instrument@^4.0.3: + version "4.0.3" + resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-4.0.3.tgz#873c6fff897450118222774696a3f28902d77c1d" + integrity sha512-BXgQl9kf4WTCPCCpmFGoJkz/+uhvm7h7PFKUYxh7qarQd3ER33vHG//qaE8eN25l07YqZPpHXU9I09l/RD5aGQ== + dependencies: + "@babel/core" "^7.7.5" + "@istanbuljs/schema" "^0.1.2" + istanbul-lib-coverage "^3.0.0" + semver "^6.3.0" + +istanbul-lib-report@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz#7518fe52ea44de372f460a76b5ecda9ffb73d8a6" + integrity sha512-wcdi+uAKzfiGT2abPpKZ0hSU1rGQjUQnLvtY5MpQ7QCTahD3VODhcu4wcfY1YtkGaDD5yuydOLINXsfbus9ROw== + dependencies: + istanbul-lib-coverage "^3.0.0" + make-dir "^3.0.0" + supports-color "^7.1.0" + +istanbul-lib-source-maps@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/istanbul-lib-source-maps/-/istanbul-lib-source-maps-4.0.0.tgz#75743ce6d96bb86dc7ee4352cf6366a23f0b1ad9" + integrity sha512-c16LpFRkR8vQXyHZ5nLpY35JZtzj1PQY1iZmesUbf1FZHbIupcWfjgOXBY9YHkLEQ6puz1u4Dgj6qmU/DisrZg== + dependencies: + debug "^4.1.1" + istanbul-lib-coverage "^3.0.0" + source-map "^0.6.1" + +istanbul-reports@^3.0.2: + version "3.0.2" + resolved "https://registry.yarnpkg.com/istanbul-reports/-/istanbul-reports-3.0.2.tgz#d593210e5000683750cb09fc0644e4b6e27fd53b" + integrity sha512-9tZvz7AiR3PEDNGiV9vIouQ/EAcqMXFmkcA1CDFTwOB98OZVDL0PH9glHotf5Ugp6GCOTypfzGWI/OqjWNCRUw== + dependencies: + html-escaper "^2.0.0" + istanbul-lib-report "^3.0.0" + +jake@^10.6.1: + version "10.8.2" + resolved "https://registry.yarnpkg.com/jake/-/jake-10.8.2.tgz#ebc9de8558160a66d82d0eadc6a2e58fbc500a7b" + integrity sha512-eLpKyrfG3mzvGE2Du8VoPbeSkRry093+tyNjdYaBbJS9v17knImYGNXQCUV0gLxQtF82m3E8iRb/wdSQZLoq7A== + dependencies: + async "0.9.x" + chalk "^2.4.2" + filelist "^1.0.1" + minimatch "^3.0.4" + +jest-changed-files@^26.6.2: + version "26.6.2" + resolved "https://registry.yarnpkg.com/jest-changed-files/-/jest-changed-files-26.6.2.tgz#f6198479e1cc66f22f9ae1e22acaa0b429c042d0" + integrity sha512-fDS7szLcY9sCtIip8Fjry9oGf3I2ht/QT21bAHm5Dmf0mD4X3ReNUf17y+bO6fR8WgbIZTlbyG1ak/53cbRzKQ== + dependencies: + "@jest/types" "^26.6.2" + execa "^4.0.0" + throat "^5.0.0" + +jest-cli@^26.6.3: + version "26.6.3" + resolved "https://registry.yarnpkg.com/jest-cli/-/jest-cli-26.6.3.tgz#43117cfef24bc4cd691a174a8796a532e135e92a" + integrity sha512-GF9noBSa9t08pSyl3CY4frMrqp+aQXFGFkf5hEPbh/pIUFYWMK6ZLTfbmadxJVcJrdRoChlWQsA2VkJcDFK8hg== + dependencies: + "@jest/core" "^26.6.3" + "@jest/test-result" "^26.6.2" + "@jest/types" "^26.6.2" + chalk "^4.0.0" + exit "^0.1.2" + graceful-fs "^4.2.4" + import-local "^3.0.2" + is-ci "^2.0.0" + jest-config "^26.6.3" + jest-util "^26.6.2" + jest-validate "^26.6.2" + prompts "^2.0.1" + yargs "^15.4.1" + +jest-config@^26.6.3: + version "26.6.3" + resolved "https://registry.yarnpkg.com/jest-config/-/jest-config-26.6.3.tgz#64f41444eef9eb03dc51d5c53b75c8c71f645349" + integrity sha512-t5qdIj/bCj2j7NFVHb2nFB4aUdfucDn3JRKgrZnplb8nieAirAzRSHP8uDEd+qV6ygzg9Pz4YG7UTJf94LPSyg== + dependencies: + "@babel/core" "^7.1.0" + "@jest/test-sequencer" "^26.6.3" + "@jest/types" "^26.6.2" + babel-jest "^26.6.3" + chalk "^4.0.0" + deepmerge "^4.2.2" + glob "^7.1.1" + graceful-fs "^4.2.4" + jest-environment-jsdom "^26.6.2" + jest-environment-node "^26.6.2" + jest-get-type "^26.3.0" + jest-jasmine2 "^26.6.3" + jest-regex-util "^26.0.0" + jest-resolve "^26.6.2" + jest-util "^26.6.2" + jest-validate "^26.6.2" + micromatch "^4.0.2" + pretty-format "^26.6.2" + +jest-diff@^26.6.2: + version "26.6.2" + resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-26.6.2.tgz#1aa7468b52c3a68d7d5c5fdcdfcd5e49bd164394" + integrity sha512-6m+9Z3Gv9wN0WFVasqjCL/06+EFCMTqDEUl/b87HYK2rAPTyfz4ZIuSlPhY51PIQRWx5TaxeF1qmXKe9gfN3sA== + dependencies: + chalk "^4.0.0" + diff-sequences "^26.6.2" + jest-get-type "^26.3.0" + pretty-format "^26.6.2" + +jest-docblock@^26.0.0: + version "26.0.0" + resolved "https://registry.yarnpkg.com/jest-docblock/-/jest-docblock-26.0.0.tgz#3e2fa20899fc928cb13bd0ff68bd3711a36889b5" + integrity sha512-RDZ4Iz3QbtRWycd8bUEPxQsTlYazfYn/h5R65Fc6gOfwozFhoImx+affzky/FFBuqISPTqjXomoIGJVKBWoo0w== + dependencies: + detect-newline "^3.0.0" + +jest-each@^26.6.2: + version "26.6.2" + resolved "https://registry.yarnpkg.com/jest-each/-/jest-each-26.6.2.tgz#02526438a77a67401c8a6382dfe5999952c167cb" + integrity sha512-Mer/f0KaATbjl8MCJ+0GEpNdqmnVmDYqCTJYTvoo7rqmRiDllmp2AYN+06F93nXcY3ur9ShIjS+CO/uD+BbH4A== + dependencies: + "@jest/types" "^26.6.2" + chalk "^4.0.0" + jest-get-type "^26.3.0" + jest-util "^26.6.2" + pretty-format "^26.6.2" + +jest-environment-jsdom@^26.6.2: + version "26.6.2" + resolved "https://registry.yarnpkg.com/jest-environment-jsdom/-/jest-environment-jsdom-26.6.2.tgz#78d09fe9cf019a357009b9b7e1f101d23bd1da3e" + integrity sha512-jgPqCruTlt3Kwqg5/WVFyHIOJHsiAvhcp2qiR2QQstuG9yWox5+iHpU3ZrcBxW14T4fe5Z68jAfLRh7joCSP2Q== + dependencies: + "@jest/environment" "^26.6.2" + "@jest/fake-timers" "^26.6.2" + "@jest/types" "^26.6.2" + "@types/node" "*" + jest-mock "^26.6.2" + jest-util "^26.6.2" + jsdom "^16.4.0" + +jest-environment-node@^26.6.2: + version "26.6.2" + resolved "https://registry.yarnpkg.com/jest-environment-node/-/jest-environment-node-26.6.2.tgz#824e4c7fb4944646356f11ac75b229b0035f2b0c" + integrity sha512-zhtMio3Exty18dy8ee8eJ9kjnRyZC1N4C1Nt/VShN1apyXc8rWGtJ9lI7vqiWcyyXS4BVSEn9lxAM2D+07/Tag== + dependencies: + "@jest/environment" "^26.6.2" + "@jest/fake-timers" "^26.6.2" + "@jest/types" "^26.6.2" + "@types/node" "*" + jest-mock "^26.6.2" + jest-util "^26.6.2" + +jest-get-type@^26.3.0: + version "26.3.0" + resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-26.3.0.tgz#e97dc3c3f53c2b406ca7afaed4493b1d099199e0" + integrity sha512-TpfaviN1R2pQWkIihlfEanwOXK0zcxrKEE4MlU6Tn7keoXdN6/3gK/xl0yEh8DOunn5pOVGKf8hB4R9gVh04ig== + +jest-haste-map@^26.6.2: + version "26.6.2" + resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-26.6.2.tgz#dd7e60fe7dc0e9f911a23d79c5ff7fb5c2cafeaa" + integrity sha512-easWIJXIw71B2RdR8kgqpjQrbMRWQBgiBwXYEhtGUTaX+doCjBheluShdDMeR8IMfJiTqH4+zfhtg29apJf/8w== + dependencies: + "@jest/types" "^26.6.2" + "@types/graceful-fs" "^4.1.2" + "@types/node" "*" + anymatch "^3.0.3" + fb-watchman "^2.0.0" + graceful-fs "^4.2.4" + jest-regex-util "^26.0.0" + jest-serializer "^26.6.2" + jest-util "^26.6.2" + jest-worker "^26.6.2" + micromatch "^4.0.2" + sane "^4.0.3" + walker "^1.0.7" + optionalDependencies: + fsevents "^2.1.2" + +jest-jasmine2@^26.6.3: + version "26.6.3" + resolved "https://registry.yarnpkg.com/jest-jasmine2/-/jest-jasmine2-26.6.3.tgz#adc3cf915deacb5212c93b9f3547cd12958f2edd" + integrity sha512-kPKUrQtc8aYwBV7CqBg5pu+tmYXlvFlSFYn18ev4gPFtrRzB15N2gW/Roew3187q2w2eHuu0MU9TJz6w0/nPEg== + dependencies: + "@babel/traverse" "^7.1.0" + "@jest/environment" "^26.6.2" + "@jest/source-map" "^26.6.2" + "@jest/test-result" "^26.6.2" + "@jest/types" "^26.6.2" + "@types/node" "*" + chalk "^4.0.0" + co "^4.6.0" + expect "^26.6.2" + is-generator-fn "^2.0.0" + jest-each "^26.6.2" + jest-matcher-utils "^26.6.2" + jest-message-util "^26.6.2" + jest-runtime "^26.6.3" + jest-snapshot "^26.6.2" + jest-util "^26.6.2" + pretty-format "^26.6.2" + throat "^5.0.0" + +jest-leak-detector@^26.6.2: + version "26.6.2" + resolved "https://registry.yarnpkg.com/jest-leak-detector/-/jest-leak-detector-26.6.2.tgz#7717cf118b92238f2eba65054c8a0c9c653a91af" + integrity sha512-i4xlXpsVSMeKvg2cEKdfhh0H39qlJlP5Ex1yQxwF9ubahboQYMgTtz5oML35AVA3B4Eu+YsmwaiKVev9KCvLxg== + dependencies: + jest-get-type "^26.3.0" + pretty-format "^26.6.2" + +jest-matcher-utils@^26.6.2: + version "26.6.2" + resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-26.6.2.tgz#8e6fd6e863c8b2d31ac6472eeb237bc595e53e7a" + integrity sha512-llnc8vQgYcNqDrqRDXWwMr9i7rS5XFiCwvh6DTP7Jqa2mqpcCBBlpCbn+trkG0KNhPu/h8rzyBkriOtBstvWhw== + dependencies: + chalk "^4.0.0" + jest-diff "^26.6.2" + jest-get-type "^26.3.0" + pretty-format "^26.6.2" + +jest-message-util@^26.6.2: + version "26.6.2" + resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-26.6.2.tgz#58173744ad6fc0506b5d21150b9be56ef001ca07" + integrity sha512-rGiLePzQ3AzwUshu2+Rn+UMFk0pHN58sOG+IaJbk5Jxuqo3NYO1U2/MIR4S1sKgsoYSXSzdtSa0TgrmtUwEbmA== + dependencies: + "@babel/code-frame" "^7.0.0" + "@jest/types" "^26.6.2" + "@types/stack-utils" "^2.0.0" + chalk "^4.0.0" + graceful-fs "^4.2.4" + micromatch "^4.0.2" + pretty-format "^26.6.2" + slash "^3.0.0" + stack-utils "^2.0.2" + +jest-mock@^26.6.2: + version "26.6.2" + resolved "https://registry.yarnpkg.com/jest-mock/-/jest-mock-26.6.2.tgz#d6cb712b041ed47fe0d9b6fc3474bc6543feb302" + integrity sha512-YyFjePHHp1LzpzYcmgqkJ0nm0gg/lJx2aZFzFy1S6eUqNjXsOqTK10zNRff2dNfssgokjkG65OlWNcIlgd3zew== + dependencies: + "@jest/types" "^26.6.2" + "@types/node" "*" + +jest-pnp-resolver@^1.2.2: + version "1.2.2" + resolved "https://registry.yarnpkg.com/jest-pnp-resolver/-/jest-pnp-resolver-1.2.2.tgz#b704ac0ae028a89108a4d040b3f919dfddc8e33c" + integrity sha512-olV41bKSMm8BdnuMsewT4jqlZ8+3TCARAXjZGT9jcoSnrfUnRCqnMoF9XEeoWjbzObpqF9dRhHQj0Xb9QdF6/w== + +jest-regex-util@^26.0.0: + version "26.0.0" + resolved "https://registry.yarnpkg.com/jest-regex-util/-/jest-regex-util-26.0.0.tgz#d25e7184b36e39fd466c3bc41be0971e821fee28" + integrity sha512-Gv3ZIs/nA48/Zvjrl34bf+oD76JHiGDUxNOVgUjh3j890sblXryjY4rss71fPtD/njchl6PSE2hIhvyWa1eT0A== + +jest-resolve-dependencies@^26.6.3: + version "26.6.3" + resolved "https://registry.yarnpkg.com/jest-resolve-dependencies/-/jest-resolve-dependencies-26.6.3.tgz#6680859ee5d22ee5dcd961fe4871f59f4c784fb6" + integrity sha512-pVwUjJkxbhe4RY8QEWzN3vns2kqyuldKpxlxJlzEYfKSvY6/bMvxoFrYYzUO1Gx28yKWN37qyV7rIoIp2h8fTg== + dependencies: + "@jest/types" "^26.6.2" + jest-regex-util "^26.0.0" + jest-snapshot "^26.6.2" + +jest-resolve@^26.6.2: + version "26.6.2" + resolved "https://registry.yarnpkg.com/jest-resolve/-/jest-resolve-26.6.2.tgz#a3ab1517217f469b504f1b56603c5bb541fbb507" + integrity sha512-sOxsZOq25mT1wRsfHcbtkInS+Ek7Q8jCHUB0ZUTP0tc/c41QHriU/NunqMfCUWsL4H3MHpvQD4QR9kSYhS7UvQ== + dependencies: + "@jest/types" "^26.6.2" + chalk "^4.0.0" + graceful-fs "^4.2.4" + jest-pnp-resolver "^1.2.2" + jest-util "^26.6.2" + read-pkg-up "^7.0.1" + resolve "^1.18.1" + slash "^3.0.0" + +jest-runner@^26.6.3: + version "26.6.3" + resolved "https://registry.yarnpkg.com/jest-runner/-/jest-runner-26.6.3.tgz#2d1fed3d46e10f233fd1dbd3bfaa3fe8924be159" + integrity sha512-atgKpRHnaA2OvByG/HpGA4g6CSPS/1LK0jK3gATJAoptC1ojltpmVlYC3TYgdmGp+GLuhzpH30Gvs36szSL2JQ== + dependencies: + "@jest/console" "^26.6.2" + "@jest/environment" "^26.6.2" + "@jest/test-result" "^26.6.2" + "@jest/types" "^26.6.2" + "@types/node" "*" + chalk "^4.0.0" + emittery "^0.7.1" + exit "^0.1.2" + graceful-fs "^4.2.4" + jest-config "^26.6.3" + jest-docblock "^26.0.0" + jest-haste-map "^26.6.2" + jest-leak-detector "^26.6.2" + jest-message-util "^26.6.2" + jest-resolve "^26.6.2" + jest-runtime "^26.6.3" + jest-util "^26.6.2" + jest-worker "^26.6.2" + source-map-support "^0.5.6" + throat "^5.0.0" + +jest-runtime@^26.6.3: + version "26.6.3" + resolved "https://registry.yarnpkg.com/jest-runtime/-/jest-runtime-26.6.3.tgz#4f64efbcfac398331b74b4b3c82d27d401b8fa2b" + integrity sha512-lrzyR3N8sacTAMeonbqpnSka1dHNux2uk0qqDXVkMv2c/A3wYnvQ4EXuI013Y6+gSKSCxdaczvf4HF0mVXHRdw== + dependencies: + "@jest/console" "^26.6.2" + "@jest/environment" "^26.6.2" + "@jest/fake-timers" "^26.6.2" + "@jest/globals" "^26.6.2" + "@jest/source-map" "^26.6.2" + "@jest/test-result" "^26.6.2" + "@jest/transform" "^26.6.2" + "@jest/types" "^26.6.2" + "@types/yargs" "^15.0.0" + chalk "^4.0.0" + cjs-module-lexer "^0.6.0" + collect-v8-coverage "^1.0.0" + exit "^0.1.2" + glob "^7.1.3" + graceful-fs "^4.2.4" + jest-config "^26.6.3" + jest-haste-map "^26.6.2" + jest-message-util "^26.6.2" + jest-mock "^26.6.2" + jest-regex-util "^26.0.0" + jest-resolve "^26.6.2" + jest-snapshot "^26.6.2" + jest-util "^26.6.2" + jest-validate "^26.6.2" + slash "^3.0.0" + strip-bom "^4.0.0" + yargs "^15.4.1" + +jest-serializer@^26.6.2: + version "26.6.2" + resolved "https://registry.yarnpkg.com/jest-serializer/-/jest-serializer-26.6.2.tgz#d139aafd46957d3a448f3a6cdabe2919ba0742d1" + integrity sha512-S5wqyz0DXnNJPd/xfIzZ5Xnp1HrJWBczg8mMfMpN78OJ5eDxXyf+Ygld9wX1DnUWbIbhM1YDY95NjR4CBXkb2g== + dependencies: + "@types/node" "*" + graceful-fs "^4.2.4" + +jest-snapshot@^26.6.2: + version "26.6.2" + resolved "https://registry.yarnpkg.com/jest-snapshot/-/jest-snapshot-26.6.2.tgz#f3b0af1acb223316850bd14e1beea9837fb39c84" + integrity sha512-OLhxz05EzUtsAmOMzuupt1lHYXCNib0ECyuZ/PZOx9TrZcC8vL0x+DUG3TL+GLX3yHG45e6YGjIm0XwDc3q3og== + dependencies: + "@babel/types" "^7.0.0" + "@jest/types" "^26.6.2" + "@types/babel__traverse" "^7.0.4" + "@types/prettier" "^2.0.0" + chalk "^4.0.0" + expect "^26.6.2" + graceful-fs "^4.2.4" + jest-diff "^26.6.2" + jest-get-type "^26.3.0" + jest-haste-map "^26.6.2" + jest-matcher-utils "^26.6.2" + jest-message-util "^26.6.2" + jest-resolve "^26.6.2" + natural-compare "^1.4.0" + pretty-format "^26.6.2" + semver "^7.3.2" + +jest-util@^26.6.2: + version "26.6.2" + resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-26.6.2.tgz#907535dbe4d5a6cb4c47ac9b926f6af29576cbc1" + integrity sha512-MDW0fKfsn0OI7MS7Euz6h8HNDXVQ0gaM9uW6RjfDmd1DAFcaxX9OqIakHIqhbnmF08Cf2DLDG+ulq8YQQ0Lp0Q== + dependencies: + "@jest/types" "^26.6.2" + "@types/node" "*" + chalk "^4.0.0" + graceful-fs "^4.2.4" + is-ci "^2.0.0" + micromatch "^4.0.2" + +jest-validate@^26.6.2: + version "26.6.2" + resolved "https://registry.yarnpkg.com/jest-validate/-/jest-validate-26.6.2.tgz#23d380971587150467342911c3d7b4ac57ab20ec" + integrity sha512-NEYZ9Aeyj0i5rQqbq+tpIOom0YS1u2MVu6+euBsvpgIme+FOfRmoC4R5p0JiAUpaFvFy24xgrpMknarR/93XjQ== + dependencies: + "@jest/types" "^26.6.2" + camelcase "^6.0.0" + chalk "^4.0.0" + jest-get-type "^26.3.0" + leven "^3.1.0" + pretty-format "^26.6.2" + +jest-watcher@^26.6.2: + version "26.6.2" + resolved "https://registry.yarnpkg.com/jest-watcher/-/jest-watcher-26.6.2.tgz#a5b683b8f9d68dbcb1d7dae32172d2cca0592975" + integrity sha512-WKJob0P/Em2csiVthsI68p6aGKTIcsfjH9Gsx1f0A3Italz43e3ho0geSAVsmj09RWOELP1AZ/DXyJgOgDKxXQ== + dependencies: + "@jest/test-result" "^26.6.2" + "@jest/types" "^26.6.2" + "@types/node" "*" + ansi-escapes "^4.2.1" + chalk "^4.0.0" + jest-util "^26.6.2" + string-length "^4.0.1" + +jest-worker@^26.6.2: + version "26.6.2" + resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-26.6.2.tgz#7f72cbc4d643c365e27b9fd775f9d0eaa9c7a8ed" + integrity sha512-KWYVV1c4i+jbMpaBC+U++4Va0cp8OisU185o73T1vo99hqi7w8tSJfUXYswwqqrjzwxa6KpRK54WhPvwf5w6PQ== + dependencies: + "@types/node" "*" + merge-stream "^2.0.0" + supports-color "^7.0.0" + +jest@^26.6.3: + version "26.6.3" + resolved "https://registry.yarnpkg.com/jest/-/jest-26.6.3.tgz#40e8fdbe48f00dfa1f0ce8121ca74b88ac9148ef" + integrity sha512-lGS5PXGAzR4RF7V5+XObhqz2KZIDUA1yD0DG6pBVmy10eh0ZIXQImRuzocsI/N2XZ1GrLFwTS27In2i2jlpq1Q== + dependencies: + "@jest/core" "^26.6.3" + import-local "^3.0.2" + jest-cli "^26.6.3" + +js-tokens@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499" + integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ== + +js-yaml@^3.13.1, js-yaml@^3.14.0: + version "3.14.1" + resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.14.1.tgz#dae812fdb3825fa306609a8717383c50c36a0537" + integrity sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g== + dependencies: + argparse "^1.0.7" + esprima "^4.0.0" + +jsbn@~0.1.0: + version "0.1.1" + resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513" + integrity sha1-peZUwuWi3rXyAdls77yoDA7y9RM= + +jsdom@^16.4.0: + version "16.4.0" + resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-16.4.0.tgz#36005bde2d136f73eee1a830c6d45e55408edddb" + integrity sha512-lYMm3wYdgPhrl7pDcRmvzPhhrGVBeVhPIqeHjzeiHN3DFmD1RBpbExbi8vU7BJdH8VAZYovR8DMt0PNNDM7k8w== + dependencies: + abab "^2.0.3" + acorn "^7.1.1" + acorn-globals "^6.0.0" + cssom "^0.4.4" + cssstyle "^2.2.0" + data-urls "^2.0.0" + decimal.js "^10.2.0" + domexception "^2.0.1" + escodegen "^1.14.1" + html-encoding-sniffer "^2.0.1" + is-potential-custom-element-name "^1.0.0" + nwsapi "^2.2.0" + parse5 "5.1.1" + request "^2.88.2" + request-promise-native "^1.0.8" + saxes "^5.0.0" + symbol-tree "^3.2.4" + tough-cookie "^3.0.1" + w3c-hr-time "^1.0.2" + w3c-xmlserializer "^2.0.0" + webidl-conversions "^6.1.0" + whatwg-encoding "^1.0.5" + whatwg-mimetype "^2.3.0" + whatwg-url "^8.0.0" + ws "^7.2.3" + xml-name-validator "^3.0.0" + +jsesc@^2.5.1: + version "2.5.2" + resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-2.5.2.tgz#80564d2e483dacf6e8ef209650a67df3f0c283a4" + integrity sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA== + +json-buffer@3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/json-buffer/-/json-buffer-3.0.0.tgz#5b1f397afc75d677bde8bcfc0e47e1f9a3d9a898" + integrity sha1-Wx85evx11ne96Lz8Dkfh+aPZqJg= + +json-parse-even-better-errors@^2.3.0: + version "2.3.1" + resolved "https://registry.yarnpkg.com/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz#7c47805a94319928e05777405dc12e1f7a4ee02d" + integrity sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w== + +json-schema-traverse@^0.4.1: + version "0.4.1" + resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz#69f6a87d9513ab8bb8fe63bdb0979c448e684660" + integrity sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg== + +json-schema@0.2.3: + version "0.2.3" + resolved "https://registry.yarnpkg.com/json-schema/-/json-schema-0.2.3.tgz#b480c892e59a2f05954ce727bd3f2a4e882f9e13" + integrity sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM= + +json-stable-stringify-without-jsonify@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz#9db7b59496ad3f3cfef30a75142d2d930ad72651" + integrity sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE= + +json-stringify-safe@^5.0.1, json-stringify-safe@~5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb" + integrity sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus= + +json5@^2.1.2: + version "2.1.3" + resolved "https://registry.yarnpkg.com/json5/-/json5-2.1.3.tgz#c9b0f7fa9233bfe5807fe66fcf3a5617ed597d43" + integrity sha512-KXPvOm8K9IJKFM0bmdn8QXh7udDh1g/giieX0NLCaMnb4hEiVFqnop2ImTXCc5e0/oHz3LTqmHGtExn5hfMkOA== + dependencies: + minimist "^1.2.5" + +jsonfile@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-4.0.0.tgz#8771aae0799b64076b76640fca058f9c10e33ecb" + integrity sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss= + optionalDependencies: + graceful-fs "^4.1.6" + +jsonfile@^6.0.1: + version "6.1.0" + resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-6.1.0.tgz#bc55b2634793c679ec6403094eb13698a6ec0aae" + integrity sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ== + dependencies: + universalify "^2.0.0" + optionalDependencies: + graceful-fs "^4.1.6" + +jsprim@^1.2.2: + version "1.4.1" + resolved "https://registry.yarnpkg.com/jsprim/-/jsprim-1.4.1.tgz#313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2" + integrity sha1-MT5mvB5cwG5Di8G3SZwuXFastqI= + dependencies: + assert-plus "1.0.0" + extsprintf "1.3.0" + json-schema "0.2.3" + verror "1.10.0" + +keyv@^3.0.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/keyv/-/keyv-3.1.0.tgz#ecc228486f69991e49e9476485a5be1e8fc5c4d9" + integrity sha512-9ykJ/46SN/9KPM/sichzQ7OvXyGDYKGTaDlKMGCAlg2UK8KRy4jb0d8sFc+0Tt0YYnThq8X2RZgCg74RPxgcVA== + dependencies: + json-buffer "3.0.0" + +kind-of@^3.0.2, kind-of@^3.0.3, kind-of@^3.2.0: + version "3.2.2" + resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-3.2.2.tgz#31ea21a734bab9bbb0f32466d893aea51e4a3c64" + integrity sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ= + dependencies: + is-buffer "^1.1.5" + +kind-of@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-4.0.0.tgz#20813df3d712928b207378691a45066fae72dd57" + integrity sha1-IIE989cSkosgc3hpGkUGb65y3Vc= + dependencies: + is-buffer "^1.1.5" + +kind-of@^5.0.0: + version "5.1.0" + resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-5.1.0.tgz#729c91e2d857b7a419a1f9aa65685c4c33f5845d" + integrity sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw== + +kind-of@^6.0.0, kind-of@^6.0.2: + version "6.0.3" + resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.3.tgz#07c05034a6c349fa06e24fa35aa76db4580ce4dd" + integrity sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw== + +kleur@^3.0.3: + version "3.0.3" + resolved "https://registry.yarnpkg.com/kleur/-/kleur-3.0.3.tgz#a79c9ecc86ee1ce3fa6206d1216c501f147fc07e" + integrity sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w== + +latest-version@^5.0.0: + version "5.1.0" + resolved "https://registry.yarnpkg.com/latest-version/-/latest-version-5.1.0.tgz#119dfe908fe38d15dfa43ecd13fa12ec8832face" + integrity sha512-weT+r0kTkRQdCdYCNtkMwWXQTMEswKrFBkm4ckQOMVhhqhIMI1UT2hMj+1iigIhgSZm5gTmrRXBNoGUgaTY1xA== + dependencies: + package-json "^6.3.0" + +lazy-val@^1.0.4: + version "1.0.4" + resolved "https://registry.yarnpkg.com/lazy-val/-/lazy-val-1.0.4.tgz#882636a7245c2cfe6e0a4e3ba6c5d68a137e5c65" + integrity sha512-u93kb2fPbIrfzBuLjZE+w+fJbUUMhNDXxNmMfaqNgpfQf1CO5ZSe2LfsnBqVAk7i/2NF48OSoRj+Xe2VT+lE8Q== + +lazystream@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/lazystream/-/lazystream-1.0.0.tgz#f6995fe0f820392f61396be89462407bb77168e4" + integrity sha1-9plf4PggOS9hOWvolGJAe7dxaOQ= + dependencies: + readable-stream "^2.0.5" + +leven@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/leven/-/leven-3.1.0.tgz#77891de834064cccba82ae7842bb6b14a13ed7f2" + integrity sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A== + +levn@^0.4.1: + version "0.4.1" + resolved "https://registry.yarnpkg.com/levn/-/levn-0.4.1.tgz#ae4562c007473b932a6200d403268dd2fffc6ade" + integrity sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ== + dependencies: + prelude-ls "^1.2.1" + type-check "~0.4.0" + +levn@~0.3.0: + version "0.3.0" + resolved "https://registry.yarnpkg.com/levn/-/levn-0.3.0.tgz#3b09924edf9f083c0490fdd4c0bc4421e04764ee" + integrity sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4= + dependencies: + prelude-ls "~1.1.2" + type-check "~0.3.2" + +lines-and-columns@^1.1.6: + version "1.1.6" + resolved "https://registry.yarnpkg.com/lines-and-columns/-/lines-and-columns-1.1.6.tgz#1c00c743b433cd0a4e80758f7b64a57440d9ff00" + integrity sha1-HADHQ7QzzQpOgHWPe2SldEDZ/wA= + +locate-path@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-5.0.0.tgz#1afba396afd676a6d42504d0a67a3a7eb9f62aa0" + integrity sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g== + dependencies: + p-locate "^4.1.0" + +lodash.defaults@^4.2.0: + version "4.2.0" + resolved "https://registry.yarnpkg.com/lodash.defaults/-/lodash.defaults-4.2.0.tgz#d09178716ffea4dde9e5fb7b37f6f0802274580c" + integrity sha1-0JF4cW/+pN3p5ft7N/bwgCJ0WAw= + +lodash.difference@^4.5.0: + version "4.5.0" + resolved "https://registry.yarnpkg.com/lodash.difference/-/lodash.difference-4.5.0.tgz#9ccb4e505d486b91651345772885a2df27fd017c" + integrity sha1-nMtOUF1Ia5FlE0V3KIWi3yf9AXw= + +lodash.flatten@^4.4.0: + version "4.4.0" + resolved "https://registry.yarnpkg.com/lodash.flatten/-/lodash.flatten-4.4.0.tgz#f31c22225a9632d2bbf8e4addbef240aa765a61f" + integrity sha1-8xwiIlqWMtK7+OSt2+8kCqdlph8= + +lodash.isplainobject@^4.0.6: + version "4.0.6" + resolved "https://registry.yarnpkg.com/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz#7c526a52d89b45c45cc690b88163be0497f550cb" + integrity sha1-fFJqUtibRcRcxpC4gWO+BJf1UMs= + +lodash.sortby@^4.7.0: + version "4.7.0" + resolved "https://registry.yarnpkg.com/lodash.sortby/-/lodash.sortby-4.7.0.tgz#edd14c824e2cc9c1e0b0a1b42bb5210516a42438" + integrity sha1-7dFMgk4sycHgsKG0K7UhBRakJDg= + +lodash.union@^4.6.0: + version "4.6.0" + resolved "https://registry.yarnpkg.com/lodash.union/-/lodash.union-4.6.0.tgz#48bb5088409f16f1821666641c44dd1aaae3cd88" + integrity sha1-SLtQiECfFvGCFmZkHETdGqrjzYg= + +lodash@^4.17.10, lodash@^4.17.14, lodash@^4.17.19: + version "4.17.20" + resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.20.tgz#b44a9b6297bcb698f1c51a3545a2b3b368d59c52" + integrity sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA== + +lowercase-keys@^1.0.0, lowercase-keys@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-1.0.1.tgz#6f9e30b47084d971a7c820ff15a6c5167b74c26f" + integrity sha512-G2Lj61tXDnVFFOi8VZds+SoQjtQC3dgokKdDG2mTm1tx4m50NUHBOZSBwQQHyy0V12A0JTG4icfZQH+xPyh8VA== + +lowercase-keys@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-2.0.0.tgz#2603e78b7b4b0006cbca2fbcc8a3202558ac9479" + integrity sha512-tqNXrS78oMOE73NMxK4EMLQsQowWf8jKooH9g7xPavRT706R6bkQJ6DY2Te7QukaZsulxa30wQ7bk0pm4XiHmA== + +lru-cache@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-6.0.0.tgz#6d6fe6570ebd96aaf90fcad1dafa3b2566db3a94" + integrity sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA== + dependencies: + yallist "^4.0.0" + +make-dir@^3.0.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-3.1.0.tgz#415e967046b3a7f1d185277d84aa58203726a13f" + integrity sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw== + dependencies: + semver "^6.0.0" + +makeerror@1.0.x: + version "1.0.11" + resolved "https://registry.yarnpkg.com/makeerror/-/makeerror-1.0.11.tgz#e01a5c9109f2af79660e4e8b9587790184f5a96c" + integrity sha1-4BpckQnyr3lmDk6LlYd5AYT1qWw= + dependencies: + tmpl "1.0.x" + +map-cache@^0.2.2: + version "0.2.2" + resolved "https://registry.yarnpkg.com/map-cache/-/map-cache-0.2.2.tgz#c32abd0bd6525d9b051645bb4f26ac5dc98a0dbf" + integrity sha1-wyq9C9ZSXZsFFkW7TyasXcmKDb8= + +map-visit@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/map-visit/-/map-visit-1.0.0.tgz#ecdca8f13144e660f1b5bd41f12f3479d98dfb8f" + integrity sha1-7Nyo8TFE5mDxtb1B8S80edmN+48= + dependencies: + object-visit "^1.0.0" + +matcher@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/matcher/-/matcher-3.0.0.tgz#bd9060f4c5b70aa8041ccc6f80368760994f30ca" + integrity sha512-OkeDaAZ/bQCxeFAozM55PKcKU0yJMPGifLwV4Qgjitu+5MoAfSQN4lsLJeXZ1b8w0x+/Emda6MZgXS1jvsapng== + dependencies: + escape-string-regexp "^4.0.0" + +merge-stream@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/merge-stream/-/merge-stream-2.0.0.tgz#52823629a14dd00c9770fb6ad47dc6310f2c1f60" + integrity sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w== + +micromatch@^3.1.4: + version "3.1.10" + resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-3.1.10.tgz#70859bc95c9840952f359a068a3fc49f9ecfac23" + integrity sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg== + dependencies: + arr-diff "^4.0.0" + array-unique "^0.3.2" + braces "^2.3.1" + define-property "^2.0.2" + extend-shallow "^3.0.2" + extglob "^2.0.4" + fragment-cache "^0.2.1" + kind-of "^6.0.2" + nanomatch "^1.2.9" + object.pick "^1.3.0" + regex-not "^1.0.0" + snapdragon "^0.8.1" + to-regex "^3.0.2" + +micromatch@^4.0.2: + version "4.0.2" + resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.2.tgz#4fcb0999bf9fbc2fcbdd212f6d629b9a56c39259" + integrity sha512-y7FpHSbMUMoyPbYUSzO6PaZ6FyRnQOpHuKwbo1G+Knck95XVU4QAiKdGEnj5wwoS7PlOgthX/09u5iFJ+aYf5Q== + dependencies: + braces "^3.0.1" + picomatch "^2.0.5" + +mime-db@1.44.0: + version "1.44.0" + resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.44.0.tgz#fa11c5eb0aca1334b4233cb4d52f10c5a6272f92" + integrity sha512-/NOTfLrsPBVeH7YtFPgsVWveuL+4SjjYxaQ1xtM1KMFj7HdxlBlxeyNLzhyJVx7r4rZGJAZ/6lkKCitSc/Nmpg== + +mime-types@^2.1.12, mime-types@~2.1.19: + version "2.1.27" + resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.27.tgz#47949f98e279ea53119f5722e0f34e529bec009f" + integrity sha512-JIhqnCasI9yD+SsmkquHBxTSEuZdQX5BuQnS2Vc7puQQQ+8yiP5AY5uWhpdv4YL4VM5c6iliiYWPgJ/nJQLp7w== + dependencies: + mime-db "1.44.0" + +mime@^2.4.6: + version "2.4.6" + resolved "https://registry.yarnpkg.com/mime/-/mime-2.4.6.tgz#e5b407c90db442f2beb5b162373d07b69affa4d1" + integrity sha512-RZKhC3EmpBchfTGBVb8fb+RL2cWyw/32lshnsETttkBAyAUXSGHxbEJWWRXc751DrIxG1q04b8QwMbAwkRPpUA== + +mimic-fn@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-2.1.0.tgz#7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b" + integrity sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg== + +mimic-response@^1.0.0, mimic-response@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/mimic-response/-/mimic-response-1.0.1.tgz#4923538878eef42063cb8a3e3b0798781487ab1b" + integrity sha512-j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ== + +minimatch@^3.0.4: + version "3.0.4" + resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083" + integrity sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA== + dependencies: + brace-expansion "^1.1.7" + +minimist@^1.1.1, minimist@^1.2.0, minimist@^1.2.5: + version "1.2.5" + resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602" + integrity sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw== + +mixin-deep@^1.2.0: + version "1.3.2" + resolved "https://registry.yarnpkg.com/mixin-deep/-/mixin-deep-1.3.2.tgz#1120b43dc359a785dce65b55b82e257ccf479566" + integrity sha512-WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA== + dependencies: + for-in "^1.0.2" + is-extendable "^1.0.1" + +mkdirp@^0.5.4: + version "0.5.5" + resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.5.tgz#d91cefd62d1436ca0f41620e251288d420099def" + integrity sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ== + dependencies: + minimist "^1.2.5" + +ms@2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8" + integrity sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g= + +ms@2.1.2: + version "2.1.2" + resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009" + integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w== + +nanomatch@^1.2.9: + version "1.2.13" + resolved "https://registry.yarnpkg.com/nanomatch/-/nanomatch-1.2.13.tgz#b87a8aa4fc0de8fe6be88895b38983ff265bd119" + integrity sha512-fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA== + dependencies: + arr-diff "^4.0.0" + array-unique "^0.3.2" + define-property "^2.0.2" + extend-shallow "^3.0.2" + fragment-cache "^0.2.1" + is-windows "^1.0.2" + kind-of "^6.0.2" + object.pick "^1.3.0" + regex-not "^1.0.0" + snapdragon "^0.8.1" + to-regex "^3.0.1" + +natural-compare@^1.4.0: + version "1.4.0" + resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7" + integrity sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc= + +nice-try@^1.0.4: + version "1.0.5" + resolved "https://registry.yarnpkg.com/nice-try/-/nice-try-1.0.5.tgz#a3378a7696ce7d223e88fc9b764bd7ef1089e366" + integrity sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ== + +node-int64@^0.4.0: + version "0.4.0" + resolved "https://registry.yarnpkg.com/node-int64/-/node-int64-0.4.0.tgz#87a9065cdb355d3182d8f94ce11188b825c68a3b" + integrity sha1-h6kGXNs1XTGC2PlM4RGIuCXGijs= + +node-modules-regexp@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/node-modules-regexp/-/node-modules-regexp-1.0.0.tgz#8d9dbe28964a4ac5712e9131642107c71e90ec40" + integrity sha1-jZ2+KJZKSsVxLpExZCEHxx6Q7EA= + +node-notifier@^8.0.0: + version "8.0.0" + resolved "https://registry.yarnpkg.com/node-notifier/-/node-notifier-8.0.0.tgz#a7eee2d51da6d0f7ff5094bc7108c911240c1620" + integrity sha512-46z7DUmcjoYdaWyXouuFNNfUo6eFa94t23c53c+lG/9Cvauk4a98rAUp9672X5dxGdQmLpPzTxzu8f/OeEPaFA== + dependencies: + growly "^1.3.0" + is-wsl "^2.2.0" + semver "^7.3.2" + shellwords "^0.1.1" + uuid "^8.3.0" + which "^2.0.2" + +normalize-package-data@^2.5.0: + version "2.5.0" + resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.5.0.tgz#e66db1838b200c1dfc233225d12cb36520e234a8" + integrity sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA== + dependencies: + hosted-git-info "^2.1.4" + resolve "^1.10.0" + semver "2 || 3 || 4 || 5" + validate-npm-package-license "^3.0.1" + +normalize-path@^2.1.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-2.1.1.tgz#1ab28b556e198363a8c1a6f7e6fa20137fe6aed9" + integrity sha1-GrKLVW4Zg2Oowab35vogE3/mrtk= + dependencies: + remove-trailing-separator "^1.0.1" + +normalize-path@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-3.0.0.tgz#0dcd69ff23a1c9b11fd0978316644a0388216a65" + integrity sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA== + +normalize-url@^4.1.0: + version "4.5.0" + resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-4.5.0.tgz#453354087e6ca96957bd8f5baf753f5982142129" + integrity sha512-2s47yzUxdexf1OhyRi4Em83iQk0aPvwTddtFz4hnSSw9dCEsLEGf6SwIO8ss/19S9iBb5sJaOuTvTGDeZI00BQ== + +npm-conf@^1.1.3: + version "1.1.3" + resolved "https://registry.yarnpkg.com/npm-conf/-/npm-conf-1.1.3.tgz#256cc47bd0e218c259c4e9550bf413bc2192aff9" + integrity sha512-Yic4bZHJOt9RCFbRP3GgpqhScOY4HH3V2P8yBj6CeYq118Qr+BLXqT2JvpJ00mryLESpgOxf5XlFv4ZjXxLScw== + dependencies: + config-chain "^1.1.11" + pify "^3.0.0" + +npm-run-path@^2.0.0: + version "2.0.2" + resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-2.0.2.tgz#35a9232dfa35d7067b4cb2ddf2357b1871536c5f" + integrity sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8= + dependencies: + path-key "^2.0.0" + +npm-run-path@^4.0.0: + version "4.0.1" + resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-4.0.1.tgz#b7ecd1e5ed53da8e37a55e1c2269e0b97ed748ea" + integrity sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw== + dependencies: + path-key "^3.0.0" + +nwsapi@^2.2.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/nwsapi/-/nwsapi-2.2.0.tgz#204879a9e3d068ff2a55139c2c772780681a38b7" + integrity sha512-h2AatdwYH+JHiZpv7pt/gSX1XoRGb7L/qSIeuqA6GwYoF9w1vP1cw42TO0aI2pNyshRK5893hNSl+1//vHK7hQ== + +oauth-sign@~0.9.0: + version "0.9.0" + resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.9.0.tgz#47a7b016baa68b5fa0ecf3dee08a85c679ac6455" + integrity sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ== + +object-copy@^0.1.0: + version "0.1.0" + resolved "https://registry.yarnpkg.com/object-copy/-/object-copy-0.1.0.tgz#7e7d858b781bd7c991a41ba975ed3812754e998c" + integrity sha1-fn2Fi3gb18mRpBupde04EnVOmYw= + dependencies: + copy-descriptor "^0.1.0" + define-property "^0.2.5" + kind-of "^3.0.3" + +object-keys@^1.0.12: + version "1.1.1" + resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz#1c47f272df277f3b1daf061677d9c82e2322c60e" + integrity sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA== + +object-visit@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/object-visit/-/object-visit-1.0.1.tgz#f79c4493af0c5377b59fe39d395e41042dd045bb" + integrity sha1-95xEk68MU3e1n+OdOV5BBC3QRbs= + dependencies: + isobject "^3.0.0" + +object.pick@^1.3.0: + version "1.3.0" + resolved "https://registry.yarnpkg.com/object.pick/-/object.pick-1.3.0.tgz#87a10ac4c1694bd2e1cbf53591a66141fb5dd747" + integrity sha1-h6EKxMFpS9Lhy/U1kaZhQftd10c= + dependencies: + isobject "^3.0.1" + +once@^1.3.0, once@^1.3.1, once@^1.4.0: + version "1.4.0" + resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1" + integrity sha1-WDsap3WWHUsROsF9nFC6753Xa9E= + dependencies: + wrappy "1" + +onetime@^5.1.0: + version "5.1.2" + resolved "https://registry.yarnpkg.com/onetime/-/onetime-5.1.2.tgz#d0e96ebb56b07476df1dd9c4806e5237985ca45e" + integrity sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg== + dependencies: + mimic-fn "^2.1.0" + +optionator@^0.8.1: + version "0.8.3" + resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.8.3.tgz#84fa1d036fe9d3c7e21d99884b601167ec8fb495" + integrity sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA== + dependencies: + deep-is "~0.1.3" + fast-levenshtein "~2.0.6" + levn "~0.3.0" + prelude-ls "~1.1.2" + type-check "~0.3.2" + word-wrap "~1.2.3" + +optionator@^0.9.1: + version "0.9.1" + resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.9.1.tgz#4f236a6373dae0566a6d43e1326674f50c291499" + integrity sha512-74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw== + dependencies: + deep-is "^0.1.3" + fast-levenshtein "^2.0.6" + levn "^0.4.1" + prelude-ls "^1.2.1" + type-check "^0.4.0" + word-wrap "^1.2.3" + +p-cancelable@^1.0.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/p-cancelable/-/p-cancelable-1.1.0.tgz#d078d15a3af409220c886f1d9a0ca2e441ab26cc" + integrity sha512-s73XxOZ4zpt1edZYZzvhqFa6uvQc1vwUa0K0BdtIZgQMAJj9IbebH+JkgKZc9h+B05PKHLOTl4ajG1BmNrVZlw== + +p-each-series@^2.1.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/p-each-series/-/p-each-series-2.2.0.tgz#105ab0357ce72b202a8a8b94933672657b5e2a9a" + integrity sha512-ycIL2+1V32th+8scbpTvyHNaHe02z0sjgh91XXjAk+ZeXoPN4Z46DVUnzdso0aX4KckKw0FNNFHdjZ2UsZvxiA== + +p-finally@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/p-finally/-/p-finally-1.0.0.tgz#3fbcfb15b899a44123b34b6dcc18b724336a2cae" + integrity sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4= + +p-limit@^2.2.0: + version "2.3.0" + resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.3.0.tgz#3dd33c647a214fdfffd835933eb086da0dc21db1" + integrity sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w== + dependencies: + p-try "^2.0.0" + +p-locate@^4.1.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-4.1.0.tgz#a3428bb7088b3a60292f66919278b7c297ad4f07" + integrity sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A== + dependencies: + p-limit "^2.2.0" + +p-try@^2.0.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/p-try/-/p-try-2.2.0.tgz#cb2868540e313d61de58fafbe35ce9004d5540e6" + integrity sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ== + +package-json@^6.3.0: + version "6.5.0" + resolved "https://registry.yarnpkg.com/package-json/-/package-json-6.5.0.tgz#6feedaca35e75725876d0b0e64974697fed145b0" + integrity sha512-k3bdm2n25tkyxcjSKzB5x8kfVxlMdgsbPr0GkZcwHsLpba6cBjqCt1KlcChKEvxHIcTB1FVMuwoijZ26xex5MQ== + dependencies: + got "^9.6.0" + registry-auth-token "^4.0.0" + registry-url "^5.0.0" + semver "^6.2.0" + +parent-module@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/parent-module/-/parent-module-1.0.1.tgz#691d2709e78c79fae3a156622452d00762caaaa2" + integrity sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g== + dependencies: + callsites "^3.0.0" + +parse-json@^5.0.0: + version "5.1.0" + resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-5.1.0.tgz#f96088cdf24a8faa9aea9a009f2d9d942c999646" + integrity sha512-+mi/lmVVNKFNVyLXV31ERiy2CY5E1/F6QtJFEzoChPRwwngMNXRDQ9GJ5WdE2Z2P4AujsOi0/+2qHID68KwfIQ== + dependencies: + "@babel/code-frame" "^7.0.0" + error-ex "^1.3.1" + json-parse-even-better-errors "^2.3.0" + lines-and-columns "^1.1.6" + +parse5@5.1.1: + version "5.1.1" + resolved "https://registry.yarnpkg.com/parse5/-/parse5-5.1.1.tgz#f68e4e5ba1852ac2cadc00f4555fff6c2abb6178" + integrity sha512-ugq4DFI0Ptb+WWjAdOK16+u/nHfiIrcE+sh8kZMaM0WllQKLI9rOUq6c2b7cwPkXdzfQESqvoqK6ug7U/Yyzug== + +pascalcase@^0.1.1: + version "0.1.1" + resolved "https://registry.yarnpkg.com/pascalcase/-/pascalcase-0.1.1.tgz#b363e55e8006ca6fe21784d2db22bd15d7917f14" + integrity sha1-s2PlXoAGym/iF4TS2yK9FdeRfxQ= + +path-exists@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-4.0.0.tgz#513bdbe2d3b95d7762e8c1137efa195c6c61b5b3" + integrity sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w== + +path-is-absolute@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f" + integrity sha1-F0uSaHNVNP+8es5r9TpanhtcX18= + +path-key@^2.0.0, path-key@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/path-key/-/path-key-2.0.1.tgz#411cadb574c5a140d3a4b1910d40d80cc9f40b40" + integrity sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A= + +path-key@^3.0.0, path-key@^3.1.0: + version "3.1.1" + resolved "https://registry.yarnpkg.com/path-key/-/path-key-3.1.1.tgz#581f6ade658cbba65a0d3380de7753295054f375" + integrity sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q== + +path-parse@^1.0.6: + version "1.0.6" + resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.6.tgz#d62dbb5679405d72c4737ec58600e9ddcf06d24c" + integrity sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw== + +pend@~1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/pend/-/pend-1.2.0.tgz#7a57eb550a6783f9115331fcf4663d5c8e007a50" + integrity sha1-elfrVQpng/kRUzH89GY9XI4AelA= + +performance-now@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b" + integrity sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns= + +picomatch@^2.0.4, picomatch@^2.0.5: + version "2.2.2" + resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.2.2.tgz#21f333e9b6b8eaff02468f5146ea406d345f4dad" + integrity sha512-q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg== + +pify@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/pify/-/pify-3.0.0.tgz#e5a4acd2c101fdf3d9a4d07f0dbc4db49dd28176" + integrity sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY= + +pirates@^4.0.1: + version "4.0.1" + resolved "https://registry.yarnpkg.com/pirates/-/pirates-4.0.1.tgz#643a92caf894566f91b2b986d2c66950a8e2fb87" + integrity sha512-WuNqLTbMI3tmfef2TKxlQmAiLHKtFhlsCZnPIpuv2Ow0RDVO8lfy1Opf4NUzlMXLjPl+Men7AuVdX6TA+s+uGA== + dependencies: + node-modules-regexp "^1.0.0" + +pkg-dir@^4.2.0: + version "4.2.0" + resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-4.2.0.tgz#f099133df7ede422e81d1d8448270eeb3e4261f3" + integrity sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ== + dependencies: + find-up "^4.0.0" + +posix-character-classes@^0.1.0: + version "0.1.1" + resolved "https://registry.yarnpkg.com/posix-character-classes/-/posix-character-classes-0.1.1.tgz#01eac0fe3b5af71a2a6c02feabb8c1fef7e00eab" + integrity sha1-AerA/jta9xoqbAL+q7jB/vfgDqs= + +prelude-ls@^1.2.1: + version "1.2.1" + resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.2.1.tgz#debc6489d7a6e6b0e7611888cec880337d316396" + integrity sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g== + +prelude-ls@~1.1.2: + version "1.1.2" + resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54" + integrity sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ= + +prepend-http@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/prepend-http/-/prepend-http-2.0.0.tgz#e92434bfa5ea8c19f41cdfd401d741a3c819d897" + integrity sha1-6SQ0v6XqjBn0HN/UAddBo8gZ2Jc= + +pretty-format@^26.6.2: + version "26.6.2" + resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-26.6.2.tgz#e35c2705f14cb7fe2fe94fa078345b444120fc93" + integrity sha512-7AeGuCYNGmycyQbCqd/3PWH4eOoX/OiCa0uphp57NVTeAGdJGaAliecxwBDHYQCIvrW7aDBZCYeNTP/WX69mkg== + dependencies: + "@jest/types" "^26.6.2" + ansi-regex "^5.0.0" + ansi-styles "^4.0.0" + react-is "^17.0.1" + +printj@~1.1.0: + version "1.1.2" + resolved "https://registry.yarnpkg.com/printj/-/printj-1.1.2.tgz#d90deb2975a8b9f600fb3a1c94e3f4c53c78a222" + integrity sha512-zA2SmoLaxZyArQTOPj5LXecR+RagfPSU5Kw1qP+jkWeNlrq+eJZyY2oS68SU1Z/7/myXM4lo9716laOFAVStCQ== + +process-nextick-args@~2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz#7820d9b16120cc55ca9ae7792680ae7dba6d7fe2" + integrity sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag== + +progress@^2.0.0, progress@^2.0.3: + version "2.0.3" + resolved "https://registry.yarnpkg.com/progress/-/progress-2.0.3.tgz#7e8cf8d8f5b8f239c1bc68beb4eb78567d572ef8" + integrity sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA== + +prompts@^2.0.1: + version "2.4.0" + resolved "https://registry.yarnpkg.com/prompts/-/prompts-2.4.0.tgz#4aa5de0723a231d1ee9121c40fdf663df73f61d7" + integrity sha512-awZAKrk3vN6CroQukBL+R9051a4R3zCZBlJm/HBfrSZ8iTpYix3VX1vU4mveiLpiwmOJT4wokTF9m6HUk4KqWQ== + dependencies: + kleur "^3.0.3" + sisteransi "^1.0.5" + +proto-list@~1.2.1: + version "1.2.4" + resolved "https://registry.yarnpkg.com/proto-list/-/proto-list-1.2.4.tgz#212d5bfe1318306a420f6402b8e26ff39647a849" + integrity sha1-IS1b/hMYMGpCD2QCuOJv85ZHqEk= + +psl@^1.1.28: + version "1.8.0" + resolved "https://registry.yarnpkg.com/psl/-/psl-1.8.0.tgz#9326f8bcfb013adcc005fdff056acce020e51c24" + integrity sha512-RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ== + +pump@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/pump/-/pump-3.0.0.tgz#b4a2116815bde2f4e1ea602354e8c75565107a64" + integrity sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww== + dependencies: + end-of-stream "^1.1.0" + once "^1.3.1" + +punycode@^2.1.0, punycode@^2.1.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec" + integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A== + +pupa@^2.0.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/pupa/-/pupa-2.1.1.tgz#f5e8fd4afc2c5d97828faa523549ed8744a20d62" + integrity sha512-l1jNAspIBSFqbT+y+5FosojNpVpF94nlI+wDUpqP9enwOTfHx9f0gh5nB96vl+6yTpsJsypeNrwfzPrKuHB41A== + dependencies: + escape-goat "^2.0.0" + +qs@~6.5.2: + version "6.5.2" + resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.2.tgz#cb3ae806e8740444584ef154ce8ee98d403f3e36" + integrity sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA== + +rc@^1.2.8: + version "1.2.8" + resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.8.tgz#cd924bf5200a075b83c188cd6b9e211b7fc0d3ed" + integrity sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw== + dependencies: + deep-extend "^0.6.0" + ini "~1.3.0" + minimist "^1.2.0" + strip-json-comments "~2.0.1" + +react-is@^17.0.1: + version "17.0.1" + resolved "https://registry.yarnpkg.com/react-is/-/react-is-17.0.1.tgz#5b3531bd76a645a4c9fb6e693ed36419e3301339" + integrity sha512-NAnt2iGDXohE5LI7uBnLnqvLQMtzhkiAOLXTmv+qnF9Ky7xAPcX8Up/xWIhxvLVGJvuLiNc4xQLtuqDRzb4fSA== + +read-config-file@6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/read-config-file/-/read-config-file-6.0.0.tgz#224b5dca6a5bdc1fb19e63f89f342680efdb9299" + integrity sha512-PHjROSdpceKUmqS06wqwP92VrM46PZSTubmNIMJ5DrMwg1OgenSTSEHIkCa6TiOJ+y/J0xnG1fFwG3M+Oi1aNA== + dependencies: + dotenv "^8.2.0" + dotenv-expand "^5.1.0" + js-yaml "^3.13.1" + json5 "^2.1.2" + lazy-val "^1.0.4" + +read-pkg-up@^7.0.1: + version "7.0.1" + resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-7.0.1.tgz#f3a6135758459733ae2b95638056e1854e7ef507" + integrity sha512-zK0TB7Xd6JpCLmlLmufqykGE+/TlOePD6qKClNW7hHDKFh/J7/7gCWGR7joEQEW1bKq3a3yUZSObOoWLFQ4ohg== + dependencies: + find-up "^4.1.0" + read-pkg "^5.2.0" + type-fest "^0.8.1" + +read-pkg@^5.2.0: + version "5.2.0" + resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-5.2.0.tgz#7bf295438ca5a33e56cd30e053b34ee7250c93cc" + integrity sha512-Ug69mNOpfvKDAc2Q8DRpMjjzdtrnv9HcSMX+4VsZxD1aZ6ZzrIE7rlzXBtWTyhULSMKg076AW6WR5iZpD0JiOg== + dependencies: + "@types/normalize-package-data" "^2.4.0" + normalize-package-data "^2.5.0" + parse-json "^5.0.0" + type-fest "^0.6.0" + +readable-stream@^2.0.0, readable-stream@^2.0.5, readable-stream@^2.2.2: + version "2.3.7" + resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.7.tgz#1eca1cf711aef814c04f62252a36a62f6cb23b57" + integrity sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw== + dependencies: + core-util-is "~1.0.0" + inherits "~2.0.3" + isarray "~1.0.0" + process-nextick-args "~2.0.0" + safe-buffer "~5.1.1" + string_decoder "~1.1.1" + util-deprecate "~1.0.1" + +readable-stream@^3.1.1, readable-stream@^3.4.0, readable-stream@^3.6.0: + version "3.6.0" + resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.0.tgz#337bbda3adc0706bd3e024426a286d4b4b2c9198" + integrity sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA== + dependencies: + inherits "^2.0.3" + string_decoder "^1.1.1" + util-deprecate "^1.0.1" + +readdir-glob@^1.0.0: + version "1.1.1" + resolved "https://registry.yarnpkg.com/readdir-glob/-/readdir-glob-1.1.1.tgz#f0e10bb7bf7bfa7e0add8baffdc54c3f7dbee6c4" + integrity sha512-91/k1EzZwDx6HbERR+zucygRFfiPl2zkIYZtv3Jjr6Mn7SkKcVct8aVO+sSRiGMc6fLf72du3d92/uY63YPdEA== + dependencies: + minimatch "^3.0.4" + +regex-not@^1.0.0, regex-not@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/regex-not/-/regex-not-1.0.2.tgz#1f4ece27e00b0b65e0247a6810e6a85d83a5752c" + integrity sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A== + dependencies: + extend-shallow "^3.0.2" + safe-regex "^1.1.0" + +regexpp@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-3.1.0.tgz#206d0ad0a5648cffbdb8ae46438f3dc51c9f78e2" + integrity sha512-ZOIzd8yVsQQA7j8GCSlPGXwg5PfmA1mrq0JP4nGhh54LaKN3xdai/vHUDu74pKwV8OxseMS65u2NImosQcSD0Q== + +registry-auth-token@^4.0.0: + version "4.2.1" + resolved "https://registry.yarnpkg.com/registry-auth-token/-/registry-auth-token-4.2.1.tgz#6d7b4006441918972ccd5fedcd41dc322c79b250" + integrity sha512-6gkSb4U6aWJB4SF2ZvLb76yCBjcvufXBqvvEx1HbmKPkutswjW1xNVRY0+daljIYRbogN7O0etYSlbiaEQyMyw== + dependencies: + rc "^1.2.8" + +registry-url@^5.0.0: + version "5.1.0" + resolved "https://registry.yarnpkg.com/registry-url/-/registry-url-5.1.0.tgz#e98334b50d5434b81136b44ec638d9c2009c5009" + integrity sha512-8acYXXTI0AkQv6RAOjE3vOaIXZkT9wo4LOFbBKYQEEnnMNBpKqdUrI6S4NT0KPIo/WVvJ5tE/X5LF/TQUf0ekw== + dependencies: + rc "^1.2.8" + +remove-trailing-separator@^1.0.1: + version "1.1.0" + resolved "https://registry.yarnpkg.com/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz#c24bce2a283adad5bc3f58e0d48249b92379d8ef" + integrity sha1-wkvOKig62tW8P1jg1IJJuSN52O8= + +repeat-element@^1.1.2: + version "1.1.3" + resolved "https://registry.yarnpkg.com/repeat-element/-/repeat-element-1.1.3.tgz#782e0d825c0c5a3bb39731f84efee6b742e6b1ce" + integrity sha512-ahGq0ZnV5m5XtZLMb+vP76kcAM5nkLqk0lpqAuojSKGgQtn4eRi4ZZGm2olo2zKFH+sMsWaqOCW1dqAnOru72g== + +repeat-string@^1.6.1: + version "1.6.1" + resolved "https://registry.yarnpkg.com/repeat-string/-/repeat-string-1.6.1.tgz#8dcae470e1c88abc2d600fff4a776286da75e637" + integrity sha1-jcrkcOHIirwtYA//Sndihtp15jc= + +request-promise-core@1.1.4: + version "1.1.4" + resolved "https://registry.yarnpkg.com/request-promise-core/-/request-promise-core-1.1.4.tgz#3eedd4223208d419867b78ce815167d10593a22f" + integrity sha512-TTbAfBBRdWD7aNNOoVOBH4pN/KigV6LyapYNNlAPA8JwbovRti1E88m3sYAwsLi5ryhPKsE9APwnjFTgdUjTpw== + dependencies: + lodash "^4.17.19" + +request-promise-native@^1.0.8: + version "1.0.9" + resolved "https://registry.yarnpkg.com/request-promise-native/-/request-promise-native-1.0.9.tgz#e407120526a5efdc9a39b28a5679bf47b9d9dc28" + integrity sha512-wcW+sIUiWnKgNY0dqCpOZkUbF/I+YPi+f09JZIDa39Ec+q82CpSYniDp+ISgTTbKmnpJWASeJBPZmoxH84wt3g== + dependencies: + request-promise-core "1.1.4" + stealthy-require "^1.1.1" + tough-cookie "^2.3.3" + +request@^2.88.2: + version "2.88.2" + resolved "https://registry.yarnpkg.com/request/-/request-2.88.2.tgz#d73c918731cb5a87da047e207234146f664d12b3" + integrity sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw== + dependencies: + aws-sign2 "~0.7.0" + aws4 "^1.8.0" + caseless "~0.12.0" + combined-stream "~1.0.6" + extend "~3.0.2" + forever-agent "~0.6.1" + form-data "~2.3.2" + har-validator "~5.1.3" + http-signature "~1.2.0" + is-typedarray "~1.0.0" + isstream "~0.1.2" + json-stringify-safe "~5.0.1" + mime-types "~2.1.19" + oauth-sign "~0.9.0" + performance-now "^2.1.0" + qs "~6.5.2" + safe-buffer "^5.1.2" + tough-cookie "~2.5.0" + tunnel-agent "^0.6.0" + uuid "^3.3.2" + +require-directory@^2.1.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42" + integrity sha1-jGStX9MNqxyXbiNE/+f3kqam30I= + +require-main-filename@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-2.0.0.tgz#d0b329ecc7cc0f61649f62215be69af54aa8989b" + integrity sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg== + +resolve-cwd@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/resolve-cwd/-/resolve-cwd-3.0.0.tgz#0f0075f1bb2544766cf73ba6a6e2adfebcb13f2d" + integrity sha512-OrZaX2Mb+rJCpH/6CpSqt9xFVpN++x01XnN2ie9g6P5/3xelLAkXWVADpdz1IHD/KFfEXyE6V0U01OQ3UO2rEg== + dependencies: + resolve-from "^5.0.0" + +resolve-from@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-4.0.0.tgz#4abcd852ad32dd7baabfe9b40e00a36db5f392e6" + integrity sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g== + +resolve-from@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-5.0.0.tgz#c35225843df8f776df21c57557bc087e9dfdfc69" + integrity sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw== + +resolve-url@^0.2.1: + version "0.2.1" + resolved "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a" + integrity sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo= + +resolve@^1.10.0, resolve@^1.18.1: + version "1.19.0" + resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.19.0.tgz#1af5bf630409734a067cae29318aac7fa29a267c" + integrity sha512-rArEXAgsBG4UgRGcynxWIWKFvh/XZCcS8UJdHhwy91zwAvCZIbcs+vAbflgBnNjYMs/i/i+/Ux6IZhML1yPvxg== + dependencies: + is-core-module "^2.1.0" + path-parse "^1.0.6" + +responselike@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/responselike/-/responselike-1.0.2.tgz#918720ef3b631c5642be068f15ade5a46f4ba1e7" + integrity sha1-kYcg7ztjHFZCvgaPFa3lpG9Loec= + dependencies: + lowercase-keys "^1.0.0" + +ret@~0.1.10: + version "0.1.15" + resolved "https://registry.yarnpkg.com/ret/-/ret-0.1.15.tgz#b8a4825d5bdb1fc3f6f53c2bc33f81388681c7bc" + integrity sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg== + +rimraf@^3.0.0, rimraf@^3.0.2: + version "3.0.2" + resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.2.tgz#f1a5402ba6220ad52cc1282bac1ae3aa49fd061a" + integrity sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA== + dependencies: + glob "^7.1.3" + +roarr@^2.15.3: + version "2.15.4" + resolved "https://registry.yarnpkg.com/roarr/-/roarr-2.15.4.tgz#f5fe795b7b838ccfe35dc608e0282b9eba2e7afd" + integrity sha512-CHhPh+UNHD2GTXNYhPWLnU8ONHdI+5DI+4EYIAOaiD63rHeYlZvyh8P+in5999TTSFgUYuKUAjzRI4mdh/p+2A== + dependencies: + boolean "^3.0.1" + detect-node "^2.0.4" + globalthis "^1.0.1" + json-stringify-safe "^5.0.1" + semver-compare "^1.0.0" + sprintf-js "^1.1.2" + +rsvp@^4.8.4: + version "4.8.5" + resolved "https://registry.yarnpkg.com/rsvp/-/rsvp-4.8.5.tgz#c8f155311d167f68f21e168df71ec5b083113734" + integrity sha512-nfMOlASu9OnRJo1mbEk2cz0D56a1MBNrJ7orjRZQG10XDyuvwksKbuXNp6qa+kbn839HwjwhBzhFmdsaEAfauA== + +safe-buffer@^5.0.1, safe-buffer@^5.1.2, safe-buffer@~5.2.0: + version "5.2.1" + resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6" + integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ== + +safe-buffer@~5.1.0, safe-buffer@~5.1.1: + version "5.1.2" + resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d" + integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g== + +safe-regex@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/safe-regex/-/safe-regex-1.1.0.tgz#40a3669f3b077d1e943d44629e157dd48023bf2e" + integrity sha1-QKNmnzsHfR6UPURinhV91IAjvy4= + dependencies: + ret "~0.1.10" + +"safer-buffer@>= 2.1.2 < 3", "safer-buffer@>= 2.1.2 < 3.0.0", safer-buffer@^2.0.2, safer-buffer@^2.1.0, safer-buffer@~2.1.0: + version "2.1.2" + resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a" + integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg== + +sane@^4.0.3: + version "4.1.0" + resolved "https://registry.yarnpkg.com/sane/-/sane-4.1.0.tgz#ed881fd922733a6c461bc189dc2b6c006f3ffded" + integrity sha512-hhbzAgTIX8O7SHfp2c8/kREfEn4qO/9q8C9beyY6+tvZ87EpoZ3i1RIEvp27YBswnNbY9mWd6paKVmKbAgLfZA== + dependencies: + "@cnakazawa/watch" "^1.0.3" + anymatch "^2.0.0" + capture-exit "^2.0.0" + exec-sh "^0.3.2" + execa "^1.0.0" + fb-watchman "^2.0.0" + micromatch "^3.1.4" + minimist "^1.1.1" + walker "~1.0.5" + +sanitize-filename@^1.6.2, sanitize-filename@^1.6.3: + version "1.6.3" + resolved "https://registry.yarnpkg.com/sanitize-filename/-/sanitize-filename-1.6.3.tgz#755ebd752045931977e30b2025d340d7c9090378" + integrity sha512-y/52Mcy7aw3gRm7IrcGDFx/bCk4AhRh2eI9luHOQM86nZsqwiRkkq2GekHXBBD+SmPidc8i2PqtYZl+pWJ8Oeg== + dependencies: + truncate-utf8-bytes "^1.0.0" + +sax@^1.2.4: + version "1.2.4" + resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9" + integrity sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw== + +saxes@^5.0.0: + version "5.0.1" + resolved "https://registry.yarnpkg.com/saxes/-/saxes-5.0.1.tgz#eebab953fa3b7608dbe94e5dadb15c888fa6696d" + integrity sha512-5LBh1Tls8c9xgGjw3QrMwETmTMVk0oFgvrFSvWx62llR2hcEInrKNZ2GZCCuuy2lvWrdl5jhbpeqc5hRYKFOcw== + dependencies: + xmlchars "^2.2.0" + +semver-compare@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/semver-compare/-/semver-compare-1.0.0.tgz#0dee216a1c941ab37e9efb1788f6afc5ff5537fc" + integrity sha1-De4hahyUGrN+nvsXiPavxf9VN/w= + +semver-diff@^3.1.1: + version "3.1.1" + resolved "https://registry.yarnpkg.com/semver-diff/-/semver-diff-3.1.1.tgz#05f77ce59f325e00e2706afd67bb506ddb1ca32b" + integrity sha512-GX0Ix/CJcHyB8c4ykpHGIAvLyOwOobtM/8d+TQkAd81/bEjgPHrfba41Vpesr7jX/t8Uh+R3EX9eAS5be+jQYg== + dependencies: + semver "^6.3.0" + +"semver@2 || 3 || 4 || 5", semver@^5.4.1, semver@^5.5.0: + version "5.7.1" + resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7" + integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ== + +semver@^6.0.0, semver@^6.2.0, semver@^6.3.0: + version "6.3.0" + resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d" + integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw== + +semver@^7.2.1, semver@^7.3.2: + version "7.3.4" + resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.4.tgz#27aaa7d2e4ca76452f98d3add093a72c943edc97" + integrity sha512-tCfb2WLjqFAtXn4KEdxIhalnRtoKFN7nAwj0B3ZXCbQloV2tq5eDbcTmT68JJD3nRJq24/XgxtQKFIpQdtvmVw== + dependencies: + lru-cache "^6.0.0" + +serialize-error@^7.0.1: + version "7.0.1" + resolved "https://registry.yarnpkg.com/serialize-error/-/serialize-error-7.0.1.tgz#f1360b0447f61ffb483ec4157c737fab7d778e18" + integrity sha512-8I8TjW5KMOKsZQTvoxjuSIa7foAwPWGOts+6o7sgjz41/qMD9VQHEDxi6PBvK2l0MXUmqZyNpUK+T2tQaaElvw== + dependencies: + type-fest "^0.13.1" + +set-blocking@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7" + integrity sha1-BF+XgtARrppoA93TgrJDkrPYkPc= + +set-value@^2.0.0, set-value@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/set-value/-/set-value-2.0.1.tgz#a18d40530e6f07de4228c7defe4227af8cad005b" + integrity sha512-JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw== + dependencies: + extend-shallow "^2.0.1" + is-extendable "^0.1.1" + is-plain-object "^2.0.3" + split-string "^3.0.1" + +shebang-command@^1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-1.2.0.tgz#44aac65b695b03398968c39f363fee5deafdf1ea" + integrity sha1-RKrGW2lbAzmJaMOfNj/uXer98eo= + dependencies: + shebang-regex "^1.0.0" + +shebang-command@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-2.0.0.tgz#ccd0af4f8835fbdc265b82461aaf0c36663f34ea" + integrity sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA== + dependencies: + shebang-regex "^3.0.0" + +shebang-regex@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-1.0.0.tgz#da42f49740c0b42db2ca9728571cb190c98efea3" + integrity sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM= + +shebang-regex@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-3.0.0.tgz#ae16f1644d873ecad843b0307b143362d4c42172" + integrity sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A== + +shellwords@^0.1.1: + version "0.1.1" + resolved "https://registry.yarnpkg.com/shellwords/-/shellwords-0.1.1.tgz#d6b9181c1a48d397324c84871efbcfc73fc0654b" + integrity sha512-vFwSUfQvqybiICwZY5+DAWIPLKsWO31Q91JSKl3UYv+K5c2QRPzn0qzec6QPu1Qc9eHYItiP3NdJqNVqetYAww== + +signal-exit@^3.0.0, signal-exit@^3.0.2: + version "3.0.3" + resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.3.tgz#a1410c2edd8f077b08b4e253c8eacfcaf057461c" + integrity sha512-VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA== + +sisteransi@^1.0.5: + version "1.0.5" + resolved "https://registry.yarnpkg.com/sisteransi/-/sisteransi-1.0.5.tgz#134d681297756437cc05ca01370d3a7a571075ed" + integrity sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg== + +slash@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/slash/-/slash-3.0.0.tgz#6539be870c165adbd5240220dbe361f1bc4d4634" + integrity sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q== + +slice-ansi@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-2.1.0.tgz#cacd7693461a637a5788d92a7dd4fba068e81636" + integrity sha512-Qu+VC3EwYLldKa1fCxuuvULvSJOKEgk9pi8dZeCVK7TqBfUNTH4sFkk4joj8afVSfAYgJoSOetjx9QWOJ5mYoQ== + dependencies: + ansi-styles "^3.2.0" + astral-regex "^1.0.0" + is-fullwidth-code-point "^2.0.0" + +snapdragon-node@^2.0.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/snapdragon-node/-/snapdragon-node-2.1.1.tgz#6c175f86ff14bdb0724563e8f3c1b021a286853b" + integrity sha512-O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw== + dependencies: + define-property "^1.0.0" + isobject "^3.0.0" + snapdragon-util "^3.0.1" + +snapdragon-util@^3.0.1: + version "3.0.1" + resolved "https://registry.yarnpkg.com/snapdragon-util/-/snapdragon-util-3.0.1.tgz#f956479486f2acd79700693f6f7b805e45ab56e2" + integrity sha512-mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ== + dependencies: + kind-of "^3.2.0" + +snapdragon@^0.8.1: + version "0.8.2" + resolved "https://registry.yarnpkg.com/snapdragon/-/snapdragon-0.8.2.tgz#64922e7c565b0e14204ba1aa7d6964278d25182d" + integrity sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg== + dependencies: + base "^0.11.1" + debug "^2.2.0" + define-property "^0.2.5" + extend-shallow "^2.0.1" + map-cache "^0.2.2" + source-map "^0.5.6" + source-map-resolve "^0.5.0" + use "^3.1.0" + +source-map-resolve@^0.5.0: + version "0.5.3" + resolved "https://registry.yarnpkg.com/source-map-resolve/-/source-map-resolve-0.5.3.tgz#190866bece7553e1f8f267a2ee82c606b5509a1a" + integrity sha512-Htz+RnsXWk5+P2slx5Jh3Q66vhQj1Cllm0zvnaY98+NFx+Dv2CF/f5O/t8x+KaNdrdIAsruNzoh/KpialbqAnw== + dependencies: + atob "^2.1.2" + decode-uri-component "^0.2.0" + resolve-url "^0.2.1" + source-map-url "^0.4.0" + urix "^0.1.0" + +source-map-support@^0.5.19, source-map-support@^0.5.6: + version "0.5.19" + resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.19.tgz#a98b62f86dcaf4f67399648c085291ab9e8fed61" + integrity sha512-Wonm7zOCIJzBGQdB+thsPar0kYuCIzYvxZwlBa87yi/Mdjv7Tip2cyVbLj5o0cFPN4EVkuTwb3GDDyUx2DGnGw== + dependencies: + buffer-from "^1.0.0" + source-map "^0.6.0" + +source-map-url@^0.4.0: + version "0.4.0" + resolved "https://registry.yarnpkg.com/source-map-url/-/source-map-url-0.4.0.tgz#3e935d7ddd73631b97659956d55128e87b5084a3" + integrity sha1-PpNdfd1zYxuXZZlW1VEo6HtQhKM= + +source-map@^0.5.0, source-map@^0.5.6: + version "0.5.7" + resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc" + integrity sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w= + +source-map@^0.6.0, source-map@^0.6.1, source-map@~0.6.1: + version "0.6.1" + resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263" + integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g== + +source-map@^0.7.3: + version "0.7.3" + resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.7.3.tgz#5302f8169031735226544092e64981f751750383" + integrity sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ== + +spdx-correct@^3.0.0: + version "3.1.1" + resolved "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-3.1.1.tgz#dece81ac9c1e6713e5f7d1b6f17d468fa53d89a9" + integrity sha512-cOYcUWwhCuHCXi49RhFRCyJEK3iPj1Ziz9DpViV3tbZOwXD49QzIN3MpOLJNxh2qwq2lJJZaKMVw9qNi4jTC0w== + dependencies: + spdx-expression-parse "^3.0.0" + spdx-license-ids "^3.0.0" + +spdx-exceptions@^2.1.0: + version "2.3.0" + resolved "https://registry.yarnpkg.com/spdx-exceptions/-/spdx-exceptions-2.3.0.tgz#3f28ce1a77a00372683eade4a433183527a2163d" + integrity sha512-/tTrYOC7PPI1nUAgx34hUpqXuyJG+DTHJTnIULG4rDygi4xu/tfgmq1e1cIRwRzwZgo4NLySi+ricLkZkw4i5A== + +spdx-expression-parse@^3.0.0: + version "3.0.1" + resolved "https://registry.yarnpkg.com/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz#cf70f50482eefdc98e3ce0a6833e4a53ceeba679" + integrity sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q== + dependencies: + spdx-exceptions "^2.1.0" + spdx-license-ids "^3.0.0" + +spdx-license-ids@^3.0.0: + version "3.0.7" + resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.7.tgz#e9c18a410e5ed7e12442a549fbd8afa767038d65" + integrity sha512-U+MTEOO0AiDzxwFvoa4JVnMV6mZlJKk2sBLt90s7G0Gd0Mlknc7kxEn3nuDPNZRta7O2uy8oLcZLVT+4sqNZHQ== + +split-string@^3.0.1, split-string@^3.0.2: + version "3.1.0" + resolved "https://registry.yarnpkg.com/split-string/-/split-string-3.1.0.tgz#7cb09dda3a86585705c64b39a6466038682e8fe2" + integrity sha512-NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw== + dependencies: + extend-shallow "^3.0.0" + +sprintf-js@^1.1.2: + version "1.1.2" + resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.1.2.tgz#da1765262bf8c0f571749f2ad6c26300207ae673" + integrity sha512-VE0SOVEHCk7Qc8ulkWw3ntAzXuqf7S2lvwQaDLRnUeIEaKNQJzV6BwmLKhOqT61aGhfUMrXeaBk+oDGCzvhcug== + +sprintf-js@~1.0.2: + version "1.0.3" + resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c" + integrity sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw= + +sshpk@^1.7.0: + version "1.16.1" + resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.16.1.tgz#fb661c0bef29b39db40769ee39fa70093d6f6877" + integrity sha512-HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg== + dependencies: + asn1 "~0.2.3" + assert-plus "^1.0.0" + bcrypt-pbkdf "^1.0.0" + dashdash "^1.12.0" + ecc-jsbn "~0.1.1" + getpass "^0.1.1" + jsbn "~0.1.0" + safer-buffer "^2.0.2" + tweetnacl "~0.14.0" + +stack-utils@^2.0.2: + version "2.0.3" + resolved "https://registry.yarnpkg.com/stack-utils/-/stack-utils-2.0.3.tgz#cd5f030126ff116b78ccb3c027fe302713b61277" + integrity sha512-gL//fkxfWUsIlFL2Tl42Cl6+HFALEaB1FU76I/Fy+oZjRreP7OPMXFlGbxM7NQsI0ZpUfw76sHnv0WNYuTb7Iw== + dependencies: + escape-string-regexp "^2.0.0" + +stat-mode@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/stat-mode/-/stat-mode-1.0.0.tgz#68b55cb61ea639ff57136f36b216a291800d1465" + integrity sha512-jH9EhtKIjuXZ2cWxmXS8ZP80XyC3iasQxMDV8jzhNJpfDb7VbQLVW4Wvsxz9QZvzV+G4YoSfBUVKDOyxLzi/sg== + +static-extend@^0.1.1: + version "0.1.2" + resolved "https://registry.yarnpkg.com/static-extend/-/static-extend-0.1.2.tgz#60809c39cbff55337226fd5e0b520f341f1fb5c6" + integrity sha1-YICcOcv/VTNyJv1eC1IPNB8ftcY= + dependencies: + define-property "^0.2.5" + object-copy "^0.1.0" + +stealthy-require@^1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/stealthy-require/-/stealthy-require-1.1.1.tgz#35b09875b4ff49f26a777e509b3090a3226bf24b" + integrity sha1-NbCYdbT/SfJqd35QmzCQoyJr8ks= + +string-length@^4.0.1: + version "4.0.1" + resolved "https://registry.yarnpkg.com/string-length/-/string-length-4.0.1.tgz#4a973bf31ef77c4edbceadd6af2611996985f8a1" + integrity sha512-PKyXUd0LK0ePjSOnWn34V2uD6acUWev9uy0Ft05k0E8xRW+SKcA0F7eMr7h5xlzfn+4O3N+55rduYyet3Jk+jw== + dependencies: + char-regex "^1.0.2" + strip-ansi "^6.0.0" + +string-width@^3.0.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/string-width/-/string-width-3.1.0.tgz#22767be21b62af1081574306f69ac51b62203961" + integrity sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w== + dependencies: + emoji-regex "^7.0.1" + is-fullwidth-code-point "^2.0.0" + strip-ansi "^5.1.0" + +string-width@^4.0.0, string-width@^4.1.0, string-width@^4.2.0: + version "4.2.0" + resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.0.tgz#952182c46cc7b2c313d1596e623992bd163b72b5" + integrity sha512-zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg== + dependencies: + emoji-regex "^8.0.0" + is-fullwidth-code-point "^3.0.0" + strip-ansi "^6.0.0" + +string_decoder@^1.1.1: + version "1.3.0" + resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.3.0.tgz#42f114594a46cf1a8e30b0a84f56c78c3edac21e" + integrity sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA== + dependencies: + safe-buffer "~5.2.0" + +string_decoder@~1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz#9cf1611ba62685d7030ae9e4ba34149c3af03fc8" + integrity sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg== + dependencies: + safe-buffer "~5.1.0" + +strip-ansi@^5.1.0: + version "5.2.0" + resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-5.2.0.tgz#8c9a536feb6afc962bdfa5b104a5091c1ad9c0ae" + integrity sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA== + dependencies: + ansi-regex "^4.1.0" + +strip-ansi@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.0.tgz#0b1571dd7669ccd4f3e06e14ef1eed26225ae532" + integrity sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w== + dependencies: + ansi-regex "^5.0.0" + +strip-bom@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-4.0.0.tgz#9c3505c1db45bcedca3d9cf7a16f5c5aa3901878" + integrity sha512-3xurFv5tEgii33Zi8Jtp55wEIILR9eh34FAW00PZf+JnSsTmV/ioewSgQl97JHvgjoRGwPShsWm+IdrxB35d0w== + +strip-eof@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/strip-eof/-/strip-eof-1.0.0.tgz#bb43ff5598a6eb05d89b59fcd129c983313606bf" + integrity sha1-u0P/VZim6wXYm1n80SnJgzE2Br8= + +strip-final-newline@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/strip-final-newline/-/strip-final-newline-2.0.0.tgz#89b852fb2fcbe936f6f4b3187afb0a12c1ab58ad" + integrity sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA== + +strip-json-comments@^3.1.0, strip-json-comments@^3.1.1: + version "3.1.1" + resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.1.1.tgz#31f1281b3832630434831c310c01cccda8cbe006" + integrity sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig== + +strip-json-comments@~2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a" + integrity sha1-PFMZQukIwml8DsNEhYwobHygpgo= + +sumchecker@^3.0.1: + version "3.0.1" + resolved "https://registry.yarnpkg.com/sumchecker/-/sumchecker-3.0.1.tgz#6377e996795abb0b6d348e9b3e1dfb24345a8e42" + integrity sha512-MvjXzkz/BOfyVDkG0oFOtBxHX2u3gKbMHIF/dXblZsgD3BWOFLmHovIpZY7BykJdAjcqRCBi1WYBNdEC9yI7vg== + dependencies: + debug "^4.1.0" + +supports-color@^5.3.0: + version "5.5.0" + resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f" + integrity sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow== + dependencies: + has-flag "^3.0.0" + +supports-color@^7.0.0, supports-color@^7.1.0: + version "7.2.0" + resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-7.2.0.tgz#1b7dcdcb32b8138801b3e478ba6a51caa89648da" + integrity sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw== + dependencies: + has-flag "^4.0.0" + +supports-hyperlinks@^2.0.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/supports-hyperlinks/-/supports-hyperlinks-2.1.0.tgz#f663df252af5f37c5d49bbd7eeefa9e0b9e59e47" + integrity sha512-zoE5/e+dnEijk6ASB6/qrK+oYdm2do1hjoLWrqUC/8WEIW1gbxFcKuBof7sW8ArN6e+AYvsE8HBGiVRWL/F5CA== + dependencies: + has-flag "^4.0.0" + supports-color "^7.0.0" + +symbol-tree@^3.2.4: + version "3.2.4" + resolved "https://registry.yarnpkg.com/symbol-tree/-/symbol-tree-3.2.4.tgz#430637d248ba77e078883951fb9aa0eed7c63fa2" + integrity sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw== + +table@^5.2.3: + version "5.4.6" + resolved "https://registry.yarnpkg.com/table/-/table-5.4.6.tgz#1292d19500ce3f86053b05f0e8e7e4a3bb21079e" + integrity sha512-wmEc8m4fjnob4gt5riFRtTu/6+4rSe12TpAELNSqHMfF3IqnA+CH37USM6/YR3qRZv7e56kAEAtd6nKZaxe0Ug== + dependencies: + ajv "^6.10.2" + lodash "^4.17.14" + slice-ansi "^2.1.0" + string-width "^3.0.0" + +tar-stream@^2.1.4: + version "2.1.4" + resolved "https://registry.yarnpkg.com/tar-stream/-/tar-stream-2.1.4.tgz#c4fb1a11eb0da29b893a5b25476397ba2d053bfa" + integrity sha512-o3pS2zlG4gxr67GmFYBLlq+dM8gyRGUOvsrHclSkvtVtQbjV0s/+ZE8OpICbaj8clrX3tjeHngYGP7rweaBnuw== + dependencies: + bl "^4.0.3" + end-of-stream "^1.4.1" + fs-constants "^1.0.0" + inherits "^2.0.3" + readable-stream "^3.1.1" + +temp-file@^3.3.7: + version "3.3.7" + resolved "https://registry.yarnpkg.com/temp-file/-/temp-file-3.3.7.tgz#686885d635f872748e384e871855958470aeb18a" + integrity sha512-9tBJKt7GZAQt/Rg0QzVWA8Am8c1EFl+CAv04/aBVqlx5oyfQ508sFIABshQ0xbZu6mBrFLWIUXO/bbLYghW70g== + dependencies: + async-exit-hook "^2.0.1" + fs-extra "^8.1.0" + +term-size@^2.1.0: + version "2.2.1" + resolved "https://registry.yarnpkg.com/term-size/-/term-size-2.2.1.tgz#2a6a54840432c2fb6320fea0f415531e90189f54" + integrity sha512-wK0Ri4fOGjv/XPy8SBHZChl8CM7uMc5VML7SqiQ0zG7+J5Vr+RMQDoHa2CNT6KHUnTGIXH34UDMkPzAUyapBZg== + +terminal-link@^2.0.0: + version "2.1.1" + resolved "https://registry.yarnpkg.com/terminal-link/-/terminal-link-2.1.1.tgz#14a64a27ab3c0df933ea546fba55f2d078edc994" + integrity sha512-un0FmiRUQNr5PJqy9kP7c40F5BOfpGlYTrxonDChEZB7pzZxRNp/bt+ymiy9/npwXya9KH99nJ/GXFIiUkYGFQ== + dependencies: + ansi-escapes "^4.2.1" + supports-hyperlinks "^2.0.0" + +test-exclude@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/test-exclude/-/test-exclude-6.0.0.tgz#04a8698661d805ea6fa293b6cb9e63ac044ef15e" + integrity sha512-cAGWPIyOHU6zlmg88jwm7VRyXnMN7iV68OGAbYDk/Mh/xC/pzVPlQtY6ngoIH/5/tciuhGfvESU8GrHrcxD56w== + dependencies: + "@istanbuljs/schema" "^0.1.2" + glob "^7.1.4" + minimatch "^3.0.4" + +text-table@^0.2.0: + version "0.2.0" + resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4" + integrity sha1-f17oI66AUgfACvLfSoTsP8+lcLQ= + +throat@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/throat/-/throat-5.0.0.tgz#c5199235803aad18754a667d659b5e72ce16764b" + integrity sha512-fcwX4mndzpLQKBS1DVYhGAcYaYt7vsHNIvQV+WXMvnow5cgjPphq5CaayLaGsjRdSCKZFNGt7/GYAuXaNOiYCA== + +tldts-core@^5.6.64: + version "5.6.64" + resolved "https://registry.yarnpkg.com/tldts-core/-/tldts-core-5.6.64.tgz#0f80d0c9607d7583acc477a10dae7e62e7c08063" + integrity sha512-uzVHDyya5Qy7VtMaaWYdNxvBBp8PKhRMt6FrzB5lDJiFtUIma4JdxRCxGxbyOoJig1DOmqcQDjnH3+C2etvyaA== + +tldts-experimental@^5.6.21: + version "5.6.64" + resolved "https://registry.yarnpkg.com/tldts-experimental/-/tldts-experimental-5.6.64.tgz#f867449964d94c6a17a499335658f42a9fbdc7d3" + integrity sha512-PaA3Lau6l7PsxvMd9Ptocalu/K9RA3Ia5QovHTuLdJZfaJJNFrC3FEQpzYqxQ4bGqB7bpPeFXZDLisA/d4KWKg== + dependencies: + tldts-core "^5.6.64" + +tmpl@1.0.x: + version "1.0.4" + resolved "https://registry.yarnpkg.com/tmpl/-/tmpl-1.0.4.tgz#23640dd7b42d00433911140820e5cf440e521dd1" + integrity sha1-I2QN17QtAEM5ERQIIOXPRA5SHdE= + +to-fast-properties@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-2.0.0.tgz#dc5e698cbd079265bc73e0377681a4e4e83f616e" + integrity sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4= + +to-object-path@^0.3.0: + version "0.3.0" + resolved "https://registry.yarnpkg.com/to-object-path/-/to-object-path-0.3.0.tgz#297588b7b0e7e0ac08e04e672f85c1f4999e17af" + integrity sha1-KXWIt7Dn4KwI4E5nL4XB9JmeF68= + dependencies: + kind-of "^3.0.2" + +to-readable-stream@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/to-readable-stream/-/to-readable-stream-1.0.0.tgz#ce0aa0c2f3df6adf852efb404a783e77c0475771" + integrity sha512-Iq25XBt6zD5npPhlLVXGFN3/gyR2/qODcKNNyTMd4vbm39HUaOiAM4PMq0eMVC/Tkxz+Zjdsc55g9yyz+Yq00Q== + +to-regex-range@^2.1.0: + version "2.1.1" + resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-2.1.1.tgz#7c80c17b9dfebe599e27367e0d4dd5590141db38" + integrity sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg= + dependencies: + is-number "^3.0.0" + repeat-string "^1.6.1" + +to-regex-range@^5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-5.0.1.tgz#1648c44aae7c8d988a326018ed72f5b4dd0392e4" + integrity sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ== + dependencies: + is-number "^7.0.0" + +to-regex@^3.0.1, to-regex@^3.0.2: + version "3.0.2" + resolved "https://registry.yarnpkg.com/to-regex/-/to-regex-3.0.2.tgz#13cfdd9b336552f30b51f33a8ae1b42a7a7599ce" + integrity sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw== + dependencies: + define-property "^2.0.2" + extend-shallow "^3.0.2" + regex-not "^1.0.2" + safe-regex "^1.1.0" + +tough-cookie@^2.3.3, tough-cookie@~2.5.0: + version "2.5.0" + resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.5.0.tgz#cd9fb2a0aa1d5a12b473bd9fb96fa3dcff65ade2" + integrity sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g== + dependencies: + psl "^1.1.28" + punycode "^2.1.1" + +tough-cookie@^3.0.1: + version "3.0.1" + resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-3.0.1.tgz#9df4f57e739c26930a018184887f4adb7dca73b2" + integrity sha512-yQyJ0u4pZsv9D4clxO69OEjLWYw+jbgspjTue4lTQZLfV0c5l1VmK2y1JK8E9ahdpltPOaAThPcp5nKPUgSnsg== + dependencies: + ip-regex "^2.1.0" + psl "^1.1.28" + punycode "^2.1.1" + +tr46@^2.0.2: + version "2.0.2" + resolved "https://registry.yarnpkg.com/tr46/-/tr46-2.0.2.tgz#03273586def1595ae08fedb38d7733cee91d2479" + integrity sha512-3n1qG+/5kg+jrbTzwAykB5yRYtQCTqOGKq5U5PE3b0a1/mzo6snDhjGS0zJVJunO0NrT3Dg1MLy5TjWP/UJppg== + dependencies: + punycode "^2.1.1" + +truncate-utf8-bytes@^1.0.0: + version "1.0.2" + resolved "https://registry.yarnpkg.com/truncate-utf8-bytes/-/truncate-utf8-bytes-1.0.2.tgz#405923909592d56f78a5818434b0b78489ca5f2b" + integrity sha1-QFkjkJWS1W94pYGENLC3hInKXys= + dependencies: + utf8-byte-length "^1.0.1" + +tunnel-agent@^0.6.0: + version "0.6.0" + resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.6.0.tgz#27a5dea06b36b04a0a9966774b290868f0fc40fd" + integrity sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0= + dependencies: + safe-buffer "^5.0.1" + +tunnel@^0.0.6: + version "0.0.6" + resolved "https://registry.yarnpkg.com/tunnel/-/tunnel-0.0.6.tgz#72f1314b34a5b192db012324df2cc587ca47f92c" + integrity sha512-1h/Lnq9yajKY2PEbBadPXj3VxsDDu844OnaAo52UVmIzIvwwtBPIuNvkjuzBlTWpfJyUbG3ez0KSBibQkj4ojg== + +tweetnacl@^0.14.3, tweetnacl@~0.14.0: + version "0.14.5" + resolved "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-0.14.5.tgz#5ae68177f192d4456269d108afa93ff8743f4f64" + integrity sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q= + +type-check@^0.4.0, type-check@~0.4.0: + version "0.4.0" + resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.4.0.tgz#07b8203bfa7056c0657050e3ccd2c37730bab8f1" + integrity sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew== + dependencies: + prelude-ls "^1.2.1" + +type-check@~0.3.2: + version "0.3.2" + resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.3.2.tgz#5884cab512cf1d355e3fb784f30804b2b520db72" + integrity sha1-WITKtRLPHTVeP7eE8wgEsrUg23I= + dependencies: + prelude-ls "~1.1.2" + +type-detect@4.0.8: + version "4.0.8" + resolved "https://registry.yarnpkg.com/type-detect/-/type-detect-4.0.8.tgz#7646fb5f18871cfbb7749e69bd39a6388eb7450c" + integrity sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g== + +type-fest@^0.11.0: + version "0.11.0" + resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.11.0.tgz#97abf0872310fed88a5c466b25681576145e33f1" + integrity sha512-OdjXJxnCN1AvyLSzeKIgXTXxV+99ZuXl3Hpo9XpJAv9MBcHrrJOQ5kV7ypXOuQie+AmWG25hLbiKdwYTifzcfQ== + +type-fest@^0.13.1: + version "0.13.1" + resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.13.1.tgz#0172cb5bce80b0bd542ea348db50c7e21834d934" + integrity sha512-34R7HTnG0XIJcBSn5XhDd7nNFPRcXYRZrBB2O2jdKqYODldSzBAqzsWoZYYvduky73toYS/ESqxPvkDf/F0XMg== + +type-fest@^0.6.0: + version "0.6.0" + resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.6.0.tgz#8d2a2370d3df886eb5c90ada1c5bf6188acf838b" + integrity sha512-q+MB8nYR1KDLrgr4G5yemftpMC7/QLqVndBmEEdqzmNj5dcFOO4Oo8qlwZE3ULT3+Zim1F8Kq4cBnikNhlCMlg== + +type-fest@^0.8.1: + version "0.8.1" + resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.8.1.tgz#09e249ebde851d3b1e48d27c105444667f17b83d" + integrity sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA== + +typedarray-to-buffer@^3.1.5: + version "3.1.5" + resolved "https://registry.yarnpkg.com/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz#a97ee7a9ff42691b9f783ff1bc5112fe3fca9080" + integrity sha512-zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q== + dependencies: + is-typedarray "^1.0.0" + +typedarray@^0.0.6: + version "0.0.6" + resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777" + integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c= + +union-value@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/union-value/-/union-value-1.0.1.tgz#0b6fe7b835aecda61c6ea4d4f02c14221e109847" + integrity sha512-tJfXmxMeWYnczCVs7XAEvIV7ieppALdyepWMkHkwciRpZraG/xwT+s2JN8+pr1+8jCRf80FFzvr+MpQeeoF4Xg== + dependencies: + arr-union "^3.1.0" + get-value "^2.0.6" + is-extendable "^0.1.1" + set-value "^2.0.1" + +unique-string@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/unique-string/-/unique-string-2.0.0.tgz#39c6451f81afb2749de2b233e3f7c5e8843bd89d" + integrity sha512-uNaeirEPvpZWSgzwsPGtU2zVSTrn/8L5q/IexZmH0eH6SA73CmAA5U4GwORTxQAZs95TAXLNqeLoPPNO5gZfWg== + dependencies: + crypto-random-string "^2.0.0" + +universalify@^0.1.0: + version "0.1.2" + resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz#b646f69be3942dabcecc9d6639c80dc105efaa66" + integrity sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg== + +universalify@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/universalify/-/universalify-1.0.0.tgz#b61a1da173e8435b2fe3c67d29b9adf8594bd16d" + integrity sha512-rb6X1W158d7pRQBg5gkR8uPaSfiids68LTJQYOtEUhoJUWBdaQHsuT/EUduxXYxcrt4r5PJ4fuHW1MHT6p0qug== + +universalify@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/universalify/-/universalify-2.0.0.tgz#75a4984efedc4b08975c5aeb73f530d02df25717" + integrity sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ== + +unset-value@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/unset-value/-/unset-value-1.0.0.tgz#8376873f7d2335179ffb1e6fc3a8ed0dfc8ab559" + integrity sha1-g3aHP30jNRef+x5vw6jtDfyKtVk= + dependencies: + has-value "^0.3.1" + isobject "^3.0.0" + +update-notifier@^4.1.1: + version "4.1.3" + resolved "https://registry.yarnpkg.com/update-notifier/-/update-notifier-4.1.3.tgz#be86ee13e8ce48fb50043ff72057b5bd598e1ea3" + integrity sha512-Yld6Z0RyCYGB6ckIjffGOSOmHXj1gMeE7aROz4MG+XMkmixBX4jUngrGXNYz7wPKBmtoD4MnBa2Anu7RSKht/A== + dependencies: + boxen "^4.2.0" + chalk "^3.0.0" + configstore "^5.0.1" + has-yarn "^2.1.0" + import-lazy "^2.1.0" + is-ci "^2.0.0" + is-installed-globally "^0.3.1" + is-npm "^4.0.0" + is-yarn-global "^0.3.0" + latest-version "^5.0.0" + pupa "^2.0.1" + semver-diff "^3.1.1" + xdg-basedir "^4.0.0" + +uri-js@^4.2.2: + version "4.4.0" + resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.4.0.tgz#aa714261de793e8a82347a7bcc9ce74e86f28602" + integrity sha512-B0yRTzYdUCCn9n+F4+Gh4yIDtMQcaJsmYBDsTSG8g/OejKBodLQ2IHfN3bM7jUsRXndopT7OIXWdYqc1fjmV6g== + dependencies: + punycode "^2.1.0" + +urix@^0.1.0: + version "0.1.0" + resolved "https://registry.yarnpkg.com/urix/-/urix-0.1.0.tgz#da937f7a62e21fec1fd18d49b35c2935067a6c72" + integrity sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI= + +url-parse-lax@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/url-parse-lax/-/url-parse-lax-3.0.0.tgz#16b5cafc07dbe3676c1b1999177823d6503acb0c" + integrity sha1-FrXK/Afb42dsGxmZF3gj1lA6yww= + dependencies: + prepend-http "^2.0.0" + +use@^3.1.0: + version "3.1.1" + resolved "https://registry.yarnpkg.com/use/-/use-3.1.1.tgz#d50c8cac79a19fbc20f2911f56eb973f4e10070f" + integrity sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ== + +utf8-byte-length@^1.0.1: + version "1.0.4" + resolved "https://registry.yarnpkg.com/utf8-byte-length/-/utf8-byte-length-1.0.4.tgz#f45f150c4c66eee968186505ab93fcbb8ad6bf61" + integrity sha1-9F8VDExm7uloGGUFq5P8u4rWv2E= + +util-deprecate@^1.0.1, util-deprecate@~1.0.1: + version "1.0.2" + resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf" + integrity sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8= + +uuid@^3.3.2: + version "3.4.0" + resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.4.0.tgz#b23e4358afa8a202fe7a100af1f5f883f02007ee" + integrity sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A== + +uuid@^8.3.0: + version "8.3.2" + resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.2.tgz#80d5b5ced271bb9af6c445f21a1a04c606cefbe2" + integrity sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg== + +v8-compile-cache@^2.0.3: + version "2.2.0" + resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.2.0.tgz#9471efa3ef9128d2f7c6a7ca39c4dd6b5055b132" + integrity sha512-gTpR5XQNKFwOd4clxfnhaqvfqMpqEwr4tOtCyz4MtYZX2JYhfr1JvBFKdS+7K/9rfpZR3VLX+YWBbKoxCgS43Q== + +v8-to-istanbul@^7.0.0: + version "7.0.0" + resolved "https://registry.yarnpkg.com/v8-to-istanbul/-/v8-to-istanbul-7.0.0.tgz#b4fe00e35649ef7785a9b7fcebcea05f37c332fc" + integrity sha512-fLL2rFuQpMtm9r8hrAV2apXX/WqHJ6+IC4/eQVdMDGBUgH/YMV4Gv3duk3kjmyg6uiQWBAA9nJwue4iJUOkHeA== + dependencies: + "@types/istanbul-lib-coverage" "^2.0.1" + convert-source-map "^1.6.0" + source-map "^0.7.3" + +validate-npm-package-license@^3.0.1: + version "3.0.4" + resolved "https://registry.yarnpkg.com/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz#fc91f6b9c7ba15c857f4cb2c5defeec39d4f410a" + integrity sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew== + dependencies: + spdx-correct "^3.0.0" + spdx-expression-parse "^3.0.0" + +verror@1.10.0: + version "1.10.0" + resolved "https://registry.yarnpkg.com/verror/-/verror-1.10.0.tgz#3a105ca17053af55d6e270c1f8288682e18da400" + integrity sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA= + dependencies: + assert-plus "^1.0.0" + core-util-is "1.0.2" + extsprintf "^1.2.0" + +w3c-hr-time@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/w3c-hr-time/-/w3c-hr-time-1.0.2.tgz#0a89cdf5cc15822df9c360543676963e0cc308cd" + integrity sha512-z8P5DvDNjKDoFIHK7q8r8lackT6l+jo/Ye3HOle7l9nICP9lf1Ci25fy9vHd0JOWewkIFzXIEig3TdKT7JQ5fQ== + dependencies: + browser-process-hrtime "^1.0.0" + +w3c-xmlserializer@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/w3c-xmlserializer/-/w3c-xmlserializer-2.0.0.tgz#3e7104a05b75146cc60f564380b7f683acf1020a" + integrity sha512-4tzD0mF8iSiMiNs30BiLO3EpfGLZUT2MSX/G+o7ZywDzliWQ3OPtTZ0PTC3B3ca1UAf4cJMHB+2Bf56EriJuRA== + dependencies: + xml-name-validator "^3.0.0" + +walker@^1.0.7, walker@~1.0.5: + version "1.0.7" + resolved "https://registry.yarnpkg.com/walker/-/walker-1.0.7.tgz#2f7f9b8fd10d677262b18a884e28d19618e028fb" + integrity sha1-L3+bj9ENZ3JisYqITijRlhjgKPs= + dependencies: + makeerror "1.0.x" + +webidl-conversions@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-5.0.0.tgz#ae59c8a00b121543a2acc65c0434f57b0fc11aff" + integrity sha512-VlZwKPCkYKxQgeSbH5EyngOmRp7Ww7I9rQLERETtf5ofd9pGeswWiOtogpEO850jziPRarreGxn5QIiTqpb2wA== + +webidl-conversions@^6.1.0: + version "6.1.0" + resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-6.1.0.tgz#9111b4d7ea80acd40f5270d666621afa78b69514" + integrity sha512-qBIvFLGiBpLjfwmYAaHPXsn+ho5xZnGvyGvsarywGNc8VyQJUMHJ8OBKGGrPER0okBeMDaan4mNBlgBROxuI8w== + +whatwg-encoding@^1.0.5: + version "1.0.5" + resolved "https://registry.yarnpkg.com/whatwg-encoding/-/whatwg-encoding-1.0.5.tgz#5abacf777c32166a51d085d6b4f3e7d27113ddb0" + integrity sha512-b5lim54JOPN9HtzvK9HFXvBma/rnfFeqsic0hSpjtDbVxR3dJKLc+KB4V6GgiGOvl7CY/KNh8rxSo9DKQrnUEw== + dependencies: + iconv-lite "0.4.24" + +whatwg-mimetype@^2.3.0: + version "2.3.0" + resolved "https://registry.yarnpkg.com/whatwg-mimetype/-/whatwg-mimetype-2.3.0.tgz#3d4b1e0312d2079879f826aff18dbeeca5960fbf" + integrity sha512-M4yMwr6mAnQz76TbJm914+gPpB/nCwvZbJU28cUD6dR004SAxDLOOSUaB1JDRqLtaOV/vi0IC5lEAGFgrjGv/g== + +whatwg-url@^8.0.0: + version "8.4.0" + resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-8.4.0.tgz#50fb9615b05469591d2b2bd6dfaed2942ed72837" + integrity sha512-vwTUFf6V4zhcPkWp/4CQPr1TW9Ml6SF4lVyaIMBdJw5i6qUUJ1QWM4Z6YYVkfka0OUIzVo/0aNtGVGk256IKWw== + dependencies: + lodash.sortby "^4.7.0" + tr46 "^2.0.2" + webidl-conversions "^6.1.0" + +which-module@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.0.tgz#d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a" + integrity sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho= + +which@^1.2.9: + version "1.3.1" + resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a" + integrity sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ== + dependencies: + isexe "^2.0.0" + +which@^2.0.1, which@^2.0.2: + version "2.0.2" + resolved "https://registry.yarnpkg.com/which/-/which-2.0.2.tgz#7c6a8dd0a636a0327e10b59c9286eee93f3f51b1" + integrity sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA== + dependencies: + isexe "^2.0.0" + +widest-line@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/widest-line/-/widest-line-3.1.0.tgz#8292333bbf66cb45ff0de1603b136b7ae1496eca" + integrity sha512-NsmoXalsWVDMGupxZ5R08ka9flZjjiLvHVAWYOKtiKM8ujtZWr9cRffak+uSE48+Ob8ObalXpwyeUiyDD6QFgg== + dependencies: + string-width "^4.0.0" + +word-wrap@^1.2.3, word-wrap@~1.2.3: + version "1.2.3" + resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.3.tgz#610636f6b1f703891bd34771ccb17fb93b47079c" + integrity sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ== + +wrap-ansi@^6.2.0: + version "6.2.0" + resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-6.2.0.tgz#e9393ba07102e6c91a3b221478f0257cd2856e53" + integrity sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA== + dependencies: + ansi-styles "^4.0.0" + string-width "^4.1.0" + strip-ansi "^6.0.0" + +wrap-ansi@^7.0.0: + version "7.0.0" + resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43" + integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q== + dependencies: + ansi-styles "^4.0.0" + string-width "^4.1.0" + strip-ansi "^6.0.0" + +wrappy@1: + version "1.0.2" + resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f" + integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8= + +write-file-atomic@^3.0.0: + version "3.0.3" + resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-3.0.3.tgz#56bd5c5a5c70481cd19c571bd39ab965a5de56e8" + integrity sha512-AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q== + dependencies: + imurmurhash "^0.1.4" + is-typedarray "^1.0.0" + signal-exit "^3.0.2" + typedarray-to-buffer "^3.1.5" + +ws@^7.2.3: + version "7.4.1" + resolved "https://registry.yarnpkg.com/ws/-/ws-7.4.1.tgz#a333be02696bd0e54cea0434e21dcc8a9ac294bb" + integrity sha512-pTsP8UAfhy3sk1lSk/O/s4tjD0CRwvMnzvwr4OKGX7ZvqZtUyx4KIJB5JWbkykPoc55tixMGgTNoh3k4FkNGFQ== + +xdg-basedir@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/xdg-basedir/-/xdg-basedir-4.0.0.tgz#4bc8d9984403696225ef83a1573cbbcb4e79db13" + integrity sha512-PSNhEJDejZYV7h50BohL09Er9VaIefr2LMAf3OEmpCkjOi34eYyQYAXUTjEQtZJTKcF0E2UKTh+osDLsgNim9Q== + +xml-name-validator@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/xml-name-validator/-/xml-name-validator-3.0.0.tgz#6ae73e06de4d8c6e47f9fb181f78d648ad457c6a" + integrity sha512-A5CUptxDsvxKJEU3yO6DuWBSJz/qizqzJKOMIfUJHETbBw/sFaDxgd6fxm1ewUaM0jZ444Fc5vC5ROYurg/4Pw== + +xmlchars@^2.2.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/xmlchars/-/xmlchars-2.2.0.tgz#060fe1bcb7f9c76fe2a17db86a9bc3ab894210cb" + integrity sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw== + +y18n@^4.0.0: + version "4.0.1" + resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.1.tgz#8db2b83c31c5d75099bb890b23f3094891e247d4" + integrity sha512-wNcy4NvjMYL8gogWWYAO7ZFWFfHcbdbE57tZO8e4cbpj8tfUcwrwqSl3ad8HxpYWCdXcJUCeKKZS62Av1affwQ== + +y18n@^5.0.5: + version "5.0.5" + resolved "https://registry.yarnpkg.com/y18n/-/y18n-5.0.5.tgz#8769ec08d03b1ea2df2500acef561743bbb9ab18" + integrity sha512-hsRUr4FFrvhhRH12wOdfs38Gy7k2FFzB9qgN9v3aLykRq0dRcdcpz5C9FxdS2NuhOrI/628b/KSTJ3rwHysYSg== + +yallist@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72" + integrity sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A== + +yargs-parser@^18.1.2: + version "18.1.3" + resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-18.1.3.tgz#be68c4975c6b2abf469236b0c870362fab09a7b0" + integrity sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ== + dependencies: + camelcase "^5.0.0" + decamelize "^1.2.0" + +yargs-parser@^20.2.2: + version "20.2.4" + resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.4.tgz#b42890f14566796f85ae8e3a25290d205f154a54" + integrity sha512-WOkpgNhPTlE73h4VFAFsOnomJVaovO8VqLDzy5saChRBFQFBoMYirowyW+Q9HB4HFF4Z7VZTiG3iSzJJA29yRA== + +yargs@^15.4.1: + version "15.4.1" + resolved "https://registry.yarnpkg.com/yargs/-/yargs-15.4.1.tgz#0d87a16de01aee9d8bec2bfbf74f67851730f4f8" + integrity sha512-aePbxDmcYW++PaqBsJ+HYUFwCdv4LVvdnhBy78E57PIor8/OVvhMrADFFEDh8DHDFRv/O9i3lPhsENjO7QX0+A== + dependencies: + cliui "^6.0.0" + decamelize "^1.2.0" + find-up "^4.1.0" + get-caller-file "^2.0.1" + require-directory "^2.1.1" + require-main-filename "^2.0.0" + set-blocking "^2.0.0" + string-width "^4.2.0" + which-module "^2.0.0" + y18n "^4.0.0" + yargs-parser "^18.1.2" + +yargs@^16.0.3: + version "16.2.0" + resolved "https://registry.yarnpkg.com/yargs/-/yargs-16.2.0.tgz#1c82bf0f6b6a66eafce7ef30e376f49a12477f66" + integrity sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw== + dependencies: + cliui "^7.0.2" + escalade "^3.1.1" + get-caller-file "^2.0.5" + require-directory "^2.1.1" + string-width "^4.2.0" + y18n "^5.0.5" + yargs-parser "^20.2.2" + +yauzl@^2.10.0: + version "2.10.0" + resolved "https://registry.yarnpkg.com/yauzl/-/yauzl-2.10.0.tgz#c7eb17c93e112cb1086fa6d8e51fb0667b79a5f9" + integrity sha1-x+sXyT4RLLEIb6bY5R+wZnt5pfk= + dependencies: + buffer-crc32 "~0.2.3" + fd-slicer "~1.1.0" + +zip-stream@^4.0.4: + version "4.0.4" + resolved "https://registry.yarnpkg.com/zip-stream/-/zip-stream-4.0.4.tgz#3a8f100b73afaa7d1ae9338d910b321dec77ff3a" + integrity sha512-a65wQ3h5gcQ/nQGWV1mSZCEzCML6EK/vyVPcrPNynySP1j3VBbQKh3nhC8CbORb+jfl2vXvh56Ul5odP1bAHqw== + dependencies: + archiver-utils "^2.1.0" + compress-commons "^4.0.2" + readable-stream "^3.6.0" diff --git a/pkgs/applications/networking/browsers/vieb/yarn.nix b/pkgs/applications/networking/browsers/vieb/yarn.nix new file mode 100644 index 0000000000000..6f92c3a385cfa --- /dev/null +++ b/pkgs/applications/networking/browsers/vieb/yarn.nix @@ -0,0 +1,5653 @@ +{ fetchurl, fetchgit, linkFarm, runCommandNoCC, gnutar }: rec { + offline_cache = linkFarm "offline" packages; + packages = [ + { + name = "7zip_bin___7zip_bin_5.0.3.tgz"; + path = fetchurl { + name = "7zip_bin___7zip_bin_5.0.3.tgz"; + url = "https://registry.yarnpkg.com/7zip-bin/-/7zip-bin-5.0.3.tgz"; + sha1 = "bc5b5532ecafd923a61f2fb097e3b108c0106a3f"; + }; + } + { + name = "_babel_code_frame___code_frame_7.10.4.tgz"; + path = fetchurl { + name = "_babel_code_frame___code_frame_7.10.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.10.4.tgz"; + sha1 = "168da1a36e90da68ae8d49c0f1b48c7c6249213a"; + }; + } + { + name = "_babel_core___core_7.12.10.tgz"; + path = fetchurl { + name = "_babel_core___core_7.12.10.tgz"; + url = "https://registry.yarnpkg.com/@babel/core/-/core-7.12.10.tgz"; + sha1 = "b79a2e1b9f70ed3d84bbfb6d8c4ef825f606bccd"; + }; + } + { + name = "_babel_generator___generator_7.12.10.tgz"; + path = fetchurl { + name = "_babel_generator___generator_7.12.10.tgz"; + url = "https://registry.yarnpkg.com/@babel/generator/-/generator-7.12.10.tgz"; + sha1 = "2b188fc329fb8e4f762181703beffc0fe6df3460"; + }; + } + { + name = "_babel_helper_function_name___helper_function_name_7.10.4.tgz"; + path = fetchurl { + name = "_babel_helper_function_name___helper_function_name_7.10.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.10.4.tgz"; + sha1 = "d2d3b20c59ad8c47112fa7d2a94bc09d5ef82f1a"; + }; + } + { + name = "_babel_helper_get_function_arity___helper_get_function_arity_7.12.10.tgz"; + path = fetchurl { + name = "_babel_helper_get_function_arity___helper_get_function_arity_7.12.10.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.12.10.tgz"; + sha1 = "b158817a3165b5faa2047825dfa61970ddcc16cf"; + }; + } + { + name = "_babel_helper_member_expression_to_functions___helper_member_expression_to_functions_7.12.7.tgz"; + path = fetchurl { + name = "_babel_helper_member_expression_to_functions___helper_member_expression_to_functions_7.12.7.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.12.7.tgz"; + sha1 = "aa77bd0396ec8114e5e30787efa78599d874a855"; + }; + } + { + name = "_babel_helper_module_imports___helper_module_imports_7.12.5.tgz"; + path = fetchurl { + name = "_babel_helper_module_imports___helper_module_imports_7.12.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.12.5.tgz"; + sha1 = "1bfc0229f794988f76ed0a4d4e90860850b54dfb"; + }; + } + { + name = "_babel_helper_module_transforms___helper_module_transforms_7.12.1.tgz"; + path = fetchurl { + name = "_babel_helper_module_transforms___helper_module_transforms_7.12.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.12.1.tgz"; + sha1 = "7954fec71f5b32c48e4b303b437c34453fd7247c"; + }; + } + { + name = "_babel_helper_optimise_call_expression___helper_optimise_call_expression_7.12.10.tgz"; + path = fetchurl { + name = "_babel_helper_optimise_call_expression___helper_optimise_call_expression_7.12.10.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.12.10.tgz"; + sha1 = "94ca4e306ee11a7dd6e9f42823e2ac6b49881e2d"; + }; + } + { + name = "_babel_helper_plugin_utils___helper_plugin_utils_7.10.4.tgz"; + path = fetchurl { + name = "_babel_helper_plugin_utils___helper_plugin_utils_7.10.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.4.tgz"; + sha1 = "2f75a831269d4f677de49986dff59927533cf375"; + }; + } + { + name = "_babel_helper_replace_supers___helper_replace_supers_7.12.5.tgz"; + path = fetchurl { + name = "_babel_helper_replace_supers___helper_replace_supers_7.12.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.12.5.tgz"; + sha1 = "f009a17543bbbbce16b06206ae73b63d3fca68d9"; + }; + } + { + name = "_babel_helper_simple_access___helper_simple_access_7.12.1.tgz"; + path = fetchurl { + name = "_babel_helper_simple_access___helper_simple_access_7.12.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.12.1.tgz"; + sha1 = "32427e5aa61547d38eb1e6eaf5fd1426fdad9136"; + }; + } + { + name = "_babel_helper_skip_transparent_expression_wrappers___helper_skip_transparent_expression_wrappers_7.12.1.tgz"; + path = fetchurl { + name = "_babel_helper_skip_transparent_expression_wrappers___helper_skip_transparent_expression_wrappers_7.12.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.12.1.tgz"; + sha1 = "462dc63a7e435ade8468385c63d2b84cce4b3cbf"; + }; + } + { + name = "_babel_helper_split_export_declaration___helper_split_export_declaration_7.11.0.tgz"; + path = fetchurl { + name = "_babel_helper_split_export_declaration___helper_split_export_declaration_7.11.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.11.0.tgz"; + sha1 = "f8a491244acf6a676158ac42072911ba83ad099f"; + }; + } + { + name = "_babel_helper_validator_identifier___helper_validator_identifier_7.10.4.tgz"; + path = fetchurl { + name = "_babel_helper_validator_identifier___helper_validator_identifier_7.10.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.4.tgz"; + sha1 = "a78c7a7251e01f616512d31b10adcf52ada5e0d2"; + }; + } + { + name = "_babel_helpers___helpers_7.12.5.tgz"; + path = fetchurl { + name = "_babel_helpers___helpers_7.12.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.12.5.tgz"; + sha1 = "1a1ba4a768d9b58310eda516c449913fe647116e"; + }; + } + { + name = "_babel_highlight___highlight_7.10.4.tgz"; + path = fetchurl { + name = "_babel_highlight___highlight_7.10.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.10.4.tgz"; + sha1 = "7d1bdfd65753538fabe6c38596cdb76d9ac60143"; + }; + } + { + name = "_babel_parser___parser_7.12.10.tgz"; + path = fetchurl { + name = "_babel_parser___parser_7.12.10.tgz"; + url = "https://registry.yarnpkg.com/@babel/parser/-/parser-7.12.10.tgz"; + sha1 = "824600d59e96aea26a5a2af5a9d812af05c3ae81"; + }; + } + { + name = "_babel_plugin_proposal_optional_chaining___plugin_proposal_optional_chaining_7.12.7.tgz"; + path = fetchurl { + name = "_babel_plugin_proposal_optional_chaining___plugin_proposal_optional_chaining_7.12.7.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.12.7.tgz"; + sha1 = "e02f0ea1b5dc59d401ec16fb824679f683d3303c"; + }; + } + { + name = "_babel_plugin_syntax_async_generators___plugin_syntax_async_generators_7.8.4.tgz"; + path = fetchurl { + name = "_babel_plugin_syntax_async_generators___plugin_syntax_async_generators_7.8.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz"; + sha1 = "a983fb1aeb2ec3f6ed042a210f640e90e786fe0d"; + }; + } + { + name = "_babel_plugin_syntax_bigint___plugin_syntax_bigint_7.8.3.tgz"; + path = fetchurl { + name = "_babel_plugin_syntax_bigint___plugin_syntax_bigint_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-syntax-bigint/-/plugin-syntax-bigint-7.8.3.tgz"; + sha1 = "4c9a6f669f5d0cdf1b90a1671e9a146be5300cea"; + }; + } + { + name = "_babel_plugin_syntax_class_properties___plugin_syntax_class_properties_7.12.1.tgz"; + path = fetchurl { + name = "_babel_plugin_syntax_class_properties___plugin_syntax_class_properties_7.12.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.1.tgz"; + sha1 = "bcb297c5366e79bebadef509549cd93b04f19978"; + }; + } + { + name = "_babel_plugin_syntax_import_meta___plugin_syntax_import_meta_7.10.4.tgz"; + path = fetchurl { + name = "_babel_plugin_syntax_import_meta___plugin_syntax_import_meta_7.10.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-syntax-import-meta/-/plugin-syntax-import-meta-7.10.4.tgz"; + sha1 = "ee601348c370fa334d2207be158777496521fd51"; + }; + } + { + name = "_babel_plugin_syntax_json_strings___plugin_syntax_json_strings_7.8.3.tgz"; + path = fetchurl { + name = "_babel_plugin_syntax_json_strings___plugin_syntax_json_strings_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz"; + sha1 = "01ca21b668cd8218c9e640cb6dd88c5412b2c96a"; + }; + } + { + name = "_babel_plugin_syntax_logical_assignment_operators___plugin_syntax_logical_assignment_operators_7.10.4.tgz"; + path = fetchurl { + name = "_babel_plugin_syntax_logical_assignment_operators___plugin_syntax_logical_assignment_operators_7.10.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz"; + sha1 = "ca91ef46303530448b906652bac2e9fe9941f699"; + }; + } + { + name = "_babel_plugin_syntax_nullish_coalescing_operator___plugin_syntax_nullish_coalescing_operator_7.8.3.tgz"; + path = fetchurl { + name = "_babel_plugin_syntax_nullish_coalescing_operator___plugin_syntax_nullish_coalescing_operator_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz"; + sha1 = "167ed70368886081f74b5c36c65a88c03b66d1a9"; + }; + } + { + name = "_babel_plugin_syntax_numeric_separator___plugin_syntax_numeric_separator_7.10.4.tgz"; + path = fetchurl { + name = "_babel_plugin_syntax_numeric_separator___plugin_syntax_numeric_separator_7.10.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.4.tgz"; + sha1 = "b9b070b3e33570cd9fd07ba7fa91c0dd37b9af97"; + }; + } + { + name = "_babel_plugin_syntax_object_rest_spread___plugin_syntax_object_rest_spread_7.8.3.tgz"; + path = fetchurl { + name = "_babel_plugin_syntax_object_rest_spread___plugin_syntax_object_rest_spread_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz"; + sha1 = "60e225edcbd98a640332a2e72dd3e66f1af55871"; + }; + } + { + name = "_babel_plugin_syntax_optional_catch_binding___plugin_syntax_optional_catch_binding_7.8.3.tgz"; + path = fetchurl { + name = "_babel_plugin_syntax_optional_catch_binding___plugin_syntax_optional_catch_binding_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz"; + sha1 = "6111a265bcfb020eb9efd0fdfd7d26402b9ed6c1"; + }; + } + { + name = "_babel_plugin_syntax_optional_chaining___plugin_syntax_optional_chaining_7.8.3.tgz"; + path = fetchurl { + name = "_babel_plugin_syntax_optional_chaining___plugin_syntax_optional_chaining_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz"; + sha1 = "4f69c2ab95167e0180cd5336613f8c5788f7d48a"; + }; + } + { + name = "_babel_plugin_syntax_top_level_await___plugin_syntax_top_level_await_7.12.1.tgz"; + path = fetchurl { + name = "_babel_plugin_syntax_top_level_await___plugin_syntax_top_level_await_7.12.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.12.1.tgz"; + sha1 = "dd6c0b357ac1bb142d98537450a319625d13d2a0"; + }; + } + { + name = "_babel_template___template_7.12.7.tgz"; + path = fetchurl { + name = "_babel_template___template_7.12.7.tgz"; + url = "https://registry.yarnpkg.com/@babel/template/-/template-7.12.7.tgz"; + sha1 = "c817233696018e39fbb6c491d2fb684e05ed43bc"; + }; + } + { + name = "_babel_traverse___traverse_7.12.10.tgz"; + path = fetchurl { + name = "_babel_traverse___traverse_7.12.10.tgz"; + url = "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.12.10.tgz"; + sha1 = "2d1f4041e8bf42ea099e5b2dc48d6a594c00017a"; + }; + } + { + name = "_babel_types___types_7.12.10.tgz"; + path = fetchurl { + name = "_babel_types___types_7.12.10.tgz"; + url = "https://registry.yarnpkg.com/@babel/types/-/types-7.12.10.tgz"; + sha1 = "7965e4a7260b26f09c56bcfcb0498af1f6d9b260"; + }; + } + { + name = "_bcoe_v8_coverage___v8_coverage_0.2.3.tgz"; + path = fetchurl { + name = "_bcoe_v8_coverage___v8_coverage_0.2.3.tgz"; + url = "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz"; + sha1 = "75a2e8b51cb758a7553d6804a5932d7aace75c39"; + }; + } + { + name = "_cliqz_adblocker_content___adblocker_content_1.18.8.tgz"; + path = fetchurl { + name = "_cliqz_adblocker_content___adblocker_content_1.18.8.tgz"; + url = "https://registry.yarnpkg.com/@cliqz/adblocker-content/-/adblocker-content-1.18.8.tgz"; + sha1 = "96473f14c098a20091298d34a6addcd430aceebd"; + }; + } + { + name = "_cliqz_adblocker_electron_preload___adblocker_electron_preload_1.18.8.tgz"; + path = fetchurl { + name = "_cliqz_adblocker_electron_preload___adblocker_electron_preload_1.18.8.tgz"; + url = "https://registry.yarnpkg.com/@cliqz/adblocker-electron-preload/-/adblocker-electron-preload-1.18.8.tgz"; + sha1 = "c2058647e015b6f61c222e7d58040347324c63b0"; + }; + } + { + name = "_cliqz_adblocker_electron___adblocker_electron_1.18.8.tgz"; + path = fetchurl { + name = "_cliqz_adblocker_electron___adblocker_electron_1.18.8.tgz"; + url = "https://registry.yarnpkg.com/@cliqz/adblocker-electron/-/adblocker-electron-1.18.8.tgz"; + sha1 = "5f697c5dc65cd936b3908078a6e4516ec995567a"; + }; + } + { + name = "_cliqz_adblocker___adblocker_1.18.8.tgz"; + path = fetchurl { + name = "_cliqz_adblocker___adblocker_1.18.8.tgz"; + url = "https://registry.yarnpkg.com/@cliqz/adblocker/-/adblocker-1.18.8.tgz"; + sha1 = "f6e5724fe6573c2e68f2545d90bcce3e1ecfbae9"; + }; + } + { + name = "_cnakazawa_watch___watch_1.0.4.tgz"; + path = fetchurl { + name = "_cnakazawa_watch___watch_1.0.4.tgz"; + url = "https://registry.yarnpkg.com/@cnakazawa/watch/-/watch-1.0.4.tgz"; + sha1 = "f864ae85004d0fcab6f50be9141c4da368d1656a"; + }; + } + { + name = "_develar_schema_utils___schema_utils_2.6.5.tgz"; + path = fetchurl { + name = "_develar_schema_utils___schema_utils_2.6.5.tgz"; + url = "https://registry.yarnpkg.com/@develar/schema-utils/-/schema-utils-2.6.5.tgz"; + sha1 = "3ece22c5838402419a6e0425f85742b961d9b6c6"; + }; + } + { + name = "_electron_get___get_1.12.2.tgz"; + path = fetchurl { + name = "_electron_get___get_1.12.2.tgz"; + url = "https://registry.yarnpkg.com/@electron/get/-/get-1.12.2.tgz"; + sha1 = "6442066afb99be08cefb9a281e4b4692b33764f3"; + }; + } + { + name = "_eslint_eslintrc___eslintrc_0.2.2.tgz"; + path = fetchurl { + name = "_eslint_eslintrc___eslintrc_0.2.2.tgz"; + url = "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-0.2.2.tgz"; + sha1 = "d01fc791e2fc33e88a29d6f3dc7e93d0cd784b76"; + }; + } + { + name = "_istanbuljs_load_nyc_config___load_nyc_config_1.1.0.tgz"; + path = fetchurl { + name = "_istanbuljs_load_nyc_config___load_nyc_config_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz"; + sha1 = "fd3db1d59ecf7cf121e80650bb86712f9b55eced"; + }; + } + { + name = "_istanbuljs_schema___schema_0.1.2.tgz"; + path = fetchurl { + name = "_istanbuljs_schema___schema_0.1.2.tgz"; + url = "https://registry.yarnpkg.com/@istanbuljs/schema/-/schema-0.1.2.tgz"; + sha1 = "26520bf09abe4a5644cd5414e37125a8954241dd"; + }; + } + { + name = "_jest_console___console_26.6.2.tgz"; + path = fetchurl { + name = "_jest_console___console_26.6.2.tgz"; + url = "https://registry.yarnpkg.com/@jest/console/-/console-26.6.2.tgz"; + sha1 = "4e04bc464014358b03ab4937805ee36a0aeb98f2"; + }; + } + { + name = "_jest_core___core_26.6.3.tgz"; + path = fetchurl { + name = "_jest_core___core_26.6.3.tgz"; + url = "https://registry.yarnpkg.com/@jest/core/-/core-26.6.3.tgz"; + sha1 = "7639fcb3833d748a4656ada54bde193051e45fad"; + }; + } + { + name = "_jest_environment___environment_26.6.2.tgz"; + path = fetchurl { + name = "_jest_environment___environment_26.6.2.tgz"; + url = "https://registry.yarnpkg.com/@jest/environment/-/environment-26.6.2.tgz"; + sha1 = "ba364cc72e221e79cc8f0a99555bf5d7577cf92c"; + }; + } + { + name = "_jest_fake_timers___fake_timers_26.6.2.tgz"; + path = fetchurl { + name = "_jest_fake_timers___fake_timers_26.6.2.tgz"; + url = "https://registry.yarnpkg.com/@jest/fake-timers/-/fake-timers-26.6.2.tgz"; + sha1 = "459c329bcf70cee4af4d7e3f3e67848123535aad"; + }; + } + { + name = "_jest_globals___globals_26.6.2.tgz"; + path = fetchurl { + name = "_jest_globals___globals_26.6.2.tgz"; + url = "https://registry.yarnpkg.com/@jest/globals/-/globals-26.6.2.tgz"; + sha1 = "5b613b78a1aa2655ae908eba638cc96a20df720a"; + }; + } + { + name = "_jest_reporters___reporters_26.6.2.tgz"; + path = fetchurl { + name = "_jest_reporters___reporters_26.6.2.tgz"; + url = "https://registry.yarnpkg.com/@jest/reporters/-/reporters-26.6.2.tgz"; + sha1 = "1f518b99637a5f18307bd3ecf9275f6882a667f6"; + }; + } + { + name = "_jest_source_map___source_map_26.6.2.tgz"; + path = fetchurl { + name = "_jest_source_map___source_map_26.6.2.tgz"; + url = "https://registry.yarnpkg.com/@jest/source-map/-/source-map-26.6.2.tgz"; + sha1 = "29af5e1e2e324cafccc936f218309f54ab69d535"; + }; + } + { + name = "_jest_test_result___test_result_26.6.2.tgz"; + path = fetchurl { + name = "_jest_test_result___test_result_26.6.2.tgz"; + url = "https://registry.yarnpkg.com/@jest/test-result/-/test-result-26.6.2.tgz"; + sha1 = "55da58b62df134576cc95476efa5f7949e3f5f18"; + }; + } + { + name = "_jest_test_sequencer___test_sequencer_26.6.3.tgz"; + path = fetchurl { + name = "_jest_test_sequencer___test_sequencer_26.6.3.tgz"; + url = "https://registry.yarnpkg.com/@jest/test-sequencer/-/test-sequencer-26.6.3.tgz"; + sha1 = "98e8a45100863886d074205e8ffdc5a7eb582b17"; + }; + } + { + name = "_jest_transform___transform_26.6.2.tgz"; + path = fetchurl { + name = "_jest_transform___transform_26.6.2.tgz"; + url = "https://registry.yarnpkg.com/@jest/transform/-/transform-26.6.2.tgz"; + sha1 = "5ac57c5fa1ad17b2aae83e73e45813894dcf2e4b"; + }; + } + { + name = "_jest_types___types_26.6.2.tgz"; + path = fetchurl { + name = "_jest_types___types_26.6.2.tgz"; + url = "https://registry.yarnpkg.com/@jest/types/-/types-26.6.2.tgz"; + sha1 = "bef5a532030e1d88a2f5a6d933f84e97226ed48e"; + }; + } + { + name = "_remusao_guess_url_type___guess_url_type_1.2.0.tgz"; + path = fetchurl { + name = "_remusao_guess_url_type___guess_url_type_1.2.0.tgz"; + url = "https://registry.yarnpkg.com/@remusao/guess-url-type/-/guess-url-type-1.2.0.tgz"; + sha1 = "fb1402b4c47266161501704d74427b8d49e4b3e4"; + }; + } + { + name = "_remusao_small___small_1.2.0.tgz"; + path = fetchurl { + name = "_remusao_small___small_1.2.0.tgz"; + url = "https://registry.yarnpkg.com/@remusao/small/-/small-1.2.0.tgz"; + sha1 = "1f56d59418d4c121cd8814e4bea5ed95dcf4b7a9"; + }; + } + { + name = "_remusao_smaz_compress___smaz_compress_1.9.0.tgz"; + path = fetchurl { + name = "_remusao_smaz_compress___smaz_compress_1.9.0.tgz"; + url = "https://registry.yarnpkg.com/@remusao/smaz-compress/-/smaz-compress-1.9.0.tgz"; + sha1 = "ec79c87f5780865da616cd214b3b8978807d1e9a"; + }; + } + { + name = "_remusao_smaz_decompress___smaz_decompress_1.9.0.tgz"; + path = fetchurl { + name = "_remusao_smaz_decompress___smaz_decompress_1.9.0.tgz"; + url = "https://registry.yarnpkg.com/@remusao/smaz-decompress/-/smaz-decompress-1.9.0.tgz"; + sha1 = "9b3fba7c8e0c2045de63fd0ad0e5b37b447bb7cf"; + }; + } + { + name = "_remusao_smaz___smaz_1.9.0.tgz"; + path = fetchurl { + name = "_remusao_smaz___smaz_1.9.0.tgz"; + url = "https://registry.yarnpkg.com/@remusao/smaz/-/smaz-1.9.0.tgz"; + sha1 = "d02c2fb007483d4b4d050fb2fdaf523fcef08d40"; + }; + } + { + name = "_remusao_trie___trie_1.4.0.tgz"; + path = fetchurl { + name = "_remusao_trie___trie_1.4.0.tgz"; + url = "https://registry.yarnpkg.com/@remusao/trie/-/trie-1.4.0.tgz"; + sha1 = "b439210445339f0ca95ff200d98b898d431a4ce1"; + }; + } + { + name = "_sindresorhus_is___is_0.14.0.tgz"; + path = fetchurl { + name = "_sindresorhus_is___is_0.14.0.tgz"; + url = "https://registry.yarnpkg.com/@sindresorhus/is/-/is-0.14.0.tgz"; + sha1 = "9fb3a3cf3132328151f353de4632e01e52102bea"; + }; + } + { + name = "_sinonjs_commons___commons_1.8.1.tgz"; + path = fetchurl { + name = "_sinonjs_commons___commons_1.8.1.tgz"; + url = "https://registry.yarnpkg.com/@sinonjs/commons/-/commons-1.8.1.tgz"; + sha1 = "e7df00f98a203324f6dc7cc606cad9d4a8ab2217"; + }; + } + { + name = "_sinonjs_fake_timers___fake_timers_6.0.1.tgz"; + path = fetchurl { + name = "_sinonjs_fake_timers___fake_timers_6.0.1.tgz"; + url = "https://registry.yarnpkg.com/@sinonjs/fake-timers/-/fake-timers-6.0.1.tgz"; + sha1 = "293674fccb3262ac782c7aadfdeca86b10c75c40"; + }; + } + { + name = "_szmarczak_http_timer___http_timer_1.1.2.tgz"; + path = fetchurl { + name = "_szmarczak_http_timer___http_timer_1.1.2.tgz"; + url = "https://registry.yarnpkg.com/@szmarczak/http-timer/-/http-timer-1.1.2.tgz"; + sha1 = "b1665e2c461a2cd92f4c1bbf50d5454de0d4b421"; + }; + } + { + name = "_types_babel__core___babel__core_7.1.12.tgz"; + path = fetchurl { + name = "_types_babel__core___babel__core_7.1.12.tgz"; + url = "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.1.12.tgz"; + sha1 = "4d8e9e51eb265552a7e4f1ff2219ab6133bdfb2d"; + }; + } + { + name = "_types_babel__generator___babel__generator_7.6.2.tgz"; + path = fetchurl { + name = "_types_babel__generator___babel__generator_7.6.2.tgz"; + url = "https://registry.yarnpkg.com/@types/babel__generator/-/babel__generator-7.6.2.tgz"; + sha1 = "f3d71178e187858f7c45e30380f8f1b7415a12d8"; + }; + } + { + name = "_types_babel__template___babel__template_7.4.0.tgz"; + path = fetchurl { + name = "_types_babel__template___babel__template_7.4.0.tgz"; + url = "https://registry.yarnpkg.com/@types/babel__template/-/babel__template-7.4.0.tgz"; + sha1 = "0c888dd70b3ee9eebb6e4f200e809da0076262be"; + }; + } + { + name = "_types_babel__traverse___babel__traverse_7.11.0.tgz"; + path = fetchurl { + name = "_types_babel__traverse___babel__traverse_7.11.0.tgz"; + url = "https://registry.yarnpkg.com/@types/babel__traverse/-/babel__traverse-7.11.0.tgz"; + sha1 = "b9a1efa635201ba9bc850323a8793ee2d36c04a0"; + }; + } + { + name = "_types_chrome___chrome_0.0.126.tgz"; + path = fetchurl { + name = "_types_chrome___chrome_0.0.126.tgz"; + url = "https://registry.yarnpkg.com/@types/chrome/-/chrome-0.0.126.tgz"; + sha1 = "f9f3436712f0c7c12ea9798abc9b95575ad7b23a"; + }; + } + { + name = "_types_debug___debug_4.1.5.tgz"; + path = fetchurl { + name = "_types_debug___debug_4.1.5.tgz"; + url = "https://registry.yarnpkg.com/@types/debug/-/debug-4.1.5.tgz"; + sha1 = "b14efa8852b7768d898906613c23f688713e02cd"; + }; + } + { + name = "_types_filesystem___filesystem_0.0.29.tgz"; + path = fetchurl { + name = "_types_filesystem___filesystem_0.0.29.tgz"; + url = "https://registry.yarnpkg.com/@types/filesystem/-/filesystem-0.0.29.tgz"; + sha1 = "ee3748eb5be140dcf980c3bd35f11aec5f7a3748"; + }; + } + { + name = "_types_filewriter___filewriter_0.0.28.tgz"; + path = fetchurl { + name = "_types_filewriter___filewriter_0.0.28.tgz"; + url = "https://registry.yarnpkg.com/@types/filewriter/-/filewriter-0.0.28.tgz"; + sha1 = "c054e8af4d9dd75db4e63abc76f885168714d4b3"; + }; + } + { + name = "_types_firefox_webext_browser___firefox_webext_browser_82.0.0.tgz"; + path = fetchurl { + name = "_types_firefox_webext_browser___firefox_webext_browser_82.0.0.tgz"; + url = "https://registry.yarnpkg.com/@types/firefox-webext-browser/-/firefox-webext-browser-82.0.0.tgz"; + sha1 = "4d0f5cfebd7321d2cbf0ccfb6032570f0138b958"; + }; + } + { + name = "_types_fs_extra___fs_extra_9.0.5.tgz"; + path = fetchurl { + name = "_types_fs_extra___fs_extra_9.0.5.tgz"; + url = "https://registry.yarnpkg.com/@types/fs-extra/-/fs-extra-9.0.5.tgz"; + sha1 = "2afb76a43a4bef80a363b94b314d0ca1694fc4f8"; + }; + } + { + name = "_types_graceful_fs___graceful_fs_4.1.4.tgz"; + path = fetchurl { + name = "_types_graceful_fs___graceful_fs_4.1.4.tgz"; + url = "https://registry.yarnpkg.com/@types/graceful-fs/-/graceful-fs-4.1.4.tgz"; + sha1 = "4ff9f641a7c6d1a3508ff88bc3141b152772e753"; + }; + } + { + name = "_types_har_format___har_format_1.2.5.tgz"; + path = fetchurl { + name = "_types_har_format___har_format_1.2.5.tgz"; + url = "https://registry.yarnpkg.com/@types/har-format/-/har-format-1.2.5.tgz"; + sha1 = "4f6648814d0fdcb6a510e3364a9db439a753c4b1"; + }; + } + { + name = "_types_istanbul_lib_coverage___istanbul_lib_coverage_2.0.3.tgz"; + path = fetchurl { + name = "_types_istanbul_lib_coverage___istanbul_lib_coverage_2.0.3.tgz"; + url = "https://registry.yarnpkg.com/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.3.tgz"; + sha1 = "4ba8ddb720221f432e443bd5f9117fd22cfd4762"; + }; + } + { + name = "_types_istanbul_lib_report___istanbul_lib_report_3.0.0.tgz"; + path = fetchurl { + name = "_types_istanbul_lib_report___istanbul_lib_report_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/@types/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz"; + sha1 = "c14c24f18ea8190c118ee7562b7ff99a36552686"; + }; + } + { + name = "_types_istanbul_reports___istanbul_reports_3.0.0.tgz"; + path = fetchurl { + name = "_types_istanbul_reports___istanbul_reports_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/@types/istanbul-reports/-/istanbul-reports-3.0.0.tgz"; + sha1 = "508b13aa344fa4976234e75dddcc34925737d821"; + }; + } + { + name = "_types_node___node_14.14.13.tgz"; + path = fetchurl { + name = "_types_node___node_14.14.13.tgz"; + url = "https://registry.yarnpkg.com/@types/node/-/node-14.14.13.tgz"; + sha1 = "9e425079799322113ae8477297ae6ef51b8e0cdf"; + }; + } + { + name = "_types_node___node_12.19.9.tgz"; + path = fetchurl { + name = "_types_node___node_12.19.9.tgz"; + url = "https://registry.yarnpkg.com/@types/node/-/node-12.19.9.tgz"; + sha1 = "990ad687ad8b26ef6dcc34a4f69c33d40c95b679"; + }; + } + { + name = "_types_normalize_package_data___normalize_package_data_2.4.0.tgz"; + path = fetchurl { + name = "_types_normalize_package_data___normalize_package_data_2.4.0.tgz"; + url = "https://registry.yarnpkg.com/@types/normalize-package-data/-/normalize-package-data-2.4.0.tgz"; + sha1 = "e486d0d97396d79beedd0a6e33f4534ff6b4973e"; + }; + } + { + name = "_types_prettier___prettier_2.1.5.tgz"; + path = fetchurl { + name = "_types_prettier___prettier_2.1.5.tgz"; + url = "https://registry.yarnpkg.com/@types/prettier/-/prettier-2.1.5.tgz"; + sha1 = "b6ab3bba29e16b821d84e09ecfaded462b816b00"; + }; + } + { + name = "_types_stack_utils___stack_utils_2.0.0.tgz"; + path = fetchurl { + name = "_types_stack_utils___stack_utils_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/@types/stack-utils/-/stack-utils-2.0.0.tgz"; + sha1 = "7036640b4e21cc2f259ae826ce843d277dad8cff"; + }; + } + { + name = "_types_yargs_parser___yargs_parser_15.0.0.tgz"; + path = fetchurl { + name = "_types_yargs_parser___yargs_parser_15.0.0.tgz"; + url = "https://registry.yarnpkg.com/@types/yargs-parser/-/yargs-parser-15.0.0.tgz"; + sha1 = "cb3f9f741869e20cce330ffbeb9271590483882d"; + }; + } + { + name = "_types_yargs___yargs_15.0.11.tgz"; + path = fetchurl { + name = "_types_yargs___yargs_15.0.11.tgz"; + url = "https://registry.yarnpkg.com/@types/yargs/-/yargs-15.0.11.tgz"; + sha1 = "361d7579ecdac1527687bcebf9946621c12ab78c"; + }; + } + { + name = "abab___abab_2.0.5.tgz"; + path = fetchurl { + name = "abab___abab_2.0.5.tgz"; + url = "https://registry.yarnpkg.com/abab/-/abab-2.0.5.tgz"; + sha1 = "c0b678fb32d60fc1219c784d6a826fe385aeb79a"; + }; + } + { + name = "acorn_globals___acorn_globals_6.0.0.tgz"; + path = fetchurl { + name = "acorn_globals___acorn_globals_6.0.0.tgz"; + url = "https://registry.yarnpkg.com/acorn-globals/-/acorn-globals-6.0.0.tgz"; + sha1 = "46cdd39f0f8ff08a876619b55f5ac8a6dc770b45"; + }; + } + { + name = "acorn_jsx___acorn_jsx_5.3.1.tgz"; + path = fetchurl { + name = "acorn_jsx___acorn_jsx_5.3.1.tgz"; + url = "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.1.tgz"; + sha1 = "fc8661e11b7ac1539c47dbfea2e72b3af34d267b"; + }; + } + { + name = "acorn_walk___acorn_walk_7.2.0.tgz"; + path = fetchurl { + name = "acorn_walk___acorn_walk_7.2.0.tgz"; + url = "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-7.2.0.tgz"; + sha1 = "0de889a601203909b0fbe07b8938dc21d2e967bc"; + }; + } + { + name = "acorn___acorn_7.4.1.tgz"; + path = fetchurl { + name = "acorn___acorn_7.4.1.tgz"; + url = "https://registry.yarnpkg.com/acorn/-/acorn-7.4.1.tgz"; + sha1 = "feaed255973d2e77555b83dbc08851a6c63520fa"; + }; + } + { + name = "ajv_keywords___ajv_keywords_3.5.2.tgz"; + path = fetchurl { + name = "ajv_keywords___ajv_keywords_3.5.2.tgz"; + url = "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.5.2.tgz"; + sha1 = "31f29da5ab6e00d1c2d329acf7b5929614d5014d"; + }; + } + { + name = "ajv___ajv_6.12.6.tgz"; + path = fetchurl { + name = "ajv___ajv_6.12.6.tgz"; + url = "https://registry.yarnpkg.com/ajv/-/ajv-6.12.6.tgz"; + sha1 = "baf5a62e802b07d977034586f8c3baf5adf26df4"; + }; + } + { + name = "ansi_align___ansi_align_3.0.0.tgz"; + path = fetchurl { + name = "ansi_align___ansi_align_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/ansi-align/-/ansi-align-3.0.0.tgz"; + sha1 = "b536b371cf687caaef236c18d3e21fe3797467cb"; + }; + } + { + name = "ansi_colors___ansi_colors_4.1.1.tgz"; + path = fetchurl { + name = "ansi_colors___ansi_colors_4.1.1.tgz"; + url = "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-4.1.1.tgz"; + sha1 = "cbb9ae256bf750af1eab344f229aa27fe94ba348"; + }; + } + { + name = "ansi_escapes___ansi_escapes_4.3.1.tgz"; + path = fetchurl { + name = "ansi_escapes___ansi_escapes_4.3.1.tgz"; + url = "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-4.3.1.tgz"; + sha1 = "a5c47cc43181f1f38ffd7076837700d395522a61"; + }; + } + { + name = "ansi_regex___ansi_regex_4.1.0.tgz"; + path = fetchurl { + name = "ansi_regex___ansi_regex_4.1.0.tgz"; + url = "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-4.1.0.tgz"; + sha1 = "8b9f8f08cf1acb843756a839ca8c7e3168c51997"; + }; + } + { + name = "ansi_regex___ansi_regex_5.0.0.tgz"; + path = fetchurl { + name = "ansi_regex___ansi_regex_5.0.0.tgz"; + url = "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.0.tgz"; + sha1 = "388539f55179bf39339c81af30a654d69f87cb75"; + }; + } + { + name = "ansi_styles___ansi_styles_3.2.1.tgz"; + path = fetchurl { + name = "ansi_styles___ansi_styles_3.2.1.tgz"; + url = "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz"; + sha1 = "41fbb20243e50b12be0f04b8dedbf07520ce841d"; + }; + } + { + name = "ansi_styles___ansi_styles_4.3.0.tgz"; + path = fetchurl { + name = "ansi_styles___ansi_styles_4.3.0.tgz"; + url = "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.3.0.tgz"; + sha1 = "edd803628ae71c04c85ae7a0906edad34b648937"; + }; + } + { + name = "anymatch___anymatch_2.0.0.tgz"; + path = fetchurl { + name = "anymatch___anymatch_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/anymatch/-/anymatch-2.0.0.tgz"; + sha1 = "bcb24b4f37934d9aa7ac17b4adaf89e7c76ef2eb"; + }; + } + { + name = "anymatch___anymatch_3.1.1.tgz"; + path = fetchurl { + name = "anymatch___anymatch_3.1.1.tgz"; + url = "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.1.tgz"; + sha1 = "c55ecf02185e2469259399310c173ce31233b142"; + }; + } + { + name = "app_builder_bin___app_builder_bin_3.5.10.tgz"; + path = fetchurl { + name = "app_builder_bin___app_builder_bin_3.5.10.tgz"; + url = "https://registry.yarnpkg.com/app-builder-bin/-/app-builder-bin-3.5.10.tgz"; + sha1 = "4a7f9999fccc0c435b6284ae1366bc76a17c4a7d"; + }; + } + { + name = "app_builder_lib___app_builder_lib_22.9.1.tgz"; + path = fetchurl { + name = "app_builder_lib___app_builder_lib_22.9.1.tgz"; + url = "https://registry.yarnpkg.com/app-builder-lib/-/app-builder-lib-22.9.1.tgz"; + sha1 = "ccb8f1a02b628514a5dfab9401fa2a976689415c"; + }; + } + { + name = "archiver_utils___archiver_utils_2.1.0.tgz"; + path = fetchurl { + name = "archiver_utils___archiver_utils_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/archiver-utils/-/archiver-utils-2.1.0.tgz"; + sha1 = "e8a460e94b693c3e3da182a098ca6285ba9249e2"; + }; + } + { + name = "archiver___archiver_5.1.0.tgz"; + path = fetchurl { + name = "archiver___archiver_5.1.0.tgz"; + url = "https://registry.yarnpkg.com/archiver/-/archiver-5.1.0.tgz"; + sha1 = "05b0f6f7836f3e6356a0532763d2bb91017a7e37"; + }; + } + { + name = "argparse___argparse_1.0.10.tgz"; + path = fetchurl { + name = "argparse___argparse_1.0.10.tgz"; + url = "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz"; + sha1 = "bcd6791ea5ae09725e17e5ad988134cd40b3d911"; + }; + } + { + name = "arr_diff___arr_diff_4.0.0.tgz"; + path = fetchurl { + name = "arr_diff___arr_diff_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/arr-diff/-/arr-diff-4.0.0.tgz"; + sha1 = "d6461074febfec71e7e15235761a329a5dc7c520"; + }; + } + { + name = "arr_flatten___arr_flatten_1.1.0.tgz"; + path = fetchurl { + name = "arr_flatten___arr_flatten_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/arr-flatten/-/arr-flatten-1.1.0.tgz"; + sha1 = "36048bbff4e7b47e136644316c99669ea5ae91f1"; + }; + } + { + name = "arr_union___arr_union_3.1.0.tgz"; + path = fetchurl { + name = "arr_union___arr_union_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/arr-union/-/arr-union-3.1.0.tgz"; + sha1 = "e39b09aea9def866a8f206e288af63919bae39c4"; + }; + } + { + name = "array_unique___array_unique_0.3.2.tgz"; + path = fetchurl { + name = "array_unique___array_unique_0.3.2.tgz"; + url = "https://registry.yarnpkg.com/array-unique/-/array-unique-0.3.2.tgz"; + sha1 = "a894b75d4bc4f6cd679ef3244a9fd8f46ae2d428"; + }; + } + { + name = "asn1___asn1_0.2.4.tgz"; + path = fetchurl { + name = "asn1___asn1_0.2.4.tgz"; + url = "https://registry.yarnpkg.com/asn1/-/asn1-0.2.4.tgz"; + sha1 = "8d2475dfab553bb33e77b54e59e880bb8ce23136"; + }; + } + { + name = "assert_plus___assert_plus_1.0.0.tgz"; + path = fetchurl { + name = "assert_plus___assert_plus_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/assert-plus/-/assert-plus-1.0.0.tgz"; + sha1 = "f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525"; + }; + } + { + name = "assign_symbols___assign_symbols_1.0.0.tgz"; + path = fetchurl { + name = "assign_symbols___assign_symbols_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/assign-symbols/-/assign-symbols-1.0.0.tgz"; + sha1 = "59667f41fadd4f20ccbc2bb96b8d4f7f78ec0367"; + }; + } + { + name = "astral_regex___astral_regex_1.0.0.tgz"; + path = fetchurl { + name = "astral_regex___astral_regex_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/astral-regex/-/astral-regex-1.0.0.tgz"; + sha1 = "6c8c3fb827dd43ee3918f27b82782ab7658a6fd9"; + }; + } + { + name = "async_exit_hook___async_exit_hook_2.0.1.tgz"; + path = fetchurl { + name = "async_exit_hook___async_exit_hook_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/async-exit-hook/-/async-exit-hook-2.0.1.tgz"; + sha1 = "8bd8b024b0ec9b1c01cccb9af9db29bd717dfaf3"; + }; + } + { + name = "async___async_0.9.2.tgz"; + path = fetchurl { + name = "async___async_0.9.2.tgz"; + url = "https://registry.yarnpkg.com/async/-/async-0.9.2.tgz"; + sha1 = "aea74d5e61c1f899613bf64bda66d4c78f2fd17d"; + }; + } + { + name = "async___async_3.2.0.tgz"; + path = fetchurl { + name = "async___async_3.2.0.tgz"; + url = "https://registry.yarnpkg.com/async/-/async-3.2.0.tgz"; + sha1 = "b3a2685c5ebb641d3de02d161002c60fc9f85720"; + }; + } + { + name = "asynckit___asynckit_0.4.0.tgz"; + path = fetchurl { + name = "asynckit___asynckit_0.4.0.tgz"; + url = "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz"; + sha1 = "c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"; + }; + } + { + name = "at_least_node___at_least_node_1.0.0.tgz"; + path = fetchurl { + name = "at_least_node___at_least_node_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/at-least-node/-/at-least-node-1.0.0.tgz"; + sha1 = "602cd4b46e844ad4effc92a8011a3c46e0238dc2"; + }; + } + { + name = "atob___atob_2.1.2.tgz"; + path = fetchurl { + name = "atob___atob_2.1.2.tgz"; + url = "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz"; + sha1 = "6d9517eb9e030d2436666651e86bd9f6f13533c9"; + }; + } + { + name = "aws_sign2___aws_sign2_0.7.0.tgz"; + path = fetchurl { + name = "aws_sign2___aws_sign2_0.7.0.tgz"; + url = "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.7.0.tgz"; + sha1 = "b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8"; + }; + } + { + name = "aws4___aws4_1.11.0.tgz"; + path = fetchurl { + name = "aws4___aws4_1.11.0.tgz"; + url = "https://registry.yarnpkg.com/aws4/-/aws4-1.11.0.tgz"; + sha1 = "d61f46d83b2519250e2784daf5b09479a8b41c59"; + }; + } + { + name = "babel_jest___babel_jest_26.6.3.tgz"; + path = fetchurl { + name = "babel_jest___babel_jest_26.6.3.tgz"; + url = "https://registry.yarnpkg.com/babel-jest/-/babel-jest-26.6.3.tgz"; + sha1 = "d87d25cb0037577a0c89f82e5755c5d293c01056"; + }; + } + { + name = "babel_plugin_istanbul___babel_plugin_istanbul_6.0.0.tgz"; + path = fetchurl { + name = "babel_plugin_istanbul___babel_plugin_istanbul_6.0.0.tgz"; + url = "https://registry.yarnpkg.com/babel-plugin-istanbul/-/babel-plugin-istanbul-6.0.0.tgz"; + sha1 = "e159ccdc9af95e0b570c75b4573b7c34d671d765"; + }; + } + { + name = "babel_plugin_jest_hoist___babel_plugin_jest_hoist_26.6.2.tgz"; + path = fetchurl { + name = "babel_plugin_jest_hoist___babel_plugin_jest_hoist_26.6.2.tgz"; + url = "https://registry.yarnpkg.com/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-26.6.2.tgz"; + sha1 = "8185bd030348d254c6d7dd974355e6a28b21e62d"; + }; + } + { + name = "babel_preset_current_node_syntax___babel_preset_current_node_syntax_1.0.0.tgz"; + path = fetchurl { + name = "babel_preset_current_node_syntax___babel_preset_current_node_syntax_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/babel-preset-current-node-syntax/-/babel-preset-current-node-syntax-1.0.0.tgz"; + sha1 = "cf5feef29551253471cfa82fc8e0f5063df07a77"; + }; + } + { + name = "babel_preset_jest___babel_preset_jest_26.6.2.tgz"; + path = fetchurl { + name = "babel_preset_jest___babel_preset_jest_26.6.2.tgz"; + url = "https://registry.yarnpkg.com/babel-preset-jest/-/babel-preset-jest-26.6.2.tgz"; + sha1 = "747872b1171df032252426586881d62d31798fee"; + }; + } + { + name = "balanced_match___balanced_match_1.0.0.tgz"; + path = fetchurl { + name = "balanced_match___balanced_match_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz"; + sha1 = "89b4d199ab2bee49de164ea02b89ce462d71b767"; + }; + } + { + name = "base64_js___base64_js_1.5.1.tgz"; + path = fetchurl { + name = "base64_js___base64_js_1.5.1.tgz"; + url = "https://registry.yarnpkg.com/base64-js/-/base64-js-1.5.1.tgz"; + sha1 = "1b1b440160a5bf7ad40b650f095963481903930a"; + }; + } + { + name = "base___base_0.11.2.tgz"; + path = fetchurl { + name = "base___base_0.11.2.tgz"; + url = "https://registry.yarnpkg.com/base/-/base-0.11.2.tgz"; + sha1 = "7bde5ced145b6d551a90db87f83c558b4eb48a8f"; + }; + } + { + name = "bcrypt_pbkdf___bcrypt_pbkdf_1.0.2.tgz"; + path = fetchurl { + name = "bcrypt_pbkdf___bcrypt_pbkdf_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz"; + sha1 = "a4301d389b6a43f9b67ff3ca11a3f6637e360e9e"; + }; + } + { + name = "bl___bl_4.0.3.tgz"; + path = fetchurl { + name = "bl___bl_4.0.3.tgz"; + url = "https://registry.yarnpkg.com/bl/-/bl-4.0.3.tgz"; + sha1 = "12d6287adc29080e22a705e5764b2a9522cdc489"; + }; + } + { + name = "bluebird_lst___bluebird_lst_1.0.9.tgz"; + path = fetchurl { + name = "bluebird_lst___bluebird_lst_1.0.9.tgz"; + url = "https://registry.yarnpkg.com/bluebird-lst/-/bluebird-lst-1.0.9.tgz"; + sha1 = "a64a0e4365658b9ab5fe875eb9dfb694189bb41c"; + }; + } + { + name = "bluebird___bluebird_3.7.2.tgz"; + path = fetchurl { + name = "bluebird___bluebird_3.7.2.tgz"; + url = "https://registry.yarnpkg.com/bluebird/-/bluebird-3.7.2.tgz"; + sha1 = "9f229c15be272454ffa973ace0dbee79a1b0c36f"; + }; + } + { + name = "boolean___boolean_3.0.2.tgz"; + path = fetchurl { + name = "boolean___boolean_3.0.2.tgz"; + url = "https://registry.yarnpkg.com/boolean/-/boolean-3.0.2.tgz"; + sha1 = "df1baa18b6a2b0e70840475e1d93ec8fe75b2570"; + }; + } + { + name = "boxen___boxen_4.2.0.tgz"; + path = fetchurl { + name = "boxen___boxen_4.2.0.tgz"; + url = "https://registry.yarnpkg.com/boxen/-/boxen-4.2.0.tgz"; + sha1 = "e411b62357d6d6d36587c8ac3d5d974daa070e64"; + }; + } + { + name = "brace_expansion___brace_expansion_1.1.11.tgz"; + path = fetchurl { + name = "brace_expansion___brace_expansion_1.1.11.tgz"; + url = "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz"; + sha1 = "3c7fcbf529d87226f3d2f52b966ff5271eb441dd"; + }; + } + { + name = "braces___braces_2.3.2.tgz"; + path = fetchurl { + name = "braces___braces_2.3.2.tgz"; + url = "https://registry.yarnpkg.com/braces/-/braces-2.3.2.tgz"; + sha1 = "5979fd3f14cd531565e5fa2df1abfff1dfaee729"; + }; + } + { + name = "braces___braces_3.0.2.tgz"; + path = fetchurl { + name = "braces___braces_3.0.2.tgz"; + url = "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz"; + sha1 = "3454e1a462ee8d599e236df336cd9ea4f8afe107"; + }; + } + { + name = "browser_process_hrtime___browser_process_hrtime_1.0.0.tgz"; + path = fetchurl { + name = "browser_process_hrtime___browser_process_hrtime_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/browser-process-hrtime/-/browser-process-hrtime-1.0.0.tgz"; + sha1 = "3c9b4b7d782c8121e56f10106d84c0d0ffc94626"; + }; + } + { + name = "bser___bser_2.1.1.tgz"; + path = fetchurl { + name = "bser___bser_2.1.1.tgz"; + url = "https://registry.yarnpkg.com/bser/-/bser-2.1.1.tgz"; + sha1 = "e6787da20ece9d07998533cfd9de6f5c38f4bc05"; + }; + } + { + name = "buffer_crc32___buffer_crc32_0.2.13.tgz"; + path = fetchurl { + name = "buffer_crc32___buffer_crc32_0.2.13.tgz"; + url = "https://registry.yarnpkg.com/buffer-crc32/-/buffer-crc32-0.2.13.tgz"; + sha1 = "0d333e3f00eac50aa1454abd30ef8c2a5d9a7242"; + }; + } + { + name = "buffer_from___buffer_from_1.1.1.tgz"; + path = fetchurl { + name = "buffer_from___buffer_from_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.1.tgz"; + sha1 = "32713bc028f75c02fdb710d7c7bcec1f2c6070ef"; + }; + } + { + name = "buffer___buffer_5.7.1.tgz"; + path = fetchurl { + name = "buffer___buffer_5.7.1.tgz"; + url = "https://registry.yarnpkg.com/buffer/-/buffer-5.7.1.tgz"; + sha1 = "ba62e7c13133053582197160851a8f648e99eed0"; + }; + } + { + name = "builder_util_runtime___builder_util_runtime_8.7.2.tgz"; + path = fetchurl { + name = "builder_util_runtime___builder_util_runtime_8.7.2.tgz"; + url = "https://registry.yarnpkg.com/builder-util-runtime/-/builder-util-runtime-8.7.2.tgz"; + sha1 = "d93afc71428a12789b437e13850e1fa7da956d72"; + }; + } + { + name = "builder_util___builder_util_22.9.1.tgz"; + path = fetchurl { + name = "builder_util___builder_util_22.9.1.tgz"; + url = "https://registry.yarnpkg.com/builder-util/-/builder-util-22.9.1.tgz"; + sha1 = "b7087a5cde477f90d718ca5d7fafb6ae261b16af"; + }; + } + { + name = "cache_base___cache_base_1.0.1.tgz"; + path = fetchurl { + name = "cache_base___cache_base_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/cache-base/-/cache-base-1.0.1.tgz"; + sha1 = "0a7f46416831c8b662ee36fe4e7c59d76f666ab2"; + }; + } + { + name = "cacheable_request___cacheable_request_6.1.0.tgz"; + path = fetchurl { + name = "cacheable_request___cacheable_request_6.1.0.tgz"; + url = "https://registry.yarnpkg.com/cacheable-request/-/cacheable-request-6.1.0.tgz"; + sha1 = "20ffb8bd162ba4be11e9567d823db651052ca912"; + }; + } + { + name = "callsites___callsites_3.1.0.tgz"; + path = fetchurl { + name = "callsites___callsites_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/callsites/-/callsites-3.1.0.tgz"; + sha1 = "b3630abd8943432f54b3f0519238e33cd7df2f73"; + }; + } + { + name = "camelcase___camelcase_5.3.1.tgz"; + path = fetchurl { + name = "camelcase___camelcase_5.3.1.tgz"; + url = "https://registry.yarnpkg.com/camelcase/-/camelcase-5.3.1.tgz"; + sha1 = "e3c9b31569e106811df242f715725a1f4c494320"; + }; + } + { + name = "camelcase___camelcase_6.2.0.tgz"; + path = fetchurl { + name = "camelcase___camelcase_6.2.0.tgz"; + url = "https://registry.yarnpkg.com/camelcase/-/camelcase-6.2.0.tgz"; + sha1 = "924af881c9d525ac9d87f40d964e5cea982a1809"; + }; + } + { + name = "capture_exit___capture_exit_2.0.0.tgz"; + path = fetchurl { + name = "capture_exit___capture_exit_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/capture-exit/-/capture-exit-2.0.0.tgz"; + sha1 = "fb953bfaebeb781f62898239dabb426d08a509a4"; + }; + } + { + name = "caseless___caseless_0.12.0.tgz"; + path = fetchurl { + name = "caseless___caseless_0.12.0.tgz"; + url = "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz"; + sha1 = "1b681c21ff84033c826543090689420d187151dc"; + }; + } + { + name = "chalk___chalk_2.4.2.tgz"; + path = fetchurl { + name = "chalk___chalk_2.4.2.tgz"; + url = "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz"; + sha1 = "cd42541677a54333cf541a49108c1432b44c9424"; + }; + } + { + name = "chalk___chalk_3.0.0.tgz"; + path = fetchurl { + name = "chalk___chalk_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/chalk/-/chalk-3.0.0.tgz"; + sha1 = "3f73c2bf526591f574cc492c51e2456349f844e4"; + }; + } + { + name = "chalk___chalk_4.1.0.tgz"; + path = fetchurl { + name = "chalk___chalk_4.1.0.tgz"; + url = "https://registry.yarnpkg.com/chalk/-/chalk-4.1.0.tgz"; + sha1 = "4e14870a618d9e2edd97dd8345fd9d9dc315646a"; + }; + } + { + name = "char_regex___char_regex_1.0.2.tgz"; + path = fetchurl { + name = "char_regex___char_regex_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/char-regex/-/char-regex-1.0.2.tgz"; + sha1 = "d744358226217f981ed58f479b1d6bcc29545dcf"; + }; + } + { + name = "chromium_pickle_js___chromium_pickle_js_0.2.0.tgz"; + path = fetchurl { + name = "chromium_pickle_js___chromium_pickle_js_0.2.0.tgz"; + url = "https://registry.yarnpkg.com/chromium-pickle-js/-/chromium-pickle-js-0.2.0.tgz"; + sha1 = "04a106672c18b085ab774d983dfa3ea138f22205"; + }; + } + { + name = "ci_info___ci_info_2.0.0.tgz"; + path = fetchurl { + name = "ci_info___ci_info_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/ci-info/-/ci-info-2.0.0.tgz"; + sha1 = "67a9e964be31a51e15e5010d58e6f12834002f46"; + }; + } + { + name = "cjs_module_lexer___cjs_module_lexer_0.6.0.tgz"; + path = fetchurl { + name = "cjs_module_lexer___cjs_module_lexer_0.6.0.tgz"; + url = "https://registry.yarnpkg.com/cjs-module-lexer/-/cjs-module-lexer-0.6.0.tgz"; + sha1 = "4186fcca0eae175970aee870b9fe2d6cf8d5655f"; + }; + } + { + name = "class_utils___class_utils_0.3.6.tgz"; + path = fetchurl { + name = "class_utils___class_utils_0.3.6.tgz"; + url = "https://registry.yarnpkg.com/class-utils/-/class-utils-0.3.6.tgz"; + sha1 = "f93369ae8b9a7ce02fd41faad0ca83033190c463"; + }; + } + { + name = "cli_boxes___cli_boxes_2.2.1.tgz"; + path = fetchurl { + name = "cli_boxes___cli_boxes_2.2.1.tgz"; + url = "https://registry.yarnpkg.com/cli-boxes/-/cli-boxes-2.2.1.tgz"; + sha1 = "ddd5035d25094fce220e9cab40a45840a440318f"; + }; + } + { + name = "cliui___cliui_6.0.0.tgz"; + path = fetchurl { + name = "cliui___cliui_6.0.0.tgz"; + url = "https://registry.yarnpkg.com/cliui/-/cliui-6.0.0.tgz"; + sha1 = "511d702c0c4e41ca156d7d0e96021f23e13225b1"; + }; + } + { + name = "cliui___cliui_7.0.4.tgz"; + path = fetchurl { + name = "cliui___cliui_7.0.4.tgz"; + url = "https://registry.yarnpkg.com/cliui/-/cliui-7.0.4.tgz"; + sha1 = "a0265ee655476fc807aea9df3df8df7783808b4f"; + }; + } + { + name = "clone_response___clone_response_1.0.2.tgz"; + path = fetchurl { + name = "clone_response___clone_response_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/clone-response/-/clone-response-1.0.2.tgz"; + sha1 = "d1dc973920314df67fbeb94223b4ee350239e96b"; + }; + } + { + name = "co___co_4.6.0.tgz"; + path = fetchurl { + name = "co___co_4.6.0.tgz"; + url = "https://registry.yarnpkg.com/co/-/co-4.6.0.tgz"; + sha1 = "6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184"; + }; + } + { + name = "collect_v8_coverage___collect_v8_coverage_1.0.1.tgz"; + path = fetchurl { + name = "collect_v8_coverage___collect_v8_coverage_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/collect-v8-coverage/-/collect-v8-coverage-1.0.1.tgz"; + sha1 = "cc2c8e94fc18bbdffe64d6534570c8a673b27f59"; + }; + } + { + name = "collection_visit___collection_visit_1.0.0.tgz"; + path = fetchurl { + name = "collection_visit___collection_visit_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/collection-visit/-/collection-visit-1.0.0.tgz"; + sha1 = "4bc0373c164bc3291b4d368c829cf1a80a59dca0"; + }; + } + { + name = "color_convert___color_convert_1.9.3.tgz"; + path = fetchurl { + name = "color_convert___color_convert_1.9.3.tgz"; + url = "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz"; + sha1 = "bb71850690e1f136567de629d2d5471deda4c1e8"; + }; + } + { + name = "color_convert___color_convert_2.0.1.tgz"; + path = fetchurl { + name = "color_convert___color_convert_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/color-convert/-/color-convert-2.0.1.tgz"; + sha1 = "72d3a68d598c9bdb3af2ad1e84f21d896abd4de3"; + }; + } + { + name = "color_name___color_name_1.1.3.tgz"; + path = fetchurl { + name = "color_name___color_name_1.1.3.tgz"; + url = "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz"; + sha1 = "a7d0558bd89c42f795dd42328f740831ca53bc25"; + }; + } + { + name = "color_name___color_name_1.1.4.tgz"; + path = fetchurl { + name = "color_name___color_name_1.1.4.tgz"; + url = "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz"; + sha1 = "c2a09a87acbde69543de6f63fa3995c826c536a2"; + }; + } + { + name = "combined_stream___combined_stream_1.0.8.tgz"; + path = fetchurl { + name = "combined_stream___combined_stream_1.0.8.tgz"; + url = "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.8.tgz"; + sha1 = "c3d45a8b34fd730631a110a8a2520682b31d5a7f"; + }; + } + { + name = "component_emitter___component_emitter_1.3.0.tgz"; + path = fetchurl { + name = "component_emitter___component_emitter_1.3.0.tgz"; + url = "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.3.0.tgz"; + sha1 = "16e4070fba8ae29b679f2215853ee181ab2eabc0"; + }; + } + { + name = "compress_commons___compress_commons_4.0.2.tgz"; + path = fetchurl { + name = "compress_commons___compress_commons_4.0.2.tgz"; + url = "https://registry.yarnpkg.com/compress-commons/-/compress-commons-4.0.2.tgz"; + sha1 = "d6896be386e52f37610cef9e6fa5defc58c31bd7"; + }; + } + { + name = "concat_map___concat_map_0.0.1.tgz"; + path = fetchurl { + name = "concat_map___concat_map_0.0.1.tgz"; + url = "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz"; + sha1 = "d8a96bd77fd68df7793a73036a3ba0d5405d477b"; + }; + } + { + name = "concat_stream___concat_stream_1.6.2.tgz"; + path = fetchurl { + name = "concat_stream___concat_stream_1.6.2.tgz"; + url = "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.2.tgz"; + sha1 = "904bdf194cd3122fc675c77fc4ac3d4ff0fd1a34"; + }; + } + { + name = "config_chain___config_chain_1.1.12.tgz"; + path = fetchurl { + name = "config_chain___config_chain_1.1.12.tgz"; + url = "https://registry.yarnpkg.com/config-chain/-/config-chain-1.1.12.tgz"; + sha1 = "0fde8d091200eb5e808caf25fe618c02f48e4efa"; + }; + } + { + name = "configstore___configstore_5.0.1.tgz"; + path = fetchurl { + name = "configstore___configstore_5.0.1.tgz"; + url = "https://registry.yarnpkg.com/configstore/-/configstore-5.0.1.tgz"; + sha1 = "d365021b5df4b98cdd187d6a3b0e3f6a7cc5ed96"; + }; + } + { + name = "convert_source_map___convert_source_map_1.7.0.tgz"; + path = fetchurl { + name = "convert_source_map___convert_source_map_1.7.0.tgz"; + url = "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.7.0.tgz"; + sha1 = "17a2cb882d7f77d3490585e2ce6c524424a3a442"; + }; + } + { + name = "copy_descriptor___copy_descriptor_0.1.1.tgz"; + path = fetchurl { + name = "copy_descriptor___copy_descriptor_0.1.1.tgz"; + url = "https://registry.yarnpkg.com/copy-descriptor/-/copy-descriptor-0.1.1.tgz"; + sha1 = "676f6eb3c39997c2ee1ac3a924fd6124748f578d"; + }; + } + { + name = "core_js___core_js_3.8.1.tgz"; + path = fetchurl { + name = "core_js___core_js_3.8.1.tgz"; + url = "https://registry.yarnpkg.com/core-js/-/core-js-3.8.1.tgz"; + sha1 = "f51523668ac8a294d1285c3b9db44025fda66d47"; + }; + } + { + name = "core_util_is___core_util_is_1.0.2.tgz"; + path = fetchurl { + name = "core_util_is___core_util_is_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz"; + sha1 = "b5fd54220aa2bc5ab57aab7140c940754503c1a7"; + }; + } + { + name = "crc_32___crc_32_1.2.0.tgz"; + path = fetchurl { + name = "crc_32___crc_32_1.2.0.tgz"; + url = "https://registry.yarnpkg.com/crc-32/-/crc-32-1.2.0.tgz"; + sha1 = "cb2db6e29b88508e32d9dd0ec1693e7b41a18208"; + }; + } + { + name = "crc32_stream___crc32_stream_4.0.1.tgz"; + path = fetchurl { + name = "crc32_stream___crc32_stream_4.0.1.tgz"; + url = "https://registry.yarnpkg.com/crc32-stream/-/crc32-stream-4.0.1.tgz"; + sha1 = "0f047d74041737f8a55e86837a1b826bd8ab0067"; + }; + } + { + name = "cross_spawn___cross_spawn_6.0.5.tgz"; + path = fetchurl { + name = "cross_spawn___cross_spawn_6.0.5.tgz"; + url = "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-6.0.5.tgz"; + sha1 = "4a5ec7c64dfae22c3a14124dbacdee846d80cbc4"; + }; + } + { + name = "cross_spawn___cross_spawn_7.0.3.tgz"; + path = fetchurl { + name = "cross_spawn___cross_spawn_7.0.3.tgz"; + url = "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz"; + sha1 = "f73a85b9d5d41d045551c177e2882d4ac85728a6"; + }; + } + { + name = "crypto_random_string___crypto_random_string_2.0.0.tgz"; + path = fetchurl { + name = "crypto_random_string___crypto_random_string_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/crypto-random-string/-/crypto-random-string-2.0.0.tgz"; + sha1 = "ef2a7a966ec11083388369baa02ebead229b30d5"; + }; + } + { + name = "cssom___cssom_0.4.4.tgz"; + path = fetchurl { + name = "cssom___cssom_0.4.4.tgz"; + url = "https://registry.yarnpkg.com/cssom/-/cssom-0.4.4.tgz"; + sha1 = "5a66cf93d2d0b661d80bf6a44fb65f5c2e4e0a10"; + }; + } + { + name = "cssom___cssom_0.3.8.tgz"; + path = fetchurl { + name = "cssom___cssom_0.3.8.tgz"; + url = "https://registry.yarnpkg.com/cssom/-/cssom-0.3.8.tgz"; + sha1 = "9f1276f5b2b463f2114d3f2c75250af8c1a36f4a"; + }; + } + { + name = "cssstyle___cssstyle_2.3.0.tgz"; + path = fetchurl { + name = "cssstyle___cssstyle_2.3.0.tgz"; + url = "https://registry.yarnpkg.com/cssstyle/-/cssstyle-2.3.0.tgz"; + sha1 = "ff665a0ddbdc31864b09647f34163443d90b0852"; + }; + } + { + name = "darkreader___darkreader_4.9.26.tgz"; + path = fetchurl { + name = "darkreader___darkreader_4.9.26.tgz"; + url = "https://registry.yarnpkg.com/darkreader/-/darkreader-4.9.26.tgz"; + sha1 = "ad92139742f22fc406ae14d12ec6e5672a7eedde"; + }; + } + { + name = "dashdash___dashdash_1.14.1.tgz"; + path = fetchurl { + name = "dashdash___dashdash_1.14.1.tgz"; + url = "https://registry.yarnpkg.com/dashdash/-/dashdash-1.14.1.tgz"; + sha1 = "853cfa0f7cbe2fed5de20326b8dd581035f6e2f0"; + }; + } + { + name = "data_urls___data_urls_2.0.0.tgz"; + path = fetchurl { + name = "data_urls___data_urls_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/data-urls/-/data-urls-2.0.0.tgz"; + sha1 = "156485a72963a970f5d5821aaf642bef2bf2db9b"; + }; + } + { + name = "debug___debug_2.6.9.tgz"; + path = fetchurl { + name = "debug___debug_2.6.9.tgz"; + url = "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz"; + sha1 = "5d128515df134ff327e90a4c93f4e077a536341f"; + }; + } + { + name = "debug___debug_4.3.1.tgz"; + path = fetchurl { + name = "debug___debug_4.3.1.tgz"; + url = "https://registry.yarnpkg.com/debug/-/debug-4.3.1.tgz"; + sha1 = "f0d229c505e0c6d8c49ac553d1b13dc183f6b2ee"; + }; + } + { + name = "decamelize___decamelize_1.2.0.tgz"; + path = fetchurl { + name = "decamelize___decamelize_1.2.0.tgz"; + url = "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz"; + sha1 = "f6534d15148269b20352e7bee26f501f9a191290"; + }; + } + { + name = "decimal.js___decimal.js_10.2.1.tgz"; + path = fetchurl { + name = "decimal.js___decimal.js_10.2.1.tgz"; + url = "https://registry.yarnpkg.com/decimal.js/-/decimal.js-10.2.1.tgz"; + sha1 = "238ae7b0f0c793d3e3cea410108b35a2c01426a3"; + }; + } + { + name = "decode_uri_component___decode_uri_component_0.2.0.tgz"; + path = fetchurl { + name = "decode_uri_component___decode_uri_component_0.2.0.tgz"; + url = "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.0.tgz"; + sha1 = "eb3913333458775cb84cd1a1fae062106bb87545"; + }; + } + { + name = "decompress_response___decompress_response_3.3.0.tgz"; + path = fetchurl { + name = "decompress_response___decompress_response_3.3.0.tgz"; + url = "https://registry.yarnpkg.com/decompress-response/-/decompress-response-3.3.0.tgz"; + sha1 = "80a4dd323748384bfa248083622aedec982adff3"; + }; + } + { + name = "deep_extend___deep_extend_0.6.0.tgz"; + path = fetchurl { + name = "deep_extend___deep_extend_0.6.0.tgz"; + url = "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.6.0.tgz"; + sha1 = "c4fa7c95404a17a9c3e8ca7e1537312b736330ac"; + }; + } + { + name = "deep_is___deep_is_0.1.3.tgz"; + path = fetchurl { + name = "deep_is___deep_is_0.1.3.tgz"; + url = "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.3.tgz"; + sha1 = "b369d6fb5dbc13eecf524f91b070feedc357cf34"; + }; + } + { + name = "deepmerge___deepmerge_4.2.2.tgz"; + path = fetchurl { + name = "deepmerge___deepmerge_4.2.2.tgz"; + url = "https://registry.yarnpkg.com/deepmerge/-/deepmerge-4.2.2.tgz"; + sha1 = "44d2ea3679b8f4d4ffba33f03d865fc1e7bf4955"; + }; + } + { + name = "defer_to_connect___defer_to_connect_1.1.3.tgz"; + path = fetchurl { + name = "defer_to_connect___defer_to_connect_1.1.3.tgz"; + url = "https://registry.yarnpkg.com/defer-to-connect/-/defer-to-connect-1.1.3.tgz"; + sha1 = "331ae050c08dcf789f8c83a7b81f0ed94f4ac591"; + }; + } + { + name = "define_properties___define_properties_1.1.3.tgz"; + path = fetchurl { + name = "define_properties___define_properties_1.1.3.tgz"; + url = "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.3.tgz"; + sha1 = "cf88da6cbee26fe6db7094f61d870cbd84cee9f1"; + }; + } + { + name = "define_property___define_property_0.2.5.tgz"; + path = fetchurl { + name = "define_property___define_property_0.2.5.tgz"; + url = "https://registry.yarnpkg.com/define-property/-/define-property-0.2.5.tgz"; + sha1 = "c35b1ef918ec3c990f9a5bc57be04aacec5c8116"; + }; + } + { + name = "define_property___define_property_1.0.0.tgz"; + path = fetchurl { + name = "define_property___define_property_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/define-property/-/define-property-1.0.0.tgz"; + sha1 = "769ebaaf3f4a63aad3af9e8d304c9bbe79bfb0e6"; + }; + } + { + name = "define_property___define_property_2.0.2.tgz"; + path = fetchurl { + name = "define_property___define_property_2.0.2.tgz"; + url = "https://registry.yarnpkg.com/define-property/-/define-property-2.0.2.tgz"; + sha1 = "d459689e8d654ba77e02a817f8710d702cb16e9d"; + }; + } + { + name = "delayed_stream___delayed_stream_1.0.0.tgz"; + path = fetchurl { + name = "delayed_stream___delayed_stream_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz"; + sha1 = "df3ae199acadfb7d440aaae0b29e2272b24ec619"; + }; + } + { + name = "detect_newline___detect_newline_3.1.0.tgz"; + path = fetchurl { + name = "detect_newline___detect_newline_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/detect-newline/-/detect-newline-3.1.0.tgz"; + sha1 = "576f5dfc63ae1a192ff192d8ad3af6308991b651"; + }; + } + { + name = "detect_node___detect_node_2.0.4.tgz"; + path = fetchurl { + name = "detect_node___detect_node_2.0.4.tgz"; + url = "https://registry.yarnpkg.com/detect-node/-/detect-node-2.0.4.tgz"; + sha1 = "014ee8f8f669c5c58023da64b8179c083a28c46c"; + }; + } + { + name = "diff_sequences___diff_sequences_26.6.2.tgz"; + path = fetchurl { + name = "diff_sequences___diff_sequences_26.6.2.tgz"; + url = "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-26.6.2.tgz"; + sha1 = "48ba99157de1923412eed41db6b6d4aa9ca7c0b1"; + }; + } + { + name = "dmg_builder___dmg_builder_22.9.1.tgz"; + path = fetchurl { + name = "dmg_builder___dmg_builder_22.9.1.tgz"; + url = "https://registry.yarnpkg.com/dmg-builder/-/dmg-builder-22.9.1.tgz"; + sha1 = "64647224f37ee47fc9bd01947c21cc010a30511f"; + }; + } + { + name = "doctrine___doctrine_3.0.0.tgz"; + path = fetchurl { + name = "doctrine___doctrine_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/doctrine/-/doctrine-3.0.0.tgz"; + sha1 = "addebead72a6574db783639dc87a121773973961"; + }; + } + { + name = "domexception___domexception_2.0.1.tgz"; + path = fetchurl { + name = "domexception___domexception_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/domexception/-/domexception-2.0.1.tgz"; + sha1 = "fb44aefba793e1574b0af6aed2801d057529f304"; + }; + } + { + name = "dot_prop___dot_prop_5.3.0.tgz"; + path = fetchurl { + name = "dot_prop___dot_prop_5.3.0.tgz"; + url = "https://registry.yarnpkg.com/dot-prop/-/dot-prop-5.3.0.tgz"; + sha1 = "90ccce708cd9cd82cc4dc8c3ddd9abdd55b20e88"; + }; + } + { + name = "dotenv_expand___dotenv_expand_5.1.0.tgz"; + path = fetchurl { + name = "dotenv_expand___dotenv_expand_5.1.0.tgz"; + url = "https://registry.yarnpkg.com/dotenv-expand/-/dotenv-expand-5.1.0.tgz"; + sha1 = "3fbaf020bfd794884072ea26b1e9791d45a629f0"; + }; + } + { + name = "dotenv___dotenv_8.2.0.tgz"; + path = fetchurl { + name = "dotenv___dotenv_8.2.0.tgz"; + url = "https://registry.yarnpkg.com/dotenv/-/dotenv-8.2.0.tgz"; + sha1 = "97e619259ada750eea3e4ea3e26bceea5424b16a"; + }; + } + { + name = "duplexer3___duplexer3_0.1.4.tgz"; + path = fetchurl { + name = "duplexer3___duplexer3_0.1.4.tgz"; + url = "https://registry.yarnpkg.com/duplexer3/-/duplexer3-0.1.4.tgz"; + sha1 = "ee01dd1cac0ed3cbc7fdbea37dc0a8f1ce002ce2"; + }; + } + { + name = "ecc_jsbn___ecc_jsbn_0.1.2.tgz"; + path = fetchurl { + name = "ecc_jsbn___ecc_jsbn_0.1.2.tgz"; + url = "https://registry.yarnpkg.com/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz"; + sha1 = "3a83a904e54353287874c564b7549386849a98c9"; + }; + } + { + name = "ejs___ejs_3.1.5.tgz"; + path = fetchurl { + name = "ejs___ejs_3.1.5.tgz"; + url = "https://registry.yarnpkg.com/ejs/-/ejs-3.1.5.tgz"; + sha1 = "aed723844dc20acb4b170cd9ab1017e476a0d93b"; + }; + } + { + name = "electron_builder___electron_builder_22.9.1.tgz"; + path = fetchurl { + name = "electron_builder___electron_builder_22.9.1.tgz"; + url = "https://registry.yarnpkg.com/electron-builder/-/electron-builder-22.9.1.tgz"; + sha1 = "a2962db6f2757bc01d02489f38fafe0809f68f60"; + }; + } + { + name = "electron_publish___electron_publish_22.9.1.tgz"; + path = fetchurl { + name = "electron_publish___electron_publish_22.9.1.tgz"; + url = "https://registry.yarnpkg.com/electron-publish/-/electron-publish-22.9.1.tgz"; + sha1 = "7cc76ac4cc53efd29ee31c1e5facb9724329068e"; + }; + } + { + name = "electron___electron_11.1.0.tgz"; + path = fetchurl { + name = "electron___electron_11.1.0.tgz"; + url = "https://registry.yarnpkg.com/electron/-/electron-11.1.0.tgz"; + sha1 = "8dfdf579d1eb79feef3e3d2937fc022e72129c90"; + }; + } + { + name = "emittery___emittery_0.7.2.tgz"; + path = fetchurl { + name = "emittery___emittery_0.7.2.tgz"; + url = "https://registry.yarnpkg.com/emittery/-/emittery-0.7.2.tgz"; + sha1 = "25595908e13af0f5674ab419396e2fb394cdfa82"; + }; + } + { + name = "emoji_regex___emoji_regex_7.0.3.tgz"; + path = fetchurl { + name = "emoji_regex___emoji_regex_7.0.3.tgz"; + url = "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-7.0.3.tgz"; + sha1 = "933a04052860c85e83c122479c4748a8e4c72156"; + }; + } + { + name = "emoji_regex___emoji_regex_8.0.0.tgz"; + path = fetchurl { + name = "emoji_regex___emoji_regex_8.0.0.tgz"; + url = "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz"; + sha1 = "e818fd69ce5ccfcb404594f842963bf53164cc37"; + }; + } + { + name = "encodeurl___encodeurl_1.0.2.tgz"; + path = fetchurl { + name = "encodeurl___encodeurl_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz"; + sha1 = "ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59"; + }; + } + { + name = "end_of_stream___end_of_stream_1.4.4.tgz"; + path = fetchurl { + name = "end_of_stream___end_of_stream_1.4.4.tgz"; + url = "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.4.tgz"; + sha1 = "5ae64a5f45057baf3626ec14da0ca5e4b2431eb0"; + }; + } + { + name = "enquirer___enquirer_2.3.6.tgz"; + path = fetchurl { + name = "enquirer___enquirer_2.3.6.tgz"; + url = "https://registry.yarnpkg.com/enquirer/-/enquirer-2.3.6.tgz"; + sha1 = "2a7fe5dd634a1e4125a975ec994ff5456dc3734d"; + }; + } + { + name = "env_paths___env_paths_2.2.0.tgz"; + path = fetchurl { + name = "env_paths___env_paths_2.2.0.tgz"; + url = "https://registry.yarnpkg.com/env-paths/-/env-paths-2.2.0.tgz"; + sha1 = "cdca557dc009152917d6166e2febe1f039685e43"; + }; + } + { + name = "error_ex___error_ex_1.3.2.tgz"; + path = fetchurl { + name = "error_ex___error_ex_1.3.2.tgz"; + url = "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.2.tgz"; + sha1 = "b4ac40648107fdcdcfae242f428bea8a14d4f1bf"; + }; + } + { + name = "es6_error___es6_error_4.1.1.tgz"; + path = fetchurl { + name = "es6_error___es6_error_4.1.1.tgz"; + url = "https://registry.yarnpkg.com/es6-error/-/es6-error-4.1.1.tgz"; + sha1 = "9e3af407459deed47e9a91f9b885a84eb05c561d"; + }; + } + { + name = "escalade___escalade_3.1.1.tgz"; + path = fetchurl { + name = "escalade___escalade_3.1.1.tgz"; + url = "https://registry.yarnpkg.com/escalade/-/escalade-3.1.1.tgz"; + sha1 = "d8cfdc7000965c5a0174b4a82eaa5c0552742e40"; + }; + } + { + name = "escape_goat___escape_goat_2.1.1.tgz"; + path = fetchurl { + name = "escape_goat___escape_goat_2.1.1.tgz"; + url = "https://registry.yarnpkg.com/escape-goat/-/escape-goat-2.1.1.tgz"; + sha1 = "1b2dc77003676c457ec760b2dc68edb648188675"; + }; + } + { + name = "escape_string_regexp___escape_string_regexp_1.0.5.tgz"; + path = fetchurl { + name = "escape_string_regexp___escape_string_regexp_1.0.5.tgz"; + url = "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz"; + sha1 = "1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"; + }; + } + { + name = "escape_string_regexp___escape_string_regexp_2.0.0.tgz"; + path = fetchurl { + name = "escape_string_regexp___escape_string_regexp_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz"; + sha1 = "a30304e99daa32e23b2fd20f51babd07cffca344"; + }; + } + { + name = "escape_string_regexp___escape_string_regexp_4.0.0.tgz"; + path = fetchurl { + name = "escape_string_regexp___escape_string_regexp_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz"; + sha1 = "14ba83a5d373e3d311e5afca29cf5bfad965bf34"; + }; + } + { + name = "escodegen___escodegen_1.14.3.tgz"; + path = fetchurl { + name = "escodegen___escodegen_1.14.3.tgz"; + url = "https://registry.yarnpkg.com/escodegen/-/escodegen-1.14.3.tgz"; + sha1 = "4e7b81fba61581dc97582ed78cab7f0e8d63f503"; + }; + } + { + name = "eslint_scope___eslint_scope_5.1.1.tgz"; + path = fetchurl { + name = "eslint_scope___eslint_scope_5.1.1.tgz"; + url = "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-5.1.1.tgz"; + sha1 = "e786e59a66cb92b3f6c1fb0d508aab174848f48c"; + }; + } + { + name = "eslint_utils___eslint_utils_2.1.0.tgz"; + path = fetchurl { + name = "eslint_utils___eslint_utils_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-2.1.0.tgz"; + sha1 = "d2de5e03424e707dc10c74068ddedae708741b27"; + }; + } + { + name = "eslint_visitor_keys___eslint_visitor_keys_1.3.0.tgz"; + path = fetchurl { + name = "eslint_visitor_keys___eslint_visitor_keys_1.3.0.tgz"; + url = "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz"; + sha1 = "30ebd1ef7c2fdff01c3a4f151044af25fab0523e"; + }; + } + { + name = "eslint_visitor_keys___eslint_visitor_keys_2.0.0.tgz"; + path = fetchurl { + name = "eslint_visitor_keys___eslint_visitor_keys_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-2.0.0.tgz"; + sha1 = "21fdc8fbcd9c795cc0321f0563702095751511a8"; + }; + } + { + name = "eslint___eslint_7.15.0.tgz"; + path = fetchurl { + name = "eslint___eslint_7.15.0.tgz"; + url = "https://registry.yarnpkg.com/eslint/-/eslint-7.15.0.tgz"; + sha1 = "eb155fb8ed0865fcf5d903f76be2e5b6cd7e0bc7"; + }; + } + { + name = "espree___espree_7.3.1.tgz"; + path = fetchurl { + name = "espree___espree_7.3.1.tgz"; + url = "https://registry.yarnpkg.com/espree/-/espree-7.3.1.tgz"; + sha1 = "f2df330b752c6f55019f8bd89b7660039c1bbbb6"; + }; + } + { + name = "esprima___esprima_4.0.1.tgz"; + path = fetchurl { + name = "esprima___esprima_4.0.1.tgz"; + url = "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz"; + sha1 = "13b04cdb3e6c5d19df91ab6987a8695619b0aa71"; + }; + } + { + name = "esquery___esquery_1.3.1.tgz"; + path = fetchurl { + name = "esquery___esquery_1.3.1.tgz"; + url = "https://registry.yarnpkg.com/esquery/-/esquery-1.3.1.tgz"; + sha1 = "b78b5828aa8e214e29fb74c4d5b752e1c033da57"; + }; + } + { + name = "esrecurse___esrecurse_4.3.0.tgz"; + path = fetchurl { + name = "esrecurse___esrecurse_4.3.0.tgz"; + url = "https://registry.yarnpkg.com/esrecurse/-/esrecurse-4.3.0.tgz"; + sha1 = "7ad7964d679abb28bee72cec63758b1c5d2c9921"; + }; + } + { + name = "estraverse___estraverse_4.3.0.tgz"; + path = fetchurl { + name = "estraverse___estraverse_4.3.0.tgz"; + url = "https://registry.yarnpkg.com/estraverse/-/estraverse-4.3.0.tgz"; + sha1 = "398ad3f3c5a24948be7725e83d11a7de28cdbd1d"; + }; + } + { + name = "estraverse___estraverse_5.2.0.tgz"; + path = fetchurl { + name = "estraverse___estraverse_5.2.0.tgz"; + url = "https://registry.yarnpkg.com/estraverse/-/estraverse-5.2.0.tgz"; + sha1 = "307df42547e6cc7324d3cf03c155d5cdb8c53880"; + }; + } + { + name = "esutils___esutils_2.0.3.tgz"; + path = fetchurl { + name = "esutils___esutils_2.0.3.tgz"; + url = "https://registry.yarnpkg.com/esutils/-/esutils-2.0.3.tgz"; + sha1 = "74d2eb4de0b8da1293711910d50775b9b710ef64"; + }; + } + { + name = "exec_sh___exec_sh_0.3.4.tgz"; + path = fetchurl { + name = "exec_sh___exec_sh_0.3.4.tgz"; + url = "https://registry.yarnpkg.com/exec-sh/-/exec-sh-0.3.4.tgz"; + sha1 = "3a018ceb526cc6f6df2bb504b2bfe8e3a4934ec5"; + }; + } + { + name = "execa___execa_1.0.0.tgz"; + path = fetchurl { + name = "execa___execa_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/execa/-/execa-1.0.0.tgz"; + sha1 = "c6236a5bb4df6d6f15e88e7f017798216749ddd8"; + }; + } + { + name = "execa___execa_4.1.0.tgz"; + path = fetchurl { + name = "execa___execa_4.1.0.tgz"; + url = "https://registry.yarnpkg.com/execa/-/execa-4.1.0.tgz"; + sha1 = "4e5491ad1572f2f17a77d388c6c857135b22847a"; + }; + } + { + name = "exit_on_epipe___exit_on_epipe_1.0.1.tgz"; + path = fetchurl { + name = "exit_on_epipe___exit_on_epipe_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/exit-on-epipe/-/exit-on-epipe-1.0.1.tgz"; + sha1 = "0bdd92e87d5285d267daa8171d0eb06159689692"; + }; + } + { + name = "exit___exit_0.1.2.tgz"; + path = fetchurl { + name = "exit___exit_0.1.2.tgz"; + url = "https://registry.yarnpkg.com/exit/-/exit-0.1.2.tgz"; + sha1 = "0632638f8d877cc82107d30a0fff1a17cba1cd0c"; + }; + } + { + name = "expand_brackets___expand_brackets_2.1.4.tgz"; + path = fetchurl { + name = "expand_brackets___expand_brackets_2.1.4.tgz"; + url = "https://registry.yarnpkg.com/expand-brackets/-/expand-brackets-2.1.4.tgz"; + sha1 = "b77735e315ce30f6b6eff0f83b04151a22449622"; + }; + } + { + name = "expect___expect_26.6.2.tgz"; + path = fetchurl { + name = "expect___expect_26.6.2.tgz"; + url = "https://registry.yarnpkg.com/expect/-/expect-26.6.2.tgz"; + sha1 = "c6b996bf26bf3fe18b67b2d0f51fc981ba934417"; + }; + } + { + name = "extend_shallow___extend_shallow_2.0.1.tgz"; + path = fetchurl { + name = "extend_shallow___extend_shallow_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-2.0.1.tgz"; + sha1 = "51af7d614ad9a9f610ea1bafbb989d6b1c56890f"; + }; + } + { + name = "extend_shallow___extend_shallow_3.0.2.tgz"; + path = fetchurl { + name = "extend_shallow___extend_shallow_3.0.2.tgz"; + url = "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-3.0.2.tgz"; + sha1 = "26a71aaf073b39fb2127172746131c2704028db8"; + }; + } + { + name = "extend___extend_3.0.2.tgz"; + path = fetchurl { + name = "extend___extend_3.0.2.tgz"; + url = "https://registry.yarnpkg.com/extend/-/extend-3.0.2.tgz"; + sha1 = "f8b1136b4071fbd8eb140aff858b1019ec2915fa"; + }; + } + { + name = "extglob___extglob_2.0.4.tgz"; + path = fetchurl { + name = "extglob___extglob_2.0.4.tgz"; + url = "https://registry.yarnpkg.com/extglob/-/extglob-2.0.4.tgz"; + sha1 = "ad00fe4dc612a9232e8718711dc5cb5ab0285543"; + }; + } + { + name = "extract_zip___extract_zip_1.7.0.tgz"; + path = fetchurl { + name = "extract_zip___extract_zip_1.7.0.tgz"; + url = "https://registry.yarnpkg.com/extract-zip/-/extract-zip-1.7.0.tgz"; + sha1 = "556cc3ae9df7f452c493a0cfb51cc30277940927"; + }; + } + { + name = "extsprintf___extsprintf_1.3.0.tgz"; + path = fetchurl { + name = "extsprintf___extsprintf_1.3.0.tgz"; + url = "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.3.0.tgz"; + sha1 = "96918440e3041a7a414f8c52e3c574eb3c3e1e05"; + }; + } + { + name = "extsprintf___extsprintf_1.4.0.tgz"; + path = fetchurl { + name = "extsprintf___extsprintf_1.4.0.tgz"; + url = "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.4.0.tgz"; + sha1 = "e2689f8f356fad62cca65a3a91c5df5f9551692f"; + }; + } + { + name = "fast_deep_equal___fast_deep_equal_3.1.3.tgz"; + path = fetchurl { + name = "fast_deep_equal___fast_deep_equal_3.1.3.tgz"; + url = "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz"; + sha1 = "3a7d56b559d6cbc3eb512325244e619a65c6c525"; + }; + } + { + name = "fast_json_stable_stringify___fast_json_stable_stringify_2.1.0.tgz"; + path = fetchurl { + name = "fast_json_stable_stringify___fast_json_stable_stringify_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz"; + sha1 = "874bf69c6f404c2b5d99c481341399fd55892633"; + }; + } + { + name = "fast_levenshtein___fast_levenshtein_2.0.6.tgz"; + path = fetchurl { + name = "fast_levenshtein___fast_levenshtein_2.0.6.tgz"; + url = "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz"; + sha1 = "3d8a5c66883a16a30ca8643e851f19baa7797917"; + }; + } + { + name = "fb_watchman___fb_watchman_2.0.1.tgz"; + path = fetchurl { + name = "fb_watchman___fb_watchman_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/fb-watchman/-/fb-watchman-2.0.1.tgz"; + sha1 = "fc84fb39d2709cf3ff6d743706157bb5708a8a85"; + }; + } + { + name = "fd_slicer___fd_slicer_1.1.0.tgz"; + path = fetchurl { + name = "fd_slicer___fd_slicer_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/fd-slicer/-/fd-slicer-1.1.0.tgz"; + sha1 = "25c7c89cb1f9077f8891bbe61d8f390eae256f1e"; + }; + } + { + name = "file_entry_cache___file_entry_cache_6.0.0.tgz"; + path = fetchurl { + name = "file_entry_cache___file_entry_cache_6.0.0.tgz"; + url = "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-6.0.0.tgz"; + sha1 = "7921a89c391c6d93efec2169ac6bf300c527ea0a"; + }; + } + { + name = "filelist___filelist_1.0.1.tgz"; + path = fetchurl { + name = "filelist___filelist_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/filelist/-/filelist-1.0.1.tgz"; + sha1 = "f10d1a3ae86c1694808e8f20906f43d4c9132dbb"; + }; + } + { + name = "fill_range___fill_range_4.0.0.tgz"; + path = fetchurl { + name = "fill_range___fill_range_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/fill-range/-/fill-range-4.0.0.tgz"; + sha1 = "d544811d428f98eb06a63dc402d2403c328c38f7"; + }; + } + { + name = "fill_range___fill_range_7.0.1.tgz"; + path = fetchurl { + name = "fill_range___fill_range_7.0.1.tgz"; + url = "https://registry.yarnpkg.com/fill-range/-/fill-range-7.0.1.tgz"; + sha1 = "1919a6a7c75fe38b2c7c77e5198535da9acdda40"; + }; + } + { + name = "find_up___find_up_4.1.0.tgz"; + path = fetchurl { + name = "find_up___find_up_4.1.0.tgz"; + url = "https://registry.yarnpkg.com/find-up/-/find-up-4.1.0.tgz"; + sha1 = "97afe7d6cdc0bc5928584b7c8d7b16e8a9aa5d19"; + }; + } + { + name = "flat_cache___flat_cache_3.0.4.tgz"; + path = fetchurl { + name = "flat_cache___flat_cache_3.0.4.tgz"; + url = "https://registry.yarnpkg.com/flat-cache/-/flat-cache-3.0.4.tgz"; + sha1 = "61b0338302b2fe9f957dcc32fc2a87f1c3048b11"; + }; + } + { + name = "flatted___flatted_3.1.0.tgz"; + path = fetchurl { + name = "flatted___flatted_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/flatted/-/flatted-3.1.0.tgz"; + sha1 = "a5d06b4a8b01e3a63771daa5cb7a1903e2e57067"; + }; + } + { + name = "for_in___for_in_1.0.2.tgz"; + path = fetchurl { + name = "for_in___for_in_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz"; + sha1 = "81068d295a8142ec0ac726c6e2200c30fb6d5e80"; + }; + } + { + name = "forever_agent___forever_agent_0.6.1.tgz"; + path = fetchurl { + name = "forever_agent___forever_agent_0.6.1.tgz"; + url = "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz"; + sha1 = "fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"; + }; + } + { + name = "form_data___form_data_2.3.3.tgz"; + path = fetchurl { + name = "form_data___form_data_2.3.3.tgz"; + url = "https://registry.yarnpkg.com/form-data/-/form-data-2.3.3.tgz"; + sha1 = "dcce52c05f644f298c6a7ab936bd724ceffbf3a6"; + }; + } + { + name = "fragment_cache___fragment_cache_0.2.1.tgz"; + path = fetchurl { + name = "fragment_cache___fragment_cache_0.2.1.tgz"; + url = "https://registry.yarnpkg.com/fragment-cache/-/fragment-cache-0.2.1.tgz"; + sha1 = "4290fad27f13e89be7f33799c6bc5a0abfff0d19"; + }; + } + { + name = "fs_constants___fs_constants_1.0.0.tgz"; + path = fetchurl { + name = "fs_constants___fs_constants_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/fs-constants/-/fs-constants-1.0.0.tgz"; + sha1 = "6be0de9be998ce16af8afc24497b9ee9b7ccd9ad"; + }; + } + { + name = "fs_extra___fs_extra_8.1.0.tgz"; + path = fetchurl { + name = "fs_extra___fs_extra_8.1.0.tgz"; + url = "https://registry.yarnpkg.com/fs-extra/-/fs-extra-8.1.0.tgz"; + sha1 = "49d43c45a88cd9677668cb7be1b46efdb8d2e1c0"; + }; + } + { + name = "fs_extra___fs_extra_9.0.1.tgz"; + path = fetchurl { + name = "fs_extra___fs_extra_9.0.1.tgz"; + url = "https://registry.yarnpkg.com/fs-extra/-/fs-extra-9.0.1.tgz"; + sha1 = "910da0062437ba4c39fedd863f1675ccfefcb9fc"; + }; + } + { + name = "fs.realpath___fs.realpath_1.0.0.tgz"; + path = fetchurl { + name = "fs.realpath___fs.realpath_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz"; + sha1 = "1504ad2523158caa40db4a2787cb01411994ea4f"; + }; + } + { + name = "fsevents___fsevents_2.2.1.tgz"; + path = fetchurl { + name = "fsevents___fsevents_2.2.1.tgz"; + url = "https://registry.yarnpkg.com/fsevents/-/fsevents-2.2.1.tgz"; + sha1 = "1fb02ded2036a8ac288d507a65962bd87b97628d"; + }; + } + { + name = "function_bind___function_bind_1.1.1.tgz"; + path = fetchurl { + name = "function_bind___function_bind_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz"; + sha1 = "a56899d3ea3c9bab874bb9773b7c5ede92f4895d"; + }; + } + { + name = "functional_red_black_tree___functional_red_black_tree_1.0.1.tgz"; + path = fetchurl { + name = "functional_red_black_tree___functional_red_black_tree_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz"; + sha1 = "1b0ab3bd553b2a0d6399d29c0e3ea0b252078327"; + }; + } + { + name = "gensync___gensync_1.0.0_beta.2.tgz"; + path = fetchurl { + name = "gensync___gensync_1.0.0_beta.2.tgz"; + url = "https://registry.yarnpkg.com/gensync/-/gensync-1.0.0-beta.2.tgz"; + sha1 = "32a6ee76c3d7f52d46b2b1ae5d93fea8580a25e0"; + }; + } + { + name = "get_caller_file___get_caller_file_2.0.5.tgz"; + path = fetchurl { + name = "get_caller_file___get_caller_file_2.0.5.tgz"; + url = "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz"; + sha1 = "4f94412a82db32f36e3b0b9741f8a97feb031f7e"; + }; + } + { + name = "get_package_type___get_package_type_0.1.0.tgz"; + path = fetchurl { + name = "get_package_type___get_package_type_0.1.0.tgz"; + url = "https://registry.yarnpkg.com/get-package-type/-/get-package-type-0.1.0.tgz"; + sha1 = "8de2d803cff44df3bc6c456e6668b36c3926e11a"; + }; + } + { + name = "get_stream___get_stream_4.1.0.tgz"; + path = fetchurl { + name = "get_stream___get_stream_4.1.0.tgz"; + url = "https://registry.yarnpkg.com/get-stream/-/get-stream-4.1.0.tgz"; + sha1 = "c1b255575f3dc21d59bfc79cd3d2b46b1c3a54b5"; + }; + } + { + name = "get_stream___get_stream_5.2.0.tgz"; + path = fetchurl { + name = "get_stream___get_stream_5.2.0.tgz"; + url = "https://registry.yarnpkg.com/get-stream/-/get-stream-5.2.0.tgz"; + sha1 = "4966a1795ee5ace65e706c4b7beb71257d6e22d3"; + }; + } + { + name = "get_value___get_value_2.0.6.tgz"; + path = fetchurl { + name = "get_value___get_value_2.0.6.tgz"; + url = "https://registry.yarnpkg.com/get-value/-/get-value-2.0.6.tgz"; + sha1 = "dc15ca1c672387ca76bd37ac0a395ba2042a2c28"; + }; + } + { + name = "getpass___getpass_0.1.7.tgz"; + path = fetchurl { + name = "getpass___getpass_0.1.7.tgz"; + url = "https://registry.yarnpkg.com/getpass/-/getpass-0.1.7.tgz"; + sha1 = "5eff8e3e684d569ae4cb2b1282604e8ba62149fa"; + }; + } + { + name = "glob_parent___glob_parent_5.1.1.tgz"; + path = fetchurl { + name = "glob_parent___glob_parent_5.1.1.tgz"; + url = "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.1.tgz"; + sha1 = "b6c1ef417c4e5663ea498f1c45afac6916bbc229"; + }; + } + { + name = "glob___glob_7.1.6.tgz"; + path = fetchurl { + name = "glob___glob_7.1.6.tgz"; + url = "https://registry.yarnpkg.com/glob/-/glob-7.1.6.tgz"; + sha1 = "141f33b81a7c2492e125594307480c46679278a6"; + }; + } + { + name = "global_agent___global_agent_2.1.12.tgz"; + path = fetchurl { + name = "global_agent___global_agent_2.1.12.tgz"; + url = "https://registry.yarnpkg.com/global-agent/-/global-agent-2.1.12.tgz"; + sha1 = "e4ae3812b731a9e81cbf825f9377ef450a8e4195"; + }; + } + { + name = "global_dirs___global_dirs_2.0.1.tgz"; + path = fetchurl { + name = "global_dirs___global_dirs_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/global-dirs/-/global-dirs-2.0.1.tgz"; + sha1 = "acdf3bb6685bcd55cb35e8a052266569e9469201"; + }; + } + { + name = "global_tunnel_ng___global_tunnel_ng_2.7.1.tgz"; + path = fetchurl { + name = "global_tunnel_ng___global_tunnel_ng_2.7.1.tgz"; + url = "https://registry.yarnpkg.com/global-tunnel-ng/-/global-tunnel-ng-2.7.1.tgz"; + sha1 = "d03b5102dfde3a69914f5ee7d86761ca35d57d8f"; + }; + } + { + name = "globals___globals_11.12.0.tgz"; + path = fetchurl { + name = "globals___globals_11.12.0.tgz"; + url = "https://registry.yarnpkg.com/globals/-/globals-11.12.0.tgz"; + sha1 = "ab8795338868a0babd8525758018c2a7eb95c42e"; + }; + } + { + name = "globals___globals_12.4.0.tgz"; + path = fetchurl { + name = "globals___globals_12.4.0.tgz"; + url = "https://registry.yarnpkg.com/globals/-/globals-12.4.0.tgz"; + sha1 = "a18813576a41b00a24a97e7f815918c2e19925f8"; + }; + } + { + name = "globalthis___globalthis_1.0.1.tgz"; + path = fetchurl { + name = "globalthis___globalthis_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/globalthis/-/globalthis-1.0.1.tgz"; + sha1 = "40116f5d9c071f9e8fb0037654df1ab3a83b7ef9"; + }; + } + { + name = "got___got_9.6.0.tgz"; + path = fetchurl { + name = "got___got_9.6.0.tgz"; + url = "https://registry.yarnpkg.com/got/-/got-9.6.0.tgz"; + sha1 = "edf45e7d67f99545705de1f7bbeeeb121765ed85"; + }; + } + { + name = "graceful_fs___graceful_fs_4.2.4.tgz"; + path = fetchurl { + name = "graceful_fs___graceful_fs_4.2.4.tgz"; + url = "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.4.tgz"; + sha1 = "2256bde14d3632958c465ebc96dc467ca07a29fb"; + }; + } + { + name = "growly___growly_1.3.0.tgz"; + path = fetchurl { + name = "growly___growly_1.3.0.tgz"; + url = "https://registry.yarnpkg.com/growly/-/growly-1.3.0.tgz"; + sha1 = "f10748cbe76af964b7c96c93c6bcc28af120c081"; + }; + } + { + name = "har_schema___har_schema_2.0.0.tgz"; + path = fetchurl { + name = "har_schema___har_schema_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/har-schema/-/har-schema-2.0.0.tgz"; + sha1 = "a94c2224ebcac04782a0d9035521f24735b7ec92"; + }; + } + { + name = "har_validator___har_validator_5.1.5.tgz"; + path = fetchurl { + name = "har_validator___har_validator_5.1.5.tgz"; + url = "https://registry.yarnpkg.com/har-validator/-/har-validator-5.1.5.tgz"; + sha1 = "1f0803b9f8cb20c0fa13822df1ecddb36bde1efd"; + }; + } + { + name = "has_flag___has_flag_3.0.0.tgz"; + path = fetchurl { + name = "has_flag___has_flag_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz"; + sha1 = "b5d454dc2199ae225699f3467e5a07f3b955bafd"; + }; + } + { + name = "has_flag___has_flag_4.0.0.tgz"; + path = fetchurl { + name = "has_flag___has_flag_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz"; + sha1 = "944771fd9c81c81265c4d6941860da06bb59479b"; + }; + } + { + name = "has_value___has_value_0.3.1.tgz"; + path = fetchurl { + name = "has_value___has_value_0.3.1.tgz"; + url = "https://registry.yarnpkg.com/has-value/-/has-value-0.3.1.tgz"; + sha1 = "7b1f58bada62ca827ec0a2078025654845995e1f"; + }; + } + { + name = "has_value___has_value_1.0.0.tgz"; + path = fetchurl { + name = "has_value___has_value_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/has-value/-/has-value-1.0.0.tgz"; + sha1 = "18b281da585b1c5c51def24c930ed29a0be6b177"; + }; + } + { + name = "has_values___has_values_0.1.4.tgz"; + path = fetchurl { + name = "has_values___has_values_0.1.4.tgz"; + url = "https://registry.yarnpkg.com/has-values/-/has-values-0.1.4.tgz"; + sha1 = "6d61de95d91dfca9b9a02089ad384bff8f62b771"; + }; + } + { + name = "has_values___has_values_1.0.0.tgz"; + path = fetchurl { + name = "has_values___has_values_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/has-values/-/has-values-1.0.0.tgz"; + sha1 = "95b0b63fec2146619a6fe57fe75628d5a39efe4f"; + }; + } + { + name = "has_yarn___has_yarn_2.1.0.tgz"; + path = fetchurl { + name = "has_yarn___has_yarn_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/has-yarn/-/has-yarn-2.1.0.tgz"; + sha1 = "137e11354a7b5bf11aa5cb649cf0c6f3ff2b2e77"; + }; + } + { + name = "has___has_1.0.3.tgz"; + path = fetchurl { + name = "has___has_1.0.3.tgz"; + url = "https://registry.yarnpkg.com/has/-/has-1.0.3.tgz"; + sha1 = "722d7cbfc1f6aa8241f16dd814e011e1f41e8796"; + }; + } + { + name = "hosted_git_info___hosted_git_info_2.8.8.tgz"; + path = fetchurl { + name = "hosted_git_info___hosted_git_info_2.8.8.tgz"; + url = "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.8.tgz"; + sha1 = "7539bd4bc1e0e0a895815a2e0262420b12858488"; + }; + } + { + name = "hosted_git_info___hosted_git_info_3.0.7.tgz"; + path = fetchurl { + name = "hosted_git_info___hosted_git_info_3.0.7.tgz"; + url = "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-3.0.7.tgz"; + sha1 = "a30727385ea85acfcee94e0aad9e368c792e036c"; + }; + } + { + name = "html_comment_regex___html_comment_regex_1.1.2.tgz"; + path = fetchurl { + name = "html_comment_regex___html_comment_regex_1.1.2.tgz"; + url = "https://registry.yarnpkg.com/html-comment-regex/-/html-comment-regex-1.1.2.tgz"; + sha1 = "97d4688aeb5c81886a364faa0cad1dda14d433a7"; + }; + } + { + name = "html_encoding_sniffer___html_encoding_sniffer_2.0.1.tgz"; + path = fetchurl { + name = "html_encoding_sniffer___html_encoding_sniffer_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/html-encoding-sniffer/-/html-encoding-sniffer-2.0.1.tgz"; + sha1 = "42a6dc4fd33f00281176e8b23759ca4e4fa185f3"; + }; + } + { + name = "html_escaper___html_escaper_2.0.2.tgz"; + path = fetchurl { + name = "html_escaper___html_escaper_2.0.2.tgz"; + url = "https://registry.yarnpkg.com/html-escaper/-/html-escaper-2.0.2.tgz"; + sha1 = "dfd60027da36a36dfcbe236262c00a5822681453"; + }; + } + { + name = "http_cache_semantics___http_cache_semantics_4.1.0.tgz"; + path = fetchurl { + name = "http_cache_semantics___http_cache_semantics_4.1.0.tgz"; + url = "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-4.1.0.tgz"; + sha1 = "49e91c5cbf36c9b94bcfcd71c23d5249ec74e390"; + }; + } + { + name = "http_signature___http_signature_1.2.0.tgz"; + path = fetchurl { + name = "http_signature___http_signature_1.2.0.tgz"; + url = "https://registry.yarnpkg.com/http-signature/-/http-signature-1.2.0.tgz"; + sha1 = "9aecd925114772f3d95b65a60abb8f7c18fbace1"; + }; + } + { + name = "human_signals___human_signals_1.1.1.tgz"; + path = fetchurl { + name = "human_signals___human_signals_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/human-signals/-/human-signals-1.1.1.tgz"; + sha1 = "c5b1cd14f50aeae09ab6c59fe63ba3395fe4dfa3"; + }; + } + { + name = "iconv_lite___iconv_lite_0.4.24.tgz"; + path = fetchurl { + name = "iconv_lite___iconv_lite_0.4.24.tgz"; + url = "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz"; + sha1 = "2022b4b25fbddc21d2f524974a474aafe733908b"; + }; + } + { + name = "iconv_lite___iconv_lite_0.6.2.tgz"; + path = fetchurl { + name = "iconv_lite___iconv_lite_0.6.2.tgz"; + url = "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.6.2.tgz"; + sha1 = "ce13d1875b0c3a674bd6a04b7f76b01b1b6ded01"; + }; + } + { + name = "ieee754___ieee754_1.2.1.tgz"; + path = fetchurl { + name = "ieee754___ieee754_1.2.1.tgz"; + url = "https://registry.yarnpkg.com/ieee754/-/ieee754-1.2.1.tgz"; + sha1 = "8eb7a10a63fff25d15a57b001586d177d1b0d352"; + }; + } + { + name = "ignore___ignore_4.0.6.tgz"; + path = fetchurl { + name = "ignore___ignore_4.0.6.tgz"; + url = "https://registry.yarnpkg.com/ignore/-/ignore-4.0.6.tgz"; + sha1 = "750e3db5862087b4737ebac8207ffd1ef27b25fc"; + }; + } + { + name = "import_fresh___import_fresh_3.2.2.tgz"; + path = fetchurl { + name = "import_fresh___import_fresh_3.2.2.tgz"; + url = "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.2.2.tgz"; + sha1 = "fc129c160c5d68235507f4331a6baad186bdbc3e"; + }; + } + { + name = "import_lazy___import_lazy_2.1.0.tgz"; + path = fetchurl { + name = "import_lazy___import_lazy_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/import-lazy/-/import-lazy-2.1.0.tgz"; + sha1 = "05698e3d45c88e8d7e9d92cb0584e77f096f3e43"; + }; + } + { + name = "import_local___import_local_3.0.2.tgz"; + path = fetchurl { + name = "import_local___import_local_3.0.2.tgz"; + url = "https://registry.yarnpkg.com/import-local/-/import-local-3.0.2.tgz"; + sha1 = "a8cfd0431d1de4a2199703d003e3e62364fa6db6"; + }; + } + { + name = "imurmurhash___imurmurhash_0.1.4.tgz"; + path = fetchurl { + name = "imurmurhash___imurmurhash_0.1.4.tgz"; + url = "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz"; + sha1 = "9218b9b2b928a238b13dc4fb6b6d576f231453ea"; + }; + } + { + name = "inflight___inflight_1.0.6.tgz"; + path = fetchurl { + name = "inflight___inflight_1.0.6.tgz"; + url = "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz"; + sha1 = "49bd6331d7d02d0c09bc910a1075ba8165b56df9"; + }; + } + { + name = "inherits___inherits_2.0.4.tgz"; + path = fetchurl { + name = "inherits___inherits_2.0.4.tgz"; + url = "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz"; + sha1 = "0fa2c64f932917c3433a0ded55363aae37416b7c"; + }; + } + { + name = "ini___ini_1.3.8.tgz"; + path = fetchurl { + name = "ini___ini_1.3.8.tgz"; + url = "https://registry.yarnpkg.com/ini/-/ini-1.3.8.tgz"; + sha1 = "a29da425b48806f34767a4efce397269af28432c"; + }; + } + { + name = "ip_regex___ip_regex_2.1.0.tgz"; + path = fetchurl { + name = "ip_regex___ip_regex_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/ip-regex/-/ip-regex-2.1.0.tgz"; + sha1 = "fa78bf5d2e6913c911ce9f819ee5146bb6d844e9"; + }; + } + { + name = "is_accessor_descriptor___is_accessor_descriptor_0.1.6.tgz"; + path = fetchurl { + name = "is_accessor_descriptor___is_accessor_descriptor_0.1.6.tgz"; + url = "https://registry.yarnpkg.com/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz"; + sha1 = "a9e12cb3ae8d876727eeef3843f8a0897b5c98d6"; + }; + } + { + name = "is_accessor_descriptor___is_accessor_descriptor_1.0.0.tgz"; + path = fetchurl { + name = "is_accessor_descriptor___is_accessor_descriptor_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz"; + sha1 = "169c2f6d3df1f992618072365c9b0ea1f6878656"; + }; + } + { + name = "is_arrayish___is_arrayish_0.2.1.tgz"; + path = fetchurl { + name = "is_arrayish___is_arrayish_0.2.1.tgz"; + url = "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz"; + sha1 = "77c99840527aa8ecb1a8ba697b80645a7a926a9d"; + }; + } + { + name = "is_buffer___is_buffer_1.1.6.tgz"; + path = fetchurl { + name = "is_buffer___is_buffer_1.1.6.tgz"; + url = "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz"; + sha1 = "efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be"; + }; + } + { + name = "is_ci___is_ci_2.0.0.tgz"; + path = fetchurl { + name = "is_ci___is_ci_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/is-ci/-/is-ci-2.0.0.tgz"; + sha1 = "6bc6334181810e04b5c22b3d589fdca55026404c"; + }; + } + { + name = "is_core_module___is_core_module_2.2.0.tgz"; + path = fetchurl { + name = "is_core_module___is_core_module_2.2.0.tgz"; + url = "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.2.0.tgz"; + sha1 = "97037ef3d52224d85163f5597b2b63d9afed981a"; + }; + } + { + name = "is_data_descriptor___is_data_descriptor_0.1.4.tgz"; + path = fetchurl { + name = "is_data_descriptor___is_data_descriptor_0.1.4.tgz"; + url = "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz"; + sha1 = "0b5ee648388e2c860282e793f1856fec3f301b56"; + }; + } + { + name = "is_data_descriptor___is_data_descriptor_1.0.0.tgz"; + path = fetchurl { + name = "is_data_descriptor___is_data_descriptor_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz"; + sha1 = "d84876321d0e7add03990406abbbbd36ba9268c7"; + }; + } + { + name = "is_descriptor___is_descriptor_0.1.6.tgz"; + path = fetchurl { + name = "is_descriptor___is_descriptor_0.1.6.tgz"; + url = "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-0.1.6.tgz"; + sha1 = "366d8240dde487ca51823b1ab9f07a10a78251ca"; + }; + } + { + name = "is_descriptor___is_descriptor_1.0.2.tgz"; + path = fetchurl { + name = "is_descriptor___is_descriptor_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-1.0.2.tgz"; + sha1 = "3b159746a66604b04f8c81524ba365c5f14d86ec"; + }; + } + { + name = "is_docker___is_docker_2.1.1.tgz"; + path = fetchurl { + name = "is_docker___is_docker_2.1.1.tgz"; + url = "https://registry.yarnpkg.com/is-docker/-/is-docker-2.1.1.tgz"; + sha1 = "4125a88e44e450d384e09047ede71adc2d144156"; + }; + } + { + name = "is_extendable___is_extendable_0.1.1.tgz"; + path = fetchurl { + name = "is_extendable___is_extendable_0.1.1.tgz"; + url = "https://registry.yarnpkg.com/is-extendable/-/is-extendable-0.1.1.tgz"; + sha1 = "62b110e289a471418e3ec36a617d472e301dfc89"; + }; + } + { + name = "is_extendable___is_extendable_1.0.1.tgz"; + path = fetchurl { + name = "is_extendable___is_extendable_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/is-extendable/-/is-extendable-1.0.1.tgz"; + sha1 = "a7470f9e426733d81bd81e1155264e3a3507cab4"; + }; + } + { + name = "is_extglob___is_extglob_2.1.1.tgz"; + path = fetchurl { + name = "is_extglob___is_extglob_2.1.1.tgz"; + url = "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz"; + sha1 = "a88c02535791f02ed37c76a1b9ea9773c833f8c2"; + }; + } + { + name = "is_fullwidth_code_point___is_fullwidth_code_point_2.0.0.tgz"; + path = fetchurl { + name = "is_fullwidth_code_point___is_fullwidth_code_point_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz"; + sha1 = "a3b30a5c4f199183167aaab93beefae3ddfb654f"; + }; + } + { + name = "is_fullwidth_code_point___is_fullwidth_code_point_3.0.0.tgz"; + path = fetchurl { + name = "is_fullwidth_code_point___is_fullwidth_code_point_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz"; + sha1 = "f116f8064fe90b3f7844a38997c0b75051269f1d"; + }; + } + { + name = "is_generator_fn___is_generator_fn_2.1.0.tgz"; + path = fetchurl { + name = "is_generator_fn___is_generator_fn_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/is-generator-fn/-/is-generator-fn-2.1.0.tgz"; + sha1 = "7d140adc389aaf3011a8f2a2a4cfa6faadffb118"; + }; + } + { + name = "is_glob___is_glob_4.0.1.tgz"; + path = fetchurl { + name = "is_glob___is_glob_4.0.1.tgz"; + url = "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.1.tgz"; + sha1 = "7567dbe9f2f5e2467bc77ab83c4a29482407a5dc"; + }; + } + { + name = "is_installed_globally___is_installed_globally_0.3.2.tgz"; + path = fetchurl { + name = "is_installed_globally___is_installed_globally_0.3.2.tgz"; + url = "https://registry.yarnpkg.com/is-installed-globally/-/is-installed-globally-0.3.2.tgz"; + sha1 = "fd3efa79ee670d1187233182d5b0a1dd00313141"; + }; + } + { + name = "is_npm___is_npm_4.0.0.tgz"; + path = fetchurl { + name = "is_npm___is_npm_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/is-npm/-/is-npm-4.0.0.tgz"; + sha1 = "c90dd8380696df87a7a6d823c20d0b12bbe3c84d"; + }; + } + { + name = "is_number___is_number_3.0.0.tgz"; + path = fetchurl { + name = "is_number___is_number_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/is-number/-/is-number-3.0.0.tgz"; + sha1 = "24fd6201a4782cf50561c810276afc7d12d71195"; + }; + } + { + name = "is_number___is_number_7.0.0.tgz"; + path = fetchurl { + name = "is_number___is_number_7.0.0.tgz"; + url = "https://registry.yarnpkg.com/is-number/-/is-number-7.0.0.tgz"; + sha1 = "7535345b896734d5f80c4d06c50955527a14f12b"; + }; + } + { + name = "is_obj___is_obj_2.0.0.tgz"; + path = fetchurl { + name = "is_obj___is_obj_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/is-obj/-/is-obj-2.0.0.tgz"; + sha1 = "473fb05d973705e3fd9620545018ca8e22ef4982"; + }; + } + { + name = "is_path_inside___is_path_inside_3.0.2.tgz"; + path = fetchurl { + name = "is_path_inside___is_path_inside_3.0.2.tgz"; + url = "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-3.0.2.tgz"; + sha1 = "f5220fc82a3e233757291dddc9c5877f2a1f3017"; + }; + } + { + name = "is_plain_object___is_plain_object_2.0.4.tgz"; + path = fetchurl { + name = "is_plain_object___is_plain_object_2.0.4.tgz"; + url = "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-2.0.4.tgz"; + sha1 = "2c163b3fafb1b606d9d17928f05c2a1c38e07677"; + }; + } + { + name = "is_potential_custom_element_name___is_potential_custom_element_name_1.0.0.tgz"; + path = fetchurl { + name = "is_potential_custom_element_name___is_potential_custom_element_name_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.0.tgz"; + sha1 = "0c52e54bcca391bb2c494b21e8626d7336c6e397"; + }; + } + { + name = "is_stream___is_stream_1.1.0.tgz"; + path = fetchurl { + name = "is_stream___is_stream_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz"; + sha1 = "12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44"; + }; + } + { + name = "is_stream___is_stream_2.0.0.tgz"; + path = fetchurl { + name = "is_stream___is_stream_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/is-stream/-/is-stream-2.0.0.tgz"; + sha1 = "bde9c32680d6fae04129d6ac9d921ce7815f78e3"; + }; + } + { + name = "is_svg___is_svg_4.2.1.tgz"; + path = fetchurl { + name = "is_svg___is_svg_4.2.1.tgz"; + url = "https://registry.yarnpkg.com/is-svg/-/is-svg-4.2.1.tgz"; + sha1 = "095b496e345fec9211c2a7d5d021003e040d6f81"; + }; + } + { + name = "is_typedarray___is_typedarray_1.0.0.tgz"; + path = fetchurl { + name = "is_typedarray___is_typedarray_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz"; + sha1 = "e479c80858df0c1b11ddda6940f96011fcda4a9a"; + }; + } + { + name = "is_windows___is_windows_1.0.2.tgz"; + path = fetchurl { + name = "is_windows___is_windows_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/is-windows/-/is-windows-1.0.2.tgz"; + sha1 = "d1850eb9791ecd18e6182ce12a30f396634bb19d"; + }; + } + { + name = "is_wsl___is_wsl_2.2.0.tgz"; + path = fetchurl { + name = "is_wsl___is_wsl_2.2.0.tgz"; + url = "https://registry.yarnpkg.com/is-wsl/-/is-wsl-2.2.0.tgz"; + sha1 = "74a4c76e77ca9fd3f932f290c17ea326cd157271"; + }; + } + { + name = "is_yarn_global___is_yarn_global_0.3.0.tgz"; + path = fetchurl { + name = "is_yarn_global___is_yarn_global_0.3.0.tgz"; + url = "https://registry.yarnpkg.com/is-yarn-global/-/is-yarn-global-0.3.0.tgz"; + sha1 = "d502d3382590ea3004893746754c89139973e232"; + }; + } + { + name = "isarray___isarray_1.0.0.tgz"; + path = fetchurl { + name = "isarray___isarray_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz"; + sha1 = "bb935d48582cba168c06834957a54a3e07124f11"; + }; + } + { + name = "isbinaryfile___isbinaryfile_4.0.6.tgz"; + path = fetchurl { + name = "isbinaryfile___isbinaryfile_4.0.6.tgz"; + url = "https://registry.yarnpkg.com/isbinaryfile/-/isbinaryfile-4.0.6.tgz"; + sha1 = "edcb62b224e2b4710830b67498c8e4e5a4d2610b"; + }; + } + { + name = "isexe___isexe_2.0.0.tgz"; + path = fetchurl { + name = "isexe___isexe_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz"; + sha1 = "e8fbf374dc556ff8947a10dcb0572d633f2cfa10"; + }; + } + { + name = "isobject___isobject_2.1.0.tgz"; + path = fetchurl { + name = "isobject___isobject_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/isobject/-/isobject-2.1.0.tgz"; + sha1 = "f065561096a3f1da2ef46272f815c840d87e0c89"; + }; + } + { + name = "isobject___isobject_3.0.1.tgz"; + path = fetchurl { + name = "isobject___isobject_3.0.1.tgz"; + url = "https://registry.yarnpkg.com/isobject/-/isobject-3.0.1.tgz"; + sha1 = "4e431e92b11a9731636aa1f9c8d1ccbcfdab78df"; + }; + } + { + name = "isstream___isstream_0.1.2.tgz"; + path = fetchurl { + name = "isstream___isstream_0.1.2.tgz"; + url = "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz"; + sha1 = "47e63f7af55afa6f92e1500e690eb8b8529c099a"; + }; + } + { + name = "istanbul_lib_coverage___istanbul_lib_coverage_3.0.0.tgz"; + path = fetchurl { + name = "istanbul_lib_coverage___istanbul_lib_coverage_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-3.0.0.tgz"; + sha1 = "f5944a37c70b550b02a78a5c3b2055b280cec8ec"; + }; + } + { + name = "istanbul_lib_instrument___istanbul_lib_instrument_4.0.3.tgz"; + path = fetchurl { + name = "istanbul_lib_instrument___istanbul_lib_instrument_4.0.3.tgz"; + url = "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-4.0.3.tgz"; + sha1 = "873c6fff897450118222774696a3f28902d77c1d"; + }; + } + { + name = "istanbul_lib_report___istanbul_lib_report_3.0.0.tgz"; + path = fetchurl { + name = "istanbul_lib_report___istanbul_lib_report_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz"; + sha1 = "7518fe52ea44de372f460a76b5ecda9ffb73d8a6"; + }; + } + { + name = "istanbul_lib_source_maps___istanbul_lib_source_maps_4.0.0.tgz"; + path = fetchurl { + name = "istanbul_lib_source_maps___istanbul_lib_source_maps_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/istanbul-lib-source-maps/-/istanbul-lib-source-maps-4.0.0.tgz"; + sha1 = "75743ce6d96bb86dc7ee4352cf6366a23f0b1ad9"; + }; + } + { + name = "istanbul_reports___istanbul_reports_3.0.2.tgz"; + path = fetchurl { + name = "istanbul_reports___istanbul_reports_3.0.2.tgz"; + url = "https://registry.yarnpkg.com/istanbul-reports/-/istanbul-reports-3.0.2.tgz"; + sha1 = "d593210e5000683750cb09fc0644e4b6e27fd53b"; + }; + } + { + name = "jake___jake_10.8.2.tgz"; + path = fetchurl { + name = "jake___jake_10.8.2.tgz"; + url = "https://registry.yarnpkg.com/jake/-/jake-10.8.2.tgz"; + sha1 = "ebc9de8558160a66d82d0eadc6a2e58fbc500a7b"; + }; + } + { + name = "jest_changed_files___jest_changed_files_26.6.2.tgz"; + path = fetchurl { + name = "jest_changed_files___jest_changed_files_26.6.2.tgz"; + url = "https://registry.yarnpkg.com/jest-changed-files/-/jest-changed-files-26.6.2.tgz"; + sha1 = "f6198479e1cc66f22f9ae1e22acaa0b429c042d0"; + }; + } + { + name = "jest_cli___jest_cli_26.6.3.tgz"; + path = fetchurl { + name = "jest_cli___jest_cli_26.6.3.tgz"; + url = "https://registry.yarnpkg.com/jest-cli/-/jest-cli-26.6.3.tgz"; + sha1 = "43117cfef24bc4cd691a174a8796a532e135e92a"; + }; + } + { + name = "jest_config___jest_config_26.6.3.tgz"; + path = fetchurl { + name = "jest_config___jest_config_26.6.3.tgz"; + url = "https://registry.yarnpkg.com/jest-config/-/jest-config-26.6.3.tgz"; + sha1 = "64f41444eef9eb03dc51d5c53b75c8c71f645349"; + }; + } + { + name = "jest_diff___jest_diff_26.6.2.tgz"; + path = fetchurl { + name = "jest_diff___jest_diff_26.6.2.tgz"; + url = "https://registry.yarnpkg.com/jest-diff/-/jest-diff-26.6.2.tgz"; + sha1 = "1aa7468b52c3a68d7d5c5fdcdfcd5e49bd164394"; + }; + } + { + name = "jest_docblock___jest_docblock_26.0.0.tgz"; + path = fetchurl { + name = "jest_docblock___jest_docblock_26.0.0.tgz"; + url = "https://registry.yarnpkg.com/jest-docblock/-/jest-docblock-26.0.0.tgz"; + sha1 = "3e2fa20899fc928cb13bd0ff68bd3711a36889b5"; + }; + } + { + name = "jest_each___jest_each_26.6.2.tgz"; + path = fetchurl { + name = "jest_each___jest_each_26.6.2.tgz"; + url = "https://registry.yarnpkg.com/jest-each/-/jest-each-26.6.2.tgz"; + sha1 = "02526438a77a67401c8a6382dfe5999952c167cb"; + }; + } + { + name = "jest_environment_jsdom___jest_environment_jsdom_26.6.2.tgz"; + path = fetchurl { + name = "jest_environment_jsdom___jest_environment_jsdom_26.6.2.tgz"; + url = "https://registry.yarnpkg.com/jest-environment-jsdom/-/jest-environment-jsdom-26.6.2.tgz"; + sha1 = "78d09fe9cf019a357009b9b7e1f101d23bd1da3e"; + }; + } + { + name = "jest_environment_node___jest_environment_node_26.6.2.tgz"; + path = fetchurl { + name = "jest_environment_node___jest_environment_node_26.6.2.tgz"; + url = "https://registry.yarnpkg.com/jest-environment-node/-/jest-environment-node-26.6.2.tgz"; + sha1 = "824e4c7fb4944646356f11ac75b229b0035f2b0c"; + }; + } + { + name = "jest_get_type___jest_get_type_26.3.0.tgz"; + path = fetchurl { + name = "jest_get_type___jest_get_type_26.3.0.tgz"; + url = "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-26.3.0.tgz"; + sha1 = "e97dc3c3f53c2b406ca7afaed4493b1d099199e0"; + }; + } + { + name = "jest_haste_map___jest_haste_map_26.6.2.tgz"; + path = fetchurl { + name = "jest_haste_map___jest_haste_map_26.6.2.tgz"; + url = "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-26.6.2.tgz"; + sha1 = "dd7e60fe7dc0e9f911a23d79c5ff7fb5c2cafeaa"; + }; + } + { + name = "jest_jasmine2___jest_jasmine2_26.6.3.tgz"; + path = fetchurl { + name = "jest_jasmine2___jest_jasmine2_26.6.3.tgz"; + url = "https://registry.yarnpkg.com/jest-jasmine2/-/jest-jasmine2-26.6.3.tgz"; + sha1 = "adc3cf915deacb5212c93b9f3547cd12958f2edd"; + }; + } + { + name = "jest_leak_detector___jest_leak_detector_26.6.2.tgz"; + path = fetchurl { + name = "jest_leak_detector___jest_leak_detector_26.6.2.tgz"; + url = "https://registry.yarnpkg.com/jest-leak-detector/-/jest-leak-detector-26.6.2.tgz"; + sha1 = "7717cf118b92238f2eba65054c8a0c9c653a91af"; + }; + } + { + name = "jest_matcher_utils___jest_matcher_utils_26.6.2.tgz"; + path = fetchurl { + name = "jest_matcher_utils___jest_matcher_utils_26.6.2.tgz"; + url = "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-26.6.2.tgz"; + sha1 = "8e6fd6e863c8b2d31ac6472eeb237bc595e53e7a"; + }; + } + { + name = "jest_message_util___jest_message_util_26.6.2.tgz"; + path = fetchurl { + name = "jest_message_util___jest_message_util_26.6.2.tgz"; + url = "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-26.6.2.tgz"; + sha1 = "58173744ad6fc0506b5d21150b9be56ef001ca07"; + }; + } + { + name = "jest_mock___jest_mock_26.6.2.tgz"; + path = fetchurl { + name = "jest_mock___jest_mock_26.6.2.tgz"; + url = "https://registry.yarnpkg.com/jest-mock/-/jest-mock-26.6.2.tgz"; + sha1 = "d6cb712b041ed47fe0d9b6fc3474bc6543feb302"; + }; + } + { + name = "jest_pnp_resolver___jest_pnp_resolver_1.2.2.tgz"; + path = fetchurl { + name = "jest_pnp_resolver___jest_pnp_resolver_1.2.2.tgz"; + url = "https://registry.yarnpkg.com/jest-pnp-resolver/-/jest-pnp-resolver-1.2.2.tgz"; + sha1 = "b704ac0ae028a89108a4d040b3f919dfddc8e33c"; + }; + } + { + name = "jest_regex_util___jest_regex_util_26.0.0.tgz"; + path = fetchurl { + name = "jest_regex_util___jest_regex_util_26.0.0.tgz"; + url = "https://registry.yarnpkg.com/jest-regex-util/-/jest-regex-util-26.0.0.tgz"; + sha1 = "d25e7184b36e39fd466c3bc41be0971e821fee28"; + }; + } + { + name = "jest_resolve_dependencies___jest_resolve_dependencies_26.6.3.tgz"; + path = fetchurl { + name = "jest_resolve_dependencies___jest_resolve_dependencies_26.6.3.tgz"; + url = "https://registry.yarnpkg.com/jest-resolve-dependencies/-/jest-resolve-dependencies-26.6.3.tgz"; + sha1 = "6680859ee5d22ee5dcd961fe4871f59f4c784fb6"; + }; + } + { + name = "jest_resolve___jest_resolve_26.6.2.tgz"; + path = fetchurl { + name = "jest_resolve___jest_resolve_26.6.2.tgz"; + url = "https://registry.yarnpkg.com/jest-resolve/-/jest-resolve-26.6.2.tgz"; + sha1 = "a3ab1517217f469b504f1b56603c5bb541fbb507"; + }; + } + { + name = "jest_runner___jest_runner_26.6.3.tgz"; + path = fetchurl { + name = "jest_runner___jest_runner_26.6.3.tgz"; + url = "https://registry.yarnpkg.com/jest-runner/-/jest-runner-26.6.3.tgz"; + sha1 = "2d1fed3d46e10f233fd1dbd3bfaa3fe8924be159"; + }; + } + { + name = "jest_runtime___jest_runtime_26.6.3.tgz"; + path = fetchurl { + name = "jest_runtime___jest_runtime_26.6.3.tgz"; + url = "https://registry.yarnpkg.com/jest-runtime/-/jest-runtime-26.6.3.tgz"; + sha1 = "4f64efbcfac398331b74b4b3c82d27d401b8fa2b"; + }; + } + { + name = "jest_serializer___jest_serializer_26.6.2.tgz"; + path = fetchurl { + name = "jest_serializer___jest_serializer_26.6.2.tgz"; + url = "https://registry.yarnpkg.com/jest-serializer/-/jest-serializer-26.6.2.tgz"; + sha1 = "d139aafd46957d3a448f3a6cdabe2919ba0742d1"; + }; + } + { + name = "jest_snapshot___jest_snapshot_26.6.2.tgz"; + path = fetchurl { + name = "jest_snapshot___jest_snapshot_26.6.2.tgz"; + url = "https://registry.yarnpkg.com/jest-snapshot/-/jest-snapshot-26.6.2.tgz"; + sha1 = "f3b0af1acb223316850bd14e1beea9837fb39c84"; + }; + } + { + name = "jest_util___jest_util_26.6.2.tgz"; + path = fetchurl { + name = "jest_util___jest_util_26.6.2.tgz"; + url = "https://registry.yarnpkg.com/jest-util/-/jest-util-26.6.2.tgz"; + sha1 = "907535dbe4d5a6cb4c47ac9b926f6af29576cbc1"; + }; + } + { + name = "jest_validate___jest_validate_26.6.2.tgz"; + path = fetchurl { + name = "jest_validate___jest_validate_26.6.2.tgz"; + url = "https://registry.yarnpkg.com/jest-validate/-/jest-validate-26.6.2.tgz"; + sha1 = "23d380971587150467342911c3d7b4ac57ab20ec"; + }; + } + { + name = "jest_watcher___jest_watcher_26.6.2.tgz"; + path = fetchurl { + name = "jest_watcher___jest_watcher_26.6.2.tgz"; + url = "https://registry.yarnpkg.com/jest-watcher/-/jest-watcher-26.6.2.tgz"; + sha1 = "a5b683b8f9d68dbcb1d7dae32172d2cca0592975"; + }; + } + { + name = "jest_worker___jest_worker_26.6.2.tgz"; + path = fetchurl { + name = "jest_worker___jest_worker_26.6.2.tgz"; + url = "https://registry.yarnpkg.com/jest-worker/-/jest-worker-26.6.2.tgz"; + sha1 = "7f72cbc4d643c365e27b9fd775f9d0eaa9c7a8ed"; + }; + } + { + name = "jest___jest_26.6.3.tgz"; + path = fetchurl { + name = "jest___jest_26.6.3.tgz"; + url = "https://registry.yarnpkg.com/jest/-/jest-26.6.3.tgz"; + sha1 = "40e8fdbe48f00dfa1f0ce8121ca74b88ac9148ef"; + }; + } + { + name = "js_tokens___js_tokens_4.0.0.tgz"; + path = fetchurl { + name = "js_tokens___js_tokens_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz"; + sha1 = "19203fb59991df98e3a287050d4647cdeaf32499"; + }; + } + { + name = "js_yaml___js_yaml_3.14.1.tgz"; + path = fetchurl { + name = "js_yaml___js_yaml_3.14.1.tgz"; + url = "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.14.1.tgz"; + sha1 = "dae812fdb3825fa306609a8717383c50c36a0537"; + }; + } + { + name = "jsbn___jsbn_0.1.1.tgz"; + path = fetchurl { + name = "jsbn___jsbn_0.1.1.tgz"; + url = "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz"; + sha1 = "a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"; + }; + } + { + name = "jsdom___jsdom_16.4.0.tgz"; + path = fetchurl { + name = "jsdom___jsdom_16.4.0.tgz"; + url = "https://registry.yarnpkg.com/jsdom/-/jsdom-16.4.0.tgz"; + sha1 = "36005bde2d136f73eee1a830c6d45e55408edddb"; + }; + } + { + name = "jsesc___jsesc_2.5.2.tgz"; + path = fetchurl { + name = "jsesc___jsesc_2.5.2.tgz"; + url = "https://registry.yarnpkg.com/jsesc/-/jsesc-2.5.2.tgz"; + sha1 = "80564d2e483dacf6e8ef209650a67df3f0c283a4"; + }; + } + { + name = "json_buffer___json_buffer_3.0.0.tgz"; + path = fetchurl { + name = "json_buffer___json_buffer_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/json-buffer/-/json-buffer-3.0.0.tgz"; + sha1 = "5b1f397afc75d677bde8bcfc0e47e1f9a3d9a898"; + }; + } + { + name = "json_parse_even_better_errors___json_parse_even_better_errors_2.3.1.tgz"; + path = fetchurl { + name = "json_parse_even_better_errors___json_parse_even_better_errors_2.3.1.tgz"; + url = "https://registry.yarnpkg.com/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz"; + sha1 = "7c47805a94319928e05777405dc12e1f7a4ee02d"; + }; + } + { + name = "json_schema_traverse___json_schema_traverse_0.4.1.tgz"; + path = fetchurl { + name = "json_schema_traverse___json_schema_traverse_0.4.1.tgz"; + url = "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz"; + sha1 = "69f6a87d9513ab8bb8fe63bdb0979c448e684660"; + }; + } + { + name = "json_schema___json_schema_0.2.3.tgz"; + path = fetchurl { + name = "json_schema___json_schema_0.2.3.tgz"; + url = "https://registry.yarnpkg.com/json-schema/-/json-schema-0.2.3.tgz"; + sha1 = "b480c892e59a2f05954ce727bd3f2a4e882f9e13"; + }; + } + { + name = "json_stable_stringify_without_jsonify___json_stable_stringify_without_jsonify_1.0.1.tgz"; + path = fetchurl { + name = "json_stable_stringify_without_jsonify___json_stable_stringify_without_jsonify_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz"; + sha1 = "9db7b59496ad3f3cfef30a75142d2d930ad72651"; + }; + } + { + name = "json_stringify_safe___json_stringify_safe_5.0.1.tgz"; + path = fetchurl { + name = "json_stringify_safe___json_stringify_safe_5.0.1.tgz"; + url = "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz"; + sha1 = "1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"; + }; + } + { + name = "json5___json5_2.1.3.tgz"; + path = fetchurl { + name = "json5___json5_2.1.3.tgz"; + url = "https://registry.yarnpkg.com/json5/-/json5-2.1.3.tgz"; + sha1 = "c9b0f7fa9233bfe5807fe66fcf3a5617ed597d43"; + }; + } + { + name = "jsonfile___jsonfile_4.0.0.tgz"; + path = fetchurl { + name = "jsonfile___jsonfile_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/jsonfile/-/jsonfile-4.0.0.tgz"; + sha1 = "8771aae0799b64076b76640fca058f9c10e33ecb"; + }; + } + { + name = "jsonfile___jsonfile_6.1.0.tgz"; + path = fetchurl { + name = "jsonfile___jsonfile_6.1.0.tgz"; + url = "https://registry.yarnpkg.com/jsonfile/-/jsonfile-6.1.0.tgz"; + sha1 = "bc55b2634793c679ec6403094eb13698a6ec0aae"; + }; + } + { + name = "jsprim___jsprim_1.4.1.tgz"; + path = fetchurl { + name = "jsprim___jsprim_1.4.1.tgz"; + url = "https://registry.yarnpkg.com/jsprim/-/jsprim-1.4.1.tgz"; + sha1 = "313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2"; + }; + } + { + name = "keyv___keyv_3.1.0.tgz"; + path = fetchurl { + name = "keyv___keyv_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/keyv/-/keyv-3.1.0.tgz"; + sha1 = "ecc228486f69991e49e9476485a5be1e8fc5c4d9"; + }; + } + { + name = "kind_of___kind_of_3.2.2.tgz"; + path = fetchurl { + name = "kind_of___kind_of_3.2.2.tgz"; + url = "https://registry.yarnpkg.com/kind-of/-/kind-of-3.2.2.tgz"; + sha1 = "31ea21a734bab9bbb0f32466d893aea51e4a3c64"; + }; + } + { + name = "kind_of___kind_of_4.0.0.tgz"; + path = fetchurl { + name = "kind_of___kind_of_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/kind-of/-/kind-of-4.0.0.tgz"; + sha1 = "20813df3d712928b207378691a45066fae72dd57"; + }; + } + { + name = "kind_of___kind_of_5.1.0.tgz"; + path = fetchurl { + name = "kind_of___kind_of_5.1.0.tgz"; + url = "https://registry.yarnpkg.com/kind-of/-/kind-of-5.1.0.tgz"; + sha1 = "729c91e2d857b7a419a1f9aa65685c4c33f5845d"; + }; + } + { + name = "kind_of___kind_of_6.0.3.tgz"; + path = fetchurl { + name = "kind_of___kind_of_6.0.3.tgz"; + url = "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.3.tgz"; + sha1 = "07c05034a6c349fa06e24fa35aa76db4580ce4dd"; + }; + } + { + name = "kleur___kleur_3.0.3.tgz"; + path = fetchurl { + name = "kleur___kleur_3.0.3.tgz"; + url = "https://registry.yarnpkg.com/kleur/-/kleur-3.0.3.tgz"; + sha1 = "a79c9ecc86ee1ce3fa6206d1216c501f147fc07e"; + }; + } + { + name = "latest_version___latest_version_5.1.0.tgz"; + path = fetchurl { + name = "latest_version___latest_version_5.1.0.tgz"; + url = "https://registry.yarnpkg.com/latest-version/-/latest-version-5.1.0.tgz"; + sha1 = "119dfe908fe38d15dfa43ecd13fa12ec8832face"; + }; + } + { + name = "lazy_val___lazy_val_1.0.4.tgz"; + path = fetchurl { + name = "lazy_val___lazy_val_1.0.4.tgz"; + url = "https://registry.yarnpkg.com/lazy-val/-/lazy-val-1.0.4.tgz"; + sha1 = "882636a7245c2cfe6e0a4e3ba6c5d68a137e5c65"; + }; + } + { + name = "lazystream___lazystream_1.0.0.tgz"; + path = fetchurl { + name = "lazystream___lazystream_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/lazystream/-/lazystream-1.0.0.tgz"; + sha1 = "f6995fe0f820392f61396be89462407bb77168e4"; + }; + } + { + name = "leven___leven_3.1.0.tgz"; + path = fetchurl { + name = "leven___leven_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/leven/-/leven-3.1.0.tgz"; + sha1 = "77891de834064cccba82ae7842bb6b14a13ed7f2"; + }; + } + { + name = "levn___levn_0.4.1.tgz"; + path = fetchurl { + name = "levn___levn_0.4.1.tgz"; + url = "https://registry.yarnpkg.com/levn/-/levn-0.4.1.tgz"; + sha1 = "ae4562c007473b932a6200d403268dd2fffc6ade"; + }; + } + { + name = "levn___levn_0.3.0.tgz"; + path = fetchurl { + name = "levn___levn_0.3.0.tgz"; + url = "https://registry.yarnpkg.com/levn/-/levn-0.3.0.tgz"; + sha1 = "3b09924edf9f083c0490fdd4c0bc4421e04764ee"; + }; + } + { + name = "lines_and_columns___lines_and_columns_1.1.6.tgz"; + path = fetchurl { + name = "lines_and_columns___lines_and_columns_1.1.6.tgz"; + url = "https://registry.yarnpkg.com/lines-and-columns/-/lines-and-columns-1.1.6.tgz"; + sha1 = "1c00c743b433cd0a4e80758f7b64a57440d9ff00"; + }; + } + { + name = "locate_path___locate_path_5.0.0.tgz"; + path = fetchurl { + name = "locate_path___locate_path_5.0.0.tgz"; + url = "https://registry.yarnpkg.com/locate-path/-/locate-path-5.0.0.tgz"; + sha1 = "1afba396afd676a6d42504d0a67a3a7eb9f62aa0"; + }; + } + { + name = "lodash.defaults___lodash.defaults_4.2.0.tgz"; + path = fetchurl { + name = "lodash.defaults___lodash.defaults_4.2.0.tgz"; + url = "https://registry.yarnpkg.com/lodash.defaults/-/lodash.defaults-4.2.0.tgz"; + sha1 = "d09178716ffea4dde9e5fb7b37f6f0802274580c"; + }; + } + { + name = "lodash.difference___lodash.difference_4.5.0.tgz"; + path = fetchurl { + name = "lodash.difference___lodash.difference_4.5.0.tgz"; + url = "https://registry.yarnpkg.com/lodash.difference/-/lodash.difference-4.5.0.tgz"; + sha1 = "9ccb4e505d486b91651345772885a2df27fd017c"; + }; + } + { + name = "lodash.flatten___lodash.flatten_4.4.0.tgz"; + path = fetchurl { + name = "lodash.flatten___lodash.flatten_4.4.0.tgz"; + url = "https://registry.yarnpkg.com/lodash.flatten/-/lodash.flatten-4.4.0.tgz"; + sha1 = "f31c22225a9632d2bbf8e4addbef240aa765a61f"; + }; + } + { + name = "lodash.isplainobject___lodash.isplainobject_4.0.6.tgz"; + path = fetchurl { + name = "lodash.isplainobject___lodash.isplainobject_4.0.6.tgz"; + url = "https://registry.yarnpkg.com/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz"; + sha1 = "7c526a52d89b45c45cc690b88163be0497f550cb"; + }; + } + { + name = "lodash.sortby___lodash.sortby_4.7.0.tgz"; + path = fetchurl { + name = "lodash.sortby___lodash.sortby_4.7.0.tgz"; + url = "https://registry.yarnpkg.com/lodash.sortby/-/lodash.sortby-4.7.0.tgz"; + sha1 = "edd14c824e2cc9c1e0b0a1b42bb5210516a42438"; + }; + } + { + name = "lodash.union___lodash.union_4.6.0.tgz"; + path = fetchurl { + name = "lodash.union___lodash.union_4.6.0.tgz"; + url = "https://registry.yarnpkg.com/lodash.union/-/lodash.union-4.6.0.tgz"; + sha1 = "48bb5088409f16f1821666641c44dd1aaae3cd88"; + }; + } + { + name = "lodash___lodash_4.17.20.tgz"; + path = fetchurl { + name = "lodash___lodash_4.17.20.tgz"; + url = "https://registry.yarnpkg.com/lodash/-/lodash-4.17.20.tgz"; + sha1 = "b44a9b6297bcb698f1c51a3545a2b3b368d59c52"; + }; + } + { + name = "lowercase_keys___lowercase_keys_1.0.1.tgz"; + path = fetchurl { + name = "lowercase_keys___lowercase_keys_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-1.0.1.tgz"; + sha1 = "6f9e30b47084d971a7c820ff15a6c5167b74c26f"; + }; + } + { + name = "lowercase_keys___lowercase_keys_2.0.0.tgz"; + path = fetchurl { + name = "lowercase_keys___lowercase_keys_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-2.0.0.tgz"; + sha1 = "2603e78b7b4b0006cbca2fbcc8a3202558ac9479"; + }; + } + { + name = "lru_cache___lru_cache_6.0.0.tgz"; + path = fetchurl { + name = "lru_cache___lru_cache_6.0.0.tgz"; + url = "https://registry.yarnpkg.com/lru-cache/-/lru-cache-6.0.0.tgz"; + sha1 = "6d6fe6570ebd96aaf90fcad1dafa3b2566db3a94"; + }; + } + { + name = "make_dir___make_dir_3.1.0.tgz"; + path = fetchurl { + name = "make_dir___make_dir_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/make-dir/-/make-dir-3.1.0.tgz"; + sha1 = "415e967046b3a7f1d185277d84aa58203726a13f"; + }; + } + { + name = "makeerror___makeerror_1.0.11.tgz"; + path = fetchurl { + name = "makeerror___makeerror_1.0.11.tgz"; + url = "https://registry.yarnpkg.com/makeerror/-/makeerror-1.0.11.tgz"; + sha1 = "e01a5c9109f2af79660e4e8b9587790184f5a96c"; + }; + } + { + name = "map_cache___map_cache_0.2.2.tgz"; + path = fetchurl { + name = "map_cache___map_cache_0.2.2.tgz"; + url = "https://registry.yarnpkg.com/map-cache/-/map-cache-0.2.2.tgz"; + sha1 = "c32abd0bd6525d9b051645bb4f26ac5dc98a0dbf"; + }; + } + { + name = "map_visit___map_visit_1.0.0.tgz"; + path = fetchurl { + name = "map_visit___map_visit_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/map-visit/-/map-visit-1.0.0.tgz"; + sha1 = "ecdca8f13144e660f1b5bd41f12f3479d98dfb8f"; + }; + } + { + name = "matcher___matcher_3.0.0.tgz"; + path = fetchurl { + name = "matcher___matcher_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/matcher/-/matcher-3.0.0.tgz"; + sha1 = "bd9060f4c5b70aa8041ccc6f80368760994f30ca"; + }; + } + { + name = "merge_stream___merge_stream_2.0.0.tgz"; + path = fetchurl { + name = "merge_stream___merge_stream_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/merge-stream/-/merge-stream-2.0.0.tgz"; + sha1 = "52823629a14dd00c9770fb6ad47dc6310f2c1f60"; + }; + } + { + name = "micromatch___micromatch_3.1.10.tgz"; + path = fetchurl { + name = "micromatch___micromatch_3.1.10.tgz"; + url = "https://registry.yarnpkg.com/micromatch/-/micromatch-3.1.10.tgz"; + sha1 = "70859bc95c9840952f359a068a3fc49f9ecfac23"; + }; + } + { + name = "micromatch___micromatch_4.0.2.tgz"; + path = fetchurl { + name = "micromatch___micromatch_4.0.2.tgz"; + url = "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.2.tgz"; + sha1 = "4fcb0999bf9fbc2fcbdd212f6d629b9a56c39259"; + }; + } + { + name = "mime_db___mime_db_1.44.0.tgz"; + path = fetchurl { + name = "mime_db___mime_db_1.44.0.tgz"; + url = "https://registry.yarnpkg.com/mime-db/-/mime-db-1.44.0.tgz"; + sha1 = "fa11c5eb0aca1334b4233cb4d52f10c5a6272f92"; + }; + } + { + name = "mime_types___mime_types_2.1.27.tgz"; + path = fetchurl { + name = "mime_types___mime_types_2.1.27.tgz"; + url = "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.27.tgz"; + sha1 = "47949f98e279ea53119f5722e0f34e529bec009f"; + }; + } + { + name = "mime___mime_2.4.6.tgz"; + path = fetchurl { + name = "mime___mime_2.4.6.tgz"; + url = "https://registry.yarnpkg.com/mime/-/mime-2.4.6.tgz"; + sha1 = "e5b407c90db442f2beb5b162373d07b69affa4d1"; + }; + } + { + name = "mimic_fn___mimic_fn_2.1.0.tgz"; + path = fetchurl { + name = "mimic_fn___mimic_fn_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-2.1.0.tgz"; + sha1 = "7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b"; + }; + } + { + name = "mimic_response___mimic_response_1.0.1.tgz"; + path = fetchurl { + name = "mimic_response___mimic_response_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/mimic-response/-/mimic-response-1.0.1.tgz"; + sha1 = "4923538878eef42063cb8a3e3b0798781487ab1b"; + }; + } + { + name = "minimatch___minimatch_3.0.4.tgz"; + path = fetchurl { + name = "minimatch___minimatch_3.0.4.tgz"; + url = "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz"; + sha1 = "5166e286457f03306064be5497e8dbb0c3d32083"; + }; + } + { + name = "minimist___minimist_1.2.5.tgz"; + path = fetchurl { + name = "minimist___minimist_1.2.5.tgz"; + url = "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz"; + sha1 = "67d66014b66a6a8aaa0c083c5fd58df4e4e97602"; + }; + } + { + name = "mixin_deep___mixin_deep_1.3.2.tgz"; + path = fetchurl { + name = "mixin_deep___mixin_deep_1.3.2.tgz"; + url = "https://registry.yarnpkg.com/mixin-deep/-/mixin-deep-1.3.2.tgz"; + sha1 = "1120b43dc359a785dce65b55b82e257ccf479566"; + }; + } + { + name = "mkdirp___mkdirp_0.5.5.tgz"; + path = fetchurl { + name = "mkdirp___mkdirp_0.5.5.tgz"; + url = "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.5.tgz"; + sha1 = "d91cefd62d1436ca0f41620e251288d420099def"; + }; + } + { + name = "ms___ms_2.0.0.tgz"; + path = fetchurl { + name = "ms___ms_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz"; + sha1 = "5608aeadfc00be6c2901df5f9861788de0d597c8"; + }; + } + { + name = "ms___ms_2.1.2.tgz"; + path = fetchurl { + name = "ms___ms_2.1.2.tgz"; + url = "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz"; + sha1 = "d09d1f357b443f493382a8eb3ccd183872ae6009"; + }; + } + { + name = "nanomatch___nanomatch_1.2.13.tgz"; + path = fetchurl { + name = "nanomatch___nanomatch_1.2.13.tgz"; + url = "https://registry.yarnpkg.com/nanomatch/-/nanomatch-1.2.13.tgz"; + sha1 = "b87a8aa4fc0de8fe6be88895b38983ff265bd119"; + }; + } + { + name = "natural_compare___natural_compare_1.4.0.tgz"; + path = fetchurl { + name = "natural_compare___natural_compare_1.4.0.tgz"; + url = "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz"; + sha1 = "4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7"; + }; + } + { + name = "nice_try___nice_try_1.0.5.tgz"; + path = fetchurl { + name = "nice_try___nice_try_1.0.5.tgz"; + url = "https://registry.yarnpkg.com/nice-try/-/nice-try-1.0.5.tgz"; + sha1 = "a3378a7696ce7d223e88fc9b764bd7ef1089e366"; + }; + } + { + name = "node_int64___node_int64_0.4.0.tgz"; + path = fetchurl { + name = "node_int64___node_int64_0.4.0.tgz"; + url = "https://registry.yarnpkg.com/node-int64/-/node-int64-0.4.0.tgz"; + sha1 = "87a9065cdb355d3182d8f94ce11188b825c68a3b"; + }; + } + { + name = "node_modules_regexp___node_modules_regexp_1.0.0.tgz"; + path = fetchurl { + name = "node_modules_regexp___node_modules_regexp_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/node-modules-regexp/-/node-modules-regexp-1.0.0.tgz"; + sha1 = "8d9dbe28964a4ac5712e9131642107c71e90ec40"; + }; + } + { + name = "node_notifier___node_notifier_8.0.0.tgz"; + path = fetchurl { + name = "node_notifier___node_notifier_8.0.0.tgz"; + url = "https://registry.yarnpkg.com/node-notifier/-/node-notifier-8.0.0.tgz"; + sha1 = "a7eee2d51da6d0f7ff5094bc7108c911240c1620"; + }; + } + { + name = "normalize_package_data___normalize_package_data_2.5.0.tgz"; + path = fetchurl { + name = "normalize_package_data___normalize_package_data_2.5.0.tgz"; + url = "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.5.0.tgz"; + sha1 = "e66db1838b200c1dfc233225d12cb36520e234a8"; + }; + } + { + name = "normalize_path___normalize_path_2.1.1.tgz"; + path = fetchurl { + name = "normalize_path___normalize_path_2.1.1.tgz"; + url = "https://registry.yarnpkg.com/normalize-path/-/normalize-path-2.1.1.tgz"; + sha1 = "1ab28b556e198363a8c1a6f7e6fa20137fe6aed9"; + }; + } + { + name = "normalize_path___normalize_path_3.0.0.tgz"; + path = fetchurl { + name = "normalize_path___normalize_path_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/normalize-path/-/normalize-path-3.0.0.tgz"; + sha1 = "0dcd69ff23a1c9b11fd0978316644a0388216a65"; + }; + } + { + name = "normalize_url___normalize_url_4.5.0.tgz"; + path = fetchurl { + name = "normalize_url___normalize_url_4.5.0.tgz"; + url = "https://registry.yarnpkg.com/normalize-url/-/normalize-url-4.5.0.tgz"; + sha1 = "453354087e6ca96957bd8f5baf753f5982142129"; + }; + } + { + name = "npm_conf___npm_conf_1.1.3.tgz"; + path = fetchurl { + name = "npm_conf___npm_conf_1.1.3.tgz"; + url = "https://registry.yarnpkg.com/npm-conf/-/npm-conf-1.1.3.tgz"; + sha1 = "256cc47bd0e218c259c4e9550bf413bc2192aff9"; + }; + } + { + name = "npm_run_path___npm_run_path_2.0.2.tgz"; + path = fetchurl { + name = "npm_run_path___npm_run_path_2.0.2.tgz"; + url = "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-2.0.2.tgz"; + sha1 = "35a9232dfa35d7067b4cb2ddf2357b1871536c5f"; + }; + } + { + name = "npm_run_path___npm_run_path_4.0.1.tgz"; + path = fetchurl { + name = "npm_run_path___npm_run_path_4.0.1.tgz"; + url = "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-4.0.1.tgz"; + sha1 = "b7ecd1e5ed53da8e37a55e1c2269e0b97ed748ea"; + }; + } + { + name = "nwsapi___nwsapi_2.2.0.tgz"; + path = fetchurl { + name = "nwsapi___nwsapi_2.2.0.tgz"; + url = "https://registry.yarnpkg.com/nwsapi/-/nwsapi-2.2.0.tgz"; + sha1 = "204879a9e3d068ff2a55139c2c772780681a38b7"; + }; + } + { + name = "oauth_sign___oauth_sign_0.9.0.tgz"; + path = fetchurl { + name = "oauth_sign___oauth_sign_0.9.0.tgz"; + url = "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.9.0.tgz"; + sha1 = "47a7b016baa68b5fa0ecf3dee08a85c679ac6455"; + }; + } + { + name = "object_copy___object_copy_0.1.0.tgz"; + path = fetchurl { + name = "object_copy___object_copy_0.1.0.tgz"; + url = "https://registry.yarnpkg.com/object-copy/-/object-copy-0.1.0.tgz"; + sha1 = "7e7d858b781bd7c991a41ba975ed3812754e998c"; + }; + } + { + name = "object_keys___object_keys_1.1.1.tgz"; + path = fetchurl { + name = "object_keys___object_keys_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz"; + sha1 = "1c47f272df277f3b1daf061677d9c82e2322c60e"; + }; + } + { + name = "object_visit___object_visit_1.0.1.tgz"; + path = fetchurl { + name = "object_visit___object_visit_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/object-visit/-/object-visit-1.0.1.tgz"; + sha1 = "f79c4493af0c5377b59fe39d395e41042dd045bb"; + }; + } + { + name = "object.pick___object.pick_1.3.0.tgz"; + path = fetchurl { + name = "object.pick___object.pick_1.3.0.tgz"; + url = "https://registry.yarnpkg.com/object.pick/-/object.pick-1.3.0.tgz"; + sha1 = "87a10ac4c1694bd2e1cbf53591a66141fb5dd747"; + }; + } + { + name = "once___once_1.4.0.tgz"; + path = fetchurl { + name = "once___once_1.4.0.tgz"; + url = "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz"; + sha1 = "583b1aa775961d4b113ac17d9c50baef9dd76bd1"; + }; + } + { + name = "onetime___onetime_5.1.2.tgz"; + path = fetchurl { + name = "onetime___onetime_5.1.2.tgz"; + url = "https://registry.yarnpkg.com/onetime/-/onetime-5.1.2.tgz"; + sha1 = "d0e96ebb56b07476df1dd9c4806e5237985ca45e"; + }; + } + { + name = "optionator___optionator_0.8.3.tgz"; + path = fetchurl { + name = "optionator___optionator_0.8.3.tgz"; + url = "https://registry.yarnpkg.com/optionator/-/optionator-0.8.3.tgz"; + sha1 = "84fa1d036fe9d3c7e21d99884b601167ec8fb495"; + }; + } + { + name = "optionator___optionator_0.9.1.tgz"; + path = fetchurl { + name = "optionator___optionator_0.9.1.tgz"; + url = "https://registry.yarnpkg.com/optionator/-/optionator-0.9.1.tgz"; + sha1 = "4f236a6373dae0566a6d43e1326674f50c291499"; + }; + } + { + name = "p_cancelable___p_cancelable_1.1.0.tgz"; + path = fetchurl { + name = "p_cancelable___p_cancelable_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/p-cancelable/-/p-cancelable-1.1.0.tgz"; + sha1 = "d078d15a3af409220c886f1d9a0ca2e441ab26cc"; + }; + } + { + name = "p_each_series___p_each_series_2.2.0.tgz"; + path = fetchurl { + name = "p_each_series___p_each_series_2.2.0.tgz"; + url = "https://registry.yarnpkg.com/p-each-series/-/p-each-series-2.2.0.tgz"; + sha1 = "105ab0357ce72b202a8a8b94933672657b5e2a9a"; + }; + } + { + name = "p_finally___p_finally_1.0.0.tgz"; + path = fetchurl { + name = "p_finally___p_finally_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/p-finally/-/p-finally-1.0.0.tgz"; + sha1 = "3fbcfb15b899a44123b34b6dcc18b724336a2cae"; + }; + } + { + name = "p_limit___p_limit_2.3.0.tgz"; + path = fetchurl { + name = "p_limit___p_limit_2.3.0.tgz"; + url = "https://registry.yarnpkg.com/p-limit/-/p-limit-2.3.0.tgz"; + sha1 = "3dd33c647a214fdfffd835933eb086da0dc21db1"; + }; + } + { + name = "p_locate___p_locate_4.1.0.tgz"; + path = fetchurl { + name = "p_locate___p_locate_4.1.0.tgz"; + url = "https://registry.yarnpkg.com/p-locate/-/p-locate-4.1.0.tgz"; + sha1 = "a3428bb7088b3a60292f66919278b7c297ad4f07"; + }; + } + { + name = "p_try___p_try_2.2.0.tgz"; + path = fetchurl { + name = "p_try___p_try_2.2.0.tgz"; + url = "https://registry.yarnpkg.com/p-try/-/p-try-2.2.0.tgz"; + sha1 = "cb2868540e313d61de58fafbe35ce9004d5540e6"; + }; + } + { + name = "package_json___package_json_6.5.0.tgz"; + path = fetchurl { + name = "package_json___package_json_6.5.0.tgz"; + url = "https://registry.yarnpkg.com/package-json/-/package-json-6.5.0.tgz"; + sha1 = "6feedaca35e75725876d0b0e64974697fed145b0"; + }; + } + { + name = "parent_module___parent_module_1.0.1.tgz"; + path = fetchurl { + name = "parent_module___parent_module_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/parent-module/-/parent-module-1.0.1.tgz"; + sha1 = "691d2709e78c79fae3a156622452d00762caaaa2"; + }; + } + { + name = "parse_json___parse_json_5.1.0.tgz"; + path = fetchurl { + name = "parse_json___parse_json_5.1.0.tgz"; + url = "https://registry.yarnpkg.com/parse-json/-/parse-json-5.1.0.tgz"; + sha1 = "f96088cdf24a8faa9aea9a009f2d9d942c999646"; + }; + } + { + name = "parse5___parse5_5.1.1.tgz"; + path = fetchurl { + name = "parse5___parse5_5.1.1.tgz"; + url = "https://registry.yarnpkg.com/parse5/-/parse5-5.1.1.tgz"; + sha1 = "f68e4e5ba1852ac2cadc00f4555fff6c2abb6178"; + }; + } + { + name = "pascalcase___pascalcase_0.1.1.tgz"; + path = fetchurl { + name = "pascalcase___pascalcase_0.1.1.tgz"; + url = "https://registry.yarnpkg.com/pascalcase/-/pascalcase-0.1.1.tgz"; + sha1 = "b363e55e8006ca6fe21784d2db22bd15d7917f14"; + }; + } + { + name = "path_exists___path_exists_4.0.0.tgz"; + path = fetchurl { + name = "path_exists___path_exists_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/path-exists/-/path-exists-4.0.0.tgz"; + sha1 = "513bdbe2d3b95d7762e8c1137efa195c6c61b5b3"; + }; + } + { + name = "path_is_absolute___path_is_absolute_1.0.1.tgz"; + path = fetchurl { + name = "path_is_absolute___path_is_absolute_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz"; + sha1 = "174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"; + }; + } + { + name = "path_key___path_key_2.0.1.tgz"; + path = fetchurl { + name = "path_key___path_key_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/path-key/-/path-key-2.0.1.tgz"; + sha1 = "411cadb574c5a140d3a4b1910d40d80cc9f40b40"; + }; + } + { + name = "path_key___path_key_3.1.1.tgz"; + path = fetchurl { + name = "path_key___path_key_3.1.1.tgz"; + url = "https://registry.yarnpkg.com/path-key/-/path-key-3.1.1.tgz"; + sha1 = "581f6ade658cbba65a0d3380de7753295054f375"; + }; + } + { + name = "path_parse___path_parse_1.0.6.tgz"; + path = fetchurl { + name = "path_parse___path_parse_1.0.6.tgz"; + url = "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.6.tgz"; + sha1 = "d62dbb5679405d72c4737ec58600e9ddcf06d24c"; + }; + } + { + name = "pend___pend_1.2.0.tgz"; + path = fetchurl { + name = "pend___pend_1.2.0.tgz"; + url = "https://registry.yarnpkg.com/pend/-/pend-1.2.0.tgz"; + sha1 = "7a57eb550a6783f9115331fcf4663d5c8e007a50"; + }; + } + { + name = "performance_now___performance_now_2.1.0.tgz"; + path = fetchurl { + name = "performance_now___performance_now_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz"; + sha1 = "6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"; + }; + } + { + name = "picomatch___picomatch_2.2.2.tgz"; + path = fetchurl { + name = "picomatch___picomatch_2.2.2.tgz"; + url = "https://registry.yarnpkg.com/picomatch/-/picomatch-2.2.2.tgz"; + sha1 = "21f333e9b6b8eaff02468f5146ea406d345f4dad"; + }; + } + { + name = "pify___pify_3.0.0.tgz"; + path = fetchurl { + name = "pify___pify_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/pify/-/pify-3.0.0.tgz"; + sha1 = "e5a4acd2c101fdf3d9a4d07f0dbc4db49dd28176"; + }; + } + { + name = "pirates___pirates_4.0.1.tgz"; + path = fetchurl { + name = "pirates___pirates_4.0.1.tgz"; + url = "https://registry.yarnpkg.com/pirates/-/pirates-4.0.1.tgz"; + sha1 = "643a92caf894566f91b2b986d2c66950a8e2fb87"; + }; + } + { + name = "pkg_dir___pkg_dir_4.2.0.tgz"; + path = fetchurl { + name = "pkg_dir___pkg_dir_4.2.0.tgz"; + url = "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-4.2.0.tgz"; + sha1 = "f099133df7ede422e81d1d8448270eeb3e4261f3"; + }; + } + { + name = "posix_character_classes___posix_character_classes_0.1.1.tgz"; + path = fetchurl { + name = "posix_character_classes___posix_character_classes_0.1.1.tgz"; + url = "https://registry.yarnpkg.com/posix-character-classes/-/posix-character-classes-0.1.1.tgz"; + sha1 = "01eac0fe3b5af71a2a6c02feabb8c1fef7e00eab"; + }; + } + { + name = "prelude_ls___prelude_ls_1.2.1.tgz"; + path = fetchurl { + name = "prelude_ls___prelude_ls_1.2.1.tgz"; + url = "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.2.1.tgz"; + sha1 = "debc6489d7a6e6b0e7611888cec880337d316396"; + }; + } + { + name = "prelude_ls___prelude_ls_1.1.2.tgz"; + path = fetchurl { + name = "prelude_ls___prelude_ls_1.1.2.tgz"; + url = "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz"; + sha1 = "21932a549f5e52ffd9a827f570e04be62a97da54"; + }; + } + { + name = "prepend_http___prepend_http_2.0.0.tgz"; + path = fetchurl { + name = "prepend_http___prepend_http_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/prepend-http/-/prepend-http-2.0.0.tgz"; + sha1 = "e92434bfa5ea8c19f41cdfd401d741a3c819d897"; + }; + } + { + name = "pretty_format___pretty_format_26.6.2.tgz"; + path = fetchurl { + name = "pretty_format___pretty_format_26.6.2.tgz"; + url = "https://registry.yarnpkg.com/pretty-format/-/pretty-format-26.6.2.tgz"; + sha1 = "e35c2705f14cb7fe2fe94fa078345b444120fc93"; + }; + } + { + name = "printj___printj_1.1.2.tgz"; + path = fetchurl { + name = "printj___printj_1.1.2.tgz"; + url = "https://registry.yarnpkg.com/printj/-/printj-1.1.2.tgz"; + sha1 = "d90deb2975a8b9f600fb3a1c94e3f4c53c78a222"; + }; + } + { + name = "process_nextick_args___process_nextick_args_2.0.1.tgz"; + path = fetchurl { + name = "process_nextick_args___process_nextick_args_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz"; + sha1 = "7820d9b16120cc55ca9ae7792680ae7dba6d7fe2"; + }; + } + { + name = "progress___progress_2.0.3.tgz"; + path = fetchurl { + name = "progress___progress_2.0.3.tgz"; + url = "https://registry.yarnpkg.com/progress/-/progress-2.0.3.tgz"; + sha1 = "7e8cf8d8f5b8f239c1bc68beb4eb78567d572ef8"; + }; + } + { + name = "prompts___prompts_2.4.0.tgz"; + path = fetchurl { + name = "prompts___prompts_2.4.0.tgz"; + url = "https://registry.yarnpkg.com/prompts/-/prompts-2.4.0.tgz"; + sha1 = "4aa5de0723a231d1ee9121c40fdf663df73f61d7"; + }; + } + { + name = "proto_list___proto_list_1.2.4.tgz"; + path = fetchurl { + name = "proto_list___proto_list_1.2.4.tgz"; + url = "https://registry.yarnpkg.com/proto-list/-/proto-list-1.2.4.tgz"; + sha1 = "212d5bfe1318306a420f6402b8e26ff39647a849"; + }; + } + { + name = "psl___psl_1.8.0.tgz"; + path = fetchurl { + name = "psl___psl_1.8.0.tgz"; + url = "https://registry.yarnpkg.com/psl/-/psl-1.8.0.tgz"; + sha1 = "9326f8bcfb013adcc005fdff056acce020e51c24"; + }; + } + { + name = "pump___pump_3.0.0.tgz"; + path = fetchurl { + name = "pump___pump_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/pump/-/pump-3.0.0.tgz"; + sha1 = "b4a2116815bde2f4e1ea602354e8c75565107a64"; + }; + } + { + name = "punycode___punycode_2.1.1.tgz"; + path = fetchurl { + name = "punycode___punycode_2.1.1.tgz"; + url = "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz"; + sha1 = "b58b010ac40c22c5657616c8d2c2c02c7bf479ec"; + }; + } + { + name = "pupa___pupa_2.1.1.tgz"; + path = fetchurl { + name = "pupa___pupa_2.1.1.tgz"; + url = "https://registry.yarnpkg.com/pupa/-/pupa-2.1.1.tgz"; + sha1 = "f5e8fd4afc2c5d97828faa523549ed8744a20d62"; + }; + } + { + name = "qs___qs_6.5.2.tgz"; + path = fetchurl { + name = "qs___qs_6.5.2.tgz"; + url = "https://registry.yarnpkg.com/qs/-/qs-6.5.2.tgz"; + sha1 = "cb3ae806e8740444584ef154ce8ee98d403f3e36"; + }; + } + { + name = "rc___rc_1.2.8.tgz"; + path = fetchurl { + name = "rc___rc_1.2.8.tgz"; + url = "https://registry.yarnpkg.com/rc/-/rc-1.2.8.tgz"; + sha1 = "cd924bf5200a075b83c188cd6b9e211b7fc0d3ed"; + }; + } + { + name = "react_is___react_is_17.0.1.tgz"; + path = fetchurl { + name = "react_is___react_is_17.0.1.tgz"; + url = "https://registry.yarnpkg.com/react-is/-/react-is-17.0.1.tgz"; + sha1 = "5b3531bd76a645a4c9fb6e693ed36419e3301339"; + }; + } + { + name = "read_config_file___read_config_file_6.0.0.tgz"; + path = fetchurl { + name = "read_config_file___read_config_file_6.0.0.tgz"; + url = "https://registry.yarnpkg.com/read-config-file/-/read-config-file-6.0.0.tgz"; + sha1 = "224b5dca6a5bdc1fb19e63f89f342680efdb9299"; + }; + } + { + name = "read_pkg_up___read_pkg_up_7.0.1.tgz"; + path = fetchurl { + name = "read_pkg_up___read_pkg_up_7.0.1.tgz"; + url = "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-7.0.1.tgz"; + sha1 = "f3a6135758459733ae2b95638056e1854e7ef507"; + }; + } + { + name = "read_pkg___read_pkg_5.2.0.tgz"; + path = fetchurl { + name = "read_pkg___read_pkg_5.2.0.tgz"; + url = "https://registry.yarnpkg.com/read-pkg/-/read-pkg-5.2.0.tgz"; + sha1 = "7bf295438ca5a33e56cd30e053b34ee7250c93cc"; + }; + } + { + name = "readable_stream___readable_stream_2.3.7.tgz"; + path = fetchurl { + name = "readable_stream___readable_stream_2.3.7.tgz"; + url = "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.7.tgz"; + sha1 = "1eca1cf711aef814c04f62252a36a62f6cb23b57"; + }; + } + { + name = "readable_stream___readable_stream_3.6.0.tgz"; + path = fetchurl { + name = "readable_stream___readable_stream_3.6.0.tgz"; + url = "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.0.tgz"; + sha1 = "337bbda3adc0706bd3e024426a286d4b4b2c9198"; + }; + } + { + name = "readdir_glob___readdir_glob_1.1.1.tgz"; + path = fetchurl { + name = "readdir_glob___readdir_glob_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/readdir-glob/-/readdir-glob-1.1.1.tgz"; + sha1 = "f0e10bb7bf7bfa7e0add8baffdc54c3f7dbee6c4"; + }; + } + { + name = "regex_not___regex_not_1.0.2.tgz"; + path = fetchurl { + name = "regex_not___regex_not_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/regex-not/-/regex-not-1.0.2.tgz"; + sha1 = "1f4ece27e00b0b65e0247a6810e6a85d83a5752c"; + }; + } + { + name = "regexpp___regexpp_3.1.0.tgz"; + path = fetchurl { + name = "regexpp___regexpp_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/regexpp/-/regexpp-3.1.0.tgz"; + sha1 = "206d0ad0a5648cffbdb8ae46438f3dc51c9f78e2"; + }; + } + { + name = "registry_auth_token___registry_auth_token_4.2.1.tgz"; + path = fetchurl { + name = "registry_auth_token___registry_auth_token_4.2.1.tgz"; + url = "https://registry.yarnpkg.com/registry-auth-token/-/registry-auth-token-4.2.1.tgz"; + sha1 = "6d7b4006441918972ccd5fedcd41dc322c79b250"; + }; + } + { + name = "registry_url___registry_url_5.1.0.tgz"; + path = fetchurl { + name = "registry_url___registry_url_5.1.0.tgz"; + url = "https://registry.yarnpkg.com/registry-url/-/registry-url-5.1.0.tgz"; + sha1 = "e98334b50d5434b81136b44ec638d9c2009c5009"; + }; + } + { + name = "remove_trailing_separator___remove_trailing_separator_1.1.0.tgz"; + path = fetchurl { + name = "remove_trailing_separator___remove_trailing_separator_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz"; + sha1 = "c24bce2a283adad5bc3f58e0d48249b92379d8ef"; + }; + } + { + name = "repeat_element___repeat_element_1.1.3.tgz"; + path = fetchurl { + name = "repeat_element___repeat_element_1.1.3.tgz"; + url = "https://registry.yarnpkg.com/repeat-element/-/repeat-element-1.1.3.tgz"; + sha1 = "782e0d825c0c5a3bb39731f84efee6b742e6b1ce"; + }; + } + { + name = "repeat_string___repeat_string_1.6.1.tgz"; + path = fetchurl { + name = "repeat_string___repeat_string_1.6.1.tgz"; + url = "https://registry.yarnpkg.com/repeat-string/-/repeat-string-1.6.1.tgz"; + sha1 = "8dcae470e1c88abc2d600fff4a776286da75e637"; + }; + } + { + name = "request_promise_core___request_promise_core_1.1.4.tgz"; + path = fetchurl { + name = "request_promise_core___request_promise_core_1.1.4.tgz"; + url = "https://registry.yarnpkg.com/request-promise-core/-/request-promise-core-1.1.4.tgz"; + sha1 = "3eedd4223208d419867b78ce815167d10593a22f"; + }; + } + { + name = "request_promise_native___request_promise_native_1.0.9.tgz"; + path = fetchurl { + name = "request_promise_native___request_promise_native_1.0.9.tgz"; + url = "https://registry.yarnpkg.com/request-promise-native/-/request-promise-native-1.0.9.tgz"; + sha1 = "e407120526a5efdc9a39b28a5679bf47b9d9dc28"; + }; + } + { + name = "request___request_2.88.2.tgz"; + path = fetchurl { + name = "request___request_2.88.2.tgz"; + url = "https://registry.yarnpkg.com/request/-/request-2.88.2.tgz"; + sha1 = "d73c918731cb5a87da047e207234146f664d12b3"; + }; + } + { + name = "require_directory___require_directory_2.1.1.tgz"; + path = fetchurl { + name = "require_directory___require_directory_2.1.1.tgz"; + url = "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz"; + sha1 = "8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"; + }; + } + { + name = "require_main_filename___require_main_filename_2.0.0.tgz"; + path = fetchurl { + name = "require_main_filename___require_main_filename_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-2.0.0.tgz"; + sha1 = "d0b329ecc7cc0f61649f62215be69af54aa8989b"; + }; + } + { + name = "resolve_cwd___resolve_cwd_3.0.0.tgz"; + path = fetchurl { + name = "resolve_cwd___resolve_cwd_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/resolve-cwd/-/resolve-cwd-3.0.0.tgz"; + sha1 = "0f0075f1bb2544766cf73ba6a6e2adfebcb13f2d"; + }; + } + { + name = "resolve_from___resolve_from_4.0.0.tgz"; + path = fetchurl { + name = "resolve_from___resolve_from_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/resolve-from/-/resolve-from-4.0.0.tgz"; + sha1 = "4abcd852ad32dd7baabfe9b40e00a36db5f392e6"; + }; + } + { + name = "resolve_from___resolve_from_5.0.0.tgz"; + path = fetchurl { + name = "resolve_from___resolve_from_5.0.0.tgz"; + url = "https://registry.yarnpkg.com/resolve-from/-/resolve-from-5.0.0.tgz"; + sha1 = "c35225843df8f776df21c57557bc087e9dfdfc69"; + }; + } + { + name = "resolve_url___resolve_url_0.2.1.tgz"; + path = fetchurl { + name = "resolve_url___resolve_url_0.2.1.tgz"; + url = "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz"; + sha1 = "2c637fe77c893afd2a663fe21aa9080068e2052a"; + }; + } + { + name = "resolve___resolve_1.19.0.tgz"; + path = fetchurl { + name = "resolve___resolve_1.19.0.tgz"; + url = "https://registry.yarnpkg.com/resolve/-/resolve-1.19.0.tgz"; + sha1 = "1af5bf630409734a067cae29318aac7fa29a267c"; + }; + } + { + name = "responselike___responselike_1.0.2.tgz"; + path = fetchurl { + name = "responselike___responselike_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/responselike/-/responselike-1.0.2.tgz"; + sha1 = "918720ef3b631c5642be068f15ade5a46f4ba1e7"; + }; + } + { + name = "ret___ret_0.1.15.tgz"; + path = fetchurl { + name = "ret___ret_0.1.15.tgz"; + url = "https://registry.yarnpkg.com/ret/-/ret-0.1.15.tgz"; + sha1 = "b8a4825d5bdb1fc3f6f53c2bc33f81388681c7bc"; + }; + } + { + name = "rimraf___rimraf_3.0.2.tgz"; + path = fetchurl { + name = "rimraf___rimraf_3.0.2.tgz"; + url = "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.2.tgz"; + sha1 = "f1a5402ba6220ad52cc1282bac1ae3aa49fd061a"; + }; + } + { + name = "roarr___roarr_2.15.4.tgz"; + path = fetchurl { + name = "roarr___roarr_2.15.4.tgz"; + url = "https://registry.yarnpkg.com/roarr/-/roarr-2.15.4.tgz"; + sha1 = "f5fe795b7b838ccfe35dc608e0282b9eba2e7afd"; + }; + } + { + name = "rsvp___rsvp_4.8.5.tgz"; + path = fetchurl { + name = "rsvp___rsvp_4.8.5.tgz"; + url = "https://registry.yarnpkg.com/rsvp/-/rsvp-4.8.5.tgz"; + sha1 = "c8f155311d167f68f21e168df71ec5b083113734"; + }; + } + { + name = "safe_buffer___safe_buffer_5.2.1.tgz"; + path = fetchurl { + name = "safe_buffer___safe_buffer_5.2.1.tgz"; + url = "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz"; + sha1 = "1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6"; + }; + } + { + name = "safe_buffer___safe_buffer_5.1.2.tgz"; + path = fetchurl { + name = "safe_buffer___safe_buffer_5.1.2.tgz"; + url = "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz"; + sha1 = "991ec69d296e0313747d59bdfd2b745c35f8828d"; + }; + } + { + name = "safe_regex___safe_regex_1.1.0.tgz"; + path = fetchurl { + name = "safe_regex___safe_regex_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/safe-regex/-/safe-regex-1.1.0.tgz"; + sha1 = "40a3669f3b077d1e943d44629e157dd48023bf2e"; + }; + } + { + name = "safer_buffer___safer_buffer_2.1.2.tgz"; + path = fetchurl { + name = "safer_buffer___safer_buffer_2.1.2.tgz"; + url = "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz"; + sha1 = "44fa161b0187b9549dd84bb91802f9bd8385cd6a"; + }; + } + { + name = "sane___sane_4.1.0.tgz"; + path = fetchurl { + name = "sane___sane_4.1.0.tgz"; + url = "https://registry.yarnpkg.com/sane/-/sane-4.1.0.tgz"; + sha1 = "ed881fd922733a6c461bc189dc2b6c006f3ffded"; + }; + } + { + name = "sanitize_filename___sanitize_filename_1.6.3.tgz"; + path = fetchurl { + name = "sanitize_filename___sanitize_filename_1.6.3.tgz"; + url = "https://registry.yarnpkg.com/sanitize-filename/-/sanitize-filename-1.6.3.tgz"; + sha1 = "755ebd752045931977e30b2025d340d7c9090378"; + }; + } + { + name = "sax___sax_1.2.4.tgz"; + path = fetchurl { + name = "sax___sax_1.2.4.tgz"; + url = "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz"; + sha1 = "2816234e2378bddc4e5354fab5caa895df7100d9"; + }; + } + { + name = "saxes___saxes_5.0.1.tgz"; + path = fetchurl { + name = "saxes___saxes_5.0.1.tgz"; + url = "https://registry.yarnpkg.com/saxes/-/saxes-5.0.1.tgz"; + sha1 = "eebab953fa3b7608dbe94e5dadb15c888fa6696d"; + }; + } + { + name = "semver_compare___semver_compare_1.0.0.tgz"; + path = fetchurl { + name = "semver_compare___semver_compare_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/semver-compare/-/semver-compare-1.0.0.tgz"; + sha1 = "0dee216a1c941ab37e9efb1788f6afc5ff5537fc"; + }; + } + { + name = "semver_diff___semver_diff_3.1.1.tgz"; + path = fetchurl { + name = "semver_diff___semver_diff_3.1.1.tgz"; + url = "https://registry.yarnpkg.com/semver-diff/-/semver-diff-3.1.1.tgz"; + sha1 = "05f77ce59f325e00e2706afd67bb506ddb1ca32b"; + }; + } + { + name = "semver___semver_5.7.1.tgz"; + path = fetchurl { + name = "semver___semver_5.7.1.tgz"; + url = "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz"; + sha1 = "a954f931aeba508d307bbf069eff0c01c96116f7"; + }; + } + { + name = "semver___semver_6.3.0.tgz"; + path = fetchurl { + name = "semver___semver_6.3.0.tgz"; + url = "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz"; + sha1 = "ee0a64c8af5e8ceea67687b133761e1becbd1d3d"; + }; + } + { + name = "semver___semver_7.3.4.tgz"; + path = fetchurl { + name = "semver___semver_7.3.4.tgz"; + url = "https://registry.yarnpkg.com/semver/-/semver-7.3.4.tgz"; + sha1 = "27aaa7d2e4ca76452f98d3add093a72c943edc97"; + }; + } + { + name = "serialize_error___serialize_error_7.0.1.tgz"; + path = fetchurl { + name = "serialize_error___serialize_error_7.0.1.tgz"; + url = "https://registry.yarnpkg.com/serialize-error/-/serialize-error-7.0.1.tgz"; + sha1 = "f1360b0447f61ffb483ec4157c737fab7d778e18"; + }; + } + { + name = "set_blocking___set_blocking_2.0.0.tgz"; + path = fetchurl { + name = "set_blocking___set_blocking_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz"; + sha1 = "045f9782d011ae9a6803ddd382b24392b3d890f7"; + }; + } + { + name = "set_value___set_value_2.0.1.tgz"; + path = fetchurl { + name = "set_value___set_value_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/set-value/-/set-value-2.0.1.tgz"; + sha1 = "a18d40530e6f07de4228c7defe4227af8cad005b"; + }; + } + { + name = "shebang_command___shebang_command_1.2.0.tgz"; + path = fetchurl { + name = "shebang_command___shebang_command_1.2.0.tgz"; + url = "https://registry.yarnpkg.com/shebang-command/-/shebang-command-1.2.0.tgz"; + sha1 = "44aac65b695b03398968c39f363fee5deafdf1ea"; + }; + } + { + name = "shebang_command___shebang_command_2.0.0.tgz"; + path = fetchurl { + name = "shebang_command___shebang_command_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/shebang-command/-/shebang-command-2.0.0.tgz"; + sha1 = "ccd0af4f8835fbdc265b82461aaf0c36663f34ea"; + }; + } + { + name = "shebang_regex___shebang_regex_1.0.0.tgz"; + path = fetchurl { + name = "shebang_regex___shebang_regex_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-1.0.0.tgz"; + sha1 = "da42f49740c0b42db2ca9728571cb190c98efea3"; + }; + } + { + name = "shebang_regex___shebang_regex_3.0.0.tgz"; + path = fetchurl { + name = "shebang_regex___shebang_regex_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-3.0.0.tgz"; + sha1 = "ae16f1644d873ecad843b0307b143362d4c42172"; + }; + } + { + name = "shellwords___shellwords_0.1.1.tgz"; + path = fetchurl { + name = "shellwords___shellwords_0.1.1.tgz"; + url = "https://registry.yarnpkg.com/shellwords/-/shellwords-0.1.1.tgz"; + sha1 = "d6b9181c1a48d397324c84871efbcfc73fc0654b"; + }; + } + { + name = "signal_exit___signal_exit_3.0.3.tgz"; + path = fetchurl { + name = "signal_exit___signal_exit_3.0.3.tgz"; + url = "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.3.tgz"; + sha1 = "a1410c2edd8f077b08b4e253c8eacfcaf057461c"; + }; + } + { + name = "sisteransi___sisteransi_1.0.5.tgz"; + path = fetchurl { + name = "sisteransi___sisteransi_1.0.5.tgz"; + url = "https://registry.yarnpkg.com/sisteransi/-/sisteransi-1.0.5.tgz"; + sha1 = "134d681297756437cc05ca01370d3a7a571075ed"; + }; + } + { + name = "slash___slash_3.0.0.tgz"; + path = fetchurl { + name = "slash___slash_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/slash/-/slash-3.0.0.tgz"; + sha1 = "6539be870c165adbd5240220dbe361f1bc4d4634"; + }; + } + { + name = "slice_ansi___slice_ansi_2.1.0.tgz"; + path = fetchurl { + name = "slice_ansi___slice_ansi_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-2.1.0.tgz"; + sha1 = "cacd7693461a637a5788d92a7dd4fba068e81636"; + }; + } + { + name = "snapdragon_node___snapdragon_node_2.1.1.tgz"; + path = fetchurl { + name = "snapdragon_node___snapdragon_node_2.1.1.tgz"; + url = "https://registry.yarnpkg.com/snapdragon-node/-/snapdragon-node-2.1.1.tgz"; + sha1 = "6c175f86ff14bdb0724563e8f3c1b021a286853b"; + }; + } + { + name = "snapdragon_util___snapdragon_util_3.0.1.tgz"; + path = fetchurl { + name = "snapdragon_util___snapdragon_util_3.0.1.tgz"; + url = "https://registry.yarnpkg.com/snapdragon-util/-/snapdragon-util-3.0.1.tgz"; + sha1 = "f956479486f2acd79700693f6f7b805e45ab56e2"; + }; + } + { + name = "snapdragon___snapdragon_0.8.2.tgz"; + path = fetchurl { + name = "snapdragon___snapdragon_0.8.2.tgz"; + url = "https://registry.yarnpkg.com/snapdragon/-/snapdragon-0.8.2.tgz"; + sha1 = "64922e7c565b0e14204ba1aa7d6964278d25182d"; + }; + } + { + name = "source_map_resolve___source_map_resolve_0.5.3.tgz"; + path = fetchurl { + name = "source_map_resolve___source_map_resolve_0.5.3.tgz"; + url = "https://registry.yarnpkg.com/source-map-resolve/-/source-map-resolve-0.5.3.tgz"; + sha1 = "190866bece7553e1f8f267a2ee82c606b5509a1a"; + }; + } + { + name = "source_map_support___source_map_support_0.5.19.tgz"; + path = fetchurl { + name = "source_map_support___source_map_support_0.5.19.tgz"; + url = "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.19.tgz"; + sha1 = "a98b62f86dcaf4f67399648c085291ab9e8fed61"; + }; + } + { + name = "source_map_url___source_map_url_0.4.0.tgz"; + path = fetchurl { + name = "source_map_url___source_map_url_0.4.0.tgz"; + url = "https://registry.yarnpkg.com/source-map-url/-/source-map-url-0.4.0.tgz"; + sha1 = "3e935d7ddd73631b97659956d55128e87b5084a3"; + }; + } + { + name = "source_map___source_map_0.5.7.tgz"; + path = fetchurl { + name = "source_map___source_map_0.5.7.tgz"; + url = "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz"; + sha1 = "8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"; + }; + } + { + name = "source_map___source_map_0.6.1.tgz"; + path = fetchurl { + name = "source_map___source_map_0.6.1.tgz"; + url = "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz"; + sha1 = "74722af32e9614e9c287a8d0bbde48b5e2f1a263"; + }; + } + { + name = "source_map___source_map_0.7.3.tgz"; + path = fetchurl { + name = "source_map___source_map_0.7.3.tgz"; + url = "https://registry.yarnpkg.com/source-map/-/source-map-0.7.3.tgz"; + sha1 = "5302f8169031735226544092e64981f751750383"; + }; + } + { + name = "spdx_correct___spdx_correct_3.1.1.tgz"; + path = fetchurl { + name = "spdx_correct___spdx_correct_3.1.1.tgz"; + url = "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-3.1.1.tgz"; + sha1 = "dece81ac9c1e6713e5f7d1b6f17d468fa53d89a9"; + }; + } + { + name = "spdx_exceptions___spdx_exceptions_2.3.0.tgz"; + path = fetchurl { + name = "spdx_exceptions___spdx_exceptions_2.3.0.tgz"; + url = "https://registry.yarnpkg.com/spdx-exceptions/-/spdx-exceptions-2.3.0.tgz"; + sha1 = "3f28ce1a77a00372683eade4a433183527a2163d"; + }; + } + { + name = "spdx_expression_parse___spdx_expression_parse_3.0.1.tgz"; + path = fetchurl { + name = "spdx_expression_parse___spdx_expression_parse_3.0.1.tgz"; + url = "https://registry.yarnpkg.com/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz"; + sha1 = "cf70f50482eefdc98e3ce0a6833e4a53ceeba679"; + }; + } + { + name = "spdx_license_ids___spdx_license_ids_3.0.7.tgz"; + path = fetchurl { + name = "spdx_license_ids___spdx_license_ids_3.0.7.tgz"; + url = "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.7.tgz"; + sha1 = "e9c18a410e5ed7e12442a549fbd8afa767038d65"; + }; + } + { + name = "split_string___split_string_3.1.0.tgz"; + path = fetchurl { + name = "split_string___split_string_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/split-string/-/split-string-3.1.0.tgz"; + sha1 = "7cb09dda3a86585705c64b39a6466038682e8fe2"; + }; + } + { + name = "sprintf_js___sprintf_js_1.1.2.tgz"; + path = fetchurl { + name = "sprintf_js___sprintf_js_1.1.2.tgz"; + url = "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.1.2.tgz"; + sha1 = "da1765262bf8c0f571749f2ad6c26300207ae673"; + }; + } + { + name = "sprintf_js___sprintf_js_1.0.3.tgz"; + path = fetchurl { + name = "sprintf_js___sprintf_js_1.0.3.tgz"; + url = "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz"; + sha1 = "04e6926f662895354f3dd015203633b857297e2c"; + }; + } + { + name = "sshpk___sshpk_1.16.1.tgz"; + path = fetchurl { + name = "sshpk___sshpk_1.16.1.tgz"; + url = "https://registry.yarnpkg.com/sshpk/-/sshpk-1.16.1.tgz"; + sha1 = "fb661c0bef29b39db40769ee39fa70093d6f6877"; + }; + } + { + name = "stack_utils___stack_utils_2.0.3.tgz"; + path = fetchurl { + name = "stack_utils___stack_utils_2.0.3.tgz"; + url = "https://registry.yarnpkg.com/stack-utils/-/stack-utils-2.0.3.tgz"; + sha1 = "cd5f030126ff116b78ccb3c027fe302713b61277"; + }; + } + { + name = "stat_mode___stat_mode_1.0.0.tgz"; + path = fetchurl { + name = "stat_mode___stat_mode_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/stat-mode/-/stat-mode-1.0.0.tgz"; + sha1 = "68b55cb61ea639ff57136f36b216a291800d1465"; + }; + } + { + name = "static_extend___static_extend_0.1.2.tgz"; + path = fetchurl { + name = "static_extend___static_extend_0.1.2.tgz"; + url = "https://registry.yarnpkg.com/static-extend/-/static-extend-0.1.2.tgz"; + sha1 = "60809c39cbff55337226fd5e0b520f341f1fb5c6"; + }; + } + { + name = "stealthy_require___stealthy_require_1.1.1.tgz"; + path = fetchurl { + name = "stealthy_require___stealthy_require_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/stealthy-require/-/stealthy-require-1.1.1.tgz"; + sha1 = "35b09875b4ff49f26a777e509b3090a3226bf24b"; + }; + } + { + name = "string_length___string_length_4.0.1.tgz"; + path = fetchurl { + name = "string_length___string_length_4.0.1.tgz"; + url = "https://registry.yarnpkg.com/string-length/-/string-length-4.0.1.tgz"; + sha1 = "4a973bf31ef77c4edbceadd6af2611996985f8a1"; + }; + } + { + name = "string_width___string_width_3.1.0.tgz"; + path = fetchurl { + name = "string_width___string_width_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/string-width/-/string-width-3.1.0.tgz"; + sha1 = "22767be21b62af1081574306f69ac51b62203961"; + }; + } + { + name = "string_width___string_width_4.2.0.tgz"; + path = fetchurl { + name = "string_width___string_width_4.2.0.tgz"; + url = "https://registry.yarnpkg.com/string-width/-/string-width-4.2.0.tgz"; + sha1 = "952182c46cc7b2c313d1596e623992bd163b72b5"; + }; + } + { + name = "string_decoder___string_decoder_1.3.0.tgz"; + path = fetchurl { + name = "string_decoder___string_decoder_1.3.0.tgz"; + url = "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.3.0.tgz"; + sha1 = "42f114594a46cf1a8e30b0a84f56c78c3edac21e"; + }; + } + { + name = "string_decoder___string_decoder_1.1.1.tgz"; + path = fetchurl { + name = "string_decoder___string_decoder_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz"; + sha1 = "9cf1611ba62685d7030ae9e4ba34149c3af03fc8"; + }; + } + { + name = "strip_ansi___strip_ansi_5.2.0.tgz"; + path = fetchurl { + name = "strip_ansi___strip_ansi_5.2.0.tgz"; + url = "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-5.2.0.tgz"; + sha1 = "8c9a536feb6afc962bdfa5b104a5091c1ad9c0ae"; + }; + } + { + name = "strip_ansi___strip_ansi_6.0.0.tgz"; + path = fetchurl { + name = "strip_ansi___strip_ansi_6.0.0.tgz"; + url = "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.0.tgz"; + sha1 = "0b1571dd7669ccd4f3e06e14ef1eed26225ae532"; + }; + } + { + name = "strip_bom___strip_bom_4.0.0.tgz"; + path = fetchurl { + name = "strip_bom___strip_bom_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/strip-bom/-/strip-bom-4.0.0.tgz"; + sha1 = "9c3505c1db45bcedca3d9cf7a16f5c5aa3901878"; + }; + } + { + name = "strip_eof___strip_eof_1.0.0.tgz"; + path = fetchurl { + name = "strip_eof___strip_eof_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/strip-eof/-/strip-eof-1.0.0.tgz"; + sha1 = "bb43ff5598a6eb05d89b59fcd129c983313606bf"; + }; + } + { + name = "strip_final_newline___strip_final_newline_2.0.0.tgz"; + path = fetchurl { + name = "strip_final_newline___strip_final_newline_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/strip-final-newline/-/strip-final-newline-2.0.0.tgz"; + sha1 = "89b852fb2fcbe936f6f4b3187afb0a12c1ab58ad"; + }; + } + { + name = "strip_json_comments___strip_json_comments_3.1.1.tgz"; + path = fetchurl { + name = "strip_json_comments___strip_json_comments_3.1.1.tgz"; + url = "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.1.1.tgz"; + sha1 = "31f1281b3832630434831c310c01cccda8cbe006"; + }; + } + { + name = "strip_json_comments___strip_json_comments_2.0.1.tgz"; + path = fetchurl { + name = "strip_json_comments___strip_json_comments_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz"; + sha1 = "3c531942e908c2697c0ec344858c286c7ca0a60a"; + }; + } + { + name = "sumchecker___sumchecker_3.0.1.tgz"; + path = fetchurl { + name = "sumchecker___sumchecker_3.0.1.tgz"; + url = "https://registry.yarnpkg.com/sumchecker/-/sumchecker-3.0.1.tgz"; + sha1 = "6377e996795abb0b6d348e9b3e1dfb24345a8e42"; + }; + } + { + name = "supports_color___supports_color_5.5.0.tgz"; + path = fetchurl { + name = "supports_color___supports_color_5.5.0.tgz"; + url = "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz"; + sha1 = "e2e69a44ac8772f78a1ec0b35b689df6530efc8f"; + }; + } + { + name = "supports_color___supports_color_7.2.0.tgz"; + path = fetchurl { + name = "supports_color___supports_color_7.2.0.tgz"; + url = "https://registry.yarnpkg.com/supports-color/-/supports-color-7.2.0.tgz"; + sha1 = "1b7dcdcb32b8138801b3e478ba6a51caa89648da"; + }; + } + { + name = "supports_hyperlinks___supports_hyperlinks_2.1.0.tgz"; + path = fetchurl { + name = "supports_hyperlinks___supports_hyperlinks_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/supports-hyperlinks/-/supports-hyperlinks-2.1.0.tgz"; + sha1 = "f663df252af5f37c5d49bbd7eeefa9e0b9e59e47"; + }; + } + { + name = "symbol_tree___symbol_tree_3.2.4.tgz"; + path = fetchurl { + name = "symbol_tree___symbol_tree_3.2.4.tgz"; + url = "https://registry.yarnpkg.com/symbol-tree/-/symbol-tree-3.2.4.tgz"; + sha1 = "430637d248ba77e078883951fb9aa0eed7c63fa2"; + }; + } + { + name = "table___table_5.4.6.tgz"; + path = fetchurl { + name = "table___table_5.4.6.tgz"; + url = "https://registry.yarnpkg.com/table/-/table-5.4.6.tgz"; + sha1 = "1292d19500ce3f86053b05f0e8e7e4a3bb21079e"; + }; + } + { + name = "tar_stream___tar_stream_2.1.4.tgz"; + path = fetchurl { + name = "tar_stream___tar_stream_2.1.4.tgz"; + url = "https://registry.yarnpkg.com/tar-stream/-/tar-stream-2.1.4.tgz"; + sha1 = "c4fb1a11eb0da29b893a5b25476397ba2d053bfa"; + }; + } + { + name = "temp_file___temp_file_3.3.7.tgz"; + path = fetchurl { + name = "temp_file___temp_file_3.3.7.tgz"; + url = "https://registry.yarnpkg.com/temp-file/-/temp-file-3.3.7.tgz"; + sha1 = "686885d635f872748e384e871855958470aeb18a"; + }; + } + { + name = "term_size___term_size_2.2.1.tgz"; + path = fetchurl { + name = "term_size___term_size_2.2.1.tgz"; + url = "https://registry.yarnpkg.com/term-size/-/term-size-2.2.1.tgz"; + sha1 = "2a6a54840432c2fb6320fea0f415531e90189f54"; + }; + } + { + name = "terminal_link___terminal_link_2.1.1.tgz"; + path = fetchurl { + name = "terminal_link___terminal_link_2.1.1.tgz"; + url = "https://registry.yarnpkg.com/terminal-link/-/terminal-link-2.1.1.tgz"; + sha1 = "14a64a27ab3c0df933ea546fba55f2d078edc994"; + }; + } + { + name = "test_exclude___test_exclude_6.0.0.tgz"; + path = fetchurl { + name = "test_exclude___test_exclude_6.0.0.tgz"; + url = "https://registry.yarnpkg.com/test-exclude/-/test-exclude-6.0.0.tgz"; + sha1 = "04a8698661d805ea6fa293b6cb9e63ac044ef15e"; + }; + } + { + name = "text_table___text_table_0.2.0.tgz"; + path = fetchurl { + name = "text_table___text_table_0.2.0.tgz"; + url = "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz"; + sha1 = "7f5ee823ae805207c00af2df4a84ec3fcfa570b4"; + }; + } + { + name = "throat___throat_5.0.0.tgz"; + path = fetchurl { + name = "throat___throat_5.0.0.tgz"; + url = "https://registry.yarnpkg.com/throat/-/throat-5.0.0.tgz"; + sha1 = "c5199235803aad18754a667d659b5e72ce16764b"; + }; + } + { + name = "tldts_core___tldts_core_5.6.64.tgz"; + path = fetchurl { + name = "tldts_core___tldts_core_5.6.64.tgz"; + url = "https://registry.yarnpkg.com/tldts-core/-/tldts-core-5.6.64.tgz"; + sha1 = "0f80d0c9607d7583acc477a10dae7e62e7c08063"; + }; + } + { + name = "tldts_experimental___tldts_experimental_5.6.64.tgz"; + path = fetchurl { + name = "tldts_experimental___tldts_experimental_5.6.64.tgz"; + url = "https://registry.yarnpkg.com/tldts-experimental/-/tldts-experimental-5.6.64.tgz"; + sha1 = "f867449964d94c6a17a499335658f42a9fbdc7d3"; + }; + } + { + name = "tmpl___tmpl_1.0.4.tgz"; + path = fetchurl { + name = "tmpl___tmpl_1.0.4.tgz"; + url = "https://registry.yarnpkg.com/tmpl/-/tmpl-1.0.4.tgz"; + sha1 = "23640dd7b42d00433911140820e5cf440e521dd1"; + }; + } + { + name = "to_fast_properties___to_fast_properties_2.0.0.tgz"; + path = fetchurl { + name = "to_fast_properties___to_fast_properties_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-2.0.0.tgz"; + sha1 = "dc5e698cbd079265bc73e0377681a4e4e83f616e"; + }; + } + { + name = "to_object_path___to_object_path_0.3.0.tgz"; + path = fetchurl { + name = "to_object_path___to_object_path_0.3.0.tgz"; + url = "https://registry.yarnpkg.com/to-object-path/-/to-object-path-0.3.0.tgz"; + sha1 = "297588b7b0e7e0ac08e04e672f85c1f4999e17af"; + }; + } + { + name = "to_readable_stream___to_readable_stream_1.0.0.tgz"; + path = fetchurl { + name = "to_readable_stream___to_readable_stream_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/to-readable-stream/-/to-readable-stream-1.0.0.tgz"; + sha1 = "ce0aa0c2f3df6adf852efb404a783e77c0475771"; + }; + } + { + name = "to_regex_range___to_regex_range_2.1.1.tgz"; + path = fetchurl { + name = "to_regex_range___to_regex_range_2.1.1.tgz"; + url = "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-2.1.1.tgz"; + sha1 = "7c80c17b9dfebe599e27367e0d4dd5590141db38"; + }; + } + { + name = "to_regex_range___to_regex_range_5.0.1.tgz"; + path = fetchurl { + name = "to_regex_range___to_regex_range_5.0.1.tgz"; + url = "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-5.0.1.tgz"; + sha1 = "1648c44aae7c8d988a326018ed72f5b4dd0392e4"; + }; + } + { + name = "to_regex___to_regex_3.0.2.tgz"; + path = fetchurl { + name = "to_regex___to_regex_3.0.2.tgz"; + url = "https://registry.yarnpkg.com/to-regex/-/to-regex-3.0.2.tgz"; + sha1 = "13cfdd9b336552f30b51f33a8ae1b42a7a7599ce"; + }; + } + { + name = "tough_cookie___tough_cookie_2.5.0.tgz"; + path = fetchurl { + name = "tough_cookie___tough_cookie_2.5.0.tgz"; + url = "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.5.0.tgz"; + sha1 = "cd9fb2a0aa1d5a12b473bd9fb96fa3dcff65ade2"; + }; + } + { + name = "tough_cookie___tough_cookie_3.0.1.tgz"; + path = fetchurl { + name = "tough_cookie___tough_cookie_3.0.1.tgz"; + url = "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-3.0.1.tgz"; + sha1 = "9df4f57e739c26930a018184887f4adb7dca73b2"; + }; + } + { + name = "tr46___tr46_2.0.2.tgz"; + path = fetchurl { + name = "tr46___tr46_2.0.2.tgz"; + url = "https://registry.yarnpkg.com/tr46/-/tr46-2.0.2.tgz"; + sha1 = "03273586def1595ae08fedb38d7733cee91d2479"; + }; + } + { + name = "truncate_utf8_bytes___truncate_utf8_bytes_1.0.2.tgz"; + path = fetchurl { + name = "truncate_utf8_bytes___truncate_utf8_bytes_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/truncate-utf8-bytes/-/truncate-utf8-bytes-1.0.2.tgz"; + sha1 = "405923909592d56f78a5818434b0b78489ca5f2b"; + }; + } + { + name = "tunnel_agent___tunnel_agent_0.6.0.tgz"; + path = fetchurl { + name = "tunnel_agent___tunnel_agent_0.6.0.tgz"; + url = "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.6.0.tgz"; + sha1 = "27a5dea06b36b04a0a9966774b290868f0fc40fd"; + }; + } + { + name = "tunnel___tunnel_0.0.6.tgz"; + path = fetchurl { + name = "tunnel___tunnel_0.0.6.tgz"; + url = "https://registry.yarnpkg.com/tunnel/-/tunnel-0.0.6.tgz"; + sha1 = "72f1314b34a5b192db012324df2cc587ca47f92c"; + }; + } + { + name = "tweetnacl___tweetnacl_0.14.5.tgz"; + path = fetchurl { + name = "tweetnacl___tweetnacl_0.14.5.tgz"; + url = "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-0.14.5.tgz"; + sha1 = "5ae68177f192d4456269d108afa93ff8743f4f64"; + }; + } + { + name = "type_check___type_check_0.4.0.tgz"; + path = fetchurl { + name = "type_check___type_check_0.4.0.tgz"; + url = "https://registry.yarnpkg.com/type-check/-/type-check-0.4.0.tgz"; + sha1 = "07b8203bfa7056c0657050e3ccd2c37730bab8f1"; + }; + } + { + name = "type_check___type_check_0.3.2.tgz"; + path = fetchurl { + name = "type_check___type_check_0.3.2.tgz"; + url = "https://registry.yarnpkg.com/type-check/-/type-check-0.3.2.tgz"; + sha1 = "5884cab512cf1d355e3fb784f30804b2b520db72"; + }; + } + { + name = "type_detect___type_detect_4.0.8.tgz"; + path = fetchurl { + name = "type_detect___type_detect_4.0.8.tgz"; + url = "https://registry.yarnpkg.com/type-detect/-/type-detect-4.0.8.tgz"; + sha1 = "7646fb5f18871cfbb7749e69bd39a6388eb7450c"; + }; + } + { + name = "type_fest___type_fest_0.11.0.tgz"; + path = fetchurl { + name = "type_fest___type_fest_0.11.0.tgz"; + url = "https://registry.yarnpkg.com/type-fest/-/type-fest-0.11.0.tgz"; + sha1 = "97abf0872310fed88a5c466b25681576145e33f1"; + }; + } + { + name = "type_fest___type_fest_0.13.1.tgz"; + path = fetchurl { + name = "type_fest___type_fest_0.13.1.tgz"; + url = "https://registry.yarnpkg.com/type-fest/-/type-fest-0.13.1.tgz"; + sha1 = "0172cb5bce80b0bd542ea348db50c7e21834d934"; + }; + } + { + name = "type_fest___type_fest_0.6.0.tgz"; + path = fetchurl { + name = "type_fest___type_fest_0.6.0.tgz"; + url = "https://registry.yarnpkg.com/type-fest/-/type-fest-0.6.0.tgz"; + sha1 = "8d2a2370d3df886eb5c90ada1c5bf6188acf838b"; + }; + } + { + name = "type_fest___type_fest_0.8.1.tgz"; + path = fetchurl { + name = "type_fest___type_fest_0.8.1.tgz"; + url = "https://registry.yarnpkg.com/type-fest/-/type-fest-0.8.1.tgz"; + sha1 = "09e249ebde851d3b1e48d27c105444667f17b83d"; + }; + } + { + name = "typedarray_to_buffer___typedarray_to_buffer_3.1.5.tgz"; + path = fetchurl { + name = "typedarray_to_buffer___typedarray_to_buffer_3.1.5.tgz"; + url = "https://registry.yarnpkg.com/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz"; + sha1 = "a97ee7a9ff42691b9f783ff1bc5112fe3fca9080"; + }; + } + { + name = "typedarray___typedarray_0.0.6.tgz"; + path = fetchurl { + name = "typedarray___typedarray_0.0.6.tgz"; + url = "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz"; + sha1 = "867ac74e3864187b1d3d47d996a78ec5c8830777"; + }; + } + { + name = "union_value___union_value_1.0.1.tgz"; + path = fetchurl { + name = "union_value___union_value_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/union-value/-/union-value-1.0.1.tgz"; + sha1 = "0b6fe7b835aecda61c6ea4d4f02c14221e109847"; + }; + } + { + name = "unique_string___unique_string_2.0.0.tgz"; + path = fetchurl { + name = "unique_string___unique_string_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/unique-string/-/unique-string-2.0.0.tgz"; + sha1 = "39c6451f81afb2749de2b233e3f7c5e8843bd89d"; + }; + } + { + name = "universalify___universalify_0.1.2.tgz"; + path = fetchurl { + name = "universalify___universalify_0.1.2.tgz"; + url = "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz"; + sha1 = "b646f69be3942dabcecc9d6639c80dc105efaa66"; + }; + } + { + name = "universalify___universalify_1.0.0.tgz"; + path = fetchurl { + name = "universalify___universalify_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/universalify/-/universalify-1.0.0.tgz"; + sha1 = "b61a1da173e8435b2fe3c67d29b9adf8594bd16d"; + }; + } + { + name = "universalify___universalify_2.0.0.tgz"; + path = fetchurl { + name = "universalify___universalify_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/universalify/-/universalify-2.0.0.tgz"; + sha1 = "75a4984efedc4b08975c5aeb73f530d02df25717"; + }; + } + { + name = "unset_value___unset_value_1.0.0.tgz"; + path = fetchurl { + name = "unset_value___unset_value_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/unset-value/-/unset-value-1.0.0.tgz"; + sha1 = "8376873f7d2335179ffb1e6fc3a8ed0dfc8ab559"; + }; + } + { + name = "update_notifier___update_notifier_4.1.3.tgz"; + path = fetchurl { + name = "update_notifier___update_notifier_4.1.3.tgz"; + url = "https://registry.yarnpkg.com/update-notifier/-/update-notifier-4.1.3.tgz"; + sha1 = "be86ee13e8ce48fb50043ff72057b5bd598e1ea3"; + }; + } + { + name = "uri_js___uri_js_4.4.0.tgz"; + path = fetchurl { + name = "uri_js___uri_js_4.4.0.tgz"; + url = "https://registry.yarnpkg.com/uri-js/-/uri-js-4.4.0.tgz"; + sha1 = "aa714261de793e8a82347a7bcc9ce74e86f28602"; + }; + } + { + name = "urix___urix_0.1.0.tgz"; + path = fetchurl { + name = "urix___urix_0.1.0.tgz"; + url = "https://registry.yarnpkg.com/urix/-/urix-0.1.0.tgz"; + sha1 = "da937f7a62e21fec1fd18d49b35c2935067a6c72"; + }; + } + { + name = "url_parse_lax___url_parse_lax_3.0.0.tgz"; + path = fetchurl { + name = "url_parse_lax___url_parse_lax_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/url-parse-lax/-/url-parse-lax-3.0.0.tgz"; + sha1 = "16b5cafc07dbe3676c1b1999177823d6503acb0c"; + }; + } + { + name = "use___use_3.1.1.tgz"; + path = fetchurl { + name = "use___use_3.1.1.tgz"; + url = "https://registry.yarnpkg.com/use/-/use-3.1.1.tgz"; + sha1 = "d50c8cac79a19fbc20f2911f56eb973f4e10070f"; + }; + } + { + name = "utf8_byte_length___utf8_byte_length_1.0.4.tgz"; + path = fetchurl { + name = "utf8_byte_length___utf8_byte_length_1.0.4.tgz"; + url = "https://registry.yarnpkg.com/utf8-byte-length/-/utf8-byte-length-1.0.4.tgz"; + sha1 = "f45f150c4c66eee968186505ab93fcbb8ad6bf61"; + }; + } + { + name = "util_deprecate___util_deprecate_1.0.2.tgz"; + path = fetchurl { + name = "util_deprecate___util_deprecate_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz"; + sha1 = "450d4dc9fa70de732762fbd2d4a28981419a0ccf"; + }; + } + { + name = "uuid___uuid_3.4.0.tgz"; + path = fetchurl { + name = "uuid___uuid_3.4.0.tgz"; + url = "https://registry.yarnpkg.com/uuid/-/uuid-3.4.0.tgz"; + sha1 = "b23e4358afa8a202fe7a100af1f5f883f02007ee"; + }; + } + { + name = "uuid___uuid_8.3.2.tgz"; + path = fetchurl { + name = "uuid___uuid_8.3.2.tgz"; + url = "https://registry.yarnpkg.com/uuid/-/uuid-8.3.2.tgz"; + sha1 = "80d5b5ced271bb9af6c445f21a1a04c606cefbe2"; + }; + } + { + name = "v8_compile_cache___v8_compile_cache_2.2.0.tgz"; + path = fetchurl { + name = "v8_compile_cache___v8_compile_cache_2.2.0.tgz"; + url = "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.2.0.tgz"; + sha1 = "9471efa3ef9128d2f7c6a7ca39c4dd6b5055b132"; + }; + } + { + name = "v8_to_istanbul___v8_to_istanbul_7.0.0.tgz"; + path = fetchurl { + name = "v8_to_istanbul___v8_to_istanbul_7.0.0.tgz"; + url = "https://registry.yarnpkg.com/v8-to-istanbul/-/v8-to-istanbul-7.0.0.tgz"; + sha1 = "b4fe00e35649ef7785a9b7fcebcea05f37c332fc"; + }; + } + { + name = "validate_npm_package_license___validate_npm_package_license_3.0.4.tgz"; + path = fetchurl { + name = "validate_npm_package_license___validate_npm_package_license_3.0.4.tgz"; + url = "https://registry.yarnpkg.com/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz"; + sha1 = "fc91f6b9c7ba15c857f4cb2c5defeec39d4f410a"; + }; + } + { + name = "verror___verror_1.10.0.tgz"; + path = fetchurl { + name = "verror___verror_1.10.0.tgz"; + url = "https://registry.yarnpkg.com/verror/-/verror-1.10.0.tgz"; + sha1 = "3a105ca17053af55d6e270c1f8288682e18da400"; + }; + } + { + name = "w3c_hr_time___w3c_hr_time_1.0.2.tgz"; + path = fetchurl { + name = "w3c_hr_time___w3c_hr_time_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/w3c-hr-time/-/w3c-hr-time-1.0.2.tgz"; + sha1 = "0a89cdf5cc15822df9c360543676963e0cc308cd"; + }; + } + { + name = "w3c_xmlserializer___w3c_xmlserializer_2.0.0.tgz"; + path = fetchurl { + name = "w3c_xmlserializer___w3c_xmlserializer_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/w3c-xmlserializer/-/w3c-xmlserializer-2.0.0.tgz"; + sha1 = "3e7104a05b75146cc60f564380b7f683acf1020a"; + }; + } + { + name = "walker___walker_1.0.7.tgz"; + path = fetchurl { + name = "walker___walker_1.0.7.tgz"; + url = "https://registry.yarnpkg.com/walker/-/walker-1.0.7.tgz"; + sha1 = "2f7f9b8fd10d677262b18a884e28d19618e028fb"; + }; + } + { + name = "webidl_conversions___webidl_conversions_5.0.0.tgz"; + path = fetchurl { + name = "webidl_conversions___webidl_conversions_5.0.0.tgz"; + url = "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-5.0.0.tgz"; + sha1 = "ae59c8a00b121543a2acc65c0434f57b0fc11aff"; + }; + } + { + name = "webidl_conversions___webidl_conversions_6.1.0.tgz"; + path = fetchurl { + name = "webidl_conversions___webidl_conversions_6.1.0.tgz"; + url = "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-6.1.0.tgz"; + sha1 = "9111b4d7ea80acd40f5270d666621afa78b69514"; + }; + } + { + name = "whatwg_encoding___whatwg_encoding_1.0.5.tgz"; + path = fetchurl { + name = "whatwg_encoding___whatwg_encoding_1.0.5.tgz"; + url = "https://registry.yarnpkg.com/whatwg-encoding/-/whatwg-encoding-1.0.5.tgz"; + sha1 = "5abacf777c32166a51d085d6b4f3e7d27113ddb0"; + }; + } + { + name = "whatwg_mimetype___whatwg_mimetype_2.3.0.tgz"; + path = fetchurl { + name = "whatwg_mimetype___whatwg_mimetype_2.3.0.tgz"; + url = "https://registry.yarnpkg.com/whatwg-mimetype/-/whatwg-mimetype-2.3.0.tgz"; + sha1 = "3d4b1e0312d2079879f826aff18dbeeca5960fbf"; + }; + } + { + name = "whatwg_url___whatwg_url_8.4.0.tgz"; + path = fetchurl { + name = "whatwg_url___whatwg_url_8.4.0.tgz"; + url = "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-8.4.0.tgz"; + sha1 = "50fb9615b05469591d2b2bd6dfaed2942ed72837"; + }; + } + { + name = "which_module___which_module_2.0.0.tgz"; + path = fetchurl { + name = "which_module___which_module_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/which-module/-/which-module-2.0.0.tgz"; + sha1 = "d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a"; + }; + } + { + name = "which___which_1.3.1.tgz"; + path = fetchurl { + name = "which___which_1.3.1.tgz"; + url = "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz"; + sha1 = "a45043d54f5805316da8d62f9f50918d3da70b0a"; + }; + } + { + name = "which___which_2.0.2.tgz"; + path = fetchurl { + name = "which___which_2.0.2.tgz"; + url = "https://registry.yarnpkg.com/which/-/which-2.0.2.tgz"; + sha1 = "7c6a8dd0a636a0327e10b59c9286eee93f3f51b1"; + }; + } + { + name = "widest_line___widest_line_3.1.0.tgz"; + path = fetchurl { + name = "widest_line___widest_line_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/widest-line/-/widest-line-3.1.0.tgz"; + sha1 = "8292333bbf66cb45ff0de1603b136b7ae1496eca"; + }; + } + { + name = "word_wrap___word_wrap_1.2.3.tgz"; + path = fetchurl { + name = "word_wrap___word_wrap_1.2.3.tgz"; + url = "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.3.tgz"; + sha1 = "610636f6b1f703891bd34771ccb17fb93b47079c"; + }; + } + { + name = "wrap_ansi___wrap_ansi_6.2.0.tgz"; + path = fetchurl { + name = "wrap_ansi___wrap_ansi_6.2.0.tgz"; + url = "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-6.2.0.tgz"; + sha1 = "e9393ba07102e6c91a3b221478f0257cd2856e53"; + }; + } + { + name = "wrap_ansi___wrap_ansi_7.0.0.tgz"; + path = fetchurl { + name = "wrap_ansi___wrap_ansi_7.0.0.tgz"; + url = "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz"; + sha1 = "67e145cff510a6a6984bdf1152911d69d2eb9e43"; + }; + } + { + name = "wrappy___wrappy_1.0.2.tgz"; + path = fetchurl { + name = "wrappy___wrappy_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz"; + sha1 = "b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"; + }; + } + { + name = "write_file_atomic___write_file_atomic_3.0.3.tgz"; + path = fetchurl { + name = "write_file_atomic___write_file_atomic_3.0.3.tgz"; + url = "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-3.0.3.tgz"; + sha1 = "56bd5c5a5c70481cd19c571bd39ab965a5de56e8"; + }; + } + { + name = "ws___ws_7.4.1.tgz"; + path = fetchurl { + name = "ws___ws_7.4.1.tgz"; + url = "https://registry.yarnpkg.com/ws/-/ws-7.4.1.tgz"; + sha1 = "a333be02696bd0e54cea0434e21dcc8a9ac294bb"; + }; + } + { + name = "xdg_basedir___xdg_basedir_4.0.0.tgz"; + path = fetchurl { + name = "xdg_basedir___xdg_basedir_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/xdg-basedir/-/xdg-basedir-4.0.0.tgz"; + sha1 = "4bc8d9984403696225ef83a1573cbbcb4e79db13"; + }; + } + { + name = "xml_name_validator___xml_name_validator_3.0.0.tgz"; + path = fetchurl { + name = "xml_name_validator___xml_name_validator_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/xml-name-validator/-/xml-name-validator-3.0.0.tgz"; + sha1 = "6ae73e06de4d8c6e47f9fb181f78d648ad457c6a"; + }; + } + { + name = "xmlchars___xmlchars_2.2.0.tgz"; + path = fetchurl { + name = "xmlchars___xmlchars_2.2.0.tgz"; + url = "https://registry.yarnpkg.com/xmlchars/-/xmlchars-2.2.0.tgz"; + sha1 = "060fe1bcb7f9c76fe2a17db86a9bc3ab894210cb"; + }; + } + { + name = "y18n___y18n_4.0.1.tgz"; + path = fetchurl { + name = "y18n___y18n_4.0.1.tgz"; + url = "https://registry.yarnpkg.com/y18n/-/y18n-4.0.1.tgz"; + sha1 = "8db2b83c31c5d75099bb890b23f3094891e247d4"; + }; + } + { + name = "y18n___y18n_5.0.5.tgz"; + path = fetchurl { + name = "y18n___y18n_5.0.5.tgz"; + url = "https://registry.yarnpkg.com/y18n/-/y18n-5.0.5.tgz"; + sha1 = "8769ec08d03b1ea2df2500acef561743bbb9ab18"; + }; + } + { + name = "yallist___yallist_4.0.0.tgz"; + path = fetchurl { + name = "yallist___yallist_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz"; + sha1 = "9bb92790d9c0effec63be73519e11a35019a3a72"; + }; + } + { + name = "yargs_parser___yargs_parser_18.1.3.tgz"; + path = fetchurl { + name = "yargs_parser___yargs_parser_18.1.3.tgz"; + url = "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-18.1.3.tgz"; + sha1 = "be68c4975c6b2abf469236b0c870362fab09a7b0"; + }; + } + { + name = "yargs_parser___yargs_parser_20.2.4.tgz"; + path = fetchurl { + name = "yargs_parser___yargs_parser_20.2.4.tgz"; + url = "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.4.tgz"; + sha1 = "b42890f14566796f85ae8e3a25290d205f154a54"; + }; + } + { + name = "yargs___yargs_15.4.1.tgz"; + path = fetchurl { + name = "yargs___yargs_15.4.1.tgz"; + url = "https://registry.yarnpkg.com/yargs/-/yargs-15.4.1.tgz"; + sha1 = "0d87a16de01aee9d8bec2bfbf74f67851730f4f8"; + }; + } + { + name = "yargs___yargs_16.2.0.tgz"; + path = fetchurl { + name = "yargs___yargs_16.2.0.tgz"; + url = "https://registry.yarnpkg.com/yargs/-/yargs-16.2.0.tgz"; + sha1 = "1c82bf0f6b6a66eafce7ef30e376f49a12477f66"; + }; + } + { + name = "yauzl___yauzl_2.10.0.tgz"; + path = fetchurl { + name = "yauzl___yauzl_2.10.0.tgz"; + url = "https://registry.yarnpkg.com/yauzl/-/yauzl-2.10.0.tgz"; + sha1 = "c7eb17c93e112cb1086fa6d8e51fb0667b79a5f9"; + }; + } + { + name = "zip_stream___zip_stream_4.0.4.tgz"; + path = fetchurl { + name = "zip_stream___zip_stream_4.0.4.tgz"; + url = "https://registry.yarnpkg.com/zip-stream/-/zip-stream-4.0.4.tgz"; + sha1 = "3a8f100b73afaa7d1ae9338d910b321dec77ff3a"; + }; + } + ]; +} diff --git a/pkgs/applications/networking/browsers/vivaldi/default.nix b/pkgs/applications/networking/browsers/vivaldi/default.nix index aa4dd7f8e4439..cf37a31ee4235 100644 --- a/pkgs/applications/networking/browsers/vivaldi/default.nix +++ b/pkgs/applications/networking/browsers/vivaldi/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, zlib, libX11, libXext, libSM, libICE +{ stdenv, fetchurl, zlib, libX11, libXext, libSM, libICE, libxkbcommon , libXfixes, libXt, libXi, libXcursor, libXScrnSaver, libXcomposite, libXdamage, libXtst, libXrandr , alsaLib, dbus, cups, libexif, ffmpeg_3, systemd , freetype, fontconfig, libXft, libXrender, libxcb, expat @@ -18,11 +18,11 @@ let vivaldiName = if isSnapshot then "vivaldi-snapshot" else "vivaldi"; in stdenv.mkDerivation rec { pname = "vivaldi"; - version = "3.4.2066.90-1"; + version = "3.5.2115.73-1"; src = fetchurl { url = "https://downloads.vivaldi.com/${branch}/vivaldi-${branch}_${version}_amd64.deb"; - sha256 = "059vcr2j0vr8szqcxfqnzxwy5i8z53g71fwhm22nc0477jbrsxz1"; + sha256 = "0gjar22b0qdirww4mlb0d0pm2cqkhlp1jn88gwxwvx6g72p3b6lz"; }; unpackPhase = '' @@ -33,7 +33,7 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ patchelf makeWrapper ]; buildInputs = [ - stdenv.cc.cc stdenv.cc.libc zlib libX11 libXt libXext libSM libICE libxcb + stdenv.cc.cc stdenv.cc.libc zlib libX11 libXt libXext libSM libICE libxcb libxkbcommon libXi libXft libXcursor libXfixes libXScrnSaver libXcomposite libXdamage libXtst libXrandr atk at-spi2-atk at-spi2-core alsaLib dbus cups gtk3 gdk-pixbuf libexif ffmpeg_3 systemd freetype fontconfig libXrender libuuid expat glib nss nspr diff --git a/pkgs/applications/networking/cluster/k3s/default.nix b/pkgs/applications/networking/cluster/k3s/default.nix index 629f11865bbc7..c35579def7e9a 100644 --- a/pkgs/applications/networking/cluster/k3s/default.nix +++ b/pkgs/applications/networking/cluster/k3s/default.nix @@ -223,7 +223,7 @@ let }; in stdenv.mkDerivation rec { - name = "k3s"; + pname = "k3s"; version = k3sVersion; # Important utilities used by the kubelet, see diff --git a/pkgs/applications/networking/cluster/minikube/default.nix b/pkgs/applications/networking/cluster/minikube/default.nix index bd71f2f5c5ba7..080cfc167daba 100644 --- a/pkgs/applications/networking/cluster/minikube/default.nix +++ b/pkgs/applications/networking/cluster/minikube/default.nix @@ -11,9 +11,9 @@ buildGoModule rec { pname = "minikube"; - version = "1.15.1"; + version = "1.16.0"; - vendorSha256 = "1xkk4f8qjqx5x878iniclni3jm2f7ka47va756vc3vk8p5s6vpdk"; + vendorSha256 = "0nc2f9h77h24f0nvai5wvgmf1gh09dqfwrb6d5qghmq03a459san"; doCheck = false; @@ -21,7 +21,7 @@ buildGoModule rec { owner = "kubernetes"; repo = "minikube"; rev = "v${version}"; - sha256 = "03knkc8z3vri73j1aa9ry6p1rxql3d75kphd429x5am856mpnn6g"; + sha256 = "00dn8yy7mna0j8rdcnxbgnd5vkjdkqij8akgqhvbd32kxpqss890"; }; nativeBuildInputs = [ go-bindata installShellFiles pkg-config which ]; diff --git a/pkgs/applications/networking/cluster/nerdctl/default.nix b/pkgs/applications/networking/cluster/nerdctl/default.nix index 050c414ce1e98..ed00fb231a650 100644 --- a/pkgs/applications/networking/cluster/nerdctl/default.nix +++ b/pkgs/applications/networking/cluster/nerdctl/default.nix @@ -14,16 +14,16 @@ let in buildGoModule rec { pname = "nerdctl"; - version = "0.2.0"; + version = "0.4.0"; src = fetchFromGitHub { owner = "AkihiroSuda"; repo = pname; rev = "v${version}"; - sha256 = "181qapqgp7zd0imk0zkn4wzpsw292ai2yz9pbiirpjcjx9h26w5h"; + sha256 = "0vjcbvd5yrasw97hd5mrn6cdjvfv2r03z7g1wczlszlcs8gr6nxw"; }; - vendorSha256 = "0scywhllxk1m6456wggdmn7sgvy5x3gz2xnyfq9jnvvzap8byr2v"; + vendorSha256 = "181lp9l4i0qpiqm8wbxa4ldi1j5bm3ygmanz1xh3mkjanl0pwqjr"; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/networking/cluster/nomad/0.11.nix b/pkgs/applications/networking/cluster/nomad/0.11.nix index 6487a2edd7f60..58bdb694eed51 100644 --- a/pkgs/applications/networking/cluster/nomad/0.11.nix +++ b/pkgs/applications/networking/cluster/nomad/0.11.nix @@ -1,7 +1,11 @@ -{ callPackage, buildGoPackage }: +{ callPackage +, buildGoPackage +, nvidia_x11 +, nvidiaGpuSupport +}: callPackage ./generic.nix { - inherit buildGoPackage; - version = "0.11.7"; - sha256 = "sha256-wp1Je+I3iijD/pHHQtylMQhOiVhS6AT/y2/pUiLr0M4="; + inherit buildGoPackage nvidia_x11 nvidiaGpuSupport; + version = "0.11.8"; + sha256 = "1dhh07bifr02jh2lls8fv1d9ra67ymgh8qxqvpvm0cd0qdd469z1"; } diff --git a/pkgs/applications/networking/cluster/nomad/0.12.nix b/pkgs/applications/networking/cluster/nomad/0.12.nix index 863f7cbed2f9b..b6e053e757de2 100644 --- a/pkgs/applications/networking/cluster/nomad/0.12.nix +++ b/pkgs/applications/networking/cluster/nomad/0.12.nix @@ -1,7 +1,11 @@ -{ callPackage, buildGoPackage }: +{ callPackage +, buildGoPackage +, nvidia_x11 +, nvidiaGpuSupport +}: callPackage ./generic.nix { - inherit buildGoPackage; - version = "0.12.7"; - sha256 = "0y1nwmpc4fqgjyb19n1f2w4y5k7fy4p68v2vnnry11nj3im7ia14"; + inherit buildGoPackage nvidia_x11 nvidiaGpuSupport; + version = "0.12.9"; + sha256 = "1a0ig6pb0z3qp7zk4jgz3h241bifmjlyqsfikyy3sxdnzj7yha27"; } diff --git a/pkgs/applications/networking/cluster/nomad/1.0.nix b/pkgs/applications/networking/cluster/nomad/1.0.nix new file mode 100644 index 0000000000000..0b7b7c12d1a63 --- /dev/null +++ b/pkgs/applications/networking/cluster/nomad/1.0.nix @@ -0,0 +1,11 @@ +{ callPackage +, buildGoPackage +, nvidia_x11 +, nvidiaGpuSupport +}: + +callPackage ./generic.nix { + inherit buildGoPackage nvidia_x11 nvidiaGpuSupport; + version = "1.0.1"; + sha256 = "07k81csyxhgc7bgn297zlqyvc55qb5fmiavi7dk81rdpg5m2zjvv"; +} diff --git a/pkgs/applications/networking/cluster/nomad/generic.nix b/pkgs/applications/networking/cluster/nomad/generic.nix index 0bfdb0b27f6e6..dc22ab41d8b64 100644 --- a/pkgs/applications/networking/cluster/nomad/generic.nix +++ b/pkgs/applications/networking/cluster/nomad/generic.nix @@ -1,4 +1,12 @@ -{ stdenv, buildGoPackage, fetchFromGitHub, version, sha256 }: +{ lib +, buildGoPackage +, fetchFromGitHub +, version +, sha256 +, nvidiaGpuSupport +, patchelf +, nvidia_x11 +}: buildGoPackage rec { pname = "nomad"; @@ -14,23 +22,33 @@ buildGoPackage rec { inherit rev sha256; }; + nativeBuildInputs = lib.optionals nvidiaGpuSupport [ + patchelf + ]; + # ui: # Nomad release commits include the compiled version of the UI, but the file # is only included if we build with the ui tag. - # nonvidia: - # We disable Nvidia GPU scheduling on Linux, as it doesn't work there: - # Ref: https://github.com/hashicorp/nomad/issues/5535 - preBuild = let - tags = ["ui"] - ++ stdenv.lib.optional stdenv.isLinux "nonvidia"; - tagsString = stdenv.lib.concatStringsSep " " tags; - in '' - export buildFlagsArray=( - -tags="${tagsString}" - ) - ''; + preBuild = + let + tags = [ "ui" ] ++ lib.optional (!nvidiaGpuSupport) "nonvidia"; + tagsString = lib.concatStringsSep " " tags; + in + '' + export buildFlagsArray=( + -tags="${tagsString}" + ) + ''; + + # The dependency on NVML isn't explicit. We have to make it so otherwise the + # binary will not know where to look for the relevant symbols. + postFixup = lib.optionalString nvidiaGpuSupport '' + for bin in $out/bin/*; do + patchelf --add-needed "${nvidia_x11}/lib/libnvidia-ml.so" "$bin" + done + ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.nomadproject.io/"; description = "A Distributed, Highly Available, Datacenter-Aware Scheduler"; platforms = platforms.unix; diff --git a/pkgs/applications/networking/cluster/octant/plugins/starboard-octant-plugin.nix b/pkgs/applications/networking/cluster/octant/plugins/starboard-octant-plugin.nix index 293c2ed31c03a..f7bcbca16c486 100644 --- a/pkgs/applications/networking/cluster/octant/plugins/starboard-octant-plugin.nix +++ b/pkgs/applications/networking/cluster/octant/plugins/starboard-octant-plugin.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "starboard-octant-plugin"; - version = "0.7.0"; + version = "0.7.1"; src = fetchFromGitHub { owner = "aquasecurity"; repo = pname; rev = "v${version}"; - sha256 = "140m7mnpqhfbp2qqpr3jjsc770xdph98mm5zpgwzg0jwgpsrcxsm"; + sha256 = "11c8znbijhvxl2mas205mb18sqw868l6c86ah5hlkqh3niq2gmv3"; }; - vendorSha256 = "0aphx2rpnvzmfyfs11hf8j5b7s5lgw4kcq4jpdrkjwx7zhl6qx2g"; + vendorSha256 = "0rmynfm5afjxc2lxy2rh9y6zhdd2q95wji2q8hcz78zank43rkcq"; meta = with lib; { description = "Octant plugin for viewing Starboard security information"; diff --git a/pkgs/applications/networking/cluster/qbec/default.nix b/pkgs/applications/networking/cluster/qbec/default.nix index 508e0b656d6fe..18a753ca3cae6 100644 --- a/pkgs/applications/networking/cluster/qbec/default.nix +++ b/pkgs/applications/networking/cluster/qbec/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "qbec"; - version = "0.12.1"; + version = "0.12.2"; src = fetchFromGitHub { owner = "splunk"; repo = "qbec"; rev = "v${version}"; - sha256 = "1g90z155nhcblr48qypw8qw3l8g4dz33iflv4cg4xrhwjp8dfbv9"; + sha256 = "10bf9ja44n1gzhb5znqbmr1xjc87akrsdyxfvrz4f5bd3p1fh6j0"; }; - vendorSha256 = "15hbjghi2ifylg7nr85qlk0alsy97h9zj6hf5w84m76dla2bcjf3"; + vendorSha256 = "0xkmccm6cyw1p5mah7psbpfsfaw8f09r1a2k4iksfggrn9mimaam"; doCheck = false; diff --git a/pkgs/applications/networking/cluster/sonobuoy/default.nix b/pkgs/applications/networking/cluster/sonobuoy/default.nix index be5cb51d450de..668a229a62e5b 100644 --- a/pkgs/applications/networking/cluster/sonobuoy/default.nix +++ b/pkgs/applications/networking/cluster/sonobuoy/default.nix @@ -7,10 +7,8 @@ buildGoModule rec { pname = "sonobuoy"; version = "0.19.0"; - goPackagePath = "github.com/vmware-tanzu/sonobuoy"; - buildFlagsArray = - let t = goPackagePath; + let t = "github.com/vmware-tanzu/sonobuoy"; in '' -ldflags= -s -X ${t}/pkg/buildinfo.Version=v${version} diff --git a/pkgs/applications/networking/cluster/starboard/default.nix b/pkgs/applications/networking/cluster/starboard/default.nix index e8ffa353539ef..3850eb756382b 100644 --- a/pkgs/applications/networking/cluster/starboard/default.nix +++ b/pkgs/applications/networking/cluster/starboard/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "starboard"; - version = "0.7.1"; + version = "0.8.0"; src = fetchFromGitHub { owner = "aquasecurity"; repo = pname; rev = "v${version}"; - sha256 = "0p0c459xih580ix3279fr45mm3q9w887rs7w1yrikh09xpcisdfr"; + sha256 = "sha256-KRVMgrJ7xtv2SYa249sSDV8PObStAe+UGEgZWv43sk4="; }; - vendorSha256 = "07cz4p8k927ash5ncw1r56bcn592imgywbyzkvhnn50pap91m0q0"; + vendorSha256 = "sha256-AIMa0lUXFGvhnt8v7l+NIhXLlik5cGYL1OqINNElnx0="; subPackages = [ "cmd/starboard" ]; diff --git a/pkgs/applications/networking/cluster/stern/default.nix b/pkgs/applications/networking/cluster/stern/default.nix index 0f8ed05d8e6af..29aa7d41f32a0 100644 --- a/pkgs/applications/networking/cluster/stern/default.nix +++ b/pkgs/applications/networking/cluster/stern/default.nix @@ -1,27 +1,28 @@ -{ stdenv, lib, buildPackages, buildGoPackage, fetchFromGitHub, installShellFiles }: +{ stdenv, lib, buildPackages, buildGoModule, fetchFromGitHub, installShellFiles }: +let isCrossBuild = stdenv.hostPlatform != stdenv.buildPlatform; -let isCrossBuild = stdenv.hostPlatform != stdenv.buildPlatform; in - -buildGoPackage rec { +in +buildGoModule rec { pname = "stern"; - version = "1.11.0"; - - goPackagePath = "github.com/wercker/stern"; + version = "1.13.1"; src = fetchFromGitHub { - owner = "wercker"; + owner = "stern"; repo = "stern"; - rev = version; - sha256 = "0xndlq0ks8flzx6rdd4lnkxpkbvdy9sj1jwys5yj7p989ls8by3n"; + rev = "v${version}"; + sha256 = "0fj6a52wb0jv5bz2j2wq3ljnlxnsj9bg3kbzgkz0vh0b63zyn782"; }; - deleteVendor = true; - goDeps = ./deps.nix; + vendorSha256 = "14nrdaaby74bjbk777hr82p0ybzk3spc59lbrjn9z0q3hc0p4vaf"; nativeBuildInputs = [ installShellFiles ]; + buildFlagsArray = + [ "-ldflags=-s -w -X github.com/stern/stern/cmd.version=${version}" ]; + postInstall = - let stern = if isCrossBuild then buildPackages.stern else "$out"; in + let stern = if isCrossBuild then buildPackages.stern else "$out"; + in '' for shell in bash zsh; do ${stern}/bin/stern --completion $shell > stern.$shell @@ -30,10 +31,10 @@ buildGoPackage rec { ''; meta = with lib; { - description = "Multi pod and container log tailing for Kubernetes"; - homepage = "https://github.com/wercker/stern"; - license = licenses.asl20; - maintainers = with maintainers; [ mbode ]; - platforms = platforms.unix; + description = "Multi pod and container log tailing for Kubernetes"; + homepage = "https://github.com/stern/stern"; + license = licenses.asl20; + maintainers = with maintainers; [ mbode preisschild ]; + platforms = platforms.unix; }; } diff --git a/pkgs/applications/networking/cluster/stern/deps.nix b/pkgs/applications/networking/cluster/stern/deps.nix deleted file mode 100644 index fff5cf8c0de4a..0000000000000 --- a/pkgs/applications/networking/cluster/stern/deps.nix +++ /dev/null @@ -1,336 +0,0 @@ -# file generated from Gopkg.lock using dep2nix (https://github.com/nixcloud/dep2nix) -[ - { - goPackagePath = "cloud.google.com/go"; - fetch = { - type = "git"; - url = "https://code.googlesource.com/gocloud"; - rev = "dfffe386c33fb24c34ee501e5723df5b97b98514"; - sha256 = "1g681yxz4mmzapzpzxfaz1nhcr1w526793yapfsnxlbs2skap3fy"; - }; - } - { - goPackagePath = "github.com/Azure/go-autorest"; - fetch = { - type = "git"; - url = "https://github.com/Azure/go-autorest"; - rev = "1ff28809256a84bb6966640ff3d0371af82ccba4"; - sha256 = "0sxvj2j1833bqwxvhq3wq3jgq73rnb81pnzvl0x3y1m0hzpaf2zv"; - }; - } - { - goPackagePath = "github.com/dgrijalva/jwt-go"; - fetch = { - type = "git"; - url = "https://github.com/dgrijalva/jwt-go"; - rev = "06ea1031745cb8b3dab3f6a236daf2b0aa468b7e"; - sha256 = "08m27vlms74pfy5z79w67f9lk9zkx6a9jd68k3c4msxy75ry36mp"; - }; - } - { - goPackagePath = "github.com/fatih/color"; - fetch = { - type = "git"; - url = "https://github.com/fatih/color"; - rev = "2d684516a8861da43017284349b7e303e809ac21"; - sha256 = "1fcfmz4wji3gqmmsdx493r7d101s58hwjalqps6hy25nva5pvmfs"; - }; - } - { - goPackagePath = "github.com/ghodss/yaml"; - fetch = { - type = "git"; - url = "https://github.com/ghodss/yaml"; - rev = "73d445a93680fa1a78ae23a5839bad48f32ba1ee"; - sha256 = "0pg53ky4sy3sp9j4n7vgf1p3gw4nbckwqfldcmmi9rf13kjh0mr7"; - }; - } - { - goPackagePath = "github.com/gogo/protobuf"; - fetch = { - type = "git"; - url = "https://github.com/gogo/protobuf"; - rev = "c0656edd0d9eab7c66d1eb0c568f9039345796f7"; - sha256 = "0b943dhx571lhgcs3rqzy0092mi2x5mwy2kl7g8rryhy3r5rzrz9"; - }; - } - { - goPackagePath = "github.com/golang/glog"; - fetch = { - type = "git"; - url = "https://github.com/golang/glog"; - rev = "23def4e6c14b4da8ac2ed8007337bc5eb5007998"; - sha256 = "0jb2834rw5sykfr937fxi8hxi2zy80sj2bdn9b3jb4b26ksqng30"; - }; - } - { - goPackagePath = "github.com/golang/protobuf"; - fetch = { - type = "git"; - url = "https://github.com/golang/protobuf"; - rev = "b4deda0973fb4c70b50d226b1af49f3da59f5265"; - sha256 = "0ya4ha7m20bw048m1159ppqzlvda4x0vdprlbk5sdgmy74h3xcdq"; - }; - } - { - goPackagePath = "github.com/google/btree"; - fetch = { - type = "git"; - url = "https://github.com/google/btree"; - rev = "4030bb1f1f0c35b30ca7009e9ebd06849dd45306"; - sha256 = "0ba430m9fbnagacp57krgidsyrgp3ycw5r7dj71brgp5r52g82p6"; - }; - } - { - goPackagePath = "github.com/google/gofuzz"; - fetch = { - type = "git"; - url = "https://github.com/google/gofuzz"; - rev = "24818f796faf91cd76ec7bddd72458fbced7a6c1"; - sha256 = "0cq90m2lgalrdfrwwyycrrmn785rgnxa3l3vp9yxkvnv88bymmlm"; - }; - } - { - goPackagePath = "github.com/googleapis/gnostic"; - fetch = { - type = "git"; - url = "https://github.com/googleapis/gnostic"; - rev = "0c5108395e2debce0d731cf0287ddf7242066aba"; - sha256 = "0jf3cp5clli88gpjf24r6wxbkvngnc1kf59d4cgjczsn2wasvsfc"; - }; - } - { - goPackagePath = "github.com/gregjones/httpcache"; - fetch = { - type = "git"; - url = "https://github.com/gregjones/httpcache"; - rev = "787624de3eb7bd915c329cba748687a3b22666a6"; - sha256 = "1zqlg9pkj7r6fqw7wv3ywvbz3bh0hvzifs2scgcraj812q5189w5"; - }; - } - { - goPackagePath = "github.com/imdario/mergo"; - fetch = { - type = "git"; - url = "https://github.com/imdario/mergo"; - rev = "6633656539c1639d9d78127b7d47c622b5d7b6dc"; - sha256 = "1fffbq1l17i0gynmvcxypl7d9h4v81g5vlimiph5bfgf4sp4db7g"; - }; - } - { - goPackagePath = "github.com/inconshreveable/mousetrap"; - fetch = { - type = "git"; - url = "https://github.com/inconshreveable/mousetrap"; - rev = "76626ae9c91c4f2a10f34cad8ce83ea42c93bb75"; - sha256 = "1mn0kg48xkd74brf48qf5hzp0bc6g8cf5a77w895rl3qnlpfw152"; - }; - } - { - goPackagePath = "github.com/json-iterator/go"; - fetch = { - type = "git"; - url = "https://github.com/json-iterator/go"; - rev = "f2b4162afba35581b6d4a50d3b8f34e33c144682"; - sha256 = "0siqfghsm2lkdwinvg8x5gls3p76rq3cdm59c1r4x0b2mdfhnvcd"; - }; - } - { - goPackagePath = "github.com/mattn/go-colorable"; - fetch = { - type = "git"; - url = "https://github.com/mattn/go-colorable"; - rev = "167de6bfdfba052fa6b2d3664c8f5272e23c9072"; - sha256 = "1nwjmsppsjicr7anq8na6md7b1z84l9ppnlr045hhxjvbkqwalvx"; - }; - } - { - goPackagePath = "github.com/mattn/go-isatty"; - fetch = { - type = "git"; - url = "https://github.com/mattn/go-isatty"; - rev = "6ca4dbf54d38eea1a992b3c722a76a5d1c4cb25c"; - sha256 = "0zs92j2cqaw9j8qx1sdxpv3ap0rgbs0vrvi72m40mg8aa36gd39w"; - }; - } - { - goPackagePath = "github.com/mitchellh/go-homedir"; - fetch = { - type = "git"; - url = "https://github.com/mitchellh/go-homedir"; - rev = "b8bc1bf767474819792c23f32d8286a45736f1c6"; - sha256 = "13ry4lylalkh4g2vny9cxwvryslzyzwp9r92z0b10idhdq3wad1q"; - }; - } - { - goPackagePath = "github.com/modern-go/concurrent"; - fetch = { - type = "git"; - url = "https://github.com/modern-go/concurrent"; - rev = "bacd9c7ef1dd9b15be4a9909b8ac7a4e313eec94"; - sha256 = "0s0fxccsyb8icjmiym5k7prcqx36hvgdwl588y0491gi18k5i4zs"; - }; - } - { - goPackagePath = "github.com/modern-go/reflect2"; - fetch = { - type = "git"; - url = "https://github.com/modern-go/reflect2"; - rev = "4b7aa43c6742a2c18fdef89dd197aaae7dac7ccd"; - sha256 = "1721y3yr3dpx5dx5ashf063qczk2awy5zjir1jvp1h5hn7qz4i49"; - }; - } - { - goPackagePath = "github.com/petar/GoLLRB"; - fetch = { - type = "git"; - url = "https://github.com/petar/GoLLRB"; - rev = "53be0d36a84c2a886ca057d34b6aa4468df9ccb4"; - sha256 = "01xp3lcamqkvl91jg6ly202gdsgf64j39rkrcqxi6v4pbrcv7hz0"; - }; - } - { - goPackagePath = "github.com/peterbourgon/diskv"; - fetch = { - type = "git"; - url = "https://github.com/peterbourgon/diskv"; - rev = "5f041e8faa004a95c88a202771f4cc3e991971e6"; - sha256 = "1mxpa5aad08x30qcbffzk80g9540wvbca4blc1r2qyzl65b8929b"; - }; - } - { - goPackagePath = "github.com/pkg/errors"; - fetch = { - type = "git"; - url = "https://github.com/pkg/errors"; - rev = "816c9085562cd7ee03e7f8188a1cfd942858cded"; - sha256 = "1ws5crb7c70wdicavl6qr4g03nn6m92zd6wwp9n2ygz5c8rmxh8k"; - }; - } - { - goPackagePath = "github.com/spf13/cobra"; - fetch = { - type = "git"; - url = "https://github.com/spf13/cobra"; - rev = "a114f312e075f65bf30d6d9a1430113f857e543b"; - sha256 = "10lmi5ni06yijxg02fcic5b7ycjkia12yma4a4lz8a56j30wykx1"; - }; - } - { - goPackagePath = "github.com/spf13/pflag"; - fetch = { - type = "git"; - url = "https://github.com/spf13/pflag"; - rev = "3ebe029320b2676d667ae88da602a5f854788a8a"; - sha256 = "11yxs0wqy70wj106fkz8r923yg4ncnc2mbw33v48zmlg4a1rasgp"; - }; - } - { - goPackagePath = "golang.org/x/crypto"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/crypto"; - rev = "49796115aa4b964c318aad4f3084fdb41e9aa067"; - sha256 = "0pcq2drkzsw585xi6rda8imd7a139prrmvgmv8nz0zgzk6g4dy59"; - }; - } - { - goPackagePath = "golang.org/x/net"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/net"; - rev = "1c05540f6879653db88113bc4a2b70aec4bd491f"; - sha256 = "0h8yqb0vcqgllgydrf9d3rzp83w8wlr8f0nm6r1rwf2qg30pq1pd"; - }; - } - { - goPackagePath = "golang.org/x/oauth2"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/oauth2"; - rev = "a6bd8cefa1811bd24b86f8902872e4e8225f74c4"; - sha256 = "151in8qcf5y97ziavl6b03vgw4r87zqx5kg4vjhjszjbh60cfswp"; - }; - } - { - goPackagePath = "golang.org/x/sys"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/sys"; - rev = "8e24a49d80f82323e1c4db1b5da3e0f31171a151"; - sha256 = "0zsdnyb8dy98jw6f9yn6g5gdhaqwk39hqridr0mh4dhwvwvlj724"; - }; - } - { - goPackagePath = "golang.org/x/text"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/text"; - rev = "f21a4dfb5e38f5895301dc265a8def02365cc3d0"; - sha256 = "0r6x6zjzhr8ksqlpiwm5gdd7s209kwk5p4lw54xjvz10cs3qlq19"; - }; - } - { - goPackagePath = "golang.org/x/time"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/time"; - rev = "f51c12702a4d776e4c1fa9b0fabab841babae631"; - sha256 = "07wc6g2fvafkr6djsscm0jpbpl4135khhb6kpyx1953hi5d1jvyy"; - }; - } - { - goPackagePath = "google.golang.org/appengine"; - fetch = { - type = "git"; - url = "https://github.com/golang/appengine"; - rev = "ae0ab99deb4dc413a2b4bd6c8bdd0eb67f1e4d06"; - sha256 = "1iabxnqgxvvn1239i6fvfl375vlbvhfrc03m1x2rvalmx4d6w9c7"; - }; - } - { - goPackagePath = "gopkg.in/inf.v0"; - fetch = { - type = "git"; - url = "https://github.com/go-inf/inf"; - rev = "3887ee99ecf07df5b447e9b00d9c0b2adaa9f3e4"; - sha256 = "0rf3vwyb8aqnac9x9d6ax7z5526c45a16yjm2pvkijr6qgqz8b82"; - }; - } - { - goPackagePath = "gopkg.in/yaml.v2"; - fetch = { - type = "git"; - url = "https://github.com/go-yaml/yaml"; - rev = "5420a8b6744d3b0345ab293f6fcba19c978f1183"; - sha256 = "0dwjrs2lp2gdlscs7bsrmyc5yf6mm4fvgw71bzr9mv2qrd2q73s1"; - }; - } - { - goPackagePath = "k8s.io/api"; - fetch = { - type = "git"; - url = "https://github.com/kubernetes/api"; - rev = "8be2a0b24ed0dac9cfc1ac2d987ea16cfcdbecb6"; - sha256 = "1dpmd59jlkxgrp5aaf8420344c6nq4kjlc1avgcp7690yrzc50v6"; - }; - } - { - goPackagePath = "k8s.io/apimachinery"; - fetch = { - type = "git"; - url = "https://github.com/kubernetes/apimachinery"; - rev = "594fc14b6f143d963ea2c8132e09e73fe244b6c9"; - sha256 = "0xykhpmjgagyb0ac4y0ps4v1s9bd2b1sc0simh48c41a9fk3yvr7"; - }; - } - { - goPackagePath = "k8s.io/client-go"; - fetch = { - type = "git"; - url = "https://github.com/kubernetes/client-go"; - rev = "739dd8f9d4801eb23e2bc43423c0b4acaaded29a"; - sha256 = "15psjmb14rz4kwysim9vfbbylx0khkw29b195rziv1vk202lh28k"; - }; - } -] \ No newline at end of file diff --git a/pkgs/applications/networking/cluster/terraform-compliance/default.nix b/pkgs/applications/networking/cluster/terraform-compliance/default.nix index 6205b3bf5fe52..5f71f8d70cb63 100644 --- a/pkgs/applications/networking/cluster/terraform-compliance/default.nix +++ b/pkgs/applications/networking/cluster/terraform-compliance/default.nix @@ -54,7 +54,7 @@ buildPythonApplication rec { meta = with lib; { description = "BDD test framework for terraform"; - homepage = https://github.com/eerkunt/terraform-compliance; + homepage = "https://github.com/eerkunt/terraform-compliance"; license = licenses.mit; maintainers = with maintainers; [ kalbasit ]; }; diff --git a/pkgs/applications/networking/cluster/terraform-providers/default.nix b/pkgs/applications/networking/cluster/terraform-providers/default.nix index b7b6c8ad73b33..3570191fd84e1 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/default.nix +++ b/pkgs/applications/networking/cluster/terraform-providers/default.nix @@ -65,6 +65,7 @@ let lxd = callPackage ./lxd {}; shell = callPackage ./shell {}; vpsadmin = callPackage ./vpsadmin {}; + vercel = callPackage ./vercel {}; }; in automated-providers // special-providers diff --git a/pkgs/applications/networking/cluster/terraform-providers/vercel/default.nix b/pkgs/applications/networking/cluster/terraform-providers/vercel/default.nix new file mode 100644 index 0000000000000..b4e17aabb45b6 --- /dev/null +++ b/pkgs/applications/networking/cluster/terraform-providers/vercel/default.nix @@ -0,0 +1,23 @@ +{ stdenv, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "terraform-provider-vercel"; + version = "2.1.0"; + + src = fetchFromGitHub { + owner = "ondrejsika"; + repo = pname; + rev = "v${version}"; + sha256 = "06lskp3mmax7g0lchq6jaxavycj7snkhip9madzqkr552qvz5cgw"; + }; + + vendorSha256 = "0s0kf1v2217q9hfmc7r2yybcfk33k566dfvs2jiq63kyjnadhb0k"; + + postInstall = "mv $out/bin/terraform-provider-vercel{,_v${version}}"; + + meta = with stdenv.lib; { + homepage = "https://github.com/ondrejsika/terraform-provider-vercel"; + description = "Terraform provider for Vercel"; + maintainers = with maintainers; [ mmahut ]; + }; +} diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix index d18ec94ba8c56..b9f15e21f3231 100644 --- a/pkgs/applications/networking/cluster/terraform/default.nix +++ b/pkgs/applications/networking/cluster/terraform/default.nix @@ -137,8 +137,8 @@ let ]; in rec { terraform_0_12 = pluggable (generic { - version = "0.12.29"; - sha256 = "18i7vkvnvfybwzhww8d84cyh93xfbwswcnwfrgvcny1qwm8rsaj8"; + version = "0.12.30"; + sha256 = "0mv2nsy2ygb1kgkw98xckihcdqxpzhdmks5p2gi2l7wb7lx51yz2"; patches = [ ./provider-path.patch (fetchpatch { @@ -150,16 +150,16 @@ in rec { }); terraform_0_13 = pluggable (generic { - version = "0.13.5"; - sha256 = "1fnydzm5h65pdy2gkq403sllx05cvpldkdzdpcy124ywljb4x9d8"; + version = "0.13.6"; + sha256 = "04vas8i894ssfhncdvljdvmvj2qzfrcs20zcv71l1wmnnv9ibs6l"; patches = [ ./provider-path.patch ]; passthru = { inherit plugins; }; }); terraform_0_14 = pluggable (generic { - version = "0.14.2"; - sha256 = "0j09bjdl1z836y3zdlgjcdah11wlnvsd5hmsagjsz9am04qlyfya"; - vendorSha256 = "1iifjrnc79f4liyy4pgjbnarv2fx6vwlaqcv75crmyji40xv0w9s"; + version = "0.14.4"; + sha256 = "0kjbx1gshp1lvhnjfigfzza0sbl3m6d9qb3in7q5vc6kdkiplb66"; + vendorSha256 = "10vb6gsw7mha99lvx3lbgd80vf0imcqyc0va0y64f6wzaw557n7v"; patches = [ ./provider-path.patch ]; passthru = { inherit plugins; }; }); diff --git a/pkgs/applications/networking/cluster/tilt/default.nix b/pkgs/applications/networking/cluster/tilt/default.nix index 40ba3530c8aff..42de638ec42cf 100644 --- a/pkgs/applications/networking/cluster/tilt/default.nix +++ b/pkgs/applications/networking/cluster/tilt/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { /* Do not use "dev" as a version. If you do, Tilt will consider itself running in development environment and try to serve assets from the source tree, which is not there once build completes. */ - version = "0.17.13"; + version = "0.18.1"; src = fetchFromGitHub { owner = "tilt-dev"; repo = pname; rev = "v${version}"; - sha256 = "sha256-x3U5OF8T3z9kHcYe7SwKVEKNiEsi8AEvA1rlOma4y+8="; + sha256 = "1sdb2x06va0j9cxdwz95dklv2csq0s596wjsjqi4sq65y9bxjr7i"; }; vendorSha256 = null; diff --git a/pkgs/applications/networking/cluster/waypoint/default.nix b/pkgs/applications/networking/cluster/waypoint/default.nix new file mode 100644 index 0000000000000..32a4aa373a491 --- /dev/null +++ b/pkgs/applications/networking/cluster/waypoint/default.nix @@ -0,0 +1,46 @@ +{ lib, buildGoModule, fetchFromGitHub, go-bindata }: + +buildGoModule rec { + pname = "waypoint"; + version = "0.2.0"; + + src = fetchFromGitHub { + owner = "hashicorp"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-iGR2N1ZYA5G9K2cpfrwWRhSEfehRshx157ot1yq15AY="; + }; + + deleteVendor = true; + vendorSha256 = "sha256-ArebHOjP3zvpASVAoaPXpSbrG/jq+Jbx7+EaQ1uHSVY="; + + subPackages = ["."]; + + nativeBuildInputs = [ go-bindata ]; + + 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 + ''; + + installPhase = '' + mkdir -p $out/bin + mv waypoint{,-entrypoint} $out/bin/ + ''; + + meta = with lib; { + 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. + ''; + homepage = "https://waypointproject.io"; + platforms = platforms.linux; + license = licenses.mpl20; + maintainers = with maintainers; [ winpat jk ]; + }; +} diff --git a/pkgs/applications/networking/feedreaders/canto-daemon/default.nix b/pkgs/applications/networking/feedreaders/canto-daemon/default.nix index b8279f22de4d0..2992f28c58a0b 100644 --- a/pkgs/applications/networking/feedreaders/canto-daemon/default.nix +++ b/pkgs/applications/networking/feedreaders/canto-daemon/default.nix @@ -1,19 +1,23 @@ { stdenv, fetchFromGitHub, python3Packages, }: python3Packages.buildPythonApplication rec { - version = "0.9.7"; + version = "0.9.8"; pname = "canto-daemon"; src = fetchFromGitHub { owner = "themoken"; repo = "canto-next"; rev = "v${version}"; - sha256 = "1si53r8cd4avfc56r315zyrghkppnjd6n125z1agfv59i7hdmk3n"; + sha256 = "0fmsdn28z09bvivdkqcla5bnalky7k744iir25z70bv4pz1jcvnk"; }; propagatedBuildInputs = with python3Packages; [ feedparser ]; - meta = { + doCheck = false; + + pythonImportsCheck = [ "canto_next" ]; + + meta = with stdenv.lib; { description = "Daemon for the canto Atom/RSS feed reader"; longDescription = '' Canto is an Atom/RSS feed reader for the console that is meant to be @@ -24,8 +28,8 @@ python3Packages.buildPythonApplication rec { and extensibility using the excellent Python programming language. ''; homepage = "https://codezen.org/canto-ng/"; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.devhell ]; + license = licenses.gpl2; + platforms = platforms.linux; + maintainers = with maintainers;[ devhell ]; }; } diff --git a/pkgs/applications/networking/feedreaders/feeds/default.nix b/pkgs/applications/networking/feedreaders/feeds/default.nix new file mode 100644 index 0000000000000..243999553e692 --- /dev/null +++ b/pkgs/applications/networking/feedreaders/feeds/default.nix @@ -0,0 +1,88 @@ +{ lib +, callPackage +, stdenv +, fetchFromGitLab + +, appstream +, gobject-introspection +, meson +, ninja +, pkg-config +, wrapGAppsHook + +, glib +, gtk3 +, libhandy +, listparser ? callPackage ./listparser.nix { } +, webkitgtk +, python3 +}: +python3.pkgs.buildPythonApplication rec { + pname = "feeds"; + version = "0.16.1"; + + src = fetchFromGitLab { + domain = "gitlab.gnome.org"; + owner = "World"; + repo = "gfeeds"; + rev = version; + sha256 = "10hq06nx7lcm3dqq34qkxc6k6383mvjs7pxii9y9995d9kk5a49k"; + }; + + format = "other"; + + nativeBuildInputs = [ + appstream + glib # for glib-compile-schemas + gobject-introspection + meson + ninja + pkg-config + wrapGAppsHook + ]; + + buildInputs = [ + glib + gtk3 + libhandy + webkitgtk + ]; + + propagatedBuildInputs = with python3.pkgs; [ + beautifulsoup4 + dateutil + feedparser + html5lib + listparser + lxml + pillow + pygments + pygobject3 + pyreadability + pytz + requests + ]; + + # https://github.com/NixOS/nixpkgs/issues/56943 + strictDeps = false; + + dontWrapGApps = true; + + preFixup = '' + makeWrapperArgs+=("''${gappsWrapperArgs[@]}") + ''; + + passthru = { + inherit listparser; + }; + + meta = with lib; { + description = "An RSS/Atom feed reader for GNOME"; + homepage = "https://gitlab.gnome.org/World/gfeeds"; + license = licenses.gpl3Plus; + maintainers = [ + maintainers.pbogdan + ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/networking/feedreaders/feeds/listparser.nix b/pkgs/applications/networking/feedreaders/feeds/listparser.nix new file mode 100644 index 0000000000000..c67df416c5c6c --- /dev/null +++ b/pkgs/applications/networking/feedreaders/feeds/listparser.nix @@ -0,0 +1,31 @@ +{ lib +, python3 +}: +python3.pkgs.buildPythonPackage rec { + pname = "listparser"; + version = "0.18"; + + src = python3.pkgs.fetchPypi { + inherit pname version; + sha256 = "0hdqs1mmayw1r8yla43hgb4d9y3zqs5483vgf8j9ygczkd2wrq2b"; + }; + + propagatedBuildInputs = with python3.pkgs; [ + requests + six + ]; + + checkPhase = '' + ${python3.interpreter} lptest.py + ''; + + meta = with lib; { + description = "A parser for subscription lists"; + homepage = "https://github.com/kurtmckee/listparser"; + license = licenses.lgpl3Plus; + maintainers = [ + maintainers.pbogdan + ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/networking/feedreaders/newsflash/default.nix b/pkgs/applications/networking/feedreaders/newsflash/default.nix index 441a80fc071b8..e8a76b3d491ac 100644 --- a/pkgs/applications/networking/feedreaders/newsflash/default.nix +++ b/pkgs/applications/networking/feedreaders/newsflash/default.nix @@ -8,7 +8,7 @@ , gdk-pixbuf , glib , gtk3 -, libhandy_0 +, libhandy , openssl , sqlite , webkitgtk @@ -19,16 +19,16 @@ rustPlatform.buildRustPackage rec { pname = "newsflash"; - version = "1.0.5"; + version = "1.1.1"; src = fetchFromGitLab { owner = "news-flash"; repo = "news_flash_gtk"; rev = version; - sha256 = "0kh1xqvxfz58gnrl8av0zkig9vcgmx9iaxw5p6gdm8a7gv18nvp3"; + sha256 = "1z47h23g87dqmr9sfjl36fs5xjm2wj7z2bri9g0a4jcpwzl5awsd"; }; - cargoSha256 = "059sppidbxzjk8lmjq41d5qbymp9j9v2qr0jxd7xg9avr0klwc2s"; + cargoSha256 = "0rnrdh9ganj63hf9j890yj9pahcgza95z7x020w72mbb4648hq26"; patches = [ ./no-post-install.patch @@ -54,7 +54,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ gtk3 - libhandy_0 + libhandy openssl sqlite webkitgtk diff --git a/pkgs/applications/networking/flexget/default.nix b/pkgs/applications/networking/flexget/default.nix index 8ef1a6904415c..f91d89e5ab138 100644 --- a/pkgs/applications/networking/flexget/default.nix +++ b/pkgs/applications/networking/flexget/default.nix @@ -2,11 +2,11 @@ python3Packages.buildPythonApplication rec { pname = "FlexGet"; - version = "3.1.91"; + version = "3.1.95"; src = python3Packages.fetchPypi { inherit pname version; - sha256 = "5d6668dd9721b60738ea44c616fcdee6210f7ef52b461eb13b77091caef4a832"; + sha256 = "5dc80828713c0ece57c6e86a2bad41bbdf34ec41a0ea4da71adfb43784d85120"; }; postPatch = '' diff --git a/pkgs/applications/networking/icemon/default.nix b/pkgs/applications/networking/icemon/default.nix new file mode 100644 index 0000000000000..b757445eb087b --- /dev/null +++ b/pkgs/applications/networking/icemon/default.nix @@ -0,0 +1,24 @@ +{ lib, fetchFromGitHub, mkDerivation, qtbase, cmake, extra-cmake-modules, icecream, libcap_ng, lzo, zstd, libarchive, wrapQtAppsHook }: + +mkDerivation rec { + pname = "icemon"; + version = "3.3"; + + src = fetchFromGitHub { + owner = "icecc"; + repo = pname; + rev = "v${version}"; + sha256 = "09jnipr67dhawbxfn69yh7mmjrkylgiqmd0gmc2limd3z15d7pgc"; + }; + + nativeBuildInputs = [ cmake extra-cmake-modules wrapQtAppsHook ]; + buildInputs = [ icecream qtbase libcap_ng lzo zstd libarchive ]; + + meta = with lib; { + description = "Icecream GUI Monitor"; + inherit (src.meta) homepage; + license = licenses.gpl2; + maintainers = with maintainers; [ emantor ]; + platforms = with platforms; linux ++ darwin; + }; +} diff --git a/pkgs/applications/networking/ids/zeek/default.nix b/pkgs/applications/networking/ids/zeek/default.nix index 713156a662144..336e3be074ddc 100644 --- a/pkgs/applications/networking/ids/zeek/default.nix +++ b/pkgs/applications/networking/ids/zeek/default.nix @@ -21,11 +21,11 @@ let in stdenv.mkDerivation rec { pname = "zeek"; - version = "3.2.2"; + version = "3.2.3"; src = fetchurl { url = "https://download.zeek.org/zeek-${version}.tar.gz"; - sha256 = "00cxz7ad7p62s2glcagzcvwbnsivrv4bmz6rl1vij907jb24hmvc"; + sha256 = "1in25clpbb2vdhms3iypj6r5sp8d1dxjcfn85c272sh7shnmqagr"; }; nativeBuildInputs = [ cmake flex bison file ]; @@ -56,6 +56,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Powerful network analysis framework much different from a typical IDS"; homepage = "https://www.zeek.org"; + changelog = "https://github.com/zeek/zeek/blob/v${version}/CHANGES"; license = licenses.bsd3; maintainers = with maintainers; [ pSub marsam tobim ]; platforms = platforms.unix; diff --git a/pkgs/applications/networking/instant-messengers/bluejeans/default.nix b/pkgs/applications/networking/instant-messengers/bluejeans/default.nix index 8b63483405877..5e3f0bdb5d63a 100644 --- a/pkgs/applications/networking/instant-messengers/bluejeans/default.nix +++ b/pkgs/applications/networking/instant-messengers/bluejeans/default.nix @@ -39,12 +39,12 @@ stdenv.mkDerivation rec { pname = "bluejeans"; - version = "2.17.0"; - buildNumber = "11"; + version = "2.19.0"; + buildNumber = "61"; src = fetchurl { url = "https://swdl.bluejeans.com/desktop-app/linux/${version}/BlueJeans_${version}.${buildNumber}.rpm"; - sha256 = "1h5jbnp5bwy6bpma9a1ia08v7bpz09fm66jsip470k1r7vjjwa68"; + sha256 = "163p67dqry256d454qzk4k4b692kz8s9fcvaxd6gi7zvnsd48ikr"; }; nativeBuildInputs = [ rpmextract makeWrapper ]; diff --git a/pkgs/applications/networking/instant-messengers/element/element-desktop-package.json b/pkgs/applications/networking/instant-messengers/element/element-desktop-package.json index 2bc223d5c618d..7a735e59dcbd0 100644 --- a/pkgs/applications/networking/instant-messengers/element/element-desktop-package.json +++ b/pkgs/applications/networking/instant-messengers/element/element-desktop-package.json @@ -2,7 +2,7 @@ "name": "element-desktop", "productName": "Element", "main": "src/electron-main.js", - "version": "1.7.15", + "version": "1.7.16", "description": "A feature-rich client for Matrix.org", "author": "Element", "repository": { diff --git a/pkgs/applications/networking/instant-messengers/element/element-desktop-yarndeps.nix b/pkgs/applications/networking/instant-messengers/element/element-desktop-yarndeps.nix index 21374014c8861..08c3d2554c9a9 100644 --- a/pkgs/applications/networking/instant-messengers/element/element-desktop-yarndeps.nix +++ b/pkgs/applications/networking/instant-messengers/element/element-desktop-yarndeps.nix @@ -3042,11 +3042,11 @@ }; } { - name = "ini___ini_1.3.5.tgz"; + name = "ini___ini_1.3.8.tgz"; path = fetchurl { - name = "ini___ini_1.3.5.tgz"; - url = "https://registry.yarnpkg.com/ini/-/ini-1.3.5.tgz"; - sha1 = "eee25f56db1c9ec6085e0c22778083f596abf927"; + name = "ini___ini_1.3.8.tgz"; + url = "https://registry.yarnpkg.com/ini/-/ini-1.3.8.tgz"; + sha1 = "a29da425b48806f34767a4efce397269af28432c"; }; } { diff --git a/pkgs/applications/networking/instant-messengers/element/element-desktop.nix b/pkgs/applications/networking/instant-messengers/element/element-desktop.nix index 6f6b335430b83..b6dfac397a111 100644 --- a/pkgs/applications/networking/instant-messengers/element/element-desktop.nix +++ b/pkgs/applications/networking/instant-messengers/element/element-desktop.nix @@ -8,12 +8,12 @@ let executableName = "element-desktop"; - version = "1.7.15"; + version = "1.7.16"; src = fetchFromGitHub { owner = "vector-im"; repo = "element-desktop"; rev = "v${version}"; - sha256 = "sha256-7kWf8MXSB4/sX1bjMsfkzgzElS/AYu5VHAKGcqgvH54="; + sha256 = "sha256-mdHsw1Vi+2hrAF7biX3pJqfRaZU2lpw9zUZdcCm717g="; }; electron = electron_9; diff --git a/pkgs/applications/networking/instant-messengers/element/element-web.nix b/pkgs/applications/networking/instant-messengers/element/element-web.nix index 44233d464758c..527af7a4de06f 100644 --- a/pkgs/applications/networking/instant-messengers/element/element-web.nix +++ b/pkgs/applications/networking/instant-messengers/element/element-web.nix @@ -12,11 +12,11 @@ let in stdenv.mkDerivation rec { pname = "element-web"; - version = "1.7.15"; + version = "1.7.16"; src = fetchurl { url = "https://github.com/vector-im/element-web/releases/download/v${version}/element-v${version}.tar.gz"; - sha256 = "sha256-ZSi0OLA5dyPXn1NlZkkhCmWhrSryfyj/O6Ux1lO12ns="; + sha256 = "sha256-/KLTD7IvIp1f1dSUEMMCoknQzZarcP2wDM211h+OJMM="; }; installPhase = '' diff --git a/pkgs/applications/networking/instant-messengers/hipchat/default.nix b/pkgs/applications/networking/instant-messengers/hipchat/default.nix index 7213332a549a6..63cbb69b187df 100644 --- a/pkgs/applications/networking/instant-messengers/hipchat/default.nix +++ b/pkgs/applications/networking/instant-messengers/hipchat/default.nix @@ -43,7 +43,7 @@ in stdenv.mkDerivation { inherit version; src = fetchurl { - url = "https://atlassian.artifactoryonline.com/atlassian/hipchat-apt-client/pool/HipChat4-${version}-Linux.deb"; + url = "https://atlassian.artifactoryonline.com/artifactory/hipchat-apt-client/pool/HipChat4-${version}-Linux.deb"; sha256 = "03pz8wskafn848yvciq29kwdvqcgjrk6sjnm8nk9acl89xf0sn96"; }; diff --git a/pkgs/applications/networking/instant-messengers/linphone/default.nix b/pkgs/applications/networking/instant-messengers/linphone/default.nix index c055718f47f32..1344440eafc83 100644 --- a/pkgs/applications/networking/instant-messengers/linphone/default.nix +++ b/pkgs/applications/networking/instant-messengers/linphone/default.nix @@ -52,7 +52,7 @@ mkDerivation rec { pname = "linphone-desktop"; - version = "4.2.4"; + version = "4.2.5"; src = fetchFromGitLab { domain = "gitlab.linphone.org"; @@ -175,13 +175,12 @@ mkDerivation rec { ln -s ${liblinphone}/share/belr/grammars/* $out/share/belr/grammars/ mkdir -p $out/share/linphone ln -s ${liblinphone}/share/linphone/* $out/share/linphone/ - mkdir $out/lib # prevent warning ''; meta = with lib; { homepage = "https://www.linphone.org/"; description = "Open source SIP phone for voice/video calls and instant messaging"; - license = licenses.gpl3; + license = licenses.gpl3Plus; platforms = platforms.linux; maintainers = with maintainers; [ jluttine ]; }; diff --git a/pkgs/applications/networking/instant-messengers/mirage/default.nix b/pkgs/applications/networking/instant-messengers/mirage/default.nix index 0aa2dbf889bb5..decdb18aa0637 100644 --- a/pkgs/applications/networking/instant-messengers/mirage/default.nix +++ b/pkgs/applications/networking/instant-messengers/mirage/default.nix @@ -1,7 +1,7 @@ -{ lib, mkDerivation, fetchFromGitHub +{ stdenv, mkDerivation, fetchFromGitHub , qmake, pkgconfig, olm, wrapQtAppsHook , qtbase, qtquickcontrols2, qtkeychain, qtmultimedia, qttools, qtgraphicaleffects -, python3Packages, pyotherside +, python3Packages, pyotherside, libXScrnSaver }: let @@ -13,13 +13,13 @@ let in mkDerivation rec { pname = "mirage"; - version = "0.5.2"; + version = "0.6.4"; src = fetchFromGitHub { owner = "mirukana"; repo = pname; rev = "v${version}"; - sha256 = "0i891fafdncdz1xg6nji80jb86agsrbdvai9nwf1yy126q7piryv"; + sha256 = "15x0x2rf4fzsd0zr84fq3j3ddzkgc5il8s54jpxk8wl4ah03g4nv"; fetchSubmodules = true; }; @@ -30,13 +30,14 @@ mkDerivation rec { qtquickcontrols2 qtkeychain qtgraphicaleffects olm pyotherside + libXScrnSaver ]; propagatedBuildInputs = pypkgs; pythonPath = pypkgs; - qmakeFlags = [ "PREFIX=${placeholder "out"}" ]; + qmakeFlags = [ "PREFIX=${placeholder "out"}" "CONFIG+=qtquickcompiler" ]; dontWrapQtApps = true; postInstall = '' @@ -46,11 +47,12 @@ mkDerivation rec { "''${qtWrapperArgs[@]}" ''; - meta = with lib; { + meta = with stdenv.lib; { description = "A fancy, customizable, keyboard-operable Qt/QML+Python Matrix chat client for encrypted and decentralized communication"; homepage = "https://github.com/mirukana/mirage"; license = licenses.lgpl3; maintainers = with maintainers; [ colemickens ]; + broken = stdenv.isDarwin; inherit (qtbase.meta) platforms; inherit version; }; diff --git a/pkgs/applications/networking/instant-messengers/neochat/default.nix b/pkgs/applications/networking/instant-messengers/neochat/default.nix new file mode 100644 index 0000000000000..2a489ee3e713e --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/neochat/default.nix @@ -0,0 +1,67 @@ +{ mkDerivation +, stdenv +, fetchFromGitLab +, pkg-config +, cmake +, qtbase +, qttools +, qtquickcontrols2 +, qtmultimedia +, qtgraphicaleffects +, qtkeychain +, libpulseaudio +, olm +, libsecret +, cmark +, extra-cmake-modules +, kirigami2 +, kitemmodels +, ki18n +, knotifications +, kdbusaddons +, kconfig +, libquotient +, kquickimageedit +}: + +mkDerivation rec { + pname = "neochat"; + version = "1.0"; + + src = fetchFromGitLab { + domain = "invent.kde.org"; + owner = "network"; + repo = pname; + rev = "v${version}"; + sha256 = "1r9n83kvc5v215lzmzh6hyc5q9i3w6znbf508qk0mdwdzxz4zry9"; + }; + + nativeBuildInputs = [ cmake extra-cmake-modules pkg-config ]; + + buildInputs = [ + qtkeychain + qtquickcontrols2 + qtmultimedia + qtgraphicaleffects + olm + libsecret + cmark + kirigami2 + kitemmodels + ki18n + knotifications + kdbusaddons + kconfig + libquotient + kquickimageedit + libpulseaudio + ]; + + meta = with stdenv.lib; { + description = "A client for matrix, the decentralized communication protocol."; + homepage = "https://apps.kde.org/en/neochat"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ mjlbach peterhoeg ]; + platforms = with platforms; linux; + }; +} diff --git a/pkgs/applications/networking/instant-messengers/quaternion/default.nix b/pkgs/applications/networking/instant-messengers/quaternion/default.nix index c031615a90bf9..f918cbdc2b895 100644 --- a/pkgs/applications/networking/instant-messengers/quaternion/default.nix +++ b/pkgs/applications/networking/instant-messengers/quaternion/default.nix @@ -5,13 +5,13 @@ mkDerivation rec { pname = "quaternion"; - version = "0.0.9.4e"; + version = "0.0.9.5-beta2"; src = fetchFromGitHub { owner = "QMatrixClient"; repo = "Quaternion"; rev = version; - sha256 = "0hqhg7l6wpkdbzrdjvrbqymmahziri07ba0hvbii7dd2p0h248fv"; + sha256 = "sha256-K4SMB5kL0YO2OIeNUu4hWqU4E4n4vZDRRsJVYmCZqvM="; }; buildInputs = [ diff --git a/pkgs/applications/networking/instant-messengers/rambox/pro.nix b/pkgs/applications/networking/instant-messengers/rambox/pro.nix index d39091d4618eb..3cdf1339e3bf3 100644 --- a/pkgs/applications/networking/instant-messengers/rambox/pro.nix +++ b/pkgs/applications/networking/instant-messengers/rambox/pro.nix @@ -1,11 +1,11 @@ -{ autoPatchelfHook, electron_4, fetchurl, makeDesktopItem, makeWrapper, nodePackages, nss, stdenv, xdg_utils, xorg }: +{ autoPatchelfHook, electron_7, fetchurl, makeDesktopItem, makeWrapper, nodePackages, nss, stdenv, xdg_utils, xorg }: let - electron = electron_4; + electron = electron_7; in stdenv.mkDerivation rec { pname = "rambox-pro"; - version = "1.3.2"; + version = "1.4.1"; dontBuild = true; dontStrip = true; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://github.com/ramboxapp/download/releases/download/v${version}/RamboxPro-${version}-linux-x64.tar.gz"; - sha256 = "010v5i8lxfz77cb5cn9va5cbnfa28nzdymk5k2fcpi65jldw1pxx"; + sha256 = "1bd4fba3ac8c20fa557ebfb110f6503d36e6c3dba0401d1073529dcae2c2ec1e"; }; installPhase = '' diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix index 05d94b2ef715a..44df5f6be6879 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix @@ -25,7 +25,7 @@ let else ""); in stdenv.mkDerivation rec { pname = "signal-desktop"; - version = "1.39.2"; # Please backport all updates to the stable channel. + version = "1.39.4"; # Please backport all updates to the stable channel. # All releases have a limited lifetime and "expire" 90 days after the release. # When releases "expire" the application becomes unusable until an update is # applied. The expiration date for the current release can be extracted with: @@ -35,7 +35,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb"; - sha256 = "15lv8jpnn2cx7hmb7pn32cvq6nqvzjflf77bbnvxva5hf9zjkma9"; + sha256 = "11rjz0vawwyny4rpdqsqyfh8pi177xykm69xxcj6kgcncxaxg0vb"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix b/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix index 47a79c7309df4..d4e43ed3a92df 100644 --- a/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix +++ b/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix @@ -108,6 +108,10 @@ in stdenv.mkDerivation { # Fix the desktop link substituteInPlace $out/share/applications/skypeforlinux.desktop \ --replace /usr/bin/ $out/bin/ + substituteInPlace $out/share/applications/skypeforlinux-share.desktop \ + --replace /usr/bin/ $out/bin/ + substituteInPlace $out/share/kservices5/ServiceMenus/skypeforlinux.desktop \ + --replace /usr/bin/ $out/bin/ ''; meta = with stdenv.lib; { diff --git a/pkgs/applications/networking/instant-messengers/spectral/default.nix b/pkgs/applications/networking/instant-messengers/spectral/default.nix deleted file mode 100644 index b0819ade4f33a..0000000000000 --- a/pkgs/applications/networking/instant-messengers/spectral/default.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ stdenv, fetchgit -, pkgconfig, wrapQtAppsHook -, cmake -, qtbase, qttools, qtquickcontrols2, qtmultimedia, qtkeychain -, libpulseaudio -# Not mentioned but seems needed -, qtgraphicaleffects -, qtdeclarative -, qtmacextras -, olm, libsecret, cmark -}: - -let qtkeychain-qt5 = qtkeychain.override { - inherit qtbase qttools; - withQt5 = true; -}; -in stdenv.mkDerivation rec { - pname = "spectral"; - version = "817"; - - src = fetchgit { - url = "https://gitlab.com/spectral-im/spectral.git"; - rev = version; - sha256 = "0lg0bkz621cmqb67kz1zmn4xwbspcqalz68byll5iszqz9y4gnp1"; - fetchSubmodules = true; - }; - - nativeBuildInputs = [ pkgconfig cmake wrapQtAppsHook ]; - buildInputs = [ qtbase qtkeychain-qt5 qtquickcontrols2 qtmultimedia qtgraphicaleffects qtdeclarative olm libsecret cmark ] - ++ stdenv.lib.optional stdenv.hostPlatform.isLinux libpulseaudio - ++ stdenv.lib.optional stdenv.hostPlatform.isDarwin qtmacextras; - - meta = with stdenv.lib; { - description = "A glossy cross-platform Matrix client"; - homepage = "https://spectral.im"; - license = licenses.gpl3; - platforms = with platforms; linux ++ darwin; - maintainers = with maintainers; [ dtzWill ]; - }; -} diff --git a/pkgs/applications/networking/instant-messengers/teams/default.nix b/pkgs/applications/networking/instant-messengers/teams/default.nix index bf864eb414750..1f4e11527ccda 100644 --- a/pkgs/applications/networking/instant-messengers/teams/default.nix +++ b/pkgs/applications/networking/instant-messengers/teams/default.nix @@ -15,11 +15,11 @@ stdenv.mkDerivation rec { pname = "teams"; - version = "1.3.00.25560"; + version = "1.3.00.30857"; src = fetchurl { url = "https://packages.microsoft.com/repos/ms-teams/pool/main/t/teams/teams_${version}_amd64.deb"; - sha256 = "0kpcd9q6v2qh0dzddykisdbi3djbxj2rl70wchlzrb6bx95hkzmc"; + sha256 = "06r48h1fr2si2g5ng8hsnbcmr70iapnafj21v5bzrzzrigzb2n2h"; }; nativeBuildInputs = [ dpkg autoPatchelfHook wrapGAppsHook ]; diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix index 6518f73a2299c..d4cc5293a9beb 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix @@ -22,12 +22,12 @@ let in mkDerivation rec { pname = "telegram-desktop"; - version = "2.4.7"; + version = "2.5.1"; # Telegram-Desktop with submodules src = fetchurl { url = "https://github.com/telegramdesktop/tdesktop/releases/download/v${version}/tdesktop-${version}-full.tar.gz"; - sha256 = "1j2v29952l0am357pqvvgzm2zghmwhlr833kgp85hssxpr9xy4vv"; + sha256 = "1qpap599h2c4hlmr00k82r6138ym4zqrbfpvm97gm97adn3mxk7i"; }; postPatch = '' @@ -80,9 +80,6 @@ in mkDerivation rec { # TODO: Package mapbox-variant postFixup = '' - # Nuke refs to `tg_owt` which is introduced by `__FILE__` in headers. - remove-references-to -t ${tg_owt} $out/bin/telegram-desktop - # This is necessary to run Telegram in a pure environment. # We also use gappsWrapperArgs from wrapGAppsHook. wrapProgram $out/bin/telegram-desktop \ diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/tg_owt.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/tg_owt.nix index 48499bf9f2c74..2853418da0e33 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/tg_owt.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/tg_owt.nix @@ -1,10 +1,10 @@ -{ lib, stdenv, fetchFromGitHub, cmake, ninja, yasm -, pkg-config, libjpeg, openssl, libopus, ffmpeg, alsaLib, libpulseaudio +{ lib, stdenv, fetchFromGitHub, pkg-config, cmake, ninja, yasm +, libjpeg, openssl, libopus, ffmpeg, alsaLib, libpulseaudio, protobuf }: let - rev = "e8fcae73947445db3d418fb7c20b964b59e14706"; - sha256 = "0s2dd41r71aixhvympiqfks1liv7x78y60n0i87vmyxyfx449b5h"; + rev = "6eaebec41b34a0a0d98f02892d0cfe6bbcbc0a39"; + sha256 = "0dbc36j09jmxvznal55hi3qrfyvj4y0ila6347nav9skcmk8fm64"; in stdenv.mkDerivation { pname = "tg_owt"; @@ -14,11 +14,16 @@ in stdenv.mkDerivation { owner = "desktop-app"; repo = "tg_owt"; inherit rev sha256; + fetchSubmodules = true; }; + outputs = [ "out" "dev" ]; + nativeBuildInputs = [ pkg-config cmake ninja yasm ]; - buildInputs = [ libjpeg openssl libopus ffmpeg alsaLib libpulseaudio ]; + buildInputs = [ + libjpeg openssl libopus ffmpeg alsaLib libpulseaudio protobuf + ]; meta.license = lib.licenses.bsd3; } diff --git a/pkgs/applications/networking/iptraf-ng/default.nix b/pkgs/applications/networking/iptraf-ng/default.nix index 1fc81be240bf2..6d61acb4982f1 100644 --- a/pkgs/applications/networking/iptraf-ng/default.nix +++ b/pkgs/applications/networking/iptraf-ng/default.nix @@ -1,24 +1,27 @@ -{ stdenv, fetchurl, ncurses }: +{ stdenv, fetchFromGitHub, ncurses }: stdenv.mkDerivation rec { - version = "1.1.4"; + version = "1.2.1"; pname = "iptraf-ng"; - src = fetchurl { - url = "https://fedorahosted.org/releases/i/p/iptraf-ng/${pname}-${version}.tar.gz"; - sha256 = "02gb8z9h2s6s1ybyikywz7jgb1mafdx88hijfasv3khcgkq0q53r"; + src = fetchFromGitHub { + owner = pname; + repo = pname; + rev = "v${version}"; + sha256 = "1f91w1bjaayr6ld95z2q55ny983bb0m05k1jrw2bcddvcihaiqb1"; }; buildInputs = [ ncurses ]; - configurePhase = '' - ./configure --prefix=$out/usr --sysconfdir=$out/etc \ - --localstatedir=$out/var --sbindir=$out/bin - ''; + makeFlags = [ + "DESTDIR=$(out)" + "prefix=/usr" + "sbindir=/bin" + ]; hardeningDisable = [ "format" ]; - meta = { + meta = with stdenv.lib; { description = "A console-based network monitoring utility (fork of iptraf)"; longDescription = '' IPTraf-ng is a console-based network monitoring utility. IPTraf-ng @@ -38,9 +41,9 @@ stdenv.mkDerivation rec { of the Linux kernel, so it can be used on a wide variety of supported network cards. ''; - homepage = "https://fedorahosted.org/iptraf-ng/"; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.devhell ]; + homepage = "https://github.com/iptraf-ng/iptraf-ng"; + license = licenses.gpl2Only; + platforms = platforms.linux; + maintainers = with maintainers; [ devhell ]; }; } diff --git a/pkgs/applications/networking/lieer/default.nix b/pkgs/applications/networking/lieer/default.nix index 700ad011dff33..a2c05bda63863 100644 --- a/pkgs/applications/networking/lieer/default.nix +++ b/pkgs/applications/networking/lieer/default.nix @@ -2,13 +2,13 @@ python3Packages.buildPythonApplication rec { pname = "lieer"; - version = "1.2"; + version = "1.3"; src = fetchFromGitHub { owner = "gauteh"; repo = "lieer"; rev = "v${version}"; - sha256 = "0qp8sycclzagkiszqk1pw2fr8s8s195bzy8r27dj7f5zx350nxk5"; + sha256 = "12sl7d381l1gjaam419xc8gxmsprxf0hgksz1f974qmmijvr02bh"; }; propagatedBuildInputs = with python3Packages; [ @@ -16,6 +16,7 @@ python3Packages.buildPythonApplication rec { oauth2client google_api_python_client tqdm + setuptools ]; meta = with stdenv.lib; { diff --git a/pkgs/applications/networking/mailreaders/aerc/default.nix b/pkgs/applications/networking/mailreaders/aerc/default.nix index 45d41839a1ca0..781e6c8369d0b 100644 --- a/pkgs/applications/networking/mailreaders/aerc/default.nix +++ b/pkgs/applications/networking/mailreaders/aerc/default.nix @@ -6,15 +6,15 @@ buildGoModule rec { pname = "aerc"; - version = "0.4.0"; + version = "0.5.2"; src = fetchurl { url = "https://git.sr.ht/~sircmpwn/aerc/archive/${version}.tar.gz"; - sha256 = "05qy14k9wmyhsg1hiv4njfx1zn1m9lz4d1p50kc36v7pq0n4csfk"; + sha256 = "h7kiRA5TuZ8mDSMymWU33stFLIOMd06TQLYzKW+faO4="; }; runVend = true; - vendorSha256 = "13zs5113ip85yl6sw9hzclxwlnrhy18d39vh9cwbq97dgnh9rz89"; + vendorSha256 = "9PXdUH0gu8PGaKlRJCUF15W1/LxA+sv3Pwl2UnjYxWY="; doCheck = false; diff --git a/pkgs/applications/networking/mailreaders/aerc/runtime-sharedir.patch b/pkgs/applications/networking/mailreaders/aerc/runtime-sharedir.patch index ed670d61a7b31..91978753ae960 100644 --- a/pkgs/applications/networking/mailreaders/aerc/runtime-sharedir.patch +++ b/pkgs/applications/networking/mailreaders/aerc/runtime-sharedir.patch @@ -29,7 +29,7 @@ diff --git a/config/config.go b/config/config.go index 32d07fc..8ffd3e8 100644 --- a/config/config.go +++ b/config/config.go -@@ -355,6 +355,11 @@ func LoadConfigFromFile(root *string, sharedir string) (*AercConfig, error) { +@@ -472,6 +472,11 @@ func LoadConfigFromFile(root *string, sharedir string) (*AercConfig, error) { return nil, err } } @@ -41,10 +41,11 @@ index 32d07fc..8ffd3e8 100644 file.NameMapper = mapName config := &AercConfig{ Bindings: BindingConfig{ -@@ -423,6 +428,9 @@ func LoadConfigFromFile(root *string, sharedir string) (*AercConfig, error) { +@@ -546,6 +428,9 @@ func LoadConfigFromFile(root *string, sharedir string) (*AercConfig, error) { if err = config.LoadConfig(file); err != nil { return nil, err } + + for i, filter := range config.Filters { + config.Filters[i].Command = strings.ReplaceAll(filter.Command, "@SHAREDIR@", sharedir) + } diff --git a/pkgs/applications/networking/mailreaders/imapfilter.nix b/pkgs/applications/networking/mailreaders/imapfilter.nix index b677d82dce47b..8423beec46874 100644 --- a/pkgs/applications/networking/mailreaders/imapfilter.nix +++ b/pkgs/applications/networking/mailreaders/imapfilter.nix @@ -1,27 +1,27 @@ -{ stdenv, fetchFromGitHub, openssl, lua, pcre }: +{ stdenv, fetchFromGitHub, openssl, lua, pcre2 }: stdenv.mkDerivation rec { pname = "imapfilter"; - version = "2.6.16"; + version = "2.7.5"; src = fetchFromGitHub { owner = "lefcha"; repo = "imapfilter"; rev = "v${version}"; - sha256 = "0f65sg6hhv6778fxwsz4hvarbm97dsb8jj0mg7a9qs273r35pqck"; + sha256 = "nbVwbPkNbJz4GHhvOp+QVgiBqKA/HR34p4x3NXJB7ig="; }; makeFlags = [ "SSLCAFILE=/etc/ssl/certs/ca-bundle.crt" "PREFIX=$(out)" ]; - propagatedBuildInputs = [ openssl pcre lua ]; + buildInputs = [ openssl pcre2 lua ]; meta = { homepage = "https://github.com/lefcha/imapfilter"; description = "Mail filtering utility"; license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.unix; - maintainers = with stdenv.lib.maintainers; [ ]; + maintainers = with stdenv.lib.maintainers; [ doronbehar ]; }; } diff --git a/pkgs/applications/networking/mailreaders/mailnag/default.nix b/pkgs/applications/networking/mailreaders/mailnag/default.nix index d74797dbc50b0..1fa9c66c8ff60 100644 --- a/pkgs/applications/networking/mailreaders/mailnag/default.nix +++ b/pkgs/applications/networking/mailreaders/mailnag/default.nix @@ -24,13 +24,13 @@ python3Packages.buildPythonApplication rec { pname = "mailnag"; - version = "2.0.0"; + version = "2.1.0"; src = fetchFromGitHub { owner = "pulb"; repo = "mailnag"; rev = "v${version}"; - sha256 = "0q97v9i96br22z3h6r2mz79i68ib8m8x42yxky78szfrf8j60i30"; + sha256 = "08jqs3v01a9gkjca9xgjidhdgvnlm4541z9bwh9m3k5p2g76sz96"; }; buildInputs = [ @@ -49,7 +49,7 @@ python3Packages.buildPythonApplication rec { nativeBuildInputs = [ gettext wrapGAppsHook - # To later add plugins to + # To later add plugins to xorg.lndir ]; diff --git a/pkgs/applications/networking/mailreaders/mailspring/default.nix b/pkgs/applications/networking/mailreaders/mailspring/default.nix index 6c6bf6f93db3a..eb946e267b28a 100644 --- a/pkgs/applications/networking/mailreaders/mailspring/default.nix +++ b/pkgs/applications/networking/mailreaders/mailspring/default.nix @@ -34,7 +34,9 @@ stdenv.mkDerivation rec { alsaLib db glib - gtk3 + # We don't know why with trackerSupport the executable fail to launch, See: + # https://github.com/NixOS/nixpkgs/issues/106732 + (gtk3.override {trackerSupport = false; }) libkrb5 libsecret nss diff --git a/pkgs/applications/networking/mailreaders/mlarchive2maildir/default.nix b/pkgs/applications/networking/mailreaders/mlarchive2maildir/default.nix index c7554fc84b085..ce13a4de8d092 100644 --- a/pkgs/applications/networking/mailreaders/mlarchive2maildir/default.nix +++ b/pkgs/applications/networking/mailreaders/mlarchive2maildir/default.nix @@ -2,11 +2,11 @@ python3.pkgs.buildPythonApplication rec { pname = "mlarchive2maildir"; - version = "0.0.8"; + version = "0.0.9"; src = python3.pkgs.fetchPypi { inherit pname version; - sha256 = "1din3yay2sas85178v0xr0hbm2396y4dalkcqql1ny9vdm94h6sp"; + sha256 = "02zjwa7zbcbqj76l0qmg7bbf3fqli60pl2apby3j4zwzcrrryczs"; }; nativeBuildInputs = with python3.pkgs; [ setuptools_scm ]; diff --git a/pkgs/applications/networking/mailreaders/mmh/default.nix b/pkgs/applications/networking/mailreaders/mmh/default.nix index 7d6254ed13ccf..6bd977bd319b4 100644 --- a/pkgs/applications/networking/mailreaders/mmh/default.nix +++ b/pkgs/applications/networking/mailreaders/mmh/default.nix @@ -10,6 +10,11 @@ in stdenv.mkDerivation rec { sha256 = "1q97p4g3f1q2m567i2dbx7mm7ixw3g91ww2rymwj42cxk9iyizhv"; }; + postPatch = '' + substituteInPlace sbr/Makefile.in \ + --replace "ar " "${stdenv.cc.targetPrefix}ar " + ''; + buildInputs = [ ncurses ]; nativeBuildInputs = [ autoreconfHook flex ]; diff --git a/pkgs/applications/networking/mailreaders/mutt/default.nix b/pkgs/applications/networking/mailreaders/mutt/default.nix index 0596cd350dfbe..f7b1b990acb81 100644 --- a/pkgs/applications/networking/mailreaders/mutt/default.nix +++ b/pkgs/applications/networking/mailreaders/mutt/default.nix @@ -27,11 +27,11 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "mutt"; - version = "2.0.3"; + version = "2.0.4"; src = fetchurl { url = "http://ftp.mutt.org/pub/mutt/${pname}-${version}.tar.gz"; - sha256 = "1vf1ab3mnx7p4s4n4pssajj211s3zr4730bwgsjx9gxcnyppqclw"; + sha256 = "1m4ig69qw4g3lhm4351snmy5i0ch65fqc9vqqdybr6jy21w7w225"; }; patches = optional smimeSupport (fetchpatch { diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix index 8cdd27653e235..b1905359cd3c1 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix @@ -1,22 +1,31 @@ -{ stdenv, fetchurl, config, makeWrapper +{ stdenv, lib, fetchurl, config, makeWrapper , alsaLib , at-spi2-atk , atk , cairo +, coreutils , cups , curl -, dbus-glib , dbus +, dbus-glib , fontconfig , freetype , gdk-pixbuf , glib , glibc +, gnome3 +, gnugrep +, gnupg +, gnused +, gpgme , gtk2 , gtk3 , kerberos +, libcanberra +, libGL +, libGLU , libX11 -, libXScrnSaver +, libxcb , libXcomposite , libXcursor , libXdamage @@ -25,21 +34,14 @@ , libXi , libXinerama , libXrender +, libXScrnSaver , libXt -, libxcb -, libcanberra -, gnome3 -, libGLU, libGL , nspr , nss , pango +, runtimeShell , writeScript , xidel -, coreutils -, gnused -, gnugrep -, gnupg -, runtimeShell }: # imports `version` and `sources` @@ -58,9 +60,9 @@ let systemLocale = config.i18n.defaultLocale or "en-US"; - defaultSource = stdenv.lib.findFirst (sourceMatches "en-US") {} sources; + defaultSource = lib.findFirst (sourceMatches "en-US") {} sources; - source = stdenv.lib.findFirst (sourceMatches systemLocale) defaultSource sources; + source = lib.findFirst (sourceMatches systemLocale) defaultSource sources; name = "thunderbird-bin-${version}"; in @@ -75,7 +77,7 @@ stdenv.mkDerivation { phases = "unpackPhase installPhase"; - libPath = stdenv.lib.makeLibraryPath + libPath = lib.makeLibraryPath [ stdenv.cc.cc alsaLib at-spi2-atk @@ -110,7 +112,7 @@ stdenv.mkDerivation { nspr nss pango - ] + ":" + stdenv.lib.makeSearchPathOutput "lib" "lib64" [ + ] + ":" + lib.makeSearchPathOutput "lib" "lib64" [ stdenv.cc.cc ]; @@ -118,6 +120,9 @@ stdenv.mkDerivation { nativeBuildInputs = [ makeWrapper ]; + # See "Note on GPG support" in `../thunderbird/default.nix` for explanations + # on adding `gnupg` and `gpgme` into PATH/LD_LIBRARY_PATH. + installPhase = '' mkdir -p "$prefix/usr/lib/thunderbird-bin-${version}" @@ -158,7 +163,9 @@ stdenv.mkDerivation { --suffix XDG_DATA_DIRS : "$XDG_ICON_DIRS" \ --set SNAP_NAME "thunderbird" \ --set MOZ_LEGACY_PROFILES 1 \ - --set MOZ_ALLOW_DOWNGRADE 1 + --set MOZ_ALLOW_DOWNGRADE 1 \ + --prefix PATH : "${lib.getBin gnupg}/bin" \ + --prefix LD_LIBRARY_PATH : "${lib.getLib gpgme}/lib" ''; passthru.updateScript = import ./../../browsers/firefox-bin/update.nix { @@ -168,14 +175,14 @@ stdenv.mkDerivation { basePath = "pkgs/applications/networking/mailreaders/thunderbird-bin"; baseUrl = "http://archive.mozilla.org/pub/thunderbird/releases/"; }; - meta = with stdenv.lib; { + meta = with lib; { description = "Mozilla Thunderbird, a full-featured email client (binary package)"; homepage = "http://www.mozilla.org/thunderbird/"; license = { free = false; url = "http://www.mozilla.org/en-US/foundation/trademarks/policy/"; }; - maintainers = with stdenv.lib.maintainers; [ ]; + maintainers = with lib.maintainers; [ ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix index 4a1472fde7172..b7858ba14e99a 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.5.1"; + version = "78.6.0"; sources = [ - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/af/thunderbird-78.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/af/thunderbird-78.6.0.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "87cb38398aaa5af68e562a5fc6d20d3d3477d871979bd4a635c94c440e66a482"; + sha256 = "7f8fd3a1f0e869ee03a4f120c88b606fbe4ae35d9865394fccd291caa9ae7069"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/ar/thunderbird-78.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/ar/thunderbird-78.6.0.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "935efae7caa116e16c341d64634954d77cafbc5e28626b46f5385b8416060f51"; + sha256 = "73e7beba4e5a2b9cd92ded3ee8e662be9a80d65d59790ed1d5401b5a61c8d147"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/ast/thunderbird-78.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/ast/thunderbird-78.6.0.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "a5868dc7987529790910e638b64b15295a2d57e449fa515f4e17a4ab88a830e6"; + sha256 = "890cda9e6a9582d43d61c9b4deb2241f46d34dbac5516d9a808dfbb472a22eec"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/be/thunderbird-78.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/be/thunderbird-78.6.0.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "af52b29567ce26159890f70fcdccd4cafd49c7fc75c620bb606727fd27b7049a"; + sha256 = "b951394def900c975b2796e47d948c03c59f0fde445f22d1b9a0d89ae8b7dd83"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/bg/thunderbird-78.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/bg/thunderbird-78.6.0.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "91856a4745a8bdefac7c2b0193766a4f0009378dfe941dbbe1afcae2ffae2337"; + sha256 = "2440a8ea3a49d4fe7a84b0c6e67a98889bf98c5f828699bd980705c100a0e585"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/br/thunderbird-78.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/br/thunderbird-78.6.0.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "d5ba5fe368c99377a264d8574607335fc4317dad447bb38fdc6a5b53d2e95b49"; + sha256 = "74b48030e64ff509379dd92d08734804006a8cc6176c69e387e03596138c48b0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/ca/thunderbird-78.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/ca/thunderbird-78.6.0.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "396a1d7b668c7f47b56d7cb41e6e914f03e9e517a14b4698abedb501037ef2c1"; + sha256 = "4b951a13352db2cc90aadf94c1e57bc5b40660d82dab855aa80751bbce9aa3b8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/cak/thunderbird-78.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/cak/thunderbird-78.6.0.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "914b76ad8268db608be0595039a68189146ded384c23407ccbcd78a5e74e19ae"; + sha256 = "bfb2ebc8a6b376603b9e310ad664a099725a29183c67b02ee13ecf3eb9a3bdac"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/cs/thunderbird-78.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/cs/thunderbird-78.6.0.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "4b62702cabecfbb2567b19446f405936c9d948dad6f65a2e3f21809d4f2b1176"; + sha256 = "de30e9d948ade3c82b7ebd58a3bbed5e880abcdb2d9c58f8e64d9d3d78bb336d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/cy/thunderbird-78.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/cy/thunderbird-78.6.0.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "736d245bd7766ac8c611a6801b3769a84baf4abae94818e0cfcadde8521850ad"; + sha256 = "b7d0bb95acb861c453d8649673d9e582920a6df6a9662b8a6f996636d54c68c2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/da/thunderbird-78.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/da/thunderbird-78.6.0.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "53143b51b84ee74ee9131d3b3b80e2cf873e5a8c22478c87db34a9d2ac34607a"; + sha256 = "2c4765b34f1d63a9eae942531b7f489150d6850f68487565082ea18c94f3ad0d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/de/thunderbird-78.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/de/thunderbird-78.6.0.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "2f3a4d8bf96e9653dd3883ac4399c650e87831d7df137358401966683d382e6c"; + sha256 = "e29280a519f4eca06d4e5862085d8fb8cefb9577918ba953cdc6f63ffc44a6ed"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/dsb/thunderbird-78.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/dsb/thunderbird-78.6.0.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "81a3674dd2495da673a2fe3e3d200d7cadf83f9c67ff92bf2d607f6546bc2f38"; + sha256 = "d638be5a999fd1b287628b449235e9995169c06c2cf46d1f7e6de282bf4357b8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/el/thunderbird-78.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/el/thunderbird-78.6.0.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "651e8f535b2518bc4e56706cfb76da6d0e35d4fec031f8426cbefb404e4790d7"; + sha256 = "34cbbca7eb8ecd5078d52d429b76ed0b5334398040d6e00aa5b5926bf8eeaba8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/en-CA/thunderbird-78.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/en-CA/thunderbird-78.6.0.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "775983115d98e3581db993f6202fdad1de6b23d38e5bb7edfd965ad6bc0ae425"; + sha256 = "d50be05404a4b51e3a9c2fc4a73d75504f11e12a7ba7331ca43d5f078f462303"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/en-GB/thunderbird-78.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/en-GB/thunderbird-78.6.0.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "d0a3569c76b85fdca01e5098cf279b08a63d2d9023e92cadf3f8dc136d76c619"; + sha256 = "4d11d73b268369117861250f4fecd5c6d19a904145caaaeb7ee86c7eb9e63f9f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/en-US/thunderbird-78.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/en-US/thunderbird-78.6.0.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "4363d8fd759ac4f4783eeb76726c8cf22e5afb3c171f26fe5cca5ab194ab6959"; + sha256 = "6691e528ac3fc88a023507e1172d67daac235fa1fce97e75e6fbd7072a493e0f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/es-AR/thunderbird-78.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/es-AR/thunderbird-78.6.0.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "3a04a2e42935c97c7ef003e4a690c0433783b57ce56700f07ad8b590e48b4ad0"; + sha256 = "2f45d7f6e42fdef4f8bb8ab815879157cd962c91afa352a35f8cbc3fcf52fd82"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/es-ES/thunderbird-78.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/es-ES/thunderbird-78.6.0.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "f70a3feb09b79153d18e2a382017abbd6e015c78d4d55ff66f8b199b450172c4"; + sha256 = "7bf50cefecce82e20c06441f003cc51eb7cc16d3a0e55a118213eee78e8b8494"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/et/thunderbird-78.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/et/thunderbird-78.6.0.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "c739f5306a2526baf74e57a029371390d02f8c119681b0f154481ae32c67c18c"; + sha256 = "2b2c624808f75ae0d713ad37e9959ad518ae5702caa10845fb3aa8089e77bc9c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/eu/thunderbird-78.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/eu/thunderbird-78.6.0.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "9f95f4f1ec40e2732e053e68b31529b827f95876ad890d752f5380158f53b9e6"; + sha256 = "3495821650563af2a62f36f928fb7503568de920211b9ef2f21904884d4fa3ef"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/fa/thunderbird-78.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/fa/thunderbird-78.6.0.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha256 = "e53dd458656ee9f39e996042016256949c974161c51b1bee63a401d90d59bace"; + sha256 = "90b9ff389550e5801bc7ca7e1e4d7db5b281081bef2d0d30b7c2e9799e8cd0c9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/fi/thunderbird-78.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/fi/thunderbird-78.6.0.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "b0a96b08e986e49ee6526ab098fb0d44700b3a2aa7f96205b318fdd4b938ef51"; + sha256 = "cd5819b7ed9e3017cbef8e1ca33cb92e1804fc8ece9edf6a74133db90b61ee6f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/fr/thunderbird-78.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/fr/thunderbird-78.6.0.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "872da741245da7466de58d766a0362983d59a111a65a333881d3636defe00eb4"; + sha256 = "82b382d1ea014a26a397c3fe06c586732df756104533c7450494ad43b11e43a5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/fy-NL/thunderbird-78.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/fy-NL/thunderbird-78.6.0.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "d57862f51ec01e63ab77916ab352276b7f4992b089508dee0c9c5d389ab88d95"; + sha256 = "3b4b0c4a23ad63f2d152eb8741a30fe4092c2d37d1bbb2cd56eb75c85d885f4a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/ga-IE/thunderbird-78.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/ga-IE/thunderbird-78.6.0.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "bda41b8eff5a5004f753944c49f15ddbd1f76c19b0310481251e04ff64309597"; + sha256 = "093b76080942d3e7584f7948dc65003c20878e8bf4bec4808669f012183cf97f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/gd/thunderbird-78.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/gd/thunderbird-78.6.0.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "0671af342859574cb96dbe119d76d7ffa92a8c3fef11eee2a03f662ea71fb84a"; + sha256 = "a726c67ab384b58c3a1ff84a3a1fe95f73219996e7e26f5dcdfe5dda30d34cdf"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/gl/thunderbird-78.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/gl/thunderbird-78.6.0.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "b458d6f79914fc4c551b3fa4444dc5ad4fa8d3310907a33a3480bf363bcdbfdb"; + sha256 = "b731c512c61ece7b811d74e5f40cdae742207463799cccfa9906b43f58d5f2fb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/he/thunderbird-78.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/he/thunderbird-78.6.0.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "146f2a8417827d2d6352f7cc20486ecca8fd1e0ad384d4eb2d8b2635edf2075f"; + sha256 = "d15591239235d2f7debc8454e65c1e67101b8f32901fcc7543025986c524b156"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/hr/thunderbird-78.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/hr/thunderbird-78.6.0.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "5c510bd3a8f8015e5c8a7c0cff401e3557b0cdca83bff77d2384c8f75f287152"; + sha256 = "003d02062016c8f13038e61f189b7ebb75753ffd9a55879e1f8fd3ee1c1f2a2f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/hsb/thunderbird-78.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/hsb/thunderbird-78.6.0.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "605ae5746f0df98c7a561550da9cc938d0e06a222f422910ab118fa89d09e793"; + sha256 = "2325fd29cadc8c824ddd90ba7d0975ca42c2d9964c62269f0361b5318274155f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/hu/thunderbird-78.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/hu/thunderbird-78.6.0.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "7d42f5e242e04d06bb9abd9bde8fe21571fa13f91b027369a048447d4de8526c"; + sha256 = "15650cc17e75780f17927ced485a03a23dcf771dd7d8343b28acd0ae1f0e1f9e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/hy-AM/thunderbird-78.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/hy-AM/thunderbird-78.6.0.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "74b0b31089be36c0538eb24c98e57123f24599b4122aac5b08c4eb914f6a8f7d"; + sha256 = "c20a4f0ccf2bce093986e3758784190215bf19d31469f6bb51f5a494ed54fb03"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/id/thunderbird-78.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/id/thunderbird-78.6.0.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "291ad6b1fcdc537e723ee76cf0a40a3084bdf1ebec68fc3c8c54714618f5d790"; + sha256 = "286eb0484f9a4b9c2d24dd836abcc07b00218a6c870535df1e4947482de1a79f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/is/thunderbird-78.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/is/thunderbird-78.6.0.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "188e2cab8e00421b8a5f9c9a174e8a529ab404a0f4f3976797e41848eb0abc4d"; + sha256 = "b291df9b76800c56424ed8c9ad8e55be68f2606968abef2eb83ee3c86d56fc6f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/it/thunderbird-78.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/it/thunderbird-78.6.0.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "12daeb5314ae81a82ce95c35dc9e34d676fe8b666a84a38aea36367b52aa2c95"; + sha256 = "51d112544b67c44d82b4d0f54bd35f0dfb485917ad72c09ce6136a8750e58eb0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/ja/thunderbird-78.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/ja/thunderbird-78.6.0.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "cdd41967d60abff6053f1736375cbbdb521bbdf5aa25110ca8e08bb365c853ca"; + sha256 = "931815f8f2e0e3a9e3b9eb150fe8f0112b26537b02cc0c0c0dce9c14c1959ac9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/ka/thunderbird-78.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/ka/thunderbird-78.6.0.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "9548232d8df327e6282b5413d904d5742aadfa75574b1333a235df2097337032"; + sha256 = "d51b241842f8da9d6cfc8307b11b73fe813d46a7d6cd9651c46e1af18201e89c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/kab/thunderbird-78.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/kab/thunderbird-78.6.0.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "ca35aa36ed5794661372e76f24dd6c98d11d35da76aff5396215ebe9331aa881"; + sha256 = "935d2e485aff93ee91c20710c286cb591379f5fae1a34851454707710c75df88"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/kk/thunderbird-78.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/kk/thunderbird-78.6.0.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "dd90fff1a4ee8380e03e59ef324298d1591833a021d14a11fdb2829cd3a934f3"; + sha256 = "4534b9c69f44c197997283f455d4b692ff96df122e9d633288d2874b8657833b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/ko/thunderbird-78.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/ko/thunderbird-78.6.0.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "4dae3766bf420a0cfb5473fa95356f0061b657a7ebfdc808b69a8e639564893b"; + sha256 = "bb083026c53734d3956126a7bc11f1e02e122e463b0f8cb72757cc7cf94cb911"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/lt/thunderbird-78.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/lt/thunderbird-78.6.0.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "de4b448d9651692bc4eb38447d94c94e37d93dae816edb5f3936d56a58aa41af"; + sha256 = "a9cd61089e2898a3e27cd0d10d9295c295b579324a30ff58f7500c0dd9fa1977"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/ms/thunderbird-78.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/ms/thunderbird-78.6.0.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "08593e72643de8f79b6d90a0c41d6031f915097d3f28f1e7e901c21caa0ab037"; + sha256 = "f84ac7f403802271c2730979dd7da85ec976d970aa39c1f50215ba1902449245"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/nb-NO/thunderbird-78.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/nb-NO/thunderbird-78.6.0.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "21caa07be03725788c41fa527e7656a0467194e8a498de87f2455b571c4e14b2"; + sha256 = "98fd61d91149b26750f06e12f64605ffe04f243d96c5ead0d11a2a600c4baa7d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/nl/thunderbird-78.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/nl/thunderbird-78.6.0.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "7c1c00a8e03d0a8e4fa9cdc3b4acce51215e9f273660e48ad76347e6003a1985"; + sha256 = "44dbe77dbfb8d74c2c79052e1152e0da0a751d0cccea5b643c5019704454b0ac"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/nn-NO/thunderbird-78.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/nn-NO/thunderbird-78.6.0.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "103bc1307f47c20102e14362fcd6da696eb122fe77f680e70cd0849c9c03c47a"; + sha256 = "e88e668c434b5b2469ef8268985015735ba5ff8639a1c670d1c9d42e1dd0b30b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/pa-IN/thunderbird-78.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/pa-IN/thunderbird-78.6.0.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "388d01d0881573164816d7ddf6a08c17ad966616f1c8e8e429f821d2bb179a62"; + sha256 = "388b87f10db2a0dc9c73580ccc5248c492d6274766e4350981f8289db39c95cf"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/pl/thunderbird-78.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/pl/thunderbird-78.6.0.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "160651e72037bb89ac62534714ce9ecbebdec0cf1f8a6127396c68ab531745f9"; + sha256 = "cc0e7c7bf4fd33ab255b1bcca808e6ae84c9575b3555228f84da8dad83b02d2a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/pt-BR/thunderbird-78.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/pt-BR/thunderbird-78.6.0.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "6d2064a6ed4bb684384f7e79b61cfceb66a9a26900e9947b3666c36d6b8793cd"; + sha256 = "a8b4b7db5ed2a45af8bc595c85f15f9ea78d2a790bb62a9e419b7b2c78616a66"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/pt-PT/thunderbird-78.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/pt-PT/thunderbird-78.6.0.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "2ccc7a3d9d845f1a3e2ad3869cbd4cefa10e44992c27444a599f6f1429070f32"; + sha256 = "c4504cebf2b2c831ec94029605b3068ab1cf220d3cce33b085d658c20fbf4dc4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/rm/thunderbird-78.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/rm/thunderbird-78.6.0.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "05e45497c19d46292617de4f247f014f7b14a684f74bfd314caf408416dc5b19"; + sha256 = "b1be40d4a3f6f26c9a06e3179244ae2ad9c9c259e76cdd695cb3f881e43de919"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/ro/thunderbird-78.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/ro/thunderbird-78.6.0.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "bf01cf8c987e46f03236dbaab14aa551464019f471aa111299b6c7538e995f80"; + sha256 = "305ecbe685a107461aa3dad94e7b74d9f32b343a3d9813cf7d570e0919d5d931"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/ru/thunderbird-78.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/ru/thunderbird-78.6.0.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "a3cbdfa26ff487d0efdabfa9dc324b75ec1446964f1c0192afcd67565dfc4a51"; + sha256 = "4d49f15c2c9e69a6156e89017c71f5cbda3114940bfdf273efd0e82dfcc3457b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/si/thunderbird-78.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/si/thunderbird-78.6.0.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha256 = "fb26eef7b0c5b233e41f8d4ad79f11aa7d0db21b155bf0d9284881cabb51f6e4"; + sha256 = "9d108c3b3d54d12c5008f0d77c4a6741ab94c7fcfec1cb4ff59bb2730938d01f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/sk/thunderbird-78.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/sk/thunderbird-78.6.0.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "d462f2606bfd7f6e0e45334a68d266889f0f9f927f08d5b92c39329711a8c4cf"; + sha256 = "a6e51284b554fd6a8970757d519870098baa26d3fd23561e335105ec5bf836ad"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/sl/thunderbird-78.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/sl/thunderbird-78.6.0.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "b6011aefaf1eb60c8849b4ecc7a7a6fa0a72def8ba690f5b7ca61de3e089c9a4"; + sha256 = "99b80fb6efd174beaf885e3d5451557a353693158ef147c931aa4d8560966122"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/sq/thunderbird-78.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/sq/thunderbird-78.6.0.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "aeed36c0d6129dc58d496f8f6177a88950a4c4cfe2e4ac157fb389ea79488b11"; + sha256 = "5bba738143daec5c687fedf566052c9d387a87520e510acdb963ae80c5d24b3c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/sr/thunderbird-78.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/sr/thunderbird-78.6.0.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "f55cb398b3e6420acf6791d9ab5592b9915d299c5111ea917934b5729d22dd7f"; + sha256 = "c18424e503d87ee7ea940a4d9551b9ec51a90b76b73180c89541872dbba27674"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/sv-SE/thunderbird-78.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/sv-SE/thunderbird-78.6.0.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "036b4f2b3d6cd24bcdcdbc1da1f44df2fba012f22ab96d0840a8c7ae0b945055"; + sha256 = "d0eb7a8a1a6248e40142a62b61f9fe3e78bb8c277c9734d821358e0a075d5184"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/th/thunderbird-78.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/th/thunderbird-78.6.0.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "316ae39fb02b9ad1b28bbe7a21342e5e85dd7593978b4935b7be20253fe6b761"; + sha256 = "04d3465fb8afcff051ce9a578901f3e9a8fbfab65f31cd7245b0b9321daa102f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/tr/thunderbird-78.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/tr/thunderbird-78.6.0.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "73811e185274d880abdb15503a928a537428460080245426a07cf1c01e38f1c6"; + sha256 = "46acaf32f9f035dd320d4e28d6b36ef8ce2d8ff5f753cfb6a7b02f37e8edb09f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/uk/thunderbird-78.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/uk/thunderbird-78.6.0.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "8ff9e333cf16a02e7888f297851b5a9316c5b57cf546f592f12d2aab6e3bed48"; + sha256 = "60b0be6207532039958f03a81e5fdf070d15cd624a0583c4d8e87e0528ccd240"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/uz/thunderbird-78.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/uz/thunderbird-78.6.0.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "899c0c8c886fbaa6a6609a500bb374797bd36272138a6fcdc6aca7c7b6a6fe66"; + sha256 = "070963c90b858e9ab75cee1490671ec3f9f46190896eca554fde0ced205d0d44"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/vi/thunderbird-78.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/vi/thunderbird-78.6.0.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "13afdad34f64a1c96f9612c10c8af880e9718ae10d8a1578bc397b238a936dbd"; + sha256 = "9040ed756aa19c0e850391bd9fa148eb0fbca45b84eea888c874a9c93ee0428b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/zh-CN/thunderbird-78.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/zh-CN/thunderbird-78.6.0.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "00a1d01acabd210ba70ed6d0842ab5e1674109c7f39f561e8295d1ffd5f80a0d"; + sha256 = "caba2b9f3fabf1231b947c578c9761a241178f732c110fcd4cf620146ce5002b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-x86_64/zh-TW/thunderbird-78.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-x86_64/zh-TW/thunderbird-78.6.0.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "19b84b15a6bbf593a342c874822764bd73022d2c846fe20a6d7d91aceeb1ee15"; + sha256 = "b48378e3833a0710bca60cb9c87396f0163cf9cd6211725ea711e116557e5abc"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-i686/af/thunderbird-78.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/af/thunderbird-78.6.0.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "4c1487a6b823a76d477085e66b377f536f2cfd95b4ddc6804b97c792af77c554"; + sha256 = "b4ca4cd2535fb02c059db2783f2428634373730217d420530d7c2f6441191fe7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-i686/ar/thunderbird-78.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/ar/thunderbird-78.6.0.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "d33576a1d8c346195a20c8a222281d682d14f604654ff173eb28ca8a9343574b"; + sha256 = "29c287ff2ce37f3d4c23770f85aa220d7b9265df2b188aa38730fca68f8ea40b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-i686/ast/thunderbird-78.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/ast/thunderbird-78.6.0.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "09d68977bc121e562f3c697bd1d87b21250c8a0bcac013940e3806d4a69a749d"; + sha256 = "e1267edf8d35bfaf1f2bab751b5235855ce9ab768acc607ff308021dc917cd8f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-i686/be/thunderbird-78.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/be/thunderbird-78.6.0.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "bb58501c902788b2d1f8f308468aa57447a15979cab59dc89c27e3738748b6d9"; + sha256 = "1359027429e2c1ed2535f0878105bc0485f52b569aa342246d380acd1df13e4f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-i686/bg/thunderbird-78.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/bg/thunderbird-78.6.0.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "373bd3548f518a4ae56e8a103b64eb76c3139b984a5af8013de56b133a0d44c0"; + sha256 = "4e2d1a02d6ef6ee123c68db8ff299037cbfa017334599f5e3ac7114ee3e8874b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-i686/br/thunderbird-78.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/br/thunderbird-78.6.0.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "40934c8ec7070ad29cb0111624de431a0cdeeff9c7c01d8781444e33f65acbca"; + sha256 = "526e73827d595452c40bcd2066885d41a9497bf7d61043a5236d600cb9202e94"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-i686/ca/thunderbird-78.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/ca/thunderbird-78.6.0.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "fbce4213fe7564f2af3f980f5844961cac9a7ec2a30b23d7cdd4e5db6aa4ebaa"; + sha256 = "73605bd265262a8f538b7d15b26915ecb030a76824a09192e7b2e897ac5affe5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-i686/cak/thunderbird-78.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/cak/thunderbird-78.6.0.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "2aaf7ea23606be03f5f7168aaa4286760f236d084babd1f81540f8b62b37962c"; + sha256 = "bbdcb9447938bc2ae8b4dc0a5a250cf82e316c7ef56abca2962f871abf9d1d4a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-i686/cs/thunderbird-78.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/cs/thunderbird-78.6.0.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "880e36431f76161674fdb9f2902c9d5487bed528a198722458b7e6e76e80e9b5"; + sha256 = "4052bda928576a30657dc4087bdded6ea2339e271bff36194bbd37e610f55d13"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-i686/cy/thunderbird-78.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/cy/thunderbird-78.6.0.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "eddb4dcac8063e5b245eb1c095c4ff98cb03714bf5b07f0366b89d670a9d95dd"; + sha256 = "d3b337be4b64903d075f8e2269ff5f88831d5a88f24a56deead19ea534867d10"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-i686/da/thunderbird-78.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/da/thunderbird-78.6.0.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "2425487caaab7979f504d37cf6b100c7cb030e8e5495b6723fa4f953348e4f40"; + sha256 = "96080cee994410b59935c0baaa4d8bc0c592d1654242b00540b3b1997398951a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-i686/de/thunderbird-78.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/de/thunderbird-78.6.0.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "81df3e5ba46fe5959f785c06bef0b70daa55e8f8721cfff0bf55a76f7343b32f"; + sha256 = "46b4c8b867fbc4f5ed288f0c503a776a256c229799601d7810ac51b73685d6a2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-i686/dsb/thunderbird-78.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/dsb/thunderbird-78.6.0.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "995d3aaf3df22aa3166f161b98113fc25b813dc7cee2743b2bdd6913b4a620c4"; + sha256 = "f1b8576a1c5ed9dea2b92b10b03e2f16e17207c1f5dce4f83556b11a846de754"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-i686/el/thunderbird-78.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/el/thunderbird-78.6.0.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "ad5162a76dba9c37e2542fa7ed08c63edce9955600e9b50889abb03e352ddf23"; + sha256 = "01d559767ff8a2562b81c7e42007993065b4d46319fe4890e157a2450a34875f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-i686/en-CA/thunderbird-78.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/en-CA/thunderbird-78.6.0.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "c605520e5e65449855c355147f18b813f66d38dce52e8d3a23b90afbec5bcbf1"; + sha256 = "99571e51cc28c9dbc5aab42fa5d5f7f680fdfa287f7f8b96c5548949155735a5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-i686/en-GB/thunderbird-78.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/en-GB/thunderbird-78.6.0.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "63b0d984ee8296c5185ed1aab279a0ef065986d989edbd0a7683b9db6a6d94bb"; + sha256 = "e515ef917801e0fa67b9d4821f7185b21e36b35b7df8bb43b6a917851bcae753"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-i686/en-US/thunderbird-78.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/en-US/thunderbird-78.6.0.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "b5404037f2678d36acbb225f43d426a86db9a4828a69b1beaf44dc3b5264ae7e"; + sha256 = "cee59a70210f9fc8672a914179c957d67556b068d8ce9387c01636e89e54aba9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-i686/es-AR/thunderbird-78.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/es-AR/thunderbird-78.6.0.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "cefe0ff79bacc9c16fe649c0d7b4f932afca6ebb10c8426fac527485e92f4422"; + sha256 = "e30605e7460ff80a1c26107d0393d7cd12ecfd95d55f256db6f808076d03c53d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-i686/es-ES/thunderbird-78.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/es-ES/thunderbird-78.6.0.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "de7c6685c4e73ee334faf83c809b2f45d55c971282ba99aecfd5d1c8b05577da"; + sha256 = "0e2301dd592c06a2628aeba21f38fe4b422ed2690531c1487e958c6cea1b236c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-i686/et/thunderbird-78.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/et/thunderbird-78.6.0.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "e5174b12c61221436a5926224f61f218bfe762086f1d5bb814af5f7708592392"; + sha256 = "d15684c68e9bef8902e9dcdb87bacda263953cc93ba7368b69fd318739b58fdf"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-i686/eu/thunderbird-78.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/eu/thunderbird-78.6.0.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "66bfbb4edc775117a6f048f52084fff9828633166ac6234a7c1dc0d67311677f"; + sha256 = "4144e7de84ce0a6b39d8c29a96221532951c76679a8ac5a85aa07a62b99680d6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-i686/fa/thunderbird-78.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/fa/thunderbird-78.6.0.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha256 = "072163a9d1a94b1f5c297c794791b4bd3e7f7e6897e7f7615df59a9dd2232a52"; + sha256 = "028ac9a6ad5d6e7360e597d961a7422238d96cda848042975ececec6f3a06aa3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-i686/fi/thunderbird-78.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/fi/thunderbird-78.6.0.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "9c269f267251bee9828acfd78d04bf149767dfe5247ae4f53ec5b0bd65c410ba"; + sha256 = "ee5adee4c249edd9b61fcacc0a2150d4471a7897aa1057fe3ea04e16729de966"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-i686/fr/thunderbird-78.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/fr/thunderbird-78.6.0.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "6ccfac2b5d96491c4d5dc7b00e4458617ca68fe07917941559534a31424c977c"; + sha256 = "d5d0190541184198a6c628b3c79c7dc96ec911ab195ed3419f33c4817d401e01"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-i686/fy-NL/thunderbird-78.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/fy-NL/thunderbird-78.6.0.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "1b470c45c9d52a8a84c59dbb4ed0e6966d124ffdc3ea865e4d02289bd39b346f"; + sha256 = "c7b8ee6e8b66a6948f80f10e1ebf2d61c70e5be439f197953bff91f499fa8d51"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-i686/ga-IE/thunderbird-78.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/ga-IE/thunderbird-78.6.0.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "a1cbb9a4c1bf91f920da9e4e0e39e6ecff0a8c87413898c1930ce69dadad9a26"; + sha256 = "32a1d8ded34b26136b2884d24f31c5b08c965c10061758b87df9510395f8dc7e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-i686/gd/thunderbird-78.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/gd/thunderbird-78.6.0.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "909be2cc362ed839f373eb22d27c5f3c569b1c82fc2ba5aaf270d605029d336c"; + sha256 = "a65ff1d77deb34ed46bb84ab480afad20fcf417f39c714021ccd83b4a9d3212e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-i686/gl/thunderbird-78.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/gl/thunderbird-78.6.0.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "8ffadcffd16aca8befd4b9c230b7da750e6a694add7ee465227a0c3f31a5c655"; + sha256 = "87660c561fc92396c1eeafb82e907fbc2670b6649e2c7f0bdc73714fefa3de55"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-i686/he/thunderbird-78.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/he/thunderbird-78.6.0.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "a9242889345131a405d138d0ec8e470eb49c59ada18b1e8f78004f307ceb41b1"; + sha256 = "1e5c7324c57de9e5e2a87dceb1d41994a74f55e108e8d97161e0fd428f6b197f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-i686/hr/thunderbird-78.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/hr/thunderbird-78.6.0.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "eb1f5496811677e28b2ed034da40ebf1fef324673e0f3acb2c21f0db5c71f592"; + sha256 = "cad204c16e1b8ee26809321aa27c73220e64bcd86d261474c636d088ade006e3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-i686/hsb/thunderbird-78.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/hsb/thunderbird-78.6.0.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "643a2b11a0775a71a8fa6c25097cfe297e6bc190fb29eee18ddd3d16fb61d989"; + sha256 = "9d3e8988b5e8a3f089a0334304e255a716bc24f4ec9b08dd6594b7ddb4daa3cd"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-i686/hu/thunderbird-78.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/hu/thunderbird-78.6.0.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "61d91bed542a7e014a8d11e46e1b3d97e8bef1303bba397b3d4da0585b1e68af"; + sha256 = "f46e9d49a74ccb2172c78e6e149149ff49c0be7c93336c62f8c17b30a1b1d15f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-i686/hy-AM/thunderbird-78.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/hy-AM/thunderbird-78.6.0.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "2e6739d14a45529ed2a68abb8ed03ad901b4e7770efebd382f6e9626c86da036"; + sha256 = "f3f7e033489907339055d0ef02abf4a423434248b1a10623736fdcf09a3edd79"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-i686/id/thunderbird-78.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/id/thunderbird-78.6.0.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "8753bc4c7292cd0c6ee382bb5572e432222e7c39ed739904d91ed1ece5a8197e"; + sha256 = "581cbae2f96a616d29d30eda0dad30992eaa7fe71f65c20af10f528d130d83d1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-i686/is/thunderbird-78.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/is/thunderbird-78.6.0.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "4f624262b72fce7d258b6f7c264f7d2266ebcfdd59fce895e4e85c72fa784637"; + sha256 = "8653b1e05517a723a4113995e0e69a73fa59196f5625e2c1b0e51d9d60561646"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-i686/it/thunderbird-78.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/it/thunderbird-78.6.0.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "6298ce45c4a659e47877302d61a50dfc7e0634e7c3e7036aeec49da5a2839073"; + sha256 = "98faf75b5216cc75c2348962769fcdaa98ff59c4f4870b44cb6e7a69b7b5e9bc"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-i686/ja/thunderbird-78.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/ja/thunderbird-78.6.0.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "85a7b01f65c79b0e13c4f8a18f3950f0a250f380fc8756b8fb1709680a148554"; + sha256 = "ad34916c36ac06eec4c1a900ff33639c6238e01c6426693261433b9bdf44ea91"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-i686/ka/thunderbird-78.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/ka/thunderbird-78.6.0.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "f7b18243b9985b54eb8684b62bad47b7b021eb959f467fec9876c866d92b1727"; + sha256 = "c3468772b8667784814f6d323a74aef24f561cf3fbd2c5dfbfed16f73e7e7c6d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-i686/kab/thunderbird-78.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/kab/thunderbird-78.6.0.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "cc8eb77d0d0ea95a1e2b13db51da4f18a9500aeacee1cbe505da67f2b6a9b979"; + sha256 = "1ba665c91e38df62809a601223238dc3c34a50c96e42e5792b145eb9aed3aef7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-i686/kk/thunderbird-78.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/kk/thunderbird-78.6.0.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "6999faf34774806e1e4257a139dd97dd50a889a7729fef4f51a8b41bb4ad169e"; + sha256 = "651fda1baa62acfae3f13bb65096368719461d206ce45b84a3ff5540e09d9e24"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-i686/ko/thunderbird-78.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/ko/thunderbird-78.6.0.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "42b0bf1ebfce252fdfca3ed8de9f227bbb054bf591e6155b716b18e9613a9cff"; + sha256 = "49b82df2eaa66e658b4ff0f84af7b128a92eddce7e9ce129f0f28b8239367967"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-i686/lt/thunderbird-78.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/lt/thunderbird-78.6.0.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "6ffe9b52189579bee34604499649901be5c8be2a026eb70a33ac9eb4e3b21880"; + sha256 = "6d263e236457576a0e853fd0b00711182c34c32436f65c8fc952aa2810fa500d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-i686/ms/thunderbird-78.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/ms/thunderbird-78.6.0.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "640942eb04d84d24bd28cf5e49e57497934810394b50693bad591cf3b783e1bf"; + sha256 = "45b050930b8357e3a988701d46234ccdd43ba7b38e56b88d157dee6309c375c3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-i686/nb-NO/thunderbird-78.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/nb-NO/thunderbird-78.6.0.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "c0d35274192ae664314e91fd9364609cbbf142f8177d37210c9c49fdf8d31086"; + sha256 = "23760a375705d8c3d22aaefab60c9a761fe73f5d6c97f3a3621312ba362f77ef"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-i686/nl/thunderbird-78.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/nl/thunderbird-78.6.0.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "864ac834a0f44ce112deb107abce170802abaa63556f0aad88ee828bf3f8a98c"; + sha256 = "8f006195886d26a519363c1a61940a53388952a67bae4fad07de50ab24ee21c5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-i686/nn-NO/thunderbird-78.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/nn-NO/thunderbird-78.6.0.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "e821eaf0388885e3b5e88001a2c4410cdf065059b79a3581c324f53d1cf59eb5"; + sha256 = "85710ff8542c6d592a939a55300040633f5b8fa8587f5c6c0ba0c3c2c7e5e62e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-i686/pa-IN/thunderbird-78.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/pa-IN/thunderbird-78.6.0.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "5a0afbf815683afd24c258ac66a45dc300028b4d41a9950784355645874459ed"; + sha256 = "cc1120713915ba43b74e9a4daa5814cf83b32317bc1503061c233e5fe28f8214"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-i686/pl/thunderbird-78.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/pl/thunderbird-78.6.0.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "cebdc0a0188edc63fce0b4fe0a4a3f22ab792ad486bd1e10e635ac8f641f1b5d"; + sha256 = "bf3da9722d7c9602304f64c7b11aba83cb899a23c1ddd179d5eb431aca23301b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-i686/pt-BR/thunderbird-78.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/pt-BR/thunderbird-78.6.0.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "7bbf9aa4d48bf84a7455dcebc6b7476e4c1ffa085c1771fbdf302f71d10e4825"; + sha256 = "0104d48b2de1e26e3b66545a76b7892e2b1b17f56ebf8558353e031fb8741614"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-i686/pt-PT/thunderbird-78.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/pt-PT/thunderbird-78.6.0.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "b84c28dfb5d677768a6e0f69c8ea63fcaf884839739789ac72f50e7b8884f8ca"; + sha256 = "b376bc3cc3f87484c9f976f30a3049bd4873ec67982574ec570c5c96d7643285"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-i686/rm/thunderbird-78.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/rm/thunderbird-78.6.0.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "f34eea430a9e929c25ad961b1c92724c5539a46cbbfb9a97a5c7edca4996115a"; + sha256 = "d68e60b06b03b5313a1ddc42464ee5a3ead106655860e1d2c359802875276778"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-i686/ro/thunderbird-78.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/ro/thunderbird-78.6.0.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "115cd666282822f35924d4de3b33fd0dd3d790d278bb35849ada579d43d5ac54"; + sha256 = "051c01b3e2f69258e1d44599c6c485785c1624a67fa6548517ec242c69bf47fa"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-i686/ru/thunderbird-78.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/ru/thunderbird-78.6.0.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "961eb62e639f8f7c7c5695bd39df50fe4b3401e7aeade8281600779bb8edd374"; + sha256 = "db0f48c765e7ec9c090e1d5f43f42faa5ac6cc9e4d593dbc6b8ff6f8f7210027"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-i686/si/thunderbird-78.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/si/thunderbird-78.6.0.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha256 = "0887999609e47839a0f7600215c3083ce939fe13abc0c38cf701449224dbc87a"; + sha256 = "fc104d206779b8b909f645a86151b193da0792c9af6360fbb4933d8224f23bb2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-i686/sk/thunderbird-78.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/sk/thunderbird-78.6.0.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "a3b9281efc4c0cd6cb454f2c5b97567b4d2c6567076cee188e85c30a45213f98"; + sha256 = "d08d8fe02577ad931020fdfd45b673fd2b71e41d66c1532b8025012e493c869d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-i686/sl/thunderbird-78.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/sl/thunderbird-78.6.0.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "141e9a41dba4c2a3eee4370d2db6e14f8805fee2d70c20ecbb9865b7a0dcaa77"; + sha256 = "6907401bb3973911ece57b9b3bd56032b02c2c140ab79ec554f4574a7e2121cc"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-i686/sq/thunderbird-78.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/sq/thunderbird-78.6.0.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "6a50fdac7993294937756a169b4b0ac7fe021611c5c6a730ea194ee7302c95dc"; + sha256 = "bca13f569b5cd0e6a4bac8ae59a8f1b228010a95871763600080473f45ffe5a2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-i686/sr/thunderbird-78.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/sr/thunderbird-78.6.0.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "2ec4c2f367bceb3f05c75e55366cc66fae6593fc35c79d7bea57f34f93d79dba"; + sha256 = "df9328979af4c36d553992e0928d63a6cfcf0a54541e091fe7bb57e2e934057f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-i686/sv-SE/thunderbird-78.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/sv-SE/thunderbird-78.6.0.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "4a9027f9aa74bd9c6e3cbf02ac1918f1b9dfbda57ed0344a99fccad9fa271f79"; + sha256 = "a310b66e76a2062354d2ec10dbe0827188610618ac87f866010b418d26032a50"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-i686/th/thunderbird-78.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/th/thunderbird-78.6.0.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "f394b18a364fa84ff5eeeee00c841248ba4095285833ce625b700fd500b9c0cc"; + sha256 = "efb37f15a311d2c66678f42f13085e77eaf8819b2fe16ee52e3410dde5e85bee"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-i686/tr/thunderbird-78.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/tr/thunderbird-78.6.0.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "9f180c1b6b604fc597bf1ecb10e3521c70953cb70d4292105cb3bc7cbeb806c0"; + sha256 = "4f9f9088ab91ebc3e4e022ba77cf8c168ab961c73317fccd07e987e38ec6eb57"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-i686/uk/thunderbird-78.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/uk/thunderbird-78.6.0.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "f828ac8f52bda71f913462e60fb7ea2221de4f824063b95b85709320a820db8a"; + sha256 = "d9c527045270007c74e84d9f77ab6cbab2f07112d8688757920f5adbc5bbdf1d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-i686/uz/thunderbird-78.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/uz/thunderbird-78.6.0.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "8d3dd4a1bbe008e4d346c22c01bafe988dde88fa6c9919c50194b9b155bc821f"; + sha256 = "9ea90845e8668afff622f412f571b59e03e6c02d49a4e47cb99ab93f5da822dd"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-i686/vi/thunderbird-78.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/vi/thunderbird-78.6.0.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "4db40b3debca281c59e926bd0f9cb4e5cd2150bf27235f1178ed8e497616a031"; + sha256 = "ccf4bd8c6269fb8ae15413923d556ecafb808ef205688dfb78379347a5bce5f4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-i686/zh-CN/thunderbird-78.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/zh-CN/thunderbird-78.6.0.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "399707f970a01e2f3c2eacc81f2f3bb33b1f49433c3ba6c49f4615b499f0c246"; + sha256 = "22f0b4a72f995a9936fed178138d3e0c40fb3aefeda989c9ba83fc82a4296fcf"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.5.1/linux-i686/zh-TW/thunderbird-78.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.6.0/linux-i686/zh-TW/thunderbird-78.6.0.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "27ad21908069582a4a7641dc9a7d9acc69d4842382499cef2cee2f84d0fc3856"; + sha256 = "b8c8633732641b8ab87bfc2a2867a95b817ce6d0fd0e8f569221bc51ac23e849"; } ]; } diff --git a/pkgs/applications/networking/mailreaders/thunderbird/default.nix b/pkgs/applications/networking/mailreaders/thunderbird/default.nix index 58eae867487fc..66d2667e7ed0d 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/default.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/default.nix @@ -14,13 +14,15 @@ , freetype , glib , gnugrep +, gnupg , gnused +, gpgme , icu , jemalloc , lib +, libevent , libGL , libGLU -, libevent , libjpeg , libnotify , libpng @@ -71,13 +73,13 @@ assert waylandSupport -> gtk3Support == true; stdenv.mkDerivation rec { pname = "thunderbird"; - version = "78.5.1"; + version = "78.6.0"; src = fetchurl { url = "mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz"; sha512 = - "202s2h9fsvg4chy93rgxdf4vlavf3wbp9vqgh0nrgk5wcdhz17144vhw1bmxia8hf99snq2a3ix6haidwl8d2n6l2nfsjzcnphhxd9z"; + "0hx9gg3ngpvgshrz9j7ni4kh3chadqd5w5fpywjjw4naj0k53d0i9jjhq4p6fyvf6rb2g825ibqq794lr9drn6nrfndh5w1yn5lw69n"; }; nativeBuildInputs = [ @@ -266,7 +268,7 @@ stdenv.mkDerivation rec { genericName = "Mail Reader"; name = "thunderbird"; exec = "thunderbird %U"; - icon = "$out/lib/thunderbird/chrome/icons/default/default256.png"; + icon = "thunderbird"; mimeType = lib.concatStringsSep ";" [ # Email "x-scheme-handler/mailto" @@ -286,8 +288,18 @@ stdenv.mkDerivation rec { postInstall = '' # TODO: Move to a dev output? rm -rf $out/include $out/lib/thunderbird-devel-* $out/share/idl + install -Dm 444 $out/lib/thunderbird/chrome/icons/default/default256.png $out/share/icons/hicolor/256x256/apps/thunderbird.png ''; + # Note on GPG support: + # Thunderbird's native GPG support does not yet support smartcards. + # The official upstream recommendation is to configure fall back to gnupg + # using the Thunderbird config `mail.openpgp.allow_external_gnupg` + # and GPG keys set up; instructions with pictures at: + # https://anweshadas.in/how-to-use-yubikey-or-any-gpg-smartcard-in-thunderbird-78/ + # For that to work out of the box, it requires `gnupg` on PATH and + # `gpgme` in `LD_LIBRARY_PATH`; we do this below. + preFixup = '' # Needed to find Mozilla runtime gappsWrapperArgs+=( @@ -297,6 +309,8 @@ stdenv.mkDerivation rec { --set SNAP_NAME "thunderbird" --set MOZ_LEGACY_PROFILES 1 --set MOZ_ALLOW_DOWNGRADE 1 + --prefix PATH : "${lib.getBin gnupg}/bin" + --prefix LD_LIBRARY_PATH : "${lib.getLib gpgme}/lib" ) ''; @@ -325,7 +339,7 @@ stdenv.mkDerivation rec { requiredSystemFeatures = [ "big-parallel" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A full-featured e-mail client"; homepage = "https://www.thunderbird.net"; maintainers = with maintainers; [ diff --git a/pkgs/applications/networking/msmtp/default.nix b/pkgs/applications/networking/msmtp/default.nix index bfa98b94d0a82..a9d2158d20a47 100644 --- a/pkgs/applications/networking/msmtp/default.nix +++ b/pkgs/applications/networking/msmtp/default.nix @@ -9,11 +9,11 @@ let in stdenv.mkDerivation rec { pname = "msmtp"; - version = "1.8.13"; + version = "1.8.14"; src = fetchurl { url = "https://marlam.de/${pname}/releases/${pname}-${version}.tar.xz"; - sha256 = "1fcv99nis7c6yc63n04cncjysv9jndrp469gcfxh54aiinmlbadd"; + sha256 = "1W8GXXEUhunCNGGFFaAqSKSNq0BRs08+EI++y2+3c7Q="; }; patches = [ diff --git a/pkgs/applications/networking/netperf/default.nix b/pkgs/applications/networking/netperf/default.nix index c2e51ee743b5c..47693cc97f1cb 100644 --- a/pkgs/applications/networking/netperf/default.nix +++ b/pkgs/applications/networking/netperf/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation { sha256 = "1wbbgdvhadd3qs3afv6i777argdpcyxkwz4yv6aqp223n8ki6dm8"; }; - buildInputs = stdenv.lib.optional (stdenv.hostPlatform.isx86) libsmbios; + buildInputs = stdenv.lib.optional (with stdenv.hostPlatform; isx86 && isLinux) libsmbios; nativeBuildInputs = [ autoreconfHook ]; autoreconfPhase = '' autoreconf -i -I src/missing/m4 @@ -24,7 +24,7 @@ stdenv.mkDerivation { homepage = "http://www.netperf.org/netperf/"; license = "Hewlett-Packard BSD-like license"; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.unix; maintainers = [ stdenv.lib.maintainers.mmlb ]; }; } diff --git a/pkgs/applications/networking/openbazaar/client.nix b/pkgs/applications/networking/openbazaar/client.nix index c890329771fe4..1d055520d1f6c 100644 --- a/pkgs/applications/networking/openbazaar/client.nix +++ b/pkgs/applications/networking/openbazaar/client.nix @@ -13,11 +13,11 @@ let in stdenv.mkDerivation rec { pname = "openbazaar-client"; - version = "2.4.8"; + version = "2.4.9"; src = fetchurl { url = "https://github.com/OpenBazaar/openbazaar-desktop/releases/download/v${version}/openbazaar2client_${version}_amd64.deb"; - sha256 = "0c8ar0rd4yydy4rd4hqafljrhi40v3cwhc9v7fjbrfhcx1ikmf64"; + sha256 = "1l6l72kb5h5f32dl5wqv31sigl3fh2byixv0h0d3icmjf558c39p"; }; dontBuild = true; diff --git a/pkgs/applications/networking/p2p/deluge/1/default.nix b/pkgs/applications/networking/p2p/deluge/1.nix index 7ab3379241550..aa70f969d221a 100644 --- a/pkgs/applications/networking/p2p/deluge/1/default.nix +++ b/pkgs/applications/networking/p2p/deluge/1.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, intltool, libtorrentRasterbar, pythonPackages }: +{ stdenv, fetchurl, fetchpatch, intltool, libtorrent-rasterbar, pythonPackages }: pythonPackages.buildPythonPackage rec { pname = "deluge"; @@ -19,7 +19,7 @@ pythonPackages.buildPythonPackage rec { propagatedBuildInputs = with pythonPackages; [ pyGtkGlade twisted Mako chardet pyxdg pyopenssl service-identity - libtorrentRasterbar.dev libtorrentRasterbar.python setuptools + libtorrent-rasterbar.dev libtorrent-rasterbar.python setuptools ]; nativeBuildInputs = [ intltool ]; diff --git a/pkgs/applications/networking/p2p/deluge/2/default.nix b/pkgs/applications/networking/p2p/deluge/default.nix index 2e9f08ce98a87..f9c421c408735 100644 --- a/pkgs/applications/networking/p2p/deluge/2/default.nix +++ b/pkgs/applications/networking/p2p/deluge/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, intltool, libtorrentRasterbar, pythonPackages +{ stdenv, fetchurl, intltool, libtorrent-rasterbar, pythonPackages , gtk3, glib, gobject-introspection, librsvg, wrapGAppsHook }: pythonPackages.buildPythonPackage rec { @@ -12,7 +12,7 @@ pythonPackages.buildPythonPackage rec { propagatedBuildInputs = with pythonPackages; [ twisted Mako chardet pyxdg pyopenssl service-identity - libtorrentRasterbar.dev libtorrentRasterbar.python setuptools + libtorrent-rasterbar.dev libtorrent-rasterbar.python setuptools setproctitle pillow rencode six zope_interface dbus-python pygobject3 pycairo gtk3 gobject-introspection librsvg diff --git a/pkgs/applications/networking/p2p/frostwire/frostwire-bin.nix b/pkgs/applications/networking/p2p/frostwire/frostwire-bin.nix index 364aeac550e62..8ef8740f4d2ac 100644 --- a/pkgs/applications/networking/p2p/frostwire/frostwire-bin.nix +++ b/pkgs/applications/networking/p2p/frostwire/frostwire-bin.nix @@ -3,12 +3,12 @@ with stdenv.lib; stdenv.mkDerivation rec { - version = "6.8.8"; + version = "6.8.9"; pname = "frostwire"; src = fetchurl { url = "https://dl.frostwire.com/frostwire/${version}/frostwire-${version}.amd64.tar.gz"; - sha256 = "0zxk0nv7m1k4n8n82h1rkh239a58s7j643lgqbw3qx45bdy4sf4k"; + sha256 = "0f5vyliwncryj6hj5xx0dycxycxddsn28n6zixjrn56jajijyl6q"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/networking/p2p/qbittorrent/default.nix b/pkgs/applications/networking/p2p/qbittorrent/default.nix index 9b6a8bd707d54..2e69ad23e14c5 100644 --- a/pkgs/applications/networking/p2p/qbittorrent/default.nix +++ b/pkgs/applications/networking/p2p/qbittorrent/default.nix @@ -1,29 +1,32 @@ -{ mkDerivation, lib, fetchFromGitHub, pkgconfig -, boost, libtorrentRasterbar, qtbase, qttools, qtsvg -, debugSupport ? false # Debugging +{ mkDerivation, lib, fetchFromGitHub, makeWrapper, pkgconfig +, boost, libtorrent-rasterbar, qtbase, qttools, qtsvg +, debugSupport ? false , guiSupport ? true, dbus ? null # GUI (disable to run headless) , webuiSupport ? true # WebUI +, trackerSearch ? true, python3 ? null }: assert guiSupport -> (dbus != null); -with lib; +assert trackerSearch -> (python3 != null); +with lib; mkDerivation rec { pname = "qbittorrent"; - version = "4.3.0.1"; + version = "4.3.1"; src = fetchFromGitHub { owner = "qbittorrent"; repo = "qbittorrent"; rev = "release-${version}"; - sha256 = "068sf24mjvc2idimgpzvf7gjk8n9xrr3qqlqfx5j3j598ckm3yfp"; + sha256 = "17ih00q7idrpl3b2vgh4smva6lazs5jw06pblriscn1lrwdvrc38"; }; # NOTE: 2018-05-31: CMake is working but it is not officially supported - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ makeWrapper pkgconfig ]; - buildInputs = [ boost libtorrentRasterbar qtbase qttools qtsvg ] - ++ optional guiSupport dbus; # D(esktop)-Bus depends on GUI support + buildInputs = [ boost libtorrent-rasterbar qtbase qttools qtsvg ] + ++ optional guiSupport dbus # D(esktop)-Bus depends on GUI support + ++ optional trackerSearch python3; # Otherwise qm_gen.pri assumes lrelease-qt5, which does not exist. QMAKE_LRELEASE = "lrelease"; @@ -35,6 +38,12 @@ mkDerivation rec { ++ optional (!webuiSupport) "--disable-webui" ++ optional debugSupport "--enable-debug"; + postInstall = "wrapProgram $out/bin/${ + if guiSupport + then "qbittorrent" + else "qbittorrent-nox" + } --prefix PATH : ${makeBinPath [ python3 ]}"; + enableParallelBuilding = true; meta = { diff --git a/pkgs/applications/networking/p2p/tribler/default.nix b/pkgs/applications/networking/p2p/tribler/default.nix index 5cab23ecd710c..83f517e625a4a 100644 --- a/pkgs/applications/networking/p2p/tribler/default.nix +++ b/pkgs/applications/networking/p2p/tribler/default.nix @@ -19,40 +19,41 @@ stdenv.mkDerivation rec { python3Packages.python ]; - pythonPath = [ - python3Packages.libtorrentRasterbar - python3Packages.twisted - python3Packages.netifaces - python3Packages.pycrypto - python3Packages.pyasn1 - python3Packages.requests - python3Packages.m2crypto - python3Packages.pyqt5 - python3Packages.chardet - python3Packages.cherrypy - python3Packages.cryptography - python3Packages.libnacl - python3Packages.configobj - python3Packages.decorator - python3Packages.feedparser - python3Packages.service-identity - python3Packages.psutil - python3Packages.pillow - python3Packages.networkx - python3Packages.pony - python3Packages.lz4 - python3Packages.pyqtgraph + pythonPath = with python3Packages; [ + libtorrent-rasterbar + twisted + netifaces + pycrypto + pyasn1 + requests + m2crypto + pyqt5 + chardet + cherrypy + cryptography + libnacl + configobj + decorator + feedparser + service-identity + psutil + pillow + networkx + pony + lz4 + pyqtgraph # there is a BTC feature, but it requires some unclear version of # bitcoinlib, so this doesn't work right now. - # python3Packages.bitcoinlib + # bitcoinlib ]; postPatch = '' ${stdenv.lib.optionalString enablePlayer '' substituteInPlace "./TriblerGUI/vlc.py" --replace "ctypes.CDLL(p)" "ctypes.CDLL('${libvlc}/lib/libvlc.so')" - substituteInPlace "./TriblerGUI/widgets/videoplayerpage.py" --replace "if vlc and vlc.plugin_path" "if vlc" - substituteInPlace "./TriblerGUI/widgets/videoplayerpage.py" --replace "os.environ['VLC_PLUGIN_PATH'] = vlc.plugin_path" "os.environ['VLC_PLUGIN_PATH'] = '${libvlc}/lib/vlc/plugins'" + substituteInPlace "./TriblerGUI/widgets/videoplayerpage.py" \ + --replace "if vlc and vlc.plugin_path" "if vlc" \ + --replace "os.environ['VLC_PLUGIN_PATH'] = vlc.plugin_path" "os.environ['VLC_PLUGIN_PATH'] = '${libvlc}/lib/vlc/plugins'" ''} ''; diff --git a/pkgs/applications/networking/pcloud/default.nix b/pkgs/applications/networking/pcloud/default.nix index 7db633737d99e..1b094fc442a65 100644 --- a/pkgs/applications/networking/pcloud/default.nix +++ b/pkgs/applications/networking/pcloud/default.nix @@ -26,13 +26,13 @@ let pname = "pcloud"; - version = "1.8.8"; + version = "1.8.9"; name = "${pname}-${version}"; # Archive link's code thanks to: https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=pcloud-drive src = fetchzip { - url = "https://api.pcloud.com/getpubzip?code=XZpnMpXZPWyhRfdvXUhyY6XpdfmQmJiLRmmV&filename=${name}.zip"; - hash = "sha256-z9OeFkH6EVthg5Dz2mN3jlBTMhiMt/6bUIYFeMO6EXk="; + url = "https://api.pcloud.com/getpubzip?code=XZjfKzXZ6h3uGRFId48VRNHHkuqajhRvMlPV&filename=${name}.zip"; + hash = "sha256:1bwdwfwgy3wwzlggi8qhf5q2bq2kqiqi3mgvsr9w0mxyaxxv13r8"; }; appimageContents = appimageTools.extractType2 { diff --git a/pkgs/applications/networking/remote/teamviewer/default.nix b/pkgs/applications/networking/remote/teamviewer/default.nix index 9c3ed826a2d5e..c556ce35b2dec 100644 --- a/pkgs/applications/networking/remote/teamviewer/default.nix +++ b/pkgs/applications/networking/remote/teamviewer/default.nix @@ -38,6 +38,13 @@ mkDerivation rec { ln -s /var/log/teamviewer $out/share/teamviewer/logfiles ln -s ${xdg_utils}/bin $out/share/teamviewer/tv_bin/xdg-utils + for i in 16 20 24 32 48 256; do + size=$i"x"$i + + mkdir -p $out/share/icons/hicolor/$size/apps + ln -s $out/share/teamviewer/tv_bin/desktop/teamviewer_$i.png $out/share/icons/hicolor/$size/apps/TeamViewer.png + done; + sed -i "s,/opt/teamviewer,$out/share/teamviewer,g" $out/share/teamviewer/tv_bin/desktop/com.teamviewer.*.desktop substituteInPlace $out/share/teamviewer/tv_bin/script/tvw_aux \ @@ -50,6 +57,7 @@ mkDerivation rec { wrapProgram $out/share/teamviewer/tv_bin/TeamViewer --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ libXrandr libX11 ]}" wrapProgram $out/share/teamviewer/tv_bin/TeamViewer_Desktop --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [libXrandr libX11 libXext libXdamage libXtst libSM libXfixes ]}" + wrapQtApp $out/share/teamviewer/tv_bin/script/teamviewer wrapQtApp $out/bin/teamviewer ''; diff --git a/pkgs/applications/networking/remote/waypipe/default.nix b/pkgs/applications/networking/remote/waypipe/default.nix index 2c91d6496a0ed..d325351982631 100644 --- a/pkgs/applications/networking/remote/waypipe/default.nix +++ b/pkgs/applications/networking/remote/waypipe/default.nix @@ -6,14 +6,14 @@ stdenv.mkDerivation rec { pname = "waypipe-unstable"; - version = "0.7.1"; + version = "0.7.2"; src = fetchFromGitLab { domain = "gitlab.freedesktop.org"; owner = "mstoeckl"; repo = "waypipe"; rev = "v${version}"; - sha256 = "00skyxmbssfxksb8wlqdr8gajpysadirjcn230fd5gaf5msvllx7"; + sha256 = "sha256-LtfrSEwZikOXp/fdyJ/+EylRx19zdsHMkrl1eEf1/aY="; }; postPatch = '' diff --git a/pkgs/applications/networking/seafile-client/default.nix b/pkgs/applications/networking/seafile-client/default.nix index 69b7b432b0a0a..fb0c0a18ac5fe 100644 --- a/pkgs/applications/networking/seafile-client/default.nix +++ b/pkgs/applications/networking/seafile-client/default.nix @@ -1,16 +1,16 @@ { mkDerivation, lib, fetchFromGitHub, pkgconfig, cmake, qtbase, qttools -, seafile-shared, ccnet, jansson, libsearpc +, seafile-shared, jansson, libsearpc , withShibboleth ? true, qtwebengine }: mkDerivation rec { pname = "seafile-client"; - version = "7.0.9"; + version = "8.0.1"; src = fetchFromGitHub { owner = "haiwen"; repo = "seafile-client"; - rev = "v${version}"; - sha256 = "0pcn6lfzma2hvpwsp9q0002wvym7zabpp8fvq29l101gzirn79m9"; + rev = "b4b944921c7efef13a93d693c45c997943899dec"; + sha256 = "2vV+6ZXjVg81JVLfWeD0UK+RdmpBxBU2Ozx790WFSyw="; }; nativeBuildInputs = [ pkgconfig cmake ]; @@ -21,7 +21,7 @@ mkDerivation rec { ++ lib.optional withShibboleth "-DBUILD_SHIBBOLETH_SUPPORT=ON"; qtWrapperArgs = [ - "--suffix PATH : ${lib.makeBinPath [ ccnet seafile-shared ]}" + "--suffix PATH : ${lib.makeBinPath [ seafile-shared ]}" ]; meta = with lib; { diff --git a/pkgs/applications/networking/shellhub-agent/default.nix b/pkgs/applications/networking/shellhub-agent/default.nix new file mode 100644 index 0000000000000..0aa78482e5aca --- /dev/null +++ b/pkgs/applications/networking/shellhub-agent/default.nix @@ -0,0 +1,48 @@ +{ stdenv +, buildGoModule +, fetchFromGitHub +, genericUpdater +, common-updater-scripts +}: + +buildGoModule rec { + pname = "shellhub-agent"; + version = "0.4.2"; + + src = fetchFromGitHub { + owner = "shellhub-io"; + repo = "shellhub"; + rev = "v${version}"; + sha256 = "0cd41ing1pcf1bdaaq00w5h7lih5j2kcaa0m41g3ikm3vd1w5qna"; + }; + + modRoot = "./agent"; + + vendorSha256 = "19gsfhh6idqysdxhpq45sq35gw19adz9lp83krjlhzj1vqm59qma"; + + buildFlagsArray = [ "-ldflags=-s -w -X main.AgentVersion=v${version}" ]; + + passthru = { + updateScript = genericUpdater { + inherit pname version; + versionLister = "${common-updater-scripts}/bin/list-git-tags ${src.meta.homepage}"; + rev-prefix = "v"; + ignoredVersions = ".(rc|beta).*"; + }; + }; + + meta = with stdenv.lib; { + description = + "Enables easy access any Linux device behind firewall and NAT"; + longDescription = '' + ShellHub is a modern SSH server for remotely accessing Linux devices via + command line (using any SSH client) or web-based user interface, designed + as an alternative to _sshd_. Think ShellHub as centralized SSH for the the + edge and cloud computing. + ''; + homepage = "https://shellhub.io/"; + license = licenses.asl20; + maintainers = with maintainers; [ otavio ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/networking/sniffers/wireshark/default.nix b/pkgs/applications/networking/sniffers/wireshark/default.nix index d906b4459009d..cb29857e168d5 100644 --- a/pkgs/applications/networking/sniffers/wireshark/default.nix +++ b/pkgs/applications/networking/sniffers/wireshark/default.nix @@ -10,9 +10,8 @@ assert withQt -> qt5 != null; with stdenv.lib; let - version = "3.4.0"; + version = "3.4.2"; variant = if withQt then "qt" else "cli"; - pcap = libpcap.override { withBluez = stdenv.isLinux; }; in stdenv.mkDerivation { pname = "wireshark-${variant}"; @@ -21,7 +20,7 @@ in stdenv.mkDerivation { src = fetchurl { url = "https://www.wireshark.org/download/src/all-versions/wireshark-${version}.tar.xz"; - sha256 = "1bm8jj2rviis9j9l6nixvhxcfx362y9iphkxssgmiz2kj6yypr37"; + sha256 = "1i548w6zv6ni5n22rs90a12aakyq811493dxmadlcsj2krr6i66y"; }; cmakeFlags = [ @@ -39,7 +38,7 @@ in stdenv.mkDerivation { ] ++ optional withQt qt5.wrapQtAppsHook; buildInputs = [ - gettext pcre perl pcap lua5 libssh nghttp2 openssl libgcrypt + gettext pcre perl libpcap lua5 libssh nghttp2 openssl libgcrypt libgpgerror gnutls geoip c-ares python3 glib zlib makeWrapper ] ++ optionals withQt (with qt5; [ qtbase qtmultimedia qtsvg qttools ]) ++ optionals stdenv.isLinux [ libcap libnl ] @@ -80,9 +79,6 @@ in stdenv.mkDerivation { '' else optionalString withQt '' install -Dm644 -t $out/share/applications ../wireshark.desktop - substituteInPlace $out/share/applications/*.desktop \ - --replace "Exec=wireshark" "Exec=$out/bin/wireshark" - install -Dm644 ../image/wsicon.svg $out/share/icons/wireshark.svg mkdir $dev/include/{epan/{wmem,ftypes,dfilter},wsutil,wiretap} -pv diff --git a/pkgs/applications/networking/sync/desync/default.nix b/pkgs/applications/networking/sync/desync/default.nix index 9831ab34b2eb2..7f7d2fb277a19 100644 --- a/pkgs/applications/networking/sync/desync/default.nix +++ b/pkgs/applications/networking/sync/desync/default.nix @@ -1,20 +1,20 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ stdenv, buildGoModule, fetchFromGitHub }: -buildGoPackage rec { +buildGoModule rec { pname = "desync"; - version = "0.4.0"; - rev = "v${version}"; - - goPackagePath = "github.com/folbricht/desync"; + version = "0.9.0"; src = fetchFromGitHub { - inherit rev; + rev = "v${version}"; owner = "folbricht"; repo = "desync"; - sha256 = "17qh0g1paa7212j761q9z246k10a3xrwd8fgiizw3lr9adn50kdk"; + sha256 = "0j9hixgkja268r2zn2dglrmlrb2z57sgz6q3wqb8dfwpan7b5rsy"; }; - goDeps = ./deps.nix; + vendorSha256 = "1gajh99jb6mbwk93dypddhl7r7n8h2s11s3s82firbrb5k24s4pz"; + + # nix builder doesn't have access to test data; tests fail for reasons unrelated to binary being bad. + doCheck = false; meta = with stdenv.lib; { description = "Content-addressed binary distribution system"; diff --git a/pkgs/applications/networking/sync/desync/deps.nix b/pkgs/applications/networking/sync/desync/deps.nix deleted file mode 100644 index 7f5f3251d1624..0000000000000 --- a/pkgs/applications/networking/sync/desync/deps.nix +++ /dev/null @@ -1,312 +0,0 @@ -[ - - { - goPackagePath = "github.com/datadog/zstd"; - fetch = { - type = "git"; - url = "https://github.com/datadog/zstd"; - rev = "v1.3.4"; - sha256 = "06wphl43ji23c0cmmm6fd3wszbwq36mdp1jarak2a6hmxl6yf0b8"; - }; - } - - { - 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/dchest/siphash"; - fetch = { - type = "git"; - url = "https://github.com/dchest/siphash"; - rev = "v1.2.0"; - sha256 = "01qhv9zd9l6p7pwf1fj022mp9s5496rk4lnm3yvpjsiwp6k4af8c"; - }; - } - - { - goPackagePath = "github.com/fatih/color"; - fetch = { - type = "git"; - url = "https://github.com/fatih/color"; - rev = "v1.7.0"; - sha256 = "0v8msvg38r8d1iiq2i5r4xyfx0invhc941kjrsg5gzwvagv55inv"; - }; - } - - { - goPackagePath = "github.com/folbricht/tempfile"; - fetch = { - type = "git"; - url = "https://github.com/folbricht/tempfile"; - rev = "v0.0.1"; - sha256 = "0vz08qvbniqxc24vhmcbq5ncnz97ncp4jbxgcf0hziazxfp114z3"; - }; - } - - { - goPackagePath = "github.com/go-ini/ini"; - fetch = { - type = "git"; - url = "https://github.com/go-ini/ini"; - rev = "v1.38.2"; - sha256 = "0xbnw1nd22q6k863n5gs0nxld15w0p8qxbhfky85akcb5rk1vwi9"; - }; - } - - { - goPackagePath = "github.com/gopherjs/gopherjs"; - fetch = { - type = "git"; - url = "https://github.com/gopherjs/gopherjs"; - rev = "0210a2f0f73c"; - sha256 = "1n80xjfc1dkxs8h8mkpw83n89wi5n7hzc3rxhwjs76rkxpq3rc9j"; - }; - } - - { - goPackagePath = "github.com/hanwen/go-fuse"; - fetch = { - type = "git"; - url = "https://github.com/hanwen/go-fuse"; - rev = "1d35017e9701"; - sha256 = "11rggvkd6lc5lcpsfvc9iip4z9cingzpkpshaskv2cirbxdynyi8"; - }; - } - - { - goPackagePath = "github.com/inconshreveable/mousetrap"; - fetch = { - type = "git"; - url = "https://github.com/inconshreveable/mousetrap"; - rev = "v1.0.0"; - sha256 = "1mn0kg48xkd74brf48qf5hzp0bc6g8cf5a77w895rl3qnlpfw152"; - }; - } - - { - goPackagePath = "github.com/jtolds/gls"; - fetch = { - type = "git"; - url = "https://github.com/jtolds/gls"; - rev = "v4.2.1"; - sha256 = "1vm37pvn0k4r6d3m620swwgama63laz8hhj3pyisdhxwam4m2g1h"; - }; - } - - { - goPackagePath = "github.com/kr/fs"; - fetch = { - type = "git"; - url = "https://github.com/kr/fs"; - rev = "v0.1.0"; - sha256 = "11zg176x9hr9q7fsk95r6q0wf214gg4czy02slax4x56n79g6a7q"; - }; - } - - { - goPackagePath = "github.com/mattn/go-colorable"; - fetch = { - type = "git"; - url = "https://github.com/mattn/go-colorable"; - rev = "v0.0.9"; - sha256 = "1nwjmsppsjicr7anq8na6md7b1z84l9ppnlr045hhxjvbkqwalvx"; - }; - } - - { - goPackagePath = "github.com/mattn/go-isatty"; - fetch = { - type = "git"; - url = "https://github.com/mattn/go-isatty"; - rev = "v0.0.4"; - sha256 = "0zs92j2cqaw9j8qx1sdxpv3ap0rgbs0vrvi72m40mg8aa36gd39w"; - }; - } - - { - goPackagePath = "github.com/mattn/go-runewidth"; - fetch = { - type = "git"; - url = "https://github.com/mattn/go-runewidth"; - rev = "v0.0.3"; - sha256 = "0lc39b6xrxv7h3v3y1kgz49cgi5qxwlygs715aam6ba35m48yi7g"; - }; - } - - { - goPackagePath = "github.com/minio/minio-go"; - fetch = { - type = "git"; - url = "https://github.com/minio/minio-go"; - rev = "v6.0.6"; - sha256 = "0bgivqw1n1189lksp85djw1rqcan2axyh4jv9q54iclrjkpbab37"; - }; - } - - { - goPackagePath = "github.com/mitchellh/go-homedir"; - fetch = { - type = "git"; - url = "https://github.com/mitchellh/go-homedir"; - rev = "v1.0.0"; - sha256 = "0f0z0aa4wivk4z1y503dmnw0k0g0g403dly8i4q263gfshs82sbq"; - }; - } - - { - goPackagePath = "github.com/pkg/errors"; - fetch = { - type = "git"; - url = "https://github.com/pkg/errors"; - rev = "v0.8.0"; - sha256 = "001i6n71ghp2l6kdl3qq1v2vmghcz3kicv9a5wgcihrzigm75pp5"; - }; - } - - { - goPackagePath = "github.com/pkg/sftp"; - fetch = { - type = "git"; - url = "https://github.com/pkg/sftp"; - rev = "v1.8.2"; - sha256 = "040flbir6sv213xzs75vkd5fd7bmm3fqxfcnsx8fr77zkn52hm4m"; - }; - } - - { - goPackagePath = "github.com/pmezard/go-difflib"; - fetch = { - type = "git"; - url = "https://github.com/pmezard/go-difflib"; - rev = "v1.0.0"; - sha256 = "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw"; - }; - } - - { - goPackagePath = "github.com/smartystreets/assertions"; - fetch = { - type = "git"; - url = "https://github.com/smartystreets/assertions"; - rev = "7c9eb446e3cf"; - sha256 = "1dix6qgaj6kw38hicy3zs3lvacl1kn0n267b3xw0vvdkqf1v0395"; - }; - } - - { - goPackagePath = "github.com/smartystreets/goconvey"; - fetch = { - type = "git"; - url = "https://github.com/smartystreets/goconvey"; - rev = "ef6db91d284a"; - sha256 = "16znlpsms8z2qc3airawyhzvrzcp70p9bx375i19bg489hgchxb7"; - }; - } - - { - goPackagePath = "github.com/spf13/cobra"; - fetch = { - type = "git"; - url = "https://github.com/spf13/cobra"; - rev = "v0.0.3"; - sha256 = "1q1nsx05svyv9fv3fy6xv6gs9ffimkyzsfm49flvl3wnvf1ncrkd"; - }; - } - - { - goPackagePath = "github.com/spf13/pflag"; - fetch = { - type = "git"; - url = "https://github.com/spf13/pflag"; - rev = "v1.0.2"; - sha256 = "005598piihl3l83a71ahj10cpq9pbhjck4xishx1b4dzc02r9xr2"; - }; - } - - { - goPackagePath = "github.com/stretchr/testify"; - fetch = { - type = "git"; - url = "https://github.com/stretchr/testify"; - rev = "v1.2.2"; - sha256 = "0dlszlshlxbmmfxj5hlwgv3r22x0y1af45gn1vd198nvvs3pnvfs"; - }; - } - - { - goPackagePath = "golang.org/x/crypto"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/crypto"; - rev = "0709b304e793"; - sha256 = "0i05s09y5pavmfh71fgih7syxg58x7a4krgd8am6d3mnahnmab5c"; - }; - } - - { - goPackagePath = "golang.org/x/net"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/net"; - rev = "161cd47e91fd"; - sha256 = "0254ld010iijygbzykib2vags1dc0wlmcmhgh4jl8iny159lhbcv"; - }; - } - - { - goPackagePath = "golang.org/x/sync"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/sync"; - rev = "1d60e4601c6f"; - sha256 = "046jlanz2lkxq1r57x9bl6s4cvfqaic6p2xybsj8mq1120jv4rs6"; - }; - } - - { - goPackagePath = "golang.org/x/sys"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/sys"; - rev = "49385e6e1522"; - sha256 = "0spbldahns09fdxkxflb1x24f8k2awdlnr6k5i7ci4fqd19r1dv4"; - }; - } - - { - goPackagePath = "golang.org/x/text"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/text"; - rev = "v0.3.0"; - sha256 = "0r6x6zjzhr8ksqlpiwm5gdd7s209kwk5p4lw54xjvz10cs3qlq19"; - }; - } - - { - goPackagePath = "gopkg.in/cheggaaa/pb.v1"; - fetch = { - type = "git"; - url = "https://gopkg.in/cheggaaa/pb.v1"; - rev = "v1.0.25"; - sha256 = "0vxqiw6f3xyv0zy3g4lksf8za0z8i0hvfpw92hqimsy84f79j3dp"; - }; - } - - { - goPackagePath = "gopkg.in/ini.v1"; - fetch = { - type = "git"; - url = "https://gopkg.in/ini.v1"; - rev = "v1.38.2"; - sha256 = "0xbnw1nd22q6k863n5gs0nxld15w0p8qxbhfky85akcb5rk1vwi9"; - }; - } -] diff --git a/pkgs/applications/networking/sync/onedrive/default.nix b/pkgs/applications/networking/sync/onedrive/default.nix index be255a6c1465f..b41178922af98 100644 --- a/pkgs/applications/networking/sync/onedrive/default.nix +++ b/pkgs/applications/networking/sync/onedrive/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "onedrive"; - version = "2.4.2"; + version = "2.4.7"; src = fetchFromGitHub { owner = "abraunegg"; repo = pname; rev = "v${version}"; - sha256 = "10s33p1xzq9c5n1bxv9n7n31afxgx9i6c17w0xgxdrma75micm3a"; + sha256 = "12g2z6c4f65y8cc7vyhk9nlg1mpbsmlsj7ghlny452qhr13m7qpn"; }; nativeBuildInputs = [ autoreconfHook ldc installShellFiles pkgconfig ]; diff --git a/pkgs/applications/networking/syncplay/default.nix b/pkgs/applications/networking/syncplay/default.nix index da4551d7f5552..e93b6f9a432a5 100644 --- a/pkgs/applications/networking/syncplay/default.nix +++ b/pkgs/applications/networking/syncplay/default.nix @@ -2,7 +2,7 @@ buildPythonApplication rec { pname = "syncplay"; - version = "1.6.6"; + version = "1.6.7"; format = "other"; @@ -10,7 +10,7 @@ buildPythonApplication rec { owner = "Syncplay"; repo = "syncplay"; rev = "v${version}"; - sha256 = "1wkxdp7dv5y1100awy949higvs5035ylfyl83qrp4lnimy3imw09"; + sha256 = "1hxmd13sff51lh9l3vpk33qrzf7gi58c76bc01iqimp17sxwfz3k"; }; propagatedBuildInputs = [ pyside2 shiboken2 twisted certifi ] ++ twisted.extras.tls; diff --git a/pkgs/applications/networking/syncthing/default.nix b/pkgs/applications/networking/syncthing/default.nix index 84b571a20f0c6..c6767f2e0ae1d 100644 --- a/pkgs/applications/networking/syncthing/default.nix +++ b/pkgs/applications/networking/syncthing/default.nix @@ -3,17 +3,17 @@ let common = { stname, target, postInstall ? "" }: buildGoModule rec { - version = "1.12.0"; + version = "1.12.1"; name = "${stname}-${version}"; src = fetchFromGitHub { owner = "syncthing"; repo = "syncthing"; rev = "v${version}"; - sha256 = "09kqc66pnklhmlcn66c5zydnvy2mfs2hqzd1465ydww8bbgcncss"; + sha256 = "1jyqkprb9ps8xc86qnf140wbx5kvshyihxxgym409kfks6dk3cq5"; }; - vendorSha256 = "1jw0k1wm9mfsa2yr2fi2j8mrlykrlcwfnii07rafv9dnnwabs022"; + vendorSha256 = "1xlkc47wfhsf6gzq9sgimlzqnrqdsjgc1zzfkjp3xzbbv5ay7wca"; doCheck = false; diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix index a8c0d4117a330..6d8983179dc4d 100644 --- a/pkgs/applications/office/libreoffice/default.nix +++ b/pkgs/applications/office/libreoffice/default.nix @@ -300,8 +300,6 @@ in (mkDrv rec { cp -r sysui/desktop/icons "$out/share" sed -re 's@Icon=libreoffice(dev)?[0-9.]*-?@Icon=@' -i "$out/share/applications/"*.desktop - qtWrapperArgs+=(--prefix GST_PLUGIN_SYSTEM_PATH : "$GST_PLUGIN_SYSTEM_PATH") - mkdir -p $dev cp -r include $dev '' + lib.optionalString kdeIntegration '' diff --git a/pkgs/applications/office/libreoffice/src-fresh/download.nix b/pkgs/applications/office/libreoffice/src-fresh/download.nix index e26081a02980f..d956a3b08a615 100644 --- a/pkgs/applications/office/libreoffice/src-fresh/download.nix +++ b/pkgs/applications/office/libreoffice/src-fresh/download.nix @@ -469,11 +469,11 @@ md5name = "b24890e2bb46e12e72a79f7e965f409f4e16466d00e1dd15d93d73ee6b592523-libjpeg-turbo-1.5.3.tar.gz"; } { - name = "language-subtag-registry-2020-04-01.tar.bz2"; - url = "https://dev-www.libreoffice.org/src/language-subtag-registry-2020-04-01.tar.bz2"; - sha256 = "fb1ee0dabfd956a445fbe9f351e86a52767808558f20f4256e67fbbb3768e9da"; + name = "language-subtag-registry-2020-09-29.tar.bz2"; + url = "https://dev-www.libreoffice.org/src/language-subtag-registry-2020-09-29.tar.bz2"; + sha256 = "cbe9fca811a37056560aab73e9fc9d3522b46b6785cb02db165f521bf42c230f"; md5 = ""; - md5name = "fb1ee0dabfd956a445fbe9f351e86a52767808558f20f4256e67fbbb3768e9da-language-subtag-registry-2020-04-01.tar.bz2"; + md5name = "cbe9fca811a37056560aab73e9fc9d3522b46b6785cb02db165f521bf42c230f-language-subtag-registry-2020-09-29.tar.bz2"; } { name = "JLanguageTool-1.7.0.tar.bz2"; @@ -700,11 +700,11 @@ md5name = "66adacd705a7d19895e08eac46d1e851332adf2e736c566bef1164e7a442519d-libpagemaker-0.0.4.tar.xz"; } { - name = "pdfium-4137.tar.bz2"; - url = "https://dev-www.libreoffice.org/src/pdfium-4137.tar.bz2"; - sha256 = "9a2f9bddca935a263f06c81003483473a525ccd0f4e517bc75fceb914d4c54b6"; + name = "pdfium-4306.tar.bz2"; + url = "https://dev-www.libreoffice.org/src/pdfium-4306.tar.bz2"; + sha256 = "eca406d47ac7e2a84dcc86f93c08f96e591d409589e881477fa75e488e4851d8"; md5 = ""; - md5name = "9a2f9bddca935a263f06c81003483473a525ccd0f4e517bc75fceb914d4c54b6-pdfium-4137.tar.bz2"; + md5name = "eca406d47ac7e2a84dcc86f93c08f96e591d409589e881477fa75e488e4851d8-pdfium-4306.tar.bz2"; } { name = "pixman-0.34.0.tar.gz"; diff --git a/pkgs/applications/office/libreoffice/src-fresh/primary.nix b/pkgs/applications/office/libreoffice/src-fresh/primary.nix index dbfd249901e70..c9b1826471145 100644 --- a/pkgs/applications/office/libreoffice/src-fresh/primary.nix +++ b/pkgs/applications/office/libreoffice/src-fresh/primary.nix @@ -8,8 +8,8 @@ rec { major = "7"; minor = "0"; - patch = "3"; - tweak = "1"; + patch = "4"; + tweak = "2"; subdir = "${major}.${minor}.${patch}"; @@ -17,13 +17,13 @@ rec { src = fetchurl { url = "https://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${version}.tar.xz"; - sha256 = "0b998k2dxbbj7hn3srn07fgsah236h14ncyyahamdff6h3hvqrk5"; + sha256 = "1g9akxvm7fh6lnprnc3g184qdy8gbinhb4rb60gjpw82ip6d5acz"; }; # FIXME rename translations = fetchSrc { name = "translations"; - sha256 = "0s3ic79q0c16hbd6r06mwkyqhw4fdfy9z3xbqvdxp7jl64cjlaj4"; + sha256 = "1v3kpk56fm783d5wihx41jqidpclizkfxrg4n0pq95d79hdiljsl"; }; # the "dictionaries" archive is not used for LO build because we already build hunspellDicts packages from @@ -31,6 +31,6 @@ rec { help = fetchSrc { name = "help"; - sha256 = "14wjkcdmcflfcc7264jx64s6clk5rdsprx7nkbv08z0bp6ff677b"; + sha256 = "1np9f799ww12kggl5az6piv5fi9rf737il5a5r47r4wl2li56qqb"; }; } diff --git a/pkgs/applications/office/paperwork/paperwork-gtk.nix b/pkgs/applications/office/paperwork/paperwork-gtk.nix index c493421dd11be..847287c8c856b 100644 --- a/pkgs/applications/office/paperwork/paperwork-gtk.nix +++ b/pkgs/applications/office/paperwork/paperwork-gtk.nix @@ -2,8 +2,6 @@ , python3Packages , gtk3 , cairo -, aspellDicts -, buildEnv , gnome3 , librsvg , xvfb_run @@ -40,16 +38,19 @@ python3Packages.buildPythonApplication rec { make l10n_compile ''; - ASPELL_CONF = "dict-dir ${buildEnv { - name = "aspell-all-dicts"; - paths = lib.collect lib.isDerivation aspellDicts; - }}/lib/aspell"; - postInstall = '' # paperwork-shell needs to be re-wrapped with access to paperwork cp ${python3Packages.paperwork-shell}/bin/.paperwork-cli-wrapped $out/bin/paperwork-cli # install desktop files and icons XDG_DATA_HOME=$out/share $out/bin/paperwork-gtk install --user + + # fixes [WARNING] [openpaperwork_core.resources.setuptools] Failed to find + # resource file paperwork_gtk.icon.out/paperwork_128.png, tried at path + # /nix/store/3n5lz6y8k9yks76f0nar3smc8djan3xr-paperwork-2.0.2/lib/python3.8/site-packages/paperwork_gtk/icon/out/paperwork_128.png. + site=$out/lib/${python3Packages.python.libPrefix}/site-packages/paperwork_gtk + for i in $site/data/paperwork_*.png; do + ln -s $i $site/icon/out; + done ''; checkInputs = [ xvfb_run dbus.daemon ]; diff --git a/pkgs/applications/office/paperwork/paperwork-shell.nix b/pkgs/applications/office/paperwork/paperwork-shell.nix index 1be6f329e3cfd..7e633f54f9e1c 100644 --- a/pkgs/applications/office/paperwork/paperwork-shell.nix +++ b/pkgs/applications/office/paperwork/paperwork-shell.nix @@ -10,6 +10,7 @@ , paperwork-backend , fabulous , getkey +, psutil , pkgs }: @@ -34,6 +35,7 @@ buildPythonPackage rec { paperwork-backend fabulous getkey + psutil ]; checkInputs = [ diff --git a/pkgs/applications/office/paperwork/src.nix b/pkgs/applications/office/paperwork/src.nix index 70770676edded..45c05cc4962ef 100644 --- a/pkgs/applications/office/paperwork/src.nix +++ b/pkgs/applications/office/paperwork/src.nix @@ -1,12 +1,12 @@ {fetchFromGitLab}: rec { - version = "2.0.1"; + version = "2.0.2"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; repo = "paperwork"; group = "World"; owner = "OpenPaperwork"; rev = version; - sha256 = "16pc4drwpjl4937wdavs6wk0j1qs474b072wplhs8ywxfgqip1h4"; + sha256 = "1di7nnl8ywyiwfpl5m1kvip1m0hvijbmqmkdpviwqw7ajizrr1ly"; }; } diff --git a/pkgs/applications/office/zanshin/default.nix b/pkgs/applications/office/zanshin/default.nix index e3b9408ed96db..843e7ec0145eb 100644 --- a/pkgs/applications/office/zanshin/default.nix +++ b/pkgs/applications/office/zanshin/default.nix @@ -1,6 +1,7 @@ { mkDerivation , lib , fetchurl +, fetchpatch , extra-cmake-modules , qtbase , boost @@ -24,6 +25,15 @@ mkDerivation rec { sha256 = "0b316ddcd46sawva84x5d8nsp19v66gbm83djrra7fv3k8nkv4xh"; }; + patches = [ + # Build with kontactinterface >= 5.14.42. + # Remove after next release. + (fetchpatch { + url = "https://invent.kde.org/pim/zanshin/-/commit/4850c08998b33b37af99c3312d193b063b3e8174.diff"; + sha256 = "sha256:0lh0a035alhmws3zyfnkb814drq5cqxvzpwl4g1g5d435gy8k4ps"; + }) + ]; + nativeBuildInputs = [ extra-cmake-modules ]; @@ -48,6 +58,5 @@ mkDerivation rec { maintainers = with maintainers; [ zraexy ]; platforms = platforms.linux; license = licenses.gpl2Plus; - broken = true; }; } diff --git a/pkgs/applications/printing/pappl/default.nix b/pkgs/applications/printing/pappl/default.nix new file mode 100644 index 0000000000000..5cad364d240b3 --- /dev/null +++ b/pkgs/applications/printing/pappl/default.nix @@ -0,0 +1,62 @@ +{ lib, stdenv, fetchFromGitHub +, avahi +, cups +, gnutls +, libjpeg +, libpng +, libusb1 +, pkg-config +, withPAMSupport ? true, pam +, zlib +}: + +stdenv.mkDerivation rec { + pname = "pappl"; + version = "1.0.0"; + + src = fetchFromGitHub { + owner = "michaelrsweet"; + repo = pname; + rev = "v${version}"; + sha256 = "1cg06v8hxska0hnybnmfda1v4h3ifjir24nx2iqx80kb6jq0hayb"; + }; + + outputs = [ "out" "dev" ]; + + nativeBuildInputs = [ + pkg-config + ]; + + buildInputs = [ + cups + libjpeg + libpng + libusb1 + zlib + ] ++ lib.optionals (!stdenv.isDarwin) [ + # upstream mentions these are not needed for Mac + # see: https://github.com/michaelrsweet/pappl#requirements + avahi + gnutls + ] ++ lib.optionals withPAMSupport [ + pam + ]; + + # testing requires some networking + # doCheck = true; + + doInstallCheck = true; + installCheckPhase = '' + $out/bin/pappl-makeresheader --help + ''; + + enableParallelBuilding = true; + + meta = with lib; { + description = "C-based framework/library for developing CUPS Printer Applications"; + homepage = "https://github.com/michaelrsweet/pappl"; + license = licenses.asl20; + platforms = platforms.linux; # should also work for darwin, but requires additional work + maintainers = with maintainers; [ jonringer ]; + }; +} diff --git a/pkgs/applications/radio/sdrangel/default.nix b/pkgs/applications/radio/sdrangel/default.nix index dd8c56610c287..96f6df2744bef 100644 --- a/pkgs/applications/radio/sdrangel/default.nix +++ b/pkgs/applications/radio/sdrangel/default.nix @@ -26,18 +26,19 @@ qtserialport, qtwebsockets, rtl-sdr, serialdv, +soapysdr-with-plugins, uhd }: mkDerivation rec { pname = "sdrangel"; - version = "4.21.1"; + version = "6.4.0"; src = fetchFromGitHub { owner = "f4exb"; repo = "sdrangel"; rev = "v${version}"; - sha256 = "y6BVwnSJXiapgm9pAuby1DLLeU5MSyB4uqEa3oS35/U="; + sha256 = "4iJoKs0BHmBR6JRFuTIqs0GW3SjhPRMPRlqdyTI38T4="; fetchSubmodules = false; }; @@ -46,12 +47,13 @@ mkDerivation rec { glew opencv3 libusb1 boost libopus limesuite libav libiio libpulseaudio qtbase qtwebsockets qtmultimedia rtl-sdr airspy hackrf fftwFloat codec2 cm256cc serialdv qtserialport - libbladeRF uhd + libbladeRF uhd soapysdr-with-plugins ]; cmakeFlags = [ "-DLIBSERIALDV_INCLUDE_DIR:PATH=${serialdv}/include/serialdv" "-DLIMESUITE_INCLUDE_DIR:PATH=${limesuite}/include" "-DLIMESUITE_LIBRARY:FILEPATH=${limesuite}/lib/libLimeSuite.so" + "-DSOAPYSDR_DIR=${soapysdr-with-plugins}" ]; LD_LIBRARY_PATH = "${ocl-icd}/lib"; diff --git a/pkgs/applications/radio/soapyaudio/default.nix b/pkgs/applications/radio/soapyaudio/default.nix new file mode 100644 index 0000000000000..ce5811b009ee7 --- /dev/null +++ b/pkgs/applications/radio/soapyaudio/default.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchFromGitHub, cmake, pkg-config +, hamlib, rtaudio, alsaLib, libpulseaudio, libjack2, libusb1, soapysdr +} : + +stdenv.mkDerivation rec { + pname = "soapyaudio"; + version = "0.1.1"; + + src = fetchFromGitHub { + owner = "pothosware"; + repo = "SoapyAudio"; + rev = "soapy-audio-${version}"; + sha256 = "0minlsc1lvmqm20vn5hb4im7pz8qwklfy7sbr2xr73xkrbqdahc0"; + }; + + nativeBuildInputs = [ cmake pkg-config ]; + buildInputs = [ hamlib rtaudio alsaLib libpulseaudio libjack2 libusb1 soapysdr ]; + + cmakeFlags = [ + "-DSoapySDR_DIR=${soapysdr}/share/cmake/SoapySDR/" + "-DUSE_HAMLIB=ON" + ]; + + meta = with stdenv.lib; { + homepage = "https://github.com/pothosware/SoapyAudio"; + description = "SoapySDR plugin for amateur radio and audio devices"; + license = licenses.mit; + maintainers = with maintainers; [ numinit ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/radio/soapyuhd/default.nix b/pkgs/applications/radio/soapyuhd/default.nix index a169116c29a1b..b2223d1abb70d 100644 --- a/pkgs/applications/radio/soapyuhd/default.nix +++ b/pkgs/applications/radio/soapyuhd/default.nix @@ -1,22 +1,19 @@ -{ stdenv, fetchFromGitHub, cmake, pkgconfig +{ stdenv, fetchFromGitHub, cmake, pkg-config , uhd, boost, soapysdr } : -let - version = "0.3.6"; - -in stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "soapyuhd"; - inherit version; + version = "0.4.1"; src = fetchFromGitHub { owner = "pothosware"; repo = "SoapyUHD"; rev = "soapy-uhd-${version}"; - sha256 = "11kp5iv21k8lqwjjydzqmcxdgpm6yicw6d3jhzvcvwcavd41crs7"; + sha256 = "14rk9ap9ayks2ma6mygca08yfds9bgfmip8cvwl87l06hwhnlwhj"; }; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ uhd boost soapysdr ]; cmakeFlags = [ "-DSoapySDR_DIR=${soapysdr}/share/cmake/SoapySDR/" ]; @@ -28,7 +25,7 @@ in stdenv.mkDerivation { meta = with stdenv.lib; { homepage = "https://github.com/pothosware/SoapyAirspy"; description = "SoapySDR plugin for UHD devices"; - license = licenses.gpl3; + license = licenses.gpl3Only; maintainers = with maintainers; [ markuskowa ]; platforms = platforms.linux; }; diff --git a/pkgs/applications/radio/soundmodem/default.nix b/pkgs/applications/radio/soundmodem/default.nix new file mode 100644 index 0000000000000..d7410f9280943 --- /dev/null +++ b/pkgs/applications/radio/soundmodem/default.nix @@ -0,0 +1,36 @@ +{ stdenv, fetchurl, pkg-config, alsaLib, audiofile, gtk2, libxml2 }: + +stdenv.mkDerivation rec { + name = "soundmodem"; + version = "0.20"; + + src = fetchurl { + url = "https://archive.org/download/${name}-${version}/${name}-${version}.tar.gz"; + sha256 = "156l3wjnh5rcisxb42kcmlf74swf679v4xnj09zy5j74rd4h721z"; + }; + + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ alsaLib audiofile gtk2 libxml2 ]; + + patches = [ ./matFix.patch ]; + + doCheck = true; + + meta = with stdenv.lib; { + description = "Audio based modem for ham radio supporting ax.25"; + longDescription = '' + This software allows a standard PC soundcard to be used as a packet radio "modem". The whole processing is done on the main processor CPU. + Unlike previous packet radio modem software, this new release offers several new benefits: + - Now uses standard operating system sound drivers (OSS/Free under Linux, /dev/audio under Solaris and DirectSound under Windows), thus runs on all soundcards for which drivers for the desired operating system are available. + - No fixed relationship between bitrate, sampling rate, and modem parameters. Modems may be parametrized, and multiple modems may even run on the same audio channel! + - Usermode solution allows the use of MMX, VIS, Floating point and other media instruction sets to speed up computation. + - Cross platform builds from a single source code provides ubiquitous availability. + ''; + #homepage = "http://gna.org/projects/soundmodem"; # official, but "Connection refused" + homepage = "http://soundmodem.vk4msl.id.au/"; + downloadPage = "https://archive.org/download/${name}-${version}/${name}-${version}.tar.gz"; + license = licenses.gpl2Only; + maintainers = with maintainers; [ ymarkus ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/applications/radio/soundmodem/matFix.patch b/pkgs/applications/radio/soundmodem/matFix.patch new file mode 100644 index 0000000000000..55436cda3d414 --- /dev/null +++ b/pkgs/applications/radio/soundmodem/matFix.patch @@ -0,0 +1,11 @@ +--- a/matlib/mat.hh 2003-01-06 23:47:26.000000000 +0100 ++++ b/matlib/mat.copy.hh 2021-01-06 10:05:34.332415179 +0100 +@@ -91,7 +91,7 @@ + memcpy(c, r, d1 * d3 * sizeof(c[0])); + } + +-template<typename T> void mdet(const T *c, unsigned int d) ++template<typename T> int mdet(const T *c, unsigned int d) + { + T *c2; + unsigned int i, j, k, l; diff --git a/pkgs/applications/radio/urh/default.nix b/pkgs/applications/radio/urh/default.nix index 5411571113d54..3a51f77d7bd6d 100644 --- a/pkgs/applications/radio/urh/default.nix +++ b/pkgs/applications/radio/urh/default.nix @@ -5,13 +5,13 @@ python3Packages.buildPythonApplication rec { pname = "urh"; - version = "2.9.0"; + version = "2.9.1"; src = fetchFromGitHub { owner = "jopohl"; repo = pname; rev = "v${version}"; - sha256 = "1pcyj1vzv51j8rgi0hh9chw3vfkfi03bg1rg7gs4nk95ffmwx4pd"; + sha256 = "0s8zlq2bx6hp8c522rkxj9kbkf3a0qj6iyg7q9dcxmcl3q2sanq9"; }; nativeBuildInputs = [ qt5.wrapQtAppsHook ]; diff --git a/pkgs/applications/science/astronomy/kstars/default.nix b/pkgs/applications/science/astronomy/kstars/default.nix index fde8df6104854..c32d671cb05df 100644 --- a/pkgs/applications/science/astronomy/kstars/default.nix +++ b/pkgs/applications/science/astronomy/kstars/default.nix @@ -1,46 +1,51 @@ { - stdenv, extra-cmake-modules, fetchurl, + lib, mkDerivation, extra-cmake-modules, fetchurl, kconfig, kdoctools, kguiaddons, ki18n, kinit, kiconthemes, kio, - knewstuff, kplotting, kwidgetsaddons, kxmlgui, wrapQtAppsHook, + knewstuff, kplotting, kwidgetsaddons, kxmlgui, knotifyconfig, - qtx11extras, qtwebsockets, + + qtx11extras, qtwebsockets, qtkeychain, libsecret, eigen, zlib, - cfitsio, indilib, xplanet, libnova, gsl + cfitsio, indilib, xplanet, libnova, libraw, gsl, wcslib, stellarsolver }: -stdenv.mkDerivation rec { +mkDerivation rec { pname = "kstars"; - version = "3.4.3"; + version = "3.5.0"; src = fetchurl { - url = "https://mirrors.mit.edu/kde/stable/kstars/kstars-${version}.tar.xz"; - sha256 = "0j5yxg6ay6sic194skz6vjzg6yvrpb3gvypvs0frjrcjbsl1j4f8"; + url = "mirror://kde/stable/kstars/kstars-${version}.tar.xz"; + sha256 = "0fpkm75abn0hhdhfyvpfl6n0fr7gvw63xhb4hvwdrglhkf2nxam1"; }; patches = [ - ./indi-fix.patch + # Patches ksutils.cpp to use nix store prefixes to find program binaries of + # indilib and xplanet dependencies. Without the patch, Ekos is unable to spawn + # indi servers for local telescope/camera control. + ./fs-fixes.patch ]; - nativeBuildInputs = [ extra-cmake-modules kdoctools wrapQtAppsHook ]; + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ kconfig kdoctools kguiaddons ki18n kinit kiconthemes kio - knewstuff kplotting kwidgetsaddons kxmlgui + knewstuff kplotting kwidgetsaddons kxmlgui knotifyconfig - qtx11extras qtwebsockets + qtx11extras qtwebsockets qtkeychain libsecret eigen zlib - cfitsio indilib xplanet libnova gsl + cfitsio indilib xplanet libnova libraw gsl wcslib stellarsolver ]; cmakeFlags = [ "-DINDI_NIX_ROOT=${indilib}" + "-DXPLANET_NIX_ROOT=${xplanet}" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Virtual planetarium astronomy software"; homepage = "https://kde.org/applications/education/org.kde.kstars"; longDescription = '' @@ -50,6 +55,6 @@ stdenv.mkDerivation rec { ''; license = licenses.gpl2; platforms = platforms.linux; - maintainers = with maintainers; [ timput ]; + maintainers = with maintainers; [ timput hjones2199 ]; }; } diff --git a/pkgs/applications/science/astronomy/kstars/fs-fixes.patch b/pkgs/applications/science/astronomy/kstars/fs-fixes.patch new file mode 100644 index 0000000000000..b9bdfc0c5dea0 --- /dev/null +++ b/pkgs/applications/science/astronomy/kstars/fs-fixes.patch @@ -0,0 +1,59 @@ +--- kstars-3.5.0/CMakeLists.txt.old 2020-11-24 12:36:37.967433937 -0600 ++++ kstars-3.5.0/CMakeLists.txt 2020-11-24 13:36:56.275263691 -0600 +@@ -5,6 +5,9 @@ + set (KSTARS_BUILD_RELEASE "Stable") + set (CMAKE_CXX_STANDARD 11) + ++add_definitions(-DINDI_NIX_ROOT=${INDI_NIX_ROOT}) ++add_definitions(-DXPLANET_NIX_ROOT=${XPLANET_NIX_ROOT}) ++ + # Build KStars Lite with -DBUILD_KSTARS_LITE=ON + option(BUILD_KSTARS_LITE "Build KStars Lite" OFF) + +--- kstars-3.5.0/kstars/auxiliary/ksutils.old.cpp 2020-11-24 12:22:14.397319680 -0600 ++++ kstars-3.5.0/kstars/auxiliary/ksutils.cpp 2020-11-24 13:32:22.946477798 -0600 +@@ -1081,6 +1081,10 @@ + // We support running within Snaps, Flatpaks, and AppImage + // The path should accomodate the differences between the different + // packaging solutions ++ #define STR_EXPAND(x) #x ++ #define STR(x) STR_EXPAND(x) ++ QString indi_prefix = QString(STR(INDI_NIX_ROOT)); ++ QString xplanet_prefix = QString(STR(XPLANET_NIX_ROOT)); + QString snap = QProcessEnvironment::systemEnvironment().value("SNAP"); + QString flat = QProcessEnvironment::systemEnvironment().value("FLATPAK_DEST"); + QString appimg = QProcessEnvironment::systemEnvironment().value("APPDIR"); +@@ -1110,21 +1114,21 @@ + #if defined(Q_OS_OSX) + return "/usr/local/bin/indiserver"; + #endif +- return prefix + "/bin/indiserver"; ++ return indi_prefix + "/bin/indiserver"; + } + else if (option == "INDIHubAgent") + { + #if defined(Q_OS_OSX) + return "/usr/local/bin/indihub-agent"; + #endif +- return prefix + "/bin/indihub-agent"; ++ return indi_prefix + "/bin/indihub-agent"; + } + else if (option == "indiDriversDir") + { + #if defined(Q_OS_OSX) + return "/usr/local/share/indi"; + #elif defined(Q_OS_LINUX) +- return prefix + "/share/indi"; ++ return indi_prefix + "/share/indi"; + #else + return QStandardPaths::locate(QStandardPaths::GenericDataLocation, "indi", QStandardPaths::LocateDirectory); + #endif +@@ -1181,7 +1185,7 @@ + #if defined(Q_OS_OSX) + return "/usr/local/bin/xplanet"; + #endif +- return prefix + "/bin/xplanet"; ++ return xplanet_prefix + "/bin/xplanet"; + } + else if (option == "ASTAP") + { diff --git a/pkgs/applications/science/astronomy/kstars/indi-fix.patch b/pkgs/applications/science/astronomy/kstars/indi-fix.patch deleted file mode 100644 index 9ff9f8a31dd3c..0000000000000 --- a/pkgs/applications/science/astronomy/kstars/indi-fix.patch +++ /dev/null @@ -1,50 +0,0 @@ ---- CMakeLists.txt 2020-11-02 13:58:06.119743710 -0600 -+++ kstars-3.4.3/CMakeLists.txt 2020-11-02 14:05:01.707799274 -0600 -@@ -4,5 +4,7 @@ - set (KStars_VERSION_REVISION 3) - set (CMAKE_CXX_STANDARD 11) - -+add_definitions(-DINDI_NIX_ROOT=${INDI_NIX_ROOT}) -+ - # Build KStars Lite with -DBUILD_KSTARS_LITE=ON - option(BUILD_KSTARS_LITE "Build KStars Lite" OFF) - ---- ksutils.cpp 2020-11-02 13:47:44.883596916 -0600 -+++ kstars-3.4.3/kstars/auxiliary/ksutils.cpp 2020-11-02 17:41:44.961937090 -0600 -@@ -1076,6 +1076,9 @@ - { - QString snap = QProcessEnvironment::systemEnvironment().value("SNAP"); - QString flat = QProcessEnvironment::systemEnvironment().value("FLATPAK_DEST"); -+#define STR_EXPAND(x) #x -+#define STR(x) STR_EXPAND(x) -+ QString nix = QString(STR(INDI_NIX_ROOT)); - - if (option == "fitsDir") - { -@@ -1089,7 +1091,7 @@ - if (flat.isEmpty() == false) - return flat + "/bin/indiserver"; - else -- return snap + "/usr/bin/indiserver"; -+ return nix + "/bin/indiserver"; - } - else if (option == "INDIHubAgent") - { -@@ -1099,7 +1101,7 @@ - if (flat.isEmpty() == false) - return flat + "/bin/indihub-agent"; - else -- return snap + "/usr/bin/indihub-agent"; -+ return nix + "/bin/indihub-agent"; - } - else if (option == "indiDriversDir") - { -@@ -1109,7 +1111,7 @@ - if (flat.isEmpty() == false) - return flat + "/share/indi"; - else -- return snap + "/usr/share/indi"; -+ return nix + "/share/indi"; - #else - return QStandardPaths::locate(QStandardPaths::GenericDataLocation, "indi", QStandardPaths::LocateDirectory); - #endif diff --git a/pkgs/applications/science/astronomy/phd2/default.nix b/pkgs/applications/science/astronomy/phd2/default.nix index 98afba77c4f02..7ddad3852277d 100644 --- a/pkgs/applications/science/astronomy/phd2/default.nix +++ b/pkgs/applications/science/astronomy/phd2/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchFromGitHub, pkg-config, cmake, gtk3, - wxGTK30-gtk3, curl, gettext, glib, indilib, libnova }: +{ stdenv, fetchFromGitHub, pkg-config, cmake, gtk3, wxGTK30-gtk3, + curl, gettext, glib, indilib, libnova, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "phd2"; @@ -12,13 +12,18 @@ stdenv.mkDerivation rec { sha256 = "1ih7m9lilh12xbhmwm9kkicaqy72mi3firl6df7m5x38n2zj3zm4"; }; - nativeBuildInputs = [ cmake pkg-config ]; + nativeBuildInputs = [ cmake pkg-config wrapGAppsHook ]; buildInputs = [ gtk3 wxGTK30-gtk3 curl gettext glib indilib libnova ]; cmakeFlags = [ "-DOPENSOURCE_ONLY=1" ]; + # Fix broken wrapped name scheme by moving wrapped binary to where wrapper expects it + postFixup = '' + mv $out/bin/.phd2.bin-wrapped $out/bin/.phd2-wrapped.bin + ''; + meta = with stdenv.lib; { homepage = "https://openphdguiding.org/"; description = "Telescope auto-guidance application"; diff --git a/pkgs/applications/science/biology/bowtie/default.nix b/pkgs/applications/science/biology/bowtie/default.nix new file mode 100644 index 0000000000000..964eeddb461da --- /dev/null +++ b/pkgs/applications/science/biology/bowtie/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchFromGitHub, zlib }: + +stdenv.mkDerivation rec { + pname = "bowtie"; + version = "1.3.0"; + + src = fetchFromGitHub { + owner = "BenLangmead"; + repo = pname; + rev = "v${version}"; + sha256 = "0da2kzyfsn6xv8mlqsv2vv7k8g0c9d2vgqzq8yqk888yljdzcrjp"; + }; + + buildInputs = [ zlib ]; + + installFlags = [ "prefix=$(out)" ]; + + meta = with stdenv.lib; { + description = "An ultrafast memory-efficient short read aligner"; + license = licenses.artistic2; + homepage = "http://bowtie-bio.sf.net/bowtie"; + maintainers = with maintainers; [ prusnak ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/applications/science/biology/bowtie2/default.nix b/pkgs/applications/science/biology/bowtie2/default.nix index dc818e2fb8684..603e5892ff119 100644 --- a/pkgs/applications/science/biology/bowtie2/default.nix +++ b/pkgs/applications/science/biology/bowtie2/default.nix @@ -1,19 +1,19 @@ -{ stdenv, fetchFromGitHub, zlib, tbb, python, perl }: +{ stdenv, fetchFromGitHub, cmake, tbb, zlib }: stdenv.mkDerivation rec { pname = "bowtie2"; - version = "2.3.5.1"; + version = "2.4.2"; src = fetchFromGitHub { owner = "BenLangmead"; repo = pname; rev = "v${version}"; - sha256 = "1l1f0yhjqqvy4lpxfml1xwv7ayimwbpzazvp0281gb4jb5f5mr1a"; + sha256 = "11apzq7l1lk3yxw97g9dfr0gwnvfh58x6apifcblgd66gbip3y1y"; }; - buildInputs = [ zlib tbb python perl ]; + nativeBuildInputs = [ cmake ]; - installFlags = [ "prefix=$(out)" ]; + buildInputs = [ tbb zlib ]; meta = with stdenv.lib; { description = "An ultrafast and memory-efficient tool for aligning sequencing reads to long reference sequences"; @@ -21,6 +21,6 @@ stdenv.mkDerivation rec { homepage = "http://bowtie-bio.sf.net/bowtie2"; maintainers = with maintainers; [ rybern ]; platforms = platforms.all; - broken = stdenv.isAarch64; + broken = stdenv.isAarch64; # only x86 is supported }; } diff --git a/pkgs/applications/science/biology/delly/default.nix b/pkgs/applications/science/biology/delly/default.nix index 6acdc53544c76..8f4dd77452692 100644 --- a/pkgs/applications/science/biology/delly/default.nix +++ b/pkgs/applications/science/biology/delly/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "delly"; - version = "0.8.5"; + version = "0.8.6"; src = fetchFromGitHub { owner = "dellytools"; repo = pname; rev = "v${version}"; - sha256 = "1af1y20hd8x2yvix0gjvx038w7chf4fiyr68ny5yvrx5b2gw0vbq"; + sha256 = "sha256-j9klZ8qq1GQS7+zZ+vHwAwLHBYMBrWfbwqeD8QJeCuk="; }; buildInputs = [ zlib htslib bzip2 lzma ncurses boost ]; diff --git a/pkgs/applications/science/biology/fastp/default.nix b/pkgs/applications/science/biology/fastp/default.nix new file mode 100644 index 0000000000000..c68486dbcd6be --- /dev/null +++ b/pkgs/applications/science/biology/fastp/default.nix @@ -0,0 +1,30 @@ +{ stdenv +, fetchFromGitHub +, zlib +}: + +stdenv.mkDerivation rec { + pname = "fastp"; + version = "0.20.1"; + + src = fetchFromGitHub { + owner = "OpenGene"; + repo = "fastp"; + rev = "v${version}"; + sha256 = "sha256-pANwppkO9pfV9vctB7HmNCzYRtf+Xt+5HMKzvFuvyFM="; + }; + + buildInputs = [ zlib ]; + + installPhase = '' + install -D fastp $out/bin/fastp + ''; + + meta = with stdenv.lib; { + description = "Ultra-fast all-in-one FASTQ preprocessor"; + license = licenses.mit; + homepage = "https://github.com/OpenGene/fastp"; + maintainers = with maintainers; [ jbedo ]; + platforms = platforms.x86_64; + }; +} diff --git a/pkgs/applications/science/biology/last/default.nix b/pkgs/applications/science/biology/last/default.nix index 0976e5a108029..6db7ae55da84a 100644 --- a/pkgs/applications/science/biology/last/default.nix +++ b/pkgs/applications/science/biology/last/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "last"; - version = "1145"; + version = "1170"; src = fetchurl { url = "http://last.cbrc.jp/last-${version}.zip"; - sha256 = "0g54nmxxrirgid1i1k5i6rf7vnjpk9548sy06yqb4fj7vdzqgq99"; + sha256 = "sha256-hBuG6QGXtBrvNrtaZU+i8gxu2ZQw+srFRkbuWoL5JHc="; }; nativeBuildInputs = [ unzip ]; diff --git a/pkgs/applications/science/biology/raxml/default.nix b/pkgs/applications/science/biology/raxml/default.nix index 5c7353af9315c..a77505c1b3f81 100644 --- a/pkgs/applications/science/biology/raxml/default.nix +++ b/pkgs/applications/science/biology/raxml/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { sha256 = "1jqjzhch0rips0vp04prvb8vmc20c5pdmsqn8knadcf91yy859fh"; }; - buildInputs = if mpi then [ pkgs.openmpi ] else []; + buildInputs = stdenv.lib.optionals mpi [ pkgs.openmpi ]; # TODO darwin, AVX and AVX2 makefile targets buildPhase = if mpi then '' diff --git a/pkgs/applications/science/biology/spades/default.nix b/pkgs/applications/science/biology/spades/default.nix index d555f2873a67b..776719579d979 100644 --- a/pkgs/applications/science/biology/spades/default.nix +++ b/pkgs/applications/science/biology/spades/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, zlib, bzip2, cmake }: +{ stdenv, fetchurl, zlib, bzip2, cmake, python3 }: stdenv.mkDerivation rec { pname = "SPAdes"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; - buildInputs = [ zlib bzip2 ]; + buildInputs = [ zlib bzip2 python3 ]; doCheck = true; diff --git a/pkgs/applications/science/biology/varscan/default.nix b/pkgs/applications/science/biology/varscan/default.nix index e97c8f14451f7..2c395650e175d 100644 --- a/pkgs/applications/science/biology/varscan/default.nix +++ b/pkgs/applications/science/biology/varscan/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "varscan"; - version = "2.4.2"; + version = "2.4.4"; src = fetchurl { - url = "https://github.com/dkoboldt/varscan/releases/download/${version}/VarScan.v${version}.jar"; - sha256 = "0cfhshinyqgwc6i7zf8lhbfybyly2x5anrz824zyvdhzz5i69zrl"; + url = "https://github.com/dkoboldt/varscan/raw/master/VarScan.v${version}.jar"; + sha256 = "sha256-+yO3KrZ2+1qJvQIJHCtsmv8hC5a+4E2d7mrvTYtygU0="; }; buildInputs = [ jre makeWrapper ]; diff --git a/pkgs/applications/science/chemistry/openmolcas/default.nix b/pkgs/applications/science/chemistry/openmolcas/default.nix index d432e66a19f1e..317a83371adbd 100644 --- a/pkgs/applications/science/chemistry/openmolcas/default.nix +++ b/pkgs/applications/science/chemistry/openmolcas/default.nix @@ -1,11 +1,9 @@ { stdenv, fetchFromGitLab, cmake, gfortran, perl -, openblas, blas, lapack, hdf5-cpp, python3, texlive +, openblas, hdf5-cpp, python3, texlive , armadillo, openmpi, globalarrays, openssh , makeWrapper, fetchpatch } : -assert blas.implementation == "openblas" && lapack.implementation == "openblas"; - let version = "20.10"; gitLabRev = "v${version}"; @@ -74,7 +72,7 @@ in stdenv.mkDerivation { homepage = "https://gitlab.com/Molcas/OpenMolcas"; maintainers = [ maintainers.markuskowa ]; license = licenses.lgpl21; - platforms = platforms.linux; + platforms = [ "x86_64-linux" ]; }; } diff --git a/pkgs/applications/science/chemistry/quantum-espresso/default.nix b/pkgs/applications/science/chemistry/quantum-espresso/default.nix index 2443e6b23aba7..071091f2ecf20 100644 --- a/pkgs/applications/science/chemistry/quantum-espresso/default.nix +++ b/pkgs/applications/science/chemistry/quantum-espresso/default.nix @@ -4,12 +4,12 @@ }: stdenv.mkDerivation rec { - version = "6.5"; + version = "6.6"; pname = "quantum-espresso"; src = fetchurl { url = "https://gitlab.com/QEF/q-e/-/archive/qe-${version}/q-e-qe-${version}.tar.gz"; - sha256 = "00nnsq1vq579xsmkvwrgs6bdqdcbdlsmcp4yfynnvs40ca52m2r5"; + sha256 = "0b3718bwdqfyssyz25jknijar79qh5cf1bbizv9faliz135mcilj"; }; passthru = { diff --git a/pkgs/applications/science/electronics/diylc/default.nix b/pkgs/applications/science/electronics/diylc/default.nix new file mode 100644 index 0000000000000..28f12ee221462 --- /dev/null +++ b/pkgs/applications/science/electronics/diylc/default.nix @@ -0,0 +1,71 @@ +{ stdenv, fetchurl, makeDesktopItem, unzip, bash, jre8 }: + +let + pname = "diylc"; + version = "4.15.1"; + files = { + app = fetchurl { + url = "https://github.com/bancika/diy-layout-creator/releases/download/v${version}/diylc-${version}.zip"; + sha256 = "09vzbxas654n8npxljqljf930y5gcjfvv3r4dv97dwk5sy66xvaf"; + }; + icon16 = fetchurl { + url = "https://raw.githubusercontent.com/bancika/diy-layout-creator/v${version}/diylc/diylc-core/src/org/diylc/core/images/icon_small.png"; + sha256 = "1is50aidfwzwfzwqv57s2hwhx0r5c21cp77bkl93xkdqkh2wd8x4"; + }; + icon32 = fetchurl { + url = "https://raw.githubusercontent.com/bancika/diy-layout-creator/v${version}/diylc/diylc-core/src/org/diylc/core/images/icon_medium.png"; + sha256 = "0a45p18n84xz1nd3zv3y16jlimvqzhbzg3q3f4lawgx4rcrn2n3d"; + }; + icon48 = fetchurl { + url = "https://raw.githubusercontent.com/bancika/diy-layout-creator/v${version}/diylc/diylc-core/src/org/diylc/core/images/icon_large.png"; + sha256 = "06dkz0dcy8hfmnzr5ri5n1sh8r7mg83kzbvs3zy58wwhgzs1ddk6"; + }; + }; + launcher = makeDesktopItem { + name = "diylc"; + desktopName = "DIY Layout Creator"; + comment = "Multi platform circuit layout and schematic drawing tool"; + exec = "diylc"; + icon = "diylc_icon"; + categories = "Development;Electronics;"; + }; +in +stdenv.mkDerivation rec { + inherit pname version; + + dontUnpack = true; + + buildInputs = [ jre8 ]; + nativeBuildInputs = [ unzip ]; + + installPhase = '' + install -d $out/share/diylc + ${unzip}/bin/unzip -UU ${files.app} -d $out/share/diylc + rm $out/share/diylc/diylc.exe + rm $out/share/diylc/run.sh + + # Nope, the icon cannot be named 'diylc' because KDE does not like it. + install -Dm644 ${files.icon16} $out/share/icons/hicolor/16x16/apps/diylc_icon.png + install -Dm644 ${files.icon32} $out/share/icons/hicolor/32x32/apps/diylc_icon.png + install -Dm644 ${files.icon48} $out/share/icons/hicolor/48x48/apps/diylc_icon.png + + install -d $out/share/applications + ln -s ${launcher}/share/applications/* $out/share/applications/ + + install -d $out/bin + cat <<EOF > $out/bin/diylc + #!${bash}/bin/sh + cd $out/share/diylc + ${jre8}/bin/java -Xms512m -Xmx2048m -Dorg.diylc.scriptRun=true -Dfile.encoding=UTF-8 -cp diylc.jar:lib org.diylc.DIYLCStarter + EOF + chmod +x $out/bin/diylc + ''; + + meta = with stdenv.lib; { + description = "Multi platform circuit layout and schematic drawing tool"; + homepage = "https://bancika.github.io/diy-layout-creator/"; + changelog = "https://github.com/bancika/diy-layout-creator/releases"; + license = licenses.gpl3Plus; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/science/electronics/kicad/update.sh b/pkgs/applications/science/electronics/kicad/update.sh index cfd78323b77a2..099440956ae73 100755 --- a/pkgs/applications/science/electronics/kicad/update.sh +++ b/pkgs/applications/science/electronics/kicad/update.sh @@ -144,7 +144,7 @@ for version in "${all_versions[@]}"; do for lib in "${libs[@]}"; do echo "Checking ${lib}" >&2 url="${gitlab}/libraries/kicad-${lib}.git" - lib_rev="$(${get_rev} "${url}" "${version}" | cut -f1 | head -n1)" + lib_rev="$(${get_rev} "${url}" "${version}" | cut -f1 | tail -n1)" has_rev="$(grep -sm 1 "\"${pname}\"" -A 19 "${file}" | grep -sm 1 "${lib_rev}" || true)" has_hash="$(grep -sm 1 "\"${pname}\"" -A 20 "${file}" | grep -sm 1 "${lib}.sha256" || true)" if [[ -n ${has_rev} && -n ${has_hash} && -z ${clean} ]]; then @@ -173,8 +173,8 @@ printf "}\n" } > "${tmp}" if grep '""' "${tmp}"; then - echo "empty value detected, out of space?" >&2 - exit "1" + echo "empty value detected, out of space?" >&2 + exit "1" fi mv "${tmp}" "${file}" diff --git a/pkgs/applications/science/electronics/kicad/versions.nix b/pkgs/applications/science/electronics/kicad/versions.nix index 9f00f3fa8ba81..8a5e5d8f5f5c7 100644 --- a/pkgs/applications/science/electronics/kicad/versions.nix +++ b/pkgs/applications/science/electronics/kicad/versions.nix @@ -3,19 +3,19 @@ { "kicad" = { kicadVersion = { - version = "5.1.8"; + version = "5.1.9"; src = { - rev = "db9833491010954bc27fac92c83d2864bd95c23c"; - sha256 = "08ni9j2lw2hjc1csk6rkydcxwdal6da17ch60zkjij5vfsif2hix"; + rev = "73d0e3b20dec05c4350efa5b69916eb29a7bfcb5"; + sha256 = "1cqh3bc9y140hbryfk9qavs2y3lj5sm9q0qjxcf4mm472afzckky"; }; }; libVersion = { - version = "5.1.8"; + version = "5.1.9"; libSources = { - i18n.rev = "78adcd19e7ed53f4889d6db65a33dd8ec2d323e9"; - i18n.sha256 = "0x0w2m6d3xfm22y4anp5j2j67iwzby149ynj6qjlw2kcsi8kwk1j"; - symbols.rev = "bf475af94877e8fd9cf80e667578ff61835e02bb"; - symbols.sha256 = "1ii3r813653ng2ycggnknqx4g3ja7dbm4qyxrf9aq48ws0xkvhx3"; + i18n.rev = "04f3231f60d55400cb81564b2cd465a57d5192d5"; + i18n.sha256 = "04jq1dcag6i2ljjfqrib65mn4wg4c4nmi7i946l3bywc0rkqsx1f"; + symbols.rev = "6dec5004b6a2679c19d4857bda2f90c5ab3a5726"; + symbols.sha256 = "0n25rq32jwyigfw26faqraillwv6zbi2ywy26dkz5zqlf5xp56ad"; templates.rev = "1ccbaf3704e8ff4030d0915f71e051af621ef7d7"; templates.sha256 = "1a8xfcbdbb4ylrb5m7n2jjk9kwvgmlx1pmnn2cwj327a2b3m4jjs"; footprints.rev = "302ac78bac21825532f970fb92714fa5973ad79b"; @@ -27,25 +27,25 @@ }; "kicad-unstable" = { kicadVersion = { - version = "2020-12-01"; + version = "2020-12-23"; src = { - rev = "3c521942ed52e83482c82d426170b4fbf327f846"; - sha256 = "sha256:09qab69sy3n44kjlzxxx7gbksyr1kg8n14kz0zf8n71zfcqagci4"; + rev = "912657dd238ad78cfc5d9d5e426ea850d5554fb3"; + sha256 = "1p5kr4d4zpajwdmya1f351y1ix8qmvsx1hrnvhzh7yc3g72kgxah"; }; }; libVersion = { - version = "2020-12-01"; + version = "2020-12-23"; libSources = { i18n.rev = "e89d9a89bec59199c1ade56ee2556591412ab7b0"; - i18n.sha256 = "sha256:04zaqyhj3qr4ymyd3k5vjpcna64j8klpsygcgjcv29s3rdi8glfl"; + i18n.sha256 = "04zaqyhj3qr4ymyd3k5vjpcna64j8klpsygcgjcv29s3rdi8glfl"; symbols.rev = "e538abb015b4f289910a6f26b2f1b9cb8bf2efdb"; - symbols.sha256 = "sha256:117y4cm46anlrnw6y6mdjgl1a5gab6h6m7cwx3q7qb284m9bs5gi"; + symbols.sha256 = "117y4cm46anlrnw6y6mdjgl1a5gab6h6m7cwx3q7qb284m9bs5gi"; templates.rev = "32a4f6fab863976fdcfa232e3e08fdcf3323a954"; - templates.sha256 = "sha256:13r94dghrh9slpj7nkzv0zqv5hk49s6pxm4q5ndqx0y8037ivmhk"; + templates.sha256 = "13r94dghrh9slpj7nkzv0zqv5hk49s6pxm4q5ndqx0y8037ivmhk"; footprints.rev = "15ffd67e01257d4d8134dbd6708cb58977eeccbe"; - footprints.sha256 = "sha256:1ad5k3wh2zqfibrar7pd3g363jk2q51dvraxnq3zlxa2x4znh7mw"; + footprints.sha256 = "1ad5k3wh2zqfibrar7pd3g363jk2q51dvraxnq3zlxa2x4znh7mw"; packages3d.rev = "d8b7e8c56d535f4d7e46373bf24c754a8403da1f"; - packages3d.sha256 = "sha256:0dh8ixg0w43wzj5h3164dz6l1vl4llwxhi3qcdgj1lgvrs28aywd"; + packages3d.sha256 = "0dh8ixg0w43wzj5h3164dz6l1vl4llwxhi3qcdgj1lgvrs28aywd"; }; }; }; diff --git a/pkgs/applications/science/electronics/magic-vlsi/default.nix b/pkgs/applications/science/electronics/magic-vlsi/default.nix index 6667f2be9c3da..d6c9011efa681 100644 --- a/pkgs/applications/science/electronics/magic-vlsi/default.nix +++ b/pkgs/applications/science/electronics/magic-vlsi/default.nix @@ -1,19 +1,37 @@ -{ stdenv, fetchurl -, m4, tcsh, libX11, tcl, tk -, cairo, ncurses, mesa_glu, python3 +{ stdenv +, fetchurl +, python3 +, m4 +, cairo +, libX11 +, mesa_glu +, ncurses +, tcl +, tcsh +, tk }: stdenv.mkDerivation rec { pname = "magic-vlsi"; - version = "8.3.80"; + version = "8.3.109"; src = fetchurl { url = "http://opencircuitdesign.com/magic/archive/magic-${version}.tgz"; - sha256 = "0a5x4sh5xsr79pqbgv6221jc4fvaxkg2pvrdhy1cs4bmsc1sbm9j"; + sha256 = "sha256-ZK4OF5XwjW1OJmOVUFqLklfpM10eIwCILygqIyjRbEQ="; }; - buildInputs = [ m4 tcsh libX11 tcl tk cairo ncurses mesa_glu ]; nativeBuildInputs = [ python3 ]; + buildInputs = [ + cairo + libX11 + m4 + mesa_glu + ncurses + tcl + tcsh + tk + ]; + enableParallelBuilding = true; configureFlags = [ @@ -37,6 +55,6 @@ stdenv.mkDerivation rec { description = "VLSI layout tool written in Tcl"; homepage = "http://opencircuitdesign.com/magic/"; license = licenses.mit; - maintainers = with maintainers; [ anna328p thoughtpolice ]; + maintainers = with maintainers; [ anna328p thoughtpolice AndersonTorres ]; }; } diff --git a/pkgs/applications/science/electronics/nanovna-saver/default.nix b/pkgs/applications/science/electronics/nanovna-saver/default.nix index 62bda91e50082..9f959bddf2d23 100644 --- a/pkgs/applications/science/electronics/nanovna-saver/default.nix +++ b/pkgs/applications/science/electronics/nanovna-saver/default.nix @@ -2,7 +2,7 @@ , qtbase }: let - version = "0.3.7"; + version = "0.3.8"; pname = "nanovna-saver"; in mkDerivationWith python3Packages.buildPythonApplication { @@ -12,7 +12,7 @@ in mkDerivationWith python3Packages.buildPythonApplication { owner = "NanoVNA-Saver"; repo = pname; rev = "v${version}"; - sha256 = "0c22ckyypg91gfb2sdc684msw28nnb6r8cq3b362gafvv00a35mi"; + sha256 = "0z83rwpnbbs1n74mx8dgh1d1crp90mannj9vfy161dmy4wzc5kpv"; }; nativeBuildInputs = [ wrapQtAppsHook ]; diff --git a/pkgs/applications/science/geometry/gama/default.nix b/pkgs/applications/science/geometry/gama/default.nix index fe606125c5527..c5e95d37b5106 100644 --- a/pkgs/applications/science/geometry/gama/default.nix +++ b/pkgs/applications/science/geometry/gama/default.nix @@ -1,16 +1,16 @@ -{ stdenv, fetchurl, lib, expat, octave, libxml2, texinfo }: +{ stdenv, fetchurl, lib, expat, octave, libxml2, texinfo, zip }: stdenv.mkDerivation rec { pname = "gama"; - version = "2.09"; + version = "2.12"; src = fetchurl { url = "mirror://gnu/${pname}/${pname}-${version}.tar.gz"; - sha256 = "0c1b28frl6109arj09v4zr1xs859krn8871mkvis517g5pb55dc9"; + sha256 = "0zfilasalsy29b7viw0iwgnl9bkvp0l87gpxl1hx7379l8agwqyj"; }; buildInputs = [ expat ]; - nativeBuildInputs = [ texinfo ]; + nativeBuildInputs = [ texinfo zip ]; checkInputs = [ octave libxml2 ]; doCheck = true; diff --git a/pkgs/applications/science/logic/coq/default.nix b/pkgs/applications/science/logic/coq/default.nix index dc9e40912d536..2ebe75d3bc508 100644 --- a/pkgs/applications/science/logic/coq/default.nix +++ b/pkgs/applications/science/logic/coq/default.nix @@ -36,6 +36,8 @@ let "8.11.2" = "0f77ccyxdgbf1nrj5fa8qvrk1cyfy06fv8gj9kzfvlcgn0cf48sa"; "8.12.0" = "18dc7k0piv6v064zgdadpw6mkkxk7j663hb3svgj5236fihjr0cz"; "8.12.1" = "1rkcyjjrzcqw9xk93hsq0vvji4f8r5iq0f739mghk60bghkpnb7q"; + "8.12.2" = "18gscfm039pqhq4msq01nraig5dm9ab98bjca94zldf8jvdv0x2n"; + "8.13+beta1" = "1v4a6dpj41flspa4ihcr7m5ahqz10kbn62fmrldmv7gzq6jsyfyq"; }.${version}; coq-version = stdenv.lib.versions.majorMinor version; versionAtLeast = stdenv.lib.versionAtLeast coq-version; @@ -118,7 +120,9 @@ self = stdenv.mkDerivation { then [ ocamlPackages.lablgtk3-sourceview3 glib gnome3.defaultIconTheme wrapGAppsHook ] else [ ocamlPackages.lablgtk ]); - propagatedBuildInputs = stdenv.lib.optional (versionAtLeast "8.12") ocamlPackages.num; + propagatedBuildInputs = + stdenv.lib.optional (versionAtLeast "8.13") ocamlPackages.zarith + ++ stdenv.lib.optional (coq-version == "8.12") ocamlPackages.num; postPatch = '' UNAME=$(type -tp uname) diff --git a/pkgs/applications/science/logic/cryptoverif/default.nix b/pkgs/applications/science/logic/cryptoverif/default.nix index 28295ea28922c..78861786defae 100644 --- a/pkgs/applications/science/logic/cryptoverif/default.nix +++ b/pkgs/applications/science/logic/cryptoverif/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "cryptoverif"; - version = "2.03pl1"; + version = "2.04"; src = fetchurl { url = "http://prosecco.gforge.inria.fr/personal/bblanche/cryptoverif/cryptoverif${version}.tar.gz"; - sha256 = "0q7qa1qm7mbky3m36445gdmgmkb9mrhrdsk7mmwn8fzw0rfc6z00"; + sha256 = "1mzk6n0g2vdsv38y493zg85lxrpz72b92cmsray3g970xzanqd6s"; }; buildInputs = [ ocaml ]; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { ** from under $out/libexec. By default, it expects to find the files ** in $CWD which doesn't work. */ patchPhase = '' - substituteInPlace ./src/settings.ml \ + substituteInPlace ./src/syntax.ml \ --replace \"default\" \"$out/libexec/default\" ''; diff --git a/pkgs/applications/science/logic/lean/default.nix b/pkgs/applications/science/logic/lean/default.nix index 88e1b4fbc0e1d..0684abd5ab313 100644 --- a/pkgs/applications/science/logic/lean/default.nix +++ b/pkgs/applications/science/logic/lean/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "lean"; - version = "3.23.0"; + version = "3.24.0"; src = fetchFromGitHub { owner = "leanprover-community"; repo = "lean"; rev = "v${version}"; - sha256 = "09mklc1p6ms1jayg2f89hqfmhca3h5744lli936l38ypn1d00sxx"; + sha256 = "npzBuZ37KrUYwC0TglryVTqui/3/t1ma1Zjpnty0d7c="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/applications/science/math/bcal/default.nix b/pkgs/applications/science/math/bcal/default.nix index 18b6e051b3f26..5df2d20549c2b 100644 --- a/pkgs/applications/science/math/bcal/default.nix +++ b/pkgs/applications/science/math/bcal/default.nix @@ -1,16 +1,16 @@ -{ stdenv, fetchFromGitHub, python3Packages, readline }: +{ stdenv, fetchFromGitHub, python3Packages, readline, bc }: with stdenv.lib; stdenv.mkDerivation rec { pname = "bcal"; - version = "1.9"; + version = "2.2"; src = fetchFromGitHub { owner = "jarun"; repo = "bcal"; rev = "v${version}"; - sha256 = "0h6qi5rvzl6c6fsfdpdb3l4jcgip03l18i0b1x08z1y89i56y8mm"; + sha256 = "4vR5rcbNkoEdSRNoMH9qMHP3iWFxejkVfXNiYfwbo/A="; }; nativeBuildInputs = [ python3Packages.pytest ]; @@ -18,6 +18,7 @@ stdenv.mkDerivation rec { buildInputs = [ readline ]; doCheck = true; + checkInputs = [ bc ]; checkPhase = '' python3 -m pytest test.py ''; @@ -27,7 +28,7 @@ stdenv.mkDerivation rec { meta = { description = "Storage conversion and expression calculator"; homepage = "https://github.com/jarun/bcal"; - license = licenses.gpl3; + license = licenses.gpl3Only; platforms = [ "aarch64-linux" "x86_64-darwin" "x86_64-linux" ]; maintainers = with maintainers; [ jfrankenau ]; }; diff --git a/pkgs/applications/science/math/geogebra/default.nix b/pkgs/applications/science/math/geogebra/default.nix index a6950ad3451ca..a0548ffb232b3 100644 --- a/pkgs/applications/science/math/geogebra/default.nix +++ b/pkgs/applications/science/math/geogebra/default.nix @@ -27,7 +27,7 @@ let calculus in one easy-to-use package. ''; homepage = "https://www.geogebra.org/"; - maintainers = with maintainers; [ ma27 ]; + maintainers = with maintainers; [ ]; license = with licenses; [ gpl3 cc-by-nc-sa-30 geogebra ]; platforms = with platforms; linux ++ darwin; hydraPlatforms = []; diff --git a/pkgs/applications/science/math/giac/default.nix b/pkgs/applications/science/math/giac/default.nix index ea9c921f19e12..b090274919bd4 100644 --- a/pkgs/applications/science/math/giac/default.nix +++ b/pkgs/applications/science/math/giac/default.nix @@ -9,11 +9,11 @@ assert (!blas.isILP64) && (!lapack.isILP64); stdenv.mkDerivation rec { pname = "giac${lib.optionalString enableGUI "-with-xcas"}"; - version = "1.5.0-21"; # TODO try to remove preCheck phase on upgrade + version = "1.5.0-87"; # TODO try to remove preCheck phase on upgrade src = fetchurl { url = "https://www-fourier.ujf-grenoble.fr/~parisse/debian/dists/stable/main/source/giac_${version}.tar.gz"; - sha256 = "1b9khiv0mk2xzw1rblm2jy6qsf8y6f9k7qy15sxpb21d72hzzbl2"; + sha256 = "1d0h1yb7qvh9x7wwv9yrzmcp712f49w1iljkxp4y6g9pzsmg1mmv"; }; patches = stdenv.lib.optionals (!enableGUI) [ diff --git a/pkgs/applications/science/math/mathematica/default.nix b/pkgs/applications/science/math/mathematica/default.nix index d04a89bd8842d..ea9a9c1b7554d 100644 --- a/pkgs/applications/science/math/mathematica/default.nix +++ b/pkgs/applications/science/math/mathematica/default.nix @@ -12,7 +12,7 @@ , glib , libssh2 , ncurses -, opencv2 +, opencv4 , openssl , unixODBC , xkeyboard_config @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { glib libssh2 ncurses - opencv2 + opencv4 openssl stdenv.cc.cc.lib unixODBC diff --git a/pkgs/applications/science/math/mathematica/l10ns.nix b/pkgs/applications/science/math/mathematica/l10ns.nix index 8ec6ac5048d55..896983ce1563d 100644 --- a/pkgs/applications/science/math/mathematica/l10ns.nix +++ b/pkgs/applications/science/math/mathematica/l10ns.nix @@ -8,22 +8,10 @@ let allVersions = with lib; flip map # N.B. Versions in this list should be ordered from newest to oldest. [ { - version = "12.1.1"; + version = "12.2.0"; lang = "en"; language = "English"; - sha256 = "02mk8gmv8idnakva1nc7r7mx8ld02lk7jgsj1zbn962aps3bhixd"; - } - { - version = "12.1.0"; - lang = "en"; - language = "English"; - sha256 = "15m9l20jvkxh5w6mbp81ys7mx2lx5j8acw5gz0il89lklclgb8z7"; - } - { - version = "12.0.0"; - lang = "en"; - language = "English"; - sha256 = "b9fb71e1afcc1d72c200196ffa434512d208fa2920e207878433f504e58ae9d7"; + sha256 = "3b6676a203c6adb7e9c418a5484b037974287b5be09c64e7dfea74ddc0e400d7"; } { version = "11.3.0"; diff --git a/pkgs/applications/science/math/maxima/default.nix b/pkgs/applications/science/math/maxima/default.nix index 1bf7d16f29048..cdc81a8764656 100644 --- a/pkgs/applications/science/math/maxima/default.nix +++ b/pkgs/applications/science/math/maxima/default.nix @@ -87,6 +87,10 @@ stdenv.mkDerivation ({ enableParallelBuilding = true; + passthru = { + ecl = ecl; + }; + meta = { description = "Computer algebra system"; homepage = "http://maxima.sourceforge.net"; diff --git a/pkgs/applications/science/math/nauty/default.nix b/pkgs/applications/science/math/nauty/default.nix index 76e7c796a1388..94b7ad266c454 100644 --- a/pkgs/applications/science/math/nauty/default.nix +++ b/pkgs/applications/science/math/nauty/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { version = "27r1"; src = fetchurl { url = "http://pallini.di.uniroma1.it/nauty${version}.tar.gz"; - sha256 = "1nym0p2djws8ylkpr0kgpxfa6fxdlh46cmvz0gn5vd02jzgs0aww"; + sha256 = "0xsfqfcknbd6g6wzpa5l7crmmk3bf3zjh37rhylq6b20dqcmvjkn"; }; outputs = [ "out" "dev" ]; configureFlags = [ diff --git a/pkgs/applications/science/math/pari/default.nix b/pkgs/applications/science/math/pari/default.nix index a3e2f99ab274c..7ec42d11ab14d 100644 --- a/pkgs/applications/science/math/pari/default.nix +++ b/pkgs/applications/science/math/pari/default.nix @@ -15,7 +15,8 @@ stdenv.mkDerivation rec { version = "2.11.4"; src = fetchurl { - url = "https://pari.math.u-bordeaux.fr/pub/pari/unix/${pname}-${version}.tar.gz"; + # Versions with current majorMinor values are at http://pari.math.u-bordeaux.fr/pub/pari/unix/${pname}-${version}.tar.gz + url = "https://pari.math.u-bordeaux.fr/pub/pari/OLD/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.gz"; sha256 = "sha256-v8iPxPc1L0hA5uNSxy8DacvqikVAOxg0piafNwmXCxw="; }; diff --git a/pkgs/applications/science/math/pynac/default.nix b/pkgs/applications/science/math/pynac/default.nix index 87fb205174bfd..e3474d865e2de 100644 --- a/pkgs/applications/science/math/pynac/default.nix +++ b/pkgs/applications/science/math/pynac/default.nix @@ -1,5 +1,6 @@ { stdenv , fetchFromGitHub +, fetchurl , autoreconfHook , pkgconfig , flint @@ -33,6 +34,14 @@ stdenv.mkDerivation rec { pkgconfig ]; + patches = [ + (fetchurl { + name = "py_ssize_t_clean.patch"; + url = "https://git.sagemath.org/sage.git/plain/build/pkgs/pynac/patches/py_ssize_t_clean.patch?h=9.2"; + sha256 = "0l3gbg9hc4v671zf4w376krnk3wh8hj3649610nlvzzxckcryzab"; + }) + ]; + meta = with stdenv.lib; { description = "Python is Not a CAS -- modified version of Ginac"; longDescription = '' diff --git a/pkgs/applications/science/math/qalculate-gtk/default.nix b/pkgs/applications/science/math/qalculate-gtk/default.nix index 09ead07dc09d6..ba7ac5505e4e6 100644 --- a/pkgs/applications/science/math/qalculate-gtk/default.nix +++ b/pkgs/applications/science/math/qalculate-gtk/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "qalculate-gtk"; - version = "3.15.0"; + version = "3.16.0"; src = fetchFromGitHub { owner = "qalculate"; repo = "qalculate-gtk"; rev = "v${version}"; - sha256 = "1w0r9vv1h3zbfdvk8965g5plfkz5clf81riil5b394ms9vsw0bx5"; + sha256 = "1vqzrh5zxwfvih6c3lak0wkkw6bajl88xzl1zk84gxsk9wdymrk4"; }; hardeningDisable = [ "format" ]; diff --git a/pkgs/applications/science/math/sage/default.nix b/pkgs/applications/science/math/sage/default.nix index caf51c3da2517..416f2b957b7b3 100644 --- a/pkgs/applications/science/math/sage/default.nix +++ b/pkgs/applications/science/math/sage/default.nix @@ -9,31 +9,13 @@ let inherit (pkgs) symlinkJoin callPackage nodePackages; - # https://trac.sagemath.org/ticket/15980 for tracking of python3 support - python = pkgs.python2.override { + python3 = pkgs.python3.override { packageOverrides = self: super: { - # python packages that appear unmaintained and were not accepted into the nixpkgs - # tree because of that. These packages are only dependencies of the more-or-less - # deprecated sagenb. However sagenb is still a default dependency and the doctests - # depend on it. - # See https://github.com/NixOS/nixpkgs/pull/38787 for a discussion. - # The dependency on the sage notebook (and therefore these packages) will be - # removed in the future: - # https://trac.sagemath.org/ticket/25837 - flask-oldsessions = self.callPackage ./flask-oldsessions.nix {}; - flask-openid = self.callPackage ./flask-openid.nix {}; - python-openid = self.callPackage ./python-openid.nix {}; - sagenb = self.callPackage ./sagenb.nix { - mathjax = nodePackages.mathjax; - }; - - # Package with a cyclic dependency with sage - pybrial = self.callPackage ./pybrial.nix {}; - # `sagelib`, i.e. all of sage except some wrappers and runtime dependencies sagelib = self.callPackage ./sagelib.nix { - inherit flint ecl arb; + inherit flint arb; inherit sage-src env-locations pynac singular; + ecl = maxima-ecl.ecl; linbox = pkgs.linbox.override { withSage = true; }; pkg-config = pkgs.pkgconfig; # not to confuse with pythonPackages.pkgconfig }; @@ -59,9 +41,10 @@ let # A bash script setting various environment variables to tell sage where # the files its looking fore are located. Also see `sage-env`. env-locations = callPackage ./env-locations.nix { - inherit pari_data ecl; + inherit pari_data; inherit singular maxima-ecl; - cysignals = python.pkgs.cysignals; + ecl = maxima-ecl.ecl; + cysignals = python3.pkgs.cysignals; three = nodePackages.three; mathjax = nodePackages.mathjax; }; @@ -69,21 +52,22 @@ let # The shell file that gets sourced on every sage start. Will also source # the env-locations file. sage-env = callPackage ./sage-env.nix { - sagelib = python.pkgs.sagelib; + sagelib = python3.pkgs.sagelib; inherit env-locations; - inherit python ecl singular palp flint pynac pythonEnv maxima-ecl; + inherit python3 singular palp flint pynac pythonEnv maxima-ecl; + ecl = maxima-ecl.ecl; pkg-config = pkgs.pkgconfig; # not to confuse with pythonPackages.pkgconfig }; # The documentation for sage, building it takes a lot of ram. sagedoc = callPackage ./sagedoc.nix { inherit sage-with-env; - inherit python maxima-ecl; + inherit python3 maxima-ecl; }; # sagelib with added wrappers and a dependency on sage-tests to make sure thet tests were run. sage-with-env = callPackage ./sage-with-env.nix { - inherit pythonEnv; + inherit python3 pythonEnv; inherit sage-env; inherit pynac singular maxima-ecl; pkg-config = pkgs.pkgconfig; # not to confuse with pythonPackages.pkgconfig @@ -100,10 +84,8 @@ let sage-src = callPackage ./sage-src.nix {}; - pythonRuntimeDeps = with python.pkgs; [ + pythonRuntimeDeps = with python3.pkgs; [ sagelib - pybrial - sagenb cvxopt networkx service-identity @@ -116,11 +98,10 @@ let ipywidgets rpy2 sphinx - typing pillow ]; - pythonEnv = python.buildEnv.override { + pythonEnv = python3.buildEnv.override { extraLibs = pythonRuntimeDeps; ignoreCollisions = true; } // { extraLibs = pythonRuntimeDeps; }; # make the libs accessible @@ -129,8 +110,21 @@ let singular = pkgs.singular.override { inherit flint; }; - # https://trac.sagemath.org/ticket/26625 - maxima-ecl = pkgs.maxima-ecl; + maxima-ecl = pkgs.maxima-ecl.override { + ecl = pkgs.ecl.override { + # "echo syntax error | ecl > /dev/full 2>&1" segfaults in + # ECL. We apply a patch to fix it (write_error.patch), but it + # only works if threads are disabled. sage 9.2 tests this + # (src/sage/interfaces/tests.py) and ships ecl like so. + # https://gitlab.com/embeddable-common-lisp/ecl/-/merge_requests/1#note_1657275 + threadSupport = false; + + # if we don't use the system boehmgc, sending a SIGINT to ecl + # can segfault if we it happens during memory allocation. + # src/sage/libs/ecl.pyx would intermittently fail in this case. + useBoehmgc = true; + }; + }; # *not* to confuse with the python package "pynac" pynac = pkgs.pynac.override { inherit singular flint; }; @@ -161,9 +155,6 @@ let pari-seadata-small ]; }; - - # https://trac.sagemath.org/ticket/22191 - ecl = pkgs.ecl_16_1_2; in # A wrapper around sage that makes sure sage finds its docs (if they were build). callPackage ./sage.nix { diff --git a/pkgs/applications/science/math/sage/env-locations.nix b/pkgs/applications/science/math/sage/env-locations.nix index bda2d23b9e52b..b1ad0aad9c761 100644 --- a/pkgs/applications/science/math/sage/env-locations.nix +++ b/pkgs/applications/science/math/sage/env-locations.nix @@ -44,6 +44,6 @@ writeTextFile rec { export JSMOL_DIR="${jmol}/share/jsmol" export MATHJAX_DIR="${mathjax}/lib/node_modules/mathjax" export THREEJS_DIR="${three}/lib/node_modules/three" - export SAGE_INCLUDE_DIRECTORIES="${cysignals}/lib/python2.7/site-packages" + export SAGE_INCLUDE_DIRECTORIES="${cysignals}/${cysignals.pythonModule.sitePackages}" ''; } diff --git a/pkgs/applications/science/math/sage/flask-oldsessions.nix b/pkgs/applications/science/math/sage/flask-oldsessions.nix deleted file mode 100644 index 86fe9912c19eb..0000000000000 --- a/pkgs/applications/science/math/sage/flask-oldsessions.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ stdenv -, buildPythonPackage -, fetchFromGitHub -, python -, flask -}: - -buildPythonPackage rec { - pname = "Flask-OldSessions"; - version = "0.10"; - - # no artifact on pypi: https://github.com/mitsuhiko/flask-oldsessions/issues/1 - src = fetchFromGitHub { - owner = "mitsuhiko"; - repo = "flask-oldsessions"; - rev = version; - sha256 = "04b5m8njjiwld9a0zw55iqwvyjgwcpdbhz1cic8nyhgcmypbicqn"; - }; - - propagatedBuildInputs = [ - flask - ]; - - # missing module flask.testsuite, probably assumes an old version of flask - doCheck = false; - checkPhase = '' - ${python.interpreter} run-tests.py - ''; - - meta = with stdenv.lib; { - description = "Provides a session class that works like the one in Flask before 0.10."; - license = licenses.bsd2; - maintainers = teams.sage.members; - homepage = "https://github.com/mitsuhiko/flask-oldsessions"; - }; -} diff --git a/pkgs/applications/science/math/sage/flask-openid.nix b/pkgs/applications/science/math/sage/flask-openid.nix deleted file mode 100644 index 900b033429ef4..0000000000000 --- a/pkgs/applications/science/math/sage/flask-openid.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ stdenv -, buildPythonPackage -, fetchPypi -, flask -, python-openid -}: - -buildPythonPackage rec { - pname = "Flask-OpenID"; - version = "1.2.5"; - - src = fetchPypi { - inherit pname version; - sha256 = "1aycwmwi7ilcaa5ab8hm0bp6323zl8z25q9ha0gwrl8aihfgx3ss"; - }; - - propagatedBuildInputs = [ - flask - python-openid - ]; - - meta = with stdenv.lib; { - description = "Adds openid support to flask applications"; - license = licenses.bsd2; - maintainers = teams.sage.members; - homepage = "https://pythonhosted.org/Flask-OpenID/"; - }; -} diff --git a/pkgs/applications/science/math/sage/patches/Only-test-py2-py3-optional-tests-when-all-of-sage-is.patch b/pkgs/applications/science/math/sage/patches/Only-test-py2-py3-optional-tests-when-all-of-sage-is.patch index 8cd80281d0e43..d5c19a54fd96d 100644 --- a/pkgs/applications/science/math/sage/patches/Only-test-py2-py3-optional-tests-when-all-of-sage-is.patch +++ b/pkgs/applications/science/math/sage/patches/Only-test-py2-py3-optional-tests-when-all-of-sage-is.patch @@ -1,17 +1,17 @@ -From 8218bd4fdeb4c92de8af0d3aabec55980fc4fb3d Mon Sep 17 00:00:00 2001 +From f5ea42a7aaed7611fb55b65897b9fcf2b7bcf97e Mon Sep 17 00:00:00 2001 From: Timo Kaufmann <timokau@zoho.com> Date: Sun, 21 Oct 2018 17:52:40 +0200 Subject: [PATCH] Only test py2/py3 optional tests when all of sage is tested --- - src/sage/doctest/control.py | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) + src/sage/doctest/control.py | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/sage/doctest/control.py b/src/sage/doctest/control.py -index bf18df8b2b..935c67abf7 100644 +index 2d93841e50..6d156e29a1 100644 --- a/src/sage/doctest/control.py +++ b/src/sage/doctest/control.py -@@ -362,7 +362,8 @@ class DocTestController(SageObject): +@@ -375,7 +375,8 @@ class DocTestController(SageObject): if not optionaltag_regex.search(o): raise ValueError('invalid optional tag {!r}'.format(o)) @@ -21,15 +21,6 @@ index bf18df8b2b..935c67abf7 100644 self.options = options -@@ -765,7 +766,7 @@ class DocTestController(SageObject): - sage: DC = DocTestController(DD, [dirname]) - sage: DC.expand_files_into_sources() - sage: sorted(DC.sources[0].options.optional) # abs tol 1 -- ['guava', 'magma', 'py2'] -+ ['guava', 'magma'] - - We check that files are skipped appropriately:: - -- -2.18.1 +2.28.0 diff --git a/pkgs/applications/science/math/sage/patches/do-not-test-find-library.patch b/pkgs/applications/science/math/sage/patches/do-not-test-find-library.patch index 3f844e1b1ef59..9817592023866 100644 --- a/pkgs/applications/science/math/sage/patches/do-not-test-find-library.patch +++ b/pkgs/applications/science/math/sage/patches/do-not-test-find-library.patch @@ -1,17 +1,17 @@ diff --git a/src/sage/env.py b/src/sage/env.py -index 061b94f3f1..67cd091540 100644 +index 1ddfc7cfb9..45033d6328 100644 --- a/src/sage/env.py +++ b/src/sage/env.py -@@ -189,88 +189,13 @@ var('MAXIMA_FAS') +@@ -203,97 +203,13 @@ var('ARB_LIBRARY', 'arb') var('SAGE_BANNER', '') var('SAGE_IMPORTALL', 'yes') - -def _get_shared_lib_filename(libname, *additional_libnames): - """ -- Return the full path to a shared library file installed in the standard -- location for the system within the ``LIBDIR`` prefix (or -- ``$SAGE_LOCAL/lib`` in the case of manual build of Sage). +- Return the full path to a shared library file installed in +- ``$SAGE_LOCAL/lib`` or the directories associated with the +- Python sysconfig. - - This can also be passed more than one library name (e.g. for cases where - some library may have multiple names depending on the platform) in which @@ -25,7 +25,7 @@ index 061b94f3f1..67cd091540 100644 - For distributions like Debian that use a multiarch layout, we also try the - multiarch lib paths (i.e. ``/usr/lib/<arch>/``). - -- Returns ``None`` if the file does not exist. +- This returns ``None`` if the file does not exist. - - EXAMPLES:: - @@ -48,11 +48,17 @@ index 061b94f3f1..67cd091540 100644 - - for libname in (libname,) + additional_libnames: - if sys.platform == 'cygwin': -- bindir = sysconfig.get_config_var('BINDIR') +- # Later down we take the last matching DLL found, so search +- # SAGE_LOCAL second so that it takes precedence +- bindirs = [ +- sysconfig.get_config_var('BINDIR'), +- os.path.join(SAGE_LOCAL, 'bin') +- ] - pats = ['cyg{}.dll'.format(libname), 'cyg{}-*.dll'.format(libname)] - filenames = [] -- for pat in pats: -- filenames += glob.glob(os.path.join(bindir, pat)) +- for bindir in bindirs: +- for pat in pats: +- filenames += glob.glob(os.path.join(bindir, pat)) - - # Note: This is not very robust, since if there are multi DLL - # versions for the same library this just selects one more or less @@ -66,10 +72,13 @@ index 061b94f3f1..67cd091540 100644 - else: - ext = 'so' - -- libdirs = [sysconfig.get_config_var('LIBDIR')] +- libdirs = [ +- os.path.join(SAGE_LOCAL, 'lib'), +- sysconfig.get_config_var('LIBDIR') +- ] - multilib = sysconfig.get_config_var('MULTILIB') - if multilib: -- libdirs.insert(0, os.path.join(libdirs[0], multilib)) +- libdirs.insert(1, os.path.join(libdirs[0], multilib)) - - for libdir in libdirs: - basename = 'lib{}.{}'.format(libname, ext) @@ -89,7 +98,7 @@ index 061b94f3f1..67cd091540 100644 # locate libgap shared object -GAP_SO= _get_shared_lib_filename('gap','') -+GAP_SO= '/default' ++GAP_SO = '/default' var('GAP_SO', GAP_SO) # post process diff --git a/pkgs/applications/science/math/sage/patches/docutils-0.15.patch b/pkgs/applications/science/math/sage/patches/docutils-0.15.patch deleted file mode 100644 index 63f5d2e146dd4..0000000000000 --- a/pkgs/applications/science/math/sage/patches/docutils-0.15.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff --git a/src/sage/misc/sphinxify.py b/src/sage/misc/sphinxify.py -index 4849c2bffa..76b7bc8602 100644 ---- a/src/sage/misc/sphinxify.py -+++ b/src/sage/misc/sphinxify.py -@@ -25,6 +25,7 @@ from __future__ import absolute_import, print_function - import os - import re - import shutil -+import warnings - from tempfile import mkdtemp - from sphinx.application import Sphinx - -@@ -120,7 +121,10 @@ smart_quotes = no""") - # buildername, confoverrides, status, warning, freshenv). - sphinx_app = Sphinx(srcdir, confdir, outdir, doctreedir, format, - confoverrides, None, None, True) -- sphinx_app.build(None, [rst_name]) -+ with warnings.catch_warnings(): -+ # Quick and dirty workaround for https://trac.sagemath.org/ticket/28856#comment:19 -+ warnings.simplefilter("ignore") -+ sphinx_app.build(None, [rst_name]) - sys.path = old_sys_path - - # We need to remove "_" from __builtin__ that the gettext module installs diff --git a/pkgs/applications/science/math/sage/patches/ignore-cmp-deprecation.patch b/pkgs/applications/science/math/sage/patches/ignore-cmp-deprecation.patch index 11ca74819615b..a91ee319b8f0b 100644 --- a/pkgs/applications/science/math/sage/patches/ignore-cmp-deprecation.patch +++ b/pkgs/applications/science/math/sage/patches/ignore-cmp-deprecation.patch @@ -1,24 +1,24 @@ diff --git a/src/sage/tests/cmdline.py b/src/sage/tests/cmdline.py -index bd6b76ab82..ccf1203dec 100644 +index 6e034dcb5a..8ec60ec72b 100644 --- a/src/sage/tests/cmdline.py +++ b/src/sage/tests/cmdline.py -@@ -837,8 +837,6 @@ def test_executable(args, input="", timeout=100.0, **kwds): +@@ -660,8 +660,8 @@ def test_executable(args, input="", timeout=100.0, pydebug_ignore_warnings=False + sage: with open(input, 'w') as F: + ....: _ = F.write(s) + sage: L = ["sage", "--rst2ipynb", input, output] +- sage: test_executable(L) # optional - rst2ipynb +- ('', '', 0) ++ sage: test_executable(L)[2] # optional - rst2ipynb ++ 0 + sage: import json # optional - rst2ipynb + sage: d = json.load(open(output,'r')) # optional - rst2ipynb + sage: type(d) # optional - rst2ipynb +@@ -757,8 +757,6 @@ def test_executable(args, input="", timeout=100.0, pydebug_ignore_warnings=False /// 4 }}} -- sage: err # py2 +- sage: err # py2 # optional -- sagenb - '' - sage: ret + sage: ret # py2 # optional -- sagenb 0 -@@ -871,8 +869,8 @@ def test_executable(args, input="", timeout=100.0, **kwds): - sage: output = tmp_filename(ext='.sws') - sage: with open(input, 'w') as F: - ....: _ = F.write(s) -- sage: test_executable(["sage", "--rst2sws", input, output]) # py2 -- ('', '', 0) -+ sage: test_executable(["sage", "--rst2sws", input, output])[2] # py2 -+ 0 - sage: import tarfile # py2 - sage: f = tarfile.open(output, 'r') # py2 - sage: print(f.extractfile('sage_worksheet/worksheet.html').read()) # py2 diff --git a/pkgs/applications/science/math/sage/patches/ignore-werkzeug-immutable-dict-deprecation.patch b/pkgs/applications/science/math/sage/patches/ignore-werkzeug-immutable-dict-deprecation.patch deleted file mode 100644 index c5f95b498d536..0000000000000 --- a/pkgs/applications/science/math/sage/patches/ignore-werkzeug-immutable-dict-deprecation.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/src/sage/all.py b/src/sage/all.py -index c87c9372e9..862fca4fcc 100644 ---- a/src/sage/all.py -+++ b/src/sage/all.py -@@ -306,6 +306,7 @@ warnings.filters.remove(('ignore', None, DeprecationWarning, None, 0)) - # Ignore all deprecations from IPython etc. - warnings.filterwarnings('ignore', category=DeprecationWarning, - module='.*(IPython|ipykernel|jupyter_client|jupyter_core|nbformat|notebook|ipywidgets|storemagic)') -+warnings.filterwarnings('ignore', category=DeprecationWarning, message=r".*The import 'werkzeug.ImmutableDict' is deprecated") - # Ignore collections.abc warnings, there are a lot of them but they are - # harmless. - warnings.filterwarnings('ignore', category=DeprecationWarning, diff --git a/pkgs/applications/science/math/sage/patches/pari-stackwarn.patch b/pkgs/applications/science/math/sage/patches/pari-stackwarn.patch deleted file mode 100644 index 49cdfd189b92a..0000000000000 --- a/pkgs/applications/science/math/sage/patches/pari-stackwarn.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff --git a/src/sage/doctest/parsing.py b/src/sage/doctest/parsing.py -index 6bdc9a0..31fc780 100644 ---- a/src/sage/doctest/parsing.py -+++ b/src/sage/doctest/parsing.py -@@ -40,6 +40,7 @@ from .external import available_software - - float_regex = re.compile('\s*([+-]?\s*((\d*\.?\d+)|(\d+\.?))([eE][+-]?\d+)?)') - optional_regex = re.compile(r'(py2|py3|long time|not implemented|not tested|known bug)|([^ a-z]\s*optional\s*[:-]*((\s|\w)*))') -+pari_stack_warning_regex = re.compile(r'\s*\*\*\*.*(Warning: increasing stack size to )\d+\.') - find_sage_prompt = re.compile(r"^(\s*)sage: ", re.M) - find_sage_continuation = re.compile(r"^(\s*)\.\.\.\.:", re.M) - random_marker = re.compile('.*random', re.I) -@@ -935,6 +936,7 @@ class SageOutputChecker(doctest.OutputChecker): - <type 'float'> - """ - got = self.human_readable_escape_sequences(got) -+ got = pari_stack_warning_regex.sub('', got) - if isinstance(want, MarkedOutput): - if want.random: - return True diff --git a/pkgs/applications/science/math/sage/patches/pillow-update.patch b/pkgs/applications/science/math/sage/patches/pillow-update.patch new file mode 100644 index 0000000000000..19d615522626d --- /dev/null +++ b/pkgs/applications/science/math/sage/patches/pillow-update.patch @@ -0,0 +1,39 @@ +diff --git a/src/sage/repl/image.py b/src/sage/repl/image.py +index d7d00b0..cd1607a 100644 +--- a/src/sage/repl/image.py ++++ b/src/sage/repl/image.py +@@ -77,7 +77,7 @@ class Image(SageObject): + + - ``size`` -- 2-tuple, containing (width, height) in pixels. + +- - ``color`` -- string or tuple of numeric. What colour to use ++ - ``color`` -- string, numeric or tuple of numeric. What colour to use + for the image. Default is black. If given, this should be a + a tuple with one value per band. When creating RGB images, + you can also use colour strings as supported by the +@@ -91,9 +91,15 @@ class Image(SageObject): + EXAMPLES:: + + sage: from sage.repl.image import Image +- sage: Image('P', (16, 16), (13,)) ++ sage: Image('P', (16, 16), 13) + 16x16px 8-bit Color image + """ ++ # pillow does not support Sage integers as color ++ from sage.rings.integer import Integer ++ if isinstance(color, Integer): ++ color = int(color) ++ elif isinstance(color, tuple): ++ color = tuple(int(i) if isinstance(i, Integer) else i for i in color) + self._pil = PIL.Image.new(mode, size, color) + + @property +@@ -233,7 +239,7 @@ class Image(SageObject): + EXAMPLES:: + + sage: from sage.repl.image import Image +- sage: img = Image('P', (12, 34), (13,)) ++ sage: img = Image('P', (12, 34), 13) + sage: filename = tmp_filename(ext='.png') + sage: img.save(filename) + sage: with open(filename, 'rb') as f: diff --git a/pkgs/applications/science/math/sage/patches/python-5755-hotpatch.patch b/pkgs/applications/science/math/sage/patches/python-5755-hotpatch.patch deleted file mode 100644 index 1b64f39fe60f9..0000000000000 --- a/pkgs/applications/science/math/sage/patches/python-5755-hotpatch.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff --git a/src/sage/all.py b/src/sage/all.py -index ca309ef..be3186b 100644 ---- a/src/sage/all.py -+++ b/src/sage/all.py -@@ -298,6 +298,23 @@ warnings.filterwarnings('ignore', module='matplotlib[.]font_manager') - warnings.filterwarnings('default', - '[\s\S]*See http://trac.sagemath.org/[0-9]* for details.') - -+# Hotpatch around https://bugs.python.org/issue5755 which won't be fixed for -+# python 2.7. Idea by https://stackoverflow.com/a/36293331. -+from distutils.command.build_ext import build_ext -+from distutils.sysconfig import customize_compiler -+ -+_build_extensions = build_ext.build_extensions -+ -+def build_extensions_patched(self): -+ customize_compiler(self.compiler) -+ try: -+ self.compiler.compiler_so.remove("-Wstrict-prototypes") -+ except (AttributeError, ValueError): -+ pass -+ _build_extensions(self) -+ -+build_ext.build_extensions = build_extensions_patched -+ - - # Set a new random number seed as the very last thing - # (so that printing initial_seed() and using that seed diff --git a/pkgs/applications/science/math/sage/patches/register-pretty-printer-earlier.patch b/pkgs/applications/science/math/sage/patches/register-pretty-printer-earlier.patch new file mode 100644 index 0000000000000..83bd83a6d33bd --- /dev/null +++ b/pkgs/applications/science/math/sage/patches/register-pretty-printer-earlier.patch @@ -0,0 +1,36 @@ +diff --git a/src/sage/doctest/forker.py b/src/sage/doctest/forker.py +index cb3667659e..867f547d71 100644 +--- a/src/sage/doctest/forker.py ++++ b/src/sage/doctest/forker.py +@@ -200,6 +200,15 @@ def init_sage(controller=None): + from sage.cpython._py2_random import Random + sage.misc.randstate.DEFAULT_PYTHON_RANDOM = Random + ++ # IPython's pretty printer sorts the repr of dicts by their keys by default ++ # (or their keys' str() if they are not otherwise orderable). However, it ++ # disables this for CPython 3.6+ opting to instead display dicts' "natural" ++ # insertion order, which is preserved in those versions). ++ # However, this order is random in some instances. ++ # Also modifications of code may affect the order. ++ # So here we fore sorted dict printing. ++ IPython.lib.pretty.for_type(dict, _sorted_dict_pprinter_factory('{', '}')) ++ + if controller is None: + import sage.repl.ipython_kernel.all_jupyter + else: +@@ -222,15 +231,6 @@ def init_sage(controller=None): + from sage.repl.rich_output.backend_doctest import BackendDoctest + dm.switch_backend(BackendDoctest()) + +- # IPython's pretty printer sorts the repr of dicts by their keys by default +- # (or their keys' str() if they are not otherwise orderable). However, it +- # disables this for CPython 3.6+ opting to instead display dicts' "natural" +- # insertion order, which is preserved in those versions). +- # However, this order is random in some instances. +- # Also modifications of code may affect the order. +- # So here we fore sorted dict printing. +- IPython.lib.pretty.for_type(dict, _sorted_dict_pprinter_factory('{', '}')) +- + # Switch on extra debugging + from sage.structure.debug_options import debug + debug.refine_category_hash_check = True diff --git a/pkgs/applications/science/math/sage/patches/sagenb-cmp-deprecation.patch b/pkgs/applications/science/math/sage/patches/sagenb-cmp-deprecation.patch deleted file mode 100644 index 9f502a6695173..0000000000000 --- a/pkgs/applications/science/math/sage/patches/sagenb-cmp-deprecation.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/sagenb/__init__.py b/sagenb/__init__.py -index 4db0d2cb..2fc5f01e 100644 ---- a/sagenb/__init__.py -+++ b/sagenb/__init__.py -@@ -1,3 +1,8 @@ - # -*- coding: utf-8 -* - # init -+import warnings - from . import storage -+ -+# deprecation in attrs, needs to be fixed in twisted -+warnings.filterwarnings('ignore', category=DeprecationWarning, -+ message=r'The usage of `cmp` is deprecated and will be removed.*') diff --git a/pkgs/applications/science/math/sage/patches/sagespawn-implicit-casting.patch b/pkgs/applications/science/math/sage/patches/sagespawn-implicit-casting.patch new file mode 100644 index 0000000000000..2ee5db3e29c0b --- /dev/null +++ b/pkgs/applications/science/math/sage/patches/sagespawn-implicit-casting.patch @@ -0,0 +1,13 @@ +diff --git a/src/sage/interfaces/sagespawn.pyx b/src/sage/interfaces/sagespawn.pyx +index 9041238f1d..469befbc66 100644 +--- a/src/sage/interfaces/sagespawn.pyx ++++ b/src/sage/interfaces/sagespawn.pyx +@@ -228,7 +228,7 @@ class SagePtyProcess(PtyProcess): + Check that the process eventually dies after calling + ``terminate_async``:: + +- sage: s.ptyproc.terminate_async(interval=0.2) ++ sage: s.ptyproc.terminate_async(interval=float(0.2)) + sage: while True: + ....: try: + ....: os.kill(s.pid, 0) diff --git a/pkgs/applications/science/math/sage/patches/sphinx-docbuild-subprocesses.patch b/pkgs/applications/science/math/sage/patches/sphinx-docbuild-subprocesses.patch index 56f092796229a..661077cfa8cdb 100644 --- a/pkgs/applications/science/math/sage/patches/sphinx-docbuild-subprocesses.patch +++ b/pkgs/applications/science/math/sage/patches/sphinx-docbuild-subprocesses.patch @@ -36,7 +36,7 @@ index 73a078e619..059125c59f 100644 # Run Sphinx with Sage's special logger - sys.argv = ["sphinx-build"] + build_command.split() - from .sphinxbuild import runsphinx -+ args = "python -um sage_setup.docbuild.sphinxbuild -N".split() + build_command.split() ++ args = "python3 -um sage_setup.docbuild.sphinxbuild -N".split() + build_command.split() try: - runsphinx() + subprocess.check_call(args) diff --git a/pkgs/applications/science/math/sage/patches/sympow-cache.patch b/pkgs/applications/science/math/sage/patches/sympow-cache.patch index 20020d610f80f..d71f3acbc706e 100644 --- a/pkgs/applications/science/math/sage/patches/sympow-cache.patch +++ b/pkgs/applications/science/math/sage/patches/sympow-cache.patch @@ -1,5 +1,5 @@ diff --git a/src/sage/lfunctions/sympow.py b/src/sage/lfunctions/sympow.py -index 1640ac4f6a..03578be7b8 100644 +index 92cb01fd73..b123e6accc 100644 --- a/src/sage/lfunctions/sympow.py +++ b/src/sage/lfunctions/sympow.py @@ -50,6 +50,7 @@ from __future__ import print_function, absolute_import @@ -8,14 +8,14 @@ index 1640ac4f6a..03578be7b8 100644 +from sage.env import DOT_SAGE from sage.structure.sage_object import SageObject - from sage.misc.all import pager, verbose - import sage.rings.all -@@ -76,7 +77,7 @@ class Sympow(SageObject): + from sage.misc.all import pager + from sage.misc.verbose import verbose +@@ -78,7 +79,7 @@ class Sympow(SageObject): """ Used to call sympow with given args """ -- cmd = 'sympow %s'%args +- cmd = 'sympow %s' % args + cmd = 'env SYMPOW_CACHEDIR="%s/sympow///" sympow %s' % (DOT_SAGE, args) - v = os.popen(cmd).read().strip() + with os.popen(cmd) as f: + v = f.read().strip() verbose(v, level=2) - return v diff --git a/pkgs/applications/science/math/sage/patches/sympy-1.7-update.patch b/pkgs/applications/science/math/sage/patches/sympy-1.7-update.patch new file mode 100644 index 0000000000000..1d21622a23543 --- /dev/null +++ b/pkgs/applications/science/math/sage/patches/sympy-1.7-update.patch @@ -0,0 +1,25 @@ +diff --git a/src/sage/interfaces/sympy.py b/src/sage/interfaces/sympy.py +index cc35a42a9f..6e577d5d8d 100644 +--- a/src/sage/interfaces/sympy.py ++++ b/src/sage/interfaces/sympy.py +@@ -397,7 +397,7 @@ def _sympysage_rf(self): + sage: from sympy import Symbol, rf + sage: _ = var('x, y') + sage: rfxy = rf(Symbol('x'), Symbol('y')) +- sage: assert rising_factorial(x,y)._sympy_() == rfxy.rewrite('gamma') ++ sage: assert rising_factorial(x,y)._sympy_() == rfxy.rewrite('gamma', piecewise=False) + sage: assert rising_factorial(x,y) == rfxy._sage_() + """ + from sage.arith.all import rising_factorial +diff --git a/src/sage/symbolic/expression.pyx b/src/sage/symbolic/expression.pyx +index 7c18ec1efa..c2619ac42d 100644 +--- a/src/sage/symbolic/expression.pyx ++++ b/src/sage/symbolic/expression.pyx +@@ -955,6 +955,6 @@ cdef class Expression(CommutativeRingElement): + sage: unicode_art(13 - I) + 13 - ⅈ + sage: unicode_art(1.3 - I) +- 1.3 - 1.0⋅ⅈ ++ 1.3 - ⅈ + sage: unicode_art(cos(I)) + cosh(1) diff --git a/pkgs/applications/science/math/sage/pybrial.nix b/pkgs/applications/science/math/sage/pybrial.nix deleted file mode 100644 index 5fc8a4aa6f488..0000000000000 --- a/pkgs/applications/science/math/sage/pybrial.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ stdenv -, fetchFromGitHub -, buildPythonPackage -, brial -}: -# This has a cyclic dependency with sage. I don't include sage in the -# buildInputs and let python figure it out at runtime. Because of this, -# I don't include the package in the main nipxkgs tree. It wouldn't be useful -# outside of sage anyways (as you could just directly depend on sage and use -# it). -buildPythonPackage rec { - pname = "pyBRiAl"; - version = brial.version; - - # included with BRiAl source - src = brial.src; - - sourceRoot = "source/sage-brial"; - - meta = with stdenv.lib; { - description = "python implementation of BRiAl"; - license = licenses.gpl2; - maintainers = teams.sage.members; - }; -} diff --git a/pkgs/applications/science/math/sage/python-openid.nix b/pkgs/applications/science/math/sage/python-openid.nix deleted file mode 100644 index 1e8a908ac79ae..0000000000000 --- a/pkgs/applications/science/math/sage/python-openid.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ stdenv -, buildPythonPackage -, fetchPypi -, isPy3k -, django -, nose -, twill -, pycrypto -}: - -buildPythonPackage rec { - pname = "python-openid"; - version = "2.2.5"; - - disabled = isPy3k; - - src = fetchPypi { - inherit pname version; - sha256 = "1vvhxlghjan01snfdc4k7ykd80vkyjgizwgg9bncnin8rqz1ricj"; - }; - - propagatedBuildInputs = [ - pycrypto - ]; - - # Cannot access the djopenid example module. - # I don't know how to fix that (adding the examples dir to PYTHONPATH doesn't work) - doCheck = false; - checkInputs = [ nose django twill ]; - checkPhase = '' - nosetests - ''; - - meta = with stdenv.lib; { - description = "OpenID library for Python"; - license = licenses.asl20; - maintainers = teams.sage.members; - homepage = "https://github.com/openid/python-openid/"; - }; -} diff --git a/pkgs/applications/science/math/sage/sage-env.nix b/pkgs/applications/science/math/sage/sage-env.nix index ba7f6ccd18b5d..568a4a39f3936 100644 --- a/pkgs/applications/science/math/sage/sage-env.nix +++ b/pkgs/applications/science/math/sage/sage-env.nix @@ -1,7 +1,6 @@ { stdenv , lib , writeTextFile -, python , sagelib , env-locations , gfortran @@ -67,11 +66,6 @@ let "@sage-local@" "@sage-local@/build" pythonEnv - # empty python env to add python wrapper that clears PYTHONHOME (see - # wrapper.nix). This is necessary because sage will call the python3 binary - # (from python2 code). The python2 PYTHONHOME (again set in wrapper.nix) - # will then confuse python3, if it is not overwritten. - python3.buildEnv gfortran # for inline fortran stdenv.cc # for cython bash @@ -129,8 +123,21 @@ writeTextFile rec { ] }' export SAGE_ROOT='${sagelib.src}' - export SAGE_LOCAL='@sage-local@' + '' + + # TODO: is using pythonEnv instead of @sage-local@ here a good + # idea? there is a test in src/sage/env.py that checks if the values + # SAGE_ROOT and SAGE_LOCAL set here match the ones set in env.py. + # we fix up env.py's SAGE_ROOT in sage-src.nix (which does not + # have access to sage-with-env), but env.py autodetects + # SAGE_LOCAL to be pythonEnv. + # setting SAGE_LOCAL to pythonEnv also avoids having to create + # python3, ipython, ipython3 and jupyter symlinks in + # sage-with-env.nix. + '' + export SAGE_LOCAL='${pythonEnv}' + export SAGE_SHARE='${sagelib}/share' + export SAGE_ENV_CONFIG_SOURCED=1 # sage-env complains if sage-env-config is not sourced beforehand orig_path="$PATH" export PATH='${runtimepath}' @@ -177,9 +184,9 @@ writeTextFile rec { ]) }' - export SAGE_LIB='${sagelib}/${python.sitePackages}' + export SAGE_LIB='${sagelib}/${python3.sitePackages}' - export SAGE_EXTCODE='${sagelib.src}/src/ext' + export SAGE_EXTCODE='${sagelib.src}/src/sage/ext_data' # for find_library export DYLD_LIBRARY_PATH="${lib.makeLibraryPath [stdenv.cc.libc singular]}''${DYLD_LIBRARY_PATH:+:}$DYLD_LIBRARY_PATH" diff --git a/pkgs/applications/science/math/sage/sage-src.nix b/pkgs/applications/science/math/sage/sage-src.nix index 4791d12450a93..b8fb41596607d 100644 --- a/pkgs/applications/science/math/sage/sage-src.nix +++ b/pkgs/applications/science/math/sage/sage-src.nix @@ -10,44 +10,23 @@ # all get the same sources with the same patches applied. stdenv.mkDerivation rec { - version = "8.9"; + version = "9.2"; pname = "sage-src"; src = fetchFromGitHub { owner = "sagemath"; repo = "sage"; rev = version; - sha256 = "1bwga58x3s8z42w5h51c232f91ndsc1861dlb1glhax3pn0rhn3a"; + sha256 = "103j8d5x6szl9fxaz0dvdi4y47q1af9h9y5hmjh2xayi62qmp5ql"; }; # Patches needed because of particularities of nix or the way this is packaged. # The goal is to upstream all of them and get rid of this list. nixPatches = [ - # https://trac.sagemath.org/ticket/25358 - (fetchpatch { - name = "safe-directory-test-without-patch.patch"; - url = "https://git.sagemath.org/sage.git/patch?id2=8bdc326ba57d1bb9664f63cf165a9e9920cc1afc&id=dc673c17555efca611f68398d5013b66e9825463"; - sha256 = "1hhannz7xzprijakn2w2d0rhd5zv2zikik9p51i87bas3nc658f7"; - }) - - # `is_unitary` test in `matrix_double_dense.pyx` fails with some BLAS implementations - # https://trac.sagemath.org/ticket/29297 should be included in 9.1 - (fetchpatch { - name = "is_unitary-special-case.patch"; - url = "https://git.sagemath.org/sage.git/patch?id=cc3eb9ffa991e328b09028d32aab7e7cc2ddbb6a"; - sha256 = "0jq4w8hnp5c9q99011ldr4n3knvm1rx2g85z0hidv3i9x868p0ay"; - }) - - # Unfortunately inclusion in upstream sage was rejected. Instead the bug was - # fixed in python, but of course not backported to 2.7. So we'll probably - # have to keep this around until 2.7 is deprecated. - # https://trac.sagemath.org/ticket/25316 - # https://github.com/python/cpython/pull/7476 - ./patches/python-5755-hotpatch.patch - # Make sure py2/py3 tests are only run when their expected context (all "sage" # tests) are also run. That is necessary to test dochtml individually. See # https://trac.sagemath.org/ticket/26110 for an upstream discussion. + # TODO: Determine if it is still necessary. ./patches/Only-test-py2-py3-optional-tests-when-all-of-sage-is.patch # Fixes a potential race condition which can lead to transient doctest failures. @@ -61,10 +40,17 @@ stdenv.mkDerivation rec { # https://groups.google.com/forum/#!topic/sage-packaging/YGOm8tkADrE ./patches/sphinx-docbuild-subprocesses.patch - # Fix doctest failures with docutils 0.15: - # https://nix-cache.s3.amazonaws.com/log/dzmzrb2zvardsmpy7idg7djkizmkzdhs-sage-tests-8.9.drv - # https://trac.sagemath.org/ticket/28856#comment:19 - ./patches/docutils-0.15.patch + # Sage's workaround to pretty print dicts (in + # src/sage/doctest/forker.py:init_sage) runs too late (after + # controller.load_environment(), which imports sage.all.*) to to + # affect sage.sandpiles.Sandpile{Config,Divisor}'s pretty printer. + # Due to the sandpiles module being lazily loaded, this only + # affects the first run (subsequent runs read from an import cache + # at ~/.sage/cache and are not affected), which is probably why + # other distributions don't hit this bug. This breaks two sandpile + # tests, so do the workaround a little bit earlier. + # https://trac.sagemath.org/ticket/31053 + ./patches/register-pretty-printer-earlier.patch ]; # Since sage unfortunately does not release bugfix releases, packagers must @@ -74,6 +60,17 @@ stdenv.mkDerivation rec { # To help debug the transient error in # https://trac.sagemath.org/ticket/23087 when it next occurs. ./patches/configurationpy-error-verbose.patch + + # fix intermittent errors in Sage 9.2's psage.py (this patch is + # already included in Sage 9.3): https://trac.sagemath.org/ticket/30730 + (fetchpatch { + name = "fix-psage-is-locked.patch"; + url = "https://git.sagemath.org/sage.git/patch/?id=75df605f216ddc7b6ca719be942d666b241520e9"; + sha256 = "0g9pl1wbb3sgs26d3bvv70cpa77sfskylv4kd255y1794f1fgk4q"; + }) + + # fix intermittent errors in sagespawn.pyx: https://trac.sagemath.org/ticket/31052 + ./patches/sagespawn-implicit-casting.patch ]; # Patches needed because of package updates. We could just pin the versions of @@ -96,55 +93,19 @@ stdenv.mkDerivation rec { } // builtins.removeAttrs args [ "rev" "base" ]) ); in [ - # New glpk version has new warnings, filter those out until upstream sage has found a solution - # Should be fixed with glpk > 4.65. - # https://trac.sagemath.org/ticket/24824 - ./patches/pari-stackwarn.patch # not actually necessary since the pari upgrade, but necessary for the glpk patch to apply - (fetchpatch { - url = "https://salsa.debian.org/science-team/sagemath/raw/58bbba93a807ca2933ca317501d093a1bb4b84db/debian/patches/dt-version-glpk-4.65-ignore-warnings.patch"; - sha256 = "0b9293v73wb4x13wv5zwyjgclc01zn16msccfzzi6znswklgvddp"; - stripLen = 1; - }) - # After updating smypow to (https://trac.sagemath.org/ticket/3360) we can # now set the cache dir to be withing the .sage directory. This is not # strictly necessary, but keeps us from littering in the user's HOME. ./patches/sympow-cache.patch - # https://trac.sagemath.org/ticket/28472 - (fetchpatch { - name = "eclib-20190909.patch"; - url = "https://git.sagemath.org/sage.git/patch?id=d27dc479a5772d59e4bc85d805b6ffd595284f1d"; - sha256 = "1nf1s9y7n30lhlbdnam7sghgaq9nasmv96415gl5jlcf7a3hlxk3"; - }) - # ignore a deprecation warning for usage of `cmp` in the attrs library in the doctests ./patches/ignore-cmp-deprecation.patch - # Werkzeug has deprecated ImmutableDict, but it is still used in legacy - # sagenb. That's no big issue since sagenb will be removed soon anyways. - ./patches/ignore-werkzeug-immutable-dict-deprecation.patch - - # threejs r109 (#28560) - (fetchpatch { - name = "threejs-r109.patch"; - url = "https://git.sagemath.org/sage.git/patch?id=fcc11d6effa39f375bc5f4ea5831fb7a2f2767da"; - sha256 = "0hnmc8ld3bblks0hcjvjjaydkgwdr1cs3dbl2ys4gfq964pjgqwc"; - }) - - # https://trac.sagemath.org/ticket/28911 - (fetchpatch { - name = "sympy-1.5.patch"; - url = "https://git.sagemath.org/sage.git/patch/?h=c6d0308db15efd611211d26cfcbefbd180fc0831"; - sha256 = "0nwai2jr22h49km4hx3kwafs3mzsc5kwsv7mqwjf6ibwfx2bbgyq"; - }) + # adapt sage's Image class to pillow 8.0.1 (https://trac.sagemath.org/ticket/30971) + ./patches/pillow-update.patch - # https://trac.sagemath.org/ticket/29313 (patch from ArchLinux) - (fetchpatch { - name = "pari-2.11.3.patch"; - url = "https://aur.archlinux.org/cgit/aur.git/plain/sagemath-pari-2.11.3.patch?h=sagemath-git&id=02e1d58bd1cd70935d69a4990469d18be6bd2c43"; - sha256 = "0z07444zvijyw96d11q7j81pvg7ysd6ycf1bbbjr6za9y74hv7d2"; - }) + # fix test output with sympy 1.7 (https://trac.sagemath.org/ticket/30985) + ./patches/sympy-1.7-update.patch ]; patches = nixPatches ++ bugfixPatches ++ packageUpgradePatches; @@ -152,16 +113,16 @@ stdenv.mkDerivation rec { postPatch = '' # make sure shebangs etc are fixed, but sage-python23 still works find . -type f -exec sed \ - -e 's/sage-python23/python/g' \ + -e 's/sage-python23/python3/g' \ -i {} \; echo '#!${runtimeShell} - python "$@"' > build/bin/sage-python23 + python3 "$@"' > build/bin/sage-python23 # Make sure sage can at least be imported without setting any environment # variables. It won't be close to feature complete though. sed -i \ - "s|var('SAGE_LOCAL',.*|var('SAGE_LOCAL', '$out/src')|" \ + "s|var('SAGE_ROOT'.*|var('SAGE_ROOT', '$out')|" \ src/sage/env.py # Do not use sage-env-config (generated by ./configure). @@ -169,7 +130,39 @@ stdenv.mkDerivation rec { echo '# do nothing' > src/bin/sage-env-config ''; - configurePhase = "# do nothing"; + # Test src/doc/en/reference/spkg/conf.py will fail if + # src/doc/en/reference/spkg/index.rst is not generated. It is + # generated by src/doc/bootstrap, so I've copied the relevant part + # here. An alternative would be to create an empty + # src/doc/en/reference/spkg/index.rst file. + configurePhase = '' + OUTPUT_DIR="src/doc/en/reference/spkg" + mkdir -p "$OUTPUT_DIR" + OUTPUT_INDEX="$OUTPUT_DIR"/index.rst + cat > "$OUTPUT_INDEX" <<EOF + + External Packages + ================= + + .. toctree:: + :maxdepth: 1 + + EOF + for PKG_SCRIPTS in build/pkgs/*; do + if [ -d "$PKG_SCRIPTS" ]; then + PKG_BASE=$(basename "$PKG_SCRIPTS") + if [ -f "$PKG_SCRIPTS"/SPKG.rst ]; then + # Instead of just copying, we may want to call + # a version of sage-spkg-info to format extra information. + cp "$PKG_SCRIPTS"/SPKG.rst "$OUTPUT_DIR"/$PKG_BASE.rst + echo >> "$OUTPUT_INDEX" " $PKG_BASE" + fi + fi + done + cat >> "$OUTPUT_INDEX" <<EOF + .. include:: ../footer.txt + EOF + ''; buildPhase = "# do nothing"; diff --git a/pkgs/applications/science/math/sage/sage-with-env.nix b/pkgs/applications/science/math/sage/sage-with-env.nix index 87c1e07f5307b..f204d97961b65 100644 --- a/pkgs/applications/science/math/sage/sage-with-env.nix +++ b/pkgs/applications/science/math/sage/sage-with-env.nix @@ -13,7 +13,7 @@ , pari , gmp , gfan -, python2 +, python3 , flintqs , eclib , ntl @@ -50,11 +50,11 @@ let ]; # remove python prefix, replace "-" in the name by "_", apply patch_names - # python2.7-some-pkg-1.0 -> some_pkg-1.0 + # python3.8-some-pkg-1.0 -> some_pkg-1.0 pkg_to_spkg_name = pkg: patch_names: let parts = lib.splitString "-" pkg.name; - # remove python2.7- - stripped_parts = if (builtins.head parts) == python2.libPrefix then builtins.tail parts else parts; + # remove python3.8- + stripped_parts = if (builtins.head parts) == python3.libPrefix then builtins.tail parts else parts; version = lib.last stripped_parts; orig_pkgname = lib.init stripped_parts; pkgname = patch_names (lib.concatStringsSep "_" orig_pkgname); diff --git a/pkgs/applications/science/math/sage/sage.nix b/pkgs/applications/science/math/sage/sage.nix index a21bffea14cd8..e2acef7b8eb55 100644 --- a/pkgs/applications/science/math/sage/sage.nix +++ b/pkgs/applications/science/math/sage/sage.nix @@ -61,7 +61,6 @@ stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - broken = true; description = "Open Source Mathematics Software, free alternative to Magma, Maple, Mathematica, and Matlab"; license = licenses.gpl2; maintainers = teams.sage.members; diff --git a/pkgs/applications/science/math/sage/sagedoc.nix b/pkgs/applications/science/math/sage/sagedoc.nix index bf618fe64f45f..a10672f3a0921 100644 --- a/pkgs/applications/science/math/sage/sagedoc.nix +++ b/pkgs/applications/science/math/sage/sagedoc.nix @@ -1,6 +1,6 @@ { stdenv , sage-with-env -, python +, python3 , maxima-ecl , tachyon , jmol @@ -17,16 +17,15 @@ stdenv.mkDerivation rec { # modules are imported and because matplotlib is used to produce plots. buildInputs = [ sage-with-env.env.lib - python + python3 maxima-ecl tachyon jmol cddlib - ] ++ (with python.pkgs; [ + ] ++ (with python3.pkgs; [ psutil future sphinx - sagenb scipy sympy matplotlib @@ -35,8 +34,6 @@ stdenv.mkDerivation rec { ipykernel ipywidgets jupyter_client - typing - pybrial ]); unpackPhase = '' @@ -47,13 +44,26 @@ stdenv.mkDerivation rec { chmod -R 755 "$SAGE_DOC_SRC_OVERRIDE" ''; + postPatch = '' + # src/doc/bootstrap generates installation instructions for + # arch, debian, fedora, cygwin and homebrew. as a hack, disable + # including the generated files. + sed -i "/literalinclude/d" $SAGE_DOC_SRC_OVERRIDE/en/installation/source.rst + ''; + buildPhase = '' export SAGE_NUM_THREADS="$NIX_BUILD_CORES" export HOME="$TMPDIR/sage_home" mkdir -p "$HOME" # needed to link them in the sage docs using intersphinx - export PPLPY_DOCS=${python.pkgs.pplpy.doc}/share/doc/pplpy + export PPLPY_DOCS=${python3.pkgs.pplpy.doc}/share/doc/pplpy + + # adapted from src/doc/bootstrap + OUTPUT_DIR="$SAGE_DOC_SRC_OVERRIDE/en/reference/repl" + mkdir -p "$OUTPUT_DIR" + OUTPUT="$OUTPUT_DIR/options.txt" + ${sage-with-env}/bin/sage -advanced > "$OUTPUT" ${sage-with-env}/bin/sage -python -m sage_setup.docbuild \ --mathjax \ diff --git a/pkgs/applications/science/math/sage/sagelib.nix b/pkgs/applications/science/math/sage/sagelib.nix index 830d806a8bcd3..1c2235bf71b43 100644 --- a/pkgs/applications/science/math/sage/sagelib.nix +++ b/pkgs/applications/science/math/sage/sagelib.nix @@ -15,6 +15,7 @@ , ecm , flint , gd +, giac , givaro , glpk , gsl @@ -51,6 +52,7 @@ , libbraiding , gmpy2 , pplpy +, sqlite }: assert (!blas.isILP64) && (!lapack.isILP64); @@ -94,6 +96,7 @@ buildPythonPackage rec { ecm fflas-ffpack flint + giac givaro glpk gsl @@ -124,6 +127,7 @@ buildPythonPackage rec { libbraiding gmpy2 pplpy + sqlite ]; buildPhase = '' diff --git a/pkgs/applications/science/math/sage/sagenb.nix b/pkgs/applications/science/math/sage/sagenb.nix deleted file mode 100644 index ad5c53b6c1184..0000000000000 --- a/pkgs/applications/science/math/sage/sagenb.nix +++ /dev/null @@ -1,57 +0,0 @@ -{ stdenv -, python -, buildPythonPackage -, fetchFromGitHub -, mathjax -, twisted -, flask -, flask-oldsessions -, flask-openid -, flask-autoindex -, flask-babel -}: - -# Has a cyclic dependency with sage (not expressed here) and is not useful outside of sage. -# Deprecated, hopefully soon to be removed. See -# https://trac.sagemath.org/ticket/25837 - -buildPythonPackage rec { - pname = "sagenb"; - version = "1.1.2"; - - src = fetchFromGitHub { - owner = "sagemath"; - repo = "sagenb"; - rev = version; - sha256 = "0bxvhr03qh2nsjdfc4pyfiqrn9jhp3vf7irsc9gqx0185jlblbxs"; - }; - - patches = [ - # cmp deprecation in attrs needs to be handled in twisted - ./patches/sagenb-cmp-deprecation.patch - ]; - - propagatedBuildInputs = [ - twisted - flask - flask-oldsessions - flask-openid - flask-autoindex - flask-babel - ]; - - # tests depend on sage - doCheck = false; - - meta = with stdenv.lib; { - description = "Sage Notebook"; - license = licenses.gpl3Plus; - maintainers = teams.sage.members; - }; - - # let sagenb use mathjax - postInstall = '' - mkdir -p "$out/${python.sitePackages}/sagenb/data" - ln -s ${mathjax}/lib/node_modules/mathjax "$out/${python.sitePackages}/sagenb/data/mathjax" - ''; -} diff --git a/pkgs/applications/science/misc/colmap/default.nix b/pkgs/applications/science/misc/colmap/default.nix index 83dff3e08f157..60f9810dfb6a0 100644 --- a/pkgs/applications/science/misc/colmap/default.nix +++ b/pkgs/applications/science/misc/colmap/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib, fetchpatch, fetchFromGitHub, cmake, boost17x, ceres-solver, eigen, +{ mkDerivation, lib, fetchFromGitHub, cmake, boost17x, ceres-solver, eigen, freeimage, glog, libGLU, glew, qtbase, cudaSupport ? false, cudatoolkit ? null }: @@ -7,22 +7,15 @@ assert !cudaSupport || cudatoolkit != null; let boost_static = boost17x.override { enableStatic = true; }; in mkDerivation rec { - version = "3.5"; + version = "3.6"; pname = "colmap"; src = fetchFromGitHub { owner = "colmap"; repo = "colmap"; rev = version; - sha256 = "1vnb62p0y2bnga173wmjs0lnyqdjikv0fkcxjzxm8187khk2lly8"; + sha256 = "1kfivdmhpmdxjjf30rr57y2iy7xmdpg4h8aw3qgacv8ckfpgda3n"; }; - patches = [ - (fetchpatch { - url = "https://github.com/colmap/colmap/commit/6af3d8b0048cecc3b9fc6f4e78c3214dd038180b.patch"; - sha256 = "1zv5girmv4hv78w1xn131v8njwhpbyylc1m15731lnhrs8bri0jq"; - }) - ]; - buildInputs = [ boost_static ceres-solver eigen freeimage glog libGLU glew qtbase diff --git a/pkgs/applications/science/misc/root/default.nix b/pkgs/applications/science/misc/root/default.nix index 97d8d4e7cee58..03b206973103d 100644 --- a/pkgs/applications/science/misc/root/default.nix +++ b/pkgs/applications/science/misc/root/default.nix @@ -1,19 +1,20 @@ -{ stdenv, lib, fetchurl, makeWrapper, cmake, gl2ps, gsl, libX11, libXpm, libXft -, libXext, libGLU, libGL, libxml2, lz4, lzma, pcre, pkgconfig, python, xxHash -, zlib +{ stdenv, lib, fetchurl, makeWrapper, cmake, ftgl, gl2ps, glew, gsl, llvm_5 +, libX11, libXpm, libXft, libXext, libGLU, libGL, libxml2, lz4, lzma, pcre +, pkgconfig, python, xxHash, zlib, zstd +, libAfterImage, giflib, libjpeg, libtiff, libpng , Cocoa, OpenGL, noSplash ? false }: stdenv.mkDerivation rec { pname = "root"; - version = "6.18.04"; + version = "6.22.06"; src = fetchurl { url = "https://root.cern.ch/download/root_v${version}.source.tar.gz"; - sha256 = "196ghma6g5a7sqz52wyjkgvmh4hj4vqwppm0zwdypy33hgy8anii"; + sha256 = "0mqvj42nax0bmz8h83jjlwjm3xxjy1n0n10inc8csip9ly28fs64"; }; nativeBuildInputs = [ makeWrapper cmake pkgconfig ]; - buildInputs = [ gl2ps pcre zlib libxml2 lz4 lzma gsl xxHash python.pkgs.numpy ] + buildInputs = [ ftgl gl2ps glew pcre zlib zstd llvm_5 libxml2 lz4 lzma gsl xxHash libAfterImage giflib libjpeg libtiff libpng python.pkgs.numpy ] ++ lib.optionals (!stdenv.isDarwin) [ libX11 libXpm libXft libXext libGLU libGL ] ++ lib.optionals (stdenv.isDarwin) [ Cocoa OpenGL ] ; @@ -38,6 +39,7 @@ stdenv.mkDerivation rec { "-DCMAKE_INSTALL_INCLUDEDIR=include" "-Dalien=OFF" "-Dbonjour=OFF" + "-Dbuiltin_llvm=OFF" "-Dcastor=OFF" "-Dchirp=OFF" "-Dclad=OFF" @@ -69,7 +71,14 @@ stdenv.mkDerivation rec { "-Dxrootd=OFF" ] ++ stdenv.lib.optional (stdenv.cc.libc != null) "-DC_INCLUDE_DIRS=${stdenv.lib.getDev stdenv.cc.libc}/include" - ++ stdenv.lib.optional stdenv.isDarwin "-DOPENGL_INCLUDE_DIR=${OpenGL}/Library/Frameworks"; + ++ stdenv.lib.optionals stdenv.isDarwin [ + "-DOPENGL_INCLUDE_DIR=${OpenGL}/Library/Frameworks" + "-DCMAKE_DISABLE_FIND_PACKAGE_Python2=TRUE" + + # fatal error: module map file '/nix/store/<hash>-Libsystem-osx-10.12.6/include/module.modulemap' not found + # fatal error: could not build module '_Builtin_intrinsics' + "-Druntime_cxxmodules=OFF" + ]; enableParallelBuilding = true; diff --git a/pkgs/applications/science/misc/root/sw_vers.patch b/pkgs/applications/science/misc/root/sw_vers.patch index 34af132c11f8b..b2ee1b6a4ceba 100644 --- a/pkgs/applications/science/misc/root/sw_vers.patch +++ b/pkgs/applications/science/misc/root/sw_vers.patch @@ -1,19 +1,7 @@ -diff a/build/unix/compiledata.sh b/build/unix/compiledata.sh ---- a/build/unix/compiledata.sh -+++ b/build/unix/compiledata.sh -@@ -47,7 +47,7 @@ fi - - if [ "$ARCH" = "macosx" ] || [ "$ARCH" = "macosx64" ] || \ - [ "$ARCH" = "macosxicc" ]; then -- macosx_minor=`sw_vers | sed -n 's/ProductVersion://p' | cut -d . -f 2` -+ macosx_minor=12 - SOEXT="so" - if [ $macosx_minor -ge 5 ]; then - if [ "x`echo $SOFLAGS | grep -- '-install_name'`" != "x" ]; then diff a/cmake/modules/SetUpMacOS.cmake b/cmake/modules/SetUpMacOS.cmake --- a/cmake/modules/SetUpMacOS.cmake +++ b/cmake/modules/SetUpMacOS.cmake -@@ -2,17 +2,8 @@ set(ROOT_ARCHITECTURE macosx) +@@ -8,17 +8,10 @@ set(ROOT_ARCHITECTURE macosx) set(ROOT_PLATFORM macosx) if (CMAKE_SYSTEM_NAME MATCHES Darwin) @@ -21,8 +9,8 @@ diff a/cmake/modules/SetUpMacOS.cmake b/cmake/modules/SetUpMacOS.cmake - COMMAND cut -d . -f 1-2 - OUTPUT_VARIABLE MACOSX_VERSION OUTPUT_STRIP_TRAILING_WHITESPACE) - -- MESSAGE(STATUS "Found a Mac OS X System ${MACOSX_VERSION}") -- + MESSAGE(STATUS "Found a macOS system ${MACOSX_VERSION}") + - if(MACOSX_VERSION VERSION_GREATER 10.7 AND ${CMAKE_CXX_COMPILER_ID} MATCHES Clang) set(libcxx ON CACHE BOOL "Build using libc++" FORCE) - endif() @@ -31,7 +19,7 @@ diff a/cmake/modules/SetUpMacOS.cmake b/cmake/modules/SetUpMacOS.cmake #TODO: check haveconfig and rpath -> set rpath true #TODO: check Thread, define link command #TODO: more stuff check configure script -@@ -25,23 +16,7 @@ if (CMAKE_SYSTEM_NAME MATCHES Darwin) +@@ -37,23 +30,7 @@ if (CMAKE_SYSTEM_NAME MATCHES Darwin) SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -m64") SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -m64") SET(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -m64") @@ -56,7 +44,7 @@ diff a/cmake/modules/SetUpMacOS.cmake b/cmake/modules/SetUpMacOS.cmake if (CMAKE_COMPILER_IS_GNUCXX) message(STATUS "Found GNU compiler collection") -@@ -104,7 +79,6 @@ if (CMAKE_SYSTEM_NAME MATCHES Darwin) +@@ -115,7 +92,6 @@ if (CMAKE_SYSTEM_NAME MATCHES Darwin) endif() #---Set Linker flags---------------------------------------------------------------------- @@ -67,33 +55,33 @@ diff a/cmake/modules/SetUpMacOS.cmake b/cmake/modules/SetUpMacOS.cmake diff a/config/root-config.in b/config/root-config.in --- a/config/root-config.in +++ b/config/root-config.in -@@ -306,12 +306,6 @@ macosxicc) - auxlibs="-lm -ldl" +@@ -312,12 +312,6 @@ macosxicc) ;; - macosx64) -- # MacOS X with gcc (GNU cc v4.x) in 64 bit mode + macosx64|macosxarm64) + # MacOS X with gcc (GNU cc v4.x) in 64 bit mode +- macosx_major=`sw_vers | sed -n 's/ProductVersion://p' | cut -d . -f 1 | sed -e 's/^[[:space:]]*//'` - macosx_minor=`sw_vers | sed -n 's/ProductVersion://p' | cut -d . -f 2` - # cannot find the one linked to libGraf if relocated after built -- if [ $macosx_minor -le 4 ]; then +- if [ $macosx_major -eq 10 -a $macosx_minor -le 4 ]; then - rootlibs="$rootlibs -lfreetype" - fi auxcflags="${cxxversionflag} -m64" auxldflags="-m64" auxlibs="-lm -ldl" -@@ -375,18 +369,11 @@ freebsd* | openbsd* | linux*) +@@ -378,18 +372,11 @@ freebsd* | openbsd* | linux*) + done + ;; macosx*) +- if [ \( $macosx_major -eq 10 -a $macosx_minor -ge 5 \) -o $macosx_major -gt 10 ]; then + auxcflags="-pthread $auxcflags" + auxlibs="-lpthread $auxlibs" +- else +- auxcflags="-D_REENTRANT $auxcflags" +- auxlibs="-lpthread $auxlibs" +- fi for f in $features ; do - if test "x$f" = "xthread" ; then -- if [ $macosx_minor -ge 5 ]; then - auxcflags="-pthread $auxcflags" - auxlibs="-lpthread $auxlibs" -- else -- auxcflags="-D_REENTRANT $auxcflags" -- auxlibs="-lpthread $auxlibs" -- fi - fi if test "x$f" = "xrpath" ; then -- if [ $macosx_minor -ge 5 ]; then +- if [ \( $macosx_major -eq 10 -a $macosx_minor -ge 5 \) -o $macosx_major -gt 10 ]; then auxlibs="-Wl,-rpath,$libdir $auxlibs" - fi fi diff --git a/pkgs/applications/science/misc/simgrid/default.nix b/pkgs/applications/science/misc/simgrid/default.nix index 0ba1cd0d2faf4..11d73095834f9 100644 --- a/pkgs/applications/science/misc/simgrid/default.nix +++ b/pkgs/applications/science/misc/simgrid/default.nix @@ -18,14 +18,14 @@ in stdenv.mkDerivation rec { pname = "simgrid"; - version = "3.25"; + version = "3.26"; src = fetchFromGitLab { domain = "framagit.org"; owner = pname; repo = pname; rev = "v${version}"; - sha256 = "019fgryfwpcrkv1f3271v7qxk0mfw2w990vgnk1cqhmr9i1f17gs"; + sha256 = "0kwiggdjqjhjvmwb1m7hb9clvm3xz948fy5ia67dif2pakwad754"; }; nativeBuildInputs = [ cmake perl python3 boost valgrind ] diff --git a/pkgs/applications/science/molecular-dynamics/viennarna/default.nix b/pkgs/applications/science/molecular-dynamics/viennarna/default.nix new file mode 100644 index 0000000000000..a68feaea1ef52 --- /dev/null +++ b/pkgs/applications/science/molecular-dynamics/viennarna/default.nix @@ -0,0 +1,37 @@ +{ stdenv +, fetchurl +, gsl +, mpfr +, perl +, python3 +}: + +stdenv.mkDerivation rec { + pname = "ViennaRNA"; + version = "2.4.17"; + + src = fetchurl { + url = "https://www.tbi.univie.ac.at/RNA/download/sourcecode/2_4_x/${pname}-${version}.tar.gz"; + sha256 = "08f1h2a8fn1s2zwf1244smiydhgwxgcnzy6irpdlmpvwygv0irmi"; + }; + + buildInputs = [ + gsl + mpfr + perl + python3 + ]; + + configureFlags = [ + "--with-cluster" + "--with-kinwalker" + ]; + + meta = with stdenv.lib; { + description = "Prediction and comparison of RNA secondary structures"; + homepage = "https://www.tbi.univie.ac.at/RNA/"; + license = licenses.unfree; + maintainers = with maintainers; [ prusnak ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/applications/science/robotics/mavproxy/default.nix b/pkgs/applications/science/robotics/mavproxy/default.nix index a71ddc874c9d0..8e7c5bddd961c 100644 --- a/pkgs/applications/science/robotics/mavproxy/default.nix +++ b/pkgs/applications/science/robotics/mavproxy/default.nix @@ -3,11 +3,11 @@ buildPythonApplication rec { pname = "MAVProxy"; - version = "1.8.29"; + version = "1.8.30"; src = fetchPypi { inherit pname version; - sha256 = "8f5900dc0a404ab9cf5a00155f83e9aaeab18161ce21a352dfdcf2d7abf5d78e"; + sha256 = "fe046481b793b592334749249620fce8a463f4c46b394ff744645975465d677b"; }; propagatedBuildInputs = [ diff --git a/pkgs/applications/science/robotics/mission-planner/default.nix b/pkgs/applications/science/robotics/mission-planner/default.nix new file mode 100644 index 0000000000000..5ae04d8a84b73 --- /dev/null +++ b/pkgs/applications/science/robotics/mission-planner/default.nix @@ -0,0 +1,59 @@ +{ stdenv, fetchurl, makeDesktopItem, makeWrapper, unzip, mono6 }: + +let + pname = "mission-planner"; + desktopItem = makeDesktopItem { + name = pname; + exec = pname; + icon = pname; + comment = "MissionPlanner GCS & Ardupilot configuration tool"; + desktopName = "MissionPlanner"; + genericName = "Ground Control Station"; + }; +in stdenv.mkDerivation rec { + inherit pname; + version = "1.3.74"; + + src = fetchurl { + url = "https://firmware.ardupilot.org/Tools/MissionPlanner/MissionPlanner-${version}.zip"; + sha256 = "1cgpmsmmnbzw1lwsdafp8yklk1rwc61yf12vc1ahcc6bl7q2385x"; + }; + + nativeBuildInputs = [ makeWrapper mono6 unzip ]; + sourceRoot = "."; + + AOT_FILES = [ "MissionPlanner.exe" "MissionPlanner.*.dll" ]; + + buildPhase = '' + runHook preBuild + for file in $AOT_FILES + do + mono --aot $file + done + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + mkdir -p $out/{bin,opt/mission-planner} + install -m 444 -D mpdesktop150.png $out/share/icons/mission-planner.png + cp -r ${desktopItem}/share/applications $out/share/ + mv * $out/opt/mission-planner + makeWrapper ${mono6}/bin/mono $out/bin/mission-planner \ + --add-flags $out/opt/mission-planner/MissionPlanner.exe + runHook postInstall + ''; + + meta = with stdenv.lib; { + description = "An ArduPilot ground station"; + longDescription = '' + Full-featured ground station application for the ArduPilot open source + autopilot project. Lets you both flash, configure and control ArduPilot + Plane, Copter and Rover targets. + ''; + homepage = "https://ardupilot.org/planner/"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ wucke13 ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/applications/science/robotics/qgroundcontrol/default.nix b/pkgs/applications/science/robotics/qgroundcontrol/default.nix index 8710b88ced36d..023a4fc8b6a3c 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.10"; + version = "4.0.11"; qtInputs = [ qtbase qtcharts qtlocation qtserialport qtsvg qtquickcontrols2 @@ -62,7 +62,7 @@ mkDerivation rec { owner = "mavlink"; repo = pname; rev = "v${version}"; - sha256 = "1jmhhd2nwxq3m9rzzmrjls8f6hhj52ia71b1sv4vvcjh802cha8g"; + sha256 = "14pk1vmcpg2cc5p100chbhnynclcwyqmyb2n2w11vvk0l2c9z1gz"; fetchSubmodules = true; }; diff --git a/pkgs/applications/terminal-emulators/foot/default.nix b/pkgs/applications/terminal-emulators/foot/default.nix index 3d95f7c5772dd..2b79c5362de19 100644 --- a/pkgs/applications/terminal-emulators/foot/default.nix +++ b/pkgs/applications/terminal-emulators/foot/default.nix @@ -1,35 +1,142 @@ -{ stdenv, fetchgit -, fcft, freetype, pixman, libxkbcommon, fontconfig, wayland -, meson, ninja, ncurses, scdoc, tllist, wayland-protocols, pkg-config +{ stdenv +, lib +, fetchzip +, fetchurl +, runCommandNoCC +, fcft +, freetype +, pixman +, libxkbcommon +, fontconfig +, wayland +, meson +, ninja +, ncurses +, scdoc +, tllist +, wayland-protocols +, pkg-config +, allowPgo ? true +, python3 # for PGO }: +let + version = "1.6.2"; + + # build stimuli file for PGO build and the script to generate it + # independently of the foot's build, so we can cache the result + # and avoid unnecessary rebuilds as it can take relatively long + # to generate + stimulusGenerator = stdenv.mkDerivation { + pname = "foot-generate-alt-random-writes"; + inherit version; + + src = fetchurl { + url = "https://codeberg.org/dnkl/foot/raw/tag/${version}/scripts/generate-alt-random-writes.py"; + sha256 = "0pnc5nvqrbgx5618ylrkrs9fyxjh4jcsbryfk6vlnk8x4wyyaibz"; + }; + + dontUnpack = true; + + buildInputs = [ python3 ]; + + installPhase = '' + install -Dm755 $src $out + ''; + }; + + stimuliFile = runCommandNoCC "pgo-stimulus-file" { } '' + ${stimulusGenerator} \ + --rows=67 --cols=135 \ + --scroll --scroll-region \ + --colors-regular --colors-bright --colors-256 --colors-rgb \ + --attr-bold --attr-italic --attr-underline \ + --sixel \ + --seed=2305843009213693951 \ + $out + ''; + + compilerName = + if stdenv.cc.isClang + then "clang" + else if stdenv.cc.isGNU + then "gcc" + else "unknown"; + + # https://codeberg.org/dnkl/foot/src/branch/master/INSTALL.md#performance-optimized-pgo + pgoCflags = { + "clang" = "-O3 -Wno-ignored-optimization-argument -Wno-profile-instr-out-of-date -Wno-profile-instr-unprofiled"; + "gcc" = "-O3 -Wno-missing-profile"; + }."${compilerName}"; + + # ar with lto support + ar = { + "clang" = "llvm-ar"; + "gcc" = "gcc-ar"; + "unknown" = "ar"; + }."${compilerName}"; + + # PGO only makes sense if we are not cross compiling and + # using a compiler which foot's PGO build supports (clang or gcc) + doPgo = allowPgo && (stdenv.hostPlatform == stdenv.buildPlatform) + && compilerName != "unknown"; +in stdenv.mkDerivation rec { pname = "foot"; - version = "1.5.1"; + inherit version; - src = fetchgit { - url = "https://codeberg.org/dnkl/foot.git"; - rev = version; - sha256 = "sha256-GAk2qkrgCNILJOeRcn1NT4t3w+R6WFTZ1goOhBEwKwc="; + src = fetchzip { + url = "https://codeberg.org/dnkl/${pname}/archive/${version}.tar.gz"; + sha256 = "08i3jmjky5s2nnc0c95c009cym91rs4sj4876sr4xnlkb7ab4812"; }; nativeBuildInputs = [ - meson ninja ncurses scdoc tllist wayland-protocols pkg-config - ]; + meson + ninja + ncurses + scdoc + tllist + wayland-protocols + pkg-config + ] ++ lib.optional stdenv.cc.isClang stdenv.cc.cc.llvm; + buildInputs = [ - fontconfig freetype pixman wayland libxkbcommon fcft + fontconfig + freetype + pixman + wayland + libxkbcommon + fcft ]; - # recommended build flags for foot as per INSTALL.md - # https://codeberg.org/dnkl/foot/src/branch/master/INSTALL.md#user-content-release-build + # recommended build flags for performance optimized foot builds + # https://codeberg.org/dnkl/foot/src/branch/master/INSTALL.md#release-build + CFLAGS = + if !doPgo + then "-O3 -fno-plt" + else pgoCflags; + + # ar with gcc plugins for lto objects preConfigure = '' - export CFLAGS+="-O3 -fno-plt" + export AR="${ar}" ''; mesonFlags = [ "--buildtype=release" "-Db_lto=true" ]; - meta = with stdenv.lib; { + # build and run binary generating PGO profiles, + # then reconfigure to build the normal foot binary utilizing PGO + preBuild = lib.optionalString doPgo '' + meson configure -Db_pgo=generate + ninja + ./pgo ${stimuliFile} ${stimuliFile} ${stimuliFile} + meson configure -Db_pgo=use + '' + lib.optionalString (doPgo && stdenv.cc.cc.pname == "clang") '' + llvm-profdata merge default_*profraw --output=default.profdata + ''; + + meta = with lib; { homepage = "https://codeberg.org/dnkl/foot/"; + changelog = "https://codeberg.org/dnkl/foot/releases/tag/${version}"; description = "A fast, lightweight and minimalistic Wayland terminal emulator"; license = licenses.mit; maintainers = [ maintainers.sternenseemann ]; diff --git a/pkgs/applications/terminal-emulators/germinal/default.nix b/pkgs/applications/terminal-emulators/germinal/default.nix new file mode 100644 index 0000000000000..b44e48fafae90 --- /dev/null +++ b/pkgs/applications/terminal-emulators/germinal/default.nix @@ -0,0 +1,55 @@ +{ stdenv +, fetchFromGitHub +, autoreconfHook +, pkg-config +, appstream-glib +, dbus +, pango +, pcre2 +, tmux +, vte +, wrapGAppsHook +}: + +stdenv.mkDerivation rec { + pname = "germinal"; + version = "26"; + + src = fetchFromGitHub { + owner = "Keruspe"; + repo = "Germinal"; + rev = "v${version}"; + sha256 = "sha256-HUi+skF4bJj5CY2cNTOC4tl7jhvpXYKqBx2rqKzjlo0="; + }; + + nativeBuildInputs = [ autoreconfHook pkg-config wrapGAppsHook ]; + buildInputs = [ + appstream-glib + dbus + pango + pcre2 + vte + ]; + + configureFlags = [ + "--with-dbusservicesdir=${placeholder "out"}/etc/dbus-1/system-services/" + ]; + + dontWrapGApps = true; + + fixupPhase = '' + runHook preFixup + wrapProgram $out/bin/germinal \ + --prefix PATH ":" "${stdenv.lib.makeBinPath [ tmux ]}" \ + "''${gappsWrapperArgs[@]}" + runHook postFixup + ''; + + meta = with stdenv.lib; { + description = "A minimal terminal emulator"; + homepage = "https://github.com/Keruspe/Germinal"; + license = with licenses; gpl3Plus; + platforms = with platforms; unix; + maintainers = with maintainers; [ AndersonTorres ]; + }; +} diff --git a/pkgs/applications/terminal-emulators/kitty/default.nix b/pkgs/applications/terminal-emulators/kitty/default.nix index b6a93aefb594f..2fa03a97e8bc9 100644 --- a/pkgs/applications/terminal-emulators/kitty/default.nix +++ b/pkgs/applications/terminal-emulators/kitty/default.nix @@ -21,14 +21,14 @@ with python3Packages; buildPythonApplication rec { pname = "kitty"; - version = "0.19.2"; + version = "0.19.3"; format = "other"; src = fetchFromGitHub { owner = "kovidgoyal"; repo = "kitty"; rev = "v${version}"; - sha256 = "06mlrc283k5f75y36fmmaxnj29jfc1s8vaykjph6a86m1gcl5wgi"; + sha256 = "0r49bybqy6c0n1lz6yc85py80wb40w757m60f5rszjf200wnyl6s"; }; buildInputs = [ diff --git a/pkgs/applications/terminal-emulators/tilda/default.nix b/pkgs/applications/terminal-emulators/tilda/default.nix index 0a672b039f6be..560a47a9cdb82 100644 --- a/pkgs/applications/terminal-emulators/tilda/default.nix +++ b/pkgs/applications/terminal-emulators/tilda/default.nix @@ -1,23 +1,35 @@ -{ stdenv, fetchFromGitHub, pkgconfig -, autoreconfHook, gettext, expat, pcre2 -, libconfuse, vte, gtk -, makeWrapper }: +{ stdenv +, fetchFromGitHub +, autoreconfHook +, pkg-config +, expat +, gettext +, gtk +, libconfuse +, pcre2 +, vte +, makeWrapper +}: -with stdenv.lib; stdenv.mkDerivation rec { - pname = "tilda"; - version = "1.5.2"; + version = "1.5.4"; src = fetchFromGitHub { owner = "lanoxx"; repo = "tilda"; rev = "${pname}-${version}"; - sha256 = "0psq0f4s0s92bba6wwcf6b0j7i59b76svqxhvpavwv53yvhmmamn"; + sha256 = "sha256-uDx28jmjNUyzJbgTJiHbjI9U5mYb9bnfl/9AjbxNUWA="; }; - nativeBuildInputs = [ autoreconfHook makeWrapper pkgconfig ]; - buildInputs = [ gettext pcre2 libconfuse vte gtk ]; + nativeBuildInputs = [ autoreconfHook makeWrapper pkg-config ]; + buildInputs = [ + gettext + gtk + libconfuse + pcre2 + vte + ]; LD_LIBRARY_PATH = "${expat.out}/lib"; # ugly hack for xgettext to work during build @@ -30,10 +42,10 @@ stdenv.mkDerivation rec { --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" ''; - meta = { + meta = with stdenv.lib; { description = "A Gtk based drop down terminal for Linux and Unix"; homepage = "https://github.com/lanoxx/tilda/"; - license = licenses.gpl3; + license = licenses.gpl3Plus; maintainers = [ maintainers.AndersonTorres ]; platforms = platforms.linux; }; diff --git a/pkgs/applications/terminal-emulators/wezterm/default.nix b/pkgs/applications/terminal-emulators/wezterm/default.nix new file mode 100644 index 0000000000000..a30afa1ce68ab --- /dev/null +++ b/pkgs/applications/terminal-emulators/wezterm/default.nix @@ -0,0 +1,108 @@ +{ stdenv +, rustPlatform +, lib +, fetchFromGitHub + +, pkg-config +, fontconfig +, python3 +, openssl +, perl + +# Apple frameworks +, CoreGraphics +, Cocoa +, Foundation + +, dbus +, libX11 +, xcbutil +, libxcb +, xcbutilkeysyms +, xcbutilwm # contains xcb-ewmh among others +, libxkbcommon +, libglvnd # libEGL.so.1 +, egl-wayland +, wayland +, libGLU +, libGL +, freetype +, zlib +}: +let + runtimeDeps = [ + zlib + fontconfig + freetype + ] ++ stdenv.lib.optionals (stdenv.isLinux) [ + libX11 + xcbutil + libxcb + xcbutilkeysyms + xcbutilwm + libxkbcommon + dbus + libglvnd + egl-wayland + wayland + libGLU + libGL + ] ++ stdenv.lib.optionals (stdenv.isDarwin) [ + Foundation + CoreGraphics + Cocoa + ]; + pname = "wezterm"; +in + +rustPlatform.buildRustPackage { + inherit pname; + version = "unstable-2020-11-22"; + + src = fetchFromGitHub { + owner = "wez"; + repo = pname; + rev = "3bd8d8c84591f4d015ff9a47ddb478e55c231fda"; + sha256 = "13xf3685kir4p159hsxrqkj9p2lwgfp0n13h9zadslrd44l8b8j8"; + fetchSubmodules = true; + }; + cargoSha256 = "1ghjpyd3f5dqi6bblr6d2lihdschpyj5djfd1600hvb41x75lmhx"; + + nativeBuildInputs = [ + pkg-config + python3 + openssl.dev + perl + ]; + + buildInputs = runtimeDeps; + + installPhase = '' + '' + stdenv.lib.optionalString stdenv.isLinux '' + for artifact in wezterm wezterm-gui wezterm-mux-server strip-ansi-escapes; do + patchelf --set-rpath "${lib.makeLibraryPath runtimeDeps}" $releaseDir/$artifact + install -D $releaseDir/$artifact -t $out/bin + done + '' + stdenv.lib.optionalString stdenv.isDarwin '' + mkdir -p "$out/Applications" + OUT_APP="$out/Applications/WezTerm.app" + cp -r assets/macos/WezTerm.app "$OUT_APP" + rm $OUT_APP/*.dylib + cp -r assets/shell-integration/* "$OUT_APP" + cp $releaseDir/wezterm "$OUT_APP" + cp $releaseDir/wezterm-mux-server "$OUT_APP" + cp $releaseDir/wezterm-gui "$OUT_APP" + cp $releaseDir/strip-ansi-escapes "$OUT_APP" + ''; + + # prevent further changes to the RPATH + dontPatchELF = true; + + meta = with lib; { + description = "A GPU-accelerated cross-platform terminal emulator and multiplexer written by @wez and implemented in Rust"; + homepage = "https://wezfurlong.org/wezterm"; + license = licenses.mit; + maintainers = with maintainers; [ steveej ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/applications/terminal-emulators/xterm/default.nix b/pkgs/applications/terminal-emulators/xterm/default.nix index 1ec704f5d4389..d06a66edf1af3 100644 --- a/pkgs/applications/terminal-emulators/xterm/default.nix +++ b/pkgs/applications/terminal-emulators/xterm/default.nix @@ -4,14 +4,14 @@ stdenv.mkDerivation rec { pname = "xterm"; - version = "362"; + version = "363"; src = fetchurl { urls = [ "ftp://ftp.invisible-island.net/xterm/${pname}-${version}.tgz" "https://invisible-mirror.net/archives/xterm/${pname}-${version}.tgz" ]; - sha256 = "HU/+Im+o8CGFm7wwB3iP9jpGoxJC2b2ae9fr4k6BrKI="; + sha256 = "2Bo2OeJlUrZ2W9zyi+Hs24rKv5B5VXCOgwrWOX6hC0g="; }; buildInputs = [ diff --git a/pkgs/applications/version-management/bumpver/default.nix b/pkgs/applications/version-management/bumpver/default.nix index 6aa4bcc52bc37..ded8f7ba69938 100644 --- a/pkgs/applications/version-management/bumpver/default.nix +++ b/pkgs/applications/version-management/bumpver/default.nix @@ -2,11 +2,11 @@ python3.pkgs.buildPythonApplication rec { pname = "bumpver"; - version = "2020.1107"; + version = "2020.1108"; src = python3.pkgs.fetchPypi { inherit pname version; - sha256 = "75704333a8d1699e2cadcf1fcd3027a2cab6837ae343af10a61c6eef4e0313d7"; + sha256 = "1bhbrq8fk8rsr78vq9xjz8v9lgv571va0nmg86dwmv6qnj6dymzm"; }; prePatch = '' diff --git a/pkgs/applications/version-management/dvc/default.nix b/pkgs/applications/version-management/dvc/default.nix index b9ac8b139cbb6..ac1659cccf8bf 100644 --- a/pkgs/applications/version-management/dvc/default.nix +++ b/pkgs/applications/version-management/dvc/default.nix @@ -41,7 +41,7 @@ buildPythonApplication rec { distro appdirs ] - ++ lib.optional enableGoogle google_cloud_storage + ++ lib.optional enableGoogle google-cloud-storage ++ lib.optional enableAWS boto3 ++ lib.optional enableAzure azure-storage-blob ++ lib.optional enableSSH paramiko; diff --git a/pkgs/applications/version-management/fossil/default.nix b/pkgs/applications/version-management/fossil/default.nix index f8ad81c605818..6d39ae0931cdb 100644 --- a/pkgs/applications/version-management/fossil/default.nix +++ b/pkgs/applications/version-management/fossil/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { pname = "fossil"; - version = "2.12.1"; + version = "2.13"; src = fetchurl { urls = @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { "https://www.fossil-scm.org/index.html/uv/fossil-src-${version}.tar.gz" ]; name = "${pname}-${version}.tar.gz"; - sha256 = "00v6gmn2wpfms5jzf103hkm5s8i3bfs5mzacmznlhdzdrzzjc8w2"; + sha256 = "1xbk7bb7340x2vvn22ykii54v721fwk8vgr3xvjkvv8ff7hd6cyr"; }; nativeBuildInputs = [ installShellFiles tcl ]; diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix index bf6591a8cb9c5..2b0efdf690469 100644 --- a/pkgs/applications/version-management/git-and-tools/default.nix +++ b/pkgs/applications/version-management/git-and-tools/default.nix @@ -38,6 +38,8 @@ let ghq = callPackage ./ghq { }; + ghr = callPackage ./ghr { }; + git = appendToName "minimal" gitBase; git-absorb = callPackage ./git-absorb { @@ -170,6 +172,8 @@ let inherit (darwin.apple_sdk.frameworks) Security; }; + git-when-merged = callPackage ./git-when-merged { }; + git-workspace = callPackage ./git-workspace { inherit (darwin.apple_sdk.frameworks) Security; }; @@ -201,6 +205,7 @@ let gitui = callPackage ./gitui { inherit (darwin.apple_sdk.frameworks) Security AppKit; + inherit (pkgs) openssl perl; }; glab = callPackage ./glab { }; diff --git a/pkgs/applications/version-management/git-and-tools/delta/default.nix b/pkgs/applications/version-management/git-and-tools/delta/default.nix index f667a7b6d8c11..465de2d1d2be8 100644 --- a/pkgs/applications/version-management/git-and-tools/delta/default.nix +++ b/pkgs/applications/version-management/git-and-tools/delta/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "delta"; - version = "0.4.4"; + version = "0.5.1"; src = fetchFromGitHub { owner = "dandavison"; repo = pname; rev = version; - sha256 = "1ng22g9h1l1v2yav8zh6w4nn6ifv8sfz8566m8155d0cza2iimw6"; + sha256 = "17cmwkha25hwsvnjcp388zd9kwacfq7adjp0sjw59y0vyr1maf22"; }; - cargoSha256 = "0b3qv1ksk8fmpawih2qrz29wlpj1gvq9hw4yqm7hdk6awl5h8lvv"; + cargoSha256 = "1bji818cmkl0286a4qcnfiwibnqd5q5fvzmzgk5cabrdwaag2ia5"; nativeBuildInputs = [ installShellFiles ]; @@ -34,6 +34,6 @@ rustPlatform.buildRustPackage rec { description = "A syntax-highlighting pager for git"; changelog = "https://github.com/dandavison/delta/releases/tag/${version}"; license = licenses.mit; - maintainers = with maintainers; [ marsam ma27 zowoq ]; + maintainers = with maintainers; [ marsam zowoq ]; }; } diff --git a/pkgs/applications/version-management/git-and-tools/gh/default.nix b/pkgs/applications/version-management/git-and-tools/gh/default.nix index 830d189665c65..7ba8a652d8065 100644 --- a/pkgs/applications/version-management/git-and-tools/gh/default.nix +++ b/pkgs/applications/version-management/git-and-tools/gh/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "gh"; - version = "1.3.1"; + version = "1.4.0"; src = fetchFromGitHub { owner = "cli"; repo = "cli"; rev = "v${version}"; - sha256 = "1j1nyx4ly87g0hk3hfw3qbykb64hrg3vg4r52z1w146v6ln7lm7h"; + sha256 = "08gxx9dwk24r1c5jkc9mqzcicxqmrdw0bi94nr517hk5cqsav2sl"; }; - vendorSha256 = "19gv7ggbry46h40d9sc5cqba95vjfknzdd1cn3xa5409qaczg9lg"; + vendorSha256 = "1ih7z883pffb6hnx51h8823d95b52d6dy1gk6ln7j25fqhcfvsy8"; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/applications/version-management/git-and-tools/ghr/default.nix b/pkgs/applications/version-management/git-and-tools/ghr/default.nix new file mode 100644 index 0000000000000..be6d64646a593 --- /dev/null +++ b/pkgs/applications/version-management/git-and-tools/ghr/default.nix @@ -0,0 +1,30 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "ghr"; + version = "0.13.0"; + + src = fetchFromGitHub { + owner = "tcnksm"; + repo = "ghr"; + rev = "v${version}"; + sha256 = "1nm5kdjkqayxh06j9nr5daic9sw9nx9w06y9gaqhdrw9byvjpr1a"; + }; + + vendorSha256 = "14avsngzhl1b8a05i43ph6sxh9vj0jls0acxr9j7r0h3f0vpamcj"; + + # Tests require a Github API token, and networking + doCheck = false; + doInstallCheck = true; + + installCheckPhase = '' + $out/bin/ghr --version + ''; + + meta = with lib; { + homepage = "https://github.com/tcnksm/ghr"; + description = "Upload multiple artifacts to GitHub Release in parallel"; + license = licenses.mit; + maintainers = [ maintainers.ivar ]; + }; +} diff --git a/pkgs/applications/version-management/git-and-tools/git-machete/default.nix b/pkgs/applications/version-management/git-and-tools/git-machete/default.nix index dac3c54a16a6b..3fb8b2f35e8d3 100644 --- a/pkgs/applications/version-management/git-and-tools/git-machete/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-machete/default.nix @@ -4,11 +4,11 @@ buildPythonApplication rec { pname = "git-machete"; - version = "2.15.7"; + version = "2.15.9"; src = fetchPypi { inherit pname version; - sha256 = "0djbl4s9i7bs7kkldr7453yayi38s8mx0i41mkd0j2cvv5r9himr"; + sha256 = "0sg9ci9q1v3975855vi491ass72ladp3bjj2mvg77yxj13g3qqsx"; }; nativeBuildInputs = [ installShellFiles pbr ]; diff --git a/pkgs/applications/version-management/git-and-tools/git-when-merged/default.nix b/pkgs/applications/version-management/git-and-tools/git-when-merged/default.nix new file mode 100644 index 0000000000000..8eee1469819d0 --- /dev/null +++ b/pkgs/applications/version-management/git-and-tools/git-when-merged/default.nix @@ -0,0 +1,40 @@ +{ stdenv, fetchFromGitHub, python3 }: + +stdenv.mkDerivation rec { + pname = "git-when-merged"; + version = "1.2.0"; + + src = fetchFromGitHub { + owner = "mhagger"; + repo = pname; + rev = "v${version}"; + sha256 = "0sw98gmsnd4iki9fx455jga9m80bxvvfgys8i1r2fc7d5whc2qa6"; + }; + + buildInputs = [ python3 ]; + + installPhase = '' + install -D --target-directory $out/bin/ bin/git-when-merged + ''; + + meta = with stdenv.lib; { + description = + "Helps you figure out when and why a commit was merged into a branch"; + longDescription = '' + If you use standard Git workflows, then you create a feature + branch for each feature that you are working on. When the feature + is complete, you merge it into your master branch. You might even + have sub-feature branches that are merged into a feature branch + before the latter is merged. + + In such a workflow, the first-parent history of master consists + mainly of merges of feature branches into the mainline. git + when-merged can be used to ask, "When (and why) was commit C + merged into the current branch?" + ''; + homepage = "https://github.com/mhagger/git-when-merged"; + license = licenses.gpl2Only; + platforms = python3.meta.platforms; + maintainers = with maintainers; [ DamienCassou ]; + }; +} diff --git a/pkgs/applications/version-management/git-and-tools/gitstatus/default.nix b/pkgs/applications/version-management/git-and-tools/gitstatus/default.nix index a99ff3c2e08c0..a6ca3126d5ce8 100644 --- a/pkgs/applications/version-management/git-and-tools/gitstatus/default.nix +++ b/pkgs/applications/version-management/git-and-tools/gitstatus/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "gitstatus"; - version = "1.4.3"; + version = "1.4.4"; src = fetchFromGitHub { owner = "romkatv"; repo = "gitstatus"; rev = "v${version}"; - sha256 = "0skpi22plzb9r9cgqfnjzpaz856q9f4n0gd5i97nv8bfny8hl30z"; + sha256 = "1w5kpca2v6iii912riywp1jscq7cpr5xv93mglr30pjnar1mk8gs"; }; buildInputs = [ (callPackage ./romkatv_libgit2.nix {}) ]; @@ -76,7 +76,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "10x faster implementation of `git status` command"; homepage = "https://github.com/romkatv/gitstatus"; - license = [ licenses.gpl3 ]; + license = licenses.gpl3Only; maintainers = with maintainers; [ mmlb hexa ]; }; } diff --git a/pkgs/applications/version-management/git-and-tools/gitui/default.nix b/pkgs/applications/version-management/git-and-tools/gitui/default.nix index 21e382a44bc87..f89349aaeaa5f 100644 --- a/pkgs/applications/version-management/git-and-tools/gitui/default.nix +++ b/pkgs/applications/version-management/git-and-tools/gitui/default.nix @@ -1,20 +1,20 @@ -{ stdenv, rustPlatform, fetchFromGitHub, libiconv, xorg, python3, Security, AppKit }: +{ stdenv, rustPlatform, fetchFromGitHub, libiconv, perl, python3, Security, AppKit, openssl, xclip }: rustPlatform.buildRustPackage rec { pname = "gitui"; - version = "0.10.1"; + version = "0.11.0"; src = fetchFromGitHub { owner = "extrawurst"; repo = pname; rev = "v${version}"; - sha256 = "1ifwbi6nydh66z6cprjmz2qvy9z52rj9jg2xf054i249gy955hah"; + sha256 = "0yq98jslbac87zdzlwqc2kcd6hqy2wnza3l8n3asss1iaqcb0ilh"; }; - cargoSha256 = "1454dn7k1fc4yxhbcmx0z3hj9d9srnlc2k1qp707h1vq46ib1rsf"; + cargoSha256 = "16riggrhk1f6lg8y46wn89ab5b1iz6lw00ngid20x4z32d2ww70f"; - nativeBuildInputs = [ python3 ]; - buildInputs = [ ] - ++ stdenv.lib.optional stdenv.isLinux xorg.libxcb + nativeBuildInputs = [ python3 perl ]; + buildInputs = [ openssl ] + ++ stdenv.lib.optional stdenv.isLinux xclip ++ stdenv.lib.optionals stdenv.isDarwin [ libiconv Security AppKit ]; meta = with stdenv.lib; { diff --git a/pkgs/applications/version-management/git-and-tools/hub/default.nix b/pkgs/applications/version-management/git-and-tools/hub/default.nix index be81364279710..788512df85cda 100644 --- a/pkgs/applications/version-management/git-and-tools/hub/default.nix +++ b/pkgs/applications/version-management/git-and-tools/hub/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchFromGitHub, groff, installShellFiles, util-linux }: +{ stdenv, buildGoPackage, fetchFromGitHub, git, groff, installShellFiles, util-linux, nixosTests }: buildGoPackage rec { pname = "hub"; @@ -20,6 +20,8 @@ buildGoPackage rec { postPatch = '' patchShebangs . + substituteInPlace git/git.go --replace "cmd.New(\"git\")" "cmd.New(\"${git}/bin/git\")" + substituteInPlace commands/args.go --replace "Executable: \"git\"" "Executable: \"${git}/bin/git\"" ''; postInstall = '' @@ -33,6 +35,8 @@ buildGoPackage rec { installManPage share/man/man[1-9]/*.[1-9] ''; + passthru.tests = { inherit (nixosTests) hub; }; + meta = with stdenv.lib; { description = "Command-line wrapper for git that makes you better at GitHub"; license = licenses.mit; diff --git a/pkgs/applications/version-management/git-and-tools/lab/default.nix b/pkgs/applications/version-management/git-and-tools/lab/default.nix index 3459f5099c970..437529cd73ad6 100644 --- a/pkgs/applications/version-management/git-and-tools/lab/default.nix +++ b/pkgs/applications/version-management/git-and-tools/lab/default.nix @@ -1,32 +1,32 @@ -{ lib, buildGoModule, fetchFromGitHub, makeWrapper, xdg_utils }: +{ lib, buildGoModule, fetchFromGitHub, makeWrapper, xdg_utils, installShellFiles, git }: buildGoModule rec { pname = "lab"; - version = "0.17.2"; + version = "0.18.0"; src = fetchFromGitHub { owner = "zaquestion"; repo = "lab"; rev = "v${version}"; - sha256 = "0zkwvmzgj7h8lc8jkg2a81392b28c8hkwqzj6dds6q4asbmymx5c"; + sha256 = "1vl5ylix4h6z1vrdslv9qphgb6yqpqd4r54jzk5kd6zgrnf9c2zc"; }; subPackages = [ "." ]; - vendorSha256 = "1lrmafvv5zfn9kc0p8g5vdz351n1zbaqwhwk861fxys0rdpqskyc"; + vendorSha256 = "07zl5xhzgrgr5skba6cds5nal58pllf10gak0ap62j1k9gk2ych2"; doCheck = false; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper installShellFiles ]; buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ]; postInstall = '' - mkdir -p "$out/share/bash-completion/completions" "$out/share/zsh/site-functions" - export LAB_CORE_HOST=a LAB_CORE_USER=b LAB_CORE_TOKEN=c - $out/bin/lab completion bash > $out/share/bash-completion/completions/lab - $out/bin/lab completion zsh > $out/share/zsh/site-functions/_lab - wrapProgram $out/bin/lab --prefix PATH ":" "${lib.makeBinPath [ xdg_utils ]}"; + wrapProgram $out/bin/lab --prefix PATH ":" "${lib.makeBinPath [ git xdg_utils ]}"; + for shell in bash fish zsh; do + $out/bin/lab completion $shell > lab.$shell + installShellCompletion lab.$shell + done ''; meta = with lib; { diff --git a/pkgs/applications/version-management/git-and-tools/radicle-upstream/default.nix b/pkgs/applications/version-management/git-and-tools/radicle-upstream/default.nix new file mode 100644 index 0000000000000..9f0949aef5299 --- /dev/null +++ b/pkgs/applications/version-management/git-and-tools/radicle-upstream/default.nix @@ -0,0 +1,64 @@ +{ stdenv, appimageTools, gsettings-desktop-schemas, gtk3, autoPatchelfHook, zlib, fetchurl }: + +let + pname = "radicle-upstream"; + version = "0.1.6"; + name = "${pname}-${version}"; + + src = fetchurl { + url = "https://releases.radicle.xyz/radicle-upstream-${version}.AppImage"; + sha256 = "1s299rxala6gqj69j5q4d4n5wfdk2zsb4r9qrhml0m79b4f79yar"; + }; + + contents = appimageTools.extractType2 { inherit name src; }; + + git-remote-rad = stdenv.mkDerivation rec { + pname = "git-remote-rad"; + inherit version; + src = contents; + + nativeBuildInputs = [ autoPatchelfHook ]; + buildInputs = [ zlib ]; + + installPhase = '' + mkdir -p $out/bin/ + cp ${contents}/resources/git-remote-rad $out/bin/git-remote-rad + ''; + }; +in + +# FIXME: a dependency of the `proxy` component of radicle-upstream (radicle-macros +# v0.1.0) uses unstable rust features, making a from source build impossible at +# this time. See this PR for discussion: https://github.com/NixOS/nixpkgs/pull/105674 +appimageTools.wrapType2 { + inherit name src; + + profile = '' + export XDG_DATA_DIRS=${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}:${gtk3}/share/gsettings-schemas/${gtk3.name}:$XDG_DATA_DIRS + ''; + + extraInstallCommands = '' + mv $out/bin/${name} $out/bin/${pname} + + # this automatically adds the git-remote-rad binary to the users `PATH` so + # they don't need to mess around with shell profiles... + ln -s ${git-remote-rad}/bin/git-remote-rad $out/bin/git-remote-rad + + # desktop item + install -m 444 -D ${contents}/${pname}.desktop $out/share/applications/${pname}.desktop + substituteInPlace $out/share/applications/${pname}.desktop \ + --replace 'Exec=AppRun' 'Exec=${pname}' + + # icon + install -m 444 -D ${contents}/${pname}.png \ + $out/share/icons/hicolor/512x512/apps/${pname}.png + ''; + + meta = with stdenv.lib; { + description = "A decentralized app for code collaboration"; + homepage = "https://radicle.xyz/"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ xwvvvvwx ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/applications/version-management/git-repo/default.nix b/pkgs/applications/version-management/git-repo/default.nix index db18e765b0092..56e4f30d9279c 100644 --- a/pkgs/applications/version-management/git-repo/default.nix +++ b/pkgs/applications/version-management/git-repo/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "git-repo"; - version = "2.10"; + version = "2.11"; src = fetchFromGitHub { owner = "android"; repo = "tools_repo"; rev = "v${version}"; - sha256 = "0jd28281wys2iy7pbyyrzkzrkzq9ms7p9pbj6j2fha6bg1bh7rkz"; + sha256 = "sha256-eb35yNsE0F+xPA1j7Czag1aOZO4cr6OeRsBlCrQwCRk="; }; patches = [ ./import-ssl-module.patch ]; diff --git a/pkgs/applications/version-management/gitea/default.nix b/pkgs/applications/version-management/gitea/default.nix index 340ab283bf6e6..ffbeb050956d2 100644 --- a/pkgs/applications/version-management/gitea/default.nix +++ b/pkgs/applications/version-management/gitea/default.nix @@ -8,11 +8,11 @@ with stdenv.lib; buildGoPackage rec { pname = "gitea"; - version = "1.13.0"; + version = "1.13.1"; src = fetchurl { url = "https://github.com/go-gitea/gitea/releases/download/v${version}/gitea-src-${version}.tar.gz"; - sha256 = "090i4hk9mb66ia14kyp7rqymhc897yi1ifb0skvknylx0sw8vhk9"; + sha256 = "sha256-tah7ciq+jkkROJq/V+yPRtWPuWaSnf5hKndjnifsQYc="; }; unpackPhase = '' diff --git a/pkgs/applications/version-management/gitlab/data.json b/pkgs/applications/version-management/gitlab/data.json index 866b7efa4236b..c6d4401fde4a3 100644 --- a/pkgs/applications/version-management/gitlab/data.json +++ b/pkgs/applications/version-management/gitlab/data.json @@ -1,13 +1,13 @@ { - "version": "13.6.1", - "repo_hash": "0kfh9ngykrnvvjpx4m69pfyfvsvvqfxzlxhm8dgx9ypz4bpmr947", + "version": "13.7.1", + "repo_hash": "13bbi9ps6z8q9di9gni2ckydgfk7pxkaqf0wgx8gfwm80sc7s0km", "owner": "gitlab-org", "repo": "gitlab", - "rev": "v13.6.1-ee", + "rev": "v13.7.1-ee", "passthru": { - "GITALY_SERVER_VERSION": "13.6.1", - "GITLAB_PAGES_VERSION": "1.30.0", - "GITLAB_SHELL_VERSION": "13.13.0", - "GITLAB_WORKHORSE_VERSION": "8.54.0" + "GITALY_SERVER_VERSION": "13.7.1", + "GITLAB_PAGES_VERSION": "1.32.0", + "GITLAB_SHELL_VERSION": "13.14.0", + "GITLAB_WORKHORSE_VERSION": "8.58.0" } } diff --git a/pkgs/applications/version-management/gitlab/gitaly/Gemfile b/pkgs/applications/version-management/gitlab/gitaly/Gemfile index d8564dca87795..0a7fcd7c260d7 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/Gemfile +++ b/pkgs/applications/version-management/gitlab/gitaly/Gemfile @@ -1,7 +1,7 @@ source 'https://rubygems.org' gem 'rugged', '~> 0.28' -gem 'github-linguist', '~> 7.11', require: 'linguist' +gem 'github-linguist', '~> 7.12', require: 'linguist' gem 'gitlab-markup', '~> 1.7.1' gem 'activesupport', '~> 6.0.3.3' gem 'rdoc', '~> 6.0' diff --git a/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock b/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock index a633e067f0d9c..eb5c86946d7a7 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock +++ b/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock @@ -45,7 +45,7 @@ GEM ffi (1.13.1) gemojione (3.3.0) json - github-linguist (7.11.0) + github-linguist (7.12.1) charlock_holmes (~> 0.7.7) escape_utils (~> 1.2.0) mini_mime (~> 1.0) @@ -134,7 +134,7 @@ GEM redis (4.1.3) regexp_parser (1.8.1) rexml (3.2.4) - rouge (3.24.0) + rouge (3.26.0) rspec (3.8.0) rspec-core (~> 3.8.0) rspec-expectations (~> 3.8.0) @@ -197,7 +197,7 @@ DEPENDENCIES activesupport (~> 6.0.3.3) factory_bot faraday (~> 1.0) - github-linguist (~> 7.11) + github-linguist (~> 7.12) gitlab-gollum-lib (~> 4.2.7.9) gitlab-gollum-rugged_adapter (~> 0.4.4.2) gitlab-labkit (~> 0.13.2) diff --git a/pkgs/applications/version-management/gitlab/gitaly/default.nix b/pkgs/applications/version-management/gitlab/gitaly/default.nix index 57465f808df5d..e8c99198df40e 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/default.nix +++ b/pkgs/applications/version-management/gitlab/gitaly/default.nix @@ -4,6 +4,18 @@ , libgit2, openssl, zlib, pcre, http-parser }: let + # libgit2 was updated to 1.1.0 in nixpkgs, but gitlab doesn't support that yet. + # See https://github.com/NixOS/nixpkgs/pull/106909 + libgit = libgit2.overrideAttrs (attrs: rec { + version = "1.0.0"; + src = fetchFromGitHub { + owner = "libgit2"; + repo = "libgit2"; + rev = "v${version}"; + sha256 = "06cwrw93ycpfb5kisnsa5nsy95pm11dbh0vvdjg1jn25h9q5d3vc"; + }; + }); + rubyEnv = bundlerEnv rec { name = "gitaly-env"; inherit ruby; @@ -21,17 +33,17 @@ let }; }; in buildGoModule rec { - version = "13.6.1"; + version = "13.7.1"; pname = "gitaly"; src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitaly"; rev = "v${version}"; - sha256 = "02w7pf7l9sr2nk8ky9b0d5b4syx3d9my65h2kzvh2afk7kv35h5y"; + sha256 = "1zmjll7sdan8kc7bq5vjaiyqwzlh5zmx1g4ql4dqmnwscpn1avjb"; }; - vendorSha256 = "15mx5g2wa93sajbdwh58wcspg0n51d1ciwb7f15d0nm5hspz3w9r"; + vendorSha256 = "15i1ajvrff1bfpv3kmb1wm1mmriswwfw2v4cml0nv0zp6a5n5187"; passthru = { inherit rubyEnv; @@ -39,7 +51,7 @@ in buildGoModule rec { buildFlags = [ "-tags=static,system_libgit2" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ rubyEnv.wrappedRuby libgit2 openssl zlib pcre http-parser ]; + buildInputs = [ rubyEnv.wrappedRuby libgit openssl zlib pcre http-parser ]; doCheck = false; postInstall = '' diff --git a/pkgs/applications/version-management/gitlab/gitaly/gemset.nix b/pkgs/applications/version-management/gitlab/gitaly/gemset.nix index 9cdadec5d4fb2..fe05c1d017843 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/gemset.nix +++ b/pkgs/applications/version-management/gitlab/gitaly/gemset.nix @@ -207,10 +207,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "12vwx6msqqdyf10zrrp2zdwr8ixrb82phriyin16rsmndb93cijv"; + sha256 = "08lnb04qmlz4arls3nr3ia0k8r1kcyn010fr5qvc2qddidckqk88"; type = "gem"; }; - version = "7.11.0"; + version = "7.12.1"; }; github-markup = { source = { @@ -645,10 +645,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1igl00gk0vaq4xxk44m7yflqdzsblgxlzcxj8saz96bmx7mg7392"; + sha256 = "0b4b300i3m4m4kw7w1n9wgxwy16zccnb7271miksyzd0wq5b9pm3"; type = "gem"; }; - version = "3.24.0"; + version = "3.26.0"; }; rspec = { dependencies = ["rspec-core" "rspec-expectations" "rspec-mocks"]; diff --git a/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix b/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix index e2dd35ff3319b..14f7ce0f81e84 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix +++ b/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix @@ -2,12 +2,12 @@ buildGoModule rec { pname = "gitlab-shell"; - version = "13.13.0"; + version = "13.14.0"; src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-shell"; rev = "v${version}"; - sha256 = "1zx7x3g18xzw7fs7cayd20llxabv5r93m2mp6ixgr99ksvi6zix7"; + sha256 = "171c4rfffb73198fhlwk8rq7xy4b4zrnssi8c1wd0x82kqv6csb0"; }; buildInputs = [ ruby ]; diff --git a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix index a0f80533caa04..e536d4fcbb1e3 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix +++ b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix @@ -3,16 +3,16 @@ buildGoModule rec { pname = "gitlab-workhorse"; - version = "8.54.0"; + version = "8.58.0"; src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-workhorse"; rev = "v${version}"; - sha256 = "0fz00sl9q4d3vbslh7y9nsnhjshgfg0x7mv7b7a9sc3mxmabp7gz"; + sha256 = "1642vxxqnpccjzfls3vz4l62kvksk6irwv1dhjcxv1cppbr9hz80"; }; - vendorSha256 = "0wi6vj9phwh0bsdk2lrgq807nb90iivlm0bkdjkim06jq068mizj"; + vendorSha256 = "0vkw12w7vr0g4hf4f0im79y7l36d3ah01n1vl7siy94si47g8ir5"; buildInputs = [ git ]; buildFlagsArray = "-ldflags=-X main.Version=${version}"; doCheck = false; diff --git a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile index d60fefe29dca0..49d0841be3cd8 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile +++ b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile @@ -66,7 +66,7 @@ gem 'attr_encrypted', '~> 3.1.0' gem 'u2f', '~> 0.2.1' # GitLab Pages -gem 'validates_hostname', '~> 1.0.10' +gem 'validates_hostname', '~> 1.0.11' gem 'rubyzip', '~> 2.0.0', require: 'zip' # GitLab Pages letsencrypt support gem 'acme-client', '~> 2.0', '>= 2.0.6' @@ -115,11 +115,11 @@ gem 'carrierwave', '~> 1.3' gem 'mini_magick', '~> 4.10.1' # for backups -gem 'fog-aws', '~> 3.5' +gem 'fog-aws', '~> 3.7' # Locked until fog-google resolves https://github.com/fog/fog-google/issues/421. # Also see config/initializers/fog_core_patch.rb. gem 'fog-core', '= 2.1.0' -gem 'fog-google', '~> 1.11' +gem 'fog-google', '~> 1.12' gem 'fog-local', '~> 0.6' gem 'fog-openstack', '~> 1.0' gem 'fog-rackspace', '~> 0.1.1' @@ -149,7 +149,7 @@ gem 'html-pipeline', '~> 2.12' gem 'deckar01-task_list', '2.3.1' gem 'gitlab-markup', '~> 1.7.1' gem 'github-markup', '~> 1.7.0', require: 'github/markup' -gem 'commonmarker', '~> 0.20' +gem 'commonmarker', '~> 0.21' gem 'kramdown', '~> 2.3.0' gem 'RedCloth', '~> 4.3.2' gem 'rdoc', '~> 6.1.2' @@ -159,7 +159,8 @@ gem 'wikicloth', '0.8.1' gem 'asciidoctor', '~> 2.0.10' gem 'asciidoctor-include-ext', '~> 0.3.1', require: false gem 'asciidoctor-plantuml', '~> 0.0.12' -gem 'rouge', '~> 3.25.0' +gem 'asciidoctor-kroki', '~> 0.2.2', require: false +gem 'rouge', '~> 3.26.0' gem 'truncato', '~> 0.7.11' gem 'bootstrap_form', '~> 4.2.0' gem 'nokogiri', '~> 1.10.9' @@ -209,7 +210,7 @@ gem 'httparty', '~> 0.16.4' gem 'rainbow', '~> 3.0' # Progress bar -gem 'ruby-progressbar' +gem 'ruby-progressbar', '~> 1.10' # GitLab settings gem 'settingslogic', '~> 2.0.9' @@ -291,7 +292,6 @@ gem 'sassc-rails', '~> 2.1.0' gem 'terser', '1.0.2' gem 'addressable', '~> 2.7' -gem 'font-awesome-rails', '~> 4.7' gem 'gemojione', '~> 3.3' gem 'gon', '~> 6.2' gem 'request_store', '~> 1.5' @@ -311,7 +311,7 @@ gem 'gitlab-pg_query', '~> 1.3', require: 'pg_query' gem 'premailer-rails', '~> 1.10.3' # LabKit: Tracing and Correlation -gem 'gitlab-labkit', '0.13.1' +gem 'gitlab-labkit', '0.13.3' # I18n gem 'ruby_parser', '~> 3.15', require: false @@ -351,6 +351,7 @@ group :development do end group :development, :test do + gem 'deprecation_toolkit', '~> 1.5.1', require: false gem 'bullet', '~> 6.1.0' gem 'pry-byebug', '~> 3.9.0', platform: :mri gem 'pry-rails', '~> 0.3.9' @@ -370,7 +371,7 @@ group :development, :test do gem 'spring', '~> 2.1.0' gem 'spring-commands-rspec', '~> 1.0.4' - gem 'gitlab-styles', '~> 5.1.0', require: false + gem 'gitlab-styles', '~> 5.3.0', require: false gem 'scss_lint', '~> 0.59.0', require: false gem 'haml_lint', '~> 0.36.0', require: false @@ -428,7 +429,7 @@ end gem 'octokit', '~> 4.15' # https://gitlab.com/gitlab-org/gitlab/issues/207207 -gem 'gitlab-mail_room', '~> 0.0.7', require: 'mail_room' +gem 'gitlab-mail_room', '~> 0.0.8', require: 'mail_room' gem 'email_reply_trimmer', '~> 0.1' gem 'html2text' @@ -464,7 +465,7 @@ group :ed25519 do end # Gitaly GRPC protocol definitions -gem 'gitaly', '~> 13.5.0-rc2' +gem 'gitaly', '~> 13.7.0.pre.rc1' gem 'grpc', '~> 1.30.2' @@ -477,6 +478,7 @@ gem 'flipper', '~> 0.17.1' gem 'flipper-active_record', '~> 0.17.1' gem 'flipper-active_support_cache_store', '~> 0.17.1' gem 'unleash', '~> 0.1.5' +gem 'gitlab-experiment', '~> 0.4.4' # Structured logging gem 'lograge', '~> 0.5' diff --git a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock index 64179847dd8cf..1cd90080fd878 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock +++ b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock @@ -84,6 +84,8 @@ GEM asciidoctor (2.0.10) asciidoctor-include-ext (0.3.1) asciidoctor (>= 1.5.6, < 3.0.0) + asciidoctor-kroki (0.2.2) + asciidoctor (~> 2.0) asciidoctor-plantuml (0.0.12) asciidoctor (>= 1.5.6, < 3.0.0) ast (2.4.1) @@ -177,7 +179,7 @@ GEM open4 (~> 1.3) coderay (1.1.3) colored2 (3.1.2) - commonmarker (0.20.1) + commonmarker (0.21.0) ruby-enum (~> 0.5) concord (0.1.5) adamantium (~> 0.2.0) @@ -220,10 +222,12 @@ GEM debugger-ruby_core_source (1.3.8) deckar01-task_list (2.3.1) html-pipeline - declarative (0.0.10) + declarative (0.0.20) declarative-option (0.1.0) default_value_for (3.3.0) activerecord (>= 3.2.0, < 6.1) + deprecation_toolkit (1.5.1) + activesupport (>= 4.2) derailed_benchmarks (1.7.0) benchmark-ips (~> 2) get_process_mem (~> 0) @@ -359,7 +363,7 @@ GEM fog-json ipaddress (~> 0.8) xml-simple (~> 1.1) - fog-aws (3.5.2) + fog-aws (3.7.0) fog-core (~> 2.1) fog-json (~> 1.1) fog-xml (~> 0.1) @@ -369,11 +373,11 @@ GEM excon (~> 0.58) formatador (~> 0.2) mime-types - fog-google (1.11.0) + fog-google (1.12.0) fog-core (<= 2.1.0) fog-json (~> 1.2) fog-xml (~> 0.1.0) - google-api-client (>= 0.32, < 0.34) + google-api-client (>= 0.44.2, < 0.51) google-cloud-env (~> 1.2) fog-json (1.2.0) fog-core @@ -392,8 +396,6 @@ GEM fog-xml (0.1.3) fog-core nokogiri (>= 1.5.11, < 2.0.0) - font-awesome-rails (4.7.0.5) - railties (>= 3.2, < 6.1) formatador (0.2.5) fugit (1.2.1) et-orbi (~> 1.1, >= 1.1.8) @@ -418,11 +420,14 @@ GEM rails (>= 3.2.0) git (1.7.0) rchardet (~> 1.8) - gitaly (13.5.0.pre.rc2) + gitaly (13.7.0.pre.rc1) grpc (~> 1.0) github-markup (1.7.0) gitlab-chronic (0.10.5) numerizer (~> 0.2) + gitlab-experiment (0.4.4) + activesupport (>= 3.0) + scientist (~> 1.5, >= 1.5.0) gitlab-fog-azure-rm (1.0.0) azure-storage-blob (~> 2.0) azure-storage-common (~> 2.0) @@ -430,15 +435,16 @@ GEM fog-json (~> 1.2.0) mime-types ms_rest_azure (~> 0.12.0) - gitlab-labkit (0.13.1) + gitlab-labkit (0.13.3) actionpack (>= 5.0.0, < 6.1.0) activesupport (>= 5.0.0, < 6.1.0) + gitlab-pg_query (~> 1.3) grpc (~> 1.19) jaeger-client (~> 1.1) opentracing (~> 0.4) redis (> 3.0.0, < 5.0.0) gitlab-license (1.0.0) - gitlab-mail_room (0.0.7) + gitlab-mail_room (0.0.8) gitlab-markup (1.7.1) gitlab-net-dns (0.9.1) gitlab-pg_query (1.3.0) @@ -449,7 +455,7 @@ GEM gitlab-puma (>= 2.7, < 5) gitlab-sidekiq-fetcher (0.5.2) sidekiq (~> 5) - gitlab-styles (5.1.0) + gitlab-styles (5.3.0) rubocop (~> 0.89.1) rubocop-gitlab-security (~> 0.1.0) rubocop-performance (~> 1.8.1) @@ -468,20 +474,21 @@ GEM actionpack (>= 3.0) multi_json request_store (>= 1.0) - google-api-client (0.33.2) + google-api-client (0.50.0) addressable (~> 2.5, >= 2.5.1) googleauth (~> 0.9) httpclient (>= 2.8.1, < 3.0) mini_mime (~> 1.0) representable (~> 3.0) retriable (>= 2.0, < 4.0) + rexml signet (~> 0.12) google-cloud-env (1.4.0) faraday (>= 0.17.3, < 2.0) google-protobuf (3.12.4) googleapis-common-protos-types (1.0.5) google-protobuf (~> 3.11) - googleauth (0.12.0) + googleauth (0.14.0) faraday (>= 0.17.3, < 2.0) jwt (>= 1.4, < 3.0) memoist (~> 0.16) @@ -691,7 +698,7 @@ GEM marginalia (1.9.0) actionpack (>= 2.3) activerecord (>= 2.3) - memoist (0.16.0) + memoist (0.16.2) memoizable (0.4.2) thread_safe (~> 0.3, >= 0.3.1) memory_profiler (0.9.14) @@ -832,7 +839,7 @@ GEM org-ruby (0.9.12) rubypants (~> 0.2) orm_adapter (0.5.0) - os (1.0.0) + os (1.1.1) parallel (1.19.2) parser (2.7.2.0) ast (~> 2.4.1) @@ -977,7 +984,7 @@ GEM rexml (3.2.4) rinku (2.0.0) rotp (2.1.2) - rouge (3.25.0) + rouge (3.26.0) rqrcode (0.7.0) chunky_png rqrcode-rails3 (0.1.7) @@ -1041,7 +1048,7 @@ GEM rubocop-rspec (1.44.1) rubocop (~> 0.87) rubocop-ast (>= 0.7.1) - ruby-enum (0.7.2) + ruby-enum (0.8.0) i18n ruby-fogbugz (0.2.1) crack (~> 0.4) @@ -1081,6 +1088,7 @@ GEM sawyer (0.8.2) addressable (>= 2.3.5) faraday (> 0.8, < 2.0) + scientist (1.5.0) scss_lint (0.59.0) sass (~> 3.5, >= 3.5.5) securecompare (1.0.0) @@ -1215,7 +1223,7 @@ GEM validate_url (1.0.8) activemodel (>= 3.0.0) public_suffix - validates_hostname (1.0.10) + validates_hostname (1.0.11) activerecord (>= 3.0) activesupport (>= 3.0) version_sorter (2.2.4) @@ -1267,6 +1275,7 @@ DEPENDENCIES asana (= 0.10.2) asciidoctor (~> 2.0.10) asciidoctor-include-ext (~> 0.3.1) + asciidoctor-kroki (~> 0.2.2) asciidoctor-plantuml (~> 0.0.12) atlassian-jwt (~> 0.2.0) attr_encrypted (~> 3.1.0) @@ -1292,7 +1301,7 @@ DEPENDENCIES capybara-screenshot (~> 1.0.22) carrierwave (~> 1.3) charlock_holmes (~> 0.7.7) - commonmarker (~> 0.20) + commonmarker (~> 0.21) concurrent-ruby (~> 1.1) connection_pool (~> 2.0) countries (~> 3.0) @@ -1302,6 +1311,7 @@ DEPENDENCIES database_cleaner (~> 1.7.0) deckar01-task_list (= 2.3.1) default_value_for (~> 3.3.0) + deprecation_toolkit (~> 1.5.1) derailed_benchmarks device_detector devise (~> 4.7.2) @@ -1329,33 +1339,33 @@ DEPENDENCIES flipper-active_support_cache_store (~> 0.17.1) flowdock (~> 0.7) fog-aliyun (~> 0.3) - fog-aws (~> 3.5) + fog-aws (~> 3.7) fog-core (= 2.1.0) - fog-google (~> 1.11) + fog-google (~> 1.12) fog-local (~> 0.6) fog-openstack (~> 1.0) fog-rackspace (~> 0.1.1) - font-awesome-rails (~> 4.7) fugit (~> 1.2.1) fuubar (~> 2.2.0) gemojione (~> 3.3) gettext (~> 3.3) gettext_i18n_rails (~> 1.8.0) gettext_i18n_rails_js (~> 1.3) - gitaly (~> 13.5.0.pre.rc2) + gitaly (~> 13.7.0.pre.rc1) github-markup (~> 1.7.0) gitlab-chronic (~> 0.10.5) + gitlab-experiment (~> 0.4.4) gitlab-fog-azure-rm (~> 1.0) - gitlab-labkit (= 0.13.1) + gitlab-labkit (= 0.13.3) gitlab-license (~> 1.0) - gitlab-mail_room (~> 0.0.7) + gitlab-mail_room (~> 0.0.8) gitlab-markup (~> 1.7.1) gitlab-net-dns (~> 0.9.1) gitlab-pg_query (~> 1.3) gitlab-puma (~> 4.3.3.gitlab.2) gitlab-puma_worker_killer (~> 0.1.1.gitlab.1) gitlab-sidekiq-fetcher (= 0.5.2) - gitlab-styles (~> 5.1.0) + gitlab-styles (~> 5.3.0) gitlab_chronic_duration (~> 0.10.6.2) gitlab_omniauth-ldap (~> 2.1.1) gon (~> 6.2) @@ -1468,7 +1478,7 @@ DEPENDENCIES request_store (~> 1.5) responders (~> 3.0) retriable (~> 3.1.2) - rouge (~> 3.25.0) + rouge (~> 3.26.0) rqrcode-rails3 (~> 0.1.7) rspec-parameterized rspec-rails (~> 4.0.0) @@ -1477,7 +1487,7 @@ DEPENDENCIES rspec_profiling (~> 0.0.6) ruby-fogbugz (~> 0.2.1) ruby-prof (~> 1.3.0) - ruby-progressbar + ruby-progressbar (~> 1.10) ruby_parser (~> 3.15) rubyzip (~> 2.0.0) rugged (~> 0.28) @@ -1515,7 +1525,7 @@ DEPENDENCIES unicorn-worker-killer (~> 0.4.4) unleash (~> 0.1.5) valid_email (~> 0.1) - validates_hostname (~> 1.0.10) + validates_hostname (~> 1.0.11) version_sorter (~> 2.2.4) vmstat (~> 2.3.0) webauthn (~> 2.3) diff --git a/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix b/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix index 651b418234c4f..ebb3fe5b740af 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix +++ b/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix @@ -258,6 +258,17 @@ }; version = "0.3.1"; }; + asciidoctor-kroki = { + dependencies = ["asciidoctor"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "10yc07x2z9f122wnncf34s91vlfcd4wy8y9wshxc7j2m4a2jlzm5"; + type = "gem"; + }; + version = "0.2.2"; + }; asciidoctor-plantuml = { dependencies = ["asciidoctor"]; groups = ["default"]; @@ -762,10 +773,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "19zd9na1g2d0zzbqhmfj8rjfzcxj34vja3i52gvv859i8fifa461"; + sha256 = "0vwpkmwfr8lx8b6cfvwh56f1ygyf2da5ah37mxbdr9mxmfwig5fr"; type = "gem"; }; - version = "0.20.1"; + version = "0.21.0"; }; concord = { dependencies = ["adamantium" "equalizer"]; @@ -955,10 +966,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0642xvwzzbgi3kp1bg467wma4g3xqrrn0sk369hjam7w579gnv5j"; + sha256 = "1yczgnqrbls7shrg63y88g7wand2yp9h6sf56c9bdcksn5nds8c0"; type = "gem"; }; - version = "0.0.10"; + version = "0.0.20"; }; declarative-option = { groups = ["default"]; @@ -981,6 +992,17 @@ }; version = "3.3.0"; }; + deprecation_toolkit = { + dependencies = ["activesupport"]; + groups = ["development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1fh4d98irhph3ri7c2rrvvmmjd4z14702r8baq9flh5f34dap8d8"; + type = "gem"; + }; + version = "1.5.1"; + }; derailed_benchmarks = { dependencies = ["benchmark-ips" "get_process_mem" "heapy" "memory_profiler" "mini_histogram" "rack" "rake" "ruby-statistics" "thor" "unicode_plot"]; groups = ["default"]; @@ -1590,10 +1612,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "086kyvdhf1k8nk7f4gmybjc3k0m88f9pw99frddcy1w96pj5kyg4"; + sha256 = "1764kvyzigaxwmxgfggpqq15qpplm77j2nmvhf8f0gybsm3vbrbn"; type = "gem"; }; - version = "3.5.2"; + version = "3.7.0"; }; fog-core = { dependencies = ["builder" "excon" "formatador" "mime-types"]; @@ -1612,10 +1634,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1h9apmm2pyb157pbnrqk37wfs2d9f35navsgzs3kclrxhyl2qm5f"; + sha256 = "1cl6rprichdn1i40c2ndri1c53cfb0x2xk58l9arwip9ivkasln4"; type = "gem"; }; - version = "1.11.0"; + version = "1.12.0"; }; fog-json = { dependencies = ["fog-core" "multi_json"]; @@ -1672,17 +1694,6 @@ }; version = "0.1.3"; }; - font-awesome-rails = { - dependencies = ["railties"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0a32q69rdsdw9zhmf2cflvvnikg20amidhn40sv2afw2qk91fcrz"; - type = "gem"; - }; - version = "4.7.0.5"; - }; formatador = { groups = ["default"]; platforms = []; @@ -1797,10 +1808,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1q1l0c1yjnhr451jj845h2vd9s00grjiyj2w9r1b9y3bscsyzs0m"; + sha256 = "1al29diaj9zrkj1rxwrqd644f2winv81dmnjycvm0gsim0vvw2hq"; type = "gem"; }; - version = "13.5.0.pre.rc2"; + version = "13.7.0.pre.rc1"; }; github-markup = { groups = ["default"]; @@ -1823,6 +1834,17 @@ }; version = "0.10.5"; }; + gitlab-experiment = { + dependencies = ["activesupport" "scientist"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "12ng0q49vl4k80m3hyx6bz915x1gmfmxjvgzdp3w0q77j4qv6nwi"; + type = "gem"; + }; + version = "0.4.4"; + }; gitlab-fog-azure-rm = { dependencies = ["azure-storage-blob" "azure-storage-common" "fog-core" "fog-json" "mime-types" "ms_rest_azure"]; groups = ["default"]; @@ -1835,15 +1857,15 @@ version = "1.0.0"; }; gitlab-labkit = { - dependencies = ["actionpack" "activesupport" "grpc" "jaeger-client" "opentracing" "redis"]; + dependencies = ["actionpack" "activesupport" "gitlab-pg_query" "grpc" "jaeger-client" "opentracing" "redis"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0cnrpqswicawhpvd4dh4jcma9d4haznc4gyl37ssvj1jkfhc4w40"; + sha256 = "0x4d5dl60cfvvqj89b8blpsxa7lbbblqwdqy8kc1z51gira7i803"; type = "gem"; }; - version = "0.13.1"; + version = "0.13.3"; }; gitlab-license = { groups = ["default"]; @@ -1860,10 +1882,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "14785l38sqrgf06y45ayhj3nhfqdar8vrsxna764vdsw01dngmin"; + sha256 = "05j8rpsbl2l5q4xnfh2cnws9axy1a19asg8nlw6jngba94raw5ir"; type = "gem"; }; - version = "0.0.7"; + version = "0.0.8"; }; gitlab-markup = { groups = ["default"]; @@ -1934,10 +1956,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0l24vgcmvval1apqk99c3ifcwlg1fh60vf02ggnc20f65dka81p3"; + sha256 = "14zg4mxj780ssk6lg8mvy4br3327cdlq17k5sds8zk2glng9vmsh"; type = "gem"; }; - version = "5.1.0"; + version = "5.3.0"; }; gitlab_chronic_duration = { dependencies = ["numerizer"]; @@ -1984,15 +2006,15 @@ version = "6.2.0"; }; google-api-client = { - dependencies = ["addressable" "googleauth" "httpclient" "mini_mime" "representable" "retriable" "signet"]; + dependencies = ["addressable" "googleauth" "httpclient" "mini_mime" "representable" "retriable" "rexml" "signet"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "13y6xara8w211y88pxa8bcbg6y40vkidqk854zl7z4csmgfnplxq"; + sha256 = "05ynbapd26wppcqa81kw6kb8a39mzp0fql1rwmk3lgr95ybmxr1s"; type = "gem"; }; - version = "0.33.2"; + version = "0.50.0"; }; google-cloud-env = { dependencies = ["faraday"]; @@ -2032,10 +2054,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0rsk471ld98pxhvzig3lnw9i13454c9nschvzxvq6vjqnn9ip0yh"; + sha256 = "0cm60nbmwzf83fzy06f3iyn5a6sw91siw8x9bdvpwwmjsmivana6"; type = "gem"; }; - version = "0.12.0"; + version = "0.14.0"; }; gpgme = { dependencies = ["mini_portile2"]; @@ -2854,10 +2876,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0pq8fhqh8w25qcw9v3vzfb0i6jp0k3949ahxc3wrwz2791dpbgbh"; + sha256 = "0i9wpzix3sjhf6d9zw60dm4371iq8kyz7ckh2qapan2vyaim6b55"; type = "gem"; }; - version = "0.16.0"; + version = "0.16.2"; }; memoizable = { dependencies = ["thread_safe"]; @@ -3562,10 +3584,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1s401gvhqgs2r8hh43ia205mxsy1wc0ib4k76wzkdpspfcnfr1rk"; + sha256 = "12fli64wz5j9868gpzv5wqsingk1jk457qyqksv9ksmq9b0zpc9x"; type = "gem"; }; - version = "1.0.0"; + version = "1.1.1"; }; parallel = { groups = ["development" "test"]; @@ -4250,10 +4272,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0yvcv901lrh5rfnk1h4h56hf2m6n9pd6w8n96vag74aakgz3gaxn"; + sha256 = "0b4b300i3m4m4kw7w1n9wgxwy16zccnb7271miksyzd0wq5b9pm3"; type = "gem"; }; - version = "3.25.0"; + version = "3.26.0"; }; rqrcode = { dependencies = ["chunky_png"]; @@ -4458,10 +4480,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0h62avini866kxpjzqxlqnajma3yvj0y25l6hn9h2mv5pp6fcrhx"; + sha256 = "0d3dyx2z41zd6va9dwn3q8caf710vzdaf57xspc0y17aqmnprwnw"; type = "gem"; }; - version = "0.7.2"; + version = "0.8.0"; }; ruby-fogbugz = { dependencies = ["crack"]; @@ -4663,6 +4685,16 @@ }; version = "0.8.2"; }; + scientist = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "09565ppvd851zxpspn5d5q28wqkfjyfxhvda9w80i16p3y937155"; + type = "gem"; + }; + version = "1.5.0"; + }; scss_lint = { dependencies = ["sass"]; groups = ["development" "test"]; @@ -5374,10 +5406,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "066hkh3ihzhrp5a9knjgqqfi5dyv4z5hfrpdj4fpgxjkvkfaxivy"; + sha256 = "1hxqza44pvk6x6vb91cvllhw71hqziby06dk1s94rh9f6khbl1nm"; type = "gem"; }; - version = "1.0.10"; + version = "1.0.11"; }; version_sorter = { groups = ["default"]; diff --git a/pkgs/applications/version-management/gitlab/update.py b/pkgs/applications/version-management/gitlab/update.py index 0f215370e184d..f662bd3097f95 100755 --- a/pkgs/applications/version-management/gitlab/update.py +++ b/pkgs/applications/version-management/gitlab/update.py @@ -1,5 +1,5 @@ #!/usr/bin/env nix-shell -#! nix-shell -i python3 -p bundix bundler common-updater-scripts nix nix-universal-prefetch python3 python3Packages.requests python3Packages.click python3Packages.click-log vgo2nix yarn2nix +#! nix-shell -i python3 -p bundix bundler nix-update nix nix-universal-prefetch python3 python3Packages.requests python3Packages.click python3Packages.click-log yarn2nix import click import click_log @@ -83,10 +83,10 @@ def _get_data_json(): return json.load(f) -def _call_update_source_version(pkg, version): - """calls update-source-version from nixpkgs root dir""" +def _call_nix_update(pkg, version): + """calls nix-update from nixpkgs root dir""" nixpkgs_path = pathlib.Path(__file__).parent / '../../../../' - return subprocess.check_output(['update-source-version', pkg, version], cwd=nixpkgs_path) + return subprocess.check_output(['nix-update', pkg, '--version', version], cwd=nixpkgs_path) @click_log.simple_verbosity_option(logger) @@ -168,20 +168,10 @@ def update_gitaly(): with open(gitaly_dir / fn, 'w') as f: f.write(repo.get_file(f"ruby/{fn}", f"v{gitaly_server_version}")) - for fn in ['go.mod', 'go.sum']: - with open(gitaly_dir / fn, 'w') as f: - f.write(repo.get_file(fn, f"v{gitaly_server_version}")) - subprocess.check_output(['bundle', 'lock'], cwd=gitaly_dir) subprocess.check_output(['bundix'], cwd=gitaly_dir) - os.environ['GOROOT'] = "" - subprocess.check_output(['vgo2nix', '--keep-going'], cwd=gitaly_dir) - - for fn in ['go.mod', 'go.sum']: - os.unlink(gitaly_dir / fn) - - _call_update_source_version('gitaly', gitaly_server_version) + _call_nix_update('gitaly', gitaly_server_version) @cli.command('update-gitlab-shell') @@ -189,42 +179,22 @@ def update_gitlab_shell(): """Update gitlab-shell""" data = _get_data_json() gitlab_shell_version = data['passthru']['GITLAB_SHELL_VERSION'] - _call_update_source_version('gitlab-shell', gitlab_shell_version) + _call_nix_update('gitlab-shell', gitlab_shell_version) repo = GitLabRepo(repo='gitlab-shell') gitlab_shell_dir = pathlib.Path(__file__).parent / 'gitlab-shell' - for fn in ['go.mod', 'go.sum']: - with open(gitlab_shell_dir / fn, 'w') as f: - f.write(repo.get_file(fn, f"v{gitlab_shell_version}")) - - os.environ['GOROOT'] = "" - subprocess.check_output(['vgo2nix', '--keep-going'], cwd=gitlab_shell_dir) - - for fn in ['go.mod', 'go.sum']: - os.unlink(gitlab_shell_dir / fn) - @cli.command('update-gitlab-workhorse') def update_gitlab_workhorse(): """Update gitlab-workhorse""" data = _get_data_json() gitlab_workhorse_version = data['passthru']['GITLAB_WORKHORSE_VERSION'] - _call_update_source_version('gitlab-workhorse', gitlab_workhorse_version) + _call_nix_update('gitlab-workhorse', gitlab_workhorse_version) repo = GitLabRepo('gitlab-org', 'gitlab-workhorse') gitlab_workhorse_dir = pathlib.Path(__file__).parent / 'gitlab-workhorse' - for fn in ['go.mod', 'go.sum']: - with open(gitlab_workhorse_dir / fn, 'w') as f: - f.write(repo.get_file(fn, f"v{gitlab_workhorse_version}")) - - os.environ['GOROOT'] = "" - subprocess.check_output(['vgo2nix', '--keep-going'], cwd=gitlab_workhorse_dir) - - for fn in ['go.mod', 'go.sum']: - os.unlink(gitlab_workhorse_dir / fn) - @cli.command('update-all') @click.option('--rev', default='latest', help='The rev to use (vX.Y.Z-ee), or \'latest\'') @click.pass_context diff --git a/pkgs/applications/version-management/gitlab/yarnPkgs.nix b/pkgs/applications/version-management/gitlab/yarnPkgs.nix index ca504fc231e9d..ba24888d9522b 100644 --- a/pkgs/applications/version-management/gitlab/yarnPkgs.nix +++ b/pkgs/applications/version-management/gitlab/yarnPkgs.nix @@ -786,19 +786,27 @@ }; } { - name = "_gitlab_svgs___svgs_1.175.0.tgz"; + name = "_gitlab_svgs___svgs_1.177.0.tgz"; path = fetchurl { - name = "_gitlab_svgs___svgs_1.175.0.tgz"; - url = "https://registry.yarnpkg.com/@gitlab/svgs/-/svgs-1.175.0.tgz"; - sha1 = "734f341784af1cd1d62d160a17bcdfb61ff7b04d"; + name = "_gitlab_svgs___svgs_1.177.0.tgz"; + url = "https://registry.yarnpkg.com/@gitlab/svgs/-/svgs-1.177.0.tgz"; + sha1 = "e481ed327a11d3834c8b1668d7485b9eefef97f5"; }; } { - name = "_gitlab_ui___ui_23.9.0.tgz"; + name = "_gitlab_tributejs___tributejs_1.0.0.tgz"; path = fetchurl { - name = "_gitlab_ui___ui_23.9.0.tgz"; - url = "https://registry.yarnpkg.com/@gitlab/ui/-/ui-23.9.0.tgz"; - sha1 = "e21966130b41e624dbe4505911a79afb731c2d6b"; + name = "_gitlab_tributejs___tributejs_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/@gitlab/tributejs/-/tributejs-1.0.0.tgz"; + sha1 = "672befa222aeffc83e7d799b0500a7a4418e59b8"; + }; + } + { + name = "_gitlab_ui___ui_24.8.1.tgz"; + path = fetchurl { + name = "_gitlab_ui___ui_24.8.1.tgz"; + url = "https://registry.yarnpkg.com/@gitlab/ui/-/ui-24.8.1.tgz"; + sha1 = "eb674d19aedf9c91b9a14aa7a66397d54b199fb7"; }; } { @@ -1026,19 +1034,19 @@ }; } { - name = "_toast_ui_editor___editor_2.5.0.tgz"; + name = "_toast_ui_editor___editor_2.5.1.tgz"; path = fetchurl { - name = "_toast_ui_editor___editor_2.5.0.tgz"; - url = "https://registry.yarnpkg.com/@toast-ui/editor/-/editor-2.5.0.tgz"; - sha1 = "02779b119eaa6dd7601249d75ca031e0b98400f1"; + name = "_toast_ui_editor___editor_2.5.1.tgz"; + url = "https://registry.yarnpkg.com/@toast-ui/editor/-/editor-2.5.1.tgz"; + sha1 = "42671c52ca4b97c84f684d09c2966711b36f41a7"; }; } { - name = "_toast_ui_vue_editor___vue_editor_2.5.0.tgz"; + name = "_toast_ui_vue_editor___vue_editor_2.5.1.tgz"; path = fetchurl { - name = "_toast_ui_vue_editor___vue_editor_2.5.0.tgz"; - url = "https://registry.yarnpkg.com/@toast-ui/vue-editor/-/vue-editor-2.5.0.tgz"; - sha1 = "8094136588b0f726241b5f89d0754a7169f2ffee"; + name = "_toast_ui_vue_editor___vue_editor_2.5.1.tgz"; + url = "https://registry.yarnpkg.com/@toast-ui/vue-editor/-/vue-editor-2.5.1.tgz"; + sha1 = "0a221d74d5305c8ca20cb11d9eb8ff9206455cfc"; }; } { @@ -4394,11 +4402,11 @@ }; } { - name = "dompurify___dompurify_2.2.2.tgz"; + name = "dompurify___dompurify_2.2.4.tgz"; path = fetchurl { - name = "dompurify___dompurify_2.2.2.tgz"; - url = "https://registry.yarnpkg.com/dompurify/-/dompurify-2.2.2.tgz"; - sha1 = "cb8c2b1a2f3c8a0b565127504ae4eedec176a972"; + name = "dompurify___dompurify_2.2.4.tgz"; + url = "https://registry.yarnpkg.com/dompurify/-/dompurify-2.2.4.tgz"; + sha1 = "a98cd182b729bdd8715c3eb7a8bf8eafb2ff7410"; }; } { @@ -7434,6 +7442,14 @@ }; } { + name = "jest_raw_loader___jest_raw_loader_1.0.1.tgz"; + path = fetchurl { + name = "jest_raw_loader___jest_raw_loader_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/jest-raw-loader/-/jest-raw-loader-1.0.1.tgz"; + sha1 = "ce9f56d54650f157c4a7d16d224ba5d613bcd626"; + }; + } + { name = "jest_regex_util___jest_regex_util_26.0.0.tgz"; path = fetchurl { name = "jest_regex_util___jest_regex_util_26.0.0.tgz"; @@ -8938,11 +8954,11 @@ }; } { - name = "mock_apollo_client___mock_apollo_client_0.4.0.tgz"; + name = "mock_apollo_client___mock_apollo_client_0.5.0.tgz"; path = fetchurl { - name = "mock_apollo_client___mock_apollo_client_0.4.0.tgz"; - url = "https://registry.yarnpkg.com/mock-apollo-client/-/mock-apollo-client-0.4.0.tgz"; - sha1 = "556a6090b1816dbf07e51093b652aca84aee979e"; + name = "mock_apollo_client___mock_apollo_client_0.5.0.tgz"; + url = "https://registry.yarnpkg.com/mock-apollo-client/-/mock-apollo-client-0.5.0.tgz"; + sha1 = "8f0d6a1ba0d349ebde87a1dcd85c7fd353076922"; }; } { @@ -12658,14 +12674,6 @@ }; } { - name = "tributejs___tributejs_5.1.3.tgz"; - path = fetchurl { - name = "tributejs___tributejs_5.1.3.tgz"; - url = "https://registry.yarnpkg.com/tributejs/-/tributejs-5.1.3.tgz"; - sha1 = "980600fc72865be5868893078b4bfde721129eae"; - }; - } - { name = "trim_newlines___trim_newlines_1.0.0.tgz"; path = fetchurl { name = "trim_newlines___trim_newlines_1.0.0.tgz"; @@ -13466,19 +13474,19 @@ }; } { - name = "vue_loader___vue_loader_15.9.3.tgz"; + name = "vue_loader___vue_loader_15.9.5.tgz"; path = fetchurl { - name = "vue_loader___vue_loader_15.9.3.tgz"; - url = "https://registry.yarnpkg.com/vue-loader/-/vue-loader-15.9.3.tgz"; - sha1 = "0de35d9e555d3ed53969516cac5ce25531299dda"; + name = "vue_loader___vue_loader_15.9.5.tgz"; + url = "https://registry.yarnpkg.com/vue-loader/-/vue-loader-15.9.5.tgz"; + sha1 = "7a960dc420a3439deaacdda038fdcdbf7c432706"; }; } { - name = "vue_router___vue_router_3.4.5.tgz"; + name = "vue_router___vue_router_3.4.9.tgz"; path = fetchurl { - name = "vue_router___vue_router_3.4.5.tgz"; - url = "https://registry.yarnpkg.com/vue-router/-/vue-router-3.4.5.tgz"; - sha1 = "d396ec037b35931bdd1e9b7edd86f9788dc15175"; + name = "vue_router___vue_router_3.4.9.tgz"; + url = "https://registry.yarnpkg.com/vue-router/-/vue-router-3.4.9.tgz"; + sha1 = "c016f42030ae2932f14e4748b39a1d9a0e250e66"; }; } { @@ -13538,11 +13546,11 @@ }; } { - name = "vuex___vuex_3.5.1.tgz"; + name = "vuex___vuex_3.6.0.tgz"; path = fetchurl { - name = "vuex___vuex_3.5.1.tgz"; - url = "https://registry.yarnpkg.com/vuex/-/vuex-3.5.1.tgz"; - sha1 = "f1b8dcea649bc25254cf4f4358081dbf5da18b3d"; + name = "vuex___vuex_3.6.0.tgz"; + url = "https://registry.yarnpkg.com/vuex/-/vuex-3.6.0.tgz"; + sha1 = "95efa56a58f7607c135b053350833a09e01aa813"; }; } { diff --git a/pkgs/applications/version-management/gitoxide/default.nix b/pkgs/applications/version-management/gitoxide/default.nix index 0b9d29bd52511..f7a17e510f4b3 100644 --- a/pkgs/applications/version-management/gitoxide/default.nix +++ b/pkgs/applications/version-management/gitoxide/default.nix @@ -1,27 +1,27 @@ -{ lib, rustPlatform, fetchFromGitHub, pkg-config, openssl }: +{ stdenv, rustPlatform, fetchFromGitHub, pkg-config, openssl, Security }: rustPlatform.buildRustPackage rec { pname = "gitoxide"; - version = "0.4.3"; + version = "0.6.0"; src = fetchFromGitHub { owner = "Byron"; repo = "gitoxide"; rev = "v${version}"; - sha256 = "0ap5ih4s99c4ah95mcafqsvy4yhfqab6vg1c6ydzfa4czczgcxff"; + sha256 = "qt1IN/5+yw5lrQ00YsvXUcUXCxd97EtNf5JvxJVa7uc="; }; - cargoSha256 = "0vj7g2jhvd5d37rcq02hval9axpciwyqyd10z2a0bsvw0r4bh943"; + cargoSha256 = "mitUyf/z7EgjKzFy8ZER8Ceoe9tk6r0ctSYdDG87rIU="; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ openssl ]; + buildInputs = [ openssl ] + ++ stdenv.lib.optionals stdenv.isDarwin [ Security ]; # Needed to get openssl-sys to use pkgconfig. OPENSSL_NO_VENDOR = 1; - meta = with lib; { - description = - "A command-line application for interacting with git repositories"; + meta = with stdenv.lib; { + description = "A command-line application for interacting with git repositories"; homepage = "https://github.com/Byron/gitoxide"; license = with licenses; [ mit /* or */ asl20 ]; maintainers = [ maintainers.syberant ]; diff --git a/pkgs/applications/version-management/pijul/default.nix b/pkgs/applications/version-management/pijul/default.nix index 0f7e2bc9486c7..4a64057cf11f4 100644 --- a/pkgs/applications/version-management/pijul/default.nix +++ b/pkgs/applications/version-management/pijul/default.nix @@ -13,14 +13,14 @@ rustPlatform.buildRustPackage rec { pname = "pijul"; - version = "1.0.0-alpha.17"; + version = "1.0.0-alpha.31"; src = fetchCrate { inherit version pname; - sha256 = "03r383fkqx17sb2c0kz71lbn0rdas7nd9yw7ni5fbmrq8rlk9brv"; + sha256 = "sha256-dSwQlALN0E87o86sasuNFPTZN6SRCuxP6pI7wi4uRf4"; }; - cargoSha256 = "0dfmldklklax8nb3pry0h80kih1k1idfjgaxinxkk1iflcm3cwqn"; + cargoSha256 = "sha256-Xwk5bX9o41M/1BmkOpAscGQHikhzV+9qAwVz0qI7FRA"; cargoBuildFlags = stdenv.lib.optional gitImportSupport "--features=git"; diff --git a/pkgs/applications/version-management/redmine/default.nix b/pkgs/applications/version-management/redmine/default.nix index defbf9c2aec46..4279fdd5f995c 100644 --- a/pkgs/applications/version-management/redmine/default.nix +++ b/pkgs/applications/version-management/redmine/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, bundlerEnv, ruby }: +{ stdenv, fetchurl, bundlerEnv, ruby, makeWrapper }: let version = "4.1.1"; @@ -19,6 +19,7 @@ in sha256 = "1nndy5hz8zvfglxf1f3bsb1pkrfwinfxzkdan1vjs3rkckkszyh5"; }; + nativeBuildInputs = [ makeWrapper ]; buildInputs = [ rubyEnv rubyEnv.wrappedRuby rubyEnv.bundler ]; # taken from https://www.redmine.org/issues/33784 @@ -31,12 +32,14 @@ in ''; installPhase = '' - mkdir -p $out/share + mkdir -p $out/bin $out/share cp -r . $out/share/redmine for i in config files log plugins public/plugin_assets public/themes tmp; do rm -rf $out/share/redmine/$i ln -fs /run/redmine/$i $out/share/redmine/$i done + + makeWrapper ${rubyEnv.wrappedRuby}/bin/ruby $out/bin/rdm-mailhandler.rb --add-flags $out/share/redmine/extra/mail_handler/rdm-mailhandler.rb ''; meta = with stdenv.lib; { diff --git a/pkgs/applications/version-management/sourcehut/builds.nix b/pkgs/applications/version-management/sourcehut/builds.nix index e5fc7c3386047..493402bd2b133 100644 --- a/pkgs/applications/version-management/sourcehut/builds.nix +++ b/pkgs/applications/version-management/sourcehut/builds.nix @@ -45,6 +45,8 @@ in buildPythonPackage rec { cp ${buildWorker "${src}/worker"}/bin/worker $out/bin/builds.sr.ht-worker ''; + dontUseSetuptoolsCheck = true; + meta = with stdenv.lib; { homepage = "https://git.sr.ht/~sircmpwn/builds.sr.ht"; description = "Continuous integration service for the sr.ht network"; diff --git a/pkgs/applications/version-management/sourcehut/dispatch.nix b/pkgs/applications/version-management/sourcehut/dispatch.nix index fa557ce78aa2f..552b643951d0f 100644 --- a/pkgs/applications/version-management/sourcehut/dispatch.nix +++ b/pkgs/applications/version-management/sourcehut/dispatch.nix @@ -24,6 +24,8 @@ buildPythonPackage rec { export PKGVER=${version} ''; + dontUseSetuptoolsCheck = true; + meta = with stdenv.lib; { homepage = "https://dispatch.sr.ht/~sircmpwn/dispatch.sr.ht"; description = "Task dispatcher and service integration tool for the sr.ht network"; diff --git a/pkgs/applications/version-management/sourcehut/git.nix b/pkgs/applications/version-management/sourcehut/git.nix index 3611ad93e17e1..46870dab413a2 100644 --- a/pkgs/applications/version-management/sourcehut/git.nix +++ b/pkgs/applications/version-management/sourcehut/git.nix @@ -67,6 +67,8 @@ in buildPythonPackage rec { cp ${buildAPI "${src}/api"}/bin/api $out/bin/gitsrht-api ''; + dontUseSetuptoolsCheck = true; + meta = with stdenv.lib; { homepage = "https://git.sr.ht/~sircmpwn/git.sr.ht"; description = "Git repository hosting service for the sr.ht network"; diff --git a/pkgs/applications/version-management/sourcehut/hg.nix b/pkgs/applications/version-management/sourcehut/hg.nix index 73c9dfeb71e20..81c51324eb9cf 100644 --- a/pkgs/applications/version-management/sourcehut/hg.nix +++ b/pkgs/applications/version-management/sourcehut/hg.nix @@ -25,6 +25,8 @@ buildPythonPackage rec { export PKGVER=${version} ''; + dontUseSetuptoolsCheck = true; + meta = with stdenv.lib; { homepage = "https://git.sr.ht/~sircmpwn/hg.sr.ht"; description = "Mercurial repository hosting service for the sr.ht network"; diff --git a/pkgs/applications/version-management/sourcehut/hub.nix b/pkgs/applications/version-management/sourcehut/hub.nix index 5c9736564c39c..b3cf8f0a9fb14 100644 --- a/pkgs/applications/version-management/sourcehut/hub.nix +++ b/pkgs/applications/version-management/sourcehut/hub.nix @@ -22,6 +22,8 @@ buildPythonPackage rec { export PKGVER=${version} ''; + dontUseSetuptoolsCheck = true; + meta = with stdenv.lib; { homepage = "https://git.sr.ht/~sircmpwn/hub.sr.ht"; description = "Project hub service for the sr.ht network"; diff --git a/pkgs/applications/version-management/sourcehut/lists.nix b/pkgs/applications/version-management/sourcehut/lists.nix index 880dc60f0b3a2..d15aada60166a 100644 --- a/pkgs/applications/version-management/sourcehut/lists.nix +++ b/pkgs/applications/version-management/sourcehut/lists.nix @@ -26,6 +26,8 @@ buildPythonPackage rec { export PKGVER=${version} ''; + dontUseSetuptoolsCheck = true; + meta = with stdenv.lib; { homepage = "https://git.sr.ht/~sircmpwn/lists.sr.ht"; description = "Mailing list service for the sr.ht network"; diff --git a/pkgs/applications/version-management/sourcehut/man.nix b/pkgs/applications/version-management/sourcehut/man.nix index 8072c74d2d0f4..9f00180ff1864 100644 --- a/pkgs/applications/version-management/sourcehut/man.nix +++ b/pkgs/applications/version-management/sourcehut/man.nix @@ -23,6 +23,8 @@ buildPythonPackage rec { export PKGVER=${version} ''; + dontUseSetuptoolsCheck = true; + meta = with stdenv.lib; { homepage = "https://git.sr.ht/~sircmpwn/man.sr.ht"; description = "Wiki service for the sr.ht network"; diff --git a/pkgs/applications/version-management/sourcehut/meta.nix b/pkgs/applications/version-management/sourcehut/meta.nix index 6cbae67151728..8887bdbb95643 100644 --- a/pkgs/applications/version-management/sourcehut/meta.nix +++ b/pkgs/applications/version-management/sourcehut/meta.nix @@ -48,6 +48,8 @@ in buildPythonPackage rec { cp ${buildAPI "${src}/api"}/bin/api $out/bin/metasrht-api ''; + dontUseSetuptoolsCheck = true; + meta = with stdenv.lib; { homepage = "https://git.sr.ht/~sircmpwn/meta.sr.ht"; description = "Account management service for the sr.ht network"; diff --git a/pkgs/applications/version-management/sourcehut/paste.nix b/pkgs/applications/version-management/sourcehut/paste.nix index a2fdaa05efcae..e5bb5b379d145 100644 --- a/pkgs/applications/version-management/sourcehut/paste.nix +++ b/pkgs/applications/version-management/sourcehut/paste.nix @@ -23,6 +23,8 @@ buildPythonPackage rec { export PKGVER=${version} ''; + dontUseSetuptoolsCheck = true; + meta = with stdenv.lib; { homepage = "https://git.sr.ht/~sircmpwn/paste.sr.ht"; description = "Ad-hoc text file hosting service for the sr.ht network"; diff --git a/pkgs/applications/version-management/tortoisehg/default.nix b/pkgs/applications/version-management/tortoisehg/default.nix index 2743d4f827fb9..6c97d1536619d 100644 --- a/pkgs/applications/version-management/tortoisehg/default.nix +++ b/pkgs/applications/version-management/tortoisehg/default.nix @@ -4,16 +4,16 @@ let tortoisehgSrc = fetchurl rec { meta.name = "tortoisehg-${meta.version}"; - meta.version = "5.2.1"; - url = "https://bitbucket.org/tortoisehg/thg/get/14221e991a5b623e0072d3bd340b759dbe9072ca.tar.gz"; - sha256 = "01rpzf5z99izcdda1ps9bhqvhw6qghagd8c1y7x19rv223zi05dv"; + meta.version = "5.6"; + url = "https://www.mercurial-scm.org/release/tortoisehg/targz/tortoisehg-${meta.version}.tar.gz"; + sha256 = "031bafj88wggpvw0lgvl0djhlbhs9nls9vzwvni8yn0m0bgzc9gr"; }; tortoiseMercurial = mercurial.overridePythonAttrs (old: rec { inherit (tortoisehgSrc.meta) version; src = fetchurl { url = "https://mercurial-scm.org/release/mercurial-${version}.tar.gz"; - sha256 = "1pxkd37b0a1mi2zakk1hi122lgz1ffy2fxdnbs8acwlqpw55bc8q"; + sha256 = "1hk2y30zzdnlv8f71kabvh0xi9c7qhp28ksh20vpd0r712sv79yz"; }; }); diff --git a/pkgs/applications/version-management/yadm/default.nix b/pkgs/applications/version-management/yadm/default.nix index 37fd8055662d8..3a45d1262039d 100644 --- a/pkgs/applications/version-management/yadm/default.nix +++ b/pkgs/applications/version-management/yadm/default.nix @@ -19,10 +19,10 @@ stdenv.mkDerivation { installPhase = '' runHook preInstall - install -Dt $out/bin $src/yadm - install -Dt $out/share/man/man1 $src/yadm.1 - install -D $src/completion/yadm.zsh_completion $out/share/zsh/site-functions/_yadm - install -D $src/completion/yadm.bash_completion $out/share/bash-completion/completions/yadm.bash + install -Dt $out/bin yadm + install -Dt $out/share/man/man1 yadm.1 + install -D completion/yadm.zsh_completion $out/share/zsh/site-functions/_yadm + install -D completion/yadm.bash_completion $out/share/bash-completion/completions/yadm.bash runHook postInstall ''; @@ -36,6 +36,7 @@ stdenv.mkDerivation { * Supplies a method of encrypting confidential data so it can safely be stored in your repository. ''; license = stdenv.lib.licenses.gpl3; + maintainers = with stdenv.lib.maintainers; [ abathur ]; platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/applications/video/droidcam/default.nix b/pkgs/applications/video/droidcam/default.nix new file mode 100644 index 0000000000000..dc6c0d330eb24 --- /dev/null +++ b/pkgs/applications/video/droidcam/default.nix @@ -0,0 +1,58 @@ +{ stdenv, fetchFromGitHub +, ffmpeg, libjpeg_turbo, gtk3, alsaLib, speex, libusbmuxd, libappindicator-gtk3 +, pkg-config +}: + +stdenv.mkDerivation rec { + pname = "droidcam"; + version = "1.6"; + + src = fetchFromGitHub { + owner = "aramg"; + repo = "droidcam"; + rev = "v${version}"; + sha256 = "sha256-3RmEmLNUbwIh+yr7vtYZnMwbzfmtW3mz5u4Ohau9OLU="; + }; + + nativeBuildInputs = [ + pkg-config + ]; + + buildInputs = [ + ffmpeg + libjpeg_turbo + gtk3 + alsaLib + speex + libusbmuxd + libappindicator-gtk3 + ]; + + postPatch = '' + substituteInPlace linux/src/droidcam.c \ + --replace "/opt/droidcam-icon.png" "$out/share/icons/hicolor/droidcam.png" + ''; + + preBuild = '' + cd linux + makeFlagsArray+=("JPEG=$(pkg-config --libs --cflags libturbojpeg)") + makeFlagsArray+=("USBMUXD=$(pkg-config --libs --cflags libusbmuxd-2.0)") + ''; + + installPhase = '' + runHook preInstall + + install -Dt $out/bin droidcam droidcam-cli + install -D icon2.png $out/share/icons/hicolor/droidcam.png + + runHook postInstall + ''; + + meta = with stdenv.lib; { + description = "Linux client for DroidCam app"; + homepage = "https://github.com/aramg/droidcam"; + license = licenses.gpl2Only; + maintainers = [ maintainers.suhr ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/video/gnomecast/default.nix b/pkgs/applications/video/gnomecast/default.nix index e4814e40c1fd4..486159135055b 100644 --- a/pkgs/applications/video/gnomecast/default.nix +++ b/pkgs/applications/video/gnomecast/default.nix @@ -1,4 +1,4 @@ -{ lib, python3Packages, gtk3, gobject-introspection, ffmpeg_3, wrapGAppsHook }: +{ stdenv, lib, python3Packages, gtk3, gobject-introspection, ffmpeg_3, wrapGAppsHook }: with python3Packages; buildPythonApplication rec { @@ -24,5 +24,6 @@ buildPythonApplication rec { description = "A native Linux GUI for Chromecasting local files"; homepage = "https://github.com/keredson/gnomecast"; license = with licenses; [ gpl3 ]; + broken = stdenv.isDarwin; }; } diff --git a/pkgs/applications/video/jellyfin-mpv-shim/default.nix b/pkgs/applications/video/jellyfin-mpv-shim/default.nix index 825aac4dad290..475b04c58620a 100644 --- a/pkgs/applications/video/jellyfin-mpv-shim/default.nix +++ b/pkgs/applications/video/jellyfin-mpv-shim/default.nix @@ -53,6 +53,10 @@ buildPythonApplication rec { pywebview ]; + # no tests + doCheck = false; + pythonImportsCheck = [ "jellyfin_mpv_shim" ]; + meta = with stdenv.lib; { homepage = "https://github.com/iwalton3/jellyfin-mpv-shim"; description = "Allows casting of videos to MPV via the jellyfin mobile and web app"; diff --git a/pkgs/applications/video/kodi/plugins.nix b/pkgs/applications/video/kodi/plugins.nix index 6863ef9ca6226..12c16a744b08e 100644 --- a/pkgs/applications/video/kodi/plugins.nix +++ b/pkgs/applications/video/kodi/plugins.nix @@ -467,7 +467,7 @@ let self = rec { propagatedBuildInputs = [ simpleplugin python2Packages.requests - python2Packages.libtorrentRasterbar + python2Packages.libtorrent-rasterbar ]; meta = { diff --git a/pkgs/applications/video/makemkv/default.nix b/pkgs/applications/video/makemkv/default.nix index 6f47307f4a6a8..47fb6fc9b1b83 100644 --- a/pkgs/applications/video/makemkv/default.nix +++ b/pkgs/applications/video/makemkv/default.nix @@ -13,21 +13,21 @@ }: let - version = "1.15.3"; + version = "1.15.4"; # Using two URLs as the first one will break as soon as a new version is released src_bin = fetchurl { urls = [ "http://www.makemkv.com/download/makemkv-bin-${version}.tar.gz" "http://www.makemkv.com/download/old/makemkv-bin-${version}.tar.gz" ]; - hash = "sha256-Y23aetnwqLGaBIgJ/AP0oCrh8P5jpVrcMJgmc0Oe+i8="; + hash = "sha256-Reun5hp7Rnsf6N5yL6iQ1Vbhnz/AKnt/jYRqyOK625o="; }; src_oss = fetchurl { urls = [ "http://www.makemkv.com/download/makemkv-oss-${version}.tar.gz" "http://www.makemkv.com/download/old/makemkv-oss-${version}.tar.gz" ]; - hash = "sha256-Qruq9YKAaNF1pDtOhptP95UjFL2NA4EuROR4v6XZHEw="; + hash = "sha256-gtBi1IRNF5ASk/ZdzkDmOuEIT9gazNaRNCftqbLEP+M="; }; in mkDerivation { pname = "makemkv"; diff --git a/pkgs/applications/video/mpc-qt/default.nix b/pkgs/applications/video/mpc-qt/default.nix index d9de3eb699d4c..d9d02ce792dc8 100644 --- a/pkgs/applications/video/mpc-qt/default.nix +++ b/pkgs/applications/video/mpc-qt/default.nix @@ -29,6 +29,7 @@ mkDerivation rec { homepage = "https://gitlab.com/mpc-qt/mpc-qt"; license = licenses.gpl2; platforms = platforms.unix; + broken = stdenv.isDarwin; maintainers = with maintainers; [ romildo ]; }; } diff --git a/pkgs/applications/video/openshot-qt/default.nix b/pkgs/applications/video/openshot-qt/default.nix index 9245bdf03e43e..ede47ad061f68 100644 --- a/pkgs/applications/video/openshot-qt/default.nix +++ b/pkgs/applications/video/openshot-qt/default.nix @@ -55,8 +55,5 @@ mkDerivationWith python3Packages.buildPythonApplication rec { license = with licenses; gpl3Plus; maintainers = with maintainers; [ AndersonTorres ]; platforms = with platforms; unix; - # Cannot use a newer Qt (5.15) version because it requires qtwebkit - # and our qtwebkit fails to build with 5.15. 01bcfd3579219d60e5d07df309a000f96b2b658b - broken = true; }; } diff --git a/pkgs/applications/video/openshot-qt/libopenshot.nix b/pkgs/applications/video/openshot-qt/libopenshot.nix index 1b6084a1d2f94..1ab7a5266a23f 100644 --- a/pkgs/applications/video/openshot-qt/libopenshot.nix +++ b/pkgs/applications/video/openshot-qt/libopenshot.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub +{ stdenv, fetchFromGitHub, fetchpatch , pkgconfig, cmake, doxygen , libopenshot-audio, imagemagick, ffmpeg_3 , swig, python3 @@ -19,7 +19,15 @@ stdenv.mkDerivation rec { sha256 = "1mxjkgjmjzgf628y3rscc6rqf55hxgjpmvwxlncfk1216i5xskwp"; }; - patchPhase = '' + patches = [ + (fetchpatch { + name = "fix-build-with-gcc-10.patch"; + url = "https://github.com/OpenShot/libopenshot/commit/13290364e7bea54164ab83d973951f2898ad9e23.diff"; + sha256 = "0i7rpdsr8y9dphil8yq75qbh20vfqjc2hp5ahv0ws58z9wj6ngnz"; + }) + ]; + + postPatch = '' sed -i 's/{UNITTEST++_INCLUDE_DIR}/ENV{UNITTEST++_INCLUDE_DIR}/g' tests/CMakeLists.txt sed -i 's/{_REL_PYTHON_MODULE_PATH}/ENV{_REL_PYTHON_MODULE_PATH}/g' src/bindings/python/CMakeLists.txt export _REL_PYTHON_MODULE_PATH=$(toPythonPath $out) diff --git a/pkgs/applications/video/plex-mpv-shim/default.nix b/pkgs/applications/video/plex-mpv-shim/default.nix index e25c101b5dfb3..5006bf8ddaa4c 100644 --- a/pkgs/applications/video/plex-mpv-shim/default.nix +++ b/pkgs/applications/video/plex-mpv-shim/default.nix @@ -13,6 +13,9 @@ buildPythonApplication rec { propagatedBuildInputs = [ mpv requests python-mpv-jsonipc ]; + # does not contain tests + doCheck = false; + meta = with stdenv.lib; { homepage = "https://github.com/iwalton3/plex-mpv-shim"; description = "Allows casting of videos to MPV via the Plex mobile and web app"; diff --git a/pkgs/applications/video/qmplay2/default.nix b/pkgs/applications/video/qmplay2/default.nix index b7f7f8c530238..a873c9e72ea79 100644 --- a/pkgs/applications/video/qmplay2/default.nix +++ b/pkgs/applications/video/qmplay2/default.nix @@ -22,7 +22,7 @@ let pname = "qmplay2"; - version = "20.07.04"; + version = "20.12.16"; in stdenv.mkDerivation { inherit pname version; @@ -30,7 +30,7 @@ in stdenv.mkDerivation { owner = "zaps166"; repo = "QMPlay2"; rev = version; - sha256 = "sha256-sUDucxSvsdD2C2FSVrrXeHdNdrjECtJSXVr106OdHzA="; + sha256 = "sha256-+XXlQI9MyENioYmzqbbZYQ6kaMATBjPrPaErR2Vqhus="; fetchSubmodules = true; }; diff --git a/pkgs/applications/video/streamlink-twitch-gui/bin.nix b/pkgs/applications/video/streamlink-twitch-gui/bin.nix index 1c955a36f34a6..1c88e3324b974 100644 --- a/pkgs/applications/video/streamlink-twitch-gui/bin.nix +++ b/pkgs/applications/video/streamlink-twitch-gui/bin.nix @@ -1,8 +1,29 @@ -{ autoPatchelfHook, fetchurl, lib, makeDesktopItem, makeWrapper, stdenv, wrapGAppsHook -, at-spi2-core, atk, alsaLib, cairo, cups, dbus, expat, gcc-unwrapped -, gdk-pixbuf, glib, pango, gtk3-x11, libudev0-shim, libuuid, nss, nspr, xorg -, streamlink }: - +{ autoPatchelfHook +, fetchurl +, lib +, makeDesktopItem +, makeWrapper +, stdenv +, wrapGAppsHook +, at-spi2-core +, atk +, alsaLib +, cairo +, cups +, dbus +, expat +, gcc-unwrapped +, gdk-pixbuf +, glib +, pango +, gtk3-x11 +, libudev0-shim +, libuuid +, nss +, nspr +, xorg +, streamlink +}: let basename = "streamlink-twitch-gui"; runtimeLibs = lib.makeLibraryPath [ libudev0-shim ]; @@ -16,16 +37,16 @@ let in stdenv.mkDerivation rec { pname = "${basename}-bin"; - version = "1.10.0"; + version = "1.11.0"; src = fetchurl { url = "https://github.com/streamlink/${basename}/releases/download/v${version}/${basename}-v${version}-${arch}.tar.gz"; sha256 = if arch == "linux64" then - "17s9zbzj4pgz9mxxwjbp3788afkddc9s3p7xp28y5084z9wwzph2" + "0y96nziavvpdvrpn58p6a175kaa8cgadp19rnbm250x9cypn1d9y" else - "1pww05hr48m6v0g1sz48g1c7p615lig3s12l21xgyz4gkjzmjy22"; + "0sfmhqf55w7wavqy4idsqpkf5p7l8sapjxap6xvyzpz4z5z6xr7y"; }; nativeBuildInputs = with xorg; [ diff --git a/pkgs/applications/video/streamlink/default.nix b/pkgs/applications/video/streamlink/default.nix index 4c8800c918e2e..97607f939fdd8 100644 --- a/pkgs/applications/video/streamlink/default.nix +++ b/pkgs/applications/video/streamlink/default.nix @@ -1,21 +1,42 @@ -{ stdenv, pythonPackages, fetchFromGitHub, rtmpdump, ffmpeg_3 }: +{ lib +, pythonPackages +, fetchFromGitHub +, rtmpdump +, ffmpeg_3 +}: pythonPackages.buildPythonApplication rec { - version = "1.5.0"; pname = "streamlink"; + version = "2.0.0"; + disabled = pythonPackages.pythonOlder "3.5.0"; src = fetchFromGitHub { owner = "streamlink"; repo = "streamlink"; rev = version; - sha256 = "00pishpyim3mcvr9njcbfhj79j85b5xhkslk3mspc2csqknw4k61"; + sha256 = "+W9Nu5Ze08r7IlUZOkkVOz582E1Bbj0a3qIQHwxSmj8="; }; - checkInputs = with pythonPackages; [ pytest mock requests-mock freezegun ]; + checkInputs = with pythonPackages; [ + pytest + mock + requests-mock + freezegun + ]; - propagatedBuildInputs = (with pythonPackages; [ pycryptodome requests iso-639 iso3166 websocket_client isodate ]) ++ [ rtmpdump ffmpeg_3 ]; + propagatedBuildInputs = (with pythonPackages; [ + pycryptodome + requests + iso-639 + iso3166 + websocket_client + isodate + ]) ++ [ + rtmpdump + ffmpeg_3 + ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/streamlink/streamlink"; description = "CLI for extracting streams from various websites to video player of your choosing"; longDescription = '' @@ -27,6 +48,6 @@ pythonPackages.buildPythonApplication rec { ''; license = licenses.bsd2; platforms = platforms.linux ++ platforms.darwin; - maintainers = with maintainers; [ dezgeg zraexy enzime ]; + maintainers = with maintainers; [ dezgeg zraexy ]; }; } diff --git a/pkgs/applications/video/subtitleeditor/default.nix b/pkgs/applications/video/subtitleeditor/default.nix index 29e2de6b6c0a9..eea6353d66cd5 100644 --- a/pkgs/applications/video/subtitleeditor/default.nix +++ b/pkgs/applications/video/subtitleeditor/default.nix @@ -35,6 +35,9 @@ stdenv.mkDerivation { gst_all_1.gstreamermm gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good + gst_all_1.gst-plugins-bad + gst_all_1.gst-plugins-ugly + gst_all_1.gst-libav hicolor-icon-theme libsigcxx libxmlxx diff --git a/pkgs/applications/video/tartube/default.nix b/pkgs/applications/video/tartube/default.nix index 23ee76eb4693c..36375d9ecc060 100644 --- a/pkgs/applications/video/tartube/default.nix +++ b/pkgs/applications/video/tartube/default.nix @@ -10,17 +10,18 @@ , wrapGAppsHook , youtube-dl , glib +, ffmpeg }: python3Packages.buildPythonApplication rec { pname = "tartube"; - version = "2.1.0"; + version = "2.3.042"; src = fetchFromGitHub { owner = "axcore"; repo = "tartube"; rev = "v${version}"; - sha256 = "1klqjwqm29y2f6nc8gn222ykfvb5d64z1w2kifw9bq5bv0np9bda"; + sha256 = "117q4s2b2js3204506qv3kjcsy3amcf0mpwj6q0ixs1256ilkxwj"; }; nativeBuildInputs = [ @@ -37,6 +38,7 @@ python3Packages.buildPythonApplication rec { requests feedparser playsound + ffmpeg ]; buildInputs = [ @@ -48,7 +50,7 @@ python3Packages.buildPythonApplication rec { ]; postPatch = '' - sed -i "/^\s*install_requires/s/, 'gi'\|'gi', \|'gi'//" setup.py + sed -i "/^\s*install_requires/s/, 'pgi'\|'pgi', \|'pgi'//" setup.py ''; postInstall = '' diff --git a/pkgs/applications/video/vdr/default.nix b/pkgs/applications/video/vdr/default.nix index bc3d54f3b5b82..16aa2a3e6a5f0 100644 --- a/pkgs/applications/video/vdr/default.nix +++ b/pkgs/applications/video/vdr/default.nix @@ -5,12 +5,12 @@ }: stdenv.mkDerivation rec { pname = "vdr"; - version = "2.4.4"; + version = "2.4.6"; src = fetchgit { url = "git://git.tvdr.de/vdr.git"; - rev = "V20404"; - sha256 = "1fzghnp5mpcwn3a3fyk3w8h15z4f2cnc75247kvxj1c9069mgnwa"; + rev = "V20406"; + sha256 = "sha256-te9lMmnWpesv+np2gJUDL17pI0WyVxhUnoBsFSRtOco="; }; enableParallelBuilding = true; diff --git a/pkgs/applications/virtualization/charliecloud/default.nix b/pkgs/applications/virtualization/charliecloud/default.nix index d6cbc25d883b2..79e32007144fc 100644 --- a/pkgs/applications/virtualization/charliecloud/default.nix +++ b/pkgs/applications/virtualization/charliecloud/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { - version = "0.20"; + version = "0.21"; pname = "charliecloud"; src = fetchFromGitHub { owner = "hpc"; repo = "charliecloud"; rev = "v${version}"; - sha256 = "15ihffwhpjnzgz0ir5vc9la4fwkqj91vmrcsb2r58ikq7h9sk45j"; + sha256 = "Y/tH6Znq//HBA/FHfIm2Wpppx6TiL7CqKtZFDc/XSNc="; }; nativeBuildInputs = [ autoreconfHook makeWrapper ]; diff --git a/pkgs/applications/virtualization/cntr/default.nix b/pkgs/applications/virtualization/cntr/default.nix index e3ab1c6c2f80f..ab9b63eb79b24 100644 --- a/pkgs/applications/virtualization/cntr/default.nix +++ b/pkgs/applications/virtualization/cntr/default.nix @@ -2,23 +2,22 @@ rustPlatform.buildRustPackage rec { pname = "cntr"; - version = "1.2.1"; + version = "1.4.1"; src = fetchFromGitHub { owner = "Mic92"; repo = "cntr"; rev = version; - sha256 = "0dhfz7aj3cqi974ybf0axchih40rzrs9m8bxhwz1hgig57aisfc0"; + sha256 = "sha256-4ogyOKuz6702/sOQNvE+UP+cvQrPPU3VjL4b0FUfRNw="; }; - cargoSha256 = "088drkpkgq8psv5j6igxyhfvvbalzg6nd98r9z0nxkawck5i2clz"; + cargoSha256 = "sha256-lblvun2T1qpFiowld77Ti2MFPzhs5pOWWRbErORXYCM="; meta = with stdenv.lib; { description = "A container debugging tool based on FUSE"; homepage = "https://github.com/Mic92/cntr"; license = licenses.mit; - # aarch64 support will be fixed soon - platforms = [ "x86_64-linux" ]; + platforms = platforms.linux; maintainers = [ maintainers.mic92 ]; }; } diff --git a/pkgs/applications/virtualization/conmon/default.nix b/pkgs/applications/virtualization/conmon/default.nix index d2f1f2debe545..e143ebcca7557 100644 --- a/pkgs/applications/virtualization/conmon/default.nix +++ b/pkgs/applications/virtualization/conmon/default.nix @@ -9,20 +9,25 @@ stdenv.mkDerivation rec { pname = "conmon"; - version = "2.0.21"; + version = "2.0.22"; src = fetchFromGitHub { owner = "containers"; repo = pname; rev = "v${version}"; - sha256 = "13g436s00bcwzs31qsx5rpgkbbyxd4zvx8mbkq10gkrsv4r04q23"; + sha256 = "07wd3pns6x25dcnc1r84cwmrzg8xgzsfmidkclcpcagf97ad7jmc"; }; nativeBuildInputs = [ pkg-config ]; buildInputs = [ glib systemd ] ++ stdenv.lib.optionals (!stdenv.hostPlatform.isMusl) [ glibc glibc.static ]; - installFlags = [ "PREFIX=$(out)" ]; + # manpage requires building the vendored go-md2man + makeFlags = [ "bin/conmon" ]; + + installPhase = '' + install -D bin/conmon -t $out/bin + ''; passthru.tests = { inherit (nixosTests) cri-o podman; }; diff --git a/pkgs/applications/virtualization/containerd/default.nix b/pkgs/applications/virtualization/containerd/default.nix index cece3cc6b6737..695109fd8a403 100644 --- a/pkgs/applications/virtualization/containerd/default.nix +++ b/pkgs/applications/virtualization/containerd/default.nix @@ -1,12 +1,16 @@ -{ lib, fetchFromGitHub, buildGoPackage, btrfs-progs, go-md2man, installShellFiles, util-linux, nixosTests }: - -with lib; +{ lib +, fetchFromGitHub +, buildGoPackage +, btrfs-progs +, go-md2man +, installShellFiles +, util-linux +, nixosTests +}: buildGoPackage rec { pname = "containerd"; version = "1.4.3"; - # git commit for the above version's tag - commit = "269548fa27e0089a8b8278fc4fc781d7f65a939b"; src = fetchFromGitHub { owner = "containerd"; @@ -22,29 +26,32 @@ buildGoPackage rec { buildInputs = [ btrfs-progs ]; - buildFlags = [ "VERSION=v${version}" "REVISION=${commit}" ]; + buildFlags = [ "VERSION=v${version}" "REVISION=${src.rev}" ]; - BUILDTAGS = [] - ++ optional (btrfs-progs == null) "no_btrfs"; + BUILDTAGS = [ ] + ++ lib.optional (btrfs-progs == null) "no_btrfs"; buildPhase = '' cd go/src/${goPackagePath} patchShebangs . - make binaries $buildFlags + make binaries man $buildFlags ''; installPhase = '' - for b in bin/*; do - install -Dm555 $b $out/$b - done - - make man + install -Dm555 bin/* -t $out/bin installManPage man/*.[1-9] ''; + # completion installed separately so it can be overridden in docker + # can be moved to installPhase when docker uses containerd >= 1.4 + postInstall = '' + installShellFiles --bash contrib/autocomplete/ctr + installShellFiles --zsh --name _ctr contrib/autocomplete/zsh_autocomplete + ''; + passthru.tests = { inherit (nixosTests) docker; }; - meta = { + meta = with lib; { homepage = "https://containerd.io/"; description = "A daemon to control runC"; license = licenses.asl20; diff --git a/pkgs/applications/virtualization/docker-slim/default.nix b/pkgs/applications/virtualization/docker-slim/default.nix index 84e0135f665b5..9ba7ff5d66bc3 100644 --- a/pkgs/applications/virtualization/docker-slim/default.nix +++ b/pkgs/applications/virtualization/docker-slim/default.nix @@ -6,7 +6,7 @@ buildGoPackage rec { pname = "docker-slim"; - version = "1.32.0"; + version = "1.33.0"; goPackagePath = "github.com/docker-slim/docker-slim"; @@ -14,7 +14,7 @@ buildGoPackage rec { owner = "docker-slim"; repo = "docker-slim"; rev = version; - sha256 = "0pd2v7df176ca923c4nw9ns5gz442jkb0jhzqjl53rwfwz1vxy9h"; + sha256 = "0fk1r9id3fjcqdg4nls2k5ik3822njz4xx9fpbvmx0fycvjmbr4v"; }; subPackages = [ "cmd/docker-slim" "cmd/docker-slim-sensor" ]; @@ -39,6 +39,7 @@ buildGoPackage rec { meta = with stdenv.lib; { description = "Minify and secure Docker containers"; homepage = "https://dockersl.im/"; + changelog = "https://github.com/docker-slim/docker-slim/blob/${version}/CHANGELOG.md"; license = licenses.asl20; maintainers = with maintainers; [ Br1ght0ne marsam mbrgm ]; }; diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix index 1d55744efb49c..1f4d5e3aac64a 100644 --- a/pkgs/applications/virtualization/docker/default.nix +++ b/pkgs/applications/virtualization/docker/default.nix @@ -41,6 +41,8 @@ rec { rev = containerdRev; sha256 = containerdSha256; }; + # disable completion, can be removed when docker uses containerd >= 1.4 + postInstall = []; # This should be removed once Docker uses containerd >=1.4 nativeBuildInputs = oldAttrs.nativeBuildInputs ++ lib.optional withlibseccomp pkgconfig; buildInputs = oldAttrs.buildInputs ++ lib.optional withlibseccomp libseccomp; diff --git a/pkgs/applications/virtualization/nvidia-docker/default.nix b/pkgs/applications/virtualization/nvidia-docker/default.nix index d0d7125721f8d..3f75e36ccae62 100644 --- a/pkgs/applications/virtualization/nvidia-docker/default.nix +++ b/pkgs/applications/virtualization/nvidia-docker/default.nix @@ -1,57 +1,74 @@ -{ stdenv, lib, fetchFromGitHub, fetchpatch, callPackage, makeWrapper -, buildGoPackage, runc, glibc }: +{ stdenv +, lib +, fetchFromGitHub +, fetchpatch +, callPackage +, makeWrapper +, buildGoModule +, buildGoPackage +, git +, glibc +}: with lib; let - libnvidia-container = callPackage ./libnvc.nix { }; - nvidia-container-runtime = fetchFromGitHub { - owner = "NVIDIA"; - repo = "nvidia-container-runtime"; - rev = "runtime-v2.0.0"; - sha256 = "0jcj5xxbg7x7gyhbb67h3ds6vly62gx7j02zm6lg102h34jajj7a"; - }; - - nvidia-container-runtime-hook = buildGoPackage { - pname = "nvidia-container-runtime-hook"; - version = "1.4.0"; - - goPackagePath = "nvidia-container-runtime-hook"; - - src = "${nvidia-container-runtime}/hook/nvidia-container-runtime-hook"; + nvidia-container-runtime = buildGoPackage rec { + pname = "nvidia-container-toolkit"; + version = "3.4.0"; + src = fetchFromGitHub { + owner = "NVIDIA"; + repo = "nvidia-container-runtime"; + rev = "v${version}"; + sha256 = "095mks0r4079vawi50pk4zb5jk0g6s9idg2s1w55a0d27jkknldr"; + }; + goPackagePath = "github.com/nvidia-container-runtime/src"; + buildFlagsArray = [ "-ldflags=" "-s -w" ]; + postInstall = '' + mv $out/bin/{src,nvidia-container-runtime} + ''; }; - nvidia-runc = runc.overrideAttrs (oldAttrs: rec { - name = "nvidia-runc"; - version = "1.0.0-rc6"; + nvidia-container-toolkit = buildGoModule rec { + pname = "nvidia-container-toolkit"; + version = "1.3.0"; src = fetchFromGitHub { - owner = "opencontainers"; - repo = "runc"; + owner = "NVIDIA"; + repo = "nvidia-container-toolkit"; rev = "v${version}"; - sha256 = "1jwacb8xnmx5fr86gximhbl9dlbdwj3rpf27hav9q1si86w5pb1j"; + sha256 = "04284bhgx4j55vg9ifvbji2bvmfjfy3h1lq7q356ffgw3yr9n0hn"; }; - patches = [ "${nvidia-container-runtime}/runtime/runc/3f2f8b84a77f73d38244dd690525642a72156c64/0001-Add-prestart-hook-nvidia-container-runtime-hook-to-t.patch" ]; - }); + vendorSha256 = "17zpiyvf22skfcisflsp6pn56y6a793jcx89kw976fq2x5br1bz7"; + buildFlagsArray = [ "-ldflags=" "-s -w" ]; + postInstall = '' + mv $out/bin/{pkg,${pname}} + cp $out/bin/{${pname},nvidia-container-runtime-hook} + ''; + }; -in stdenv.mkDerivation rec { +in +stdenv.mkDerivation rec { pname = "nvidia-docker"; - version = "2.0.3"; + version = "2.5.0"; src = fetchFromGitHub { owner = "NVIDIA"; repo = "nvidia-docker"; rev = "v${version}"; - sha256 = "1vx5m591mnvcb9vy0196x5lh3r8swjsk0fnlv5h62m7m4m07v6wx"; + sha256 = "1n1k7fnimky67s12p2ycaq9mgk245fchq62vgd7bl3bzfcbg0z4h"; }; nativeBuildInputs = [ makeWrapper ]; buildPhase = '' mkdir bin + cp nvidia-docker bin + substituteInPlace bin/nvidia-docker --subst-var-by VERSION ${version} + cp ${libnvidia-container}/bin/nvidia-container-cli bin - cp ${nvidia-container-runtime-hook}/bin/nvidia-container-runtime-hook bin - cp ${nvidia-runc}/bin/runc bin/nvidia-container-runtime + cp ${nvidia-container-toolkit}/bin/nvidia-container-{toolkit,runtime-hook} bin + cp ${nvidia-container-runtime}/bin/nvidia-container-runtime bin ''; installPhase = '' @@ -68,5 +85,6 @@ in stdenv.mkDerivation rec { description = "NVIDIA container runtime for Docker"; license = licenses.bsd3; platforms = platforms.linux; + maintainers = with lib.maintainers; [ cpcloud ]; }; } diff --git a/pkgs/applications/virtualization/nvidia-docker/libnvc-ldconfig-and-path-fixes.patch b/pkgs/applications/virtualization/nvidia-docker/libnvc-ldconfig-and-path-fixes.patch index 9ae8d6b5e756f..d4638791a01cb 100644 --- a/pkgs/applications/virtualization/nvidia-docker/libnvc-ldconfig-and-path-fixes.patch +++ b/pkgs/applications/virtualization/nvidia-docker/libnvc-ldconfig-and-path-fixes.patch @@ -86,7 +86,7 @@ index 30e3cfd..6d12a50 100644 if (info->libs == NULL) goto fail; if (ldcache_resolve(&ld, LIB_ARCH, root, libs, -- info->libs, info->nlibs, select_libraries, info) < 0) +- info->libs, info->nlibs, select_libraries_fn, info) < 0) + info->libs, info->nlibs, info->nvrm_version) < 0) goto fail; @@ -95,7 +95,7 @@ index 30e3cfd..6d12a50 100644 if (info->libs32 == NULL) goto fail; if (ldcache_resolve(&ld, LIB32_ARCH, root, libs, -- info->libs32, info->nlibs32, select_libraries, info) < 0) +- info->libs32, info->nlibs32, select_libraries_fn, info) < 0) + info->libs32, info->nlibs32, info->nvrm_version) < 0) goto fail; rv = 0; diff --git a/pkgs/applications/virtualization/nvidia-docker/libnvc.nix b/pkgs/applications/virtualization/nvidia-docker/libnvc.nix index 6079f215ec801..95d66582618e9 100644 --- a/pkgs/applications/virtualization/nvidia-docker/libnvc.nix +++ b/pkgs/applications/virtualization/nvidia-docker/libnvc.nix @@ -9,23 +9,23 @@ , libtirpc }: let - modp-ver = "396.51"; + modp-ver = "450.57"; nvidia-modprobe = fetchFromGitHub { owner = "NVIDIA"; repo = "nvidia-modprobe"; rev = modp-ver; - sha256 = "1fw2qwc84k64agw6fx2v0mjf88aggph9c6qhs4cv7l3gmflv8qbk"; + sha256 = "0r4f6lpbbqqs9932xd2mr7bxn6a3xdalcwq332fc1amrrkgzfyv7"; }; in stdenv.mkDerivation rec { pname = "libnvidia-container"; - version = "1.0.6"; + version = "1.3.1"; src = fetchFromGitHub { owner = "NVIDIA"; repo = "libnvidia-container"; rev = "v${version}"; - sha256 = "1pnpc9knwh8d1zqb28zc3spkjc00w0z10vd3jna8ksvpl35jl7w3"; + sha256 = "0j6b8z9x9hrrs4xp11zyjjd7kyl7fzcicpiis8k1qb1q2afnqsrq"; }; patches = [ @@ -58,7 +58,10 @@ stdenv.mkDerivation rec { mkdir -p deps/src/nvidia-modprobe-${modp-ver} cp -r ${nvidia-modprobe}/* deps/src/nvidia-modprobe-${modp-ver} chmod -R u+w deps/src - touch deps/src/nvidia-modprobe-${modp-ver}/.download_stamp + pushd deps/src + patch -p0 < ${./modprobe.patch} + touch nvidia-modprobe-${modp-ver}/.download_stamp + popd ''; NIX_CFLAGS_COMPILE = [ "-I${libtirpc.dev}/include/tirpc" ]; diff --git a/pkgs/applications/virtualization/nvidia-docker/modprobe.patch b/pkgs/applications/virtualization/nvidia-docker/modprobe.patch new file mode 100644 index 0000000000000..8e7b0a723ec0c --- /dev/null +++ b/pkgs/applications/virtualization/nvidia-docker/modprobe.patch @@ -0,0 +1,29 @@ +diff -ruN nvidia-modprobe-450.57/modprobe-utils/nvidia-modprobe-utils.c nvidia-modprobe-450.57/modprobe-utils/nvidia-modprobe-utils.c +--- nvidia-modprobe-450.57/modprobe-utils/nvidia-modprobe-utils.c 2020-07-09 17:06:05.000000000 +0000 ++++ nvidia-modprobe-450.57/modprobe-utils/nvidia-modprobe-utils.c 2020-08-18 12:43:03.223871514 +0000 +@@ -840,10 +840,10 @@ + return mknod_helper(major, minor_num, vgpu_dev_name, NV_PROC_REGISTRY_PATH); + } + +-static int nvidia_cap_get_device_file_attrs(const char* cap_file_path, +- int *major, +- int *minor, +- char *name) ++int nvidia_cap_get_device_file_attrs(const char* cap_file_path, ++ int *major, ++ int *minor, ++ char *name) + { + char field[32]; + FILE *fp; +diff -ruN nvidia-modprobe-450.57/modprobe-utils/nvidia-modprobe-utils.h nvidia-modprobe-450.57/modprobe-utils/nvidia-modprobe-utils.h +--- nvidia-modprobe-450.57/modprobe-utils/nvidia-modprobe-utils.h 2020-07-09 17:06:05.000000000 +0000 ++++ nvidia-modprobe-450.57/modprobe-utils/nvidia-modprobe-utils.h 2020-08-18 12:43:44.227745050 +0000 +@@ -81,6 +81,7 @@ + int nvidia_nvswitch_get_file_state(int minor); + int nvidia_cap_mknod(const char* cap_file_path, int *minor); + int nvidia_cap_get_file_state(const char* cap_file_path); ++int nvidia_cap_get_device_file_attrs(const char* cap_file_path, int *major, int *minor, char *name); + int nvidia_get_chardev_major(const char *name); + + #endif /* NV_LINUX */ diff --git a/pkgs/applications/virtualization/vpcs/default.nix b/pkgs/applications/virtualization/vpcs/default.nix index 464fe46b499c8..ce08428eba0a1 100644 --- a/pkgs/applications/virtualization/vpcs/default.nix +++ b/pkgs/applications/virtualization/vpcs/default.nix @@ -1,19 +1,16 @@ -{ stdenv, fetchurl, glibc }: +{ stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "vpcs"; - version = "0.8"; + version = "0.8.1"; - src = fetchurl { - name = "${pname}-${version}.tar.bz2"; - url = "mirror://sourceforge/project/${pname}/${version}/${pname}-${version}-src.tbz"; - sha256 = "14y9nflcyq486vvw0na0fkfmg5dac004qb332v4m5a0vaz8059nw"; + src = fetchFromGitHub { + owner = "GNS3"; + repo = pname; + rev = "v${version}"; + sha256 = "0kqy4bd3ns8nzn7fa72izn7a08sfrasy1rn7fd8ajah2wv8d2cak"; }; - patches = [ ./vpcs-0.8-glibc-2.26.patch ]; - - buildInputs = [ glibc.static ]; - buildPhase = ''( cd src ./mk.sh ${stdenv.buildPlatform.platform.kernelArch} @@ -27,13 +24,13 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with stdenv.lib; { - description = "Virtual PC simulator"; + description = "A simple virtual PC simulator"; longDescription = '' - The VPCS can simulate up to 9 PCs. You can ping/traceroute them, or - ping/traceroute the other hosts/routers from the VPCS when you study the - Cisco routers in the dynamips. + The VPCS (Virtual PC Simulator) can simulate up to 9 PCs. You can + ping/traceroute them, or ping/traceroute the other hosts/routers from the + VPCS when you study the Cisco routers in the dynamips. ''; - homepage = "https://sourceforge.net/projects/vpcs/"; + inherit (src.meta) homepage; license = licenses.bsd2; platforms = platforms.linux; maintainers = with maintainers; [ primeos ]; diff --git a/pkgs/applications/virtualization/vpcs/vpcs-0.8-glibc-2.26.patch b/pkgs/applications/virtualization/vpcs/vpcs-0.8-glibc-2.26.patch deleted file mode 100644 index d94a39ccd64da..0000000000000 --- a/pkgs/applications/virtualization/vpcs/vpcs-0.8-glibc-2.26.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/src/getopt.h b/src/getopt.h -index 4394aa2..bf59e10 100644 ---- a/src/getopt.h -+++ b/src/getopt.h -@@ -49,9 +49,6 @@ extern int optind; - extern int opterr; - extern int optopt; - --#ifndef FreeBSD --int getopt(int argc, char** argv, char* optstr); --#endif - int arg_to_int(const char* arg, int min, int max, int defalt); - - #ifdef __cplusplus diff --git a/pkgs/applications/window-managers/i3/balance-workspace.nix b/pkgs/applications/window-managers/i3/balance-workspace.nix new file mode 100644 index 0000000000000..18e9167227fe1 --- /dev/null +++ b/pkgs/applications/window-managers/i3/balance-workspace.nix @@ -0,0 +1,23 @@ +{ lib, buildPythonPackage, fetchPypi, i3ipc }: + +buildPythonPackage rec { + pname = "i3-balance-workspace"; + version = "1.8.3"; + + src = fetchPypi { + inherit pname version; + sha256 = "1gndzrwff8gfdqjjxv4zf2h2k0x7y97w1c3mrjpihz8xd0hbnk4d"; + }; + + propagatedBuildInputs = [ i3ipc ]; + + doCheck = false; # project has no test + pythonImportsCheck = [ "i3_balance_workspace" ]; + + meta = { + description = "Balance windows and workspaces in i3wm"; + homepage = "https://pypi.org/project/i3-balance-workspace/"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ pacien ]; + }; +} diff --git a/pkgs/applications/window-managers/i3/gaps.nix b/pkgs/applications/window-managers/i3/gaps.nix index 755ceb42161ca..10f86132ea9ad 100644 --- a/pkgs/applications/window-managers/i3/gaps.nix +++ b/pkgs/applications/window-managers/i3/gaps.nix @@ -20,7 +20,7 @@ i3.overrideAttrs (oldAttrs : rec { homepage = "https://github.com/Airblader/i3"; maintainers = with maintainers; [ fmthoma ]; license = licenses.bsd3; - platforms = platforms.all; + platforms = platforms.linux ++ platforms.netbsd ++ platforms.openbsd; longDescription = '' Fork of i3wm, a tiling window manager primarily targeted at advanced users diff --git a/pkgs/applications/window-managers/i3/i3-resurrect.nix b/pkgs/applications/window-managers/i3/i3-resurrect.nix new file mode 100644 index 0000000000000..a765d2e298ed2 --- /dev/null +++ b/pkgs/applications/window-managers/i3/i3-resurrect.nix @@ -0,0 +1,22 @@ +{ lib, buildPythonApplication, click, i3ipc, psutil, natsort, fetchPypi, xprop, xdotool, importlib-metadata }: + +buildPythonApplication rec { + pname = "i3-resurrect"; + version = "1.4.3"; + + src = fetchPypi { + inherit pname version; + sha256 = "0h181frdwpqfj9agw43qgicdvzv1i7xwky0vs0ksd8h18qxqp4hr"; + }; + + propagatedBuildInputs = [ click psutil xprop natsort i3ipc xdotool importlib-metadata ]; + doCheck = false; # no tests + + meta = with lib; { + homepage = "https://github.com/JonnyHaystack/i3-resurrect"; + description = "A simple but flexible solution to saving and restoring i3 workspaces"; + license = licenses.gpl3; + platforms= platforms.linux; + maintainers = with maintainers; [ magnetophon ]; + }; +} diff --git a/pkgs/applications/window-managers/i3/lock-color.nix b/pkgs/applications/window-managers/i3/lock-color.nix index a64e5ea33693e..f07a1926f6e4c 100644 --- a/pkgs/applications/window-managers/i3/lock-color.nix +++ b/pkgs/applications/window-managers/i3/lock-color.nix @@ -55,8 +55,6 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ malyn ]; license = licenses.bsd3; - # Needs the SSE2 instruction set. See upstream issue - # https://github.com/chrjguill/i3lock-color/issues/44 - platforms = platforms.x86; + platforms = platforms.all; }; } diff --git a/pkgs/applications/window-managers/icewm/default.nix b/pkgs/applications/window-managers/icewm/default.nix index b86e598a4d08e..f07bc873b7ad8 100644 --- a/pkgs/applications/window-managers/icewm/default.nix +++ b/pkgs/applications/window-managers/icewm/default.nix @@ -1,30 +1,86 @@ -{ stdenv, fetchFromGitHub, cmake, gettext, perl, asciidoc -, libjpeg, libtiff, libungif, libpng, imlib, expat -, freetype, fontconfig, pkgconfig, gdk-pixbuf, gdk-pixbuf-xlib, glib -, mkfontdir, libX11, libXft, libXext, libXinerama -, libXrandr, libICE, libSM, libXpm, libXdmcp, libxcb -, libpthreadstubs, pcre, libXdamage, libXcomposite, libXfixes -, libsndfile, fribidi }: +{ stdenv +, fetchFromGitHub +, cmake +, pkg-config +, perl +, asciidoc +, expat +, fontconfig +, freetype +, fribidi +, gdk-pixbuf +, gdk-pixbuf-xlib +, gettext +, glib +, imlib2 +, libICE +, libSM +, libX11 +, libXcomposite +, libXdamage +, libXdmcp +, libXext +, libXfixes +, libXft +, libXinerama +, libXpm +, libXrandr +, libjpeg +, libpng +, libpthreadstubs +, libsndfile +, libtiff +, libungif +, libxcb +, mkfontdir +, pcre +}: -with stdenv.lib; stdenv.mkDerivation rec { pname = "icewm"; - version = "1.9.2"; + version = "2.0.0"; src = fetchFromGitHub { owner = "bbidulock"; repo = pname; rev = version; - sha256 = "16a9ikknjmhrrlc5r6z2ilkjj5vzyfk4ypwab39mg7vcmd7jzc41"; + sha256 = "sha256-WdRAWAQEf9c66MVrLAs5VgBDK5r4JKM2GrjAV4cuGfA="; }; - nativeBuildInputs = [ cmake pkgconfig perl asciidoc ]; + nativeBuildInputs = [ cmake pkg-config perl asciidoc ]; buildInputs = [ - gettext libjpeg libtiff libungif libpng imlib expat freetype fontconfig - gdk-pixbuf gdk-pixbuf-xlib glib mkfontdir libX11 libXft libXext libXinerama - libXrandr libICE libSM libXpm libXdmcp libxcb libpthreadstubs pcre - libsndfile fribidi libXdamage libXcomposite libXfixes ]; + expat + fontconfig + freetype + fribidi + gdk-pixbuf + gdk-pixbuf-xlib + gettext + glib + imlib2 + libICE + libSM + libX11 + libXcomposite + libXdamage + libXdmcp + libXext + libXfixes + libXft + libXinerama + libXpm + libXrandr + libjpeg + libpng + libpthreadstubs + libsndfile + libtiff + libungif + libxcb + mkfontdir + pcre + ]; cmakeFlags = [ "-DPREFIX=$out" "-DCFGDIR=/etc/icewm" ]; @@ -33,11 +89,20 @@ stdenv.mkDerivation rec { cp -r ../lib/themes/{gtk2,Natural,nice,nice2,warp3,warp4,yellowmotif} $out/share/icewm/themes/ ''; - meta = { + meta = with stdenv.lib; { description = "A simple, lightweight X window manager"; longDescription = '' - IceWM is a window manager for the X Window System. The goal of - IceWM is speed, simplicity, and not getting in the user's way. + IceWM is a window manager for the X Window System. The goal of IceWM is + speed, simplicity, and not getting in the user’s way. It comes with a + taskbar with pager, global and per-window keybindings and a dynamic menu + system. Application windows can be managed by keyboard and mouse. Windows + can be iconified to the taskbar, to the tray, to the desktop or be made + hidden. They are controllable by a quick switch window (Alt+Tab) and in a + window list. A handful of configurable focus models are + menu-selectable. Setups with multiple monitors are supported by RandR and + Xinerama. IceWM is very configurable, themeable and well documented. It + includes an optional external background wallpaper manager with + transparency support, a simple session manager and a system tray. ''; homepage = "https://www.ice-wm.org/"; license = licenses.lgpl2; diff --git a/pkgs/applications/window-managers/notion/default.nix b/pkgs/applications/window-managers/notion/default.nix index 494bb9ff1b711..a00462e81113b 100644 --- a/pkgs/applications/window-managers/notion/default.nix +++ b/pkgs/applications/window-managers/notion/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "notion"; - version = "4.0.1"; + version = "4.0.2"; src = fetchFromGitHub { owner = "raboof"; repo = pname; rev = version; - sha256 = "1s0fyacygvc9iz7b9v3b2cmzzqc02nh4g1p9bfcxbg254iscd502"; + sha256 = "14swd0yqci8lxn259fkd9w92bgyf4rmjwgvgyqp78wlfix6ai4mv"; }; nativeBuildInputs = [ pkgconfig makeWrapper groff ]; diff --git a/pkgs/applications/window-managers/pekwm/default.nix b/pkgs/applications/window-managers/pekwm/default.nix index da2c11c873b1b..dce727ee29b38 100644 --- a/pkgs/applications/window-managers/pekwm/default.nix +++ b/pkgs/applications/window-managers/pekwm/default.nix @@ -1,20 +1,37 @@ -{ stdenv, fetchurl, pkgconfig -, libpng, libjpeg -, libXext, libXft, libXpm, libXrandr, libXinerama }: +{ stdenv +, fetchFromGitHub +, pkg-config +, cmake +, libXext +, libXft +, libXinerama +, libXpm +, libXrandr +, libjpeg +, libpng +}: stdenv.mkDerivation rec { - pname = "pekwm"; - version = "0.1.17"; + version = "0.1.18"; - src = fetchurl { - url = "https://www.pekwm.org/projects/pekwm/files/${pname}-${version}.tar.bz2"; - sha256 = "003x6bxj1lb2ljxz3v414bn0rdl6z68c0r185fxwgs1qkyzx67wa"; + src = fetchFromGitHub { + owner = "pekdon"; + repo = "pekwm"; + rev = "release-${version}"; + sha256 = "sha256-R1XDEk097ycMI3R4SjUEJv37CiMaDCQMvg7N8haN0MM="; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ libpng libjpeg - libXext libXft libXpm libXrandr libXinerama ]; + nativeBuildInputs = [ pkg-config cmake ]; + buildInputs = [ + libXext + libXft + libXinerama + libXpm + libXrandr + libjpeg + libpng + ]; meta = with stdenv.lib; { description = "A lightweight window manager"; @@ -24,7 +41,7 @@ stdenv.mkDerivation rec { longer resembles aewm++ at all. It has a much expanded feature-set, including window grouping (similar to ion, pwm, or fluxbox), autoproperties, xinerama, keygrabber that supports - keychains, and much more. + keychains, and much more. - Lightweight and Unobtrusive, a window manager shouldn't be noticed. - Very configurable, we all work and think in different ways. @@ -33,7 +50,7 @@ stdenv.mkDerivation rec { - Chainable Keygrabber, usability for everyone. ''; homepage = "http://www.pekwm.org"; - license = licenses.gpl2; + license = licenses.gpl2Plus; maintainers = [ maintainers.AndersonTorres ]; platforms = platforms.linux; }; diff --git a/pkgs/applications/window-managers/picom/default.nix b/pkgs/applications/window-managers/picom/default.nix index 064e555f3a5ba..4287dd2db0202 100644 --- a/pkgs/applications/window-managers/picom/default.nix +++ b/pkgs/applications/window-managers/picom/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, pkgconfig, uthash, asciidoc, docbook_xml_dtd_45 +{ stdenv, lib, fetchFromGitHub, pkg-config, uthash, asciidoc, docbook_xml_dtd_45 , docbook_xsl, libxslt, libxml2, makeWrapper, meson, ninja , xorgproto, libxcb ,xcbutilrenderutil, xcbutilimage, pixman, libev , dbus, libconfig, libdrm, libGL, pcre, libX11 @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja - pkgconfig + pkg-config uthash asciidoc docbook_xml_dtd_45 @@ -35,10 +35,10 @@ stdenv.mkDerivation rec { libxdg_basedir ]; - NIX_CFLAGS_COMPILE = "-fno-strict-aliasing"; + mesonBuildType = "release"; mesonFlags = [ - "-Dbuild_docs=true" + "-Dwith_docs=true" ]; installFlags = [ "PREFIX=$(out)" ]; @@ -59,7 +59,7 @@ stdenv.mkDerivation rec { ''; license = licenses.mit; homepage = "https://github.com/yshui/picom"; - maintainers = with maintainers; [ ertes enzime twey ]; + maintainers = with maintainers; [ ertes twey thiagokokada ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/window-managers/wayfire/applications.nix b/pkgs/applications/window-managers/wayfire/applications.nix new file mode 100644 index 0000000000000..6c22227c0c513 --- /dev/null +++ b/pkgs/applications/window-managers/wayfire/applications.nix @@ -0,0 +1,23 @@ +{ newScope, wayfirePlugins }: + +let + self = with self; { + inherit wayfirePlugins; + + callPackage = newScope self; + + wayfire = callPackage ./. { }; + + wcm = callPackage ./wcm.nix { + inherit (wayfirePlugins) wf-shell; + }; + + wrapWayfireApplication = callPackage ./wrapper.nix { }; + + withPlugins = selector: self // { + wayfire = wrapWayfireApplication wayfire selector; + wcm = wrapWayfireApplication wcm selector; + }; + }; +in +self diff --git a/pkgs/applications/window-managers/wayfire/default.nix b/pkgs/applications/window-managers/wayfire/default.nix new file mode 100644 index 0000000000000..513784b8b52b0 --- /dev/null +++ b/pkgs/applications/window-managers/wayfire/default.nix @@ -0,0 +1,30 @@ +{ stdenv, lib, fetchurl, meson, ninja, pkg-config, git +, cairo, libdrm, libexecinfo, libinput, libjpeg, libxkbcommon, wayland +, wayland-protocols, wf-config, wlroots +}: + +stdenv.mkDerivation rec { + pname = "wayfire"; + version = "0.6.0"; + + src = fetchurl { + url = "https://github.com/WayfireWM/wayfire/releases/download/${version}/wayfire-${version}.tar.xz"; + sha256 = "0wc5szslgf8d4r4dlbfgc5v49j2ziaa8fycmknq4p0vl67mh7acq"; + }; + + nativeBuildInputs = [ meson ninja pkg-config wayland ]; + buildInputs = [ + cairo libdrm libexecinfo libinput libjpeg libxkbcommon wayland + wayland-protocols wf-config wlroots + ]; + + mesonFlags = [ "--sysconfdir" "/etc" ]; + + meta = with lib; { + homepage = "https://wayfire.org/"; + description = "3D wayland compositor"; + license = licenses.mit; + maintainers = with maintainers; [ qyliss wucke13 ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/applications/window-managers/wayfire/plugins.nix b/pkgs/applications/window-managers/wayfire/plugins.nix new file mode 100644 index 0000000000000..830a918fcb7e4 --- /dev/null +++ b/pkgs/applications/window-managers/wayfire/plugins.nix @@ -0,0 +1,12 @@ +{ newScope, wayfire }: + +let + self = with self; { + inherit wayfire; + + callPackage = newScope self; + + wf-shell = callPackage ./wf-shell.nix { }; + }; +in +self diff --git a/pkgs/applications/window-managers/wayfire/wcm.nix b/pkgs/applications/window-managers/wayfire/wcm.nix new file mode 100644 index 0000000000000..7c4b546c68efc --- /dev/null +++ b/pkgs/applications/window-managers/wayfire/wcm.nix @@ -0,0 +1,29 @@ +{ stdenv, lib, fetchFromGitHub, 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"; + + src = fetchFromGitHub { + owner = "WayfireWM"; + repo = "wcm"; + rev = "v${version}"; + sha256 = "1b22gymqfn0c49nf39676q5bj25rxab874iayiq31cmn14r30dyg"; + }; + + nativeBuildInputs = [ meson ninja pkg-config wayland wrapGAppsHook ]; + buildInputs = [ + gnome3.gtk libevdev libxml2 wayfire wayland + wayland-protocols wf-config wf-shell + ]; + + meta = with lib; { + homepage = "https://github.com/WayfireWM/wcm"; + description = "Wayfire Config Manager"; + license = licenses.mit; + maintainers = with maintainers; [ qyliss wucke13 ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/applications/window-managers/wayfire/wf-config.nix b/pkgs/applications/window-managers/wayfire/wf-config.nix new file mode 100644 index 0000000000000..00a4404c1d4e5 --- /dev/null +++ b/pkgs/applications/window-managers/wayfire/wf-config.nix @@ -0,0 +1,23 @@ +{ stdenv, lib, fetchurl, meson, ninja, pkg-config, glm, libevdev, libxml2 }: + +stdenv.mkDerivation rec { + pname = "wf-config"; + version = "0.6.0"; + + src = fetchurl { + url = "https://github.com/WayfireWM/wf-config/releases/download/${version}/wf-config-${version}.tar.xz"; + sha256 = "1a5aqybhbp9dp4jygrm3gbkdap5qbd52y6ihfr4rm1cj37sckcn0"; + }; + + nativeBuildInputs = [ meson ninja pkg-config ]; + buildInputs = [ libevdev libxml2 ]; + propagatedBuildInputs = [ glm ]; + + meta = with lib; { + homepage = "https://github.com/WayfireWM/wf-config"; + description = "Library for managing configuration files, written for Wayfire"; + license = licenses.mit; + maintainers = with maintainers; [ qyliss wucke13 ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/applications/window-managers/wayfire/wf-shell.nix b/pkgs/applications/window-managers/wayfire/wf-shell.nix new file mode 100644 index 0000000000000..6e5f189275b63 --- /dev/null +++ b/pkgs/applications/window-managers/wayfire/wf-shell.nix @@ -0,0 +1,30 @@ +{ stdenv, lib, fetchurl, meson, ninja, pkg-config, wayland, git +, alsaLib, gnome3, gtk-layer-shell, pulseaudio, wayfire, wf-config +}: + +stdenv.mkDerivation rec { + pname = "wf-shell"; + version = "0.6.1"; + + # > 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"; + }; + + nativeBuildInputs = [ meson ninja pkg-config wayland ]; + buildInputs = [ + alsaLib gnome3.gtkmm gtk-layer-shell pulseaudio wayfire wf-config + ]; + + mesonFlags = [ "--sysconfdir" "/etc" ]; + + meta = with lib; { + homepage = "https://github.com/WayfireWM/wf-shell"; + description = "GTK3-based panel for Wayfire"; + license = licenses.mit; + maintainers = with maintainers; [ qyliss wucke13 ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/applications/window-managers/wayfire/wrapper.nix b/pkgs/applications/window-managers/wayfire/wrapper.nix new file mode 100644 index 0000000000000..6229289854711 --- /dev/null +++ b/pkgs/applications/window-managers/wayfire/wrapper.nix @@ -0,0 +1,39 @@ +{ runCommandNoCC, lib, makeWrapper, wayfirePlugins }: + +let + inherit (lib) escapeShellArg makeBinPath; + + xmlPath = plugin: "${plugin}/share/wayfire/metadata/wf-shell"; + + makePluginPath = lib.makeLibraryPath; + makePluginXMLPath = lib.concatMapStringsSep ":" xmlPath; +in + +application: + +choosePlugins: + +let + plugins = choosePlugins wayfirePlugins; +in + +runCommandNoCC "${application.name}-wrapped" { + nativeBuildInputs = [ makeWrapper ]; + + passthru = application.passthru // { + unwrapped = application; + }; + + inherit (application) meta; +} '' + mkdir -p $out/bin + for bin in ${application}/bin/* + do + makeWrapper "$bin" $out/bin/''${bin##*/} \ + --suffix PATH : ${escapeShellArg (makeBinPath plugins)} \ + --suffix WAYFIRE_PLUGIN_PATH : ${escapeShellArg (makePluginPath plugins)} \ + --suffix WAYFIRE_PLUGIN_XML_PATH : ${escapeShellArg (makePluginXMLPath plugins)} + done + find ${application} -mindepth 1 -maxdepth 1 -not -name bin \ + -exec ln -s '{}' $out ';' +'' diff --git a/pkgs/applications/window-managers/wio/default.nix b/pkgs/applications/window-managers/wio/default.nix new file mode 100644 index 0000000000000..b597cf978a63f --- /dev/null +++ b/pkgs/applications/window-managers/wio/default.nix @@ -0,0 +1,57 @@ +{ stdenv, fetchgit +, meson +, ninja +, pkg-config +, alacritty +, cage +, cairo +, libxkbcommon +, udev +, wayland +, wayland-protocols +, wlroots +, xwayland +, makeWrapper +}: + +stdenv.mkDerivation rec { + pname = "wio"; + version = "unstable-2020-11-02"; + + src = fetchgit { + url = "https://git.sr.ht/~sircmpwn/wio"; + rev = "31b742e473b15a2087be740d1de28bc2afd47a4d"; + sha256 = "1vpvlahv6dmr7vfb11p5cc5ds2y2vfvcb877nkqx18yin6pg357l"; + }; + + nativeBuildInputs = [ meson ninja pkg-config makeWrapper ]; + buildInputs = [ + cairo + libxkbcommon + udev + wayland + wayland-protocols + wlroots + xwayland + ]; + + postInstall = '' + wrapProgram $out/bin/wio \ + --prefix PATH ":" "${stdenv.lib.makeBinPath [ alacritty cage ]}" + ''; + + meta = with stdenv.lib; { + description = "That Plan 9 feel, for Wayland"; + longDescription = '' + Wio is a Wayland compositor for Linux and FreeBSD which has a similar look + and feel to plan9's rio. + ''; + homepage = "https://wio-project.org/"; + license = licenses.mit; + platforms = with platforms; linux; + maintainers = with maintainers; [ AndersonTorres ]; + }; + + passthru.providedSessions = [ "wio" ]; +} +# TODO: factor Linux-specific options diff --git a/pkgs/applications/window-managers/yabar/build.nix b/pkgs/applications/window-managers/yabar/build.nix index 10806ba78cfe6..b9996e1b4666a 100644 --- a/pkgs/applications/window-managers/yabar/build.nix +++ b/pkgs/applications/window-managers/yabar/build.nix @@ -50,6 +50,6 @@ stdenv.mkDerivation { homepage = "https://github.com/geommer/yabar"; license = licenses.mit; platforms = platforms.linux; - maintainers = with maintainers; [ ma27 ]; + maintainers = with maintainers; [ ]; }; } |