diff options
author | Vladimír Čunát | 2019-10-09 14:24:04 +0200 |
---|---|---|
committer | Vladimír Čunát | 2019-10-09 14:24:04 +0200 |
commit | 61273bc672adaf89a275744532711c3eb09edf11 (patch) | |
tree | e2c2e16c71422298a527466ed30d8b349efa839c /pkgs/applications | |
parent | 2b6d5dd5d78e45f20f022ad0e9219ca3cd645c9d (diff) | |
parent | dbf21775d4d1890fb807bdf48f56838c6ceb7617 (diff) |
Merge branch 'master'
Diffstat (limited to 'pkgs/applications')
440 files changed, 26798 insertions, 11267 deletions
diff --git a/pkgs/applications/audio/asunder/default.nix b/pkgs/applications/audio/asunder/default.nix index e4c145b35c75..e252635e9537 100644 --- a/pkgs/applications/audio/asunder/default.nix +++ b/pkgs/applications/audio/asunder/default.nix @@ -12,11 +12,11 @@ with stdenv.lib; stdenv.mkDerivation rec { - version = "2.9.3"; + version = "2.9.4"; pname = "asunder"; src = fetchurl { url = "http://littlesvr.ca/asunder/releases/${pname}-${version}.tar.bz2"; - sha256 = "1630i1df06y840v3fgdf75jxw1s8kwbfn5bhi0686viah0scccw5"; + sha256 = "1bwc9v9l1f3kqjd7wis6g2sv6ibc618ybh0gsb8mkkfhadp68w30"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/applications/audio/flacon/default.nix b/pkgs/applications/audio/flacon/default.nix index 02317fee15f1..9dd5da4c1a90 100644 --- a/pkgs/applications/audio/flacon/default.nix +++ b/pkgs/applications/audio/flacon/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "flacon"; - version = "5.4.0"; + version = "5.5.1"; src = fetchFromGitHub { owner = "flacon"; repo = "flacon"; rev = "v${version}"; - sha256 = "1j8gzk92kn10yb7rmvrnyq0ipda2swnkmsavqsk5ws0z600p3k93"; + sha256 = "05pvg5xhc2azwzld08m81r4b2krqdbcbm5lmdvg2zkk67xq9pqyd"; }; nativeBuildInputs = [ cmake pkgconfig makeWrapper ]; diff --git a/pkgs/applications/audio/fmit/default.nix b/pkgs/applications/audio/fmit/default.nix index 680694aa403d..ee45217e4909 100644 --- a/pkgs/applications/audio/fmit/default.nix +++ b/pkgs/applications/audio/fmit/default.nix @@ -11,13 +11,13 @@ with stdenv.lib; mkDerivation rec { pname = "fmit"; - version = "1.2.6"; + version = "1.2.13"; src = fetchFromGitHub { owner = "gillesdegottex"; repo = "fmit"; rev = "v${version}"; - sha256 = "03nzkig5mw2rqwhwmg0qvc5cnk9bwh2wp13jh0mdrr935w0587mz"; + sha256 = "1qyskam053pvlap1av80rgp12pzhr92rs88vqs6s0ia3ypnixcc6"; }; nativeBuildInputs = [ qmake itstool wrapQtAppsHook ]; diff --git a/pkgs/applications/audio/friture/default.nix b/pkgs/applications/audio/friture/default.nix new file mode 100644 index 000000000000..483f873fbd56 --- /dev/null +++ b/pkgs/applications/audio/friture/default.nix @@ -0,0 +1,44 @@ +{ lib, fetchFromGitHub, python3Packages, wrapQtAppsHook }: + +let + py = python3Packages; +in py.buildPythonApplication rec { + pname = "friture"; + version = "0.36"; + + src = fetchFromGitHub { + owner = "tlecomte"; + repo = "friture"; + rev = "v${version}"; + sha256 = "1pz8v0qbzqq3ig9w33cp027s6c8rj316x5sy8pqs5nsiny9ddnk6"; + }; + + # module imports scipy.misc.factorial, but it has been removed since scipy + # 1.3.0; use scipy.special.factorial instead + patches = [ ./factorial.patch ]; + + nativeBuildInputs = (with py; [ numpy cython scipy ]) ++ + [ wrapQtAppsHook ]; + + propagatedBuildInputs = with py; [ + sounddevice + pyopengl + docutils + numpy + pyqt5 + appdirs + pyrr + ]; + + postFixup = '' + wrapQtApp $out/bin/friture + wrapQtApp $out/bin/.friture-wrapped + ''; + + meta = with lib; { + description = "A real-time audio analyzer"; + homepage = http://friture.org/; + license = licenses.gpl3; + maintainers = [ maintainers.laikq ]; + }; +} diff --git a/pkgs/applications/audio/friture/factorial.patch b/pkgs/applications/audio/friture/factorial.patch new file mode 100644 index 000000000000..de053802932d --- /dev/null +++ b/pkgs/applications/audio/friture/factorial.patch @@ -0,0 +1,13 @@ +diff --git a/friture/filter_design.py b/friture/filter_design.py +index 9876c43..1cc749a 100644 +--- a/friture/filter_design.py ++++ b/friture/filter_design.py +@@ -2,7 +2,7 @@ + from numpy import pi, exp, arange, cos, sin, sqrt, zeros, ones, log, arange, set_printoptions + # the three following lines are a workaround for a bug with scipy and py2exe + # together. See http://www.pyinstaller.org/ticket/83 for reference. +-from scipy.misc import factorial ++from scipy.special import factorial + import scipy + scipy.factorial = factorial + diff --git a/pkgs/applications/audio/gigedit/default.nix b/pkgs/applications/audio/gigedit/default.nix index d8fada45eb16..b8ec2d7116f5 100644 --- a/pkgs/applications/audio/gigedit/default.nix +++ b/pkgs/applications/audio/gigedit/default.nix @@ -4,15 +4,13 @@ stdenv.mkDerivation rec { pname = "gigedit"; - version = "1.1.0"; + version = "1.1.1"; src = fetchurl { url = "https://download.linuxsampler.org/packages/${pname}-${version}.tar.bz2"; - sha256 = "087pc919q28r1vw31c7w4m14bqnp4md1i2wbmk8w0vmwv2cbx2ni"; + sha256 = "08db12crwf0dy1dbyrmivqqpg5zicjikqkmf2kb1ywpq0a9hcxrb"; }; - patches = [ ./gigedit-1.1.0-pangomm-2.40.1.patch ]; - preConfigure = "make -f Makefile.svn"; nativeBuildInputs = [ autoconf automake intltool libtool pkgconfig which ]; diff --git a/pkgs/applications/audio/gigedit/gigedit-1.1.0-pangomm-2.40.1.patch b/pkgs/applications/audio/gigedit/gigedit-1.1.0-pangomm-2.40.1.patch deleted file mode 100644 index eb00fcc87a24..000000000000 --- a/pkgs/applications/audio/gigedit/gigedit-1.1.0-pangomm-2.40.1.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- a/src/gigedit/wrapLabel.cc -+++ b/src/gigedit/wrapLabel.cc -@@ -64,12 +64,7 @@ WrapLabel::WrapLabel(const Glib::ustring &text) // IN: The label text - : mWrapWidth(0), - mWrapHeight(0) - { -- // pangomm >= 2.35.1 --#if PANGOMM_MAJOR_VERSION > 2 || (PANGOMM_MAJOR_VERSION == 2 && (PANGOMM_MINOR_VERSION > 35 || (PANGOMM_MINOR_VERSION == 35 && PANGOMM_MICRO_VERSION >= 1))) -- get_layout()->set_wrap(Pango::WrapMode::WORD_CHAR); --#else - get_layout()->set_wrap(Pango::WRAP_WORD_CHAR); --#endif - set_alignment(0.0, 0.0); - set_text(text); - } diff --git a/pkgs/applications/audio/gradio/default.nix b/pkgs/applications/audio/gradio/default.nix index c4a8f2fce026..487b0a730d83 100644 --- a/pkgs/applications/audio/gradio/default.nix +++ b/pkgs/applications/audio/gradio/default.nix @@ -16,7 +16,7 @@ , gst_plugins ? with gst_all_1; [ gst-plugins-good gst-plugins-ugly ] }: let - version = "7.2"; + version = "7.3"; in stdenv.mkDerivation { pname = "gradio"; @@ -26,7 +26,7 @@ in stdenv.mkDerivation { owner = "haecker-felix"; repo = "gradio"; rev = "v${version}"; - sha256 = "0c4vlrfl0ljkiwarpwa8wcfmmihh6a5j4pi4yr0qshyl9xxvxiv3"; + sha256 = "00982dynl36lpsrx3mkd2a479zsrc8jvwfb8i7pi6w7fzzd8n8bl"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/audio/kid3/default.nix b/pkgs/applications/audio/kid3/default.nix index dfb07c4f4568..75ffd083a5a4 100644 --- a/pkgs/applications/audio/kid3/default.nix +++ b/pkgs/applications/audio/kid3/default.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation rec { pname = "kid3"; - version = "3.7.1"; + version = "3.8.0"; src = fetchurl { url = "mirror://sourceforge/project/kid3/kid3/${version}/${pname}-${version}.tar.gz"; - sha256 = "0xkrsjrbr3z8cn8hjf623l28r3b755gr11i0clv8d8i3s10vhbd8"; + sha256 = "1a6ixkkdp1fl3arylx06w73mwf26i0ibyplwwcn2kw5xsfxmbjp6"; }; nativeBuildInputs = [ wrapQtAppsHook ]; diff --git a/pkgs/applications/audio/linuxsampler/default.nix b/pkgs/applications/audio/linuxsampler/default.nix index 26fc2408d8ac..f13f10d15e82 100644 --- a/pkgs/applications/audio/linuxsampler/default.nix +++ b/pkgs/applications/audio/linuxsampler/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "linuxsampler"; - version = "2.1.0"; + version = "2.1.1"; src = fetchurl { url = "https://download.linuxsampler.org/packages/${pname}-${version}.tar.bz2"; - sha256 = "0fdxpw7jjfi058l95131d6d8538h05z7n94l60i6mhp9xbplj2jf"; + sha256 = "1gijf50x5xbpya5dj3v2mzj7azx4qk9p012csgddp73f0qi0n190"; }; preConfigure = '' diff --git a/pkgs/applications/audio/lollypop/default.nix b/pkgs/applications/audio/lollypop/default.nix index e4d508b2a1f5..c967576a5aa5 100644 --- a/pkgs/applications/audio/lollypop/default.nix +++ b/pkgs/applications/audio/lollypop/default.nix @@ -20,7 +20,7 @@ python3.pkgs.buildPythonApplication rec { pname = "lollypop"; - version = "1.1.4.14"; + version = "1.1.4.16"; format = "other"; doCheck = false; @@ -29,7 +29,7 @@ python3.pkgs.buildPythonApplication rec { url = "https://gitlab.gnome.org/World/lollypop"; rev = "refs/tags/${version}"; fetchSubmodules = true; - sha256 = "004cwbnxss6vmdsc6i0y83h3xbc2bzc0ra4z99pkizkky2mz6swj"; + sha256 = "1azfxc1vc1j4ph0zrfsgz2gac1vwmbj65j6wjlxx3nr8kia4mccl"; }; nativeBuildInputs = [ @@ -71,9 +71,8 @@ python3.pkgs.buildPythonApplication rec { patchShebangs meson_post_install.py ''; - preFixup = '' - buildPythonPath "$out $propagatedBuildInputs" - patchPythonScript "$out/libexec/lollypop-sp" + postFixup = '' + wrapPythonProgramsIn $out/libexec "$out $propagatedBuildInputs" ''; # Produce only one wrapper using wrap-python passing diff --git a/pkgs/applications/audio/mopidy/default.nix b/pkgs/applications/audio/mopidy/default.nix index c574c862f521..a5248e2a89ef 100644 --- a/pkgs/applications/audio/mopidy/default.nix +++ b/pkgs/applications/audio/mopidy/default.nix @@ -21,7 +21,7 @@ pythonPackages.buildPythonApplication rec { ]; propagatedBuildInputs = with pythonPackages; [ - gst-python pygobject3 pykka tornado_4 requests + gst-python pygobject3 pykka tornado_4 requests setuptools ] ++ stdenv.lib.optional (!stdenv.isDarwin) dbus-python; # There are no tests diff --git a/pkgs/applications/audio/mopidy/iris.nix b/pkgs/applications/audio/mopidy/iris.nix index 3a663fd33c81..90b81e1163d8 100644 --- a/pkgs/applications/audio/mopidy/iris.nix +++ b/pkgs/applications/audio/mopidy/iris.nix @@ -2,11 +2,11 @@ pythonPackages.buildPythonApplication rec { pname = "Mopidy-Iris"; - version = "3.39.0"; + version = "3.40.0"; src = pythonPackages.fetchPypi { inherit pname version; - sha256 = "1d2g66gvm7yaz4nbxlh23lj2xfkhi3hsg2k646m1za510f8dzlag"; + sha256 = "1cn68zmyvig114dsw7vhx761v9c1za3wnbq4y2z0f0cbl958n49v"; }; propagatedBuildInputs = [ diff --git a/pkgs/applications/audio/mp3gain/default.nix b/pkgs/applications/audio/mp3gain/default.nix index 907d4b8be168..233aebfa1470 100644 --- a/pkgs/applications/audio/mp3gain/default.nix +++ b/pkgs/applications/audio/mp3gain/default.nix @@ -1,13 +1,13 @@ -{ stdenv, fetchurl, unzip }: +{ stdenv, fetchurl, unzip, mpg123 }: stdenv.mkDerivation { - name = "mp3gain-1.5.2"; + name = "mp3gain-1.6.2"; src = fetchurl { - url = "mirror://sourceforge/mp3gain/mp3gain-1_5_2-src.zip"; - sha256 = "1jkgry59m8cnnfq05b9y1h4x4wpy3iq8j68slb9qffwa3ajcgbfv"; + url = "mirror://sourceforge/mp3gain/mp3gain-1_6_2-src.zip"; + sha256 = "0varr6y7k8zarr56b42r0ad9g3brhn5vv3xjg1c0v19jxwr4gh2w"; }; - buildInputs = [ unzip ]; + buildInputs = [ unzip mpg123 ]; sourceRoot = "."; diff --git a/pkgs/applications/audio/ncmpc/default.nix b/pkgs/applications/audio/ncmpc/default.nix index d89b61aa21f4..4fa9626332be 100644 --- a/pkgs/applications/audio/ncmpc/default.nix +++ b/pkgs/applications/audio/ncmpc/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "ncmpc"; - version = "0.34"; + version = "0.35"; src = fetchFromGitHub { owner = "MusicPlayerDaemon"; repo = "ncmpc"; rev = "v${version}"; - sha256 = "0ffby37qdg251c1w0vl6rmd13akbydnf12468z4vrl0ybwfd7fc4"; + sha256 = "0hhc5snxy5fbg47ynz4b7fkmzdy974zxqr0cqc6kh15yvbr25ikh"; }; buildInputs = [ glib ncurses mpd_clientlib boost ]; diff --git a/pkgs/applications/audio/osmid/default.nix b/pkgs/applications/audio/osmid/default.nix new file mode 100644 index 000000000000..7e49b872a6a5 --- /dev/null +++ b/pkgs/applications/audio/osmid/default.nix @@ -0,0 +1,37 @@ +{ stdenv +, fetchFromGitHub +, cmake +, alsaLib +, libX11 +}: + +stdenv.mkDerivation rec { + pname = "osmid"; + version = "0.6.8"; + + src = fetchFromGitHub { + owner = "llloret"; + repo = "osmid"; + rev = "v${version}"; + sha256 = "1yl25abf343yvd49nfsgxsz7jf956zrsi5n4xyqb5ldlp2hifk15"; + }; + + nativeBuildInputs = [ cmake ]; + + buildInputs = [ alsaLib libX11 ]; + + installPhase = '' + runHook preInstall + mkdir -p $out/bin + cp {m2o,o2m} $out/bin/ + runHook postInstall + ''; + + meta = with stdenv.lib; { + homepage = "https://github.com/llloret/osmid"; + description = "A lightweight, portable, easy to use tool to convert MIDI to OSC and OSC to MIDI"; + license = licenses.mit; + maintainers = with maintainers; [ c0deaddict ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/audio/padthv1/default.nix b/pkgs/applications/audio/padthv1/default.nix index b424bce2433b..49e40bad0be6 100644 --- a/pkgs/applications/audio/padthv1/default.nix +++ b/pkgs/applications/audio/padthv1/default.nix @@ -2,11 +2,11 @@ mkDerivation rec { pname = "padthv1"; - version = "0.9.9"; + version = "0.9.10"; src = fetchurl { url = "mirror://sourceforge/padthv1/${pname}-${version}.tar.gz"; - sha256 = "0axansxwa3vfc1n6a7jbaqyz6wmsffi37i4ggsl08gmqywz255xb"; + sha256 = "07gpq31a9iwk79yzndqzmw7snap7s4ifnsc4mfwkdga2zx13z0rx"; }; buildInputs = [ libjack2 alsaLib libsndfile liblo lv2 qt5.qtbase qt5.qttools fftw ]; diff --git a/pkgs/applications/audio/parlatype/default.nix b/pkgs/applications/audio/parlatype/default.nix index 1eb8b416a9aa..fb5fe47f4f2d 100644 --- a/pkgs/applications/audio/parlatype/default.nix +++ b/pkgs/applications/audio/parlatype/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "parlatype"; - version = "1.6.1"; + version = "1.6.2"; src = fetchFromGitHub { owner = "gkarsay"; repo = pname; rev = "v${version}"; - sha256 = "0b811lwiylrjirx88gi9az1b1b71j2i5a4a6g56wp9qxln6lzjj2"; + sha256 = "157423f40l8nd5da6y0qjmg4l3125zailp98w2hda3mxxn1j5ix3"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/audio/paulstretch/default.nix b/pkgs/applications/audio/paulstretch/default.nix index b2c049c9eeeb..b9a3f39affb1 100644 --- a/pkgs/applications/audio/paulstretch/default.nix +++ b/pkgs/applications/audio/paulstretch/default.nix @@ -1,5 +1,7 @@ -{ stdenv, fetchFromGitHub, audiofile, libvorbis, fltk, fftw, fftwFloat, -minixml, pkgconfig, libmad, libjack2, portaudio, libsamplerate }: +{ stdenv, fetchFromGitHub, fetchpatch +, audiofile, libvorbis, fltk, fftw, fftwFloat +, minixml, pkgconfig, libmad, libjack2, portaudio, libsamplerate +}: stdenv.mkDerivation { pname = "paulstretch"; @@ -27,6 +29,13 @@ stdenv.mkDerivation { libsamplerate ]; + patches = [ + (fetchpatch { + url = "https://github.com/paulnasca/paulstretch_cpp/pull/12.patch"; + sha256 = "0lx1rfrs53afkiz1drp456asqgj5yv6hx3lkc01165cv1jsbw6q4"; + }) + ]; + buildPhase = '' bash compile_linux_fftw_jack.sh ''; diff --git a/pkgs/applications/audio/pianobar/default.nix b/pkgs/applications/audio/pianobar/default.nix index 40e45a76b4bf..26b94f306bc6 100644 --- a/pkgs/applications/audio/pianobar/default.nix +++ b/pkgs/applications/audio/pianobar/default.nix @@ -20,8 +20,8 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A console front-end for Pandora.com"; - homepage = http://6xq.net/projects/pianobar/; - platforms = platforms.linux; + homepage = "https://6xq.net/pianobar/"; + platforms = platforms.unix; license = licenses.mit; # expat version }; } diff --git a/pkgs/applications/audio/picard/default.nix b/pkgs/applications/audio/picard/default.nix index 04a62b5d159c..f6eee17f834a 100644 --- a/pkgs/applications/audio/picard/default.nix +++ b/pkgs/applications/audio/picard/default.nix @@ -4,13 +4,13 @@ let pythonPackages = python3Packages; in pythonPackages.buildPythonApplication rec { pname = "picard"; - version = "2.1.3"; + version = "2.2.1"; src = fetchFromGitHub { owner = "metabrainz"; repo = pname; rev = "release-${version}"; - sha256 = "1armg8vpvnbpk7rrfk9q7nj5gm56rza00ni9qwdyqpxp1xaz6apj"; + sha256 = "1g7pbicf65hswbqmhrwlba9jm4r2vnggy7vy75z4256y7qcpwdfd"; }; nativeBuildInputs = [ gettext qt5.wrapQtAppsHook qt5.qtbase ]; diff --git a/pkgs/applications/audio/pulseaudio-ctl/default.nix b/pkgs/applications/audio/pulseaudio-ctl/default.nix index 1ad57efda7a0..6b7d242e1f6d 100644 --- a/pkgs/applications/audio/pulseaudio-ctl/default.nix +++ b/pkgs/applications/audio/pulseaudio-ctl/default.nix @@ -7,13 +7,13 @@ let in stdenv.mkDerivation rec { name = "${pname}-${version}"; - version = "1.66"; + version = "1.67"; src = fetchFromGitHub { owner = "graysky2"; repo = pname; rev = "v${version}"; - sha256 = "19a24w7y19551ar41q848w7r1imqkl9cpff4dpb7yry7qp1yjg0y"; + sha256 = "1mf5r7x6aiqmx9mz7gpckrqvvzxnr5gs2q1k4m42rjk6ldkpdb46"; }; postPatch = '' diff --git a/pkgs/applications/audio/pulseeffects/default.nix b/pkgs/applications/audio/pulseeffects/default.nix index 83fb17189e1d..2a68f9a64f22 100644 --- a/pkgs/applications/audio/pulseeffects/default.nix +++ b/pkgs/applications/audio/pulseeffects/default.nix @@ -47,13 +47,13 @@ let ]; in stdenv.mkDerivation rec { pname = "pulseeffects"; - version = "4.6.6"; + version = "4.6.8"; src = fetchFromGitHub { owner = "wwmm"; repo = "pulseeffects"; rev = "v${version}"; - sha256 = "15w1kc1b0i8wrkrbfzrvcscanxvcsz336bfyi1awb1lbclvd3sf4"; + sha256 = "09crsg73mvqdknvh6lczwx16x73zb2vb3m53bsapqiaq4lmwy3qr"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/audio/qmmp/default.nix b/pkgs/applications/audio/qmmp/default.nix index ef52c65b1051..aee373329ce0 100644 --- a/pkgs/applications/audio/qmmp/default.nix +++ b/pkgs/applications/audio/qmmp/default.nix @@ -29,11 +29,11 @@ # handle that. mkDerivation rec { - name = "qmmp-1.3.3"; + name = "qmmp-1.3.4"; src = fetchurl { url = "http://qmmp.ylsoftware.com/files/${name}.tar.bz2"; - sha256 = "1777kqgvbkshqlawy00gbgwflxflwmjjidqdq29mhqszs76r6727"; + sha256 = "0j9vgm6216w7arwl919p9rps0a9r6s4415spl3qkpifhwlk90zg0"; }; nativeBuildInputs = [ cmake pkgconfig ]; diff --git a/pkgs/applications/audio/quodlibet/default.nix b/pkgs/applications/audio/quodlibet/default.nix index c874bdd40d24..573dca518e3a 100644 --- a/pkgs/applications/audio/quodlibet/default.nix +++ b/pkgs/applications/audio/quodlibet/default.nix @@ -65,5 +65,6 @@ python3.pkgs.buildPythonApplication rec { maintainers = with maintainers; [ coroa sauyon ]; homepage = https://quodlibet.readthedocs.io/en/latest/; + broken = true; }; } diff --git a/pkgs/applications/audio/rofi-mpd/default.nix b/pkgs/applications/audio/rofi-mpd/default.nix new file mode 100644 index 000000000000..9def4a292f61 --- /dev/null +++ b/pkgs/applications/audio/rofi-mpd/default.nix @@ -0,0 +1,26 @@ +{ lib, python3Packages, fetchFromGitHub }: + +python3Packages.buildPythonApplication rec { + pname = "rofi-mpd"; + version = "1.1.0"; + + src = fetchFromGitHub { + owner = "JakeStanger"; + repo = "Rofi_MPD"; + rev = "v${version}"; + sha256 = "0pdra1idgas3yl9z9v7b002igwg2c1mv0yw2ffb8rsbx88x4gbai"; + }; + + propagatedBuildInputs = with python3Packages; [ mutagen mpd2 ]; + + # upstream doesn't contain a test suite + doCheck = false; + + meta = with lib; { + description = "A rofi menu for interacting with MPD written in Python"; + homepage = "https://github.com/JakeStanger/Rofi_MPD"; + license = licenses.mit; + maintainers = with maintainers; [ jakestanger ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/applications/audio/sfxr-qt/default.nix b/pkgs/applications/audio/sfxr-qt/default.nix index 706d0faa3bc1..615a8a8c6604 100644 --- a/pkgs/applications/audio/sfxr-qt/default.nix +++ b/pkgs/applications/audio/sfxr-qt/default.nix @@ -20,7 +20,7 @@ mkDerivation rec { }; nativeBuildInputs = [ cmake - (python3.withPackages (pp: with pp; [ pyyaml jinja2 ])) + (python3.withPackages (pp: with pp; [ pyyaml jinja2 setuptools ])) ]; buildInputs = [ qtbase diff --git a/pkgs/applications/audio/snd/default.nix b/pkgs/applications/audio/snd/default.nix index 32e241cf557b..43637ef5dc4b 100644 --- a/pkgs/applications/audio/snd/default.nix +++ b/pkgs/applications/audio/snd/default.nix @@ -4,11 +4,11 @@ }: stdenv.mkDerivation rec { - name = "snd-19.6"; + name = "snd-19.7"; src = fetchurl { url = "mirror://sourceforge/snd/${name}.tar.gz"; - sha256 = "0s2qv8sznvw6559bi39qj9p072azh9qcb2b86w6w8clz2azjaa76"; + sha256 = "1pr3l9iadvwinmxfl9a2lsm67yi7w3rhxglidpd41m2ni8jf2rlm"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/applications/audio/sndpeek/default.nix b/pkgs/applications/audio/sndpeek/default.nix new file mode 100644 index 000000000000..ecdafdaeaddd --- /dev/null +++ b/pkgs/applications/audio/sndpeek/default.nix @@ -0,0 +1,56 @@ +{ stdenv, fetchurl, libsndfile, freeglut, alsaLib, mesa, libGLU, libX11, libXmu +, libXext, libXi }: + +stdenv.mkDerivation rec { + pname = "sndpeek"; + version = "1.4"; + + src = fetchurl { + url = "https://soundlab.cs.princeton.edu/software/sndpeek/files/sndpeek-${version}.tgz"; + sha256 = "2d86cf74854fa00dcdc05a35dd92bc4cf6115e87102b17023be5cba9ead8eedf"; + }; + sourceRoot = "sndpeek-${version}/src/sndpeek"; + + # this patch adds -lpthread to the list of libraries, without it a + # symbol-not-found-error is thrown + patches = [ ./pthread.patch ]; + + buildInputs = [ + freeglut + alsaLib + mesa + libGLU + libsndfile + libX11 + libXmu + libXext + libXi + ]; + buildFlags = "linux-alsa"; + + installPhase = '' + mkdir -p $out/bin + mv sndpeek $out/bin + ''; + + meta = with stdenv.lib; { + description = "Real-time 3D animated audio display/playback"; + longDescription = '' + sndpeek is just what it sounds (and looks) like: + * real-time 3D animated display/playback + * can use mic-input or wav/aiff/snd/raw/mat file (with playback) + * time-domain waveform + * FFT magnitude spectrum + * 3D waterfall plot + * lissajous! (interchannel correlation) + * rotatable and scalable display + * freeze frame! (for didactic purposes) + * real-time spectral feature extraction (centroid, rms, flux, rolloff) + * available on MacOS X, Linux, and Windows under GPL + * part of the sndtools distribution. + ''; + homepage = https://soundlab.cs.princeton.edu/software/sndpeek/; + license = licenses.gpl2; + maintainers = [ maintainers.laikq ]; + }; +} diff --git a/pkgs/applications/audio/sndpeek/pthread.patch b/pkgs/applications/audio/sndpeek/pthread.patch new file mode 100644 index 000000000000..b2f1d37da6be --- /dev/null +++ b/pkgs/applications/audio/sndpeek/pthread.patch @@ -0,0 +1,13 @@ +diff --git a/makefile.alsa b/makefile.alsa +index 34fb848..cdaeaec 100644 +--- a/makefile.alsa ++++ b/makefile.alsa +@@ -4,7 +4,7 @@ CPP=g++ + INCLUDES=-I../marsyas/ + MARSYAS_DIR=../marsyas/ + CFLAGS=-D__LINUX_ALSA__ -D__LITTLE_ENDIAN__ $(INCLUDES) -O3 -c +-LIBS=-L/usr/X11R6/lib -lglut -lGL -lGLU -lasound -lXmu -lX11 -lXext -lXi -lm -lsndfile ++LIBS=-L/usr/X11R6/lib -lglut -lGL -lGLU -lasound -lXmu -lX11 -lXext -lXi -lm -lsndfile -lpthread + + OBJS=chuck_fft.o RtAudio.o Thread.o sndpeek.o Stk.o \ + Centroid.o DownSampler.o Flux.o LPC.o MFCC.o RMS.o Rolloff.o \ diff --git a/pkgs/applications/audio/sonic-pi/default.nix b/pkgs/applications/audio/sonic-pi/default.nix index 2a39caa08659..055678b0e35f 100644 --- a/pkgs/applications/audio/sonic-pi/default.nix +++ b/pkgs/applications/audio/sonic-pi/default.nix @@ -100,5 +100,6 @@ mkDerivation rec { license = lib.licenses.mit; maintainers = with lib.maintainers; [ Phlogistique kamilchm ]; platforms = lib.platforms.linux; + broken = true; }; } diff --git a/pkgs/applications/audio/spotifyd/default.nix b/pkgs/applications/audio/spotifyd/default.nix index 9035a2a73c57..fab12a3e7245 100644 --- a/pkgs/applications/audio/spotifyd/default.nix +++ b/pkgs/applications/audio/spotifyd/default.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "spotifyd"; - version = "0.2.11"; + version = "0.2.18"; src = fetchFromGitHub { owner = "Spotifyd"; repo = "spotifyd"; - rev = version; - sha256 = "1iybk9xrrvhrcl2xl5r2xhyn1ydhrgwnnb8ldhsw5c16b32z03q1"; + rev = "v${version}"; + sha256 = "12826b0wf31m9vw1s7bcd1hb4ygb1xn4sdknn1y9kzc68brsq94v"; }; - cargoSha256 = "1dzg4sb95ixjfhx6n4w2rgrq4481vw01nsdrbm746mz7nm71csk3"; + cargoSha256 = "0ar4bfwn3qxa6wsz2hd7nv1wr824h74jy3xqba2qsy0rsfwy1bmm"; cargoBuildFlags = [ "--no-default-features" @@ -30,6 +30,8 @@ rustPlatform.buildRustPackage rec { ++ stdenv.lib.optional withPulseAudio libpulseaudio ++ stdenv.lib.optional withPortAudio portaudio; + doCheck = false; + meta = with stdenv.lib; { description = "An open source Spotify client running as a UNIX daemon"; homepage = "https://github.com/Spotifyd/spotifyd"; diff --git a/pkgs/applications/audio/vcv-rack/default.nix b/pkgs/applications/audio/vcv-rack/default.nix index 234b98a893c8..4322bbcbc438 100644 --- a/pkgs/applications/audio/vcv-rack/default.nix +++ b/pkgs/applications/audio/vcv-rack/default.nix @@ -1,6 +1,6 @@ { stdenv, makeWrapper, fetchFromBitbucket, fetchFromGitHub, pkgconfig , alsaLib, curl, glew, glfw, gtk2-x11, jansson, libjack2, libXext, libXi -, libzip, rtaudio, rtmidi, speex }: +, libzip, rtaudio, rtmidi, speex, libsamplerate }: let glfw-git = glfw.overrideAttrs (oldAttrs: rec { @@ -28,13 +28,13 @@ let in with stdenv.lib; stdenv.mkDerivation rec { pname = "VCV-Rack"; - version = "1.1.4"; + version = "1.1.5"; src = fetchFromGitHub { owner = "VCVRack"; repo = "Rack"; rev = "v${version}"; - sha256 = "04kg0nm7w19s2zfrsxjfl3bs4sy3bzf28kzl4hayzwv480667ybx"; + sha256 = "172v66v2vb6l9dpsq6fb6xn035igwhpjci8w3kz2na3rvmz1bc5w"; fetchSubmodules = true; }; @@ -58,7 +58,7 @@ with stdenv.lib; stdenv.mkDerivation rec { enableParallelBuilding = true; nativeBuildInputs = [ makeWrapper pkgconfig ]; - buildInputs = [ glfw-git alsaLib curl glew gtk2-x11 jansson libjack2 libzip rtaudio rtmidi speex ]; + buildInputs = [ glfw-git alsaLib curl glew gtk2-x11 jansson libjack2 libzip rtaudio rtmidi speex libsamplerate ]; buildFlags = "Rack"; diff --git a/pkgs/applications/audio/vcv-rack/rack-minimize-vendoring.patch b/pkgs/applications/audio/vcv-rack/rack-minimize-vendoring.patch index eca9c2f13c06..d310d57835e4 100644 --- a/pkgs/applications/audio/vcv-rack/rack-minimize-vendoring.patch +++ b/pkgs/applications/audio/vcv-rack/rack-minimize-vendoring.patch @@ -5,10 +5,9 @@ diff -ru a/Makefile b/Makefile build/dep/osdialog/osdialog_gtk2.c.o: FLAGS += $(shell pkg-config --cflags gtk+-2.0) LDFLAGS += -rdynamic \ -- dep/lib/libglfw3.a dep/lib/libGLEW.a dep/lib/libjansson.a dep/lib/libspeexdsp.a dep/lib/libzip.a dep/lib/libz.a dep/lib/librtmidi.a dep/lib/librtaudio.a dep/lib/libcurl.a dep/lib/libssl.a dep/lib/libcrypto.a \ -- -lpthread -lGL -ldl -lX11 -lasound -ljack \ -+ -lGLEW -ljansson -lspeexdsp -lzip -lz -lrtmidi -lrtaudio -lcurl -lssl -lcrypto \ -+ -lpthread -lGL -ldl -lX11 -lasound -ljack -lglfw \ +- dep/lib/libGLEW.a dep/lib/libglfw3.a dep/lib/libjansson.a dep/lib/libcurl.a dep/lib/libssl.a dep/lib/libcrypto.a dep/lib/libzip.a dep/lib/libz.a dep/lib/libspeexdsp.a dep/lib/libsamplerate.a dep/lib/librtmidi.a dep/lib/librtaudio.a \ ++ -lGLEW -lglfw -ljansson -lcurl -lssl -lcrypto -lzip -lz -lspeexdsp -lsamplerate -lrtmidi -lrtaudio \ + -lpthread -lGL -ldl -lX11 -lasound -ljack \ $(shell pkg-config --libs gtk+-2.0) TARGET := Rack endif diff --git a/pkgs/applications/blockchains/bitcoin-abc.nix b/pkgs/applications/blockchains/bitcoin-abc.nix index 479d175020b7..cd07a57cba7f 100644 --- a/pkgs/applications/blockchains/bitcoin-abc.nix +++ b/pkgs/applications/blockchains/bitcoin-abc.nix @@ -7,13 +7,13 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "bitcoin" + (toString (optional (!withGui) "d")) + "-abc-" + version; - version = "0.19.4"; + version = "0.20.2"; src = fetchFromGitHub { owner = "bitcoin-ABC"; repo = "bitcoin-abc"; rev = "v${version}"; - sha256 = "1z4x25ygcw1pqml2ww02vqrvmihlv4f5gnnn1iyfirrjxgpfaxd7"; + sha256 = "1hii6wjz6095jpy5kw7z6i3fn2jf1dvsppf162xx2c08n9vmz3s3"; }; patches = [ ./fix-bitcoin-qt-build.patch ]; diff --git a/pkgs/applications/blockchains/go-ethereum.nix b/pkgs/applications/blockchains/go-ethereum.nix index 5f347fe91e9c..3754c9a087c5 100644 --- a/pkgs/applications/blockchains/go-ethereum.nix +++ b/pkgs/applications/blockchains/go-ethereum.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "go-ethereum"; - version = "1.9.3"; + version = "1.9.5"; goPackagePath = "github.com/ethereum/go-ethereum"; @@ -17,7 +17,7 @@ buildGoPackage rec { owner = "ethereum"; repo = pname; rev = "v${version}"; - sha256 = "0lv6gxp34j26hqazcvyr4c7rsl1vljm6cfzkcmlapsjdgym505bg"; + sha256 = "1h1c02dgazlcgp9lrm0zsig80nfj0c9553jy9nsvjyzf95ym1542"; }; meta = with stdenv.lib; { diff --git a/pkgs/applications/blockchains/jormungandr/default.nix b/pkgs/applications/blockchains/jormungandr/default.nix index 8c276d6bb805..f4ed3d777ca6 100644 --- a/pkgs/applications/blockchains/jormungandr/default.nix +++ b/pkgs/applications/blockchains/jormungandr/default.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "jormungandr"; - version = "0.3.3"; + version = "0.5.5"; src = fetchgit { url = "https://github.com/input-output-hk/${pname}"; rev = "v${version}"; - sha256 = "1fw3cl2rxnw9mww1b1z96x2iapwbpdgyp4ra19dhvfzmlvaiml5j"; + sha256 = "1fzhmkx60b5fnx4x81g5ls93iixd3126m4q1smrpq8ksidw5xifa"; fetchSubmodules = true; }; - cargoSha256 = "1ilp9ffaz3njv38mnqics4b5d7wh52mj4rwi71h5c0wzx4ww3zal"; + cargoSha256 = "1hkbzxp6ic1655cq45zv6dcyrk9rbmvscdl8wm8fbidabz4x8vqd"; nativeBuildInputs = [ pkgconfig protobuf ]; buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ]; @@ -32,6 +32,7 @@ rustPlatform.buildRustPackage rec { install -d $out/bin $out/templates install -m755 target/*/release/jormungandr $out/bin/ install -m755 target/*/release/jcli $out/bin/ + install -m755 target/*/release/jormungandr-scenario-tests $out/bin/ install -m755 scripts/send-transaction $out/templates install -m755 scripts/jcli-helpers $out/bin/ install -m755 scripts/bootstrap $out/bin/jormungandr-bootstrap diff --git a/pkgs/applications/blockchains/ledger-live-desktop/default.nix b/pkgs/applications/blockchains/ledger-live-desktop/default.nix index 0417d2913de5..09cb3c329b91 100644 --- a/pkgs/applications/blockchains/ledger-live-desktop/default.nix +++ b/pkgs/applications/blockchains/ledger-live-desktop/default.nix @@ -1,50 +1,36 @@ -{ stdenv, fetchurl, makeDesktopItem, makeWrapper, appimage-run }: +{ stdenv, fetchurl, makeDesktopItem, appimageTools, imagemagick }: -stdenv.mkDerivation rec { +let pname = "ledger-live-desktop"; - version = "1.12.0"; + version = "1.15.0"; + name = "${pname}-${version}"; src = fetchurl { url = "https://github.com/LedgerHQ/${pname}/releases/download/v${version}/${pname}-${version}-linux-x86_64.AppImage"; - sha256 = "0sn0ri8kqvy36d6vjwsb0mh54nwic58416m6q5drl1schsn6wyvj"; + sha256 = "0r7gm7q7gj39v36jd5xz20931za94nf2fpf3clbghkhlbrm0kbnq"; }; - nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ appimage-run ]; - - desktopIcon = fetchurl { - url = "https://raw.githubusercontent.com/LedgerHQ/${pname}/v${version}/build/icon.png"; - sha256 = "1mmfaf0yk7xf1kgbs3ka8wsbz1qgh60xj6z91ica1i7lw2qbdd5h"; - }; - - desktopItem = makeDesktopItem { - name = pname; - exec = "${placeholder "out"}/bin/${pname}"; - icon = pname; - desktopName = "Ledger Live"; - categories = "Utility;"; + appimageContents = appimageTools.extractType2 { + inherit name src; }; - - unpackPhase = ":"; - - installPhase = '' - runHook preInstall - - ${desktopItem.buildCommand} - install -D $src $out/share/${src.name} - install -Dm -x ${desktopIcon} \ - $out/share/icons/hicolor/1024x1024/apps/${pname}.png - makeWrapper ${appimage-run}/bin/appimage-run $out/bin/${pname} \ - --add-flags $out/share/${src.name} - - runHook postInstall +in appimageTools.wrapType2 rec { + inherit name src; + + extraInstallCommands = '' + mv $out/bin/${name} $out/bin/${pname} + install -m 444 -D ${appimageContents}/ledger-live-desktop.desktop $out/share/applications/ledger-live-desktop.desktop + install -m 444 -D ${appimageContents}/ledger-live-desktop.png $out/share/icons/hicolor/1024x1024/apps/ledger-live-desktop.png + ${imagemagick}/bin/convert ${appimageContents}/ledger-live-desktop.png -resize 512x512 ledger-live-desktop_512.png + install -m 444 -D ledger-live-desktop_512.png $out/share/icons/hicolor/512x512/apps/ledger-live-desktop.png + substituteInPlace $out/share/applications/ledger-live-desktop.desktop \ + --replace 'Exec=AppRun' 'Exec=${pname}' ''; meta = with stdenv.lib; { description = "Wallet app for Ledger Nano S and Ledger Blue"; homepage = "https://www.ledger.com/live"; license = licenses.mit; - maintainers = with maintainers; [ thedavidmeister ]; + maintainers = with maintainers; [ thedavidmeister nyanloutre ]; platforms = [ "x86_64-linux" ]; }; } diff --git a/pkgs/applications/blockchains/parity/beta.nix b/pkgs/applications/blockchains/parity/beta.nix index a6d4660dff11..a26a1b7cc771 100644 --- a/pkgs/applications/blockchains/parity/beta.nix +++ b/pkgs/applications/blockchains/parity/beta.nix @@ -1,6 +1,6 @@ let - version = "2.6.2"; - sha256 = "1j4249m5k3bi7di0wq6fm64zv3nlpgmg4hr5hnn94fyc09nz9n1r"; - cargoSha256 = "1wr0i54zc3l6n0x6cvlq9zfy3bw9w5fcvdz4vmyym9r1nkvk31s7"; + version = "2.6.4"; + sha256 = "11l93w97961zig4gqf345j9l20g0mjp7fayl1mdwdp14hhd5zk5g"; + cargoSha256 = "1q6cbms7j1h726bvq38npxkjkmz14b5ir9c4z7pb0jcy7gkplyxx"; in import ./parity.nix { inherit version sha256 cargoSha256; } diff --git a/pkgs/applications/blockchains/parity/default.nix b/pkgs/applications/blockchains/parity/default.nix index 88d24a87e135..299bb0639b6c 100644 --- a/pkgs/applications/blockchains/parity/default.nix +++ b/pkgs/applications/blockchains/parity/default.nix @@ -1,6 +1,6 @@ let - version = "2.5.7"; - sha256 = "0aprs71cbf98dsvjz0kydngkvdg5x7dijji8j6xadgvsarl1ljnj"; - cargoSha256 = "11mr5q5aynli9xm4wnxcypl3ij7f4b0p7l557yi9n0cvdraw8ki4"; + version = "2.5.9"; + sha256 = "06gmfw5l8n5i35dimsmj6dn0fxhbp53zjrdvbkff63r5kfqnwnx2"; + cargoSha256 = "1kdy0bnmyqx4rhpq0a8gliy6mws68n035kfkxrfa6cxr2cn53dyb"; in import ./parity.nix { inherit version sha256 cargoSha256; } diff --git a/pkgs/applications/blockchains/polkadot/default.nix b/pkgs/applications/blockchains/polkadot/default.nix index 100c0f8ba41f..681268b4f327 100644 --- a/pkgs/applications/blockchains/polkadot/default.nix +++ b/pkgs/applications/blockchains/polkadot/default.nix @@ -26,5 +26,6 @@ rustPlatform.buildRustPackage rec { license = licenses.gpl3; maintainers = [ maintainers.akru ]; platforms = platforms.linux; + broken = true; }; } diff --git a/pkgs/applications/blockchains/wasabiwallet/default.nix b/pkgs/applications/blockchains/wasabiwallet/default.nix index 41510eebff60..6a5532f92c95 100644 --- a/pkgs/applications/blockchains/wasabiwallet/default.nix +++ b/pkgs/applications/blockchains/wasabiwallet/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "wasabiwallet"; - version = "1.1.8"; + version = "1.1.9"; src = fetchurl { url = "https://github.com/zkSNACKs/WalletWasabi/releases/download/v${version}/WasabiLinux-${version}.tar.gz"; - sha256 = "10w4f9d0li25ifkmlmj6302i70sw3drdwd54d4r7x1n5kc6p164j"; + sha256 = "1dz05ivhadfjfp4yfpz492401yznm3rlnx7g4nqzxwh4cmqzisrm"; }; dontBuild = true; diff --git a/pkgs/applications/blockchains/zcash/default.nix b/pkgs/applications/blockchains/zcash/default.nix index 6a8fba3c2bb7..1852d72d326f 100644 --- a/pkgs/applications/blockchains/zcash/default.nix +++ b/pkgs/applications/blockchains/zcash/default.nix @@ -1,6 +1,6 @@ { stdenv, libsodium, fetchFromGitHub, wget, pkgconfig, autoreconfHook, openssl, db62, boost , zlib, gtest, gmock, callPackage, gmp, qt4, utillinux, protobuf, qrencode, libevent -, withGui }: +, libsnark, withGui }: let librustzcash = callPackage ./librustzcash {}; in @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkgconfig ]; buildInputs = [ gtest gmock gmp openssl wget db62 boost zlib - protobuf libevent libsodium librustzcash ] + protobuf libevent libsodium librustzcash libsnark ] ++ optionals stdenv.isLinux [ utillinux ] ++ optionals withGui [ qt4 qrencode ]; diff --git a/pkgs/applications/display-managers/lightdm-enso-os-greeter/default.nix b/pkgs/applications/display-managers/lightdm-enso-os-greeter/default.nix index accdea3ae2d3..3128f125cd9e 100644 --- a/pkgs/applications/display-managers/lightdm-enso-os-greeter/default.nix +++ b/pkgs/applications/display-managers/lightdm-enso-os-greeter/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchgit, pkgconfig +{ stdenv, fetchgit, pkgconfig, linkFarm, lightdm-enso-os-greeter , dbus, pcre, epoxy, libXdmcp, at-spi2-core, libxklavier, libxkbcommon, libpthreadstubs -, gtk3, vala, cmake, libgee, libX11, lightdm, gdk-pixbuf, clutter-gtk }: +, gtk3, vala, cmake, libgee, libX11, lightdm, gdk-pixbuf, clutter-gtk, wrapGAppsHook, librsvg }: stdenv.mkDerivation { version = "0.2.1"; @@ -12,12 +12,21 @@ stdenv.mkDerivation { sha256 = "11jm181jq1vbn83h235avpdxz7pqq6prqyzki5yryy53mkj4kgxz"; }; + patches = [ + ./fix-paths.patch + ]; + + nativeBuildInputs = [ + cmake + pkgconfig + vala + wrapGAppsHook + ]; + buildInputs = [ dbus gtk3 pcre - vala - cmake epoxy libgee libX11 @@ -29,31 +38,21 @@ stdenv.mkDerivation { at-spi2-core libxkbcommon libpthreadstubs + librsvg ]; - nativeBuildInputs = [ - pkgconfig - ]; - - postPatch = '' - sed -i "s@\''${CMAKE_INSTALL_PREFIX}/@@" greeter/CMakeLists.txt - ''; - preConfigure = '' cd greeter ''; - installFlags = [ - "DESTDIR=$(out)" - ]; - - preFixup = '' - mv $out/usr/* $out - rm -r $out/usr - ''; + passthru.xgreeters = linkFarm "enso-os-greeter-xgreeters" [{ + path = "${lightdm-enso-os-greeter}/share/xgreeters/pantheon-greeter.desktop"; + name = "pantheon-greeter.desktop"; + }]; postFixup = '' - rm -r $out/sbin + substituteInPlace $out/share/xgreeters/pantheon-greeter.desktop \ + --replace "pantheon-greeter" "$out/bin/pantheon-greeter" ''; meta = with stdenv.lib; { diff --git a/pkgs/applications/display-managers/lightdm-enso-os-greeter/fix-paths.patch b/pkgs/applications/display-managers/lightdm-enso-os-greeter/fix-paths.patch new file mode 100644 index 000000000000..ab3ad2b10e41 --- /dev/null +++ b/pkgs/applications/display-managers/lightdm-enso-os-greeter/fix-paths.patch @@ -0,0 +1,24 @@ +diff --git a/greeter/CMakeLists.txt b/greeter/CMakeLists.txt +index 57aebb0..ab50bff 100644 +--- a/greeter/CMakeLists.txt ++++ b/greeter/CMakeLists.txt +@@ -9,7 +9,6 @@ list (APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake) + set (CONF_DIR "/etc/lightdm") + set (DATADIR "${CMAKE_INSTALL_PREFIX}/share") + set (PKGDATADIR "${DATADIR}/enso/greeter") +-set (CMAKE_INSTALL_PREFIX /usr) + set (VERSION "1.0.6") + + +@@ -94,9 +93,9 @@ glib_compile_resources (GLIB_RESOURCES_CSS SOURCE data/css.gresource.xml) + add_executable (pantheon-greeter ${VALA_C} ${GLIB_RESOURCES_CSS}) + target_link_libraries(pantheon-greeter m) + +-install (TARGETS pantheon-greeter RUNTIME DESTINATION sbin) ++install (TARGETS pantheon-greeter RUNTIME DESTINATION bin) + install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/pantheon-greeter.desktop DESTINATION share/xgreeters) +-install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/greeter.conf DESTINATION ${CONF_DIR}) ++install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/greeter.conf DESTINATION etc/lightdm) + install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/fingerprint.svg DESTINATION ${PKGDATADIR}) + install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/power.svg DESTINATION ${PKGDATADIR}) + install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/checked.svg DESTINATION ${PKGDATADIR}) diff --git a/pkgs/applications/display-managers/lightdm-mini-greeter/default.nix b/pkgs/applications/display-managers/lightdm-mini-greeter/default.nix index 69635718e3ba..b5b26d7cc430 100644 --- a/pkgs/applications/display-managers/lightdm-mini-greeter/default.nix +++ b/pkgs/applications/display-managers/lightdm-mini-greeter/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, lightdm, gtk3 }: +{ stdenv, linkFarm, lightdm-mini-greeter, fetchFromGitHub, autoreconfHook, pkgconfig, lightdm, gtk3, glib, gdk-pixbuf, wrapGAppsHook, librsvg }: stdenv.mkDerivation rec { pname = "lightdm-mini-greeter"; @@ -11,17 +11,22 @@ stdenv.mkDerivation rec { sha256 = "1qi0bsqi8z2zv3303ww0kd7bciz6qx8na5bkvgrqlwyvq31czai5"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; - buildInputs = [ lightdm gtk3 ]; + nativeBuildInputs = [ autoreconfHook pkgconfig wrapGAppsHook ]; + buildInputs = [ lightdm gtk3 glib gdk-pixbuf librsvg ]; configureFlags = [ "--sysconfdir=/etc" ]; - makeFlags = [ "configdir=$(out)/etc" ]; + makeFlags = [ "configdir=${placeholder "out"}/etc" ]; postInstall = '' substituteInPlace "$out/share/xgreeters/lightdm-mini-greeter.desktop" \ --replace "Exec=lightdm-mini-greeter" "Exec=$out/bin/lightdm-mini-greeter" ''; + passthru.xgreeters = linkFarm "lightdm-mini-greeter-xgreeters" [{ + path = "${lightdm-mini-greeter}/share/xgreeters/lightdm-mini-greeter.desktop"; + name = "lightdm-mini-greeter.desktop"; + }]; + meta = with stdenv.lib; { description = "A minimal, configurable, single-user GTK3 LightDM greeter"; homepage = https://github.com/prikhi/lightdm-mini-greeter; diff --git a/pkgs/applications/display-managers/lightdm/gtk-greeter.nix b/pkgs/applications/display-managers/lightdm/gtk-greeter.nix index f892a9da50b9..5b1490a6b3be 100644 --- a/pkgs/applications/display-managers/lightdm/gtk-greeter.nix +++ b/pkgs/applications/display-managers/lightdm/gtk-greeter.nix @@ -1,7 +1,18 @@ -{ stdenv, fetchurl, lightdm, pkgconfig, intltool -, hicolor-icon-theme, makeWrapper -, useGTK2 ? false, gtk2, gtk3 # gtk3 seems better supported -, exo, at-spi2-core +{ stdenv +, lightdm_gtk_greeter +, fetchurl +, lightdm +, pkgconfig +, intltool +, linkFarm +, wrapGAppsHook +, useGTK2 ? false +, gtk2 +, gtk3 # gtk3 seems better supported +, exo +, at-spi2-core +, librsvg +, hicolor-icon-theme }: #ToDo: bad icons with gtk2; @@ -20,14 +31,15 @@ stdenv.mkDerivation rec { sha256 = "1pis5qyg95pg31dvnfqq34bzgj00hg4vs547r8h60lxjk81z8p15"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ lightdm exo intltool makeWrapper hicolor-icon-theme ] + nativeBuildInputs = [ pkgconfig intltool wrapGAppsHook ]; + buildInputs = [ lightdm exo librsvg hicolor-icon-theme ] ++ (if useGTK2 then [ gtk2 ] else [ gtk3 ]); configureFlags = [ "--localstatedir=/var" "--sysconfdir=/etc" "--disable-indicator-services-command" + "--sbindir=${placeholder "out"}/bin" # for wrapGAppsHook to wrap automatically ] ++ stdenv.lib.optional useGTK2 "--with-gtk2"; preConfigure = '' @@ -43,11 +55,14 @@ stdenv.mkDerivation rec { postInstall = '' substituteInPlace "$out/share/xgreeters/lightdm-gtk-greeter.desktop" \ - --replace "Exec=lightdm-gtk-greeter" "Exec=$out/sbin/lightdm-gtk-greeter" - wrapProgram "$out/sbin/lightdm-gtk-greeter" \ - --prefix XDG_DATA_DIRS ":" "${hicolor-icon-theme}/share" + --replace "Exec=lightdm-gtk-greeter" "Exec=$out/bin/lightdm-gtk-greeter" ''; + passthru.xgreeters = linkFarm "lightdm-gtk-greeter-xgreeters" [{ + path = "${lightdm_gtk_greeter}/share/xgreeters/lightdm-gtk-greeter.desktop"; + name = "lightdm-gtk-greeter.desktop"; + }]; + meta = with stdenv.lib; { homepage = https://launchpad.net/lightdm-gtk-greeter; platforms = platforms.linux; diff --git a/pkgs/applications/editors/amp/default.nix b/pkgs/applications/editors/amp/default.nix index 98692de43170..31d0806df8a5 100644 --- a/pkgs/applications/editors/amp/default.nix +++ b/pkgs/applications/editors/amp/default.nix @@ -1,4 +1,5 @@ -{ stdenv, fetchFromGitHub, rustPlatform, openssl, pkgconfig, python3, xorg, cmake, libgit2 }: +{ stdenv, fetchFromGitHub, rustPlatform, openssl, pkgconfig, python3, xorg, cmake, libgit2, darwin +, curl }: rustPlatform.buildRustPackage rec { pname = "amp"; @@ -15,7 +16,8 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "1bvj2zg19ak4vi47vjkqlybz011kn5zq1j7zznr76zrryacw4lz1"; nativeBuildInputs = [ cmake pkgconfig ]; - buildInputs = [ openssl python3 xorg.libxcb libgit2 ]; + buildInputs = [ openssl python3 xorg.libxcb libgit2 ] ++ stdenv.lib.optionals stdenv.isDarwin + (with darwin.apple_sdk.frameworks; [ curl Security AppKit ]); # Tests need to write to the theme directory in HOME. preCheck = "export HOME=`mktemp -d`"; diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix index 2a9129cfebf2..aeacc0a33b52 100644 --- a/pkgs/applications/editors/android-studio/default.nix +++ b/pkgs/applications/editors/android-studio/default.nix @@ -8,15 +8,15 @@ let inherit (gnome2) GConf gnome_vfs; }; stableVersion = { - version = "3.5.0.21"; # "Android Studio 3.5" - build = "191.5791312"; - sha256Hash = "0vvk2vhklxg9wfi4lv4sahs5ahhb1mki1msy3yixmr56vipgv52p"; + version = "3.5.1.0"; # "Android Studio 3.5.1" + build = "191.5900203"; + sha256Hash = "0afxlif8pkrl6m1lhiqri1qv4vf5mfm1yg6qk5rad0442hm3kz4l"; }; betaVersion = stableVersion; latestVersion = { # canary & dev - version = "3.6.0.11"; # "Android Studio 3.6 Canary 11" - build = "192.5863777"; - sha256Hash = "1wz4vcdj4225vffsq0ji4zgg9qaqlfd21x7c6nczhqvydbyrjzg8"; + version = "3.6.0.12"; # "Android Studio 3.6 Canary 12" + build = "192.5871855"; + sha256Hash = "0pxvpxqdxv37sl72p7gml70k6kl717k6avw9p0l00cys0zbvb3zq"; }; in { # Attributes are named by their corresponding release channels diff --git a/pkgs/applications/editors/eclipse/default.nix b/pkgs/applications/editors/eclipse/default.nix index 972a9daded41..13db2d13567d 100644 --- a/pkgs/applications/editors/eclipse/default.nix +++ b/pkgs/applications/editors/eclipse/default.nix @@ -13,10 +13,10 @@ assert stdenv ? glibc; let platform_major = "4"; - platform_minor = "12"; + platform_minor = "13"; year = "2019"; - month = "06"; - timestamp = "201906051800"; + month = "09"; + timestamp = "201909161045"; in rec { @@ -34,7 +34,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 = "3mfljabrwbwq256vvsp9qjb96hzlbpwgnb3wz806pbyh0ibfq6s1hn8kh5aaa2da5821v0ykcxa12jagj7naqp4g91jqxp1wb1ygz2q"; + sha512 = "0s9wvxd1bahlcdw7l6cyfi59p78j6gym3a3mn1z6dm6swxgyb2wjjl7hx8bkg0zs8x31bwllpdq22y2vcm6j57h40v53l3xkhy73m8v"; }; }; @@ -46,7 +46,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 = "18p6xz6rq4w6j39b2k9kjpz8s1nljfq44g2cmvxqjgjfkq8lk4ij73ssyv1raly4wkm7r22ixacswdjmyj942k5vpv9y11i91hp1scv"; + sha512 = "09nc7ipv67h0gr7lkxsbxrgj9gn48348asn03ylcvflyrcxghqs8n11a75rwvdj98igdzpw922saicx5lqq5g2flfqiga97lwwhfiz5"; }; }; @@ -58,7 +58,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 = "0qiyk95qhdqcfgg5hgc7pcpbpjy9jnx7l3vb7s4cgijdz2xz0n5psh11lpj3whk2amh4iwkyx7kn8fxdq7lm03rlgx67cbk7p8my16m"; + sha512 = "2c40wwrc2ip32n0m5cs8ds0g7cs7018acw8gjkd23msa4pr9x9511c3dj6rbnn1hwzf9yjq6vnjmib5qarxd3vly76jwxhf867l1f7v"; }; }; @@ -88,7 +88,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 = "3bbc8d66ms7nhg6f8gb0bnzjqz26wixpipn4n9qf0azcplrv2j91z8hjw1fx39dx4pqnsf442bkgab4qqhkpks7qq54110l01q6gvy9"; + sha512 = "2vm646d1crzzzysll3p5pjfljfjzxx4qd37dqcp6xjm91zg8iskli688h0lgla0rmbwz5kj509jp22m4rxkp3cbgd006dd0jr3icdls"; }; }; @@ -100,7 +100,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 = "20qs1aagh4drsycvar3x42zy422zl34yg1p3vhxbqfbf7v3z1d3cxs9ah61x4bdxx9bkfwchasqp1wr15nflch9g0i50bdki3cgng1d"; + sha512 = "3zyxqd8iwrfgjjg91dfi4bda61rd2717hy53swmbygi48zaaam70swx997yp5qzxwjp3macdslfk6sqhq2qlcdwcdl6dmkry018jh7b"; }; }; diff --git a/pkgs/applications/editors/eclipse/plugins.nix b/pkgs/applications/editors/eclipse/plugins.nix index cf7980582ff7..b2fdeafd37c3 100644 --- a/pkgs/applications/editors/eclipse/plugins.nix +++ b/pkgs/applications/editors/eclipse/plugins.nix @@ -254,12 +254,12 @@ rec { cdt = buildEclipseUpdateSite rec { name = "cdt-${version}"; - version = "9.8.1"; + version = "9.9.0"; src = fetchzip { stripRoot = false; - url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/tools/cdt/releases/9.8/${name}/${name}.zip"; - sha256 = "0kxmwz75i8mv4wics9n0hspxhzl3glf5ry2v5mnl5j9gcf73b0nv"; + url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/tools/cdt/releases/9.9/${name}/${name}.zip"; + sha256 = "1vgx7ggilfwmx0bjrhk7mwlwg1c8lb141ilj3vzwxivlffihy054"; }; meta = with stdenv.lib; { @@ -474,12 +474,12 @@ rec { jdt = buildEclipseUpdateSite rec { name = "jdt-${version}"; - version = "4.12"; + version = "4.13"; src = fetchzip { stripRoot = false; - url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.12-201906051800/org.eclipse.jdt-4.12.zip; - sha256 = "0qscvqg69z4554n1yhl0xg1xz8ln3qsbgfzi7cg3xnnwnxfqz9cb"; + url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.13-201909161045/org.eclipse.jdt-4.13.zip; + sha256 = "0sfpxph0cszcx1cihzzjn60qid8sxgl2xyr9x46fld4ian5a7vbr"; }; 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 7737034973af..a8d9a38729f4 100644 --- a/pkgs/applications/editors/emacs-modes/elpa-generated.nix +++ b/pkgs/applications/editors/emacs-modes/elpa-generated.nix @@ -636,16 +636,16 @@ license = lib.licenses.free; }; }) {}; - csv-mode = callPackage ({ elpaBuild, fetchurl, lib }: + csv-mode = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "csv-mode"; ename = "csv-mode"; - version = "1.7"; + version = "1.9"; src = fetchurl { - url = "https://elpa.gnu.org/packages/csv-mode-1.7.el"; - sha256 = "0r4bip0w3h55i8h6sxh06czf294mrhavybz0zypzrjw91m1bi7z6"; + url = "https://elpa.gnu.org/packages/csv-mode-1.9.el"; + sha256 = "0sdnyi9in904k49yy5imapypnmk75lv14k9c1yyjhjpalvvh6br1"; }; - packageRequires = []; + packageRequires = [ cl-lib emacs ]; meta = { homepage = "https://elpa.gnu.org/packages/csv-mode.html"; license = lib.licenses.free; @@ -720,10 +720,10 @@ elpaBuild { pname = "debbugs"; ename = "debbugs"; - version = "0.19"; + version = "0.20"; src = fetchurl { - url = "https://elpa.gnu.org/packages/debbugs-0.19.tar"; - sha256 = "0cpby8f088cqb5mpd756a2mb706x763k15cg2xdmmsxl415k3yw4"; + url = "https://elpa.gnu.org/packages/debbugs-0.20.tar"; + sha256 = "03mmb1zvbqlsznl5agq8k3xrlcz310vnsa2zn0y8myanm4ra51zm"; }; packageRequires = [ cl-lib emacs soap-client ]; meta = { @@ -975,10 +975,10 @@ elpaBuild { pname = "eev"; ename = "eev"; - version = "20190517"; + version = "20190902"; src = fetchurl { - url = "https://elpa.gnu.org/packages/eev-20190517.tar"; - sha256 = "0hgjdax0kg2w7bf3idl6mw6m8j2wkh1253px42v2lbaxp6897m07"; + url = "https://elpa.gnu.org/packages/eev-20190902.tar"; + sha256 = "09rk01ykvvmmzadkz8y064iil2sm6ql6qz0rj0jjlnyymi58lj69"; }; packageRequires = [ emacs ]; meta = { @@ -1132,10 +1132,10 @@ elpaBuild { pname = "exwm"; ename = "exwm"; - version = "0.22.1"; + version = "0.23"; src = fetchurl { - url = "https://elpa.gnu.org/packages/exwm-0.22.1.tar"; - sha256 = "1ggb8vgxxml8c5bvamv9jgz80gs6h9xirjgphq8gwkywwd5xyiq4"; + url = "https://elpa.gnu.org/packages/exwm-0.23.tar"; + sha256 = "05w1v3wrp1lzz20zd9lcvr5nhk809kgy6svvkbs15xhnr6x55ad5"; }; packageRequires = [ xelb ]; meta = { @@ -1282,10 +1282,10 @@ elpaBuild { pname = "gited"; ename = "gited"; - version = "0.5.4"; + version = "0.6.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/gited-0.5.4.tar"; - sha256 = "07ckknggkqd733bnps21r46bacgyhd0v9wc0spid22hn0dnrfp12"; + url = "https://elpa.gnu.org/packages/gited-0.6.0.tar"; + sha256 = "187asqrxfpxv53hhnrcid1sy46vcy07qx5yqgnrczi54jpcc57j5"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -1327,10 +1327,10 @@ elpaBuild { pname = "gnorb"; ename = "gnorb"; - version = "1.6.1"; + version = "1.6.3"; src = fetchurl { - url = "https://elpa.gnu.org/packages/gnorb-1.6.1.tar"; - sha256 = "0n4460hsmcc3l0y3nb3fysvh33cjwgv0a3mkc26xcx8v85zl7m63"; + url = "https://elpa.gnu.org/packages/gnorb-1.6.3.tar"; + sha256 = "14cdldlvq2fx0j9g1bbzb6dq7yp9rw6bv39sls67i2p35h3gc2gd"; }; packageRequires = [ cl-lib ]; meta = { @@ -2220,10 +2220,10 @@ elpaBuild { pname = "org"; ename = "org"; - version = "9.2.5"; + version = "9.2.6"; src = fetchurl { - url = "https://elpa.gnu.org/packages/org-9.2.5.tar"; - sha256 = "1pid1sykgz83i4ry5n8f270finag6sm7ckqxn5lkikyya43wlzx1"; + url = "https://elpa.gnu.org/packages/org-9.2.6.tar"; + sha256 = "0ikd78k4yw4sm5x7l3dsbvfcmvnv5qna2mxirr560gvcnzhr0zg4"; }; packageRequires = []; meta = { @@ -2385,10 +2385,10 @@ elpaBuild { pname = "phps-mode"; ename = "phps-mode"; - version = "0.2.8"; + version = "0.3.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/phps-mode-0.2.8.tar"; - sha256 = "16sdqh93d2i9dxjibbhx4afakn150qc6xy2ifd83kx85c67y95kl"; + url = "https://elpa.gnu.org/packages/phps-mode-0.3.1.tar"; + sha256 = "1h6s5k156mbbkaysb07vcb13k3izs91pwigzcfh6jvv3lak4azg5"; }; packageRequires = [ emacs ]; meta = { @@ -3001,10 +3001,10 @@ elpaBuild { pname = "ssh-deploy"; ename = "ssh-deploy"; - version = "3.1"; + version = "3.1.10"; src = fetchurl { - url = "https://elpa.gnu.org/packages/ssh-deploy-3.1.tar"; - sha256 = "09m1ljp68rribypls5mzffmdv86jkg9wq4bdb7d1qkdjyr3f2hgn"; + url = "https://elpa.gnu.org/packages/ssh-deploy-3.1.10.tar"; + sha256 = "0gckc6yhgi8pn3s8vdyzz8x1s2d4wmsw6yjwsaqcr5nra50glbpg"; }; packageRequires = [ emacs ]; meta = { @@ -3327,10 +3327,10 @@ elpaBuild { pname = "verilog-mode"; ename = "verilog-mode"; - version = "2019.6.21.103209889"; + version = "2019.9.23.4801067"; src = fetchurl { - url = "https://elpa.gnu.org/packages/verilog-mode-2019.6.21.103209889.el"; - sha256 = "0hlcp2jhm30bzx6iabdb31aqv0dmmim30g9z5kqb0hl1bd1dnm9m"; + url = "https://elpa.gnu.org/packages/verilog-mode-2019.9.23.4801067.el"; + sha256 = "0jaba2cqiiknjqc7qz6047hpjd87hznl6b154ai1900i52kjbs21"; }; packageRequires = []; meta = { @@ -3590,10 +3590,10 @@ elpaBuild { pname = "xelb"; ename = "xelb"; - version = "0.17"; + version = "0.18"; src = fetchurl { - url = "https://elpa.gnu.org/packages/xelb-0.17.tar"; - sha256 = "0k98580vq253fjdgklgqlwl450saninfw39fbq8lv3xsnp3dcgml"; + url = "https://elpa.gnu.org/packages/xelb-0.18.tar"; + sha256 = "1fp5mzl63sh0h3ws4l5p4qgvi7ny8a3fj6k4dhqa98xgw2bx03v7"; }; packageRequires = [ cl-generic emacs ]; meta = { diff --git a/pkgs/applications/editors/emacs-modes/recipes-archive-melpa.json b/pkgs/applications/editors/emacs-modes/recipes-archive-melpa.json index def54a99e68d..3cc5f4b7df03 100644 --- a/pkgs/applications/editors/emacs-modes/recipes-archive-melpa.json +++ b/pkgs/applications/editors/emacs-modes/recipes-archive-melpa.json @@ -31,11 +31,11 @@ "url": "https://git.sr.ht/~zge/nullpointer-emacs", "unstable": { "version": [ - 20190819, - 1232 + 20190902, + 929 ], - "commit": "9d195764bfd1f2da7dc50ed73e70f3e5ac8610f5", - "sha256": "1x99ifgsxb3xn18hihral1qc6c30w824blqjhr9kpx4shh42g9f5" + "commit": "87efcc058f40e8a38a613cb479a2affba9f0ebe5", + "sha256": "0cdh64z1mass9fl05n9xn1q82ka38iar27g5dsidkfhlg6wqxmlk" }, "stable": { "version": [ @@ -442,27 +442,27 @@ "repo": "atilaneves/ac-dcd", "unstable": { "version": [ - 20190425, - 907 + 20190902, + 1124 ], "deps": [ "auto-complete", "flycheck-dmd-dub" ], - "commit": "9d444523ffa92a763ea8f532b8001829a51a2557", - "sha256": "1fkpvr7mix9wvhd6pgbcj6mrmhrffvlh5sp8wp5m48j0qc3wx7mi" + "commit": "d378d33c7bedc6c108eda7f674bd0aa1d8664857", + "sha256": "1gpqxfc83p7gzjrhs95gimwg46v9pq58m81m0fhz6slk7i005mdl" }, "stable": { "version": [ 0, - 4 + 6 ], "deps": [ "auto-complete", "flycheck-dmd-dub" ], - "commit": "4cb14b1e9fcfc4bf4a084765bc1eb10abfbbbd49", - "sha256": "0a3s880nswc2s6yh2v5zsmws550q917i7av8nrxc5sp1d03xqwmn" + "commit": "d378d33c7bedc6c108eda7f674bd0aa1d8664857", + "sha256": "1gpqxfc83p7gzjrhs95gimwg46v9pq58m81m0fhz6slk7i005mdl" } }, { @@ -961,8 +961,8 @@ "auto-complete", "yasnippet" ], - "commit": "4490d168778a61a4ee8623defe760164cd9745b8", - "sha256": "1mkxayqrvz246gxr9wjabsn015hnjq96ys71syb6r4ykjn892a6m" + "commit": "131961b0476c6ee4d7bd07ce8d42d9e5a0dde38a", + "sha256": "0b3cfrhpzjh96kdgfv7r9p0ssd7qkn9kq69jkqjzrv23jr9y80fi" }, "stable": { "version": [ @@ -987,8 +987,8 @@ "repo": "xcwen/ac-php", "unstable": { "version": [ - 20190816, - 548 + 20190922, + 428 ], "deps": [ "dash", @@ -998,8 +998,8 @@ "s", "xcscope" ], - "commit": "4490d168778a61a4ee8623defe760164cd9745b8", - "sha256": "1mkxayqrvz246gxr9wjabsn015hnjq96ys71syb6r4ykjn892a6m" + "commit": "131961b0476c6ee4d7bd07ce8d42d9e5a0dde38a", + "sha256": "0b3cfrhpzjh96kdgfv7r9p0ssd7qkn9kq69jkqjzrv23jr9y80fi" }, "stable": { "version": [ @@ -1065,8 +1065,8 @@ "auto-complete", "rtags" ], - "commit": "6289e66a69d0d5ff20b12da91e735d3984ad6f88", - "sha256": "1ggdi4mgqw1cc0w6cijds7s4vb575v27g72h6md8h1jdsfv6pvrm" + "commit": "d3d4bc9b7b829d39628a1af96f06eb23ba48670c", + "sha256": "0fgxrpqvqs988kjnkcc1lmyqnfc85ivhrarldl7iqgj25fvni6z1" }, "stable": { "version": [ @@ -1411,15 +1411,15 @@ "repo": "cute-jumper/ace-pinyin", "unstable": { "version": [ - 20190123, - 402 + 20190917, + 318 ], "deps": [ "avy", "pinyinlib" ], - "commit": "4915b2413359d85002918e322dbc90c4984b4277", - "sha256": "1yv3445p6w10wj310ffla2ghh81fynwgmxpsfkwgbcsbcjx9hmsl" + "commit": "8b2e9335b02486730ea4ceee790130cc5328f9ea", + "sha256": "1p2h4bva0v8yad075is1zkhn69x78ddwa8ncdfm0zzysddw5w8bq" }, "stable": { "version": [ @@ -1564,30 +1564,32 @@ "repo": "pauldub/activity-watch-mode", "unstable": { "version": [ - 20190423, - 1529 + 20190916, + 1212 ], "deps": [ - "cl", + "cl-lib", "json", "projectile", "request" ], - "commit": "c2ad321952524d88dd34842a6989b6e2d8acb646", - "sha256": "1fan25w5zb33i8mbd06iwz8vjac0alcv1r73h9hyzdkn8ivl6k3s" + "commit": "fb7e415484fa65f03660f59e2799bc2bcb9441ff", + "sha256": "1dzla3j6s3s5fnh8y9xq0k869fbdmzvqgbbvk6dphhzwi1wwhlzm" }, "stable": { "version": [ 1, - 0, - 2 + 1, + 0 ], "deps": [ + "cl-lib", + "json", "projectile", "request" ], - "commit": "27a0841b32dfd2b691a1dcf3a4a50d74660676b1", - "sha256": "1hfmll3g33529pshzvh2gxqr0h53p1v68wq0zlq2h2wfml89bzr9" + "commit": "fb7e415484fa65f03660f59e2799bc2bcb9441ff", + "sha256": "1dzla3j6s3s5fnh8y9xq0k869fbdmzvqgbbvk6dphhzwi1wwhlzm" } }, { @@ -1850,6 +1852,21 @@ } }, { + "ename": "ah", + "commit": "029c328e87ceb346e162c47162af727af22b65ac", + "sha256": "0h5kjf3sa17n8swkynb0fqk2jiwwgib3lzmrhwlk6k8pvzsgvlhj", + "fetcher": "github", + "repo": "takaxp/ah", + "unstable": { + "version": [ + 20190905, + 1422 + ], + "commit": "401135fd94c7f2df1ce23dbed32b4efd670689c7", + "sha256": "0n5g2fildhca5vlgpkzrhd8j60bvkfq74zzq4vzhqq7qflj17j3h" + } + }, + { "ename": "ahg", "commit": "5b7972602399f9df9139cff177e38653bb0f43ed", "sha256": "0kw138lfzwp54fmly3jzzml11y7fhcjp3w0irmwdzr68lc206lr4", @@ -1857,11 +1874,11 @@ "repo": "agriggio/ahg", "unstable": { "version": [ - 20190708, - 1358 + 20190903, + 1349 ], - "commit": "f5ffd8f592ce9038f1dd30594124ad83e2976fdf", - "sha256": "06k7hyvizhg8xrlckxcgsd5lmlqk2skhah4z914n21759yhzvf61" + "commit": "c85d951d7376425156911e5f3cd7535b4ecfbfc3", + "sha256": "0j5h1yjhg7lj3zxznfzy7mqj2c2r4cwdg8xik3wlk2cnm27fhgz6" } }, { @@ -2144,8 +2161,8 @@ "gntp", "log4e" ], - "commit": "95a735e6947b0d09dbf9b9a944a21e5f5c1e6ee1", - "sha256": "0dqk6jnmfqhxcy4hd9a09632c9gfl7hg4vksp6p0k6wrz9yx6qsf" + "commit": "b5ef49bbb871867ac03d2943a720576336cd7025", + "sha256": "00lhx0gd1myzjfp59hjk0z44xf0cr4njvzwjdacahim7gz3hhicd" }, "stable": { "version": [ @@ -2407,6 +2424,29 @@ } }, { + "ename": "amixer", + "commit": "ebb2d6c70b1fd2ddfb33d915c2ea01cc0d6da663", + "sha256": "17bf6asrx5q71m8ry9fkdb1lavj4slx995j1v0vny7wgijmcyhdf", + "fetcher": "github", + "repo": "remvee/amixer-el", + "unstable": { + "version": [ + 20190923, + 607 + ], + "commit": "51016256450996aad3ffc0f99129a98ff32059be", + "sha256": "1r07im2zd22a9f6dpxw6qrhbr773dyb6lfxcqsg7jjx55fa7xw3g" + }, + "stable": { + "version": [ + 0, + 1 + ], + "commit": "052d5a2f91e43e7dfb7bf4e7c5537ce600ae1c4a", + "sha256": "0vmzca0pwdrqiysk5dbhmn02v2sqzs0qhi6987r1z6m9xzrwhmba" + } + }, + { "ename": "ammonite-term-repl", "commit": "cf0ece0efb1fcf0ea7364df0d35fca69862f5e9a", "sha256": "004cvhyh4afgpb31m1q31g98x8c9m6lmsb5fzc4a1r5pb4p3iimp", @@ -2501,14 +2541,14 @@ }, { "ename": "anaconda-mode", - "commit": "e03b698fd3fe5b80bdd24ce01f7fba28e9da0da8", - "sha256": "0gz16aam4zrm3s9ms13h4qcdflf55506kgkpyncq3bi54cvv8n1r", + "commit": "c756ccbae044bc23131060355532261aa9a12409", + "sha256": "1cr4qyk2brm1kvm7i9cmvihid8799df7yhmmdizv3sj5l6qnsyfr", "fetcher": "github", - "repo": "proofit404/anaconda-mode", + "repo": "pythonic-emacs/anaconda-mode", "unstable": { "version": [ - 20190616, - 1019 + 20190918, + 353 ], "deps": [ "dash", @@ -2516,8 +2556,8 @@ "pythonic", "s" ], - "commit": "24aa81ba62f13d7bb505a03fe244181c461fec68", - "sha256": "166szgnm8mkw4gqcn87b6k4f2s1fv2k20zc9fkwif2mr2bk88c1v" + "commit": "dc324ddea5d43e8f9a9d86936fc27ebfca8dac68", + "sha256": "0b8sdxdi9l78143mpachnm4wa6wivhx0q4kav801wxh0ncwfnk6i" }, "stable": { "version": [ @@ -2582,20 +2622,20 @@ "repo": "remvee/android-mode", "unstable": { "version": [ - 20190109, - 1014 + 20190903, + 811 ], - "commit": "d60c88bfbd2dc5122bd2fde7dc11ec1e6848a5db", - "sha256": "1hd7wxp8f67cnbyjs4bv9x18nvzn16qjy4pi7bkbcymfpwj33r38" + "commit": "d5332e339a1f5e30559a53feffb8442ca79265d6", + "sha256": "10jhnxmxcjv9jpnsz2hrfb3rdl8306m8j30aclhvrvh4gcy1vwck" }, "stable": { "version": [ 0, 5, - 1 + 2 ], - "commit": "f8cabafaa266b56fcf4b3c6942b3ae062735251a", - "sha256": "0npx54w565mkxkgkpv02dgmfc44i1256p0w331pf3nfxq145xh27" + "commit": "d5332e339a1f5e30559a53feffb8442ca79265d6", + "sha256": "10jhnxmxcjv9jpnsz2hrfb3rdl8306m8j30aclhvrvh4gcy1vwck" } }, { @@ -2676,15 +2716,15 @@ "repo": "louietan/anki-editor", "unstable": { "version": [ - 20190608, - 1621 + 20190922, + 1223 ], "deps": [ "dash", "request" ], - "commit": "3e9f957ac59c19f1ca8c06d16c98a280a0c0474a", - "sha256": "1gkxpl4r4j547rwifp5597424arlya0k676sdkcz625b9jk65ypn" + "commit": "084ffad14fa700ad1ba95d8cbfe4a8f6052e2408", + "sha256": "0zjd5yid333shvjm4zy3p7zdpa09xcl96gc4wvi2paxjad6iqhwz" } }, { @@ -2723,6 +2763,36 @@ } }, { + "ename": "annalist", + "commit": "2298cf2894029267c77a8aa06f4fa8d9d7c3e4f0", + "sha256": "1102yd0vas3kyml8flf3mdswnc2kizbdq996740plzwnnnbw34vj", + "fetcher": "github", + "repo": "noctuid/annalist.el", + "unstable": { + "version": [ + 20190905, + 5 + ], + "deps": [ + "cl-lib" + ], + "commit": "8f52a365b2876f034fbf9b335786fa6bafc9ac80", + "sha256": "0qscah37qs65wykkw9nc5n5xgd4fy8w1jv6mznk4fbpds6qaxrjh" + }, + "stable": { + "version": [ + 1, + 0, + 0 + ], + "deps": [ + "cl-lib" + ], + "commit": "0da9812e419b1687cf1e7040384f983be32d5328", + "sha256": "1dws8r39asjnxzjq4ixlja1ih6kphw0w666k685m7ncq9jmr6jw6" + } + }, + { "ename": "annotate", "commit": "3aae88b8e3b080501195d291012deab31aaf35f7", "sha256": "1ajykgara2m713blj2kfmdz12fzm8jw7klyakkyi6i3c3a9m44jy", @@ -2730,11 +2800,11 @@ "repo": "bastibe/annotate.el", "unstable": { "version": [ - 20190519, - 706 + 20190918, + 714 ], - "commit": "09d0cd89e458779ca375ac28bc664ee2e20db530", - "sha256": "141pqfrrzbqaxxcr6m6ri9r6k1mg5i3cv8v2kili365cypnjdg1y" + "commit": "cb8de5081ab4adda81806a44ba91ba70d05d4ffb", + "sha256": "1xxx2iafl8fkp2mmdkl6l8f7bml6g1azc746vwwxsx0yiim48jm9" }, "stable": { "version": [ @@ -3328,8 +3398,8 @@ 20190816, 25 ], - "commit": "90aeb73bedba63ac9efb9cad8e7444feb8b40261", - "sha256": "0hsmjmgbsvdim1vxzh0qh41f9vmpsh8rlsy2h508ydw82rpc2q6f" + "commit": "32e08d5a8ad2f305578e0f783e087c1d312238c7", + "sha256": "00135gq4xfblv50dwxq02dd1y18xv29lrl7iir3caq4pr3nhrshg" } }, { @@ -3490,6 +3560,21 @@ } }, { + "ename": "asx", + "commit": "2eda72c3574c41184104532bb129cbe0efc8afd4", + "sha256": "0kijqfwkwm5kd1h3v0rab9fm8ivmqnmijy065iz5xhmi3yicx4aq", + "fetcher": "github", + "repo": "ragone/asx", + "unstable": { + "version": [ + 20190916, + 2122 + ], + "commit": "903e01d2856a95427bdf7d41d9628b3886e90867", + "sha256": "09dv2imw5mcpw3n42hgwiw7c3wb31f74ci7hbqa5rk140rrvhf8j" + } + }, + { "ename": "async", "commit": "855ea20024b606314f8590129259747cac0bcc97", "sha256": "0s2qrmkqqfgi1ilzbj0rfk27f89p4dycdl1lqkbsm23j0zya53w4", @@ -3610,8 +3695,8 @@ "repo": "jyp/attrap", "unstable": { "version": [ - 20190805, - 1829 + 20190918, + 828 ], "deps": [ "dash", @@ -3619,8 +3704,8 @@ "flycheck", "s" ], - "commit": "25d34a6c5f13ee6de5da60f3dae25d7e4961d991", - "sha256": "0bvymi8cfalv64a5zh1ln641qfgrdmqvsfd0d9c82xjrz19ffnpm" + "commit": "18cd1f7832870a36c404e872fa83a271fe8e688d", + "sha256": "078391949h0fgmshin8f79a1a595m06ig577rkgjqgngcp0d61l9" }, "stable": { "version": [ @@ -4196,11 +4281,11 @@ "repo": "mattfidler/auto-indent-mode.el", "unstable": { "version": [ - 20171222, - 506 + 20190925, + 231 ], - "commit": "28069360a7f89ad0286fd6a53db550752ec58488", - "sha256": "14sqmv320ryfljpxbjw9xphj6bz1ccjk3ih4cm1r8aryyhxiacii" + "commit": "8dffa08ab631bf9c388d076958f4da735eaa3e3a", + "sha256": "0y8k1mc7fk59j36khrrp9g65yaklp39s93gk9l1vmp33rclshqg8" }, "stable": { "version": [ @@ -4470,15 +4555,15 @@ "repo": "Fuco1/autobookmarks", "unstable": { "version": [ - 20180531, - 1906 + 20190919, + 841 ], "deps": [ "cl-lib", "dash" ], - "commit": "e971aa49d97da9f7ed760b37e0b674e45f1c5673", - "sha256": "04453h3s9g7ka028s4f97z606czq3vsvphrmba533jkl8lk3hpi8" + "commit": "224b24950d3ae57cd16d7417c07fda337fe0ea09", + "sha256": "0cfx447185shbiadhbar72bgqwzmbia82f8a2py215hgw9wrgqr9" } }, { @@ -4583,8 +4668,8 @@ 20190331, 2230 ], - "commit": "b959376241704cabdcf10a8d0d85e8061b5c6949", - "sha256": "0ryh0b6fg9s954dr0gmzfbrykhj8p4m1cjmcli85nympq4xymfbq" + "commit": "34eb4fe7d0a3380083e2e51627ae5968524d240b", + "sha256": "1yh02mrqkn9hp5l1kl4qj5g1jijjvbd77dcssp76gw7nm8dlsn8a" } }, { @@ -4690,14 +4775,14 @@ "repo": "abo-abo/avy", "unstable": { "version": [ - 20190828, - 951 + 20190925, + 1054 ], "deps": [ "cl-lib" ], - "commit": "034de4c0e900717ebcb6e19a973cf66beea54420", - "sha256": "0ssvnbvmdvjqpdswn68lwv2xi8mdfx8iyvs38mqc45f4502ahbjx" + "commit": "87394c9a880104a08d0f0e2d4149ac2d70cc192f", + "sha256": "1n1ngl9w8h889apkgvnz4z9lwks66qkwfb20jw5jh8p8kxyz7m16" }, "stable": { "version": [ @@ -4862,6 +4947,21 @@ } }, { + "ename": "awscli-capf", + "commit": "286c5963541f099032890c6df3bbe39648fb8684", + "sha256": "1mggykjjdl74rbgnw4k0q01iqdhl09q9zgp51xakgy07vpjs49w0", + "fetcher": "github", + "repo": "sebasmonia/awscli-capf", + "unstable": { + "version": [ + 20190909, + 1534 + ], + "commit": "6670b4db6bd35f0ea9ede598a9c17384046f4400", + "sha256": "0pnz8jiapd8i8ya2j9lns22rg903iq65pby89wpmz7cidzg6lgf0" + } + }, + { "ename": "axiom-environment", "commit": "8b4c6b03c5ff78ce327dcf66b175e266bbc53dbf", "sha256": "1hzfxdwhgv0z9136k7bdjhqjrkawsjmvqch6za6p7nkpd9ikr2zb", @@ -4961,11 +5061,11 @@ "repo": "mschuldt/backlight.el", "unstable": { "version": [ - 20190821, - 1808 + 20190905, + 519 ], - "commit": "5a7a9b70f368fc77bac2c9c2d10dee4ad9f03987", - "sha256": "0sbmvyf6y73c0rw5yi6rgri29qidr1hpwqlgdass9rrzdnq5i3zg" + "commit": "3e5b971b4ee89299240a89614db92d2c4034e954", + "sha256": "0hsb1vd1mk4mcgr4l93b81hz2bq7cpd7b3kdhabv9z489mxiy3fa" } }, { @@ -5097,6 +5197,21 @@ } }, { + "ename": "balanced-windows", + "commit": "2dc9c15d14d4417df74b73cde983ef4f25eda363", + "sha256": "0y53als0cmd4h0z1w55f4z5w6zkk7ig0ygjrzjv2khwig8hl2b8h", + "fetcher": "github", + "repo": "wbolster/emacs-balanced-windows", + "unstable": { + "version": [ + 20190903, + 1120 + ], + "commit": "1da5354ad8a9235d13928e2ee0863f3642ccdd13", + "sha256": "1hsjg48jlfi6lc6izp9xcfqvxj7c0ivjrfsr2q3yv3s1iy2fz37l" + } + }, + { "ename": "bang", "commit": "d9830cce42339243091f4463490954a8a955c65f", "sha256": "1dx1130095ij09ix20jyqradkjw9gpdfpw0d9f3krrx6xjqfn2sk", @@ -5196,11 +5311,11 @@ "repo": "belak/base16-emacs", "unstable": { "version": [ - 20190722, - 1950 + 20190924, + 1827 ], - "commit": "6e7d80859c364c74b6848c3f7679de53620daf43", - "sha256": "1dr1f9w1ysz40m0vra2ig6sr0wh6jbpcwwgnwf5rf5qi3d8g5nxi" + "commit": "4cee70262967efce31997443645f83b08aa33df1", + "sha256": "0q56qp1wrgcsabqi25npz0y3f7hw7w9zq8nkpvxhzgg105szgy17" }, "stable": { "version": [ @@ -5735,11 +5850,11 @@ "repo": "technomancy/better-defaults", "unstable": { "version": [ - 20190224, - 1816 + 20190917, + 1545 ], - "commit": "0937ac9a813632c48d114cf959768cda9676db3a", - "sha256": "0zwixak4aysj6hckg7h7qj6ha6n7fb9v66drfpgjcg4ylg500anr" + "commit": "01b8f00235c37bddf3e1a949e943dc0c9980863a", + "sha256": "0qniwfdip1ksxwx52xwsx9sgy7vfcsixsccmx877w4rlv893plah" }, "stable": { "version": [ @@ -5947,8 +6062,8 @@ "a", "pdf-tools" ], - "commit": "f2fcfc0d4e7cdb1312c5c06fd5e1820788268de3", - "sha256": "14rfixf6948zf5ylplzmpqr15rn1kr1qc26055kbb13klyl0qj3y" + "commit": "ebb2778052aeaf737adebc003957cb48cb01135e", + "sha256": "0qlvdpa88ic9gnb0qhijfsc9i6l3ba2zrvk4r4li3qrx0i9rpz5c" } }, { @@ -6095,8 +6210,8 @@ "bind-key", "key-chord" ], - "commit": "1d5ffb2e0d1427066ced58febbba68c1328bf001", - "sha256": "1a8zpi9pkgp8qkm6qxyzaj3k1s25z3x034mgjqp2mpd7ij76mk8v" + "commit": "4714d73b61bdb378f6e9e3f3838cae1abbf65ea0", + "sha256": "19m31nh2bd7rrlh53wy1hf6sxcqk4qn4wkm5w1c16314d5w56w5s" }, "stable": { "version": [ @@ -6122,8 +6237,8 @@ 20180513, 430 ], - "commit": "1d5ffb2e0d1427066ced58febbba68c1328bf001", - "sha256": "1a8zpi9pkgp8qkm6qxyzaj3k1s25z3x034mgjqp2mpd7ij76mk8v" + "commit": "4714d73b61bdb378f6e9e3f3838cae1abbf65ea0", + "sha256": "19m31nh2bd7rrlh53wy1hf6sxcqk4qn4wkm5w1c16314d5w56w5s" }, "stable": { "version": [ @@ -6304,8 +6419,8 @@ 20161216, 656 ], - "commit": "d8b984f2541bb86eb4363a2b4c94631e49843d4a", - "sha256": "1jh2960yab6rhdq7ci1slpmnr43619cza0g8bfbq759yz5b7xryh" + "commit": "7a0d79410feb728ff5cce75c140fadc19a3f9a6d", + "sha256": "00hws9fbf7hy11hnicgk2q3din0z8hdq7my00aaw7b8nnb8q4g89" }, "stable": { "version": [ @@ -6318,17 +6433,17 @@ }, { "ename": "blacken", - "commit": "69d9802996a338be937d61678f2cadf3497f6b85", - "sha256": "16lbs76jkhcq0vg09x1n8mrd4pgz5bdjsprr9260xr7g3dx8xacc", + "commit": "c756ccbae044bc23131060355532261aa9a12409", + "sha256": "0lk7rhrzysdg4zmvv75bkpxcs6fcd6jaf0nh0bp15c3kp2v9zsn5", "fetcher": "github", - "repo": "proofit404/blacken", + "repo": "pythonic-emacs/blacken", "unstable": { "version": [ - 20190521, - 841 + 20190917, + 535 ], - "commit": "1874018ae242176d0780cdcd0109e8f9a123a914", - "sha256": "1zgx7j4cp51r2cdlyf744jgfpid4lz7fwwjxbm6cvcp9hv57v7wz" + "commit": "5f30f17b048af1fe73ba710781650e3490a7be49", + "sha256": "151gxc3pi8jam8mcmbfgny519kk0vib0m2dm5b9hzf5nq0dx7r9x" } }, { @@ -6649,8 +6764,8 @@ "repo": "boogie-org/boogie-friends", "unstable": { "version": [ - 20190710, - 2300 + 20190909, + 1432 ], "deps": [ "cl-lib", @@ -6659,8 +6774,8 @@ "flycheck", "yasnippet" ], - "commit": "a7536291e4ef1e97d369b1b76b6a31906ef5e348", - "sha256": "1cq2dg71lavn4xp2pmvz784ir0lqyb4hhsj2893kllvm912hw3a6" + "commit": "45ee305eba1cce63f89e49daef9eaeaa90e34265", + "sha256": "0dnmg84ynxr4vhdgrzdvrq68jrrmp9vkz0lbwhlxpljckpmfdf03" } }, { @@ -6695,16 +6810,16 @@ "repo": "jyp/boon", "unstable": { "version": [ - 20190828, - 655 + 20190918, + 601 ], "deps": [ "dash", "expand-region", "multiple-cursors" ], - "commit": "623174d015d4ba867e4decf0fcd439b51262f0a9", - "sha256": "19qm2i4pba9kbaw70cdchvmv9jgs2vxnlrz9jqpcn864z3k887iw" + "commit": "07534c76d6bd3cd9307cc53deb59f11746f91ecc", + "sha256": "16rzjr52g4jn96xsa6z1acl9zipq46pg8rhcgxri43cdanwkfqin" }, "stable": { "version": [ @@ -6728,16 +6843,16 @@ "repo": "emacscollective/borg", "unstable": { "version": [ - 20190802, - 2023 + 20190902, + 1510 ], "deps": [ "dash", "epkg", "magit" ], - "commit": "b338e13e8de7bb2e0eef093fdb79fb763910c7e8", - "sha256": "0ydj3xs856gbm559f20zrnag5rbhy9s60qs2x5kwwdn921mdcsgj" + "commit": "e4a53ec687a1e2f75276c2f2c2b568266887fe10", + "sha256": "1s01gwnpqrkr60r0xn27231854qpqqbqphiy200x7hmkq93wzlhv" }, "stable": { "version": [ @@ -7005,8 +7120,8 @@ 20181023, 1222 ], - "commit": "8899f4f4a7faf0080977cd137e0ad7b00c40f1e8", - "sha256": "0ghq8n0lnidjz5m0i2wsmdrk2nwbwh6l8imxfhkva7qpaha4jqyq" + "commit": "6568844b83dc916a5d6aa69960cbc85ded5f7d73", + "sha256": "1b76hvk87p3glrlbm8gj4w6r7y7gqa5yq8hdxq31m2swqg8h3k52" } }, { @@ -7595,19 +7710,19 @@ "repo": "jorgenschaefer/emacs-buttercup", "unstable": { "version": [ - 20190828, - 2027 + 20190906, + 1433 ], - "commit": "9d172a74373916f571f6fe3292bdc66cd3f28779", - "sha256": "10xm856x58zgki2d9gr4rqqlkd3f8pl24z657qa7d3lkzs2av9a2" + "commit": "d2b6692d58828d0e604fa259cf484296795fb2a7", + "sha256": "0gb3d2039m71pi8m3n3mdncifljzq8qjvdg0j5gskx4shpg6k7jh" }, "stable": { "version": [ 1, - 16 + 17 ], - "commit": "810fa6fb8dab06610dbf2b5ccbc64b4d0ecc7485", - "sha256": "0dckgcyzsav6ld78bcyrrygy1cz1jvqgav6vy8f6klpmk3r8xrl1" + "commit": "d2b6692d58828d0e604fa259cf484296795fb2a7", + "sha256": "0gb3d2039m71pi8m3n3mdncifljzq8qjvdg0j5gskx4shpg6k7jh" } }, { @@ -8219,15 +8334,15 @@ "repo": "kwrooijen/cargo.el", "unstable": { "version": [ - 20190816, - 1046 + 20190902, + 754 ], "deps": [ "markdown-mode", "rust-mode" ], - "commit": "f70b060c97f0df6ec6487968dfdfae8ec97a080f", - "sha256": "1qaz6m34j4khw27nkb8yfcy1iprcldbl7jjwzsljw1i2yfc1xqj0" + "commit": "39a77e48a16d69b2e841084a3dbbbd083f166a21", + "sha256": "0wyqqc22my842ag999hnfijycfck888z1pbm6acaa6h6cczm1ya9" }, "stable": { "version": [ @@ -8695,15 +8810,15 @@ "repo": "ema2159/centaur-tabs", "unstable": { "version": [ - 20190812, - 1915 + 20190919, + 2028 ], "deps": [ "cl-lib", "powerline" ], - "commit": "de3738c14b8e73e135c16e26ca405f18459fbb20", - "sha256": "11w5nhiaz7wrb8kgkv832xg0fmm0251wy6klxrk5gsdjh2c5qf26" + "commit": "90220c26cbc77b121eeb065e30f6d7a395ef131f", + "sha256": "1hrrsz4pbblmxyhds3253sjpk3gqb4zwjwwdl8b3shgamrhwl7y3" } }, { @@ -8818,8 +8933,8 @@ 20171115, 2108 ], - "commit": "35d777b0fd54b574b42cf61c202bf077ed986e8f", - "sha256": "1p63w0i71vsysdp05mh05pvbpmhdvbjmiv3zgfdsim9k55lbn5pz" + "commit": "a886d605bc55f03250b12c45144aa4366ea5fb71", + "sha256": "10ppaz9lja7iipa2594ybfpq3cr593sq6xyy70gl8kb7wbxr7mig" }, "stable": { "version": [ @@ -9457,8 +9572,8 @@ "repo": "clojure-emacs/cider", "unstable": { "version": [ - 20190829, - 613 + 20190923, + 739 ], "deps": [ "clojure-mode", @@ -9469,25 +9584,26 @@ "sesman", "spinner" ], - "commit": "f350c7431330ca7cd2f01a1fddefbb637d3e3493", - "sha256": "0zvk6kcs1v6gfv7d48inqqa7hwn5aghhkmycn0wdiarkcdhagjmi" + "commit": "c3c903adaa85d33c3935c7483f6d6c8c8ce73c41", + "sha256": "10vn4z578q3kiizbcx785jddpg5w0ssicc0n3qbpglik7sqdgp74" }, "stable": { "version": [ 0, - 21, - 0 + 22, + 1 ], "deps": [ "clojure-mode", + "parseedn", "pkg-info", "queue", "seq", "sesman", "spinner" ], - "commit": "200c88adb1314b5811ba749af42ffb6817c1ca1b", - "sha256": "0lbrwj67fnvynkdkzvnzp3p8vqlz0ldrcs317vg60bqfhx7hvqkj" + "commit": "8a1262dae8f86f03fa2ec0abdbced10ff7e5ee1e", + "sha256": "0pjp1gcvhmbdh10w2yall9a7bbprg2z2hmmkwhqxcalsaacwfz0x" } }, { @@ -9720,8 +9836,8 @@ "repo": "andras-simonyi/citeproc-el", "unstable": { "version": [ - 20190422, - 2017 + 20190914, + 613 ], "deps": [ "dash", @@ -9731,8 +9847,8 @@ "s", "string-inflection" ], - "commit": "abab214473b7486f662c147f1c36b2a6b4b0302d", - "sha256": "0x4pjmjvi53ysfz1c0l1vi8fvd49fsdmn1j9g8zdry5b2kv36siw" + "commit": "fd2188e5d76ca78723567ae3b369ae542402e633", + "sha256": "0a924bpb15259dlv8ry5bhlq61yczy31fnsbvx2lhzf9r0i06vvc" }, "stable": { "version": [ @@ -9835,14 +9951,14 @@ "repo": "emacsmirror/clang-format", "unstable": { "version": [ - 20180406, - 1514 + 20190517, + 722 ], "deps": [ "cl-lib" ], - "commit": "1469728c61dcba8fa09c456e841f97e9eb75fa85", - "sha256": "0w6pd47pfs8jna076xjz0xz1f7bxdgvyglpllkm62fifiy2n994l" + "commit": "77ee89a0b6c1b956bc68d192527d1a0391fe5baa", + "sha256": "1xfhxn6pn0clxwlsd9pqyy8srbqvkr0wmbyxr2979zv2fxzn17kd" } }, { @@ -9958,14 +10074,14 @@ "repo": "redguardtoo/cliphist", "unstable": { "version": [ - 20181229, - 1411 + 20190920, + 149 ], "deps": [ "ivy" ], - "commit": "232ab0b3f6d502de61ebe76681a6a04d4223b877", - "sha256": "0is772r0b7i8rvra9zb94g9aczv8b6q0dmdk67wbli5rv5drfjyq" + "commit": "3105e5c4b4d2d0338edb6effd9329426854b80b1", + "sha256": "0jbn2nczhsv9adhkc6mnrmxyjbpkbqq475gry0khhqlmzm49y618" }, "stable": { "version": [ @@ -10223,11 +10339,11 @@ "repo": "clojure-emacs/clojure-mode", "unstable": { "version": [ - 20190725, - 654 + 20190914, + 1029 ], - "commit": "f23eb209a8bedec95e0ad0542762bd13998ba048", - "sha256": "1ighmb00qxk8fzc6g2n5pg4x7l079w9wazsd8kbvk6z09lpip5cs" + "commit": "147bf84189ef672161b2229ddc5c35713323ad59", + "sha256": "1m80pabpqc1lkc5zlcalqz6r6ppslj7zqx00b1c35innhzm7dzw0" }, "stable": { "version": [ @@ -10253,8 +10369,8 @@ "deps": [ "clojure-mode" ], - "commit": "f23eb209a8bedec95e0ad0542762bd13998ba048", - "sha256": "1ighmb00qxk8fzc6g2n5pg4x7l079w9wazsd8kbvk6z09lpip5cs" + "commit": "147bf84189ef672161b2229ddc5c35713323ad59", + "sha256": "1m80pabpqc1lkc5zlcalqz6r6ppslj7zqx00b1c35innhzm7dzw0" }, "stable": { "version": [ @@ -10339,16 +10455,16 @@ "repo": "clojure-emacs/clomacs", "unstable": { "version": [ - 20190313, - 1517 + 20190925, + 1509 ], "deps": [ "cider", "s", "simple-httpd" ], - "commit": "461be59e5f480af292c84fd6f7d88f1f885371a5", - "sha256": "1kglhcid32vxs8nc7j2jjbd0cbwxx2rc0y2wlhmcxpd3gsk2lwp3" + "commit": "a953d882dd4e476e58b04fcb6bb08d101588a8d1", + "sha256": "0s5sqcn8dwysvzbpvphvr4165yqh4h02r17lsy8fp5ddaqpdy6aw" }, "stable": { "version": [ @@ -10418,11 +10534,11 @@ "repo": "vallyscode/cloud-theme", "unstable": { "version": [ - 20190826, - 2117 + 20190901, + 1701 ], - "commit": "9422a25a1d7e73176b0c8b81cf4be1f722d6304a", - "sha256": "085kj8wzm21fdli0ycdj117306pc9j0a6r17w9kzy7ckzax54zc6" + "commit": "08090f00738809306fa156aac60d85ad6be9e672", + "sha256": "17a5xdn2m7gdaw71b79xs1cprh4jqgwsfgmb52gz2yaxb20hg7xy" } }, { @@ -10556,17 +10672,17 @@ 20190710, 1319 ], - "commit": "c0d21d763b13e280ccf7a387ba690650db014646", - "sha256": "072m458y9sazjmp7z0i1c3wppnwqry1lb2crf6k0v9fk3l78zknz" + "commit": "b42cb1ff80dc056da4036c7b65109d1a77d84bf4", + "sha256": "1lw7rj57pg27gs0yfqrln16hhrb7npslv26jkd0jh3k5whs0fska" }, "stable": { "version": [ 3, 15, - 2 + 3 ], - "commit": "40bbe50e23c06232ccf1c49589dde5dd84e1ac31", - "sha256": "006ziv2imzxpq646f3vq30ylbpp84l2hf7ki0l7s521g1ikh1dy0" + "commit": "26a0e200e5f4abe8268235c9fdb23a2612a1b3b1", + "sha256": "03qvdgfdxvbwwdipx8fbplnzrahf485w08j9fb0z1g27kq4wjjbb" } }, { @@ -10681,6 +10797,21 @@ } }, { + "ename": "codcut", + "commit": "0fcd1c7a483dd377674a71a07fd86297f05cc83b", + "sha256": "1pmbsv7pzmlbkfcw4ihpi5k7pgcrwlcg1hp0wkhkii8w61dq62x6", + "fetcher": "github", + "repo": "codcut/codcut-emacs", + "unstable": { + "version": [ + 20190915, + 1009 + ], + "commit": "bf07c3db3900e36b0b87423f3b715d6378f86393", + "sha256": "1wraxwnhf3xmlhc0ijh1ca9xqrxzxgih4dzca34smwp7dssz3xha" + } + }, + { "ename": "code-archive", "commit": "a8d0832eff966874d90e1d5ac1043c03e96b1c25", "sha256": "0rj7cvwzhgam25jxjw5aqx9cxa86008gx2mwcyjlbnjrkhcbi97a", @@ -11051,11 +11182,11 @@ "repo": "purcell/color-theme-sanityinc-tomorrow", "unstable": { "version": [ - 20190826, - 1340 + 20190904, + 520 ], - "commit": "2ef60a4de1d0973e53e97cc08db4c0a510a2669f", - "sha256": "1f0829zipvckcgnl5kv9msdpya8q67p72rlkg0hb6z5ik095n2yq" + "commit": "d43905165503bc5e3bf4c658b414884f5cb434e5", + "sha256": "0hzy863abchc46cpig8mnn4c885df02h8m2z7m257krkv5aggmif" }, "stable": { "version": [ @@ -11165,11 +11296,11 @@ "repo": "cyrus-and/comb", "unstable": { "version": [ - 20180831, - 721 + 20190918, + 14 ], - "commit": "69d59284e19428794b5c0aaa9be0e7d2770cc846", - "sha256": "17kcj0bkarr9biyjf1kkj4l1n9qfh6lkhwfd32qlr5k7pnwnbirb" + "commit": "a68fd0274592e8dcca28a337c9ee913cb84efa9b", + "sha256": "1n2nk8nhvfiz8dw863q91k04jrmafirdi0mj88awq9ibpw453vzz" }, "stable": { "version": [ @@ -11182,6 +11313,30 @@ } }, { + "ename": "comint-hyperlink", + "commit": "3c3bc7c897bfc5fafcda33d9837e6f3ff4da3692", + "sha256": "17fvg00r2wjwxa747v8yvgv70rd287crhhxxmp6nchfklw408ai6", + "fetcher": "github", + "repo": "matthewbauer/comint-hyperlink", + "unstable": { + "version": [ + 20190907, + 1856 + ], + "commit": "7aae3ba615eec1d96f59a386a2fcf98d5b659707", + "sha256": "1r2rxda7jhb3rydzmwk9yxscmb6rj54jz9ihqsglfmlv8p2g8q6w" + }, + "stable": { + "version": [ + 0, + 1, + 4 + ], + "commit": "7aae3ba615eec1d96f59a386a2fcf98d5b659707", + "sha256": "1r2rxda7jhb3rydzmwk9yxscmb6rj54jz9ihqsglfmlv8p2g8q6w" + } + }, + { "ename": "comint-intercept", "commit": "7d38188ec2d6e16714de9bb24ebd1ea89c7df3da", "sha256": "1m2fn02n7aphlqmiaxgwp8jqg60sq4001cnkdxn5wb3w1hxy5qvq", @@ -11437,10 +11592,10 @@ "repo": "company-mode/company-mode", "unstable": { "version": [ - 20190821, - 658 + 20190907, + 1149 ], - "commit": "1120b56bd1154a17e4c0b950cbdba4c85be28e2a", + "commit": "f6974e3103497afe01da2ad4d2ea3668ad68bc27", "sha256": "0pi6n1ggxb2i8x8f2wf1il8wcm6rd6ilvgbbh7ni95by1c987vbp" }, "stable": { @@ -11455,10 +11610,10 @@ }, { "ename": "company-anaconda", - "commit": "0eb23a75c8b57b4af1737c0508f03e66430e6076", - "sha256": "1s7y47ghy7q35qpfqavh4p9wr91i6r579mdbpvv6h5by856yn4gl", + "commit": "c756ccbae044bc23131060355532261aa9a12409", + "sha256": "0kq8vh4i92n0b42jyy8a2ra2jk27l6hmzq8r2hsyl6zj7qqzymrx", "fetcher": "github", - "repo": "proofit404/company-anaconda", + "repo": "pythonic-emacs/company-anaconda", "unstable": { "version": [ 20181025, @@ -11471,7 +11626,7 @@ "dash", "s" ], - "commit": "0ab70de1740e67cee451abcf3685c7525ff9e95a", + "commit": "398fad19160cc1d0e31dcb1d4a3f88de7a2d355d", "sha256": "182cijh6l82jj1r7iwd93h3np9c8fvcibjhv7860rk9ik41n7wil" }, "stable": { @@ -12213,8 +12368,8 @@ "lean-mode", "s" ], - "commit": "9d6b8471e2044310b4cd7cd3213b1fc8f78ec499", - "sha256": "0r8vfklrdw3f11cpk279jg3mnfbqm60m6klisqndkvir7vsrshni" + "commit": "b5ba739f68ef731c03247bf6db2708502c8ac46c", + "sha256": "1dx0a76l7w3ck23sdjymigk1hycqiawfwv24yz6wqyy74f1pcyjf" } }, { @@ -12422,8 +12577,8 @@ "cl-lib", "company" ], - "commit": "4490d168778a61a4ee8623defe760164cd9745b8", - "sha256": "1mkxayqrvz246gxr9wjabsn015hnjq96ys71syb6r4ykjn892a6m" + "commit": "131961b0476c6ee4d7bd07ce8d42d9e5a0dde38a", + "sha256": "0b3cfrhpzjh96kdgfv7r9p0ssd7qkn9kq69jkqjzrv23jr9y80fi" }, "stable": { "version": [ @@ -12455,8 +12610,8 @@ "company", "phpactor" ], - "commit": "299347fbe3dd8617a46e874ccb8511f6705c95e4", - "sha256": "0g5hidr0c3f83ml1b8wnkf1blvapkivxzr26amcv5ml0v5f6icjn" + "commit": "a12ec67ce9de9e96c89548052ae323a277cba846", + "sha256": "031i5s3cv9z2d6vnwbf91291fgafcqg61km9b3z7p9bk91vbkxsy" }, "stable": { "version": [ @@ -12539,27 +12694,27 @@ "repo": "raxod502/prescient.el", "unstable": { "version": [ - 20190706, - 1917 + 20190921, + 3 ], "deps": [ "company", "prescient" ], - "commit": "ea8e9fea4385272924d09c91220c7f2e9ac95b3f", - "sha256": "1apb9v31ajq586f7mqachv238yv40gacrjmh2s8mnk45xil72swy" + "commit": "2f01b640e3a487718dbc481d14406005c0212ed9", + "sha256": "1wqk1g8fjpcbpiz32k7arnisncd4n9zs84dn3qn9y8ggjzldqy91" }, "stable": { "version": [ 3, - 2 + 3 ], "deps": [ "company", "prescient" ], - "commit": "653ca4b66954b7f1b6e4635a574234dd316c11a3", - "sha256": "0d60h4rfm5jcf8cf11z91wjqp0xcrviskqzyqhfliqvy2i2yl6ks" + "commit": "2f01b640e3a487718dbc481d14406005c0212ed9", + "sha256": "1wqk1g8fjpcbpiz32k7arnisncd4n9zs84dn3qn9y8ggjzldqy91" } }, { @@ -12703,8 +12858,8 @@ "company", "rtags" ], - "commit": "6289e66a69d0d5ff20b12da91e735d3984ad6f88", - "sha256": "1ggdi4mgqw1cc0w6cijds7s4vb575v27g72h6md8h1jdsfv6pvrm" + "commit": "d3d4bc9b7b829d39628a1af96f06eb23ba48670c", + "sha256": "0fgxrpqvqs988kjnkcc1lmyqnfc85ivhrarldl7iqgj25fvni6z1" }, "stable": { "version": [ @@ -12735,8 +12890,8 @@ "company", "dash" ], - "commit": "6ae625f80d90e0779c79de38e8f83a336c1d00fa", - "sha256": "0da9y7x1xvaahsslcmgji6hr3cbn779i504cfrmsabbr3wmkn3fy" + "commit": "52f3bf26b74adc30a275f5f4290a1fc72a6876ff", + "sha256": "0nv8vwmqgdb33cl1wfdbmncbrpfdciid48f6w8vmw39ks53i2z32" }, "stable": { "version": [ @@ -12888,8 +13043,8 @@ "s", "unicode-escape" ], - "commit": "2cbfea20d342d1a259b27b99185c2d822aba3094", - "sha256": "06vndicjzm19hk5kb7sxs3ljf559wfnvql1hlpfqlhhgjhgsw17c" + "commit": "81b7440a7253e1753cf41932237fd64c1c1e44b6", + "sha256": "15nmli9drrb25d5xn31v1ja2hmc9kgpn2hjj6b2azj391yw0q4a3" } }, { @@ -13084,11 +13239,11 @@ "repo": "paldepind/composable.el", "unstable": { "version": [ - 20190728, - 1527 + 20190904, + 701 ], - "commit": "b2139cd6f4434197ae0c678091c78b72fd022fed", - "sha256": "043g55gzvxvdplgxz1w1gl367k0nnblmi6ifdg98gl4z4xlqfc1j" + "commit": "46f82d86c285ceba3e0e46adf993a98cd8816390", + "sha256": "14n5sckdaxx291wmj7mnsn06sprpdxf6s44hgxdksv0pvln2m0wx" }, "stable": { "version": [ @@ -13139,6 +13294,24 @@ } }, { + "ename": "comware-router-mode", + "commit": "47d74f54efc324d39b66d88051edbe6ff2cad9e0", + "sha256": "0i3isavwhdwzz8dzwkss4sajj9v3phk8hvq7cxrwrh09lwpp4kxs", + "fetcher": "github", + "repo": "daviderestivo/comware-router-mode", + "unstable": { + "version": [ + 20190923, + 542 + ], + "deps": [ + "dash" + ], + "commit": "17d8bf8bcf2d7551480cd9a4785c3a6e832e6d8a", + "sha256": "0dm5gvaxgbn2flj0k6y6w0nw4ia02lhwpkh3iawv00lqndxqjrv6" + } + }, + { "ename": "concurrent", "commit": "8bc29a8d518ce7a584277089bd4654f52ac0f358", "sha256": "09wjw69bqrr3424h0mpb2kr5ixh96syjjsqrcyd7z2lsas5ldpnf", @@ -13511,27 +13684,26 @@ "repo": "zonuexe/emacs-copyit", "unstable": { "version": [ - 20161126, - 1229 + 20190919, + 1258 ], "deps": [ - "cl-lib", "s" ], - "commit": "f50d033b129d467fb517a351adf3f16cabd82a62", - "sha256": "1s1ddwxgvig7skibicm9j8jii651n1v5ivfj4j6d1kkc79lpq69n" + "commit": "c4f2c28e5b6270e8e3364341619f1154bb4e682e", + "sha256": "17xqpshwc48srwljpbad7vhx3rkxqav0ygp0ff4xh7wgy21fp2mp" }, "stable": { "version": [ 0, - 0, - 2 + 1, + 0 ], "deps": [ - "cl-lib" + "s" ], - "commit": "c973d3650208a033aaf845989d023f9c6e572ddd", - "sha256": "1fwndjbzwhl4dzrw5jxbq66yggxkl81ga3cnnl7rm3s63pkb6l3w" + "commit": "c4f2c28e5b6270e8e3364341619f1154bb4e682e", + "sha256": "17xqpshwc48srwljpbad7vhx3rkxqav0ygp0ff4xh7wgy21fp2mp" } }, { @@ -13542,28 +13714,28 @@ "repo": "zonuexe/emacs-copyit", "unstable": { "version": [ - 20160624, - 2028 + 20190919, + 1258 ], "deps": [ "copyit", "pandoc" ], - "commit": "f50d033b129d467fb517a351adf3f16cabd82a62", - "sha256": "1s1ddwxgvig7skibicm9j8jii651n1v5ivfj4j6d1kkc79lpq69n" + "commit": "c4f2c28e5b6270e8e3364341619f1154bb4e682e", + "sha256": "17xqpshwc48srwljpbad7vhx3rkxqav0ygp0ff4xh7wgy21fp2mp" }, "stable": { "version": [ 0, - 0, - 2 + 1, + 0 ], "deps": [ "copyit", "pandoc" ], - "commit": "c973d3650208a033aaf845989d023f9c6e572ddd", - "sha256": "1fwndjbzwhl4dzrw5jxbq66yggxkl81ga3cnnl7rm3s63pkb6l3w" + "commit": "c4f2c28e5b6270e8e3364341619f1154bb4e682e", + "sha256": "17xqpshwc48srwljpbad7vhx3rkxqav0ygp0ff4xh7wgy21fp2mp" } }, { @@ -13818,15 +13990,15 @@ "repo": "FelipeLema/emacs-counsel-gtags", "unstable": { "version": [ - 20190422, - 1501 + 20190923, + 1842 ], "deps": [ "counsel", "seq" ], - "commit": "3ebfd4159856e9dbd9531b2a43410f72175a90bb", - "sha256": "08n11nvf7p6clmha8r50r2fzp9f4nmrcm8j6byvn99vazdvych7p" + "commit": "baac1a718aaa3ad6c439ab48903b12013de2cec0", + "sha256": "18bwis4j6j4plcdwxml3jdqzd9l8wi0k9kwmyqf9nbqx9f54klqr" }, "stable": { "version": [ @@ -14593,8 +14765,8 @@ 20190717, 1024 ], - "commit": "e7e96e3b0cb69d98b4e12eda269719c9b23453ed", - "sha256": "0zpq404x8022rybfsmp5s1kvxfalfih6i9jjp9fnq0g8j6869qp8" + "commit": "30ae13607c9d8174ab488ff58cd0dfe4e5cbd0c2", + "sha256": "0wzrlda3nvrpzghb2nkh4apdbx9fbdq5sdbasz0ym0h9m0cbyc24" }, "stable": { "version": [ @@ -14806,19 +14978,19 @@ "repo": "maurooaranda/ctune", "unstable": { "version": [ - 20190709, - 1309 + 20190914, + 1305 ], - "commit": "ae298d617237c65ddebc52d236230be11fd4126d", - "sha256": "1w6rljq4aqr7m9j18s7zaw7alllxmk819938pzmgl9pkjscmva0k" + "commit": "d7643461f5aa33cc04e4d808123e4ed1d85500ee", + "sha256": "03gby644xqah7q9sjba9w6c7askc1s7ka4bx814x6vrlla6089h4" }, "stable": { "version": [ 0, - 1 + 2 ], - "commit": "5633024d14957cd6eff03574b2044bb8e9b55710", - "sha256": "1gxhjgh4rs1gnva3a33wr2si594r4qywv20087hfbjlgli7114n0" + "commit": "d7643461f5aa33cc04e4d808123e4ed1d85500ee", + "sha256": "03gby644xqah7q9sjba9w6c7askc1s7ka4bx814x6vrlla6089h4" } }, { @@ -15131,8 +15303,8 @@ 20190111, 2150 ], - "commit": "00c1dc96af0e44741dc777f96a2eb5769f572bb3", - "sha256": "0hkh3844kaawhqh90cqpskh9ifm6cs6i3d2bwkbrrjrkyig9qp38" + "commit": "7e233ab00e117b2e7165c246941ac85a989be262", + "sha256": "1189hi8vp2albpvfz5b66327qizzkzkg9p9b6l8157jsm6a03y7p" }, "stable": { "version": [ @@ -15229,11 +15401,11 @@ "repo": "cbowdon/daemons.el", "unstable": { "version": [ - 20190202, - 1528 + 20190923, + 1644 ], - "commit": "fd7925b0c113e5bad2e4692430ce049405794910", - "sha256": "07l8k41ly92m3wkzlzyb9nmq4pd34xkpn7cjrdap7zfppd3iiq2r" + "commit": "fac6c8bdd295138ddfc830dd94637c3e45a0823e", + "sha256": "1mpbshib5il4sxricirqlx37cy2kcfmd3x1szg7xk7i3ghayp0df" }, "stable": { "version": [ @@ -15339,8 +15511,8 @@ "repo": "emacs-lsp/dap-mode", "unstable": { "version": [ - 20190823, - 1240 + 20190917, + 548 ], "deps": [ "bui", @@ -15351,8 +15523,8 @@ "s", "tree-mode" ], - "commit": "368a0ac922d03b6ad0d2d782823ef30b3072866a", - "sha256": "0zml4kskwz01myki3acbfrfqzgwyw1bsvppijmfi4d24jk04lydk" + "commit": "2e0f7dd70656aad5a70ce2b4f5375870084a02f3", + "sha256": "0hckyrv470j8zx5sr24h16fa9a3fxa8i7iwywxs15wwrwl6mqh9m" }, "stable": { "version": [ @@ -15604,11 +15776,11 @@ "repo": "magnars/dash.el", "unstable": { "version": [ - 20190814, - 2006 + 20190920, + 1035 ], - "commit": "11907f4592ff1813536366d54245d3ecf6b99198", - "sha256": "0lzy7r5wvr1b4m3wg03l3q90wga8gl6j4gbmw66kq8pg8zg1rvqr" + "commit": "a743ae3da1d5869434c6f262bbe45ef30d87cb9c", + "sha256": "1ggd88i11dnvl8yxrzv41l66rj25zi66v82jsc0mb3fgh921hx7i" }, "stable": { "version": [ @@ -15683,8 +15855,8 @@ "deps": [ "dash" ], - "commit": "11907f4592ff1813536366d54245d3ecf6b99198", - "sha256": "0lzy7r5wvr1b4m3wg03l3q90wga8gl6j4gbmw66kq8pg8zg1rvqr" + "commit": "a743ae3da1d5869434c6f262bbe45ef30d87cb9c", + "sha256": "1ggd88i11dnvl8yxrzv41l66rj25zi66v82jsc0mb3fgh921hx7i" }, "stable": { "version": [ @@ -16554,14 +16726,14 @@ "repo": "psibi/dhall-mode", "unstable": { "version": [ - 20190526, - 2113 + 20190919, + 2242 ], "deps": [ "reformatter" ], - "commit": "1b71e8e7123647761d8f35916c06b7280b2929ea", - "sha256": "12xpzaby75fczxj885ij9wgrc9pn05mg5s7abgfr1irvkq7s467n" + "commit": "57001a69917329e7933d80a7e21116fe11255ae7", + "sha256": "039lgmap36iawvw89jhkq25j9h2r9qb8s3612j5xhyzbbrg6q0pl" } }, { @@ -16941,6 +17113,21 @@ } }, { + "ename": "diminish-buffer", + "commit": "be1dc31aaad773f6504ded15d9ce2579fdf192af", + "sha256": "10rsdn2mlk3lnc9dc75zyphqckja7bzm5xgzjrbzvvbf4w87qa1f", + "fetcher": "github", + "repo": "elpa-host/diminish-buffer", + "unstable": { + "version": [ + 20190921, + 1647 + ], + "commit": "e137baa5e258a7938c713253fc9cc63f8674f841", + "sha256": "03068nyfb3cz0lz8z3qcwjlsvqaw9dfg3g8w13gmpwsmxaxlbv3i" + } + }, + { "ename": "dimmer", "commit": "8ae80e9202d69ed3214325dd15c4b2f114263954", "sha256": "0w8n5svckk1jp8856pg2gkws9798prqjjkdqf8ili2hjcqnd1a3r", @@ -18012,6 +18199,21 @@ } }, { + "ename": "dispwatch", + "commit": "580cee72ac9871f8f256069b371f7fb66367a048", + "sha256": "1cq5lbh3r9jjwixn2q30gryy4j4l8jb70nkhsjbaln1c3jdwrf9p", + "fetcher": "github", + "repo": "mnp/dispwatch", + "unstable": { + "version": [ + 20190903, + 356 + ], + "commit": "04e7ecb52636e27a8e2e670c6e8977c12ed989e6", + "sha256": "0yv4gl86z9wx81n1hadha01iqcinp2c3414hg5iypv2j7n129kri" + } + }, + { "ename": "dist-file-mode", "commit": "dd10fbed2810a642600dba9dfe320fa6299e6d34", "sha256": "1gbnkb0537gw8flv4gdi4jzb7y9dnbf9cfj2jw8y84axyfzbb4mf", @@ -18249,10 +18451,10 @@ }, { "ename": "djangonaut", - "commit": "0c1281f59add99abf57bc858d6e0f9b2ae5b3c5c", - "sha256": "0038zqazzhxz82q8l1phxc3aiiwmzksz9c15by9v0apzwpmdkj38", + "commit": "c756ccbae044bc23131060355532261aa9a12409", + "sha256": "1ys0s8hx8a8zykwynpan1h95v9fl87m7hlh8zhcg42kzd7b09px2", "fetcher": "github", - "repo": "proofit404/djangonaut", + "repo": "pythonic-emacs/djangonaut", "unstable": { "version": [ 20180727, @@ -18358,14 +18560,14 @@ "repo": "lujun9972/el-dmenu", "unstable": { "version": [ - 20190706, - 951 + 20190908, + 44 ], "deps": [ "cl-lib" ], - "commit": "93c09c04441ad96902ba2aab2bdb556f7e34a53b", - "sha256": "0dm9z05980l7z2k4p0j5n6f4sis1va5am3hk1zsaa9z7fvhpbci3" + "commit": "e8cc9b27c79d3ecc252267c082ab8e9c82eab264", + "sha256": "098ncygms1r33zhjlq4fj2p4jc91v5whqrm3fazzdk7sd6dilf25" } }, { @@ -18703,30 +18905,30 @@ "repo": "seagle0128/doom-modeline", "unstable": { "version": [ - 20190830, - 1605 + 20190918, + 1510 ], "deps": [ "all-the-icons", "dash", "shrink-path" ], - "commit": "b433d87f428061cc7477b444b7dc9101e575095d", - "sha256": "0k0kdr7alxwz0zf14zz92zhacza8izzc38117x4zcixx3yrsspnx" + "commit": "2690aa27892380b4e857efee4b7a76ff3a87e538", + "sha256": "020zwg15ww40mss7ndc56hji16rmpllab3rkm0k6z79h9jmmc01c" }, "stable": { "version": [ 2, - 5, - 0 + 6, + 1 ], "deps": [ "all-the-icons", "dash", "shrink-path" ], - "commit": "eb3258b50399ae7a2ed2edea797238a21352ea22", - "sha256": "1xx2zjksh93z6px89w4grycry9m8vh864m0p471q0g77r16z2prn" + "commit": "b117f2e86920c0bb3a61ce64c59a6f5db05a11e9", + "sha256": "1lzw3nfqrymrgc9vhd5zzffjy79sdfiihx3mphp5hny8f1nw912g" } }, { @@ -18737,14 +18939,14 @@ "repo": "hlissner/emacs-doom-themes", "unstable": { "version": [ - 20190821, - 2117 + 20190904, + 2252 ], "deps": [ "cl-lib" ], - "commit": "470dd52ec4761a0b2c1f2c0309233e1fba04e598", - "sha256": "1wj9f7rxr2330fqgwsaqhz5mp1247a1x3a7zr6jdnr6h819ji74p" + "commit": "1159463956223ae53df421bcd796e94610759c42", + "sha256": "0jacmhqvvsqy5w7zxsr5nxka1pxysz74zkv5lfvbqkay59asn95z" }, "stable": { "version": [ @@ -18825,8 +19027,8 @@ 20190325, 1917 ], - "commit": "22937754c6c4f3cfc432175de86f70e826ae7470", - "sha256": "1pjmj0mkh0xiaggzp1xq84ckzq8hkvvmsxpvlnbsxngbz6k34sa5" + "commit": "166ca7f01a0c85faaa3f8d20dbb8f7c5e972eebb", + "sha256": "0nc0nvxmsjg7821c7jxzhzxnj9h00yc4i725a75qadqynmm60bq4" }, "stable": { "version": [ @@ -19096,15 +19298,16 @@ "repo": "pavpanchekha/dropbox.el", "unstable": { "version": [ - 20190714, - 1721 + 20190918, + 1629 ], "deps": [ "json", - "oauth" + "oauth", + "request" ], - "commit": "2a143087aff0a69a8ff4df40f87335501945346e", - "sha256": "0xf6lsrrv4n9acbglhccikv5lrgfqmkqvz7bbw91rmwx5wvjs1f7" + "commit": "5e0c954a6b819fd3a22b463cce3825984f9ef691", + "sha256": "0z1iw5rzdgipqhx4bvshjbrqqr3wyqy75frwmz34g7s6vll1ip0a" } }, { @@ -19302,8 +19505,8 @@ "repo": "jacktasia/dumb-jump", "unstable": { "version": [ - 20190804, - 533 + 20190923, + 1849 ], "deps": [ "dash", @@ -19311,14 +19514,14 @@ "popup", "s" ], - "commit": "7ffa63cdc8481158a2dbfe4acc6719ebe7fff056", - "sha256": "1l682xjish7v8mdkfdjqbdz464hnif15xlyrq8il6pgcq12g2hl6" + "commit": "d64ee2a31afa755d5b373ada2e8fea11149b44a3", + "sha256": "0jx0wsw99m9dwpfbssk9n4kpd08rzyhyhw5wjfwadapd2hhf11mw" }, "stable": { "version": [ 0, 5, - 2 + 3 ], "deps": [ "dash", @@ -19326,8 +19529,8 @@ "popup", "s" ], - "commit": "260054500d4731c36574b6cbc519de29fdd22f43", - "sha256": "00ph85vp8sa3k99qrdxfz4l8zx121q9xf47vvspzg26bk9l4nwin" + "commit": "0319569f1332641057c3e23d1e3bffb2404435a8", + "sha256": "1njf60264snhxrd36m4z687lqfkis0p9mmrr7cf1c8l0lfdvawxi" } }, { @@ -19353,11 +19556,11 @@ "repo": "ocaml/dune", "unstable": { "version": [ - 20190808, - 345 + 20190911, + 1607 ], - "commit": "823a3c66d11b30333f511c03348bd4714e736f46", - "sha256": "1fdca3rk599xfq02cihk30p29v4ng3hn3dvdzq5l90kfigpanaz9" + "commit": "27f97109256eb6336491536f2c62bf332716de03", + "sha256": "1llzmq56kvy8v1ijn62gyfr71g3z5s0svqcq4q4zan57rdhzchn0" }, "stable": { "version": [ @@ -19425,11 +19628,11 @@ "repo": "dylan-lang/dylan-mode", "unstable": { "version": [ - 20190109, - 300 + 20190831, + 1910 ], - "commit": "9a6ad5ff83f2dfc25ce3deee9d3ef71ed53964b5", - "sha256": "1d6krgiabkrj3mryaz79vmiqy0vkr5s8ji34yjd14v73ikzwxwkp" + "commit": "4801b7adcc984edfffa3f951e2c35329fae2b6e4", + "sha256": "1xm27fc98rj8fsfm9na1x3d7zgp8fkxf782ajvirzbbq5nj0lyma" } }, { @@ -19823,8 +20026,8 @@ "popup", "request" ], - "commit": "2e2eb5720792512bb8a2ab2a7d9eb9ce86de8df9", - "sha256": "0zram35da92gvv72fdj1mpyxasagvv0i20rrqilawyvah7kr1njg" + "commit": "00a7dfb19b6ee9e6a2993104400334ea2ebb39f1", + "sha256": "18sm2nsfidvbp7walf3wrfq9ra7l5ww0b5p4xglr1ch73m47gdzj" }, "stable": { "version": [ @@ -20025,14 +20228,14 @@ "repo": "joostkremers/ebib", "unstable": { "version": [ - 20190718, - 2011 + 20190922, + 2000 ], "deps": [ "parsebib" ], - "commit": "603451582c3471c90fbf795baa2f53043ce5ddb0", - "sha256": "01s1aghyc83372nkccjfx3yn65hqx5hrxbsj1dcbb6z1y5aqbwdj" + "commit": "b9c924d2a206f70caf714251a33bebcfef0c37c2", + "sha256": "18z58s3s1afr9spg57kpmpxfgkbwxdq7bv4rl5wk78rwj76bskpk" }, "stable": { "version": [ @@ -20857,8 +21060,8 @@ 20190714, 236 ], - "commit": "9fbaf81114ffd3550801457257c983a077a7e17e", - "sha256": "0iz9hcx9s5l7c0y73ik6l7whjymgc0q4vfdr73y85cmnwfyi7fk5" + "commit": "20d33864e0e9d30edb0f146d89b6349776382bf3", + "sha256": "175mcx9hi6nnynamhj3pa9808wgpz2cxjs95b2ky8g6dfv07cmk6" }, "stable": { "version": [ @@ -20878,15 +21081,15 @@ "repo": "joaotavora/eglot", "unstable": { "version": [ - 20190819, - 9 + 20190924, + 1547 ], "deps": [ "flymake", "jsonrpc" ], - "commit": "7a70c977fdb6a16182d375993edd528653a2cb5d", - "sha256": "0s48k733nyk21h22c98ckch0kcki3snn1dw5ymqx2n9gl0w18gkh" + "commit": "d7747541f3ee82fbc1b7ce3f9499737b4da9414b", + "sha256": "19jgmx9a1hmwcpix8dznjs6qscsn5x6z5jpcn7s6h47wfp470nav" }, "stable": { "version": [ @@ -20992,7 +21195,7 @@ "version": [ 0, 16, - 1 + 2 ], "deps": [ "auto-complete", @@ -21005,8 +21208,8 @@ "skewer-mode", "websocket" ], - "commit": "43107fc5c85722899534700daa7f5e73fe59a933", - "sha256": "05ns2ddr012dmw3x651lr4bhn9x0vrphivymdmhzc4bsxsisbd32" + "commit": "a2872eff6c18a0706c531e9316c792a9fb99826f", + "sha256": "0i182ic59wnhqmik15qsqjsqza5fn67qw18i5gvvj7dsn3v05vac" } }, { @@ -21059,8 +21262,8 @@ "repo": "kostafey/ejc-sql", "unstable": { "version": [ - 20190828, - 919 + 20190924, + 1423 ], "deps": [ "auto-complete", @@ -21069,8 +21272,8 @@ "direx", "spinner" ], - "commit": "5a2b3580e362841f51d262eeeeaa396fcceb4fe9", - "sha256": "1xgppkabl2lwfqrgylab25v4pqfkhfxy780hlmsys1yha2r1167l" + "commit": "99f2928624e19efc4eb7736e0e722161d9781fc5", + "sha256": "0xqhma6l1zmmkxsb1b3pzdwjz95237r2ibkhqrqfys30wi5xkk1z" }, "stable": { "version": [ @@ -21153,8 +21356,8 @@ 20181006, 225 ], - "commit": "e8bdc7be1a61faf61787d4a3c0b80dafc37d2ef4", - "sha256": "09mb43cdl711dva0hv7jln35nz0r4q0m6r3zbv563s8wnqpza7ig" + "commit": "156d1a0bbbf330b3f274b0afb7a8366d7f04b8c7", + "sha256": "1mm4xphk9h8p9f3pl4brqyksk3lmnw4cr78j933p28qcmgk8sr7w" }, "stable": { "version": [ @@ -21725,11 +21928,11 @@ "repo": "skeeto/elfeed", "unstable": { "version": [ - 20190824, - 1213 + 20190903, + 1137 ], - "commit": "63b26ee83fd58afdf8f0b3d2c04cdc9cd956772c", - "sha256": "0m0a35210pb4yf6m8mzaq6nkl9x6fphjjqyl3dzygnmmzxkc8aw2" + "commit": "69b0320156cbf7e395efa670464d4651f708332f", + "sha256": "1nkd1ll8fjnnkqqz6x4yr7lij6kknh4mh30qf3g4kzg5gmwhbx6q" }, "stable": { "version": [ @@ -21826,15 +22029,15 @@ "repo": "skeeto/elfeed", "unstable": { "version": [ - 20190824, - 1213 + 20190906, + 2012 ], "deps": [ "elfeed", "simple-httpd" ], - "commit": "63b26ee83fd58afdf8f0b3d2c04cdc9cd956772c", - "sha256": "0m0a35210pb4yf6m8mzaq6nkl9x6fphjjqyl3dzygnmmzxkc8aw2" + "commit": "69b0320156cbf7e395efa670464d4651f708332f", + "sha256": "1nkd1ll8fjnnkqqz6x4yr7lij6kknh4mh30qf3g4kzg5gmwhbx6q" }, "stable": { "version": [ @@ -21858,14 +22061,14 @@ "repo": "TobiasZawada/elgrep", "unstable": { "version": [ - 20190729, - 811 + 20190917, + 2320 ], "deps": [ "async" ], - "commit": "7a4e8f3c99c8a50b92881f0bf0f29a3cd6098324", - "sha256": "0v6f91y43q4hfd4rhwgwh5wqw2hmzdf1rc4rkngg1qh554ml5glz" + "commit": "c644ed57337fdf117de5b7e342c2623d4f17e8f7", + "sha256": "1j757kclw54y3cn839jjdsbkydf3sc0bjkkii50gvy65kp46fqhp" }, "stable": { "version": [ @@ -22106,14 +22309,14 @@ "repo": "elixir-editors/emacs-elixir", "unstable": { "version": [ - 20190422, - 155 + 20190831, + 2225 ], "deps": [ "pkg-info" ], - "commit": "694d133e847e9a6db6abd1c19850cec6d867ccce", - "sha256": "0fl3i8cxnrn70l68328jyhabgccmqbislkgp4k4ih5yll3plz31n" + "commit": "5c50dcedd890f14e0ede33b74ddf86607b037239", + "sha256": "0hi8ly4jplhlh4mrmwlhz44w50ccjbc4w12jkacjc82gay8m8yfa" }, "stable": { "version": [ @@ -22166,15 +22369,15 @@ "repo": "walseb/ellocate", "unstable": { "version": [ - 20190819, - 211 + 20190920, + 1407 ], "deps": [ "f", "s" ], - "commit": "f5b222777d063d8ba3c851dcd9a132d6f74fbe08", - "sha256": "18cxqsxsgks7s31gmx9azsv26wdb979d24ypy44rhrwc5r4yk292" + "commit": "798c40de09ebfff40fd1aa5b996bd8390f803bdf", + "sha256": "1z1g1v3q5zdljkdziv8jnyjm2n4jxdfbds1qqwddlaz143b4h5zb" } }, { @@ -22413,26 +22616,26 @@ "repo": "dochang/elpa-clone", "unstable": { "version": [ - 20190109, - 2340 + 20190922, + 2302 ], "deps": [ "cl-lib" ], - "commit": "5dddbab4c27ec6aca541a1f8e9792617f10fc325", - "sha256": "17lbdgwg97x8q8dbghylr2j0nwb72mpfl679qb0pl9184ih27qfc" + "commit": "777ac63fef531bdecf29cd3bf06e15dbe51e9d09", + "sha256": "1lrkmbspcwgh97b30i49nacfm5pjpkgk69z6qfkkmm6xvxx8wp7d" }, "stable": { "version": [ 0, 0, - 7 + 8 ], "deps": [ "cl-lib" ], - "commit": "5dddbab4c27ec6aca541a1f8e9792617f10fc325", - "sha256": "17lbdgwg97x8q8dbghylr2j0nwb72mpfl679qb0pl9184ih27qfc" + "commit": "777ac63fef531bdecf29cd3bf06e15dbe51e9d09", + "sha256": "1lrkmbspcwgh97b30i49nacfm5pjpkgk69z6qfkkmm6xvxx8wp7d" } }, { @@ -22467,20 +22670,20 @@ "repo": "tgvaughan/elpher", "unstable": { "version": [ - 20190816, - 1414 + 20190921, + 2324 ], - "commit": "40ec805063c480dfdc01c8328be12f7c8f823c9c", - "sha256": "0g36b7pil5vihwx2v55ga82k9l31wl3w0ba0s3af27wh058zz7bq" + "commit": "5b568bcfd841bcd8fa3972035f6bdff82cb5d3f0", + "sha256": "0wffrxc6k3pzh1r7hva6m16mrinf6365xzci452r33kdw1pj323h" }, "stable": { "version": [ - 1, - 4, - 7 + 2, + 3, + 5 ], - "commit": "e5471b9460610b3c3af3842c6ac009bcbf70ecac", - "sha256": "1sf91x2spk7nkpnn7ss2vkjfzvxw83z3pw7nyvra45gvq11vmy3c" + "commit": "c0ff9d26c2e5cf62ade93852e7eb8a0f081bf028", + "sha256": "0khgplpwm7dzsxfh43i1lgwrwskmyxaz9qcgzs0vx9c4vm8c1byk" } }, { @@ -22506,8 +22709,8 @@ "repo": "jorgenschaefer/elpy", "unstable": { "version": [ - 20190725, - 2259 + 20190925, + 2241 ], "deps": [ "company", @@ -22517,14 +22720,14 @@ "s", "yasnippet" ], - "commit": "7acdd14eaec4b123ae1c16ead59c91adcf7f9775", - "sha256": "182zs3b7s0n4wsz0k1wybmd3fa4x9m7q5j8n7jpbwa3m0v3vvyk7" + "commit": "a1002f3682fe071652eb935e5c7c7de09c5ff2e1", + "sha256": "0r787z9xi821mhmh71wa73a3a0a9yl1jmmi3a9982rzv0xc1wpsa" }, "stable": { "version": [ 1, - 29, - 1 + 31, + 0 ], "deps": [ "company", @@ -22534,8 +22737,8 @@ "s", "yasnippet" ], - "commit": "d98ee26f564e33c9acf233862734e72200bd3703", - "sha256": "19sd5p03rkp5yibq1ilwisq8jlma02ks2kdc3swy6r27n4hy90xf" + "commit": "54ed6fe219689e187286c8808041b6f61718b025", + "sha256": "0bvmgqs3c80bhs9v5ymgadv7vk4iamha10y7rl09pixmjm4mzagk" } }, { @@ -22821,11 +23024,11 @@ "repo": "emacscollective/elx", "unstable": { "version": [ - 20190710, - 1415 + 20190904, + 1331 ], - "commit": "457fca9d4bb0429b08c8f4e675f8b1f3e48297e3", - "sha256": "0vpvdnmg95nk9bmrjysbpfwbyzxhipdqh9xfphxi2n63sd0vzk7z" + "commit": "aec740bb4453a8b671beccd31a583225fb2eb104", + "sha256": "144mh3klxqv70qz5qksj5dzgcczc6wwscwwi2mx07x6s3vbgmfal" }, "stable": { "version": [ @@ -22898,20 +23101,20 @@ "repo": "knu/emacsc", "unstable": { "version": [ - 20161028, - 1706 + 20190917, + 1102 ], - "commit": "421e0c567358769e32f670ae8e949d99abae0c28", - "sha256": "0zmb1qdbdlrycari1r1g65c9px357wz4f2gvmcacg83504mmf3d8" + "commit": "57940b93881efabb375df18093b99800bfb5d5f7", + "sha256": "032g44dad90cas2b80cxhzbim2sxd8rliyxf65ccfrqi1xg3vkff" }, "stable": { "version": [ 1, - 2, - 20131027 + 3, + 20190917 ], - "commit": "69607bdc3a0c070e924a3bcac93180f917992368", - "sha256": "1r6cpb7fck5znb7q7zrxcsjn7d3xiqhq8dp1ar1rsd6k4h05by4j" + "commit": "57940b93881efabb375df18093b99800bfb5d5f7", + "sha256": "032g44dad90cas2b80cxhzbim2sxd8rliyxf65ccfrqi1xg3vkff" } }, { @@ -23044,6 +23247,24 @@ } }, { + "ename": "emacsql-sqlite3", + "commit": "5a25cf38b4f39b1c4d259143f1586fdad605b101", + "sha256": "06zm6vs6sry2lwksikxp0rjyvs1rgiqyapyw7m8hgy336h810v84", + "fetcher": "github", + "repo": "cireu/emacsql-sqlite3", + "unstable": { + "version": [ + 20190926, + 452 + ], + "deps": [ + "emacsql" + ], + "commit": "4bd7ec90a8fd029a29034fca2f051a8bc6f8ae7d", + "sha256": "1jrwhflwrcijmfj0zvig4m2m4sr7h14ywz86rj2ld4vd0fsdx7qd" + } + }, + { "ename": "emacsshot", "commit": "d94b48f1d01c6f0e7bb2169a4a3181eae3f79c23", "sha256": "1v5cd278fls5hib6f4arv0g5mzjhv22lslbb9s2p274dk4pn1ggc", @@ -23284,14 +23505,14 @@ "url": "https://git.savannah.gnu.org/git/emms.git", "unstable": { "version": [ - 20190827, - 1610 + 20190905, + 2111 ], "deps": [ "cl-lib" ], - "commit": "f209b44c76f4a8532783909384ae7492b8d9b6e7", - "sha256": "1m68vpsbkcmnlj35h31qikifvah8b9gazwk5yv4wafabpg3bdav2" + "commit": "2bad5e6cf7442cff492cafe896c47719ae77b8fb", + "sha256": "1bxaa1mzx5l1pp16j14y66cywpr174y6q7rhk5qr60lfjjfgj3h6" }, "stable": { "version": [ @@ -24598,20 +24819,19 @@ "repo": "erlang/otp", "unstable": { "version": [ - 20190404, - 928 + 20190925, + 1606 ], - "commit": "a56c1dc1fb996040ab192b0c96dc32e5ebf47a06", - "sha256": "1dm7l2kizbg3d878b16hca5qyfaf2yvskhwlc3h2kldchw4xgrby" + "commit": "c3c731edfc64c00b03f9394bfdae4ae2b0063798", + "sha256": "0n5lvxb30s62n403pk3vmfwa6nr3zn59zlpwli5xmx30imh6dqmn" }, "stable": { "version": [ 22, - 0, - 7 + 1 ], - "commit": "3967d28c05dae77db30b15e56eb4ececf4f1afef", - "sha256": "1jk78b674cvi6fh6fj5jqqnqv4452x9bn6h79yrdm5nws1nh84am" + "commit": "e62a389ce5dd27e7b26802243a5565ffd1feaef0", + "sha256": "0p0lwajq5skbhrx1nw8ncphj409rl6wghjrgk7d3libz12hnwrpn" } }, { @@ -24962,14 +25182,14 @@ "repo": "tom-tan/esh-help", "unstable": { "version": [ - 20170830, - 411 + 20190905, + 22 ], "deps": [ "dash" ], - "commit": "8a8a9d4d9852f8bd96da3b94e95ff57097ac8ec6", - "sha256": "02fybhmqm2qmy5qdig7xvwxazqi499pw32kh5mrsbdr14srg9fhs" + "commit": "417673ed18a983930a66a6692dbfb288a995cb80", + "sha256": "0x7d51a6ljl014zy7mi27vzcqqbcwg9z4drq29fr2ajk82mqhlgd" }, "stable": { "version": [ @@ -25252,14 +25472,14 @@ "repo": "aaronjensen/eslintd-fix", "unstable": { "version": [ - 20180429, - 1455 + 20190830, + 2116 ], "deps": [ "dash" ], - "commit": "90e451af4daa190d6c0e29fb714b0501a7cce89a", - "sha256": "01jysgdd4im4kf4afzwd4mm8x9vlpibb1w4yi2jvc0hglqddnr2g" + "commit": "98c669e3653bf94c236c54946c6faba7f782ef0d", + "sha256": "1v4s3srn6cc4rbb8hg3wri8c3vnijkyz582qmpyf1vd44mldfq4x" }, "stable": { "version": [ @@ -25402,14 +25622,14 @@ "repo": "emacs-ess/ESS", "unstable": { "version": [ - 20190814, - 1054 + 20190921, + 1258 ], "deps": [ "julia-mode" ], - "commit": "5b12e56a52144b2393858236e56e1c5ea828b753", - "sha256": "0gcz8r7mdjmrcrisqr1w4pmnyj4m76fc1qg773y2b1majkdv7rbj" + "commit": "9e522405814b3ae7a81853930d7c97d50cdadd4f", + "sha256": "0kfiyf5v66dbhwcpjj8ndc2ysnn767id5gws7gjng8q6wmkq97na" }, "stable": { "version": [ @@ -26042,28 +26262,28 @@ "repo": "emacs-evil/evil-collection", "unstable": { "version": [ - 20190828, - 2159 + 20190926, + 221 ], "deps": [ "cl-lib", "evil" ], - "commit": "da75a170ea5485b7c0083624ca4e6cacc6aaa028", - "sha256": "1s4sr8lfdd2k11588gzylwbwmyigs29jfmvv9h0mjmixhaz85z1w" + "commit": "492b20cc735a026a70c58f5438c341a112562e14", + "sha256": "1b2zcpfj7ivsn7hpnv9a11f22d6yqz48dqkf2xjmf7y2cq8fmi56" }, "stable": { "version": [ 0, 0, - 1 + 2 ], "deps": [ "cl-lib", "evil" ], - "commit": "733f8d0d289fcbb58705acd1049b618826a3c011", - "sha256": "01hr5wf693s2djs6l83nfpq6wyyws99c5nwil6hpqhvrwp4f5h95" + "commit": "986ca7eb0b75eccd843bdad2f7fdb48f4ca6ac22", + "sha256": "172sx5w50x5wrs5w0sb6rkbj3q22s7mmsnk4c6pwknhbz3vwlvwz" } }, { @@ -26574,15 +26794,15 @@ "repo": "emacs-evil/evil-magit", "unstable": { "version": [ - 20190620, - 153 + 20190904, + 1730 ], "deps": [ "evil", "magit" ], - "commit": "6a32e4359cbd2803bafb7134cb6df312644ac986", - "sha256": "0i8xpa6vr30vjy3iilcx9g65srrprg1igk3f4xp6lwcc6pkc2mbj" + "commit": "4b66a1db8285457147a5436f209391016a819ea1", + "sha256": "0kkmbswfh34k3amfl3v140vsnz1gq4n4mg9g4khjd9yjph3zms4h" }, "stable": { "version": [ @@ -26636,26 +26856,26 @@ "repo": "redguardtoo/evil-matchit", "unstable": { "version": [ - 20190808, - 1056 + 20190924, + 2348 ], "deps": [ "evil" ], - "commit": "43be86d8c41841a20733718d177e8299d5379218", - "sha256": "04kllxd7vvziwqiff3vx60a0r6805wynsla73j8xkcz4yzk8q91r" + "commit": "ea1e867129174ef0d545574b883939fcc2019886", + "sha256": "0n0scxkp0c2a0b6n7jmcdj8xcsrfcxcp5hw6df4150bmmpwv7wkk" }, "stable": { "version": [ 2, 3, - 3 + 4 ], "deps": [ "evil" ], - "commit": "43be86d8c41841a20733718d177e8299d5379218", - "sha256": "04kllxd7vvziwqiff3vx60a0r6805wynsla73j8xkcz4yzk8q91r" + "commit": "5e92e374e6b46176d46323b884c25c44063331da", + "sha256": "1nflkmx08n3ya5vaipy1xg19hnqcp6f7ddsx9xjh5gl6ix2iz0az" } }, { @@ -26666,15 +26886,15 @@ "repo": "gabesoft/evil-mc", "unstable": { "version": [ - 20190321, - 1606 + 20190916, + 348 ], "deps": [ "cl-lib", "evil" ], - "commit": "5205fe671803465149e578849bbbe803c23a8e4e", - "sha256": "03pxpjjxbai4dwp84bgxh52ahh0f6ac58xi2mds1kl4v93nm7v42" + "commit": "1cabb869fe70cef49f7dc06f015c3ade1a969c8c", + "sha256": "0p83p90faq1p02lmsfs7zrnky3cyzgy8z4m83a81r9kakjzhkrnb" }, "stable": { "version": [ @@ -27522,14 +27742,14 @@ "repo": "mamapanda/evil-traces", "unstable": { "version": [ - 20190818, - 2331 + 20190906, + 538 ], "deps": [ "evil" ], - "commit": "4eec121e2abc0dd8f32b3d7cbdbf676302c4904a", - "sha256": "0hqrw3jda7qci0f3xqc35x0dhc2hrkd8fddwvlgicdj628wsm7ng" + "commit": "1931e3ea2c64b4aec393a9c25063c330deff55e3", + "sha256": "12p9lfxscs182vbd4dy0m5gacs3d4kyprbz5yndpwvl8g2qsqplz" } }, { @@ -27731,11 +27951,19 @@ "repo": "jjzmajic/ewal", "unstable": { "version": [ - 20190828, - 1542 + 20190911, + 1319 ], - "commit": "62d0789cdcddd5bfcc85b37cf7398d616eecb8f5", - "sha256": "1b6sdz6y7iaah1nnbv5qwwkz9dgc6prp4y5gmgz4fw9w27b3lbgd" + "commit": "07793e2bd03ca3f473b1ecf6ed4637f7d2982ce0", + "sha256": "13zdsqnv6sasai8j7wlhlfp687s3a8yarrrwnxjvy5wbjjn604sk" + }, + "stable": { + "version": [ + 0, + 2 + ], + "commit": "f822c0b26635c69a62e36cbc9696eb35b425ca61", + "sha256": "1qgb10mhjgpk51pwbd726pzcn48730kw9q7nfib8r4rqsgk1r9ar" } }, { @@ -27746,14 +27974,25 @@ "repo": "jjzmajic/ewal", "unstable": { "version": [ - 20190825, - 335 + 20190911, + 1315 + ], + "deps": [ + "ewal" + ], + "commit": "07793e2bd03ca3f473b1ecf6ed4637f7d2982ce0", + "sha256": "13zdsqnv6sasai8j7wlhlfp687s3a8yarrrwnxjvy5wbjjn604sk" + }, + "stable": { + "version": [ + 0, + 2 ], "deps": [ "ewal" ], - "commit": "62d0789cdcddd5bfcc85b37cf7398d616eecb8f5", - "sha256": "1b6sdz6y7iaah1nnbv5qwwkz9dgc6prp4y5gmgz4fw9w27b3lbgd" + "commit": "f822c0b26635c69a62e36cbc9696eb35b425ca61", + "sha256": "1qgb10mhjgpk51pwbd726pzcn48730kw9q7nfib8r4rqsgk1r9ar" } }, { @@ -27764,15 +28003,27 @@ "repo": "jjzmajic/ewal", "unstable": { "version": [ - 20190828, - 1542 + 20190911, + 1305 ], "deps": [ "ewal", "spacemacs-theme" ], - "commit": "62d0789cdcddd5bfcc85b37cf7398d616eecb8f5", - "sha256": "1b6sdz6y7iaah1nnbv5qwwkz9dgc6prp4y5gmgz4fw9w27b3lbgd" + "commit": "07793e2bd03ca3f473b1ecf6ed4637f7d2982ce0", + "sha256": "13zdsqnv6sasai8j7wlhlfp687s3a8yarrrwnxjvy5wbjjn604sk" + }, + "stable": { + "version": [ + 0, + 2 + ], + "deps": [ + "ewal", + "spacemacs-theme" + ], + "commit": "f822c0b26635c69a62e36cbc9696eb35b425ca61", + "sha256": "1qgb10mhjgpk51pwbd726pzcn48730kw9q7nfib8r4rqsgk1r9ar" } }, { @@ -28050,11 +28301,11 @@ "repo": "extemporelang/extempore-emacs-mode", "unstable": { "version": [ - 20180105, - 621 + 20190917, + 1031 ], - "commit": "ae5f40d4b0883a4519e460cd7720e5fcc3a68fa5", - "sha256": "1f888h7xv6zz6kq38ak1vpwjrjr2sqgwpfxwb9x0ldf3kkx4wf1w" + "commit": "848ad0084f27b92d1cf98dabffbad29f959a642d", + "sha256": "00wr025php7nl33x541s9rjm99hj0jbdcmnw9ljx5hqpm04aqm7c" } }, { @@ -28111,16 +28362,15 @@ "repo": "ananthakumaran/exunit.el", "unstable": { "version": [ - 20190511, - 614 + 20190919, + 1238 ], "deps": [ - "dash", "f", "s" ], - "commit": "7aa008cb54e7935183a19d6b81d218de7ec38ca4", - "sha256": "0zp0sdnrb5mm6k1z6zqs7s042f6n24sg1y0wx6bw35za6r5f36cr" + "commit": "c77b0397b80d772c98fcc34c9ab131a8350fbf40", + "sha256": "08lhsjmibgvd4cjrvyxhwn7cqrpd83bgsvh2xqppi9mnw1xwgzd5" } }, { @@ -28274,14 +28524,14 @@ "repo": "wasamasa/eyebrowse", "unstable": { "version": [ - 20190827, - 1828 + 20190917, + 1653 ], "deps": [ "dash" ], - "commit": "d75e37a048718d6981c366c431b93ccbe884f356", - "sha256": "08k6dcz2pzgv0n4rfpq0gmpzs9319h5jk5xznmh2s8y42imvp5l7" + "commit": "e0f6bdf3fc1eab2f036952721a7496e408ce860d", + "sha256": "10fwxryisgpyyxhcz8p2g3h085hd6j6qw1hi5pz70a94d3syr3ws" }, "stable": { "version": [ @@ -28614,6 +28864,24 @@ } }, { + "ename": "fancy-dabbrev", + "commit": "1ac5a3797d9882235de984739d5a2bf122b64540", + "sha256": "038zyg8kmz7k2y2xfs5mmm4fh87a503yri990kyf82pqyrsj3yww", + "fetcher": "github", + "repo": "jrosdahl/fancy-dabbrev", + "unstable": { + "version": [ + 20190921, + 1811 + ], + "deps": [ + "popup" + ], + "commit": "2d9c55ce0ef20cd405c597bbac8b204cfaeee77a", + "sha256": "0ap13sxycvwg5dxvm65qkp11816hz4vvw3828q730y9j30fizn0r" + } + }, + { "ename": "fancy-narrow", "commit": "1e6aed365c42987d64d0cd9a8a6178339b1b39e8", "sha256": "15i86jz6rdpva1az7gqp1wbm8kispcfc8h6v9fqsbag9sbzvgcyv", @@ -28668,6 +28936,36 @@ } }, { + "ename": "fast-scroll", + "commit": "1a06816fe50be692f971f08e76f687a3560baceb", + "sha256": "1ds8wjc2zdvr31c4c1dwrbf6al9ff3p4njli7mis85kb883k371c", + "fetcher": "github", + "repo": "ahungry/fast-scroll", + "unstable": { + "version": [ + 20190923, + 310 + ], + "deps": [ + "cl-lib" + ], + "commit": "70a4d21638bf95646bd12ae9512dffbe1c4970d2", + "sha256": "1gbzwql0x6vmn8pip55qa31v4mrjw5wgcv1sx0hmwkrafji3mwjq" + }, + "stable": { + "version": [ + 0, + 0, + 5 + ], + "deps": [ + "cl-lib" + ], + "commit": "0f78d1039e5394a6b57d186189a89937453c7002", + "sha256": "042dkz12rcj27ymla1lg70vwg3n7vb9i5908ga6vabn7q61bxbsh" + } + }, + { "ename": "fastdef", "commit": "f6effb2fbccc71e8a44c53138e3c21f10dc55fbc", "sha256": "1cf4slxhcp2z7h9k3l31h06nnqsyb4smwnj55ivil2lm0fa0vlzj", @@ -28884,11 +29182,11 @@ "repo": "technomancy/fennel-mode", "unstable": { "version": [ - 20190807, - 17 + 20190921, + 359 ], - "commit": "7f146605feeeebdf5452450662e2f3bc1e435e6f", - "sha256": "0yr6f2gzgprkqhc22mq64mn119aljihziix712kk1vq59yx2l22f" + "commit": "686e4d28a8abeb1fa05cb21e14c4f0cc12217d63", + "sha256": "0wis927rya6v2mzyvsnjca1b2a1vrndlb7nskkgxs0ssvsvv68bn" } }, { @@ -29118,14 +29416,14 @@ "repo": "technomancy/find-file-in-project", "unstable": { "version": [ - 20190720, - 313 + 20190914, + 524 ], "deps": [ "ivy" ], - "commit": "85f0fc4ab29e4339732c19be314a4920888803b2", - "sha256": "1skjbh7m0cck2rwmgzrrds51gipqf1jqghyfx15drc1n6kwivx3h" + "commit": "79baa7026803b3d877857493da3041ddf6eed050", + "sha256": "0q5lcfg7bpid8rl04c9qml062pyi6sqgdcvhrqxm9mcfyjq5zg72" }, "stable": { "version": [ @@ -29373,11 +29671,11 @@ "repo": "Ambrevar/emacs-fish-completion", "unstable": { "version": [ - 20190429, - 822 + 20190904, + 254 ], - "commit": "e5b9b65a077319dfdb2faca9ef847db3ef55d0db", - "sha256": "1pjqnbyjmj64q5nwq1mrdxcls4fp5y0b6zqs785i0s6wdvrm4021" + "commit": "0a9a63e2cac24bfdf7dbedb5c6ab7faca23d3bfe", + "sha256": "1rp5y1hpdr08v374cvkqjb2i47lni0yl866wssm73ch9ql30y22n" }, "stable": { "version": [ @@ -29396,20 +29694,20 @@ "repo": "wwwjfy/emacs-fish", "unstable": { "version": [ - 20180827, - 303 + 20190921, + 526 ], - "commit": "35fc7c1e243a7410823088a571ecf378e9f3efa6", - "sha256": "0rn08dm4gn0g0nz080zxm0am1z6hfkinvzqwqszv96qkxy250ghp" + "commit": "688c82decad108029b0434e3bce6c3d129ede6f3", + "sha256": "1s961nhwxpb9xyc26rxpn6hvwn63sng452l03mm2ply32b247f9p" }, "stable": { "version": [ 0, 1, - 4 + 5 ], - "commit": "bac709ac1235751952d6022dddc6307d9135d096", - "sha256": "0a74ghmjjrxfdhk4mvq6lar4w6l6lc4iilabs99smqr2fn5rsslq" + "commit": "688c82decad108029b0434e3bce6c3d129ede6f3", + "sha256": "1s961nhwxpb9xyc26rxpn6hvwn63sng452l03mm2ply32b247f9p" } }, { @@ -29882,11 +30180,11 @@ "repo": "amake/flutter.el", "unstable": { "version": [ - 20190729, - 444 + 20190924, + 118 ], - "commit": "a5de449cd10f98e7ea4340940b7726f299a0854a", - "sha256": "0v20yirkg04szaw0l7abq8qpqnhqlhgpm5hg5i8dks01dlczw29h" + "commit": "4d59cf0a08426c66c1d80c1a98d6245645b9a54d", + "sha256": "03x9cq4mah211379zx34dvmmdf86yc3wa9m71g7z1g1374pq036v" } }, { @@ -29904,8 +30202,8 @@ "flutter", "flycheck" ], - "commit": "a5de449cd10f98e7ea4340940b7726f299a0854a", - "sha256": "0v20yirkg04szaw0l7abq8qpqnhqlhgpm5hg5i8dks01dlczw29h" + "commit": "4d59cf0a08426c66c1d80c1a98d6245645b9a54d", + "sha256": "03x9cq4mah211379zx34dvmmdf86yc3wa9m71g7z1g1374pq036v" } }, { @@ -30015,8 +30313,8 @@ "repo": "flycheck/flycheck", "unstable": { "version": [ - 20190828, - 1147 + 20190913, + 1456 ], "deps": [ "dash", @@ -30024,8 +30322,8 @@ "pkg-info", "seq" ], - "commit": "ea176a4f6bfebd70b71a8a5e2988b49e1a58fe52", - "sha256": "0ys9cvhbxxq51sipk6ay13jcahgcbv869bxlhivdpjj7gmhzj5db" + "commit": "0006a59259ebd02c9199ddc87f0e3ce22793a2ea", + "sha256": "09q3h6ldpg528cfbmsbb1x2vf5hmzgm3fshqn6kdy144jxcdjlf1" }, "stable": { "version": [ @@ -30252,14 +30550,26 @@ "repo": "ch1bo/flycheck-clang-tidy", "unstable": { "version": [ - 20171024, - 808 + 20190925, + 2345 ], "deps": [ "flycheck" ], - "commit": "b8ebd49693f67e08e420ba847cc88f6721ef9e3e", - "sha256": "0fnn1baw64f7x1zjb95adryr3mfynbblwppcd6ywh7pk0sq18b80" + "commit": "11535422f483ecfccb345c559e7309a81648f088", + "sha256": "1y38r98d4f3sdxndhd8p0k3acp7qhzi6vf2k0ph9rj59pp6bqkg7" + }, + "stable": { + "version": [ + 0, + 1, + 0 + ], + "deps": [ + "flycheck" + ], + "commit": "0775e3cde31010820585bb6fdb1239d9b6af67e2", + "sha256": "1bjagdi4f4gardwqdfpz2jnyrsn717hhk7lmmwndjxfi1phbqdc4" } }, { @@ -30910,8 +31220,8 @@ "repo": "flycheck/flycheck-haskell", "unstable": { "version": [ - 20181207, - 1646 + 20190907, + 2035 ], "deps": [ "dash", @@ -30920,8 +31230,8 @@ "let-alist", "seq" ], - "commit": "32ddff87165a7d3a35e7318bee997b5b4bd41278", - "sha256": "10pgsbagq6qj4mshq5sypv0q0khck92b30sc793b4g1pfpsxvgjn" + "commit": "4b585264826a9f0f35d121dd52aa0e381f336d69", + "sha256": "1cz8yxb06acm77jlr0mk9kx79v6pnhb97p2601pik9rndr824c2a" }, "stable": { "version": [ @@ -31541,14 +31851,14 @@ "version": [ 0, 3, - 1 + 2 ], "deps": [ "flycheck", "phpstan" ], - "commit": "525792fc4a9ecb5dc577a7c416e298e0c45c6183", - "sha256": "02cgcqkgwl0rbxhndcyjd8fj57g84n8x4n9rkh671rg3r7p7c71j" + "commit": "de74ebfcbce53a08daf95d324d7447dede094222", + "sha256": "01x5gf7z0iqx601z3g4cdq6cv27aflxw5kmqrwrj0aijcb7nb9c6" } }, { @@ -31801,8 +32111,8 @@ "flycheck", "rtags" ], - "commit": "6289e66a69d0d5ff20b12da91e735d3984ad6f88", - "sha256": "1ggdi4mgqw1cc0w6cijds7s4vb575v27g72h6md8h1jdsfv6pvrm" + "commit": "d3d4bc9b7b829d39628a1af96f06eb23ba48670c", + "sha256": "0fgxrpqvqs988kjnkcc1lmyqnfc85ivhrarldl7iqgj25fvni6z1" }, "stable": { "version": [ @@ -33595,11 +33905,11 @@ "repo": "cadadr/elisp", "unstable": { "version": [ - 20190829, - 1514 + 20190904, + 1257 ], - "commit": "f2fcfc0d4e7cdb1312c5c06fd5e1820788268de3", - "sha256": "14rfixf6948zf5ylplzmpqr15rn1kr1qc26055kbb13klyl0qj3y" + "commit": "ebb2778052aeaf737adebc003957cb48cb01135e", + "sha256": "0qlvdpa88ic9gnb0qhijfsc9i6l3ba2zrvk4r4li3qrx0i9rpz5c" } }, { @@ -33676,8 +33986,8 @@ "repo": "magit/forge", "unstable": { "version": [ - 20190820, - 826 + 20190924, + 2125 ], "deps": [ "closql", @@ -33689,8 +33999,8 @@ "markdown-mode", "transient" ], - "commit": "6c43971a78a08954c20992cb6b0e98a7e7295908", - "sha256": "1hlk6jmn4w7bq0x7syrxmk2gz4dn7iswi73dixcfkv3m97qiqxd1" + "commit": "b80e0988cc15d3f7e5754c05fc3ac9414cd97947", + "sha256": "0v8qqakv1bwn00b2kqcn8x87mfpnwdqik0573l4k9drvc3lax41q" }, "stable": { "version": [ @@ -33745,14 +34055,14 @@ "repo": "lassik/emacs-format-all-the-code", "unstable": { "version": [ - 20190830, - 1152 + 20190911, + 2017 ], "deps": [ "cl-lib" ], - "commit": "15e9837a9e2d74bbb12fbaf1dcb400d0153754ba", - "sha256": "0bpz3i20vkd22y16cb7cllikj0sd91km2697wmix5wjsc370nimh" + "commit": "15a33a9b62d7ac0580c722ee4a7130bd67ba9b49", + "sha256": "16zka3dcxzn25ig8fg06lhiv453pnyqp791hald4r90v46p4x7qq" } }, { @@ -33869,6 +34179,30 @@ } }, { + "ename": "fountain-mode", + "commit": "12589d1eb14bfc87d2e6f2a5ff8f5fb66b574a56", + "sha256": "1i55gcjy8ycr1ww2fh1a2j0bchx1bsfs0zd6v4cv5zdgy7vw6840", + "fetcher": "github", + "repo": "rnkn/fountain-mode", + "unstable": { + "version": [ + 20190913, + 637 + ], + "commit": "f663ea2cfea24bf17ca539bd7ffe844351b7efe8", + "sha256": "0svmsia57dbakdcyjx3435n0vwlrh548j21d5mrgm788dkn668nv" + }, + "stable": { + "version": [ + 2, + 7, + 3 + ], + "commit": "5fe797ebea7544749bc212c77780942329a1ff70", + "sha256": "1ghck97vv2ygqbwgwxgbzb0wvf87w0i6vff47lzmmr2ig1ggw2yb" + } + }, + { "ename": "fraktur-mode", "commit": "855ea20024b606314f8590129259747cac0bcc97", "sha256": "0hy2cncbgpp7ysp7qwfpj0r075rxrc77bmc70bw7hf8m1xiw124k", @@ -34061,6 +34395,25 @@ } }, { + "ename": "frecentf", + "commit": "64d342c3814721f82dee8859d90b2da4192d8bc8", + "sha256": "1z20035iplkjan3nf3lr0jzdz6jh988rq281zbi4a5l271ll8lb9", + "fetcher": "git", + "url": "https://git.launchpad.net/frecentf.el", + "unstable": { + "version": [ + 20190903, + 2109 + ], + "deps": [ + "frecency", + "persist" + ], + "commit": "b32eb159de14b2e0d1d1c763acd65cc6784756ae", + "sha256": "15pskn85dmm7dblp56b0zzby9wbc2kysb7n3q07yp8680z6lnxhg" + } + }, + { "ename": "free-keys", "commit": "55067e899ba618d4394ad9657322c92a667a0774", "sha256": "0j9cfgy2nkbska4lm5z32p804i9n8pdgn50bs5zzk1ilwd5vbalj", @@ -34279,8 +34632,8 @@ "deps": [ "cl-lib" ], - "commit": "e6eb7be61c35d4a7b7d5eeb528b582639c57f08f", - "sha256": "10ndvjwg4c77qkh0a2ab7vdkz8z6fyk5ji7ra68cq75g7gclli77" + "commit": "0150e4c30390ecea135cdd2f859eb8b88421da6e", + "sha256": "1dfjni5f688kj223wvg0hhnw0b38241486p2bxbvr1gnwg3w47cx" }, "stable": { "version": [ @@ -34454,8 +34807,8 @@ 20190810, 507 ], - "commit": "57b5d0df689dd7e0958e0eba1269ae32a172cd90", - "sha256": "1ivsy5yarapcaqrnhn6pkbipv0s83laxjlrdb3z055g0091zq8bs" + "commit": "f4e30922952470984460d6617e35939aa97640dd", + "sha256": "08dyp4z3yqc044wyff207z8bzj51z91yxfk92vv120cvach70k5z" }, "stable": { "version": [ @@ -34816,11 +35169,11 @@ "repo": "jaor/geiser", "unstable": { "version": [ - 20190826, - 1736 + 20190905, + 2337 ], - "commit": "d7bcfde6303b420ca76d9364c6e8f2c6827112e6", - "sha256": "01n3vxczv02vj9h7w1syq62qpnaw44wryk17ssk72ihg3zrrri6v" + "commit": "f76340bd11dc6eb5cf6c22cb5f39e76d52b15d66", + "sha256": "0si9d2xcxwkf9l6sly3cckyzlrvr67ihijffjmaswbx7qkgb7gk1" }, "stable": { "version": [ @@ -35498,8 +35851,8 @@ "dash", "with-editor" ], - "commit": "bcd161d8ad3fcd80cbf69e7720c1d75a79415021", - "sha256": "06nxrnln7cas9sk0g7k88r9z2zbvm32ki3mab1yn9w3abgralfyc" + "commit": "f788dd7f4730316378b8a222aa5d6b6f1efce94e", + "sha256": "1v2ml8nk7fkaapdcm88098wcc2mcgi0d3mil5dd57vhqmrn7d23z" }, "stable": { "version": [ @@ -37183,8 +37536,8 @@ "cl-lib", "go-mode" ], - "commit": "9ab06b3deb1cbf00802d7824bf7107c31865f9fb", - "sha256": "13bz4cphm1f90bj08shbnk9556091hfv4fzpa1hkwlav09j5nk7q" + "commit": "2a1584f06f95792f2c5a84c523bccaafbc5dbbab", + "sha256": "06aig4r5a4sfdpwh58pikj9ij95iiy2hakqjgszg54wdv5rljwvd" }, "stable": { "version": [ @@ -37276,11 +37629,11 @@ "repo": "dominikh/go-mode.el", "unstable": { "version": [ - 20190819, - 2109 + 20190917, + 1943 ], - "commit": "9ab06b3deb1cbf00802d7824bf7107c31865f9fb", - "sha256": "13bz4cphm1f90bj08shbnk9556091hfv4fzpa1hkwlav09j5nk7q" + "commit": "2a1584f06f95792f2c5a84c523bccaafbc5dbbab", + "sha256": "06aig4r5a4sfdpwh58pikj9ij95iiy2hakqjgszg54wdv5rljwvd" }, "stable": { "version": [ @@ -37384,8 +37737,8 @@ "deps": [ "go-mode" ], - "commit": "9ab06b3deb1cbf00802d7824bf7107c31865f9fb", - "sha256": "13bz4cphm1f90bj08shbnk9556091hfv4fzpa1hkwlav09j5nk7q" + "commit": "2a1584f06f95792f2c5a84c523bccaafbc5dbbab", + "sha256": "06aig4r5a4sfdpwh58pikj9ij95iiy2hakqjgszg54wdv5rljwvd" }, "stable": { "version": [ @@ -37632,8 +37985,8 @@ 20180221, 2015 ], - "commit": "959b441ac422379a43da2230f62be024250818b0", - "sha256": "1mgcv5f00pkzsbwnq2y7vqvd1b4lr5a3s47cphh2qv4indfk7pck" + "commit": "414d861bb4acf565ff8cb05f9906a2283b7dc75a", + "sha256": "1ixb7c3vv8ky7gk9kpknv4hg0wgk6xfcbxxrmql9vc16g6jvcspy" } }, { @@ -37677,8 +38030,8 @@ 20180130, 1736 ], - "commit": "dceb47fb3ea99ad7cc4308fa2c9ecb0d012639e1", - "sha256": "184llmywxm3fi20lpyni3vx4wxg2z8aag8ahirka2ipnykl1z9id" + "commit": "5651966e0275572a9956199418d89c9ccc7b2b1a", + "sha256": "10lxzkz031lazd9zs3pwh2j7723gzpbhr564vsk1r4gdcbbbj2h3" } }, { @@ -38051,8 +38404,8 @@ "magit-popup", "s" ], - "commit": "3e2022d00278b8d47ea40793d299365c5d7b53a1", - "sha256": "1gmfsqn46lb4anqzb0s8yr21kzg5k2arw1daz056vcspq4fy3ix1" + "commit": "b51c3b036a2f375ef5b95de2d29f3792aad064d7", + "sha256": "05b6v6z6dxgpx9b2cp8k3d3fvj01l3smqymikri10ay975g3xawv" }, "stable": { "version": [ @@ -38665,20 +39018,20 @@ "repo": "seagle0128/grip-mode", "unstable": { "version": [ - 20190820, - 1726 + 20190909, + 1939 ], - "commit": "e3f5143d34ec47ee3c01a21e1d7c5dbf744bfe1a", - "sha256": "09ikf88nl7mig525m4432f8bjff4rdgiw3a5vjnmilmsx85n6gpd" + "commit": "eb574c874c76cd3e9b8ec39be04331eaeeac5f31", + "sha256": "1m7q1nbg3x6lgbrdsxnsbxchhfw5v0lf5dzix8lnw2wv1lsl51py" }, "stable": { "version": [ 2, - 0, + 1, 0 ], - "commit": "7777b694751c0da754712b964052617de1740e42", - "sha256": "1kbyr3rfdbclpvxbbv66rirj7bn507izafjssvkwgjrrd6vfhdv2" + "commit": "eb574c874c76cd3e9b8ec39be04331eaeeac5f31", + "sha256": "1m7q1nbg3x6lgbrdsxnsbxchhfw5v0lf5dzix8lnw2wv1lsl51py" } }, { @@ -39032,8 +39385,8 @@ "repo": "alezost/guix.el", "unstable": { "version": [ - 20190507, - 1711 + 20190913, + 1624 ], "deps": [ "bui", @@ -39042,8 +39395,8 @@ "geiser", "magit-popup" ], - "commit": "11e0dbf6491300d250efb3dc09d634b01e86b35b", - "sha256": "0j60v0h850cwxik1mhlnmqms47dkkqcnfx53qs66hi1zyp7pax5z" + "commit": "24918011d2f1a78d63f39bf0c462b7dab190629a", + "sha256": "1maag50nbgwygc6w7lbna1ml20f3k4dvxzjm3fgdqmfypi5ag891" }, "stable": { "version": [ @@ -39667,11 +40020,11 @@ "repo": "haskell/haskell-mode", "unstable": { "version": [ - 20190801, - 50 + 20190926, + 313 ], - "commit": "56d67ee282294c786a92e2d83c5bebf1a6d919c1", - "sha256": "1wschs4ny2b40bg8z86vc73zq32bv9mcxkyvgbmza44zvhqpdkwp" + "commit": "1bee161d3cea973d4ee3ff7acf980bf2cdeb83e2", + "sha256": "1vjxqqa08cxhsk69rcf0kn7bsfp6c5a9jax777h7ljc39fzcpf8q" }, "stable": { "version": [ @@ -40001,16 +40354,16 @@ "repo": "emacs-helm/helm", "unstable": { "version": [ - 20190830, - 1604 + 20190926, + 609 ], "deps": [ "async", "helm-core", "popup" ], - "commit": "c00b5826c1d5797debe92ed235d50b068a348c14", - "sha256": "0fzr08cln58j9d03c1znk29gw6qnj6a28z4i8p7szsifryrhy4vr" + "commit": "72f68624b6f19ead155a7e1006a5550d92b8ec9f", + "sha256": "07sjy78yb8gclmvh8xjgkbh9gk06ns77g2z53wysf3markwg6pky" }, "stable": { "version": [ @@ -40267,8 +40620,8 @@ "repo": "tmalsburg/helm-bibtex", "unstable": { "version": [ - 20190814, - 1056 + 20190918, + 1116 ], "deps": [ "biblio", @@ -40279,8 +40632,8 @@ "parsebib", "s" ], - "commit": "7e87161463c9c5ade3ed0e65aa3cde48c51b57de", - "sha256": "1krn85fvd0438iqs2af8vlqp8am39z6lbkda2b3hi01frp7g8sx6" + "commit": "5a26b35c3fa223d4c74262137f34bb2f325c4411", + "sha256": "0nw35f2qr5pqswz1rbkgwvd2wmvg8hzjf419w9iffx1m858k99rf" }, "stable": { "version": [ @@ -40855,14 +41208,14 @@ "repo": "emacs-helm/helm", "unstable": { "version": [ - 20190830, - 635 + 20190924, + 1617 ], "deps": [ "async" ], - "commit": "c00b5826c1d5797debe92ed235d50b068a348c14", - "sha256": "0fzr08cln58j9d03c1znk29gw6qnj6a28z4i8p7szsifryrhy4vr" + "commit": "72f68624b6f19ead155a7e1006a5550d92b8ec9f", + "sha256": "07sjy78yb8gclmvh8xjgkbh9gk06ns77g2z53wysf3markwg6pky" }, "stable": { "version": [ @@ -40964,8 +41317,8 @@ "dash-docs", "helm" ], - "commit": "6c76c794fec95586028633f24773451812af5df4", - "sha256": "0ajkflf6fzpxxgv2nzpxnc1d2rp32ba1lz9x4s2bini71krai88s" + "commit": "7f853bd34da666f0e9a883011c80f451b06f6c59", + "sha256": "0r192vzry1212ihabg9pgw9xar8zdgnbgy0vsgvfm8s5wj6ny7jp" }, "stable": { "version": [ @@ -41393,6 +41746,36 @@ } }, { + "ename": "helm-fd", + "commit": "ea8d504faa73bc0a649b13738ed7c6a76e2fad88", + "sha256": "1hlq0xxi616flykay9jr96rqgvs53dmlk50h25982jpl6xb63g9y", + "fetcher": "github", + "repo": "lerouxrgd/helm-fd", + "unstable": { + "version": [ + 20190923, + 48 + ], + "deps": [ + "helm" + ], + "commit": "84a2aa656473f2921e35abad62b158b3813ee944", + "sha256": "14bdcr4db500sqv5p47jdkjp06hys35bpb07fp40v39r9pbzfdla" + }, + "stable": { + "version": [ + 0, + 1, + 0 + ], + "deps": [ + "helm" + ], + "commit": "2891ca941b5a70facf35d5a8bbc791fc41ab0284", + "sha256": "16szlby36g393mwnywl59iyngrinnsd9xilsgadr6l9hngas4anm" + } + }, + { "ename": "helm-file-preview", "commit": "bf60b4c17c866cd89ff68b99aeb2941c6bc6d940", "sha256": "0y3wkj98nj5nnf5v5iqaihipyx9p902i152gbcrsqcjbpgw3wlhz", @@ -41400,14 +41783,14 @@ "repo": "elpa-host/helm-file-preview", "unstable": { "version": [ - 20190825, - 247 + 20190903, + 331 ], "deps": [ "helm" ], - "commit": "7b332fc3ceb730d054bac464b78e4d6e009ff432", - "sha256": "0klcgqqyx4zkxy0vnqfkbydjv59za8g247x0rgk64iq62fsmm3k8" + "commit": "6ab26c5fb414a0c1232974fd3f888839b6844203", + "sha256": "0lsrcn03f4981762l2rq25ps1f2ka86q125jkh6nq7wzfb7pj71f" } }, { @@ -41444,8 +41827,8 @@ "cl-lib", "helm" ], - "commit": "0ad34b7b5abc485a86cae6920c14de861cbeb085", - "sha256": "08mjsi2f9s29fkk35cj1rrparjnkm836qmbfdwdz7y51f9varjbs" + "commit": "b290734807ee68e7a7aface2af781d86e1fd5950", + "sha256": "02m05fy5qf5xfd5dh402pibbzwzmcfgqymqigkbdfyjbfbljl3zx" }, "stable": { "version": [ @@ -41550,17 +41933,17 @@ }, { "ename": "helm-frame", - "commit": "febb2599e50518dadb30088bc9576aea2af092a7", - "sha256": "18wbwm4r3ra9214whhdbxnjrxzra4pn12wqgq5lxli1khylihm3i", - "fetcher": "gitlab", + "commit": "8bbb56b883658fdf91b984c01d2472bdf6787003", + "sha256": "1hmml0209z3ap35bqk9b1fh0lcfksysqszgj1ifh1mdjz81xx9sq", + "fetcher": "github", "repo": "chee/helm-frame", "unstable": { "version": [ - 20170515, - 1950 + 20180604, + 1005 ], - "commit": "389e6461a423d649b7062ba99a2234bef7770059", - "sha256": "1z7iwgl1v8nkwyz3h610l97amgq9slrfxxiicsnigc9vgsqlh987" + "commit": "485e2a534b0de5e8dbeb144a9a60ceca00215a4a", + "sha256": "1hxqyyh8jzk83ppi1p5r9b9gy7k2hanh3xzp129iw9yqpmvwmsnq" } }, { @@ -41578,8 +41961,8 @@ "fuz", "helm" ], - "commit": "57b5d0df689dd7e0958e0eba1269ae32a172cd90", - "sha256": "1ivsy5yarapcaqrnhn6pkbipv0s83laxjlrdb3z055g0091zq8bs" + "commit": "f4e30922952470984460d6617e35939aa97640dd", + "sha256": "08dyp4z3yqc044wyff207z8bzj51z91yxfk92vv120cvach70k5z" }, "stable": { "version": [ @@ -41614,6 +41997,25 @@ } }, { + "ename": "helm-fuzzy", + "commit": "e0172c8a4e2393a0263373c80e6e7f654bf74dc6", + "sha256": "1f7lj9prgh0wpf8xmy5xi5rhs5pj3j4lz68apd95nv2idnbrrlb7", + "fetcher": "github", + "repo": "elpa-host/helm-fuzzy", + "unstable": { + "version": [ + 20190905, + 526 + ], + "deps": [ + "flx", + "helm" + ], + "commit": "fc080a0b4be8a68944a64bc4fb5b38cd11a70bc7", + "sha256": "01632zrpl69b034srgsfidf62r1kwc8f4z8i48kz95g5n2ax1xk9" + } + }, + { "ename": "helm-fuzzy-find", "commit": "34f76bb377ed31aa42663858c407cc5476e6fe1f", "sha256": "0lczlrpd5jy2vhy9jl3rjcdyiwr136spqm8k2rj8m9s8wpn0v75i", @@ -42247,15 +42649,15 @@ "repo": "torgeir/helm-js-codemod.el", "unstable": { "version": [ - 20171106, - 1044 + 20190921, + 942 ], "deps": [ "helm-core", "js-codemod" ], - "commit": "18503d94e64418e8ea5c5854f197ae9f3009cdbf", - "sha256": "0d5fsvfa017gda0jryjdvva1q04nry6grc1433gvgrqqp6vxayxc" + "commit": "29b1b3c441f0d7e450a3c65b5ff9e72023dc6314", + "sha256": "15lksdyk5z4xszfsdk290pm6ri5r9c2ki9jxmwppkqpd52w2dxck" } }, { @@ -42331,8 +42733,8 @@ "helm", "lean-mode" ], - "commit": "9d6b8471e2044310b4cd7cd3213b1fc8f78ec499", - "sha256": "0r8vfklrdw3f11cpk279jg3mnfbqm60m6klisqndkvir7vsrshni" + "commit": "b5ba739f68ef731c03247bf6db2708502c8ac46c", + "sha256": "1dx0a76l7w3ck23sdjymigk1hycqiawfwv24yz6wqyy74f1pcyjf" } }, { @@ -43514,8 +43916,8 @@ "helm", "rtags" ], - "commit": "6289e66a69d0d5ff20b12da91e735d3984ad6f88", - "sha256": "1ggdi4mgqw1cc0w6cijds7s4vb575v27g72h6md8h1jdsfv6pvrm" + "commit": "d3d4bc9b7b829d39628a1af96f06eb23ba48670c", + "sha256": "0fgxrpqvqs988kjnkcc1lmyqnfc85ivhrarldl7iqgj25fvni6z1" }, "stable": { "version": [ @@ -43792,15 +44194,15 @@ "repo": "wandersoncferreira/helm-spotify-plus", "unstable": { "version": [ - 20190807, - 2115 + 20190913, + 2236 ], "deps": [ "helm", "multi" ], - "commit": "e52233523917596dd3862e1151a027ce89a80a38", - "sha256": "0h4lj18rvhwcsb0k7ckp81h1aank9pf0dsa3qb578n10i9p6bb4y" + "commit": "c3922ec368250965e483876cde5880d88a40a71b", + "sha256": "12zl775l7zikv268vypnb56ly2h0y3sf5wxv5rc2amnmwgrikvra" } }, { @@ -44149,14 +44551,14 @@ "repo": "brotzeit/helm-xref", "unstable": { "version": [ - 20190821, - 1252 + 20190916, + 1544 ], "deps": [ "helm" ], - "commit": "5290e2a05209b742d7efcd3e03b5f51ac1eab6ad", - "sha256": "1jkjm43fnwc4n9h5rrpkb2sgs2k0nb5fmxxn08b4iyz992lgmk7b" + "commit": "316e1bdb877ec4634addc422cdb9572ee3e2afe0", + "sha256": "14zgww1qyk7cp80p6f3viljjbibm3h0c51alplrmjdng57xy0wgq" } }, { @@ -44327,25 +44729,26 @@ "repo": "jjzmajic/hercules.el", "unstable": { "version": [ - 20190820, - 1712 + 20190920, + 518 ], "deps": [ "which-key" ], - "commit": "aace3409bc4d78fec3006b2906eb2ae99cadd9f4", - "sha256": "1s88hmw671in3lrmsbbc3w6fs1ccgzip8k46j79gyf50vzzfcpk7" + "commit": "e6fcb0df3fe877bec2d708f4d034da685d8a1081", + "sha256": "0i1bza4nj01z23ig340svyr0lcl284lcpg1lpnhc7cmybjlv27nl" }, "stable": { "version": [ 0, - 2 + 2, + 1 ], "deps": [ "which-key" ], - "commit": "8d156df2b7ae2866bfe44ee1b9c038379524147a", - "sha256": "17izhdq6pgg25nkl1zlqri18dhjgxwkw95iy230adsbk8m0iys4g" + "commit": "489ed27f978c8ae7ce0587d4677ef14d59776008", + "sha256": "19939pf5d6p2facmfhpyghx0vipb5k6ry3bmkmjfkj1zp132zfqf" } }, { @@ -44519,20 +44922,20 @@ "repo": "hlissner/emacs-hide-mode-line", "unstable": { "version": [ - 20180302, - 1910 + 20190922, + 115 ], - "commit": "86b9057391edad75467261c2e579603567e608f9", - "sha256": "0qmjmwhmlm008r22n2mv7lir4v1lpfz1c3yvqlwjgv0glbyvqd88" + "commit": "88888825b5b27b300683e662fa3be88d954b1cea", + "sha256": "0dfzjgxfkcw4wisbyldsm1km18pfp9j8xgadn6qnsz11l55bpgyp" }, "stable": { "version": [ 1, 0, - 1 + 2 ], - "commit": "86b9057391edad75467261c2e579603567e608f9", - "sha256": "0qmjmwhmlm008r22n2mv7lir4v1lpfz1c3yvqlwjgv0glbyvqd88" + "commit": "88888825b5b27b300683e662fa3be88d954b1cea", + "sha256": "0dfzjgxfkcw4wisbyldsm1km18pfp9j8xgadn6qnsz11l55bpgyp" } }, { @@ -44576,17 +44979,17 @@ }, { "ename": "highlight", - "commit": "f0a8eb0eefe88b4ea683a4743c0f8393506e014b", - "sha256": "11icn6f46synw6xvs2a266g43fvpnz8i7d7dyr0iywzjpbpyhsd2", - "fetcher": "git", - "url": "https://framagit.org/steckerhalter/highlight.el.git", + "commit": "38433e95f73ab20f27254a084d0b245c6e62d882", + "sha256": "0ik2kci2y404zzvs78h74v21ssgi6f0jdzzbq45fhdhjra02kzzz", + "fetcher": "github", + "repo": "emacsmirror/highlight", "unstable": { "version": [ - 20181002, - 1151 + 20190710, + 1527 ], - "commit": "ea733e17884aeae19172407e20559fc693fdd3a7", - "sha256": "13ajbhpwvdmk0mzaffj45gxqmq13b57d81iqdpg9q2l2wjk95jq7" + "commit": "9258a2b8362d737115cbd87618f947eadb140411", + "sha256": "0pbqzgbfkm8smi23j94hirxh2r1yc0ipyjbbv1y906br6bx5c1a8" } }, { @@ -45248,11 +45651,11 @@ "repo": "tarsius/hl-todo", "unstable": { "version": [ - 20190807, - 1831 + 20190918, + 2149 ], - "commit": "be57dbc5a4667e4a60b8249b53fa176db1019c8e", - "sha256": "12swld4a723wqkh5h9jf3l4lj5rsidgmna53n8g48w8qvi2gz8l8" + "commit": "d7673363ef318a417adc28e36cafb78d01a671af", + "sha256": "11d7kmgdpjmjlnfkhfhwvwjdjaag0iscscdbg6gf1hkch19055cp" }, "stable": { "version": [ @@ -45336,6 +45739,26 @@ } }, { + "ename": "hnreader", + "commit": "65dc5e41f88158d7595aba7a66b791b205b929b7", + "sha256": "1y7ariri9q7dvda28rdp5i66c2xw74ap8cd7n6lskgnnxjk1yl8j", + "fetcher": "github", + "repo": "thanhvg/emacs-hnreader", + "unstable": { + "version": [ + 20190909, + 258 + ], + "deps": [ + "org", + "promise", + "request" + ], + "commit": "7e68beff596a7c67ff436be5cc29660acd46f5df", + "sha256": "0yynfz8bw7nvzk05zxypn183y6hf243s55kxfiicnxx7shag217i" + } + }, + { "ename": "hoa-mode", "commit": "f8b91f35d06f9e7e17c9aaf2fb9ee43a77257113", "sha256": "06rfqn7sqvmgpvwhfmk17qqs4q0frfzhm597z3p1q7kys2035kiv", @@ -45558,6 +45981,26 @@ } }, { + "ename": "howdoyou", + "commit": "eb5356c3e094e93c09398bfd628b1594c7e3ec20", + "sha256": "0dnlhkpnjag6vk7qyfgzc7p0fs1b01pc3dnm6bgw19ghdp1wvp8y", + "fetcher": "github", + "repo": "thanhvg/emacs-howdoyou", + "unstable": { + "version": [ + 20190921, + 259 + ], + "deps": [ + "org", + "promise", + "request" + ], + "commit": "8ebfcb2b8f708110040c5a3e6f4f0d46f33b025c", + "sha256": "1rsmz7av9ij11j307ncly78dhncyb7lxdcgpy0plfsyja3kw3m5q" + } + }, + { "ename": "howm", "commit": "0099a1f9b0efb3fc3a1420cfe71a647ec6458998", "sha256": "07wx3wmc51vm42s81km5sdbm600ax2pv83xg0116xsyn05za3bfn", @@ -45601,14 +46044,14 @@ "repo": "Wilfred/ht.el", "unstable": { "version": [ - 20190830, - 910 + 20190924, + 704 ], "deps": [ "dash" ], - "commit": "a5a046e7c26fbcda0b757a64b30ca3e5b1cc6d69", - "sha256": "15vqnl72ahydj0qjg7y7na1i6n8800fl0na2glgrrwyhzy0z2sa2" + "commit": "66c5f9131242697fabaede5566d87ecda4c14b1f", + "sha256": "0mip7v2w89wjs2nw4c198y7rpf9i7wsrjibmcnnzwxhcm1sidjnh" }, "stable": { "version": [ @@ -45660,15 +46103,15 @@ "repo": "plexus/html-to-hiccup", "unstable": { "version": [ - 20161028, - 1401 + 20190909, + 1549 ], "deps": [ "dash", "s" ], - "commit": "99217a5058626d253ed8ada51a7642071fe54ba5", - "sha256": "1cvlh1iqjdmgwbw254g0rfdshsj7dhqjjp56gwqhn2fqkga44a7i" + "commit": "50a52e2b0d13d865187acdf775b8203d5003f2f1", + "sha256": "1qi092mw2n08v6yr0j6hlpx0pnlcnhxjqbsrlw9pn4yin6zk91yp" } }, { @@ -46078,14 +46521,14 @@ "repo": "ieure/hyperspace-el", "unstable": { "version": [ - 20190702, - 2331 + 20190908, + 550 ], "deps": [ "s" ], - "commit": "6441da7a816b4bf6faba21cb7b8cc1a1db6f35d5", - "sha256": "10l82fzp7m57bkzbqgmz1sp42mqkcmz4i6w9rv2hpzdp7ccgfr9v" + "commit": "825ac47887bf2f63e7dc2ecce264a52d9f0fae70", + "sha256": "00bjwgg67y6igm2k2rwrw4n35jiw5akhl01mhbggwy999gb01cg2" }, "stable": { "version": [ @@ -46192,11 +46635,19 @@ "repo": "muffinmad/emacs-ibuffer-project", "unstable": { "version": [ - 20181216, - 2125 + 20190925, + 1105 + ], + "commit": "7de4f54a959de3254a98662777269ec7a08adbc9", + "sha256": "06p12hxnrbcjdwr8b1rmbm7b4hwkhp7lsrw4j6fnnf1hi27hngsq" + }, + "stable": { + "version": [ + 1, + 1 ], - "commit": "7424e71062f2cb969c3e9951203022414dea37fb", - "sha256": "02rr81ddpand0hb3yaskklhpknnqfjkcqaa2w77xi4xlzjdima01" + "commit": "a29ed1f415902f21b5b17bf36ce1a0e46e29400c", + "sha256": "0b5d5gdqinnqfll82i994jmg6y4va2fallvh0d8g0978y3xx8vnp" } }, { @@ -46559,8 +47010,8 @@ "memoize", "s" ], - "commit": "61c6fc60c2c7c70cf07fa533914bd2dae27c902a", - "sha256": "0qwi4prdx6flfzkzhqz15xbvlcxdb9gg3i1hz350p7h2kcfjkqpa" + "commit": "fcb6fa0c2f5989b2e79f2dc1ef57d03e455cce44", + "sha256": "1wq5gbr87f6c3bbsndkg50ndf6s21pzz49dmxaa4sckjs2ax9mzx" }, "stable": { "version": [ @@ -47624,32 +48075,34 @@ "repo": "NicolasPetton/Indium", "unstable": { "version": [ - 20190715, - 1457 + 20190925, + 1909 ], "deps": [ "company", "js2-mode", "js2-refactor", + "json-process-client", "seq" ], - "commit": "971e310b8eec87afbf1f9bf927e12848deb1c058", - "sha256": "1rllgalxa73dcgmakbly23m8iwhszq44hnjpkwx5hn11zfdgx0wx" + "commit": "116d18c781eabf85bfc683e748a83f3c769a01ea", + "sha256": "0dsp614p827z7magdy7kn4acx6m9hzwwa3sd9zvarnrfymw9c5hi" }, "stable": { "version": [ 2, 1, - 2 + 3 ], "deps": [ "company", "js2-mode", "js2-refactor", + "json-process-client", "seq" ], - "commit": "a55f3c2eaa6620c4ce2e61f1d1897db4080a2cd4", - "sha256": "07iah188fzmqyb3ag0rjygq68m317grpyibsgy64v8lzdrax0fbs" + "commit": "3895b0cfda53d33ef7e6819e745f0b1e158acbfa", + "sha256": "18wl3yxlqcvb03mb4wv6v20fpy24w9yqfgiva5jrp453bqhp3mfk" } }, { @@ -47991,11 +48444,11 @@ "repo": "ideasman42/emacs-inkpot-theme", "unstable": { "version": [ - 20190816, - 715 + 20190907, + 1024 ], - "commit": "54adc447d30e60b6e6c39220e8b36d93d63fecac", - "sha256": "0pk8wgbxrly5lz0xzbk0kf5rx8z3cbyv9wj6l8s1zdc0bzj7i1nk" + "commit": "f6f148eebef72939b90a1822c1c3a257e22f802e", + "sha256": "0jxh9plw699b7w6vi6km4154ixgn5w8a1hx9v99s0icf8rpvrcnw" } }, { @@ -48235,16 +48688,16 @@ "repo": "commercialhaskell/intero", "unstable": { "version": [ - 20190530, - 1308 + 20190919, + 216 ], "deps": [ "company", "flycheck", "haskell-mode" ], - "commit": "61caa798bd385acf918b3639cf03f336b618e78b", - "sha256": "0s6ik53anwljd858xs69awx42v70ifl3pcq8njx0msfqd4qalhlx" + "commit": "bab8e85b1aea9b03dfe05048bcdc0395e05e9b20", + "sha256": "19zl7dydg2lf8msl2ls9r85f4xw3x2796w5j4h7dxxz6flljhhby" }, "stable": { "version": [ @@ -48676,10 +49129,10 @@ }, { "ename": "isortify", - "commit": "9d4ad18492e7f4a56a1515873bc0b66fa49829bb", - "sha256": "0nlpjd6mrhv8iccdny0x5lb41dpyp6l7kiax4xqra0rb2vq0chcs", + "commit": "c756ccbae044bc23131060355532261aa9a12409", + "sha256": "0bqs84prlwk94x543mv22wjnz0s7gqbdi7ryvdc20s7vdr18fn82", "fetcher": "github", - "repo": "proofit404/isortify", + "repo": "pythonic-emacs/isortify", "unstable": { "version": [ 20190315, @@ -48688,7 +49141,7 @@ "deps": [ "pythonic" ], - "commit": "4d8ecfcadf58ea51368e66ecf6f2a95a95953fcf", + "commit": "ae7fb7163ce075209543f72953c9f431d103f6a3", "sha256": "0gslib1r9d9dqd9r89dfg8npkybjw2bjdrbs0z2qcnfa82x4fq4z" } }, @@ -48848,8 +49301,8 @@ "repo": "tmalsburg/helm-bibtex", "unstable": { "version": [ - 20190814, - 1056 + 20190918, + 1116 ], "deps": [ "biblio", @@ -48860,8 +49313,8 @@ "s", "swiper" ], - "commit": "7e87161463c9c5ade3ed0e65aa3cde48c51b57de", - "sha256": "1krn85fvd0438iqs2af8vlqp8am39z6lbkda2b3hi01frp7g8sx6" + "commit": "5a26b35c3fa223d4c74262137f34bb2f325c4411", + "sha256": "0nw35f2qr5pqswz1rbkgwvd2wmvg8hzjf419w9iffx1m858k99rf" }, "stable": { "version": [ @@ -48890,15 +49343,15 @@ "repo": "wandersoncferreira/ivy-clojuredocs", "unstable": { "version": [ - 20190810, - 258 + 20190907, + 2053 ], "deps": [ "edn", "ivy" ], - "commit": "7af9cef998a608a7f505120af4754779f3014106", - "sha256": "1zg730gby1l0h1vrhbzwba2ybh1rk7n9gj1a369mcd2kkdlsvw2m" + "commit": "dd33a25f1de4339f75f05689ed60fe1b1c97f554", + "sha256": "0km1par5jhhbdbn1sccpsz0drqvmmjg1905xyc2bbfc2xx38cg1i" } }, { @@ -48942,8 +49395,8 @@ "repo": "s-kostyaev/ivy-erlang-complete", "unstable": { "version": [ - 20190406, - 1736 + 20190910, + 426 ], "deps": [ "async", @@ -48951,8 +49404,8 @@ "erlang", "ivy" ], - "commit": "f3a7088ba62746932ac0084e254e4235b93febcc", - "sha256": "0sdxcx1ihb51khi5chdm80mzwh8ygfs86pndgh5gq8dzbqpi2ax4" + "commit": "fb2e31863cb0305bb3e16c094d29ff78a7414603", + "sha256": "0p16lxaana6zb2dlci3d6wwslcw4pifvnmhf3ymbhccmc36v5yqi" }, "stable": { "version": [ @@ -48978,14 +49431,14 @@ "repo": "clemera/ivy-explorer", "unstable": { "version": [ - 20190722, - 845 + 20190909, + 1921 ], "deps": [ "ivy" ], - "commit": "cb41a9e5df1cfad5877ab5429b9250e7ba082e4e", - "sha256": "0svlix3sr2jlr5awdvism1akmnca0vn0mq072s38w1q19q461cii" + "commit": "a413966cfbcecacc082d99297fa1abde0c10d3f3", + "sha256": "1720g8i6jq56myv8m9pnr0ab7wagsflm0jgkg7cl3av7zc90zq8r" }, "stable": { "version": [ @@ -49260,15 +49713,15 @@ "repo": "tumashu/ivy-posframe", "unstable": { "version": [ - 20190819, - 657 + 20190923, + 2233 ], "deps": [ "ivy", "posframe" ], - "commit": "d9ceee94171767b4aba6c55ebe93e51ccbe0fa8a", - "sha256": "1ghn9n4lc50p94byi0z2vfgkwyh4q4i19j26dkqr2lyvfhsvvdwj" + "commit": "fc0a6a7a80d4396ea44d7ee08879f0f4b46d1b67", + "sha256": "150n1gdlnyhqkflhck4m1h0g01y9mppzs6j4dp1rhn2mhhf90hrc" } }, { @@ -49279,27 +49732,27 @@ "repo": "raxod502/prescient.el", "unstable": { "version": [ - 20190728, - 1607 + 20190921, + 3 ], "deps": [ "ivy", "prescient" ], - "commit": "ea8e9fea4385272924d09c91220c7f2e9ac95b3f", - "sha256": "1apb9v31ajq586f7mqachv238yv40gacrjmh2s8mnk45xil72swy" + "commit": "2f01b640e3a487718dbc481d14406005c0212ed9", + "sha256": "1wqk1g8fjpcbpiz32k7arnisncd4n9zs84dn3qn9y8ggjzldqy91" }, "stable": { "version": [ 3, - 2 + 3 ], "deps": [ "ivy", "prescient" ], - "commit": "653ca4b66954b7f1b6e4635a574234dd316c11a3", - "sha256": "0d60h4rfm5jcf8cf11z91wjqp0xcrviskqzyqhfliqvy2i2yl6ks" + "commit": "2f01b640e3a487718dbc481d14406005c0212ed9", + "sha256": "1wqk1g8fjpcbpiz32k7arnisncd4n9zs84dn3qn9y8ggjzldqy91" } }, { @@ -49378,8 +49831,8 @@ "ivy", "rtags" ], - "commit": "6289e66a69d0d5ff20b12da91e735d3984ad6f88", - "sha256": "1ggdi4mgqw1cc0w6cijds7s4vb575v27g72h6md8h1jdsfv6pvrm" + "commit": "d3d4bc9b7b829d39628a1af96f06eb23ba48670c", + "sha256": "0fgxrpqvqs988kjnkcc1lmyqnfc85ivhrarldl7iqgj25fvni6z1" }, "stable": { "version": [ @@ -49708,11 +50161,11 @@ "repo": "ALSchwalm/janet-mode", "unstable": { "version": [ - 20190605, - 443 + 20190917, + 124 ], - "commit": "d5555cc83c1893a1c0ea04d48857d5e71b138c06", - "sha256": "1lzs5zh4ipvyxi5vzbcpxrdjrrb0vddbcajzcbsi0784cs3ndzkk" + "commit": "349eba576455f1c8f40acaa77ef222bf6432c4e7", + "sha256": "0c0idb1rfp7n99jq1jmjvgmv77f38jrvxjy95lx27j743i8zkb7d" } }, { @@ -50311,14 +50764,15 @@ "repo": "nyyManni/jiralib2", "unstable": { "version": [ - 20190720, - 1329 + 20190923, + 1809 ], "deps": [ + "dash", "request" ], - "commit": "9e3c238d96a98d6d156dbb38dcbaecf1450b9d2e", - "sha256": "1332jnn63wl00l9701qvjx9z6sxisygvn9bz366yhiq2racfrgb4" + "commit": "cb2bedb940afb7c163c5881f0cddc03d4a63c109", + "sha256": "16x1bwr9jwg8cfvn2vp8akqvl2j6q4pl8xkvpvimvvjv3girbq1a" } }, { @@ -50528,11 +50982,11 @@ "repo": "torgeir/js-codemod.el", "unstable": { "version": [ - 20171104, - 1154 + 20190921, + 941 ], - "commit": "014e56c846487d1eeaf8a91dd503b9d96eb1510a", - "sha256": "0s07ypjlqsx2pgq89wmr69w9p7ybc62abqp53kzf5gmdl6fdzgxq" + "commit": "056bdf3e5e0c807b8cf17edb5834179a90fb722b", + "sha256": "1s87jy1v7vjqpl09w2lafhliqhc5hm9061n7f2gfiw0hhv1xp6bw" } }, { @@ -50613,6 +51067,24 @@ } }, { + "ename": "js-react-redux-yasnippets", + "commit": "b5eef6590b2070ab46a5ab216cdcc6ab82174e47", + "sha256": "1mkcgpca4kzs31p0r5iwplwsm8jmf8w6h1v1a7qvpqan3gj7kidb", + "fetcher": "github", + "repo": "sooqua/js-react-redux-yasnippets", + "unstable": { + "version": [ + 20190911, + 1259 + ], + "deps": [ + "yasnippet" + ], + "commit": "70785d126a28ffcb314fb4b354319418586e06b1", + "sha256": "0adlnjkcq0kpadc1dqwfzrrk0xd4jc0rc4k8hbj6nh4dhc7shnk0" + } + }, + { "ename": "js2-closure", "commit": "61bf3e70ae38a78184f0b373ff6f0db234f51cb2", "sha256": "19732bf98lk2ah2ssgkr1ngxx7rz3nhsiw84lsfmydb0vvm4fpk7", @@ -50868,10 +51340,10 @@ }, { "ename": "json-process-client", - "commit": "38cf8baad750427268659c8b25d35270add18317", - "sha256": "0lv4xdihjphpg31zdzkzrhp715sj7y2sl87c6cz6akhlfz2mmm0h", + "commit": "a681f977631344190e2a35d9ac2cbb9a42402272", + "sha256": "0nf0lna15ymcn8wniz24ixxwr1qaznic9nym1q16ifwl72qryj79", "fetcher": "git", - "url": "https://gitlab.petton.fr/nico/json-process-client.git", + "url": "https://gitea.petton.fr/nico/json-process-client.git", "unstable": { "version": [ 20190827, @@ -51121,20 +51593,20 @@ "repo": "tpapp/julia-repl", "unstable": { "version": [ - 20190828, - 1646 + 20190908, + 1717 ], - "commit": "94761603d368f05eaed3573312503db940f4edfe", - "sha256": "1h3h5s0ls3shwgg6fl3sk0iszqdd90nz2kl5cpj1bbqfgw0fivmj" + "commit": "b8155b8a1e23e1ad740fd7bd49b5d841b1365c7d", + "sha256": "0qdn70h6k03l3xmv4xmbvrs1lx632jihhmkvjxk5hp4nk5phh9rk" }, "stable": { "version": [ 1, - 1, + 2, 0 ], - "commit": "6eb58ef8b2e922e042fb0aee399547291fce06a4", - "sha256": "05siwlyafga6ihksmd4v7dlhn1c3f6vg4ns255apm7vnmfryzvkf" + "commit": "b8155b8a1e23e1ad740fd7bd49b5d841b1365c7d", + "sha256": "0qdn70h6k03l3xmv4xmbvrs1lx632jihhmkvjxk5hp4nk5phh9rk" } }, { @@ -51287,8 +51759,8 @@ "repo": "dzop/emacs-jupyter", "unstable": { "version": [ - 20190828, - 2043 + 20190924, + 143 ], "deps": [ "cl-lib", @@ -51296,8 +51768,8 @@ "websocket", "zmq" ], - "commit": "aa9b634e7b26347a9b938da4cb97184b73651a64", - "sha256": "0k1piakj4rzygy73jd6wv9hd6nhci3d056xfiaaala6vywfllvxg" + "commit": "53da538b6634afe7e72b18b7b561afd9d2eeeb38", + "sha256": "0lbvi9sf7d02gzxhvn02w55bmcf7fv2lwmmgxv9vp3ya6dc03sya" }, "stable": { "version": [ @@ -51580,16 +52052,30 @@ "repo": "magnars/kaocha-runner.el", "unstable": { "version": [ - 20190826, - 916 + 20190904, + 1950 ], "deps": [ "cider", "parseedn", "s" ], - "commit": "5973bf9619d8c8b8f69824246210f31ea644127b", - "sha256": "1sr7zbdbg3hkcbmpr7fwpw26d6j4vk0a3cxnlr2pq2f5zy9n0hax" + "commit": "1376d50f1fc91f9345351aeb4960b54bf83be59e", + "sha256": "06zp5kshcsxf91d4as0nw1ncxx1a8ii6npzvk485sjrghnldsccm" + }, + "stable": { + "version": [ + 0, + 3, + 0 + ], + "deps": [ + "cider", + "parseedn", + "s" + ], + "commit": "c4ec9cdc817e5f4c3f8d6013e44ea2df8f3eb07f", + "sha256": "062c6j8l2vv2vc23z5iq4b50p92k6bni1rayhhd8j0h5bkiml4w3" } }, { @@ -51600,15 +52086,15 @@ "repo": "ogdenwebb/emacs-kaolin-themes", "unstable": { "version": [ - 20190812, - 1835 + 20190921, + 751 ], "deps": [ "autothemer", "cl-lib" ], - "commit": "9bc8dc1b69e6d858a523b98603201f60a51825fa", - "sha256": "0jb0z1p1n3fdmqlwrv7x0ndcccijdw6025gw6sm6qdyj09a241vw" + "commit": "97c8d71977f12e4b791bdd0646c3e128bbe9fc1b", + "sha256": "0jv817fpbvadqvl44xf9ai8iw2w6jhlc3gsvb9by6cr6rbqyz9js" }, "stable": { "version": [ @@ -51820,8 +52306,8 @@ 20190721, 1357 ], - "commit": "a243f0e0fdc9ee2b22ee19594de0c3b966b2445f", - "sha256": "0pzppcxzspx1k6r7vd88fn56r21d0g1jvq4w0ymlzm63vwda4p6i" + "commit": "f4a27da3c09dbee62d63dd756bc44652f6319692", + "sha256": "1bw3ywjv49bmkxkcjfr8pnshy2kxklfx253cd1qaplw1g28d0plb" } }, { @@ -52252,8 +52738,8 @@ 20180702, 2029 ], - "commit": "cefc5a72118021e01660734d08d1ad2433c7131e", - "sha256": "140h62p9i4h3jhf7rpsxn4ymg0dnxgf9kg070zc1fdvkj52gxxlw" + "commit": "0d1156a14f5fb59f420e67b1f3b899395cf595e0", + "sha256": "07i3jkvxja2a0bj7f7vlh2v2y2cialn4b4319r2kymaxlw5pmzk2" }, "stable": { "version": [ @@ -52273,14 +52759,14 @@ "repo": "stardiviner/kiwix.el", "unstable": { "version": [ - 20190811, - 1116 + 20190904, + 1248 ], "deps": [ "cl-lib" ], - "commit": "d2ae3386b52a25c080d8502fc19207d997676cd2", - "sha256": "0fsndh8nwpmnbv505r26cxxgxx8wlvx9h8pgb95im6q6pj2g7p9x" + "commit": "878b02be15ea9aebe939189fd10598b057b739af", + "sha256": "18g1jid2z6gls4ijgz3k8b5gaij3fs5rwrn0i8bgly6jmk6nx8rp" }, "stable": { "version": [ @@ -52439,11 +52925,11 @@ "repo": "Emacs-Kotlin-Mode-Maintainers/kotlin-mode", "unstable": { "version": [ - 20190116, - 2055 + 20190917, + 1807 ], - "commit": "0e542ae2f78420618df8b0123dfe168a37dce333", - "sha256": "1rv3vxw3dx477sapfd0hj3pkl3x0sihdsyl671azbcr02z67xl6p" + "commit": "d6720fe9bc2ce447f213c470bd18fad8e04dc18b", + "sha256": "093yirwm3w0z2x0f07kggivkvgcaqhkar0fqbfagd9nly2f0jzr2" } }, { @@ -52695,8 +53181,8 @@ 20190320, 1827 ], - "commit": "d32477943ff6a2ea158c560a7b0c67537432bc2b", - "sha256": "1mlpdma7s4q54k54740q7r0ykkhkr3avxq8h5zmirc3lib7rrxv0" + "commit": "17a21954725eae3bf7b77f724d7783936eb33742", + "sha256": "0q1j5h4nxpckfd5apwl4iqhgdnjpy2fjf9kqfknyiz7c7h7424d0" } }, { @@ -53127,20 +53613,20 @@ "repo": "conao3/leaf.el", "unstable": { "version": [ - 20190828, - 1538 + 20190917, + 1451 ], - "commit": "daa8b5194f5a05b74a9eb46f6787f46ddfe5778d", - "sha256": "05f9vdbk31jpqpc5afnwpnzwaswmlrvz9cr09ncrbjwcap06705i" + "commit": "31df91362e8e14e51ba3c16ea17d914e7c3986e1", + "sha256": "1zl6qkn6cd5f85d7w03w3az7s7dmz0jp3g6w1pwwhdf76dcw3lhx" }, "stable": { "version": [ 3, - 3, + 5, 0 ], - "commit": "cecaaed04bd0f756b3ac98922768d61229ed2322", - "sha256": "1d70dfqlr5j2d5ns16dbdibhyfm6ss0khcj7hang3rhyiyrhpkra" + "commit": "c8ca1ecc892229dc16019fe3a7eb98a7307e746f", + "sha256": "1rgd59146wad92yc64las0qgx67k2ifgsw1vwhp40xvkd7kb0r6d" } }, { @@ -53151,14 +53637,14 @@ "repo": "conao3/leaf-keywords.el", "unstable": { "version": [ - 20190816, - 1859 + 20190911, + 1658 ], "deps": [ "leaf" ], - "commit": "c314c8295973f75034f0dc2946b18087d3408e66", - "sha256": "114g469016pjar5wmr126cpd6cfiliz4w0lmw1rlmafc53h3wbr7" + "commit": "29cae76ea7817fe3719f4ebf6751cf434567e4d0", + "sha256": "0qsmixhn7jjlzxnxjs77nmyzqh6q0q9ssgjj7gnp3i4llv2jlj3y" }, "stable": { "version": [ @@ -53178,8 +53664,8 @@ "repo": "leanprover/lean-mode", "unstable": { "version": [ - 20180906, - 1645 + 20190914, + 958 ], "deps": [ "dash", @@ -53188,8 +53674,8 @@ "flycheck", "s" ], - "commit": "9d6b8471e2044310b4cd7cd3213b1fc8f78ec499", - "sha256": "0r8vfklrdw3f11cpk279jg3mnfbqm60m6klisqndkvir7vsrshni" + "commit": "b5ba739f68ef731c03247bf6db2708502c8ac46c", + "sha256": "1dx0a76l7w3ck23sdjymigk1hycqiawfwv24yz6wqyy74f1pcyjf" } }, { @@ -53270,11 +53756,11 @@ "repo": "ledger/ledger-mode", "unstable": { "version": [ - 20190811, - 2340 + 20190925, + 1300 ], - "commit": "0114525803860b18a34624339825219bb6b8943e", - "sha256": "04di2f51i0gqvwj8x2wn1f85a4iyg6gf8hkig4z244j8jv489v6d" + "commit": "129dfbab2f744c8d6b6bcd406001ff527c262aff", + "sha256": "09xq34q4zb6xq85nvp2aj56h96h8b3vy56ijn6i5zwrhlwwyj32i" }, "stable": { "version": [ @@ -53309,16 +53795,17 @@ "repo": "kaiwk/leetcode.el", "unstable": { "version": [ - 20190827, - 1032 + 20190924, + 353 ], "deps": [ + "aio", + "dash", "graphql", - "request-deferred", "spinner" ], - "commit": "2b2f44bbd46d3c8db23473833824a237073f6c23", - "sha256": "1bcknygmz1ay2j90cs6rmiax5gsdwrysvv2w13cmz601bv3prrgf" + "commit": "296a9dfba4f0cd55e27e5eea8a678d7084cff270", + "sha256": "0xcipajyii5l6lk4s30i7ninp08spq4vlg0smjp9rrcdilyfpnbn" } }, { @@ -53492,11 +53979,11 @@ "repo": "fniessen/emacs-leuven-theme", "unstable": { "version": [ - 20190829, - 921 + 20190831, + 1008 ], - "commit": "69ab5c2db93cf58a57354a5d78e825d191109717", - "sha256": "1bsshad7y9yicbzp2fp53jv4kkli1slkyw7b15db4bgzj8br55s5" + "commit": "026da5d614864a60bb151f0e75240a938e41923b", + "sha256": "008ynbzcszsbyj3pi9cm6ig1ks059xprkyhd74dnw8grlddwfimd" } }, { @@ -53540,8 +54027,8 @@ 20170121, 1254 ], - "commit": "9d15bc75a34052f7f2749bd38b3d0297ed60b29a", - "sha256": "07ysaihl24fiqz8n6hvdvaj53nyalk68dsn073zb8q88sdmzf33w" + "commit": "a6c9922f31f59686bb48db1b8d5b75e74e79757a", + "sha256": "0wvk341hx0fsv4hihlr508grqzgzza0w3gfqh4c1f88mdpmm62if" }, "stable": { "version": [ @@ -53553,6 +54040,36 @@ } }, { + "ename": "libbcel", + "commit": "31f4cbd89473f48ad6b4cc78028e8c51f1ee95a7", + "sha256": "03sfd2af54cm53hh8k3d0b9jy7cj4f1hgd93wqvqi7bbcz91krg2", + "fetcher": "github", + "repo": "DamienCassou/libbcel", + "unstable": { + "version": [ + 20190919, + 1948 + ], + "deps": [ + "request" + ], + "commit": "f3eab975b7222eb4441743744eb8697bd82b57ec", + "sha256": "1sj2ijphaabkayiry0vzx0digrz5dkacl78agrv0lz51m8r5c4fd" + }, + "stable": { + "version": [ + 0, + 3, + 0 + ], + "deps": [ + "request" + ], + "commit": "f3eab975b7222eb4441743744eb8697bd82b57ec", + "sha256": "1sj2ijphaabkayiry0vzx0digrz5dkacl78agrv0lz51m8r5c4fd" + } + }, + { "ename": "libelcouch", "commit": "209d5c507cfe42b152c21a4534c3ba549186420f", "sha256": "1zfjyfyjd59z0ns32v2b0r5g9ypjxrlmkx3djmxsmzd4an8ciq3p", @@ -53620,20 +54137,20 @@ "repo": "mpdel/libmpdel", "unstable": { "version": [ - 20190827, - 1905 + 20190918, + 1609 ], - "commit": "5045f33e270b07ba98ea876e9a31f1acdedc6cd9", - "sha256": "0l29q4f0qdkfadr0w7dz4cmv9psnpmf1vwqh1wzavp2g3jf038ln" + "commit": "5cec415bd9db566088ec44b8bb4dd0a9cc76ccdc", + "sha256": "0qx7h6y9ih6qkijspzpn8gfpxjb486qrp0g4b9fpfzp8igc2ddik" }, "stable": { "version": [ 1, 1, - 0 + 1 ], - "commit": "5045f33e270b07ba98ea876e9a31f1acdedc6cd9", - "sha256": "0l29q4f0qdkfadr0w7dz4cmv9psnpmf1vwqh1wzavp2g3jf038ln" + "commit": "5cec415bd9db566088ec44b8bb4dd0a9cc76ccdc", + "sha256": "0qx7h6y9ih6qkijspzpn8gfpxjb486qrp0g4b9fpfzp8igc2ddik" } }, { @@ -53972,8 +54489,8 @@ "repo": "abo-abo/lispy", "unstable": { "version": [ - 20190827, - 1516 + 20190925, + 1020 ], "deps": [ "ace-window", @@ -53982,8 +54499,8 @@ "iedit", "zoutline" ], - "commit": "7130b9d36f6d7eaed61e911772ba23e0c36659b3", - "sha256": "1swihyr4ir3a74kl8vppbl8s4yf3mwrvrjrpdfgvva0jys03bhsx" + "commit": "17cfa867ae81d2024a242b17d7b61f5840c22ec0", + "sha256": "1l13yja6s6jnsc00bv5axyfgwl6a5lvhmjjhm44fwi4rpjfl0rj4" }, "stable": { "version": [ @@ -54042,8 +54559,8 @@ "evil", "lispy" ], - "commit": "e5e6cddb2cff93ee19f34d5dde8f46d010a90dad", - "sha256": "1v07s2l3pww30rsmq4dp4nxwmkz7cvdgfbjsyfxkny4i87v5figz" + "commit": "56198f1c4488a52a0d0512c717dff36e8b9fbfd0", + "sha256": "1zrhn5pgjvwprwnsr85zs4rhs7mijyq3wbd5s0ff96m9n1dbj6vp" } }, { @@ -54271,14 +54788,14 @@ "repo": "jingtaozf/literate-elisp", "unstable": { "version": [ - 20190804, - 602 + 20190924, + 526 ], "deps": [ "cl-lib" ], - "commit": "1dd1aad8c4049423d1a7980191c25b4120681296", - "sha256": "07gp0l2y7ysl13n368jaqnj52fpqcirj0faz95rrzrysq9ap8xn8" + "commit": "039b94b08ff750fc5b8a5b0e051eec288627c545", + "sha256": "124m56rb2878gmlygcqpyyi18i3kn9xmpw72q6bjizjmakcpl30p" }, "stable": { "version": [ @@ -54974,8 +55491,8 @@ "repo": "emacs-lsp/lsp-java", "unstable": { "version": [ - 20190817, - 1436 + 20190918, + 1601 ], "deps": [ "dash", @@ -54986,8 +55503,8 @@ "markdown-mode", "request" ], - "commit": "ccc40d3249c031e34fec13d4b82da694addb0274", - "sha256": "1nb40nnj7caz2mvfwnpwnicck1ippvnqhypqcglp6bvvz75h32z9" + "commit": "df3cfc30eaa9d7605ac3db5d17d8a02efaf50527", + "sha256": "0whybqasbi09ki9714k139vm0hmzvxrn0r20ibk8rfj6lxprkwl5" }, "stable": { "version": [ @@ -55034,8 +55551,8 @@ "repo": "emacs-lsp/lsp-mode", "unstable": { "version": [ - 20190828, - 1641 + 20190926, + 514 ], "deps": [ "dash", @@ -55045,8 +55562,8 @@ "markdown-mode", "spinner" ], - "commit": "4835feb8189fab4b00ba54ba73837c931022931d", - "sha256": "0f859fhy245aq6r0w4ibyaqjr1i4s1f850w4867f9knfw67zj64h" + "commit": "0546d33e345c63265a6df812f2713e62dbe6a7ad", + "sha256": "1rp8abwx2pbm4zmsy13hkvhvxgpz876dnlfvxijvxchnf0dxwba4" }, "stable": { "version": [ @@ -55139,8 +55656,8 @@ "repo": "emacs-lsp/lsp-python-ms", "unstable": { "version": [ - 20190826, - 1758 + 20190911, + 1324 ], "deps": [ "cl-lib", @@ -55148,8 +55665,8 @@ "lsp-mode", "python" ], - "commit": "d2f9bddc3988a43e680b858e9da44f7b0a0eae55", - "sha256": "0hmmv8rjg89bgkhsf2wcllmz3rljhnnncg00wsiz6fiwh0dw8lpp" + "commit": "42222bacf09c4ca18302ac39d50ea09d196e2816", + "sha256": "09a8kjc47v5qcrd4p0b911idbhh760xdir2bgkn3gm2w5l4krfyj" } }, { @@ -55197,8 +55714,8 @@ "repo": "emacs-lsp/lsp-treemacs", "unstable": { "version": [ - 20190829, - 2110 + 20190924, + 1757 ], "deps": [ "dash", @@ -55208,8 +55725,8 @@ "lsp-mode", "treemacs" ], - "commit": "3adf416da2fcd7dd4eac33f87c3eff66d5b67624", - "sha256": "0dqa7ny01v7k16pjrb42393blccvck650803hbsf1bp40ainaks9" + "commit": "76c304df80256bb3314b177af3db27cf2f527b87", + "sha256": "0dai66jmpisf0h2qaiq32mzdzmnlzh5k2fi00wzg3l25vj13vvdr" } }, { @@ -55220,8 +55737,8 @@ "repo": "emacs-lsp/lsp-ui", "unstable": { "version": [ - 20190823, - 541 + 20190915, + 856 ], "deps": [ "dash", @@ -55229,8 +55746,8 @@ "lsp-mode", "markdown-mode" ], - "commit": "845fbd40f20d63b9eff592ddefeefd2263f6b27c", - "sha256": "0z8cds09wv275ckx13dbw6z84lfldij2lfx0az7cj1hkfsrwhxd4" + "commit": "c8fa40c0f9c65877d1cabe1739e5f787adb24898", + "sha256": "040qzkd1zvyb0q3yxs2vd4f3qp37c8anr3zcmx96bjvj1v7pmpmn" }, "stable": { "version": [ @@ -55648,11 +56165,11 @@ "repo": "roadrunner1776/magik", "unstable": { "version": [ - 20190730, - 1911 + 20190922, + 1727 ], - "commit": "e7e32dc29382e1a59bb8963315d70fcc30473d6e", - "sha256": "1nhmd94x3h047r08wnl7nlrx0g6d17zwnj0km0gxlli9m61qwczs" + "commit": "e66f288844bbd4035a18da9444b2dc163faa8ed8", + "sha256": "1dpxihdq6ssqkgj2i6v1zcnk7hkpmk5fjvlwki7jamqlizzvy9is" } }, { @@ -55663,8 +56180,8 @@ "repo": "magit/magit", "unstable": { "version": [ - 20190825, - 1416 + 20190924, + 2040 ], "deps": [ "async", @@ -55673,8 +56190,8 @@ "transient", "with-editor" ], - "commit": "bcd161d8ad3fcd80cbf69e7720c1d75a79415021", - "sha256": "06nxrnln7cas9sk0g7k88r9z2zbvm32ki3mab1yn9w3abgralfyc" + "commit": "f788dd7f4730316378b8a222aa5d6b6f1efce94e", + "sha256": "1v2ml8nk7fkaapdcm88098wcc2mcgi0d3mil5dd57vhqmrn7d23z" }, "stable": { "version": [ @@ -55962,15 +56479,28 @@ "repo": "Ailrun/magit-lfs", "unstable": { "version": [ - 20190504, - 1909 + 20190831, + 118 + ], + "deps": [ + "dash", + "magit" + ], + "commit": "75bf6d3310eae24889589a09e96a4a855e1a11c4", + "sha256": "0dy2p6wyp5xqx4jnh1sf3v47dv09k7vv3c9mhjapcr1jpbpqj87w" + }, + "stable": { + "version": [ + 0, + 4, + 0 ], "deps": [ "dash", "magit" ], - "commit": "5ff5648158413aec01ba178f349c33862e6e140a", - "sha256": "1g1hawsmx2j69n25n2ip1lb8x3lshcyrn7f5w83dw56i5ywmyr0v" + "commit": "75bf6d3310eae24889589a09e96a4a855e1a11c4", + "sha256": "0dy2p6wyp5xqx4jnh1sf3v47dv09k7vv3c9mhjapcr1jpbpqj87w" } }, { @@ -55988,8 +56518,8 @@ "libgit", "magit" ], - "commit": "bcd161d8ad3fcd80cbf69e7720c1d75a79415021", - "sha256": "06nxrnln7cas9sk0g7k88r9z2zbvm32ki3mab1yn9w3abgralfyc" + "commit": "f788dd7f4730316378b8a222aa5d6b6f1efce94e", + "sha256": "1v2ml8nk7fkaapdcm88098wcc2mcgi0d3mil5dd57vhqmrn7d23z" } }, { @@ -56175,14 +56705,14 @@ "repo": "magit/magit-tbdiff", "unstable": { "version": [ - 20190808, - 1639 + 20190918, + 6 ], "deps": [ "magit" ], - "commit": "49faa9b94c338c0d5aa064f41b3acd50e5943421", - "sha256": "0wznf26l8hvdp8p6nbvwbwg2v33yrms72nsw0gvyvnn5mqiw4v7b" + "commit": "2b08d93c5ead14f34f9cc3c3140ecf25b1531151", + "sha256": "1h5lnns6adpyah2i1k8fznbq4qf43sf64a4vp8s5h67q2ajlf52j" }, "stable": { "version": [ @@ -56205,8 +56735,8 @@ "repo": "alphapapa/magit-todos", "unstable": { "version": [ - 20190805, - 552 + 20190907, + 1321 ], "deps": [ "async", @@ -56217,13 +56747,14 @@ "pcre2el", "s" ], - "commit": "8a88171b2785acce59081d8b12649731e6cf20c0", - "sha256": "09pjb4k409gc0h51vb5az1shx02c1hx8cnvhi529n7dm4maildg5" + "commit": "a80dace2bf8bf3e697e3e8421189996adcecc900", + "sha256": "0qwzag9js6qy98m7c8gmaskg4qc82sf0aihcs5vcxdf8rgia2j9q" }, "stable": { "version": [ 1, - 4 + 4, + 1 ], "deps": [ "async", @@ -56234,8 +56765,8 @@ "pcre2el", "s" ], - "commit": "8a88171b2785acce59081d8b12649731e6cf20c0", - "sha256": "09pjb4k409gc0h51vb5az1shx02c1hx8cnvhi529n7dm4maildg5" + "commit": "8557cf36260743674e7c3ecdb3038dca5106416b", + "sha256": "1rcl6j53yabxqk3jzgaxvm3wqq7rayf1hdib2v2fapw5b0layym6" } }, { @@ -57369,26 +57900,26 @@ "repo": "dochang/mb-url", "unstable": { "version": [ - 20181225, - 1724 + 20190921, + 2101 ], "deps": [ "cl-lib" ], - "commit": "23078f2e59808890268401f294d860ba51bc71d9", - "sha256": "07b9w9vd22ma4s3qhplmg84sylihz920byyi9qa7dwj7b59d4avf" + "commit": "d0165204f8c1195bbf77b615f9cefaa327973639", + "sha256": "08qj938b6fd97bxkc3fcrx0fa1d72vxxawa2z6g207cfv0b3i6im" }, "stable": { "version": [ 0, - 4, + 5, 0 ], "deps": [ "cl-lib" ], - "commit": "23078f2e59808890268401f294d860ba51bc71d9", - "sha256": "07b9w9vd22ma4s3qhplmg84sylihz920byyi9qa7dwj7b59d4avf" + "commit": "d0165204f8c1195bbf77b615f9cefaa327973639", + "sha256": "08qj938b6fd97bxkc3fcrx0fa1d72vxxawa2z6g207cfv0b3i6im" } }, { @@ -57679,11 +58210,11 @@ "repo": "skeeto/emacs-memoize", "unstable": { "version": [ - 20180614, - 1930 + 20190915, + 37 ], - "commit": "9a561268ffb550b257a08710489a95cd087998b6", - "sha256": "1hsw7pjdy3mksg343v400068b6x7s45gzg0l74h5i4nq8bacv8km" + "commit": "8c1e5569550e783dd7814735e22c935416c4462d", + "sha256": "1pa9f8ydkabbxx5szgmvl4mn85pk2bw878z81vlfwbcz4nv8fr1h" }, "stable": { "version": [ @@ -57757,11 +58288,11 @@ "repo": "ocaml/merlin", "unstable": { "version": [ - 20190718, - 1023 + 20190922, + 655 ], - "commit": "a2fff37a09159ce94a3229ce137bb4e6e552339f", - "sha256": "12786wl1zmhdj5kkvfm9zv02j0lnrja18yrbc286v33xa77lpiwc" + "commit": "b090fe2b058206566505287599116e32f6c373b7", + "sha256": "0l0bh14hwff75awjpivpar8b4zkbpf04crd212vivda1szrgy674" }, "stable": { "version": [ @@ -58006,8 +58537,8 @@ 20190324, 1908 ], - "commit": "b79e48dd775de3e1a08e445953243f1491e244cf", - "sha256": "0b4kmm09c70jsidrvpla99p9sy9n2d3x628fxrd2z0l6rfwpcyrj" + "commit": "89bdafacb8d7c65a0e4bbd2697b30d281e2b70ae", + "sha256": "0zlh241358p5jhmbdk9ias21jzrwxf7icn57ndx9714xvsxqzp3z" }, "stable": { "version": [ @@ -58210,14 +58741,14 @@ "repo": "kiennq/emacs-mini-modeline", "unstable": { "version": [ - 20190824, - 1308 + 20190925, + 57 ], "deps": [ "dash" ], - "commit": "d0ed5f1ac1ff5cdb1db5fb2a99f2a09b9bc6f089", - "sha256": "0i1b220b5kb0h0yhn5s3dgnlvf6r9hd0iazh9nqbnw28n92gvp01" + "commit": "cee757ee72b9cf73fe87b5c472ac1edd823cd58a", + "sha256": "1pymxq18zijlvlwbf02bdk748g70zbxhf58c14sb2gbxy8p1j6hr" } }, { @@ -58353,14 +58884,14 @@ "repo": "tarsius/minions", "unstable": { "version": [ - 20181030, - 2101 + 20190918, + 2048 ], "deps": [ "dash" ], - "commit": "62f1d60a0852b4f83f64e6fc4c199eea967a34f7", - "sha256": "0q8py0v06sq9yy7f3w6m45q3nflnd3vppf3i53s0xib3izxl2vca" + "commit": "ca6a3e77ddbd19cdf363ea71ba357096395a5de5", + "sha256": "16rplpbfy3dnvqqgavk9jb1f1ihr5875zlixd4zxb1pqxs3jkgw3" }, "stable": { "version": [ @@ -59033,11 +59564,11 @@ "repo": "belak/emacs-monokai-pro-theme", "unstable": { "version": [ - 20190425, - 2303 + 20190924, + 2152 ], - "commit": "747556c0cb38993c83ea8b6665869f42249d885a", - "sha256": "1xfc3v1bwxpn3j42h6b1vy6knjrlmskq95c9vgdlia9ffz5pg7r3" + "commit": "b5dcc197cf36b181362b468da48b67a5f2199cae", + "sha256": "1shpaglvwdhybpkfmigz8vvw5500kybl5mri05h8sfn3b8331kfc" } }, { @@ -59087,11 +59618,11 @@ "repo": "sanel/monroe", "unstable": { "version": [ - 20190109, - 1347 + 20190912, + 1624 ], - "commit": "2f472fdc09c1b36c291ddb5ed9aecc331fd7e082", - "sha256": "1g9v7z2bk2vcknpff31y9pf6cw8xrb5hxsh8cjci7i5w2abp7qbj" + "commit": "508f5ed0f88b0b5e01a37d456186ea437f44d93c", + "sha256": "01dwnb7f6c49q8vr3qb9m5h1wh9h119axxalqa71wahi1ygrcydc" }, "stable": { "version": [ @@ -59111,11 +59642,11 @@ "repo": "jessieh/mood-line", "unstable": { "version": [ - 20190606, - 1046 + 20190911, + 2023 ], - "commit": "3560d8aafd8c856a218ff8fab5a30e1aa0db25b6", - "sha256": "08qh8x0gd7byvfp03jpkd95h70djh8vrwpm451932zwf66j7fnay" + "commit": "29ba63795911bdd535d569f0cc4e9d18cc3ac8e4", + "sha256": "0sp6cgpqrab1cgqy4vhgdfavmfz73h57aw0fxvywf348kxbqf28s" }, "stable": { "version": [ @@ -59135,11 +59666,11 @@ "repo": "jessieh/mood-one-theme", "unstable": { "version": [ - 20190606, - 1111 + 20190911, + 2031 ], - "commit": "47fc825547664c3e3eb8f47f1a9cf74b23efc2c6", - "sha256": "17zz3nc3r2cm4w99frzqxnh768vnmzs71p9zz9bj03wc222n1kv6" + "commit": "2f044f7b1f68d450fd4c3c67209c353401621277", + "sha256": "10x1a9r537qd80rzhhp99mxx08fp8gpd8knrbb0565iqi3czk1rz" }, "stable": { "version": [ @@ -59159,11 +59690,11 @@ "repo": "tarsius/moody", "unstable": { "version": [ - 20190203, - 1747 + 20190831, + 1058 ], - "commit": "58af7973742bf381f5980413dfb21bf5f21b44f8", - "sha256": "11kahx0gzchmn3yh5n0cms58cmsbrhd2kj380qcnlqv390cknqvy" + "commit": "ac17d739075a571a086756fcaed482814888bf5c", + "sha256": "1yisg83khzfmdyqp450kfqgsy76wglb003j1bsann0z0xkw5pla3" }, "stable": { "version": [ @@ -59585,15 +60116,15 @@ "repo": "mpdel/mpdel", "unstable": { "version": [ - 20190827, - 1854 + 20190911, + 632 ], "deps": [ "libmpdel", "navigel" ], - "commit": "a16ff55e93109c37a204cde9a29699eb0b1d8e6f", - "sha256": "01kvgs4z4ppif339l8dq74ipjjyl8rdh0k03xy7zdivdna3mf06i" + "commit": "e09904bf31ed465ea93ef2c165e8a6f705229f57", + "sha256": "159nb9ws800d5lx5plh8y0mmjl1y6spwhaxm9f5kxs6psa89mckj" }, "stable": { "version": [ @@ -60199,16 +60730,16 @@ "repo": "Wilfred/mustache.el", "unstable": { "version": [ - 20170923, - 1233 + 20190905, + 2214 ], "deps": [ "dash", "ht", "s" ], - "commit": "5e39654b933a18131146a0f3b3e3dc55c5058124", - "sha256": "0ilsdrvqy9zn0yb1c8zh1zidag32rfb9xhm43qpfcg6n5w6c7r82" + "commit": "6443e1563ddf4eee2236ca1bb1fe87ddfde4b2bb", + "sha256": "0wbmknx4pjgfw6y1482a3y1fxv054r0k2qj3qzc47xrkdsjw47y8" }, "stable": { "version": [ @@ -61492,11 +62023,11 @@ "repo": "m-cat/nimbus-theme", "unstable": { "version": [ - 20190815, - 1740 + 20190909, + 1313 ], - "commit": "d2e627024ab7ce608b5203d4084c6a1588621545", - "sha256": "12zdk161d18f1yl6linx2g4fw1p4x68n5fbikkklw0ssqj0liqy2" + "commit": "188af947416961b3ed86a7ac026952c8e530245d", + "sha256": "1bswdaxvx0f36zh9f8q343a8mr27g53jw5dxqpwk6x9ad7jiia83" } }, { @@ -61510,8 +62041,8 @@ 20181024, 1439 ], - "commit": "61f90e918b608413daf07ffcb5c5c0930416951a", - "sha256": "1wsq7ap7yn5lvvb52ggzh7qk8wr8s4lfiip9v2qp73q25mlqnxww" + "commit": "21bd971ea9381e6c36d3a3be17a501899922ff73", + "sha256": "1vahangjygyx9y6blwml55l7anb74fa9malll7jirz9lxcah1mnv" }, "stable": { "version": [ @@ -61594,11 +62125,11 @@ "repo": "NixOS/nix-mode", "unstable": { "version": [ - 20190703, - 526 + 20190904, + 1440 ], - "commit": "ddf091708b9069f1fe0979a7be4e719445eed918", - "sha256": "0s8ljr4d7kys2xqrhkvj75l7babvk60kxgy4vmyqfwj6xmcxi3ad" + "commit": "5b5961780f3b1c1b62453d2087f775298980f10d", + "sha256": "0lyf9vp6sivy321z8l8a2yf99kj5g15p6ly3f8gkyaf6dcq3jgnc" }, "stable": { "version": [ @@ -61742,6 +62273,27 @@ } }, { + "ename": "nnhackernews", + "commit": "40fec106c676f8207ec9c4553c3ec16c626b098c", + "sha256": "0nqbfzyb61a80900hg2sqimjvr765a3f94v07by55d1smifzwnff", + "fetcher": "github", + "repo": "dickmao/nnhackernews", + "unstable": { + "version": [ + 20190925, + 1239 + ], + "deps": [ + "anaphora", + "dash", + "dash-functional", + "request" + ], + "commit": "2765b153a0a73b328d2a3a9ea3e3f5fbe6c2fd28", + "sha256": "1gip213471ni9yy0arvf7sii31a20q81mddmknlpmmvsx7raz6n8" + } + }, + { "ename": "nnir-est", "commit": "ca17de8cdd53bb32a9d3faaeb38f19f92b18ee38", "sha256": "04ih47pipph8sl84nv6ka4xlpd8vhnpwhs5cchgk5k1zv3l5scxv", @@ -61764,8 +62316,8 @@ "repo": "dickmao/nnreddit", "unstable": { "version": [ - 20190819, - 2331 + 20190925, + 1300 ], "deps": [ "anaphora", @@ -61774,8 +62326,8 @@ "request", "virtualenvwrapper" ], - "commit": "c16a75a6fd99f5c47f10b349131be1c3d85bbe9b", - "sha256": "0gabznnvg9gxd6rrvcik2iyrlmpl409vc5k37c3vfjrnjqnwk6ra" + "commit": "5081e2ab08a44a117a6d30cc046a972d37776d98", + "sha256": "1wjigf1w9nzm6lwf77v4d7myplci4456fd662lj5y8raxx6ygxgd" } }, { @@ -62114,8 +62666,8 @@ 20190525, 1602 ], - "commit": "e13862f127394fd4addc5d2cf604b3af399c8377", - "sha256": "0w2jzv378bkkvwb6k7i6sfpis6hf8zpgwx8m2sa44ry3hixqmbgw" + "commit": "74a1b5ac65b31f7ebc1258b259b8c355023e21b4", + "sha256": "0gbfwh9sccykb84mrckz8lyk2h76p4g2di4j0jkhjf4lzy5q414r" }, "stable": { "version": [ @@ -62500,8 +63052,8 @@ "repo": "rejeep/nvm.el", "unstable": { "version": [ - 20190601, - 813 + 20190912, + 626 ], "deps": [ "dash", @@ -62509,13 +63061,13 @@ "f", "s" ], - "commit": "4aeb672d543ce2372dcca289719092aa4c38a6cd", - "sha256": "0phillz5dxpvhsi9rlah4988ksx2rcgagfw5iqf5lmfn7kp4604p" + "commit": "e93e5216e311c665c593ac68c5456d624120ea42", + "sha256": "11fa9g05gsh2yjvhy1xjc6hkby5z98mb2bmbshdp89fvlsdksv3i" }, "stable": { "version": [ 0, - 2, + 3, 0 ], "deps": [ @@ -62524,8 +63076,8 @@ "f", "s" ], - "commit": "d18b13e8275a57ee6c55dc71b671f02a8e6522ad", - "sha256": "1624jj922l0bbav1v8szdr0lpyx0ng959fg3sspg1j15kgkir8kf" + "commit": "e93e5216e311c665c593ac68c5456d624120ea42", + "sha256": "11fa9g05gsh2yjvhy1xjc6hkby5z98mb2bmbshdp89fvlsdksv3i" } }, { @@ -62663,16 +63215,16 @@ "repo": "astahlman/ob-async", "unstable": { "version": [ - 20190220, - 710 + 20190916, + 1537 ], "deps": [ "async", "dash", "org" ], - "commit": "73e57a9297849bb50336799ae7858777b6b386ee", - "sha256": "1g2agc6qwklg5cxfgm28fc5swlw54sn66lqk7q0hjn1gdq9rdqdm" + "commit": "80a30b96a007d419ece12c976a81804ede340311", + "sha256": "0jhgzmqds73yc49hc4yarp1a25pci9qmsvnpcxd7kv5saha40hnn" }, "stable": { "version": [ @@ -62756,11 +63308,11 @@ "repo": "nickanderson/ob-cfengine3", "unstable": { "version": [ - 20190520, - 1929 + 20190908, + 1801 ], - "commit": "4d4cd53ceaf8a756f48c02cb2e10476f3cda37c4", - "sha256": "0gmgx4ynbk6fvahaglj9m1gpz8d3b038zag4m7g7pmz0xv5s4p1w" + "commit": "d16fd0f1585d5f64dfae76498d43c764d81fc3f8", + "sha256": "1xv07hc2fcp9kvzmy5vdjwb6iq5mkj5vpxsnik0m68vcb2jnllbi" } }, { @@ -63313,6 +63865,30 @@ } }, { + "ename": "ob-svgbob", + "commit": "77b7095d93730bfa193245df358fa50bef4faea6", + "sha256": "0746f70yswgqcx8awc7lfkh6r5982frlwirdij2pjb9ivw3a82h9", + "fetcher": "github", + "repo": "mgxm/ob-svgbob", + "unstable": { + "version": [ + 20190911, + 300 + ], + "commit": "5747f96fb4fdb8711546b3313df9412177eb3c1a", + "sha256": "1h60mzxp1wzd1kjkgligi04nb06mpkhij8imkva188inr0hzqlvm" + }, + "stable": { + "version": [ + 0, + 0, + 1 + ], + "commit": "9a930b1ed93e5ce1818029b2ec9e7662c098dbf4", + "sha256": "18c35xpllwv1zflinkh3ki00vclp4nk52sanfl2vppq6a6hyda8a" + } + }, + { "ename": "ob-swift", "commit": "b401383966398d3223032c59baa920ce594e5fef", "sha256": "19mcjfmijbajldm3jz8ij1x2p7d164mbq2ln6yb6iihxmdqnn2q4", @@ -63402,14 +63978,14 @@ "repo": "lurdan/ob-typescript", "unstable": { "version": [ - 20150804, - 1230 + 20190910, + 946 ], "deps": [ "org" ], - "commit": "9dcbd226cbfb75e790dd9de91d9401dde85a889a", - "sha256": "1ycqdjqn5361pcnc95hxhjqd3y96cjjnaylrnzwhmacl38jm3vai" + "commit": "0b2766b9d136cd6d81f4c15f1ad4b28542f484b9", + "sha256": "0crz6k41bva53x3qhvvzzdlml4v18f43fja8nkrlgwpn103d0x9h" } }, { @@ -63641,17 +64217,17 @@ 20190726, 1452 ], - "commit": "bdd84a71da8eac87447e35b55782ec07f0d2aead", - "sha256": "0cvfzz1i3lh9q5fl26sp98cqpv3mqjxlzlflv8hc3cdr8ascjm4g" + "commit": "3ce84f2d009833883f908669a89a99c5274d01c3", + "sha256": "0hx7bfvqh5amsvsxx4qf6575k87n3xfj558a06sbrg0fnvg2vh1i" }, "stable": { "version": [ 1, - 7, - 0 + 8, + 1 ], - "commit": "6e6ff005fc1692489fa80767a23bc381ebc987e1", - "sha256": "006x3fsd61vxnxj4chlakyk3b2s10pb0bdl46g0ghf3j8h33x7hc" + "commit": "3ce84f2d009833883f908669a89a99c5274d01c3", + "sha256": "0hx7bfvqh5amsvsxx4qf6575k87n3xfj558a06sbrg0fnvg2vh1i" } }, { @@ -63721,14 +64297,14 @@ "repo": "oer/oer-reveal", "unstable": { "version": [ - 20190826, - 718 + 20190916, + 657 ], "deps": [ "org-re-reveal" ], - "commit": "f62fe1497be473d776d22094a02cfff381c61cfc", - "sha256": "088khyvflg4akdszkpalv2j49g25g10b0xzrjji2h2lgb1w5dg1m" + "commit": "b30cf2b16b4987152df8355beab8b8fdcbc22c1f", + "sha256": "1m6b5cg5rkimp03w1zgxfh2yycifyj89a5rripr2bic1wp6bifzw" } }, { @@ -63784,6 +64360,30 @@ } }, { + "ename": "olivetti", + "commit": "10292536096e698f37e6ad81a4d5b6204beeb7cb", + "sha256": "0fkvw2y8r4ww2ar9505xls44j0rcrxc884p5srf1q47011v69mhd", + "fetcher": "github", + "repo": "rnkn/olivetti", + "unstable": { + "version": [ + 20190923, + 840 + ], + "commit": "c7784fe2dccf676310a9a602b6eedc2a7b667499", + "sha256": "1fbj9s49y5yx5i429awv9rybacfgvhwp7v5h0zw67bpgx4qs44pa" + }, + "stable": { + "version": [ + 1, + 8, + 1 + ], + "commit": "c7784fe2dccf676310a9a602b6eedc2a7b667499", + "sha256": "1fbj9s49y5yx5i429awv9rybacfgvhwp7v5h0zw67bpgx4qs44pa" + } + }, + { "ename": "om-mode", "commit": "855ea20024b606314f8590129259747cac0bcc97", "sha256": "0bnlnxmzch9j39l8sf85npi89xlnkcnkmy4fihmwhrm86mnmayrb", @@ -63977,8 +64577,8 @@ "repo": "OmniSharp/omnisharp-emacs", "unstable": { "version": [ - 20190809, - 341 + 20190915, + 1000 ], "deps": [ "auto-complete", @@ -63990,8 +64590,8 @@ "popup", "s" ], - "commit": "b5afa053c8d3771d5567538bae89a03cc66e826c", - "sha256": "0vhjfig0yx2ihqbq9ah6w7vs84lbnn5zlkjlda63kfs5cwwi43vp" + "commit": "c1dab2beae4b1e67f20f3e90cddeba81bd236fe5", + "sha256": "1pm8pv3iccpmyg0bs19d28g56gwfbkkp6d4i1qyxkf371d9w7r3w" }, "stable": { "version": [ @@ -64317,11 +64917,11 @@ "repo": "abo-abo/orca", "unstable": { "version": [ - 20190701, - 1127 + 20190925, + 915 ], - "commit": "b07b69ba0052a0dd4ef59a20ec0e54f3c8cf137e", - "sha256": "12ahmqqvnl1vaf8qc4smsk6727bzmv3qja79kb00g3yf4k1r0nhk" + "commit": "68c9dbe235b1f97f12ff0f82878bb9e0ac971b1f", + "sha256": "0k5xsz0mlg4yhra80pixj10zl8dmy78r68hhd5q24dwqg6yic7f0" } }, { @@ -64454,20 +65054,20 @@ "repo": "rksm/clj-org-analyzer", "unstable": { "version": [ - 20190827, - 2211 + 20190914, + 2215 ], - "commit": "e55960609c1ccd5feda307e28e72eac1f07e8e28", - "sha256": "0y1x04046gifmky3i46i23anr6q2f7ynj7lxp18v2iah3ri99v8f" + "commit": "576e1fda552af0da4e64070e2b26303a913f17a9", + "sha256": "194vk80d2mzfb0fpkj19jhfsq916l9lkxxwaj0q30r3w6p8hplz4" }, "stable": { "version": [ + 1, 0, - 3, - 5 + 2 ], - "commit": "10fe5da1bbad72093b784fb8c4c262e9daaa8b97", - "sha256": "0gf3bw8c5yll07mvh0ippvkqyf3m5bf36mwxabmmc64fpy0xb3jc" + "commit": "576e1fda552af0da4e64070e2b26303a913f17a9", + "sha256": "194vk80d2mzfb0fpkj19jhfsq916l9lkxxwaj0q30r3w6p8hplz4" } }, { @@ -64622,14 +65222,14 @@ "repo": "Kungsgeten/org-brain", "unstable": { "version": [ - 20190830, - 757 + 20190922, + 1414 ], "deps": [ "org" ], - "commit": "e8a0dd5dd04c17dbbc954f3f2ec985996a539f01", - "sha256": "05l2yy3886nvkplca09q45lpzpwzx8fxd7fr96b4nb5i1187bagx" + "commit": "1f86e92c72cf52b75695c99572eeace7405caf96", + "sha256": "0vdpqg7jy60qlhsdbcfs592xfg32ybw71z1hhpabvhfms92sj2bx" } }, { @@ -64825,11 +65425,11 @@ "repo": "mallt/org-clock-today-mode", "unstable": { "version": [ - 20161014, - 920 + 20190915, + 701 ], - "commit": "02b8fd541a01040405a9a1400c46dcb68b7c2a3a", - "sha256": "1gbkrgbpsrwkjd199giffim8jvx1n4dqrsyk53sz1swj9dlhxgp9" + "commit": "18af3fede1aa0ccab83ce9195f94f9097f51c548", + "sha256": "0knjks1rzl7p38r36g7a186mlxsc5dr88a7q0mxjsgg86vjx1xwf" } }, { @@ -64976,15 +65576,15 @@ "repo": "vapniks/org-dotemacs", "unstable": { "version": [ - 20190116, - 2155 + 20190903, + 2024 ], "deps": [ "cl-lib", "org" ], - "commit": "5f504f36af6bcb9dbe9869c7ed54851d3db742e7", - "sha256": "0pxphad9qxssqxr50g0mf20b7247xjp9a6fmb494bj8yv6wnn9m9" + "commit": "ee59739c2d59151fe7d7d3034e87c7691120a5be", + "sha256": "17xrjhfjahryawrmkd2p0yi7pfxfvgdfhh4n18jdmfkrr6gllavg" } }, { @@ -65274,17 +65874,16 @@ "repo": "kidd/org-gcal.el", "unstable": { "version": [ - 20190826, - 2152 + 20190902, + 252 ], "deps": [ "alert", - "cl-lib", - "org", + "request", "request-deferred" ], - "commit": "149ea8ee6ce538742d65d5a7925ab4536f421b1d", - "sha256": "02myllpdlizaqxfa8c8dk14481ly3c1yzb79dg1acna132p6sn93" + "commit": "19ebbc647d8f4098cdda986aff2fea66e6da13ef", + "sha256": "1jvdwlqjgqic2v5nwkiz523nry4jphxg3wp9pin4vxw55vzm5ygb" }, "stable": { "version": [ @@ -65384,11 +65983,11 @@ "repo": "marcIhm/org-index", "unstable": { "version": [ - 20190829, - 1443 + 20190920, + 356 ], - "commit": "687c10cb4a2c4a66730bdfce161068bc6b0d2fa2", - "sha256": "1nnj7zzcbrmlnnd6q6739pqm8jsmlik2ci6zlfpd05sj7kmg0l19" + "commit": "aba9b1ea49e83c541c544e4030fcc2e0a55c908b", + "sha256": "1rpbas9svwni6nz5jywvxxvan0lgrqi100aby1aivi3prsmh6jhy" }, "stable": { "version": [ @@ -65463,11 +66062,11 @@ "repo": "bastibe/org-journal", "unstable": { "version": [ - 20190826, - 1919 + 20190914, + 1643 ], - "commit": "cb15adcec09a891911bd2a85cbbfd45502e65f00", - "sha256": "10daayd273fc1vz6zxzjbi2blww12y2vzg93awmhn9awy5plg75z" + "commit": "5481b6c7410cbc68f0966b5b5840c0048edc3fef", + "sha256": "1afjz5s7z0lfb67wsdckgsj2h9rr31gm8424v2w243xmz2lzgrjx" }, "stable": { "version": [ @@ -65796,14 +66395,14 @@ "repo": "jeremy-compostella/org-msg", "unstable": { "version": [ - 20190822, - 2115 + 20190916, + 2334 ], "deps": [ "htmlize" ], - "commit": "df89f46a86abed5c39d66ad35b47ab763dd27781", - "sha256": "1xm1ym4x1916h8nkm5zpj5q25sj2n9iawibmf2ifk0yr8faaz2jb" + "commit": "7616a9760bd1e3fb0e6a22f6e1cbc2bf71a733df", + "sha256": "0mccaw4wvh4624iyxfbv1jr01z7fkjg5mcl56scq164daznm200g" } }, { @@ -65864,15 +66463,15 @@ "repo": "weirdNox/org-noter", "unstable": { "version": [ - 20190829, - 2358 + 20190913, + 1509 ], "deps": [ "cl-lib", "org" ], - "commit": "54e1bc5c1dbb291d4ed55c7961633b2977374055", - "sha256": "1kyxphldkqggn384mplvj8r3rbfwz7q8ba64i43b4j0ldglbvwgl" + "commit": "a926c1075964f4a972467c01b807d6a01fd5d0b1", + "sha256": "0fb5r5aslqkd48h2l502sq3hixwcy64m00p17znnagf699djfhfl" }, "stable": { "version": [ @@ -66094,6 +66693,21 @@ } }, { + "ename": "org-picklink", + "commit": "c6c44a3e5a1c5e4acdf76c4d6f2f4b695aa6938e", + "sha256": "0gr4psgps9775hh0pvcyq3x2irrzkzpm5ghcnc9ddp5hn41yv57m", + "fetcher": "github", + "repo": "tumashu/org-picklink", + "unstable": { + "version": [ + 20190902, + 654 + ], + "commit": "e8c95e188b60ff84d794cbedbcce6732ccb82e4f", + "sha256": "05b488h1b5yvh0892358ndina2lywh67lhvqp180rp5ivz7zqm10" + } + }, + { "ename": "org-pivotal", "commit": "c1257d38bbd3a9944135b000e962f30ab28f5464", "sha256": "1gv4968akh2wx92d7q1i1mpl9ndygkq8ssdwg6cf19wp8mk18088", @@ -66327,30 +66941,34 @@ "repo": "alphapapa/org-ql", "unstable": { "version": [ - 20190830, - 1527 + 20190923, + 2244 ], "deps": [ "dash", "org", + "org-super-agenda", + "ov", "s", "ts" ], - "commit": "58b298153c482e6517995bb94f28e03aaf9924bd", - "sha256": "0zkfczvmfwm09diihxr2yn1mdi7hxcd7p4hj4j0fkq6yrf296ca4" + "commit": "d33b2e0129cbf99df209e1a4d975cfa3d6d5c226", + "sha256": "02f5n0v3fq25vxhwsn21nv08s5ris5vq6l9ymsnpha6piqkd4h8d" }, "stable": { "version": [ 0, + 2, 1 ], "deps": [ "dash", "org", - "s" + "s", + "ts" ], - "commit": "eb281fe34569901d84b502c1734d01cdb09246d8", - "sha256": "1nvzirn1lmgmgl7irbsc1n391a2cw8gmvwm3pa228l2c1gcx8kd8" + "commit": "55694f17fce4dc566f533b0b5f8cd60c4dad9670", + "sha256": "1xyabg9fhpip6426za6wjrn0msnaf10c5fzzaawwagk7zmjf9b48" } }, { @@ -66429,28 +67047,28 @@ "repo": "oer/org-re-reveal", "unstable": { "version": [ - 20190826, - 749 + 20190922, + 1724 ], "deps": [ "htmlize", "org" ], - "commit": "84edfb6c359b4cdd489a92adf7e31c40a3c893e8", - "sha256": "0lz38sjkfja3f4szjw3gb15ckggkr4bjjyb3zdcfli89781zdjrq" + "commit": "db4848b2e24de71cf1c849ef05b36497ce4d40c1", + "sha256": "13zyf3mxaqqsdad1mm1cmqadwpm5b54wn3r0r1cavqv1hy104p6b" }, "stable": { "version": [ 2, - 1, - 0 + 5, + 1 ], "deps": [ "htmlize", "org" ], - "commit": "6941394ce00f02a1fe8e7db99fe0c0bfc0a19824", - "sha256": "0bfbgjlp37ysik8y6a4gcqhbmy73i5p87lhjhp4d13f7dxq9q07p" + "commit": "07d4af7f601fb22d8ed74081c9f69ba9af61e474", + "sha256": "1zbz6hbddxbb264ibmhc04cmnpk17kb50jpn5l8878q4hxw5wwy2" } }, { @@ -66461,15 +67079,15 @@ "repo": "oer/org-re-reveal-ref", "unstable": { "version": [ - 20190819, - 921 + 20190921, + 744 ], "deps": [ "org-re-reveal", "org-ref" ], - "commit": "12a85e3f6f1b2f4c9e0169c8642a78f71d933633", - "sha256": "0c03rd2rr43hbm4s9fd05qmhy98yvqdxg8da3dkwizkynr47f2yn" + "commit": "03aca420afeb6f701d2fae5d2add9eec19c89d10", + "sha256": "1r3daccda3km1s7r2bs03wivzczz07iyh8bbjsdf0fss2d8acdrg" } }, { @@ -66480,8 +67098,8 @@ "repo": "alphapapa/org-recent-headings", "unstable": { "version": [ - 20190817, - 624 + 20190909, + 1618 ], "deps": [ "dash", @@ -66490,8 +67108,8 @@ "org", "s" ], - "commit": "6336a0c36ef1048ba1f4e07716a421dce106d082", - "sha256": "1lpkjvlm969pr64j25zkpmsacjnr7qbq9zfwwzb9xyqlhaf5zzz0" + "commit": "6430700dbe2ba34d852b36d56b3a879d71dabc9a", + "sha256": "0rl7f2dnwv90l7dnhgzaqnpmff0li366dmkiprjydxchkh1n7mic" }, "stable": { "version": [ @@ -66548,8 +67166,8 @@ "repo": "jkitchin/org-ref", "unstable": { "version": [ - 20190802, - 1327 + 20190921, + 2346 ], "deps": [ "dash", @@ -66563,8 +67181,8 @@ "pdf-tools", "s" ], - "commit": "9ab74270c1543e4743ca0436de567d8205403b43", - "sha256": "0ma9zaxzrd1dzmk8633bkw6wrp03wrm9bjhrgsp9qp7vhm597fdq" + "commit": "0fa807ff6bdfce58bd9abec3d86a242dd76228e4", + "sha256": "1805klqzxvarjd499nb5184n60c7nxnnzyddwykvjy1add2jcvxa" }, "stable": { "version": [ @@ -66619,14 +67237,14 @@ "repo": "akirak/org-reverse-datetree", "unstable": { "version": [ - 20190806, - 1412 + 20190914, + 102 ], "deps": [ "dash" ], - "commit": "0c70a06474921638eba3c287472879ce903ee8b7", - "sha256": "0fdndpy7j8idbrqpn85hnwj8caf737hcind00blbvc5rka85vaq4" + "commit": "a3bc7846531b55337ec069d0696b8d8a04fad3de", + "sha256": "0xhsv46xx9bzakzpb9y133s9drj5vyg8wrm15llqhgnaygakpfj6" } }, { @@ -66720,6 +67338,45 @@ } }, { + "ename": "org-sidebar", + "commit": "fa65cb74eabe0c46094c64f1384e31b31a6a58e5", + "sha256": "0grzh47b6nnk1y7xqd1dfy2cyq688g589wfd5dp78g0wfqbmdl5c", + "fetcher": "github", + "repo": "alphapapa/org-sidebar", + "unstable": { + "version": [ + 20190923, + 2231 + ], + "deps": [ + "dash", + "dash-functional", + "org", + "org-ql", + "org-super-agenda", + "s" + ], + "commit": "12df3c76e35de3e52b59678133e452785454f96b", + "sha256": "0vq3h1cnk1l0h66jrll4md3d6hrprjddl9fjx48dbdqq2zbly10b" + }, + "stable": { + "version": [ + 0, + 1 + ], + "deps": [ + "dash", + "org", + "org-ql", + "org-ql-agenda", + "org-super-agenda", + "s" + ], + "commit": "d55d0e8ddaba7843880a355daf6b33d6c0ed9bb8", + "sha256": "1zpjzlf372z68mqn3zfam1jfslnkx7hysxhpm2d77s63qbik0s21" + } + }, + { "ename": "org-snooze", "commit": "fd04816fb53fe01fa9924ec928c1dd41f2219d6a", "sha256": "00iwjj249vzqnfvbmlzrjig1sfhzbpv9kcpz95i3ir1w1qhw5119", @@ -66769,15 +67426,15 @@ "repo": "akirak/org-starter", "unstable": { "version": [ - 20190824, - 814 + 20190907, + 1859 ], "deps": [ "dash", "dash-functional" ], - "commit": "114cbaf359b5f08a23fbe5c199cf9df35d39d4ae", - "sha256": "1nmgbyv9lg1p9frs5mbfqnyblwb4f47kp972bavhni69qc6l33f1" + "commit": "ca166579a35dc671ad8f59dbc6dcf2a1eda94a20", + "sha256": "02ikg795jny9cddprbd9ipyiyg2gv6i4c6408qp94n3qmr9jcz48" } }, { @@ -66795,8 +67452,8 @@ "org-starter", "swiper" ], - "commit": "114cbaf359b5f08a23fbe5c199cf9df35d39d4ae", - "sha256": "1nmgbyv9lg1p9frs5mbfqnyblwb4f47kp972bavhni69qc6l33f1" + "commit": "ca166579a35dc671ad8f59dbc6dcf2a1eda94a20", + "sha256": "02ikg795jny9cddprbd9ipyiyg2gv6i4c6408qp94n3qmr9jcz48" } }, { @@ -66807,11 +67464,11 @@ "repo": "bastibe/org-static-blog", "unstable": { "version": [ - 20190619, - 635 + 20190924, + 729 ], - "commit": "a269b23e1b258b1cb9d80dfdc1d1d4c126f8241a", - "sha256": "019m07j6nfq18kv4gxsk99wb2wpisw0rywbx4xx63s8p3aaizv62" + "commit": "9f1132fbb6f49609b61730e6769ee5c1d6542d82", + "sha256": "0pf7dm5yzy8as63sm5s3mn4npn5p39mvygvnz81jv4r922h9cici" }, "stable": { "version": [ @@ -66861,8 +67518,8 @@ "repo": "alphapapa/org-super-agenda", "unstable": { "version": [ - 20190815, - 2140 + 20190925, + 958 ], "deps": [ "dash", @@ -66871,8 +67528,8 @@ "s", "ts" ], - "commit": "f65ff8109c97368ad640a6a50aaebd24046ce54a", - "sha256": "08aqq5sgj6y8mdj244j8024ampij49q08maws2sb1s40f0a7s697" + "commit": "a87ca11fbbe72ab6c1c4c3b55ae9e1e93ebfb8ba", + "sha256": "08b7babdaqblb6jff57an4kbcxk6fkhf668620fipfjgbsnqv3ff" }, "stable": { "version": [ @@ -66973,14 +67630,14 @@ "repo": "cute-jumper/org-table-sticky-header", "unstable": { "version": [ - 20190703, - 405 + 20190924, + 506 ], "deps": [ "org" ], - "commit": "2b0b36a075043ff426cca077bf4099b6ee4bf187", - "sha256": "08xd5qc19cc2000qgs5a5ywz5ykiwb0zhc0mghx599phvpprdfwz" + "commit": "b65442857128ab04724aaa301e60aa874a31a798", + "sha256": "1rnv7n444gidn2kqfbzc1wypj253nmlhn50x14pd8rdg4s3srpar" }, "stable": { "version": [ @@ -66996,6 +67653,21 @@ } }, { + "ename": "org-tanglesync", + "commit": "9282e48b725e835fe8dfb226dacbea40257584c1", + "sha256": "1vyvy5l7bb8v7c190rzi7r1nz7vlq4yj2bskhcw35h6df3zy3j2y", + "fetcher": "github", + "repo": "mtekman/org-tanglesync.el", + "unstable": { + "version": [ + 20190924, + 2040 + ], + "commit": "9e6f074bae1ce7579f495b62fc6ee08f47b63e95", + "sha256": "0b6cx26fsqkp4r54k724v7klfczm40zn9hsb48wqiwc7v67qnka0" + } + }, + { "ename": "org-tfl", "commit": "d9e97f2fee577c7e3fb42e4ca9d4f422c8907faf", "sha256": "1rqmmw0222vbxfn5wxq9ni2j813x92lpv99jjszqjvgnf2rkhjhf", @@ -67282,8 +67954,8 @@ 20190409, 1815 ], - "commit": "f2fcfc0d4e7cdb1312c5c06fd5e1820788268de3", - "sha256": "14rfixf6948zf5ylplzmpqr15rn1kr1qc26055kbb13klyl0qj3y" + "commit": "ebb2778052aeaf737adebc003957cb48cb01135e", + "sha256": "0qlvdpa88ic9gnb0qhijfsc9i6l3ba2zrvk4r4li3qrx0i9rpz5c" } }, { @@ -67423,8 +68095,8 @@ }, { "ename": "org2blog", - "commit": "6440f81aed1fcddcaf7afeedb74520e605211986", - "sha256": "15nr6f45z0i265llf8xs87958l5hvafh518k0s7jan7x1l6w5q33", + "commit": "781b2b45602cae8b972e5c8fd2b19bf7ee8133c6", + "sha256": "02gw1kjfm5v08bc1iwa029pk5v3jl277jiq62nmisxn8sd646f5s", "fetcher": "github", "repo": "org2blog/org2blog", "unstable": { @@ -67600,11 +68272,11 @@ "repo": "kostafey/organic-green-theme", "unstable": { "version": [ - 20190828, - 922 + 20190923, + 1308 ], - "commit": "cde171651b08ef24326127a62992062e25c3e699", - "sha256": "0a970fv8y2pvbxw2iy09zyl70c2raacdsysdi6ywkxi63fid5l8r" + "commit": "f839bf213520d3736c3e3f712af3ca7ae5321411", + "sha256": "0xjn90wg0f7rich6yja9jm6h3104rihgizim59i1jq6rjngazwhv" } }, { @@ -67615,16 +68287,16 @@ "repo": "elpa-host/organize-imports-java", "unstable": { "version": [ - 20190807, - 1218 + 20190922, + 1520 ], "deps": [ "cl-lib", "f", "s" ], - "commit": "df209ce7f8055bd9fbd93e7a03b42f1705a1933d", - "sha256": "1fx05xn22zj5dgdyxrz0ifzxwfpf1s5gcszkjyhzfg1g2r8kmf0v" + "commit": "de094d6d56c85aa9820c77055b54287ae6b46d20", + "sha256": "0hgdgz1jx292dfxcm1av4v9v6400jpnyp1j21d4fzfi0wj2srfrr" } }, { @@ -67701,15 +68373,15 @@ "repo": "tarsius/orglink", "unstable": { "version": [ - 20190630, - 1437 + 20190919, + 1859 ], "deps": [ "dash", "org" ], - "commit": "30e27843fbe916c26b4fe15948415b9c44e9d153", - "sha256": "0dqm4i2ykzaxairbralz6b1h3gga7falvg5nvw3180mkkrkcjbx2" + "commit": "988ad54db45708b0fe835829d512eb6d5f6cf161", + "sha256": "1mswfbwz7fm9lriab365g7hq8hn85gxcsg8y41by9j0n8hb3hj5q" }, "stable": { "version": [ @@ -68526,14 +69198,14 @@ "repo": "kaushalmodi/ox-hugo", "unstable": { "version": [ - 20190830, - 1623 + 20190905, + 303 ], "deps": [ "org" ], - "commit": "a8e0c6e1ceeecebd5d2cd17dd3062b3e8aecbfcb", - "sha256": "0j2prlgb3gprdg9ynaka7y9390qdns6182zj6qpjvayvxkzfi0p5" + "commit": "b5672ea8925eaff93c4e17982b35acec302ba5e7", + "sha256": "1z9c85z55an38wrg6vmal8vp8k8qp1wkfxc9ijjlqsh0i2809x6b" }, "stable": { "version": [ @@ -68837,14 +69509,14 @@ "repo": "yjwen/org-reveal", "unstable": { "version": [ - 20190810, - 1655 + 20190918, + 1627 ], "deps": [ "org" ], - "commit": "4abd898da3b24530a80336327ec29d3ae6ad4ec9", - "sha256": "0ik5r99hv407yalvdwba62rppaf9g0r9qzyp4iz0i3n1mhcnv0h1" + "commit": "00bef55f26eefb223662664f33f72810df1e8316", + "sha256": "0l6kgbfdqzg66c4qif7zablfk5mr0b0gh3jb24gih2ipxh67r76d" } }, { @@ -68855,14 +69527,14 @@ "repo": "choppsv1/org-rfc-export", "unstable": { "version": [ - 20190429, - 1133 + 20190923, + 1004 ], "deps": [ "org" ], - "commit": "4cac33c387bc10e32f18940298aa5095d060ed3e", - "sha256": "0y442swdsh8fl3471bz9276r2srv6dp7j12y09s82xx5nm668nmb" + "commit": "8427bc0b680defd4276bfaa222136b9cbe1f96fc", + "sha256": "0ic7w7zgd5da487p8zra6vbv586f2rdhd5xqa6r1606cv203imbz" } }, { @@ -69265,14 +69937,14 @@ "repo": "purcell/package-lint", "unstable": { "version": [ - 20190807, - 1837 + 20190923, + 8 ], "deps": [ "cl-lib" ], - "commit": "c5ba20dead0df743a699f502f5d034d03b367f65", - "sha256": "0pshjm6swgm6pfpx8ri8zfixazc7bjhdvy7md905lf8a8byr7zk2" + "commit": "f2899cac84689d687cf62c61ae9ec587febaf225", + "sha256": "1qkackrp6ch8p77j5iqh64qbp0kbi13aw26v4lg35dya2z6y6k3k" }, "stable": { "version": [ @@ -69300,8 +69972,8 @@ "deps": [ "package-lint" ], - "commit": "c5ba20dead0df743a699f502f5d034d03b367f65", - "sha256": "0pshjm6swgm6pfpx8ri8zfixazc7bjhdvy7md905lf8a8byr7zk2" + "commit": "f2899cac84689d687cf62c61ae9ec587febaf225", + "sha256": "1qkackrp6ch8p77j5iqh64qbp0kbi13aw26v4lg35dya2z6y6k3k" }, "stable": { "version": [ @@ -69428,11 +70100,11 @@ "repo": "kadena-io/pact-mode", "unstable": { "version": [ - 20190710, - 1817 + 20190903, + 1542 ], - "commit": "5df7032cf9b61ae5aff36ac7d2a23b2ab0e00904", - "sha256": "0hdg5b3mnld8pcfiawn51dc65dfws6gr7j4fvjc2gnhypy36l8xl" + "commit": "f836c376e142b372a92900b630511fde9937a51a", + "sha256": "00xp8j9hgqscz865pp4s5khngpsidad6arwybcxh1cfsncc6w8f2" }, "stable": { "version": [ @@ -69594,11 +70266,11 @@ "repo": "sebasmonia/panda", "unstable": { "version": [ - 20190801, - 1622 + 20190907, + 314 ], - "commit": "30dac32f9b18fb225ade8e56f7d9242d6c8efb35", - "sha256": "1d6wykf2k5b0494l2l8p9p0hmq52jvcq534dz4piwgnngrjcbq8n" + "commit": "5a3da498a8ab8a60cef3a3a5e8f3e14dea9992dd", + "sha256": "04fa2895vr0z6y1w1mkpxhzx2q323vl7r3hayxr0vldd8mz8m0lw" } }, { @@ -69656,15 +70328,15 @@ "repo": "joostkremers/pandoc-mode", "unstable": { "version": [ - 20190711, - 2122 + 20190925, + 822 ], "deps": [ "dash", "hydra" ], - "commit": "7b9a19d8777a21431a819281a14201bfdf1dfdc1", - "sha256": "04bqc7mhgkfks3nsvimd3rrriv4nqbksmv5ahlbbd03aqa2b0vrv" + "commit": "5b1275cbf5f6eb5617e1c7775c935fb1ddd6ae68", + "sha256": "10lk0f0wxjdyccp881x0j53g73cadjqdhny3qdmzbg8lblgl79gg" }, "stable": { "version": [ @@ -69691,8 +70363,8 @@ 20190823, 401 ], - "commit": "2e2dc6427b4427b045df37ba793884c6225c262e", - "sha256": "00zqb68vzcqd1mcxz3nsdydima14381dvqc4nncqm1l6hnapxf1h" + "commit": "f92898949ba3bf991fd229416f3bbb54e9c6c223", + "sha256": "0c8ad30313598mggjiq4szz1alc6kcswh7i8447kdci241rlyqrf" }, "stable": { "version": [ @@ -69714,8 +70386,8 @@ 20190124, 1828 ], - "commit": "f2fcfc0d4e7cdb1312c5c06fd5e1820788268de3", - "sha256": "14rfixf6948zf5ylplzmpqr15rn1kr1qc26055kbb13klyl0qj3y" + "commit": "ebb2778052aeaf737adebc003957cb48cb01135e", + "sha256": "0qlvdpa88ic9gnb0qhijfsc9i6l3ba2zrvk4r4li3qrx0i9rpz5c" } }, { @@ -70101,6 +70773,19 @@ ], "commit": "ddf824bc1df1585867cb7f27f2dd8ca8df760569", "sha256": "11wi3hwcgmy54p6ivpijqm7v0hj6j75a19qk5z779bqfrp79b4pc" + }, + "stable": { + "version": [ + 0, + 1, + 0 + ], + "deps": [ + "a", + "parseclj" + ], + "commit": "ddf824bc1df1585867cb7f27f2dd8ca8df760569", + "sha256": "11wi3hwcgmy54p6ivpijqm7v0hj6j75a19qk5z779bqfrp79b4pc" } }, { @@ -70126,29 +70811,29 @@ "repo": "NicolasPetton/pass", "unstable": { "version": [ - 20190715, - 1509 + 20190830, + 2017 ], "deps": [ "f", "password-store", "password-store-otp" ], - "commit": "ba6a3f695acb380e1457a29a0d13b22641f72c4f", - "sha256": "14g50fywwgf9bpqnl6bvq2k1czl9m2da43xcdrng2gpyrz3ns1w3" + "commit": "919d8e3826d556433ab67d4ee21a509d209d1baa", + "sha256": "03cf7d51p7d5a9nmlzp1k0n68j4n0di0nmpmcx3vlfd62lk3rs2p" }, "stable": { "version": [ - 1, - 8 + 2, + 0 ], "deps": [ "f", "password-store", "password-store-otp" ], - "commit": "cd79375005a1c1d8b45d38fefa91eef0bd23182c", - "sha256": "05h4hacv3yygyjcjj004qbyqjpkl4pyhwgp25gsz8mw5c66l70cx" + "commit": "35e3f86e96878520e690513cdbc1b2753b173e72", + "sha256": "0jc8j421mlflspg24jvrqc2n3y5n3cpk3hjy560il8g36xi1049p" } }, { @@ -70248,8 +70933,8 @@ "repo": "zx2c4/password-store", "unstable": { "version": [ - 20190829, - 1054 + 20190916, + 2027 ], "deps": [ "auth-source-pass", @@ -70257,8 +70942,8 @@ "s", "with-editor" ], - "commit": "b87e91f984f45615b6459ff3829baa9130b8ef75", - "sha256": "1xgfw238ph6fa8inrwqzfzfzqi16w4rr5sg79djb7iqz8njczbn8" + "commit": "e74a1c738f7cda65c7a308e30e8d122f853d6f70", + "sha256": "07g2w57q9lvgf5wznyg2ybkrw6w1f5w4jqi8zbw9lzkvj4iz3rg7" }, "stable": { "version": [ @@ -70773,15 +71458,15 @@ "repo": "politza/pdf-tools", "unstable": { "version": [ - 20190701, - 202 + 20190918, + 1715 ], "deps": [ "let-alist", "tablist" ], - "commit": "db7de3901ae0e55f6ab8cf9baec257f706c3d16e", - "sha256": "1vvhgxxg5lpmh0kqjgy8x1scdaah3wb76h2zj7x99ayym2bxyigv" + "commit": "c851df842e05f353e4d249f2653f98418b3345d6", + "sha256": "1ij2w7lhwx2f88m35xp56risa29qrhh2p6xnvc3rnbb9iszajs3i" }, "stable": { "version": [ @@ -70804,14 +71489,14 @@ "repo": "007kevin/pdf-view-restore", "unstable": { "version": [ - 20190423, - 1625 + 20190904, + 1708 ], "deps": [ "pdf-tools" ], - "commit": "12d9734d2133dead548497193016c86ab28e9477", - "sha256": "1z5483jclfn1xrcdrvrw2c94fpnb1skv6c2ppi3w5nj4myny6nsv" + "commit": "5a1947c01a3edecc9e0fe7629041a2f53e0610c9", + "sha256": "1b9zzvfsprf7x0v7l4dabdh5qdfhl7mm30vvqah8l10jvlf2wlc7" } }, { @@ -70930,14 +71615,14 @@ "repo": "sebasmonia/pepita", "unstable": { "version": [ - 20190731, - 1610 + 20190907, + 409 ], "deps": [ "csv" ], - "commit": "1d67dad08cb994dd2fa637ea591db14cbb00d644", - "sha256": "09lqjssg72bq437cvg15dxmy7j446raaknvkp7pl5357vgmqcdy0" + "commit": "489ddc2675906f9dd27bd4ec69ef140e52194952", + "sha256": "1k77c7zz73j2vais62qbymk246fyc6nw4jd1abdx2c9jjp3sn94k" } }, { @@ -71032,20 +71717,20 @@ "repo": "Fanael/persistent-scratch", "unstable": { "version": [ - 20190128, - 1843 + 20190922, + 1046 ], - "commit": "71371a7ce9846754276350fd577dc7543eb52878", - "sha256": "0n638krbrs2hx97cgkb5nc0fbrd8wsbmb7mz3ym5mx5pvdyxnlgv" + "commit": "fd690e138459e0b490f1fda469811a9cbcb34df7", + "sha256": "1nig9ja42sm3nkbi9wrsm86akrq0m85jfc65k9rmym13vrdpflvq" }, "stable": { "version": [ 0, 3, - 3 + 4 ], - "commit": "71371a7ce9846754276350fd577dc7543eb52878", - "sha256": "0n638krbrs2hx97cgkb5nc0fbrd8wsbmb7mz3ym5mx5pvdyxnlgv" + "commit": "fd690e138459e0b490f1fda469811a9cbcb34df7", + "sha256": "1nig9ja42sm3nkbi9wrsm86akrq0m85jfc65k9rmym13vrdpflvq" } }, { @@ -71198,14 +71883,14 @@ "repo": "nex3/perspective-el", "unstable": { "version": [ - 20181120, - 114 + 20190915, + 2104 ], "deps": [ "cl-lib" ], - "commit": "2c8cf56d170c3eb1fcc1a8fe41026b780e0ffead", - "sha256": "0xlib2f8fjmwk8r0p6r8y5ni687xmixqp9s40rgxc15ikin54hhf" + "commit": "519838e2647268567c086b77158a55b01feb7f6c", + "sha256": "07bak10gy0ziy7zm9ha8sqfl564nxqhcaaicc35l8zk7qk11gj65" }, "stable": { "version": [ @@ -71401,14 +72086,14 @@ "repo": "zk-phi/phi-grep", "unstable": { "version": [ - 20170606, - 807 + 20190920, + 908 ], "deps": [ "cl-lib" ], - "commit": "ab9bd8d25e751a9cbfa108b49839293230b6e8b5", - "sha256": "0p1i07dgaic0jnwdsnvsnib2913r9w8j98d1p5rx8db2nabjmzc0" + "commit": "06b740e3fb20074be9bae87530f5616a122c3aca", + "sha256": "0lwqlz6jp44dq7yhj5yvfrhnjlxlihkpqjil6d2ma20b2946n9ny" } }, { @@ -71667,14 +72352,11 @@ "repo": "emacs-php/php-mode", "unstable": { "version": [ - 20190827, - 1721 - ], - "deps": [ - "cl-lib" + 20190919, + 1405 ], - "commit": "5a5b9073585b7afb679e32f1d61086d9122c8b3f", - "sha256": "1595ncllpfzgjwq8lwcpk8wxgjvcsigpppf6y5s8gj5g7rz4d45c" + "commit": "ba45a54d45fbf0cb8dfcf8aaa62ae42d43d449bb", + "sha256": "12wmh5306xr5jl9l2v02bgswvxkn98pfhny2491mivhgsmra1svi" }, "stable": { "version": [ @@ -71765,8 +72447,8 @@ "repo": "emacs-php/phpactor.el", "unstable": { "version": [ - 20190824, - 500 + 20190913, + 1340 ], "deps": [ "async", @@ -71775,8 +72457,8 @@ "f", "php-runtime" ], - "commit": "299347fbe3dd8617a46e874ccb8511f6705c95e4", - "sha256": "0g5hidr0c3f83ml1b8wnkf1blvapkivxzr26amcv5ml0v5f6icjn" + "commit": "a12ec67ce9de9e96c89548052ae323a277cba846", + "sha256": "031i5s3cv9z2d6vnwbf91291fgafcqg61km9b3z7p9bk91vbkxsy" }, "stable": { "version": [ @@ -71840,10 +72522,10 @@ "version": [ 0, 3, - 1 + 2 ], - "commit": "525792fc4a9ecb5dc577a7c416e298e0c45c6183", - "sha256": "02cgcqkgwl0rbxhndcyjd8fj57g84n8x4n9rkh671rg3r7p7c71j" + "commit": "de74ebfcbce53a08daf95d324d7447dede094222", + "sha256": "01x5gf7z0iqx601z3g4cdq6cv27aflxw5kmqrwrj0aijcb7nb9c6" } }, { @@ -71937,14 +72619,26 @@ "repo": "ahungry/pickle-mode", "unstable": { "version": [ - 20190816, - 341 + 20190923, + 354 ], "deps": [ "cl-lib" ], - "commit": "0dab75b9f75dc2d0cf28f876cc9e2d127e6dca15", - "sha256": "03jp4nhca78k8kl6r5g8c2spjxsamhmqq5p3fqhiniqm3sz5v6cf" + "commit": "3a0a717f2a24827667f34bc53830a3b81cd57460", + "sha256": "1r12r21882bq22w6cawf28ndf70nz2nd0f2wagdfr5a9ir9wchfy" + }, + "stable": { + "version": [ + 0, + 0, + 3 + ], + "deps": [ + "cl-lib" + ], + "commit": "3a0a717f2a24827667f34bc53830a3b81cd57460", + "sha256": "1r12r21882bq22w6cawf28ndf70nz2nd0f2wagdfr5a9ir9wchfy" } }, { @@ -71958,8 +72652,8 @@ 20190824, 806 ], - "commit": "7a487a56f22690eebe4f8b4fb628aab9cba95ab1", - "sha256": "121hwfckjvli7g7b2mvmi6m2xp5kk1040h4nripcwl3wp6j5w5w9" + "commit": "1ae7af6c310d20b31b8229dc8c1eedeb47aa3311", + "sha256": "0ziil73lfcvr3sih00n19jnmciddirwsjqci1im80qg7z268l6s3" } }, { @@ -72259,16 +72953,16 @@ "repo": "pwalsh/pipenv.el", "unstable": { "version": [ - 20190522, - 803 + 20190919, + 2147 ], "deps": [ "f", "pyvenv", "s" ], - "commit": "03edaaa44a5a4212d2e5a14e3ae6303189d76703", - "sha256": "04y6p8gd20xhn7qkz2gp94yxizwl67yhi7qs0x6c8nrxpqd1y5y9" + "commit": "b730bb509e8b60af9f5ab1f1e6c3458d1d95d789", + "sha256": "0f2lihzzw9v91adx9v89crbsph4zjj0qrlb3a8fikbhd6jy8xpb8" } }, { @@ -72411,8 +73105,8 @@ 20171124, 410 ], - "commit": "a3d5389a44326314da21f147bad2ede60e2cf986", - "sha256": "0qik5478z49fpn9b37fxkybglvsgzbapl1dkam5prg0sxns98xha" + "commit": "48b37b9b19d8f1e0accbf930f30b5346cf7959fe", + "sha256": "0pi4sjp0aq279m449lw4rbppdivzkazd07bh9jqrmyrw9wib3hbl" }, "stable": { "version": [ @@ -72460,26 +73154,26 @@ "repo": "skuro/plantuml-mode", "unstable": { "version": [ - 20190822, - 1403 + 20190905, + 838 ], "deps": [ "dash" ], - "commit": "2f8170b30b9885b5a6992047662d5ba0f4ac2248", - "sha256": "0c9as4g2rc1py12wcmv4s4gn2cpsf55cm7b4yf8amld5viz7r7pg" + "commit": "1590a75da6c3e25b726bc5e3e12656faab968917", + "sha256": "0l20vkq4d673a12lf15m7zn2yzkzf0qkqmq35hi6kpy4bd3zar2v" }, "stable": { "version": [ 1, 4, - 0 + 1 ], "deps": [ "dash" ], - "commit": "b39c310e9cb5a2e7aa72d143348362307d561f88", - "sha256": "03sdkjs7al2g6kqsxr8z53lqsnir6wk2a59kgi08lki049zim0a0" + "commit": "5889166b6cfe94a37532ea27fc8de13be2ebfd02", + "sha256": "0yp41d2dmf3sx7qnl5x0zdjcr9y71b2wwc9m0q31v22xqn938ipc" } }, { @@ -72658,11 +73352,11 @@ "repo": "flexibeast/plisp-mode", "unstable": { "version": [ - 20190824, - 541 + 20190914, + 513 ], - "commit": "7a487a56f22690eebe4f8b4fb628aab9cba95ab1", - "sha256": "121hwfckjvli7g7b2mvmi6m2xp5kk1040h4nripcwl3wp6j5w5w9" + "commit": "1ae7af6c310d20b31b8229dc8c1eedeb47aa3311", + "sha256": "0ziil73lfcvr3sih00n19jnmciddirwsjqci1im80qg7z268l6s3" } }, { @@ -72985,15 +73679,15 @@ "repo": "galaunay/poetry.el", "unstable": { "version": [ - 20190706, - 1141 + 20190905, + 959 ], "deps": [ "pyvenv", "transient" ], - "commit": "0173c61dee6587d5898722df1e06d9c00bee4fd1", - "sha256": "1n3xzw204hy3l1kisjpgg01n12x1z01mxfqi3hyfw3w3hlxciw7b" + "commit": "9fcefd042355a0280b11ac61e45b52b9819e9c2a", + "sha256": "07vhgvpz35infidsw6bh0rxmfhyvmqn93vl9456lfhwyhwka366p" }, "stable": { "version": [ @@ -73188,15 +73882,15 @@ "repo": "polymode/poly-markdown", "unstable": { "version": [ - 20190715, - 707 + 20190916, + 702 ], "deps": [ "markdown-mode", "polymode" ], - "commit": "6fc4b26392f101494ceb176a8446b159c8a6ac29", - "sha256": "0jvn7l59z8ncbs6bwk3ka13gcmxq615w9qp9fam1fvmc3dykakn8" + "commit": "a867e5e5689f1e1a5bab5db57c7d39bac2448bcb", + "sha256": "1mrmrwmrv6xsafhn7ys3y8nbdqgzhkrb2mm0gir63g03kd6bn793" }, "stable": { "version": [ @@ -73702,15 +74396,15 @@ "repo": "kostafey/popup-switcher", "unstable": { "version": [ - 20171205, - 851 + 20190917, + 1634 ], "deps": [ "cl-lib", "popup" ], - "commit": "f5788a31918e37bb5c04139048c667bcec9f1b62", - "sha256": "0gfi8dlgynciv3q5a208c7gd66g2r99b3zn0i31ibpppjqy2vcsk" + "commit": "953f599c1fd9d6843ec9380cc0fc3f8248390d24", + "sha256": "1h0mxx1304fp4ilv4cz5mb65a7df1b3hi6n4dz6k9kkzbvihsacc" } }, { @@ -73822,11 +74516,11 @@ "repo": "tumashu/posframe", "unstable": { "version": [ - 20190805, - 956 + 20190924, + 759 ], - "commit": "bfd2e55219e0911980f4ea97b5995ce8553dce60", - "sha256": "19vvhx9x6646va4s4yy77inll9d2mhipakvz4pyz4pjw8pjcd94x" + "commit": "bb1393383d512d7358549c99f95b45e7d56d7d2c", + "sha256": "1xxq1jnzvms053k7n04mx9y7x68j1h9mij056ai31raxm751mr05" }, "stable": { "version": [ @@ -74055,19 +74749,19 @@ "repo": "raxod502/prescient.el", "unstable": { "version": [ - 20190727, - 2126 + 20190921, + 3 ], - "commit": "ea8e9fea4385272924d09c91220c7f2e9ac95b3f", - "sha256": "1apb9v31ajq586f7mqachv238yv40gacrjmh2s8mnk45xil72swy" + "commit": "2f01b640e3a487718dbc481d14406005c0212ed9", + "sha256": "1wqk1g8fjpcbpiz32k7arnisncd4n9zs84dn3qn9y8ggjzldqy91" }, "stable": { "version": [ 3, - 2 + 3 ], - "commit": "653ca4b66954b7f1b6e4635a574234dd316c11a3", - "sha256": "0d60h4rfm5jcf8cf11z91wjqp0xcrviskqzyqhfliqvy2i2yl6ks" + "commit": "2f01b640e3a487718dbc481d14406005c0212ed9", + "sha256": "1wqk1g8fjpcbpiz32k7arnisncd4n9zs84dn3qn9y8ggjzldqy91" } }, { @@ -74236,6 +74930,24 @@ } }, { + "ename": "prism", + "commit": "c8ee14b9d67a9703c25b508b324ad7dabaa4352d", + "sha256": "1prvvpwa10i260hcj59xfj1vynjv7gykxinqas2xhw6lq6lwrbjk", + "fetcher": "github", + "repo": "alphapapa/prism.el", + "unstable": { + "version": [ + 20190908, + 1820 + ], + "deps": [ + "dash" + ], + "commit": "49c8b97b286c7403bf239645964416200ea82dd5", + "sha256": "0dcy032g4jc027mwq8dfadsc05bsi1k6yiab3rpdxwc17c9pg9x8" + } + }, + { "ename": "private", "commit": "6440f81aed1fcddcaf7afeedb74520e605211986", "sha256": "1mvma2xgjy9vkh468x80xlri6qfr7d494la1j6r1clkjsn5kg7hr", @@ -74291,14 +75003,14 @@ "repo": "travisjeffery/proced-narrow", "unstable": { "version": [ - 20190818, - 1923 + 20190911, + 1818 ], "deps": [ "seq" ], - "commit": "079a6834869638ae3586a68474149575d7623ef0", - "sha256": "0771n655f4bhvw6qdjkk0m8l5qwbqdyk28whp52bmx95j56yfkvx" + "commit": "0e2a4dfb072eb0369d0020b429e820ae620d325e", + "sha256": "0d1qq5606prls7mzy0iri41j2c14l4axz6kq629r4wjdqwshxkli" }, "stable": { "version": [ @@ -74610,14 +75322,14 @@ "repo": "bbatsov/projectile", "unstable": { "version": [ - 20190626, - 1315 + 20190904, + 1025 ], "deps": [ "pkg-info" ], - "commit": "71a01f409a319d57eb3832e93e8a412fbc9d7a65", - "sha256": "1qsm4kwydi56h7p0mdm7m8r6nhm4l7lp7snamcgjyfmja2w424fl" + "commit": "0707fc4fd6cb10959bede0d321a915a959c466aa", + "sha256": "14bz3jp0qvq36h70jrv7y18zfgrlh258v18r6sr8fm6pa05kchr8" }, "stable": { "version": [ @@ -74731,8 +75443,8 @@ "repo": "asok/projectile-rails", "unstable": { "version": [ - 20190706, - 1231 + 20190913, + 1003 ], "deps": [ "f", @@ -74741,8 +75453,8 @@ "projectile", "rake" ], - "commit": "b0c88a381cc15b0aaba2629949e10ae6373d209a", - "sha256": "0p33gmykri30csv9b214rmmcxm59c0lcwhbwala78a28y63mfcri" + "commit": "d31af287b2228f855e0bfbc5f985f999e5b5f811", + "sha256": "1r4ib96kkhy40m5jd63d9qml9k495zcjk12mwxcid8pk0f1s8l7d" }, "stable": { "version": [ @@ -75149,17 +75861,19 @@ 20170526, 1650 ], - "commit": "36bdcb5a7a79aff977617bd1a83a7b25055e38bb", - "sha256": "00fgcysw557mgs0wfh095djnxd94qklf6h45bh8zw1dyhwfbmqpx" + "commit": "b9f405ae46036860a4e73e167bee3800dfe53a9e", + "sha256": "0q70rsi012ybyq7akanl2np4x0ajqcmjknwcwrk3issy24l9f9sq" }, "stable": { "version": [ 3, - 9, + 10, + 0, + -1, 1 ], - "commit": "655310ca192a6e3a050e0ca0b7084a2968072260", - "sha256": "0vv85xb65dx6fa76fsnyps13kaamvwfzd8hr6ii1payr73x4zy2h" + "commit": "ae1bcaad6ffcd04ca5d40f21dc3fab4f965e49cb", + "sha256": "0slzayqgda24z24470lx0iv0rqvvj0jg7g8izbgx2l5g04al0ihz" } }, { @@ -75428,8 +76142,8 @@ 20190828, 1136 ], - "commit": "c47ea8fca65c0f964365488a392e51798d698cdd", - "sha256": "0j861dp8jzkp6a6956x9jy00bc905bzf3rwylws2vvrz9wpzp7r3" + "commit": "1b844a9b21d549bfe767990b4c611de3bc4e2241", + "sha256": "0fz2ynxxgq3j7hvfmqq24gvbfpc08apz6zw9cjav08r5z04n1xr3" } }, { @@ -75880,10 +76594,10 @@ }, { "ename": "pyenv-mode", - "commit": "acc9b816796b9f142c53f90593952b43c962d2d8", - "sha256": "00yqrk92knv9gq1m9xcg78gavv70jsjlwzkllzxl63iva9qrch59", + "commit": "c756ccbae044bc23131060355532261aa9a12409", + "sha256": "05rfppn75130m5zpg5yz9bz1r7wap05jmd9v08fbqjipv98ckpz3", "fetcher": "github", - "repo": "proofit404/pyenv-mode", + "repo": "pythonic-emacs/pyenv-mode", "unstable": { "version": [ 20170801, @@ -75892,7 +76606,7 @@ "deps": [ "pythonic" ], - "commit": "eabb1c66f9e0c0500fef4d089508aad246d81dc0", + "commit": "aec6f2aa289f6aed974f053c081143758dd142fb", "sha256": "1zmgm24d6s56jc4ix61058p1k0h95vdvdllr7fh1k3bq4mw22qn3" }, "stable": { @@ -75971,8 +76685,8 @@ "repo": "tumashu/pyim", "unstable": { "version": [ - 20190826, - 51 + 20190925, + 252 ], "deps": [ "async", @@ -75980,8 +76694,8 @@ "pyim-basedict", "xr" ], - "commit": "0b8a7ff8b0fcd1086ef938ae398c8efb4791e494", - "sha256": "0lac78442pyidlrnd8zy6c96adv1jdfismz0qd9a0rj4zyfnzp4r" + "commit": "172a099fe1212d560dab72569f3b0091735a8eb8", + "sha256": "0bjjphamw6n7fi86k24zx1wdm6i9hirnf100vkaiyjqmf34490dc" }, "stable": { "version": [ @@ -76126,8 +76840,8 @@ 20170402, 1255 ], - "commit": "6b3afd4f6d75debd7f286f0d3c760ed10ab1e79f", - "sha256": "19rq53qmk3vzlh9l29f254jpvjbf28j6bzmhzakhy8sn1vchpqsq" + "commit": "fde732e0e9a4f224c5ae48ad942c6d955aa0a8e6", + "sha256": "1wz5psdrpxi58vs2wpz9vagxdrzghc839whqvsa2y71ka3z923rk" } }, { @@ -76356,11 +77070,11 @@ "repo": "python-mode-devs/python-mode", "unstable": { "version": [ - 20190819, - 1244 + 20190912, + 1653 ], - "commit": "31603f1fc1d8a7568b7259d7ccfef58dde72430a", - "sha256": "17rb0427v6nwjxy7b2364ihhlzhnqib1xvb547x8kdl971hw3ngx" + "commit": "2fc13db9eb7652b3f6619fbd1a96073850ee6175", + "sha256": "0mw3hvslvvj6h56nc42my94vjci36k3yr44511635vdmfsmdzafl" }, "stable": { "version": [ @@ -76474,10 +77188,10 @@ }, { "ename": "pythonic", - "commit": "5589c55d459f15717914061d0f0f4caa32caa13c", - "sha256": "1hq0r3vg8vmgw89wfjdqknwm76pimlk0dy56wmh9vffh06gqsb51", + "commit": "c756ccbae044bc23131060355532261aa9a12409", + "sha256": "12yaxpir17bccj5zwd9lsm8dzd7qlflm8kcf8m1c0pxzgpsk0i5p", "fetcher": "github", - "repo": "proofit404/pythonic", + "repo": "pythonic-emacs/pythonic", "unstable": { "version": [ 20190725, @@ -76487,7 +77201,7 @@ "f", "s" ], - "commit": "1ba07048cffa0f95d7d1c75eab2d2be175e67cb6", + "commit": "29f8049e56141805b0ee1a2c5fc62c3b027aa736", "sha256": "12dhh11q16crhb6dffwx3s7ncgbqsvc2dvpkzgllr58iwd8hs2kk" }, "stable": { @@ -76514,11 +77228,11 @@ "repo": "jorgenschaefer/pyvenv", "unstable": { "version": [ - 20181228, - 1722 + 20190916, + 1037 ], - "commit": "fa6a028349733b0ecb407c4cfb3a715b71931eec", - "sha256": "1x052fsavb94x3scpqd6n9spqgzaahzbdxhg4qa5sy6hqsabn6zh" + "commit": "392e28dad42dc6cc9507e496391a32482f9f1881", + "sha256": "0kmzqinlv99wpm5q0lzwlzmjsc03m4z24pwz3zixldh76f7c2fmb" }, "stable": { "version": [ @@ -76955,14 +77669,14 @@ "repo": "greghendershott/racket-mode", "unstable": { "version": [ - 20190803, - 1820 + 20190925, + 1446 ], "deps": [ "faceup" ], - "commit": "5300aa004f08535c3fac99f1af78462f129aca81", - "sha256": "1gkpm4fl1ybsm9qqgrkwyjbd9znddy438x266k27fs90lkxrfray" + "commit": "bf31305d903b375f2be88d99f87891843a604e5d", + "sha256": "0mq6x3sbhs83imj4g1p92739ldkhqv5g3bnnyzp7yhpcpjk1519n" } }, { @@ -77302,6 +78016,30 @@ } }, { + "ename": "rbtagger", + "commit": "2365f30d641474e121d64729e5f57641bbb44d17", + "sha256": "03f34vb6rks67mgxn0yk2imfsn9fsshi2j3fv4zilb4dav778n4y", + "fetcher": "github", + "repo": "thiagoa/rbtagger", + "unstable": { + "version": [ + 20190925, + 2046 + ], + "commit": "831041ea12bb4963fb72386f6c17faf9988013e8", + "sha256": "0ssyyw67pvl6py33gq9cfhqlpbsw5dwli130h6lqnjm6yy8li8z5" + }, + "stable": { + "version": [ + 0, + 1, + 3 + ], + "commit": "dcc8ca8b9c1e42e637b9225b7ad8a3d50dd01be6", + "sha256": "0rrpjq3dczwp2vj4dclylid27hwd0am0l8p9kqy67wldkkcc0qz2" + } + }, + { "ename": "rc-mode", "commit": "d8062b2e5b2744a6e614b389cca7e7f21b582f6f", "sha256": "0p77mckw8jyxcwspj1ffm8mz0k01ddm67hh9j8rw812wddwnj7qf", @@ -77580,16 +78318,16 @@ "repo": "realgud/realgud", "unstable": { "version": [ - 20190724, - 2001 + 20190912, + 744 ], "deps": [ "load-relative", "loc-changes", "test-simple" ], - "commit": "11c57cd2ea898c2167ad6c7f80eb1807109d8260", - "sha256": "0x5d2g18sywh36gp1l2pbjfx4qp3gpvgrkx8gvjsgjdfgmpiygag" + "commit": "cc5d1236879a2dcdd91c9a842987f2f5a3accd11", + "sha256": "0a27lmaqbhg227insacadrcxhzi6pi64hj4yx3mkppnhiyaasy6v" }, "stable": { "version": [ @@ -77673,15 +78411,15 @@ "repo": "realgud/realgud-lldb", "unstable": { "version": [ - 20190604, - 702 + 20190912, + 1335 ], "deps": [ "load-relative", "realgud" ], - "commit": "f2f77d6ddfa42430ead400eaf81c605c3a04dead", - "sha256": "0n8nagjhgyg2l0qymx4rjzigxnhhks86s8flpndsfyhzh98b8qbm" + "commit": "47cb0178fdde50a9d9151ab45806b41007cd758a", + "sha256": "11vaiq7c4iaypsgs4x4sdfycjailba36qh0pwgdprmiyf8swy8hq" }, "stable": { "version": [ @@ -77805,15 +78543,15 @@ "repo": "realgud/realgud-trepan-ni", "unstable": { "version": [ - 20190528, - 2211 + 20190912, + 1418 ], "deps": [ "load-relative", "realgud" ], - "commit": "4cd936edcc89324a819b21aa1afd331c02e6bd3e", - "sha256": "0h0d8566km6v7rgiqx54lwazwwl929npxicg8dx8qw12q13vkk31" + "commit": "6e9cac5e8097018aadf41c88de541168036cc227", + "sha256": "0xc80mhqk26vm1sv8xz0zw0pmbznvdpb8gla5bh3rnxpadpannc3" }, "stable": { "version": [ @@ -77831,6 +78569,30 @@ } }, { + "ename": "reaper", + "commit": "034737d27ad4305b526210e82fe320db4f72a84c", + "sha256": "0yr1nb550903g0i2x7arw155v0x5vi4hbdniddwaxa4v9712gphj", + "fetcher": "github", + "repo": "xendk/reaper", + "unstable": { + "version": [ + 20190920, + 2209 + ], + "commit": "1c58c96380b8dc31002bbc87100c3faecfa01f1b", + "sha256": "08yfwxpqsr0qvy8bhj650n2yd2dxs2miciszngbnplrkkvdy0v7g" + }, + "stable": { + "version": [ + 1, + 1, + 0 + ], + "commit": "1c58c96380b8dc31002bbc87100c3faecfa01f1b", + "sha256": "08yfwxpqsr0qvy8bhj650n2yd2dxs2miciszngbnplrkkvdy0v7g" + } + }, + { "ename": "reason-mode", "commit": "f9f1a18c13601f3a4fd7b1bbfe7d5da07746e492", "sha256": "07sirgj8bs9yv7pbx1lahwslvjd2aadkzkz7lsyw6xflj5fxpggr", @@ -78350,11 +79112,11 @@ "repo": "alvarogonzalezsotillo/region-occurrences-highlighter", "unstable": { "version": [ - 20190830, - 1152 + 20190905, + 730 ], - "commit": "5f52084d77c22df3b57e96a7ce0dc69679088f4e", - "sha256": "1p0q7dgchh9cjj0rknas3g40d5lfcp9qrxfbpq6hqzz569f6pc2y" + "commit": "ee86d6a79342c6e4b3cfad5ec73cb0a40e18ae3d", + "sha256": "06y1hbqgdw2y0isn26wmwrqjxb1ypwrqhcjg4n69mdn74cwlk4jz" } }, { @@ -78421,8 +79183,8 @@ "repo": "proofit404/relative-buffers", "unstable": { "version": [ - 20160221, - 1923 + 20190914, + 1042 ], "deps": [ "cl-lib", @@ -78430,8 +79192,8 @@ "f", "s" ], - "commit": "2547475084244d266b507e563c9b4034705cfeca", - "sha256": "16m4qyjg0ca1j944ra1qhhg9ks3sk0rv5ax59rqga20l8wf6k0jq" + "commit": "496fd31530adc455992b2bac535900fd29b9ad51", + "sha256": "14nqs14ml33wlrm268dpijs0n2b12yrlysk1qd62fc7k5hvz9wxl" } }, { @@ -78733,11 +79495,11 @@ "repo": "tkf/emacs-request", "unstable": { "version": [ - 20190819, - 1735 + 20190923, + 1502 ], - "commit": "f0aeeb5fc17ae270d9a109299edc48e8cf2bf2b6", - "sha256": "09kdi4mijv6wzcizh7f9lvdszb12csh52yy1r8y7njmma5hqfndp" + "commit": "61b29734d7c44a594598a7674f2c6c575462dd4b", + "sha256": "1c8giy34pqzcdh3a7afp4308bj0764wk87c3smfkihfl3clc53ys" }, "stable": { "version": [ @@ -78764,8 +79526,8 @@ "deferred", "request" ], - "commit": "f0aeeb5fc17ae270d9a109299edc48e8cf2bf2b6", - "sha256": "09kdi4mijv6wzcizh7f9lvdszb12csh52yy1r8y7njmma5hqfndp" + "commit": "61b29734d7c44a594598a7674f2c6c575462dd4b", + "sha256": "1c8giy34pqzcdh3a7afp4308bj0764wk87c3smfkihfl3clc53ys" }, "stable": { "version": [ @@ -79078,21 +79840,22 @@ "repo": "dajva/rg.el", "unstable": { "version": [ - 20190828, - 1339 + 20190925, + 543 ], "deps": [ "cl-lib", "s", + "transient", "wgrep" ], - "commit": "64f25282fbba3cb436dbaabe73f5a5417f2daaa8", - "sha256": "003da113ak5bx2jdcy0ffkm2ihg013m1vk9v7pc5k65xb262c5wz" + "commit": "d948457034527f1ed9d0d3b00ee81d7ff0abfc02", + "sha256": "1hqdhrzhr4yyn0n8pd7xxbj76ibzb6zb35yg8c3kwsba7m3sm6vi" }, "stable": { "version": [ 1, - 7, + 8, 0 ], "deps": [ @@ -79100,8 +79863,8 @@ "s", "wgrep" ], - "commit": "77670a4bcdba138a0cef3fb12a20b1492dca902a", - "sha256": "0hpxkpyylzvzzvqc51ac0r89nv1jdymb8nmsb03sq1svsw5nyag9" + "commit": "df76c35a7c370f34e23f4ad20a22aacce5581165", + "sha256": "0p29hcf0gcswlsy4cy68byys459358v14fzdbz38j1diz5g5ac6p" } }, { @@ -79494,11 +80257,11 @@ "repo": "DerBeutlin/ros.el", "unstable": { "version": [ - 20190720, - 1439 + 20190919, + 1939 ], - "commit": "ef443866c2f9ad6b2099fe04552a71c654799808", - "sha256": "071k37019v7fx75ssw823rsgzgmicgpnm641qdfz47zagg9b1xg6" + "commit": "967963404824052f25913906f506b090ebba221a", + "sha256": "09p9dcybkabkrdvv0ss9jgbmn87zilgijpxhd0r18qpb5hipyr8g" } }, { @@ -79595,15 +80358,15 @@ "repo": "pezra/rspec-mode", "unstable": { "version": [ - 20190609, - 1123 + 20190912, + 856 ], "deps": [ "cl-lib", "ruby-mode" ], - "commit": "bc2618a71e0bbef60258cf59bad0796f469a2685", - "sha256": "0ivcp2gvysr6lx0dv2d9g4bsc5sb6h6qjn5b0yr67lbs0r6wrvva" + "commit": "66ea7cc9699d6edc6115daa024818adbd85efc20", + "sha256": "0b11s8r0pi7ah54km4yg4fqff8wkk409d25qnlwm1l94pdwjd1c8" }, "stable": { "version": [ @@ -79626,11 +80389,11 @@ "repo": "Andersbakken/rtags", "unstable": { "version": [ - 20190820, - 502 + 20190918, + 505 ], - "commit": "6289e66a69d0d5ff20b12da91e735d3984ad6f88", - "sha256": "1ggdi4mgqw1cc0w6cijds7s4vb575v27g72h6md8h1jdsfv6pvrm" + "commit": "d3d4bc9b7b829d39628a1af96f06eb23ba48670c", + "sha256": "0fgxrpqvqs988kjnkcc1lmyqnfc85ivhrarldl7iqgj25fvni6z1" }, "stable": { "version": [ @@ -80098,11 +80861,11 @@ "repo": "rust-lang/rust-mode", "unstable": { "version": [ - 20190517, - 2037 + 20190923, + 2214 ], - "commit": "48290d331d923031156bbbaf8360b774bf983d1e", - "sha256": "0xws8mrbrzhfy9kf2p68kwxvshayzbhrnqs6jjvv89h4aaj3630i" + "commit": "295e234e5ceb62c047c50ff14bd6ab0a39499816", + "sha256": "0hm3mii2d6p93jf4ld8rkrk55pklzj7zlsy14rrc6xh02n2lzzi4" }, "stable": { "version": [ @@ -80145,8 +80908,8 @@ "repo": "brotzeit/rustic", "unstable": { "version": [ - 20190820, - 1448 + 20190922, + 930 ], "deps": [ "dash", @@ -80160,8 +80923,8 @@ "spinner", "xterm-color" ], - "commit": "cb03a31bff0b1a13ff1ac90c1fd9bc89c55fbb0e", - "sha256": "0n0vrlv9l9d8qa4vrkvy5jaj6j4qvlqkjz1p5rya2vmiv4wb56ba" + "commit": "911676a82fb561cc59c9e54e87d566c5a23469f5", + "sha256": "1nlp7apy7d6dwxhn61awdy2vhckjjsps4wk0ffjrnjnjhypljwqn" } }, { @@ -80199,8 +80962,8 @@ 20190816, 1209 ], - "commit": "539abca4651dda2d667a44f172957df39fa76eb5", - "sha256": "1n3biqink9zfbj4r94519xn68xigkvx16caj35njfzc05pkmvawc" + "commit": "0bb210f37539e9d0c1e77ae286a0d7db79cf8edf", + "sha256": "1x093wq7srgby3608n3q1vkdfvx9b98q7mzfhxwmy3999y7qhsk5" } }, { @@ -80548,14 +81311,14 @@ "repo": "clojure-emacs/sayid", "unstable": { "version": [ - 20190826, - 1037 + 20190919, + 654 ], "deps": [ "cider" ], - "commit": "6febf397d5d610d28100fb1381a82d5e77f0d261", - "sha256": "0ra8xjsmagjwa1qakr1x4f9l88f3zj686dyk88q9qj1bvyam8r33" + "commit": "277404a6bb0a979e195df5886fc143bb1d1f1e8c", + "sha256": "0whsfl6z39zhjm6b3wcliwfs70xz3pg9b1r6s2bcwnp5ld1v65m9" }, "stable": { "version": [ @@ -80605,8 +81368,8 @@ 20190413, 1246 ], - "commit": "c060053d3b4818bf6d0620b0711be845795c4157", - "sha256": "0w3s32kk7mr9605mmssxrh4izq1wllxccd1hs4hcn2fz04igd9b7" + "commit": "497baa7a4f9e688b7c9eb6f16dd57e645202e041", + "sha256": "0ss7wkc46xmwgldhdygx0344zh2c51ny2xbj869sqpky1wi72z4c" } }, { @@ -80953,11 +81716,11 @@ "repo": "emacs-pe/scribble-mode", "unstable": { "version": [ - 20181204, - 325 + 20190912, + 200 ], - "commit": "217945d54de5e4bb207033f2116baa28f5c5ecf2", - "sha256": "1s5ccw1a5ack01wd94ywfcrar9j98agchwdh30q7iyxr0d2z4sii" + "commit": "5c3ea3cc9bbad585476eee41ea76dc056c2012bb", + "sha256": "0p7mch1z289hjxmdb4w04sdixkqqvjmrrw92yd6akr551yj0jbhx" } }, { @@ -81614,11 +82377,11 @@ "repo": "vspinu/sesman", "unstable": { "version": [ - 20190623, - 1123 + 20190909, + 1754 ], - "commit": "e8bfb0e37940bf5f370ae300b896dd04afbc63c8", - "sha256": "0p2hlrsy2s7pkqlsdicbv3jm2bg16nlrwpllqgnvbqss6jrasx17" + "commit": "edee869c209c016e5f0c5cbb8abb9f3ccd2d1e05", + "sha256": "16d4kkfmrzc4d0smk9m759mv11bvicixrvwh1za7c6avscg9lym2" }, "stable": { "version": [ @@ -81784,11 +82547,11 @@ "repo": "Shopify/shadowenv.el", "unstable": { "version": [ - 20190818, - 2128 + 20190903, + 1907 ], - "commit": "1887f606db73846d7da6023cb8944efbc791377c", - "sha256": "1izivy5vz2x86yqbip69jz7sfrjwfm0gsya95ynic7q9qqnq7bmj" + "commit": "f3cbe25c82f99367ac009d67a2400eb6d56547ff", + "sha256": "10y7qcb61f0x17fy5h2flhvyyql99cshqmfy1varn1mgg2h36mn9" } }, { @@ -82130,8 +82893,8 @@ 20190826, 741 ], - "commit": "3e75463de69ce58ae57aca3b7f5e851a728c499c", - "sha256": "13a112i5dxsgmphdckzlfa2nys2pfs02ps8i3fas8vq04zk4314n" + "commit": "f5abefa599e63a769b08debf1aa8f13e77a2b1b4", + "sha256": "0kr136ya51iw5nv72jrkk2wn6m2zr86b19b93i1pplhvq465a9bm" } }, { @@ -82203,11 +82966,11 @@ "repo": "elpa-host/show-eol", "unstable": { "version": [ - 20190517, - 257 + 20190924, + 621 ], - "commit": "ea4d5253d2a9ee61f0e76898f0ab760b5574df43", - "sha256": "1nmx1nxwb6fqkl5h988cjs3yi5cp65wm50w2lbffjd15pswd9kyg" + "commit": "097a2a79e5bd7c297bcdc231559813056cd584ac", + "sha256": "0yhwd20azk6ib992fy3vzb9knqji3g6hz3ahz89sz71sjjvy1rrm" } }, { @@ -82473,11 +83236,11 @@ "repo": "rnkn/side-notes", "unstable": { "version": [ - 20190816, - 303 + 20190903, + 818 ], - "commit": "96c4677ba4dc91c8100c93d3af6f165c21db3e05", - "sha256": "1gway2ljpi1ac0ssy9r11pvy50j6c5y10wfs4bizlqhzdpjfinh2" + "commit": "0d23b13938d4443463ee66956bf57e0a459cb166", + "sha256": "1mg0x390nzr844l4zlr4ismkxb9zyy35kg8zjlmy6pcggn7cf82c" }, "stable": { "version": [ @@ -83072,15 +83835,15 @@ "repo": "slime/slime", "unstable": { "version": [ - 20190818, - 1634 + 20190925, + 1213 ], "deps": [ "cl-lib", "macrostep" ], - "commit": "cbab3e9a1bc4f1a03ee21f392a499f01333af816", - "sha256": "0y645w8lp1f51xx0f36fv2fz1lgk2w1rk7v6brxfg44igbb4c6sv" + "commit": "0bd5891373adf44ab453880dc5549ef53ffc9dba", + "sha256": "1dpl1xb5psm83ls5nsl34wiw5zz5csmdm6vfqdr7szxncdsfjij1" }, "stable": { "version": [ @@ -83565,14 +84328,14 @@ "repo": "jojojames/smart-jump", "unstable": { "version": [ - 20190423, - 158 + 20190925, + 1518 ], "deps": [ "dumb-jump" ], - "commit": "7df77da872dc836dbf032388fc6de82dbc9fa22c", - "sha256": "0w8jfsm6k2ayk0hg0imsm2vv8y5im5crlij9zi18iwa1mrqkmhsp" + "commit": "07800ddd508cf620e6360e4a1f5bb25f8eab3ab1", + "sha256": "0g6s5v2mpdd06i8yih8c8qj3bz1j1bdnki1937mn5ca163gjlrr9" } }, { @@ -83750,11 +84513,11 @@ "repo": "genehack/smart-tab", "unstable": { "version": [ - 20170902, - 2107 + 20190916, + 137 ], - "commit": "76a8ec13384975d39aa1b25e5384a02558dba574", - "sha256": "02mj2is05adq5v64aahivbkx2kzrxmmg2va650hsvl4izj3dr2x3" + "commit": "0f6963ce4de403fa43f3db68b31ce059f6251c3a", + "sha256": "16rh9wwjnqjk7hf7npfvwf28wmhd7bwnsnfgh592gv70xkcwywaa" } }, { @@ -83806,15 +84569,15 @@ "repo": "Fuco1/smartparens", "unstable": { "version": [ - 20190728, - 2037 + 20190904, + 1742 ], "deps": [ "cl-lib", "dash" ], - "commit": "7080e7fba9f478c2e5d4c18a325c3a5d60f6be76", - "sha256": "029hy609p74w36ivcnw40x6j2v6agjg5bha4k8wbch3wf9y823mz" + "commit": "12856838cf9b0e6a635a6ceb14a22fdc03b04728", + "sha256": "1252j96slvipjlixp9gzlsa5za7zx9a7piz661qmbv6pb812ibfr" }, "stable": { "version": [ @@ -83924,11 +84687,11 @@ "repo": "aaptel/smblog-mode", "unstable": { "version": [ - 20170419, - 1021 + 20190920, + 1823 ], - "commit": "5245e7aeac20915121946f59bba30899305d950b", - "sha256": "0i5q29b3hk644dnc0d98d613l065p0k846ljg13vgawpiic6ld6b" + "commit": "fe866afbe19f804f80c37e077192576e4b0aad1a", + "sha256": "19zynq5izaafkj97a1f7dz8fljdr0mxsal8xcfa938clxihydaaz" } }, { @@ -84131,28 +84894,28 @@ "repo": "kyleam/snakemake-mode", "unstable": { "version": [ - 20190412, - 228 + 20190912, + 308 ], "deps": [ "cl-lib", "magit-popup" ], - "commit": "d49c6580e5e01a5e80198f4026caf1d5a717f8a0", - "sha256": "0lxxd0a735sy4igncf6f0ljk2wy38x2pm1yq90gxymwi26j75ram" + "commit": "239b0c812b6963877d64c7051128353f2b9bcb55", + "sha256": "11p5gcpb4j5y1wbz212wi8nc7vznbxd70aafb1891q6bcli10g2c" }, "stable": { "version": [ 1, - 5, + 6, 0 ], "deps": [ "cl-lib", "magit-popup" ], - "commit": "0cadd2bbd20aae1555561e81ed72fec43ec7296e", - "sha256": "1i4cwdyhfyawfx07i63iqdx524mlphgbrl44wqqnnxrbdqm0h534" + "commit": "239b0c812b6963877d64c7051128353f2b9bcb55", + "sha256": "11p5gcpb4j5y1wbz212wi8nc7vznbxd70aafb1891q6bcli10g2c" } }, { @@ -85574,11 +86337,11 @@ "repo": "srcery-colors/srcery-emacs", "unstable": { "version": [ - 20190526, - 1227 + 20190909, + 1149 ], - "commit": "a47a40c7c5d39d251bf15e45f184565c5240b33e", - "sha256": "1i3c7y0a7dzvb3c8pk69gvh33945bhm00j0fwl49yh7hg2d9w118" + "commit": "0879e2fe1872fe11c3ddfab631987ed64bb5c437", + "sha256": "0mwy50rydy64zcy9g08b952vjd5ij9gwgcsl6ipaq52kjhs7x8l8" }, "stable": { "version": [ @@ -85726,11 +86489,11 @@ "repo": "cjohansson/emacs-ssh-deploy", "unstable": { "version": [ - 20190816, - 2237 + 20190917, + 530 ], - "commit": "d0f7294d23380766dcabdb4ed21bc6a68e496110", - "sha256": "1w4zd38whpqidhfscbcns7y14ixw6lq2x6wirfjxybq3yilgz9j2" + "commit": "93a0e189a06d49b03627c65fe77652bee9f129d4", + "sha256": "1ijmnn3f6ymm04fbp6xmsvc1nrxgcj0k90462ffyl6adbzv4f82a" }, "stable": { "version": [ @@ -85781,17 +86544,17 @@ }, { "ename": "stan-mode", - "commit": "67a44a0abe675238b10decdd612b67e418caf34b", - "sha256": "17ph5khwwrcpyl96xnp3rsbmnk7mpwmgskxka3cfgkm190qihfqy", + "commit": "0d31e038cd133936085994641f9af2bb7d15ba36", + "sha256": "1pvdh1pgjcbvkw2qh1mpazfrmcjhwv95a1s4flbn4zijmb2zigdf", "fetcher": "github", "repo": "stan-dev/stan-mode", "unstable": { "version": [ - 20190805, - 1427 + 20190921, + 111 ], - "commit": "e60fe0caecb8e84d0b8fc160a0cdf8343e33d905", - "sha256": "16wl8r1409v3cjfb91fkv42gf9cbzgcd1cvqpypj3jm3hdmlz9gz" + "commit": "80930bb4f222b8fa11b1e64ba2f2905c0d3dd228", + "sha256": "1sqana7wy8r7l6zy8sjv89a92qqlxn4z1zckbjk2zld68hp6q6cd" }, "stable": { "version": [ @@ -85805,21 +86568,21 @@ }, { "ename": "stan-snippets", - "commit": "eda8539b7d8da3a458a38f7536ed03580f9088c3", - "sha256": "021skkvak645483s7haz1hsz98q3zd8hqi9k5zdzaqlabwdjwh85", + "commit": "57f9fe7c4735d4106ad2a0f27331c3e3fe8833c0", + "sha256": "1ar2abnlav1sy9622387ps5gr7fls0mx2msczvan4wrc1nnfvwdx", "fetcher": "github", "repo": "stan-dev/stan-mode", "unstable": { "version": [ - 20190805, - 1427 + 20190921, + 1827 ], "deps": [ "stan-mode", "yasnippet" ], - "commit": "e60fe0caecb8e84d0b8fc160a0cdf8343e33d905", - "sha256": "16wl8r1409v3cjfb91fkv42gf9cbzgcd1cvqpypj3jm3hdmlz9gz" + "commit": "80930bb4f222b8fa11b1e64ba2f2905c0d3dd228", + "sha256": "1sqana7wy8r7l6zy8sjv89a92qqlxn4z1zckbjk2zld68hp6q6cd" }, "stable": { "version": [ @@ -85939,14 +86702,14 @@ "repo": "Kungsgeten/steam.el", "unstable": { "version": [ - 20171109, - 13 + 20190916, + 627 ], "deps": [ "cl-lib" ], - "commit": "d6ca2a828b0824da51978397e198bf91c51ce793", - "sha256": "16cxws1b3iwm9aqbiip298zsjm6gwjihpvkia4p0zvzynwhflw8q" + "commit": "f32951f4e0a4bc92813d0121d9df0257101b8992", + "sha256": "1fl4875992xxv0amcqj7b516f35k19h8fd7pij0by5b808k5ls6x" } }, { @@ -85990,8 +86753,8 @@ 20171130, 1559 ], - "commit": "143146feada95b8be228d339114f2c469a78bbb9", - "sha256": "0dknxxp320zy3zrrbqsgl4d8jj4i2xcmsa6n91zpvdnb035658pp" + "commit": "43559408e8340e8fac588c5711c40f7cdca48f96", + "sha256": "1w576zzb0dzffn59bxf14z32vy7rmdj4k8ms2dy7qn4vhmyr38jx" }, "stable": { "version": [ @@ -86052,6 +86815,24 @@ } }, { + "ename": "stock-tracker", + "commit": "5e959303b4c0a07c821252a913b578f70b5f41ad", + "sha256": "1gc4z980rp9s0nvbrbp792ckyw12ahfsk3a3whf12vb3anmmgd7b", + "fetcher": "github", + "repo": "beacoder/stock-tracker", + "unstable": { + "version": [ + 20190902, + 812 + ], + "deps": [ + "dash" + ], + "commit": "c7455081fa78fd8ffa229dcf0c691f66bf2ece16", + "sha256": "19phvf5xcaiwlxx0s8p9ys6xrw6ljp9qxjik98v2ab6d8f2x123q" + } + }, + { "ename": "strace-mode", "commit": "9b2003bee9992d9e79124d95d30b573c8a6bdbfe", "sha256": "16v350nqdxmmk1r4z25bssm436xcm4cvnaxm7f3wxwvmg9z0gx8d", @@ -86561,14 +87342,14 @@ "repo": "aaronbieber/sunshine.el", "unstable": { "version": [ - 20181029, - 1654 + 20190905, + 1832 ], "deps": [ "cl-lib" ], - "commit": "8959dea03377e61aaca0124ac8d2703daaae6b9a", - "sha256": "1shzhl5bi5dkmvc07mc7sknm5id89iivjkcxsrdcw004g08hr8y0" + "commit": "5e57899b2201dd36ae7242aa13ca82efcded3b7c", + "sha256": "1l7mls11k9v524c2f4d2xk6b8gydl5mgrpjf7vnngwz63mdy263n" } }, { @@ -86810,6 +87591,26 @@ } }, { + "ename": "swift-helpful", + "commit": "052fb5b561bee1dd71c2c227c75c4f6db4261f68", + "sha256": "0rrhi14asrswzg4pn38vyqrc0bh83bs4jfvdj3sbd7jd1zizgj09", + "fetcher": "github", + "repo": "danielmartin/swift-helpful", + "unstable": { + "version": [ + 20190923, + 1022 + ], + "deps": [ + "dash", + "lsp-mode", + "swift-mode" + ], + "commit": "5d07fa0d574a3ef58dfb0341da118e37c86bf6c5", + "sha256": "1jf4544jzn75vkxhxaj3xk3284nz94ik1gxk6b5hzy0r643ccklw" + } + }, + { "ename": "swift-mode", "commit": "6440f81aed1fcddcaf7afeedb74520e605211986", "sha256": "103nix9k2agxgfpwyhsracixl4xvzqlgidd25r1fpj679hr42bg8", @@ -87345,14 +88146,14 @@ "repo": "emacs-berlin/syntactic-close", "unstable": { "version": [ - 20190513, - 947 + 20190923, + 1030 ], "deps": [ "cl-lib" ], - "commit": "2bd46845b664ae828c8b973839ef454cde501028", - "sha256": "1r1ia1yw43vvyk62d6r1k55zcz185777s10ix9bg3fllczdbyzcz" + "commit": "a6c2c24453d18a653fe365707692ad354781cba3", + "sha256": "0k3ndhgw2hglkd572zgyaf3znk6pmm8sdn4ma681b4vd7m1j2yw1" } }, { @@ -87410,6 +88211,37 @@ } }, { + "ename": "syslog-mode", + "commit": "44b28cc63352e4398a94338d885371226d1e81aa", + "sha256": "15kh2v8jsw04vyh2lmh1ndpxli3cwp6yq66hl8mwb1i3g429az19", + "fetcher": "github", + "repo": "vapniks/syslog-mode", + "unstable": { + "version": [ + 20190913, + 2040 + ], + "deps": [ + "hide-lines", + "ov" + ], + "commit": "18f441bf57dd70cdd48a71f1f4566ab35facdb35", + "sha256": "1xl6immya0i5xjpls3vqdqj9rr5jxp5srny8l9j4qxf8kp75byqa" + }, + "stable": { + "version": [ + 2, + 3 + ], + "deps": [ + "hide-lines", + "ov" + ], + "commit": "18f441bf57dd70cdd48a71f1f4566ab35facdb35", + "sha256": "1xl6immya0i5xjpls3vqdqj9rr5jxp5srny8l9j4qxf8kp75byqa" + } + }, + { "ename": "system-packages", "commit": "7d3c7af03e0bca3f834c32827cbcca29e29ef4db", "sha256": "13nk3m8gw9kqjllk7hgkmpxsx9y5h03f0l7zydg388wc7cxsiy3l", @@ -87776,11 +88608,11 @@ "repo": "saf-dmitry/taskpaper-mode", "unstable": { "version": [ - 20190805, - 1153 + 20190919, + 727 ], - "commit": "3f5b0981a87f1c4895961f36e0a67b69ccbbb18d", - "sha256": "194m2rm1yv7jp6nb7mm3m4hyhj81i379ky7ifaisrvc1jm3dwp6n" + "commit": "c95fb2375b0c8d448a347241eb95f160e6880e99", + "sha256": "18qdnjxr4p4a2ds4k7sk5kkykyxcfri8zws3bhisfz1kayad1wlg" }, "stable": { "version": [ @@ -87792,6 +88624,25 @@ } }, { + "ename": "taskrunner", + "commit": "f0e0354a4da2e675406068d158c7e532cd5ed083", + "sha256": "0dyqqlafzxn0irmqwfh9rjysn1vm0wxlapg3pzgqps1w4mkkvwc5", + "fetcher": "github", + "repo": "emacs-taskrunner/emacs-taskrunner", + "unstable": { + "version": [ + 20190916, + 1608 + ], + "deps": [ + "async", + "projectile" + ], + "commit": "716323aff410b4d864d137c9ebe4bbb5b8587f5e", + "sha256": "03llmj09jg5cba927qbzkhld83k24yd1i95nfiq7q754a4y4iksn" + } + }, + { "ename": "tawny-mode", "commit": "ea9a114ff739f7d6f5d4c3167f5635ddf79bf60c", "sha256": "1xaw1six1n6rw1283fdyl15xcf6m7ngvq6gqlz0xzpf232c4b0kr", @@ -87799,14 +88650,14 @@ "repo": "phillord/tawny-owl", "unstable": { "version": [ - 20170422, - 2202 + 20190912, + 1357 ], "deps": [ "cider" ], - "commit": "1be07e047343a1bdbb1a8ca40ff6ed3fbb585dec", - "sha256": "1x6544hk87pxlvjv136wi3ixswpd621zjmv20c85bxj8zaasc80n" + "commit": "217ca22fdff89a2bbe23d67afd43c06f928de826", + "sha256": "0w16icw1g1naaasvnjaggjvqyfbbwmc4xlw928dnqyfyys2a4j60" }, "stable": { "version": [ @@ -87957,26 +88808,26 @@ "repo": "zevlg/telega.el", "unstable": { "version": [ - 20190830, - 1446 + 20190925, + 1406 ], "deps": [ "visual-fill-column" ], - "commit": "f8f28c739dcc8f52c3e66368b06c0cfcd48e83a9", - "sha256": "0ynhw9ai906y4405r8wdalx09hinfns9n01cg96nc4fgbqkhbpdw" + "commit": "cfb9a581b0832266386f3a6229d3e4f944168652", + "sha256": "1s0zg7a737vsd1yxwnlxgh7w19i9w52scm1402fsil3i8sgznr1f" }, "stable": { "version": [ 0, 4, - 0 + 4 ], "deps": [ "visual-fill-column" ], - "commit": "529003333797fade89a04a8b3fba9099f6585c08", - "sha256": "1a5fxix2zvs461vn6zn36qgpg65bl38gfb3ivr24wmxq1avja5s1" + "commit": "4457087e1e34e7340d3678714807335665d798d8", + "sha256": "0s2a9hwa775qyfad1zikah0vnpn9mbydzf8ipsyabns2hhjzf225" } }, { @@ -88409,8 +89260,8 @@ "cl-lib", "json" ], - "commit": "9ddff4ca9bce7f46694b15c51799904ff41131b6", - "sha256": "1kbwaqhb86kidmygn9gcgskrkniqp3x71cl0qgrzgp1cjl0g9xcd" + "commit": "556f5559255518865456af0b228f86bfabd43e6b", + "sha256": "1dvdd4vzdfkgb9blc6f5402kknp3ppxjyd94cn696rlfrya58vmm" }, "stable": { "version": [ @@ -88442,8 +89293,8 @@ "cl-lib", "tern" ], - "commit": "9ddff4ca9bce7f46694b15c51799904ff41131b6", - "sha256": "1kbwaqhb86kidmygn9gcgskrkniqp3x71cl0qgrzgp1cjl0g9xcd" + "commit": "556f5559255518865456af0b228f86bfabd43e6b", + "sha256": "1dvdd4vzdfkgb9blc6f5402kknp3ppxjyd94cn696rlfrya58vmm" }, "stable": { "version": [ @@ -88967,18 +89818,18 @@ 20180905, 1050 ], - "commit": "562e52d2ecc53b86c56c7ee4e88288b45fe2e4e3", - "sha256": "10hxy7iwz24qcagpmi6vvkw7zv04ly4r5ym3sw8wzhcsb1fslzgf" + "commit": "ba36b4665dff17fa3996c114be56c1d0673aca4e", + "sha256": "070nd0dxz1gcw3dsf913gs5p8p7xm83l0g52hpq2cg9max5xr07n" }, "stable": { "version": [ 2019, - 7, - 29, + 9, + 23, 0 ], - "commit": "e30e8a85fdd5e66318be64a66f879e42ace97825", - "sha256": "0n9yvw7m3wj5nphiavb27s8g8nnzwlm42k781y6rzwb0q8baxnzz" + "commit": "2f9839604e2569120cc4876c667388da6d7342f2", + "sha256": "13sma0vbm5g90sa8yxw03rna1kx0nv7zimm8nnw13k1swv0zm21l" } }, { @@ -89034,8 +89885,8 @@ "deps": [ "haskell-mode" ], - "commit": "621d95f6563d550bf777a51a2010f23382d61a78", - "sha256": "0ps8zjfkwjan5ziil6jhz7ls3mzgk970js0gaja3ndwsd5nlsmq2" + "commit": "6c25387d6ba088258c6ae2fe0079936395ff8f8d", + "sha256": "1bnva874xw3i8qqh4w1jy16jhmxv3b3n86dsvzcrpmq4nk09m5lh" }, "stable": { "version": [ @@ -89416,11 +90267,11 @@ "repo": "snosov1/toc-org", "unstable": { "version": [ - 20190603, - 803 + 20190902, + 1055 ], - "commit": "2539b4be401d006e2752f6ad3b88e696889a7fc8", - "sha256": "1d9jj6vgz5f29xqbx1hh0nxkzbql66z3ygxrksry0xjyxabcmnc2" + "commit": "379b457fcff091d2fa47223ade58f457fd6eed28", + "sha256": "1pbc4ni9sw99r6z9zm1khlyvf1sxy1813ilv73ai7q2619y6njja" }, "stable": { "version": [ @@ -89440,16 +90291,16 @@ "repo": "abrochard/emacs-todoist", "unstable": { "version": [ - 20190627, - 2139 + 20190925, + 39 ], "deps": [ "dash", "org", "transient" ], - "commit": "ca38839638580001600f076c8075369916d24507", - "sha256": "1l6zrsfx4b06rl07ndlyabqg8pp1bnila40cgadpnmqvh5w6sfdz" + "commit": "9c6b4e6abcd53d323a992181d6b5ac72cc370c72", + "sha256": "178wb528lpf5phcw2nqpmb83k86by59kfmp4qhwixgagnwzz89r5" } }, { @@ -89514,8 +90365,8 @@ "deps": [ "cl-lib" ], - "commit": "b959376241704cabdcf10a8d0d85e8061b5c6949", - "sha256": "0ryh0b6fg9s954dr0gmzfbrykhj8p4m1cjmcli85nympq4xymfbq" + "commit": "34eb4fe7d0a3380083e2e51627ae5968524d240b", + "sha256": "1yh02mrqkn9hp5l1kl4qj5g1jijjvbd77dcssp76gw7nm8dlsn8a" } }, { @@ -89900,14 +90751,14 @@ "repo": "magit/transient", "unstable": { "version": [ - 20190812, - 1336 + 20190905, + 1138 ], "deps": [ "dash" ], - "commit": "9fb3f797f10fd069c2bffa7a3ead746aa53d1a25", - "sha256": "1xyj9ncqz0mrdgn6wg252p8kv2k9h391ni0bvkw8dqwz7xwgfl3g" + "commit": "7bf97594a5ec1b9a682ef5a1537a6b0ecc6d9dfb", + "sha256": "08crxnha8rwkv0npdb624v3xxy50bcb0s8pwm1vvz7ahpzyp7gza" }, "stable": { "version": [ @@ -90042,8 +90893,8 @@ "repo": "Alexander-Miller/treemacs", "unstable": { "version": [ - 20190826, - 1125 + 20190922, + 1026 ], "deps": [ "ace-window", @@ -90055,8 +90906,8 @@ "pfuture", "s" ], - "commit": "48b3cad1a94ec94ecc1ee33a01fe85ef64e5249f", - "sha256": "09dm727sxjzhhc4s0phw9mf67jg5yp6c4qji0fp1ikz00hg3a359" + "commit": "6a0b1fce801bf0791bc3eee7b0dc4bbbcf95e6a7", + "sha256": "16axm791cg49mi61wrqdj5mcadh59zvmslmkfb1bwai5v43br8nc" }, "stable": { "version": [ @@ -90092,8 +90943,8 @@ "evil", "treemacs" ], - "commit": "48b3cad1a94ec94ecc1ee33a01fe85ef64e5249f", - "sha256": "09dm727sxjzhhc4s0phw9mf67jg5yp6c4qji0fp1ikz00hg3a359" + "commit": "6a0b1fce801bf0791bc3eee7b0dc4bbbcf95e6a7", + "sha256": "16axm791cg49mi61wrqdj5mcadh59zvmslmkfb1bwai5v43br8nc" }, "stable": { "version": [ @@ -90123,8 +90974,8 @@ "cl-lib", "treemacs" ], - "commit": "48b3cad1a94ec94ecc1ee33a01fe85ef64e5249f", - "sha256": "09dm727sxjzhhc4s0phw9mf67jg5yp6c4qji0fp1ikz00hg3a359" + "commit": "6a0b1fce801bf0791bc3eee7b0dc4bbbcf95e6a7", + "sha256": "16axm791cg49mi61wrqdj5mcadh59zvmslmkfb1bwai5v43br8nc" }, "stable": { "version": [ @@ -90155,8 +91006,8 @@ "pfuture", "treemacs" ], - "commit": "48b3cad1a94ec94ecc1ee33a01fe85ef64e5249f", - "sha256": "09dm727sxjzhhc4s0phw9mf67jg5yp6c4qji0fp1ikz00hg3a359" + "commit": "6a0b1fce801bf0791bc3eee7b0dc4bbbcf95e6a7", + "sha256": "16axm791cg49mi61wrqdj5mcadh59zvmslmkfb1bwai5v43br8nc" }, "stable": { "version": [ @@ -90187,8 +91038,8 @@ "projectile", "treemacs" ], - "commit": "48b3cad1a94ec94ecc1ee33a01fe85ef64e5249f", - "sha256": "09dm727sxjzhhc4s0phw9mf67jg5yp6c4qji0fp1ikz00hg3a359" + "commit": "6a0b1fce801bf0791bc3eee7b0dc4bbbcf95e6a7", + "sha256": "16axm791cg49mi61wrqdj5mcadh59zvmslmkfb1bwai5v43br8nc" }, "stable": { "version": [ @@ -90357,15 +91208,15 @@ "repo": "alphapapa/ts.el", "unstable": { "version": [ - 20190819, - 102 + 20190918, + 241 ], "deps": [ "dash", "s" ], - "commit": "93c074f2895a204e003e8c7f3033c37d6486fac8", - "sha256": "0lpyv78k04vbp9glnv14dawcfgi3m49847wlgwfmkdq5cr3fn735" + "commit": "395649a2f2ba79028331bb1fa9ec08b218950ff6", + "sha256": "02603wv66fplsigxd87jy23hrb5g9vigszcpdqrdv0ypaqaxlr3a" }, "stable": { "version": [ @@ -90714,11 +91565,11 @@ "repo": "emacs-typescript/typescript.el", "unstable": { "version": [ - 20190710, - 2011 + 20190918, + 1042 ], - "commit": "32146510b8ebb031e468c6c0898a9b253c73617e", - "sha256": "1yhzlgq73px45wy9pz9rx5al510mgzq2bz3rh4j50wpwvl13ja5r" + "commit": "2405090403e2907d7751770bab4a40865ef043ff", + "sha256": "0lsn4p08ka1jpjcb436bbcdk1cnj09ld8x1cdh67m23hcclbssi1" }, "stable": { "version": [ @@ -91037,11 +91888,11 @@ "repo": "jackkamm/undo-propose-el", "unstable": { "version": [ - 20190824, - 1554 + 20190921, + 1533 ], - "commit": "21a5cdc8ebfe8113f7039867c4abb0197c0fe71c", - "sha256": "035hav4lfxwgikg3zpb4cz1nf08qfp27awl87dqbm2ly6d74lpny" + "commit": "505d79053590a411be6d84e1bcd4ce13485e96f0", + "sha256": "1kvpwcry6q28cw0xrzmss0d05kzn1ay4y2c55k3sb2157izxvafn" } }, { @@ -91476,8 +92327,8 @@ "deps": [ "dash" ], - "commit": "c37728e11dedd29d849ba9523465b0cdaccea9d5", - "sha256": "0sp3kcqqj5km6nw6kinhg780vj3bjwf2zj52pmfwpfk8xiy6km5y" + "commit": "1e4b1e7f44f242a6cdcce0c157d07efe667b7bef", + "sha256": "16ic97lpw1d9bqcc0fvzv2n62xb5rlpi92cha3jpy7flbp8ys143" } }, { @@ -91592,8 +92443,8 @@ "deps": [ "bind-key" ], - "commit": "1d5ffb2e0d1427066ced58febbba68c1328bf001", - "sha256": "1a8zpi9pkgp8qkm6qxyzaj3k1s25z3x034mgjqp2mpd7ij76mk8v" + "commit": "4714d73b61bdb378f6e9e3f3838cae1abbf65ea0", + "sha256": "19m31nh2bd7rrlh53wy1hf6sxcqk4qn4wkm5w1c16314d5w56w5s" }, "stable": { "version": [ @@ -91624,8 +92475,8 @@ "key-chord", "use-package" ], - "commit": "1d5ffb2e0d1427066ced58febbba68c1328bf001", - "sha256": "1a8zpi9pkgp8qkm6qxyzaj3k1s25z3x034mgjqp2mpd7ij76mk8v" + "commit": "4714d73b61bdb378f6e9e3f3838cae1abbf65ea0", + "sha256": "19m31nh2bd7rrlh53wy1hf6sxcqk4qn4wkm5w1c16314d5w56w5s" }, "stable": { "version": [ @@ -91686,8 +92537,8 @@ "system-packages", "use-package" ], - "commit": "1d5ffb2e0d1427066ced58febbba68c1328bf001", - "sha256": "1a8zpi9pkgp8qkm6qxyzaj3k1s25z3x034mgjqp2mpd7ij76mk8v" + "commit": "4714d73b61bdb378f6e9e3f3838cae1abbf65ea0", + "sha256": "19m31nh2bd7rrlh53wy1hf6sxcqk4qn4wkm5w1c16314d5w56w5s" }, "stable": { "version": [ @@ -91784,17 +92635,17 @@ 20190715, 1836 ], - "commit": "2405c8dd8f1cb995baeffb90324dc9c0e1966edc", - "sha256": "1jm3sagissbw8012mnppknsxl9dqd9514b891b64disqhdb5awg3" + "commit": "83ee76fc39b6cb394f5fb19063a3a7da09224339", + "sha256": "0z8klqwqmq5i111p4awzvlvirhm1dxp0mbfagwfiwq1wg72v6zdm" }, "stable": { "version": [ 2, 4, - 1 + 2 ], - "commit": "2405c8dd8f1cb995baeffb90324dc9c0e1966edc", - "sha256": "1jm3sagissbw8012mnppknsxl9dqd9514b891b64disqhdb5awg3" + "commit": "83ee76fc39b6cb394f5fb19063a3a7da09224339", + "sha256": "0z8klqwqmq5i111p4awzvlvirhm1dxp0mbfagwfiwq1wg72v6zdm" } }, { @@ -92052,20 +92903,19 @@ "repo": "muffinmad/emacs-vc-hgcmd", "unstable": { "version": [ - 20190701, - 1115 + 20190910, + 2008 ], - "commit": "dc7d629cec310e97ea195da1592a35f69aa66c66", - "sha256": "14c3hlzabiy113vzmlynd9fqhpakhmbgkjrx9i6c5mwf32hmw8p2" + "commit": "1515cd8cca0b749da482fa1af6e0576da98aa1ac", + "sha256": "19x2vdij1sd18g9gcx0vd9qyn37nq1p9dmyyskqlzqlbzxvhg0nm" }, "stable": { "version": [ 1, - 6, - 9 + 8 ], - "commit": "dc7d629cec310e97ea195da1592a35f69aa66c66", - "sha256": "14c3hlzabiy113vzmlynd9fqhpakhmbgkjrx9i6c5mwf32hmw8p2" + "commit": "1515cd8cca0b749da482fa1af6e0576da98aa1ac", + "sha256": "19x2vdij1sd18g9gcx0vd9qyn37nq1p9dmyyskqlzqlbzxvhg0nm" } }, { @@ -93076,11 +93926,11 @@ "repo": "emacs-w3m/emacs-w3m", "unstable": { "version": [ - 20190830, - 742 + 20190925, + 2344 ], - "commit": "3e75463de69ce58ae57aca3b7f5e851a728c499c", - "sha256": "13a112i5dxsgmphdckzlfa2nys2pfs02ps8i3fas8vq04zk4314n" + "commit": "f5abefa599e63a769b08debf1aa8f13e77a2b1b4", + "sha256": "0kr136ya51iw5nv72jrkk2wn6m2zr86b19b93i1pplhvq465a9bm" } }, { @@ -93168,11 +94018,11 @@ "repo": "darkstego/wakib-keys", "unstable": { "version": [ - 20190828, - 916 + 20190910, + 1011 ], - "commit": "4f3e2c10b8d3b0bd48afb4db9df93ff2ce61c2cd", - "sha256": "0dmcbv4d2h2jxxblq6kqqy4rs8aci1zxl8wccz6zi3v9si4f7sql" + "commit": "23237fc2c255de798b8d3fc2cb68c7c22b53caa9", + "sha256": "1s5n2gcldwj5srjn44pigd788x0hv4c7lz75krqyz1hysriydv9p" } }, { @@ -93253,14 +94103,14 @@ "repo": "wanderlust/wanderlust", "unstable": { "version": [ - 20190812, - 818 + 20190919, + 859 ], "deps": [ "semi" ], - "commit": "ba07b99ee146c7945823874102e7db38e7aa8bd0", - "sha256": "14fp8s1baq3r6gxaf1c50zyk59bnzpnpbpxnp3lvcz1a1i5377ql" + "commit": "7a919e422a48f5021576e68282703de430558879", + "sha256": "0k2jklkpqm33bimxy4vnssdc9xa7wfnvay3ng0av1bwxfgxfrmdr" } }, { @@ -93497,11 +94347,11 @@ "repo": "fxbois/web-mode", "unstable": { "version": [ - 20190625, - 1951 + 20190916, + 1858 ], - "commit": "a723d3ecd3606d1c1948871f46fc8c8d7f879fe4", - "sha256": "1vsm95v47xk63gxg08w8bxlg91l2yqbgqwgaa5706x65q0rzv0xm" + "commit": "a31eb8592f09d789c4b08ccecfdaca6fd2f06a69", + "sha256": "1552wq8v4d0pj00kyhc05a4wq0p639r5yxa0rf6y3n4vy94190ql" }, "stable": { "version": [ @@ -94094,20 +94944,20 @@ "repo": "whizzml/whizzml-mode", "unstable": { "version": [ - 20190802, - 1637 + 20190920, + 2342 ], - "commit": "fe8dd75941aac0749b97c9e4fd3709f828d784cd", - "sha256": "091gyi2qxx96hcq3r6rxkc9jdwmb5kbcsyp4cb6sm0rhiczvif79" + "commit": "5c5be351e11a71b31ede33ce941ce20ee0da75ed", + "sha256": "0i43l3fwdxvm7mrxpqlf3j06w7blcqp0jyz6jici4pyg0bdy4kd0" }, "stable": { "version": [ 0, - 34, + 35, 0 ], - "commit": "fe8dd75941aac0749b97c9e4fd3709f828d784cd", - "sha256": "091gyi2qxx96hcq3r6rxkc9jdwmb5kbcsyp4cb6sm0rhiczvif79" + "commit": "5c5be351e11a71b31ede33ce941ce20ee0da75ed", + "sha256": "0i43l3fwdxvm7mrxpqlf3j06w7blcqp0jyz6jici4pyg0bdy4kd0" } }, { @@ -94549,15 +95399,15 @@ "repo": "deb0ch/emacs-winum", "unstable": { "version": [ - 20181119, - 1705 + 20190911, + 1607 ], "deps": [ "cl-lib", "dash" ], - "commit": "247df36c03d70b453e9b912d6e1b7065644f639d", - "sha256": "0xbbf35cpbp5mayq5497g6m7l264vlf5p612mpz81yd55xs9pi7k" + "commit": "c5455e866e8a5f7eab6a7263e2057aff5f1118b9", + "sha256": "0lj4cp7ml7cjhkd66f6ivcl6sbfs2my8ajjlynzl3pm5qansfw5i" }, "stable": { "version": [ @@ -94581,11 +95431,11 @@ "repo": "ArneBab/wisp", "unstable": { "version": [ - 20190718, - 1218 + 20190921, + 2218 ], - "commit": "5e860c746ee02c764bf378aeb8f436a1a341bd5c", - "sha256": "12qcq5k7xdlqwnq01qdkjf1035idrdmjxb24ya1xsxdkd3jra9dw" + "commit": "0d2c025ac4cfd394706c07fbb60999eaf711020b", + "sha256": "1fs4dpc78aax4mzcp0vzcvzf2mxiwzbdwjfgpylwppxamqdycdwy" } }, { @@ -94683,6 +95533,21 @@ } }, { + "ename": "with-proxy", + "commit": "295a85f94a804b72475b81b324a6120569b8134a", + "sha256": "18453b3687iywd62vnh47yig998l6c8vbc9py1rba1m6a9q01vq0", + "fetcher": "github", + "repo": "twlz0ne/with-proxy.el", + "unstable": { + "version": [ + 20190920, + 24 + ], + "commit": "a7506af86ffc943f5d4cba712ec661125799c30b", + "sha256": "1nxssc8xn8i2zf9bs9rv61im3jxi38lq1ph9qr0hazwncndcsb39" + } + }, + { "ename": "with-simulated-input", "commit": "e4ddf16e19f5018106a423327ddc7e7499cf9248", "sha256": "0113la76nbp18vaffsd7w7wcw5k2sqwgnjq1gslf4khdfqghrkwk", @@ -94690,27 +95555,27 @@ "repo": "DarwinAwardWinner/with-simulated-input", "unstable": { "version": [ - 20170821, - 617 + 20190913, + 1524 ], "deps": [ "s", "seq" ], - "commit": "af9a38ce28a741e6d8742750bef5d7b5afa13796", - "sha256": "0iann7zi9bgd3vmvxvg2n6x24hkyzbchbli1ymsmfrn8rif9byf7" + "commit": "3d881793521c5618cdb0968a85879e0e49da7fca", + "sha256": "12d3mhvzj74qwc4rdcb236jbqnf5lam8pk78j92kwbwjk1jaz2cf" }, "stable": { "version": [ 2, - 2 + 4 ], "deps": [ "s", "seq" ], - "commit": "9efeb236c8f6887a8591d6241962c37266d8e726", - "sha256": "1v8c85ahsk9pz3zndh0c9xba4c78f4b1j97hbv62jirvr75b079g" + "commit": "3d881793521c5618cdb0968a85879e0e49da7fca", + "sha256": "12d3mhvzj74qwc4rdcb236jbqnf5lam8pk78j92kwbwjk1jaz2cf" } }, { @@ -95760,25 +96625,25 @@ "repo": "NicolasPetton/xref-js2", "unstable": { "version": [ - 20170530, - 826 + 20190915, + 2032 ], "deps": [ "js2-mode" ], - "commit": "d5f93605405989529c2f66b542def6c32429b927", - "sha256": "1vzsw257xkqwlgfj8d5hnrirjhxzzs9d8ms40ihb2zwsxn70im53" + "commit": "6f1ed5dae0c2485416196a51f2fa92f32e4b8262", + "sha256": "0pbnhliq3zivijksdhdqd7m3ndc3z7kw2g21zwihq28faps96ikj" }, "stable": { "version": [ 1, - 5 + 6 ], "deps": [ "js2-mode" ], - "commit": "7e2bc6a8dad08a493d11d3554f6374584846b9e6", - "sha256": "1mmd27miv32sl8cj7qhy09yfh7v1zgw7rv4fdwk96msvd4qfdkqd" + "commit": "d48253bf1999815329a294d09f0b1b744a6272ae", + "sha256": "0kg1vdyjd0n48cb8bvjqskzd79s3bgdcpzn80gm2y78m280kakn8" } }, { @@ -96131,11 +96996,11 @@ "repo": "Kungsgeten/yankpad", "unstable": { "version": [ - 20190824, - 1946 + 20190904, + 1507 ], - "commit": "c364607804e943b301ded8a30d7e19dda217568a", - "sha256": "0sqcli05kyafn2x9sd92az3hqc010pypr0dw31mv0vslg0rfkn8m" + "commit": "2f110f4aacb00c58439385cabb18cfaa8d759e64", + "sha256": "1hwmap0z4jjfs5lwmr0zrybzvx49qbqa957wg21l8h31pq40d3k5" }, "stable": { "version": [ @@ -96310,14 +97175,14 @@ "repo": "leanprover-community/yasnippet-lean", "unstable": { "version": [ - 20190609, - 454 + 20190922, + 2037 ], "deps": [ "yasnippet" ], - "commit": "2d57b8ad5c69a1886701d42ca5a8de6bacb170cc", - "sha256": "1d2n3q36s1mri1lmazld6pabx3929kqivkgq6b8qaya04ri8ds28" + "commit": "9119be08a32286d3e8559138e8ae003856ae1c0a", + "sha256": "1q06c574zn0ibbb3zbgi59zxj17i7kyjkcz45sj5h7hbn9l81594" } }, { @@ -96328,25 +97193,25 @@ "repo": "AndreaCrotti/yasnippet-snippets", "unstable": { "version": [ - 20190821, - 901 + 20190925, + 846 ], "deps": [ "yasnippet" ], - "commit": "71ae4a665f0db13165f14687cf5828d4510ef557", - "sha256": "1gaycwqy1s2jvkqswjcbm49157ci5k8apsqlj2x5qs55w71zm5p8" + "commit": "221f2c340af36afb4af2edc2cee92568bb3aba6c", + "sha256": "0wj97n79qlpkqdg9g5wxh25x6y0dzkclsvsi6j1dp0c5p1n9nylg" }, "stable": { "version": [ 0, - 14 + 15 ], "deps": [ "yasnippet" ], - "commit": "71ae4a665f0db13165f14687cf5828d4510ef557", - "sha256": "1gaycwqy1s2jvkqswjcbm49157ci5k8apsqlj2x5qs55w71zm5p8" + "commit": "221f2c340af36afb4af2edc2cee92568bb3aba6c", + "sha256": "0wj97n79qlpkqdg9g5wxh25x6y0dzkclsvsi6j1dp0c5p1n9nylg" } }, { @@ -96386,11 +97251,11 @@ "url": "https://www.yatex.org/hgrepos/yatex", "unstable": { "version": [ - 20190525, - 548 + 20190911, + 27 ], - "commit": "714f3527b4a16daf7a811dcc7b344ac989064f52", - "sha256": "12sqy2wrlgzi71vn3q5h47z1i6l6di3pnr4pmn0ixdp500gvy2fv" + "commit": "9e07513fc2efd1e60e00bff1832ca77ec644166c", + "sha256": "0bs1kizsn2cp26ssj84pk1xqabrvc5kpl4689sjxc4vihfayzd5l" } }, { @@ -96507,14 +97372,14 @@ "repo": "alphapapa/yequake", "unstable": { "version": [ - 20190114, - 1955 + 20190921, + 225 ], "deps": [ "dash" ], - "commit": "4c093fa6ca3b8953ee509c7d8f434984d55ec802", - "sha256": "0y9dhvfp31yn8cgqslk647b8fs1sv0kwwnnjakjhx2zm3ljld3s0" + "commit": "d1f24c1cb49ca4b23fa2a639136ec58ab620cd1f", + "sha256": "1fzy4xfyfjrlsc8jzryqp75qz6i623173qa1w5n6knwdn4hgh4r1" } }, { @@ -96598,8 +97463,8 @@ "repo": "xuchunyang/youdao-dictionary.el", "unstable": { "version": [ - 20180714, - 414 + 20190916, + 313 ], "deps": [ "chinese-word-at-point", @@ -96607,8 +97472,8 @@ "popup", "pos-tip" ], - "commit": "9496ea3ba8aa999db3dbde88d6aa37f3579d8dea", - "sha256": "0kn07ksjdrwl0m1wiac83ljg5drrmyf65gxm4m6r3iz1awd1akbb" + "commit": "c8c76a1584c9a39ab5df7bba3ba3c728cbd30bb2", + "sha256": "07vngrn17x91anhwvnaa7ryfipgszipaghnj1404yik9w9j9mff9" }, "stable": { "version": [ @@ -96818,15 +97683,13 @@ "stable": { "version": [ 4, - 5 + 6 ], "deps": [ - "all-the-icons", - "flycheck", - "magit" + "all-the-icons" ], - "commit": "ceb46240636865e86f3fe26906957943ba7bd73c", - "sha256": "0nnlxzsmhsbszqigcyxak9i1a0digrd13gv6v18ck4h760mihh1m" + "commit": "df22536a244293591575e56970bf83814faa7c14", + "sha256": "0pfyd1iqs7l2ngwgvj9n0r9k1px7yl16h8n502xdyf0pprxcs4p6" } }, { @@ -97043,8 +97906,8 @@ 20190523, 1300 ], - "commit": "578295532fb1c4ad2a2e95894e65cce02f812b54", - "sha256": "1qcni15mps7w9waail21x0fy2rrd5y8cm4yzi8rs2ar4vqrjbyyp" + "commit": "e2aad25dfd334299a7e53df21796b8652142c5b5", + "sha256": "0nr21gmji24bn5j73hrl8qy9llv3cmc9w5j30pcnsi4zi2svh9gc" }, "stable": { "version": [ diff --git a/pkgs/applications/editors/geany/default.nix b/pkgs/applications/editors/geany/default.nix index a30a8f702242..1e1a817f092d 100644 --- a/pkgs/applications/editors/geany/default.nix +++ b/pkgs/applications/editors/geany/default.nix @@ -3,7 +3,7 @@ with stdenv.lib; let - version = "1.35"; + version = "1.36"; in stdenv.mkDerivation rec { @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://download.geany.org/${pname}-${version}.tar.bz2"; - sha256 = "179xfnvhcxsv54v2mlrhykqv2j7klniln5sffvqqpjmdvwyivvim"; + sha256 = "0gnm17cr4rf3pmkf0axz4a0fxwnvp55ji0q0lzy88yqbshyxv14i"; }; nativeBuildInputs = [ pkgconfig intltool libintl ]; diff --git a/pkgs/applications/editors/gnome-builder/default.nix b/pkgs/applications/editors/gnome-builder/default.nix index 740d65838c3f..82ed8cc19748 100644 --- a/pkgs/applications/editors/gnome-builder/default.nix +++ b/pkgs/applications/editors/gnome-builder/default.nix @@ -1,4 +1,4 @@ -{ gcc8Stdenv +{ stdenv , ctags , appstream-glib , desktop-file-utils @@ -23,6 +23,7 @@ , ninja , ostree , pcre +, pcre2 , pkgconfig , python3 , sysprof @@ -33,20 +34,16 @@ , wrapGAppsHook , dbus , xvfb_run +, glib }: -let - # Does not build with GCC 7 - # https://gitlab.gnome.org/GNOME/gnome-builder/issues/868 - stdenv = gcc8Stdenv; -in stdenv.mkDerivation rec { pname = "gnome-builder"; - version = "3.32.4"; + version = "3.34.1"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0xip58m206p8wa28p0a3y4ykylzr5xzmirjl3dspg4j25r08i8qr"; + sha256 = "19018pq94cxf6fywd7fsmy98x56by5zfmh140pl530gaaw84cvhb"; }; nativeBuildInputs = [ @@ -82,6 +79,7 @@ stdenv.mkDerivation rec { libxml2 ostree pcre + pcre2 python3 sysprof template-glib @@ -100,6 +98,8 @@ stdenv.mkDerivation rec { patchShebangs build-aux/meson/post_install.py ''; + NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0"; + mesonFlags = [ "-Dpython_libprefix=${python3.libPrefix}" "-Ddocs=true" diff --git a/pkgs/applications/editors/jetbrains/common.nix b/pkgs/applications/editors/jetbrains/common.nix index be20800cde29..bca85c01016a 100644 --- a/pkgs/applications/editors/jetbrains/common.nix +++ b/pkgs/applications/editors/jetbrains/common.nix @@ -1,4 +1,4 @@ -{ stdenv, makeDesktopItem, makeWrapper, patchelf, p7zip +{ stdenv, lib, makeDesktopItem, makeWrapper, patchelf, p7zip , coreutils, gnugrep, which, git, unzip, libsecret, libnotify }: @@ -28,7 +28,7 @@ with stdenv; lib.makeOverridable mkDerivation rec { nativeBuildInputs = [ makeWrapper patchelf p7zip unzip ]; - patchPhase = '' + patchPhase = lib.optionalString (!stdenv.isDarwin) '' get_file_size() { local fname="$1" echo $(ls -l $fname | cut -d ' ' -f5) @@ -63,7 +63,7 @@ with stdenv; lib.makeOverridable mkDerivation rec { item=${desktopItem} makeWrapper "$out/$name/bin/${loName}.sh" "$out/bin/${execName}" \ - --prefix PATH : "$out/libexec/${name}:${stdenv.lib.makeBinPath [ jdk coreutils gnugrep which git ]}" \ + --prefix PATH : "$out/libexec/${name}:${lib.optionalString (stdenv.isDarwin) "${jdk}/jdk/Contents/Home/bin:"}${stdenv.lib.makeBinPath [ jdk coreutils gnugrep which git ]}" \ --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ # Some internals want libstdc++.so.6 stdenv.cc.cc.lib libsecret @@ -77,4 +77,6 @@ with stdenv; lib.makeOverridable mkDerivation rec { ln -s "$item/share/applications" $out/share ''; +} // stdenv.lib.optionalAttrs (!(meta.license.free or true)) { + preferLocalBuild = true; } diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix index a33b9531730f..16d5609934dd 100644 --- a/pkgs/applications/editors/jetbrains/default.nix +++ b/pkgs/applications/editors/jetbrains/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, callPackage, fetchurl , python -, jdk, cmake, libxml2, zlib, python3, ncurses +, jdk, cmake, libxml2, zlib, python3, ncurses5 }: with stdenv.lib; @@ -34,7 +34,7 @@ let lldbLibPath=$out/clion-${version}/bin/lldb/linux/lib interp="$(cat $NIX_CC/nix-support/dynamic-linker)" - ln -s ${ncurses.out}/lib/libncurses.so $lldbLibPath/libtinfo.so.5 + ln -s ${ncurses5.out}/lib/libtinfo.so.5 $lldbLibPath/libtinfo.so.5 patchelf --set-interpreter $interp \ --set-rpath "${lib.makeLibraryPath [ libxml2 zlib stdenv.cc.cc.lib ]}:$lldbLibPath" \ @@ -134,7 +134,7 @@ let as IntelliJ. ''; maintainers = with maintainers; [ edwtjo ]; - platforms = platforms.linux; + platforms = platforms.linux ++ platforms.darwin; }; }); @@ -201,11 +201,11 @@ let platforms = platforms.linux; }; }) (attrs: { - patchPhase = attrs.patchPhase + '' + patchPhase = lib.optionalString (!stdenv.isDarwin) (attrs.patchPhase + '' # Patch built-in mono for ReSharperHost to start successfully interpreter=$(echo ${stdenv.glibc.out}/lib/ld-linux*.so.2) patchelf --set-interpreter "$interpreter" lib/ReSharperHost/linux-x64/mono/bin/mono-sgen - ''; + ''); }); buildRubyMine = { name, version, src, license, description, wmClass, ... }: @@ -240,7 +240,7 @@ let patchPhase = (attrs.patchPhase or "") + optionalString (stdenv.isLinux) '' # Webstorm tries to use bundled jre if available. # Lets prevent this for the moment - rm -r jre64 + rm -r jbr ''; }); in @@ -250,12 +250,12 @@ in clion = buildClion rec { name = "clion-${version}"; - version = "2019.2.1"; /* updated by script */ + version = "2019.2.3"; /* 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 = "13y2c3vzlklwz9cd7anpfdc3dqwh714xivm1g59s6p4x9sy172lp"; /* updated by script */ + sha256 = "0kiqbcx64rlz1pajbn326zwy0d1vxdxpvk5xpqkcj7nva611pdq1"; /* updated by script */ }; wmClass = "jetbrains-clion"; update-channel = "CLion RELEASE"; # channel's id as in http://www.jetbrains.com/updates/updates.xml @@ -263,12 +263,12 @@ in datagrip = buildDataGrip rec { name = "datagrip-${version}"; - version = "2019.2.2"; /* updated by script */ + version = "2019.2.5"; /* 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 = "1babydzmgaas1rxjv11yhgbp0l5scsdwy17l9927qwlbgccf24mb"; /* updated by script */ + sha256 = "18frmlchalpvc55j25ig2slf2h33gwmbmm8dvc29jb3kgsl0ny7p"; /* updated by script */ }; wmClass = "jetbrains-datagrip"; update-channel = "DataGrip RELEASE"; @@ -276,12 +276,12 @@ in goland = buildGoland rec { name = "goland-${version}"; - version = "2019.2.1"; /* updated by script */ + version = "2019.2.2"; /* 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 = "16wmsf6c8x95d050grqgv6aaxlkc6pqhbqzlz6fzsngjnbkn64yj"; /* updated by script */ + sha256 = "1wq1prgfn6wc7lc6qjhiykm62c56yrb5rv0hyylcsgdw0q3ns6z2"; /* updated by script */ }; wmClass = "jetbrains-goland"; update-channel = "GoLand RELEASE"; @@ -289,12 +289,12 @@ in idea-community = buildIdea rec { name = "idea-community-${version}"; - version = "2019.2.1"; /* updated by script */ + version = "2019.2.3"; /* 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 = "1pbqnyqly09m7lw6356dydbvppq4i94rsk7c3y40mrc285qzj413"; /* updated by script */ + sha256 = "0gy42x49yhdnp4ks6445xbc24dxw2vxnl12hdyx03mszdv0r58ni"; /* updated by script */ }; wmClass = "jetbrains-idea-ce"; update-channel = "IntelliJ IDEA RELEASE"; @@ -302,12 +302,12 @@ in idea-ultimate = buildIdea rec { name = "idea-ultimate-${version}"; - version = "2019.2.1"; /* updated by script */ + version = "2019.2.3"; /* 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 = "0mslmhakjjgwj76hbfw9dcidic6zprjfjryggic7dqywl7vjwc95"; /* updated by script */ + sha256 = "0allnibq8van3n1c5y85gscbpls0wshwffa6b2l2andw1jkhc259"; /* updated by script */ }; wmClass = "jetbrains-idea"; update-channel = "IntelliJ IDEA RELEASE"; @@ -315,12 +315,12 @@ in phpstorm = buildPhpStorm rec { name = "phpstorm-${version}"; - version = "2019.2.1"; /* updated by script */ + version = "2019.2.3"; /* 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 = "1m198p6586dych6mrgwqxs486qndypsmnikl0rxx45ddrwfjl42g"; /* updated by script */ + sha256 = "0pra0hmyczxcxnvsc7rqiwhwj23ckx97c9m1wcyn7ik612xwik1i"; /* updated by script */ }; wmClass = "jetbrains-phpstorm"; update-channel = "PhpStorm RELEASE"; @@ -328,12 +328,12 @@ in pycharm-community = buildPycharm rec { name = "pycharm-community-${version}"; - version = "2019.2.1"; /* updated by script */ + version = "2019.2.3"; /* updated by script */ description = "PyCharm Community Edition"; license = stdenv.lib.licenses.asl20; src = fetchurl { url = "https://download.jetbrains.com/python/${name}.tar.gz"; - sha256 = "0a3fi2wjj0166199pyhvvpaih9nx0xr6q7zf7jfj8i7khpkdk8i5"; /* updated by script */ + sha256 = "02fynwi54libibgigwggh6xaf5p4046n0kjsqsck1kjbnrlghp10"; /* updated by script */ }; wmClass = "jetbrains-pycharm-ce"; update-channel = "PyCharm RELEASE"; @@ -341,12 +341,12 @@ in pycharm-professional = buildPycharm rec { name = "pycharm-professional-${version}"; - version = "2019.2.1"; /* updated by script */ + version = "2019.2.3"; /* updated by script */ description = "PyCharm Professional Edition"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/python/${name}.tar.gz"; - sha256 = "03i7qi0kcnx0irih468xaz7hzicaa5yh399r676drs22ak23qwrq"; /* updated by script */ + sha256 = "19i3ll8p69n7jw7psv2nkhjq899gljwmc5ixpqhyl203rykavb7n"; /* updated by script */ }; wmClass = "jetbrains-pycharm"; update-channel = "PyCharm RELEASE"; @@ -354,12 +354,12 @@ in rider = buildRider rec { name = "rider-${version}"; - version = "2019.2.1"; /* updated by script */ + version = "2019.2.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 = "1p0mlch7qvkvgxjscx6rl65v6h8g6fwk8rcb8s27qkcjm0d78ic8"; /* updated by script */ + sha256 = "1wv5vhiv3w1dwyklx1pr5javp4psqyiv4naq37cvxxp9zh7hk8rc"; /* updated by script */ }; wmClass = "jetbrains-rider"; update-channel = "Rider RELEASE"; @@ -367,12 +367,12 @@ in ruby-mine = buildRubyMine rec { name = "ruby-mine-${version}"; - version = "2019.2.1"; /* updated by script */ + version = "2019.2.3"; /* 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 = "0l0kwc1mih55px8j6bvp1g3pxrv0scd9vpydwvkaqmq5x0r1n3jf"; /* updated by script */ + sha256 = "0g8yxsq9xn8l8wnmcm0y5y0ll5081s83mmwrb62k4bldlsr25iba"; /* updated by script */ }; wmClass = "jetbrains-rubymine"; update-channel = "RubyMine RELEASE"; @@ -380,12 +380,12 @@ in webstorm = buildWebStorm rec { name = "webstorm-${version}"; - version = "2019.1.3"; /* updated by script */ + version = "2019.2.3"; /* 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 = "1bhx2p40r15zvfr6q10bj5y8jaa3i9x9adchczp0irkd3w2jgvy3"; /* updated by script */ + sha256 = "0l3c3b1d53b3w90d4g99pjw8vmjj716jjaxsv4hy53shh1ncd55g"; /* updated by script */ }; wmClass = "jetbrains-webstorm"; update-channel = "WebStorm RELEASE"; diff --git a/pkgs/applications/editors/manuskript/default.nix b/pkgs/applications/editors/manuskript/default.nix index a9d8ffec43ee..811284491dd7 100644 --- a/pkgs/applications/editors/manuskript/default.nix +++ b/pkgs/applications/editors/manuskript/default.nix @@ -2,7 +2,7 @@ python3Packages.buildPythonApplication rec { pname = "manuskript"; - version = "0.9.0"; + version = "0.10.0"; format = "other"; @@ -10,7 +10,7 @@ python3Packages.buildPythonApplication rec { repo = pname; owner = "olivierkes"; rev = version; - sha256 = "13y1s0kba1ib6g977n7h920kyr7abdw03kpal512m7iwa9g2kdw8"; + sha256 = "0q413vym7hzjpyg3krj5y63hwpncdifjkyswqmr76zg5yqnklnh3"; }; nativeBuildInputs = [ wrapQtAppsHook ]; diff --git a/pkgs/applications/editors/nano/default.nix b/pkgs/applications/editors/nano/default.nix index aea585ce8d66..15f251f5b093 100644 --- a/pkgs/applications/editors/nano/default.nix +++ b/pkgs/applications/editors/nano/default.nix @@ -20,11 +20,11 @@ let in stdenv.mkDerivation rec { pname = "nano"; - version = "4.4"; + version = "4.5"; src = fetchurl { url = "mirror://gnu/nano/${pname}-${version}.tar.xz"; - sha256 = "1iw2ypq34g1gfqyhgka2fz5yj5vrlz85q6zk7amgyj286ph25wia"; + sha256 = "0czmz1yq8s5qcxcmfjdxzg9nkhbmlc9q1nz04jvf57fdbs7w7mfy"; }; nativeBuildInputs = [ texinfo ] ++ optional enableNls gettext; diff --git a/pkgs/applications/editors/nedit/default.nix b/pkgs/applications/editors/nedit/default.nix index b1b3a416178b..4ff8c759a260 100644 --- a/pkgs/applications/editors/nedit/default.nix +++ b/pkgs/applications/editors/nedit/default.nix @@ -26,7 +26,8 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://sourceforge.net/projects/nedit; + homepage = "https://sourceforge.net/projects/nedit"; + description = "A fast, compact Motif/X11 plain text editor"; platforms = with platforms; linux ++ darwin; license = licenses.gpl2; }; diff --git a/pkgs/applications/editors/neovim/default.nix b/pkgs/applications/editors/neovim/default.nix index 7d558dfb8937..99b04059730d 100644 --- a/pkgs/applications/editors/neovim/default.nix +++ b/pkgs/applications/editors/neovim/default.nix @@ -13,7 +13,7 @@ with stdenv.lib; let neovimLuaEnv = lua.withPackages(ps: - (with ps; [ mpack lpeg luabitop ] + (with ps; [ lpeg luabitop mpack ] ++ optionals doCheck [ nvim-client luv coxpcall busted luafilesystem penlight inspect ] @@ -21,13 +21,13 @@ let in stdenv.mkDerivation rec { pname = "neovim-unwrapped"; - version = "0.3.8"; + version = "0.4.2"; src = fetchFromGitHub { owner = "neovim"; repo = "neovim"; rev = "v${version}"; - sha256 = "15flii3p4g9f65xy9jpkb8liajrvhm5ck4j39z6d6b1nkxr6ghwb"; + sha256 = "13w446plvgl219lhj29jyimhiqvs1y1byrz4qpdmxgyddmx9xqss"; }; patches = [ @@ -41,14 +41,15 @@ in enableParallelBuilding = true; buildInputs = [ + gperf libtermkey libuv + libvterm-neovim + lua.pkgs.luv.libluv msgpack ncurses - libvterm-neovim - unibilium - gperf neovimLuaEnv + unibilium ] ++ optional withJemalloc jemalloc ++ optional stdenv.isDarwin libiconv ++ optionals doCheck [ glibcLocales procps ] @@ -77,9 +78,12 @@ in disallowedReferences = [ stdenv.cc ]; cmakeFlags = [ - "-DLUA_PRG=${neovimLuaEnv.interpreter}" "-DGPERF_PRG=${gperf}/bin/gperf" + "-DLUA_PRG=${neovimLuaEnv.interpreter}" ] + # FIXME: this is verry messy and strange. + ++ optional (!stdenv.isDarwin) "-DLIBLUV_LIBRARY=${lua.pkgs.luv}/lib/lua/${lua.luaversion}/luv.so" + ++ optional (stdenv.isDarwin) "-DLIBLUV_LIBRARY=${lua.pkgs.luv.libluv}/lib/lua/${lua.luaversion}/libluv.dylib" ++ optional doCheck "-DBUSTED_PRG=${neovimLuaEnv}/bin/busted" ++ optional (!lua.pkgs.isLuaJIT) "-DPREFER_LUA=ON" ; diff --git a/pkgs/applications/editors/neovim/gnvim/default.nix b/pkgs/applications/editors/neovim/gnvim/default.nix new file mode 100644 index 000000000000..764d7004940d --- /dev/null +++ b/pkgs/applications/editors/neovim/gnvim/default.nix @@ -0,0 +1,47 @@ +{ stdenv, rustPlatform, fetchFromGitHub, gtk, webkitgtk }: + +rustPlatform.buildRustPackage rec { + pname = "gnvim-unwrapped"; + version = "0.1.5"; + + src = fetchFromGitHub { + owner = "vhakulinen"; + repo = "gnvim"; + rev = version; + sha256 = "11gb59lhc1sp5dxj2fdm6072f4nxxay0war3kmchdwsk41nvxlrh"; + }; + + cargoSha256 = "00r5jf5qdw02vcv3522qqrnwj14mip0l58prcncbvyg4pxlm2rb2"; + + buildInputs = [ gtk webkitgtk ]; + + # The default build script tries to get the version through Git, so we + # replace it + prePatch = '' + cat << EOF > build.rs + use std::env; + use std::fs::File; + use std::io::Write; + use std::path::Path; + + fn main() { + let out_dir = env::var("OUT_DIR").unwrap(); + let dest_path = Path::new(&out_dir).join("gnvim_version.rs"); + let mut f = File::create(&dest_path).unwrap(); + f.write_all(b"const VERSION: &str = \"${version}\";").unwrap(); + } + EOF + ''; + + installPhase = '' + make install PREFIX="${placeholder "out"}" + ''; + + meta = with stdenv.lib; { + description = "GUI for neovim, without any web bloat"; + homepage = "https://github.com/vhakulinen/gnvim"; + license = licenses.mit; + maintainers = with maintainers; [ minijackson ]; + inherit version; + }; +} diff --git a/pkgs/applications/editors/neovim/gnvim/wrapper.nix b/pkgs/applications/editors/neovim/gnvim/wrapper.nix new file mode 100644 index 000000000000..e16fe8a8adc7 --- /dev/null +++ b/pkgs/applications/editors/neovim/gnvim/wrapper.nix @@ -0,0 +1,41 @@ +{ stdenv, gnvim-unwrapped, neovim, makeWrapper }: + +stdenv.mkDerivation { + pname = "gnvim"; + version = gnvim-unwrapped.version; + buildCommand = if stdenv.isDarwin then '' + mkdir -p $out/Applications + cp -r ${gnvim-unwrapped}/bin/gnvim.app $out/Applications + + chmod -R a+w "$out/Applications/gnvim.app/Contents/MacOS" + wrapProgram "$out/Applications/gnvim.app/Contents/MacOS/gnvim" \ + --prefix PATH : "${neovim}/bin" \ + --set GNVIM_RUNTIME_PATH "${gnvim-unwrapped}/share/gnvim/runtime" + '' else '' + makeWrapper '${gnvim-unwrapped}/bin/gnvim' "$out/bin/gnvim" \ + --prefix PATH : "${neovim}/bin" \ + --set GNVIM_RUNTIME_PATH "${gnvim-unwrapped}/share/gnvim/runtime" + + mkdir -p "$out/share" + ln -s '${gnvim-unwrapped}/share/icons' "$out/share/icons" + + # copy and fix .desktop file + cp -r '${gnvim-unwrapped}/share/applications' "$out/share/applications" + # Sed needs a writable directory to do inplace modifications + chmod u+rw "$out/share/applications" + for file in $out/share/applications/*.desktop; do + sed -e "s|Exec=.\\+gnvim\\>|Exec=$out/bin/gnvim|" -i "$file" + done + ''; + + preferLocalBuild = true; + + nativeBuildInputs = [ + makeWrapper + ]; + + passthru.unwrapped = gnvim-unwrapped; + + inherit (gnvim-unwrapped) meta; +} + diff --git a/pkgs/applications/editors/neovim/neovim-remote.nix b/pkgs/applications/editors/neovim/neovim-remote.nix index 92ff745d1a6a..6ad3983a5311 100644 --- a/pkgs/applications/editors/neovim/neovim-remote.nix +++ b/pkgs/applications/editors/neovim/neovim-remote.nix @@ -4,14 +4,14 @@ with stdenv.lib; pythonPackages.buildPythonApplication rec { pname = "neovim-remote"; - version = "2.2.0"; + version = "2.2.1"; disabled = !pythonPackages.isPy3k; src = fetchFromGitHub { owner = "mhinz"; repo = "neovim-remote"; rev = "v${version}"; - sha256 = "0vvwygyar835z947d5zgjywyhl7ajj63z0l8sb7w9kj1w5snb43x"; + sha256 = "0f9x053yr8wq35l2s2dsnb0iygd4g4yya2h3iv0yh3440jjj5vfj"; }; propagatedBuildInputs = with pythonPackages; [ pynvim psutil ]; diff --git a/pkgs/applications/editors/okteta/default.nix b/pkgs/applications/editors/okteta/default.nix index 287758e0fd83..5c7ddfb34d46 100644 --- a/pkgs/applications/editors/okteta/default.nix +++ b/pkgs/applications/editors/okteta/default.nix @@ -28,6 +28,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { license = licenses.gpl2; + description = "A hex editor"; maintainers = with maintainers; [ peterhoeg bkchr ]; platforms = platforms.linux; }; diff --git a/pkgs/applications/editors/quilter/default.nix b/pkgs/applications/editors/quilter/default.nix index 49ebe579ed4a..49f41d5205b3 100644 --- a/pkgs/applications/editors/quilter/default.nix +++ b/pkgs/applications/editors/quilter/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "quilter"; - version = "1.9.5"; + version = "2.0.0"; src = fetchFromGitHub { owner = "lainsce"; repo = pname; rev = version; - sha256 = "119ri6lkzqapi5k0v818qkhg1916jj9s6bh72yqvc2wmyjnn2dbw"; + sha256 = "1jmgnmpalnl3261wifk0mqa9viag6yvlrycgzqalmnrm1b20pyg4"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/editors/sublime/3/packages.nix b/pkgs/applications/editors/sublime/3/packages.nix index 82d92ba2fe11..d72966e04401 100644 --- a/pkgs/applications/editors/sublime/3/packages.nix +++ b/pkgs/applications/editors/sublime/3/packages.nix @@ -5,15 +5,15 @@ let in { sublime3-dev = common { - buildVersion = "3208"; + buildVersion = "3210"; dev = true; - x32sha256 = "09k04fjryc0dc6173i6nwhi5xaan89n4lp0n083crvkqwp0qlf2i"; - x64sha256 = "12pn3yfm452m75dlyl0lyf82956j8raz2dglv328m81hbafflrj8"; + x32sha256 = "1ngr4c8h2mafy96mi8dd3g8mg5r9ha1cpcd8p3gz7jwpbypvkkbv"; + x64sha256 = "0j65a4ylgga1qzc74wf3k5craghahma8hwqg3zs1rgzz601nl693"; } {}; sublime3 = common { - buildVersion = "3207"; - x32sha256 = "14hfb8x8zb49zjq0pd8s73xk333gmf38h5b7g979czcmbhdxiyqy"; - x64sha256 = "1i1q9592sc8idvlpygksdkclh7h506hsz5l0i02g1814w0flzdmc"; + buildVersion = "3211"; + x32sha256 = "0w9hba1nl2hv1mri418n7v0m321b6wqphb1knll23ldv5fb0j1j8"; + x64sha256 = "1vkldmimyjhbgplcd6r27gvk64rr7cparfd44hy6qdyzwsjqqg0b"; } {}; } diff --git a/pkgs/applications/editors/typora/default.nix b/pkgs/applications/editors/typora/default.nix index 7273b7252ca7..09baf383f972 100644 --- a/pkgs/applications/editors/typora/default.nix +++ b/pkgs/applications/editors/typora/default.nix @@ -1,4 +1,16 @@ -{ stdenv, fetchurl, makeWrapper, electron_5, dpkg, gtk3, glib, gsettings-desktop-schemas, wrapGAppsHook }: +{ stdenv +, lib +, fetchurl +, makeWrapper +, electron_5 +, dpkg +, gtk3 +, glib +, gsettings-desktop-schemas +, wrapGAppsHook +, withPandoc ? false +, pandoc +}: stdenv.mkDerivation rec { pname = "typora"; @@ -42,10 +54,11 @@ stdenv.mkDerivation rec { makeWrapper ${electron_5}/bin/electron $out/bin/typora \ --add-flags $out/share/typora \ "''${gappsWrapperArgs[@]}" \ - --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ stdenv.cc.cc ]}" + ${lib.optionalString withPandoc ''--prefix PATH : "${lib.makeBinPath [ pandoc ]}"''} \ + --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ stdenv.cc.cc ]}" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A minimal Markdown reading & writing app"; homepage = https://typora.io; license = licenses.unfree; diff --git a/pkgs/applications/editors/vim/macvim.nix b/pkgs/applications/editors/vim/macvim.nix index 6081bbc8b0ca..8406dd60b895 100644 --- a/pkgs/applications/editors/vim/macvim.nix +++ b/pkgs/applications/editors/vim/macvim.nix @@ -48,7 +48,11 @@ stdenv.mkDerivation { # The sparkle patch modified the nibs, so we have to recompile them postPatch = '' for nib in MainMenu Preferences; do - /usr/bin/ibtool --compile src/MacVim/English.lproj/$nib.nib/keyedobjects.nib src/MacVim/English.lproj/$nib.nib + # redirect stdin/stdout/stderr to /dev/null because ibtool marks them nonblocking + # and not redirecting screws with subsequent commands. + # redirecting stderr is unfortunate but I don't know of a reasonable way to remove O_NONBLOCK + # from the fds. + /usr/bin/ibtool --compile src/MacVim/English.lproj/$nib.nib/keyedobjects.nib src/MacVim/English.lproj/$nib.nib >/dev/null 2>/dev/null </dev/null done ''; @@ -102,6 +106,9 @@ stdenv.mkDerivation { substituteInPlace src/auto/config.mk --replace "PERL_CFLAGS =" "PERL_CFLAGS = -I${darwin.libutil}/include" substituteInPlace src/MacVim/vimrc --subst-var-by CSCOPE ${cscope}/bin/cscope + + # Work around weird code-signing issue + substituteInPlace src/auto/config.mk --replace "XCODEFLAGS''\t=" "XCODEFLAGS''\t= CODE_SIGN_IDENTITY=" ''; postInstall = '' diff --git a/pkgs/applications/editors/vim/macvim.patch b/pkgs/applications/editors/vim/macvim.patch index 8cb96a9ebbad..fd02e1199024 100644 --- a/pkgs/applications/editors/vim/macvim.patch +++ b/pkgs/applications/editors/vim/macvim.patch @@ -18,6 +18,21 @@ index e519018de..556a4127d 100644 PRODUCT_BUNDLE_IDENTIFIER = org.vim.MacVim; PRODUCT_NAME = MacVim; VERSIONING_SYSTEM = "apple-generic"; +diff --git a/src/MacVim/PSMTabBarControl/source/PSMTabBarCell.m b/src/MacVim/PSMTabBarControl/source/PSMTabBarCell.m +index 6f1a06e46..a12e2cea4 100644 +--- a/src/MacVim/PSMTabBarControl/source/PSMTabBarCell.m ++++ b/src/MacVim/PSMTabBarControl/source/PSMTabBarCell.m +@@ -13,7 +13,9 @@ + #import "PSMTabDragAssistant.h" + + +-@implementation PSMTabBarCell ++@implementation PSMTabBarCell { ++ id _controlView; ++} + + #pragma mark - + #pragma mark Creation/Destruction diff --git a/src/MacVim/vimrc b/src/MacVim/vimrc index 23a06bf37..dfb10fe94 100644 --- a/src/MacVim/vimrc @@ -77,6 +92,18 @@ diff --git a/src/auto/configure b/src/auto/configure index 9e6a82f4a..3c6d1a89b 100755 --- a/src/auto/configure +++ b/src/auto/configure +@@ -4705,10 +4705,8 @@ fi + rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + else +- if test -z "$MACOSX_DEPLOYMENT_TARGET"; then +- macosx_deployment_target=`/usr/bin/sw_vers -productVersion|/usr/bin/sed -e 's/^\([0-9]*\.[0-9]*\).*/\1/'` ++ macosx_deployment_target=${MACOSX_DEPLOYMENT_TARGET:-10.12} + XCODEFLAGS="$XCODEFLAGS MACOSX_DEPLOYMENT_TARGET=$macosx_deployment_target" +- fi + fi + + @@ -5829,10 +5829,7 @@ $as_echo "not found" >&6; } for path in "${vi_cv_path_mzscheme_pfx}/lib" "${SCHEME_LIB}"; do diff --git a/pkgs/applications/editors/vscode/generic.nix b/pkgs/applications/editors/vscode/generic.nix index 7b7209a5e1f4..bdcf786f61d2 100644 --- a/pkgs/applications/editors/vscode/generic.nix +++ b/pkgs/applications/editors/vscode/generic.nix @@ -69,9 +69,9 @@ in installPhase = if system == "x86_64-darwin" then '' - mkdir -p $out/lib/vscode $out/bin - cp -r ./* $out/lib/vscode - ln -s $out/lib/vscode/Contents/Resources/app/bin/${executableName} $out/bin + mkdir -p "$out/Applications/${longName}.app" $out/bin + cp -r ./* "$out/Applications/${longName}.app" + ln -s "$out/Applications/${longName}.app/Contents/Resources/app/bin/code" $out/bin/${executableName} '' else '' mkdir -p $out/lib/vscode $out/bin cp -r ./* $out/lib/vscode diff --git a/pkgs/applications/editors/vscode/vscode.nix b/pkgs/applications/editors/vscode/vscode.nix index 40d16733db27..6f7e3ad0ba4b 100644 --- a/pkgs/applications/editors/vscode/vscode.nix +++ b/pkgs/applications/editors/vscode/vscode.nix @@ -11,13 +11,13 @@ let archive_fmt = if system == "x86_64-darwin" then "zip" else "tar.gz"; sha256 = { - x86_64-linux = "1iz36nhkg78346g5407df6jv4d1ydb22hhgs8hiaxql3hq5z7x3q"; - x86_64-darwin = "1iijk0kx90rax39iradbbafyvd3vwnzsgvyb3s13asy42pbhhkky"; + x86_64-linux = "1wxaxz2q4qizh6f23ipz8ihay6bpjdq0545vijqd84fqazcji6sq"; + x86_64-darwin = "1gb9w3hvw3avn852an5v8m1ia64fkavnvaawjfc3455b248iiqvk"; }.${system}; in callPackage ./generic.nix rec { - version = "1.38.0"; + version = "1.38.1"; pname = "vscode"; executableName = "code" + lib.optionalString isInsiders "-insiders"; diff --git a/pkgs/applications/editors/vscode/vscodium.nix b/pkgs/applications/editors/vscode/vscodium.nix index 02d0396a94f5..3024ea107999 100644 --- a/pkgs/applications/editors/vscode/vscodium.nix +++ b/pkgs/applications/editors/vscode/vscodium.nix @@ -11,13 +11,19 @@ let archive_fmt = if system == "x86_64-darwin" then "zip" else "tar.gz"; sha256 = { - x86_64-linux = "09rq5jx7aicwp3qqi5pcv6bmyyp1rm5cfa96hvy3f4grhq1fi132"; - x86_64-darwin = "1y1lbb3q5myaz7jg21x5sl0in8wr46brqj9zyrg3f16zahsagzr4"; + x86_64-linux = "15m7mfb8gmx3pwydc37blj0rxwgmkrnqfj6y79rpqlr2dg92gwlb"; + x86_64-darwin = "080k4fnfa5ylmmya6zprgci3gld9mrbqsfnk53hgcny91ykl5xj5"; + }.${system}; + + sourceRoot = { + x86_64-linux = "."; + x86_64-darwin = ""; }.${system}; in callPackage ./generic.nix rec { + inherit sourceRoot; - version = "1.38.0"; + version = "1.38.1"; pname = "vscodium"; executableName = "codium"; @@ -29,8 +35,6 @@ in inherit sha256; }; - sourceRoot = "."; - meta = with stdenv.lib; { description = '' Open source source code editor developed by Microsoft for Windows, diff --git a/pkgs/applications/gis/grass/default.nix b/pkgs/applications/gis/grass/default.nix index 360d94d1b825..562a5e616a32 100644 --- a/pkgs/applications/gis/grass/default.nix +++ b/pkgs/applications/gis/grass/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, flex, bison, pkgconfig, zlib, libtiff, libpng, fftw , cairo, readline, ffmpeg, makeWrapper, wxGTK30, netcdf, blas -, proj, gdal, geos, sqlite, postgresql, mysql, python2Packages, libLAS, proj-datumgrid +, proj, gdal, geos, sqlite, postgresql, libmysqlclient, python2Packages, libLAS, proj-datumgrid }: stdenv.mkDerivation rec { @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ flex bison zlib proj gdal libtiff libpng fftw sqlite cairo proj - readline ffmpeg makeWrapper wxGTK30 netcdf geos postgresql mysql.connector-c blas + readline ffmpeg makeWrapper wxGTK30 netcdf geos postgresql libmysqlclient blas libLAS proj-datumgrid ] ++ (with python2Packages; [ python dateutil wxPython30 numpy ]); @@ -37,8 +37,8 @@ stdenv.mkDerivation rec { "--with-postgres-libs=${postgresql.lib}/lib/" # it complains about missing libmysqld but doesn't really seem to need it "--with-mysql" - "--with-mysql-includes=${mysql.connector-c}/include/mysql" - "--with-mysql-libs=${mysql.connector-c}/lib/mysql" + "--with-mysql-includes=${libmysqlclient}/include/mysql" + "--with-mysql-libs=${libmysqlclient}/lib/mysql" "--with-blas" "--with-liblas=${libLAS}/bin/liblas-config" ]; diff --git a/pkgs/applications/gis/qgis/unwrapped.nix b/pkgs/applications/gis/qgis/unwrapped.nix index a57b180d5b23..bb772db2b6a4 100644 --- a/pkgs/applications/gis/qgis/unwrapped.nix +++ b/pkgs/applications/gis/qgis/unwrapped.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, cmake, ninja, flex, bison, proj, geos, xlibsWrapper, sqlite, gsl +{ 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 @@ -9,8 +9,8 @@ let pythonBuildInputs = with python3Packages; [ qscintilla-qt5 gdal jinja2 numpy psycopg2 chardet dateutil pyyaml pytz requests urllib3 pygments pyqt5 sip owslib six ]; -in stdenv.mkDerivation rec { - version = "3.8.0"; +in mkDerivation rec { + version = "3.8.3"; pname = "qgis"; name = "${pname}-unwrapped-${version}"; @@ -18,7 +18,7 @@ in stdenv.mkDerivation rec { owner = "qgis"; repo = "QGIS"; rev = "final-${lib.replaceStrings ["."] ["_"] version}"; - sha256 = "11jqj6lavpw9piv0rm8vvbgd99zhcxl6yfjg699wlrjlyf71xac5"; + sha256 = "16axjih48qn8ri3p71d8f7k0y3rd05wghmg1fcbyda871b45b2f8"; }; passthru = { @@ -29,7 +29,7 @@ in stdenv.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] ++ - (stdenv.lib.optional withGrass grass) ++ pythonBuildInputs; + (lib.optional withGrass grass) ++ pythonBuildInputs; nativeBuildInputs = [ cmake flex bison ninja ]; @@ -45,13 +45,13 @@ in stdenv.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" ] ++ - stdenv.lib.optional withGrass "-DGRASS_PREFIX7=${grass}/${grass.name}"; + lib.optional withGrass "-DGRASS_PREFIX7=${grass}/${grass.name}"; meta = { description = "A Free and Open Source Geographic Information System"; homepage = http://www.qgis.org; - license = stdenv.lib.licenses.gpl2Plus; - platforms = with stdenv.lib.platforms; linux; - maintainers = with stdenv.lib.maintainers; [ lsix ]; + license = lib.licenses.gpl2Plus; + platforms = with lib.platforms; linux; + maintainers = with lib.maintainers; [ lsix ]; }; } diff --git a/pkgs/applications/graphics/ImageMagick/7.0.nix b/pkgs/applications/graphics/ImageMagick/7.0.nix index 654363d36f24..bd557f7b832f 100644 --- a/pkgs/applications/graphics/ImageMagick/7.0.nix +++ b/pkgs/applications/graphics/ImageMagick/7.0.nix @@ -13,8 +13,8 @@ let else throw "ImageMagick is not supported on this platform."; cfg = { - version = "7.0.8-58"; - sha256 = "0yfw32nydwy7ag7ina1zc6yssa146x4v35hjv6v59bci9mmj9fb1"; + version = "7.0.8-66"; + sha256 = "0wih8ag5i6qg2zhbjrlcripb5ic5l6i1z04chnlgykb84n5pcirv"; patches = []; }; in diff --git a/pkgs/applications/graphics/avocode/default.nix b/pkgs/applications/graphics/avocode/default.nix index 5e1cba31b7ec..bb526b75ea42 100644 --- a/pkgs/applications/graphics/avocode/default.nix +++ b/pkgs/applications/graphics/avocode/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "avocode"; - version = "3.9.2"; + version = "3.9.3"; src = fetchurl { url = "https://media.avocode.com/download/avocode-app/${version}/avocode-${version}-linux.zip"; - sha256 = "18yzw7bss1dkmmd8lxr9x8s46qmpnqci202g16zrp6j9jdj094d3"; + sha256 = "1ki2fpn70p1rzf52q8511a90n7y7dqi86fs2a48qhass1abxlpqx"; }; libPath = stdenv.lib.makeLibraryPath (with xorg; [ diff --git a/pkgs/applications/graphics/djview/default.nix b/pkgs/applications/graphics/djview/default.nix index 1917640fd2e5..4d09f2ad5fe0 100644 --- a/pkgs/applications/graphics/djview/default.nix +++ b/pkgs/applications/graphics/djview/default.nix @@ -1,8 +1,16 @@ -{ stdenv, fetchurl, pkgconfig -, djvulibre, qt4, xorg, libtiff -, darwin }: +{ stdenv +, mkDerivation +, fetchurl +, pkgconfig +, djvulibre +, qtbase +, qttools +, xorg +, libtiff +, darwin +}: -stdenv.mkDerivation rec { +mkDerivation rec { pname = "djview"; version = "4.10.6"; @@ -11,20 +19,56 @@ stdenv.mkDerivation rec { sha256 = "08bwv8ppdzhryfcnifgzgdilb12jcnivl4ig6hd44f12d76z6il4"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ + pkgconfig + qttools + ]; - buildInputs = [ djvulibre qt4 xorg.libXt libtiff ] - ++ stdenv.lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.AGL ]; + buildInputs = [ + djvulibre + qtbase + xorg.libXt + libtiff + ] ++ stdenv.lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.AGL; + + configureFlags = [ + "--disable-silent-rules" + "--disable-dependency-tracking" + "--with-x" + "--with-tiff" + # NOTE: 2019-09-19: experimental "--enable-npdjvu" fails + ] ++ stdenv.lib.optional stdenv.isDarwin "--enable-mac"; passthru = { mozillaPlugin = "/lib/mozilla/plugins"; }; meta = with stdenv.lib; { - homepage = http://djvu.sourceforge.net/djview4.html; - description = "A portable DjVu viewer and browser plugin"; + description = "A portable DjVu viewer (Qt5) and browser (nsdejavu) plugin"; + homepage = "http://djvu.sourceforge.net/djview4.html"; license = licenses.gpl2; platforms = platforms.unix; - maintainers = [ ]; + maintainers = with maintainers; [ Anton-Latukha ]; + longDescription = '' + The portable DjVu viewer (Qt5) and browser (nsdejavu) plugin. + + Djview highlights: + - entirely based on the public DjVulibre api. + - entirely written in portable Qt5. + - works natively under Unix/X11, MS Windows, and macOS X. + - continuous scrolling of pages + - side-by-side display of pages + - ability to specify a url to the djview command + - all plugin and cgi options available from the command line + - all silly annotations implemented + - display thumbnails as a grid + - display outlines + - page names supported (see djvused command set-page-title) + - metadata dialog (see djvused command set-meta) + - implemented as reusable Qt widgets + + nsdejavu: browser plugin for DjVu. It internally uses djview. + Has CGI-style arguments to configure the view of document (see man). + ''; }; } diff --git a/pkgs/applications/graphics/drawio/default.nix b/pkgs/applications/graphics/drawio/default.nix index 3f922530e73e..88cff0035c73 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 = "11.1.4"; + version = "11.3.0"; src = fetchurl { url = "https://github.com/jgraph/drawio-desktop/releases/download/v${version}/draw.io-x86_64-${version}.rpm"; - sha256 = "0ca8wkkdr7kbb8il84nq05qgd5ykjq15fdv9432wr5p9xmqixz1q"; + sha256 = "00xq2pi84nbdnlbsaj4k9i93skz1nknxvhd2f2cgdm0b3sp86qbk"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/graphics/gcolor3/default.nix b/pkgs/applications/graphics/gcolor3/default.nix index c7555b612f7b..67be3ba6782c 100644 --- a/pkgs/applications/graphics/gcolor3/default.nix +++ b/pkgs/applications/graphics/gcolor3/default.nix @@ -1,4 +1,5 @@ -{ stdenv, fetchFromGitLab, meson, ninja, gettext, pkgconfig, libxml2, gtk3, hicolor-icon-theme, wrapGAppsHook }: +{ stdenv, fetchFromGitLab, meson, ninja, gettext, pkgconfig, libxml2, gtk3, hicolor-icon-theme, wrapGAppsHook +, fetchpatch }: let version = "2.3.1"; @@ -14,6 +15,14 @@ in stdenv.mkDerivation { sha256 = "10cfzlkflwkb7f51rnrxmgxpfryh1qzvqaydj6lffjq9zvnhigg7"; }; + patches = [ + # Remove useage of deprecrated G_PARAM_PRIVATE + (fetchpatch { + url = "https://gitlab.gnome.org/World/gcolor3/commit/96612cdd6c2cc71e28eb97ee17956004a05e5140.patch"; + sha256 = "134wv5x15bd7k0fjzifrddwssaq213sx2l38r3xw6x1j625qwzq9"; + }) + ]; + nativeBuildInputs = [ meson ninja gettext pkgconfig libxml2 wrapGAppsHook ]; buildInputs = [ gtk3 hicolor-icon-theme ]; diff --git a/pkgs/applications/graphics/gnome-photos/default.nix b/pkgs/applications/graphics/gnome-photos/default.nix index f591dd5a60dd..0eb4f21e53ca 100644 --- a/pkgs/applications/graphics/gnome-photos/default.nix +++ b/pkgs/applications/graphics/gnome-photos/default.nix @@ -35,13 +35,13 @@ stdenv.mkDerivation rec { pname = "gnome-photos"; - version = "3.32.1"; + version = "3.34.0"; outputs = [ "out" "installedTests" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0nxa2jz1g73wypdsj19r4plf4hfkhs9mpl7gbhsiyqp1rkn84ahn"; + sha256 = "12j455id5g616cn0nnj73v83aqgpavrsqszw1r5yhbpyc76lg03m"; }; patches = [ @@ -102,7 +102,7 @@ stdenv.mkDerivation rec { ''; postFixup = '' - wrapProgram "${placeholder "installedTests"}/libexec/installed-tests/gnome-photos/basic.py" "''${gappsWrapperArgs[@]}" + wrapGApp "${placeholder "installedTests"}/libexec/installed-tests/gnome-photos/basic.py" ''; passthru = { diff --git a/pkgs/applications/graphics/gscan2pdf/default.nix b/pkgs/applications/graphics/gscan2pdf/default.nix index 9af1a0fc9141..b0e76d23dacb 100644 --- a/pkgs/applications/graphics/gscan2pdf/default.nix +++ b/pkgs/applications/graphics/gscan2pdf/default.nix @@ -10,11 +10,11 @@ with stdenv.lib; perlPackages.buildPerlPackage rec { pname = "gscan2pdf"; - version = "2.5.5"; + version = "2.5.6"; src = fetchurl { url = "mirror://sourceforge/gscan2pdf/${version}/${pname}-${version}.tar.xz"; - sha256 = "0gfhjmv768hx2l3jk2mjhh1snkgkaddgw70s14jq8kxhhzvhlmv8"; + sha256 = "0wp81nsi5jfypabwmjqiamxr739jq5ij79n5fzn5pbw1hg5gcmfz"; }; nativeBuildInputs = [ wrapGAppsHook ]; diff --git a/pkgs/applications/graphics/gthumb/default.nix b/pkgs/applications/graphics/gthumb/default.nix index 6bcee18651b0..d7c0f0e0a0cf 100644 --- a/pkgs/applications/graphics/gthumb/default.nix +++ b/pkgs/applications/graphics/gthumb/default.nix @@ -33,11 +33,11 @@ stdenv.mkDerivation rec { pname = "gthumb"; - version = "3.8.0"; + version = "3.8.1"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1l2s1facq1r6yvqjqc34aqfzlvb3nhkhn79xisxbbdlgrrxdq52f"; + sha256 = "184zn79w4s9y1zy42ar31p3jsg8rmkxy8k6iry51nz8aizbcs7jb"; }; nativeBuildInputs = [ @@ -103,6 +103,6 @@ stdenv.mkDerivation rec { description = "Image browser and viewer for GNOME"; platforms = platforms.linux; license = licenses.gpl2Plus; - maintainers = [ maintainers.mimadrid ]; + maintainers = [ maintainers.mimame ]; }; } diff --git a/pkgs/applications/graphics/kcc/default.nix b/pkgs/applications/graphics/kcc/default.nix new file mode 100644 index 000000000000..da3589189725 --- /dev/null +++ b/pkgs/applications/graphics/kcc/default.nix @@ -0,0 +1,38 @@ +{ lib +, mkDerivationWith +, python3Packages +, p7zip +, archiveSupport ? true +}: + +mkDerivationWith python3Packages.buildPythonApplication rec { + pname = "kcc"; + version = "5.5.1"; + + src = python3Packages.fetchPypi { + inherit version; + pname = "KindleComicConverter"; + sha256 = "5dbee5dc5ee06a07316ae5ebaf21ffa1970094dbae5985ad735e2807ef112644"; + }; + + propagatedBuildInputs = with python3Packages ; [ + pillow + pyqt5 + psutil + python-slugify + raven + ]; + + qtWrapperArgs = lib.optional archiveSupport [ "--prefix" "PATH" ":" "${ lib.makeBinPath [ p7zip ] }" ]; + + postFixup = '' + wrapProgram $out/bin/kcc "''${qtWrapperArgs[@]}" + ''; + + meta = with lib; { + description = "Python app to convert comic/manga files or folders to EPUB, Panel View MOBI or E-Ink optimized CBZ"; + homepage = "https://kcc.iosphe.re"; + license = licenses.isc; + maintainers = with maintainers; [ dawidsowa ]; + }; +} diff --git a/pkgs/applications/graphics/kodelife/default.nix b/pkgs/applications/graphics/kodelife/default.nix index b86560d1319e..22cd252a3e70 100644 --- a/pkgs/applications/graphics/kodelife/default.nix +++ b/pkgs/applications/graphics/kodelife/default.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation rec { pname = "kodelife"; - version = "0.8.3.93"; + version = "0.8.5.99"; src = fetchzip { url = "https://hexler.net/pub/${pname}/${pname}-${version}-linux-x86_64.zip"; - sha256 = "1gidh0745g5mc8h5ypm2wamv1paymnrq3nh3yx1j70jwjg8v2v7g"; + sha256 = "189i2j6kaygjb5pccynxv4pwqpy67jf9nfi7fjfhbrmjpqnmkp90"; }; dontConfigure = true; diff --git a/pkgs/applications/graphics/krita/default.nix b/pkgs/applications/graphics/krita/default.nix index 83489e1a24c9..30f7739167ca 100644 --- a/pkgs/applications/graphics/krita/default.nix +++ b/pkgs/applications/graphics/krita/default.nix @@ -10,11 +10,11 @@ mkDerivation rec { pname = "krita"; - version = "4.2.5"; + version = "4.2.6"; src = fetchurl { - url = "https://download.kde.org/stable/${pname}/${version}/${pname}-${version}.tar.gz"; - sha256 = "1f14r2mrqasl6nr3sss0xy2h8xlxd5wdcjcd64m9nz2gwlm39r7w"; + url = "https://download.kde.org/stable/${pname}/${version}/${pname}-${version}.tar.xz"; + sha256 = "0qdaw8xx3h91v8iw6nw2h276ka8hflaq4r4qwz5mqfd3h254jzym"; }; nativeBuildInputs = [ cmake extra-cmake-modules python3Packages.sip makeWrapper ]; diff --git a/pkgs/applications/graphics/mcomix/default.nix b/pkgs/applications/graphics/mcomix/default.nix index 7ae5286f7622..7130d21b8ef4 100644 --- a/pkgs/applications/graphics/mcomix/default.nix +++ b/pkgs/applications/graphics/mcomix/default.nix @@ -9,7 +9,7 @@ python27Packages.buildPythonApplication rec { sha256 = "0fzsf9pklhfs1rzwzj64c0v30b74nk94p93h371rpg45qnfiahvy"; }; - propagatedBuildInputs = with python27Packages; [ pygtk pillow ]; + propagatedBuildInputs = with python27Packages; [ pygtk pillow setuptools ]; doCheck = false; diff --git a/pkgs/applications/graphics/pdfcpu/default.nix b/pkgs/applications/graphics/pdfcpu/default.nix index 7b1077d18a9d..3d6d04db5539 100644 --- a/pkgs/applications/graphics/pdfcpu/default.nix +++ b/pkgs/applications/graphics/pdfcpu/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "pdfcpu"; - version = "0.2.4"; + version = "0.2.5"; src = fetchFromGitHub { owner = "pdfcpu"; repo = pname; rev = "v${version}"; - sha256 = "0inlwrpv5zkcv48g5gq1xdrvd7w1zkhf8p57fpr2cpd7hd3am7n8"; + sha256 = "0fgdq8byb9pp9wiq3dm0vxw32kbspczqnk41agxpzjf303zmv75y"; }; modSha256 = "1nagb3k2ghfw27g4vcmn7v8s5flg387jpf1l18gw6c44a1xjcivs"; diff --git a/pkgs/applications/graphics/photoflow/default.nix b/pkgs/applications/graphics/photoflow/default.nix index db41ee0566fe..78d16e692261 100644 --- a/pkgs/applications/graphics/photoflow/default.nix +++ b/pkgs/applications/graphics/photoflow/default.nix @@ -51,6 +51,6 @@ stdenv.mkDerivation { license = licenses.gpl3Plus; maintainers = [ maintainers.MtP ]; platforms = platforms.linux; - broken = stdenv.isAarch64; + broken = true; }; } diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix index 9b146aa50364..70a716a760c6 100644 --- a/pkgs/applications/kde/default.nix +++ b/pkgs/applications/kde/default.nix @@ -172,6 +172,7 @@ let pim-data-exporter = callPackage ./pim-data-exporter.nix {}; pim-sieve-editor = callPackage ./pim-sieve-editor.nix {}; print-manager = callPackage ./print-manager.nix {}; + rocs = callPackage ./rocs.nix {}; spectacle = callPackage ./spectacle.nix {}; yakuake = callPackage ./yakuake.nix {}; # Okteta was removed from kde applications and will now be released independently diff --git a/pkgs/applications/kde/dolphin.nix b/pkgs/applications/kde/dolphin.nix index 241bb71983a0..76d4e989e8c3 100644 --- a/pkgs/applications/kde/dolphin.nix +++ b/pkgs/applications/kde/dolphin.nix @@ -15,6 +15,7 @@ mkDerivation { maintainers = [ lib.maintainers.ttuegel ]; }; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; + propagatedUserEnvPkgs = [ baloo ]; propagatedBuildInputs = [ baloo baloo-widgets kactivities kbookmarks kcmutils kcompletion kconfig kcoreaddons kdelibs4support kdbusaddons kfilemetadata ki18n kiconthemes diff --git a/pkgs/applications/kde/kdenlive.nix b/pkgs/applications/kde/kdenlive.nix index fa75dd1eb97a..b7c691e9594b 100644 --- a/pkgs/applications/kde/kdenlive.nix +++ b/pkgs/applications/kde/kdenlive.nix @@ -70,10 +70,13 @@ mkDerivation { kpurpose kdeclarative ]; + patches = [ ./mlt-path.patch ]; + inherit mlt; postPatch = # Module Qt5::Concurrent must be included in `find_package` before it is used. '' sed -i CMakeLists.txt -e '/find_package(Qt5 REQUIRED/ s|)| Concurrent)|' + substituteAllInPlace src/kdenlivesettings.kcfg ''; meta = { license = with lib.licenses; [ gpl2Plus ]; diff --git a/pkgs/applications/kde/kmail.nix b/pkgs/applications/kde/kmail.nix index a58b3b8c45d8..ab24f15a14bc 100644 --- a/pkgs/applications/kde/kmail.nix +++ b/pkgs/applications/kde/kmail.nix @@ -7,7 +7,7 @@ kmail-account-wizard, kmailtransport, knotifications, knotifyconfig, kontactinterface, kparts, kpty, kservice, ktextwidgets, ktnef, kwallet, kwidgetsaddons, kwindowsystem, kxmlgui, libgravatar, libksieve, mailcommon, - messagelib, pim-sieve-editor, qtscript, qtwebengine, + messagelib, pim-sieve-editor, qtscript, qtwebengine, akonadi }: mkDerivation { @@ -25,6 +25,6 @@ mkDerivation { ktextwidgets ktnef kwidgetsaddons kwindowsystem kxmlgui libgravatar libksieve mailcommon messagelib pim-sieve-editor qtscript qtwebengine ]; - propagatedUserEnvPkgs = [ kdepim-runtime kwallet ]; + propagatedUserEnvPkgs = [ kdepim-runtime kwallet akonadi ]; patches = [ ./kmail.patch ]; } diff --git a/pkgs/applications/kde/mlt-path.patch b/pkgs/applications/kde/mlt-path.patch new file mode 100644 index 000000000000..9bfb66c1a839 --- /dev/null +++ b/pkgs/applications/kde/mlt-path.patch @@ -0,0 +1,22 @@ +diff -ruN old/src/kdenlivesettings.kcfg new/src/kdenlivesettings.kcfg +--- old/src/kdenlivesettings.kcfg 2019-09-10 23:20:27.555392353 -0400 ++++ new/src/kdenlivesettings.kcfg 2019-09-10 23:25:47.533964155 -0400 +@@ -378,14 +378,14 @@ + </group> + + <group name="env"> +- <entry name="mltpath" type="Path"> ++ <entry name="mltpath" type="Path" hidden="true"> + <label>Mlt framework install path.</label> +- <default></default> ++ <default>@mlt@/share/mlt/profiles</default> + </entry> + +- <entry name="rendererpath" type="Path"> ++ <entry name="rendererpath" type="Path" hidden="true"> + <label>Mlt melt renderer install path.</label> +- <default></default> ++ <default>@mlt@/bin/melt</default> + </entry> + + <entry name="ffmpegpath" type="Path"> diff --git a/pkgs/applications/kde/pim-data-exporter.nix b/pkgs/applications/kde/pim-data-exporter.nix index d17ffb3c0444..9f2117b41fb4 100644 --- a/pkgs/applications/kde/pim-data-exporter.nix +++ b/pkgs/applications/kde/pim-data-exporter.nix @@ -1,10 +1,10 @@ { mkDerivation, lib, kdepimTeam, extra-cmake-modules, kdoctools, - akonadi, kcmutils, kcrash, kdbusaddons, kidentitymanagement, kldap, - kmailtransport, knewstuff, knotifications, knotifyconfig, kparts, kross, ktexteditor, - kwallet, libkdepim, libkleo, pimcommon, qttools, - karchive, mailcommon, messagelib + akonadi, akonadi-notes, kcalcore, kcmutils, kcrash, kdbusaddons, + kidentitymanagement, kldap, kmailtransport, knewstuff, knotifications, + knotifyconfig, kparts, kross, ktexteditor, kwallet, libkdepim, libkleo, + pimcommon, qttools, karchive, mailcommon, messagelib }: mkDerivation { @@ -15,8 +15,9 @@ mkDerivation { }; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ - akonadi kcmutils kcrash kdbusaddons kidentitymanagement kldap kmailtransport - knewstuff knotifications knotifyconfig kparts kross ktexteditor kwallet libkdepim - libkleo pimcommon qttools karchive mailcommon messagelib + akonadi akonadi-notes kcalcore kcmutils kcrash kdbusaddons + kidentitymanagement kldap kmailtransport knewstuff knotifications + knotifyconfig kparts kross ktexteditor kwallet libkdepim libkleo pimcommon + qttools karchive mailcommon messagelib ]; } diff --git a/pkgs/applications/kde/rocs.nix b/pkgs/applications/kde/rocs.nix new file mode 100644 index 000000000000..feae7ca81dec --- /dev/null +++ b/pkgs/applications/kde/rocs.nix @@ -0,0 +1,25 @@ +{ + mkDerivation, lib, + extra-cmake-modules, boost, + qtbase, qtscript, qtquickcontrols, qtwebkit, qtxmlpatterns, grantlee, + kdoctools, karchive, kxmlgui, kcrash, kdeclarative, ktexteditor, kguiaddons +}: + +mkDerivation { + name = "rocs"; + + meta = with lib; { + homepage = "https://edu.kde.org/rocs/"; + description = "A graph theory IDE."; + license = with licenses; [ gpl2 lgpl21 fdl12 ]; + platforms = lib.platforms.linux; + maintainers = with maintainers; [ knairda ]; + }; + + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; + buildInputs = [ + boost + qtbase qtscript qtquickcontrols qtwebkit qtxmlpatterns grantlee + kxmlgui kcrash kdeclarative karchive ktexteditor kguiaddons + ]; +} diff --git a/pkgs/applications/misc/1password/default.nix b/pkgs/applications/misc/1password/default.nix index edcd08f24999..5895990e80ed 100644 --- a/pkgs/applications/misc/1password/default.nix +++ b/pkgs/applications/misc/1password/default.nix @@ -2,24 +2,24 @@ stdenv.mkDerivation rec { pname = "1password"; - version = "0.6.1"; + version = "0.6.2"; src = if stdenv.hostPlatform.system == "i686-linux" then fetchzip { url = "https://cache.agilebits.com/dist/1P/op/pkg/v${version}/op_linux_386_v${version}.zip"; - sha256 = "1yr78yawscp9fgvdw0dimc68k3bblk3g67g3jrqpa7hnl6pr24yl"; + sha256 = "08ha4qr064jyivsp8z3q2cwmmm6klqyicc1i9vpf7zd9xmmx72rd"; stripRoot = false; } else if stdenv.hostPlatform.system == "x86_64-linux" then fetchzip { url = "https://cache.agilebits.com/dist/1P/op/pkg/v${version}/op_linux_amd64_v${version}.zip"; - sha256 = "03m0vxhghzf4zq7k2f1afkc5ixf0qwiiypqjfjgpqpfng7g9ang7"; + sha256 = "1fjhn1k9h6rlrgin5czvpig8h70dh14i5k20g77jvxq24bf0sn9m"; stripRoot = false; } else if stdenv.hostPlatform.system == "x86_64-darwin" then fetchzip { url = "https://cache.agilebits.com/dist/1P/op/pkg/v${version}/op_darwin_amd64_v${version}.zip"; - sha256 = "1hypmls1fq4rjx9icgr0pkx3s3fhhma2q5rds314sv7f9ijl458f"; + sha256 = "1x7pj41a4wra3ws09cyc063ai5isf12qbkm2hxiiiq5glnacpvpl"; stripRoot = false; } else throw "Architecture not supported"; @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { description = "1Password command-line tool"; homepage = https://support.1password.com/command-line/; downloadPage = https://app-updates.agilebits.com/product_history/CLI; - maintainers = with maintainers; [ joelburget ]; + maintainers = with maintainers; [ joelburget marsam ]; license = licenses.unfree; platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin" ]; }; diff --git a/pkgs/applications/misc/alacritty/default.nix b/pkgs/applications/misc/alacritty/default.nix index dddf8d93412d..24f788ef4687 100644 --- a/pkgs/applications/misc/alacritty/default.nix +++ b/pkgs/applications/misc/alacritty/default.nix @@ -22,6 +22,7 @@ libxcb, libxkbcommon, wayland, + xdg_utils, # Darwin Frameworks AppKit, @@ -75,6 +76,10 @@ in buildRustPackage rec { ++ lib.optionals stdenv.isDarwin [ AppKit CoreGraphics CoreServices CoreText Foundation OpenGL ]; outputs = [ "out" "terminfo" ]; + postPatch = '' + substituteInPlace alacritty_terminal/src/config/mouse.rs \ + --replace xdg-open ${xdg_utils}/bin/xdg-open + ''; postBuild = lib.optionalString stdenv.isDarwin "make app"; diff --git a/pkgs/applications/misc/ape/default.nix b/pkgs/applications/misc/ape/default.nix index e78ba2df9993..0d8ebccb3d02 100644 --- a/pkgs/applications/misc/ape/default.nix +++ b/pkgs/applications/misc/ape/default.nix @@ -1,33 +1,33 @@ { stdenv, swiProlog, makeWrapper, fetchFromGitHub, - lexicon ? "lexicon/clex_lexicon.pl", + lexicon ? "prolog/lexicon/clex_lexicon.pl", pname ? "ape", description ? "Parser for Attempto Controlled English (ACE)", license ? with stdenv.lib; licenses.lgpl3 }: stdenv.mkDerivation rec { - name = "${pname}-${version}"; - version = "6.7-131003"; + inherit pname; + version = "2019-08-10"; buildInputs = [ swiProlog makeWrapper ]; src = fetchFromGitHub { owner = "Attempto"; repo = "APE"; - rev = version; - sha256 = "0cw47qjg4896kw3vps6rfs02asvscsqvcfdiwgfmqb3hvykb1sdx"; + rev = "113b81621262d7a395779465cb09397183e6f74c"; + sha256 = "0xyvna2fbr18hi5yvm0zwh77q02dfna1g4g53z9mn2rmlfn2mhjh"; }; patchPhase = '' # We move the file first to avoid "same file" error in the default case cp ${lexicon} new_lexicon.pl - rm lexicon/clex_lexicon.pl - cp new_lexicon.pl lexicon/clex_lexicon.pl + rm prolog/lexicon/clex_lexicon.pl + cp new_lexicon.pl prolog/lexicon/clex_lexicon.pl ''; buildPhase = '' - make build + make SHELL=${stdenv.shell} build ''; installPhase = '' diff --git a/pkgs/applications/misc/cataract/build.nix b/pkgs/applications/misc/cataract/build.nix index 5f4e24f4d3cc..1c33a92987c1 100644 --- a/pkgs/applications/misc/cataract/build.nix +++ b/pkgs/applications/misc/cataract/build.nix @@ -22,17 +22,21 @@ stdenv.mkDerivation { nativeBuildInputs = [ autoreconfHook pkgconfig ]; buildInputs = [ glib libxml2 exiv2 imagemagick ]; + prePatch = '' + sed -i 's|#include <exiv2/exif.hpp>|#include <exiv2/exiv2.hpp>|' src/jpeg-utils.cpp + ''; + installPhase = '' mkdir $out/{bin,share} -p cp src/cgg{,-dirgen} $out/bin/ ''; - meta = { - homepage = http://cgg.bzatek.net/; - description = "a simple static web photo gallery, designed to be clean and easily usable"; - license = stdenv.lib.licenses.gpl2; - maintainers = [ stdenv.lib.maintainers.matthiasbeyer ]; - platforms = with stdenv.lib.platforms; linux ++ darwin; + meta = with stdenv.lib; { + homepage = "http://cgg.bzatek.net/"; + description = "A simple static web photo gallery, designed to be clean and easily usable"; + license = licenses.gpl2; + maintainers = [ maintainers.matthiasbeyer ]; + platforms = with platforms; linux ++ darwin; }; } diff --git a/pkgs/applications/misc/cbatticon/default.nix b/pkgs/applications/misc/cbatticon/default.nix index 44612644359c..e506829b575e 100644 --- a/pkgs/applications/misc/cbatticon/default.nix +++ b/pkgs/applications/misc/cbatticon/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "cbatticon"; - version = "1.6.9"; + version = "1.6.10"; src = fetchFromGitHub { owner = "valr"; repo = pname; rev = version; - sha256 = "0kw09d678sd3m18fmi4380sl4a2m5lkfmq0kps16cdmq7z80rvaf"; + sha256 = "0ivm2dzhsa9ir25ry418r2qg2llby9j7a6m3arbvq5c3kaj8m9jr"; }; nativeBuildInputs = [ pkgconfig gettext ]; diff --git a/pkgs/applications/misc/cipher/default.nix b/pkgs/applications/misc/cipher/default.nix new file mode 100644 index 000000000000..51095e8e58eb --- /dev/null +++ b/pkgs/applications/misc/cipher/default.nix @@ -0,0 +1,57 @@ +{ stdenv +, fetchFromGitHub +, meson +, ninja +, pkgconfig +, pantheon +, python3 +, gettext +, glib +, gtk3 +, libgee +, xdg_utils +, wrapGAppsHook }: + +stdenv.mkDerivation rec { + pname = "cipher"; + version = "2.0.0"; + + src = fetchFromGitHub { + owner = "arshubham"; + repo = "cipher"; + rev = version; + sha256 = "0n5aigcyxnl4k52mdmavbxx6afc1ixymn3k3l2ryhyzi5q31x0x3"; + }; + + nativeBuildInputs = [ + gettext + meson + ninja + pantheon.vala + pkgconfig + python3 + wrapGAppsHook + ]; + + buildInputs = [ + glib + gtk3 + pantheon.granite + libgee + ]; + + postPatch = '' + substituteInPlace data/com.github.arshubham.cipher.desktop.in \ + --replace xdg-open ${xdg_utils}/bin/xdg-open + chmod +x post_install.py + patchShebangs post_install.py + ''; + + meta = with stdenv.lib; { + description = "A simple application for encoding and decoding text, designed for elementary OS"; + homepage = "https://github.com/arshubham/cipher"; + maintainers = with maintainers; [ kjuvi ] ++ pantheon.maintainers; + platforms = platforms.linux; + license = licenses.gpl3Plus; + }; +} diff --git a/pkgs/applications/misc/cmatrix/default.nix b/pkgs/applications/misc/cmatrix/default.nix index 9a008a886fac..cc57e58c56a4 100644 --- a/pkgs/applications/misc/cmatrix/default.nix +++ b/pkgs/applications/misc/cmatrix/default.nix @@ -16,6 +16,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Simulates the falling characters theme from The Matrix movie"; + license = licenses.gpl3; longDescription = '' CMatrix simulates the display from "The Matrix" and is based on the screensaver from the movie's website. diff --git a/pkgs/applications/misc/cointop/default.nix b/pkgs/applications/misc/cointop/default.nix index c29d8684c902..099b06c078d4 100644 --- a/pkgs/applications/misc/cointop/default.nix +++ b/pkgs/applications/misc/cointop/default.nix @@ -1,6 +1,6 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: -buildGoModule rec { +buildGoPackage rec { pname = "cointop"; version = "1.3.4"; @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "0nw6vzp0c5r8bwnlvgzj4hzdah44p5pp03d2bcr1lkw8np8fy65n"; }; - modSha256 = "1fg5h689s6r79qa9qsmd8hcvyihfyzlvqrhhk0qyfl528ipi1zwg"; + goPackagePath = "github.com/miguelmota/cointop"; meta = with lib; { description = "The fastest and most interactive terminal based UI application for tracking cryptocurrencies"; diff --git a/pkgs/applications/misc/cura/default.nix b/pkgs/applications/misc/cura/default.nix index 084881f75d97..04cf627b2818 100644 --- a/pkgs/applications/misc/cura/default.nix +++ b/pkgs/applications/misc/cura/default.nix @@ -2,7 +2,7 @@ mkDerivation rec { pname = "cura"; - version = "4.2.1"; + version = "4.3.0"; src = fetchFromGitHub { owner = "Ultimaker"; @@ -14,8 +14,8 @@ mkDerivation rec { materials = fetchFromGitHub { owner = "Ultimaker"; repo = "fdm_materials"; - rev = "4.2.0"; # TODO: change back to `version` after 4.2.1 - sha256 = "17x43v0np58qbdfk3wz1k7i9pl0plndx9gmf7y0n23nl9f1qzb0m"; + rev = version; + sha256 = "141cv1f2pv2pznhgj32zg8bw3kmw9002g6rx16jq7lhclr0x3xls"; }; buildInputs = [ qtbase qtquickcontrols2 qtgraphicaleffects ]; diff --git a/pkgs/applications/misc/curaengine/default.nix b/pkgs/applications/misc/curaengine/default.nix index 3e4c77aafc6a..06c5d1585652 100644 --- a/pkgs/applications/misc/curaengine/default.nix +++ b/pkgs/applications/misc/curaengine/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "curaengine"; - version = "4.2.0"; + version = "4.3.0"; src = fetchFromGitHub { owner = "Ultimaker"; repo = "CuraEngine"; rev = version; - sha256 = "13hbzsx4fwrbwviyhh8z04gs9b0m8fjl8a31ci7gr2dfdmgjs6pd"; + sha256 = "074qcaj1v2ri9wppx9lr066nlidkrsp9m1rrrk2hs2b61x0340ff"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/applications/misc/dbeaver/default.nix b/pkgs/applications/misc/dbeaver/default.nix index 2e8217012160..179dc85b2a92 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 = "6.1.5"; + version = "6.2.2"; desktopItem = makeDesktopItem { name = "dbeaver"; @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://dbeaver.io/files/${version}/dbeaver-ce-${version}-linux.gtk.x86_64.tar.gz"; - sha256 = "0lkycm1152wd56i1hjq7q3sd05h51fyz99qr2n65lwi33vz2qk9m"; + sha256 = "0qpa0wh5lr5lxk9cdv5p1cmbdk1kw1lfqmsfgqxvgfysc1mgjgp1"; }; installPhase = '' diff --git a/pkgs/applications/misc/ddgr/default.nix b/pkgs/applications/misc/ddgr/default.nix index 3cbb091a4e21..9b877c2594b3 100644 --- a/pkgs/applications/misc/ddgr/default.nix +++ b/pkgs/applications/misc/ddgr/default.nix @@ -1,20 +1,26 @@ {stdenv, fetchFromGitHub, python3}: stdenv.mkDerivation rec { - version = "1.6"; + version = "1.7"; pname = "ddgr"; src = fetchFromGitHub { owner = "jarun"; repo = "ddgr"; rev = "v${version}"; - sha256 = "04ybbjsf9hpn2p5cjjm15cwvv0mwrmdi19iifrym6ps3rmll0p3c"; + sha256 = "0kcl8z9w8iwn3pxay1pfahhw6vs2l1dp60yfv3i19in4ac9va7m0"; }; buildInputs = [ python3 ]; makeFlags = "PREFIX=$(out)"; + preBuild = '' + # Version 1.7 was released as 1.6 + # https://github.com/jarun/ddgr/pull/95 + sed -i "s/_VERSION_ = '1.6'/_VERSION_ = '1.7'/" ddgr + ''; + postInstall = '' mkdir -p "$out/share/bash-completion/completions/" cp "auto-completion/bash/ddgr-completion.bash" "$out/share/bash-completion/completions/" diff --git a/pkgs/applications/misc/diff-pdf/default.nix b/pkgs/applications/misc/diff-pdf/default.nix index 0016f89746d6..af47afcc601d 100644 --- a/pkgs/applications/misc/diff-pdf/default.nix +++ b/pkgs/applications/misc/diff-pdf/default.nix @@ -7,15 +7,15 @@ let else [ wxGTK ]; in -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "diff-pdf"; - version = "2017-12-30"; + version = "0.3"; src = fetchFromGitHub { owner = "vslavik"; repo = "diff-pdf"; - rev = "c4d67226ec4c29b30a7399e75f80636ff8a6f9fc"; - sha256 = "1c3ig7ckrg37p5vzvgjnsfdzdad328wwsx0r31lbs1d8pkjkgq3m"; + rev = "v${version}"; + sha256 = "0vzvyjpk6m89zs6j1dq85f93n2b1i6akn2g0z9qhagjd2pds920i"; }; nativeBuildInputs = [ autoconf automake pkgconfig ]; @@ -24,9 +24,10 @@ stdenv.mkDerivation { preConfigure = "./bootstrap"; meta = with stdenv.lib; { - homepage = http://vslavik.github.io/diff-pdf; + homepage = "https://vslavik.github.io/diff-pdf/"; description = "Simple tool for visually comparing two PDF files"; license = licenses.gpl2; + platforms = platforms.all; maintainers = with maintainers; [ dtzWill ]; }; } diff --git a/pkgs/applications/misc/digitalbitbox/default.nix b/pkgs/applications/misc/digitalbitbox/default.nix index a4f6b1ce9881..a6ae45306552 100644 --- a/pkgs/applications/misc/digitalbitbox/default.nix +++ b/pkgs/applications/misc/digitalbitbox/default.nix @@ -138,5 +138,6 @@ in stdenv.mkDerivation rec { vidbina ]; platforms = platforms.linux; + broken = true; }; } diff --git a/pkgs/applications/misc/electron-cash/default.nix b/pkgs/applications/misc/electron-cash/default.nix index 913afd766d3d..d0429d135d75 100644 --- a/pkgs/applications/misc/electron-cash/default.nix +++ b/pkgs/applications/misc/electron-cash/default.nix @@ -56,6 +56,10 @@ python3Packages.buildPythonApplication rec { --replace "Exec=electron-cash" "Exec=$out/bin/electron-cash" ''; + postFixup = '' + wrapQtApp $out/bin/electron-cash + ''; + doInstallCheck = true; installCheckPhase = '' $out/bin/electron-cash help >/dev/null diff --git a/pkgs/applications/misc/electrum/ltc.nix b/pkgs/applications/misc/electrum/ltc.nix index 0a28efbc28cd..88f44c6cc853 100644 --- a/pkgs/applications/misc/electrum/ltc.nix +++ b/pkgs/applications/misc/electrum/ltc.nix @@ -51,7 +51,7 @@ python3Packages.buildPythonApplication rec { homepage = https://electrum-ltc.org/; license = licenses.mit; platforms = platforms.linux; - maintainers = with maintainers; [ asymmetric ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/applications/misc/font-manager/default.nix b/pkgs/applications/misc/font-manager/default.nix index 5df34c84f096..dad954900124 100644 --- a/pkgs/applications/misc/font-manager/default.nix +++ b/pkgs/applications/misc/font-manager/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, meson, ninja, gettext, python3, +{ stdenv, fetchFromGitHub, meson, ninja, gettext, python3, fetchpatch, pkgconfig, libxml2, json-glib , sqlite, itstool, librsvg, vala, gtk3, gnome3, desktop-file-utils, wrapGAppsHook, gobject-introspection }: @@ -42,6 +42,15 @@ stdenv.mkDerivation rec { "-Ddisable_pycompile=true" ]; + patches = [ + # fix build with Vala 0.46 + (fetchpatch { + url = "https://github.com/FontManager/font-manager/commit/c73b40de11f376f4515a0edfe97fb3721a264b35.patch"; + sha256 = "0lacwsifgvda2r3z6j2a0svdqr6mgav7zkvih35xa8155y8wfpnw"; + excludes = [ "fedora/font-manager.spec" ]; + }) + ]; + postPatch = '' chmod +x meson_post_install.py patchShebangs meson_post_install.py @@ -60,7 +69,6 @@ stdenv.mkDerivation rec { Font Manager is NOT a professional-grade font management solution. ''; license = licenses.gpl3; - repositories.git = https://github.com/FontManager/master; platforms = platforms.unix; maintainers = [ maintainers.romildo ]; }; diff --git a/pkgs/applications/misc/formatter/default.nix b/pkgs/applications/misc/formatter/default.nix new file mode 100644 index 000000000000..11e7a4e5241a --- /dev/null +++ b/pkgs/applications/misc/formatter/default.nix @@ -0,0 +1,70 @@ +{ stdenv +, fetchFromGitHub +, meson +, ninja +, pkgconfig +, pantheon +, python3 +, substituteAll +, glib +, gtk3 +, dosfstools +, e2fsprogs +, exfat +, hfsprogs +, ntfs3g +, libgee +, wrapGAppsHook +}: + +stdenv.mkDerivation rec { + pname = "formatter"; + version = "0.3.0"; + + src = fetchFromGitHub { + owner = "Djaler"; + repo = "Formatter"; + rev = version; + sha256 = "145742dk16736zxj30rzn61h4k0xpggfsbqkxllxd302mgbmxlzq"; + }; + + patches = [ + (substituteAll { + src = ./fix-paths.patch; + ext4 = "${e2fsprogs}/bin/mkfs.ext4"; + exfat = "${exfat}/bin/mkfs.exfat"; + fat = "${dosfstools}/bin/mkfs.fat"; + ntfs = "${ntfs3g}/bin/mkfs.ntfs"; + hfsplus = "${hfsprogs}/bin/mkfs.hfsplus"; + }) + ]; + + nativeBuildInputs = [ + meson + ninja + pantheon.vala + pkgconfig + python3 + wrapGAppsHook + ]; + + buildInputs = [ + glib + gtk3 + libgee + pantheon.granite + ]; + + postPatch = '' + chmod +x meson/post_install.py + patchShebangs meson/post_install.py + ''; + + meta = with stdenv.lib; { + description = "A simple formatter designed for elementary OS"; + homepage = "https://github.com/Djaler/Formatter"; + maintainers = with maintainers; [ kjuvi ] ++ pantheon.maintainers; + platforms = platforms.linux; + license = licenses.lgpl2Plus; + }; +} diff --git a/pkgs/applications/misc/formatter/fix-paths.patch b/pkgs/applications/misc/formatter/fix-paths.patch new file mode 100644 index 000000000000..67c1d2b43ccc --- /dev/null +++ b/pkgs/applications/misc/formatter/fix-paths.patch @@ -0,0 +1,53 @@ +diff --git a/src/Objects/DeviceFormatter.vala b/src/Objects/DeviceFormatter.vala +index cf6a3b8..0de10a9 100644 +--- a/src/Objects/DeviceFormatter.vala ++++ b/src/Objects/DeviceFormatter.vala +@@ -62,42 +62,42 @@ namespace Formatter { + string drive_identifier = drive.get_identifier ("unix-device"); + switch (filesystem) { + case Formatter.Filesystems.EXT4: +- spawn_args = {"pkexec", "mkfs.ext4", drive_identifier, "-F"}; ++ spawn_args = {"pkexec", "@ext4@", drive_identifier, "-F"}; + if (label != "") { + spawn_args += "-L"; + spawn_args += label; + } + break; + case Formatter.Filesystems.EXFAT: +- spawn_args = {"pkexec", "mkfs.exfat", drive_identifier}; ++ spawn_args = {"pkexec", "@exfat@", drive_identifier}; + if (label != "") { + spawn_args += "-n"; + spawn_args += label; + } + break; + case Formatter.Filesystems.FAT16: +- spawn_args = {"pkexec", "mkfs.fat", "-F16", "-I", drive_identifier}; ++ spawn_args = {"pkexec", "@fat@", "-F16", "-I", drive_identifier}; + if (label != "") { + spawn_args += "-n"; + spawn_args += label; + } + break; + case Formatter.Filesystems.FAT32: +- spawn_args = {"pkexec", "mkfs.fat", "-F32", "-I", drive_identifier}; ++ spawn_args = {"pkexec", "@fat@", "-F32", "-I", drive_identifier}; + if (label != "") { + spawn_args += "-n"; + spawn_args += label; + } + break; + case Formatter.Filesystems.NTFS: +- spawn_args = {"pkexec", "mkfs.ntfs", drive_identifier, "-f", "-F"}; ++ spawn_args = {"pkexec", "@ntfs@", drive_identifier, "-f", "-F"}; + if (label != "") { + spawn_args += "-L"; + spawn_args += label; + } + break; + case Formatter.Filesystems.HFS_PLUS: +- spawn_args = {"pkexec", "mkfs.hfsplus", drive_identifier}; ++ spawn_args = {"pkexec", "@hfsplus@", drive_identifier}; + if (label != "") { + spawn_args += "-v"; + spawn_args += label; diff --git a/pkgs/applications/misc/gcalcli/default.nix b/pkgs/applications/misc/gcalcli/default.nix index 6f380114a276..8381f182e5d3 100644 --- a/pkgs/applications/misc/gcalcli/default.nix +++ b/pkgs/applications/misc/gcalcli/default.nix @@ -5,13 +5,13 @@ with python3.pkgs; buildPythonApplication rec { pname = "gcalcli"; - version = "4.1.1"; + version = "4.2.0"; src = fetchFromGitHub { owner = "insanum"; repo = pname; rev = "v${version}"; - sha256 = "1qlmslywm4dfimggly4p0ckn2gj165mq1p0wkry9jpb3sg1m5fdf"; + sha256 = "0746vmhfclkpkqnyaidxid2z20mlv86hv0pjxy1qglrja91vkd72"; }; postPatch = lib.optionalString stdenv.isLinux '' diff --git a/pkgs/applications/misc/girara/default.nix b/pkgs/applications/misc/girara/default.nix index c2b7487cd72f..6bfb4907807a 100644 --- a/pkgs/applications/misc/girara/default.nix +++ b/pkgs/applications/misc/girara/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "girara"; - version = "0.3.2"; + version = "0.3.3"; outputs = [ "out" "dev" ]; src = fetchurl { - url = "https://pwmt.org/projects/girara/download/${pname}-${version}.tar.xz"; - sha256 = "1kc6n1mxjxa7wvwnqy94qfg8l9jvx9qrvrr2kc7m4g0z20x3a00p"; + url = "https://git.pwmt.org/pwmt/${pname}/-/archive/${version}/${pname}-${version}.tar.gz"; + sha256 = "13vr62kkkqs2xsrmsn114n6c6084ix1qyjksczqsc3s2y3bdsmj4"; }; nativeBuildInputs = [ meson ninja pkgconfig gettext check dbus xvfb_run ]; @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://pwmt.org/projects/girara/; + homepage = "https://git.pwmt.org/pwmt/girara"; description = "User interface library"; longDescription = '' girara is a library that implements a GTK based VIM-like user interface diff --git a/pkgs/applications/misc/gnome-firmware-updater/default.nix b/pkgs/applications/misc/gnome-firmware-updater/default.nix new file mode 100644 index 000000000000..f05c5fd210c4 --- /dev/null +++ b/pkgs/applications/misc/gnome-firmware-updater/default.nix @@ -0,0 +1,76 @@ +{ stdenv +, fetchFromGitLab +, fetchpatch +, appstream-glib +, desktop-file-utils +, fwupd +, gettext +, glib +, gnome3 +, gtk3 +, libsoup +, libxmlb +, meson +, ninja +, pkgconfig +, systemd +, help2man +, wrapGAppsHook +}: + +stdenv.mkDerivation rec { + pname = "gnome-firmware-updater"; + version = "3.34.0"; + + src = fetchFromGitLab { + domain = "gitlab.gnome.org"; + owner = "hughsie"; + repo = "gnome-firmware-updater"; + rev = version; + sha256 = "04pll0fzf4nr276kfw89r0524s6ppmls5rz4vq2j8c8gb50g0b6l"; + }; + + patches = [ + # Fixes manual build + (fetchpatch { + url = "https://gitlab.gnome.org/hughsie/gnome-firmware-updater/commit/006b64dcb401d8c81a33222bc4be8274c23f3c9c.patch"; + sha256 = "02303ip4ri5pv1bls8c0njb00qhn0jd0d8rmvsrig0fmacwfvc06"; + }) + (fetchpatch { + url = "https://gitlab.gnome.org/hughsie/gnome-firmware-updater/commit/c4f076f2c902080618e0c27dec924fd0019f68a3.patch"; + sha256 = "1yfxd7qsg3gwpamg0m2sbcfrgks59w70r9728arrc4pwx1hia2q1"; + }) + ]; + + nativeBuildInputs = [ + appstream-glib # for ITS rules + desktop-file-utils + gettext + help2man + meson + ninja + pkgconfig + wrapGAppsHook + ]; + + buildInputs = [ + fwupd + glib + gtk3 + libsoup + libxmlb + systemd + ]; + + mesonFlags = [ + "-Dconsolekit=false" + ]; + + meta = with stdenv.lib; { + homepage = "https://gitlab.gnome.org/hughsie/gnome-firmware-updater"; + description = "Tool for installing firmware on devices"; + license = licenses.gpl2Plus; + maintainers = gnome3.maintainers; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/misc/gnome-usage/default.nix b/pkgs/applications/misc/gnome-usage/default.nix index eecf9bbd88f7..7484998ab205 100644 --- a/pkgs/applications/misc/gnome-usage/default.nix +++ b/pkgs/applications/misc/gnome-usage/default.nix @@ -13,15 +13,16 @@ , libgtop , libdazzle , gnome3 +, tracker }: stdenv.mkDerivation rec { pname = "gnome-usage"; - version = "3.32.0"; + version = "3.33.2"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0bgszckddfpd3czyb9fddx4pgv5yv44sxc45dfk2kgqyy169gjih"; + sha256 = "0w3ppfaf15il8mad64qyc9hj1rmlvzs5dyzrxhq7r50k4kyiwmk4"; }; nativeBuildInputs = [ @@ -41,6 +42,7 @@ stdenv.mkDerivation rec { gtk3 libdazzle libgtop + tracker ]; postPatch = '' diff --git a/pkgs/applications/misc/gnome15/default.nix b/pkgs/applications/misc/gnome15/default.nix index 7a918d961f63..41d535b35106 100644 --- a/pkgs/applications/misc/gnome15/default.nix +++ b/pkgs/applications/misc/gnome15/default.nix @@ -28,6 +28,9 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "A set of tools for configuring the Logitech G15 keyboard"; + # Doesn't work with new `keyring` library which is Python 3-only now. + # https://github.com/Gnome15/gnome15/issues/29 + broken = true; license = licenses.gpl3; homepage = https://gnome15.org/; platforms = platforms.linux; diff --git a/pkgs/applications/misc/gpscorrelate/default.nix b/pkgs/applications/misc/gpscorrelate/default.nix index d10507b10449..bf7bec38afb5 100644 --- a/pkgs/applications/misc/gpscorrelate/default.nix +++ b/pkgs/applications/misc/gpscorrelate/default.nix @@ -3,15 +3,17 @@ stdenv.mkDerivation rec { pname = "gpscorrelate"; - version = "unstable-2019-06-05"; + version = "unstable-2019-09-03"; src = fetchFromGitHub { owner = "dfandrich"; repo = pname; - rev = "80b14fe7c10c1cc8f62c13f517c062577ce88c85"; - sha256 = "1gaan0nd7ai0bwilfnkza7lg5mz87804mvlygj0gjc672izr37r6"; + rev = "e1dd44a34f67b1ab7201440e60a840258ee448d2"; + sha256 = "0gjwwdqh9dprzylmmnk3gm41khka9arkij3i9amd8y7d49pm9rlv"; }; + patches = [ ./fix-localedir.diff ]; + nativeBuildInputs = [ desktop-file-utils docbook_xml_dtd_42 @@ -31,11 +33,12 @@ stdenv.mkDerivation rec { "GTK=3" "CC=cc" "CXX=c++" + "CFLAGS=-DENABLE_NLS" ]; doCheck = true; - installTargets = [ "install" "install-desktop-file" ]; + installTargets = [ "install" "install-po" "install-desktop-file" ]; meta = with stdenv.lib; { description = "A GPS photo correlation tool, to add EXIF geotags"; @@ -59,5 +62,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2Plus; homepage = "https://github.com/dfandrich/gpscorrelate"; platforms = platforms.linux; + maintainers = with maintainers; [ sikmir ]; }; } diff --git a/pkgs/applications/misc/gpscorrelate/fix-localedir.diff b/pkgs/applications/misc/gpscorrelate/fix-localedir.diff new file mode 100644 index 000000000000..5f9cb296ecd5 --- /dev/null +++ b/pkgs/applications/misc/gpscorrelate/fix-localedir.diff @@ -0,0 +1,27 @@ +diff --git i/Makefile w/Makefile +index 47919ca..408fd68 100644 +--- i/Makefile ++++ w/Makefile +@@ -33,8 +33,9 @@ datadir = $(prefix)/share + mandir = $(datadir)/man + docdir = $(datadir)/doc/gpscorrelate + applicationsdir = $(datadir)/applications ++localedir = ${datadir}/locale + +-DEFS = -DPACKAGE_VERSION=\"$(PACKAGE_VERSION)\" ++DEFS = -DPACKAGE_VERSION=\"$(PACKAGE_VERSION)\" -DPACKAGE_LOCALE_DIR=\"$(localedir)\" + + TARGETS = gpscorrelate-gui$(EXEEXT) gpscorrelate$(EXEEXT) doc/gpscorrelate.1 doc/gpscorrelate.html + +diff --git i/main-gui.c w/main-gui.c +index fdace6f..8a6197b 100644 +--- i/main-gui.c ++++ w/main-gui.c +@@ -40,6 +40,7 @@ + int main(int argc, char* argv[]) + { + /* Initialize gettext (gtk_init initializes the locale) */ ++ (void) bindtextdomain(TEXTDOMAIN, PACKAGE_LOCALE_DIR); + (void) textdomain(TEXTDOMAIN); + (void) bind_textdomain_codeset(TEXTDOMAIN, "UTF-8"); + diff --git a/pkgs/applications/misc/gpxsee/default.nix b/pkgs/applications/misc/gpxsee/default.nix index 6e9296da267b..ef84b8a4e6d7 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.12"; + version = "7.15"; src = fetchFromGitHub { owner = "tumic0"; repo = "GPXSee"; rev = version; - sha256 = "0c3axs3mm6xzabwbvy9vgq1sryjpi4h91nwzy9iyv9zjxz7phgzc"; + sha256 = "036g17479nqy3kvy3dy3cn7yi7r57rsp28gkcay0qhf9h0az76p3"; }; nativeBuildInputs = [ qmake ]; @@ -28,7 +28,7 @@ mkDerivation rec { all common GPS log file formats. ''; license = licenses.gpl3; - maintainers = [ maintainers.womfoo ]; + maintainers = with maintainers; [ womfoo sikmir ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/misc/grip/default.nix b/pkgs/applications/misc/grip/default.nix index 7f2057b2947a..b7df9b49fb3f 100644 --- a/pkgs/applications/misc/grip/default.nix +++ b/pkgs/applications/misc/grip/default.nix @@ -2,11 +2,11 @@ , curl, cdparanoia, libid3tag, ncurses, libtool }: stdenv.mkDerivation rec { - name = "grip-3.3.1"; + name = "grip-3.10.2"; src = fetchurl { url = "mirror://sourceforge/grip/${name}.tar.gz"; - sha256 = "1zb6zpq7qmn6bflbgfwisyg3vrjr23yi1c1kqvwndl1f0shr8qyl"; + sha256 = "1wngrvw0zkrd2xw7c6w0qmq38jxishp5q9xvm6qlycza2czb4p36"; }; nativeBuildInputs = [ pkgconfig ]; @@ -15,6 +15,9 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; + # glib-2.62 deprecations + NIX_CFLAGS_COMPILE = [ "-DGLIB_DISABLE_DEPRECATION_WARNINGS" ]; + meta = { description = "GTK-based audio CD player/ripper"; homepage = http://nostatic.org/grip; diff --git a/pkgs/applications/misc/gxneur/default.nix b/pkgs/applications/misc/gxneur/default.nix index 7d19a9cb1108..6e6145e79086 100644 --- a/pkgs/applications/misc/gxneur/default.nix +++ b/pkgs/applications/misc/gxneur/default.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation { sha256 = "0avmhdcj0hpr55fc0iih8fjykmdhn34c8mwdnqvl8jh4nhxxchxr"; }; - NIX_CFLAGS_COMPILE = "-Wno-deprecated-declarations"; + # glib-2.62 deprecations + NIX_CFLAGS_COMPILE = [ "-DGLIB_DISABLE_DEPRECATION_WARNINGS" ]; nativeBuildInputs = [ pkgconfig intltool ]; buildInputs = [ diff --git a/pkgs/applications/misc/hubstaff/revision.json b/pkgs/applications/misc/hubstaff/revision.json index 3170a63379cf..64cad5c02928 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.4.10-848554d6/Hubstaff-1.4.10-848554d6.sh", - "version": "1.4.10-848554d6", - "sha256": "1hwncdzpzawrwswr3ibhxny0aa5k9f8f2qf636bdzqilwhv6342z" + "url": "https://hubstaff-production.s3.amazonaws.com/downloads/HubstaffClient/Builds/Release/1.4.11-a12e5bad/Hubstaff-1.4.11-a12e5bad.sh", + "version": "1.4.11-a12e5bad", + "sha256": "0nqmw02spplqppvz2jniq5p5y69l8n5xp9wji4032kn4qsba33jn" } diff --git a/pkgs/applications/misc/hugo/default.nix b/pkgs/applications/misc/hugo/default.nix index 720445be9bea..840f4c32e52a 100644 --- a/pkgs/applications/misc/hugo/default.nix +++ b/pkgs/applications/misc/hugo/default.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "hugo"; - version = "0.58.0"; + version = "0.58.3"; goPackagePath = "github.com/gohugoio/hugo"; src = fetchFromGitHub { owner = "gohugoio"; - repo = "hugo"; + repo = pname; rev = "v${version}"; - sha256 = "0971li0777c1s67w72wl1y0b58ky93dw05hbk3s4kqys0acanc2d"; + sha256 = "00dhb6xilkwr9yhncpyc6alzqw77ch3vd85dc7lzsmhw1c80n0lc"; }; - modSha256 = "14ylbh2hx14swcqvawprbx5gynkwyb0nlp5acr4fjy1zl0ifc790"; + modSha256 = "0d6zc7hxb246zsvwsjz4ds6gdd2m95x6l3djh3mmciwfg9cd7prx"; buildFlags = "-tags extended"; diff --git a/pkgs/applications/misc/ipmiview/default.nix b/pkgs/applications/misc/ipmiview/default.nix index 64e0f0d325b5..e46df5d59e0e 100644 --- a/pkgs/applications/misc/ipmiview/default.nix +++ b/pkgs/applications/misc/ipmiview/default.nix @@ -1,33 +1,72 @@ -{ stdenv, fetchurl, patchelf, makeWrapper, xorg, gcc, gcc-unwrapped }: +{ stdenv +, fetchurl +, makeDesktopItem +, makeWrapper +, patchelf +, fontconfig +, freetype +, gcc +, gcc-unwrapped +, iputils +, psmisc +, xorg }: stdenv.mkDerivation rec { - pname = "IPMIView"; - version = "2.14.0"; - buildVersion = "180213"; + pname = "IPMIView"; + version = "2.16.0"; + buildVersion = "190815"; - src = fetchurl { - url = "ftp://ftp.supermicro.com/utility/IPMIView/Linux/IPMIView_${version}_build.${buildVersion}_bundleJRE_Linux_x64.tar.gz"; - sha256 = "1wp22wm7smlsb25x0cck4p660cycfczxj381930crd1qrf68mw4h"; + src = fetchurl { + url = "https://www.supermicro.com/wftp/utility/IPMIView/Linux/IPMIView_${version}_build.${buildVersion}_bundleJRE_Linux_x64.tar.gz"; + sha256 = "0qw9zfnj0cyvab7ndamlw2y0gpczjhh1jkz8340kl42r2xmhkvpl"; }; - nativeBuildInputs = [ patchelf makeWrapper ]; + nativeBuildInputs = [ patchelf makeWrapper ]; + buildPhase = with xorg; + let + stunnelBinary = if stdenv.hostPlatform.system == "x86_64-linux" then "linux/stunnel64" + else if stdenv.hostPlatform.system == "i686-linux" then "linux/stunnel32" + else throw "IPMIView is not supported on this platform"; + in + '' + patchelf --set-rpath "${stdenv.lib.makeLibraryPath [ libX11 libXext libXrender libXtst libXi ]}" ./jre/lib/amd64/libawt_xawt.so + patchelf --set-rpath "${stdenv.lib.makeLibraryPath [ freetype ]}" ./jre/lib/amd64/libfontmanager.so + patchelf --set-rpath "${gcc-unwrapped.lib}/lib" ./libiKVM64.so + patchelf --set-rpath "${gcc.cc}/lib:$out/jre/lib/amd64/jli" --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" ./jre/bin/java + patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" ./BMCSecurity/${stunnelBinary} + ''; - buildPhase = with xorg; '' - patchelf --set-rpath "${stdenv.lib.makeLibraryPath [ libX11 libXext libXrender libXtst libXi ]}" ./jre/lib/amd64/xawt/libmawt.so - patchelf --set-rpath "${gcc-unwrapped.lib}/lib" ./libiKVM64.so - patchelf --set-rpath "${stdenv.lib.makeLibraryPath [ libXcursor libX11 libXext libXrender libXtst libXi ]}" --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" ./jre/bin/javaws - patchelf --set-rpath "${gcc.cc}/lib:$out/jre/lib/amd64/jli" --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" ./jre/bin/java - ''; + desktopItem = makeDesktopItem rec { + name = "IPMIView"; + exec = "IPMIView"; + desktopName = name; + genericName = "Supermicro BMC manager"; + categories = "Network;Configuration"; + }; + + installPhase = '' + mkdir -p $out/bin + cp -R . $out/ - installPhase = '' - mkdir -p $out/bin - cp -R . $out/ - makeWrapper $out/jre/bin/java $out/bin/IPMIView \ - --prefix PATH : "$out/jre/bin" \ - --add-flags "-jar $out/IPMIView20.jar" - ''; + ln -s ${desktopItem}/share $out/share - meta = with stdenv.lib; { + # LD_LIBRARY_PATH: fontconfig is used from java code + # PATH: iputils is used for ping, and psmisc is for killall + # WORK_DIR: unfortunately the ikvm related binaries are loaded from + # and user configuration is written to files in the CWD + makeWrapper $out/jre/bin/java $out/bin/IPMIView \ + --set LD_LIBRARY_PATH "${stdenv.lib.makeLibraryPath [ fontconfig ]}" \ + --prefix PATH : "$out/jre/bin:${iputils}/bin:${psmisc}/bin" \ + --add-flags "-jar $out/IPMIView20.jar" \ + --run 'WORK_DIR=''${XDG_DATA_HOME:-~/.local/share}/ipmiview + mkdir -p $WORK_DIR + ln -snf '$out'/iKVM.jar '$out'/libiKVM* '$out'/libSharedLibrary* $WORK_DIR + cd $WORK_DIR' + ''; + + meta = with stdenv.lib; { license = licenses.unfree; - }; - } + maintainers = with maintainers; [ vlaci ]; + platforms = [ "x86_64-linux" "i686-linux" ]; + }; +} diff --git a/pkgs/applications/misc/jgmenu/default.nix b/pkgs/applications/misc/jgmenu/default.nix index 879f344a5afb..17d5dd873369 100644 --- a/pkgs/applications/misc/jgmenu/default.nix +++ b/pkgs/applications/misc/jgmenu/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "jgmenu"; - version = "3.3"; + version = "3.4"; src = fetchFromGitHub { owner = "johanmalm"; repo = pname; rev = "v${version}"; - sha256 = "02qpvlmcis7217hkqilhszza4g1smb4byx4gihgp5207aj8qhz0l"; + sha256 = "1cikndf71wi17qld3rwp38gk0q7zic707zzz0mr7cgn86dc4if3d"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/joplin-desktop/default.nix b/pkgs/applications/misc/joplin-desktop/default.nix index 410b04d5dcbd..ff0332e1e5ff 100644 --- a/pkgs/applications/misc/joplin-desktop/default.nix +++ b/pkgs/applications/misc/joplin-desktop/default.nix @@ -2,12 +2,12 @@ let pname = "joplin-desktop"; - version = "1.0.158"; + version = "1.0.167"; in appimageTools.wrapType2 rec { name = "${pname}-${version}"; src = fetchurl { url = "https://github.com/laurent22/joplin/releases/download/v${version}/Joplin-${version}-x86_64.AppImage"; - sha256 = "1xaamwcasihja3agwb0nnfnzc1wmmr0d2ng73qmfil9nhf9v3j6q"; + sha256 = "062f2av60490ffrml0q8zv68yir6zaqif0g3d32c985gcvmgn9lw"; }; diff --git a/pkgs/applications/misc/jotta-cli/default.nix b/pkgs/applications/misc/jotta-cli/default.nix new file mode 100644 index 000000000000..a5196811a6a5 --- /dev/null +++ b/pkgs/applications/misc/jotta-cli/default.nix @@ -0,0 +1,35 @@ +{ stdenv, fetchzip }: + +let + arch = "amd64"; +in +stdenv.mkDerivation rec { + pname = "jotta-cli"; + version = "0.6.18626"; + src = + fetchzip { + url = "https://repo.jotta.us/archives/linux/${arch}/jotta-cli-${version}_linux_${arch}.tar.gz"; + sha256 = "0v9bw0f2mcvmzp7v8gs6q4p1q54rflqnbjv5sw7h1kyfwznmflzj"; + stripRoot = false; + }; + + installPhase = '' + install -D usr/bin/jotta-cli usr/bin/jottad -t $out/bin/ + mkdir -p $out/share/bash-completion/completions + ''; + + postFixup = '' + patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) $out/bin/jotta-cli + patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) $out/bin/jottad + $out/bin/jotta-cli completion > $out/share/bash-completion/completions/jotta-cli.bash + ''; + + meta = with stdenv.lib; { + description = "Jottacloud CLI"; + homepage = https://www.jottacloud.com/; + downloadPage = https://repo.jotta.us/archives/linux/; + maintainers = with maintainers; [ evenbrenden ]; + license = licenses.unfree; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/applications/misc/k2pdfopt/default.nix b/pkgs/applications/misc/k2pdfopt/default.nix index 9391fe88c5ea..a2eba8e08c27 100644 --- a/pkgs/applications/misc/k2pdfopt/default.nix +++ b/pkgs/applications/misc/k2pdfopt/default.nix @@ -30,73 +30,25 @@ stdenv.mkDerivation rec { cp -r ${v251a_src}/* $sourceRoot ''; - patches = [ ./k2pdfopt.patch ]; + patches = [ ./k2pdfopt.patch ./k2pdfopt-mupdf-1.16.1.patch ]; nativeBuildInputs = [ cmake pkgconfig ]; buildInputs = let + # The patches below were constructed by taking the files from k2pdfopt in + # the {mupdf,leptonica,tesseract}_mod/ directories, replacing the + # corresponding files in the respective source trees, resolving any errors + # with more recent versions of these depencencies, and running diff. mupdf_modded = mupdf.overrideAttrs (attrs: { - # Excluded the pdf-*.c files, since they mostly just broke the #includes - prePatch = '' - cp ${src}/mupdf_mod/{font,stext-device,string}.c source/fitz/ - cp ${src}/mupdf_mod/font-win32.c source/pdf/ - ''; + patches = attrs.patches ++ [ ./mupdf.patch ]; # Last verified with mupdf 1.16.1 }); - leptonica_modded = leptonica.overrideAttrs (attrs: { - name = "leptonica-1.74.4"; - # Modified source files apply to this particular version of leptonica - version = "1.74.4"; - - src = fetchurl { - url = "http://www.leptonica.org/source/leptonica-1.74.4.tar.gz"; - sha256 = "0fw39amgyv8v6nc7x8a4c7i37dm04i6c5zn62d24bgqnlhk59hr9"; - }; - - prePatch = '' - cp ${src}/leptonica_mod/{allheaders.h,dewarp2.c,leptwin.c} src/ - ''; - patches = [ - # stripped down copy of upstream commit b88c821f8d347bce0aea86d606c710303919f3d2 - ./leptonica-CVE-2018-3836.patch - (fetchpatch { - # CVE-2018-7186 - url = "https://github.com/DanBloomberg/leptonica/commit/" - + "ee301cb2029db8a6289c5295daa42bba7715e99a.patch"; - sha256 = "0cgb7mvz2px1rg5i80wk1wxxjvzjga617d8q6j7qygkp7jm6495d"; - }) - (fetchpatch { - # CVE-2018-7247 - url = "https://github.com/DanBloomberg/leptonica/commit/" - + "c1079bb8e77cdd426759e466729917ca37a3ed9f.patch"; - sha256 = "1z4iac5gwqggh7aa8cvyp6nl9fwd1v7wif26caxc9y5qr3jj34qf"; - }) - (fetchpatch { - # CVE-2018-7440 - url = "https://github.com/DanBloomberg/leptonica/commit/" - + "49ecb6c2dfd6ed5078c62f4a8eeff03e3beced3b.patch"; - sha256 = "1hjmva98iaw9xj7prg7aimykyayikcwnk4hk0380007hqb35lqmy"; - }) - ]; + patches = [ ./leptonica.patch ]; # Last verified with leptonica 1.78.0 }); tesseract_modded = tesseract4.override { tesseractBase = tesseract4.tesseractBase.overrideAttrs (_: { - prePatch = '' - cp ${src}/tesseract_mod/baseapi.{h,cpp} src/api/ - cp ${src}/tesseract_mod/ccutil.{h,cpp} src/ccutil/ - cp ${src}/tesseract_mod/genericvector.h src/ccutil/ - cp ${src}/tesseract_mod/input.cpp src/lstm/ - cp ${src}/tesseract_mod/lstmrecognizer.cpp src/lstm/ - cp ${src}/tesseract_mod/mainblk.cpp src/ccutil/ - cp ${src}/tesseract_mod/params.cpp src/ccutil/ - cp ${src}/tesseract_mod/serialis.{h,cpp} src/ccutil/ - cp ${src}/tesseract_mod/tesscapi.cpp src/api/ - cp ${src}/tesseract_mod/tessdatamanager.cpp src/ccstruct/ - cp ${src}/tesseract_mod/tessedit.cpp src/ccmain/ - cp ${src}/include_mod/{tesseract.h,leptonica.h} src/api/ - ''; - patches = [ ./tesseract.patch ]; + patches = [ ./tesseract.patch ]; # Last verified with tesseract 1.4 }); }; in diff --git a/pkgs/applications/misc/k2pdfopt/k2pdfopt-mupdf-1.16.1.patch b/pkgs/applications/misc/k2pdfopt/k2pdfopt-mupdf-1.16.1.patch new file mode 100644 index 000000000000..3a9eca30e751 --- /dev/null +++ b/pkgs/applications/misc/k2pdfopt/k2pdfopt-mupdf-1.16.1.patch @@ -0,0 +1,151 @@ +diff --git a/willuslib/wmupdf.c b/willuslib/wmupdf.c +index 81627ef..f14a96c 100644 +--- a/willuslib/wmupdf.c ++++ b/willuslib/wmupdf.c +@@ -189,8 +189,6 @@ int wmupdf_remake_pdf(char *infile,char *outfile,WPDFPAGEINFO *pageinfo,int use_ + pdf_write_opts.do_compress=1; + pdf_write_opts.do_linear=0; + pdf_write_opts.do_garbage=1; /* 2 and 3 don't work for this. */ +- pdf_write_opts.continue_on_error=0; +- pdf_write_opts.errors=NULL; + write_failed=0; + wpdfpageinfo_sort(pageinfo); + xref=NULL; +@@ -1687,8 +1685,8 @@ WPDFOUTLINE *wpdfoutline_read_from_pdf_file(char *filename) + /* Sumatra version of MuPDF v1.4 -- use locally installed fonts */ + pdf_install_load_system_font_funcs(ctx); + fz_try(ctx) { doc=fz_open_document(ctx,filename); } +- fz_catch(ctx) +- { ++ fz_catch(ctx) ++ { + fz_drop_context(ctx); + return(NULL); + } +@@ -1890,5 +1888,5 @@ static pdf_obj *pdf_new_string_utf8(fz_context *ctx,char *string) + willus_mem_free((double **)&utfbuf,funcname); + return(pdfobj); + } +- ++ + #endif /* HAVE_MUPDF_LIB */ +diff --git a/willuslib/wmupdfinfo.c b/willuslib/wmupdfinfo.c +index 5c7f38c..9b9e6fd 100644 +--- a/willuslib/wmupdfinfo.c ++++ b/willuslib/wmupdfinfo.c +@@ -237,23 +237,22 @@ static void showglobalinfo(fz_context *ctx, globals *glo,char *filename) + pdf_obj *robj; + + robj=pdf_resolve_indirect(ctx,obj); +- n=pdf_sprint_obj(ctx,NULL,0,robj,1); +- buf=malloc(n+2); ++ buf=pdf_sprint_obj(ctx,NULL,0,&n,robj,1,0); + if (buf==NULL) + { + fz_write_printf(ctx,out,"Info object (%d %d R):\n",pdf_to_num(ctx,obj),pdf_to_gen(ctx,obj)); +- pdf_print_obj(ctx,out,robj,1); ++ pdf_print_obj(ctx,out,robj,1,0); + } + else + { +- pdf_sprint_obj(ctx,buf,n+2,robj,1); ++ pdf_sprint_obj(ctx,buf,n+2,&n,robj,1,0); + display_pdf_field(ctx,out,buf,"Title","TITLE"); + display_pdf_field(ctx,out,buf,"CreationDate","CREATED"); + display_pdf_field(ctx,out,buf,"ModDate","LAST MODIFIED"); + display_pdf_field(ctx,out,buf,"Producer","PDF PRODUCER"); + display_pdf_field(ctx,out,buf,"Creator","CREATOR"); + display_file_size(ctx,out,filename); +- free(buf); ++ fz_free(ctx,buf); + } + } + if (glo->dims==1) +@@ -275,7 +274,7 @@ static void showglobalinfo(fz_context *ctx, globals *glo,char *filename) + if (obj) + { + fz_write_printf(ctx,out, "\nEncryption object (%d %d R):\n", pdf_to_num(ctx,obj), pdf_to_gen(ctx,obj)); +- pdf_print_obj(ctx,out, pdf_resolve_indirect(ctx,obj), 1); ++ pdf_print_obj(ctx,out, pdf_resolve_indirect(ctx,obj), 1, 0); + } + } + +@@ -396,7 +395,7 @@ gatherdimensions(fz_context *ctx, globals *glo, int page, pdf_obj *pageref, pdf_ + if (j < glo->dims) + return; + +- glo->dim = fz_resize_array(ctx, glo->dim, glo->dims+1, sizeof(struct info)); ++ glo->dim = fz_realloc_array(ctx, glo->dim, glo->dims+1, struct info); + glo->dims++; + + glo->dim[glo->dims - 1].page = page; +@@ -441,7 +440,7 @@ gatherfonts(fz_context *ctx, globals *glo, int page, pdf_obj *pageref, pdf_obj * + if (k < glo->fonts) + continue; + +- glo->font = fz_resize_array(ctx, glo->font, glo->fonts+1, sizeof(struct info)); ++ glo->font = fz_realloc_array(ctx, glo->font, glo->fonts+1, struct info); + glo->fonts++; + + glo->font[glo->fonts - 1].page = page; +@@ -510,7 +509,7 @@ gatherimages(fz_context *ctx, globals *glo, int page, pdf_obj *pageref, pdf_obj + if (k < glo->images) + continue; + +- glo->image = fz_resize_array(ctx, glo->image, glo->images+1, sizeof(struct info)); ++ glo->image = fz_realloc_array(ctx, glo->image, glo->images+1, struct info); + glo->images++; + + glo->image[glo->images - 1].page = page; +@@ -568,7 +567,7 @@ gatherforms(fz_context *ctx, globals *glo, int page, pdf_obj *pageref, pdf_obj * + if (k < glo->forms) + continue; + +- glo->form = fz_resize_array(ctx, glo->form, glo->forms+1, sizeof(struct info)); ++ glo->form = fz_realloc_array(ctx, glo->form, glo->forms+1, struct info); + glo->forms++; + + glo->form[glo->forms - 1].page = page; +@@ -613,7 +612,7 @@ gatherpsobjs(fz_context *ctx, globals *glo, int page, pdf_obj *pageref, pdf_obj + if (k < glo->psobjs) + continue; + +- glo->psobj = fz_resize_array(ctx, glo->psobj, glo->psobjs+1, sizeof(struct info)); ++ glo->psobj = fz_realloc_array(ctx, glo->psobj, glo->psobjs+1, struct info); + glo->psobjs++; + + glo->psobj[glo->psobjs - 1].page = page; +@@ -656,7 +655,7 @@ gathershadings(fz_context *ctx, globals *glo, int page, pdf_obj *pageref, pdf_ob + if (k < glo->shadings) + continue; + +- glo->shading = fz_resize_array(ctx, glo->shading, glo->shadings+1, sizeof(struct info)); ++ glo->shading = fz_realloc_array(ctx, glo->shading, glo->shadings+1, struct info); + glo->shadings++; + + glo->shading[glo->shadings - 1].page = page; +@@ -724,7 +723,7 @@ gatherpatterns(fz_context *ctx, globals *glo, int page, pdf_obj *pageref, pdf_ob + if (k < glo->patterns) + continue; + +- glo->pattern = fz_resize_array(ctx, glo->pattern, glo->patterns+1, sizeof(struct info)); ++ glo->pattern = fz_realloc_array(ctx, glo->pattern, glo->patterns+1, struct info); + glo->patterns++; + + glo->pattern[glo->patterns - 1].page = page; +@@ -1216,7 +1215,7 @@ void wmupdfinfo_get(char *filename,int *pagelist,char **buf) + if (fout==NULL) + return; + */ +- ++ + ctx = fz_new_context(NULL, NULL, FZ_STORE_UNLIMITED); + if (!ctx) + { +@@ -1307,5 +1306,5 @@ static void date_convert(char *dst,char *src) + else if (src[i]!='\0') + sprintf(&dst[strlen(dst)]," %s",&src[i]); + } +- ++ + #endif /* HAVE_MUPDF_LIB */ diff --git a/pkgs/applications/misc/k2pdfopt/leptonica-CVE-2018-3836.patch b/pkgs/applications/misc/k2pdfopt/leptonica-CVE-2018-3836.patch deleted file mode 100644 index f1b4170fbaae..000000000000 --- a/pkgs/applications/misc/k2pdfopt/leptonica-CVE-2018-3836.patch +++ /dev/null @@ -1,95 +0,0 @@ ---- a/src/allheaders.h -+++ b/src/allheaders.h -@@ -2600,6 +2600,7 @@ - LEPT_DLL extern char * stringReverse ( const char *src ); - LEPT_DLL extern char * strtokSafe ( char *cstr, const char *seps, char **psaveptr ); - LEPT_DLL extern l_int32 stringSplitOnToken ( char *cstr, const char *seps, char **phead, char **ptail ); -+LEPT_DLL extern l_int32 stringCheckForChars ( const char *src, const char *chars, l_int32 *pfound ); - LEPT_DLL extern char * stringRemoveChars ( const char *src, const char *remchars ); - LEPT_DLL extern l_int32 stringFindSubstr ( const char *src, const char *sub, l_int32 *ploc ); - LEPT_DLL extern char * stringReplaceSubstr ( const char *src, const char *sub1, const char *sub2, l_int32 *pfound, l_int32 *ploc ); ---- a/src/gplot.c -+++ b/src/gplot.c -@@ -141,9 +141,10 @@ - const char *xlabel, - const char *ylabel) - { --char *newroot; --char buf[L_BUF_SIZE]; --GPLOT *gplot; -+char *newroot; -+char buf[L_BUF_SIZE]; -+l_int32 badchar; -+GPLOT *gplot; - - PROCNAME("gplotCreate"); - -@@ -152,6 +153,9 @@ - if (outformat != GPLOT_PNG && outformat != GPLOT_PS && - outformat != GPLOT_EPS && outformat != GPLOT_LATEX) - return (GPLOT *)ERROR_PTR("outformat invalid", procName, NULL); -+ stringCheckForChars(rootname, "`;&|><\"?*", &badchar); -+ if (badchar) /* danger of command injection */ -+ return (GPLOT *)ERROR_PTR("invalid rootname", procName, NULL); - - if ((gplot = (GPLOT *)LEPT_CALLOC(1, sizeof(GPLOT))) == NULL) - return (GPLOT *)ERROR_PTR("gplot not made", procName, NULL); ---- a/src/utils2.c -+++ b/src/utils2.c -@@ -42,6 +42,7 @@ - * l_int32 stringSplitOnToken() - * - * Find and replace string and array procs -+ * l_int32 stringCheckForChars() - * char *stringRemoveChars() - * l_int32 stringFindSubstr() - * char *stringReplaceSubstr() -@@ -701,6 +702,48 @@ - /*--------------------------------------------------------------------* - * Find and replace procs * - *--------------------------------------------------------------------*/ -+/*! -+ * \brief stringCheckForChars() -+ * -+ * \param[in] src input string; can be of zero length -+ * \param[in] chars string of chars to be searched for in %src -+ * \param[out] pfound 1 if any characters are found; 0 otherwise -+ * \return 0 if OK, 1 on error -+ * -+ * <pre> -+ * Notes: -+ * (1) This can be used to sanitize an operation by checking for -+ * special characters that don't belong in a string. -+ * </pre> -+ */ -+l_int32 -+stringCheckForChars(const char *src, -+ const char *chars, -+ l_int32 *pfound) -+{ -+char ch; -+l_int32 i, n; -+ -+ PROCNAME("stringCheckForChars"); -+ -+ if (!pfound) -+ return ERROR_INT("&found not defined", procName, 1); -+ *pfound = FALSE; -+ if (!src || !chars) -+ return ERROR_INT("src and chars not both defined", procName, 1); -+ -+ n = strlen(src); -+ for (i = 0; i < n; i++) { -+ ch = src[i]; -+ if (strchr(chars, ch)) { -+ *pfound = TRUE; -+ break; -+ } -+ } -+ return 0; -+} -+ -+ - /*! - * \brief stringRemoveChars() - * diff --git a/pkgs/applications/misc/k2pdfopt/leptonica.patch b/pkgs/applications/misc/k2pdfopt/leptonica.patch new file mode 100644 index 000000000000..dfab99fd0130 --- /dev/null +++ b/pkgs/applications/misc/k2pdfopt/leptonica.patch @@ -0,0 +1,254 @@ +From 8c11a20925686855023df90ed477957c7d7fe91e Mon Sep 17 00:00:00 2001 +From: Daniel Fullmer <danielrf12@gmail.com> +Date: Fri, 13 Sep 2019 15:54:21 -0400 +Subject: [PATCH] Willus mod for k2pdfopt + +--- + src/allheaders.h | 4 ++ + src/dewarp2.c | 106 ++++++++++++++++++++++++++++++++++++++++++----- + src/leptwin.c | 6 ++- + 3 files changed, 104 insertions(+), 12 deletions(-) + +diff --git a/src/allheaders.h b/src/allheaders.h +index e68eff1..b3cc729 100644 +--- a/src/allheaders.h ++++ b/src/allheaders.h +@@ -669,6 +669,10 @@ LEPT_DLL extern L_DEWARPA * dewarpaReadMem ( const l_uint8 *data, size_t size ); + LEPT_DLL extern l_ok dewarpaWrite ( const char *filename, L_DEWARPA *dewa ); + LEPT_DLL extern l_ok dewarpaWriteStream ( FILE *fp, L_DEWARPA *dewa ); + LEPT_DLL extern l_ok dewarpaWriteMem ( l_uint8 **pdata, size_t *psize, L_DEWARPA *dewa ); ++/* WILLUS MOD */ ++ LEPT_DLL extern l_int32 dewarpBuildPageModel_ex ( L_DEWARP *dew, const char *debugfile,l_int32 fit_order ); ++ LEPT_DLL extern l_int32 dewarpFindVertDisparity_ex ( L_DEWARP *dew, PTAA *ptaa, l_int32 rotflag,l_int32 fit_order ); ++ LEPT_DLL extern l_int32 dewarpBuildLineModel_ex ( L_DEWARP *dew, l_int32 opensize, const char *debugfile,l_int32 fit_order ); + LEPT_DLL extern l_ok dewarpBuildPageModel ( L_DEWARP *dew, const char *debugfile ); + LEPT_DLL extern l_ok dewarpFindVertDisparity ( L_DEWARP *dew, PTAA *ptaa, l_int32 rotflag ); + LEPT_DLL extern l_ok dewarpFindHorizDisparity ( L_DEWARP *dew, PTAA *ptaa ); +diff --git a/src/dewarp2.c b/src/dewarp2.c +index 220eec1..2e29500 100644 +--- a/src/dewarp2.c ++++ b/src/dewarp2.c +@@ -144,9 +144,17 @@ static const l_float32 L_ALLOWED_W_FRACT = 0.05; /* no bigger */ + * longest textlines. + * </pre> + */ ++/* WILLUS MOD */ + l_ok +-dewarpBuildPageModel(L_DEWARP *dew, +- const char *debugfile) ++dewarpBuildPageModel(L_DEWARP *dew,const char *debugfile) ++{ ++return(dewarpBuildPageModel_ex(dew,debugfile,2)); ++} ++ ++l_ok ++dewarpBuildPageModel_ex(L_DEWARP *dew, ++ const char *debugfile, ++ l_int32 fit_order) + { + l_int32 linecount, topline, botline, ret; + PIX *pixs, *pix1, *pix2, *pix3; +@@ -225,7 +233,7 @@ PTAA *ptaa1, *ptaa2; + /* Get the sampled vertical disparity from the textline centers. + * The disparity array will push pixels vertically so that each + * textline is flat and centered at the y-position of the mid-point. */ +- if (dewarpFindVertDisparity(dew, ptaa2, 0) != 0) { ++ if (dewarpFindVertDisparity_ex(dew, ptaa2, 0, fit_order) != 0) { + L_WARNING("vertical disparity not built\n", procName); + ptaaDestroy(&ptaa2); + return 1; +@@ -290,13 +298,24 @@ PTAA *ptaa1, *ptaa2; + * a pdf. Non-pix debug output goes to /tmp. + * </pre> + */ ++/* WILLUS MOD */ + l_ok + dewarpFindVertDisparity(L_DEWARP *dew, + PTAA *ptaa, + l_int32 rotflag) + { ++return(dewarpFindVertDisparity_ex(dew,ptaa,rotflag,2)); ++} ++/* WILLUS MOD -- add cubic and quartic fits and ..._ex functions */ ++l_int32 ++dewarpFindVertDisparity_ex(L_DEWARP *dew, ++ PTAA *ptaa, ++ l_int32 rotflag, ++ l_int32 fit_order) ++{ + l_int32 i, j, nlines, npts, nx, ny, sampling; +-l_float32 c0, c1, c2, x, y, midy, val, medval, meddev, minval, maxval; ++/* WILLUS MOD */ ++l_float32 c0, c1, c2, c3, c4, x, y, midy, val, medval, meddev, minval, maxval; + l_float32 *famidys; + NUMA *nax, *nafit, *nacurve0, *nacurve1, *nacurves; + NUMA *namidy, *namidys, *namidysi; +@@ -304,11 +323,22 @@ PIX *pix1, *pix2, *pixcirc, *pixdb; + PTA *pta, *ptad, *ptacirc; + PTAA *ptaa0, *ptaa1, *ptaa2, *ptaa3, *ptaa4, *ptaa5, *ptaat; + FPIX *fpix; ++/* WILLUS MOD */ ++l_int32 fit_order1,fit_order2; + + PROCNAME("dewarpFindVertDisparity"); + + if (!dew) + return ERROR_INT("dew not defined", procName, 1); ++/* WILLUS MOD */ ++ if (fit_order < 10) ++ fit_order1 = fit_order2 = fit_order; ++ else ++ { ++ fit_order1=fit_order % 10; ++ fit_order2=fit_order / 10; ++ fit_order2=fit_order2 % 10; ++ } + dew->vsuccess = 0; + if (!ptaa) + return ERROR_INT("ptaa not defined", procName, 1); +@@ -331,12 +361,32 @@ FPIX *fpix; + pixdb = (rotflag) ? pixRotateOrth(dew->pixs, 1) : pixClone(dew->pixs); + for (i = 0; i < nlines; i++) { /* for each line */ + pta = ptaaGetPta(ptaa, i, L_CLONE); +- ptaGetQuadraticLSF(pta, &c2, &c1, &c0, NULL); +- numaAddNumber(nacurve0, c2); ++/* WILLUS MOD */ ++if (fit_order1>3) ++ { ++ ptaGetQuarticLSF(pta, &c4, &c3, &c2, &c1, &c0, NULL); ++ numaAddNumber(nacurve0, c4); ++ } ++else if (fit_order1==3) ++ { ++ ptaGetCubicLSF(pta, &c3, &c2, &c1, &c0, NULL); ++ numaAddNumber(nacurve0, c3); ++ } ++else ++ { ++ ptaGetQuadraticLSF(pta, &c2, &c1, &c0, NULL); ++ numaAddNumber(nacurve0, c2); ++ } + ptad = ptaCreate(nx); + for (j = 0; j < nx; j++) { /* uniformly sampled in x */ + x = j * sampling; +- applyQuadraticFit(c2, c1, c0, x, &y); ++/* WILLUS MOD */ ++if (fit_order1>3) ++ applyQuarticFit(c4, c3, c2, c1, c0, x, &y); ++else if (fit_order1==3) ++ applyCubicFit(c3, c2, c1, c0, x, &y); ++else ++ applyQuadraticFit(c2, c1, c0, x, &y); + ptaAddPt(ptad, x, y); + } + ptaaAddPta(ptaa0, ptad, L_INSERT); +@@ -350,7 +400,13 @@ FPIX *fpix; + for (i = 0; i < nlines; i++) { + pta = ptaaGetPta(ptaa, i, L_CLONE); + ptaGetArrays(pta, &nax, NULL); +- ptaGetQuadraticLSF(pta, NULL, NULL, NULL, &nafit); ++/* WILLUS MOD */ ++if (fit_order1>3) ++ptaGetQuarticLSF(pta, NULL, NULL, NULL, NULL, NULL, &nafit); ++else if (fit_order1==3) ++ptaGetCubicLSF(pta, NULL, NULL, NULL, NULL, &nafit); ++else ++ptaGetQuadraticLSF(pta, NULL, NULL, NULL, &nafit); + ptad = ptaCreateFromNuma(nax, nafit); + ptaaAddPta(ptaat, ptad, L_INSERT); + ptaDestroy(&pta); +@@ -494,11 +550,24 @@ FPIX *fpix; + ptaa5 = ptaaCreate(nx); /* uniformly sampled across full height of image */ + for (j = 0; j < nx; j++) { /* for each column */ + pta = ptaaGetPta(ptaa4, j, L_CLONE); +- ptaGetQuadraticLSF(pta, &c2, &c1, &c0, NULL); ++/* WILLUS MOD */ ++/* Order higher than 2 can cause a little craziness here. */ ++if (fit_order2>3) ++ ptaGetQuarticLSF(pta, &c4, &c3, &c2, &c1, &c0, NULL); ++else if (fit_order2==3) ++ ptaGetCubicLSF(pta, &c3, &c2, &c1, &c0, NULL); ++else ++ ptaGetQuadraticLSF(pta, &c2, &c1, &c0, NULL); + ptad = ptaCreate(ny); + for (i = 0; i < ny; i++) { /* uniformly sampled in y */ + y = i * sampling; +- applyQuadraticFit(c2, c1, c0, y, &val); ++/* WILLUS MOD */ ++if (fit_order2>3) ++ applyQuarticFit(c4, c3, c2, c1, c0, y, &val); ++else if (fit_order2==3) ++ applyCubicFit(c3, c2, c1, c0, y, &val); ++else ++ applyQuadraticFit(c2, c1, c0, y, &val); + ptaAddPt(ptad, y, val); + } + ptaaAddPta(ptaa5, ptad, L_INSERT); +@@ -1602,11 +1671,21 @@ FPIX *fpix; + * See notes there. + * </pre> + */ ++/* WILLUS MOD */ + l_ok + dewarpBuildLineModel(L_DEWARP *dew, + l_int32 opensize, + const char *debugfile) + { ++return(dewarpBuildLineModel_ex(dew,opensize,debugfile,2)); ++} ++ ++l_int32 ++dewarpBuildLineModel_ex(L_DEWARP *dew, ++ l_int32 opensize, ++ const char *debugfile, ++ l_int32 fit_order) ++{ + char buf[64]; + l_int32 i, j, bx, by, ret, nlines; + BOXA *boxa; +@@ -1695,6 +1774,8 @@ PTAA *ptaa1, *ptaa2; + + /* Remove all lines that are not at least 0.75 times the length + * of the longest line. */ ++/* WILLUS MOD */ ++/* + ptaa2 = dewarpRemoveShortLines(pix, ptaa1, 0.75, DEBUG_SHORT_LINES); + if (debugfile) { + pix1 = pixConvertTo32(pix); +@@ -1704,6 +1785,8 @@ PTAA *ptaa1, *ptaa2; + pixDestroy(&pix1); + pixDestroy(&pix2); + } ++*/ ++ptaa2=ptaa1; + ptaaDestroy(&ptaa1); + nlines = ptaaGetCount(ptaa2); + if (nlines < dew->minlines) { +@@ -1717,7 +1800,8 @@ PTAA *ptaa1, *ptaa2; + * centers. The disparity array will push pixels vertically + * so that each line is flat and centered at the y-position + * of the mid-point. */ +- ret = dewarpFindVertDisparity(dew, ptaa2, 1 - i); ++/* WILLUS MOD */ ++ ret = dewarpFindVertDisparity_ex(dew, ptaa2, 1 - i, fit_order); + + /* If i == 0, move the result to the horizontal disparity, + * rotating it back by -90 degrees. */ +diff --git a/src/leptwin.c b/src/leptwin.c +index 72643a0..573d33e 100644 +--- a/src/leptwin.c ++++ b/src/leptwin.c +@@ -364,5 +364,9 @@ PIXCMAP *cmap; + + return hBitmap; + } +- ++#else ++/* willus mod: Avoid weird issue with OS/X library archiver when there are no symbols */ ++int leptwin_my_empty_func(void); ++int leptwin_my_empty_func(void) ++{return(0);} + #endif /* _WIN32 */ +-- +2.22.0 + diff --git a/pkgs/applications/misc/k2pdfopt/mupdf.patch b/pkgs/applications/misc/k2pdfopt/mupdf.patch new file mode 100644 index 000000000000..0c59a1d20163 --- /dev/null +++ b/pkgs/applications/misc/k2pdfopt/mupdf.patch @@ -0,0 +1,1060 @@ +From d8927c969e3387ca2669a616c0ba53bce918a031 Mon Sep 17 00:00:00 2001 +From: Daniel Fullmer <danielrf12@gmail.com> +Date: Fri, 13 Sep 2019 15:11:45 -0400 +Subject: [PATCH] Willus mod for k2pdfopt + +--- + source/fitz/filter-basic.c | 3 + + source/fitz/font-win32.c | 866 +++++++++++++++++++++++++++++++++++++ + source/fitz/font.c | 3 + + source/fitz/stext-device.c | 5 + + source/fitz/string.c | 5 + + source/pdf/pdf-annot.c | 14 +- + source/pdf/pdf-link.c | 3 + + source/pdf/pdf-parse.c | 5 + + source/pdf/pdf-xref.c | 9 + + 9 files changed, 912 insertions(+), 1 deletion(-) + create mode 100644 source/fitz/font-win32.c + +diff --git a/source/fitz/filter-basic.c b/source/fitz/filter-basic.c +index 0713a62e7..b8ef4d292 100644 +--- a/source/fitz/filter-basic.c ++++ b/source/fitz/filter-basic.c +@@ -259,7 +259,10 @@ look_for_endstream: + if (!state->warned) + { + state->warned = 1; ++/* willus mod -- no warning */ ++/* + fz_warn(ctx, "PDF stream Length incorrect"); ++*/ + } + return *stm->rp++; + } +diff --git a/source/fitz/font-win32.c b/source/fitz/font-win32.c +new file mode 100644 +index 000000000..45de8cfd3 +--- /dev/null ++++ b/source/fitz/font-win32.c +@@ -0,0 +1,866 @@ ++/* ++** Routines to access MS Windows system fonts. ++** From sumatra PDF distro. ++** Modified for MuPDF v1.9a by willus.com ++*/ ++#include "mupdf/pdf.h" ++ ++/* ++ Which fonts are embedded is based on a few preprocessor definitions. ++ ++ The base 14 fonts are always embedded. ++ For CJK font substitution we embed DroidSansFallback. ++ ++ Set NOCJK to skip all CJK support (this also omits embedding the CJK CMaps) ++ Set NOCJKFONT to skip the embedded CJK font. ++ Set NOCJKFULL to embed a smaller CJK font without CJK Extension A support. ++*/ ++ ++#ifdef NOCJK ++#define NOCJKFONT ++#endif ++ ++/* SumatraPDF: also load fonts included with Windows */ ++#ifdef _WIN32 ++ ++#ifndef UNICODE ++#define UNICODE ++#endif ++#ifndef _UNICODE ++#define _UNICODE ++#endif ++ ++#include <windows.h> ++ ++// TODO: Use more of FreeType for TTF parsing (for performance reasons, ++// the fonts can't be parsed completely, though) ++#include <ft2build.h> ++#include FT_TRUETYPE_IDS_H ++#include FT_TRUETYPE_TAGS_H ++ ++#define TTC_VERSION1 0x00010000 ++#define TTC_VERSION2 0x00020000 ++ ++#define MAX_FACENAME 128 ++ ++// Note: the font face must be the first field so that the structure ++// can be treated like a simple string for searching ++typedef struct pdf_fontmapMS_s ++{ ++ char fontface[MAX_FACENAME]; ++ char fontpath[MAX_PATH]; ++ int index; ++} pdf_fontmapMS; ++ ++typedef struct pdf_fontlistMS_s ++{ ++ pdf_fontmapMS *fontmap; ++ int len; ++ int cap; ++} pdf_fontlistMS; ++ ++typedef struct _tagTT_OFFSET_TABLE ++{ ++ ULONG uVersion; ++ USHORT uNumOfTables; ++ USHORT uSearchRange; ++ USHORT uEntrySelector; ++ USHORT uRangeShift; ++} TT_OFFSET_TABLE; ++ ++typedef struct _tagTT_TABLE_DIRECTORY ++{ ++ ULONG uTag; //table name ++ ULONG uCheckSum; //Check sum ++ ULONG uOffset; //Offset from beginning of file ++ ULONG uLength; //length of the table in bytes ++} TT_TABLE_DIRECTORY; ++ ++typedef struct _tagTT_NAME_TABLE_HEADER ++{ ++ USHORT uFSelector; //format selector. Always 0 ++ USHORT uNRCount; //Name Records count ++ USHORT uStorageOffset; //Offset for strings storage, from start of the table ++} TT_NAME_TABLE_HEADER; ++ ++typedef struct _tagTT_NAME_RECORD ++{ ++ USHORT uPlatformID; ++ USHORT uEncodingID; ++ USHORT uLanguageID; ++ USHORT uNameID; ++ USHORT uStringLength; ++ USHORT uStringOffset; //from start of storage area ++} TT_NAME_RECORD; ++ ++typedef struct _tagFONT_COLLECTION ++{ ++ ULONG Tag; ++ ULONG Version; ++ ULONG NumFonts; ++} FONT_COLLECTION; ++ ++static struct { ++ char *name; ++ char *pattern; ++} baseSubstitutes[] = { ++ { "Courier", "CourierNewPSMT" }, ++ { "Courier-Bold", "CourierNewPS-BoldMT" }, ++ { "Courier-Oblique", "CourierNewPS-ItalicMT" }, ++ { "Courier-BoldOblique", "CourierNewPS-BoldItalicMT" }, ++ { "Helvetica", "ArialMT" }, ++ { "Helvetica-Bold", "Arial-BoldMT" }, ++ { "Helvetica-Oblique", "Arial-ItalicMT" }, ++ { "Helvetica-BoldOblique", "Arial-BoldItalicMT" }, ++ { "Times-Roman", "TimesNewRomanPSMT" }, ++ { "Times-Bold", "TimesNewRomanPS-BoldMT" }, ++ { "Times-Italic", "TimesNewRomanPS-ItalicMT" }, ++ { "Times-BoldItalic", "TimesNewRomanPS-BoldItalicMT" }, ++ { "Symbol", "SymbolMT" }, ++}; ++static const char *base_font_names[][10] = ++{ ++ { "Courier", "CourierNew", "CourierNewPSMT", NULL }, ++ { "Courier-Bold", "CourierNew,Bold", "Courier,Bold", ++ "CourierNewPS-BoldMT", "CourierNew-Bold", NULL }, ++ { "Courier-Oblique", "CourierNew,Italic", "Courier,Italic", ++ "CourierNewPS-ItalicMT", "CourierNew-Italic", NULL }, ++ { "Courier-BoldOblique", "CourierNew,BoldItalic", "Courier,BoldItalic", ++ "CourierNewPS-BoldItalicMT", "CourierNew-BoldItalic", NULL }, ++ { "Helvetica", "ArialMT", "Arial", NULL }, ++ { "Helvetica-Bold", "Arial-BoldMT", "Arial,Bold", "Arial-Bold", ++ "Helvetica,Bold", NULL }, ++ { "Helvetica-Oblique", "Arial-ItalicMT", "Arial,Italic", "Arial-Italic", ++ "Helvetica,Italic", "Helvetica-Italic", NULL }, ++ { "Helvetica-BoldOblique", "Arial-BoldItalicMT", ++ "Arial,BoldItalic", "Arial-BoldItalic", ++ "Helvetica,BoldItalic", "Helvetica-BoldItalic", NULL }, ++ { "Times-Roman", "TimesNewRomanPSMT", "TimesNewRoman", ++ "TimesNewRomanPS", NULL }, ++ { "Times-Bold", "TimesNewRomanPS-BoldMT", "TimesNewRoman,Bold", ++ "TimesNewRomanPS-Bold", "TimesNewRoman-Bold", NULL }, ++ { "Times-Italic", "TimesNewRomanPS-ItalicMT", "TimesNewRoman,Italic", ++ "TimesNewRomanPS-Italic", "TimesNewRoman-Italic", NULL }, ++ { "Times-BoldItalic", "TimesNewRomanPS-BoldItalicMT", ++ "TimesNewRoman,BoldItalic", "TimesNewRomanPS-BoldItalic", ++ "TimesNewRoman-BoldItalic", NULL }, ++ { "Symbol", "Symbol,Italic", "Symbol,Bold", "Symbol,BoldItalic", ++ "SymbolMT", "SymbolMT,Italic", "SymbolMT,Bold", "SymbolMT,BoldItalic", NULL }, ++ { "ZapfDingbats", NULL } ++}; ++ ++static pdf_fontlistMS fontlistMS = ++{ ++ NULL, ++ 0, ++ 0, ++}; ++static int strcmp_ignore_space(const char *a, const char *b); ++static const char *clean_font_name(const char *fontname); ++static const char *pdf_clean_base14_name(const char *fontname); ++ ++static inline USHORT BEtoHs(USHORT x) ++{ ++ BYTE *data = (BYTE *)&x; ++ return (data[0] << 8) | data[1]; ++} ++ ++static inline ULONG BEtoHl(ULONG x) ++{ ++ BYTE *data = (BYTE *)&x; ++ return (data[0] << 24) | (data[1] << 16) | (data[2] << 8) | data[3]; ++} ++ ++static int strcmp_ignore_space(const char *a, const char *b) ++{ ++ while (1) ++ { ++ while (*a == ' ') ++ a++; ++ while (*b == ' ') ++ b++; ++ if (*a != *b) ++ return 1; ++ if (*a == 0) ++ return *a != *b; ++ if (*b == 0) ++ return *a != *b; ++ a++; ++ b++; ++ } ++} ++ ++/* A little bit more sophisticated name matching so that e.g. "EurostileExtended" ++ matches "EurostileExtended-Roman" or "Tahoma-Bold,Bold" matches "Tahoma-Bold" */ ++static int ++lookup_compare(const void *elem1, const void *elem2) ++{ ++ const char *val1 = elem1; ++ const char *val2 = elem2; ++ int len1 = strlen(val1); ++ int len2 = strlen(val2); ++ ++ if (len1 != len2) ++ { ++ const char *rest = len1 > len2 ? val1 + len2 : val2 + len1; ++ if (',' == *rest || !_stricmp(rest, "-roman")) ++ return _strnicmp(val1, val2, fz_mini(len1, len2)); ++ } ++ ++ return _stricmp(val1, val2); ++} ++ ++static void ++remove_spaces(char *srcDest) ++{ ++ char *dest; ++ ++ for (dest = srcDest; *srcDest; srcDest++) ++ if (*srcDest != ' ') ++ *dest++ = *srcDest; ++ *dest = '\0'; ++} ++ ++static int ++str_ends_with(const char *str, const char *end) ++{ ++ size_t len1 = strlen(str); ++ size_t len2 = strlen(end); ++ ++ return len1 >= len2 && !strcmp(str + len1 - len2, end); ++} ++ ++static pdf_fontmapMS * ++pdf_find_windows_font_path(const char *fontname) ++{ ++ return bsearch(fontname, fontlistMS.fontmap, fontlistMS.len, sizeof(pdf_fontmapMS), lookup_compare); ++} ++ ++/* source and dest can be same */ ++static void ++decode_unicode_BE(fz_context *ctx, char *source, int sourcelen, char *dest, int destlen) ++{ ++ WCHAR *tmp; ++ int converted, i; ++ ++ if (sourcelen % 2 != 0) ++ fz_throw(ctx, FZ_ERROR_GENERIC, "fonterror : invalid unicode string"); ++ ++ tmp = fz_malloc_array(ctx, sourcelen / 2 + 1, sizeof(WCHAR)); ++ for (i = 0; i < sourcelen / 2; i++) ++ tmp[i] = BEtoHs(((WCHAR *)source)[i]); ++ tmp[sourcelen / 2] = '\0'; ++ ++ converted = WideCharToMultiByte(CP_UTF8, 0, tmp, -1, dest, destlen, NULL, NULL); ++ fz_free(ctx, tmp); ++ if (!converted) ++ fz_throw(ctx, FZ_ERROR_GENERIC, "fonterror : invalid unicode string"); ++} ++ ++static void ++decode_platform_string(fz_context *ctx, int platform, int enctype, char *source, int sourcelen, char *dest, int destlen) ++{ ++ switch (platform) ++ { ++ case TT_PLATFORM_APPLE_UNICODE: ++ switch (enctype) ++ { ++ case TT_APPLE_ID_DEFAULT: ++ case TT_APPLE_ID_UNICODE_2_0: ++ decode_unicode_BE(ctx, source, sourcelen, dest, destlen); ++ return; ++ } ++ fz_throw(ctx, FZ_ERROR_GENERIC, "fonterror : unsupported encoding (%d/%d)", platform, enctype); ++ case TT_PLATFORM_MACINTOSH: ++ switch (enctype) ++ { ++ case TT_MAC_ID_ROMAN: ++ if (sourcelen + 1 > destlen) ++ fz_throw(ctx, FZ_ERROR_GENERIC, "fonterror : overlong fontname: %s", source); ++ // TODO: Convert to UTF-8 from what encoding? ++ memcpy(dest, source, sourcelen); ++ dest[sourcelen] = 0; ++ return; ++ } ++ fz_throw(ctx, FZ_ERROR_GENERIC, "fonterror : unsupported encoding (%d/%d)", platform, enctype); ++ case TT_PLATFORM_MICROSOFT: ++ switch (enctype) ++ { ++ case TT_MS_ID_SYMBOL_CS: ++ case TT_MS_ID_UNICODE_CS: ++ case TT_MS_ID_UCS_4: ++ decode_unicode_BE(ctx, source, sourcelen, dest, destlen); ++ return; ++ } ++ fz_throw(ctx, FZ_ERROR_GENERIC, "fonterror : unsupported encoding (%d/%d)", platform, enctype); ++ default: ++ fz_throw(ctx, FZ_ERROR_GENERIC, "fonterror : unsupported encoding (%d/%d)", platform, enctype); ++ } ++} ++ ++static void ++grow_system_font_list(fz_context *ctx, pdf_fontlistMS *fl) ++{ ++ int newcap; ++ pdf_fontmapMS *newitems; ++ ++ if (fl->cap == 0) ++ newcap = 1024; ++ else ++ newcap = fl->cap * 2; ++ ++ // use realloc/free for the fontmap, since the list can ++ // remain in memory even with all fz_contexts destroyed ++ newitems = realloc(fl->fontmap, newcap * sizeof(pdf_fontmapMS)); ++ if (!newitems) ++ fz_throw(ctx, FZ_ERROR_GENERIC, "OOM in grow_system_font_list"); ++ memset(newitems + fl->cap, 0, sizeof(pdf_fontmapMS) * (newcap - fl->cap)); ++ ++ fl->fontmap = newitems; ++ fl->cap = newcap; ++} ++ ++static void ++append_mapping(fz_context *ctx, pdf_fontlistMS *fl, const char *facename, const char *path, int index) ++{ ++ if (fl->len == fl->cap) ++ grow_system_font_list(ctx, fl); ++ ++ if (fl->len >= fl->cap) ++ fz_throw(ctx, FZ_ERROR_GENERIC, "fonterror : fontlist overflow"); ++ ++ fz_strlcpy(fl->fontmap[fl->len].fontface, facename, sizeof(fl->fontmap[0].fontface)); ++ fz_strlcpy(fl->fontmap[fl->len].fontpath, path, sizeof(fl->fontmap[0].fontpath)); ++ fl->fontmap[fl->len].index = index; ++ ++ ++fl->len; ++} ++ ++static void ++safe_read(fz_context *ctx, fz_stream *file, int offset, char *buf, int size) ++{ ++ int n; ++ fz_seek(ctx, file, offset, 0); ++ n = fz_read(ctx, file, (unsigned char *)buf, size); ++ if (n != size) ++ fz_throw(ctx, FZ_ERROR_GENERIC, "safe_read: read %d, expected %d", n, size); ++} ++ ++static void ++read_ttf_string(fz_context *ctx, fz_stream *file, int offset, TT_NAME_RECORD *ttRecordBE, char *buf, int size) ++{ ++ char szTemp[MAX_FACENAME * 2]; ++ // ignore empty and overlong strings ++ int stringLength = BEtoHs(ttRecordBE->uStringLength); ++ if (stringLength == 0 || stringLength >= sizeof(szTemp)) ++ return; ++ ++ safe_read(ctx, file, offset + BEtoHs(ttRecordBE->uStringOffset), szTemp, stringLength); ++ decode_platform_string(ctx, BEtoHs(ttRecordBE->uPlatformID), ++ BEtoHs(ttRecordBE->uEncodingID), szTemp, stringLength, buf, size); ++} ++ ++static void ++makeFakePSName(char szName[MAX_FACENAME], const char *szStyle) ++{ ++ // append the font's subfamily, unless it's a Regular font ++ if (*szStyle && _stricmp(szStyle, "Regular") != 0) ++ { ++ fz_strlcat(szName, "-", MAX_FACENAME); ++ fz_strlcat(szName, szStyle, MAX_FACENAME); ++ } ++ remove_spaces(szName); ++} ++ ++static void ++parseTTF(fz_context *ctx, fz_stream *file, int offset, int index, const char *path) ++{ ++ TT_OFFSET_TABLE ttOffsetTableBE; ++ TT_TABLE_DIRECTORY tblDirBE; ++ TT_NAME_TABLE_HEADER ttNTHeaderBE; ++ TT_NAME_RECORD ttRecordBE; ++ ++ char szPSName[MAX_FACENAME] = { 0 }; ++ char szTTName[MAX_FACENAME] = { 0 }; ++ char szStyle[MAX_FACENAME] = { 0 }; ++ char szCJKName[MAX_FACENAME] = { 0 }; ++ int i, count, tblOffset; ++ ++ safe_read(ctx, file, offset, (char *)&ttOffsetTableBE, sizeof(TT_OFFSET_TABLE)); ++ ++ // check if this is a TrueType font of version 1.0 or an OpenType font ++ if (BEtoHl(ttOffsetTableBE.uVersion) != TTC_VERSION1 && ++ BEtoHl(ttOffsetTableBE.uVersion) != TTAG_OTTO) ++ { ++ fz_throw(ctx, FZ_ERROR_GENERIC, "fonterror : invalid font version %x", (unsigned int)BEtoHl(ttOffsetTableBE.uVersion)); ++ } ++ ++ // determine the name table's offset by iterating through the offset table ++ count = BEtoHs(ttOffsetTableBE.uNumOfTables); ++ for (i = 0; i < count; i++) ++ { ++ int entryOffset = offset + sizeof(TT_OFFSET_TABLE) + i * sizeof(TT_TABLE_DIRECTORY); ++ safe_read(ctx, file, entryOffset, (char *)&tblDirBE, sizeof(TT_TABLE_DIRECTORY)); ++ if (!BEtoHl(tblDirBE.uTag) || BEtoHl(tblDirBE.uTag) == TTAG_name) ++ break; ++ } ++ if (count == i || !BEtoHl(tblDirBE.uTag)) ++ fz_throw(ctx, FZ_ERROR_GENERIC, "fonterror : nameless font"); ++ tblOffset = BEtoHl(tblDirBE.uOffset); ++ ++ // read the 'name' table for record count and offsets ++ safe_read(ctx, file, tblOffset, (char *)&ttNTHeaderBE, sizeof(TT_NAME_TABLE_HEADER)); ++ offset = tblOffset + sizeof(TT_NAME_TABLE_HEADER); ++ tblOffset += BEtoHs(ttNTHeaderBE.uStorageOffset); ++ ++ // read through the strings for PostScript name and font family ++ count = BEtoHs(ttNTHeaderBE.uNRCount); ++ for (i = 0; i < count; i++) ++ { ++ short langId, nameId; ++ BOOL isCJKName; ++ ++ safe_read(ctx, file, offset + i * sizeof(TT_NAME_RECORD), (char *)&ttRecordBE, sizeof(TT_NAME_RECORD)); ++ ++ langId = BEtoHs(ttRecordBE.uLanguageID); ++ nameId = BEtoHs(ttRecordBE.uNameID); ++ isCJKName = TT_NAME_ID_FONT_FAMILY == nameId && LANG_CHINESE == PRIMARYLANGID(langId); ++ ++ // ignore non-English strings (except for Chinese font names) ++ if (langId && langId != TT_MS_LANGID_ENGLISH_UNITED_STATES && !isCJKName) ++ continue; ++ // ignore names other than font (sub)family and PostScript name ++ fz_try(ctx) ++ { ++ if (isCJKName) ++ read_ttf_string(ctx, file, tblOffset, &ttRecordBE, szCJKName, sizeof(szCJKName)); ++ else if (TT_NAME_ID_FONT_FAMILY == nameId) ++ read_ttf_string(ctx, file, tblOffset, &ttRecordBE, szTTName, sizeof(szTTName)); ++ else if (TT_NAME_ID_FONT_SUBFAMILY == nameId) ++ read_ttf_string(ctx, file, tblOffset, &ttRecordBE, szStyle, sizeof(szStyle)); ++ else if (TT_NAME_ID_PS_NAME == nameId) ++ read_ttf_string(ctx, file, tblOffset, &ttRecordBE, szPSName, sizeof(szPSName)); ++ } ++ fz_catch(ctx) ++ { ++ fz_warn(ctx, "ignoring face name decoding fonterror"); ++ } ++ } ++ ++ // try to prevent non-Arial fonts from accidentally substituting Arial ++ if (!strcmp(szPSName, "ArialMT")) ++ { ++ // cf. https://code.google.com/p/sumatrapdf/issues/detail?id=2471 ++ if (strcmp(szTTName, "Arial") != 0) ++ szPSName[0] = '\0'; ++ // TODO: is there a better way to distinguish Arial Caps from Arial proper? ++ // cf. http://code.google.com/p/sumatrapdf/issues/detail?id=1290 ++ else if (strstr(path, "caps") || strstr(path, "Caps")) ++ fz_throw(ctx, FZ_ERROR_GENERIC, "ignore %s, as it can't be distinguished from Arial,Regular", path); ++ } ++ ++ if (szPSName[0]) ++ append_mapping(ctx, &fontlistMS, szPSName, path, index); ++ if (szTTName[0]) ++ { ++ // derive a PostScript-like name and add it, if it's different from the font's ++ // included PostScript name; cf. http://code.google.com/p/sumatrapdf/issues/detail?id=376 ++ makeFakePSName(szTTName, szStyle); ++ // compare the two names before adding this one ++ if (lookup_compare(szTTName, szPSName)) ++ append_mapping(ctx, &fontlistMS, szTTName, path, index); ++ } ++ if (szCJKName[0]) ++ { ++ makeFakePSName(szCJKName, szStyle); ++ if (lookup_compare(szCJKName, szPSName) && lookup_compare(szCJKName, szTTName)) ++ append_mapping(ctx, &fontlistMS, szCJKName, path, index); ++ } ++} ++ ++static void ++parseTTFs(fz_context *ctx, const char *path) ++{ ++ fz_stream *file = fz_open_file(ctx, path); ++ /* "fonterror : %s not found", path */ ++ fz_try(ctx) ++ { ++ parseTTF(ctx, file, 0, 0, path); ++ } ++ fz_always(ctx) ++ { ++ fz_drop_stream(ctx,file); ++ } ++ fz_catch(ctx) ++ { ++ fz_rethrow(ctx); ++ } ++} ++ ++static void ++parseTTCs(fz_context *ctx, const char *path) ++{ ++ FONT_COLLECTION fontcollectionBE; ++ ULONG i, numFonts, *offsettableBE = NULL; ++ ++ fz_stream *file = fz_open_file(ctx, path); ++ /* "fonterror : %s not found", path */ ++ ++ fz_var(offsettableBE); ++ ++ fz_try(ctx) ++ { ++ safe_read(ctx, file, 0, (char *)&fontcollectionBE, sizeof(FONT_COLLECTION)); ++ if (BEtoHl(fontcollectionBE.Tag) != TTAG_ttcf) ++ fz_throw(ctx, FZ_ERROR_GENERIC, "fonterror : wrong format %x", (unsigned int)BEtoHl(fontcollectionBE.Tag)); ++ if (BEtoHl(fontcollectionBE.Version) != TTC_VERSION1 && ++ BEtoHl(fontcollectionBE.Version) != TTC_VERSION2) ++ { ++ fz_throw(ctx, FZ_ERROR_GENERIC, "fonterror : invalid version %x", (unsigned int)BEtoHl(fontcollectionBE.Version)); ++ } ++ ++ numFonts = BEtoHl(fontcollectionBE.NumFonts); ++ offsettableBE = fz_malloc_array(ctx, numFonts, sizeof(ULONG)); ++ ++ safe_read(ctx, file, sizeof(FONT_COLLECTION), (char *)offsettableBE, numFonts * sizeof(ULONG)); ++ for (i = 0; i < numFonts; i++) ++ parseTTF(ctx, file, BEtoHl(offsettableBE[i]), i, path); ++ } ++ fz_always(ctx) ++ { ++ fz_free(ctx, offsettableBE); ++ fz_drop_stream(ctx,file); ++ } ++ fz_catch(ctx) ++ { ++ fz_rethrow(ctx); ++ } ++} ++ ++static void ++extend_system_font_list(fz_context *ctx, const WCHAR *path) ++{ ++ WCHAR szPath[MAX_PATH], *lpFileName; ++ WIN32_FIND_DATA FileData; ++ HANDLE hList; ++ ++ GetFullPathName(path, nelem(szPath), szPath, &lpFileName); ++ ++ hList = FindFirstFile(szPath, &FileData); ++ if (hList == INVALID_HANDLE_VALUE) ++ { ++ // Don't complain about missing directories ++ if (GetLastError() == ERROR_FILE_NOT_FOUND) ++ return; ++ fz_throw(ctx, FZ_ERROR_GENERIC, "extend_system_font_list: unknown error %d", (int)GetLastError()); ++ } ++ do ++ { ++ if (!(FileData.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)) ++ { ++ char szPathUtf8[MAX_PATH], *fileExt; ++ int res; ++ lstrcpyn(lpFileName, FileData.cFileName, szPath + MAX_PATH - lpFileName); ++ res = WideCharToMultiByte(CP_UTF8, 0, szPath, -1, szPathUtf8, sizeof(szPathUtf8), NULL, NULL); ++ if (!res) ++ { ++ fz_warn(ctx, "WideCharToMultiByte failed for %S", szPath); ++ continue; ++ } ++ fileExt = szPathUtf8 + strlen(szPathUtf8) - 4; ++ fz_try(ctx) ++ { ++ if (!_stricmp(fileExt, ".ttc")) ++ parseTTCs(ctx, szPathUtf8); ++ else if (!_stricmp(fileExt, ".ttf") || !_stricmp(fileExt, ".otf")) ++ parseTTFs(ctx, szPathUtf8); ++ } ++ fz_catch(ctx) ++ { ++ // ignore errors occurring while parsing a given font file ++ } ++ } ++ } while (FindNextFile(hList, &FileData)); ++ FindClose(hList); ++} ++ ++static void ++destroy_system_font_list(void) ++{ ++ free(fontlistMS.fontmap); ++ memset(&fontlistMS, 0, sizeof(fontlistMS)); ++} ++ ++static void ++create_system_font_list(fz_context *ctx) ++{ ++ WCHAR szFontDir[MAX_PATH]; ++ UINT cch; ++ ++ cch = GetWindowsDirectory(szFontDir, nelem(szFontDir) - 12); ++ if (0 < cch && cch < nelem(szFontDir) - 12) ++ { ++ /* willus.com edit--Win XP default MSVCRT.DLL doesn't have wcscat_s */ ++#ifdef _WIN64 ++ wcscat_s(szFontDir, MAX_PATH, L"\\Fonts\\*.?t?"); ++#else ++ wcscat(szFontDir,L"\\Fonts\\*.?t?"); ++#endif ++ extend_system_font_list(ctx, szFontDir); ++ } ++ ++ if (fontlistMS.len == 0) ++ fz_warn(ctx, "couldn't find any usable system fonts"); ++ ++#ifdef NOCJKFONT ++ { ++ // If no CJK fallback font is builtin but one has been shipped separately (in the same ++ // directory as the main executable), add it to the list of loadable system fonts ++ WCHAR szFile[MAX_PATH], *lpFileName; ++ GetModuleFileName(0, szFontDir, MAX_PATH); ++ GetFullPathName(szFontDir, MAX_PATH, szFile, &lpFileName); ++ lstrcpyn(lpFileName, L"DroidSansFallback.ttf", szFile + MAX_PATH - lpFileName); ++ extend_system_font_list(ctx, szFile); ++ } ++#endif ++ ++ // sort the font list, so that it can be searched binarily ++ qsort(fontlistMS.fontmap, fontlistMS.len, sizeof(pdf_fontmapMS), _stricmp); ++ ++#ifdef DEBUG ++ // allow to overwrite system fonts for debugging purposes ++ // (either pass a full path or a search pattern such as "fonts\*.ttf") ++ cch = GetEnvironmentVariable(L"MUPDF_FONTS_PATTERN", szFontDir, nelem(szFontDir)); ++ if (0 < cch && cch < nelem(szFontDir)) ++ { ++ int i, prev_len = fontlistMS.len; ++ extend_system_font_list(ctx, szFontDir); ++ for (i = prev_len; i < fontlistMS.len; i++) ++ { ++ pdf_fontmapMS *entry = bsearch(fontlistMS.fontmap[i].fontface, fontlistMS.fontmap, prev_len, sizeof(pdf_fontmapMS), lookup_compare); ++ if (entry) ++ *entry = fontlistMS.fontmap[i]; ++ } ++ qsort(fontlistMS.fontmap, fontlistMS.len, sizeof(pdf_fontmapMS), _stricmp); ++ } ++#endif ++ ++ // make sure to clean up after ourselves ++ atexit(destroy_system_font_list); ++} ++ ++static fz_font * ++pdf_load_windows_font_by_name(fz_context *ctx, const char *orig_name) ++{ ++ pdf_fontmapMS *found = NULL; ++ char *comma, *fontname; ++ fz_font *font; ++ ++ /* WILLUS MOD--not multi-threaded for k2pdfopt */ ++ /* fz_synchronize_begin(); */ ++ if (fontlistMS.len == 0) ++ { ++ fz_try(ctx) ++ { ++ create_system_font_list(ctx); ++ } ++ fz_catch(ctx) { } ++ } ++ /* WILLUS MOD--not multi-threaded for k2pdfopt */ ++ /* fz_synchronize_end(); */ ++ if (fontlistMS.len == 0) ++ fz_throw(ctx, FZ_ERROR_GENERIC, "fonterror: couldn't find any fonts"); ++ ++ // work on a normalized copy of the font name ++ fontname = fz_strdup(ctx, orig_name); ++ remove_spaces(fontname); ++ ++ // first, try to find the exact font name (including appended style information) ++ comma = strchr(fontname, ','); ++ if (comma) ++ { ++ *comma = '-'; ++ found = pdf_find_windows_font_path(fontname); ++ *comma = ','; ++ } ++ // second, substitute the font name with a known PostScript name ++ else ++ { ++ int i; ++ for (i = 0; i < nelem(baseSubstitutes) && !found; i++) ++ if (!strcmp(fontname, baseSubstitutes[i].name)) ++ found = pdf_find_windows_font_path(baseSubstitutes[i].pattern); ++ } ++ // third, search for the font name without additional style information ++ if (!found) ++ found = pdf_find_windows_font_path(fontname); ++ // fourth, try to separate style from basename for prestyled fonts (e.g. "ArialBold") ++ if (!found && !comma && (str_ends_with(fontname, "Bold") || str_ends_with(fontname, "Italic"))) ++ { ++ int styleLen = str_ends_with(fontname, "Bold") ? 4 : str_ends_with(fontname, "BoldItalic") ? 10 : 6; ++ fontname = fz_resize_array(ctx, fontname, strlen(fontname) + 2, sizeof(char)); ++ comma = fontname + strlen(fontname) - styleLen; ++ memmove(comma + 1, comma, styleLen + 1); ++ *comma = '-'; ++ found = pdf_find_windows_font_path(fontname); ++ *comma = ','; ++ if (!found) ++ found = pdf_find_windows_font_path(fontname); ++ } ++ // fifth, try to convert the font name from the common Chinese codepage 936 ++ if (!found && fontname[0] < 0) ++ { ++ WCHAR cjkNameW[MAX_FACENAME]; ++ char cjkName[MAX_FACENAME]; ++ if (MultiByteToWideChar(936, MB_ERR_INVALID_CHARS, fontname, -1, cjkNameW, nelem(cjkNameW)) && ++ WideCharToMultiByte(CP_UTF8, 0, cjkNameW, -1, cjkName, nelem(cjkName), NULL, NULL)) ++ { ++ comma = strchr(cjkName, ','); ++ if (comma) ++ { ++ *comma = '-'; ++ found = pdf_find_windows_font_path(cjkName); ++ *comma = ','; ++ } ++ if (!found) ++ found = pdf_find_windows_font_path(cjkName); ++ } ++ } ++ ++ fz_free(ctx, fontname); ++ if (!found) ++ fz_throw(ctx, FZ_ERROR_GENERIC, "couldn't find system font '%s'", orig_name); ++ ++ /* ++ fz_warn(ctx, "loading non-embedded font '%s' from '%s'", orig_name, found->fontpath); ++ */ ++ ++ font = fz_new_font_from_file(ctx, orig_name, found->fontpath, found->index, ++ strcmp(found->fontface, "DroidSansFallback") != 0); ++ /* willus mod for MuPDF v1.10, 10-21-2016 */ ++ { ++ fz_font_flags_t *flags; ++ flags=fz_font_flags(font); ++ if (flags!=NULL) ++ flags->ft_substitute = 1; ++ } ++ return font; ++} ++ ++static fz_font * ++pdf_load_windows_font(fz_context *ctx, const char *fontname, int bold, int italic, int needs_exact_metrics) ++{ ++ if (needs_exact_metrics) ++ { ++ const char *clean_name; ++ /* WILLUS: Declare pdf_clean_base14_name() */ ++ extern const char *pdf_clean_base14_name(const char *fontname); ++ ++ /* TODO: the metrics for Times-Roman and Courier don't match ++ those of Windows' Times New Roman and Courier New; for ++ some reason, Poppler doesn't seem to have this problem */ ++ int len; ++ if (fz_lookup_builtin_font(ctx,fontname, bold, italic, &len)) ++ return NULL; ++ ++ /* cf. http://code.google.com/p/sumatrapdf/issues/detail?id=2173 */ ++ clean_name = pdf_clean_base14_name(fontname); ++ if (clean_name != fontname && !strncmp(clean_name, "Times-", 6)) ++ return NULL; ++ } ++ ++ // TODO: unset font->ft_substitute for base14/needs_exact_metrics? ++ return pdf_load_windows_font_by_name(ctx, fontname); ++} ++ ++static const char *clean_font_name(const char *fontname) ++{ ++ int i, k; ++ for (i = 0; i < nelem(base_font_names); i++) ++ for (k = 0; base_font_names[i][k]; k++) ++ if (!strcmp_ignore_space(base_font_names[i][k], fontname)) ++ return base_font_names[i][0]; ++ return fontname; ++} ++ ++ ++/* SumatraPDF: expose clean_font_name */ ++static const char * pdf_clean_base14_name(const char *fontname) ++{ ++ return clean_font_name(fontname); ++} ++ ++static fz_font * ++pdf_load_windows_cjk_font(fz_context *ctx, const char *fontname, int ros, int serif) ++{ ++ fz_font *font; ++ ++ font=NULL; /* WILLUS: Avoid compiler warning */ ++ /* try to find a matching system font before falling back to an approximate one */ ++ fz_try(ctx) ++ { ++ font = pdf_load_windows_font_by_name(ctx, fontname); ++ } ++ fz_catch(ctx) ++ { ++ font = NULL; ++ } ++ if (font) ++ return font; ++ ++ /* try to fall back to a reasonable system font */ ++ fz_try(ctx) ++ { ++ if (serif) ++ { ++ switch (ros) ++ { ++ case FZ_ADOBE_CNS: font = pdf_load_windows_font_by_name(ctx, "MingLiU"); break; ++ case FZ_ADOBE_GB: font = pdf_load_windows_font_by_name(ctx, "SimSun"); break; ++ case FZ_ADOBE_JAPAN: font = pdf_load_windows_font_by_name(ctx, "MS-Mincho"); break; ++ case FZ_ADOBE_KOREA: font = pdf_load_windows_font_by_name(ctx, "Batang"); break; ++ default: fz_throw(ctx, FZ_ERROR_GENERIC, "invalid serif ros"); ++ } ++ } ++ else ++ { ++ switch (ros) ++ { ++ case FZ_ADOBE_CNS: font = pdf_load_windows_font_by_name(ctx, "DFKaiShu-SB-Estd-BF"); break; ++ case FZ_ADOBE_GB: ++ fz_try(ctx) ++ { ++ font = pdf_load_windows_font_by_name(ctx, "KaiTi"); ++ } ++ fz_catch(ctx) ++ { ++ font = pdf_load_windows_font_by_name(ctx, "KaiTi_GB2312"); ++ } ++ break; ++ case FZ_ADOBE_JAPAN: font = pdf_load_windows_font_by_name(ctx, "MS-Gothic"); break; ++ case FZ_ADOBE_KOREA: font = pdf_load_windows_font_by_name(ctx, "Gulim"); break; ++ default: fz_throw(ctx, FZ_ERROR_GENERIC, "invalid sans-serif ros"); ++ } ++ } ++ } ++ fz_catch(ctx) ++ { ++#ifdef NOCJKFONT ++ /* If no CJK fallback font is builtin, maybe one has been shipped separately */ ++ font = pdf_load_windows_font_by_name(ctx, "DroidSansFallback"); ++#else ++ fz_rethrow(ctx); ++#endif ++ } ++ ++ return font; ++} ++ ++#endif ++ ++void pdf_install_load_system_font_funcs(fz_context *ctx) ++{ ++#ifdef _WIN32 ++ fz_install_load_system_font_funcs(ctx, pdf_load_windows_font, pdf_load_windows_cjk_font, NULL); ++#endif ++} +diff --git a/source/fitz/font.c b/source/fitz/font.c +index 00c6e8f99..1448b4a56 100644 +--- a/source/fitz/font.c ++++ b/source/fitz/font.c +@@ -4,8 +4,11 @@ + #include "draw-imp.h" + + #include <ft2build.h> ++/* willus mod -- remove hb includes */ ++/* + #include "hb.h" + #include "hb-ft.h" ++*/ + + #include <assert.h> + +diff --git a/source/fitz/stext-device.c b/source/fitz/stext-device.c +index 2df90305e..b1f99e056 100644 +--- a/source/fitz/stext-device.c ++++ b/source/fitz/stext-device.c +@@ -825,6 +825,11 @@ fz_new_stext_device(fz_context *ctx, fz_stext_page *page, const fz_stext_options + dev->lastchar = ' '; + dev->curdir = 1; + dev->lasttext = NULL; ++ /* willus mod -- seems like this should be here, but not sure. */ ++ if (opts) ++ dev->flags = opts->flags; ++ else ++ dev->flags = 0; + + return (fz_device*)dev; + } +diff --git a/source/fitz/string.c b/source/fitz/string.c +index f8eedb682..7a767983d 100644 +--- a/source/fitz/string.c ++++ b/source/fitz/string.c +@@ -560,6 +560,10 @@ fz_utflen(const char *s) + */ + float fz_atof(const char *s) + { ++/* willus mod: atof(s), #if-#else-#endif */ ++#if (!defined(__SSE__)) ++ return(atof(s)); ++#else + float result; + + if (s == NULL) +@@ -572,6 +576,7 @@ float fz_atof(const char *s) + return 1; + result = fz_clamp(result, -FLT_MAX, FLT_MAX); + return result; ++#endif + } + + /* +diff --git a/source/pdf/pdf-annot.c b/source/pdf/pdf-annot.c +index 4dfdf36fe..acff7d12a 100644 +--- a/source/pdf/pdf-annot.c ++++ b/source/pdf/pdf-annot.c +@@ -5,8 +5,20 @@ + #include <string.h> + #include <time.h> + ++/* willus mod--don't use _mkgmtime--not available in Win XP */ + #ifdef _WIN32 +-#define timegm _mkgmtime ++static time_t timegm(struct tm *date); ++static time_t timegm(struct tm *date) ++ ++ { ++ time_t t,z; ++ struct tm gmz; ++ ++ z=(time_t)0; ++ gmz=(*gmtime(&z)); ++ t=mktime(date)-mktime(&gmz); ++ return(t); ++ } + #endif + + #define isdigit(c) (c >= '0' && c <= '9') +diff --git a/source/pdf/pdf-link.c b/source/pdf/pdf-link.c +index 37444b471..613cc05b9 100644 +--- a/source/pdf/pdf-link.c ++++ b/source/pdf/pdf-link.c +@@ -345,6 +345,9 @@ pdf_resolve_link(fz_context *ctx, pdf_document *doc, const char *uri, float *xp, + } + return page; + } ++/* willus mod -- be quiet */ ++/* + fz_warn(ctx, "unknown link uri '%s'", uri); ++*/ + return -1; + } +diff --git a/source/pdf/pdf-parse.c b/source/pdf/pdf-parse.c +index 04a772204..9dd0cd898 100644 +--- a/source/pdf/pdf-parse.c ++++ b/source/pdf/pdf-parse.c +@@ -663,9 +663,14 @@ pdf_parse_ind_obj(fz_context *ctx, pdf_document *doc, + if (c == '\r') + { + c = fz_peek_byte(ctx, file); ++/* willus mod -- no warning */ ++/* + if (c != '\n') + fz_warn(ctx, "line feed missing after stream begin marker (%d %d R)", num, gen); + else ++*/ ++if (c=='\n') ++/* willus mod -- end */ + fz_read_byte(ctx, file); + } + stm_ofs = fz_tell(ctx, file); +diff --git a/source/pdf/pdf-xref.c b/source/pdf/pdf-xref.c +index 8f888059b..08de7bfba 100644 +--- a/source/pdf/pdf-xref.c ++++ b/source/pdf/pdf-xref.c +@@ -710,8 +710,11 @@ pdf_xref_size_from_old_trailer(fz_context *ctx, pdf_document *doc, pdf_lexbuf *b + if (!s) + fz_throw(ctx, FZ_ERROR_GENERIC, "xref subsection length missing"); + len = fz_atoi(fz_strsep(&s, " ")); ++/* willus mod -- no warning */ ++/* + if (len < 0) + fz_throw(ctx, FZ_ERROR_GENERIC, "xref subsection length must be positive"); ++*/ + + /* broken pdfs where the section is not on a separate line */ + if (s && *s != '\0') +@@ -1378,7 +1381,10 @@ pdf_init_document(fz_context *ctx, pdf_document *doc) + { + pdf_drop_xref_sections(ctx, doc); + fz_rethrow_if(ctx, FZ_ERROR_TRYLATER); ++/* willus mod -- be quiet */ ++/* + fz_warn(ctx, "trying to repair broken xref"); ++*/ + repaired = 1; + } + +@@ -1506,7 +1512,10 @@ pdf_drop_document_imp(fz_context *ctx, pdf_document *doc) + /* Swallow error, but continue dropping */ + } + ++/* willu smod -- no pdf_drop_js */ ++/* + pdf_drop_js(ctx, doc->js); ++*/ + + pdf_drop_xref_sections(ctx, doc); + fz_free(ctx, doc->xref_index); +-- +2.22.0 + diff --git a/pkgs/applications/misc/k2pdfopt/tesseract.patch b/pkgs/applications/misc/k2pdfopt/tesseract.patch index b882f5b949c3..adfee9ae282f 100644 --- a/pkgs/applications/misc/k2pdfopt/tesseract.patch +++ b/pkgs/applications/misc/k2pdfopt/tesseract.patch @@ -1,13 +1,675 @@ +From 39aa8502eee7bb669a29d1a9b3bfe5c9595ad960 Mon Sep 17 00:00:00 2001 +From: Daniel Fullmer <danielrf12@gmail.com> +Date: Fri, 13 Sep 2019 13:45:05 -0400 +Subject: [PATCH] Willus mod changes from k2pdfopt + +--- + src/api/Makefile.am | 1 + + src/api/baseapi.cpp | 87 +++++++++++ + src/api/baseapi.h | 3 + + src/api/tesscapi.cpp | 311 +++++++++++++++++++++++++++++++++++++ + src/api/tesseract.h | 29 ++++ + src/ccmain/tessedit.cpp | 5 +- + src/ccutil/ccutil.h | 7 + + src/ccutil/genericvector.h | 21 ++- + src/ccutil/mainblk.cpp | 17 +- + src/ccutil/params.cpp | 3 +- + src/ccutil/serialis.cpp | 3 + + src/ccutil/serialis.h | 2 + + src/lstm/input.cpp | 3 + + 13 files changed, 488 insertions(+), 4 deletions(-) + create mode 100644 src/api/tesscapi.cpp + create mode 100644 src/api/tesseract.h + diff --git a/src/api/Makefile.am b/src/api/Makefile.am -index d8c1e54..46ead13 100644 +index d9b76eb6..cd2dc30f 100644 --- a/src/api/Makefile.am +++ b/src/api/Makefile.am -@@ -42,7 +42,7 @@ libtesseract_api_la_CPPFLAGS = $(AM_CPPFLAGS) - if VISIBILITY - libtesseract_api_la_CPPFLAGS += -DTESS_EXPORTS - endif --libtesseract_api_la_SOURCES = baseapi.cpp capi.cpp renderer.cpp pdfrenderer.cpp -+libtesseract_api_la_SOURCES = baseapi.cpp capi.cpp renderer.cpp pdfrenderer.cpp tesscapi.cpp +@@ -39,6 +39,7 @@ libtesseract_api_la_SOURCES += lstmboxrenderer.cpp + libtesseract_api_la_SOURCES += pdfrenderer.cpp + libtesseract_api_la_SOURCES += wordstrboxrenderer.cpp + libtesseract_api_la_SOURCES += renderer.cpp ++libtesseract_api_la_SOURCES += tesscapi.cpp lib_LTLIBRARIES += libtesseract.la - libtesseract_la_LDFLAGS = + libtesseract_la_LDFLAGS = $(LEPTONICA_LIBS) $(OPENCL_LDFLAGS) $(libarchive_LIBS) +diff --git a/src/api/baseapi.cpp b/src/api/baseapi.cpp +index 9245d07c..ea964ee6 100644 +--- a/src/api/baseapi.cpp ++++ b/src/api/baseapi.cpp +@@ -215,6 +215,14 @@ TessBaseAPI::TessBaseAPI() + // Use the current locale if building debug code. + std::locale::global(std::locale("")); + #endif ++ const char *locale; ++ locale = std::setlocale(LC_ALL, nullptr); ++/* willus mod Remove assertions--taken care of in tesscapi.cpp */ ++// ASSERT_HOST(!strcmp(locale, "C")); ++ locale = std::setlocale(LC_CTYPE, nullptr); ++// ASSERT_HOST(!strcmp(locale, "C")); ++ locale = std::setlocale(LC_NUMERIC, nullptr); ++// ASSERT_HOST(!strcmp(locale, "C")); + } + + TessBaseAPI::~TessBaseAPI() { +@@ -1333,6 +1341,85 @@ static void AddBoxToTSV(const PageIterator* it, PageIteratorLevel level, + text->add_str_int("\t", bottom - top); + } + ++/* willus mod */ ++int TessBaseAPI::GetOCRWords(int **x00,int **y00,int **x11,int **y11,int **ybaseline0, ++ char **utf8words) ++ ++ { ++ int iword,nwords,totlen,it8; ++ int *x0,*y0,*x1,*y1,*ybaseline; ++ char *tutf8; ++ ++ ResultIterator *res_it = GetIterator(); ++ /* Count words */ ++ iword=0; ++ totlen=0; ++ while (!res_it->Empty(RIL_BLOCK)) ++ { ++ if (res_it->Empty(RIL_WORD)) ++ { ++ res_it->Next(RIL_WORD); ++ continue; ++ } ++ iword++; ++ STRING textstr=std::unique_ptr<const char[]>(res_it->GetUTF8Text(RIL_WORD)).get(); ++ totlen+=strlen(textstr.string())+1; ++ res_it->Next(RIL_WORD); ++ } ++ nwords=iword; ++/* ++printf("\nnwords=%d, totlen=%d\n",nwords,totlen); ++*/ ++ x0=(*x00)=(int *)malloc(sizeof(int)*5*nwords); ++ y0=(*y00)=&x0[nwords]; ++ x1=(*x11)=&y0[nwords]; ++ y1=(*y11)=&x1[nwords]; ++ ybaseline=(*ybaseline0)=&y1[nwords]; ++ tutf8=(*utf8words)=(char *)malloc(totlen); ++ iword=0; ++ it8=0; ++ res_it->Begin(); ++ while (!res_it->Empty(RIL_BLOCK)) ++ { ++ if (res_it->Empty(RIL_WORD)) ++ { ++ res_it->Next(RIL_WORD); ++ continue; ++ } ++ STRING textstr=std::unique_ptr<const char[]>(res_it->GetUTF8Text(RIL_WORD)).get(); ++ strcpy(&tutf8[it8],textstr.string()); ++ it8 += strlen(&tutf8[it8])+1; ++ /* ++ STRING textstr(""); ++ textstr += std::unique_ptr<const char[]>(res_it->GetUTF8Text(RIL_WORD)).get(); ++ */ ++/* ++printf("Word %d: '%s'\n",iword,textstr.string()); ++*/ ++ int left, top, right, bottom; ++ int u1,v1,u2,v2; ++ res_it->BoundingBox(RIL_WORD, &left, &top, &right, &bottom); ++ res_it->Baseline(RIL_WORD, &u1, &v1, &u2, &v2); ++ x0[iword]=left; ++ x1[iword]=right; ++ y0[iword]=top; ++ y1[iword]=bottom; ++ ybaseline[iword]=(v1+v2)/2; ++ iword++; ++/* ++printf("BB: (%d,%d)-(%d,%d) BL: (%d,%d)-(%d,%d)\n",left,bottom,right,top,x1,y1,x2,y2); ++*/ ++ res_it->Next(RIL_WORD); ++ } ++/* ++printf("iword=%d\n",iword); ++*/ ++ return(iword); ++ } ++ ++/* willus mod */ ++int GetOCRWords(int **x0,int **y0,int **x1,int **y1,int **ybaseline,char **utf8words); ++ + /** + * Make a TSV-formatted string from the internal data structures. + * page_number is 0-based but will appear in the output as 1-based. +diff --git a/src/api/baseapi.h b/src/api/baseapi.h +index 3724dd92..23be5920 100644 +--- a/src/api/baseapi.h ++++ b/src/api/baseapi.h +@@ -575,6 +575,9 @@ class TESS_API TessBaseAPI { + */ + char* GetHOCRText(ETEXT_DESC* monitor, int page_number); + ++/* willus mod */ ++int GetOCRWords(int **x0,int **y0,int **x1,int **y1,int **ybaseline,char **utf8words); ++ + /** + * Make a HTML-formatted string with hOCR markup from the internal + * data structures. +diff --git a/src/api/tesscapi.cpp b/src/api/tesscapi.cpp +new file mode 100644 +index 00000000..1752fafe +--- /dev/null ++++ b/src/api/tesscapi.cpp +@@ -0,0 +1,311 @@ ++/* ++** tesscapi.cpp willus.com attempt at C wrapper for tesseract. ++** (Butchered from tesseractmain.cpp) ++** Last udpated 9-1-12 ++** ++** Copyright (C) 2012 http://willus.com ++** ++** This program is free software: you can redistribute it and/or modify ++** it under the terms of the GNU Affero General Public License as ++** published by the Free Software Foundation, either version 3 of the ++** License, or (at your option) any later version. ++** ++** This program is distributed in the hope that it will be useful, ++** but WITHOUT ANY WARRANTY; without even the implied warranty of ++** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++** GNU Affero General Public License for more details. ++** ++** You should have received a copy of the GNU Affero General Public License ++** along with this program. If not, see <http://www.gnu.org/licenses/>. ++** ++*/ ++ ++/* ++#include "mfcpch.h" ++*/ ++// #define USE_VLD //Uncomment for Visual Leak Detector. ++#if (defined _MSC_VER && defined USE_VLD) ++#include <vld.h> ++#endif ++ ++// Include automatically generated configuration file if running autoconf ++#ifdef HAVE_CONFIG_H ++#include "config_auto.h" ++#endif ++#include <locale.h> ++#ifdef USING_GETTEXT ++#include <libintl.h> ++#define _(x) gettext(x) ++#else ++#define _(x) (x) ++#endif ++ ++#include "allheaders.h" ++#include "baseapi.h" ++#include "strngs.h" ++#include "params.h" ++#include "blobs.h" ++#include "simddetect.h" ++#include "tesseractclass.h" ++/* ++#include "notdll.h" ++*/ ++ ++/* C Wrappers */ ++#include "tesseract.h" ++ ++// static tesseract::TessBaseAPI api[4]; ++ ++/* ++** ocr_type=0: OEM_DEFAULT ++** ocr_type=1: OEM_TESSERACT_ONLY ++** ocr_type=2: OEM_LSTM_ONLY ++** ocr_type=3: OEM_TESSERACT_LSTM_COMBINED ++*/ ++void *tess_capi_init(char *datapath,char *language,int ocr_type,FILE *out, ++ char *initstr,int maxlen,int *status) ++ ++ { ++ char original_locale[256]; ++ tesseract::TessBaseAPI *api = new tesseract::TessBaseAPI; ++/* ++printf("@tess_capi_init\n"); ++printf(" datapath='%s'\n",datapath); ++printf(" language='%s'\n",language); ++printf(" ocr_type=%d\n",ocr_type); ++*/ ++#ifdef USE_NLS ++ setlocale (LC_ALL, ""); ++ bindtextdomain (PACKAGE, LOCALEDIR); ++ textdomain (PACKAGE); ++#endif ++ /* willus mod, 11-24-16 */ ++ /* Tesseract needs "C" locale to correctly parse all data .traineddata files. */ ++/* ++printf("locale='%s'\n",setlocale(LC_ALL,NULL)); ++printf("ctype='%s'\n",setlocale(LC_CTYPE,NULL)); ++printf("numeric='%s'\n",setlocale(LC_NUMERIC,NULL)); ++*/ ++ strncpy(original_locale,setlocale(LC_ALL,NULL),255); ++ original_locale[255]='\0'; ++/* ++printf("original_locale='%s'\n",original_locale); ++*/ ++ setlocale(LC_ALL,"C"); ++/* ++printf("new locale='%s'\n",setlocale(LC_ALL,NULL)); ++printf("new ctype='%s'\n",setlocale(LC_CTYPE,NULL)); ++printf("new numeric='%s'\n",setlocale(LC_NUMERIC,NULL)); ++*/ ++ // fprintf(stderr, "tesseract %s\n", tesseract::TessBaseAPI::Version()); ++ // Make the order of args a bit more forgiving than it used to be. ++ const char* lang = "eng"; ++ tesseract::PageSegMode pagesegmode = tesseract::PSM_SINGLE_BLOCK; ++ if (language!=NULL && language[0]!='\0') ++ lang = language; ++ /* ++ if (output == NULL) ++ { ++ fprintf(stderr, _("Usage:%s imagename outputbase [-l lang] " ++ "[-psm pagesegmode] [configfile...]\n"), argv[0]); ++ fprintf(stderr, ++ _("pagesegmode values are:\n" ++ "0 = Orientation and script detection (OSD) only.\n" ++ "1 = Automatic page segmentation with OSD.\n" ++ "2 = Automatic page segmentation, but no OSD, or OCR\n" ++ "3 = Fully automatic page segmentation, but no OSD. (Default)\n" ++ "4 = Assume a single column of text of variable sizes.\n" ++ "5 = Assume a single uniform block of vertically aligned text.\n" ++ "6 = Assume a single uniform block of text.\n" ++ "7 = Treat the image as a single text line.\n" ++ "8 = Treat the image as a single word.\n" ++ "9 = Treat the image as a single word in a circle.\n" ++ "10 = Treat the image as a single character.\n")); ++ fprintf(stderr, _("-l lang and/or -psm pagesegmode must occur before any" ++ "configfile.\n")); ++ exit(1); ++ } ++ */ ++/* ++printf("SSE = %s\n",SIMDDetect::IsSSEAvailable() ? "AVAILABLE" : "NOT AVAILABLE"); ++printf("AVX = %s\n",SIMDDetect::IsAVXAvailable() ? "AVAILABLE" : "NOT AVAILABLE"); ++*/ ++/* ++v4.00 loads either TESSERACT enginer, LSTM engine, or both. No CUBE. ++*/ ++ ocr_type=0; /* Ignore specified and use default */ ++ api->SetOutputName(NULL); ++ (*status)=api->Init(datapath,lang, ++ ocr_type==0 ? tesseract::OEM_DEFAULT : ++ (ocr_type==1 ? tesseract::OEM_TESSERACT_ONLY : ++ (ocr_type==2 ? tesseract::OEM_LSTM_ONLY : ++ (tesseract::OEM_TESSERACT_LSTM_COMBINED)))); ++ if ((*status)!=0) ++ { ++ /* willus mod, 11-24-16 */ ++ setlocale(LC_ALL,original_locale); ++ api->End(); ++ delete api; ++ return(NULL); ++ } ++ /* ++ api.Init("tesscapi",lang,tesseract::OEM_DEFAULT, ++ &(argv[arg]), argc - arg, NULL, NULL, false); ++ */ ++ // We have 2 possible sources of pagesegmode: a config file and ++ // the command line. For backwards compatability reasons, the ++ // default in tesseract is tesseract::PSM_SINGLE_BLOCK, but the ++ // default for this program is tesseract::PSM_AUTO. We will let ++ // the config file take priority, so the command-line default ++ // can take priority over the tesseract default, so we use the ++ // value from the command line only if the retrieved mode ++ // is still tesseract::PSM_SINGLE_BLOCK, indicating no change ++ // in any config file. Therefore the only way to force ++ // tesseract::PSM_SINGLE_BLOCK is from the command line. ++ // It would be simpler if we could set the value before Init, ++ // but that doesn't work. ++ if (api->GetPageSegMode() == tesseract::PSM_SINGLE_BLOCK) ++ api->SetPageSegMode(pagesegmode); ++ ++ /* ++ ** Initialization message ++ */ ++ { ++ char istr[1024]; ++ int sse,avx; ++ ++// printf("tessedit_ocr_engine_mode = %d\n",tessedit_ocr_engine_mode); ++ sprintf(istr,"%s",api->Version()); ++ sse=tesseract::SIMDDetect::IsSSEAvailable(); ++ avx=tesseract::SIMDDetect::IsAVXAvailable(); ++ if (sse || avx) ++ sprintf(&istr[strlen(istr)]," [%s]",sse&&avx?"SSE+AVX":(sse?"SSE":"AVX")); ++ sprintf(&istr[strlen(istr)],"\n Tesseract data folder = '%s'",datapath==NULL?getenv("TESSDATA_PREFIX"):datapath); ++ strcat(istr,"\n Tesseract languages: "); ++ GenericVector<STRING> languages; ++ api->GetLoadedLanguagesAsVector(&languages); ++/* ++printf("OEM=%d\n",api->oem()); ++printf("Langs='%s'\n",api->GetInitLanguagesAsString()); ++printf("AnyTessLang()=%d\n",(int)api->tesseract()->AnyTessLang()); ++printf("AnyLSTMLang()=%d\n",(int)api->tesseract()->AnyLSTMLang()); ++printf("num_sub_langs()=%d\n",api->tesseract()->num_sub_langs()); ++printf("languages.size()=%d\n",(int)languages.size()); ++*/ ++ ++ for (int i=0;i<=api->tesseract()->num_sub_langs();i++) ++ { ++ tesseract::Tesseract *lang1; ++ int eng; ++ lang1 = i==0 ? api->tesseract() : api->tesseract()->get_sub_lang(i-1); ++ eng=(int)lang1->tessedit_ocr_engine_mode; ++ sprintf(&istr[strlen(istr)],"%s%s [%s]",i==0?"":", ",lang1->lang.string(), ++ eng==2?"LSTM+Tess":(eng==1?"LSTM":"Tess")); ++ } ++/* ++printf("%d. '%s'\n",i+1,languages[i].string()); ++printf(" sublang[%d].oem_engine = %d\n",i+1,(int)api->tesseract()->get_sub_lang(i)->tessedit_ocr_engine_mode); ++*/ ++ ++ /* ++ if (ocr_type==0 || ocr_type==3) ++ sprintf(&istr[strlen(istr)],"[LSTM+] (lang="); ++ else if (ocr_type==2) ++ sprintf(&istr[strlen(istr)],"[LSTM] (lang="); ++ strncpy(&istr[strlen(istr)],language,253-strlen(istr)); ++ istr[253]='\0'; ++ strcat(istr,")"); ++ */ ++ if (out!=NULL) ++ fprintf(out,"%s\n",istr); ++ if (initstr!=NULL) ++ { ++ strncpy(initstr,istr,maxlen-1); ++ initstr[maxlen-1]='\0'; ++ } ++ } ++ ++ ++ /* Turn off LSTM debugging output */ ++ api->SetVariable("lstm_debug_level","0"); ++#if (WILLUSDEBUG & 1) ++ api->SetVariable("lstm_debug_level","9"); ++ api->SetVariable("paragraph_debug_level","9"); ++ api->SetVariable("tessdata_manager_debug_level","9"); ++ api->SetVariable("tosp_debug_level","9"); ++ api->SetVariable("wordrec_debug_level","9"); ++ api->SetVariable("segsearch_debug_level","9"); ++#endif ++ /* willus mod, 11-24-16 */ ++ setlocale(LC_ALL,original_locale); ++ return((void *)api); ++ } ++ ++ ++int tess_capi_get_ocr(void *vapi,PIX *pix,char *outstr,int maxlen,int segmode,FILE *out) ++ ++ { ++ tesseract::TessBaseAPI *api; ++ static int old_segmode=-1; ++ ++ api=(tesseract::TessBaseAPI *)vapi; ++ if (old_segmode != segmode) ++ { ++ old_segmode=segmode; ++ api->SetPageSegMode((tesseract::PageSegMode)segmode); ++ } ++ if (!api->ProcessPage(pix,0,NULL,NULL,0,NULL)) ++ { ++ /* pixDestroy(&pix); */ ++ if (out!=NULL) ++ fprintf(out,"tesscapi: Error during bitmap processing.\n"); ++ api->Clear(); ++ return(-1); ++ } ++ strncpy(outstr,api->GetUTF8Text(),maxlen-1); ++ outstr[maxlen-1]='\0'; ++ api->Clear(); ++ return(0); ++ } ++ ++ ++int tess_capi_get_ocr_multiword(void *vapi,PIX *pix,int segmode, ++ int **left,int **top,int **right,int **bottom, ++ int **ybase,char **text,int *nw, ++ FILE *out) ++ ++ { ++ tesseract::TessBaseAPI *api; ++ static int old_segmode=-1; ++ ++ api=(tesseract::TessBaseAPI *)vapi; ++ if (old_segmode != segmode) ++ { ++ old_segmode=segmode; ++ api->SetPageSegMode((tesseract::PageSegMode)segmode); ++ } ++ if (!api->ProcessPage(pix,0,NULL,NULL,0,NULL)) ++ { ++ if (out!=NULL) ++ fprintf(out,"tesscapi: Error during bitmap processing.\n"); ++ api->Clear(); ++ (*nw)=0; ++ return(-1); ++ } ++ (*nw)=api->GetOCRWords(left,top,right,bottom,ybase,text); ++ api->Clear(); ++ return(0); ++ } ++ ++ ++void tess_capi_end(void *vapi) ++ ++ { ++ tesseract::TessBaseAPI *api; ++ ++ if (vapi==NULL) ++ return; ++ api=(tesseract::TessBaseAPI *)vapi; ++ api->End(); ++ delete api; ++ } +diff --git a/src/api/tesseract.h b/src/api/tesseract.h +new file mode 100644 +index 00000000..575948cc +--- /dev/null ++++ b/src/api/tesseract.h +@@ -0,0 +1,29 @@ ++/* ++** Willus.com's Tesseract C Wrappers ++** ++** 6-8-12 ++** ++*/ ++ ++#ifndef _TESSERACT_H_ ++#define _TESSERACT_H_ ++ ++//#include <leptonica.h> ++#ifdef __cplusplus ++extern "C" { ++#endif ++ ++void *tess_capi_init(char *datapath,char *language,int ocr_type,FILE *out, ++ char *initstr,int maxlen,int *status); ++int tess_capi_get_ocr(void *api,PIX *pix,char *outstr,int maxlen,int segmode,FILE *out); ++int tess_capi_get_ocr_multiword(void *vapi,PIX *pix,int segmode, ++ int **left,int **top,int **right,int **bottom, ++ int **ybase,char **text,int *nw, ++ FILE *out); ++void tess_capi_end(void *api); ++ ++#ifdef __cplusplus ++} ++#endif ++ ++#endif +diff --git a/src/ccmain/tessedit.cpp b/src/ccmain/tessedit.cpp +index 17f0951b..7af94ee2 100644 +--- a/src/ccmain/tessedit.cpp ++++ b/src/ccmain/tessedit.cpp +@@ -101,6 +101,10 @@ bool Tesseract::init_tesseract_lang_data( + " to your \"tessdata\" directory.\n"); + return false; + } ++ /* willus mod */ ++ TFile fp; ++ strncpy(fp.tfile_filename,tessdata_path.string(),511); ++ fp.tfile_filename[511]='\0'; + #ifndef DISABLED_LEGACY_ENGINE + if (oem == OEM_DEFAULT) { + // Set the engine mode from availability, which can then be overridden by +@@ -116,7 +120,6 @@ bool Tesseract::init_tesseract_lang_data( + #endif // ndef DISABLED_LEGACY_ENGINE + + // If a language specific config file (lang.config) exists, load it in. +- TFile fp; + if (mgr->GetComponent(TESSDATA_LANG_CONFIG, &fp)) { + ParamUtils::ReadParamsFromFp(SET_PARAM_CONSTRAINT_NONE, &fp, + this->params()); +diff --git a/src/ccutil/ccutil.h b/src/ccutil/ccutil.h +index 71e89c60..bdeccc14 100644 +--- a/src/ccutil/ccutil.h ++++ b/src/ccutil/ccutil.h +@@ -80,6 +80,13 @@ class CCUtil { + // Member parameters. + // These have to be declared and initialized after params_ member, since + // params_ should be initialized before parameters are added to it. ++/* willus mod */ ++/* ++ #ifdef _WIN32 ++ STRING_VAR_H(tessedit_module_name, WINDLLNAME, ++ "Module colocated with tessdata dir"); ++ #endif ++*/ + INT_VAR_H(ambigs_debug_level, 0, "Debug level for unichar ambiguities"); + BOOL_VAR_H(use_definite_ambigs_for_classifier, false, + "Use definite ambiguities when running character classifier"); +diff --git a/src/ccutil/genericvector.h b/src/ccutil/genericvector.h +index 3556d153..3a5e8662 100644 +--- a/src/ccutil/genericvector.h ++++ b/src/ccutil/genericvector.h +@@ -382,7 +382,26 @@ inline bool LoadDataFromFile(const char* filename, GenericVector<char>* data) { + // reserve an extra byte in case caller wants to append a '\0' character + data->reserve(size + 1); + data->resize_no_init(size); +- result = static_cast<long>(fread(&(*data)[0], 1, size, fp)) == size; ++ /* willus mod Dec 2018--weird issue with Win XP and MinGW gcc 7.3.0 */ ++ /* Can't read entire file at once -- need to break up into smaller blocksize reads */ ++ { ++ int frs,n; ++ int blocksize; ++ blocksize=1024*1024; ++ for (n=0;1;) ++ { ++ int bs; ++ bs= size-n > blocksize ? blocksize : size-n; ++ frs=(int)fread(&(*data)[n],1,bs,fp); ++ n+=frs; ++ if (frs<bs || bs<blocksize || n>=size) ++ break; ++ } ++ result = static_cast<long>((long)n==size); ++ } ++ /* ++ result = static_cast<long>(fread(&(*data)[0], 1, size, fp)) == size; ++ */ + } + fclose(fp); + } +diff --git a/src/ccutil/mainblk.cpp b/src/ccutil/mainblk.cpp +index 52b04b04..80b26044 100644 +--- a/src/ccutil/mainblk.cpp ++++ b/src/ccutil/mainblk.cpp +@@ -55,8 +55,22 @@ void CCUtil::main_setup(const char *argv0, const char *basename) { + #if defined(_WIN32) + } else if (datadir == nullptr || _access(datadir.string(), 0) != 0) { + /* Look for tessdata in directory of executable. */ ++ /* ++ char drive[_MAX_DRIVE]; ++ char dir[_MAX_DIR]; ++ */ + char path[_MAX_PATH]; +- DWORD length = GetModuleFileName(nullptr, path, sizeof(path)); ++ int i; ++ /* DWORD length = */ GetModuleFileName(nullptr, path, sizeof(path)); ++ /* willus mod--avoid _splitpath_s -- not in XP */ ++ for (i=strlen(path)-1;i>=0 && path[i]!='/' && path[i]!='\\';i--); ++ if (i>=0) ++ { ++ path[i]='\0'; ++ datadir=path; ++ datadir += "/tessdata"; ++ } ++ /* + if (length > 0 && length < sizeof(path)) { + char* separator = std::strrchr(path, '\\'); + if (separator != nullptr) { +@@ -65,6 +79,7 @@ void CCUtil::main_setup(const char *argv0, const char *basename) { + datadir += "/tessdata"; + } + } ++ */ + #endif /* _WIN32 */ + #if defined(TESSDATA_PREFIX) + } else { +diff --git a/src/ccutil/params.cpp b/src/ccutil/params.cpp +index 00bf2563..486c5ce0 100644 +--- a/src/ccutil/params.cpp ++++ b/src/ccutil/params.cpp +@@ -82,7 +82,8 @@ bool ParamUtils::ReadParamsFromFp(SetParamConstraint constraint, TFile *fp, + + if (!foundit) { + anyerr = true; // had an error +- tprintf("Warning: Parameter not found: %s\n", line); ++ /* willus mod */ ++ tprintf("Tesseract warning: Parameter %s not found in file %s.\n",line,fp->tfile_filename); + } + } + } +diff --git a/src/ccutil/serialis.cpp b/src/ccutil/serialis.cpp +index 7def011f..6107a494 100644 +--- a/src/ccutil/serialis.cpp ++++ b/src/ccutil/serialis.cpp +@@ -201,6 +201,9 @@ bool TFile::Open(const STRING& filename, FileReader reader) { + offset_ = 0; + is_writing_ = false; + swap_ = false; ++ /* willus mod */ ++ strncpy(tfile_filename,filename.string(),511); ++ tfile_filename[511]='\0'; + if (reader == nullptr) + return LoadDataFromFile(filename, data_); + else +diff --git a/src/ccutil/serialis.h b/src/ccutil/serialis.h +index 095b9227..4cc8251e 100644 +--- a/src/ccutil/serialis.h ++++ b/src/ccutil/serialis.h +@@ -77,6 +77,8 @@ class TFile { + public: + TFile(); + ~TFile(); ++ /* willus mod */ ++ char tfile_filename[512]; + + // All the Open methods load the whole file into memory for reading. + // Opens a file with a supplied reader, or nullptr to use the default. +diff --git a/src/lstm/input.cpp b/src/lstm/input.cpp +index 73b584b3..0b0b54c3 100644 +--- a/src/lstm/input.cpp ++++ b/src/lstm/input.cpp +@@ -93,8 +93,11 @@ Pix* Input::PrepareLSTMInputs(const ImageData& image_data, + return nullptr; + } + if (width < min_width || height < min_width) { ++ /* willus mod -- no warning */ ++ /* + tprintf("Image too small to scale!! (%dx%d vs min width of %d)\n", width, + height, min_width); ++ */ + pixDestroy(&pix); + return nullptr; + } +-- +2.22.0 + diff --git a/pkgs/applications/misc/kitty/default.nix b/pkgs/applications/misc/kitty/default.nix index 3b7e9e9d139d..db8ef0043830 100644 --- a/pkgs/applications/misc/kitty/default.nix +++ b/pkgs/applications/misc/kitty/default.nix @@ -21,14 +21,14 @@ with python3Packages; buildPythonApplication rec { pname = "kitty"; - version = "0.14.3"; + version = "0.14.6"; format = "other"; src = fetchFromGitHub { owner = "kovidgoyal"; repo = "kitty"; rev = "v${version}"; - sha256 = "0wi6b6b1nyp16rcpcghk6by62wy6qsamv1xdymyn0zbqgd8h9n6b"; + sha256 = "1rb5ys9xsdhd2qa3kz5gqzz111c6b14za98va6hlglk69wqlmb51"; }; buildInputs = [ @@ -89,7 +89,7 @@ buildPythonApplication rec { mkdir -p $out ${if stdenv.isDarwin then '' mkdir "$out/bin" - ln -s ../Applications/kitty.app/Contents/MacOS/kitty-deref-symlink "$out/bin/kitty" + ln -s ../Applications/kitty.app/Contents/MacOS/kitty "$out/bin/kitty" mkdir "$out/Applications" cp -r kitty.app "$out/Applications/kitty.app" '' else '' @@ -123,6 +123,6 @@ buildPythonApplication rec { description = "A modern, hackable, featureful, OpenGL based terminal emulator"; license = licenses.gpl3; platforms = platforms.darwin ++ platforms.linux; - maintainers = with maintainers; [ tex rvolosatovs ]; + maintainers = with maintainers; [ tex rvolosatovs ma27 ]; }; } diff --git a/pkgs/applications/misc/librecad/default.nix b/pkgs/applications/misc/librecad/default.nix index 09089a072b3c..142dafe38eb1 100644 --- a/pkgs/applications/misc/librecad/default.nix +++ b/pkgs/applications/misc/librecad/default.nix @@ -1,42 +1,64 @@ -{ stdenv, fetchurl, qt4, qmake4Hook, muparser, which, boost, pkgconfig }: +{ mkDerivation, lib, fetchFromGitHub, installShellFiles, pkgconfig, runtimeShell +, qtbase, qtsvg, qttools, qmake +, boost, muparser }: -stdenv.mkDerivation rec { - version = "2.1.3"; +mkDerivation rec { pname = "librecad"; + version = "2.2.0-rc1"; - src = fetchurl { - url = "https://github.com/LibreCAD/LibreCAD/tarball/${version}"; - name = "${pname}-${version}" + ".tar.gz"; - sha256 = "1czp8bja61hfav2m7184cq1np1n76w3w6vn0hlkp81hhz9zc62sx"; + src = fetchFromGitHub { + owner = "LibreCAD"; + repo = "LibreCAD"; + rev = version; + sha256 = "0kwj838hqzbw95gl4x6scli9gj3gs72hdmrrkzwq5rjxam18k3f3"; }; - patchPhase = '' - sed -i -e s,/bin/bash,`type -P bash`, scripts/postprocess-unix.sh - sed -i -e s,/usr/share,$out/share, librecad/src/lib/engine/rs_system.cpp + patches = [ ./fix_qt_5_11_build.patch ]; + + postPatch = '' + substituteInPlace scripts/postprocess-unix.sh \ + --replace /bin/sh ${runtimeShell} + + substituteInPlace librecad/src/lib/engine/rs_system.cpp \ + --replace /usr/share $out/share + + substituteInPlace librecad/src/main/qc_applicationwindow.cpp \ + --replace __DATE__ 0 ''; - qmakeFlags = [ "MUPARSER_DIR=${muparser}" "BOOST_DIR=${boost.dev}" ]; + qmakeFlags = [ + "MUPARSER_DIR=${muparser}" + "BOOST_DIR=${boost.dev}" + ]; installPhase = '' - install -m 555 -D unix/librecad $out/bin/librecad - install -m 444 -D desktop/librecad.desktop $out/share/applications/librecad.desktop - install -m 444 -D desktop/librecad.sharedmimeinfo $out/share/mime/packages/librecad.xml - install -m 444 -D desktop/graphics_icons_and_splash/Icon\ LibreCAD/Icon_Librecad.svg \ + runHook preInstall + + install -Dm555 -t $out/bin unix/{librecad,ttf2lff} + install -Dm444 -t $out/share/applications desktop/librecad.desktop + install -Dm644 -t $out/share/pixmaps librecad/res/main/librecad.png + install -Dm444 desktop/librecad.sharedmimeinfo $out/share/mime/packages/librecad.xml + install -Dm444 desktop/graphics_icons_and_splash/Icon\ LibreCAD/Icon_Librecad.svg \ $out/share/icons/hicolor/scalable/apps/librecad.svg + + installManPage desktop/librecad.? + cp -R unix/resources $out/share/librecad + + runHook postInstall ''; - buildInputs = [ qt4 muparser which boost ]; - nativeBuildInputs = [ pkgconfig qmake4Hook ]; + buildInputs = [ boost muparser qtbase qtsvg ]; + + nativeBuildInputs = [ installShellFiles pkgconfig qmake qttools ]; enableParallelBuilding = true; - meta = { - description = "A 2D CAD package based upon Qt"; - homepage = https://librecad.org; - repositories.git = git://github.com/LibreCAD/LibreCAD.git; - license = stdenv.lib.licenses.gpl2; - maintainers = with stdenv.lib.maintainers; [viric]; - platforms = with stdenv.lib.platforms; linux; + meta = with lib; { + description = "2D CAD package based on Qt"; + homepage = "https://librecad.org"; + license = licenses.gpl2; + maintainers = with maintainers; [ viric ]; + platforms = platforms.linux; }; } diff --git a/pkgs/applications/misc/librecad/fix_qt_5_11_build.patch b/pkgs/applications/misc/librecad/fix_qt_5_11_build.patch new file mode 100644 index 000000000000..04701e5ab1ee --- /dev/null +++ b/pkgs/applications/misc/librecad/fix_qt_5_11_build.patch @@ -0,0 +1,36 @@ +diff --git a/librecad/src/ui/forms/qg_commandwidget.cpp b/librecad/src/ui/forms/qg_commandwidget.cpp +index 835e47d..2c878e8 100644 +--- a/librecad/src/ui/forms/qg_commandwidget.cpp ++++ b/librecad/src/ui/forms/qg_commandwidget.cpp +@@ -27,6 +27,7 @@ + + #include <algorithm> + ++#include <QAction> + #include <QKeyEvent> + #include <QFileDialog> + #include <QSettings> +diff --git a/librecad/src/ui/generic/colorwizard.cpp b/librecad/src/ui/generic/colorwizard.cpp +index 2beaceb..84068ad 100644 +--- a/librecad/src/ui/generic/colorwizard.cpp ++++ b/librecad/src/ui/generic/colorwizard.cpp +@@ -27,6 +27,7 @@ + #include "colorwizard.h" + #include "ui_colorwizard.h" + ++#include <QAction> + #include <QColorDialog> + #include <QLineEdit> + #include <QListWidget> +diff --git a/librecad/src/ui/generic/widgetcreator.cpp b/librecad/src/ui/generic/widgetcreator.cpp +index 7c35144..0e394f2 100644 +--- a/librecad/src/ui/generic/widgetcreator.cpp ++++ b/librecad/src/ui/generic/widgetcreator.cpp +@@ -27,6 +27,7 @@ + #include "widgetcreator.h" + #include "ui_widgetcreator.h" + ++#include <QActionGroup> + #include <QSettings> + #include <QLineEdit> + #include <QPushButton> diff --git a/pkgs/applications/misc/llpp/default.nix b/pkgs/applications/misc/llpp/default.nix index c66ef21416be..2c2acb6a7434 100644 --- a/pkgs/applications/misc/llpp/default.nix +++ b/pkgs/applications/misc/llpp/default.nix @@ -5,12 +5,12 @@ assert lib.versionAtLeast (lib.getVersion ocaml) "4.07"; stdenv.mkDerivation rec { pname = "llpp"; - version = "30"; + version = "31"; src = fetchgit { url = "git://repo.or.cz/llpp.git"; rev = "v${version}"; - sha256 = "0iilpzf12hs0zky58j55l4y5dvzv7fc53nsrg324n9vka92mppvd"; + sha256 = "14ibsm1zzxfidjajcj30b5m9in10q3817izahsjvkmryrvvn6qsg"; fetchSubmodules = false; }; diff --git a/pkgs/applications/misc/llpp/fix-build-bash.patch b/pkgs/applications/misc/llpp/fix-build-bash.patch index 25d503290ce8..13dbdb926c8f 100644 --- a/pkgs/applications/misc/llpp/fix-build-bash.patch +++ b/pkgs/applications/misc/llpp/fix-build-bash.patch @@ -1,14 +1,5 @@ -From cccadedfbcb6764a38382154838113a6b2fd4dee Mon Sep 17 00:00:00 2001 -From: Michael Hoang <enzime@users.noreply.github.com> -Date: Mon, 10 Dec 2018 15:08:01 +1100 -Subject: [PATCH] Patch build.bash for nixpkgs - ---- - build.bash | 37 ++----------------------------------- - 1 file changed, 2 insertions(+), 35 deletions(-) - diff --git a/build.bash b/build.bash -index 1588011..72117d9 100755 +index 7c278b6..41494c5 100755 --- a/build.bash +++ b/build.bash @@ -29,7 +29,6 @@ srcd="$(dirname $0)" @@ -20,10 +11,10 @@ index 1588011..72117d9 100755 mkdir -p $outd/{$wsid,lablGL} :>$outd/ordered @@ -39,12 +38,6 @@ isfresh() { test -r "$1.past" && . "$1.past" && test "$k" = "$2"; } - mbt=native + mbt=${mbt:-native} mulibs="$mudir/build/$mbt/libmupdf.a" # $mudir/build/$mbt/libmupdf-third.a --keycmd="(cd $mudir && git describe --tags --dirty); digest $mulibs" +-keycmd="(cd $mudir && make -q build=$mbt libs && echo); digest $mulibs" -isfresh "$mulibs" "$(eval $keycmd)" || ( - make -C "$mudir" build=$mbt -j $mjobs libs - echo "k='$(eval $keycmd)'" >$mudir/build/$mbt/libmupdf.a.past @@ -32,12 +23,12 @@ index 1588011..72117d9 100755 oincs() { local i= local incs1= -@@ -90,32 +83,6 @@ mflags() { +@@ -90,34 +83,6 @@ mflags() { } overs="$(ocamlc -vnum 2>/dev/null)" || overs="" --test "$overs" = "4.07.0" || { -- url=https://caml.inria.fr/pub/distrib/ocaml-4.07/ocaml-4.07.0.tar.xz +-test "$overs" = "4.08" || { +- url=https://caml.inria.fr/pub/distrib/ocaml-4.08/ocaml-4.08.0.tar.xz - txz=$outd/$(basename $url) - isfresh $txz $url || { - executable_p() { command -v "$1" >/dev/null 2>&1; } @@ -54,8 +45,10 @@ index 1588011..72117d9 100755 - tar xf $txz -C $outd - bn=$(basename $url) - cd $outd/${bn%.tar.xz} -- ./configure -prefix $absprefix \ -- -no-graph -no-debugger -no-ocamldoc -no-native-compiler +- ./configure --disable-vmthreads --disable-graph-lib \ +- --disable-ocamldoc --enable-debugger=no \ +- --disable-flat-float-array \ +- --prefix=$absprefix - make -j $mjobs world - make install - echo "k='$url'" >$absprefix/bin/ocamlc.past @@ -65,7 +58,7 @@ index 1588011..72117d9 100755 bocaml1() { grep -q "$3" $outd/ordered || { -@@ -224,7 +191,7 @@ bobjc() { +@@ -227,7 +192,7 @@ bobjc() { } && vecho "fresh $o" } @@ -74,7 +67,7 @@ index 1588011..72117d9 100755 cmd="(. $srcd/genconfstr.sh >$outd/confstruct.ml)" keycmd="digest $srcd/genconfstr.sh $outd/confstruct.ml" -@@ -278,7 +245,7 @@ for m in ml_gl ml_glarray ml_raw; do +@@ -281,7 +246,7 @@ for m in ml_gl ml_glarray ml_raw; do done libs="str.cma unix.cma" @@ -83,6 +76,3 @@ index 1588011..72117d9 100755 if $darwin; then mcomp=$(ocamlc -config | grep bytecomp_c_co | { read _ c; echo $c; }) clibs="$clibs -framework Cocoa -framework OpenGL" --- -2.19.2 - diff --git a/pkgs/applications/misc/mediainfo-gui/default.nix b/pkgs/applications/misc/mediainfo-gui/default.nix index 9eb4a0897d4f..b84bc08ddb37 100644 --- a/pkgs/applications/misc/mediainfo-gui/default.nix +++ b/pkgs/applications/misc/mediainfo-gui/default.nix @@ -2,11 +2,11 @@ , desktop-file-utils, libSM, imagemagick }: stdenv.mkDerivation rec { - version = "19.07"; + version = "19.09"; pname = "mediainfo-gui"; src = fetchurl { url = "https://mediaarea.net/download/source/mediainfo/${version}/mediainfo_${version}.tar.xz"; - sha256 = "0b2ypdlpj5v64ggqk628mgqraba27z725sa0zf0fa4agxhf9ka44"; + sha256 = "1a2ssklg12sjsw09y8my9kf35mizi3zj7w002nspcmw28apb1x82"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; diff --git a/pkgs/applications/misc/mediainfo/default.nix b/pkgs/applications/misc/mediainfo/default.nix index 98d5ef72b224..f084d17e3896 100644 --- a/pkgs/applications/misc/mediainfo/default.nix +++ b/pkgs/applications/misc/mediainfo/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, autoreconfHook, pkgconfig, libzen, libmediainfo, zlib }: stdenv.mkDerivation rec { - version = "19.07"; + version = "19.09"; pname = "mediainfo"; src = fetchurl { url = "https://mediaarea.net/download/source/mediainfo/${version}/mediainfo_${version}.tar.xz"; - sha256 = "0b2ypdlpj5v64ggqk628mgqraba27z725sa0zf0fa4agxhf9ka44"; + sha256 = "1a2ssklg12sjsw09y8my9kf35mizi3zj7w002nspcmw28apb1x82"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; diff --git a/pkgs/applications/misc/minder/default.nix b/pkgs/applications/misc/minder/default.nix new file mode 100644 index 000000000000..4b92a43451a3 --- /dev/null +++ b/pkgs/applications/misc/minder/default.nix @@ -0,0 +1,41 @@ +{ stdenv, fetchFromGitHub +, pkgconfig, meson, ninja, python3 +, wrapGAppsHook, vala, shared-mime-info +, cairo, pantheon, glib, gtk3, libxml2, libgee, libarchive +, hicolor-icon-theme # for setup-hook +}: + +stdenv.mkDerivation rec { + pname = "minder"; + version = "1.5.0"; + + src = fetchFromGitHub { + owner = "phase1geo"; + repo = pname; + rev = version; + sha256 = "0lhmv3z2jifv4cksxa27jigdfj9n81myjsxg38xp28fx5x3h8bzc"; + }; + + nativeBuildInputs = [ pkgconfig meson ninja python3 wrapGAppsHook vala shared-mime-info ]; + buildInputs = [ cairo pantheon.granite glib gtk3 libxml2 libgee libarchive hicolor-icon-theme ]; + + postPatch = '' + chmod +x meson/post_install.py + patchShebangs meson/post_install.py + ''; + + postFixup = '' + for x in $out/bin/*; do + ln -vrs $x "$out/bin/''${x##*.}" + done + ''; + + meta = with stdenv.lib; { + description = "Mind-mapping application for Elementary OS"; + homepage = "https://github.com/phase1geo/Minder"; + license = licenses.gpl3Plus; + platforms = platforms.linux; + maintainers = with maintainers; [ dtzWill ]; + }; +} + diff --git a/pkgs/applications/misc/mucommander/default.nix b/pkgs/applications/misc/mucommander/default.nix index d6153d2268b6..12a0720e4473 100644 --- a/pkgs/applications/misc/mucommander/default.nix +++ b/pkgs/applications/misc/mucommander/default.nix @@ -1,21 +1,23 @@ -{ stdenv, fetchFromGitHub, gradle_3_5, perl, makeWrapper, jre, gsettings-desktop-schemas }: +{ stdenv, fetchFromGitHub, gradle_4_10, perl, makeWrapper, jre, gsettings-desktop-schemas }: let - version = "0.9.2"; + version = "0.9.3-3"; name = "mucommander-${version}"; src = fetchFromGitHub { owner = "mucommander"; repo = "mucommander"; rev = version; - sha256 = "1fvij0yjjz56hsyddznx7mdgq1zm25fkng3axl03iyrij976z7b8"; + sha256 = "1zhglsx3b5k6np3ppfkkrqz9wg0j7ip598xxfgn75gjl020w0can"; }; postPatch = '' # there is no .git anyway substituteInPlace build.gradle \ --replace "git = org.ajoberstar.grgit.Grgit.open(file('.'))" "" \ - --replace "revision = git.head().id" "revision = 'abcdefgh'" + --replace "revision = git.head().id" "revision = 'abcdefgh'" \ + --replace "proguard.enabled =" "// proguard.enabled =" \ + --replace "version = '0.9.4'" "version = '${version}'" # disable gradle plugins with native code and their targets perl -i.bak1 -pe "s#(^\s*id '.+' version '.+'$)#// \1#" build.gradle @@ -34,7 +36,7 @@ let deps = stdenv.mkDerivation { name = "${name}-deps"; inherit src postPatch; - nativeBuildInputs = [ gradle_3_5 perl ]; + nativeBuildInputs = [ gradle_4_10 perl ]; buildPhase = '' export GRADLE_USER_HOME=$(mktemp -d) gradle --no-daemon build @@ -47,12 +49,12 @@ let ''; outputHashAlgo = "sha256"; outputHashMode = "recursive"; - outputHash = "199a9rc1pp9jjwpy83743qhjczfz0d1mkbic6si9bh8l62nw8qc7"; + outputHash = "1v5a76pvk7llbyv2rg50wlxc2wf468l2cslz1vi20aihycbyky7j"; }; in stdenv.mkDerivation { inherit name src postPatch; - nativeBuildInputs = [ gradle_3_5 perl makeWrapper ]; + nativeBuildInputs = [ gradle_4_10 perl makeWrapper ]; buildPhase = '' export GRADLE_USER_HOME=$(mktemp -d) @@ -63,7 +65,7 @@ in stdenv.mkDerivation { repositories { mavenLocal(); maven { url '${deps}' } } #" {} \; - gradle --offline --no-daemon build + gradle --offline --no-daemon distTar ''; installPhase = '' diff --git a/pkgs/applications/misc/mupdf/default.nix b/pkgs/applications/misc/mupdf/default.nix index 9219c4e2e423..7420932e0b68 100644 --- a/pkgs/applications/misc/mupdf/default.nix +++ b/pkgs/applications/misc/mupdf/default.nix @@ -9,29 +9,21 @@ let # OpenJPEG version is hardcoded in package source openJpegVersion = with stdenv; - lib.concatStringsSep "." (lib.lists.take 2 - (lib.splitString "." (lib.getVersion openjpeg))); + lib.versions.majorMinor (lib.getVersion openjpeg); in stdenv.mkDerivation rec { - version = "1.14.0"; + version = "1.16.1"; pname = "mupdf"; src = fetchurl { url = "https://mupdf.com/downloads/archive/${pname}-${version}-source.tar.gz"; - sha256 = "093p7lv6pgyymagn28n58fs0np928r0i5p2az9cc4gwccwx4hhy4"; + sha256 = "0iz4ickj52fxjp8crg573kjrl4viq279g589isdpgpckslysf7g7"; }; patches = # Use shared libraries to decrease size - [( fetchpatch - { - name = "CVE-2018-18662"; - url = "http://git.ghostscript.com/?p=mupdf.git;a=patch;h=164ddc22ee0d5b63a81d5148f44c37dd132a9356"; - sha256 = "1jkzh20n3b854871h86cy5y7fvy0d5wyqy51b3fg6gj3a0jqpzzd"; - } - )] - ++ stdenv.lib.optional (!stdenv.isDarwin) ./mupdf-1.14-shared_libs.patch + stdenv.lib.optional (!stdenv.isDarwin) ./mupdf-1.14-shared_libs.patch ++ stdenv.lib.optional stdenv.isDarwin ./darwin.patch ; diff --git a/pkgs/applications/misc/mysql-workbench/default.nix b/pkgs/applications/misc/mysql-workbench/default.nix index 172f999223a8..443fe2f1d6c8 100644 --- a/pkgs/applications/misc/mysql-workbench/default.nix +++ b/pkgs/applications/misc/mysql-workbench/default.nix @@ -37,6 +37,12 @@ in stdenv.mkDerivation rec { }) ]; + # have it look for 4.7.2 instead of 4.7.1 + preConfigure = '' + substituteInPlace CMakeLists.txt \ + --replace "antlr-4.7.1-complete.jar" "antlr-4.7.2-complete.jar" + ''; + nativeBuildInputs = [ cmake ninja pkgconfig jre swig wrapGAppsHook ]; @@ -85,8 +91,8 @@ in stdenv.mkDerivation rec { find -L "$out/bin" -type f -executable -print0 \ | while IFS= read -r -d ''' file; do if [[ "''${file}" != *-bin ]]; then - echo "Wrapping program ''${file}" - wrapProgram "''${file}" "''${gappsWrapperArgs[@]}" + echo "Wrapping program $file" + wrapGApp "$file" fi done ''; diff --git a/pkgs/applications/misc/mystem/default.nix b/pkgs/applications/misc/mystem/default.nix index deecc92d9934..6a6c95b6572d 100644 --- a/pkgs/applications/misc/mystem/default.nix +++ b/pkgs/applications/misc/mystem/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://download.cdn.yandex.net/mystem/${pname}-${version}-linux-64bit.tar.gz"; - sha256 = "0q3vxvyj5bqllqnlivy5llss39z7j0bgpn6kv8mrc54vjdhppx10"; + sha256 = "0qha7jvkdmil3jiwrpsfhkqsbkqn9dzgx3ayxwjdmv73ikmg95j6"; }; buildCommand = '' diff --git a/pkgs/applications/misc/noice/default.nix b/pkgs/applications/misc/noice/default.nix index db8139122bab..6cc5dc9066dc 100644 --- a/pkgs/applications/misc/noice/default.nix +++ b/pkgs/applications/misc/noice/default.nix @@ -4,12 +4,12 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "noice"; - version = "0.6"; + version = "0.8"; src = fetchgit { url = "git://git.2f30.org/noice.git"; rev = "refs/tags/v${version}"; - sha256 = "03rwglcy47fh6rb630vws10m95bxpcfv47nxrlws2li2ljam8prw"; + sha256 = "0975j4m93s9a21pazwdzn4gqhkngwq7q6ghp0q8a75r6c4fb7aar"; }; configFile = optionalString (conf!=null) (builtins.toFile "config.def.h" conf); diff --git a/pkgs/applications/misc/nut/default.nix b/pkgs/applications/misc/nut/default.nix index 816918ca0638..ec5ee031a5be 100644 --- a/pkgs/applications/misc/nut/default.nix +++ b/pkgs/applications/misc/nut/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, neon, libusb, openssl, udev, avahi, freeipmi -, libtool, makeWrapper }: +, libtool, makeWrapper, nss }: stdenv.mkDerivation rec { name = "nut-2.7.4"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "19r5dm07sfz495ckcgbfy0pasx0zy3faa0q7bih69lsjij8q43lq"; }; - buildInputs = [ neon libusb openssl udev avahi freeipmi libtool ]; + buildInputs = [ neon libusb openssl udev avahi freeipmi libtool nss ]; nativeBuildInputs = [ pkgconfig makeWrapper ]; diff --git a/pkgs/applications/misc/opencpn/default.nix b/pkgs/applications/misc/opencpn/default.nix index 9240b5d8910e..db5446cb9deb 100644 --- a/pkgs/applications/misc/opencpn/default.nix +++ b/pkgs/applications/misc/opencpn/default.nix @@ -29,5 +29,6 @@ stdenv.mkDerivation rec { platforms = [ "x86_64-linux" ]; license = stdenv.lib.licenses.gpl2; homepage = https://opencpn.org/; + broken = true; }; } diff --git a/pkgs/applications/misc/opentx/default.nix b/pkgs/applications/misc/opentx/default.nix index 585c85cbd2c5..370f88d7b479 100644 --- a/pkgs/applications/misc/opentx/default.nix +++ b/pkgs/applications/misc/opentx/default.nix @@ -58,6 +58,7 @@ in stdenv.mkDerivation { license = stdenv.lib.licenses.gpl2; platforms = [ "i686-linux" "x86_64-linux" ]; maintainers = with maintainers; [ elitak ]; + broken = true; }; } diff --git a/pkgs/applications/misc/orca/default.nix b/pkgs/applications/misc/orca/default.nix index 1a8d5b76fe3d..4009bbb6da15 100644 --- a/pkgs/applications/misc/orca/default.nix +++ b/pkgs/applications/misc/orca/default.nix @@ -1,6 +1,6 @@ { stdenv, pkgconfig, fetchurl, buildPythonApplication , autoreconfHook, wrapGAppsHook, gobject-introspection -, intltool, yelp-tools, itstool, libxmlxx3 +, gettext, yelp-tools, itstool, libxmlxx3 , python, pygobject3, gtk3, gnome3, substituteAll, hicolor-icon-theme , at-spi2-atk, at-spi2-core, pyatspi, dbus, dbus-python, pyxdg , xkbcomp, procps, lsof, coreutils, gsettings-desktop-schemas @@ -9,13 +9,13 @@ buildPythonApplication rec { pname = "orca"; - version = "3.32.0"; + version = "3.34.0"; format = "other"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "05jqzlg0f1x53hyl0l9282ynmw37159g6dsbrid12b7sjs12cc1i"; + sha256 = "10h258cprsxzb2hz9wqrkzv1yrsm19ws46l6fsnspywza5wq0z4p"; }; patches = [ @@ -30,7 +30,7 @@ buildPythonApplication rec { nativeBuildInputs = [ autoreconfHook wrapGAppsHook pkgconfig libxmlxx3 - intltool yelp-tools itstool gobject-introspection + gettext yelp-tools itstool gobject-introspection hicolor-icon-theme # setup-hook ]; @@ -45,11 +45,6 @@ buildPythonApplication rec { gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good ]; - # Run intltoolize to create po/Makefile.in.in - preConfigure = '' - intltoolize - ''; - passthru = { updateScript = gnome3.updateScript { packageName = pname; diff --git a/pkgs/applications/misc/osmium-tool/default.nix b/pkgs/applications/misc/osmium-tool/default.nix index 616949af8836..19657da607fc 100644 --- a/pkgs/applications/misc/osmium-tool/default.nix +++ b/pkgs/applications/misc/osmium-tool/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "osmium-tool"; - version = "1.10.0"; + version = "1.11.0"; src = fetchFromGitHub { owner = "osmcode"; repo = "osmium-tool"; rev = "v${version}"; - sha256 = "1balhz78nva0agmbp8n9vg8fhmdssnd9fjxj20bpw7b45mxhjc20"; + sha256 = "164r1w539dzy67ir2rqh21kwdvkjv87isd18gp51qyxbsprz6kq5"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/applications/misc/overmind/default.nix b/pkgs/applications/misc/overmind/default.nix index 918924df0b97..7603a66cd362 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.0.2"; + version = "2.0.3"; goPackagePath = "github.com/DarthSim/overmind"; nativeBuildInputs = [ makeWrapper ]; @@ -15,7 +15,7 @@ buildGoPackage rec { owner = "DarthSim"; repo = pname; rev = "v${version}"; - sha256 = "0cns19gqkfxsiiyfxhb05cjp1iv2fb40x47gp8djrwwzcd1r6zxh"; + sha256 = "0c551c240lqxdjg0jj01rh2fyhwls02k5lczlxacj05prp1plz9p"; }; meta = with lib; { diff --git a/pkgs/applications/misc/pastel/default.nix b/pkgs/applications/misc/pastel/default.nix new file mode 100644 index 000000000000..8499ad0880c0 --- /dev/null +++ b/pkgs/applications/misc/pastel/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchFromGitHub, rustPlatform, Security }: + +rustPlatform.buildRustPackage rec { + pname = "pastel"; + version = "0.6.1"; + + src = fetchFromGitHub { + owner = "sharkdp"; + repo = pname; + rev = "v${version}"; + sha256 = "1c47bph1qraq3g0g5bp23jqlz7qdn4f8vh264y937jz17avvacx5"; + }; + + cargoSha256 = "1pfhwqj9kxm9p0mpdw7qyvivgby2bmah05kavf0a5zhzvq4v4sg0"; + + buildInputs = stdenv.lib.optional stdenv.isDarwin Security; + + meta = with stdenv.lib; { + description = "A command-line tool to generate, analyze, convert and manipulate colors"; + homepage = https://github.com/sharkdp/pastel; + license = with licenses; [ asl20 /* or */ mit ]; + maintainers = with maintainers; [ davidtwco ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/applications/misc/pbpst/default.nix b/pkgs/applications/misc/pbpst/default.nix index fcf88200133c..c1fd6c5d7cb8 100644 --- a/pkgs/applications/misc/pbpst/default.nix +++ b/pkgs/applications/misc/pbpst/default.nix @@ -45,5 +45,6 @@ llvmPackages.stdenv.mkDerivation rec { license = licenses.gpl2; platforms = platforms.linux; maintainers = with maintainers; [ tmplt ]; + broken = true; }; } diff --git a/pkgs/applications/misc/pdfpc/default.nix b/pkgs/applications/misc/pdfpc/default.nix index c0dca0564768..1adab6b70a3e 100644 --- a/pkgs/applications/misc/pdfpc/default.nix +++ b/pkgs/applications/misc/pdfpc/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchFromGitHub, cmake, makeWrapper, pkgconfig, vala, gtk3, libgee -, poppler, libpthreadstubs, gstreamer, gst-plugins-base, librsvg, pcre, gobject-introspection }: +{ stdenv, fetchFromGitHub, cmake, pkgconfig, vala, gtk3, libgee, fetchpatch +, poppler, libpthreadstubs, gstreamer, gst-plugins-base, librsvg, pcre, gobject-introspection, wrapGAppsHook }: stdenv.mkDerivation rec { name = "${product}-${version}"; @@ -17,16 +17,20 @@ stdenv.mkDerivation rec { cmake pkgconfig vala # For setup hook gobject-introspection + wrapGAppsHook ]; buildInputs = [ gstreamer gst-plugins-base gtk3 libgee poppler - libpthreadstubs makeWrapper librsvg pcre ]; + libpthreadstubs librsvg pcre ]; cmakeFlags = stdenv.lib.optionalString stdenv.isDarwin "-DMOVIES=OFF"; - postInstall = '' - wrapProgram $out/bin/pdfpc \ - --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" - ''; + patches = [ + # Fix build vala 0.46 + (fetchpatch { + url = "https://github.com/pdfpc/pdfpc/commit/bbc16b97ecbdcdd22c2dc827a5c0e8b569073312.patch"; + sha256 = "0wi1rqcvg65cxnxvmvavcvghqyksnpijq1p91m57jaby3hb0pdcy"; + }) + ]; meta = with stdenv.lib; { description = "A presenter console with multi-monitor support for PDF files"; diff --git a/pkgs/applications/misc/pdfsam-basic/default.nix b/pkgs/applications/misc/pdfsam-basic/default.nix new file mode 100644 index 000000000000..30e68a89a1cb --- /dev/null +++ b/pkgs/applications/misc/pdfsam-basic/default.nix @@ -0,0 +1,49 @@ +{ stdenv, makeDesktopItem, fetchurl, jdk11, wrapGAppsHook, glib }: + +stdenv.mkDerivation rec { + pname = "pdfsam-basic"; + version = "4.0.4"; + + src = fetchurl { + url = "https://github.com/torakiki/pdfsam/releases/download/v${version}/pdfsam_${version}-1_amd64.deb"; + sha256 = "17lhzxlgr4l4dljy0b0avfrgbj9rsfzk1dzg0abqvld4w4igkqbq"; + }; + + unpackPhase = '' + ar vx ${src} + tar xvf data.tar.gz + ''; + + nativeBuildInputs = [ wrapGAppsHook ]; + buildInputs = [ glib ]; + + preFixup = '' + gappsWrapperArgs+=(--set JAVA_HOME "${jdk11}" --set PDFSAM_JAVA_PATH "${jdk11}") + ''; + + installPhase = '' + cp -R opt/pdfsam-basic/ $out/ + mkdir -p "$out"/share/icons + cp --recursive ${desktopItem}/share/applications $out/share + cp $out/icon.svg "$out"/share/icons/pdfsam-basic.svg + ''; + + desktopItem = makeDesktopItem { + name = pname; + exec = pname; + icon = pname; + comment = meta.description; + desktopName = "PDFsam Basic"; + genericName = "PDF Split and Merge"; + mimeType = "application/pdf;"; + categories = "Office;Application;"; + }; + + meta = with stdenv.lib; { + homepage = "https://github.com/torakiki/pdfsam"; + description = "Multi-platform software designed to extract pages, split, merge, mix and rotate PDF files"; + license = licenses.agpl3; + platforms = platforms.all; + maintainers = with maintainers; [ maintainers."1000101" ]; + }; +} \ No newline at end of file diff --git a/pkgs/applications/misc/pgmodeler/default.nix b/pkgs/applications/misc/pgmodeler/default.nix new file mode 100644 index 000000000000..5ce7d06d7273 --- /dev/null +++ b/pkgs/applications/misc/pgmodeler/default.nix @@ -0,0 +1,32 @@ +{ stdenv, lib, fetchFromGitHub, pkgconfig, qmake, mkDerivation, + qtsvg, + libxml2, postgresql }: + +mkDerivation rec { + pname = "pgmodeler"; + version = "0.9.1"; + + src = fetchFromGitHub { + owner = "pgmodeler"; + repo = "pgmodeler"; + rev = "v${version}"; + sha256 = "15isnbli9jj327r6sj7498nmhgf1mzdyhc1ih120ibw4900aajiv"; + }; + + enableParallelBuilding = true; + + nativeBuildInputs = [ pkgconfig qmake ]; + qmakeFlags = [ "pgmodeler.pro" "CONFIG+=release" ]; + + # todo: libpq would suffice here. Unfortunately this won't work, if one uses only postgresql.lib here. + buildInputs = [ postgresql qtsvg ]; + + 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 ]; + platforms = platforms.linux; + }; +} \ No newline at end of file diff --git a/pkgs/applications/misc/pwsafe/default.nix b/pkgs/applications/misc/pwsafe/default.nix index 1ed54b05ec8c..b1f4e5f9e42b 100644 --- a/pkgs/applications/misc/pwsafe/default.nix +++ b/pkgs/applications/misc/pwsafe/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "pwsafe"; - version = "1.08.1"; + version = "1.08.2"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "${version}BETA"; - sha256 = "0x89pn056h8b4yvxbd6l3qwrghslxc7vlxnblmcmsx7xx4i041ng"; + sha256 = "14qwk3cv5psj7ll71ikyv452x55c7iwjw9765yrpij6741r4yjln"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/qlcplus/default.nix b/pkgs/applications/misc/qlcplus/default.nix index 8fc890f42439..e928b0d597ea 100644 --- a/pkgs/applications/misc/qlcplus/default.nix +++ b/pkgs/applications/misc/qlcplus/default.nix @@ -5,13 +5,13 @@ mkDerivation rec { pname = "qlcplus"; - version = "4.12.1"; + version = "4.12.2"; src = fetchFromGitHub { owner = "mcallegari"; repo = "qlcplus"; rev = "QLC+_${version}"; - sha256 = "1kz2zbz7blnm91dysn949bjsy4xqxg658k47p3gbl0pjl58c44hp"; + sha256 = "1j0jhgql78p5ghcaz36l1k55447s5qiv396a448qic7xqpym2vl3"; }; nativeBuildInputs = [ qmake pkgconfig ]; diff --git a/pkgs/applications/misc/qmapshack/default.nix b/pkgs/applications/misc/qmapshack/default.nix index 335c583998fc..a12736b5a60e 100644 --- a/pkgs/applications/misc/qmapshack/default.nix +++ b/pkgs/applications/misc/qmapshack/default.nix @@ -1,12 +1,18 @@ -{ mkDerivation, lib, fetchurl, fetchpatch, cmake, qtscript, qtwebengine, gdal, proj, routino, quazip }: +{ mkDerivation, lib, fetchFromGitHub, cmake +, qtscript, qtwebengine, gdal, proj, routino, quazip }: mkDerivation rec { pname = "qmapshack"; - version = "1.13.1"; - - src = fetchurl { - url = "https://bitbucket.org/maproom/qmapshack/downloads/${pname}-${version}.tar.gz"; - sha256 = "15x1b2q0hr1vx006f9hjc4cvfjvxvfdwybw32qvczdyc3crq0mc9"; + version = "1.13.2"; + + src = fetchFromGitHub { + owner = "Maproom"; + repo = pname; + # TODO: remove it on next release. + # 1.13.2 release tarball is essentially broken, use fixed commit instead. + # See https://github.com/maproom/qmapshack/pull/4 for more details. + rev = "763cfc149566325cce9e4690cb7b5f986048f86a"; #"V_${version}"; + sha256 = "1lfivhm9rv9ly1srlmb7d80s77306xplg23lx35vav879bri29rx"; }; nativeBuildInputs = [ cmake ]; @@ -22,21 +28,15 @@ mkDerivation rec { enableParallelBuilding = true; patches = [ - (fetchpatch { - url = "https://bitbucket.org/maproom/qmapshack/raw/d0b1b595578a83fda981ccc1ff24166fa636ba1d/FindPROJ4.patch"; - sha256 = "1nx4ax233bnnj478cmjpm5c1qqmyn1navlihf10q6hhbanay9n99"; - }) - (fetchpatch { - url = "https://bitbucket.org/maproom/qmapshack/raw/d0b1b595578a83fda981ccc1ff24166fa636ba1d/FindQuaZip5.patch"; - sha256 = "0z1b2dz2zlz685mxgn8bmh1fyhxpf6dzd6jvkkjyk2kvnrdxv3b9"; - }) + "${src}/FindPROJ4.patch" + "${src}/FindQuaZip5.patch" ]; meta = with lib; { - homepage = https://bitbucket.org/maproom/qmapshack/wiki/Home; - description = "Plan your next outdoor trip"; + homepage = https://github.com/Maproom/qmapshack; + description = "Consumer grade GIS software"; license = licenses.gpl3; - maintainers = with maintainers; [ dotlambda ]; + maintainers = with maintainers; [ dotlambda sikmir ]; platforms = with platforms; linux; }; } diff --git a/pkgs/applications/misc/qtpass/default.nix b/pkgs/applications/misc/qtpass/default.nix index 1fccada42003..e6e0860f7ec6 100644 --- a/pkgs/applications/misc/qtpass/default.nix +++ b/pkgs/applications/misc/qtpass/default.nix @@ -1,43 +1,41 @@ -{ stdenv, lib, mkDerivation, fetchFromGitHub, fetchpatch -, git, gnupg, pass, qtbase, qtsvg, qttools, qmake +{ lib, mkDerivation, fetchFromGitHub +, git, gnupg, pass, pwgen +, qtbase, qtsvg, qttools, qmake }: mkDerivation rec { pname = "qtpass"; - version = "1.3.0"; + version = "1.3.1"; src = fetchFromGitHub { owner = "IJHack"; repo = "QtPass"; rev = "v${version}"; - sha256 = "0v3ca4fdjk6l24vc9wlc0i7r6fdj85kjmnb7jvicd3f8xi9mvhnv"; + sha256 = "025sdk4fq71jgfs54zj7ssgvlci8vvjkqdckgbwz0nqrynlljy08"; }; - buildInputs = [ git gnupg pass qtbase qtsvg qttools ]; + buildInputs = [ git gnupg pass qtbase qtsvg ]; - nativeBuildInputs = [ qmake ]; - - # Fix missing app icon on Wayland. Has been upstreamed and should be safe to - # remove in versions > 1.3.0 - patches = [ - (fetchpatch { - url = "https://github.com/IJHack/QtPass/commit/aba8c4180f0ab3d66c44f88b21f137b19d17bde8.patch"; - sha256 = "009bcq0d75khmaligzd7736xdzy6a8s1m9dgqybn70h801h92fcr"; - }) - ]; + nativeBuildInputs = [ qmake qttools ]; enableParallelBuilding = true; + qmakeFlags = [ + # setup hook only sets QMAKE_LRELEASE, set QMAKE_LUPDATE too: + "QMAKE_LUPDATE=${qttools.dev}/bin/lupdate" + ]; + qtWrapperArgs = [ - "--suffix PATH : ${lib.makeBinPath [ git gnupg pass ]}" + "--suffix PATH : ${lib.makeBinPath [ git gnupg pass pwgen ]}" ]; postInstall = '' - install -D qtpass.desktop $out/share/applications/qtpass.desktop + install -D qtpass.desktop -t $out/share/applications install -D artwork/icon.svg $out/share/icons/hicolor/scalable/apps/qtpass-icon.svg + install -D qtpass.1 -t $out/share/man/man1 ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A multi-platform GUI for pass, the standard unix password manager"; homepage = https://qtpass.org; license = licenses.gpl3; diff --git a/pkgs/applications/misc/roxterm/default.nix b/pkgs/applications/misc/roxterm/default.nix index 3dbe7790d185..efd2ddad2216 100644 --- a/pkgs/applications/misc/roxterm/default.nix +++ b/pkgs/applications/misc/roxterm/default.nix @@ -1,6 +1,6 @@ { at-spi2-core, cmake, dbus, dbus-glib, docbook_xsl, epoxy, fetchpatch, fetchFromGitHub , glib, gtk3, harfbuzz, hicolor-icon-theme, libXdmcp, libXtst, libpthreadstubs -, libselinux, libsepol, libtasn1, libxkbcommon, libxslt, p11-kit, pcre +, libselinux, libsepol, libtasn1, libxkbcommon, libxslt, p11-kit, pcre2 , pkgconfig, stdenv, utillinuxMinimal, vte, wrapGAppsHook, xmlto }: @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkgconfig wrapGAppsHook libxslt ]; buildInputs = - [ gtk3 dbus dbus-glib vte pcre harfbuzz libpthreadstubs libXdmcp + [ gtk3 dbus dbus-glib vte pcre2 harfbuzz libpthreadstubs libXdmcp utillinuxMinimal glib hicolor-icon-theme docbook_xsl xmlto libselinux libsepol libxkbcommon epoxy at-spi2-core libXtst libtasn1 p11-kit ]; diff --git a/pkgs/applications/misc/sakura/default.nix b/pkgs/applications/misc/sakura/default.nix index 8510d5019424..ede1995f9275 100644 --- a/pkgs/applications/misc/sakura/default.nix +++ b/pkgs/applications/misc/sakura/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, pkgconfig, gtk3, perl, vte, pcre, glib , makeWrapper }: +{ stdenv, fetchurl, cmake, pkgconfig, gtk3, perl, vte, pcre2, glib , makeWrapper }: stdenv.mkDerivation rec { pname = "sakura"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake perl pkgconfig ]; - buildInputs = [ makeWrapper gtk3 vte pcre glib ]; + buildInputs = [ makeWrapper gtk3 vte pcre2 glib ]; # Wrapper sets path to gsettings-schemata so sakura knows where to find colorchooser, fontchooser ... postInstall = "wrapProgram $out/bin/sakura --suffix XDG_DATA_DIRS : ${gtk3}/share/gsettings-schemas/${gtk3.name}/"; diff --git a/pkgs/applications/misc/sequeler/default.nix b/pkgs/applications/misc/sequeler/default.nix index e3edb5399289..78c9fed17feb 100644 --- a/pkgs/applications/misc/sequeler/default.nix +++ b/pkgs/applications/misc/sequeler/default.nix @@ -11,13 +11,13 @@ let in stdenv.mkDerivation rec { pname = "sequeler"; - version = "0.7.2"; + version = "0.7.3"; src = fetchFromGitHub { owner = "Alecaddd"; repo = pname; rev = "v${version}"; - sha256 = "0mxlhyfqmd4zg0psdmr62rhmvssw8jslm7a1nvh93675ns3vfrs5"; + sha256 = "16vc3v9qls9fxg9h8fsi67z68s4acl5hj14gbcrnqm7mf3kmk3aw"; }; nativeBuildInputs = [ meson ninja pkgconfig pantheon.vala gettext wrapGAppsHook python3 desktop-file-utils ]; diff --git a/pkgs/applications/misc/simplenote/default.nix b/pkgs/applications/misc/simplenote/default.nix index 6a16741a06b5..87125eb1b365 100644 --- a/pkgs/applications/misc/simplenote/default.nix +++ b/pkgs/applications/misc/simplenote/default.nix @@ -1,64 +1,75 @@ -{ fetchurl, stdenv, lib, zlib, glib, alsaLib, dbus, gtk2, atk, pango, freetype, fontconfig -, libgnome-keyring3, gdk-pixbuf, cairo, cups, expat, libgpgerror, nspr -, nss, xorg, libcap, systemd, libnotify ,libXScrnSaver, gnome2 }: +{ atomEnv, autoPatchelfHook, dpkg, fetchurl, makeDesktopItem, makeWrapper +, stdenv, udev, wrapGAppsHook }: -stdenv.mkDerivation rec { +let + inherit (stdenv.hostPlatform) system; - name = "simplenote-${pkgver}"; - pkgver = "1.1.3"; + pname = "simplenote"; - src = fetchurl { - url = "https://github.com/Automattic/simplenote-electron/releases/download/v${pkgver}/Simplenote-linux-${pkgver}.tar.gz"; - sha256 = "1z92yyjmg3bgfqfdpnysf98h9hhhnqzdqqigwlmdmn3d7fy49kcf"; - }; + version = "1.8.0"; - buildCommand = let - - packages = [ - stdenv.cc.cc zlib glib dbus gtk2 atk pango freetype libgnome-keyring3 - fontconfig gdk-pixbuf cairo cups expat libgpgerror alsaLib nspr nss - xorg.libXrender xorg.libX11 xorg.libXext xorg.libXdamage xorg.libXtst - xorg.libXcomposite xorg.libXi xorg.libXfixes xorg.libXrandr - xorg.libXcursor libcap systemd libnotify libXScrnSaver gnome2.GConf - xorg.libxcb - ]; - - libPathNative = lib.makeLibraryPath packages; - libPath64 = lib.makeSearchPathOutput "lib" "lib64" packages; - libPath = "${libPathNative}:${libPath64}"; - - in '' - mkdir -p $out/share/ - mkdir -p $out/bin - tar xvzf $src -C $out/share/ - mv $out/share/Simplenote-linux-x64 $out/share/simplenote - mv $out/share/simplenote/Simplenote $out/share/simplenote/simplenote - mkdir -p $out/share/applications - - cat > $out/share/applications/simplenote.desktop << EOF - [Desktop Entry] - Name=Simplenote - Comment=Simplenote for Linux - Exec=$out/bin/simplenote - Icon=$out/share/simplenote/Simplenote.png - Type=Application - StartupNotify=true - Categories=Development; - EOF - - fixupPhase - - patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath "${libPath}:$out/share/simplenote" \ - $out/share/simplenote/simplenote - - ln -s $out/share/simplenote/simplenote $out/bin/simplenote - ''; + sha256 = { + x86_64-linux = "066gr1awdj5nwdr1z57mmvx7dd1z19g0wzsgbnrrb89bqfj67ykl"; + }.${system}; meta = with stdenv.lib; { description = "The simplest way to keep notes"; - homepage = https://github.com/Automattic/simplenote-electron; - license = licenses.lgpl2; + homepage = "https://github.com/Automattic/simplenote-electron"; + license = licenses.gpl2; + maintainers = with maintainers; [ kiwi ]; platforms = [ "x86_64-linux" ]; }; -} + + linux = stdenv.mkDerivation rec { + inherit pname version meta; + + src = fetchurl { + url = + "https://github.com/Automattic/simplenote-electron/releases/download/" + + "v${version}/Simplenote-linux-${version}-amd64.deb"; + inherit sha256; + }; + + desktopItem = makeDesktopItem { + name = "simplenote"; + comment = "Simplenote for Linux"; + exec = "simplenote %U"; + icon = "simplenote"; + type = "Application"; + startupNotify = "true"; + desktopName = "Simplenote"; + categories = "Development"; + }; + + dontBuild = true; + dontConfigure = true; + dontPatchELF = true; + dontWrapGApps = true; + + buildInputs = atomEnv.packages; + + nativeBuildInputs = [ dpkg makeWrapper autoPatchelfHook wrapGAppsHook ]; + + unpackPhase = "dpkg-deb -x $src ."; + + installPhase = '' + mkdir -p "$out/bin" + cp -R "opt" "$out" + cp -R "usr/share" "$out/share" + chmod -R g-w "$out" + + mkdir -p "$out/share/applications" + cp "${desktopItem}/share/applications/"* "$out/share/applications" + ''; + + runtimeDependencies = [ udev.lib ]; + + postFixup = '' + ls -ahl $out + makeWrapper $out/opt/Simplenote/simplenote $out/bin/simplenote \ + "''${gappsWrapperArgs[@]}" + ''; + }; + +in + linux diff --git a/pkgs/applications/misc/sleepyhead/default.nix b/pkgs/applications/misc/sleepyhead/default.nix index cf5c4625c952..a32709294175 100644 --- a/pkgs/applications/misc/sleepyhead/default.nix +++ b/pkgs/applications/misc/sleepyhead/default.nix @@ -37,6 +37,7 @@ in stdenv.mkDerivation { license = licenses.gpl3; platforms = platforms.all; maintainers = [ maintainers.krav ]; + broken = true; }; } diff --git a/pkgs/applications/misc/solaar/default.nix b/pkgs/applications/misc/solaar/default.nix index f2e1aa6bdb68..722b0bc5077e 100644 --- a/pkgs/applications/misc/solaar/default.nix +++ b/pkgs/applications/misc/solaar/default.nix @@ -1,17 +1,14 @@ { fetchFromGitHub, lib, gobject-introspection, gtk3, python3Packages }: - # Although we copy in the udev rules here, you probably just want to use logitech-udev-rules instead of # adding this to services.udev.packages on NixOS - -python3Packages.buildPythonApplication { - pname = "solaar-unstable"; - version = "2019-01-30"; - +python3Packages.buildPythonApplication rec { + pname = "solaar"; + version = "1.0.1"; src = fetchFromGitHub { - owner = "pwr"; + owner = "pwr-Solaar"; repo = "Solaar"; - rev = "c07c115ee379e82db84283aaa29dc53df033a8c8"; - sha256 = "0xg181xcwzzs8pdqvjrkjyaaga7ir93hzjvd17j9g3ns8xfj2mvr"; + rev = "${version}"; + sha256 = "1ni3aimpl9vyhwzi61mvm8arkii52cmb6bzjma9cnkjyx328pkid"; }; propagatedBuildInputs = with python3Packages; [ gobject-introspection gtk3 pygobject3 pyudev ]; @@ -28,7 +25,6 @@ python3Packages.buildPythonApplication { ''; enableParallelBuilding = true; - meta = with lib; { description = "Linux devices manager for the Logitech Unifying Receiver"; longDescription = '' @@ -43,7 +39,7 @@ python3Packages.buildPythonApplication { To be able to use it, make sure you have access to /dev/hidraw* files. ''; license = licenses.gpl2; - homepage = https://pwr.github.io/Solaar/; + homepage = https://pwr-solaar.github.io/Solaar/; platforms = platforms.linux; maintainers = with maintainers; [ spinus ysndr ]; }; diff --git a/pkgs/applications/misc/stupidterm/default.nix b/pkgs/applications/misc/stupidterm/default.nix index ecaf9d5a34a2..a3247b29fb8e 100644 --- a/pkgs/applications/misc/stupidterm/default.nix +++ b/pkgs/applications/misc/stupidterm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkgconfig, vte, gtk }: +{ stdenv, fetchFromGitHub, pkgconfig, vte, gtk, pcre2 }: stdenv.mkDerivation { pname = "stupidterm"; @@ -6,7 +6,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ vte gtk ]; + buildInputs = [ vte gtk pcre2 ]; src = fetchFromGitHub { owner = "esmil"; diff --git a/pkgs/applications/misc/syncthingtray/default.nix b/pkgs/applications/misc/syncthingtray/default.nix index 0dc8f3bf38e4..79dfc7344da1 100644 --- a/pkgs/applications/misc/syncthingtray/default.nix +++ b/pkgs/applications/misc/syncthingtray/default.nix @@ -20,14 +20,14 @@ }: mkDerivation rec { - version = "0.9.1"; + version = "0.10.1"; pname = "syncthingtray"; src = fetchFromGitHub { owner = "Martchus"; repo = "syncthingtray"; rev = "v${version}"; - sha256 = "0ijwpwlwwbfh9fdfbwz6dgi6hpmaav2jm56mzxm6as50iwnb59fx"; + sha256 = "107w6dlr1m5g60j342p2b6ipfn1r8kyad8av58nh8ibzycghbfv2"; }; buildInputs = [ qtbase cpp-utilities qtutilities ] diff --git a/pkgs/applications/misc/termite/default.nix b/pkgs/applications/misc/termite/default.nix index 6a9de3644469..992c1f7e223d 100644 --- a/pkgs/applications/misc/termite/default.nix +++ b/pkgs/applications/misc/termite/default.nix @@ -1,6 +1,40 @@ -{ stdenv, fetchFromGitHub, fetchpatch, pkgconfig, vte-ng, gtk3, ncurses, wrapGAppsHook }: +{ stdenv, fetchFromGitHub, fetchpatch, pkgconfig, vte, gtk3, ncurses, pcre2, wrapGAppsHook }: -stdenv.mkDerivation rec { +let + + # termite requires VTE with some internals exposed + # https://github.com/thestinger/vte-ng + vte-ng = vte.overrideAttrs (attrs: { + patches = attrs.patches or [] ++ [ + (fetchpatch { + name = "0001-expose-functions-for-pausing-unpausing-output.patch"; + url = "https://github.com/thestinger/vte-ng/commit/342e26574f50dcd40bbeaad9e839c2a6144d0c1c.patch"; + sha256 = "1b0k9ys545q85vfki417p21kis9f36yd0hyp12phayynss6fn715"; + }) + (fetchpatch { + name = "0002-expose-function-for-setting-cursor-position.patch"; + url = "https://github.com/thestinger/vte-ng/commit/5ae3acb69474fe5bc43767a4a3625e9ed23607a1.patch"; + sha256 = "091sb44g2pl0zbxnxidpfmsqqc65dmkakhjb0wvlnsjckqalhs89"; + }) + (fetchpatch { + name = "0003-add-function-for-setting-the-text-selections.patch"; + url = "https://github.com/thestinger/vte-ng/commit/742d57ecf15e24f6a5f2133a81b6c70acc8ff03c.patch"; + sha256 = "12rq3svbj1nzridbssxsvmmb8njky3w8qdnkymz7850b3kqg277x"; + }) + (fetchpatch { + name = "0004-add-functions-to-get-set-block-selection-mode.patch"; + url = "https://github.com/thestinger/vte-ng/commit/08748fd9cb82bd191e5c476b1682ca71f7732572.patch"; + sha256 = "1cnhd8f7ywdgcyd6xmcd2nn39jjxzkxp4d0zsj2k7m5v74nhcs1g"; + }) + (fetchpatch { + name = "0005-expose-function-for-getting-the-selected-text.patch"; + url = "https://github.com/thestinger/vte-ng/commit/dd74ae7c06e8888af2fc090ac6f8920a9d8227fb.patch"; + sha256 = "0pbnbkwqxm4p9xsgvqwayvh8srk5z1kyjnigmahf9mlqn7hi6v27"; + }) + ]; + }); + +in stdenv.mkDerivation rec { pname = "termite"; version = "15"; @@ -24,7 +58,7 @@ stdenv.mkDerivation rec { makeFlags = [ "VERSION=v${version}" "PREFIX=" "DESTDIR=$(out)" ]; - buildInputs = [ vte-ng gtk3 ncurses ]; + buildInputs = [ vte-ng gtk3 ncurses pcre2 ]; nativeBuildInputs = [ wrapGAppsHook pkgconfig ]; diff --git a/pkgs/applications/misc/todoist/default.nix b/pkgs/applications/misc/todoist/default.nix index d9dcee762cf3..eaedad167489 100644 --- a/pkgs/applications/misc/todoist/default.nix +++ b/pkgs/applications/misc/todoist/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "todoist"; - version = "0.13.1"; + version = "0.14.0"; src = fetchFromGitHub { owner = "sachaos"; repo = "todoist"; rev = "v${version}"; - sha256 = "1kwvlsjr2a7wdhlwpxxpdh87wz8k9yjwl59vl2g7ya6m0rvhd3mc"; + sha256 = "0qhmv65il14lns817yxhma784jw5bz629svzh2ykrmilx5f7dxqc"; }; - modSha256 = "09n6abyaqwz4zcdz8934rvpbxhp4v2nmm5v739kkcc98c3h93i64"; + modSha256 = "1nnp5ijz4n34gc97rar4wlvlbx21ndpjyb2mc6gxdk1wzx3mgswp"; meta = { homepage = https://github.com/sachaos/todoist; diff --git a/pkgs/applications/misc/toot/default.nix b/pkgs/applications/misc/toot/default.nix index 425ea8d237b3..13e0cdfb2607 100644 --- a/pkgs/applications/misc/toot/default.nix +++ b/pkgs/applications/misc/toot/default.nix @@ -1,20 +1,20 @@ { stdenv, fetchFromGitHub, python3Packages }: python3Packages.buildPythonApplication rec { - version = "0.22.0"; + version = "0.24.0"; name = "toot-${version}"; src = fetchFromGitHub { owner = "ihabunek"; repo = "toot"; rev = version; - sha256 = "11dgz082shxpbsxr4i41as040cfqinm5lbcg3bmsxqvc4hsz2nr5"; + sha256 = "1szpmkxc1lqfphicfcj0z7b1nq97xmb4ppwf806p8w0fxj1shil3"; }; checkInputs = with python3Packages; [ pytest ]; propagatedBuildInputs = with python3Packages; - [ requests beautifulsoup4 future wcwidth ]; + [ requests beautifulsoup4 future wcwidth urwid ]; checkPhase = '' py.test diff --git a/pkgs/applications/misc/urlscan/default.nix b/pkgs/applications/misc/urlscan/default.nix index 87800cf90d6d..791075e4dd9b 100644 --- a/pkgs/applications/misc/urlscan/default.nix +++ b/pkgs/applications/misc/urlscan/default.nix @@ -2,13 +2,13 @@ python3Packages.buildPythonApplication rec { pname = "urlscan"; - version = "0.9.3"; + version = "0.9.4"; src = fetchFromGitHub { owner = "firecat53"; repo = pname; rev = version; - sha256 = "0z24k8sk2zfp2pwysyp844vmhr5vbkj74frwy4i0v5pj60i9jl0v"; + sha256 = "11wkwjqsq848ks6m2jqsb8h0xnz75fb60bm0c4jkxys9wzy4chg5"; }; propagatedBuildInputs = [ python3Packages.urwid ]; diff --git a/pkgs/applications/misc/wego/default.nix b/pkgs/applications/misc/wego/default.nix index 03f3caa4c151..93f50fb53705 100644 --- a/pkgs/applications/misc/wego/default.nix +++ b/pkgs/applications/misc/wego/default.nix @@ -17,5 +17,7 @@ buildGoPackage rec { meta = { license = stdenv.lib.licenses.isc; + homepage = "https://github.com/schachmat/wego"; + description = "Weather app for the terminal"; }; } diff --git a/pkgs/applications/misc/worker/default.nix b/pkgs/applications/misc/worker/default.nix index e5b89ff43b5b..6ff09a5b4b0e 100644 --- a/pkgs/applications/misc/worker/default.nix +++ b/pkgs/applications/misc/worker/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "worker"; - version = "4.0.1"; + version = "4.1.0"; src = fetchurl { url = "http://www.boomerangsworld.de/cms/worker/downloads/${pname}-${version}.tar.gz"; - sha256 = "1mwkyak68bsxgff399xmr7bb3hxl0r976b90zi7jrzznwlvxx7vh"; + sha256 = "19v4g34sk4fkagk0s60rbixyrrgg22qy1xwffm8b5ffq36r7yfch"; }; buildInputs = [ libX11 ]; diff --git a/pkgs/applications/misc/workrave/default.nix b/pkgs/applications/misc/workrave/default.nix index a3c9d735ff8d..9ad010deb16d 100644 --- a/pkgs/applications/misc/workrave/default.nix +++ b/pkgs/applications/misc/workrave/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { in fetchFromGitHub { sha256 = "0v2mx2idaxlsyv5w66b7pknlill9j9i2gqcs3vq54gak7ix9fj1p"; rev = with stdenv.lib; - "v" + concatStringsSep "_" (splitString "." version); + "v" + concatStringsSep "_" (splitVersion version); repo = "workrave"; owner = "rcaelers"; }; diff --git a/pkgs/applications/misc/wtf/default.nix b/pkgs/applications/misc/wtf/default.nix index 60ff84ffe593..fa865dcc16c4 100644 --- a/pkgs/applications/misc/wtf/default.nix +++ b/pkgs/applications/misc/wtf/default.nix @@ -7,7 +7,7 @@ buildGoModule rec { pname = "wtf"; - version = "0.21.0"; + version = "0.22.0"; overrideModAttrs = _oldAttrs : _oldAttrs // { preBuild = ''export GOPROXY="https://gocenter.io"''; @@ -17,17 +17,18 @@ buildGoModule rec { owner = "wtfutil"; repo = pname; rev = "v${version}"; - sha256 = "0sd8vrx7nak0by4whdmd9jzr66zm48knv1w1aqi90709fv98brm9"; - }; + sha256 = "1d8lp94cw8rh9r9y64awxafhw9fmp33v3m761gzy500hrxal2rzb"; + }; - modSha256 = "0jgq9ql27x0kdp59l5drisl5v7v7sx2wy3zqjbr3bqyh3vdx19ic"; + modSha256 = "0m180571j4564py5mzdcbyypk71fdlp2vkfdwi6q85nd2q94sx6h"; buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ]; nativeBuildInputs = [ makeWrapper ]; postInstall = '' - wrapProgram "$out/bin/wtf" --prefix PATH : "${ncurses.dev}/bin" + mv "$out/bin/wtf" "$out/bin/wtfutil" + wrapProgram "$out/bin/wtfutil" --prefix PATH : "${ncurses.dev}/bin" ''; meta = with lib; { diff --git a/pkgs/applications/misc/xmind/default.nix b/pkgs/applications/misc/xmind/default.nix index c673002fb511..f65f5bc26e8b 100644 --- a/pkgs/applications/misc/xmind/default.nix +++ b/pkgs/applications/misc/xmind/default.nix @@ -15,6 +15,8 @@ stdenv.mkDerivation rec { sha256 = "0jxq2fiq69q9ly0m6hx2qfybqad22sl42ciw636071khpqgc885f"; }; + preferLocalBuild = true; + patches = [ ./java-env-config-fixes.patch ]; nativeBuildInputs = [ makeWrapper ]; @@ -61,7 +63,7 @@ stdenv.mkDerivation rec { cp -r $out/libexec/configuration/ \$HOME/.xmind/configuration-cathy/ fi - exec "$out/libexec/XMind" "$@" + exec "$out/libexec/XMind" "\$@" EOF chmod +x $out/bin/XMind diff --git a/pkgs/applications/misc/xmrig/default.nix b/pkgs/applications/misc/xmrig/default.nix index 8a46336c9de2..425c4a858882 100644 --- a/pkgs/applications/misc/xmrig/default.nix +++ b/pkgs/applications/misc/xmrig/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "xmrig"; - version = "3.0.0"; + version = "3.1.3"; src = fetchFromGitHub { owner = "xmrig"; repo = "xmrig"; rev = "v${version}"; - sha256 = "1m0rsjb7y1j77mzg5cqb3fdvzgvjkrwgmkjn9nv1xl2757z8hcl4"; + sha256 = "05z3hpz42609zsrqwd9sbxkgzm4f28ajhvgk69jvcfw7azg5jcfq"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/applications/misc/xmrig/proxy.nix b/pkgs/applications/misc/xmrig/proxy.nix index 7d9ebca0086c..5871d1a557b9 100644 --- a/pkgs/applications/misc/xmrig/proxy.nix +++ b/pkgs/applications/misc/xmrig/proxy.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "xmrig-proxy"; - version = "3.0.0"; + version = "3.1.1"; src = fetchFromGitHub { owner = "xmrig"; repo = "xmrig-proxy"; rev = "v${version}"; - sha256 = "19rv5zmxwr3kmb2m3fas91aq1493cnkhvs88zcflnijr1ra218ks"; + sha256 = "1qiwarf0bqc17w3r88ysxxpm71gm861zx1fnzp0xi4q3rbh3nfmd"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/applications/misc/xterm/default.nix b/pkgs/applications/misc/xterm/default.nix index 60231350edbc..83ba28bfce37 100644 --- a/pkgs/applications/misc/xterm/default.nix +++ b/pkgs/applications/misc/xterm/default.nix @@ -3,14 +3,14 @@ }: stdenv.mkDerivation rec { - name = "xterm-348"; + name = "xterm-349"; src = fetchurl { urls = [ "ftp://ftp.invisible-island.net/xterm/${name}.tgz" "https://invisible-mirror.net/archives/xterm/${name}.tgz" ]; - sha256 = "1gkmj9v44xg4jahivhnpbmq22w1mwclr6fssv3lhssgkvchm27wb"; + sha256 = "0ps7b2b2kbrkv5q49cmb8c51z0w21jmm7hwciw30m6jgfb9s79ir"; }; buildInputs = diff --git a/pkgs/applications/misc/zathura/core/default.nix b/pkgs/applications/misc/zathura/core/default.nix index 8afba9353ce1..99729125b631 100644 --- a/pkgs/applications/misc/zathura/core/default.nix +++ b/pkgs/applications/misc/zathura/core/default.nix @@ -10,11 +10,11 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "zathura-core"; - version = "0.4.3"; + version = "0.4.4"; src = fetchurl { - url = "https://pwmt.org/projects/zathura/download/zathura-${version}.tar.xz"; - sha256 = "0hgx5x09i6d0z45llzdmh4l348fxh1y102sb1w76f2fp4r21j4ky"; + url = "https://git.pwmt.org/pwmt/zathura/-/archive/${version}/zathura-${version}.tar.gz"; + sha256 = "0v5klgr009rsxi41h73k0398jbgmgh37asvwz2w15i4fzmw89jgb"; }; outputs = [ "bin" "man" "dev" "out" ]; @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { doCheck = true; meta = { - homepage = https://pwmt.org/projects/zathura/; + homepage = "https://git.pwmt.org/pwmt/zathura"; description = "A core component for zathura PDF viewer"; license = licenses.zlib; platforms = platforms.unix; diff --git a/pkgs/applications/misc/zathura/pdf-mupdf/default.nix b/pkgs/applications/misc/zathura/pdf-mupdf/default.nix index 2ebc640d683d..d8c1364d3957 100644 --- a/pkgs/applications/misc/zathura/pdf-mupdf/default.nix +++ b/pkgs/applications/misc/zathura/pdf-mupdf/default.nix @@ -2,7 +2,7 @@ , pkgconfig, zathura_core, cairo , gtk-mac-integration, girara, mupdf }: stdenv.mkDerivation rec { - version = "0.3.4"; + version = "0.3.5"; pname = "zathura-pdf-mupdf"; # pwmt.org server was down at the time of last update @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { owner = "pwmt"; repo = "zathura-pdf-mupdf"; rev = version; - sha256 = "1m4w4jrybpjmx6pi33a5saxzmfd8rrym2k13jpd1fv543s17d9dy"; + sha256 = "0wb46hllykbi30ir69s8s23mihivqn13mgfdzawbsn2a21p8y4zl"; }; nativeBuildInputs = [ meson ninja pkgconfig ]; diff --git a/pkgs/applications/misc/zola/default.nix b/pkgs/applications/misc/zola/default.nix index 7418640e072b..b9231f8f0935 100644 --- a/pkgs/applications/misc/zola/default.nix +++ b/pkgs/applications/misc/zola/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "zola"; - version = "0.8.0"; + version = "0.9.0"; src = fetchFromGitHub { owner = "getzola"; repo = pname; rev = "v${version}"; - sha256 = "166kmlkzd1qyw9yq2jqs58z8b3d956jjhw9r15jzw98md949psr5"; + sha256 = "0dbj2rkn4k5glnwdazsvjhah5pj9cbdb8hwlvm5q4njsmrgpyaw5"; }; - cargoSha256 = "1brmlg6nqyls1v62z0fg0km150q9m7h71wy67lidcnw76icmqr24"; + cargoSha256 = "0i0xqbpbv3md42d2853cfzkhfwlkvxahhz5dldla5x96rm1i2hr8"; nativeBuildInputs = [ cmake pkgconfig ]; buildInputs = [ openssl ] diff --git a/pkgs/applications/networking/browsers/brave/default.nix b/pkgs/applications/networking/browsers/brave/default.nix index 45fb820a076c..ae3659a21fef 100644 --- a/pkgs/applications/networking/browsers/brave/default.nix +++ b/pkgs/applications/networking/browsers/brave/default.nix @@ -82,11 +82,11 @@ in stdenv.mkDerivation rec { pname = "brave"; - version = "0.68.131"; + version = "0.69.128"; src = fetchurl { url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb"; - sha256 = "0syhwy1gxy82jbxbryi1n4zp1ya7wvm20g1vqvd2s7kqspprsi0l"; + sha256 = "1w5p2hbn14k239fbqrbxkw9h3p8wm7cdyjcyvrsss57fj00j8s4r"; }; dontConfigure = true; diff --git a/pkgs/applications/networking/browsers/chromium/browser.nix b/pkgs/applications/networking/browsers/chromium/browser.nix index 8bdb33ed5d22..ad7fa78527cd 100644 --- a/pkgs/applications/networking/browsers/chromium/browser.nix +++ b/pkgs/applications/networking/browsers/chromium/browser.nix @@ -1,4 +1,4 @@ -{ stdenv, mkChromiumDerivation, channel }: +{ stdenv, mkChromiumDerivation, channel, enableWideVine }: with stdenv.lib; @@ -18,11 +18,6 @@ mkChromiumDerivation (base: rec { cp -vLR "$buildPath/locales" "$buildPath/resources" "$libExecPath/" cp -v "$buildPath/chrome" "$libExecPath/$packageName" - if [ -e "$buildPath/libwidevinecdmadapter.so" ]; then - cp -v "$buildPath/libwidevinecdmadapter.so" \ - "$libExecPath/libwidevinecdmadapter.so" - fi - mkdir -p "$sandbox/bin" cp -v "$buildPath/chrome_sandbox" "$sandbox/bin/${sandboxExecutableName}" @@ -67,7 +62,7 @@ mkChromiumDerivation (base: rec { description = "An open source web browser from Google"; homepage = http://www.chromium.org/; maintainers = with maintainers; [ bendlas ivan ]; - license = licenses.bsd3; + 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 diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index a3645e97e255..4353d2958f58 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -24,7 +24,6 @@ # package customization , enableNaCl ? false -, enableWideVine ? false , useVaapi ? false , gnomeSupport ? false, gnome ? null , gnomeKeyringSupport ? false, libgnome-keyring3 ? null @@ -133,11 +132,19 @@ let ++ optional pulseSupport libpulseaudio ++ optional (versionAtLeast version "72") jdk.jre; - patches = optional enableWideVine ./patches/widevine.patch ++ [ + patches = [ ./patches/nix_plugin_paths_68.patch ./patches/remove-webp-include-69.patch ./patches/jumbo-sorted.patch ./patches/no-build-timestamps.patch + ./patches/widevine.patch + # Revert "Implement GetFallbackFont on Linux" to fix a performance regression + # Remove after https://bugs.chromium.org/p/chromium/issues/detail?id=1003997 is fixed + (fetchpatch { + url = "https://github.com/chromium/chromium/commit/5a32abe4247f80fdb55c55a289b906b0e42faa5f.patch"; + sha256 = "1a4jqmki6cyi2dwvaszh01db2diqnz1d50mhpdpby3dd1cw0xmfy"; + revert = true; + }) # Unfortunately, chromium regularly breaks on major updates and # then needs various patches backported in order to be compiled with GCC. @@ -227,15 +234,16 @@ let use_gold = true; gold_path = "${stdenv.cc}/bin"; is_debug = false; - # at least 2X compilation speedup - use_jumbo_build = true; + # Use jumbo for a 2x (at least) compilation speedup, except where it is currently broken: + # https://gist.github.com/ivan/6fe7014c1b1cc35dec133fa6de0549d9 + use_jumbo_build = (version != "78.0.3904.17"); proprietary_codecs = false; use_sysroot = false; use_gnome_keyring = gnomeKeyringSupport; use_gio = gnomeSupport; enable_nacl = enableNaCl; - enable_widevine = enableWideVine; + enable_widevine = true; use_cups = cupsSupport; treat_warnings_as_errors = false; diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index 3178e2595fc5..5fb0d67a4809 100644 --- a/pkgs/applications/networking/browsers/chromium/default.nix +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -2,6 +2,8 @@ , makeWrapper, ed , glib, gtk3, gnome3, gsettings-desktop-schemas , libva ? null +, gcc, nspr, nss, patchelfUnstable, runCommand +, lib # package customization , channel ? "stable" @@ -34,14 +36,64 @@ in let mkChromiumDerivation = callPackage ./common.nix { inherit enableNaCl gnomeSupport gnome gnomeKeyringSupport proprietaryCodecs cupsSupport pulseSupport - useVaapi - enableWideVine; + useVaapi; }; - browser = callPackage ./browser.nix { inherit channel; }; + browser = callPackage ./browser.nix { inherit channel enableWideVine; }; plugins = callPackage ./plugins.nix { - inherit enablePepperFlash enableWideVine; + inherit enablePepperFlash; + }; + }; + + mkrpath = p: "${lib.makeSearchPathOutput "lib" "lib64" p}:${lib.makeLibraryPath p}"; + widevine = let upstream-info = chromium.upstream-info; in stdenv.mkDerivation { + name = "chromium-binary-plugin-widevine"; + + # The .deb file for Google Chrome + src = upstream-info.binary; + + nativeBuildInputs = [ patchelfUnstable ]; + + phases = [ "unpackPhase" "patchPhase" "installPhase" "checkPhase" ]; + + unpackCmd = let + soPath = + if upstream-info.channel == "stable" then + "./opt/google/chrome/libwidevinecdm.so" + else if upstream-info.channel == "beta" then + "./opt/google/chrome-beta/libwidevinecdm.so" + else if upstream-info.channel == "dev" then + "./opt/google/chrome-unstable/WidevineCdm/_platform_specific/linux_x64/libwidevinecdm.so" + else + throw "Unknown chromium channel."; + in '' + mkdir -p plugins + # Extract just libwidevinecdm.so from upstream's .deb file + ar p "$src" data.tar.xz | tar xJ -C plugins ${soPath} + mv plugins/${soPath} plugins/ + rm -rf plugins/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" libwidevinecdm.so + ''; + + installPhase = '' + install -vD libwidevinecdm.so \ + "$out/lib/libwidevinecdm.so" + ''; + + meta = { + platforms = [ "x86_64-linux" ]; + license = lib.licenses.unfree; }; }; @@ -51,6 +103,23 @@ in let 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 libwidevinecdm.so. + 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 + if [[ ${channel} != "dev" ]]; then + cp ${widevine}/lib/libwidevinecdm.so $out/libexec/chromium/ + else + mkdir -p $out/libexec/chromium/WidevineCdm/_platform_specific/linux_x64 + cp ${widevine}/lib/libwidevinecdm.so $out/libexec/chromium/WidevineCdm/_platform_specific/linux_x64/ + fi + '' + else browser; in stdenv.mkDerivation { name = "chromium${suffix}-${version}"; inherit version; @@ -68,7 +137,7 @@ in stdenv.mkDerivation { outputs = ["out" "sandbox"]; buildCommand = let - browserBinary = "${chromium.browser}/libexec/chromium/chromium"; + browserBinary = "${chromiumWV}/libexec/chromium/chromium"; getWrapperFlags = plugin: "$(< \"${plugin}/nix-support/wrapper-flags\")"; libPath = stdenv.lib.makeLibraryPath ([] ++ stdenv.lib.optional useVaapi libva @@ -113,13 +182,7 @@ in stdenv.mkDerivation { ''; inherit (chromium.browser) packageName; - meta = chromium.browser.meta // { - broken = if enableWideVine then - builtins.trace "WARNING: WideVine is not functional, please only use for testing" - true - else false; - }; - + meta = chromium.browser.meta; passthru = { inherit (chromium) upstream-info browser; mkDerivation = chromium.mkChromiumDerivation; diff --git a/pkgs/applications/networking/browsers/chromium/patches/widevine.patch b/pkgs/applications/networking/browsers/chromium/patches/widevine.patch index 90a13928e3bd..2de6024141d7 100644 --- a/pkgs/applications/networking/browsers/chromium/patches/widevine.patch +++ b/pkgs/applications/networking/browsers/chromium/patches/widevine.patch @@ -1,16 +1,24 @@ -Minimal WideVine patch from Gentoo: +Description: enable widevine and set its version string to "undefined" +Author: Michael Gilbert <mgilbert@debian.org> +Author: Olivier Tilloy <olivier.tilloy@canonical.com> -https://gitweb.gentoo.org/repo/gentoo.git/tree/www-client/chromium/files/chromium-widevine-r1.patch - -BTS: https://bugs.gentoo.org/show_bug.cgi?id=547630 - ---- a/third_party/widevine/cdm/stub/widevine_cdm_version.h -+++ b/third_party/widevine/cdm/stub/widevine_cdm_version.h -@@ -10,6 +10,7 @@ - - #include "third_party/widevine/cdm/widevine_cdm_common.h" - -+#define WIDEVINE_CDM_VERSION_STRING "unknown" - #define WIDEVINE_CDM_AVAILABLE +--- a/third_party/widevine/cdm/widevine_cdm_version.h ++++ b/third_party/widevine/cdm/widevine_cdm_version.h +@@ -11,5 +11,6 @@ + // If the Widevine CDM is available define the following: + // - WIDEVINE_CDM_VERSION_STRING (with the version of the CDM that's available + // as a string, e.g., "1.0.123.456"). ++#define WIDEVINE_CDM_VERSION_STRING "undefined" #endif // WIDEVINE_CDM_VERSION_H_ +--- a/chrome/common/chrome_content_client.cc ++++ b/chrome/common/chrome_content_client.cc +@@ -99,7 +99,7 @@ + // Registers Widevine CDM if Widevine is enabled, the Widevine CDM is + // bundled and not a component. When the Widevine CDM is a component, it is + // registered in widevine_cdm_component_installer.cc. +-#if BUILDFLAG(BUNDLE_WIDEVINE_CDM) && !BUILDFLAG(ENABLE_WIDEVINE_CDM_COMPONENT) ++#if !BUILDFLAG(ENABLE_WIDEVINE_CDM_COMPONENT) + #define REGISTER_BUNDLED_WIDEVINE_CDM + #include "third_party/widevine/cdm/widevine_cdm_common.h" // nogncheck + // TODO(crbug.com/663554): Needed for WIDEVINE_CDM_VERSION_STRING. Support diff --git a/pkgs/applications/networking/browsers/chromium/plugins.nix b/pkgs/applications/networking/browsers/chromium/plugins.nix index b356f809f03c..a80210542c53 100644 --- a/pkgs/applications/networking/browsers/chromium/plugins.nix +++ b/pkgs/applications/networking/browsers/chromium/plugins.nix @@ -6,7 +6,6 @@ , fetchzip , patchelfUnstable , enablePepperFlash ? false -, enableWideVine ? false , upstream-info }: @@ -44,60 +43,6 @@ let echo ${toString quoted} > "''$${output}/nix-support/wrapper-flags" ''; - widevine = stdenv.mkDerivation { - name = "chromium-binary-plugin-widevine"; - - src = upstream-info.binary; - - nativeBuildInputs = [ patchelfUnstable ]; - - phases = [ "unpackPhase" "patchPhase" "installPhase" "checkPhase" ]; - - unpackCmd = let - chan = if upstream-info.channel == "dev" then "chrome-unstable" - else if upstream-info.channel == "stable" then "chrome" - else "chrome-${upstream-info.channel}"; - in '' - mkdir -p plugins - ar p "$src" data.tar.xz | tar xJ -C plugins --strip-components=4 \ - ./opt/google/${chan}/libwidevinecdm.so \ - ./opt/google/${chan}/libwidevinecdmadapter.so - ''; - - doCheck = true; - checkPhase = '' - ! find -iname '*.so' -exec ldd {} + | grep 'not found' - ''; - - PATCH_RPATH = mkrpath [ gcc.cc glib nspr nss ]; - - patchPhase = '' - chmod +x libwidevinecdm.so libwidevinecdmadapter.so - patchelf --set-rpath "$PATCH_RPATH" libwidevinecdm.so - patchelf --set-rpath "$out/lib:$PATCH_RPATH" libwidevinecdmadapter.so - ''; - - installPhase = let - wvName = "Widevine Content Decryption Module"; - wvDescription = "Playback of encrypted HTML audio/video content"; - wvMimeTypes = "application/x-ppapi-widevine-cdm"; - wvModule = "@out@/lib/libwidevinecdmadapter.so"; - wvInfo = "#${wvName}#${wvDescription};${wvMimeTypes}"; - in '' - install -vD libwidevinecdm.so \ - "$out/lib/libwidevinecdm.so" - install -vD libwidevinecdmadapter.so \ - "$out/lib/libwidevinecdmadapter.so" - - ${mkPluginInfo { - flags = [ "--register-pepper-plugins=${wvModule}${wvInfo}" ]; - envVars.NIX_CHROMIUM_PLUGIN_PATH_WIDEVINE = "@out@/lib"; - }} - ''; - - meta.platforms = platforms.x86_64; - }; - flash = stdenv.mkDerivation rec { pname = "flashplayer-ppapi"; version = "32.0.0.255"; @@ -140,6 +85,5 @@ let }; in { - enabled = optional enableWideVine widevine - ++ optional enablePepperFlash flash; + enabled = optional enablePepperFlash flash; } diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.nix b/pkgs/applications/networking/browsers/chromium/upstream-info.nix index 14799e9f96cc..b641d1163bc4 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.nix +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.nix @@ -1,18 +1,18 @@ # This file is autogenerated from update.sh in the same directory. { beta = { - sha256 = "0m7xdpi1f2a33csd7bsp91g5klz0hmr83ksfwsd2fki3iipvfs4w"; - sha256bin64 = "1b4cyf4v55sy52mxxl8d70abg5ck5k45jaqdjsjw7dvh3s2x4bwp"; - version = "77.0.3865.42"; + sha256 = "1hzgzmrn0d6cqvqnqayl048zwlcx0f7azg2rhvm7p13lvyqzsk00"; + sha256bin64 = "0p3275ii8800swlfmljbdrvyqjd5nlw0vgv2my4r8ccszgbhidbd"; + version = "77.0.3865.90"; }; dev = { - sha256 = "0x5r6xqwiggwyzbinm252xc1n3f9r7cmmzj6assi4v1nsispdh2k"; - sha256bin64 = "03yymhbpd1snycmcv7wkg5j6zbydvyc365gy5myp7wgas7cd0mb6"; - version = "78.0.3887.7"; + sha256 = "0zka01ml3hbximswzkkqbqq8wpiz8f4fq4wx5fys002hi69l296l"; + sha256bin64 = "0nrip45s0ylri34vlpf16xlwv3ybmy2jg7dz8l9rvgbdwwdzdb75"; + version = "78.0.3904.17"; }; stable = { - sha256 = "0hajwjf7swlgh1flpf8ljfrb2zhmcpzvrigvvxqd36g3nm04cknm"; - sha256bin64 = "0hdsla8i3q0zbczia64ghqsf420alcc31xdishx1sv48x3rlrxkk"; - version = "76.0.3809.132"; + sha256 = "1hzgzmrn0d6cqvqnqayl048zwlcx0f7azg2rhvm7p13lvyqzsk00"; + sha256bin64 = "1npx867j39mdyivf8nlkcfwgq7j34hl7s948vf6h2kqni0y50hzl"; + version = "77.0.3865.90"; }; } diff --git a/pkgs/applications/networking/browsers/eolie/default.nix b/pkgs/applications/networking/browsers/eolie/default.nix index e067f3f15eb5..b9b183a03ff3 100644 --- a/pkgs/applications/networking/browsers/eolie/default.nix +++ b/pkgs/applications/networking/browsers/eolie/default.nix @@ -5,7 +5,7 @@ python3.pkgs.buildPythonApplication rec { pname = "eolie"; - version = "0.9.60"; + version = "0.9.63"; format = "other"; doCheck = false; @@ -14,7 +14,7 @@ python3.pkgs.buildPythonApplication rec { url = "https://gitlab.gnome.org/World/eolie"; rev = "refs/tags/${version}"; fetchSubmodules = true; - sha256 = "1mhl7p8pwp8lqx5z15r0lx1y4mb2c1gjwy3w6041cyc4hyb91693"; + sha256 = "0z8gcfg7i842rr5p8r3vqa31kf7nnj1yv3afax3jzf4zbnhb8wm0"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/browsers/ephemeral/default.nix b/pkgs/applications/networking/browsers/ephemeral/default.nix index 369689520d8a..170e0f98c905 100644 --- a/pkgs/applications/networking/browsers/ephemeral/default.nix +++ b/pkgs/applications/networking/browsers/ephemeral/default.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation rec { pname = "ephemeral"; - version = "5.3.0"; + version = "5.4.0"; src = fetchFromGitHub { owner = "cassidyjames"; repo = "ephemeral"; rev = version; - sha256 = "1xglhv4rpl6vqryvliyvr9y8mqli4x4bjcfjsl1v8gdxkzkwfy39"; + sha256 = "1bl5x79nvzq49azcghc2sx9l709524zixh7py8ddccfnhrq641w8"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix index 386707351108..dd289d203b81 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix @@ -1,935 +1,935 @@ { - version = "69.0"; + version = "69.0.2"; sources = [ - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/ach/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-x86_64/ach/firefox-69.0.2.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha512 = "300639491b6ca69d7f594df35fbaae3f0e452f8c5280aee71f64ebfdb2592f3948ea2b936f04f01660e3b296e07650b72c583771a90902e62ca3efaea67d291e"; + sha512 = "650e140fded88137d72babd41abeeca478d7b48025b3bf0821467ac0a899932c0a49d59e94a5ec9dcf94b0c2fc40c4e1dee59591e7b9b3a09ccd2693e7588483"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/af/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-x86_64/af/firefox-69.0.2.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha512 = "5da9dee3ec659045f282dd76c821cc62ac20fda014ce04fdd756ad0ebbba73f054f520f89e227c5b6590255e275d0cdece2c2c16e42733c7395ecde18f42f2f4"; + sha512 = "d18a0c1b1e9df37c6ba034c5c39fdb4ddade929d949cca06df2b4d7b61e49ad0f9b333c19e8ef661bb80182c77ee69d4462aecb1cd7a91b0d4fa8a067fd2dbab"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/an/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-x86_64/an/firefox-69.0.2.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha512 = "7ef4a311136988c57194e9388862f68b30cc4e5f9c4303da4105389188abb4453f592e9d0819b337e7ef9b482a76df19a9d84a06eeb287f93dbc7e43a41bda15"; + sha512 = "501fc660c9911b6949f9b43f68ba48f8ec775df22f59f20f34b13831f44954d53b88659974d01a52f184447052a196787f2c4df0219171e36f27e4f444a0877b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/ar/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-x86_64/ar/firefox-69.0.2.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha512 = "a16636cfced17bccf2932e14c6b4c2260c713c538d774802c1dc8598bc47635238549a4332c4cf69b3d3946397bc8f2ba5b330be5716dbb8a81570bea1acc5e1"; + sha512 = "df127eb1947d76ba1fcd7e75a39439331bd9cb6d1e4eae897a93696a816534df3f9210440f4536127b11a1866aee36fb8a7c4f1d0f5ee1234bffb815058f07cd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/ast/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-x86_64/ast/firefox-69.0.2.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha512 = "2239a47cd8869cb7cd50820e1faef0eae66245f04cab81e36250b4be1ae3e7619a994b68c2256777636f8da8fb10aee781715b11bbd7ea857300b7a5afcb085f"; + sha512 = "8342887310ba51a523d966e413bda10d93ec8e23e593267ea287d3d5673df30dd9a991bff6358bb91f8c5a5825a0befb45b75b584326af8678fa305f0b5b6a6f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/az/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-x86_64/az/firefox-69.0.2.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha512 = "d79ad1be25e9eb3123ba89a5589abfdc58e161bf3ab0c90ff3306639f1a43bd80b9175695f7d5a24aad7c3fb16a616bb90eeb67d2f3f820db5b5b5556e774cf8"; + sha512 = "fc1c395390117c62770a362330068877928b9b3141195effe3ec49517016b501e56f5542c07b6f9245e61f31e046a2453aa8b521c37a08b7a521d8681fe531eb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/be/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-x86_64/be/firefox-69.0.2.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha512 = "38b340353be185502214945665b846ca73f1ace1528f0426ae702d8dda88a104f79a879e99873bc9f418a753572ab3bd597a9f820f0e0e94daeb21e05793b90a"; + sha512 = "bd8d861b85abcc9ea35ba6e2fbe02ae226bbe95dd42910e7bb32e62a58222d4b331e2ed432da81138d6babbf0bc701525e53fab9cbc9a68ec41d1c20e64a2a9c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/bg/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-x86_64/bg/firefox-69.0.2.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha512 = "addf46d8ac6a823d9f1a00e55bd814abb27732484560399aacc7f704fcfbc7d239380c0857df7a4d445fac8724caada49981c2dd4ee288f47c63a7613aefed9a"; + sha512 = "fb26463a13ad0c5ee2bfc0ab8ccb7256bf1a3b8a585755297065b3de44ec65d2ee0ff1cc7cf67f314d10e29c4452ae01d3a7f296c447a7611276e6997aae9f58"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/bn/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-x86_64/bn/firefox-69.0.2.tar.bz2"; locale = "bn"; arch = "linux-x86_64"; - sha512 = "3d0e90b85b5d91f01ae4e84182d071f9b07436a3d9f088ca9178a72140a7d3fcd6c1506b7899ec7bc6ef82a6dd132ea5345c2c8b41c1e2977a5d1aa95f916453"; + sha512 = "43aee9e4e2a6f4202a1edd0ac295d2144608fa7fa9607a9399855be6d03225ef6d395ac1089e898515badcb5aad78ec028ae19631efc895fcef2aa2cbac8bb54"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/br/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-x86_64/br/firefox-69.0.2.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha512 = "aae8493b79569b0e096193c05de56197e01c9f8f7e89b8db2d021bed6ab6e553af4e44c36ad66d427e80840e631d7b85f8c9d1c5ca17fd0bb94a0bfdaab94d7d"; + sha512 = "fd80c5d18a816380ade244f52bf1d6a6811ce1904a895326c8c1f7e9b9441edf3dccb1e01a1867c0bf1c3ca975cefc3e92d177956cca4a0340375ec3063ebb9b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/bs/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-x86_64/bs/firefox-69.0.2.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha512 = "19efd698f911401b32b3affa6e5a371566eca8aaafde96e38704e48871f69d4e6c4c3a8f189519f8b8022ad2782ea5076e53e75db9c1c12e504eb31c827c243a"; + sha512 = "164abe404d823674f85819450277e9e71929cb25a899b2d99621b702ea7a8c5d9bb41bce0f0767348838e1a09a637a2c60fd9d9e7324b05363c08bcaf2ed6b59"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/ca/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-x86_64/ca/firefox-69.0.2.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha512 = "527d672c469bbea18d727e276fd53ca26d65a169f665b32190c6db47c549e7e3155dd04c65fb2720e1d45658a3c8c1f2567f62fc807a8993bf00a2cf280db548"; + sha512 = "318f407386b93619b72a1e1e6291adafc62cf9d9200599fd1640b35e0b76f883a81ceb7a93713f5f243debc79e1163d5c48082800cd80025ec80417bb5bf4be3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/cak/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-x86_64/cak/firefox-69.0.2.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha512 = "def5f01b180c354ecf2248d36f12778a2dbb5df8e376bc1eff4eefe3cb3b383cdb1b03b7a83784325ecbef330e5449687b36cbd239090973f1bb3098717bc2ff"; + sha512 = "a11ff622217abb69fa0322e27169947033d77faf56608e1a768953a4848d44e0f02828f849676d2cb46fc37d9b8f0e39ad12a8df93ab5f29c490f2ae9d45e9b6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/cs/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-x86_64/cs/firefox-69.0.2.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha512 = "5490aff5d9c693e22104607dd8ef342fb3ed79905995854930c7eee876cb2da3f940bf339570b68f008557ea16312af614ef65895a6831c22849e9818ea91b52"; + sha512 = "8e73d9d631482c02a0abe66c8fa029d0ed48427c707b20e8d7fa2f838d5d4095197d89fdf23db21acba96254c047043afb53cb8bfef3de33bac51ab5e4d65b29"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/cy/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-x86_64/cy/firefox-69.0.2.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha512 = "9b5e9518f89a9777150fecb25951ca02c232b526784161a8b55aa09b4cab9ed23743dbf62c5f365802beffab4c62d5991da83b138889d7894e5f1b1dc2edcb17"; + sha512 = "e8c58e39a9b6fd950c9459645a2d3489bc43918b21536ffe8e16774ac26a213ad17e17944d5d0cc11dd3decd701991d3e7b40e8ff05a12e31e5ea1e909bc8af0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/da/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-x86_64/da/firefox-69.0.2.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha512 = "9482ccaa5e3ab92522f60a28571c020c3acce55acbd7c38d7d4f7559396cb71ea96a47210213d1ff15a0d97fbb1a3b6e07453d09ace9cdbee13381fb68829bed"; + sha512 = "8002bd633c8ae1ce839399e6b5e680c12b326b32c87fa027ddd38a2776bfb008803938caa9c9b9a31cb7698b6b098fae2db10dfa003d39d388e95c46431f07bb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/de/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-x86_64/de/firefox-69.0.2.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha512 = "055948aa2b9ef551d0348b4a24437648cf7613446cabf1290ce429c0ed70c7f2b81ca82f0dbbe9359a0bdb6cce673f9472a3fe74e1ef8359ff3fb8903763a7a3"; + sha512 = "7acb482726040a659731baf1a907525be5934a75606e948f4dd256df4ffbfb11fe70137d7a5c25d8a4a6d11e38f2272b2d89a9acb56d2810ff77dae22b8d9ef5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/dsb/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-x86_64/dsb/firefox-69.0.2.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha512 = "a19cc34132f07635eebfc0d521c0177cd24f8c800f9be2750e2e653e8732fb93b39343eceefffacfbebed5656ad4ba0fb05557bd55e993f27c3327b171020f81"; + sha512 = "b25f88fc38dc03b1ba87ee70636b13c5d2b677beddddcdba6eeb67932a6e5cd5d69bee2d0f3e5336f184d9968f80d76debce102db4b8b2449787c46424674053"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/el/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-x86_64/el/firefox-69.0.2.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha512 = "f70a195f748c546fd76f5f2e73a379eda8a079475b3e03e67af41c8b0da1ddeb70c335ffa3f6019b406e49944c329eee1ac600d8fcd2daf393d0348d8bbb8048"; + sha512 = "5eef7c7aae58590ce1119b583cd8c32b62143a0776be28f1693ac43ade2ed28cb2bfb529756b553de9e16fccd8662c0735cf91d4766fd9e1216c19deee89c98b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/en-CA/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-x86_64/en-CA/firefox-69.0.2.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha512 = "eac808b225a6ef8162ddf82d8f975d8c0c77a4f8aec110fec017dad38ee4070d4a754f74566cbfe4d8dbbd65a022e1f168c2ffbac3f8ce84f10fb3eafcd114e8"; + sha512 = "0e08e3a4cc7e83f484dd5cc264e5e0797fa610b2ffb0594ff646b444da25d06b450d4b733e4298111b7dcfd9727bef0167fc29587ca5cc65d55eb72c5bb0e45c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/en-GB/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-x86_64/en-GB/firefox-69.0.2.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha512 = "ba5d57b5596aef987b07354db04bd930fee66a58672c246c9769b2205f96f8d80360d1d212e560a7897ecca95f0b10385eb9d947c4b71126cae5d4893a2a7a47"; + sha512 = "1d6b06d58a49e27a7d6eedac33a3e6ae74778fe8c98368c2e10709d0c9e451cd90d32df6a2165e65e9d78faa32fed514567479aa58bedcec69d5a4fdeeb0ec4e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/en-US/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-x86_64/en-US/firefox-69.0.2.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha512 = "f4f57ec920bed699a986512dac01adff30fa446ffc35b50039f9b321d4c5a1ede9ccd311f81aa3b7a0ed844a5ba4de1e676ce50bfe138f69f786e6d86afa790f"; + sha512 = "b7de5546104889f334daaf4751470ffb26ecc845e433d26ad455dab9d443baf1cc0e1c7efd42ebe2df6ce609ef8a08946d83470a78341739195832f51528f427"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/eo/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-x86_64/eo/firefox-69.0.2.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha512 = "0697adf7b3b68b1b11018c690868a28389c2579f96886d5e2d70c7a66abd14778291e2f7efacb3467022dfcb0368bd2d04814aadc7356a536791e0613026db2e"; + sha512 = "b1df1d53c78405597fbf174e270fc49dc1a52529973a7ec690bdd3309824fc295d5bdc980449f0d8eea366548a180852cf38d2f7ceea82d9518a527a9a57bf2d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/es-AR/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-x86_64/es-AR/firefox-69.0.2.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha512 = "0adc717397ddac8b49e5d86bbd702d122ce0f09add74b2246a98d2b686cdebfecef1011dfca5b54752671c7019b153ef9994e983cdcb78023b35e166177bd6c0"; + sha512 = "ff89873f85e4cf87e3f6338987e1da54412686017f14f2f2cbd14bd507b3ba0a00e15c45ce2711b07cb3c0a72fcaa778965ed293601eafb991aeef84ed8d29a3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/es-CL/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-x86_64/es-CL/firefox-69.0.2.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha512 = "fa5fbee9d58121faeb0d3a2d17375410e7eea9e7a92b0f803c7b922c936b78cb8db55f9dc6745d9fbe12474a5baba5e7c11e2a83426b19c29bad0262cd046fd3"; + sha512 = "2ad1c34e64824565b699275d13e74027d5a4950e00bbff71754b221fc9a1f1118414a7d62a280acbd8aa8172175fb54f41e67f6fd3d696a07dd8a888b7e1adfb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/es-ES/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-x86_64/es-ES/firefox-69.0.2.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha512 = "40d61b149da156b3008b131a9a4cb46a00c05a700e72a84575ce33f0b6dcf0bf317f64f54c1b0a0e6b03e817afdead048c530ff068da3cf8cb4ef53d60e57ea9"; + sha512 = "ca21787070a5ec6a9009cb04ac214fa86239776b90d6d541adfbff0babb6a16ff51d568cd01a10d19b547a181f123dc4a15bbd5d82fdb38d41332cd192cd81fc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/es-MX/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-x86_64/es-MX/firefox-69.0.2.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha512 = "518bec00e953c8adb7f5c7a0ea460b9d92b0b001f960e31ca5ef1771e74309782056760593f7f976795acfe020498b67d94f80f87fab37469b0c219e86c0158e"; + sha512 = "63d5cb5c2fd570ef5e00c700aa60294858eed7f953d5a89dabad324ea7c1151fafe990097892da085075f14041f6e7e1b11dd77b4064f64830da9a3ea5edaea7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/et/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-x86_64/et/firefox-69.0.2.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha512 = "7a5fd6b36dee306446d94d33150004115da55002ee11ba1daebc6cef7d1485e023dc08d9cfdc419d76b7c1335bd7e0f24f3cf197a31003c71569111f5edcc316"; + sha512 = "f6f94f4ac50ecbe39837e10822fc1824c97094a897fd8426c83f86f2f3ff97851626091c27e71efb73ae4f3ae611da3bf1d419d8cb0971fc2729853cabc2f320"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/eu/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-x86_64/eu/firefox-69.0.2.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha512 = "5ac8e602ee20afaba5b7501ecb3af0cc4358d61a729299eb6189a932af19d86f409b66853576ae4c259bb14df43003b395dae7f713572babce62bc549b7ef0e6"; + sha512 = "dcc82582dce399f5620c47d1853db3bfd233be6b8addd3b2e87275f2d88483dc840e50f57674ccf0eecb7d53381065321ce285d046e860a869534c4bb618e7d2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/fa/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-x86_64/fa/firefox-69.0.2.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha512 = "7e0e98538caae2345b88e9e9921b1eb3e8d4e226950aebe6a9b6d927aab47d40e59ef93fa33b0b175460db44e906e64e3f4974706ec0b3d85a3e6ed1adc99a52"; + sha512 = "032fa11b3def5f2bfc1776296a4868396986eee1ea4480fdcad33c2a8e4b743803df59aac5088a01300f43c4f2ef2f106d18320ea829d2c3d178c2c42f79bbcc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/ff/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-x86_64/ff/firefox-69.0.2.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha512 = "02cfea4fe949c4105d5cf2836de867c21c9ca8fb73cf0b3702493d409cb36a70f9f195c53d755840d7696500ea7e1a03f4bdeeafaa67833ff60aa96d854b14c1"; + sha512 = "caa002e10a2ff3f9115b63fb3625914977550401a342e0cd9ca515fd64af3281a22a1a3aa51814370ef18e3ead3d6e093ad6c7b0b728011d8f0a40088168c9c5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/fi/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-x86_64/fi/firefox-69.0.2.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha512 = "470e499c26f9120d68904775e9ec2396020b91dfae504bdd6219d2932e5588240f9f25458425895c2d74fd6aa4c9c525f117f0a0f69adf98703af2570cec40b5"; + sha512 = "12136b4f24c697ab663c5947d6042eb7af0efa676126882009fb8b74bbaddfc25433c0a80f22094e342d3f390ed253b67371e6b54b3fbf7388df2130042079ef"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/fr/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-x86_64/fr/firefox-69.0.2.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha512 = "44f4df351b0a34bd3126753a785f9a36856686d9df9648c9a3a1f678dcbca9585c19b576d6deb31967aa9448ef45aaf602558e87040ef19d1cb812d42c5894d1"; + sha512 = "f88d755212abdd116d13db212056d6d6eb2c628130c381ed17183e8aa64453b71f514cc22c347f37b9fa40346e2bb95188e4b248dc7429c70ffc306acbf9cc7e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/fy-NL/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-x86_64/fy-NL/firefox-69.0.2.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha512 = "1f336759e304747cfb6932dd433c31123b153a04b4600952d0dc622b442901e1642acba220508373b915caff68e87e026ef54e24eb5c001a1e6e3f4d1b9736d7"; + sha512 = "25fc225c9c97850f23bec3317198dcce8b3c802fb672db3cadfe2abe5a77feb2a55a2c2835c35495dfb7dc97039f21ff6d5189fe4fb266efd40c41c45be718e9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/ga-IE/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-x86_64/ga-IE/firefox-69.0.2.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha512 = "dc0109a75094fe53caa78bb5c02257118aa9c992b4633cecf8a6e60a5daf4fdf488aa5e5309233aa1882bf69e3c8a01a527c2e2878ab9655c4810b3e54244ba9"; + sha512 = "83e4ff3f316a537420f92d564397e6d39969cce23497d5ea2da5832804d0ca00781cc430541324ab6d36ab711048637976be9b07725f1a1657997824a47b3704"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/gd/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-x86_64/gd/firefox-69.0.2.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha512 = "69362cd2b58066646dc62ad0022d82ce6b010ade0abbf779d7d3ed7b9bf6ee808c848a9404c3beb966751d3aed0d3a5da2be3f2b262580e8b6211a3f8444727d"; + sha512 = "7b1f1dd35680fa7566fbc56619a467f6d1d32118c74b0b5cf6e96188f5eae9c5c7275353319c755b4685dff999bbeb6cd18c56ae8e24753c6ab74ced6cbbf066"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/gl/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-x86_64/gl/firefox-69.0.2.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha512 = "787a3a454d59daabd81cc734f15232622f3e2cd0253c98c10fcfc5eb47b8d329f89740474f7f754ab6f17bcb50e1fee38012df9183e061629490582c677da68f"; + sha512 = "7061aeb98e08c3b0ce12d17c6a41eec360a1662dd4a91ece86aea2e1d24ac6e4f99bd678a1a02fc458901d50aa0fb29fd6ab03c0409e771e0664fb02ba4eaf6e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/gn/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-x86_64/gn/firefox-69.0.2.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha512 = "cf05696e4b0e3ba6c9316166f56e99505d4419062d77cc0438d0fbb66729d354c59026018828ec7d46db4f99e6367dea9911d4bdf7e80ba68fe32f8e0d5c09c3"; + sha512 = "56fd0618ace9343c0a5a23a269654e6e4fcf9cd1f0d1fa5170dbf61f6d102246dc3dc68faa04ef601d0b37775733154aaf2f573d4a82fdc3290e3f126962e59c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/gu-IN/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-x86_64/gu-IN/firefox-69.0.2.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha512 = "0b38a698358012e0cc3ff1091b82d1eb82673f124b34ee4156cc36bb49d5d69efc32874de2a2050339e73d6f386f6d4a468e6d906be0b22567b867dde7e0ff9c"; + sha512 = "74995df89406da1cb2303c75300d3aefa77b14c7f7af55f6152649034fc87049aebb6f9529bb03a465f85c702fb0cf24f5b08d7d109b4bb7952a331c7ab69cf3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/he/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-x86_64/he/firefox-69.0.2.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha512 = "8250cf4c8b18edb35e8c601cb6df8bc7825a96064064b6d46a6dfb77e297c64dcc7a2f7937750d4734ab56f843a65b6174b4c9d523f9b5877e0e26ce9fecae01"; + sha512 = "fa860c409ab5d77cd4beb48cf1294588afc2343d75cea07c717ad844195364176e14ced2d38f8cb91996899037d213ec04852847628cc4c87b2808d33cb814c3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/hi-IN/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-x86_64/hi-IN/firefox-69.0.2.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha512 = "a0262214be3ebae877300b54720b4b74defe46bb641b989a1d65df02c62d78d51274386b0997a45189fa86d5974e56670a852d24d76a655baebd3c5aad8149db"; + sha512 = "c14b6d9dc7e38dcb20a7676b8a8744dae145e8cb99ee5a568aad79e6c086bcc591232e6312c87543120b5ecc698abffa8c7acc83073ede8bccd6cf07f9e16aff"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/hr/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-x86_64/hr/firefox-69.0.2.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha512 = "a5254f81f1ae432b50ac9b0a1732134b32bd460502baf51eef7242c37b37f2a6f0cfb6ce9c10bc3ce6ce509287fde824bede15534b010ab2f55721e43d85a8f0"; + sha512 = "ae9f7b87fe869441e21d87956ac199440aa3189cb6704a3e55f08e3de5cb714a2c0eabaec9d33b2a0de40c89cc464f731412acb7fc7d11eeccebc24974de521b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/hsb/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-x86_64/hsb/firefox-69.0.2.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha512 = "7081a889a6689e2d6fb4550474840085724cb4a583a9618a03a88ebca706ebdd32ccadd64ec8491332e342293634903ee52122ec9a5e49efb0f3cc8c09ac891c"; + sha512 = "5acc0a8e09e77e3e98c0f4296e1fb410918db719de853ac3c0e1ddc028a19878bd7b31299cd2292cf54570e8c911318dcd32e74e272e15f7cddd9d74ebb93524"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/hu/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-x86_64/hu/firefox-69.0.2.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha512 = "0a6bd225ee22562da294a0a6753949f6e627d1076579c514b4c93719cd0acfab90ce28c241d05cfa58a9b723610169f7e3a8b65dcf3bce7615e56cede10f0064"; + sha512 = "82798f3e1105e75bcd0fbce330e01ef0cc6b4eac806d122bd448ef5420e9508355e2fcc477bcd75399c0f93b9be99d0a629356294b132f86376d279c45799b26"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/hy-AM/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-x86_64/hy-AM/firefox-69.0.2.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha512 = "dc21bc95a2ef7e66b04fe9900458754db5fe51047b3e166a48bfc1c6c7d8048846049356778515556be0184b5f40a08b29bffb27eca2d85cf90e47c42a9ff086"; + sha512 = "b5f4bb43d12cc9337d416b8233f1fa025e24c6e818990018fd90097f762451775dc9d5d43be1dd7ee81cdacfdc071e9344d05ed41f6d6b28869b77273e505309"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/ia/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-x86_64/ia/firefox-69.0.2.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha512 = "b2ab4096778dab01ec722c90daabdd8b0a892de1cd01ffc2bf5b6c403a74bbb6ab1180b1331635861c29b05db9662ec1d973d8506170c7227d574848a6281678"; + sha512 = "84c2adcbcf52fb3ae64d484b0683840579d6ac5e87cd6361709132c150015f909c9f8036fc6e4609c23a8faa0f53c4f27b15ec32fe04c7d7b839e8c30a720008"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/id/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-x86_64/id/firefox-69.0.2.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha512 = "a416e7ff14facaf80a8edec2b1100f65bd4ca13b6ba10ebd8ca181c65683deba962c276b4b32372f9d8aca33213ffdc882ede3c8bf6dac883c819b85ae84789a"; + sha512 = "9524f5fdb0d1b5289a30fc2b0c0b37cc1ea45a99e9f8f6292a6d7c53ef65d02278135035cfaf4b8858b67f3795791434f041da81c03e7ae03fa0462403d3be2e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/is/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-x86_64/is/firefox-69.0.2.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha512 = "f5b0e2b1bf63db7a3e4bb14b0332d5b365be87f7c256c7c4a34dc4d4107a139bbe0415c757d7274209e82a1219863db3862426621cd2453d24864776c0ffbd83"; + sha512 = "1b5b416a431e067390610893dcc0101a194a552a1ea1251bdf8abca5590128ee313b17a5c2be7c21fee21037f5ae2270c016f4cdc944eb7d9777301d194f65ad"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/it/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-x86_64/it/firefox-69.0.2.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha512 = "655def933c7a17d5417fd319158a3a8f21a0263bb7aa539641b1f3d3eb0087148198975a9961a789b3e944c812c857a35afd5e973018a82e409ae438c160aead"; + sha512 = "2891360ad4b83a98bd4fe919eb553b5d52b5b07df05a4376e5cfc06e1391f1c007929fbb56e7f541361e156852637c37106a67b943e7045cc4db17fcc55321dc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/ja/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-x86_64/ja/firefox-69.0.2.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha512 = "19b9a42561727da209614222f618512a8ff714f0edb21baae1efab69fc384d3ba0766475fa76e0f1fb4cf298cfec01c0e3bf3879e1b730cd0254d6174f764df4"; + sha512 = "c440e77db3c5b9ed0a539bc104eabe38e271f5951d617abaaa3f33ab51573518a2abdbddecd711d087d3844582916e14ba4f1aeb1bfe6e1be59cffbbc660189d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/ka/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-x86_64/ka/firefox-69.0.2.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha512 = "4949b620ef6ca2e23472d721bded35091028048633f8393ef9a68b780928e11e779527b8b62f02e27288456fd939a5d273dd3dc6096ead80107b3c4266deee2a"; + sha512 = "09bc7fa6d98677149d99c8c0ce38202d6928956907637d3168816197b2470eab0b3285267d98e353b348a39a89ce0330eb3c969493027702a6324ca3cd81f7e6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/kab/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-x86_64/kab/firefox-69.0.2.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha512 = "a1e9f7afe4c09a1056ad0f9f81dd30af5c6a62582a19c5ab437e42281b312f8cbf9f3ddc5e4e9e6553d4c68ac268f5cfd6080d8aeeef51032387b8bf1915382d"; + sha512 = "6ef367e0e7429f93c1ac0664cbe63c1263af2d134018d1aa69a4616bc896e400e798f899791446fa16e7e89aa03d682a21e318ae4de809da8842c44e5778d674"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/kk/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-x86_64/kk/firefox-69.0.2.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha512 = "47b2963dbc9333b30627ef1583a87adb23962dbbd71e01be2b58f6ff7a6d226076f9193310038884000c6ff7a4f96bd1eaa33767bf96bea3ecbd0715ccdcfd37"; + sha512 = "da0dad64eca68f473aee8c09f6ed3fa3ced3f172415aca55ab68366dea5f75ea98f0b384b63be19c6b96a6d29163a91009118e43bd792de6f8c71cdec3d70d2e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/km/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-x86_64/km/firefox-69.0.2.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha512 = "758c7dd7eb7a91e09bc7f921e0506a4e719ae818b5794abe7a090e9af230c6d5240ab7077a9ca4636599566faab83dac92c64e1f97bcd3515e27a2ccf4e9f6ab"; + sha512 = "8409553cd52554702fd3bccd3c50b4604dd39872a2caeca9d6bfa3edb7bb01f1d5f093ddf04fc826152691fc669b9881e295c3d796e0327fd4c210bdca01ebc1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/kn/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-x86_64/kn/firefox-69.0.2.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha512 = "fe0c88f827e0b4581e3f72367c19ddf2396cb654eaf2d5457babcc1be8761ca6fd7a7cedc79c580abd7e9a336439ce24d84ad37a6f1d0907bbd548232a9c3d81"; + sha512 = "c626d769f319c4cc155fa26f9bd32a2bab60e7260aa0237fbe9e8569a3c162b2e5285de8008a83e94b44f329f59af57df1c5c186fbbd9263a6b4da52120af13e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/ko/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-x86_64/ko/firefox-69.0.2.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha512 = "52d0cf33a3a6d083f63c03c5076be9e68829560ece3c5729c5694c989a1179df8ba6f9c5ad4c3d720394cae351ff078af13e07d194b175a364e3f529dd7983f3"; + sha512 = "838316274f178e3498afee6bbdc245433f31a92cad50893729263b5399f3fe3f3a97dad77eabfb13648453bc3356d4c4fab3077ee71cfa801b68505f613babc4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/lij/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-x86_64/lij/firefox-69.0.2.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha512 = "7acba227856b3bb015745f5239bbdd06a88e30ae7f17129e8b104ff800fe7b60f24646962348177e7efef71144a7cdf2415b6daebd2eb75574cd6ca6b708c892"; + sha512 = "7529cdcade0ed9e1a9adebed956a9f1c5c26b212d4ce76d3a75d00d9dd8edac086e6b9fe2f993d5071230b6f0f5067a9ac9281fc95a4c82fd6cf60f1647679fd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/lt/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-x86_64/lt/firefox-69.0.2.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha512 = "0829cd18857660588330c306ec7db6e64d52346ead593ffc7e4022c25d8ea5451329e7bb70667645b0bc4894f20d8d6251111449dd3f48362165e9f583f89e92"; + sha512 = "68803d5c8aaf40a78fb6e51237fa36f72142f9ffbaa7c41f845debbedebab990cf6349736ac98ae0ccafd00c56c6f16aaf053e847b31cfa508f4272914d9948f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/lv/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-x86_64/lv/firefox-69.0.2.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha512 = "3c19e724d31b20bbec4a9a4267c5cb9ce1e4aa5ff522beefdf35b468d220964eb547ed1b3a4354624cc653764f62d41a294eac10d90bdafacd290e192786a73a"; + sha512 = "9746365d8720cd416ef13affd40015c25c0b225fc10d9a8d5e28440ca0ffaef5a9ea72572af10f122eeccb9c95f6c0f86420bc82407b968e481ae8bbab5e59dd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/mk/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-x86_64/mk/firefox-69.0.2.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha512 = "1223ff81d9162d87db9d71948d34b677eae86d3ea06953a939cd18836c8b820c0fcbc468d124a3b0ab37346716db06fec7a4510806b7f2f98caaa0a30642746b"; + sha512 = "5fea92de8a3a040e0c2bc9f79c313bc8ec1ed5c6ac3394479cb5e18cd29908c7b5c6aa6e0f3f94590479712e0f1bd70e099d93ce4ea8bb822a65b7dba42ea78a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/mr/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-x86_64/mr/firefox-69.0.2.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha512 = "202bf4f9b7250a73f70f0503e53f1f55b9466d4daa13092d9674b21edfc61a0dc6af3daee4cc229372eb2e3e3d97e13f686d9f6d8d702f4dfdad19ff52792eb8"; + sha512 = "787ad5c7c176009199e63d8abd55a11b1aac9f815bd9596a80e08298e44f6948ded1c5d03ef23267e129aa7522169569b6a1d23032110c7522f6c68b8012702f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/ms/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-x86_64/ms/firefox-69.0.2.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha512 = "7c1e2b00ead7cb7b2a3ef516c0137f1cb2fcdc4fddd44c5b5887e949797b42218ae66fd58a4b207ec9519704ad8b26a71edd2fe3a36ae152e589fad48a4e2754"; + sha512 = "682c955257f36be238dc4e6c4770eb65661af1fd6dc46a2b4ecd3d506e08ce602f22366e46bdba91d636eecf943fa0a5151f29536aafba4c488728abf660bd0c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/my/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-x86_64/my/firefox-69.0.2.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha512 = "bd92ec45173af70a10715f16e8043e7d41900607bbf2acbef566002f8ae8855cb604963d2cf2a1e5a9c610120c24b6d192c0e32c7ba29c635c2d92d1fe4b73bb"; + sha512 = "cdfaafd1720039202d569d106f484f6c1fa6181ff2d9128b1de3cbc555c34454391cb87dc9c90557ac62100731243de7f3efcda73d5bf69dbcfcacb76d65f6b1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/nb-NO/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-x86_64/nb-NO/firefox-69.0.2.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha512 = "c032c4d91c67d11ced6b47caad8ed04554e08fa78e7bb49c2ee1176ca192131b9372e35c121d5747f59672d1c9f8f1fd7f2d29ab24ce3b6e681eafae7a821e02"; + sha512 = "9e147b4dd6ac4bef22c89f7fe7e946bb1546a6a0872e5d9e9fe9b6c7c368e98de365cf6d55bdfd4d4f826abc18a8992775e07552c9f14d1156c2524d3fb4d8e6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/ne-NP/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-x86_64/ne-NP/firefox-69.0.2.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha512 = "5c6a5e7cd3555bef6de3f02e566349a5e4797efed99c0b161e0de38f8391657c963446ab7e9b57a3728a81350bd98a7de66029bc0fcbe611b39f93e804cb1302"; + sha512 = "528e2dbca84dc8ca16393c4b037e0ae3eb95896342e5bcdc4eb068f5e42509ccdfeda1995b483fc76ebf43d09d7362a6493936588d4cc649a3547868d1377314"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/nl/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-x86_64/nl/firefox-69.0.2.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha512 = "a1ae9b567eb05c28443886b49351532c92d5e29d65386e3c3d0d842574be355f49544de1302a485d71b9962483eeba4d7f8c855089b5fb8fc3dd1b86e47f70c8"; + sha512 = "87cc2663920121c158c626be7a89a5a96d933f23c6e6c29958ee077acc0722c99f6e8728aee40e1a5249fd7af8259c2904768d26f7d0ed68574b4655e03334f2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/nn-NO/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-x86_64/nn-NO/firefox-69.0.2.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha512 = "3926a8efcbe5cf785cf687e10b5d7a846cafcc5e9a09fb77f517ec071c5b2afec954fa6f870c3688d07ecc17d64fd71080201b4646d8547cb3446201ffc30944"; + sha512 = "bee76395e5941618ee0ef3ce4e602aad58916456bbcc2d348240888810d86d0cc0ec7f24309c610988acca106848227b6c8427a59e231d6103a7e8e73a4b74b2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/oc/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-x86_64/oc/firefox-69.0.2.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha512 = "05ce37349d320e94547531cabd995d21107c64b87d52b0e08c465abc709526e4504019657ee2c49079fd8bef012f1ea7c55f595828602ca1d74f8a18940eee2a"; + sha512 = "70ec55d6ce83982a3fc6e84a4850a580eb461abb92ad74d8674f5fea9e87ffeb3ea679bc2786d0a8951292c9a9d1bde008edb696121c26d9ecd618583b78312c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/pa-IN/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-x86_64/pa-IN/firefox-69.0.2.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha512 = "48f6a34384b79b6a0104b33073c32589a9a66da64c83c0f205f7cdbf940ff75a162c9612ab7f457377f018c4508ff398c2410239efe0a22862d36aecc7b409af"; + sha512 = "38d808b9b4cdfb710667514d8d88dba29ab19ee4e33780791b1d6e8e3e01db532bb2e8297d4bca658e20cf65de18279d77e1af2f0aa0a2b66552ef2e712010c6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/pl/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-x86_64/pl/firefox-69.0.2.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha512 = "912149f85fd055d5e9ee3ec9f40ce9308bef4580a265f6ff8a782b5db1dbc8e82bc6ab6cb40df14968b3d00e11aeb539c6768d755acc3e5a96bf2bb952b86f1a"; + sha512 = "87a482bcd54044a2b42d2716102814a07f03254407abe7fe1d242717040c5981260f7df2bfa46ee2dfc709d517ff5e1d4ab8d203c0640503eb65edb39cc93601"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/pt-BR/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-x86_64/pt-BR/firefox-69.0.2.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha512 = "e167770aa356ab88af89d1ff8de492ff0e31c9e45b64bcdbc3ed76749bf2027b70085c34b95490047f3a71f72fb29da5d771dddb7b445b70a2986d22088c7964"; + sha512 = "ac9b20c4719e2d9f4f77d52c850a32d25b0beb53d2e320f7eee4044f72543a5a4f0051060d9b0c30b50e8643e20bcb57e46e670a5b8b993a1b330c345e71acea"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/pt-PT/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-x86_64/pt-PT/firefox-69.0.2.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha512 = "a06e26bc1285a39ccc4399e98ba523c39b9f7573444f5793bc5278908454c717dc3198be5f3985280af4869bd68987f5cc0d4c4a4000eb65d6eff4c7d3e61a15"; + sha512 = "27a2871a7687d3d9037f5f983670d1f2e34d31221925e26f6aa8d39fd0efab85495f54dd7c154fd4974968ecb1798eed3177315575a949d9e0b9900dd2f34c39"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/rm/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-x86_64/rm/firefox-69.0.2.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha512 = "41e9519e6e10cbdf20eec17ccdcf7120417c477a3358a0fd0f6b770dce64b5528a51271b9257cf981ac21dd0e118e8193c0885c5039955b84d331d29e881455c"; + sha512 = "f7e45e4f7b52a016eb97778340134b9d8f8358c7a37fafb8a29225323767147991030a1be996bf9f09ff777716d3a179e18e79ce784ecd3aa0df4167df5b1c1f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/ro/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-x86_64/ro/firefox-69.0.2.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha512 = "63845db9011089101b6350e5b13c3e614a198ba24343d386e46b4219f0e006c346b6ef103791dbd5013a89138c1facfbd81b3e144e04cb8690c996969af6afe7"; + sha512 = "792d13d134c81a072139706d27554563fbc84f3063d71945055d13e9277f6b6dec13d4af0a2d3c3ffd5a36ec64dc1b6f2b5ff3634c19b7f4fe290cd16f997a25"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/ru/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-x86_64/ru/firefox-69.0.2.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha512 = "ba844bebc9469c2372815821d751fe3146d8f7d0c4c18002ae617f1d42a03369a13eb3a2cbe2087135164a30784bd476a4512867145a57613a8611f1af47227b"; + sha512 = "ebbb9f69e090f61ddebf3013dfade85ee9d2b448394bbbcbd638feebea27f3e1dec4314644210ea9e07169cf81f06276c7fac42dd0adfc90087f0dcdf4b3f603"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/si/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-x86_64/si/firefox-69.0.2.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha512 = "67df7f6a6d32c37db778237b2cde1418d8b4d19360f752960129c94dc3ed4736a8b1eeef73966b54a531e3e3c6ddceb5cab33d758124ba375a2a46a7768b99e8"; + sha512 = "160b341ad9cbf78e4a518262b392672bddca2c54bc4695587afff79448f192d032cd1234d58c2d2be0d437a7934c7eaf29929e60ad57a431574ceb3e48e26e13"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/sk/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-x86_64/sk/firefox-69.0.2.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha512 = "5d748ec7f889e8465cfdf6304db6403a346ed6b9c433fa482365b82bdf39cd600a9926b5e3355e4e8cb911bfb03bb9ed14df83ac0b4cfc2019b71b2006e1ef51"; + sha512 = "070a8c830a2424b96ab8a8ae0f590dc982b775fb237abab6bfb023d35cf8fcbe21bf608f5c684cafbc7c48f7849811c2c0deacfc73633cc85ca274c8348e96bb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/sl/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-x86_64/sl/firefox-69.0.2.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha512 = "f870acdda0da2fb373718d2218d0db79de90c6153d7dcab4163102b220c265d502691f525f9db77ab2403e528e578b9e45d839c2296f16665179c838703aef23"; + sha512 = "e29d6a7bad88f96656242539f316ec20116779f1160ec5795b8922e86c9b12bf6a687cee3db322cc5a574e5371919864c17fa39741f930f2cd32d3645e26a010"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/son/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-x86_64/son/firefox-69.0.2.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha512 = "f8c702a54be2f9b15ffc183de2853b8da7d7809d2c02e3a7a2a2d001878236102c35383879c0f66ceeaefcd6a676adf23d766a80682af4122c82561fe7eaf36d"; + sha512 = "48286ed90c08ff2fafd22964fb52791bccfd03a80f03d2bcc22141b4b8bc06fd05818923048389f80dd93046dbf28a1d86ea0612f0bdfaeacbcb45f0eb643e52"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/sq/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-x86_64/sq/firefox-69.0.2.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha512 = "4da3b8e0c0a012e5f78ef1c10f9f462b9e5a716c95e9d8134da274dc1461d60d094af2de314987c6a68c1a50c17f09dc00ce9cd039553b406efc2306968b38a0"; + sha512 = "179c51438cadcf6f669c75d1db3ec4e79cf8a943cd2242d80727984c90a2bd7c167832e465e4d0510fb385bde450129ec48f4f97d4aec6d4f78d753a2d2cba7b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/sr/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-x86_64/sr/firefox-69.0.2.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha512 = "1a41de2409ecf00fd94690c0f452395c3318590e9b9f2164f2d82112e51057680d2c758d1e0b9d9a372e3080afdb611d30a2c74b9bb6377da63352cdddcd1099"; + sha512 = "96c8cbf9589a2b00e1318f5031b26eda5b44fd3be002f4d47f2df174452273baa36cb427b31168206427b23e2002ba4fac666803c498bf45b95270d70b25ed21"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/sv-SE/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-x86_64/sv-SE/firefox-69.0.2.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha512 = "f09d3024b2f9032512aa10ce9b5c72b44a673f324190e1e971ad3c09837545b79a784e6a10e5cd9997f701903c4445284f64a9eec7d40b857a8386b2b72eaeb1"; + sha512 = "a8da64283b5c58693c91270a7aef01ae8b8332cfcef6e2c3c989ce72effa7de00b3e162f925dcec23cc1d9f7e29672875d27cd81656b55decc67d59ba2a5ccb8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/ta/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-x86_64/ta/firefox-69.0.2.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha512 = "60666bb1ec53979b6b614a4c31a04085b1542deec9908bd485db2e0f09ad833a2dbd81f84f483f24d73689cde5fdad2554079b3a54e4b98e148d3f6f144b8de0"; + sha512 = "6f505ce970579f59fe0d6bee0a38754cb1f2762b550be21760199600c34979f6aa943c2aaeaad74299245ca8b4c8834a7d4349e328121b1db375e188f1675a8b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/te/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-x86_64/te/firefox-69.0.2.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha512 = "03fb5b9cb18402657b77cee2f7bfff3474a84c32204ce5163e028680cff75ad0faefc398975fb98378fbaaa86ad247cb43970cf86bfb383512fc4e890a928842"; + sha512 = "a171b0bcdc1ff9a21a6dbfa4db5fa83576d16d51445384bcd83a9ffae908f9a55077cde70f22a34848b9ef2841b162e86ba9aa2ec4a8bd38fed9ca9e021226e5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/th/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-x86_64/th/firefox-69.0.2.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha512 = "53d525b0309e5f0d02314c0ceb568f067e858588befa64047a3163fc0623d0afbc05167df34fffbcf97b1f5fb127dcb8fb45c05ef117de42d42e8e7d37a04a6e"; + sha512 = "63af749d36b86e113a768569f53791a3c8ac156434f4ed2651f1cebfe9ac565e142ec406af44245e76e661fe30c9fd070f7d8078b98c720699efaf63ccd88d20"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/tr/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-x86_64/tr/firefox-69.0.2.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha512 = "ef3c0a7f2ef67b92cf22bd6a69b237db8b9d1d85a018cc7c33f767fe71f483ab479bead36af874f4c6bdf99f7eb58b86b564825de897abbf8809aef41d95ff4a"; + sha512 = "3d519e4fe21e5637a3ac0c9a4f67dc3a473fadcad2078f933d2126cf524893b638cf8a4b69522f3209d2ec2560821b469d89c873ab3b83da8f4515898003af90"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/uk/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-x86_64/uk/firefox-69.0.2.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha512 = "bece51aaa6fa0131f55364b3a8079382db4d8415e19f3b5ee7333b4111ecd282012f55343b44df95cfe3006f3226c7ec6b6d4bc71d1f30aefbf203e24c282b5d"; + sha512 = "0b155c61963a65a13b88d630f81407b5b9aa38ec2a66dd95e8fb125d740b9a802492dc799d3064ddb99d84e7d36d279c0295a77ffe06d28deafb211cea12aceb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/ur/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-x86_64/ur/firefox-69.0.2.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha512 = "1f5373231283004843f8d87a53ee5eb92c7c79d4c15cdd611baaa5ec56ea6ba6eefc5ed63ad66e0a3b66b4748eb21af201fd98dea645754bcca3731e8643dec6"; + sha512 = "fcf8432ea95d66466ba8ab254f630924ccb05432d0b3a7424813149e02dc6a8db6b29c5c11be65820267189594e7e5bc4a9f7f3b9ffc80c1334bd24faab3fd07"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/uz/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-x86_64/uz/firefox-69.0.2.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha512 = "31708d41970b7184bca2686b8ee048afa732e24f05ed84bc7dfee1fa18c86ca8f3bfc27002f306bfd71423331567be2c952addd1af50ed85ca7377a87b1c91cd"; + sha512 = "89e69e07500096124d9d5b75d82d76fa245dcb86973f588fd2db744e162b8a89971005e4ac3385a1badbf5e195fa04ee4216d0737ee0c5d51cd1995e9c03a107"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/vi/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-x86_64/vi/firefox-69.0.2.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha512 = "f1abfcf9142310c6362b429d8d58f370c3fa9af20d7261e0e3328b37d4cc33b88d764d108167ae9b3aea6dde7593bf92591d41e71eaa233cd01d8583e1d8542f"; + sha512 = "5e8d1b3a719368a7466cf84f486ea5f8c26b6907bf69376291db8fedc18f8e7e2c7bd949c8b156fc4eb3b8fdba630395373d48032fca8c0e5f4b2a6d411503c8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/xh/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-x86_64/xh/firefox-69.0.2.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha512 = "cbc4ec3f78d47276b1cc67948645b92fc891a0089bb81151d1b4ff8ec20b5ea7db714c7a386ef094a05040fb399d8de7a98d3c7ae7dc212c64955004474c4466"; + sha512 = "dea545c6f6e9304ef94f9dd33c1ef39c862db7a4d9f0cefa81301dfeca1f898382229aa7ff960eef51b3f216ba69a70edd17a64ab6c936ee7cb1c0b5dc02bb95"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/zh-CN/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-x86_64/zh-CN/firefox-69.0.2.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha512 = "5ca30257e96e8e7770fe8a7d626433932a06e56789cf6d84a09b633348570c59cf904707a2c6737267d111929830df8b1556d84c6dbccd62e4146926a87e68d7"; + sha512 = "1f09b9bdc8b7dc8e05132d8b448cd95f3241a539a4a76756ca3eacfb401e40251463a120596d33a84f447508e4872a71de50b509ed01b2b6f0d80d4d852ce8ef"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-x86_64/zh-TW/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-x86_64/zh-TW/firefox-69.0.2.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha512 = "bd3ddc2e9da6f1e47648ac4054c6568e48e3c01422623947f745016bd624350885a194b7dad600fcdeb0fc64cebf10b8f694764da0575332618cc948dad33cce"; + sha512 = "9a219a35dc0cbad6bb98f27d55b654e1b3277e30ddfc3ca40a436eefd3ab49854ad92844a9abb54993214a456858fcef317a3400135aabc1cc879734df70c858"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/ach/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-i686/ach/firefox-69.0.2.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha512 = "9f5876b495e56d195c01a278fa602c7686c52c662145d46dd4e7a9ab143801a26822c5a084683b74819fec15d66b21644ab6adcf160deb1d48fcb381fb395187"; + sha512 = "b8ce88a7adf8b4a5fb39fa810c12500625f077f31938c0215642e263611ef99982912719ef0e9989704e4d79100a2234123179a0e352886d7f6052184968cae7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/af/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-i686/af/firefox-69.0.2.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha512 = "13516530c77ddd90e9a5380817acedd7d1843908f4cca8cbe523f2390236c7f37b50a5ea6286ed9a944a4de141d911af0ce425d557af338e8f7be20581717077"; + sha512 = "bbd7ae4ffc80f7b15166cf80589b406c0e50851bb1e3935450cd376d763fe4a54be138be16ba3d6de3d3d416559e626ef7ca6400500b3c80cdd5bab10a1acefc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/an/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-i686/an/firefox-69.0.2.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha512 = "f947a2e74a8a1afcdfa64d4d70f123efc490403879037ac31bf082874a90cf4a40e143539bfdc5fed10a406cc1b446dfaa99e7c4c3c805ae37d23ebb420bbcfa"; + sha512 = "2086c62510b52f87e980557dbf14a859ab5a622b02e5ae04ecc7d483cd22ad1126a4ea4ec4736fee792fcd741630fcc5ed8f6e66759502ec583805cae0cf9011"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/ar/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-i686/ar/firefox-69.0.2.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha512 = "d050acc7f518b00c231112364bc9a678c64905175c111380488adea3633945b3acd285195b10f6c7a0b624effb7006f742451df5ae95583e3e20990b9639145a"; + sha512 = "391a85284f0542fd35363fea0ca566a3f06db3ca06c47017d7f3696cfd41ef56d97dd51667f80e04e079e187f1b214871d552ab6139108927353d5f5bfe6ba81"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/ast/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-i686/ast/firefox-69.0.2.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha512 = "33b64ed51cbf24703433087bf869a3ecbf16591ea4d870b902bc775c0a9d027b91d3d161e11be075072363da178f7ed02103fd57915ba43c2f21904f32709f4f"; + sha512 = "1336b446a8473fe82eb2a9fe2c00e683ff80d24629fb80c37378ffac713b4cd7a617670eeca084018da3b9fa952e9304f6f32a6d29a28213fa49f1aa9d52fc2a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/az/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-i686/az/firefox-69.0.2.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha512 = "5f281e9f1bcddf149c30266ebd80199c2c6c6645f5ac46c118f6aae13c87e61f34d84077f44bcc93fdf03d9c02fdf1e3e8c34fa124260e0b3da3cba7b02021f4"; + sha512 = "f55cc621d04c9d3899e35652a16dd70f299c7568694b3de2135c129369ccb6471c0c7b811182a9b5eb6c803ab9b2c169b99911aa2de30c437fd8eecaac8c1dea"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/be/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-i686/be/firefox-69.0.2.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha512 = "e912b6e121cfc3702585a68e8140c0a9ccfccd2f2a614f3b72bba2ba0794d665c0cc2596bacd2ac64e30b87837551e1b7758554b379301af650df1929003dfa3"; + sha512 = "6638a25ec12cac9d753bb524d9b5531c31e11ce57fa607fd0a45ee602a34b32b7b46cb62db18d14fe21c15e4273f9109f04e08dafbbb13fe56e8b4dbb2511ede"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/bg/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-i686/bg/firefox-69.0.2.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha512 = "9f7c3afbda97498d2377ebcfd6417801054018a7752b7c0e4bc03fd349d80779d43202139423f48adc3af14d71fe8203a144d567bf5b051484847321ba223fea"; + sha512 = "fa01acc679b88354fe6db0e1c757dfba339ef7bf4f95205d771edf21c62373770000db2f794e34d86a0e8a7ba31aa7d6d125a70a305fbbc434b84e8732e361be"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/bn/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-i686/bn/firefox-69.0.2.tar.bz2"; locale = "bn"; arch = "linux-i686"; - sha512 = "97f1e4bec660cd573717524b42490d84bbbc93976a973fba5dfe4ccf3a745b76a494f6386ffb3060e8bc0ede9a32e69a87fd28b9fef33bfae0294a4d8e08069a"; + sha512 = "5ffff990d4ebcf3933577350777ab7bc7798d6e8ca01a4cee42f20c90473c48d2c91884868c22c44153894ced374a0ddee7e8aaec5c3d6ec3f419c20468e0637"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/br/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-i686/br/firefox-69.0.2.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha512 = "99e8bd11f12189b66e9f79c7b197b7b149d274e813a090e118e1823b159e87a335c890f3f257d39bc7ceab7089cf64d4665d2732919cd1ad29c7365ca2f5ca8e"; + sha512 = "2af02050e3ef328bd4669f99de250eae122ea13997428b94b13ebc2ff66bbc9d49d8ae9660a30c399099ab700bcd2db2ff2ebfff7e40e379ad119315dc8bdacf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/bs/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-i686/bs/firefox-69.0.2.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha512 = "5b3947dafa7e7c1d0c7c47a1ee09de3b9cafb47bf39d4ffe536a9f35f56c7ca2a265289f1729b760f09cd3befef2fdedc1e5f7afbdabf03f3c3c0e553da8d925"; + sha512 = "c311a75c53820fd05fc41b02e41a70ba6f3802d1d48e1e66cc76e24e7f74416034cdcdbcd189bac0d8b88088fa5530deb22ba6bd04e238a0ba8de13af760fcee"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/ca/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-i686/ca/firefox-69.0.2.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha512 = "3d83e71c9f3acfe3ac2838eaeba4134ba8cf9ddd6c7be2218e5200ab2507228f3af5ab7930a6a08f368c1c3a31a22b9816803e9ee66f67c1dc0280a0f5f5e98b"; + sha512 = "3fb3cffe26403fda0c578ac815cde6a1d79227ad1cb4b27706d805af0baea726f292a79bab124204e50e90e07fc61a921554a72a19c6960fed846139ff7efec0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/cak/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-i686/cak/firefox-69.0.2.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha512 = "97b0761c67aca6f6ea89e88154ffea95651f98aa5341f155d8f7a25c40f109e5f5ecc4aa7242b8291cd5b28d5df676503cbb52da25f58de4e1274996b412213b"; + sha512 = "0f862f6dc7af2dd8f880edb22c678a20fb0e3a84e3d904c882970ebe7c6d9f66e33cc6d2a0644f8e4416a45bbc44f712bfb51b2009d75635317870d558fdeef1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/cs/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-i686/cs/firefox-69.0.2.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha512 = "6404cb3cbf6b5850c08fa1e222101f340550a30398413ac49c1a498ffe8a73172a65da20d4c71bc66bad840ce5cbab12d93f9a5e47a2969024981b3e3a6c3594"; + sha512 = "5716fe5ac9ace990cca650ecc7c169cc737fb75031d8eccbc181f79acea019328a96d0e8132325a0161a092e051ed0d26fad60c1426ae8245799ecc916ac440b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/cy/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-i686/cy/firefox-69.0.2.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha512 = "2e2f45ab86409368d00af0e8684a2de8f779ae5ed21c4b7bfbbd9b1b6dd2c0cb89ef00ca0d678e2c2f8f0a946ee9576ae3a657e63188b357511da4e512ee0b15"; + sha512 = "c903d8206a0175c5c34a1b4fbcacd5b8139adb721cae921c586851ada8d29880ae1e601286a8a4bdbba8f3f25e9943b63cf449785dc8489ac2d437ac3412bad8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/da/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-i686/da/firefox-69.0.2.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha512 = "f39a37f55d49e00074bafd58a1afff2b2fd2284eb14f43b78c1f0a63fede72458c61a34058a453bda0d537109914bf94ab3912d04cff91286bdddf76d0df9534"; + sha512 = "b2618aaffb14618e7f649c9dea62ce945d5db8a13d8ca71b6377d03df30ac57b18c7d009931704c4be6120015ad39128a2f1f6953828e5b3df5eb4c92aba900e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/de/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-i686/de/firefox-69.0.2.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha512 = "4db0be46edbd3443bbaf6d19f115a0dfd751dc08d55f22c905518f7e30fbdc9d765f905505a1908ab96baf16ac4a2f03b50230c565e278e75533c4379e39a0bb"; + sha512 = "03bcace61e808f009d4bca532f88ae1fc145421cdc4f35613e4224c0a96ae4b251db1e95041da3a7cb4ec96c438a379fe3fbb0b84b672c881f733c300b7d925a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/dsb/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-i686/dsb/firefox-69.0.2.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha512 = "2901e1d382dcc9f67217e15ca2d2575c96be02af1d853e61d4885c3c546171f8da067223a73b53c1176eaa03cf7cdfa80fbe2c74ff20860a8d31642f79ed93de"; + sha512 = "a8e9a7e62a84f9dadfb3028781659d3c7df23b8d922ae8424bed8a0f3cd61515c5c41f70c1d89f243fe949953e7885713ecbf89193ad78bf08c23402e27db478"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/el/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-i686/el/firefox-69.0.2.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha512 = "a31c178ac0003f93ef62091bc1468f30814fd8919ac645b84e6ec5977d13ad983389d04ae7e986ddd0c31325e550c5f8593d64d48450fc50a2d37e32b785165a"; + sha512 = "a34958a80d35c01dced2a53451d300d87b1eba32154ce15eb1588ab7c2ddf4d9b521c60b6746d1372c63375826a84adb3dcc61edfabe264ead2ecc05281f2e4d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/en-CA/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-i686/en-CA/firefox-69.0.2.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha512 = "4ff8b109121ef8fd4f0a817a3d273e3a28ffb952faa072ed3d8822d48691de54035d45abf7fb84a7dfa6a0543c30281896a3eb840f64a658894b477918ecd902"; + sha512 = "151471c8ac80ced526160a53c9026aa4c374c48e7a4f548da386f744a2769c26b36b67566487933c02d8eedfe839cff62c7496b3d91af516df20e0b35c9da8c5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/en-GB/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-i686/en-GB/firefox-69.0.2.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha512 = "c514432dcbc3529ae58b1896621765da05c8a0511461bf6a09015d5b8e7eb14f8873029947d4d7f17b975ed73982746de8d92b651db70f7c6f97530028c7bc7c"; + sha512 = "4f618d64d981d633dc305e4fea60439d382ea0245212cbd1945737bde2d1afc65c69cf1ae33a609d775879471aa3a125bcfb1b0c646c5a9cf905ef0aeeacbcc9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/en-US/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-i686/en-US/firefox-69.0.2.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha512 = "da231783ed7ef640d02fa7bea95191af2081f694594e08160b682bd2725a49db56b54eed868ce11aac6f664d81d588243987ac80adc71bf11f0d03d85e90e14b"; + sha512 = "a90d847edef53119ba8014501c6fadc940085054a6fdea3d565e31c5f054b1c1d1d04dcdb9cbca8a2a123dd0080a36e7e733cf4178a782fbebe7069677b28f23"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/eo/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-i686/eo/firefox-69.0.2.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha512 = "599d9177a80ab92dcb0ed637f5b344d0e7c180985a04bfa213b5254dbaa932af7f920b8dc95a2a9ff2e276cc4ee8d22ac8ee84d9ae012ae085b59cbb6cc15ea8"; + sha512 = "6d88b395dba7cb3659c701e34e3e8dcb676f906b76e5985fe6b00e7f35a760849d1f265d81046854b7624f5d73566ccc4d402b31b302aa712c48e374ec0c4275"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/es-AR/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-i686/es-AR/firefox-69.0.2.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha512 = "01222211b16a3339bc56ead44cd8f9ef8035230c7f154d078ea444e07520d06add00ee100dc1b37af04ee444745cc9b514c90a8d18ff0af2a84276091c90bf0e"; + sha512 = "dff444623c2e36adc9bad96397a852a1b3b48b693ddc36fd0293025bf9ba74084e2a31c24bffe08d402cc4b55b95a7845dc26db16cbfd0720e51b24e17ea8b1e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/es-CL/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-i686/es-CL/firefox-69.0.2.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha512 = "16652520468f1a58798cb1ab6580114449cd7116e9f5564f3c886cbce6bfcc21ae93e5f559f45faa6c273ac9e07b584eec7d3c940c50a84f9c02d6ba9d17f192"; + sha512 = "483e69faed459cd03ba2b23cec038634381ee7f6759d8947cf741da667891c9f9bf2e0276d4fc754cb31281b391ad22170ebc8e710eec8aef65f922e4293b8d3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/es-ES/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-i686/es-ES/firefox-69.0.2.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha512 = "cf96ec9a0f40d4178f0724ca62c9da5208bded775ff0a2ebdf9ff6f0ec7fc919f1450a221050706bb0490347ace75b7bc0e6652f6ff2ca9c5565e06c2b6d4706"; + sha512 = "a0fec9000b79fc5852599de23469b623d1d813ae3c7731924e579967b1297261aec6ab73d605e4171725641f2cec17d8498503d16e93a371767da7015042d69b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/es-MX/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-i686/es-MX/firefox-69.0.2.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha512 = "771da7d61622787543371266527ba41a24022a278788ff585f76208beb9936a6aa9449adf1cced85952aaf2c04f8c6f2a08883071378c66f297d3cb73a53ee9d"; + sha512 = "c87b41584fe94cb995defe294402ec879fc44334f669bae1d5688bf661d6fd43f1715f221634bba930513fb612cb8602f5bade200cdc27f55611e56b709ed049"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/et/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-i686/et/firefox-69.0.2.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha512 = "babfb53e1f5a805013eb149bbabc9e9968423c138bed3f8d6146983928210d44c57565a6abaf1f97fd741fd328a3df60d502b1357ccadde79ec1a228147b9334"; + sha512 = "d28baeb886d075fdb60785476cda5e133fb4afb3108e4d2aee0fa87410ecb556faf7678cf2557dc8e6bce1fd1e0610af9215ed16b5bc92a57a9c789ed5518c5e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/eu/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-i686/eu/firefox-69.0.2.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha512 = "d88809fb0dae2034f36080bd117bec9d2192c3ddea337ca0012391ed6a17d8f09894d0a3799e712fb3c0fe1f6f88074b265366fff92ade0a5f2db8cb96ab0afe"; + sha512 = "c36b95059cea376a02b4a64161e712ed262d8754994168181278b8d87d806abbcc217384c5610aad6ad42a0372cd828d3cc081841c3ff89f805eec37d1d478e3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/fa/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-i686/fa/firefox-69.0.2.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha512 = "acef056f215e333a29bbf8c13e17036e50e7763cad2a0e46324326f25de38b0c0060cd1c313cc7c3fdd43ed537e913a0885c6fe1e474ab7746c82531d3e27b39"; + sha512 = "e668003d18a987b1bc08d4736d13cd1766b4e225740995809066c65454b03ae0354a13cfd971e032e79254d6ac8d2246d94ec9eb9be807751d01c1742d3a05ca"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/ff/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-i686/ff/firefox-69.0.2.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha512 = "dd13224227e1dd82b0b5e153ec4e43e66308fc38e1c8b68402b0a931eccf0e23afd67215832cd01428d975a3dcb72a5e6f876ec3fec2c1641c2058a93e623d83"; + sha512 = "321cab5b4d231ea2b9623dafba4fb4e0ae3e4f9b283d202ea8540daa057ed7b066dc52382b24af9b19711af0a79f5bfc8b8072f27a26941b9d6f6d7862fab306"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/fi/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-i686/fi/firefox-69.0.2.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha512 = "3681a99b3ffa8294a81683395ca158a93ec87484d1490ec55c24b34f24437b6e6ab89b3aaf0430c49cf29dbed5a92e605b4a5dc7cf3d2868eb8bb935b61ecad1"; + sha512 = "d63e5bca29768a6e10fa1cdea04893768df29a39382ae65c2ab64c76e921790c628f3728bf5e7b93d01eaa87af7e1e8c0464fdf9b1f562a22c3736cba27db9cc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/fr/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-i686/fr/firefox-69.0.2.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha512 = "3bf864381286094a373ed77df37d116424f2297c9efcdaf8fd73190253b77701afdda32ee692292bb4889eeb87bba8c1d6aed3c961a58f717c3ecbddc8fe098c"; + sha512 = "be3b4191c10c8d9e001eec25d93d7b45c66cb80c5752d6d98994a3a4cafed513d527e0d707c9d4e387c1fab613d4334707a19bc728901f26b3a8a116685b13ff"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/fy-NL/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-i686/fy-NL/firefox-69.0.2.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha512 = "9468187b6afed9e2fe02cc72e1bb88e06c312af13de59ef97b54f135853ba47916f65dee7543578e01d18352367f4d4ff9c035e4c43666c9510c23f7977fa6f5"; + sha512 = "346c46c329577e990c74e5134b9bec54fb4f892c7b5e52f45a0e9d460ccdcbe8e3c8516f894c4183020c9a60ca26ce74cd3a0867afba6513bf5e005f88d73e2e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/ga-IE/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-i686/ga-IE/firefox-69.0.2.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha512 = "5135e19b3043ca9891af4035583f228d9a628f6b8717c124bbc9ffb6cb19866182521719e544555257a6921cdfd1619a67d21af8be327fe3f5582e39b9cd389a"; + sha512 = "378bc4c3bb2e9ae8c4a8eebde8508fb21d880b6d2c8f46f934383cfaf6b046fbb282e1643ea491e4349d2fda73978c9bffd1c8c22b9183896c5cbaae91d72a03"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/gd/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-i686/gd/firefox-69.0.2.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha512 = "a7d079d791fbde00d83981080694fe813bb2abcd03a014abca9fb9a9df5af9e1daaf4cc6b35b1eaa2359aa9caa317a4352db6ed40a3adbe6021ac76fc48529ee"; + sha512 = "b539a54da10439d874eb8cfb996ff5199d7467ea9f454f9d762d7094dfdec14353e12614f5bd5a9d3f7e8927ad787c254764562a96eeb4b1d0e86a4fde1f0993"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/gl/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-i686/gl/firefox-69.0.2.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha512 = "020c63d6ace98c964588040c15d0e8ecc6a74c63cfaf3e0e64b0bd42bcd2a4e7bf762ac93fc510beb1689203d56812e87be743886ca5eb6d1bafbbbc0fe56216"; + sha512 = "c540869fd35a38446c3846167bdc7d9448dd2110cc2a2086cbabab133cac841a5c1b5c1fe0cb4d91c351dc78c8e32d1a11d640d5e06b0ff2ba82ac1f697383a9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/gn/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-i686/gn/firefox-69.0.2.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha512 = "0681b4cc593d63f4244bbdd6009287d89acb3709741281c6604c5de57593e53876e9448da46a718d2fdfe369feffba1d5b115f5372b68433d5b05ce2d06c3647"; + sha512 = "c69667a0fa55ea3ce6baa9771b9fd1d79f77eec1955228e0b1702c7f19d13048400fe41459847f06a42ea57fc6a6f10ed7629c19bcff9514121331e58bc3b46e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/gu-IN/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-i686/gu-IN/firefox-69.0.2.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha512 = "1e4afa88d7f153f2e653d754c71cfd960b51ecd016a533f868a96d3a4c076d5f0063d7aa169740c5f3c6e91c6c10f54edf1a4ad1829cda2fa83a462856d1f981"; + sha512 = "ee89d19d539e3738f64ab39933ca974e3c4d4f8e6ca74c9cd925165a35663738deeee2f850c898ee83a9182a9466e5a075528d8fae573cead952c5946349fc3e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/he/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-i686/he/firefox-69.0.2.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha512 = "3ea8ff7b1397ca2e2c15cd1fbfa63542d5d31fbea6fe9fe0c11b8bea0d953c2c2e35afe336714bf76baf2f38ed3894d869e9b467fa98fcc38796f1a31c6a0d00"; + sha512 = "28ea17f2930c998d240389ee4fce00344ecc53bcfaf232a6b643c76aace3b2eb443bd2dc01830d6435eabc0091ccb466279dea6df4a36511963a97b192cc30ba"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/hi-IN/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-i686/hi-IN/firefox-69.0.2.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha512 = "eed63dbb1d8a702cd755383f967d859015040db231b464c3691376b3cd6e8ba5b23bec3460bc0c7dd6b0798735a196525530a533caf68e4056d54d54bc4ae50c"; + sha512 = "5f2660e0fc98ce6481f07ea118fe270e18d21088e421ce8a53f38a180c068ac6b6ecaee7bc4fad2526ecf06c9dcd60d87ef8119703d8904bef9732592b699268"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/hr/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-i686/hr/firefox-69.0.2.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha512 = "e79b0398e4a57751c87f11574b9bf6d7b92cd578b41cb80cfceb2f515e01c58bc17426fd7b3668b4d5b48d17abc60009ce1539b2a57355a90a1394f742c8916d"; + sha512 = "11517b04b45cd49a16909532d950508ad566acac98f4b464cb124952c97989c825302df84027198a7ea85c7ce227904aed7d3d229e22b8988678be7dbc2ba556"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/hsb/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-i686/hsb/firefox-69.0.2.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha512 = "704dce04396b78070853cb2ea8a0d6c4bf1da489864f4575a5d98c953b765fd7660e5c75bd3506bb05d94f5eca12d37a50be351fdd189592315e32c3fc361dc1"; + sha512 = "89e86cd92e70f5ae038ed967597822de420160a1c57c61d52354c94a98b4a3b3624645a1ac774916cd3049e6dc9c2fed9bafdaef28822754c8891cde3f2180e3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/hu/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-i686/hu/firefox-69.0.2.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha512 = "613b525e8abc06e54dd985984b690c25e5c9ad8aa072cf5e48b20298b91853a8019696f7d7101d74efe200119a4a9d1196b71fc286bed7916d712dbf6c6b5686"; + sha512 = "7acaf642e8ee366af432bca7066631270d035979d210d7ce23831b54096e967a6b7e870220fcf9eab048df6e0d3bd71d2851f39382d666b305ad007147afc648"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/hy-AM/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-i686/hy-AM/firefox-69.0.2.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha512 = "5d4088682997b0490ac49606dc8ad56158b3b7585ed4b89507a2596d119eae098d82fdf224eb047b6090572fd5b00cb95dfc5027afd6cea11b0f05e6d93ad439"; + sha512 = "0fac10d9a34f19640fd454fdb187581d2b745386b0ed40c88890a2a0b4c1336a9d07624f7faa466f75abfd60c7efccc6c7e59e2aeb0eab1e90c4868c4bf3c9c8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/ia/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-i686/ia/firefox-69.0.2.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha512 = "7ddcddfe7e3baf0bae0bac901b503fca8c344bd02d6b52d90face8b8575318c8805db618e8591372c4c4c60e1092a842f2bb17a920d96e0f15a1491ac847305b"; + sha512 = "4ea1fe6671a8965d159e4244e610f3058ff40c1e5236cf9aa7019db0685a370084bd692cc4f9e4800e6daa701c5eb2492de4c66d9fbcad0a73f5209458b1c813"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/id/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-i686/id/firefox-69.0.2.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha512 = "90cf509c70963750a4bbe5029e5e0512e98c8c7286d80120e39e299920d9331cb72dc7f39f2906e9a5b331b54d2f282b46c4b7f69dde51ce2b06c39e2601d335"; + sha512 = "d7b214515f4d8015439c9e8c99f1d4e9a4bb8678bd3ff3310dfbe497ffa61d886afae690d42fd0ea7dd23716b3d26026a63c4a4ccb5c7ad4e8124492a05089b0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/is/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-i686/is/firefox-69.0.2.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha512 = "ad4c03603a8a81dbdd968ce4831ea40effe90b4cb044315a3c0566b647854fd4e95cdf6c085da8a4f4d901ef671392237aee70e4604552381959b65ea6d32089"; + sha512 = "ffee8ba2d33edb4e2b1f13d2140491baf53bb9965affc604da4fe2a441f5b2f402df366da303b5261e2d8a3de40b8ec54f9c675627cf7ce14098bd513868a59d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/it/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-i686/it/firefox-69.0.2.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha512 = "04dcf6f3b9b3f22a44b74a2e9e20d6fa74a75707c3b3145d048fd9bc10eb4859127cff525367d0e7fdb8ba6d997a7ac1506e3611ddcb80256aa0cfb7d472d407"; + sha512 = "70515a2abf2dde0795a5945073f7f8065336b9922b5c25dacbfd7a165171c9c6e8d73e34259f875bcfda3fa2aff5a35563c37357f7b6e97d177b209483064c05"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/ja/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-i686/ja/firefox-69.0.2.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha512 = "d9d017a9279bafc6d7b440ea7b11ff945bd647601e85b395e0ac086684f58dfb15bfa18688748e934bd76ddb3729804e10a55ec3428f2e03413f9bce8921936f"; + sha512 = "c2a9dafd649c7c08ebae2b5e3a6d8f38abf7105e64d2206ac7e007bbaadfcf7b60cca6259b77b22881065c885a5a88d0484f2486e37a5af689ef53ea936b99d6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/ka/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-i686/ka/firefox-69.0.2.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha512 = "513d865cbda546448b77e7adbc236d24dc1d379fd5c74ada7a8fe6667c61237428f0751e1a9c0e067c9ec5684ddb8b0fe8041b8eaa04e98c4690ca1486c20281"; + sha512 = "f7ade5f8f34a12f22596f5f91a5876e508f40f42511a57d5ae0bf72cd9eea520f3e6f25a93ed75bc243931b2e2513067eb538798218179baffc88452986e07c5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/kab/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-i686/kab/firefox-69.0.2.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha512 = "7747666dffb5a8836ee88669dfa7e5c848e27821911499c1b4d896172bc8f696dbb998c701b043177fe0370000529d8ef807cbebf9457e013ddd822faf4b7a19"; + sha512 = "17b20c0dec71766064fced196c757d6b6bd98e50d251e499edce9656d955729643e85b27492ffe965de3d5bb7693919bff4b721b34c3495fcb231adda7116c00"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/kk/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-i686/kk/firefox-69.0.2.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha512 = "badeb493bbcd591359a283e930d9f042c2c81af24b2824cc4559f1a10a5372dba3eff457121744f0e5a8bc78394215535524f440cfe7435853f4b97db03a05a9"; + sha512 = "fa1da75b80000391fe9267eff190cd6d0b152737c77425f4e553be65e09b181c909fa63c88189cd90fb34e03ac97a3379aac098211cdb50f7d82751db3bb36a3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/km/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-i686/km/firefox-69.0.2.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha512 = "2e33e07d9a35eaff182ad012dbd2f59cfc70170cba518d066bb05bc4873867dc24dcd0dece4fabfc045cda6313d5aa86a31e4c5d42579eecd6a11596a8d806bd"; + sha512 = "f73f28f0dea884f83ab9c0e1e239485689c5aa46bf5aa88fb459c2cf4e717af02857f1858488c5c886c82f719086395f6be4f9a2802172f96a4c1fa624bc50dc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/kn/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-i686/kn/firefox-69.0.2.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha512 = "9ba5560db5f127018b3c365da5c18942da60ce609fbd5ea24c2eac75bb683a0853f212d8c46d7ddbd6190b6158d733d9f9dcd146188940e2705e9ca84caf1c33"; + sha512 = "e777d4c9368b87b771c3b32c9877de90c417a2612d89c88b856bedea0f139482858e48705d6a2f7845b9414d49531e9532bb13462639c36999299b4d094f6e2a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/ko/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-i686/ko/firefox-69.0.2.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha512 = "7f1ac38d2c303fa4d6ba628b3c57f5fbfde1b29e6830f5a2fc657f85d94f37d7474dd590e6b2933103cbabeefc5a51d6e59b434db7c8b422b8071b09a81e73fe"; + sha512 = "fa22beb017404454f729f3b2edd1fcf8dc108a64daee0df17782e214440979eb0985d3c19934ed940fe650ea93c906328bda3a724a6a42967e07f37cd4ab2af4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/lij/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-i686/lij/firefox-69.0.2.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha512 = "9e8023da48c91b1e1eb5cd67ff661413a346fdd9a5062f71df712a4dd237c8b54ead00c49d03342eb32a614b85e55f6cc263a4968c8c6b09e307876483ce39ac"; + sha512 = "974dcd6ff8970360ab11f81b1b3015bae66ad959f2158c476a539202d24eb85ae02dfa1f4178360b8215a8260ab0a2b11bf97fbcf7c73b79e3b594517530eed7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/lt/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-i686/lt/firefox-69.0.2.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha512 = "1d422bfdb4fcdaf791541a778bacd27753e154e6093e0f8e76146f0eda6cbaa40346c519590fc78954d6d88c7fb0bd1c23b0ac5e359dd7a052ec124072a63c1c"; + sha512 = "f5121f98a06ee04040412606a6023bd26307679bb50ef93e607b51b6397bcafb92d0176c3407c45a48f3e21ac111e8415a5083d7a36e942160ce4a99fd17ef6c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/lv/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-i686/lv/firefox-69.0.2.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha512 = "5168aef4edacf147f4f26f8f6c9f9b051339bf8b3910d8cda527321c0a6bb410a4cccc016c939de7d99a2db3b096ca2a14bd9eb5889f468d8aea27d2d96db1a8"; + sha512 = "df5128735ea116c025ee7161f993798bddf7a1e18ca3bac24feae3d4dd61ccec09d95a10fb19f12cd090b8645d3f0776e608628fe717deeb2e8eb9c42d1fc240"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/mk/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-i686/mk/firefox-69.0.2.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha512 = "af4d3216ac877e1fed003056ccb9ef502ee8ed9984df609043190946d7017f0e94838a00c1bbdaae9ff0078a8779bb3e0cef668e9f38dc94f546ef9cb4691e1b"; + sha512 = "ff59e4e400ed7faf2f7ae6c277083219fa8b1a6f9f84332d2639d1dea02cc7e7a7644d7af540637d299573e3abde03a884ae657fb225349e11266bf1c169b9ea"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/mr/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-i686/mr/firefox-69.0.2.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha512 = "744196bffb399181b66ae4c192febdf595906809985807a596d2e482c2e1d519c0e3500ad98d04518b6f71dbdcbacfc481972bf2cf7802ad81f6627fe3b59877"; + sha512 = "4f8a55fbad666b39617f8c3fc6783631cffbc6e6dc97d8047b561d606fb7a010e422d1911df16d965a3fe2b871baf23391ab6aadb1768cedf8065807e1f31501"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/ms/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-i686/ms/firefox-69.0.2.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha512 = "5d79b3b383d4163a4ae5ee84c28d8578b27e4fb42d09691fa7cd6fdf77e3a74e5e83c9bac581fa59e74b2aaaf8713f9f3b6b1d5ad778579f274d6f08fb4fc36c"; + sha512 = "8aead1b0d2c83e50c59e626ff77027077d26cc2fadcf702d4d825bddde58bf4163a5c5f7fc179b0cd9cad3c899b4f3e529e660e20bb6ce47a699d312bacd7b3e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/my/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-i686/my/firefox-69.0.2.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha512 = "60b128b6d0cc632667b496f8b61e39fd14ad4c1544b4d0041cf739622c5c1b1cae539e848fd5944d0c3286f0b03dc2de46a156457ec6e2efa155e13cf7ce279d"; + sha512 = "e60f014d5f3fb838451541fd1a9dffeffa1150f449a38374c981dd8cb785decc72027a207cfe0e64fc550166e931f86793cb1aadcbede8656818452c36e2ebe0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/nb-NO/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-i686/nb-NO/firefox-69.0.2.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha512 = "32e52dc1b1221862c0e3243e29234b330d73cc99c4500faf785aa911c92019e655beaab6f79911a8661a5efbd1dc8784aa328216653c2a206e52f703057f15c8"; + sha512 = "a5ce10c96f910ffe60f926599e415a30f1ae22f78cfe837140b5fb0112a5126f7fb219259eb7c1ed8c89e476ec5bcaafd17e0422f66833ba87c58c8eb62993de"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/ne-NP/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-i686/ne-NP/firefox-69.0.2.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha512 = "04802130d9f08cfef7d0f5d29e0ed0b9757c3b7fbac001bd35431ea4851edd8c2e4837518fa893381f6c0c976684ffedeaa96b2bcdec3849cd2cca6bf170bdd3"; + sha512 = "b1e90bb61b75dafa61653a340bd80331d0c4a93d5aaa41ad944741c056acc62b16d2243a6618c99d3c9f69b6bb6993cc509476052973cf68596f7bbf4577f10d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/nl/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-i686/nl/firefox-69.0.2.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha512 = "fc02ea317fa90caf203608a31f2a188971bf5d6a900c8f03a422ffa76adb1eefd32c55f317c7c89c8443d11a79f0041a6a111a78519b441eaa7ec4832bd8ad38"; + sha512 = "5ba6a608aaa0125995c5e4d8f62f4e61a48159a60632988c0adfbd63d90c957fffa2517cc13633fe3257a60bfec6281d5550f0332810ee1aa75400eedb1d598e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/nn-NO/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-i686/nn-NO/firefox-69.0.2.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha512 = "f7f1274605b79541ec6f93cc7f023fe437c93e969d3644c6867a7c2c448f5504f9a6fc29f47c4267f13187ff6eb1b240e32e17dd2e5d66afc96e0a3bbecd9922"; + sha512 = "f8f5325e0d724c006a83ba41e4232463c4913753280b508c38c505e79c46029a7fe8ddb9219acdd80ee5c84b31a759a54ad961b6e37d780db7df5b527242a72f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/oc/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-i686/oc/firefox-69.0.2.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha512 = "ce1c1a35de6ac933192cbdd49370d5cbf90dfb993dcc8e3c739f2e3ff2023cc793f7ffeec40b3ba4093449dcd37e221932a6c3771f8f70ec074bf79e50320f69"; + sha512 = "1c2940a380f4d58cc86be0946ca437e29fbf3072b1601402831faccdbc3eac85b95d435257f818b07bf1881dae618c619fe2453b8851bdf0796d907c609ea69a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/pa-IN/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-i686/pa-IN/firefox-69.0.2.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha512 = "50b4826d83cf08ebccae048c4dd3760f3ec639427d6354de398b77501e73df5062b8090590fcd74be54005a7df61a8cd7c2f4207142bdcd6468b1fbc126801a3"; + sha512 = "215759a9748edaef6720f3c9146e610ac067f9e92f9395ca7097607692801ac56f1d4c8f02de03307144d04bc54345239e1a92470d4b6a0a16a886e5899e9aea"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/pl/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-i686/pl/firefox-69.0.2.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha512 = "ae77877e1eb03174a1899b2b5d0820b367553d56febea14df4f1545a7f10de16c9f4401efad4334ae04a4a5c8abe49b2e24c09263bc002937576ad5ce622ed17"; + sha512 = "fea49ac1dd08b0de8ebf4b64b026ad1511661a92cb49b3e600917a37a4f7e8b920dddf6e50252b53c6edf74d5d373b770247632886689d87a1c489b8d0c361dc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/pt-BR/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-i686/pt-BR/firefox-69.0.2.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha512 = "92cd33b35927dddc22e8a3ff3833ce2bb4913ae9ea12d4220d88861f7badcd69d1dd97be22cb6546a8f09b0e7620e17eedddee3d159660c9128c288e49a47dbf"; + sha512 = "f9fb77f1165f3230408a620cda6df1e0ab3fe749f34c5a8e33e8de52764e08568ca3e642c49b9eac33c52f7d33bb41a7df2735ea0b5960e64d16d3c9f1b35b28"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/pt-PT/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-i686/pt-PT/firefox-69.0.2.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha512 = "fb8d011fca706e6337e0b0b13b2e1ec619565b954c887c71720240905ec5c085aa7037b54e8b3df316c253483a3d3c7ad2182b27d8591d4e2840c6a4f9e39382"; + sha512 = "23d029b3187a6de32037aaf0872c4f33de4664eca779d9fc7c10b2aac04274905aaff61542a0686dd50e56c60ff2db56ff981a0124eaa268dda27d74db8f56f6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/rm/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-i686/rm/firefox-69.0.2.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha512 = "fbf0e34fbae7da291cc132697b6505f3213ad07c78a47171827a9bd6c22b674629cd21a9f47187173cf21f1b168baad0f058365a9ab24e274a2d3aff5acd0e38"; + sha512 = "cfd45aae4671eb2c4bca7d397b5ea5987f092d99944adf6c3e66ec4b40f044ee072ad72fab5e62acd13b2990ea6bb50eb6dd42abfd735393a77d959a626eb1be"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/ro/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-i686/ro/firefox-69.0.2.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha512 = "cb712f917e0b70936ba1222f03c8874134e1cac6c901d94792aada224d894a607829b64993535f0cf61d8a2a050f488452c35404400587222418c8312e2b22f6"; + sha512 = "2ac00a6503443b1d46327eccd94b97afd2a4fb7ec7ed108b3098c98a3f9da3fbef949d821274b596dd9b5c243396056bf50c6a21a854de9e91bb2f2a8cf71749"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/ru/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-i686/ru/firefox-69.0.2.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha512 = "7ba048f533655e5802347a6d409ed6db4441b421cb81d66269eb610336f3fe2077a5bea405f235c167390f745762ef29863e83e6e704bdec17404d26a97f8ab1"; + sha512 = "17514d91496849a32fa830abe5cad8ebfa23da496af57d6c79ab46d7dc0a9c6f25af7969b23ead52f7a56385a4d22cd32503ad26d87584031aa080b689ab4e9e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/si/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-i686/si/firefox-69.0.2.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha512 = "ea59ce14e80132d96f0419981dda30184809542978d158b8894c77cb4622c3f0bfb9bbbc4d456b386a023d9856ff6b02e5388ddfb0aced2ca764991ba8bab48e"; + sha512 = "cfa2527b657b6136a25bc4edbd594b0353c8e2072f147da3be0d3bfd11ae1082252de9a5fafc2d0deb2fb2815c5e8e3a2426685976b4711a4de0cfa02ee62099"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/sk/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-i686/sk/firefox-69.0.2.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha512 = "4665b3b4b96a07ea0530acf4063dacfa48ff39a65d2e1da0f6d3f65703c3916ed65a8881d8a9d92109e252993f63edfec899d00a3559149a282b615624267431"; + sha512 = "1f38bb9237e7937b2c152204bb0403030e1fe05e6b6fc7bf28168eff1caae4204b4b469ac36ba04633ecfbaba17141d11167cd7f49943322e4fc7444f8f38785"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/sl/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-i686/sl/firefox-69.0.2.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha512 = "f3d6486a3dfc435933871cc8abcd3a428d724dfccca26be63df29d9f5b34fec115bb6e185b2aaf839f428d0ab44d33583610bf9d1c7f02de442506d1fc06192d"; + sha512 = "76a01cdae11ad8364cf32f1cb7580d728954b7a2d6944a8b1af49cef282b45a5727093723b34ffe3d488d8ec24925b88622afeb966008df4bfba8d495d2919f8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/son/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-i686/son/firefox-69.0.2.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha512 = "6486e2f291deb1fb241df996e7898a9d487889815195d01d77d6bfcab6e2cb4bdc24c7694b6b05a95758ef130cb3332842e36446ffc2a926940ded5031cfa13c"; + sha512 = "9bbbb4f9062e700dbae41df85bba28aeb99aeb73850e02cdecbdde4bca3fcb6808cd1079a8102ca9279ff5f2349418414c958ff316dee9a05fa8bd8bb9d499ba"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/sq/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-i686/sq/firefox-69.0.2.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha512 = "b111d30e2cb7fd5edadc68b9d25fd8970db62d721e903d9874afe6b875b313d039dc7c4e98e3de07a09fe84ca7d0ed10da2e74cf3cd4953b2c25252e16e01516"; + sha512 = "396e93b74ca2a00a57569322d4d7874c8bb29b326003726d5c4ee0e3db22d6504b1d73232ee3120b3a6f7f5b7244d5c98e441cd0d8e190c6d5004e1971ee08d6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/sr/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-i686/sr/firefox-69.0.2.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha512 = "14c98d156bcae234c12f28166ee5ffc7d034529efb76536ffb29ee8baf850cb3c934ba177956ceba9c4cde2481064c3a906515328d1d8b6f5d9258cc1d30da94"; + sha512 = "8322797d3ede9d475a4b4b45472d513e3a2d6cb052a7645f0bc683e9df0fbba4bccf5fdbedb56e4136df1a4a1c5ac9b7aed49480aa6c8607fd5387bb5c50f0f7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/sv-SE/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-i686/sv-SE/firefox-69.0.2.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha512 = "a196eb9ec6b667d04dd787aae47a1dd22a99f01fdcbf6b36e9946038dad52ddc3d215e2307641c3f539e476c9b8e3f9470d78b914a243b51595f7d75cad2e114"; + sha512 = "01550f47dcb1dd9fe5cf6fb00098ff910e71e0c1a58f9c8956f97de47cb67527df8e14a8b82fc878aed1ebba50e99183285252269c8d158e6e11ede5a5240073"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/ta/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-i686/ta/firefox-69.0.2.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha512 = "d76c3797cd752a2b8021694421c224c2e2afa2d1350cb86263b01a8efd84b49cbda40a5c6b64f981833865944798148508fd6ae3532e82b773d650b41980893f"; + sha512 = "3acfdcc73aab0ecda77f96fd37ae9643c619a14b1a9d88f6058d0b16e000352680d39e6e37498b62e234385c60d2ab1224943ea057b069a5b492cea24ba4a37f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/te/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-i686/te/firefox-69.0.2.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha512 = "8bf86410d1d73cf355ecc4c2ef3308c35a31d55f90bba1c942f915e8cedee919c80729271c2d9e3aecbf499ca711f36bcf74c8b41c50024161e567d395485477"; + sha512 = "768926b2fcf050675d3e9d915fd336d5c85f9e73a4a27e33bca7b78cc5161a0f142134fc8c0dac18f6cd47c309b1c90d5f21b8136075becb92e3f4e3507f6731"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/th/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-i686/th/firefox-69.0.2.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha512 = "c757659188b17cfad880e70eab772517128bfa7d1dcdb86f313a63fb46c3f3d3504d66bf3ac99d1058848264ee4458bc5b77bf78009e9a7216c1fa359714a3d6"; + sha512 = "d6b23302197682eb9c4c3323ee3a385c14844889adc8b82b9d6df837bc429b07ccb1c4c4ee5b383f1571a46a900b8c95eebd52649f118d716673f0be4cc8d0ae"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/tr/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-i686/tr/firefox-69.0.2.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha512 = "635ad19f913a2d6dc46df50589229658dcea0bc570f45b7c5ff8eb6878b852ebde3a490512d679a6257c39b16fb986f40ea2894c08caed8c485a91e95f4addc3"; + sha512 = "7f3ea40a95b093191f3a83f29b2616f99f45bcdb5de5a796dd3d0c10b08317d5e39a63133436e9109a39c76846163a46b9be1b16c6b22059176f5f8c902c8046"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/uk/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-i686/uk/firefox-69.0.2.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha512 = "99a3410ea2caf11911e7613568f7522230b13dcef48ffe6b95206a6a6d9f43f396b37bda1fad62dc4db097da55f96b30683626031491d88d116797b605d3cd2c"; + sha512 = "3c09c74b77226548dc5842fe67990f69b89a6dec5f86f4bcf98cc7a04ec8810e55e988350c231b951c96d3005c86e45a27e9fc507acd1855a86c42ce8aeb3194"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/ur/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-i686/ur/firefox-69.0.2.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha512 = "aeb60017d6ff2deb1675880c2358eb2a8561196e6148e8f796bc6964d26c303355339d7e6e4526be0814190a3bc4a98b48228457d6709a762e0e36bc83f6fb52"; + sha512 = "098a78e40511e2ab7d2b093da2c34867b46fdf8f9bf7ee123641149da5ca11cb9ab8aa9be2665bc58521fd1d7b3ab1a05a28c78ba15bec9ed15aebe838014d79"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/uz/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-i686/uz/firefox-69.0.2.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha512 = "99d025db18d86f75818354abfa56bb13041832605f25e0b91c87e18bda06d059ba62aec8be7141c8c6cc5f34edfeb83bfcff9234222ec88121b51fafdeab7ca1"; + sha512 = "9a9d1c10a787e69afc67d352fe5626993b23a4d04c17463e80001350dfbd0703af1793dbe5040e6614de268ec1d7d3789fc0363635d1bc773a7a6da94bb2778c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/vi/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-i686/vi/firefox-69.0.2.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha512 = "5e5a586ed274f112ca20d729c89b949c46eefdf2d993e4bc27ecc4a40530f89ab68838dc458e510cb5d862e63c1b7b6188657650599dea920070092f091d6a2e"; + sha512 = "18fb0259a310543991eccb796debfb156a77a942cb94264105526f5637c9d39b21fc033e62c837d41b3b316732caa6d3118abfc48ac0b3188c8a995dac95c828"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/xh/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-i686/xh/firefox-69.0.2.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha512 = "fbcf97c7235c0a765fa083893dbd1e82e6b9befd8266bc86c1b1ca7a5d1674af2cdd8c86d6f2087683823eac2774e0b8983c4da93c72115ea4d53e6b73815140"; + sha512 = "ef8008332ec10d03a24928e13c01bb9bf6c75efd9a96e992d00dae4ffb250d054724752189bcc87c88edf502002130af626082b4320ca644de7da10b84306a44"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/zh-CN/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-i686/zh-CN/firefox-69.0.2.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha512 = "93cce943be38357705ce7d1d4c5d88e5256c34280479216a4f739b60665ba832ef7b18b23730256871ce3bbfcae744ec421ebd56aaa73acb6cee91de03d0abe9"; + sha512 = "55920dcac08a969e5db550fe22c419043011301bc9d7863bbd0744350f267d66cfd6deb63de8690ad363d047570a5e9e8354d649730dcc7bc2570b6e409f0f98"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0/linux-i686/zh-TW/firefox-69.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0.2/linux-i686/zh-TW/firefox-69.0.2.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha512 = "407014668d7fd6802c1966cb8ac8571c151877ae3a9841e581784987a0337cff5c5ff191d13f305c371c7880a269b8483ac96b08bfd9f04b8ee4747adca5715d"; + sha512 = "96677bf71dd3ecf7466fcc8b6b7fb41470634a7c1eae4662c6f6a509f3f97ebfddae10d28e3d575a2caa573996fcd386359244860e2962b0c345fb7cb8591be9"; } ]; } diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix index e1d4014c83bb..eabd3239586a 100644 --- a/pkgs/applications/networking/browsers/firefox/packages.nix +++ b/pkgs/applications/networking/browsers/firefox/packages.nix @@ -17,10 +17,10 @@ rec { firefox = common rec { pname = "firefox"; - ffversion = "69.0"; + ffversion = "69.0.2"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz"; - sha512 = "2q0gky7a6ayb6mw8bw3s35q3ggibf7vfyrxgggz1l4lpcv6dwjj01x45071h106jkvnh71hycvp1cywf98lkybjbfp8c9kd8sivkd43"; + sha512 = "2ag1syrvlkch7vl151hkq8abf86p9v6b6gmgcbh26b8wfva1p1ss1x09h4w50zmcc6jq4q5mcxgf1sd9zna552jl90k1y4rqvrrzwl6"; }; patches = [ @@ -32,6 +32,7 @@ rec { homepage = http://www.mozilla.com/en-US/firefox/; maintainers = with lib.maintainers; [ eelco andir ]; platforms = lib.platforms.unix; + badPlatforms = lib.platforms.darwin; license = lib.licenses.mpl20; }; updateScript = callPackage ./update.nix { @@ -70,11 +71,11 @@ rec { firefox-esr-60 = common rec { pname = "firefox-esr"; - ffversion = "60.8.0esr"; + ffversion = "60.9.0esr"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz"; - sha512 = "0332b6049b97e488e55a3b9540baad3bd159e297084e9a625b8492497c73f86eb3e144219dabc5e9f2c2e4a27630d83d243c919cd4f86b7f59f47133ed3afc54"; + sha512 = "4baea5c9c4eff257834bbaee6d7786f69f7e6bacd24ca13c2705226f4a0d88315ab38c650b2c5e9c76b698f2debc7cea1e5a99cb4dc24e03c48a24df5143a3cf"; }; patches = [ @@ -265,17 +266,17 @@ in rec { gtk3Support = false; }; - tor-browser-8-5 = tbcommon { - ffversion = "60.8.0esr"; - tbversion = "8.5.4"; + tor-browser-8-5 = tbcommon rec { + ffversion = "60.9.0esr"; + tbversion = "8.5.6"; # FIXME: fetchFromGitHub is not ideal, unpacked source is >900Mb src = fetchFromGitHub { owner = "SLNOS"; repo = "tor-browser"; - # branch "tor-browser-60.8.0esr-8.5-1-slnos" - rev = "9ec7e4832a68ba3a77f5e8e21dc930a25757f55d"; - sha256 = "10x9h2nm1p8cs0qnd8yjp7ly5raxagqyfjn4sj2y3i86ya5zygb9"; + # branch "tor-browser-60.9.0esr-8.5-2-slnos" + rev = "0489ae3158cd8c0e16c2e78b94083d8cbf0209dc"; + sha256 = "0y5s7d8pg8ak990dp8d801j9823igaibfhv9hsa79nib5yllifzs"; }; patches = [ diff --git a/pkgs/applications/networking/browsers/midori/default.nix b/pkgs/applications/networking/browsers/midori/default.nix index a0bc0c743e46..f87ba43f2bba 100644 --- a/pkgs/applications/networking/browsers/midori/default.nix +++ b/pkgs/applications/networking/browsers/midori/default.nix @@ -1,24 +1,52 @@ -{ stdenv, fetchurl, cmake, ninja, pkgconfig, intltool, vala, wrapGAppsHook, gcr, libpeas -, gtk3, webkitgtk, sqlite, gsettings-desktop-schemas, libsoup, glib-networking +{ stdenv +, fetchurl +, cmake +, ninja +, pkgconfig +, intltool +, vala_0_44 +, wrapGAppsHook +, gcr +, libpeas +, gtk3 +, webkitgtk +, sqlite +, gsettings-desktop-schemas +, libsoup +, glib-networking +, json-glib +, libarchive }: stdenv.mkDerivation rec { pname = "midori"; - version = "7"; + version = "9.0"; src = fetchurl { - url = "https://github.com/midori-browser/core/releases/download/v${version}/midori-v${version}.0.tar.gz"; - sha256 = "0ffdnjp55s0ci737vlhxikb2nihghwlb6mjcjzpgpnzi47vjqnwh"; + url = "https://github.com/midori-browser/core/releases/download/v${version}/midori-v${version}.tar.gz"; + sha256 = "05i04qa83dnarmgkx4xsk6fga5lw1lmslh4rb3vhyyy4ala562jy"; }; nativeBuildInputs = [ - pkgconfig cmake ninja intltool vala wrapGAppsHook + cmake + intltool + ninja + pkgconfig + vala_0_44 + wrapGAppsHook ]; buildInputs = [ - gtk3 webkitgtk sqlite gsettings-desktop-schemas gcr - (libsoup.override { gnomeSupport = true; }) libpeas + (libsoup.override { gnomeSupport = true; }) + gcr glib-networking + gsettings-desktop-schemas + gtk3 + libpeas + sqlite + webkitgtk + json-glib + libarchive ]; meta = with stdenv.lib; { diff --git a/pkgs/applications/networking/browsers/next-gtk-webkit/default.nix b/pkgs/applications/networking/browsers/next-gtk-webkit/default.nix new file mode 100644 index 000000000000..6ab533763109 --- /dev/null +++ b/pkgs/applications/networking/browsers/next-gtk-webkit/default.nix @@ -0,0 +1,25 @@ +{ stdenv, gcc7, pkg-config +, next +, webkitgtk, gsettings-desktop-schemas +}: + +stdenv.mkDerivation rec { + pname = "next-gtk-webkit"; + inherit (next) src version; + + makeFlags = [ "gtk-webkit" "PREFIX=$(out)" ]; + installTargets = "install-gtk-webkit"; + + nativeBuildInputs = [ gcc7 pkg-config ]; + buildInputs = [ + webkitgtk + gsettings-desktop-schemas + ]; + meta = with stdenv.lib; { + description = "Infinitely extensible web-browser (user interface only)"; + homepage = https://next.atlas.engineer; + license = licenses.bsd3; + maintainers = [ maintainers.lewo ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/applications/networking/browsers/next/default.nix b/pkgs/applications/networking/browsers/next/default.nix new file mode 100644 index 000000000000..2b2e173342c5 --- /dev/null +++ b/pkgs/applications/networking/browsers/next/default.nix @@ -0,0 +1,80 @@ +{ pkgs, stdenv, fetchFromGitHub +, gcc7, pkg-config, makeWrapper +, glib-networking +, next-gtk-webkit +, lispPackages +, sbcl +}: + +stdenv.mkDerivation rec { + pname = "next"; + version = "1.3.1"; + + src = fetchFromGitHub { + owner = "atlas-engineer"; + repo = "next"; + rev = version; + sha256 = "01fn1f080ydk0wj1bwkyakqz93bdq9xb5x8qz820jpl9id17bqgj"; + }; + + # Stripping destroys the generated SBCL image + dontStrip = true; + + prePatch = '' + substituteInPlace source/ports/gtk-webkit.lisp \ + --replace "next-gtk-webkit" "${next-gtk-webkit}/bin/next-gtk-webkit" + ''; + + nativeBuildInputs = [ sbcl makeWrapper ]; + buildInputs = with lispPackages; [ + trivial-features + trivial-garbage + alexandria + bordeaux-threads + cl-json + cl-markup + cl-ppcre + cl-ppcre-unicode + closer-mop + dexador + ironclad + lparallel + parenscript + quri + cl-css + log4cl + mk-string-metrics + sqlite + str + swank + trivia + trivial-clipboard + unix-opts + dbus + ]; + propagatedBuildInputs = [ next-gtk-webkit ]; + + buildPhase = '' + common-lisp.sh --eval "(require :asdf)" \ + --eval "(asdf:load-asd (truename \"next.asd\") :name \"next\")" \ + --eval '(asdf:make :next)' \ + --quit + ''; + + installPhase = '' + install -D -m0755 next $out/bin/next + ''; + + preFixup = '' + wrapProgram $out/bin/next \ + --prefix GIO_EXTRA_MODULES : "${glib-networking.out}/lib/gio/modules" + ''; + + meta = with stdenv.lib; { + description = "Infinitely extensible web-browser (with Lisp development files)"; + homepage = https://next.atlas.engineer; + license = licenses.bsd3; + maintainers = [ maintainers.lewo ]; + platforms = [ "x86_64-linux" ]; + }; + } diff --git a/pkgs/applications/networking/browsers/opera/default.nix b/pkgs/applications/networking/browsers/opera/default.nix index 062d2e6582b1..b968c4f3d9d1 100644 --- a/pkgs/applications/networking/browsers/opera/default.nix +++ b/pkgs/applications/networking/browsers/opera/default.nix @@ -36,60 +36,14 @@ , systemd , at-spi2-atk , at-spi2-core +, autoPatchelfHook +, wrapGAppsHook }: let mirror = "https://get.geo.opera.com/pub/opera/desktop"; - rpath = lib.makeLibraryPath [ - - # These provide shared libraries loaded when starting. If one is missing, - # an error is shown in stderr. - alsaLib.out - atk.out - cairo.out - cups - curl.out - dbus.lib - expat.out - fontconfig.lib - freetype.out - gdk-pixbuf.out - glib.out - gnome2.GConf - gtk3.out - libX11.out - libXScrnSaver.out - libXcomposite.out - libXcursor.out - libXdamage.out - libXext.out - libXfixes.out - libXi.out - libXrandr.out - libXrender.out - libXtst.out - libxcb.out - libnotify.out - libuuid.out - nspr.out - nss.out - pango.out - stdenv.cc.cc.lib - - # This is a little tricky. Without it the app starts then crashes. Then it - # brings up the crash report, which also crashes. `strace -f` hints at a - # missing libudev.so.0. - systemd.lib - - # Works fine without this except there is no sound. - libpulseaudio.out - - at-spi2-atk - at-spi2-core - ]; - in stdenv.mkDerivation rec { pname = "opera"; @@ -102,23 +56,63 @@ in stdenv.mkDerivation rec { unpackCmd = "${dpkg}/bin/dpkg-deb -x $curSrc ."; + nativeBuildInputs = [ + autoPatchelfHook + wrapGAppsHook + ]; + + buildInputs = [ + alsaLib + at-spi2-atk + at-spi2-core + atk + cairo + cups + curl + dbus + expat + fontconfig.lib + freetype + gdk-pixbuf + glib + gnome2.GConf + gtk3 + libX11 + libXScrnSaver + libXcomposite + libXcursor + libXdamage + libXext + libXfixes + libXi + libXrandr + libXrender + libXtst + libnotify + libuuid + libxcb + nspr + nss + pango + stdenv.cc.cc.lib + ]; + + runtimeDependencies = [ + # Works fine without this except there is no sound. + libpulseaudio.out + + # This is a little tricky. Without it the app starts then crashes. Then it + # brings up the crash report, which also crashes. `strace -f` hints at a + # missing libudev.so.0. + systemd.lib + ]; + installPhase = '' - mkdir --parent $out - mv * $out/ + mkdir -p $out + cp -r . $out/ mv $out/lib/*/opera/*.so $out/lib/ ''; - postFixup = '' - find $out -executable -type f \ - | while read f - do - patchelf \ - --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath "$out/lib:${rpath}" \ - "$f" - done - ''; - meta = with lib; { homepage = "https://www.opera.com"; description = "Web browser"; diff --git a/pkgs/applications/networking/browsers/qutebrowser/default.nix b/pkgs/applications/networking/browsers/qutebrowser/default.nix index 1f441b4e9615..7b13d748fe05 100644 --- a/pkgs/applications/networking/browsers/qutebrowser/default.nix +++ b/pkgs/applications/networking/browsers/qutebrowser/default.nix @@ -10,23 +10,23 @@ assert withMediaPlayback -> gst_all_1 != null; let pdfjs = let - version = "2.1.266"; + version = "2.2.228"; in fetchzip rec { name = "pdfjs-${version}"; url = "https://github.com/mozilla/pdf.js/releases/download/v${version}/${name}-dist.zip"; - sha256 = "1ybbnpz2jcdikzwr7r13lq528vxj3bpms1fqmg3n1zgs30cqpkby"; + sha256 = "0yik4vfnz46j844jfw1gq5cshgzry42kpy2d5rr7fbn9fjf98bw6"; stripRoot = false; }; in mkDerivationWith python3Packages.buildPythonApplication rec { pname = "qutebrowser"; - version = "1.7.0"; + version = "1.8.1"; # the release tarballs are different from the git checkout! src = fetchurl { url = "https://github.com/qutebrowser/qutebrowser/releases/download/v${version}/${pname}-${version}.tar.gz"; - sha256 = "0wyjmb2qvnw3gn0ypgckwblmn7kasi12dfwp343hi6wscqripw7i"; + sha256 = "0ckffbw2zlg0afz4rgyywzdprnqs74va5qj0xqlaqc14ziiypxnw"; }; # Needs tox @@ -108,6 +108,6 @@ in mkDerivationWith python3Packages.buildPythonApplication rec { homepage = https://github.com/The-Compiler/qutebrowser; description = "Keyboard-focused browser with a minimal GUI"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ jagajaga rnhmjoj ]; + maintainers = with maintainers; [ jagajaga rnhmjoj ebzzry ]; }; } 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 739315917d43..563c0e751c84 100644 --- a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix +++ b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix @@ -95,18 +95,12 @@ let srcs = { x86_64-linux = fetchurl { - urls = [ - "https://github.com/TheTorProject/gettorbrowser/releases/download/v${version}/tor-browser-linux64-${version}_${lang}.tar.xz" - "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz" - ]; + url = "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz"; sha256 = "00r5k9bbfpv3s6shxqypl13psr1zz51xiyz3vmm4flhr2qa4ycsz"; }; i686-linux = fetchurl { - urls = [ - "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz" - "https://github.com/TheTorProject/gettorbrowser/releases/download/v${version}/tor-browser-linux32-${version}_${lang}.tar.xz" - ]; + url = "https://github.com/TheTorProject/gettorbrowser/releases/download/v${version}/tor-browser-linux32-${version}_${lang}.tar.xz"; sha256 = "1nxvw5kiggfr4n5an436ass84cvwjviaa894kfm72yf2ls149f29"; }; }; diff --git a/pkgs/applications/networking/browsers/vivaldi/default.nix b/pkgs/applications/networking/browsers/vivaldi/default.nix index 6483b6d03e30..51a9cc9aec07 100644 --- a/pkgs/applications/networking/browsers/vivaldi/default.nix +++ b/pkgs/applications/networking/browsers/vivaldi/default.nix @@ -17,11 +17,11 @@ let vivaldiName = if isSnapshot then "vivaldi-snapshot" else "vivaldi"; in stdenv.mkDerivation rec { pname = "vivaldi"; - version = "2.7.1628.33-1"; + version = "2.8.1664.40-1"; src = fetchurl { url = "https://downloads.vivaldi.com/${branch}/vivaldi-${branch}_${version}_amd64.deb"; - sha256 = "1km5ccxqyd5xgmzm42zca670jf7wd4j7c726fhyj4wjni71zar34"; + sha256 = "07v7p3r9yc566xkwhiazd80pj2d6rcvs3xnbnwjambi1rajbs5sx"; }; unpackPhase = '' diff --git a/pkgs/applications/networking/browsers/webmacs/default.nix b/pkgs/applications/networking/browsers/webmacs/default.nix new file mode 100644 index 000000000000..0f36177278b9 --- /dev/null +++ b/pkgs/applications/networking/browsers/webmacs/default.nix @@ -0,0 +1,73 @@ +{ lib +, mkDerivationWith +, fetchFromGitHub +, python3Packages +, herbstluftwm +}: + +mkDerivationWith python3Packages.buildPythonApplication rec { + pname = "webmacs"; + version = "0.8"; + + disabled = python3Packages.isPy27; + + src = fetchFromGitHub { + owner = "parkouss"; + repo = "webmacs"; + rev = version; + fetchSubmodules = true; + sha256 = "1hzb9341hybgrqcy1w20hshm6xaiby4wbjpjkigf4zq389407368"; + }; + + propagatedBuildInputs = with python3Packages; [ + pyqtwebengine + setuptools + dateparser + jinja2 + pygments + ]; + + dontWrapQtApps = true; + + makeWrapperArgs = [ "\${qtWrapperArgs[@]}" ]; + + # See https://github.com/parkouss/webmacs/blob/1a04fb7bd3f33d39cb4d71621b48c2458712ed39/setup.py#L32 + # Don't know why they're using CC for g++. + preConfigure = '' + export CC=$CXX + ''; + + doCheck = false; # test dependencies not packaged up yet + + checkInputs = [ + python3Packages.pytest + #python3Packages.pytest-xvfb + #python3Packages.pytest-qt + python3Packages.pytestCheckHook + herbstluftwm + + # The following are listed in test-requirements.txt but appear not + # to be needed at present: + + # python3Packages.pytest-mock + # python3Packages.flake8 + ]; + + meta = with lib; { + description = "Keyboard-based web browser with Emacs/conkeror heritage"; + longDescription = '' + webmacs is yet another browser for keyboard-based web navigation. + + It mainly targets emacs-like navigation, and started as a clone (in terms of + features) of conkeror. + + Based on QtWebEngine and Python 3. Fully customizable in Python. + ''; + homepage = https://webmacs.readthedocs.io/en/latest/; + changelog = https://github.com/parkouss/webmacs/blob/master/CHANGELOG.md; + license = licenses.gpl3; + maintainers = with maintainers; [ jacg ]; + platforms = platforms.all; + }; + +} diff --git a/pkgs/applications/networking/cawbird/default.nix b/pkgs/applications/networking/cawbird/default.nix new file mode 100644 index 000000000000..51657659b95a --- /dev/null +++ b/pkgs/applications/networking/cawbird/default.nix @@ -0,0 +1,46 @@ +{ stdenv, fetchFromGitHub, glib, gtk3, json-glib, sqlite, libsoup, gettext, vala +, meson, ninja, pkgconfig, gnome3, gst_all_1, wrapGAppsHook, gobject-introspection +, glib-networking, python3, fetchpatch }: + +stdenv.mkDerivation rec { + version = "1.0.1"; + pname = "cawbird"; + + src = fetchFromGitHub { + owner = "IBBoard"; + repo = "cawbird"; + rev = "v${version}"; + sha256 = "sha256:0bk33fh32nnv6ya6j0ij34abw6a3g6m8fq13303slhhja8xhvmb1"; + }; + + nativeBuildInputs = [ + meson ninja vala pkgconfig wrapGAppsHook python3 + gobject-introspection # for setup hook + ]; + + buildInputs = [ + glib gtk3 json-glib sqlite libsoup gettext gnome3.dconf gnome3.gspell glib-networking + ] ++ (with gst_all_1; [ gstreamer gst-plugins-base gst-plugins-bad (gst-plugins-good.override { gtkSupport = true; }) gst-libav ]); + + patches = [ + # Fix build with vala 0.46 + (fetchpatch { + url = "https://github.com/IBBoard/cawbird/commit/7b88f8856d108b9555ba7b855c7daed7b9e745ca.patch"; + sha256 = "10kfdy91yas4xyz0hd057q6nsqfrkljcj7pql81xgm43qaff31y0"; + }) + ]; + + postPatch = '' + chmod +x data/meson_post_install.py # patchShebangs requires executable file + patchShebangs data/meson_post_install.py + ''; + + meta = with stdenv.lib; { + description = "Native GTK Twitter client for the Linux desktop"; + longDescription = "Cawbird is a modern, easy and fun Twitter client. Fork of the discontinued Corebird."; + homepage = https://ibboard.co.uk/cawbird/; + license = licenses.gpl3; + platforms = platforms.linux; + maintainers = with stdenv.lib.maintainers; [ jonafato schmittlauch ]; + }; +} diff --git a/pkgs/applications/networking/cluster/cni/plugins-deps.nix b/pkgs/applications/networking/cluster/cni/plugins-deps.nix new file mode 100644 index 000000000000..a6bbd333be43 --- /dev/null +++ b/pkgs/applications/networking/cluster/cni/plugins-deps.nix @@ -0,0 +1,210 @@ +# file generated from go.mod using vgo2nix (https://github.com/adisbladis/vgo2nix) +[ + { + goPackagePath = "github.com/Microsoft/go-winio"; + fetch = { + type = "git"; + url = "https://github.com/Microsoft/go-winio"; + rev = "v0.4.11"; + sha256 = "14y1gryr3pb3zy09v2g8dh89m363rfd9sch0wgbabh531hfx72vn"; + }; + } + { + goPackagePath = "github.com/Microsoft/hcsshim"; + fetch = { + type = "git"; + url = "https://github.com/Microsoft/hcsshim"; + rev = "v0.7.4"; + sha256 = "0hky9p6xvkkx2jfkd4fy2d6iaikvlzalyw67gypyqyxygf2hsshg"; + }; + } + { + goPackagePath = "github.com/alexflint/go-filemutex"; + fetch = { + type = "git"; + url = "https://github.com/alexflint/go-filemutex"; + rev = "72bdc8eae2ae"; + sha256 = "082y6y9zv40q3kaqvsv6fyaw2fc42j0sn9z0dl9rbiz4szixj3c4"; + }; + } + { + goPackagePath = "github.com/buger/jsonparser"; + fetch = { + type = "git"; + url = "https://github.com/buger/jsonparser"; + rev = "f4dd9f5a6b44"; + sha256 = "12qa2n33s7yz88ywpr3k9kg3b4gm6rqgnv28iyikyxw8h5jascz5"; + }; + } + { + goPackagePath = "github.com/containernetworking/cni"; + fetch = { + type = "git"; + url = "https://github.com/containernetworking/cni"; + rev = "v0.7.0"; + sha256 = "15ad323dw44k82bfx9r8w5q2kn7jix60p9v4ciyzx2p5pip36wp8"; + }; + } + { + goPackagePath = "github.com/coreos/go-iptables"; + fetch = { + type = "git"; + url = "https://github.com/coreos/go-iptables"; + rev = "v0.4.1"; + sha256 = "0id1npqw3rd5rrkslf6i9yy6lpmd7l5qcglln38g85ylq7inysyi"; + }; + } + { + goPackagePath = "github.com/coreos/go-systemd"; + fetch = { + type = "git"; + url = "https://github.com/coreos/go-systemd"; + rev = "39ca1b05acc7"; + sha256 = "1kzqrrzqspa5qm7kwslxl3m16lqzns23c24rv474ajzwmj3ixmx1"; + }; + } + { + goPackagePath = "github.com/d2g/dhcp4"; + fetch = { + type = "git"; + url = "https://github.com/d2g/dhcp4"; + rev = "f0e4d29ff023"; + sha256 = "07gn9bjvnlfz2jv9wdq3gxxxm9lpwgrwk8z65072jdrz9rs9izpr"; + }; + } + { + goPackagePath = "github.com/d2g/dhcp4client"; + fetch = { + type = "git"; + url = "https://github.com/d2g/dhcp4client"; + rev = "bed07e1bc5b8"; + sha256 = "0kyjalv1kah7sk3i96abg71cgy5s9kzpff2zc7mwj69vicbj7mi3"; + }; + } + { + goPackagePath = "github.com/d2g/dhcp4server"; + fetch = { + type = "git"; + url = "https://github.com/d2g/dhcp4server"; + rev = "477b11cea4dc"; + sha256 = "010dpw6cxrsm6dm49w1q6qpz5xz3lbi5viz6wywxk49fxvnzmx9l"; + }; + } + { + goPackagePath = "github.com/godbus/dbus"; + fetch = { + type = "git"; + url = "https://github.com/godbus/dbus"; + rev = "885f9cc04c9c"; + sha256 = "0wjpaj4vr5lvpnwc5faf3qizd7zd2v9yq0fm0558wap1hiyqb8x8"; + }; + } + { + goPackagePath = "github.com/j-keck/arping"; + fetch = { + type = "git"; + url = "https://github.com/j-keck/arping"; + rev = "2cf9dc699c56"; + sha256 = "1bid8mpx3j4546ni0a6q5xyz7hb854g95qnxqmg5jzs9vrcird3c"; + }; + } + { + goPackagePath = "github.com/juju/errors"; + fetch = { + type = "git"; + url = "https://github.com/juju/errors"; + rev = "22422dad46e1"; + sha256 = "1766ys24y9qgngaqbx0g84lmh54b3369v8hk5fa1k8si2d34fxas"; + }; + } + { + goPackagePath = "github.com/mattn/go-shellwords"; + fetch = { + type = "git"; + url = "https://github.com/mattn/go-shellwords"; + rev = "v1.0.3"; + sha256 = "1pg7pl25wvpl2dbpyrv9p1r7prnqimxlf6136vn0dfm54j2x4mnr"; + }; + } + { + goPackagePath = "github.com/onsi/ginkgo"; + fetch = { + type = "git"; + url = "https://github.com/onsi/ginkgo"; + rev = "7f8ab55aaf3b"; + sha256 = "0nas6wqdym4jx42kw9wj80b58r69k9qhnvglz009lj34g5gba7rw"; + }; + } + { + goPackagePath = "github.com/onsi/gomega"; + fetch = { + type = "git"; + url = "https://github.com/onsi/gomega"; + rev = "2152b45fa28a"; + sha256 = "0amjlkawp84mmdqjgdamf93p1546cla6h4wwrx7hf5r862r2qcw2"; + }; + } + { + goPackagePath = "github.com/safchain/ethtool"; + fetch = { + type = "git"; + url = "https://github.com/safchain/ethtool"; + rev = "42ed695e3de8"; + sha256 = "0n5hkrzc1bh46nidcssx4539kvcmgj501v3kzh2pljpg27509daj"; + }; + } + { + goPackagePath = "github.com/sirupsen/logrus"; + fetch = { + type = "git"; + url = "https://github.com/sirupsen/logrus"; + rev = "v1.0.6"; + sha256 = "029irw2lsbqi944gdrbkwdw0m2794sqni4g21gsnmz142hbzds8c"; + }; + } + { + goPackagePath = "github.com/vishvananda/netlink"; + fetch = { + type = "git"; + url = "https://github.com/vishvananda/netlink"; + rev = "023a6dafdcdf"; + sha256 = "1i5q8r8rg7lxzvq2vhbf25lrkzdlgficfv0bxg9rf7cgg6z819sn"; + }; + } + { + goPackagePath = "github.com/vishvananda/netns"; + fetch = { + type = "git"; + url = "https://github.com/vishvananda/netns"; + rev = "13995c7128cc"; + sha256 = "1zk6w8158qi4niva5rijchbv9ixgmijsgqshh54wdaav4xrhjshn"; + }; + } + { + goPackagePath = "golang.org/x/crypto"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/crypto"; + rev = "7c1a557ab941"; + sha256 = "1f1q9mby8m7ws3gbj90v0prhnf4g2sgf74azmw31kzwd6azlar3m"; + }; + } + { + goPackagePath = "golang.org/x/net"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/net"; + rev = "49bb7cea24b1"; + sha256 = "111q4qm3hcjvzvyv9y5rz8ydnyg48rckcygxqy6gv63q618wz6gn"; + }; + } + { + goPackagePath = "golang.org/x/sys"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/sys"; + rev = "66b7b1311ac8"; + sha256 = "00ny4r2bbj6rz939iy9g699acqydq7rfi6r6awn25w9i2dld9m13"; + }; + } +] diff --git a/pkgs/applications/networking/cluster/cni/plugins.nix b/pkgs/applications/networking/cluster/cni/plugins.nix index b5276818f79f..8956828fa763 100644 --- a/pkgs/applications/networking/cluster/cni/plugins.nix +++ b/pkgs/applications/networking/cluster/cni/plugins.nix @@ -1,6 +1,5 @@ -{ stdenv, lib, fetchFromGitHub, go, removeReferencesTo }: - -stdenv.mkDerivation rec { +{ stdenv, lib, fetchFromGitHub, go, removeReferencesTo, buildGoPackage }: +buildGoPackage rec { pname = "cni-plugins"; version = "0.8.2"; @@ -11,28 +10,31 @@ stdenv.mkDerivation rec { sha256 = "0gyxa6mhiyxqw4wpn6r7wgr2kyvflzbdcqsk5ch0b6zih98144ia"; }; - buildInputs = [ removeReferencesTo go ]; - - buildPhase = '' - patchShebangs build_linux.sh - export "GOCACHE=$TMPDIR/go-cache" - ./build_linux.sh - ''; - - installPhase = '' - mkdir -p $out/bin - mv bin/* $out/bin - ''; - - preFixup = '' - find $out/bin -type f -exec remove-references-to -t ${go} '{}' + - ''; - + goDeps = ./plugins-deps.nix; + goPackagePath = "github.com/containernetworking/plugins"; + subPackages = [ + "plugins/meta/bandwidth" + "plugins/meta/firewall" + "plugins/meta/flannel" + "plugins/meta/portmap" + "plugins/meta/sbr" + "plugins/meta/tuning" + "plugins/main/bridge" + "plugins/main/host-device" + "plugins/main/ipvlan" + "plugins/main/loopback" + "plugins/main/macvlan" + "plugins/main/ptp" + "plugins/main/vlan" + "plugins/ipam/dhcp" + "plugins/ipam/host-local" + "plugins/ipam/static" + ]; meta = with lib; { description = "Some standard networking plugins, maintained by the CNI team"; homepage = https://github.com/containernetworking/plugins; license = licenses.asl20; - platforms = [ "x86_64-linux" ]; + platforms = platforms.linux; maintainers = with maintainers; [ cstrahan ]; }; } diff --git a/pkgs/applications/networking/cluster/flink/default.nix b/pkgs/applications/networking/cluster/flink/default.nix index 424b2ddca910..f8c73c65991c 100644 --- a/pkgs/applications/networking/cluster/flink/default.nix +++ b/pkgs/applications/networking/cluster/flink/default.nix @@ -8,8 +8,8 @@ let sha256 = "18wqcqi3gyqd40nspih99gq7ylfs20b35f4dcrspffagwkfp2l4z"; }; "1.6" = { - flinkVersion = "1.8.1"; - sha256 = "1ynxlkdxvrgww9hh7rlkhybrp5vl2slj3pqg2qzc8khpcgqx1h2g"; + flinkVersion = "1.9.0"; + sha256 = "1dzfcmqz5j4b545wq2q3xb2xkbhqllr04s3av1afv54y61l5y952"; }; }; in diff --git a/pkgs/applications/networking/cluster/helmfile/default.nix b/pkgs/applications/networking/cluster/helmfile/default.nix index 1faa0988a66d..6decad2f9fbe 100644 --- a/pkgs/applications/networking/cluster/helmfile/default.nix +++ b/pkgs/applications/networking/cluster/helmfile/default.nix @@ -1,6 +1,6 @@ { lib, buildGoModule, fetchFromGitHub, makeWrapper, kubernetes-helm, ... }: -let version = "0.79.3"; in +let version = "0.85.0"; in buildGoModule { pname = "helmfile"; @@ -10,12 +10,12 @@ buildGoModule { owner = "roboll"; repo = "helmfile"; rev = "v${version}"; - sha256 = "0wgfpidpqyvh41dnw351v91z4szi1s6lqak9li2pmddz1rdkx66v"; + sha256 = "0k1019ddzhhl8kn70ibqf6srlfv92jkc26m78pic5c7ibqyq5fds"; }; goPackagePath = "github.com/roboll/helmfile"; - modSha256 = "1ksz1c4j7mhsbq6ifqab04588d48c9glyhr4d3d4jyvi19qhwx1d"; + modSha256 = "1npjm3rs32c1rwx8xb9s03jhd156da6p66hpaqccm7b6zxsm32nv"; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/networking/cluster/k9s/default.nix b/pkgs/applications/networking/cluster/k9s/default.nix index 5c0adbdc548a..73d82207daf5 100644 --- a/pkgs/applications/networking/cluster/k9s/default.nix +++ b/pkgs/applications/networking/cluster/k9s/default.nix @@ -2,18 +2,17 @@ buildGoModule rec { pname = "k9s"; - version = "0.7.13"; + version = "0.8.4"; src = fetchFromGitHub { - owner = "derailed"; - repo = "k9s"; - rev = version; + owner = "derailed"; + repo = "k9s"; + rev = version; sha256 = "0wsj6wc2qi5708cg47l2qblq1cg8fcwxdygpkayib9hapx6lc6f8"; }; modSha256 = "1ia9wx6yd9mdr981lcw58xv39iqzz25r03bmn1c6byxmq2xpcjq8"; - meta = with stdenv.lib; { description = "Kubernetes CLI To Manage Your Clusters In Style."; homepage = https://github.com/derailed/k9s; diff --git a/pkgs/applications/networking/cluster/kops/default.nix b/pkgs/applications/networking/cluster/kops/default.nix index c8b95baf2f39..0b4959d3b9b3 100644 --- a/pkgs/applications/networking/cluster/kops/default.nix +++ b/pkgs/applications/networking/cluster/kops/default.nix @@ -43,7 +43,7 @@ let description = "Easiest way to get a production Kubernetes up and running"; homepage = https://github.com/kubernetes/kops; license = licenses.asl20; - maintainers = with maintainers; [offline zimbatm]; + maintainers = with maintainers; [offline zimbatm kampka]; platforms = platforms.unix; }; } // attrs'; @@ -57,7 +57,12 @@ in rec { }; kops_1_13 = mkKops { - version = "1.13.0"; - sha256 = "04kbbg3gqzwzzzq1lmnpw2gqky3pfwfk7pc0laxv2yssk9wac5k1"; + version = "1.13.2"; + sha256 = "0lkkg34vn020r62ga8vg5d3a8jwvq00xlv3p1s01nkz33f6salng"; + }; + + kops_1_14 = mkKops { + version = "1.14.0"; + sha256 = "0zd2plsdn45wf73qspv9yaxa0crwfy5h6ws3lvw96vxvrkhl96l2"; }; } diff --git a/pkgs/applications/networking/cluster/kube3d/default.nix b/pkgs/applications/networking/cluster/kube3d/default.nix index c549efa7b40b..7058c009f2dd 100644 --- a/pkgs/applications/networking/cluster/kube3d/default.nix +++ b/pkgs/applications/networking/cluster/kube3d/default.nix @@ -1,8 +1,9 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ stdenv, buildGoModule, fetchFromGitHub }: -buildGoPackage rec { +buildGoModule rec { pname = "kube3d"; version = "1.3.1"; + k3sVersion = "0.9.1"; goPackagePath = "github.com/rancher/k3d"; @@ -13,13 +14,20 @@ buildGoPackage rec { sha256 = "0bdpjnzyxd6mdc1qv0ml89qds6305kn3wmyci2kv6g2y7r7wxvm2"; }; - goDeps = ./deps.nix; + buildFlagsArray = '' + -ldflags= + -w -s + -X github.com/rancher/k3d/version.Version=${version} + -X github.com/rancher/k3d/version.K3sVersion=v${k3sVersion} + ''; + + modSha256 = "1qadf3gc2626l4jpad4lzi649nh8if9m6fgs2cf46r1nish16h95"; meta = with stdenv.lib; { homepage = "https://github.com/rancher/k3d"; description = "A helper to run k3s (Lightweight Kubernetes. 5 less than k8s) in a docker container"; license = licenses.mit; platforms = platforms.linux; - maintainers = with maintainers; [ kuznero ]; + maintainers = with maintainers; [ kuznero jlesquembre ]; }; } diff --git a/pkgs/applications/networking/cluster/kube3d/deps.nix b/pkgs/applications/networking/cluster/kube3d/deps.nix deleted file mode 100644 index 4fb2936a40b0..000000000000 --- a/pkgs/applications/networking/cluster/kube3d/deps.nix +++ /dev/null @@ -1,174 +0,0 @@ -# file generated from go.mod using vgo2nix (https://github.com/adisbladis/vgo2nix) -[ - { - goPackagePath = "github.com/Microsoft/go-winio"; - fetch = { - type = "git"; - url = "https://github.com/Microsoft/go-winio"; - rev = "v0.4.12"; - sha256 = "10v2f1xaw2cc97mjqnxzgs9ydpqv71f0ynp1spcywqw97la56zqw"; - }; - } - { - goPackagePath = "github.com/davecgh/go-spew"; - fetch = { - type = "git"; - url = "https://github.com/davecgh/go-spew"; - rev = "v1.1.0"; - sha256 = "0d4jfmak5p6lb7n2r6yvf5p1zcw0l8j74kn55ghvr7zr7b7axm6c"; - }; - } - { - goPackagePath = "github.com/docker/distribution"; - fetch = { - type = "git"; - url = "https://github.com/docker/distribution"; - rev = "v2.7.1"; - sha256 = "1nx8b5a68rn81alp8wkkw6qd5v32mgf0fk23mxm60zdf63qk1nzw"; - }; - } - { - goPackagePath = "github.com/docker/docker"; - fetch = { - type = "git"; - url = "https://github.com/docker/docker"; - rev = "v1.13.1"; - sha256 = "0l9kjibnpwcgk844sibxk9ppyqniw9r0np1mzp95f8f461jb0iar"; - }; - } - { - goPackagePath = "github.com/docker/go-connections"; - fetch = { - type = "git"; - url = "https://github.com/docker/go-connections"; - rev = "v0.4.0"; - sha256 = "0mv6f6b5nljc17dmwmc28hc0y11pqglz7x0d2mjrwdmfxf64hwqq"; - }; - } - { - goPackagePath = "github.com/docker/go-units"; - fetch = { - type = "git"; - url = "https://github.com/docker/go-units"; - rev = "v0.3.3"; - sha256 = "0npxsb3pp89slwf4a73fxm20hykad8xggij6i6hcd5jy19bjrd93"; - }; - } - { - goPackagePath = "github.com/mattn/go-runewidth"; - fetch = { - type = "git"; - url = "https://github.com/mattn/go-runewidth"; - rev = "v0.0.4"; - sha256 = "00b3ssm7wiqln3k54z2wcnxr3k3c7m1ybyhb9h8ixzbzspld0qzs"; - }; - } - { - goPackagePath = "github.com/mitchellh/go-homedir"; - fetch = { - type = "git"; - url = "https://github.com/mitchellh/go-homedir"; - rev = "v1.1.0"; - sha256 = "0ydzkipf28hwj2bfxqmwlww47khyk6d152xax4bnyh60f4lq3nx1"; - }; - } - { - goPackagePath = "github.com/olekukonko/tablewriter"; - fetch = { - type = "git"; - url = "https://github.com/olekukonko/tablewriter"; - rev = "v0.0.1"; - sha256 = "0hh95glg7d2md185r03wn52j2r33jc4zil0qvcrs66ka7bdxi7vj"; - }; - } - { - goPackagePath = "github.com/opencontainers/go-digest"; - fetch = { - type = "git"; - url = "https://github.com/opencontainers/go-digest"; - rev = "v1.0.0-rc1"; - sha256 = "01gc7fpn8ax429024p2fcx3yb18axwz5bjf2hqxlii1jbsgw4bh9"; - }; - } - { - goPackagePath = "github.com/pkg/errors"; - fetch = { - type = "git"; - url = "https://github.com/pkg/errors"; - rev = "v0.8.1"; - sha256 = "0g5qcb4d4fd96midz0zdk8b9kz8xkzwfa8kr1cliqbg8sxsy5vd1"; - }; - } - { - goPackagePath = "github.com/pmezard/go-difflib"; - fetch = { - type = "git"; - url = "https://github.com/pmezard/go-difflib"; - rev = "v1.0.0"; - sha256 = "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw"; - }; - } - { - goPackagePath = "github.com/stretchr/objx"; - fetch = { - type = "git"; - url = "https://github.com/stretchr/objx"; - rev = "v0.1.0"; - sha256 = "19ynspzjdynbi85xw06mh8ad5j0qa1vryvxjgvbnyrr8rbm4vd8w"; - }; - } - { - goPackagePath = "github.com/stretchr/testify"; - fetch = { - type = "git"; - url = "https://github.com/stretchr/testify"; - rev = "v1.3.0"; - sha256 = "0wjchp2c8xbgcbbq32w3kvblk6q6yn533g78nxl6iskq6y95lxsy"; - }; - } - { - goPackagePath = "github.com/urfave/cli"; - fetch = { - type = "git"; - url = "https://github.com/urfave/cli"; - rev = "v1.20.0"; - sha256 = "0y6f4sbzkiiwrxbl15biivj8c7qwxnvm3zl2dd3mw4wzg4x10ygj"; - }; - } - { - goPackagePath = "golang.org/x/crypto"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/crypto"; - rev = "c2843e01d9a2"; - sha256 = "01xgxbj5r79nmisdvpq48zfy8pzaaj90bn6ngd4nf33j9ar1dp8r"; - }; - } - { - goPackagePath = "golang.org/x/net"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/net"; - rev = "b630fd6fe46b"; - sha256 = "0m84kwckmmc0z05kjb4dd43g1g61al32a4z593flpcbaqx8di5sd"; - }; - } - { - goPackagePath = "golang.org/x/sys"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/sys"; - rev = "d0b11bdaac8a"; - sha256 = "18yfsmw622l7gc5sqriv5qmck6903vvhivpzp8i3xfy3z33dybdl"; - }; - } - { - goPackagePath = "golang.org/x/text"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/text"; - rev = "v0.3.0"; - sha256 = "0r6x6zjzhr8ksqlpiwm5gdd7s209kwk5p4lw54xjvz10cs3qlq19"; - }; - } -] diff --git a/pkgs/applications/networking/cluster/kubecfg/default.nix b/pkgs/applications/networking/cluster/kubecfg/default.nix index e1b5a4425d51..3d75ef543bcc 100644 --- a/pkgs/applications/networking/cluster/kubecfg/default.nix +++ b/pkgs/applications/networking/cluster/kubecfg/default.nix @@ -1,6 +1,6 @@ { lib, buildGoPackage, fetchFromGitHub, ... }: -let version = "0.12.0"; in +let version = "0.12.5"; in buildGoPackage { pname = "kubecfg"; @@ -10,7 +10,7 @@ buildGoPackage { owner = "bitnami"; repo = "kubecfg"; rev = "v${version}"; - sha256 = "118p1fy6cihswwz03vp62cz8395hgfqd82nmfkw88fx7av23rfhb"; + sha256 = "0pn37qkwn3kdsd0z3qxk95lqjn2zak7gkk0pwlqp26jmrx0vv18l"; }; goPackagePath = "github.com/bitnami/kubecfg"; diff --git a/pkgs/applications/networking/cluster/kubeless/default.nix b/pkgs/applications/networking/cluster/kubeless/default.nix index a69dc8890a7b..aaf183ad6667 100644 --- a/pkgs/applications/networking/cluster/kubeless/default.nix +++ b/pkgs/applications/networking/cluster/kubeless/default.nix @@ -1,6 +1,6 @@ -{ stdenv, buildGoModule, fetchFromGitHub }: +{ stdenv, buildGoPackage, fetchFromGitHub }: -buildGoModule rec { +buildGoPackage rec { pname = "kubeless"; version = "1.0.4"; @@ -10,7 +10,8 @@ buildGoModule rec { rev = "v${version}"; sha256 = "1f5w6kn9rsaxx9nf6kzyjkzm3s9ycy1c8h78hb61v4x915xd3040"; }; - modSha256 = "1pw4pwb8z2kq474jjipjdivlrin5zvw8d2if4317b0w0wyp6isgd"; + + goPackagePath = "github.com/kubeless/kubeless"; subPackages = [ "cmd/kubeless" ]; diff --git a/pkgs/applications/networking/cluster/kubernetes/default.nix b/pkgs/applications/networking/cluster/kubernetes/default.nix index cbe32e57f20d..1ad7ad3e393d 100644 --- a/pkgs/applications/networking/cluster/kubernetes/default.nix +++ b/pkgs/applications/networking/cluster/kubernetes/default.nix @@ -15,13 +15,13 @@ with lib; stdenv.mkDerivation rec { pname = "kubernetes"; - version = "1.15.3"; + version = "1.15.4"; src = fetchFromGitHub { owner = "kubernetes"; repo = "kubernetes"; rev = "v${version}"; - sha256 = "0vamr7m8i5svmvb0z01cngv3sffdfjj0bky2zalm7cfnapib8vz1"; + sha256 = "18wpqrgb1ils4g8ggg217xq4jq30i4m7par2mdjk59pmz7ssm25p"; }; buildInputs = [ removeReferencesTo makeWrapper which go rsync go-bindata ]; diff --git a/pkgs/applications/networking/cluster/kubetail/default.nix b/pkgs/applications/networking/cluster/kubetail/default.nix index dcda18f18be6..779edad8de34 100644 --- a/pkgs/applications/networking/cluster/kubetail/default.nix +++ b/pkgs/applications/networking/cluster/kubetail/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "kubetail"; - version = "1.6.9"; + version = "1.6.10"; src = fetchFromGitHub { owner = "johanhaleby"; repo = "kubetail"; rev = version; - sha256 = "0mcv23p0h1ww9gvax8b4b4x5hmg02shrbgms0v0c72cmw0zf2phr"; + sha256 = "0bg872n9fs6pl03rmjny9sgby718yznx9jwi5rx3hi4km3ha9j0b"; }; installPhase = '' diff --git a/pkgs/applications/networking/cluster/openshift/default.nix b/pkgs/applications/networking/cluster/openshift/default.nix index 758786f586a6..3b96ef4ea45e 100644 --- a/pkgs/applications/networking/cluster/openshift/default.nix +++ b/pkgs/applications/networking/cluster/openshift/default.nix @@ -10,7 +10,7 @@ with lib; let version = "3.11.0"; - ver = stdenv.lib.elemAt (stdenv.lib.splitString "." version); + ver = stdenv.lib.elemAt (stdenv.lib.splitVersion version); versionMajor = ver 0; versionMinor = ver 1; versionPatch = ver 2; diff --git a/pkgs/applications/networking/cluster/qbec/default.nix b/pkgs/applications/networking/cluster/qbec/default.nix new file mode 100644 index 000000000000..9e578b9b333a --- /dev/null +++ b/pkgs/applications/networking/cluster/qbec/default.nix @@ -0,0 +1,22 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "qbec"; + version = "0.7.5"; + + src = fetchFromGitHub { + owner = "splunk"; + repo = "qbec"; + rev = "v${version}"; + sha256 = "1q3rbxih4fn0zv8dni5dxb3pq840spplfy08x941najqfgflv9gb"; + }; + + modSha256 = "0s1brqvzm1ghhqb46aqfj0lpnaq76rav0hwwb82ccw8h7052y4jn"; + + meta = with lib; { + description = "Configure kubernetes objects on multiple clusters using jsonnet https://qbec.io"; + homepage = https://github.com/splunk/qbec; + license = licenses.asl20; + maintainers = with maintainers; [ groodt ]; + }; +} diff --git a/pkgs/applications/networking/cluster/spark/default.nix b/pkgs/applications/networking/cluster/spark/default.nix index e675d17491af..b8d4b947e324 100644 --- a/pkgs/applications/networking/cluster/spark/default.nix +++ b/pkgs/applications/networking/cluster/spark/default.nix @@ -1,26 +1,18 @@ { stdenv, fetchzip, makeWrapper, jre, pythonPackages, coreutils, hadoop , RSupport? true, R , mesosSupport ? true, mesos -, version }: -let - sha256 = { - "1.6.3" = "142hw73wf20d846l83ydx0yg7qj5qxywm4h7qrhwnd7lsy2sbnjf"; - "2.4.3" = "1dvvr1q3dz961bl7qigxngrp4ssrbll3g1s6nkra6gyr83pis96c"; - }.${version}; -in - with stdenv.lib; stdenv.mkDerivation rec { pname = "spark"; - inherit version; + version = "2.4.4"; src = fetchzip { - inherit sha256; url = "mirror://apache/spark/${pname}-${version}/${pname}-${version}-bin-without-hadoop.tgz"; + sha256 = "1a9w5k0207fysgpxx6db3a00fs5hdc2ncx99x4ccy2s0v5ndc66g"; }; buildInputs = [ makeWrapper jre pythonPackages.python pythonPackages.numpy ] diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix index 9c07760355ca..e0bc882c4221 100644 --- a/pkgs/applications/networking/cluster/terraform/default.nix +++ b/pkgs/applications/networking/cluster/terraform/default.nix @@ -97,8 +97,8 @@ in rec { terraform_0_11-full = terraform_0_11.full; terraform_0_12 = pluggable (generic { - version = "0.12.8"; - sha256 = "1qlhbn6xj2nd8gwr6aiyjsb62qmj4j9jnxab006xgdr1avvl2p67"; + version = "0.12.10"; + sha256 = "0bmqcmzjsrpvvnd9pn40f774c8jy6j810qz0njxqh60yh27f5rhx"; patches = [ ./provider-path.patch ]; passthru = { inherit plugins; }; }); diff --git a/pkgs/applications/networking/corebird/default.nix b/pkgs/applications/networking/corebird/default.nix deleted file mode 100644 index 73c0e234945e..000000000000 --- a/pkgs/applications/networking/corebird/default.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ stdenv, fetchFromGitHub, glib, gtk3, json-glib, sqlite, libsoup, gettext, vala_0_40 -, meson, ninja, pkgconfig, gnome3, gst_all_1, wrapGAppsHook, gobject-introspection -, glib-networking, python3 }: - -stdenv.mkDerivation rec { - version = "1.7.4"; - pname = "corebird"; - - src = fetchFromGitHub { - owner = "baedert"; - repo = "corebird"; - rev = version; - sha256 = "0qjffsmg1hm64dgsbkfwzbzy9q4xa1q4fh4h8ni8a2b1p3h80x7n"; - }; - - nativeBuildInputs = [ - meson ninja vala_0_40 pkgconfig wrapGAppsHook python3 - gobject-introspection # for setup hook - ]; - - buildInputs = [ - glib gtk3 json-glib sqlite libsoup gettext gnome3.dconf gnome3.gspell glib-networking - ] ++ (with gst_all_1; [ gstreamer gst-plugins-base gst-plugins-bad (gst-plugins-good.override { gtkSupport = true; }) gst-libav ]); - - postPatch = '' - chmod +x data/meson_post_install.py # patchShebangs requires executable file - patchShebangs data/meson_post_install.py - ''; - - meta = { - description = "Native GTK Twitter client for the Linux desktop"; - longDescription = "Corebird is a modern, easy and fun Twitter client."; - homepage = https://corebird.baedert.org/; - license = stdenv.lib.licenses.gpl3; - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.jonafato ]; - }; -} diff --git a/pkgs/applications/networking/dropbox/default.nix b/pkgs/applications/networking/dropbox/default.nix index 9a05a92cfb31..01707f12da22 100644 --- a/pkgs/applications/networking/dropbox/default.nix +++ b/pkgs/applications/networking/dropbox/default.nix @@ -7,7 +7,7 @@ assert lib.elem stdenv.hostPlatform.system platforms; # Dropbox client to bootstrap installation. # The client is self-updating, so the actual version may be newer. let - version = "73.4.118"; + version = "81.4.195"; arch = { x86_64-linux = "x86_64"; diff --git a/pkgs/applications/networking/esniper/default.nix b/pkgs/applications/networking/esniper/default.nix index 2535d0dc31db..9de87ee178d1 100644 --- a/pkgs/applications/networking/esniper/default.nix +++ b/pkgs/applications/networking/esniper/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchgit, openssl, curl, coreutils, gawk, bash, which }: stdenv.mkDerivation { - name = "esniper-2.35.0-15-g91d2665"; + name = "esniper-2.35.0-18-g4a59da0"; src = fetchgit { url = "https://git.code.sf.net/p/esniper/git"; - rev = "91d2665539beaeac21fb4c0cc2fd39c44e771ed7"; - sha256 = "0dixcsvbcj9jbfjfv50nwvw7w90c4s6gnkrpilaan984i6y45rw0"; + rev = "4a59da032aa4536b9e5ea95633247650412511db"; + sha256 = "0d3vazh5q7wymqahggbb2apl9hgrm037y4s3j91d24hjgk2pzzyd"; }; buildInputs = [ openssl curl ]; diff --git a/pkgs/applications/networking/feedreaders/feedreader/default.nix b/pkgs/applications/networking/feedreaders/feedreader/default.nix index 959649c4b150..c2fda72e36a7 100644 --- a/pkgs/applications/networking/feedreaders/feedreader/default.nix +++ b/pkgs/applications/networking/feedreaders/feedreader/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, meson, ninja, pkgconfig, vala, gettext, python3 -, appstream-glib, desktop-file-utils, wrapGAppsHook, gnome-online-accounts +, appstream-glib, desktop-file-utils, wrapGAppsHook, gnome-online-accounts, fetchpatch , gtk3, libgee, libpeas, librest, webkitgtk, gsettings-desktop-schemas, hicolor-icon-theme , curl, glib, gnome3, gst_all_1, json-glib, libnotify, libsecret, sqlite, gumbo, libxml2 }: @@ -33,6 +33,14 @@ stdenv.mkDerivation rec { patchShebangs build-aux/meson_post_install.py ''; + patches = [ + # Fixes build with libsecret + (fetchpatch { + url = "https://patch-diff.githubusercontent.com/raw/jangernert/FeedReader/pull/943.patch"; + sha256 = "0anrwvcg6607dzvfrhy5qcnpxzflskb3iy3khdg191aw1h2mqhb5"; + }) + ]; + meta = with stdenv.lib; { description = "A modern desktop application designed to complement existing web-based RSS accounts"; homepage = https://jangernert.github.io/FeedReader/; diff --git a/pkgs/applications/networking/feedreaders/newsboat/default.nix b/pkgs/applications/networking/feedreaders/newsboat/default.nix index f7a9521c9937..4273545a8e5a 100644 --- a/pkgs/applications/networking/feedreaders/newsboat/default.nix +++ b/pkgs/applications/networking/feedreaders/newsboat/default.nix @@ -53,5 +53,6 @@ rustPlatform.buildRustPackage rec { maintainers = with maintainers; [ dotlambda nicknovitski ]; license = licenses.mit; platforms = platforms.unix; + broken = true; }; } diff --git a/pkgs/applications/networking/flexget/default.nix b/pkgs/applications/networking/flexget/default.nix index f01849919ab0..6e8ec45a36d9 100644 --- a/pkgs/applications/networking/flexget/default.nix +++ b/pkgs/applications/networking/flexget/default.nix @@ -24,11 +24,11 @@ with python'.pkgs; buildPythonApplication rec { pname = "FlexGet"; - version = "2.21.16"; + version = "2.21.19"; src = fetchPypi { inherit pname version; - sha256 = "1skb73nsg5gqlqqcs64c9kiidd74p3gm0xx93jaky2gagn0jn7rv"; + sha256 = "1xkxd5p4ps0dnwns64zzlvs252wx0f9fy5b6000gyql7y5cma3kj"; }; postPatch = '' diff --git a/pkgs/applications/networking/gns3/default.nix b/pkgs/applications/networking/gns3/default.nix index 1d2756de7e69..3375bfd04d66 100644 --- a/pkgs/applications/networking/gns3/default.nix +++ b/pkgs/applications/networking/gns3/default.nix @@ -1,16 +1,16 @@ { callPackage }: let - stableVersion = "2.1.21"; - previewVersion = "2.2.0rc5"; + stableVersion = "2.2.0"; + previewVersion = "2.2.0"; addVersion = args: let version = if args.stable then stableVersion else previewVersion; branch = if args.stable then "stable" else "preview"; in args // { inherit version branch; }; mkGui = args: callPackage (import ./gui.nix (addVersion args)) { }; mkServer = args: callPackage (import ./server.nix (addVersion args)) { }; - guiSrcHash = "1ydmib302r1cpm2z9pzsfp4ygxrbmskwszsip397n92qx3l9a9v3"; - serverSrcHash = "1ahn1xq1f0wx46i0c8idz96dxfbakk37pqi6amy91594mdlp8yr4"; + guiSrcHash = "0xghldzk126ly49y7drp241w7c0h9fb0ags9blk0rlq99i72as78"; + serverSrcHash = "0iphs0w6r9s85cgd95bh6jd0224ywilrzb7a4jjwi38z7a7id4gk"; in { guiStable = mkGui { stable = true; @@ -18,7 +18,7 @@ in { }; guiPreview = mkGui { stable = false; - sha256Hash = "0x4sp6yjnvzpk8cxdqlf51njckmvvkijdb7rvcb4hvqq1ab6gb2x"; + sha256Hash = guiSrcHash; }; serverStable = mkServer { @@ -27,6 +27,6 @@ in { }; serverPreview = mkServer { stable = false; - sha256Hash = "0inj6fac0683s1sxaba3ljia90cfach0y42xylzgzza36wpyqpqg"; + sha256Hash = serverSrcHash; }; } diff --git a/pkgs/applications/networking/gns3/gui.nix b/pkgs/applications/networking/gns3/gui.nix index de624d7f6b29..9af0f1a6bc66 100644 --- a/pkgs/applications/networking/gns3/gui.nix +++ b/pkgs/applications/networking/gns3/gui.nix @@ -19,8 +19,8 @@ in pythonPackages.buildPythonPackage rec { propagatedBuildInputs = with pythonPackages; [ raven psutil jsonschema # tox for check # Runtime dependencies - sip (pyqt5.override { withWebSockets = true; }) - ] ++ stdenv.lib.optional (!stable) pythonPackages.distro; + sip (pyqt5.override { withWebSockets = true; }) distro setuptools + ]; doCheck = false; # Failing diff --git a/pkgs/applications/networking/gns3/server.nix b/pkgs/applications/networking/gns3/server.nix index f681f3fa63b6..71223c6f512e 100644 --- a/pkgs/applications/networking/gns3/server.nix +++ b/pkgs/applications/networking/gns3/server.nix @@ -3,35 +3,7 @@ { stdenv, python3, fetchFromGitHub }: let - python = if stable then python3.override { - packageOverrides = self: super: { - async-timeout = super.async-timeout.overridePythonAttrs (oldAttrs: rec { - version = "2.0.1"; - src = oldAttrs.src.override { - inherit version; - sha256 = "1l3kg062m02mph6rf9rdv8r5c5n356clxa6b6mrn0i77vk9g9kq0"; - }; - }); - aiohttp = super.aiohttp.overridePythonAttrs (oldAttrs: rec { - version = "2.3.10"; - src = oldAttrs.src.override { - inherit version; - sha256 = "8adda6583ba438a4c70693374e10b60168663ffa6564c5c75d3c7a9055290964"; - }; - propagatedBuildInputs = with self; [ async-timeout attrs chardet multidict yarl idna-ssl ]; - doCheck = false; - }); - aiohttp-cors = super.aiohttp-cors.overridePythonAttrs (oldAttrs: rec { - version = "0.6.0"; - src = oldAttrs.src.override { - inherit version; - sha256 = "1r0mb4dw0dc1lpi54dk5vxqs06nyhvagp76lyrvk7rd94z5mjkd4"; - }; - propagatedBuildInputs = with self; [ aiohttp ] - ++ stdenv.lib.optional (pythonOlder "3.5") typing; - }); - }; - } else python3; + python = python3; in python.pkgs.buildPythonPackage { pname = "gns3-server"; @@ -50,10 +22,10 @@ in python.pkgs.buildPythonPackage { ''; propagatedBuildInputs = with python.pkgs; [ - aiohttp-cors yarl aiohttp multidict - jinja2 psutil zipstream raven jsonschema + aiohttp-cors yarl aiohttp multidict setuptools + jinja2 psutil zipstream raven jsonschema distro async_generator aiofiles (python.pkgs.callPackage ../../../development/python-modules/prompt_toolkit/1.nix {}) - ] ++ stdenv.lib.optional (!stable) [ distro async_generator aiofiles ]; + ]; # Requires network access doCheck = false; diff --git a/pkgs/applications/networking/ids/bro/default.nix b/pkgs/applications/networking/ids/bro/default.nix deleted file mode 100644 index f90457ba9379..000000000000 --- a/pkgs/applications/networking/ids/bro/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -{stdenv, fetchurl, cmake, flex, bison, openssl, libpcap, perl, zlib, file, curl -, geoip, gperftools, python, swig }: - -stdenv.mkDerivation rec { - name = "bro-2.5.5"; - - src = fetchurl { - url = "https://www.bro.org/downloads/${name}.tar.gz"; - sha256 = "1kvkiq8jjsqryry9jd4vw45pbfb46jly988mq62mv4sd1fqsxwhq"; - }; - - nativeBuildInputs = [ cmake flex bison file ]; - buildInputs = [ openssl libpcap perl zlib curl geoip gperftools python swig ]; - - enableParallelBuilding = true; - - meta = with stdenv.lib; { - description = "Powerful network analysis framework much different from a typical IDS"; - homepage = https://www.bro.org/; - license = licenses.bsd3; - maintainers = with maintainers; [ pSub ]; - platforms = with platforms; linux; - }; -} diff --git a/pkgs/applications/networking/ids/zeek/default.nix b/pkgs/applications/networking/ids/zeek/default.nix new file mode 100644 index 000000000000..b087a6c3ae32 --- /dev/null +++ b/pkgs/applications/networking/ids/zeek/default.nix @@ -0,0 +1,31 @@ +{stdenv, fetchurl, cmake, flex, bison, openssl, libpcap, zlib, file, curl +, libmaxminddb, gperftools, python, swig, rocksdb }: + +stdenv.mkDerivation rec { + pname = "zeek"; + version = "3.0.0"; + + src = fetchurl { + url = "https://www.zeek.org/downloads/zeek-${version}.tar.gz"; + sha256 = "16pz5fh0z1hmvhn8pxqmdm5a9d8mqrp4gxpxkaywnaqk2h598lmm"; + }; + + nativeBuildInputs = [ cmake flex bison file ]; + buildInputs = [ openssl libpcap zlib curl libmaxminddb gperftools python swig rocksdb ]; + + enableParallelBuilding = true; + + cmakeFlags = [ + "-DPY_MOD_INSTALL_DIR=${placeholder "out"}/${python.sitePackages}" + "-DENABLE_PERFTOOLS=true" + "-DINSTALL_AUX_TOOLS=true" + ]; + + meta = with stdenv.lib; { + description = "Powerful network analysis framework much different from a typical IDS"; + homepage = "https://www.zeek.org"; + license = licenses.bsd3; + maintainers = with maintainers; [ pSub marsam tobim ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/applications/networking/instant-messengers/baresip/default.nix b/pkgs/applications/networking/instant-messengers/baresip/default.nix index f01b8d387f83..f905f90aebdd 100644 --- a/pkgs/applications/networking/instant-messengers/baresip/default.nix +++ b/pkgs/applications/networking/instant-messengers/baresip/default.nix @@ -3,11 +3,11 @@ , gsm, speex, portaudio, spandsp, libuuid, ccache, libvpx }: stdenv.mkDerivation rec { - version = "0.6.3"; + version = "0.6.4"; pname = "baresip"; src=fetchurl { url = "http://www.creytiv.com/pub/baresip-${version}.tar.gz"; - sha256 = "031hjm30v45h1sfknrf2f2ci10n712bdkcyf92y2hzllnik58068"; + sha256 = "10bmb7wiqzjdp51kjahmsp7gkvnqp91mfz0nmwgsw1n4pv8hnwb1"; }; nativeBuildInputs = [ pkgconfig ]; buildInputs = [zlib openssl libre librem cairo mpg123 diff --git a/pkgs/applications/networking/instant-messengers/blink/default.nix b/pkgs/applications/networking/instant-messengers/blink/default.nix index 001eadbb01d8..62d0d738b504 100644 --- a/pkgs/applications/networking/instant-messengers/blink/default.nix +++ b/pkgs/applications/networking/instant-messengers/blink/default.nix @@ -1,14 +1,15 @@ { stdenv, fetchdarcs, pythonPackages, libvncserver, zlib -, gnutls, libvpx, makeDesktopItem }: +, gnutls, libvpx, makeDesktopItem, mkDerivationWith }: + +mkDerivationWith pythonPackages.buildPythonApplication rec { -pythonPackages.buildPythonApplication rec { pname = "blink"; - version = "3.0.3"; + version = "3.2.0"; src = fetchdarcs { url = http://devel.ag-projects.com/repositories/blink-qt; rev = "release-${version}"; - sha256 = "1vj6zzfvxygz0fzr8bhymcw6j4v8xmr0kba53d6qg285j7hj1bdi"; + sha256 = "19rcwr5scw48qnj79q1pysw95fz9h98nyc3161qy2kph5g7dwkc3"; }; patches = [ ./pythonpath.patch ]; @@ -16,9 +17,20 @@ pythonPackages.buildPythonApplication rec { sed -i 's|@out@|'"''${out}"'|g' blink/resources.py ''; - propagatedBuildInputs = with pythonPackages; [ pyqt5_with_qtwebkit cjson sipsimple twisted google_api_python_client ]; + propagatedBuildInputs = with pythonPackages; [ + pyqt5_with_qtwebkit + cjson + sipsimple + twisted + google_api_python_client + ]; - buildInputs = [ pythonPackages.cython zlib libvncserver libvpx ]; + buildInputs = [ + pythonPackages.cython + zlib + libvncserver + libvpx + ]; desktopItem = makeDesktopItem { name = "Blink"; @@ -30,9 +42,14 @@ pythonPackages.buildPythonApplication rec { categories = "Application;Internet;"; }; + dontWrapQtApps = true; + + makeWrapperArgs = [ + "\${qtWrapperArgs[@]}" + "--prefix LD_LIBRARY_PATH: ${gnutls.out}/lib" + ]; + postInstall = '' - wrapProgram $out/bin/blink \ - --prefix LD_LIBRARY_PATH ":" ${gnutls.out}/lib mkdir -p "$out/share/applications" mkdir -p "$out/share/pixmaps" cp "$desktopItem"/share/applications/* "$out/share/applications" diff --git a/pkgs/applications/networking/instant-messengers/franz/default.nix b/pkgs/applications/networking/instant-messengers/franz/default.nix index 9a4ab636c5fe..46a27737d23e 100644 --- a/pkgs/applications/networking/instant-messengers/franz/default.nix +++ b/pkgs/applications/networking/instant-messengers/franz/default.nix @@ -3,13 +3,13 @@ , gnome2, dbus, nss, nspr, alsaLib, cups, expat, udev, libnotify, xdg_utils }: let - version = "5.3.1"; + version = "5.3.3"; in stdenv.mkDerivation { pname = "franz"; inherit version; src = fetchurl { url = "https://github.com/meetfranz/franz/releases/download/v${version}/franz_${version}_amd64.deb"; - sha256 = "16ssg4cjjmq3cps8klyx3jxqma7f83cczwjnknlfqglrwwdpnb5d"; + sha256 = "03ii1gpc2wijy917565pqig1ihd4zhal12i2f5k916i7fp8912m1"; }; # don't remove runtime deps diff --git a/pkgs/applications/networking/instant-messengers/gajim/default.nix b/pkgs/applications/networking/instant-messengers/gajim/default.nix index 6da7320e9536..1fd8c47a99c2 100644 --- a/pkgs/applications/networking/instant-messengers/gajim/default.nix +++ b/pkgs/applications/networking/instant-messengers/gajim/default.nix @@ -44,7 +44,7 @@ python3.pkgs.buildPythonApplication rec { ]; propagatedBuildInputs = with python3.pkgs; [ - nbxmpp pyasn1 pygobject3 dbus-python pillow cssutils precis-i18n keyring + nbxmpp pyasn1 pygobject3 dbus-python pillow cssutils precis-i18n keyring setuptools ] ++ lib.optionals enableE2E [ pycrypto python-gnupg ] ++ lib.optional enableRST docutils ++ lib.optionals enableOmemoPluginDependencies [ python-axolotl qrcode ] diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-matrix/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-matrix/default.nix index 310d419718fe..8a15a3bdd85e 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-matrix/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-matrix/default.nix @@ -13,6 +13,9 @@ stdenv.mkDerivation { sha256 = "0ph0s24b37d1c50p8zbzgf4q2xns43a8v6vk85iz633wdd72zsa0"; }; + # glib-2.62 deprecations + NIX_CFLAGS_COMPILE = [ "-DGLIB_DISABLE_DEPRECATION_WARNINGS" ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ pidgin json-glib glib http-parser sqlite olm libgcrypt ]; diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-slack/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-slack/default.nix new file mode 100644 index 000000000000..10973345dec9 --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-slack/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchFromGitHub, pidgin, pkgconfig }: + +stdenv.mkDerivation { + pname = "purple-slack-unstable"; + version = "2019-08-18"; + + src = fetchFromGitHub { + owner = "dylex"; + repo = "slack-libpurple"; + rev = "be97802c7fd0b611722d2f551756e2a2672f6084"; + sha256 = "0l6hwnnv6zzszxkk0a3nli88w5gijvlc9qgkkai0sb4v4c504y5v"; + }; + + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ pidgin ]; + + PKG_CONFIG_PURPLE_PLUGINDIR = "${placeholder "out"}/lib/purple-2"; + PKG_CONFIG_PURPLE_DATAROOTDIR = "${placeholder "out"}/share"; + + meta = with stdenv.lib; { + homepage = https://github.com/dylex/slack-libpurple; + description = "Slack plugin for Pidgin"; + license = licenses.gpl2; + platforms = platforms.linux; + maintainers = with maintainers; [ eyjhb ]; + }; +} + diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/sipe/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/sipe/default.nix index 5b3e09440a63..6180f531f47f 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/sipe/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/sipe/default.nix @@ -13,6 +13,9 @@ stdenv.mkDerivation rec { buildInputs = [ pidgin gmime libxml2 nss ]; enableParallelBuilding = true; + # glib-2.62 deprecations + NIX_CFLAGS_COMPILE = [ "-DGLIB_DISABLE_DEPRECATION_WARNINGS" ]; + postInstall = "find $out -ls; ln -s \$out/lib/purple-2 \$out/share/pidgin-sipe"; meta = with stdenv.lib; { diff --git a/pkgs/applications/networking/instant-messengers/psi-plus/default.nix b/pkgs/applications/networking/instant-messengers/psi-plus/default.nix index 16fb1bbab1ed..5ca28fca7a79 100644 --- a/pkgs/applications/networking/instant-messengers/psi-plus/default.nix +++ b/pkgs/applications/networking/instant-messengers/psi-plus/default.nix @@ -44,5 +44,6 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ orivej ]; license = licenses.gpl2; platforms = platforms.linux; + broken = true; }; } diff --git a/pkgs/applications/networking/instant-messengers/pybitmessage/default.nix b/pkgs/applications/networking/instant-messengers/pybitmessage/default.nix index 3f6b23d70a05..111f4e728e78 100644 --- a/pkgs/applications/networking/instant-messengers/pybitmessage/default.nix +++ b/pkgs/applications/networking/instant-messengers/pybitmessage/default.nix @@ -12,14 +12,15 @@ python2Packages.buildPythonApplication rec { sha256 = "1lmhbpwsqh1v93krlqqhafw2pc3y0qp8zby186yllbph6s8kdp35"; }; - propagatedBuildInputs = with python2Packages; [ msgpack-python pyqt4 numpy pyopencl ] ++ [ openssl ]; + propagatedBuildInputs = with python2Packages; [ msgpack pyqt4 numpy pyopencl setuptools ] ++ [ openssl ]; preConfigure = '' # Remove interaction and misleading output substituteInPlace setup.py \ --replace "nothing = raw_input()" pass \ --replace 'print "It looks like building the package failed.\n" \' pass \ - --replace ' "You may be missing a C++ compiler and the OpenSSL headers."' pass + --replace ' "You may be missing a C++ compiler and the OpenSSL headers."' pass \ + --replace 'msgpack-python' 'msgpack' substituteInPlace src/pyelliptic/openssl.py \ --replace "libdir.append(find_library('ssl'))" "libdir.append('${openssl.out}/lib/libssl.so')" diff --git a/pkgs/applications/networking/instant-messengers/rambox/pro.nix b/pkgs/applications/networking/instant-messengers/rambox/pro.nix index 9a0aab6f8ce1..eee5fd82bba7 100644 --- a/pkgs/applications/networking/instant-messengers/rambox/pro.nix +++ b/pkgs/applications/networking/instant-messengers/rambox/pro.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "rambox-pro"; - version = "1.1.6"; + version = "1.1.7"; dontBuild = true; dontStrip = true; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://github.com/ramboxapp/download/releases/download/v${version}/RamboxPro-${version}-linux-x64.tar.gz"; - sha256 = "1jdamjdl649315ms5g1c7m7gpy04rv7xpy6bsvink242adaq2pjz"; + sha256 = "1d84hlac3qwrbi8khp6r3bm5y25zcz52l6z54k7jmyplay46r5as"; }; installPhase = '' diff --git a/pkgs/applications/networking/instant-messengers/riot/riot-desktop-package.json b/pkgs/applications/networking/instant-messengers/riot/riot-desktop-package.json index 2e9602458e7f..d305fade0382 100644 --- a/pkgs/applications/networking/instant-messengers/riot/riot-desktop-package.json +++ b/pkgs/applications/networking/instant-messengers/riot/riot-desktop-package.json @@ -2,7 +2,7 @@ "name": "riot-web", "productName": "Riot", "main": "src/electron-main.js", - "version": "1.3.3", + "version": "1.4.1", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", "dependencies": { diff --git a/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix b/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix index 2c4557f2cc08..7b5bb1e04f33 100644 --- a/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix +++ b/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix @@ -6,12 +6,12 @@ let executableName = "riot-desktop"; - version = "1.3.3"; + version = "1.4.1"; riot-web-src = fetchFromGitHub { owner = "vector-im"; repo = "riot-web"; rev = "v${version}"; - sha256 = "1nzzxcz4r9932cha80q1bzn1425m67fsl89pn7n7ybrv6y0jnxpc"; + sha256 = "0w4w39smak6hp65vam5rrz6l48rb4yzszzyn1yjhr1m8w8j9bvfl"; }; in yarn2nix-moretea.mkYarnPackage rec { diff --git a/pkgs/applications/networking/instant-messengers/riot/riot-web.nix b/pkgs/applications/networking/instant-messengers/riot/riot-web.nix index 2755d181da2b..1b9b34ed4aaa 100644 --- a/pkgs/applications/networking/instant-messengers/riot/riot-web.nix +++ b/pkgs/applications/networking/instant-messengers/riot/riot-web.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "riot-web"; - version = "1.3.3"; + version = "1.4.1"; src = fetchurl { url = "https://github.com/vector-im/riot-web/releases/download/v${version}/riot-v${version}.tar.gz"; - sha256 = "1n5h7q3h0akw09p4z7nwprxsa8jnmwbvwn2npq7zz62ccasb4fv9"; + sha256 = "16lgxyqxs6vpjcfdr4j7gnn7h8gyi6b5520b8nq8hxynh24iyhcq"; }; installPhase = let diff --git a/pkgs/applications/networking/instant-messengers/signal-cli/default.nix b/pkgs/applications/networking/instant-messengers/signal-cli/default.nix index 010ea1bff7c3..7c474d26c88c 100644 --- a/pkgs/applications/networking/instant-messengers/signal-cli/default.nix +++ b/pkgs/applications/networking/instant-messengers/signal-cli/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "signal-cli"; - version = "0.6.2"; + version = "0.6.3"; # Building from source would be preferred, but is much more involved. src = fetchurl { url = "https://github.com/AsamK/signal-cli/releases/download/v${version}/signal-cli-${version}.tar.gz"; - sha256 = "050nizf7v10jlrwr8f4awzi2368qr01pzpvl2qkrwhdk25r505yr"; + sha256 = "1gvdifscyxmxn2dwlkqi684ahy5kbcj84mqda0m8l4aa8iaq1d59"; }; buildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix index f217084585a2..7575301cd30b 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix @@ -58,7 +58,7 @@ let in stdenv.mkDerivation rec { pname = "signal-desktop"; - version = "1.27.2"; # Please backport all updates to the stable channel. + version = "1.27.3"; # 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: @@ -68,7 +68,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 = "08qh7867bc6z6mdbdilqdacx67n0kaxl3m4m97k0jxhd093a8xfz"; + sha256 = "1c9arwnwa0lirvkwm0rfknabqn5gkznihxl1p2m6j7cs7hwhhsn2"; }; phases = [ "unpackPhase" "installPhase" ]; diff --git a/pkgs/applications/networking/instant-messengers/spectral/default.nix b/pkgs/applications/networking/instant-messengers/spectral/default.nix index 29b314417c76..314a3bb64571 100644 --- a/pkgs/applications/networking/instant-messengers/spectral/default.nix +++ b/pkgs/applications/networking/instant-messengers/spectral/default.nix @@ -1,49 +1,40 @@ { stdenv, fetchgit -, pkgconfig, makeWrapper -, qmake, qtbase, qtquickcontrols2, qtmultimedia +, pkgconfig, wrapQtAppsHook +, cmake +, qtbase, qttools, qtquickcontrols2, qtmultimedia, qtkeychain , libpulseaudio # Not mentioned but seems needed , qtgraphicaleffects , qtdeclarative , qtmacextras +, olm, cmark }: -let - # Following "borrowed" from yubikey-manager-qt - qmlPath = qmlLib: "${qmlLib}/${qtbase.qtQmlPrefix}"; - - inherit (stdenv) lib; - - qml2ImportPath = lib.concatMapStringsSep ":" qmlPath [ - qtbase.bin qtdeclarative.bin qtquickcontrols2.bin qtgraphicaleffects qtmultimedia - ]; - +let qtkeychain-qt5 = qtkeychain.override { + inherit qtbase qttools; + withQt5 = true; +}; in stdenv.mkDerivation { pname = "spectral"; - version = "2019-03-03"; + version = "unstable-2019-08-30"; src = fetchgit { url = "https://gitlab.com/b0/spectral.git"; - rev = "0473f25d38a064ee4e18203ec16eeae84fea4866"; - sha256 = "1n09ginw6g0p42xj3zgxm52dvyyvj5psllv70vx21i50lvkbh9rw"; + rev = "ee86c948aec5fe72979fc6df97f4a6ef711bdf94"; + sha256 = "1mqabdkvzq48wki92wm2r79kj8g8m7ganpl47sh60qfsk4bxa8b2"; fetchSubmodules = true; }; - qmakeFlags = [ "CONFIG+=qtquickcompiler" "BUNDLE_FONT=true" ]; - - postInstall = '' - wrapProgram $out/bin/spectral \ - --set QML2_IMPORT_PATH "${qml2ImportPath}" - ''; + #qmakeFlags = [ "CONFIG+=qtquickcompiler" "BUNDLE_FONT=true" ]; - nativeBuildInputs = [ pkgconfig qmake makeWrapper ]; - buildInputs = [ qtbase qtquickcontrols2 qtmultimedia qtgraphicaleffects qtdeclarative ] + nativeBuildInputs = [ pkgconfig cmake wrapQtAppsHook ]; + buildInputs = [ qtbase qtkeychain-qt5 qtquickcontrols2 qtmultimedia qtgraphicaleffects qtdeclarative olm cmark ] ++ stdenv.lib.optional stdenv.hostPlatform.isLinux libpulseaudio ++ stdenv.lib.optional stdenv.hostPlatform.isDarwin qtmacextras; meta = with stdenv.lib; { - description = "A glossy client for Matrix, written in QtQuick Controls 2 and C++"; - homepage = https://gitlab.com/b0/spectral; + description = "A glossy cross-platform Matrix client."; + homepage = "https://gitlab.com/b0/spectral"; license = licenses.gpl3; platforms = with platforms; linux ++ darwin; maintainers = with maintainers; [ dtzWill ]; diff --git a/pkgs/applications/networking/instant-messengers/teamspeak/client.nix b/pkgs/applications/networking/instant-messengers/teamspeak/client.nix index 3c532fa506a5..a75d0c8633a2 100644 --- a/pkgs/applications/networking/instant-messengers/teamspeak/client.nix +++ b/pkgs/applications/networking/instant-messengers/teamspeak/client.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, makeWrapper, makeDesktopItem, zlib, glib, libpng, freetype, openssl , xorg, fontconfig, qtbase, qtwebengine, qtwebchannel, qtsvg, xkeyboard_config, alsaLib -, libpulseaudio ? null, libredirect, quazip, less, which, unzip, llvmPackages +, libpulseaudio ? null, libredirect, quazip, which, unzip, llvmPackages, writeShellScriptBin }: let @@ -26,18 +26,20 @@ let categories = "Network"; }; + fakeLess = writeShellScriptBin "less" "cat"; + in stdenv.mkDerivation rec { pname = "teamspeak-client"; - version = "3.3.0"; + version = "3.3.2"; src = fetchurl { url = "https://files.teamspeak-services.com/releases/client/${version}/TeamSpeak3-Client-linux_${arch}-${version}.run"; sha256 = if stdenv.is64bit - then "13286dbjp4qiyfv8my1hfpwzns4szdsnqa11j8ygsh5ikgjk338a" - else "04lwclq7nvw73v5fmn9795j5wi54syglc77ldl41caiqqhdqf1i5"; + then "1n916ds67dxj5bfgc5zm9nz2xh2914k85pzzspzvfyr7njcw7hpi" + else "0csl5xklcb4v8bzwvby5m2n38zjrnaw8dcvha7qvfbjllxr75yn2"; }; # grab the plugin sdk for the desktop icon @@ -46,11 +48,11 @@ stdenv.mkDerivation rec { sha256 = "1bywmdj54glzd0kffvr27r84n4dsd0pskkbmh59mllbxvj0qwy7f"; }; - buildInputs = [ makeWrapper less which unzip ]; + nativeBuildInputs = [ makeWrapper fakeLess which unzip ]; unpackPhase = '' - echo -e 'q\ny' | sh -xe $src + echo -e '\ny' | sh -xe $src cd TeamSpeak* ''; diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix index 26b858aa3b86..e57ff881af34 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix @@ -1,14 +1,14 @@ { mkDerivation, lib, fetchFromGitHub, fetchsvn, fetchpatch , pkgconfig, pythonPackages, cmake, wrapGAppsHook, wrapQtAppsHook, gcc9 , qtbase, qtimageformats, gtk3, libappindicator-gtk3, libnotify, xdg_utils -, dee, ffmpeg, openalSoft, minizip, libopus, alsaLib, libpulseaudio, range-v3 +, dee, ffmpeg_4, openalSoft, minizip, libopus, alsaLib, libpulseaudio, range-v3 }: with lib; mkDerivation rec { pname = "telegram-desktop"; - version = "1.8.8"; + version = "1.8.15"; # Note: Due to our strong dependency on the Arch patches it's probably best # to also wait for the Arch update (especially if the patches don't apply). @@ -17,7 +17,7 @@ mkDerivation rec { owner = "telegramdesktop"; repo = "tdesktop"; rev = "v${version}"; - sha256 = "1aj1pnzc6bz8jbdrfwdj2r54jhw9z7b5fd1095r007zmlnzs51lv"; + sha256 = "03173y2nlkf757llgpia8p2dkkwsjra7b6qm5nhmkcwcm8kmsvyy"; fetchSubmodules = true; }; @@ -25,8 +25,8 @@ mkDerivation rec { archPatches = fetchsvn { url = "svn://svn.archlinux.org/community/telegram-desktop/trunk"; # svn log svn://svn.archlinux.org/community/telegram-desktop/trunk - rev = "509240"; - sha256 = "1sf4mspbsqsnjzp9ys9l0asrx1bhj273d163i2bv1zhl4mmgpl3k"; + rev = "512849"; + sha256 = "1hl7znvv6qr4cwpkj8wlplpa63i1lhk2iax7hb4l1s1a4mijx9ls"; }; privateHeadersPatch = fetchpatch { url = "https://github.com/telegramdesktop/tdesktop/commit/b9d3ba621eb8af638af46c6b3cfd7a8330bf0dd5.patch"; @@ -38,8 +38,10 @@ mkDerivation rec { patches = [ "${archPatches}/tdesktop.patch" "${archPatches}/no-gtk2.patch" - # "${archPatches}/Use-system-wide-font.patch" + "${archPatches}/Revert-Disable-DemiBold-fallback-for-Semibold.patch" "${archPatches}/tdesktop_lottie_animation_qtdebug.patch" + # "${archPatches}/Revert-Change-some-private-header-includes.patch" + # "${archPatches}/Use-system-wide-font.patch" ]; postPatch = '' @@ -57,7 +59,7 @@ mkDerivation rec { buildInputs = [ qtbase qtimageformats gtk3 libappindicator-gtk3 - dee ffmpeg openalSoft minizip libopus alsaLib libpulseaudio range-v3 + dee ffmpeg_4 openalSoft minizip libopus alsaLib libpulseaudio range-v3 ]; enableParallelBuilding = true; @@ -87,7 +89,6 @@ mkDerivation rec { preConfigure = '' # Patches to revert: - patch -R -Np1 -i "${archPatches}/demibold.patch" patch -R -Np1 -i "${privateHeadersPatch}" # Patches to apply: @@ -98,17 +99,17 @@ mkDerivation rec { # disable static-qt for rlottie sed "/RLOTTIE_WITH_STATIC_QT/d" -i "Telegram/gyp/lib_rlottie.gyp" - sed -i Telegram/gyp/telegram_linux.gypi \ + sed -i Telegram/gyp/telegram/linux.gypi \ -e 's,/usr,/does-not-exist,g' \ -e 's,appindicator-0.1,appindicator3-0.1,g' \ -e 's,-flto,,g' - sed -i Telegram/gyp/qt.gypi \ + sed -i Telegram/gyp/modules/qt.gypi \ -e "s,/usr/include/qt/QtCore/,${qtbase.dev}/include/QtCore/,g" \ -e 's,\d+",\d+" | head -n1,g' - sed -i Telegram/gyp/qt_moc.gypi \ + sed -i Telegram/gyp/modules/qt_moc.gypi \ -e "s,/usr/bin/moc,moc,g" - sed -i Telegram/gyp/qt_rcc.gypi \ + sed -i Telegram/gyp/modules/qt_rcc.gypi \ -e "s,/usr/bin/rcc,rcc,g" # Build system assumes x86, but it works fine on non-x86 if we patch this one flag out diff --git a/pkgs/applications/networking/instant-messengers/telepathy/salut/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/salut/default.nix index 0bc9b3124ee9..6513c6324a61 100644 --- a/pkgs/applications/networking/instant-messengers/telepathy/salut/default.nix +++ b/pkgs/applications/networking/instant-messengers/telepathy/salut/default.nix @@ -22,5 +22,6 @@ stdenv.mkDerivation rec { description = "Link-local XMPP connection manager for Telepathy"; platforms = platforms.gnu ++ platforms.linux; # Random choice maintainers = [ maintainers.lethalman ]; + broken = true; }; } diff --git a/pkgs/applications/networking/instant-messengers/turses/default.nix b/pkgs/applications/networking/instant-messengers/turses/default.nix index a3f32bc82956..780dab79e997 100644 --- a/pkgs/applications/networking/instant-messengers/turses/default.nix +++ b/pkgs/applications/networking/instant-messengers/turses/default.nix @@ -1,9 +1,7 @@ -{ stdenv, fetchpatch, python36Packages }: +{ stdenv, fetchpatch, python3Packages }: with stdenv.lib; - -# Needs Python <3.7 for now, see https://github.com/louipc/turses/issues/4 -with python36Packages; +with python3Packages; buildPythonPackage rec { pname = "turses"; @@ -14,8 +12,6 @@ buildPythonPackage rec { sha256 = "15mkhm3b5ka42h8qph0mhh8izfc1200v7651c62k7ldcs50ib9j6"; }; - disabled = ! python36Packages.pythonOlder "3.7"; - checkInputs = [ mock pytest coverage tox ]; propagatedBuildInputs = [ urwid tweepy future ]; @@ -24,6 +20,11 @@ buildPythonPackage rec { url = "https://github.com/louipc/turses/commit/be0961b51f502d49fd9e2e5253ac130e543a31c7.patch"; sha256 = "17s1n0275mcj03vkf3n39dmc09niwv4y7ssrfk7k3vqx22kppzg3"; }) + # python 3.7+ support + (fetchpatch { + url = "https://github.com/booxter/turses/commit/e6e285eae50fc3d2042a476185fe60daef1e758e.patch"; + sha256 = "0g2zsrny955viwgs2l6gpiiz8m67b5sgdcxkjmfimfvvih5sg79f"; + }) ]; checkPhase = '' diff --git a/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix b/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix index 869dcb9d29bd..d79a24ea1c2a 100644 --- a/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix @@ -19,12 +19,12 @@ let version = { x86_64-linux = "3.10.2904"; - x86_64-darwin = "3.10.3133"; + x86_64-darwin = "3.10.3215"; }.${system} or throwSystem; sha256 = { x86_64-linux = "1vrz4568mlhylx17jw4z452f0vrd8yd8qkbpkcvnsbhs6k066xcn"; - x86_64-darwin = "0d8g9fl3yciqp3aic374rzcywb5d5yipgni992khsfdfqhcvm3x9"; + x86_64-darwin = "0ygm3fgy9k1dp2kjfwsrrwq1i88wgxc6k8y80yz61ivdawgph9wa"; }.${system} or throwSystem; meta = with stdenv.lib; { diff --git a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix index 933badccf631..5a84f9be96dc 100644 --- a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix +++ b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix @@ -14,11 +14,11 @@ assert pulseaudioSupport -> libpulseaudio != null; let inherit (stdenv.lib) concatStringsSep makeBinPath optional; - version = "3.0.291715.0908"; + version = "3.0.301026.0930"; srcs = { x86_64-linux = fetchurl { url = "https://zoom.us/client/${version}/zoom_x86_64.tar.xz"; - sha256 = "1f2fcwf0p86bxcnfdhij6hvgizd7n7gjcccwzdm2jv0dbqskad2f"; + sha256 = "0y3c7345y2wibz6p7d6p89wraaqb51651p176z4v7lcjv3gr8dar"; }; }; diff --git a/pkgs/applications/networking/irc/kvirc/default.nix b/pkgs/applications/networking/irc/kvirc/default.nix index bd38855109a1..6fd66096b5b2 100644 --- a/pkgs/applications/networking/irc/kvirc/default.nix +++ b/pkgs/applications/networking/irc/kvirc/default.nix @@ -1,9 +1,9 @@ -{ stdenv, fetchFromGitHub +{ lib, mkDerivation, fetchFromGitHub , qtbase, qtmultimedia, qtsvg, qtx11extras , pkgconfig, cmake, gettext }: -stdenv.mkDerivation rec { +mkDerivation rec { pname = "kvirc"; version = "5.0.0"; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { pkgconfig cmake gettext ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Advanced IRC Client"; homepage = "http://www.kvirc.net/"; license = licenses.gpl2; diff --git a/pkgs/applications/networking/irc/quassel/default.nix b/pkgs/applications/networking/irc/quassel/default.nix index 6aacdde544bc..d1b950a7757c 100644 --- a/pkgs/applications/networking/irc/quassel/default.nix +++ b/pkgs/applications/networking/irc/quassel/default.nix @@ -1,11 +1,11 @@ { monolithic ? true # build monolithic Quassel -, daemon ? false # build Quassel daemon +, enableDaemon ? false # build Quassel daemon , client ? false # build Quassel client , tag ? "-kf5" # tag added to the package name , static ? false # link statically , stdenv, fetchFromGitHub, cmake, makeWrapper, dconf -, qtbase, qtscript +, mkDerivation, qtbase, qtscript , phonon, libdbusmenu, qca-qt5 , withKDE ? true # enable KDE integration @@ -20,18 +20,19 @@ }: let + inherit (stdenv) lib; buildClient = monolithic || client; - buildCore = monolithic || daemon; + buildCore = monolithic || enableDaemon; in -assert monolithic -> !client && !daemon; -assert client || daemon -> !monolithic; +assert monolithic -> !client && !enableDaemon; +assert client || enableDaemon -> !monolithic; assert !buildClient -> !withKDE; # KDE is used by the client only let edf = flag: feature: [("-D" + feature + (if flag then "=ON" else "=OFF"))]; -in with stdenv; mkDerivation rec { +in (if !buildClient then stdenv.mkDerivation else mkDerivation) rec { name = "quassel${tag}-${version}"; version = "0.13.1"; @@ -63,17 +64,19 @@ in with stdenv; mkDerivation rec { ] ++ edf static "STATIC" ++ edf monolithic "WANT_MONO" - ++ edf daemon "WANT_CORE" + ++ edf enableDaemon "WANT_CORE" ++ edf client "WANT_QTCLIENT" ++ edf withKDE "WITH_KDE"; - preFixup = - lib.optionalString daemon '' - wrapProgram "$out/bin/quasselcore" --suffix PATH : "${qtbase.bin}/bin" + dontWrapQtApps = true; + + postFixup = + lib.optionalString enableDaemon '' + wrapProgram "$out/bin/quasselcore" --suffix PATH : "${qtbase.bin}/bin" '' + lib.optionalString buildClient '' - wrapProgram "$out/bin/quassel${lib.optionalString client "client"}" \ - --prefix GIO_EXTRA_MODULES : "${dconf}/lib/gio/modules" + wrapQtApp "$out/bin/quassel${lib.optionalString client "client"}" \ + --prefix GIO_EXTRA_MODULES : "${dconf}/lib/gio/modules" ''; meta = with stdenv.lib; { diff --git a/pkgs/applications/networking/maestral/default.nix b/pkgs/applications/networking/maestral/default.nix index bfacac2eaf4d..65490ada653a 100644 --- a/pkgs/applications/networking/maestral/default.nix +++ b/pkgs/applications/networking/maestral/default.nix @@ -1,21 +1,23 @@ -{ lib, python3Packages, fetchFromGitHub +{ stdenv, lib, python3Packages, fetchFromGitHub , withGui ? false, wrapQtAppsHook ? null }: python3Packages.buildPythonApplication rec { pname = "maestral${lib.optionalString withGui "-gui"}"; - version = "0.2.6"; + version = "0.4.0"; src = fetchFromGitHub { owner = "SamSchott"; repo = "maestral-dropbox"; rev = "v${version}"; - sha256 = "1nfjm58f6hnqbx9xnz2h929s2175ka1yf5jjlk4i60v0wppnrrdf"; + sha256 = "1jjn9cz43850xvs52gvx16qc5z4l91y4kpn6fpl05iwgaisbi1ws"; }; disabled = python3Packages.pythonOlder "3.6"; propagatedBuildInputs = (with python3Packages; [ - blinker click dropbox keyring keyrings-alt requests u-msgpack-python watchdog + blinker click dropbox keyring keyrings-alt Pyro4 requests u-msgpack-python watchdog + ] ++ lib.optionals stdenv.isLinux [ + sdnotify systemd ] ++ lib.optional withGui pyqt5); nativeBuildInputs = lib.optional withGui wrapQtAppsHook; diff --git a/pkgs/applications/networking/mailreaders/afew/default.nix b/pkgs/applications/networking/mailreaders/afew/default.nix index cd512e776130..85b73141966b 100644 --- a/pkgs/applications/networking/mailreaders/afew/default.nix +++ b/pkgs/applications/networking/mailreaders/afew/default.nix @@ -12,7 +12,7 @@ pythonPackages.buildPythonApplication rec { nativeBuildInputs = with pythonPackages; [ sphinx setuptools_scm ]; propagatedBuildInputs = with pythonPackages; [ - pythonPackages.notmuch chardet dkimpy + pythonPackages.setuptools pythonPackages.notmuch chardet dkimpy ] ++ stdenv.lib.optional (!pythonPackages.isPy3k) subprocess32; makeWrapperArgs = [ diff --git a/pkgs/applications/networking/mailreaders/hasmail/default.nix b/pkgs/applications/networking/mailreaders/hasmail/default.nix new file mode 100644 index 000000000000..49f0ac533659 --- /dev/null +++ b/pkgs/applications/networking/mailreaders/hasmail/default.nix @@ -0,0 +1,41 @@ +{ lib +, buildGoModule +, fetchFromGitHub +, pkgconfig +, gobject-introspection +, pango +, cairo +, gtk2 +}: + +buildGoModule rec { + pname = "hasmail-unstable"; + version = "2019-08-24"; + + src = fetchFromGitHub { + owner = "jonhoo"; + repo = "hasmail"; + rev = "eb52536d26815383bfe5990cd5ace8bb9d036c8d"; + sha256 = "1p6kwa5xk1mb1fkkxz1b5rcyp5kb4zc8nfif1gk6fab6wbdj9ia1"; + }; + + modSha256 = "0z3asz7v1izg81f9xifx9s2sp5hly173hajsn9idi3bkv0h78is2"; + + nativeBuildInputs = [ + pkgconfig + ]; + + buildInputs = [ + pango + cairo + gtk2 + ]; + + meta = with lib; { + description = "Simple tray icon for detecting new email on IMAP servers"; + homepage = "https://github.com/jonhoo/hasmail"; + license = licenses.unlicense; + maintainers = with maintainers; [ doronbehar ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/applications/networking/mailreaders/imapfilter.nix b/pkgs/applications/networking/mailreaders/imapfilter.nix index 78b1aad03fbf..7d7972c3e582 100644 --- a/pkgs/applications/networking/mailreaders/imapfilter.nix +++ b/pkgs/applications/networking/mailreaders/imapfilter.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "imapfilter"; - version = "2.6.12"; + version = "2.6.13"; src = fetchFromGitHub { owner = "lefcha"; repo = "imapfilter"; rev = "v${version}"; - sha256 = "0vzpc54fjf5vb5vx5w0fl20xvx1k9cg6a3hbl86mm8kwsqf3wrab"; + sha256 = "02997rnnvid3rfkxmlgjpbspi4svdmq8r8wd2zvf25iadim3hxqi"; }; makeFlagsArray = "PREFIX=$(out)"; diff --git a/pkgs/applications/networking/mailreaders/mutt/default.nix b/pkgs/applications/networking/mailreaders/mutt/default.nix index c694398bd7d2..3af4c7f5e15f 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 = "1.12.1"; + version = "1.12.2"; src = fetchurl { url = "http://ftp.mutt.org/pub/mutt/${pname}-${version}.tar.gz"; - sha256 = "0311sip2q90aqaxn7h3cck1zl98b4vifqi8bp5fsizy4dr06bi81"; + sha256 = "10k8352s0z7yan6d4z2am80qd3bsaky4h89g72wl4xr3x067ahmw"; }; patches = optional smimeSupport (fetchpatch { diff --git a/pkgs/applications/networking/mailreaders/notbit/default.nix b/pkgs/applications/networking/mailreaders/notbit/default.nix index fcf1464ba239..370c4f838870 100644 --- a/pkgs/applications/networking/mailreaders/notbit/default.nix +++ b/pkgs/applications/networking/mailreaders/notbit/default.nix @@ -25,5 +25,6 @@ stdenv.mkDerivation { license = licenses.mit; platforms = platforms.unix; maintainers = with maintainers; [ mog ]; + broken = true; }; } diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix index d8f5e58d9fe5..6dfb6780f0db 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix @@ -1,615 +1,615 @@ { - version = "68.0"; + version = "68.1.1"; sources = [ - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-x86_64/ar/thunderbird-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-x86_64/ar/thunderbird-68.1.1.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha512 = "4fad3c7c4099f70253bfee450bcefe458bec61430720fcadde1fe8a1cbb2e62a18d9c55943f850c57f8d788c973774e24590823086cfacbbb2ccd8a99ce4faae"; + sha512 = "33accd6fe1f83fc47a34df038f4257571f42281a89f9aab2f54514443856b71aaa2ee81abe98331ecdbbf026a09eea31fb2c5eb72044347c54f51a6ac1e0bfd4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-x86_64/ast/thunderbird-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-x86_64/ast/thunderbird-68.1.1.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha512 = "aac850773381d7fdb4d50fafe670449301f073f7388f92a1ca38d9b7256ffcd244b63e9fc0ff2f8ef5ccd853b97016b7e05eb751be1bdc8df9623481f15d55e6"; + sha512 = "1e32c40cd198b51a5836c2ad9a6331c0b3028e57d62e5e057990a48ab80b9fd5bd1290a268da29dc5a45c61e712bf0345f85d0ca43c18b2236c0f4bac7b9328f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-x86_64/be/thunderbird-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-x86_64/be/thunderbird-68.1.1.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha512 = "6521d818984bbfba195e847735c1228ff637d3079cff1f5a461ac20a079d325adfc1d7b2eca54f63e584a5cbd2007cef42a625597276a1810158931335f09cd9"; + sha512 = "0f86506a7cf72c75712f6b507fda6e39da9520865dea5eb4fbfdb78531dc88116d4e8227dd91e8f1fb4dff9ed3e4eb7e118b5a4dde3860ec00c3bca625478a21"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-x86_64/bg/thunderbird-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-x86_64/bg/thunderbird-68.1.1.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha512 = "a0a738b6877225a5b98691d53a8f4a4bf575472a0d5feb8b77a67cd1fc9951772f1ab507b7ba460c0b62b87ab476c5c94130cbe7275692e3a99e5d2ef0bd89bd"; + sha512 = "f25c07ee41767fc1ec9381291662ce5bf269971f3542b4c2427da7240c13cfe44f006b8995e6474309bb6330e21626ca7e3e7463452ddd5d7e0128b799f6f566"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-x86_64/br/thunderbird-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-x86_64/br/thunderbird-68.1.1.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha512 = "58d21d9e55abed644eb16ba98a5fb3277e0a31b935d279b09745262952895c2c2aed31817e6157410137ff82fc5d242b64268f646c3b7b691c55c5f3ea36e0e6"; + sha512 = "c57c207922aa0f1534fd6925305effdea2f09ee83ddfe7eed62d30b91494ddbf6ade0c0cba2e7332c876e10e15593ad985deaec769525fd3a19b21d048383690"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-x86_64/ca/thunderbird-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-x86_64/ca/thunderbird-68.1.1.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha512 = "cd401259f2cc4ec71ff9d936a1f2f64a064afafed2e305bb359f79eddf1159cd6a7c84ce54cde6be94f6acd295dbedf54017d9f4592ee3637eea00496c7cfbf1"; + sha512 = "4fb66d8e9285cb40cf42f626d38eecabe489fa5311a25ce2e687483b6624819674b0b4a41f486a0ea98edbe27cea2f7f156368516f70afd4f78629aef93cb94f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-x86_64/cak/thunderbird-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-x86_64/cak/thunderbird-68.1.1.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha512 = "45ea4af30ff93500d1671c6a0eeda993692b7204a7504a91ad30bfd5155add5af902205240fd62f80abe339224e686473f2d13f466ba96269347207ed3f628b5"; + sha512 = "2c591767d09c3af59dcda7c44937f012cc14695a7744bca49d2b5788cd44953a85b8cc0005efa4db3daeb6c5f553ead9d15239af37b1c7686e5331cf9bb09ee5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-x86_64/cs/thunderbird-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-x86_64/cs/thunderbird-68.1.1.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha512 = "9f81f92a3b1710d006cda79f1b92923c1ea637a24654bd622af9be1f53a0024c5daa77619443514c9e607cb62f96403f5b7f426b3692227c0b56d1b14f51ca97"; + sha512 = "62d58fd817b235d8afea65212f527b99cf67d882a3fef592c2499881d659837ed90f5192111edef9b7d00e37ea5b1becc9fed00eb4af063ffa4ece160996a73b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-x86_64/cy/thunderbird-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-x86_64/cy/thunderbird-68.1.1.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha512 = "c90467a78bc82667d974b1e94227b7d4185878654188967d97c11e419ec7a03e4e5e3636466a0b6d35beaa98b717a26341e3a652c3b21083ad8ad0b23f063ed1"; + sha512 = "7df64966340aed43c1411abeef18ade4891c2d64361d3952967529ea487dbccf6ec4d824f85a740ed4d54bda188acf9992ba9623a72c139268f09efaaa27eb89"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-x86_64/da/thunderbird-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-x86_64/da/thunderbird-68.1.1.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha512 = "f49bd5689d2a4dd311b22a23da9f26559685f1c4663eb1e482b45b79544ab4401a17701f33b6ad083e7a8983185fcb16fca4c8026138f24be495c6cbb6401488"; + sha512 = "7bc7c0b44e981f74119cb19f4d27e260a2df53b9188364c367752ca4fa461b1c003ea58d4eb14fd9d9b64ab1cec5cbef6e68080da180ca6e904bc6bed0dea924"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-x86_64/de/thunderbird-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-x86_64/de/thunderbird-68.1.1.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha512 = "579d979cfa0bbe50fd0bbf0d15b38d90579bc065b488a2e9d4e3f18f505e71c50225d92185559578146097110760ed3807e1aefad4862d99e247447478d6bc42"; + sha512 = "6879addb03511e1fa18696069251a3649865fa2410b2503f8588d06e3ad8fe9d127ef414cfa977a323468e037f7fa06d7dbf306bb98608ecc21acedb68e2784d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-x86_64/dsb/thunderbird-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-x86_64/dsb/thunderbird-68.1.1.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha512 = "8d16bf47d368a670cadb6a2655933d5b49a796272f7dafd948cac95a2ae541561a38fa418cd4ed0c4aa79ef63a441ee769eeb2a071734abf2cc1ba243d4f3ba5"; + sha512 = "ab82cc4b35e0bc9bca7611cc9b17cc383e7489f54e976074d34deca5ddf83d380b85ef3db5b35611d59500ba8c421848ca9d0e4e8dc4f8dbbd0b9fabfd13eada"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-x86_64/el/thunderbird-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-x86_64/el/thunderbird-68.1.1.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha512 = "579b9114af9fda86e79e6812946da858945e2034ed2f00e4244724ecdd680b7db5601a4d573b530dc15207caac9245f6883343684eb43f3ae2abb64853c0b54f"; + sha512 = "b8aba262bd82149ec9213d0a307ca6579c64b7afa084a251f35efb68384df55c220fe71bbef1741514ddd45c284e669fd4062ce5202f9ba91622b88dd48d5304"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-x86_64/en-GB/thunderbird-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-x86_64/en-GB/thunderbird-68.1.1.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha512 = "f7caed8c3b49714e4449ef971ed1a21e40f28625c84e9342f63e5f73743689ee2c0e9ed4845f6667bd22732c62bd707db425f22a5c074dff8622cc4536ba9c29"; + sha512 = "b16a859480d9cc2f2ae2bf644bdff72e5b272a91cd311684012b4f364f7a06742ceac37a1821cd37e5749e6bc7c12b737e35f226c0694710140b154d931d5610"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-x86_64/en-US/thunderbird-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-x86_64/en-US/thunderbird-68.1.1.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha512 = "257528761f0eca38528ded4b31329886093418f562aa2fac73b3a5bedda51fe80b34758c10afae1735cf37b37a86413dcf08642aecb1e8bea1fb6b0b94ade5c7"; + sha512 = "3046e6826e5df839ec1e572784bf333f72c5deb3dd472a17f0fdae5ce33bad3980a7f39eddaf99e680084053d66dfe83dace788c392ef027116f03ef49e05d33"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-x86_64/es-AR/thunderbird-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-x86_64/es-AR/thunderbird-68.1.1.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha512 = "70a10e329b1031a2fd2ffb2b60459f0238ff3f5e5d80533f4be6cb22ae77692ec079ca3e146bd9a59edd09c266cec92d922a18ba45f8626a4bd44e290d3c0927"; + sha512 = "8e7ddd969487ec21ec2b4ad50e0757595d05f44972427d6c7243da15a433d16b14dcf6128f9ef96711bf8ac5353df3c3fb7a844a8f69ceb3761b023b22728f7e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-x86_64/es-ES/thunderbird-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-x86_64/es-ES/thunderbird-68.1.1.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha512 = "a03098ad7d83b86cd316c56b69589370fb8bad041b93f90f61514b04e3d0e78385f779ed715c6e22e45597d1bf03676046cbc1eae7896bb2a309af3683c8bd1e"; + sha512 = "7e59701093cd6c34498b9439d50bb1d03a2089366e793ef3d205dedeb14427d0f2306d18c5c0423a3a7d349006e3986d2c4977a996b3ebe3fed5d79d4a00035d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-x86_64/et/thunderbird-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-x86_64/et/thunderbird-68.1.1.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha512 = "44efeaf030580dd7b55770627678808e34d689e85191852c2e5fcb223a0fdd0e5386f21f03524d0983aeded7f8ed99382ff2c372c8c5a1fdfe218bd5b10ccd80"; + sha512 = "851ed5a2289682a658eb69dbc2e5bab05199b08a3ee53a5d57bc8dbf0bc7882170697b1b382c9abc6f8fd6674c132bdf83f2b05aceeb4edeab57eb510f95f64a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-x86_64/eu/thunderbird-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-x86_64/eu/thunderbird-68.1.1.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha512 = "c670be5932d7e8bea28cffda7c119cfdfd5823f76b2c97251ec23ec16e420a8b7feb5f2251d89750b956d3bf3baff5d17393c05d8c265d0a98cc3faea8f85735"; + sha512 = "b006a9d2ca2510ce975509fa505200e3ad66dbc21a3e029007b01b60ea0021c34056b5972e7610ffbbd1d083e70745328ad36d7c64d97fab9973ffe2458d7c94"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-x86_64/fi/thunderbird-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-x86_64/fi/thunderbird-68.1.1.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha512 = "36aa0b47e9b5d91fbc812a3d63503924a8ca227d7b7084c1159419092b17da9c1b6e89fa046c636dbcff7776f9a1d8465e660b47f1753505f0d2eb85da9c3a7a"; + sha512 = "c08b0567e22048a36ed6838464af84867cf6119130a5c1aa01e093bc7b564cc5d12d22bd530de6aab4e247ffdca1a3757b22dbe2be65edf846026733a8ab6cbb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-x86_64/fr/thunderbird-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-x86_64/fr/thunderbird-68.1.1.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha512 = "b1e7d345d3dd38725227b5e09c4f3cfcf29ed3a98b0580fbf6ae1ecab4414d09e307423495b75769a8d2ee3ab4700cd6eba3d95ce05612e1d8290d3f5a3ba988"; + sha512 = "0dc66c2136f6bdd0d11d450603f13f9c3822f3a50ecfa0d8f0173475243ca145dd1082fac9f8b9a25e7e6d4e0f19cb127510c40c86bc721074b301536aa114df"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-x86_64/fy-NL/thunderbird-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-x86_64/fy-NL/thunderbird-68.1.1.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha512 = "4065a083f49006dacf64f084c1bf26c4c1b8d53bca7eba7a56d66bb035eaae2c4528687c5c1e2213f92adbba17ff92eb54f897d3b0ef6d27b8effbee66ca555b"; + sha512 = "685f664ebb6545f85d52604ea9e26477ba7ab6b36b2cb26fa81caccabe42e99c4cf57de40ce0615e830b0199b1317764e90f2d112fde42344606a39eaf454c1c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-x86_64/ga-IE/thunderbird-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-x86_64/ga-IE/thunderbird-68.1.1.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha512 = "2ae9a0860513e90d1742e5c17220b2367e61273eba04738cd29e9ab497b86f9a1d78b38b21da84b1f214f3368ee114d376b05eabe0aac9a1ec07ca6a4b399070"; + sha512 = "ecc63d373496bbef6992dd619d637956ce9d753f2eeadb0b2d45d11c11b71e9018c33d6deed7bddb1781285949dfa8f245b99d881126a8076db403e9036ac39c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-x86_64/gd/thunderbird-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-x86_64/gd/thunderbird-68.1.1.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha512 = "d2315aca9d8e5bb35b21cab46a48e51f09200b056da2682201c32eb4fd3d0379a24a6926ebcf11e9c70d70fd20152fc24d5197a78cdb3c8ea3cc2399d784b463"; + sha512 = "9cc2e9a105b2e1d3410fbde8d06c3340ba2d50ef8790b31c928385607baa8735bfe02ff6010315c1068d7585ac94bd9fa002cdc27c30007e6be44b37a6ebb6e1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-x86_64/gl/thunderbird-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-x86_64/gl/thunderbird-68.1.1.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha512 = "52d9210e857c1b6cb665a2ffa71cfa5e67c3718b210e2b4b42839d8f25987170f1603fa55d324003a4be821ba74093ff92d632e688e44b87ebf51dafd02f69a2"; + sha512 = "223c36a2ac4b02e991b90134deb0ac6d2a18d77bf0e8b8627b0cc5c0af49e0d9b10b06c05efb31b93aad90a75792ecf4f803a2fc5471595612697f92e1d3aaf0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-x86_64/he/thunderbird-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-x86_64/he/thunderbird-68.1.1.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha512 = "e7b5a16950be233fe8a49152184270a901bdb4bcc14769401d4b5a21fd2a3ab9d395ed8f6b61081330386723725252fceff09bf9fdde3a71135a98d8ae45089b"; + sha512 = "865fff7acc60d6b4c19bda1ea38e532e96e0cfde18c441970389c34dd1e6f90f635202f4d98457d2373d42cd47cb3462b2ce0a3d7a385593be654edc54f2b756"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-x86_64/hr/thunderbird-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-x86_64/hr/thunderbird-68.1.1.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha512 = "1ed224dc0864009edc6389f9b3b063f56b15be982c2e2915f1a2f773bfc78e6b81ec0ab02e03f7ade08f47260be597003f8119116576f4fe5dd490e85cd3d4ab"; + sha512 = "34c410ab7a1b16c2c172a0c45fcf69d9e2b4462f98f926c391b71eacac351162dfb55f29728627ed2fef28ef7ba40530b899d637690926297e797a3a2be5ceb3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-x86_64/hsb/thunderbird-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-x86_64/hsb/thunderbird-68.1.1.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha512 = "f4bcd8a199bafd544687b1e890694dac2b598d4fd79818ab19441ae9be579a9928fd8c7fbae43e322fced15ff39314fbc88be94ce2fe12b5d2ec2ba003a219a3"; + sha512 = "f885d2b366fdf1806dd8e882fdabf8994e56471cf01cc0c6ef6d1e1d4972186dc8ec5d35b18ceab8f7982d45724544f4f20afb4621499d9543eb98a3d87a9e43"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-x86_64/hu/thunderbird-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-x86_64/hu/thunderbird-68.1.1.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha512 = "28223aec237fce2f07b0c3b454a8339bbd2f195d6e263c5a5723e04bd5df1128d58a6bc6c7275cdbeefd5161a405a2d6340303faa79d9330abd0e70de9facbfb"; + sha512 = "e66ac6ad21527936f65e82be605d061b9b93688e94ef35d85699e2ac03d639e00db07d113071af08f11ac1742d811d66048e1d6de4ecfc01e25e325788fdc208"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-x86_64/hy-AM/thunderbird-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-x86_64/hy-AM/thunderbird-68.1.1.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha512 = "d7dea23905f8bc8dfde92082f90278b76477eb3036c7fc4abe656e37af9d389d37f3b166492df210eeab03750d85cbcaf1340aaa26ab723ca1b70299b4a64ab6"; + sha512 = "fa959b64625773fdca62414269f1b3d0eb369d1e4d3d45b260d4ebfc367a156f70bda5b13d30a0fb4d576ff96bea5712edde51eab62db211fe636340b73999e2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-x86_64/id/thunderbird-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-x86_64/id/thunderbird-68.1.1.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha512 = "f55ad81a1dc80838a9ab045899e0f16bb077d05d73119705f820f6fe8c8c7a550e05cc68cb7ca0aa8861cbd70bc9f061ba51a4749db6c37d90e7e7bda5dcccdf"; + sha512 = "b20294eb413344fc550200ecf6780c79a919e9d4498bfb97c660cffc14ef18e1d38ad5033b6ecca703467f832c40d4ed4022e335cf3e28e12b43e7c6321fc1a5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-x86_64/is/thunderbird-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-x86_64/is/thunderbird-68.1.1.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha512 = "503c236102a15428e41a21b458ecc29986abff4e434f4e26ec9741b2facf39a8fc2ae9dff5aeb32fe3c9ca0dcb6e914a2acf229ae9caecdc4f064380f126ecf7"; + sha512 = "99c70cf0baed763feaa41799a51a15ecac4190131d74996101b00e99c2b4b674cdcfd0896573bd5fe4e22a25067f6c0dc3c19ecdc2706e010719d19f97aef20f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-x86_64/it/thunderbird-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-x86_64/it/thunderbird-68.1.1.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha512 = "51a736932baa5c810a29de46eba64b0fcd2703da38ba9449b6b06a9412562e80853367416c5b4d6c6834eb7a2186f434e426099ede56d9342860e4f3561455eb"; + sha512 = "b711ad04c405b7cf0796f242bcc08cb5906a8b4fea4b2655251b135347a4539e974606f88626093376ce16a11995d23c6dfb16fbea38842a0b9dbcd8ce2a93a5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-x86_64/ja/thunderbird-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-x86_64/ja/thunderbird-68.1.1.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha512 = "7a00080835155d301f65a35684d81f8e3a3be23d927d939da84a2a887057bca0b75d5b580a004b4f797af504a6812f71951bc3c75ccb24dad60b6cca770cc7a1"; + sha512 = "bad79952ae19ee63892c357ca2e55e0ee220532fa2d28836a15866f7549c82448196ddb51b91eb2abe75d87188fc1139c886c24f66a557f87253c843622fad64"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-x86_64/ka/thunderbird-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-x86_64/ka/thunderbird-68.1.1.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha512 = "eaf67c64275495fcb08aca63953406cd7815ec356ee0a1edca8a5e8dacd924a9c11e35dbe4ad17a1617199a5f66489bb553a7a5177eb629223b49a9adccff803"; + sha512 = "f129b230d2572b25e289a7b8c1f1b4be71a8f57b639d0264cc50068a2767af8fbb64ffc0c4ae7d50cb489015fe9a810e34682cf351f6711d40a333c2fcbf9493"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-x86_64/kab/thunderbird-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-x86_64/kab/thunderbird-68.1.1.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha512 = "9432bbba0965b6da04495b79ef4db3bdbe69476b20650b4d6407d921cf07d09950368f0c13211ea6743b621d486bf71dce0e60d8ceefd82b48a8f2581a3fd7ee"; + sha512 = "2346f5acab924faf1eda887f29777dbdccd4569a3163f385dbd3ff8fd7be9767df4c19496ac7a550426784a04f1cea6a4370288eb8d12e3cb93abf8b0726979d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-x86_64/kk/thunderbird-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-x86_64/kk/thunderbird-68.1.1.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha512 = "9bfb99694bcf1227162607e2b674abb00343e4da3876999430d6014cbd4f4aa6c6e9ddca7c7f3b144d101c1a5a6d38772e3750f5feb41d1f304b89a8c1e6ec15"; + sha512 = "12a7dfe909bf22a2a2906cd749aa409e023a777defeab4a28d4456e76e84a24d10c8a6cd1dfe54371b110acbb04c89c3259341ebd6e0ad497d175d1f9eb8c871"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-x86_64/ko/thunderbird-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-x86_64/ko/thunderbird-68.1.1.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha512 = "fd260740ccd74afae7af664775954acfd176b47176f48b5300f11bd77bc31205d0bbc2d06a701486e9742ffb38ad4aa2b253041b9d9518a4b9c7dbbe41aca264"; + sha512 = "7a3ec307a546c9adbf56a0b41c7b900edb76b0e52a773b486997c1f294abfd7262208a9717936e4e6ccdf109d20cdacd4cc5b4aefec30e82e23c6080154174e9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-x86_64/lt/thunderbird-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-x86_64/lt/thunderbird-68.1.1.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha512 = "fb7a7b6d0c7d58d13b3ec20c8176ee793cac5c53bf849e3b3c4aaeff0f3e897cc35e61a9dfa4055c691fd56f280f7b31e04999922c29ecc89294ea6eeac16cd3"; + sha512 = "3f0cbd3e185594fb16694020788b22aec01c12682aea86ede1052d766da797b24b9b99b8ecb44dee008cfcd7a10ea36e7e1bbd39842fa416b8e69eea0bd831a4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-x86_64/ms/thunderbird-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-x86_64/ms/thunderbird-68.1.1.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha512 = "7490a8169079569143c63f85e7da299d28ea423fb95265e2e86ec724ff0da641e24a2e9ea612d180d523973522f40c250bfd56e66ee39b28cb9acf57f6be6831"; + sha512 = "cb70f35114b3fb3c0324b80ece639a4bf733abe15b74bf0f04201e272703eecdffe66a2cd50e66d986332b40d3ba7dee04cf7624cea48e9925294437def77853"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-x86_64/nb-NO/thunderbird-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-x86_64/nb-NO/thunderbird-68.1.1.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha512 = "7256820ea97851319e51616f6eb45617983e76e74b46ae62a02e22d13e2dd6abd590fd265aa6c88ac14b2f0276219580b6b9fbd956f1eaa38e6a93329b9c9621"; + sha512 = "3bd4914a8b0cad71622a79e34d182aa7c1aa115780980c29f732454ec219a19ca4d1af3f61693595842b27cac7c64138c094dbb13b0329950d79ef8674ea610d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-x86_64/nl/thunderbird-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-x86_64/nl/thunderbird-68.1.1.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha512 = "00f32145c861abd8f151d7840d0f01eb9d4190df65e5a179f999f3149477f2de7f796782eb7ef912fcbec005d65c76974185d1c0105dea862cbc22c821bc906d"; + sha512 = "3335baf0974932247e73704a5272d3bb4b182908a76e9e3e0f15bc0c40fca7763a3fe1f4303b3f3374a0f758bb00d6639595b8cfe9c03999f3bfefd8b6f0153c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-x86_64/nn-NO/thunderbird-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-x86_64/nn-NO/thunderbird-68.1.1.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha512 = "3ac255b5bb4b352833fd56d5aceaba6d0ada571630a993729970ae99d5067f05ba22e6ef50fa7dd099c0eb5874f11aeed32718c56a80538e28b401ee6b7900a2"; + sha512 = "b9c93af9d330bec6f7182163fc680161a138a99691897263b74e81d9a30c6d892c4639aa28d0b311ac51800b72de9e092065ce03cd7683b86bd571c7e394a49b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-x86_64/pl/thunderbird-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-x86_64/pl/thunderbird-68.1.1.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha512 = "19ab4bde9314dbed1bca7565698a7b1231767ef9cc792a49e7e9d679453ae8209e6f68c63ea0a24bd9e3a97328dceeedd109bfe28038108b52b9dad366f28787"; + sha512 = "3f66d17f0e231c608b1f45dd51cdb231826a3159ce188e9036cae8f45486d38d95d9878429dc1f15a90df3a91069b4c4c5d64ba9d35ca071cc7c1383d6c89239"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-x86_64/pt-BR/thunderbird-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-x86_64/pt-BR/thunderbird-68.1.1.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha512 = "68e28b657b885e7823dca0d091f2609556d560a50b5e6c285cdf467ae2b09743406baa2e544f17997519c219e0d4e8911115d30e7b0c35f09b956e28b311f8d8"; + sha512 = "dfa439f4decb4bd22945584772d837acc79ac9227763ffe061a551d334b4ab5b8479516ece0c32ae5d7b05c7168c7ab32b390a83edb61f5d33e20cad965e6b75"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-x86_64/pt-PT/thunderbird-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-x86_64/pt-PT/thunderbird-68.1.1.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha512 = "41623568d2e78b821a89480836f8d8c739f6983b80ce26017d12fd9363016158fa6c629e030f63aba6e730e554b7717fd2ee58e0246aa82b46fe55d5d6be9933"; + sha512 = "79dcbab7997b1610a33db0654d5e2a831e63dc1e5be7794105bf3d9739d749b75ee56a9892c112d1da5fa5c5bcd76b945b1fb7532ef2b075f1c09706abe64165"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-x86_64/rm/thunderbird-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-x86_64/rm/thunderbird-68.1.1.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha512 = "a2cabac0ff5e3bb4a8dde4e884ba4647792e0935ef0a61b56470c67d3ba9c2310a07c2d2da51f7b4cb5fc3e841dd385a2c64ff29d263333a91e2044a4ad3190e"; + sha512 = "e79789f61bd59fcad82e25b62e4a324476d48297e826118352f9a8cbfb3b6807cf565fbcdc49fb1c90f22595f5d5e9b41c67b994d83a15f0bfd8b98645552b35"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-x86_64/ro/thunderbird-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-x86_64/ro/thunderbird-68.1.1.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha512 = "2e9da10d1f88352687175fa48fb70f8a73cf3ab1d84958a79c4a46526b3640e264d98611806bb234f579d616fe7d1dbb2d4c6ba55a389363034f85a97283bb64"; + sha512 = "77e7deeb8e0fb2d77e7a672d0ef77acf171b602036fc14f8685c3b247b42d953dc18e816812067d025f17ec64daf1895508c11ce27de1f55cca7474377eadb6d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-x86_64/ru/thunderbird-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-x86_64/ru/thunderbird-68.1.1.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha512 = "5f4bd3d3657479446ff070cfdb33e16a527c6f1615f37fb4c4e32c12b89c62d5649fa5c3d826723be47fa9795575bd33ccf37c2aebb555c218aba8f9d68ec3a9"; + sha512 = "74993af15f9afbe5034966d2c5ed17d1f1d43a47422acd7e671b4cbb8176ad845b1bf26d45d81a05e6cb4e6f7cb1be0dcec38d22ec4ef82aca45db49a22de1f8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-x86_64/si/thunderbird-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-x86_64/si/thunderbird-68.1.1.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha512 = "b47d2aea81327089445c9f57a1508406c534907c7b574006886828846e6deaab04e35de2781d55d882f05c0a89f65fa7c386547d6581064af4fc3bf4e879e379"; + sha512 = "a2feda066e1cac0e3d4e9ae5837cae50ec864190b9620694817eb7659a1292b488b820aefc2c3e11393ac52934827c368d379f9a74babe53dcbc48c447cfb538"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-x86_64/sk/thunderbird-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-x86_64/sk/thunderbird-68.1.1.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha512 = "4295204bb89789704da6830d33e92a77df165737c291c74a94fa532309c89505fb796151e0855b4e0bad8658fecaadc9978580ac72e2a2f24a4022909bb64aa2"; + sha512 = "ecf370133d0fcda81c9caed13f5307bf27b50e85f255a5c13cb37da4466ca60cceceabe8463dbec3b2e4e7349c92c759803eb2ec01448dce1778d2bcfd2d9fac"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-x86_64/sl/thunderbird-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-x86_64/sl/thunderbird-68.1.1.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha512 = "598fe5bd04e04a73db04eb630e02dd7cc7af34d0381e6877626c8885bc4b879e1f35362afb8cfeb1bbafffc5b7ea14c8efe9b35b5e30056d04fa0126b8663679"; + sha512 = "2fd49d0f88c145ab65ba3887363b969da2b6ca141de373fe7b3fe95cb1af27cd4fcc1e21b146e241c312862736aebeb8ddf813548e7e5e133188eaeb94933124"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-x86_64/sq/thunderbird-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-x86_64/sq/thunderbird-68.1.1.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha512 = "0b657daedc98db51179cebf547d5f278d2d632bdb552878b4af29427ab8fad62f8d6c1ab2c3a38cbd8e67b670d6d613bdb1d4f535a0c69d0d1ca607d0b10bd43"; + sha512 = "4adb9557d053c8485dd2abb89285c3559004653d4200025205758f54bf349d79f4a1db8229af5a2fbb7598554e47ebd7f6b1823f3a1cd0bff53a6080d17ed363"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-x86_64/sr/thunderbird-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-x86_64/sr/thunderbird-68.1.1.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha512 = "10efa11b9c9ba56142c8a321a25a7e875f3d02fd17f73bd3061ffc71823aeb1269f9a864aae88a4fc434d1c4a01d227c0be605ffa7f4ef6421db98c0141c839e"; + sha512 = "4132d8b2470b50d3565d4ab32ce23eae77874b6cba8451c06a10cf5e10d0f1d03170004985d61cc9d7ce4f1c5c31f017b7ed8392ac070e63227d996b0d9cabbf"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-x86_64/sv-SE/thunderbird-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-x86_64/sv-SE/thunderbird-68.1.1.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha512 = "c77d10b35edef7e59f4e6c48cd4352c4fb7d05b0140aba12be42b3e3a3df609ebc86f2f5a3993fa172ec0ac118726314bc9042335101241637481a2e1a4d1c00"; + sha512 = "7d24c7ab6f7cb5fd6cfffa21b1d55040a626109ed2cff7859dc8c28b78b2dfc40b7b3c9a5ed12aafbc15368f294990a35d172bfa69aeddf8b65505f65f38898c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-x86_64/tr/thunderbird-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-x86_64/tr/thunderbird-68.1.1.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha512 = "3d52693efb05379802d62fb9e40c4b1856b45ee948032634d4c4bde7bbae67327f963e0f1096fd5d7a15d4341af1ecf3d9ee96eed45146859d8e8e5d403d660a"; + sha512 = "17393c5c522cb0fb6de9c9fc13a2ed0743f995cb51d852ebffcaa03e59b39d93c2137e62aadc70131bc8fd61f2d6c3c70baddfae299e2244109f35b4f7443572"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-x86_64/uk/thunderbird-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-x86_64/uk/thunderbird-68.1.1.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha512 = "c09734ab8e6428c6ed270887a0add934a7058d5e9c895864b1128e0fd39d57e13789bab38cafaf7cdbac1a71c8884407698c4bdfcf48aeec6604a457ed57c48d"; + sha512 = "e8dad1bfa1b118141e65198014cc405a3041fc552cd1bf4186b22877433805357fe39a5adc6cdb9b9afaa86493442bf32ee73bf2c2859f8ad535c7996744f60c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-x86_64/uz/thunderbird-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-x86_64/uz/thunderbird-68.1.1.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha512 = "083a83ae3c6083934fbe49f1e65ceadc5b5459f0f29ae0df9901b6d9b29d0a105cbde94357c1ee0a9677ec923fd1d419c618db0e843cdf320c087108990b89ec"; + sha512 = "5a99a2ec1539f452db613f7fef10d180bb57c642e0098ecb234fe03521f1ac9c781cce50eb025d8a5adae280b466dbcdbc08be08a0106c6d8ad99ff250eec4e4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-x86_64/vi/thunderbird-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-x86_64/vi/thunderbird-68.1.1.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha512 = "6ba1573c9a170d1d827b6d17941c25e3852f7b66be2eaf7a3e9ab02278f19a38b801d7b9b0c266dc4f38f1190f9c83990eaa51f4734ddb38f43ea3e1bd23b72b"; + sha512 = "fc39ef4d2bdd5791cd8661a522f74b2a1f9f3b534968f10b3abfaaa287a160d01debc56c9cd416c35e50b38f80d2a1b5ba10f4134e9fac3ac32748e3891f4026"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-x86_64/zh-CN/thunderbird-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-x86_64/zh-CN/thunderbird-68.1.1.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha512 = "74ee429901cb520d07361a4b621c9be06253cf93300f0f91e3633d3b375e4e9a6a58823d4bbfed60519734ca5705f2cd0da4bdc7db0f578ec300f1d705e9b7b1"; + sha512 = "96e2cb653a93d788a7e721bf6677e7dd50ad67e4e173bcfc23dbf190440a35ec2349241adbe7bb1a74c4732f3990a15636a0563448cd90b7526c06bc106d083b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-x86_64/zh-TW/thunderbird-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-x86_64/zh-TW/thunderbird-68.1.1.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha512 = "d720029e0720fa972d694712a85bdae94b1ff51213c4e56b84dff6d293a2a9831f5cd4efeb44070010eba1486b9358929f64546ce7ebb7cee29a7bcd4a1cd650"; + sha512 = "c9d720e70d55998343c4d20257a0385e3764da751e57eb992d7ddf2723f565099d6e8c880ec009f9ea71609ddbf172a8ee7f82e603f42529388d0627e882ce79"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/ar/thunderbird-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-i686/ar/thunderbird-68.1.1.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha512 = "823b3cf50f8d23d1d0ba8583d2b10146e2eb0ff4a9401527557fae8e8db997ecc66d0bf5a091323bbd37dd6222bacb73fb9818de8740963b929a8893e4ec9391"; + sha512 = "79e4d01a88156ddbc1db2afd10b83e6e069a69df8cedfb0e247706aebbb8053ae68bf44b0ab1849e859ae15d8a6332c4e795033ce7e3385210cf9c12e4f3c37b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/ast/thunderbird-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-i686/ast/thunderbird-68.1.1.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha512 = "f0087ab3189e8fd194d2ef6d5d2f9c3e14d592d5217a8fea19ba5189e806f9d484332f9d342a15549651a75bcfa673f21cd7666265fc185ec58c814814902ec4"; + sha512 = "72f4ac14a13e364e4ab66d9659845abd4be47f07311cc79d71e05dedea1aa796a8e6d5772faef836e2eae410c1f8ea2b7b1bb460ccd60a0cd2bc7d48f511cd2b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/be/thunderbird-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-i686/be/thunderbird-68.1.1.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha512 = "edb358214e93142d73c92ab3dcf6240cd08614c2d0e9ea506492023be46d7b7f6273dc767ae034762c052db3b0a093dd027187afb272b2a55fc3126b06ffb78a"; + sha512 = "aaef151a1ac5b0f4adcb1d708925f5d6452f04fe3f73617bd2a5fd0e2a54e48229c9fc27ec48d5d9ebe8db9e1925b2df7542cd543cf9f312ea7e65ece10d44ce"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/bg/thunderbird-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-i686/bg/thunderbird-68.1.1.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha512 = "f3268fced7a81b5046332f975906ac79b8ab5ac888dc1c81085dd7cd1b1a414988208d426bd305f67cbd913c58de857c844809ae6e6ab5a2a520d7d6b149b731"; + sha512 = "28c9f71d5674a21785656309f40876917c27d979f082269f8b32f1600664fa10a3689abf856aa391cb42776fd2d2af18731e4af22fb1c5e75f3616c44772e54f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/br/thunderbird-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-i686/br/thunderbird-68.1.1.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha512 = "c1be2ec4d4e64a2a9b32b974eecd182ad9d1fa23b775769e8535e742479ed6be2a222272d7c5b141393f0c752d4af704758912bbac1c17f445b3bf277c12eb9a"; + sha512 = "08d2e1186d18f3dd80282597927c7c747152d13d2511eea5169b2b42eb4318a817261a2518509f8b26ac83d770d0e70e3ca0521fed8c3f253b5e6f211424ef6c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/ca/thunderbird-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-i686/ca/thunderbird-68.1.1.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha512 = "ac0c2508b89812ba63d0bb770adc2292127243fe31bf140a4ab88c953750fc2f699c5ed2afb9a400cec48dc14d927b08dc96d5b110e2f2d90e81d1532ba9d916"; + sha512 = "d6c0a548b4eaee0c0ab8f7f03e3cf329d353f7e0d2403796b7db8f1693afdcb8454715e4d0e0d2e1f074cd816b2c9ec9be5ccc76b4d7f0d00f8615bfce4f193b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/cak/thunderbird-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-i686/cak/thunderbird-68.1.1.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha512 = "4d73beb37469131b7e7747c85a73027e1eaf008100eee21e27d36b4736ffdb4cc3ca3606726e36033de64504f058ec9d4193797a09c2a591675636a5c00fc890"; + sha512 = "3bd32854eccddf411c294bf0dee5f3d945a1016d1ede639ab8c1e2e86ca97b9866f1e4149f1fb0402fe3ebb148e8f34f7b12ede4853c6cd2edb87d9e822d1e27"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/cs/thunderbird-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-i686/cs/thunderbird-68.1.1.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha512 = "635ec13ec9fd688ccb9c690ccb4d64228f1f47755ce24c4806f5f47655af1279b9ee758fe15c0fcbd43c830edf66383bfa3d84d35137209a4af41aa59565f554"; + sha512 = "33c87e9a016097991fdee92d5f8813b4cdeab355ddd5d65d25a017640bd50dba94d5936148e0873ea596fdab2e214eb70bafeb5edb6576397ba300eacbd873c0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/cy/thunderbird-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-i686/cy/thunderbird-68.1.1.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha512 = "afb546562f92c93639a407598d9c6654b64776cb68db7ddb07c0d17f83d122d9e7bb974238ee5cdb90876bca3ea30356cc5eef28b11ccf082ef72c0343dc42d0"; + sha512 = "f28f46b5d8004ade5b91e3fa10659ab87c85f33faef90c534a5c4c0680d11dc0f013abc28003b1a7111b4f67040ba54a4616c85cf9c906e52048ceaf6d9de7b2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/da/thunderbird-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-i686/da/thunderbird-68.1.1.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha512 = "f7b7d183312d11d02200890afe4e81c793b658729119d9f81ac2ca58714244ece9d64d1b9d9f34c79f1d00b574e24192ce066debf873c4b740c35208cfaec16e"; + sha512 = "21eafecbc13e8f63f36386a64fd947ca566ff6878e96a6ccbd124e1020a62ecede74f8578b56c66b13ef63a4197f527d406aaea6559b833017bb3e1931052dfa"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/de/thunderbird-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-i686/de/thunderbird-68.1.1.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha512 = "e6b3ba227c8e84273e6dadcb59d6691187512666efcb63244740a56273c5b765c65d21607e4f07a508e5e63ed0812162ad767fcb1140b89b2c155da945586179"; + sha512 = "5c7c528fbff84823ffa46300081f2d5352bfc5316af574d39e020ca53e9b61b1c5784ec7b863fb095645d908ca18862610babf31f7e094d1e0280ce8069573bc"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/dsb/thunderbird-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-i686/dsb/thunderbird-68.1.1.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha512 = "84d39965568de9c87c280beb43330aec4ba6cdebf59a9c4f566b6bc01fbe15cc3987e87d9c24a9e746283cc54ec1ebaaff99952de7ff0aa9b6f05f36b1295d09"; + sha512 = "f18ab27c8bf26e2ee2feb2007cfab28622c9df0f03facb20f0ee581d6bc33c67227a2422f9bda7edd5cec8fc1ce0096764e26d35262559162a3a37481a92ac3f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/el/thunderbird-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-i686/el/thunderbird-68.1.1.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha512 = "0942b5c8c7ee792d264824c6837d5857679feae9073fd2451b92dc0f31290360a24f7cd708e550955e798d2decb9f0c3a21dc8ba7bb5f226ba8ba9f502ef870f"; + sha512 = "f3fb8cca78a51fa0b855c8e112625af364b59a6ef2c05c7712da6451790a8749f26260aec716943a785c6006582977ebd950f09cfee8ed9041a875f9ffb632f7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/en-GB/thunderbird-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-i686/en-GB/thunderbird-68.1.1.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha512 = "12fb5086fd012d85f35a41125b7e5ebf37ec34e9215db9b2a4c67f924d3bfa738698ba15bfa2e51f8cbe0d81cdfe5de4bfecd54b0fe6cc7163c753444e56bb9e"; + sha512 = "5d53ae6575e6f3580dab921cc2ee11c00834fee39cd321c906b81103fa14b82e4e129d48642aa9b857921abb11a6877b774ad685069a921d417fd93d25ab2198"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/en-US/thunderbird-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-i686/en-US/thunderbird-68.1.1.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha512 = "6004186b0b27165a4d54191a9c2daef34b580c2d97b1e0472e8d8d863e3df51ed56ef17abb7c6944f4da214772780b5c69785b9ad22ca26ba1a8f0390beedc19"; + sha512 = "9a4ead1f16785db8778ead96eb4ed21c5d52e9d3669d2d3bbded0d616e6b57d0649347b067d48437b769c51093627b47503408aa109dc899d62ace8fed83f62f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/es-AR/thunderbird-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-i686/es-AR/thunderbird-68.1.1.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha512 = "6a547a1d0450de1089df18baae81100d3fb9934c963459ec83ae81504e7a1ec7abf595766c84fe8d321f901150a68b7e172888028f3b992b4b6b74ba98ca4efe"; + sha512 = "15e85f3f51409fac915b095310158a5313dcd82f66470c85874e4306f1efa70e63bc4b39b615dd8e1eeda22b863c6fe0c5ba15bbc6dd94b6fb4a0859f22ceea3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/es-ES/thunderbird-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-i686/es-ES/thunderbird-68.1.1.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha512 = "e1256da3c8938776b11444790f20a68f056f7407f444f0884dfa1c52260309d4adfc64fe95168dd8263e4aea650362ab9fa08930559c7f0e97b3489c172c81fd"; + sha512 = "b136302034d987594f65e68564eb1e6b1713d79be39e7b90f8ca73c74faba06d97afd60253ca34f15a415575c412be6ec1113598e86b0b7c4d8ddba35301cbe5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/et/thunderbird-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-i686/et/thunderbird-68.1.1.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha512 = "a5d7cd5e3171d44dbf91f067231301940e8a622a6729333512b49bc037022bc2058fa548c044a40b7ebea5d3199402276a34eeec5cb21b2070d7cfd96737def1"; + sha512 = "5a344c70202d884827231d0a7ba06703c7a265fd3ad59f1442b7d4bdb57fed06b8d6aabff4a5d6193a7b62027e243cfd27cbcafcdc1ce97baa7e0f3317f64e49"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/eu/thunderbird-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-i686/eu/thunderbird-68.1.1.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha512 = "08047c83e28397d265712dbd5a533799b2bba97d90f83b93be8377a544226ea0dff22f5b5e2cd5314c24608825048f3e59c6fc348959d63e1acb81d10d687f46"; + sha512 = "ae417ccef00a3c5a2fd33ca653d35575126d18cd991ae32e25bbcd8f6d8a85f282929c2f2c78ae0f12ccf85a418cbd9518f6d28f89d6bf38c41d3509801caf45"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/fi/thunderbird-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-i686/fi/thunderbird-68.1.1.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha512 = "ae407ee0dde2be8a8f89979b5dcacebd13fcfa42fddce48773e8f26ffbb503acc6b17a90170a0d72d550400397c17a725f9bf6f65d842f0f281fc58eaf9dbc53"; + sha512 = "2046eda267c49edb5bdf268265dd02f638670c8d6f1310fcc496c1acab2c777e39c5a974dedbb7bb1305f7a9ecf11c64303f8857aa7fba66f76a62cb89e45b23"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/fr/thunderbird-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-i686/fr/thunderbird-68.1.1.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha512 = "a776215a9ba91de0500cc7fda245afa19a49b51b60089c55444aa452c5aca06cf3b95e66448147cdbc3df063348c28bbde3f3c2a6e19deed26e1b33dec565b25"; + sha512 = "f483c884064d13d11d4085a72c8805b5c10564f2926182c649c5422c31c8014a75948d2dbaa612f29b1f64b615e6e9bbdb2c4c1c406c8b57f13498ec1f29674d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/fy-NL/thunderbird-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-i686/fy-NL/thunderbird-68.1.1.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha512 = "5302a5709fc4485eff607fd0b5e75f15bb600a14d20661cc4f7280b0bf5c156a40a51045182ff0d31c89d4009c5a516015843ec9fef1fb1134cfa80c511c05ad"; + sha512 = "b8fc327bb911c25be29c8ae5a664a2b000ee08183388dea6b75f56105365f541a5f81f6d00089868ad20037809c2e4a33dfcc988567fbec187f41abf66d4d6d6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/ga-IE/thunderbird-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-i686/ga-IE/thunderbird-68.1.1.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha512 = "4b9cfa317f8ae5accb2c96731bd7fcbaf2eebaaee76bc7383d247cac9db6708b7c4c03d2faf3a6e7e6620b3eb696e9bb3fd18c3dfd1f3ce12e4bc65bb86955ed"; + sha512 = "4c456ec8474109c7b136b14ba49ec8b155f6b7194ca4db618a3daa7affb7dab4b757a8536798cd59241425f4b2404a28f6f3d99969beeb9448192a8faf8fa324"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/gd/thunderbird-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-i686/gd/thunderbird-68.1.1.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha512 = "8738b93fd18972456158c28d4146ec8548e97339d7b4ff044ace814213d27940b02f9b889b5809525d5bba46a5b3ff4a570c14b3b9a5fe276b4aec515b62055b"; + sha512 = "d126c7f9c29102392c8bf2643130f7cca7add29e60d540bdd344f54bc7535b10e70b224ff6adb0d1f8eebb86b933f1f232b768ce65cbb0cda68347dccd8fe373"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/gl/thunderbird-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-i686/gl/thunderbird-68.1.1.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha512 = "c556343f99d39f6ff41f0b05af606ada89e6b95938886f8d0b1ccd7b77f336ae40a8debb003d2bfc865548c5e9e055859d6d353e169a4f2ee7ada7cb8687cc47"; + sha512 = "35c855e9d0df8030e455af1fc1c704ef12f598f598f15b2951b412f9147ad5f3dc129c7ce7b4d3757ab67773e9af75459bc4acc07fdd1390c0d080214840d903"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/he/thunderbird-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-i686/he/thunderbird-68.1.1.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha512 = "b6eed03bdebfc334c8852a15989c024883b99f600b9aa58f8344976b63f1f9590aa9b78a2a27b081a1e5256443801f01c1f638f1e4f8c0c2a78e695a5e2f590a"; + sha512 = "361df030e5bd3e876865fe727e41885cc063f1091e0fb6ed71530aaf2cb88b8ed02c6d762939668cc2bd2fc7d861ef0e737dbd7c7ace9a859158c978f87fa6c3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/hr/thunderbird-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-i686/hr/thunderbird-68.1.1.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha512 = "aa4527614db13978d03cf07444109dbc63b7788a2cff924b5566c98d9316031f1c0fb74839b5be78030959f85147c1c1e50edca5605b5cbe2ad3bbbb257c24ad"; + sha512 = "92bc3303a6a0bfde8c287e98593f3a88ed1b44257dd660cfc418beae15780c06919509c48498633ee85fff990ae447f71916bffbdbd1a5eb691fe8d880052c4c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/hsb/thunderbird-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-i686/hsb/thunderbird-68.1.1.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha512 = "92b1e17c825a60da17bc9942b689337246f301843637fe420284fe89aad4ab2f30101201330d5319a7e6a2bd87567bf7aa7b35bfbc13b1399ed54973afacf4ec"; + sha512 = "6a18e62fe60fe7694fbe305a65a497987934af299c83ea0410b08fd139cb988640f511595340b4522fa64550616864060df7423bb0e23696a29dcf274c5987af"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/hu/thunderbird-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-i686/hu/thunderbird-68.1.1.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha512 = "5e0c03de66a9098e290fb93545cb46be41d7e91c865cb3fcff9dee7d141fa113cf7bfc14cbbf1e8f9e3979e6602116081958c22a83ea043015cc5adfb738e5ea"; + sha512 = "f6a4e4844eb10964c95e0cd6a143128e970f40bda283d63ca542ad707c8818c47106e638fe2cd0e5c88420d31fcb7dd86888fa764ccf4d6de009841dd06bef65"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/hy-AM/thunderbird-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-i686/hy-AM/thunderbird-68.1.1.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha512 = "3df1da5c3d18ee3705e5d5013a752920863fdcee8a1c021bfde28603862a7c56e60a65b46b98af5d66fc5066c1580ab5484d86dd278d64d5d800b3840361b812"; + sha512 = "1ab27605d214695d3db36d337ecd33853cad37b2355c5a5a89da995c3fe655f25f3a1f7e01a9903e5628061bd65d0fe43c49e93558939d152449a81cc91916fc"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/id/thunderbird-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-i686/id/thunderbird-68.1.1.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha512 = "786a5839f311df656fd4a0687819a47589f5a6ebac6f76e1f643136286d43b2f27744dfcc116341a8905b5e1da4ec0ad1f1eb4998e188d2e87ea487c6826fb32"; + sha512 = "330f0b9b8c854c37250679ce6e9cf3882153dec717b3b0e6a29524967c5e75c6c784547e9055aae232156c6e0aa0cf833060ea9e192746185c472b1289c662cf"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/is/thunderbird-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-i686/is/thunderbird-68.1.1.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha512 = "53e4f76d41e1f8af240ecec249bd3ef3c787c6ff69320694bc682a876a76be22ed59abf0bc83691c7ea96d1e16f5a4c859e2b62528c99261f562012dbd035a9f"; + sha512 = "e8856b72d2950238ea82095fe96fb93872ff6ca8da2ccc666386ce08700f7fc137fb3957ac75c90872b7db3b15095892a3bf39d4169d364c93b79abffcec0588"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/it/thunderbird-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-i686/it/thunderbird-68.1.1.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha512 = "8ecb5594e5252be84f97a55b37f5089220a3e5c1565686fe02f00d94a1418a9460e4c1f25724243c82b3c9442eb8cfbff3c3c9470971921469f2fd71aec66860"; + sha512 = "75c7cbd7659f5b2156ee6ff05fad47f8c0e9e41461a79ec1f9c35bf15d696f9526789a6192e3dc32b36851d17958351f65f76be50ab70309fd8bfedfcf579e64"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/ja/thunderbird-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-i686/ja/thunderbird-68.1.1.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha512 = "7f9ed4fbdc0549c6ab704f80676218980a4b2609086437f57e22e9750e5a34d7506c1ee43ec48031a28322cdf4dcde6bd14c05fd032244acf33310fb6aa8e9a2"; + sha512 = "ad790fdab0bed7a4828e3654999e3c3b04dc51f04ba4ca12e60d9c70b44236e6902b0dfaa70842db661c5fefc28eb7f2045d78ff5df82224d7e0550dca516f95"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/ka/thunderbird-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-i686/ka/thunderbird-68.1.1.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha512 = "bab15aa28fc92850d374f76ae9898c9408176db9b9e19cbdb49f7b586172c20eed0cb358f3cd4b5fcc2a4740188c0f041cf617a63743a42648c7e33dd0fb79e8"; + sha512 = "371fb961b63f170ab0521bd2fd590244966a8ce9935f5352baaa244922425ddd46f40fc6f8d5512fb7b61c12d01e8d050fe53e77bd7c69f7b6a9135bdeb81e3d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/kab/thunderbird-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-i686/kab/thunderbird-68.1.1.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha512 = "26b1055333e508666dd24706da824c5cf9d5f87d1d1cb1c4d42894b836412205a7cc7ff73f764d8f2a1852138923bb02a6b2a2c3c92d1fe9307529533b6360e9"; + sha512 = "a1e6fa908913e56e17272545765092f3cb32d6f5807db7b7bf02d3eaceac37a76136cbfdf0c11e274c7a59b8a1db8d8b54ddea6bdda75d0b1e9f869eb62d8fbe"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/kk/thunderbird-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-i686/kk/thunderbird-68.1.1.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha512 = "d946c82a8c35d82147812ef16e4573ae559dbfe65f4a6e5fc7dd107fb57fc6ba2a47f8a3655344e9e6172628692ad7815045830ee27bb10aab0d71483936d6ac"; + sha512 = "2953c0e23c7153e96cde831a607e688540522698649bed526066bdd527ab8024e6007842ce8cc2f6681ab6de81250e63f52c3a0bd51f9ce1a495d19f2446b2e0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/ko/thunderbird-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-i686/ko/thunderbird-68.1.1.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha512 = "3b9d9e70c097a1b7958c6854bc2da121f44921962d873e7f90fee85ce2214725223482aebcd503205e32501648c774199eced7ff34effb428dbc738f1ba4b963"; + sha512 = "bbae4b68e771c5416285edf8bd5e8d9f117d5bb9b5da4b4d2d4a90e89dc74e0be32b53f123426bf356749dcb3077f3c28fff47037df2a4afde90d08899794e01"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/lt/thunderbird-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-i686/lt/thunderbird-68.1.1.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha512 = "0cf99a6aec58d2f56f6a52fc5fee17b9e1d5abd0ece53073cc392c71452e1415c94ad0af003dd0a97fc5c6744a1a2243aef69dc44b831be51108b769e5bff87d"; + sha512 = "a074abc38275119652bbd69765fa36d3865253f32ca7efaaf628aea94ba6316fb581d083eb0284eeba530bbbd8f2613ea43ef6cbec6090c377449e16a1cab272"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/ms/thunderbird-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-i686/ms/thunderbird-68.1.1.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha512 = "8b4697a312aafdd88a5ecdf898a796bddb91e80b4c8c9c342fce765ee0f4dd494114324a51d6379468756a44bc71cb6f46b8fabc7ca733d9d85d08069f18526d"; + sha512 = "a956870831e313917eb15e836aa1c3b5f774afce7a1962f0041c07008b627d5dc12821c091e4777181a15de94d62df565caff10c620cf48d08db0fe2391ec8d8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/nb-NO/thunderbird-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-i686/nb-NO/thunderbird-68.1.1.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha512 = "ad6275f8343dd36ed039524875b41ab9c8bafd2a1e54291b98c16b0ab35f9bea1bfee3fce86070317fad2f25d46d0aa9ef0824e4ad88e0879a33ae753c61ab2d"; + sha512 = "425ba2a0e7401d83a4f98389e108eeb85ffafe685a748526012a47c07768278879d0a9795da0bfca5a955f607afdfb5243a4a5980d85d0f827d0253c5f84daa8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/nl/thunderbird-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-i686/nl/thunderbird-68.1.1.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha512 = "49f586a62969e6ea5638eb95f812e7d4a891ef55f381633792ed0820ad098cc527dc9490c3a1ce52246526f0a8cf00eb16666c6a7f932a68c6d440e151b452cd"; + sha512 = "dd05524929e09c8459ea9bde675e645af56e516cfe087862d4b869401b54fea9766553de4edf340ae936d9db169861fe655b3e258cb2f824237de68ba087088e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/nn-NO/thunderbird-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-i686/nn-NO/thunderbird-68.1.1.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha512 = "1f04f2bf7a60472eff1b546608cfb26e41f31a273d1037e0d73530029a757dfcd95e2c1b85a6990b6f7eec28138835fe096266a00dd094b4db74007cd59ef00d"; + sha512 = "5d74324cdc78563e109f0dd151dd90133baa3d93ecd7c24e3ab8d0b36a402f524e97c58889a4d5ad2bbf5ca08d785b45c660099777b9706441bd7fe5b8c508d1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/pl/thunderbird-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-i686/pl/thunderbird-68.1.1.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha512 = "f232e4b6cfcea81ed70e56e9812b8e0783205f49b846d29338ad09457db9a18e4fbb35738bf5e9abce42855c13c1839605aa343cb7d33d0110b68d634183e697"; + sha512 = "09521b3fb8f49631c318f6bd1e8bad27f9b75994c3b1e8b57014d9b290cf6cf338ea30ff46c6b07fb2dfd456fbca18cb609696341417bfb39740253be2a9f678"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/pt-BR/thunderbird-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-i686/pt-BR/thunderbird-68.1.1.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha512 = "2527ec08fc23d01712574e3c8419273ac82111c5f2b4b6040cd8f3292aeadb36021029b01bc319d8ca52177db39f1a446acd5537a6e8f42800eb22c3e2d7cb30"; + sha512 = "9a5c096a5e2bf3d3446c0de33fb92995ca71e994e40fb5b66001f7afe5d0e196a7b3b0088b8e51fa8e079af42095c321ebf9acf367408d9c99c33ecdc90dd57b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/pt-PT/thunderbird-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-i686/pt-PT/thunderbird-68.1.1.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha512 = "c91d9d0becade1508a3212693f5fcdeb917fe5df5d63b54de125b76786dc3787a7f5f220eb48add1dd1eee95f7eb120b1c1dc85dc0bd91688c883be9219f3d7d"; + sha512 = "c19d39ace2beb65123f09129545cdddd303726c2efce12b57f5919435cd6d432c592c5fe48f86ede44a949edf1a1a995b3094f26266baf18cabb79188b00ad58"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/rm/thunderbird-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-i686/rm/thunderbird-68.1.1.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha512 = "45a4f608eb5e64f24ee385328a3a568aa2ad3284169019423c8b414790779cd079c2d73b290716f18227210ab5eff50625bd6688498bc027228b8fff51fda5b6"; + sha512 = "839f4e56a788762578de09a74ce8974573b575eb0e0f641f36d2d6086eae08e2a0cb6a610f4ee2ce00db0b8f0549c9cdc3ea433ba3e0a1eb5f6a9093542b94d1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/ro/thunderbird-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-i686/ro/thunderbird-68.1.1.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha512 = "e344d838e2f79dd8ff79cf2e7ff2a1d8f6c7e64f29cf870d8a6fad9b3dee31de6c0a80d3007dd498dffb816c00dc8429150bc6b49a5b6eb10b633a4e942ca725"; + sha512 = "0ae5d25b55971b41594676678dfeed2c5f0c89c3f4c8b2649ce2a1ae9183c1518a07410e46b9fa86d5f09f18f53f4a6c37ecf1e4e72d6414b065dbe3f46d0d6e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/ru/thunderbird-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-i686/ru/thunderbird-68.1.1.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha512 = "8dbfd4f8969703623388a55e790b722933f2c1faf702ff5c7fdfe3cdab8f62fc4ea69f9303edf94a41a71be1b8c5a2ddfa5509d4c8abe260c91b7075349afe64"; + sha512 = "fc00117c0caffb90ee70583692add1a0aadb8a03970c8cf501aeb248bf4abe1d8d8046c2c170b42248d0f1f11241067508e35aeb0db320579882905156827527"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/si/thunderbird-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-i686/si/thunderbird-68.1.1.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha512 = "f1808e9648caa00afab0609dac1cb564dbf6e5bef75446071997cc9913da8470e54cb254282fc6e8b839e88b003ef18426609a97cd1affb93659fcb519913a5c"; + sha512 = "6345bfa3abf1ec899320696b10553f0a75b48f2f2dc317c5d6ac10ddaf09a7269353a73aec84ef4d7501d064e409d434054711441da3698f1ed5af653de4970f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/sk/thunderbird-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-i686/sk/thunderbird-68.1.1.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha512 = "7d5b480a44dae0d2f5348261ecad04348ebb7943a757fe83c0fb154da251b423ba21840c5d1fbf8d7979dd30c2d5e7b18e90d0ad033a1e96d6f6587407a24cc9"; + sha512 = "745514c55e85f71cf07bda02a842c8452c454a80a10bfea20e9c5750f1702809b4c589a2c1d3127c599a91ac0fab458de8c4d66afc8511e64278f02638fff63c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/sl/thunderbird-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-i686/sl/thunderbird-68.1.1.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha512 = "f76e1f01b8da8a2ba344dd3bedfa4301df03fabf9848fa189d522995cd48d81f8d00f11e01722868acb1993d4e79977122e04e3d208629b2e398c715777194e1"; + sha512 = "2449333ceec017fd3b6e3bf673c3aa553b9c52c07a09e02e773e42e2c6acec60573183d6a09c5c085ed9389c1d48c4f02acf50d83499421bedb3094823ddb34d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/sq/thunderbird-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-i686/sq/thunderbird-68.1.1.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha512 = "cff32ee84324724dea5612e5b48b22adc63d8b9428c5937f84c94da83bcf5f2aadda6ab81c5f9bced6d693689bc38bf15c764d4ab4809cacec3bb54cd82745f7"; + sha512 = "7a2ac8f6c04cbdbc222ea1218dcc64928b6d5038381a7655db34cd568717854197fe4b77645b2ea07b4b76a724c2e8196db693c5e367d09367edf1af471f358e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/sr/thunderbird-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-i686/sr/thunderbird-68.1.1.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha512 = "96d25f7d952e204751cd601932713418cd495d11364430a37ecfa36333113a6132209b8e8f0ec337799ed02b71b388f43e22a53fa168f17e4d15e7594170299a"; + sha512 = "06db22ff1ed32c1311d62d1cb860bb22686d5893985bf16fe2effaff864b4352788889d5e2f2ff6c450edd4be9d9c1f33ddcff513d5eb2cc3e88fe5e50c33485"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/sv-SE/thunderbird-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-i686/sv-SE/thunderbird-68.1.1.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha512 = "8bc790d7951469e2dfa2499622464cf55427a6bc93dec50b18f014ac079ec0579b91a11680e4104f7d6a38f60d467e9fb3c9ee7ab83b64f8dae2c1e979150bd3"; + sha512 = "f1a43a44dc155a01cda07041f554eb3474c35621ee8d8c7596aeee2746da12aa934d94f436014218a360b7848888d0e49285ca66cca8209b7b02d044c29571f4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/tr/thunderbird-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-i686/tr/thunderbird-68.1.1.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha512 = "2c40fa3e6ecfb68507897e669bed229ed98e1b4a3998b55b59523d3cec1fc5553cfacbd9be3d55f7a32b612ee662dfda7c8a21a4c26c750d48b87d31368a9942"; + sha512 = "e430c26852fd2cc3b9afabe9f8c3e1480e3454614bd90c766dce2b2cf652fe526146f79bdc0e25a1ce4979c1e22c0af90540659df5fdae89b0498428a61e0d1b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/uk/thunderbird-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-i686/uk/thunderbird-68.1.1.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha512 = "5eee26a500c1d4bf71222987523cc3e5f144aca02c17c88a01d4b68f9ac5e1298407460c69504d0a7b1e5727755cb32e2ae523cd97766419848c1b6dc0a30bf0"; + sha512 = "d6717aee4e1367ba031d03a90fc46ef397f9bbe6ef1d2a5537df77dca1d042e83c6fb44baef9ab01dc47de0f481742186220542831bfb6670c7a756a77eddfad"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/uz/thunderbird-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-i686/uz/thunderbird-68.1.1.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha512 = "51a0fc8dc30cc82f7d3b222167aaa8ea0225b4136ebacee38687cdc1235c0720da14cd2a3e1875a4c4bfa3bb8fd9045541ca6df736115312ac49a2db2ef83639"; + sha512 = "58ba68d642eeb1700c6d0994260bb16028fd15b49697c6e99e61e73d90275e0e4d2e6957c2af60122ca7be8804c1ddeb15dc38090287335a674104da3cd1cb47"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/vi/thunderbird-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-i686/vi/thunderbird-68.1.1.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha512 = "bb02dd69a8c8d514666fedb9d7de520f6ea89740956ddcd9d7f90175bca6f7bcf79b573c6e5ecd6fdfcdd15aa2a35881e8877074fbb795019eccff52cb943a91"; + sha512 = "9968cf02fe2b58f21e228b9292b48fcf9df5beb805335e7c77332231690b2bfcea29a4abfe9e834a85c2e4f79fe55df4590a2ec17676712c1b30736f48704bf8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/zh-CN/thunderbird-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-i686/zh-CN/thunderbird-68.1.1.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha512 = "408599229da40b2ce1a23ec1e5b12c7f4a24fb63524d792d50764cdfbcc6774dd7f651ba2dce46bccd94937e24b4b08d8bf37b6fb839c61540dfbf36f6d3e6b2"; + sha512 = "41369b102e82285050147d0e883fc20c6b7d311a1a8cef2efd31480a6eeee8c3ea5e0a9e9968c3d903d1fd92aeec331ade3cbcedd16cb254a74c6049ec0ab410"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.0/linux-i686/zh-TW/thunderbird-68.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.1.1/linux-i686/zh-TW/thunderbird-68.1.1.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha512 = "d75c9bfc6234fa0ddc56b7c1dace76b789e29c0cb03ff17395eeba020a82431e457271e95117731963f2666295b94746d0370bf0e85f9c3646836830684bca45"; + sha512 = "37e07f78c2ab67d040d6cd4a511fb3e6a641ca00dd659b51d5d320e79251bb2096dd6719da819c22306e10af9fc88389212129d20064ce110d06d49bf01545b5"; } ]; } diff --git a/pkgs/applications/networking/mailreaders/thunderbird/default.nix b/pkgs/applications/networking/mailreaders/thunderbird/default.nix index f2b4cfb4befc..cdf2769c27eb 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/default.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/default.nix @@ -25,11 +25,11 @@ let gcc = if stdenv.cc.isGNU then stdenv.cc.cc else stdenv.cc.cc.gcc; in stdenv.mkDerivation rec { pname = "thunderbird"; - version = "68.0"; + version = "68.1.1"; src = fetchurl { url = "mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz"; - sha512 = "2cz583rwfpj4z5cwg2vfy4ha0pz4xs9g7li078rmk6x19haiv8s9fwijd82xgxax0afn8wk80bq5kd8yz38l9432f6bar8xnwb21y4i"; + sha512 = "2ng5wwd7fn9247ggzlxx96scc2nalaahzvxkzvb87mp9fbfcsi3v9dh370cm42px8hrknnsp2lrfk9hqx4287zyn9pl3k9vr6a9cswl"; }; # from firefox, but without sound libraries @@ -52,6 +52,11 @@ in stdenv.mkDerivation rec { patches = [ # Remove buildconfig.html to prevent a dependency on clang etc. ./no-buildconfig.patch + (fetchpatch { + # https://phabricator.services.mozilla.com/D47796 + url = "https://d3kxowhw4s8amj.cloudfront.net/file/data/a54c6fszaol23yh5aa27/PHID-FILE-sql3i57neyrztfdngrwe/D47796.diff"; + sha256 = "18i1bk6rz875dly2vnkrdgbah8kx0lv4akjzl0i9gxc58hi5q3nq"; + }) ] ++ lib.optional (lib.versionOlder version "69") (fetchpatch { # https://bugzilla.mozilla.org/show_bug.cgi?id=1500436#c29 diff --git a/pkgs/applications/networking/mailreaders/trojita/default.nix b/pkgs/applications/networking/mailreaders/trojita/default.nix index 7f7296cd7006..4b4c711042f6 100644 --- a/pkgs/applications/networking/mailreaders/trojita/default.nix +++ b/pkgs/applications/networking/mailreaders/trojita/default.nix @@ -1,37 +1,50 @@ -{ mkDerivation -, lib -, fetchurl +{ akonadi-contacts , cmake +, fetchgit +, gpgme +, kcontacts +, lib +, mimetic +, mkDerivation +, pkgconfig +, qgpgme , qtbase -, qtwebkit +, qtkeychain , qttools +, qtwebkit }: mkDerivation rec { pname = "trojita"; - version = "0.7"; + version = "0.7.20190618"; - src = fetchurl { - url = "mirror://sourceforge/trojita/trojita/${pname}-${version}.tar.xz"; - sha256 = "1n9n07md23ny6asyw0xpih37vlwzp7vawbkprl7a1bqwfa0si3g0"; + src = fetchgit { + url = "https://anongit.kde.org/trojita.git"; + rev = "90b417b131853553c94ff93aef62abaf301aa8f1"; + sha256 = "0xpxq5bzqaa68lkz90wima5q2m0mdcn0rvnigb66lylb4n20mnql"; }; buildInputs = [ + akonadi-contacts + gpgme + kcontacts + mimetic + qgpgme qtbase + qtkeychain qtwebkit ]; nativeBuildInputs = [ cmake + pkgconfig qttools ]; - meta = with lib; { description = "A Qt IMAP e-mail client"; - homepage = http://trojita.flaska.net/; + homepage = "http://trojita.flaska.net/"; license = with licenses; [ gpl2 gpl3 ]; platforms = platforms.linux; }; - } diff --git a/pkgs/applications/networking/mpop/default.nix b/pkgs/applications/networking/mpop/default.nix index 7d311d4bc707..2cdfd19067f2 100644 --- a/pkgs/applications/networking/mpop/default.nix +++ b/pkgs/applications/networking/mpop/default.nix @@ -4,11 +4,11 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "mpop"; - version = "1.4.5"; + version = "1.4.6"; src = fetchurl { url = "https://marlam.de/${pname}/releases/${pname}-${version}.tar.xz"; - sha256 = "1m6743j8g777lijvxqw2wz6pv2g5a9wlh6zq7awk0hvd44xp4sav"; + sha256 = "0q4ifzvl1gcndvqqqk7n9mc599r4s2knxjc7alflwb366fql58gv"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/applications/networking/msmtp/default.nix b/pkgs/applications/networking/msmtp/default.nix index fc720a047b5b..6ebc3e664914 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.5"; + version = "1.8.6"; src = fetchurl { url = "https://marlam.de/${pname}/releases/${pname}-${version}.tar.xz"; - sha256 = "0fczpfxlr62wkr7bwhp24clxg962k5khgz14h818qyy4v77dl4qn"; + sha256 = "1qa260xrm0fzlwxpjvgvq39m4dfkskjlyb7m4y2vlr8c8d3z29b6"; }; patches = [ diff --git a/pkgs/applications/networking/mumble/default.nix b/pkgs/applications/networking/mumble/default.nix index 6439991920d9..b3d945710f09 100644 --- a/pkgs/applications/networking/mumble/default.nix +++ b/pkgs/applications/networking/mumble/default.nix @@ -1,32 +1,28 @@ -{ stdenv, fetchurl, fetchFromGitHub, fetchpatch, pkgconfig -, qt4, qmake4Hook, qt5, avahi, boost, libopus, libsndfile, protobuf3_6, speex, libcap +{ stdenv, fetchurl, fetchFromGitHub, fetchpatch, pkgconfig, qt5 +, avahi, boost, libopus, libsndfile, protobuf, speex, libcap , alsaLib, python , jackSupport ? false, libjack2 ? null , speechdSupport ? false, speechd ? null , pulseSupport ? false, libpulseaudio ? null -, iceSupport ? false, zeroc-ice ? null, zeroc-ice-36 ? null +, iceSupport ? false, zeroc-ice ? null }: assert jackSupport -> libjack2 != null; assert speechdSupport -> speechd != null; assert pulseSupport -> libpulseaudio != null; -assert iceSupport -> zeroc-ice != null && zeroc-ice-36 != null; +assert iceSupport -> zeroc-ice != null; with stdenv.lib; let - generic = overrides: source: (if source.qtVersion == 5 then qt5.mkDerivation else stdenv.mkDerivation) (source // overrides // { + generic = overrides: source: qt5.mkDerivation (source // overrides // { name = "${overrides.type}-${source.version}"; patches = (source.patches or []) ++ optional jackSupport ./mumble-jack-support.patch; - nativeBuildInputs = [ pkgconfig python ] - ++ { qt4 = [ qmake4Hook ]; qt5 = [ qt5.qmake ]; }."qt${toString source.qtVersion}" + nativeBuildInputs = [ pkgconfig python qt5.qmake ] ++ (overrides.nativeBuildInputs or [ ]); - # protobuf is freezed to 3.6 because of this bug: https://github.com/mumble-voip/mumble/issues/3617 - # this could be reverted to the latest version in a future release of mumble as it is already fixed in master - buildInputs = [ boost protobuf3_6 avahi ] - ++ optional (source.qtVersion == 4) qt4 + buildInputs = [ boost protobuf avahi ] ++ (overrides.buildInputs or [ ]); qmakeFlags = [ @@ -76,9 +72,8 @@ let client = source: generic { type = "mumble"; - nativeBuildInputs = optional (source.qtVersion == 5) qt5.qttools; - buildInputs = [ libopus libsndfile speex ] - ++ optional (source.qtVersion == 5) qt5.qtsvg + nativeBuildInputs = [ qt5.qttools ]; + buildInputs = [ libopus libsndfile speex qt5.qtsvg ] ++ optional stdenv.isLinux alsaLib ++ optional jackSupport libjack2 ++ optional speechdSupport speechd @@ -107,18 +102,18 @@ let ''; } source; - server = source: let ice = if source.qtVersion == 4 then zeroc-ice-36 else zeroc-ice; in generic { + server = source: generic { type = "murmur"; postPatch = optional iceSupport '' - grep -Rl '/usr/share/Ice' . | xargs sed -i 's,/usr/share/Ice/,${ice.dev}/share/ice/,g' + grep -Rl '/usr/share/Ice' . | xargs sed -i 's,/usr/share/Ice/,${zeroc-ice.dev}/share/ice/,g' ''; configureFlags = [ "CONFIG+=no-client" ] ++ optional (!iceSupport) "CONFIG+=no-ice"; - buildInputs = [ libcap ] ++ optional iceSupport ice; + buildInputs = [ libcap ] ++ optional iceSupport zeroc-ice; installPhase = '' # bin stuff @@ -126,48 +121,19 @@ let ''; } source; - stableSource = rec { - version = "1.2.19"; - qtVersion = 4; - - src = fetchurl { - url = "https://github.com/mumble-voip/mumble/releases/download/${version}/mumble-${version}.tar.gz"; - sha256 = "1s60vaici3v034jzzi20x23hsj6mkjlc0glipjq4hffrg9qgnizh"; - }; - - patches = [ - # Fix compile error against boost 1.66 (#33655): - (fetchpatch { - url = "https://github.com/mumble-voip/mumble/commit/" - + "ea861fe86743c8402bbad77d8d1dd9de8dce447e.patch"; - sha256 = "1r50dc8dcl6jmbj4abhnay9div7y56kpmajzqd7ql0pm853agwbh"; - }) - # Fixes hang on reconfiguring audio (often including startup) - # https://github.com/mumble-voip/mumble/pull/3418 - (fetchpatch { - url = "https://github.com/mumble-voip/mumble/commit/" - + "fbbdf2e8ab7d93ed6f7680268ad0689b7eaa71ad.patch"; - sha256 = "1yhj62mlwm6q42i4aclbia645ha97d3j4ycxhgafr46dbjs0gani"; - }) - ]; - }; - - rcSource = rec { - version = "1.3.0-rc2"; - qtVersion = 5; + source = rec { + version = "1.3.0"; # Needs submodules src = fetchFromGitHub { owner = "mumble-voip"; repo = "mumble"; rev = version; - sha256 = "00irlzz5q4drmsfbwrkyy7p7w8a5fc1ip5vyicq3g3cy58dprpqr"; + sha256 = "0g5ri84gg0x3crhpxlzawf9s9l4hdna6aqw6qbdpx1hjlf5k6g8k"; fetchSubmodules = true; }; }; in { - mumble = client stableSource; - mumble_rc = client rcSource; - murmur = server stableSource; - murmur_rc = server rcSource; + mumble = client source; + murmur = server source; } diff --git a/pkgs/applications/networking/owncloud-client/default.nix b/pkgs/applications/networking/owncloud-client/default.nix index 7907365a6a39..c674956066ac 100644 --- a/pkgs/applications/networking/owncloud-client/default.nix +++ b/pkgs/applications/networking/owncloud-client/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchurl, cmake, pkgconfig, qtbase, qtwebkit, qtkeychain, sqlite }: +{ stdenv, fetchurl, mkDerivation, cmake, pkgconfig, qtbase, qtwebkit, qtkeychain, sqlite }: -stdenv.mkDerivation rec { +mkDerivation rec { pname = "owncloud-client"; version = "2.5.4.11654"; diff --git a/pkgs/applications/networking/p2p/qbittorrent/default.nix b/pkgs/applications/networking/p2p/qbittorrent/default.nix index a579ae15181d..c5142c2f9e2a 100644 --- a/pkgs/applications/networking/p2p/qbittorrent/default.nix +++ b/pkgs/applications/networking/p2p/qbittorrent/default.nix @@ -10,13 +10,13 @@ with lib; mkDerivation rec { pname = "qbittorrent"; - version = "4.1.7"; + version = "4.1.8"; src = fetchFromGitHub { owner = "qbittorrent"; repo = "qbittorrent"; rev = "release-${version}"; - sha256 = "1z4k64h3ik1a7ir4v9g3ar1wq8zfh4r2pq43hr2wvlamm2111gdv"; + sha256 = "1mx59mazfmd5yaqdgb6cm8hr5sbp2xgzz3y3yipq1fwq85dj3r5w"; }; # NOTE: 2018-05-31: CMake is working but it is not officially supported diff --git a/pkgs/applications/networking/p2p/twister/default.nix b/pkgs/applications/networking/p2p/twister/default.nix index 647b708e1021..30491470392a 100644 --- a/pkgs/applications/networking/p2p/twister/default.nix +++ b/pkgs/applications/networking/p2p/twister/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, autoconf, automake, libtool, pkgconfig, python2 +{ stdenv, fetchFromGitHub, fetchpatch, autoconf, automake, libtool, pkgconfig, python2 , boost, db, openssl, geoip, libiconv, miniupnpc , srcOnly, fetchgit }: @@ -17,12 +17,13 @@ let in stdenv.mkDerivation rec { pname = "twister"; - version = "0.9.34"; + version = "2019-08-19"; - src = fetchurl { - url = "https://github.com/miguelfreitas/twister-core/" - + "archive/v${version}.tar.gz"; - sha256 = "1bi8libivd9y2bn9fc7vbc5q0jnal0pykpzgri6anqaww22y58jq"; + src = fetchFromGitHub { + owner = "miguelfreitas"; + repo = "twister-core"; + rev = "31faf3f63e461ea0a9b23081567a4a552cf06873"; + sha256 = "0xh1lgnl9nd86jr0mp7m8bkd7r5j4d6chd0y73h2xv4aq5sld0sp"; }; configureFlags = [ @@ -40,12 +41,6 @@ in stdenv.mkDerivation rec { boostPython db openssl geoip miniupnpc libiconv ]; - patches = stdenv.lib.singleton (fetchpatch { - url = "https://github.com/miguelfreitas/twister-core/commit/" - + "dd4f5a176958ea6ed855dc3fcef79680c1c0c92c.patch"; - sha256 = "06fgmqnjyl83civ3ixiq673k8zjgm8n2w4w46nsh810nprqim8s6"; - }); - postPatch = '' sed -i -e '/-htmldir/s|(default: [^)]*)|(default: ${twisterHTML})|' \ src/init.cpp diff --git a/pkgs/applications/networking/p2p/zeronet/default.nix b/pkgs/applications/networking/p2p/zeronet/default.nix index 88f07f0a8a50..ce5a99b1e5fc 100644 --- a/pkgs/applications/networking/p2p/zeronet/default.nix +++ b/pkgs/applications/networking/p2p/zeronet/default.nix @@ -1,19 +1,25 @@ -{ stdenv, fetchFromGitHub, python2Packages }: +{ stdenv, fetchFromGitHub, python3Packages }: -python2Packages.buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "zeronet"; - version = "0.6.5"; + version = "0.7.1"; format = "other"; src = fetchFromGitHub { owner = "HelloZeroNet"; repo = "ZeroNet"; rev = "v${version}"; - sha256 = "1b9jg525jq40czyw9xh9ck90fl9rzrdmzl2mzhqqhz23idb60j4a"; + sha256 = "04prgicm0yjh2klcxdgwx1mvlsxxi2bdkzfcvysvixbgq20wjvdk"; }; - propagatedBuildInputs = with python2Packages; [ msgpack gevent ]; - buildPhase = "${python2Packages.python.interpreter} -O -m compileall ."; + propagatedBuildInputs = with python3Packages; [ + gevent msgpack base58 merkletools rsa pysocks pyasn1 websocket_client + gevent-websocket rencode bitcoinlib maxminddb pyopenssl + ]; + + buildPhase = '' + ${python3Packages.python.interpreter} -O -m compileall . + ''; installPhase = '' mkdir -p $out/share @@ -23,7 +29,7 @@ python2Packages.buildPythonApplication rec { postFixup = '' makeWrapper "$out/share/zeronet.py" "$out/bin/zeronet" \ --set PYTHONPATH "$PYTHONPATH" \ - --set PATH ${python2Packages.python}/bin + --set PATH ${python3Packages.python}/bin ''; meta = with stdenv.lib; { diff --git a/pkgs/applications/networking/protonmail-bridge/default.nix b/pkgs/applications/networking/protonmail-bridge/default.nix index 60ea01ae4512..a585e7f948bb 100644 --- a/pkgs/applications/networking/protonmail-bridge/default.nix +++ b/pkgs/applications/networking/protonmail-bridge/default.nix @@ -1,8 +1,8 @@ { stdenv, fetchurl, lib, qtbase, qtmultimedia, qtsvg, qtdeclarative, qttools, qtgraphicaleffects, qtquickcontrols2, full -, libsecret, libGL, libpulseaudio, glib, wrapQtAppsHook, makeDesktopItem, mkDerivation }: +, libsecret, libGL, libpulseaudio, glib, wrapQtAppsHook, mkDerivation }: let - version = "1.1.6-1"; + version = "1.2.2-1"; description = '' An application that runs on your computer in the background and seamlessly encrypts @@ -10,24 +10,13 @@ let To work, gnome-keyring service must be enabled. ''; - - desktopItem = makeDesktopItem { - name = "protonmail-bridge"; - exec = "protonmail-bridge"; - icon = "protonmail-bridge"; - comment = stdenv.lib.replaceStrings ["\n"] [" "] description; - desktopName = "ProtonMail Bridge"; - genericName = "ProtonMail Bridge for Linux"; - categories = "Utility;Security;Network;Email"; - }; - in mkDerivation { pname = "protonmail-bridge"; inherit version; src = fetchurl { url = "https://protonmail.com/download/protonmail-bridge_${version}_amd64.deb"; - sha256 = "108dql9q5znsqjkrs41pc6psjbg5bz09rdmjl036xxbvsdvq4a8r"; + sha256 = "16hfa07wdqcns79395wjdglg2cjyblqgz1hx8rl15qm7n5f24ckl"; }; sourceRoot = "."; @@ -37,12 +26,10 @@ in mkDerivation { ''; installPhase = '' - mkdir -p $out/{bin,lib,share/applications} - mkdir -p $out/share/{applications,icons/hicolor/scalable/apps} + mkdir -p $out/{bin,lib,share} cp -r usr/lib/protonmail/bridge/protonmail-bridge $out/lib - cp usr/share/icons/protonmail/ProtonMail_Bridge.svg $out/share/icons/hicolor/scalable/apps/protonmail-bridge.svg - cp ${desktopItem}/share/applications/* $out/share/applications + cp -r usr/share $out ln -s $out/lib/protonmail-bridge $out/bin/protonmail-bridge ''; @@ -67,6 +54,10 @@ in mkDerivation { --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ --set-rpath "${rpath}" \ $out/lib/protonmail-bridge + + substituteInPlace $out/share/applications/ProtonMail_Bridge.desktop \ + --replace "/usr/" "$out/" \ + --replace "Exec=protonmail-bridge" "Exec=$out/bin/protonmail-bridge" ''; buildInputs = [ qtbase qtquickcontrols2 qtmultimedia qtgraphicaleffects qtdeclarative ]; diff --git a/pkgs/applications/networking/protonvpn-cli/default.nix b/pkgs/applications/networking/protonvpn-cli/default.nix index e79ca515b518..f426a7c3a581 100644 --- a/pkgs/applications/networking/protonvpn-cli/default.nix +++ b/pkgs/applications/networking/protonvpn-cli/default.nix @@ -28,12 +28,9 @@ in stdenv.mkDerivation rec { " echo \"Connecting...\"" \ " sed -ri 's@${expectedUpdateResolvPath}@${actualUpdateResolvePath}@g' \"\$openvpn_config\"; echo \"Connecting...\"" cp protonvpn-cli.sh "$out/bin/protonvpn-cli" - ln -s "$out/bin/protonvpn-cli" "$out/bin/pvpn" - ''; - - postInstallPhase = '' - wrapProgram $out/protonvpn-cli \ + wrapProgram $out/bin/protonvpn-cli \ --prefix PATH : ${lib.makeBinPath [ coreutils openvpn python dialog wget update-resolv-conf ]} + ln -s "$out/bin/protonvpn-cli" "$out/bin/pvpn" ''; meta = with stdenv.lib; { diff --git a/pkgs/applications/networking/remote/anydesk/default.nix b/pkgs/applications/networking/remote/anydesk/default.nix index 30130f60028c..3f1e8f202935 100644 --- a/pkgs/applications/networking/remote/anydesk/default.nix +++ b/pkgs/applications/networking/remote/anydesk/default.nix @@ -4,22 +4,22 @@ let sha256 = { - x86_64-linux = "08kdxsg9npb1nmlr2jyq7p238735kqkp7c5xckxn6rc4cp12n2y2"; - i686-linux = "11r5d4234zbkkgyrd7q9x3w7s7lailnq7z4x8cnhpr8vipzrg7h2"; + x86_64-linux = "0mixw2sk7li1hjagibwzdgbfnrih5acricczqmfks1gsinjqrn82"; + i386-linux = "1gshd4vm8ysn636r1z44vmzdzrgybsmj8ma4zdabvs9jsbm2da3c"; }.${stdenv.hostPlatform.system} or (throw "system ${stdenv.hostPlatform.system} not supported"); arch = { x86_64-linux = "amd64"; - i686-linux = "i686"; + i386-linux = "i386"; }.${stdenv.hostPlatform.system} or (throw "system ${stdenv.hostPlatform.system} not supported"); description = "Desktop sharing application, providing remote support and online meetings"; desktopItem = makeDesktopItem { - name = "anydesk"; + name = "AnyDesk"; exec = "@out@/bin/anydesk"; icon = "anydesk"; - desktopName = "anydesk"; + desktopName = "AnyDesk"; genericName = description; categories = "Application;Network;"; startupNotify = "false"; @@ -27,7 +27,7 @@ let in stdenv.mkDerivation rec { pname = "anydesk"; - version = "4.0.1"; + version = "5.1.2"; src = fetchurl { url = "https://download.anydesk.com/linux/${pname}-${version}-${arch}.tar.gz"; @@ -40,7 +40,7 @@ in stdenv.mkDerivation rec { pangox_compat polkit polkit_gnome ] ++ (with xorg; [ libxcb libX11 libXdamage libXext libXfixes libXi libXmu - libXrandr libXtst libXt libICE libSM + libXrandr libXtst libXt libICE libSM libXrender ]); nativeBuildInputs = [ makeWrapper ]; @@ -50,7 +50,7 @@ in stdenv.mkDerivation rec { mkdir -p $out/bin $out/share/{applications,doc/anydesk,icons/hicolor} install -m755 anydesk $out/bin/anydesk - cp changelog copyright README $out/share/doc/anydesk + cp copyright README $out/share/doc/anydesk cp -r icons/* $out/share/icons/hicolor/ cp ${desktopItem}/share/applications/*.desktop $out/share/applications @@ -75,6 +75,6 @@ in stdenv.mkDerivation rec { homepage = https://www.anydesk.com; license = licenses.unfree; platforms = platforms.linux; - maintainers = with maintainers; [ peterhoeg ]; + maintainers = with maintainers; [ shyim ]; }; } diff --git a/pkgs/applications/networking/remote/citrix-receiver/default.nix b/pkgs/applications/networking/remote/citrix-receiver/default.nix deleted file mode 100644 index 8d21f64765dc..000000000000 --- a/pkgs/applications/networking/remote/citrix-receiver/default.nix +++ /dev/null @@ -1,215 +0,0 @@ -{ stdenv -, lib -, fetchurl -, requireFile -, makeWrapper -, libredirect -, busybox -, file -, makeDesktopItem -, tzdata -, cacert -, glib -, gtk2 -, atk -, gdk-pixbuf -, cairo -, pango -, gnome3 -, xorg -, libpng12 -, freetype -, fontconfig -, gtk_engines -, alsaLib -, libidn -, zlib -, version ? "13.10.0" -}: - -let - # In 56e1bdc7f9c (libidn: 1.34 -> 1.35), libidn.so.11 became libidn.so.12. - # Citrix looks for the former so we build version 1.34 to please the binary - libidn_134 = libidn.overrideDerivation (_: rec { - name = "libidn-1.34"; - src = fetchurl { - url = "mirror://gnu/libidn/${name}.tar.gz"; - sha256 = "0g3fzypp0xjcgr90c5cyj57apx1cmy0c6y9lvw2qdcigbyby469p"; - }; - }); - - versionInfo = let - supportedVersions = { - "13.10.0" = { - major = "13"; - minor = "10"; - patch = "0"; - x64hash = "7025688C7891374CDA11C92FC0BA2FA8151AEB4C4D31589AD18747FAE943F6EA"; - x86hash = "2DCA3C8EDED11C5D824D579BC3A6B7D531EAEDDCBFB16E91B5702C72CAE9DEE4"; - x64suffix = "20"; - x86suffix = "20"; - homepage = https://www.citrix.com/downloads/citrix-receiver/linux/receiver-for-linux-latest.html; - }; - }; - - # break an evaluation for old Citrix versions rather than exiting with - # an "attribute name not found" error to avoid confusion. - deprecatedVersions = let - versions = [ "13.8.0" "13.9.0" "13.9.1" ]; - in - lib.listToAttrs - (lib.forEach versions - (v: lib.nameValuePair v (throw "Unsupported citrix_receiver version: ${v}"))); - in - deprecatedVersions // supportedVersions; - - citrixReceiverForVersion = { major, minor, patch, x86hash, x64hash, x86suffix, x64suffix, homepage }: - stdenv.mkDerivation rec { - pname = "citrix-receiver"; - version = "${major}.${minor}.${patch}"; - inherit homepage; - - prefixWithBitness = if stdenv.is64bit then "linuxx64" else "linuxx86"; - - src = requireFile rec { - name = if stdenv.is64bit then "${prefixWithBitness}-${version}.${x64suffix}.tar.gz" else "${prefixWithBitness}-${version}.${x86suffix}.tar.gz"; - sha256 = if stdenv.is64bit then x64hash else x86hash; - message = '' - In order to use Citrix Receiver, you need to comply with the Citrix EULA and download - the ${if stdenv.is64bit then "64-bit" else "32-bit"} binaries, .tar.gz from: - - ${homepage} - - (if you do not find version ${version} there, try at - https://www.citrix.com/downloads/citrix-receiver/legacy-receiver-for-linux/ - or at https://www.citrix.com/downloads/citrix-receiver/ under "Earlier Versions of Receiver for Linux") - - Once you have downloaded the file, please use the following command and re-run the - installation: - - nix-prefetch-url file://\$PWD/${name} - ''; - }; - - dontBuild = true; - - sourceRoot = "."; - - buildInputs = [ - makeWrapper - busybox - file - gtk2 - gdk-pixbuf - ]; - - libPath = stdenv.lib.makeLibraryPath [ - glib - gtk2 - atk - gdk-pixbuf - cairo - pango - gnome3.dconf - xorg.libX11 - xorg.libXext - xorg.libXrender - xorg.libXinerama - xorg.libXfixes - libpng12 - libidn_134 - zlib - gtk_engines - freetype - fontconfig - alsaLib - stdenv.cc.cc # Fixes: Can not load [..]/opt/citrix-icaclient/lib/ctxh264_fb.so:(null) - ]; - - desktopItem = makeDesktopItem { - name = "wfica"; - desktopName = "Citrix Receiver"; - genericName = "Citrix Receiver"; - exec = "wfica"; - icon = "wfica"; - comment = "Connect to remote Citrix server"; - categories = "GTK;GNOME;X-GNOME-NetworkSettings;Network;"; - mimeType = "application/x-ica"; - }; - - installPhase = '' - runHook preInstall - - export ICAInstDir="$out/opt/citrix-icaclient" - - sed -i \ - -e 's,^main_install_menu$,install_ICA_client,g' \ - -e 's,^integrate_ICA_client(),alias integrate_ICA_client=true\nintegrate_ICA_client_old(),g' \ - -e 's,^ANSWER=""$,ANSWER="$INSTALLER_YES",' \ - -e 's,/bin/true,true,g' \ - ./${prefixWithBitness}/hinst - - # Run the installer... - bash ./${prefixWithBitness}/hinst CDROM "`pwd`" - - echo "Deleting broken links..." - for link in `find $ICAInstDir -type l ` - do - [ -f "$link" ] || rm -v "$link" - done - - echo "Expanding certificates..." - # As explained in https://wiki.archlinux.org/index.php/Citrix#Security_Certificates - pushd "$ICAInstDir/keystore/cacerts" - awk 'BEGIN {c=0;} /BEGIN CERT/{c++} { print > "cert." c ".pem"}' < ${cacert}/etc/ssl/certs/ca-bundle.crt - popd - - echo "Patching executables..." - find $ICAInstDir -type f -exec file {} \; | - grep 'ELF.*executable' | - cut -f 1 -d : | - grep -vi '\(.dll\|.so\)$' | # added as a workaround to https://github.com/NixOS/nixpkgs/issues/41729 - while read f - do - echo "Patching ELF intrepreter and rpath for $f" - chmod u+w "$f" - patchelf \ - --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ - --set-rpath "$ICAInstDir:$libPath" "$f" - done - - echo "Wrapping wfica..." - mkdir "$out/bin" - - makeWrapper "$ICAInstDir/wfica" "$out/bin/wfica" \ - --add-flags "-icaroot $ICAInstDir" \ - --set ICAROOT "$ICAInstDir" \ - --set GTK_PATH "${gtk2.out}/lib/gtk-2.0:${gnome3.gnome-themes-extra}/lib/gtk-2.0" \ - --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ - --set LD_PRELOAD "${libredirect}/lib/libredirect.so" \ - --set LD_LIBRARY_PATH "$libPath" \ - --set NIX_REDIRECTS "/usr/share/zoneinfo=${tzdata}/share/zoneinfo:/etc/zoneinfo=${tzdata}/share/zoneinfo:/etc/timezone=$ICAInstDir/timezone" - - echo "We arbitrarily set the timezone to UTC. No known consequences at this point." - echo UTC > "$ICAInstDir/timezone" - - echo "Installing desktop item..." - mkdir -p $out/share/applications - cp ${desktopItem}/share/applications/* $out/share/applications - - # We introduce a dependency on the source file so that it need not be redownloaded everytime - echo $src >> "$out/share/nix_dependencies.pin" - - runHook postInstall - ''; - - meta = with stdenv.lib; { - license = stdenv.lib.licenses.unfree; - inherit homepage; - description = "Citrix Receiver"; - maintainers = with maintainers; [ obadz a1russell ma27 ]; - platforms = platforms.linux; - }; - }; - -in citrixReceiverForVersion (lib.getAttr version versionInfo) diff --git a/pkgs/applications/networking/remote/citrix-receiver/wrapper.nix b/pkgs/applications/networking/remote/citrix-receiver/wrapper.nix deleted file mode 100644 index 63587030b38e..000000000000 --- a/pkgs/applications/networking/remote/citrix-receiver/wrapper.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ citrix_receiver, extraCerts ? [], symlinkJoin }: - -let - - mkCertCopy = certPath: - "cp ${certPath} $out/opt/citrix-icaclient/keystore/cacerts/"; - -in - -if builtins.length extraCerts == 0 then citrix_receiver else symlinkJoin { - name = "citrix-with-extra-certs-${citrix_receiver.version}"; - paths = [ citrix_receiver ]; - - postBuild = '' - ${builtins.concatStringsSep "\n" (map mkCertCopy extraCerts)} - - sed -i -E "s,-icaroot (.+citrix-icaclient),-icaroot $out/opt/citrix-icaclient," $out/bin/wfica - ''; -} diff --git a/pkgs/applications/networking/remote/putty/default.nix b/pkgs/applications/networking/remote/putty/default.nix index 3b7db7075bb5..d8dc33c944e2 100644 --- a/pkgs/applications/networking/remote/putty/default.nix +++ b/pkgs/applications/networking/remote/putty/default.nix @@ -14,6 +14,9 @@ stdenv.mkDerivation rec { sha256 = "1f66iss0kqk982azmxbk4xfm2i1csby91vdvly6cr04pz3i1r4rg"; }; + # glib-2.62 deprecations + NIX_CFLAGS_COMPILE = [ "-DGLIB_DISABLE_DEPRECATION_WARNINGS" ]; + preConfigure = lib.optionalString stdenv.hostPlatform.isUnix '' perl mkfiles.pl ( cd doc ; make ); diff --git a/pkgs/applications/networking/remote/teamviewer/default.nix b/pkgs/applications/networking/remote/teamviewer/default.nix index f9b17b42bdee..97e561da93bb 100644 --- a/pkgs/applications/networking/remote/teamviewer/default.nix +++ b/pkgs/applications/networking/remote/teamviewer/default.nix @@ -6,11 +6,11 @@ mkDerivation rec { pname = "teamviewer"; - version = "14.5.1691"; + version = "14.6.2452"; src = fetchurl { url = "https://dl.tvcdn.de/download/linux/version_14x/teamviewer_${version}_amd64.deb"; - sha256 = "1dzvjyvcqcah6z1dvw4zvmbdn8iks9j2909slbkksavn1rp3akxc"; + sha256 = "0j677bqwvlczbja9msayqpdgandb2mvyvcr0vasc3hhnmnk70ahw"; }; unpackPhase = '' @@ -54,6 +54,7 @@ mkDerivation rec { ''; dontStrip = true; + preferLocalBuild = true; meta = with lib; { homepage = http://www.teamviewer.com; diff --git a/pkgs/applications/networking/sniffers/wireshark/default.nix b/pkgs/applications/networking/sniffers/wireshark/default.nix index aa965a0c8683..ef1e07ca9763 100644 --- a/pkgs/applications/networking/sniffers/wireshark/default.nix +++ b/pkgs/applications/networking/sniffers/wireshark/default.nix @@ -10,7 +10,7 @@ assert withQt -> qt5 != null; with stdenv.lib; let - version = "3.0.3"; + version = "3.0.5"; variant = if withQt then "qt" else "cli"; in stdenv.mkDerivation { @@ -20,7 +20,7 @@ in stdenv.mkDerivation { src = fetchurl { url = "https://www.wireshark.org/download/src/all-versions/wireshark-${version}.tar.xz"; - sha256 = "0711jilp9sbgi46d105m3galw8n4wk5yncawi08031qxg2f754mg"; + sha256 = "087qv7nd7zlbckvcs37fkkg7v0mw0hjd5yfbghqym764fpjgqlf5"; }; cmakeFlags = [ diff --git a/pkgs/applications/networking/station/default.nix b/pkgs/applications/networking/station/default.nix new file mode 100644 index 000000000000..6b241ddb9594 --- /dev/null +++ b/pkgs/applications/networking/station/default.nix @@ -0,0 +1,30 @@ +{ appimageTools, fetchurl, gsettings-desktop-schemas, gtk3, lib }: + +let + pname = "station"; + version = "1.51.1"; +in appimageTools.wrapType2 rec { + name = "${pname}-${version}"; + + src = fetchurl { + url = "https://github.com/getstation/desktop-app-releases/releases/download/${version}/Station-${version}.AppImage"; + sha256 = "1vfis2q7zf1sabdlxzmbxh135jk25ylhavrgfc30k5nad9cacw8k"; + }; + + profile = '' + export LC_ALL=C.UTF-8 + export XDG_DATA_DIRS=${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}:${gtk3}/share/gsettings-schemas/${gtk3.name}:$XDG_DATA_DIRS + ''; + + multiPkgs = null; + extraPkgs = appimageTools.defaultFhsEnvArgs.multiPkgs; + extraInstallCommands = "mv $out/bin/{${name},${pname}}"; + + meta = with lib; { + description = "A single place for all of your web applications"; + homepage = "https://getstation.com"; + license = licenses.mit; + platforms = [ "x86_64-linux" ]; + maintainers = with maintainers; [ lattfein ]; + }; +} diff --git a/pkgs/applications/networking/sync/onedrive/default.nix b/pkgs/applications/networking/sync/onedrive/default.nix new file mode 100644 index 000000000000..b1a5e8e74cb3 --- /dev/null +++ b/pkgs/applications/networking/sync/onedrive/default.nix @@ -0,0 +1,35 @@ +{ stdenv +, fetchFromGitHub +, dmd +, pkgconfig +, curl +, sqlite +}: + +stdenv.mkDerivation rec { + pname = "onedrive"; + version = "2.3.10"; + + src = fetchFromGitHub { + owner = "abraunegg"; + repo = "onedrive"; + rev = "v${version}"; + sha256 = "0ks22anxih63zwlc11z0gi531wvcricbkv1wlkrgfihi58l8fhfk"; + }; + + nativeBuildInputs = [ + dmd + pkgconfig + ]; + buildInputs = [ + curl + sqlite + ]; + meta = with stdenv.lib; { + description = "A complete tool to interact with OneDrive on Linux"; + homepage = "https://github.com/abraunegg/onedrive"; + license = licenses.gpl3; + maintainers = with maintainers; [ doronbehar ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/networking/sync/rclone/default.nix b/pkgs/applications/networking/sync/rclone/default.nix index 3e93dcc44405..bc26541f4d7c 100644 --- a/pkgs/applications/networking/sync/rclone/default.nix +++ b/pkgs/applications/networking/sync/rclone/default.nix @@ -1,21 +1,21 @@ -{ stdenv, buildGoModule, fetchFromGitHub }: +{ stdenv, buildGoPackage, fetchFromGitHub }: -buildGoModule rec { +buildGoPackage rec { pname = "rclone"; - version = "1.49.2"; + version = "1.49.4"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "1a90fr7cw78qhwdgkjwshap345jk1ipm3nnk7xf3nayiyibvk5dg"; + sha256 = "04fa85ch85dxm2nq7vqria34zn6fbgvky7p1i59j1wib753jpxyp"; }; - modSha256 = "158mpmy8q67dk1ks9p926n1670gsk7rhd0vpjh44f4g64ddnhk03"; + goPackagePath = "github.com/rclone/rclone"; subPackages = [ "." ]; - outputs = [ "out" "man" ]; + outputs = [ "bin" "out" "man" ]; postInstall = '' install -D -m644 $src/rclone.1 $man/share/man/man1/rclone.1 diff --git a/pkgs/applications/networking/znc/default.nix b/pkgs/applications/networking/znc/default.nix index 238864311ef0..bf36a6f2bbbd 100644 --- a/pkgs/applications/networking/znc/default.nix +++ b/pkgs/applications/networking/znc/default.nix @@ -13,11 +13,11 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "znc"; - version = "1.7.4"; + version = "1.7.5"; src = fetchurl { url = "https://znc.in/releases/archive/${pname}-${version}.tar.gz"; - sha256 = "0wcvqkpin8w4i72alnn0nxnrc9ih543qs34hqpk9xmz6m0hjk8xi"; + sha256 = "08a7yb2xs85hyyz8dpzfbsfjwj2r6kcii022lj3l4rf8hl9ix558"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/applications/networking/znc/modules.nix b/pkgs/applications/networking/znc/modules.nix index 54e148f0833e..5e7bdd09b036 100644 --- a/pkgs/applications/networking/znc/modules.nix +++ b/pkgs/applications/networking/znc/modules.nix @@ -79,15 +79,15 @@ in { fish = zncDerivation rec { name = "znc-fish-${version}"; - version = "git-2014-10-10"; + version = "git-2017-06-26"; module_name = "fish"; src = fetchFromGitHub { - # this fork works with ZNC 1.6 - owner = "jarrydpage"; + # this fork works with ZNC 1.7 + owner = "oilslump"; repo = "znc-fish"; - rev = "9c580e018a1a08374e814fc06f551281cff827de"; - sha256 = "0yvs0jkwwp18qxqvw1dvir91ggczz56ka00k0zlsb81csdi8xfvl"; + rev = "7d91467dbb195f7b591567911210523c6087662e"; + sha256 = "1ky5xg17k5f393whrv5iv8zsmdvdyk2f7z5qdsmxcwy3pdxy6vsm"; }; meta = { diff --git a/pkgs/applications/office/gnucash/default.nix b/pkgs/applications/office/gnucash/default.nix index 3abc447f6e9f..85868803ec6f 100644 --- a/pkgs/applications/office/gnucash/default.nix +++ b/pkgs/applications/office/gnucash/default.nix @@ -25,11 +25,11 @@ in stdenv.mkDerivation rec { pname = "gnucash"; - version = "3.6"; + version = "3.7"; src = fetchurl { url = "mirror://sourceforge/gnucash/${pname}-${version}.tar.bz2"; - sha256 = "09azp17ghn7i8kwk0ci3gq0qkn5pvbknhf1cbk7v43mvc3g8djzi"; + sha256 = "1d2qi3ny0bxa16ifh3465z1jgn1l0fmqk9dkph4ialw076gv13kb"; }; nativeBuildInputs = [ pkgconfig makeWrapper cmake gtest ]; @@ -43,9 +43,8 @@ stdenv.mkDerivation rec { propagatedUserEnvPkgs = [ dconf ]; - # glib-2.58 deprecrated g_type_class_add_private - # Should probably be removed next version bump - CXXFLAGS = [ "-Wno-deprecated-declarations" ]; + # glib-2.62 deprecations + NIX_CFLAGS_COMPILE = [ "-DGLIB_DISABLE_DEPRECATION_WARNINGS" ]; patches = [ ./cmake_check_symbol_exists.patch ]; diff --git a/pkgs/applications/office/homebank/default.nix b/pkgs/applications/office/homebank/default.nix index 727a68c440a2..af289c53cff3 100644 --- a/pkgs/applications/office/homebank/default.nix +++ b/pkgs/applications/office/homebank/default.nix @@ -2,10 +2,10 @@ , hicolor-icon-theme, libsoup, gnome3 }: stdenv.mkDerivation rec { - name = "homebank-5.2.7"; + name = "homebank-5.2.8"; src = fetchurl { url = "http://homebank.free.fr/public/${name}.tar.gz"; - sha256 = "0pzbn0wlppwbap19isbv8vv3cq7xswladhc272ykaya78r1bxvcf"; + sha256 = "13ampiv68y30kc0p2560g3yz8whqpwnidfcnb9lndv93b9ca767y"; }; nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; diff --git a/pkgs/applications/office/impressive/default.nix b/pkgs/applications/office/impressive/default.nix index 5065a1cb9bc9..a8c318d690a9 100644 --- a/pkgs/applications/office/impressive/default.nix +++ b/pkgs/applications/office/impressive/default.nix @@ -2,7 +2,7 @@ , SDL, ghostscript, pdftk, dejavu_fonts }: let - version = "0.12.0"; + version = "0.12.1"; pythonEnv = python2.withPackages (ps: with ps; [pyopengl pygame pillow]); in stdenv.mkDerivation { # This project was formerly known as KeyJNote. @@ -13,7 +13,7 @@ in stdenv.mkDerivation { src = fetchurl { url = "mirror://sourceforge/impressive/Impressive-${version}.tar.gz"; - sha256 = "0zaqq3yvd296mfr5bxpj2hqlk7vrb0rsbgd4dc1l5ag46giqvivx"; + sha256 = "1r7ihv41awnlnlry1kymb8fka053wdhzibfwcarn78rr3vs338vl"; }; buildInputs = [ makeWrapper pythonEnv ]; diff --git a/pkgs/applications/office/kexi/default.nix b/pkgs/applications/office/kexi/default.nix index adad5c8680fc..8db7068f7cfa 100644 --- a/pkgs/applications/office/kexi/default.nix +++ b/pkgs/applications/office/kexi/default.nix @@ -1,10 +1,10 @@ { - mkDerivation, lib, fetchurl, extra-cmake-modules, kdoctools, + mkDerivation, lib, fetchurl, fetchpatch, extra-cmake-modules, kdoctools, boost, qttools, qtwebkit, breeze-icons, karchive, kcodecs, kcompletion, kconfig, kconfigwidgets, kcoreaddons, kcrash, kguiaddons, ki18n, kiconthemes, kitemviews, kio, ktexteditor, ktextwidgets, kwidgetsaddons, kxmlgui, - kdb, kproperty, kreport, lcms2, mysql, marble, postgresql + kdb, kproperty, kreport, lcms2, libmysqlclient, marble, postgresql }: mkDerivation rec { @@ -23,11 +23,22 @@ mkDerivation rec { breeze-icons karchive kcodecs kcompletion kconfig kconfigwidgets kcoreaddons kcrash kguiaddons ki18n kiconthemes kitemviews kio ktexteditor ktextwidgets kwidgetsaddons kxmlgui - kdb kproperty kreport lcms2 mysql.connector-c marble postgresql + kdb kproperty kreport lcms2 libmysqlclient marble postgresql ]; propagatedUserEnvPkgs = [ kproperty ]; + patches = [ + # Changes in Qt 5.13 mean that QDate isn't exported from certain places, + # which the build was relying on. This patch explicitly imports QDate where + # needed. + # Should be unnecessary with kexi >= 3.3 + (fetchpatch { + url = "https://cgit.kde.org/kexi.git/patch/src/plugins/forms/widgets/kexidbdatepicker.cpp?id=511d99b7745a6ce87a208bdbf69e631f1f136d53"; + sha256 = "0m5cwq2v46gb1b12p7acck6dadvn7sw4xf8lkqikj9hvzq3r1dnj"; + }) + ]; + meta = with lib; { description = "A open source visual database applications creator, a long-awaited competitor for programs like MS Access or Filemaker"; longDescription = '' diff --git a/pkgs/applications/office/kmymoney/default.nix b/pkgs/applications/office/kmymoney/default.nix index 0cb23abea66a..20ba1abd36aa 100644 --- a/pkgs/applications/office/kmymoney/default.nix +++ b/pkgs/applications/office/kmymoney/default.nix @@ -70,5 +70,6 @@ stdenv.mkDerivation rec { homepage = https://kmymoney.org/; platforms = lib.platforms.linux; license = lib.licenses.gpl2Plus; + broken = true; }; } diff --git a/pkgs/applications/office/ledger-autosync/default.nix b/pkgs/applications/office/ledger-autosync/default.nix index 4c126fc2f919..62ac6a803824 100644 --- a/pkgs/applications/office/ledger-autosync/default.nix +++ b/pkgs/applications/office/ledger-autosync/default.nix @@ -2,14 +2,14 @@ python3Packages.buildPythonApplication rec { pname = "ledger-autosync"; - version = "1.0.0"; + version = "1.0.1"; # no tests included in PyPI tarball src = fetchFromGitHub { owner = "egh"; repo = "ledger-autosync"; rev = "v${version}"; - sha256 = "1fn32c02idccdmf9906pxn248qc9basjy2kr2g600806k3qvw84a"; + sha256 = "1h5mjngdd3rmzwmy026xmas0491kxxi1vxkd5m1xii7y6j50z14q"; }; propagatedBuildInputs = with python3Packages; [ diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix index f5f53e10496b..a459302177b9 100644 --- a/pkgs/applications/office/libreoffice/default.nix +++ b/pkgs/applications/office/libreoffice/default.nix @@ -4,7 +4,7 @@ , bison, flex, zip, unzip, gtk3, gtk2, libmspack, getopt, file, cairo, which , icu, boost, jdk, ant, cups, xorg, libcmis, fontforge , openssl, gperf, cppunit, GConf, ORBit2, poppler, utillinux -, librsvg, gnome_vfs, libGLU_combined, bsh, CoinMP, libwps, libabw, mysql +, librsvg, gnome_vfs, libGLU_combined, bsh, CoinMP, libwps, libabw, libmysqlclient , autoconf, automake, openldap, bash, hunspell, librdf_redland, nss, nspr , libwpg, dbus-glib, qt4, clucene_core, libcdr, lcms, vigra , unixODBC, mdds, sane-backends, mythes, libexttextcat, libvisio @@ -361,7 +361,7 @@ in stdenv.mkDerivation rec { libmspack librdf_redland librsvg libsndfile libvisio libwpd libwpg libX11 libXaw libXext libXi libXinerama libxml2 libxslt libXtst libXdmcp libpthreadstubs libGLU_combined mythes gst_all_1.gstreamer - gst_all_1.gst-plugins-base glib mysql.connector-c + gst_all_1.gst-plugins-base glib libmysqlclient neon nspr nss openldap openssl ORBit2 pam perl pkgconfig poppler python3 sablotron sane-backends unzip vigra which zip zlib mdds bluez5 libcmis libwps libabw libzmf diff --git a/pkgs/applications/office/libreoffice/still.nix b/pkgs/applications/office/libreoffice/still.nix index eb774a309416..4739d5265584 100644 --- a/pkgs/applications/office/libreoffice/still.nix +++ b/pkgs/applications/office/libreoffice/still.nix @@ -4,7 +4,7 @@ , bison, flex, zip, unzip, gtk3, gtk2, libmspack, getopt, file, cairo, which , icu, boost, jdk, ant, cups, xorg, libcmis, fontforge , openssl, gperf, cppunit, GConf, ORBit2, poppler, utillinux -, librsvg, gnome_vfs, libGLU_combined, bsh, CoinMP, libwps, libabw, mysql +, librsvg, gnome_vfs, libGLU_combined, bsh, CoinMP, libwps, libabw, libmysqlclient , autoconf, automake, openldap, bash, hunspell, librdf_redland, nss, nspr , libwpg, dbus-glib, qt4, clucene_core, libcdr, lcms, vigra , unixODBC, mdds, sane-backends, mythes, libexttextcat, libvisio @@ -358,7 +358,7 @@ in stdenv.mkDerivation rec { libmspack librdf_redland librsvg libsndfile libvisio libwpd libwpg libX11 libXaw libXext libXi libXinerama libxml2 libxslt libXtst libXdmcp libpthreadstubs libGLU_combined mythes gst_all_1.gstreamer - gst_all_1.gst-plugins-base glib mysql.connector-c + gst_all_1.gst-plugins-base glib libmysqlclient neon nspr nss openldap openssl ORBit2 pam perl poppler python3 sablotron sane-backends unzip vigra which zip zlib mdds bluez5 libcmis libwps libabw libzmf diff --git a/pkgs/applications/office/paperless/default.nix b/pkgs/applications/office/paperless/default.nix index af2fd82ddb03..97088f360417 100644 --- a/pkgs/applications/office/paperless/default.nix +++ b/pkgs/applications/office/paperless/default.nix @@ -57,6 +57,12 @@ let cp -r --no-preserve=mode $src/src/* $src/LICENSE $srcDir ''; + postPatch = '' + # django-cors-headers 3.x requires a scheme for allowed hosts + substituteInPlace $out/share/paperless/paperless/settings.py \ + --replace "localhost:8080" "http://localhost:8080" + ''; + buildPhase = let # Paperless has explicit runtime checks that expect these binaries to be in PATH extraBin = lib.makeBinPath [ imagemagick7 ghostscript optipng tesseract unpaper ]; diff --git a/pkgs/applications/office/paperless/python-modules/django-crispy-forms.nix b/pkgs/applications/office/paperless/python-modules/django-crispy-forms.nix index c1e0f7da30f6..465da3862471 100644 --- a/pkgs/applications/office/paperless/python-modules/django-crispy-forms.nix +++ b/pkgs/applications/office/paperless/python-modules/django-crispy-forms.nix @@ -1,5 +1,5 @@ { lib, buildPythonPackage, fetchFromGitHub -, pytest, pytest-django, django }: +, pytest_4, pytest-django, django }: buildPythonPackage { pname = "django-crispy-forms"; @@ -19,7 +19,7 @@ buildPythonPackage { export sourceRoot=source- ''; - checkInputs = [ pytest pytest-django django ]; + checkInputs = [ pytest_4 pytest-django django ]; checkPhase = '' PYTHONPATH="$(pwd):$PYTHONPATH" \ diff --git a/pkgs/applications/office/paperwork/default.nix b/pkgs/applications/office/paperwork/default.nix index adbd4c30a393..79e4b8debc91 100644 --- a/pkgs/applications/office/paperwork/default.nix +++ b/pkgs/applications/office/paperwork/default.nix @@ -61,7 +61,7 @@ python3Packages.buildPythonApplication rec { ''; propagatedBuildInputs = with python3Packages; [ - paperwork-backend pypillowfight gtk3 cairo pyxdg dateutil + paperwork-backend pypillowfight gtk3 cairo pyxdg dateutil setuptools ]; makeWrapperArgs = [ diff --git a/pkgs/applications/office/planner/default.nix b/pkgs/applications/office/planner/default.nix index 687b83948cd1..f454d8830cba 100644 --- a/pkgs/applications/office/planner/default.nix +++ b/pkgs/applications/office/planner/default.nix @@ -45,6 +45,9 @@ in stdenv.mkDerivation { python2.pkgs.pygtk ]; + # glib-2.62 deprecations + NIX_CFLAGS_COMPILE = [ "-DGLIB_DISABLE_DEPRECATION_WARNINGS" ]; + preConfigure = ''./autogen.sh''; configureFlags = [ "--enable-python" diff --git a/pkgs/applications/office/qownnotes/default.nix b/pkgs/applications/office/qownnotes/default.nix index ab32ebc67a7f..4845f058f834 100644 --- a/pkgs/applications/office/qownnotes/default.nix +++ b/pkgs/applications/office/qownnotes/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "qownnotes"; - version = "19.8.6"; + version = "19.9.16"; src = fetchurl { url = "https://download.tuxfamily.org/${pname}/src/${pname}-${version}.tar.xz"; # Can grab official version like so: # $ curl https://download.tuxfamily.org/qownnotes/src/qownnotes-19.1.8.tar.xz.sha256 - sha256 = "a242dd15dc484baad39e737fe1af8529411f49a0d74994e6c78cf6bad4b733b6"; + sha256 = "01ja4a9z87y8wdf1p9pdjdhr2h4hlyf28iqh1wlcapfq8f53zq42"; }; nativeBuildInputs = [ qmake qttools ]; diff --git a/pkgs/applications/office/scribus/unstable.nix b/pkgs/applications/office/scribus/unstable.nix index eef57179b3ea..3c5ae4c4b0aa 100644 --- a/pkgs/applications/office/scribus/unstable.nix +++ b/pkgs/applications/office/scribus/unstable.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, mkDerivation, pkgconfig, cmake, qtbase, cairo, pixman, boost, cups, fontconfig, freetype, hunspell, libjpeg, libtiff, libxml2, lcms2, -podofo, poppler, poppler_data, python2, harfbuzz, qtimageformats, qttools, harfbuzzFull }: +podofo, poppler, poppler_data, python2, qtimageformats, qttools, harfbuzzFull }: let pythonEnv = python2.withPackages(ps: [ps.tkinter ps.pillow]); @@ -20,7 +20,7 @@ mkDerivation rec { buildInputs = [ qtbase cairo pixman boost cups fontconfig freetype hunspell libjpeg libtiff libxml2 lcms2 podofo poppler - poppler_data pythonEnv harfbuzz qtimageformats qttools harfbuzzFull + poppler_data pythonEnv qtimageformats qttools harfbuzzFull ]; meta = { diff --git a/pkgs/applications/office/skrooge/default.nix b/pkgs/applications/office/skrooge/default.nix index 42fddb972c9f..dfa08b1924ef 100644 --- a/pkgs/applications/office/skrooge/default.nix +++ b/pkgs/applications/office/skrooge/default.nix @@ -37,5 +37,6 @@ mkDerivation rec { license = with licenses; [ gpl3 ]; maintainers = with maintainers; [ joko ]; homepage = https://skrooge.org/; + broken = true; }; } diff --git a/pkgs/applications/office/softmaker/desktop_items.nix b/pkgs/applications/office/softmaker/desktop_items.nix new file mode 100644 index 000000000000..6975da064566 --- /dev/null +++ b/pkgs/applications/office/softmaker/desktop_items.nix @@ -0,0 +1,42 @@ +{ makeDesktopItem, pname, suiteName }: + +{ + planmaker = makeDesktopItem { + name = "${pname}-planmaker"; + desktopName = "${suiteName} PlanMaker"; + icon = "${pname}-pml.png"; + categories = "Application;Office;SpreadSheet;"; + exec = "${pname}-planmaker %F"; + mimeType = "application/x-pmd;application/x-pmdx;application/x-pmv;application/excel;application/x-excel;application/x-ms-excel;application/x-msexcel;application/x-sylk;application/x-xls;application/xls;application/vnd.ms-excel;application/vnd.stardivision.calc;application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;application/vnd.openxmlformats-officedocument.spreadsheetml.template;application/vnd.ms-excel.sheet.macroenabled.12;application/vnd.openxmlformats-officedocument.spreadsheetml.template;application/vnd.ms-excel.template.macroEnabled.12;application/x-dif;text/spreadsheet;text/csv;application/x-prn;application/vnd.ms-excel.sheet.binary.macroenabled.12;"; + extraEntries = '' + TryExec=${pname}-planmaker + StartupWMClass=pm + ''; + }; + + presentations = makeDesktopItem { + name = "${pname}-presentations"; + desktopName = "${suiteName} Presentations"; + icon = "${pname}-prl.png"; + categories = "Application;Office;Presentation;"; + exec = "${pname}-presentations %F"; + mimeType = "application/x-prdx;application/x-prvx;application/x-prsx;application/x-prd;application/x-prv;application/x-prs;application/ppt;application/mspowerpoint;application/vnd.ms-powerpoint;application/vnd.openxmlformats-officedocument.presentationml.presentation;application/vnd.ms-powerpoint.presentation.macroenabled.12;application/vnd.openxmlformats-officedocument.presentationml.template;application/vnd.ms-powerpoint.template.macroEnabled.12;application/vnd.ms-powerpoint.slideshow.macroenabled.12;application/vnd.openxmlformats-officedocument.presentationml.slideshow;"; + extraEntries = '' + TryExec=${pname}-presentations + StartupWMClass=pr + ''; + }; + + textmaker = makeDesktopItem { + name = "${pname}-textmaker"; + desktopName = "${suiteName} TextMaker"; + icon = "${pname}-tml.png"; + categories = "Application;Office;WordProcessor;"; + exec = "${pname}-textmaker %F"; + mimeType = "application/x-tmdx;application/x-tmvx;application/x-tmd;application/x-tmv;application/msword;application/vnd.ms-word;application/x-doc;text/rtf;application/rtf;application/vnd.oasis.opendocument.text;application/vnd.oasis.opendocument.text-template;application/vnd.stardivision.writer;application/vnd.sun.xml.writer;application/vnd.sun.xml.writer.template;application/vnd.openxmlformats-officedocument.wordprocessingml.document;application/vnd.ms-word.document.macroenabled.12;application/vnd.openxmlformats-officedocument.wordprocessingml.template;application/vnd.ms-word.template.macroenabled.12;application/x-pocket-word;application/x-dbf;application/msword-template;"; + extraEntries = '' + TryExec=${pname}-textmaker + StartupWMClass=tm + ''; + }; +} diff --git a/pkgs/applications/office/softmaker/freeoffice.nix b/pkgs/applications/office/softmaker/freeoffice.nix new file mode 100644 index 000000000000..f3e37943bb66 --- /dev/null +++ b/pkgs/applications/office/softmaker/freeoffice.nix @@ -0,0 +1,15 @@ +{ callPackage, fetchurl, ... } @ args: + +callPackage ./generic.nix (args // rec { + pname = "freeoffice"; + version = "970"; + edition = "2018"; + suiteName = "FreeOffice"; + + src = fetchurl { + url = "https://www.softmaker.net/down/softmaker-freeoffice-${version}-amd64.tgz"; + sha256 = "1maibr4x8mksb32ixvyy2rjn4x9f51191p5fcdj5qwz32pf8h2dr"; + }; + + archive = "freeoffice${edition}.tar.lzma"; +}) diff --git a/pkgs/applications/office/softmaker/generic.nix b/pkgs/applications/office/softmaker/generic.nix new file mode 100644 index 000000000000..9505271db14c --- /dev/null +++ b/pkgs/applications/office/softmaker/generic.nix @@ -0,0 +1,95 @@ +{ stdenv, fetchurl, autoPatchelfHook, makeDesktopItem, makeWrapper + + # Dynamic Libraries +, curl, libGL, libX11, libXext, libXmu, libXrandr, libXrender + +, pname, version, edition, suiteName, src, archive + +, ... +}: + +let + desktopItems = import ./desktop_items.nix { + inherit makeDesktopItem pname suiteName; + }; + shortEdition = builtins.substring 2 2 edition; +in stdenv.mkDerivation rec { + inherit pname version edition shortEdition src; + nativeBuildInputs = [ + autoPatchelfHook + makeWrapper + ]; + + buildInputs = [ + curl + libGL + libX11 + libXext + libXmu + libXrandr + libXrender + stdenv.cc.cc.lib + ]; + + dontBuild = true; + dontConfigure = true; + + unpackPhase = '' + runHook preUnpack + + mkdir installer + tar -C installer -xf ${src} + mkdir ${pname} + tar -C ${pname} -xf installer/${archive} + + runHook postUnpack + ''; + + installPhase = '' + runHook preInstall + + mkdir -p $out/share + cp -r ${pname} $out/share/${pname}${edition} + + # Wrap rather than symlinking, so that the programs can determine + # their resource path. + mkdir -p $out/bin + makeWrapper $out/share/${pname}${edition}/planmaker $out/bin/${pname}-planmaker + makeWrapper $out/share/${pname}${edition}/presentations $out/bin/${pname}-presentations + makeWrapper $out/share/${pname}${edition}/textmaker $out/bin/${pname}-textmaker + + for size in 16 32 48 64 96 128 256 512 1024; do + mkdir -p $out/share/icons/hicolor/''${size}x''${size}/apps + + for app in pml prl tml; do + ln -s $out/share/${pname}${edition}/icons/''${app}_''${size}.png \ + $out/share/icons/hicolor/''${size}x''${size}/apps/${pname}-''${app}.png + done + + mkdir -p $out/share/icons/hicolor/''${size}x''${size}/mimetypes + + for mimetype in pmd prd tmd; do + ln -s $out/share/${pname}${edition}/icons/''${mimetype}_''${size}.png \ + $out/share/icons/hicolor/''${size}x''${size}/mimetypes/application-x-''${mimetype}.png + done + done + + # Add desktop items + ${desktopItems.planmaker.buildCommand} + ${desktopItems.presentations.buildCommand} + ${desktopItems.textmaker.buildCommand} + + # Add mime types + install -D -t $out/share/mime/packages ${pname}/mime/softmaker-*office*${shortEdition}.xml + + runHook postInstall + ''; + + meta = with stdenv.lib; { + description = "An office suite with a word processor, spreadsheet and presentation program"; + homepage = "https://www.softmaker.com/"; + license = licenses.unfree; + maintainers = with maintainers; [ danieldk ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/applications/office/softmaker/softmaker_office.nix b/pkgs/applications/office/softmaker/softmaker_office.nix new file mode 100644 index 000000000000..26fe420d6a3b --- /dev/null +++ b/pkgs/applications/office/softmaker/softmaker_office.nix @@ -0,0 +1,15 @@ +{ callPackage, fetchurl, ... } @ args: + +callPackage ./generic.nix (args // rec { + pname = "softmaker-office"; + version = "970"; + edition = "2018"; + suiteName = "SoftMaker Office"; + + src = fetchurl { + url = "https://www.softmaker.net/down/softmaker-office-${edition}-${version}-amd64.tgz"; + sha256 = "14f94p1jms41s2iz5sa770rcyfp4mv01r6jjjis9amx37zrc8yid"; + }; + + archive = "office${edition}.tar.lzma"; +}) diff --git a/pkgs/applications/office/timetable/default.nix b/pkgs/applications/office/timetable/default.nix index fa2d59392180..6d8f095dc9c1 100644 --- a/pkgs/applications/office/timetable/default.nix +++ b/pkgs/applications/office/timetable/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "timetable"; - version = "1.0.8"; + version = "1.0.9"; src = fetchFromGitHub { owner = "lainsce"; repo = pname; rev = version; - sha256 = "0s825al10s0hwfzl90bplwwasx89wx28n41sg2md71l9hfqy296q"; + sha256 = "1n02y7vpi4lb888iic06xifc86n2xirk50s1ssf84vlc5md1kq9f"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/office/todoman/default.nix b/pkgs/applications/office/todoman/default.nix index 450ee34262b9..7c5c8f724401 100644 --- a/pkgs/applications/office/todoman/default.nix +++ b/pkgs/applications/office/todoman/default.nix @@ -5,11 +5,11 @@ let in buildPythonApplication rec { pname = "todoman"; - version = "3.5.0"; + version = "3.6.0"; src = fetchPypi { inherit pname version; - sha256 = "051qjdpwif06x7qspnb4pfwdhb8nnmz99yqcp4kla5hv0n3jh0w9"; + sha256 = "1c0jh9bi2xfjc7w4kka68mygl00zkp2qxhffnipmfvvykfjmlhk0"; }; LOCALE_ARCHIVE = stdenv.lib.optionalString stdenv.isLinux @@ -19,7 +19,7 @@ buildPythonApplication rec { buildInputs = [ glibcLocales ]; propagatedBuildInputs = with python3.pkgs; - [ atomicwrites click click-log configobj humanize icalendar parsedatetime + [ atomicwrites click click-log click-repl configobj humanize icalendar parsedatetime python-dateutil pyxdg tabulate urwid ]; checkInputs = with python3.pkgs; diff --git a/pkgs/applications/office/watson/default.nix b/pkgs/applications/office/watson/default.nix index 16df0b294c16..7d79d79072a9 100644 --- a/pkgs/applications/office/watson/default.nix +++ b/pkgs/applications/office/watson/default.nix @@ -4,12 +4,12 @@ with pythonPackages; buildPythonApplication rec { pname = "watson"; - version = "1.7.0"; + version = "1.8.0"; src = fetchPypi { inherit version; pname = "td-watson"; - sha256 = "249313996751f32f38817d424cbf8d74956461df1439f0ee3a962fcc3c77225d"; + sha256 = "1ip66jhbcqifdw1avbhngwym0vv7fsqxgbph11da5wlqwfwp060n"; }; checkPhase = '' diff --git a/pkgs/applications/office/zim/default.nix b/pkgs/applications/office/zim/default.nix index a41064666d58..5afc03a3bd6d 100644 --- a/pkgs/applications/office/zim/default.nix +++ b/pkgs/applications/office/zim/default.nix @@ -9,11 +9,11 @@ python3Packages.buildPythonApplication rec { name = "zim-${version}"; - version = "0.71.1"; + version = "0.72.0"; src = fetchurl { url = "http://zim-wiki.org/downloads/${name}.tar.gz"; - sha256 = "0d7whwpbklkhamlvysa0yyix1hchkpdynimf3gp1xbibg8mqzbxc"; + sha256 = "1n3gmg7g86s8iwcx0i7rvvfdfs1fzmc9awr9qzjd2rckw4bkxad1"; }; buildInputs = [ gtk3 gobject-introspection wrapGAppsHook ]; diff --git a/pkgs/applications/qubes/qubes-core-vchan-xen/default.nix b/pkgs/applications/qubes/qubes-core-vchan-xen/default.nix new file mode 100644 index 000000000000..e8241ede96cd --- /dev/null +++ b/pkgs/applications/qubes/qubes-core-vchan-xen/default.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchFromGitHub, xen_4_10 }: + +stdenv.mkDerivation rec { + pname = "qubes-core-vchan-xen"; + version = "4.1.2"; + + src = fetchFromGitHub { + owner = "QubesOS"; + repo = pname; + rev = "v${version}"; + sha256 = "1wj4vv8nkzzig52r2nzkd4jy0cwznfkyddx379hfsdl4pzsp55mj"; + }; + + buildInputs = [ xen_4_10 ]; + buildPhase = '' + make all PREFIX=/ + ''; + installPhase = '' + make install DESTDIR=$out PREFIX=/ + ''; + + meta = with stdenv.lib; { + description = "Libraries required for the higher-level Qubes daemons and tools"; + homepage = "https://qubes-os.org"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ "0x4A6F" ]; + platforms = platforms.linux; + }; +} + diff --git a/pkgs/applications/radio/flmsg/default.nix b/pkgs/applications/radio/flmsg/default.nix index ae602b752e0d..39fbb0de06c0 100644 --- a/pkgs/applications/radio/flmsg/default.nix +++ b/pkgs/applications/radio/flmsg/default.nix @@ -6,12 +6,12 @@ }: stdenv.mkDerivation rec { - version = "4.0.10"; + version = "4.0.14"; pname = "flmsg"; src = fetchurl { url = "mirror://sourceforge/fldigi/${pname}-${version}.tar.gz"; - sha256 = "1vprax1w5wm3v2i4d0mbakrxp7v53m2bm8icsvaji06ixskq7cxf"; + sha256 = "0s1prawkpvr7xr7h8w7r0ly90ya3n8h6qsii0x6laqrkgjn9w9iy"; }; buildInputs = [ diff --git a/pkgs/applications/radio/flrig/default.nix b/pkgs/applications/radio/flrig/default.nix index 5bb561f14260..242536a89655 100644 --- a/pkgs/applications/radio/flrig/default.nix +++ b/pkgs/applications/radio/flrig/default.nix @@ -6,12 +6,12 @@ }: stdenv.mkDerivation rec { - version = "1.3.47"; + version = "1.3.48"; pname = "flrig"; src = fetchurl { url = "mirror://sourceforge/fldigi/${pname}-${version}.tar.gz"; - sha256 = "1xih3ik5dssa40lx48228pcrds8r7xmd8rmk2fcr1mw6apw6q141"; + sha256 = "0f46rmrr8aphj8fsbfa1bywihigzfzyxq9zg66d1laa7d3jsfs9q"; }; buildInputs = [ diff --git a/pkgs/applications/radio/rtl_433/default.nix b/pkgs/applications/radio/rtl_433/default.nix index 3d519255ab48..148ad35a1f05 100644 --- a/pkgs/applications/radio/rtl_433/default.nix +++ b/pkgs/applications/radio/rtl_433/default.nix @@ -4,14 +4,14 @@ stdenv.mkDerivation { - version = "18.12"; + version = "19.08"; pname = "rtl_433"; src = fetchFromGitHub { owner = "merbanan"; repo = "rtl_433"; - rev = "18.12"; - sha256 = "0y73g9ffpsgnmfk8lbihyl9d1fd9v91wsn8k8xhsdmgmn4ra1jk5"; + rev = "19.08"; + sha256 = "0cm82gm5c86qfl4dw37h8wyk77947k6fv2n1pn3xvk3wz2ygsdi6"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; diff --git a/pkgs/applications/radio/tlf/default.nix b/pkgs/applications/radio/tlf/default.nix index 92183306038b..f45e695486d8 100644 --- a/pkgs/applications/radio/tlf/default.nix +++ b/pkgs/applications/radio/tlf/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, autoreconfHook, autoconf, automake, pkgconfig, glib -, perl, ncurses, hamlib, xmlrpc_c }: +, perl, ncurses5, hamlib, xmlrpc_c }: stdenv.mkDerivation rec { pname = "tlf"; @@ -13,15 +13,13 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ autoreconfHook autoconf automake pkgconfig perl ]; - buildInputs = [ glib ncurses hamlib xmlrpc_c ]; + buildInputs = [ glib ncurses5 hamlib xmlrpc_c ]; configureFlags = [ "--enable-hamlib" "--enable-fldigi-xmlrpc" ]; postInstall = '' mkdir -p $out/lib - - # Hack around lack of libtinfo in NixOS - ln -s ${ncurses.out}/lib/libncursesw.so.6 $out/lib/libtinfo.so.5 + ln -s ${ncurses5.out}/lib/libtinfo.so.5 $out/lib/libtinfo.so.5 ''; meta = with stdenv.lib; { diff --git a/pkgs/applications/radio/xlog/default.nix b/pkgs/applications/radio/xlog/default.nix index 7b9cf0a4ee55..3434c0624ed5 100644 --- a/pkgs/applications/radio/xlog/default.nix +++ b/pkgs/applications/radio/xlog/default.nix @@ -8,6 +8,9 @@ stdenv.mkDerivation rec { sha256 = "0vmn8518zk7qk1mbp1h8dm0f8fx0z0jvmy42c1n15il714lj7vsl"; }; + # glib-2.62 deprecations + NIX_CFLAGS_COMPILE = [ "-DGLIB_DISABLE_DEPRECATION_WARNINGS" ]; + buildInputs = [ glib pkgconfig gtk2 hamlib ]; meta = with stdenv.lib; { diff --git a/pkgs/applications/science/astronomy/gildas/default.nix b/pkgs/applications/science/astronomy/gildas/default.nix index a21c9f328f40..9584c2f41a82 100644 --- a/pkgs/applications/science/astronomy/gildas/default.nix +++ b/pkgs/applications/science/astronomy/gildas/default.nix @@ -7,8 +7,8 @@ let in stdenv.mkDerivation rec { - srcVersion = "sep19a"; - version = "20190901_a"; + srcVersion = "oct19a"; + version = "20191001_a"; pname = "gildas"; src = fetchurl { @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { # source code of the previous release to a different directory urls = [ "http://www.iram.fr/~gildas/dist/gildas-src-${srcVersion}.tar.xz" "http://www.iram.fr/~gildas/dist/archive/gildas/gildas-src-${srcVersion}.tar.xz" ]; - sha256 = "0l4jfzzxp1ab70a920qfbxiphgnc06m46wfwv0jlsq2mfk7cxac1"; + sha256 = "0h6g16ra7v8x15j21z5hnb3midwm0asc7bjm9gs5v5sw66vn3wc1"; }; enableParallelBuilding = true; diff --git a/pkgs/applications/science/biology/EZminc/default.nix b/pkgs/applications/science/biology/EZminc/default.nix index dbcfead6b1ea..696162d2dc53 100644 --- a/pkgs/applications/science/biology/EZminc/default.nix +++ b/pkgs/applications/science/biology/EZminc/default.nix @@ -26,5 +26,6 @@ stdenv.mkDerivation rec { pname = "EZminc"; maintainers = with maintainers; [ bcdarwin ]; platforms = platforms.unix; license = licenses.free; + broken = true; }; } diff --git a/pkgs/applications/science/biology/bcftools/default.nix b/pkgs/applications/science/biology/bcftools/default.nix index d8ffbb74e6b0..33e4de0d95aa 100644 --- a/pkgs/applications/science/biology/bcftools/default.nix +++ b/pkgs/applications/science/biology/bcftools/default.nix @@ -32,6 +32,6 @@ stdenv.mkDerivation rec { license = licenses.mit; homepage = http://www.htslib.org/; platforms = platforms.unix; - maintainers = [ maintainers.mimadrid ]; + maintainers = [ maintainers.mimame ]; }; } diff --git a/pkgs/applications/science/biology/igv/default.nix b/pkgs/applications/science/biology/igv/default.nix index 412b55f59163..04699a84b692 100644 --- a/pkgs/applications/science/biology/igv/default.nix +++ b/pkgs/applications/science/biology/igv/default.nix @@ -28,6 +28,6 @@ stdenv.mkDerivation rec { description = "A visualization tool for interactive exploration of genomic datasets"; license = licenses.lgpl21; platforms = platforms.unix; - maintainers = [ maintainers.mimadrid ]; + maintainers = [ maintainers.mimame ]; }; } diff --git a/pkgs/applications/science/biology/macse/default.nix b/pkgs/applications/science/biology/macse/default.nix new file mode 100644 index 000000000000..59938addbe82 --- /dev/null +++ b/pkgs/applications/science/biology/macse/default.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchurl, jre, makeWrapper }: + +stdenv.mkDerivation rec { + pname = "macse"; + version = "2.03"; + + src = fetchurl { + url = "https://bioweb.supagro.inra.fr/${pname}/releases/${pname}_v${version}.jar"; + sha256 = "0jnjyz4f255glg37rawzdv4m6nfs7wfwc5dny7afvx4dz2sv4ssh"; + }; + + nativeBuildInputs = [ makeWrapper ]; + + dontBuild = true; + unpackPhase = ":"; + + installPhase = '' + runHook preInstall + mkdir -p $out/share/java + cp -s $src $out/share/java/macse.jar + makeWrapper ${jre}/bin/java $out/bin/macse --add-flags "-jar $out/share/java/macse.jar" + runHook postInstall + ''; + + meta = with stdenv.lib; { + description = "Multiple alignment of coding sequences"; + homepage = "https://bioweb.supagro.inra.fr/macse/"; + license = licenses.gpl2; + maintainers = [ maintainers.bzizou ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/applications/science/biology/paml/default.nix b/pkgs/applications/science/biology/paml/default.nix index 161188f7ef16..fe6919656d9d 100644 --- a/pkgs/applications/science/biology/paml/default.nix +++ b/pkgs/applications/science/biology/paml/default.nix @@ -29,5 +29,6 @@ stdenv.mkDerivation rec { longDescription = ''PAML is a package of programs for phylogenetic analyses of DNA or protein sequences using maximum likelihood. It is maintained and distributed for academic use free of charge by Ziheng Yang. ANSI C source codes are distributed for UNIX/Linux/Mac OSX, and executables are provided for MS Windows. PAML is not good for tree making. It may be used to estimate parameters and test hypotheses to study the evolutionary process, when you have reconstructed trees using other programs such as PAUP*, PHYLIP, MOLPHY, PhyML, RaxML, etc.''; license = "non-commercial"; homepage = http://abacus.gene.ucl.ac.uk/software/paml.html; + broken = true; }; } diff --git a/pkgs/applications/science/biology/picard-tools/default.nix b/pkgs/applications/science/biology/picard-tools/default.nix index 2a57febe8f5d..8fff296affa6 100644 --- a/pkgs/applications/science/biology/picard-tools/default.nix +++ b/pkgs/applications/science/biology/picard-tools/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "picard-tools"; - version = "2.20.5"; + version = "2.20.8"; src = fetchurl { url = "https://github.com/broadinstitute/picard/releases/download/${version}/picard.jar"; - sha256 = "107zlvp74ahpn652nfkipp80bbzf3fp812pi1ma42njk4wchah10"; + sha256 = "01bibkwyp4xzwcpvkr3ab6z0syjmzj4zmyxl3bybmrp9irhjvydg"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/science/biology/samtools/default.nix b/pkgs/applications/science/biology/samtools/default.nix index dd1a53472dbc..daa2925de7c4 100644 --- a/pkgs/applications/science/biology/samtools/default.nix +++ b/pkgs/applications/science/biology/samtools/default.nix @@ -29,6 +29,6 @@ stdenv.mkDerivation rec { license = licenses.mit; homepage = http://www.htslib.org/; platforms = platforms.unix; - maintainers = [ maintainers.mimadrid ]; + maintainers = [ maintainers.mimame ]; }; } diff --git a/pkgs/applications/science/biology/spades/default.nix b/pkgs/applications/science/biology/spades/default.nix new file mode 100644 index 000000000000..a195f79010a7 --- /dev/null +++ b/pkgs/applications/science/biology/spades/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchurl, zlib, bzip2, cmake }: + +stdenv.mkDerivation rec { + pname = "SPAdes"; + version = "3.13.1"; + + src = fetchurl { + url = "http://cab.spbu.ru/files/release${version}/${pname}-${version}.tar.gz"; + sha256 = "0giayz197lmq2108filkn9izma3i803sb3iskv9hs5snzdr9p8ld"; + }; + + nativeBuildInputs = [ cmake ]; + + buildInputs = [ zlib bzip2 ]; + + doCheck = true; + + sourceRoot = "${pname}-${version}/src"; + + meta = with stdenv.lib; { + description = "St. Petersburg genome assembler: assembly toolkit containing various assembly pipelines"; + license = licenses.gpl2; + homepage = "http://cab.spbu.ru/software/spades/"; + platforms = platforms.unix; + maintainers = [ maintainers.bzizou ]; + }; +} diff --git a/pkgs/applications/science/biology/strelka/default.nix b/pkgs/applications/science/biology/strelka/default.nix index 84c90d895566..c791e8ef89bb 100644 --- a/pkgs/applications/science/biology/strelka/default.nix +++ b/pkgs/applications/science/biology/strelka/default.nix @@ -33,6 +33,7 @@ stdenv.mkDerivation rec { homepage = https://github.com/Illumina/strelka; maintainers = with maintainers; [ jbedo ]; platforms = [ "x86_64-linux" ]; + broken = true; }; } diff --git a/pkgs/applications/science/chemistry/jmol/default.nix b/pkgs/applications/science/chemistry/jmol/default.nix index 00231113d2cf..f9dc759d67a7 100644 --- a/pkgs/applications/science/chemistry/jmol/default.nix +++ b/pkgs/applications/science/chemistry/jmol/default.nix @@ -17,14 +17,14 @@ let }; in stdenv.mkDerivation rec { - version = "14.29.49"; + version = "14.29.53"; pname = "jmol"; src = let baseVersion = "${lib.versions.major version}.${lib.versions.minor version}"; in fetchurl { url = "mirror://sourceforge/jmol/Jmol/Version%20${baseVersion}/Jmol%20${version}/Jmol-${version}-binary.tar.gz"; - sha256 = "19fyr4ldvbd5rbw19hslg9fpwc42wxmyx7r3z78k6dw653vb1ml5"; + sha256 = "0wdkiprccgvc5nh6h616l282fbd5mx5z3aiq2y558qa4gn22nqrq"; }; patchPhase = '' diff --git a/pkgs/applications/science/chemistry/pymol/default.nix b/pkgs/applications/science/chemistry/pymol/default.nix index 1fc387fcc66d..b1bd01fb2f7f 100644 --- a/pkgs/applications/science/chemistry/pymol/default.nix +++ b/pkgs/applications/science/chemistry/pymol/default.nix @@ -47,5 +47,6 @@ python3Packages.buildPythonApplication { description = description; homepage = https://www.pymol.org/; license = licenses.psfl; + broken = true; }; } diff --git a/pkgs/applications/science/electronics/gtkwave/default.nix b/pkgs/applications/science/electronics/gtkwave/default.nix index 8dffe580cc65..64c1c3daba82 100644 --- a/pkgs/applications/science/electronics/gtkwave/default.nix +++ b/pkgs/applications/science/electronics/gtkwave/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "gtkwave"; - version = "3.3.101"; + version = "3.3.102"; src = fetchurl { url = "mirror://sourceforge/gtkwave/${pname}-${version}.tar.gz"; - sha256 = "1j6capxwgi8aj3sgqg1r7161icni9y8y93g1rl3bzd3s40jcyhsz"; + sha256 = "1izyfx6b1n9nr08c7q0gkgcf0q04bb4qz92ckwh74n5l5nwprfw0"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/applications/science/electronics/kicad/default.nix b/pkgs/applications/science/electronics/kicad/default.nix index 3d169f501043..bd57e355c757 100644 --- a/pkgs/applications/science/electronics/kicad/default.nix +++ b/pkgs/applications/science/electronics/kicad/default.nix @@ -65,7 +65,7 @@ in stdenv.mkDerivation rec { buildInputs = [ libGLU_combined zlib libX11 wxGTK pcre libXdmcp glew glm libpthreadstubs cairo curl openssl boost - swig python + swig (python.withPackages (ps: with ps; [ wxPython ])) ] ++ optional (oceSupport) opencascade ++ optional (ngspiceSupport) libngspice; @@ -107,7 +107,7 @@ in stdenv.mkDerivation rec { buildPythonPath "$out $pythonPath" gappsWrapperArgs+=(--set PYTHONPATH "$program_PYTHONPATH") - wrapProgram "$out/bin/kicad" "''${gappsWrapperArgs[@]}" + wrapGApp "$out/bin/kicad" ''; meta = { diff --git a/pkgs/applications/science/electronics/kicad/unstable.nix b/pkgs/applications/science/electronics/kicad/unstable.nix index 7475170d6a72..5310da0699e2 100644 --- a/pkgs/applications/science/electronics/kicad/unstable.nix +++ b/pkgs/applications/science/electronics/kicad/unstable.nix @@ -52,5 +52,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2; maintainers = with maintainers; [ berce ]; platforms = with platforms; linux; + broken = true; }; } diff --git a/pkgs/applications/science/electronics/verilator/default.nix b/pkgs/applications/science/electronics/verilator/default.nix index 9a9899192505..3ac4b24bf762 100644 --- a/pkgs/applications/science/electronics/verilator/default.nix +++ b/pkgs/applications/science/electronics/verilator/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "verilator"; - version = "4.016"; + version = "4.018"; src = fetchurl { url = "https://www.veripool.org/ftp/${pname}-${version}.tgz"; - sha256 = "18fqm6pgscy504ql27i150fdsd2j91hw5qsnpymws3pvqj2qz2ij"; + sha256 = "0ih38dd8hiwgjyc6gclx8i9jlycgdlrxzz8bicm4a6yj4p0jxmcq"; }; enableParallelBuilding = true; diff --git a/pkgs/applications/science/electronics/verilog/default.nix b/pkgs/applications/science/electronics/verilog/default.nix index f850a1bf94df..b707db141602 100644 --- a/pkgs/applications/science/electronics/verilog/default.nix +++ b/pkgs/applications/science/electronics/verilog/default.nix @@ -35,6 +35,6 @@ stdenv.mkDerivation rec { homepage = "http://iverilog.icarus.com/"; license = licenses.lgpl21; maintainers = with maintainers; [ winden ]; - platforms = platforms.linux; + platforms = platforms.all; }; } diff --git a/pkgs/applications/science/logic/coq/default.nix b/pkgs/applications/science/logic/coq/default.nix index a04ec0bb16ce..99e9d856a717 100644 --- a/pkgs/applications/science/logic/coq/default.nix +++ b/pkgs/applications/science/logic/coq/default.nix @@ -28,7 +28,7 @@ let "8.8.2" = "1lip3xja924dm6qblisk1bk0x8ai24s5xxqxphbdxj6djglj68fd"; "8.9.0" = "1dkgdjc4n1m15m1p724hhi5cyxpqbjw6rxc5na6fl3v4qjjfnizh"; "8.9.1" = "1xrq6mkhpq994bncmnijf8jwmwn961kkpl4mwwlv7j3dgnysrcv2"; - "8.10+beta2" = "0jk7pwydhd17ab7ii69zvi4sgrr630q2lsxhckaj3sz55cpjlhal"; + "8.10+beta3" = "08c7q97jyblsf7dhk8jf1fx1cp9qr3dr5s42wigx10wh7i6j7pca"; }.${version}; coq-version = stdenv.lib.versions.majorMinor version; versionAtLeast = stdenv.lib.versionAtLeast coq-version; diff --git a/pkgs/applications/science/logic/hol_light/default.nix b/pkgs/applications/science/logic/hol_light/default.nix index 40b0115dc1b7..cda3656dc59e 100644 --- a/pkgs/applications/science/logic/hol_light/default.nix +++ b/pkgs/applications/science/logic/hol_light/default.nix @@ -21,13 +21,13 @@ let in stdenv.mkDerivation { - name = "hol_light-2019-03-27"; + name = "hol_light-2019-10-06"; src = fetchFromGitHub { owner = "jrh13"; repo = "hol-light"; - rev = "a2b487b38d9da47350f1b4316e34a8fa4cf7a40a"; - sha256 = "1qlidl15qi8w4si8wxcmj8yg2srsb0q4k1ad9yd91sgx9h9aq8fk"; + rev = "5c91b2ded8a66db571824ecfc18b4536c103b23e"; + sha256 = "0sxsk8z08ba0q5aixdyczcx5l29lb51ba4ip3d2fry7y604kjsx6"; }; buildInputs = [ ocaml camlp5 ]; diff --git a/pkgs/applications/science/logic/jonprl/default.nix b/pkgs/applications/science/logic/jonprl/default.nix index 61ca78d85ed1..e503836098f1 100644 --- a/pkgs/applications/science/logic/jonprl/default.nix +++ b/pkgs/applications/science/logic/jonprl/default.nix @@ -30,5 +30,6 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.mit; maintainers = with stdenv.lib.maintainers; [ puffnfresh ]; platforms = stdenv.lib.platforms.linux; + broken = true; }; } diff --git a/pkgs/applications/science/logic/lean2/default.nix b/pkgs/applications/science/logic/lean2/default.nix index 8cc50bb5e295..612c9d6f92a2 100644 --- a/pkgs/applications/science/logic/lean2/default.nix +++ b/pkgs/applications/science/logic/lean2/default.nix @@ -32,5 +32,6 @@ stdenv.mkDerivation { license = licenses.asl20; platforms = platforms.unix; maintainers = with maintainers; [ thoughtpolice gebner ]; + broken = true; }; } diff --git a/pkgs/applications/science/logic/monosat/default.nix b/pkgs/applications/science/logic/monosat/default.nix index 30d47687a3eb..fba3bc479060 100644 --- a/pkgs/applications/science/logic/monosat/default.nix +++ b/pkgs/applications/science/logic/monosat/default.nix @@ -39,6 +39,7 @@ let platforms = platforms.unix; license = if includeGplCode then licenses.gpl2 else licenses.mit; homepage = https://github.com/sambayless/monosat; + broken = true; }; }; @@ -64,4 +65,4 @@ let --replace '../../../../libmonosat.so' '${core}/lib/libmonosat.so' ''; }; -in core \ No newline at end of file +in core diff --git a/pkgs/applications/science/logic/potassco/clingo.nix b/pkgs/applications/science/logic/potassco/clingo.nix index 2b368a0e6730..7c1ee8099e2c 100644 --- a/pkgs/applications/science/logic/potassco/clingo.nix +++ b/pkgs/applications/science/logic/potassco/clingo.nix @@ -2,15 +2,14 @@ stdenv.mkDerivation rec { pname = "clingo"; - version = "5.3.0"; + version = "5.4.0"; src = fetchzip { url = "https://github.com/potassco/clingo/archive/v${version}.tar.gz"; - sha256 = "01czx26p8gv81ahrh650x208hjhd8bx1kb688fmk1m4pw4yg5bfv"; + sha256 = "0gfqlgwg3qx042w6hdc9qpmr50n4vci3p0ddk28f3kqacf6q9q7m"; }; - buildInputs = []; - nativeBuildInputs = [cmake]; + nativeBuildInputs = [ cmake ]; cmakeFlags = [ "-DCLINGO_BUILD_WITH_PYTHON=OFF" ]; diff --git a/pkgs/applications/science/logic/saw-tools/default.nix b/pkgs/applications/science/logic/saw-tools/default.nix index d357bef2c7a0..c4041281054f 100644 --- a/pkgs/applications/science/logic/saw-tools/default.nix +++ b/pkgs/applications/science/logic/saw-tools/default.nix @@ -34,8 +34,7 @@ stdenv.mkDerivation { mv bin $out/bin mv doc $out/share - # Hack around lack of libtinfo in NixOS - ln -s ${ncurses.out}/lib/libncursesw.so.5 $out/lib/libtinfo.so.5 + ln -s ${ncurses.out}/lib/libtinfo.so.5 $out/lib/libtinfo.so.5 ln -s ${stdenv.cc.libc}/lib/libpthread.so.0 $out/lib/libpthread.so.0 # Add a clang symlink for easy building with a suitable compiler. diff --git a/pkgs/applications/science/logic/tamarin-prover/default.nix b/pkgs/applications/science/logic/tamarin-prover/default.nix index 40378f8c04d5..9b87b8c899e5 100644 --- a/pkgs/applications/science/logic/tamarin-prover/default.nix +++ b/pkgs/applications/science/logic/tamarin-prover/default.nix @@ -104,4 +104,6 @@ mkDerivation (common "tamarin-prover" src // { tamarin-prover-term tamarin-prover-theory ]; + + broken = true; }) diff --git a/pkgs/applications/science/logic/yices/default.nix b/pkgs/applications/science/logic/yices/default.nix index 76ed934fb39e..b8dd528a11c1 100644 --- a/pkgs/applications/science/logic/yices/default.nix +++ b/pkgs/applications/science/logic/yices/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { # Includes a fix for the embedded soname being libyices.so.2.5, but # only installing the libyices.so.2.5.x file. installPhase = let - ver_XdotY = builtins.concatStringsSep "." (stdenv.lib.take 2 (stdenv.lib.splitString "." version)); + ver_XdotY = stdenv.lib.versions.majorMinor version; in '' make install LDCONFIG=true ln -sfr $out/lib/libyices.so.{${version},${ver_XdotY}} diff --git a/pkgs/applications/science/math/cbc/default.nix b/pkgs/applications/science/math/cbc/default.nix index d0857e2a517c..e68ceb379b04 100644 --- a/pkgs/applications/science/math/cbc/default.nix +++ b/pkgs/applications/science/math/cbc/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "cbc"; - version = "2.10.2"; + version = "2.10.3"; src = fetchurl { url = "https://www.coin-or.org/download/source/Cbc/Cbc-${version}.tgz"; - sha256 = "0frbxkh6nbh46kaxsx5bmzridgip3v7aq75l8yak5npiiq4jlwv3"; + sha256 = "1zzcg40ky5v96s7br2hqlkqdspwrn43kf3757g6c35wl29bq6f5d"; }; configureFlags = [ "-C" ]; diff --git a/pkgs/applications/science/math/cntk/default.nix b/pkgs/applications/science/math/cntk/default.nix index c20a6954c3cb..ceb87b25ba85 100644 --- a/pkgs/applications/science/math/cntk/default.nix +++ b/pkgs/applications/science/math/cntk/default.nix @@ -1,7 +1,7 @@ -{ config, lib, stdenv, fetchgit, fetchFromGitHub, cmake +{ lib, stdenv, fetchgit, fetchFromGitHub, cmake , openblas, opencv3, libzip, boost, protobuf, openmpi , onebitSGDSupport ? false -, cudaSupport ? config.cudaSupport or false, cudatoolkit, nvidia_x11 +, cudaSupport ? false, addOpenGLRunpath, cudatoolkit, nvidia_x11 , cudnnSupport ? cudaSupport, cudnn }: @@ -27,7 +27,10 @@ in stdenv.mkDerivation rec { sha256 = "18l9k7s966a26ywcf7flqyhm61788pcb9fj3wk61jrmgkhy2pcns"; }; - nativeBuildInputs = [ cmake ]; + nativeBuildInputs = [ cmake ] ++ lib.optional cudaSupport addOpenGLRunpath; + + # Force OpenMPI to use g++ in PATH. + OMPI_CXX = "g++"; buildInputs = [ openblas opencv3 libzip boost protobuf openmpi ] ++ lib.optional cudaSupport cudatoolkit @@ -69,6 +72,7 @@ in stdenv.mkDerivation rec { ln -s ${cudnn}/include cuda export configureFlags="$configureFlags --with-cudnn=$PWD" ''} + ../configure $configureFlags ''; @@ -79,9 +83,18 @@ in stdenv.mkDerivation rec { cp bin/cntk $out/bin ''; + postFixup = lib.optionalString cudaSupport '' + for lib in $out/lib/*; do + addOpenGLRunpath "$lib" + done + ''; + enableParallelBuilding = true; meta = with lib; { + # Newer cub is included with cudatoolkit now and it breaks the build. + # https://github.com/Microsoft/CNTK/issues/3191 + broken = cudaSupport; homepage = https://github.com/Microsoft/CNTK; description = "An open source deep-learning toolkit"; license = if onebitSGDSupport then licenses.unfreeRedistributable else licenses.mit; diff --git a/pkgs/applications/science/math/giac/default.nix b/pkgs/applications/science/math/giac/default.nix index ad82d7572e34..90b1b367a7c4 100644 --- a/pkgs/applications/science/math/giac/default.nix +++ b/pkgs/applications/science/math/giac/default.nix @@ -104,9 +104,7 @@ stdenv.mkDerivation rec { description = "A free computer algebra system (CAS)"; homepage = "https://www-fourier.ujf-grenoble.fr/~parisse/giac.html"; license = licenses.gpl3Plus; - ## xcas is buildable on darwin but there are specific instructions I could - ## not test - platforms = platforms.linux; + platforms = platforms.unix; maintainers = [ maintainers.symphorien ]; }; } diff --git a/pkgs/applications/science/math/ginac/default.nix b/pkgs/applications/science/math/ginac/default.nix index 197845bfa3c1..541ed548f884 100644 --- a/pkgs/applications/science/math/ginac/default.nix +++ b/pkgs/applications/science/math/ginac/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, cln, pkgconfig, readline, gmp, python }: stdenv.mkDerivation rec { - name = "ginac-1.7.6"; + name = "ginac-1.7.7"; src = fetchurl { url = "${meta.homepage}/${name}.tar.bz2"; - sha256 = "03cq93qjfgxgr7zxadrjfbn43lk5f0x2lmd90ggx10p6jq47157v"; + sha256 = "1jsf74cym5v6nq70aij3l7axq8vf7rrc1lnb9siyb9lsfbnnxzqf"; }; propagatedBuildInputs = [ cln ]; diff --git a/pkgs/applications/science/math/glsurf/default.nix b/pkgs/applications/science/math/glsurf/default.nix index 4de683cdce90..1cd5e364208a 100644 --- a/pkgs/applications/science/math/glsurf/default.nix +++ b/pkgs/applications/science/math/glsurf/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, ocamlPackages, libGLU_combined, freeglut -, mysql, mpfr, gmp, libtiff, libjpeg, libpng, giflib +, libmysqlclient, mpfr, gmp, libtiff, libjpeg, libpng, giflib }: stdenv.mkDerivation { @@ -10,7 +10,7 @@ stdenv.mkDerivation { sha256 = "0w8xxfnw2snflz8wdr2ca9f5g91w5vbyp1hwlx1v7vg83d4bwqs7"; }; - buildInputs = [ freeglut libGLU_combined mysql.connector-c mpfr gmp + buildInputs = [ freeglut libGLU_combined libmysqlclient mpfr gmp libtiff libjpeg libpng giflib ] ++ (with ocamlPackages; [ ocaml findlib ocaml_mysql lablgl camlimages_4_0 mlgmpidl diff --git a/pkgs/applications/science/math/lrcalc/default.nix b/pkgs/applications/science/math/lrcalc/default.nix index eecb37dd743f..f407358d8f26 100644 --- a/pkgs/applications/science/math/lrcalc/default.nix +++ b/pkgs/applications/science/math/lrcalc/default.nix @@ -35,6 +35,6 @@ stdenv.mkDerivation rec { homepage = http://math.rutgers.edu/~asbuch/lrcalc/; license = licenses.gpl2Plus; maintainers = with maintainers; [ timokau ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/applications/science/math/nauty/default.nix b/pkgs/applications/science/math/nauty/default.nix index bd116b02e29e..4efe8da19180 100644 --- a/pkgs/applications/science/math/nauty/default.nix +++ b/pkgs/applications/science/math/nauty/default.nix @@ -19,7 +19,6 @@ stdenv.mkDerivation rec { sandybridge = [ "--disable-clz" ]; ivybridge = [ "--disable-clz" ]; }.${stdenv.hostPlatform.platform.gcc.arch or "default"} or []; - buildInputs = []; installPhase = '' mkdir -p "$out"/{bin,share/doc/nauty} "$dev"/{lib,include/nauty} @@ -37,7 +36,7 @@ stdenv.mkDerivation rec { description = ''Programs for computing automorphism groups of graphs and digraphs''; license = licenses.asl20; maintainers = with maintainers; [ raskin timokau ]; - platforms = platforms.linux; + platforms = platforms.unix; homepage = http://pallini.di.uniroma1.it/; }; } diff --git a/pkgs/applications/science/math/pynac/default.nix b/pkgs/applications/science/math/pynac/default.nix index 75a46bb182ae..4022383dbc7d 100644 --- a/pkgs/applications/science/math/pynac/default.nix +++ b/pkgs/applications/science/math/pynac/default.nix @@ -9,14 +9,14 @@ }: stdenv.mkDerivation rec { - version = "0.7.25"; + version = "0.7.26"; pname = "pynac"; src = fetchFromGitHub { owner = "pynac"; repo = "pynac"; rev = "pynac-${version}"; - sha256 = "0nnifvg6kzx0lq6gz7znind8g30v3d2pjfwgsdiks3vv9kv9nbj3"; + sha256 = "09d2p74x1arkydlxy6pw4p4byi7r8q7f29w373h4d8a215kadc6d"; }; buildInputs = [ @@ -43,6 +43,6 @@ stdenv.mkDerivation rec { homepage = http://pynac.org; license = licenses.gpl3; maintainers = with maintainers; [ timokau ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/applications/science/math/qalculate-gtk/default.nix b/pkgs/applications/science/math/qalculate-gtk/default.nix index b4d82b9583c4..d0625201a37d 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.3.0"; + version = "3.4.0"; src = fetchFromGitHub { owner = "qalculate"; repo = "qalculate-gtk"; rev = "v${version}"; - sha256 = "1z2d32dcvdd66114j3km58xfk80hc5rd0zrh2fgz1azv8r4cqq1b"; + sha256 = "11q9f4p67ckbxd962jchgmwqnbp7v9ghix88c5hn3vaxvgwiw5hl"; }; patchPhase = '' 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 933344aa5591..56f092796229 100644 --- a/pkgs/applications/science/math/sage/patches/sphinx-docbuild-subprocesses.patch +++ b/pkgs/applications/science/math/sage/patches/sphinx-docbuild-subprocesses.patch @@ -1,8 +1,8 @@ diff --git a/src/sage_setup/docbuild/__init__.py b/src/sage_setup/docbuild/__init__.py -index 0f2700168a..60f71357d2 100644 +index 73a078e619..059125c59f 100644 --- a/src/sage_setup/docbuild/__init__.py +++ b/src/sage_setup/docbuild/__init__.py -@@ -86,26 +86,6 @@ def builder_helper(type): +@@ -86,27 +86,6 @@ def builder_helper(type): """ Returns a function which builds the documentation for output type ``type``. @@ -19,7 +19,8 @@ index 0f2700168a..60f71357d2 100644 - ....: raise BaseException("abort pool operation") - sage: original_runsphinx, sage_setup.docbuild.sphinxbuild.runsphinx = sage_setup.docbuild.sphinxbuild.runsphinx, raiseBaseException - -- sage: from sage_setup.docbuild import builder_helper, build_many, build_ref_doc +- sage: from sage_setup.docbuild import builder_helper, build_ref_doc +- sage: from sage_setup.docbuild import _build_many as build_many - sage: helper = builder_helper("html") - sage: try: - ....: build_many(build_ref_doc, [("docname", "en", "html", {})]) @@ -29,7 +30,7 @@ index 0f2700168a..60f71357d2 100644 """ def f(self, *args, **kwds): output_dir = self._output_dir(type) -@@ -127,10 +107,9 @@ def builder_helper(type): +@@ -128,10 +107,9 @@ def builder_helper(type): logger.debug(build_command) # Run Sphinx with Sage's special logger @@ -43,10 +44,10 @@ index 0f2700168a..60f71357d2 100644 if ABORT_ON_ERROR: raise diff --git a/src/sage_setup/docbuild/sphinxbuild.py b/src/sage_setup/docbuild/sphinxbuild.py -index 9a2fba79bc..77c8ed3592 100644 +index fe7eba43b2..463790965c 100644 --- a/src/sage_setup/docbuild/sphinxbuild.py +++ b/src/sage_setup/docbuild/sphinxbuild.py -@@ -318,3 +318,8 @@ def runsphinx(): +@@ -321,3 +321,8 @@ def runsphinx(): sys.stderr = saved_stderr sys.stdout.flush() sys.stderr.flush() diff --git a/pkgs/applications/science/math/sage/patches/threejs-offline.patch b/pkgs/applications/science/math/sage/patches/threejs-offline.patch deleted file mode 100644 index 62b2f114bd62..000000000000 --- a/pkgs/applications/science/math/sage/patches/threejs-offline.patch +++ /dev/null @@ -1,64 +0,0 @@ -diff --git a/build/pkgs/threejs/spkg-src b/build/pkgs/threejs/spkg-src -index 91780d813c..254b850a24 100755 ---- a/build/pkgs/threejs/spkg-src -+++ b/build/pkgs/threejs/spkg-src -@@ -20,9 +20,17 @@ URL3="https://raw.githubusercontent.com/mrdoob/three.js/${GIT_VERSION}/LICENSE" - echo "Downloading $URL3" - curl -OL "$URL3" - -+# Set up directory structure -+ -+mkdir build -+mv three.min.js build -+ -+mkdir -p examples/js/controls -+mv OrbitControls.js examples/js/controls -+ - # Package --tar czf "$SAGE_ROOT/upstream/threejs-${GIT_VERSION}.tar.gz" 'three.min.js' 'OrbitControls.js' 'LICENSE' --rm -rf 'three.min.js' 'OrbitControls.js' 'LICENSE' -+tar czf "$SAGE_ROOT/upstream/threejs-${GIT_VERSION}.tar.gz" build examples 'LICENSE' -+rm -rf 'build' 'examples' 'LICENSE' - - # Update package info - echo "${GIT_VERSION}" > 'package-version.txt' -diff --git a/src/sage/repl/rich_output/backend_ipython.py b/src/sage/repl/rich_output/backend_ipython.py -index 7c27d48a21..8bf4861a35 100644 ---- a/src/sage/repl/rich_output/backend_ipython.py -+++ b/src/sage/repl/rich_output/backend_ipython.py -@@ -411,10 +411,15 @@ class BackendIPythonCommandline(BackendIPython): - sage: backend.threejs_offline_scripts() - '...<script ...</script>...' - """ -- from sage.env import SAGE_SHARE -+ from sage.env import THREEJS_DIR - -- scripts = [os.path.join(SAGE_SHARE, 'threejs', script) -- for script in ['three.min.js', 'OrbitControls.js']] -+ scripts = [ -+ os.path.join(THREEJS_DIR, script) -+ for script in [ -+ 'build/three.min.js', -+ 'examples/js/controls/OrbitControls.js', -+ ] -+ ] - - if sys.platform == 'cygwin': - import cygwin -@@ -594,13 +599,13 @@ class BackendIPythonNotebook(BackendIPython): - sage: from sage.repl.rich_output.backend_ipython import BackendIPythonNotebook - sage: backend = BackendIPythonNotebook() - sage: backend.threejs_offline_scripts() -- '...<script src="/nbextensions/threejs/three.min...<\\/script>...' -+ '...<script src="/nbextensions/threejs/build/three.min...<\\/script>...' - """ - from sage.repl.rich_output import get_display_manager - CDN_scripts = get_display_manager().threejs_scripts(online=True) - return """ --<script src="/nbextensions/threejs/three.min.js"></script> --<script src="/nbextensions/threejs/OrbitControls.js"></script> -+<script src="/nbextensions/threejs/build/three.min.js"></script> -+<script src="/nbextensions/threejs/examples/js/controls/OrbitControls.js"></script> - <script> - if ( !window.THREE ) document.write('{}'); - </script> diff --git a/pkgs/applications/science/math/sage/sage-env.nix b/pkgs/applications/science/math/sage/sage-env.nix index 8fd69f62171a..0b67b3cff12b 100644 --- a/pkgs/applications/science/math/sage/sage-env.nix +++ b/pkgs/applications/science/math/sage/sage-env.nix @@ -44,6 +44,7 @@ , gsl , ntl , jdk +, less }: # This generates a `sage-env` shell file that will be sourced by sage on startup. @@ -92,6 +93,7 @@ let rubiks flintqs jdk # only needed for `jmol` which may be replaced in the future + less # needed to prevent transient test errors until https://github.com/ipython/ipython/pull/11864 is resolved ] )); in diff --git a/pkgs/applications/science/math/sage/sage-src.nix b/pkgs/applications/science/math/sage/sage-src.nix index 57d6c852be8d..dc9c9b5c874f 100644 --- a/pkgs/applications/science/math/sage/sage-src.nix +++ b/pkgs/applications/science/math/sage/sage-src.nix @@ -10,14 +10,14 @@ # all get the same sources with the same patches applied. stdenv.mkDerivation rec { - version = "8.8"; + version = "8.9"; pname = "sage-src"; src = fetchFromGitHub { owner = "sagemath"; repo = "sage"; rev = version; - sha256 = "0jm7zdkz8wfgrmf6620jfr8kgvprrz3qfl8gzx6rl5z5cm734b6x"; + sha256 = "1bwga58x3s8z42w5h51c232f91ndsc1861dlb1glhax3pn0rhn3a"; }; # Patches needed because of particularities of nix or the way this is packaged. @@ -49,10 +49,6 @@ stdenv.mkDerivation rec { # https://trac.sagemath.org/ticket/27660#ticket ./patches/do-not-test-find-library.patch - - # https://trac.sagemath.org/ticket/28007 - ./patches/threejs-offline.patch - # Parallelize docubuild using subprocesses, fixing an isolation issue. See # https://groups.google.com/forum/#!topic/sage-packaging/YGOm8tkADrE ./patches/sphinx-docbuild-subprocesses.patch @@ -97,18 +93,17 @@ stdenv.mkDerivation rec { stripLen = 1; }) - # https://trac.sagemath.org/ticket/26932 - (fetchSageDiff { - name = "givaro-4.1.0_fflas-ffpack-2.4.0_linbox-1.6.0.patch"; - base = "8.8.beta4"; - rev = "c11d9cfa23ff9f77681a8f12742f68143eed4504"; - sha256 = "0xzra7mbgqvahk9v45bjwir2mqz73hrhhy314jq5nxrb35ysdxyi"; - }) - # 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"; + }) ]; patches = nixPatches ++ bugfixPatches ++ packageUpgradePatches; diff --git a/pkgs/applications/science/math/sage/sagelib.nix b/pkgs/applications/science/math/sage/sagelib.nix index 6eac84aaa865..69f7624078ea 100644 --- a/pkgs/applications/science/math/sage/sagelib.nix +++ b/pkgs/applications/science/math/sage/sagelib.nix @@ -138,8 +138,8 @@ buildPythonPackage rec { mkdir -p "$SAGE_SHARE/sage/ext/notebook-ipython" mkdir -p "var/lib/sage/installed" + source build/bin/sage-dist-helpers cd src - source bin/sage-dist-helpers ${python.interpreter} -u setup.py --no-user-cfg build ''; diff --git a/pkgs/applications/science/math/singular/default.nix b/pkgs/applications/science/math/singular/default.nix index ccb139203acb..fccd1489e11c 100644 --- a/pkgs/applications/science/math/singular/default.nix +++ b/pkgs/applications/science/math/singular/default.nix @@ -110,7 +110,7 @@ stdenv.mkDerivation rec { description = "A CAS for polynomial computations"; maintainers = with maintainers; [ raskin timokau ]; # 32 bit x86 fails with some link error: `undefined reference to `__divmoddi4@GCC_7.0.0'` - platforms = subtractLists platforms.i686 platforms.linux; + platforms = subtractLists platforms.i686 platforms.unix; license = licenses.gpl3; # Or GPLv2 at your option - but not GPLv4 homepage = http://www.singular.uni-kl.de; downloadPage = "http://www.mathematik.uni-kl.de/ftp/pub/Math/Singular/SOURCES/"; diff --git a/pkgs/applications/science/math/weka/default.nix b/pkgs/applications/science/math/weka/default.nix index 90278a744f15..ec9ea0b85331 100644 --- a/pkgs/applications/science/math/weka/default.nix +++ b/pkgs/applications/science/math/weka/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { homepage = http://www.cs.waikato.ac.nz/ml/weka/; description = "Collection of machine learning algorithms for data mining tasks"; license = stdenv.lib.licenses.gpl2Plus; - maintainers = [ stdenv.lib.maintainers.mimadrid ]; + maintainers = [ stdenv.lib.maintainers.mimame ]; platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/applications/science/misc/cytoscape/default.nix b/pkgs/applications/science/misc/cytoscape/default.nix index 2e19012af874..8ed3deed804c 100644 --- a/pkgs/applications/science/misc/cytoscape/default.nix +++ b/pkgs/applications/science/misc/cytoscape/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "cytoscape"; - version = "3.7.1"; + version = "3.7.2"; src = fetchurl { url = "https://github.com/cytoscape/cytoscape/releases/download/${version}/${pname}-${version}.tar.gz"; - sha256 = "1mhsngbwbgdwl70wj7850zg94534lasihwv2ryifardm35mkh48k"; + sha256 = "125vgr8vqbmy2nsm1yl0h0q8p49lxxqfw5cmxzbx1caklcn4rryc"; }; buildInputs = [jre makeWrapper]; @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { homepage = http://www.cytoscape.org; description = "A general platform for complex network analysis and visualization"; license = stdenv.lib.licenses.lgpl21; - maintainers = [stdenv.lib.maintainers.mimadrid]; + maintainers = [stdenv.lib.maintainers.mimame]; platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/applications/science/molecular-dynamics/gromacs/default.nix b/pkgs/applications/science/molecular-dynamics/gromacs/default.nix index d00b59307c52..d720f5ea0787 100644 --- a/pkgs/applications/science/molecular-dynamics/gromacs/default.nix +++ b/pkgs/applications/science/molecular-dynamics/gromacs/default.nix @@ -1,27 +1,28 @@ - -{ stdenv, fetchurl, cmake, - singlePrec ? true, - mpiEnabled ? false, - fftw, - openmpi +{ stdenv, fetchurl, cmake +, singlePrec ? true +, mpiEnabled ? false +, fftw +, openmpi +, perl }: stdenv.mkDerivation { - name = "gromacs-2019.3"; + name = "gromacs-2019.4"; src = fetchurl { - url = "ftp://ftp.gromacs.org/pub/gromacs/gromacs-2019.3.tar.gz"; - sha256 = "0wvm6lj4hbasl2qkjcpicqjh7abxji4196dd2hmwlyivpycaa4a2"; + url = "ftp://ftp.gromacs.org/pub/gromacs/gromacs-2019.4.tar.gz"; + sha256 = "0rqqrbjrdhprlw2z6cqid59xwxfdx05ikvywppvdp8f8vzp6chxs"; }; - buildInputs = [cmake fftw] + nativeBuildInputs = [ cmake ]; + buildInputs = [ fftw perl ] ++ (stdenv.lib.optionals mpiEnabled [ openmpi ]); cmakeFlags = '' ${if singlePrec then "-DGMX_DOUBLE=OFF" else "-DGMX_DOUBLE=ON -DGMX_DEFAULT_SUFFIX=OFF"} - ${if mpiEnabled then "-DGMX_MPI:BOOL=TRUE - -DGMX_CPU_ACCELERATION:STRING=SSE4.1 + ${if mpiEnabled then "-DGMX_MPI:BOOL=TRUE + -DGMX_CPU_ACCELERATION:STRING=SSE4.1 -DGMX_OPENMP:BOOL=TRUE -DGMX_THREAD_MPI:BOOL=FALSE" else "-DGMX_MPI:BOOL=FALSE" } diff --git a/pkgs/applications/science/programming/fdr/default.nix b/pkgs/applications/science/programming/fdr/default.nix index 3bfb70f5ce8e..2c0bb84c801f 100644 --- a/pkgs/applications/science/programming/fdr/default.nix +++ b/pkgs/applications/science/programming/fdr/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, qtbase, qtx11extras, ncurses, xorg, zlib, python27Packages}: +{stdenv, fetchurl, qtbase, qtx11extras, ncurses5, xorg, zlib, python27Packages}: stdenv.mkDerivation { name = "fdr-4.2.3"; src = fetchurl { @@ -11,7 +11,7 @@ stdenv.mkDerivation { python27Packages.python qtbase qtx11extras - ncurses + ncurses5 xorg.libX11 xorg.libXft zlib @@ -26,8 +26,7 @@ stdenv.mkDerivation { rm -r lib/qt_plugins cp -r * "$out" - # Hack around lack of libtinfo in NixOS - ln -s ${ncurses.out}/lib/libncursesw.so.6 $out/lib/libtinfo.so.5 + ln -s ${ncurses5.out}/lib/libtinfo.so.5 $out/lib/libtinfo.so.5 ln -s ${qtbase.bin}/${qtbase.qtPluginPrefix} $out/lib/qt_plugins ln -s ${zlib.out}/lib/libz.so.1 $out/lib/libz.so.1 diff --git a/pkgs/applications/science/robotics/qgroundcontrol/default.nix b/pkgs/applications/science/robotics/qgroundcontrol/default.nix index 1863757adbcf..f9fea3f31462 100644 --- a/pkgs/applications/science/robotics/qgroundcontrol/default.nix +++ b/pkgs/applications/science/robotics/qgroundcontrol/default.nix @@ -69,5 +69,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3Plus; platforms = platforms.linux; maintainers = with maintainers; [ pxc ]; + broken = true; }; } diff --git a/pkgs/applications/search/catfish/default.nix b/pkgs/applications/search/catfish/default.nix index 983a5153ee2f..30b9b9c273d4 100644 --- a/pkgs/applications/search/catfish/default.nix +++ b/pkgs/applications/search/catfish/default.nix @@ -5,13 +5,13 @@ pythonPackages.buildPythonApplication rec { majorver = "1.4"; - minorver = "7"; + minorver = "10"; version = "${majorver}.${minorver}"; pname = "catfish"; src = fetchurl { url = "https://archive.xfce.org/src/apps/${pname}/${majorver}/${pname}-${version}.tar.bz2"; - sha256 = "1s97jb1r07ff40jnz8zianpn1f0c67hssn8ywdi2g7njfb4amjj8"; + sha256 = "0g9l5sv5d7wmyb23cvpz5mpvjnxiqjh25v9gr5qzhcah202a0wr5"; }; nativeBuildInputs = [ @@ -19,7 +19,7 @@ pythonPackages.buildPythonApplication rec { file which intltool - gobject-introspection + gobject-introspection # for setup hook populating GI_TYPELIB_PATH wrapGAppsHook ]; @@ -30,9 +30,11 @@ pythonPackages.buildPythonApplication rec { pythonPackages.ptyprocess pythonPackages.pycairo hicolor-icon-theme + gobject-introspection # Temporary fix, see https://github.com/NixOS/nixpkgs/issues/56943 ]; propagatedBuildInputs = [ + pythonPackages.dbus-python pythonPackages.pygobject3 pythonPackages.pexpect xdg_utils @@ -53,7 +55,7 @@ pythonPackages.buildPythonApplication rec { meta = with stdenv.lib; { homepage = https://docs.xfce.org/apps/catfish/start; - description = "A handy file search tool"; + description = "Handy file search tool"; longDescription = '' Catfish is a handy file searching tool. The interface is intentionally lightweight and simple, using only GTK 3. diff --git a/pkgs/applications/version-management/fossil/default.nix b/pkgs/applications/version-management/fossil/default.nix index cc0298811333..5c46879e319b 100644 --- a/pkgs/applications/version-management/fossil/default.nix +++ b/pkgs/applications/version-management/fossil/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { pname = "fossil"; - version = "2.9"; + version = "2.10"; src = fetchurl { urls = @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { "https://www.fossil-scm.org/index.html/uv/fossil-src-${version}.tar.gz" ]; name = "${pname}-${version}.tar.gz"; - sha256 = "0kwb7pkp7y2my916rhyl6kmcf0fk8gkzaxzy13hfgqs35nlsvchw"; + sha256 = "041bs4fgk52fw58p7s084pxk9d9vs5v2f2pjbznqawz75inpg8yq"; }; buildInputs = [ zlib openssl readline sqlite which ed ] diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix index e64254ed29f1..cb098f502768 100644 --- a/pkgs/applications/version-management/git-and-tools/default.nix +++ b/pkgs/applications/version-management/git-and-tools/default.nix @@ -24,6 +24,8 @@ let darcsToGit = callPackage ./darcs-to-git { }; + delta = callPackage ./delta { }; + diff-so-fancy = callPackage ./diff-so-fancy { }; ghq = callPackage ./ghq { }; @@ -147,6 +149,8 @@ let lab = callPackage ./lab { }; + lefthook = callPackage ./lefthook { }; + pre-commit = pkgs.python3Packages.toPythonApplication pkgs.python3Packages.pre-commit; pass-git-helper = python3Packages.callPackage ./pass-git-helper { }; diff --git a/pkgs/applications/version-management/git-and-tools/delta/default.nix b/pkgs/applications/version-management/git-and-tools/delta/default.nix new file mode 100644 index 000000000000..d4040c3a2a13 --- /dev/null +++ b/pkgs/applications/version-management/git-and-tools/delta/default.nix @@ -0,0 +1,22 @@ +{ lib, fetchFromGitHub, rustPlatform }: + +rustPlatform.buildRustPackage rec { + pname = "delta"; + version = "0.0.12"; + + src = fetchFromGitHub { + owner = "dandavison"; + repo = pname; + rev = version; + sha256 = "10jmawxzqgz7gjg1xdna9q2v6l1qlf83ybbqxcbx6941s15lgs7x"; + }; + + cargoSha256 = "1888bvkpalfcw9bc9zmf9bmil6x35l9ia31x6mx1h2dvrfpw3bb1"; + + meta = with lib; { + homepage = "https://github.com/dandavison/delta"; + description = "A syntax-highlighting pager for git"; + license = licenses.mit; + maintainers = [ maintainers.marsam ]; + }; +} diff --git a/pkgs/applications/version-management/git-and-tools/diff-so-fancy/default.nix b/pkgs/applications/version-management/git-and-tools/diff-so-fancy/default.nix index 1bbbbe22d9a8..96216e76fd31 100644 --- a/pkgs/applications/version-management/git-and-tools/diff-so-fancy/default.nix +++ b/pkgs/applications/version-management/git-and-tools/diff-so-fancy/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "diff-so-fancy"; - version = "1.2.6"; + version = "1.2.7"; src = fetchFromGitHub { owner = "so-fancy"; repo = "diff-so-fancy"; rev = "v${version}"; - sha256 = "1w8x2d83zdhrnydiqq1qjf3j1y4cawdg8p1isj8zqwblnc47ygjm"; + sha256 = "0y5cp236gi6h7llzai5d27086l4zz58mz1zs01r97xnnmjs9vw21"; }; # Perl is needed here for patchShebangs diff --git a/pkgs/applications/version-management/git-and-tools/git-cola/default.nix b/pkgs/applications/version-management/git-and-tools/git-cola/default.nix index 545fc77168e9..5d1a06e03974 100644 --- a/pkgs/applications/version-management/git-and-tools/git-cola/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-cola/default.nix @@ -1,17 +1,17 @@ -{ stdenv, fetchFromGitHub, pythonPackages, gettext, git, qt5 }: +{ stdenv, fetchFromGitHub, python3Packages, gettext, git, qt5 }: let - inherit (pythonPackages) buildPythonApplication pyqt5 sip pyinotify; + inherit (python3Packages) buildPythonApplication pyqt5 sip pyinotify; in buildPythonApplication rec { pname = "git-cola"; - version = "3.4"; + version = "3.5"; src = fetchFromGitHub { owner = "git-cola"; repo = "git-cola"; rev = "v${version}"; - sha256 = "0754d56dprhb1nhb8fwp4my5pyqcgarwzba1l6zx7il87d7vyi5m"; + sha256 = "09b60jbpdr4czx7h4vqahqmmi7m9vn77jlkpjfhys7crrdnxjp9i"; }; buildInputs = [ git gettext ]; diff --git a/pkgs/applications/version-management/git-and-tools/git-remote-hg/default.nix b/pkgs/applications/version-management/git-and-tools/git-remote-hg/default.nix index 7d6b620e2239..6df3a97dbbb2 100644 --- a/pkgs/applications/version-management/git-and-tools/git-remote-hg/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-remote-hg/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "git-remote-hg"; - version = "1.0.0"; + version = "1.0.1"; src = fetchFromGitHub { owner = "mnauw"; repo = "git-remote-hg"; rev = "v${version}"; - sha256 = "0anl054zdi5rg5m4bm1n763kbdjkpdws3c89c8w8m5gq1ifsbd4d"; + sha256 = "1by5ygqvq9ww990kdrjndaqsssyf2jc4n380f9pfh2avsr7871wc"; }; buildInputs = [ mercurial.python mercurial makeWrapper diff --git a/pkgs/applications/version-management/git-and-tools/git-secret/default.nix b/pkgs/applications/version-management/git-and-tools/git-secret/default.nix index 62fbab02292d..494c0a3421f8 100644 --- a/pkgs/applications/version-management/git-and-tools/git-secret/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-secret/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchFromGitHub, makeWrapper, git, gnupg, gawk }: let - version = "0.2.6"; + version = "0.3.1"; repo = "git-secret"; in stdenv.mkDerivation { @@ -11,7 +11,7 @@ in stdenv.mkDerivation { inherit repo; owner = "sobolevn"; rev = "v${version}"; - sha256 = "09p4h8mdmk0nzcd1jh1i6n29klz38n5vqqwdyzjkygmr2xqka55b"; + sha256 = "0234a2507as242wlybg32f7nd27ffjs50r4p1p95j6vs5s8g413l"; }; buildInputs = [ makeWrapper ]; 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 cd38be2b977a..e40bfc9961b7 100644 --- a/pkgs/applications/version-management/git-and-tools/hub/default.nix +++ b/pkgs/applications/version-management/git-and-tools/hub/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "hub"; - version = "2.12.4"; + version = "2.12.8"; goPackagePath = "github.com/github/hub"; @@ -13,7 +13,7 @@ buildGoPackage rec { owner = "github"; repo = pname; rev = "v${version}"; - sha256 = "1d4cn4pgx520psrfac92h3m7azxnpj1plrrqmxryar85f3y363bq"; + sha256 = "0a2dpg0w29nblk1dba9a35bpwwyf0zbqcgrwn4a8diyx27b77x3x"; }; nativeBuildInputs = [ groff utillinux ]; diff --git a/pkgs/applications/version-management/git-and-tools/lefthook/default.nix b/pkgs/applications/version-management/git-and-tools/lefthook/default.nix new file mode 100644 index 000000000000..04ba4c7c48fd --- /dev/null +++ b/pkgs/applications/version-management/git-and-tools/lefthook/default.nix @@ -0,0 +1,22 @@ +{ stdenv, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "lefthook"; + version = "0.6.3"; + + src = fetchFromGitHub { + rev = "v${version}"; + owner = "Arkweid"; + repo = "lefthook"; + sha256 = "01zvlw2yyxjg92d1qag1b42kc2kd68h4fmrv9y6ar7z0rw3p9a5d"; + }; + + modSha256 = "0mjhw778x40c2plmjlkiry4rwvr9xkz65b88a61j86liv2plbmq2"; + + meta = with stdenv.lib; { + description = "Fast and powerful Git hooks manager for any type of projects"; + homepage = "https://github.com/Arkweid/lefthook"; + license = licenses.mit; + maintainers = with maintainers; [ rencire ]; + }; +} diff --git a/pkgs/applications/version-management/git-lfs/default.nix b/pkgs/applications/version-management/git-lfs/default.nix index d9b5e1704976..f2d87fd69dde 100644 --- a/pkgs/applications/version-management/git-lfs/default.nix +++ b/pkgs/applications/version-management/git-lfs/default.nix @@ -2,25 +2,22 @@ buildGoPackage rec { pname = "git-lfs"; - version = "2.7.2"; - - goPackagePath = "github.com/git-lfs/git-lfs"; + version = "2.8.0"; src = fetchFromGitHub { rev = "v${version}"; owner = "git-lfs"; repo = "git-lfs"; - sha256 = "1nf40rbdz901vsahg5cm09pznpina6wimmxl0lmh8pn0mi51yzvc"; + sha256 = "17x9q4g1acf51bxr9lfmd2ym7w740n4ghdi0ncmma77kwabw9d3x"; }; + goPackagePath = "github.com/git-lfs/git-lfs"; + + subPackages = [ "." ]; + preBuild = '' - pushd go/src/github.com/git-lfs/git-lfs + cd go/src/${goPackagePath} go generate ./commands - popd - ''; - - postInstall = '' - rm -v $bin/bin/{man,script,cmd} ''; meta = with stdenv.lib; { diff --git a/pkgs/applications/version-management/git-repo/default.nix b/pkgs/applications/version-management/git-repo/default.nix index b26548ebe991..0128eb9da2c4 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 = "1.13.5.1"; + version = "1.13.6"; src = fetchFromGitHub { owner = "android"; repo = "tools_repo"; rev = "v${version}"; - sha256 = "13rp0fq76a6qlw60pnipkgfng25i0ygyk66y30jv7hy8ip4aa92n"; + sha256 = "1a12h84anf3sshkkcv30ljgibb35gmh01bmi6sicyhxbn1hrfi3w"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/version-management/git-up/default.nix b/pkgs/applications/version-management/git-up/default.nix index ba0625c433de..5812ff8c1d1d 100644 --- a/pkgs/applications/version-management/git-up/default.nix +++ b/pkgs/applications/version-management/git-up/default.nix @@ -1,17 +1,18 @@ -{ stdenv, fetchurl, python2Packages, git }: +{ stdenv, fetchurl, pythonPackages, git }: -python2Packages.buildPythonApplication rec { - version = "1.4.2"; +pythonPackages.buildPythonApplication rec { pname = "git-up"; + version = "1.6.1"; - src = fetchurl { - url = "mirror://pypi/g/git-up/${pname}-${version}.zip"; - sha256 = "121ia5gyjy7js6fbsx9z98j2qpq7rzwpsj8gnfvsbz2d69g0vl7q"; + src = pythonPackages.fetchPypi { + inherit pname version; + sha256 = "0gs791yb0cndg9879vayvcj329jwhzpk6wrf9ri12l5hg8g490za"; }; - buildInputs = [ git ] ++ (with python2Packages; [ nose ]); - propagatedBuildInputs = with python2Packages; [ click colorama docopt GitPython six termcolor ]; + # git should be on path for tool to work correctly + propagatedBuildInputs = [ git ] ++ (with pythonPackages; [ click colorama docopt GitPython six termcolor ]); + checkInputs = [ git pythonPackages.nose ]; # git needs to be on path # 1. git fails to run as it cannot detect the email address, so we set it # 2. $HOME is by default not a valid dir, so we have to set that too # https://github.com/NixOS/nixpkgs/issues/12591 @@ -22,7 +23,7 @@ python2Packages.buildPythonApplication rec { ''; postInstall = '' - rm -r $out/${python2Packages.python.sitePackages}/PyGitUp/tests + rm -r $out/${pythonPackages.python.sitePackages}/PyGitUp/tests ''; meta = with stdenv.lib; { @@ -31,6 +32,5 @@ python2Packages.buildPythonApplication rec { license = licenses.mit; maintainers = with maintainers; [ peterhoeg ]; platforms = platforms.all; - broken = true; # Incompatible with Git 2.15 object store. }; } diff --git a/pkgs/applications/version-management/gitea/default.nix b/pkgs/applications/version-management/gitea/default.nix index 9c7d83a05fd9..0526743cc386 100644 --- a/pkgs/applications/version-management/gitea/default.nix +++ b/pkgs/applications/version-management/gitea/default.nix @@ -8,13 +8,13 @@ with stdenv.lib; buildGoPackage rec { pname = "gitea"; - version = "1.9.3"; + version = "1.9.4"; src = fetchFromGitHub { owner = "go-gitea"; repo = "gitea"; rev = "v${version}"; - sha256 = "0g6ch85dq4vazxnr6g78wgqrnfa955395y1zws0a50h0wfxpdjis"; + sha256 = "1f4bdn04pbbmnf03c58jqjl2m629137py6l06mkh63jip32a6l1z"; # Required to generate the same checksum on MacOS due to unicode encoding differences # More information: https://github.com/NixOS/nixpkgs/pull/48128 extraPostFetch = '' diff --git a/pkgs/applications/version-management/gitkraken/default.nix b/pkgs/applications/version-management/gitkraken/default.nix index fa93ff41a4ae..67e6589ac1a0 100644 --- a/pkgs/applications/version-management/gitkraken/default.nix +++ b/pkgs/applications/version-management/gitkraken/default.nix @@ -13,11 +13,11 @@ let in stdenv.mkDerivation rec { pname = "gitkraken"; - version = "6.1.4"; + version = "6.2.1"; src = fetchurl { url = "https://release.axocdn.com/linux/GitKraken-v${version}.deb"; - sha256 = "10m6pwdwdxj6x64bc7mrvlvwkgqrd5prh9xx7xhvbz55q6gx4vdr"; + sha256 = "1l1w8gr4ss0g2k7bfslnc7df4ls1av59jjjc8mrx97wsndrm3vxg"; }; libPath = makeLibraryPath [ diff --git a/pkgs/applications/version-management/gitlab/data.json b/pkgs/applications/version-management/gitlab/data.json index d20236e9f5bf..94d5be62db56 100644 --- a/pkgs/applications/version-management/gitlab/data.json +++ b/pkgs/applications/version-management/gitlab/data.json @@ -1,32 +1,13 @@ { - "ce": { - "version": "12.1.6", - "repo_hash": "0zyqxzyb1m8qa94iiyqf5ivqxrg60y378r94fsixy17fbh4y7sa6", - "deb_hash": "14bwcmwar44pjnjr6fdn2h9y92vyfva0kb76d4pz8pqc9pfm2hmg", - "deb_url": "https://packages.gitlab.com/gitlab/gitlab-ce/packages/debian/stretch/gitlab-ce_12.1.6-ce.0_amd64.deb/download.deb", - "owner": "gitlab-org", - "repo": "gitlab-ce", - "rev": "v12.1.6", - "passthru": { - "GITALY_SERVER_VERSION": "1.53.2", - "GITLAB_PAGES_VERSION": "1.7.1", - "GITLAB_SHELL_VERSION": "9.3.0", - "GITLAB_WORKHORSE_VERSION": "8.7.0" - } - }, - "ee": { - "version": "12.1.6", - "repo_hash": "1lxci1hwcccgw567c5733yl95xsxr4gnw41m48igdw9y8p6g7zbc", - "deb_hash": "0yjilhf4bjhl1a596x6n4cvjklfbrwhymslhx977nfjazfb5slx3", - "deb_url": "https://packages.gitlab.com/gitlab/gitlab-ee/packages/debian/stretch/gitlab-ee_12.1.6-ee.0_amd64.deb/download.deb", - "owner": "gitlab-org", - "repo": "gitlab-ee", - "rev": "v12.1.6-ee", - "passthru": { - "GITALY_SERVER_VERSION": "1.53.2", - "GITLAB_PAGES_VERSION": "1.7.1", - "GITLAB_SHELL_VERSION": "9.3.0", - "GITLAB_WORKHORSE_VERSION": "8.7.0" - } + "version": "12.3.5", + "repo_hash": "12ywspgnbwm232vmzbqhkqmwmcrb9pvihsayzmw0cxvhlfwq6995", + "owner": "gitlab-org", + "repo": "gitlab", + "rev": "v12.3.5-ee", + "passthru": { + "GITALY_SERVER_VERSION": "1.65.1", + "GITLAB_PAGES_VERSION": "1.9.0", + "GITLAB_SHELL_VERSION": "10.0.0", + "GITLAB_WORKHORSE_VERSION": "8.10.0" } } \ No newline at end of file diff --git a/pkgs/applications/version-management/gitlab/default.nix b/pkgs/applications/version-management/gitlab/default.nix index fb18fb7941e6..99b408bcef32 100644 --- a/pkgs/applications/version-management/gitlab/default.nix +++ b/pkgs/applications/version-management/gitlab/default.nix @@ -1,13 +1,24 @@ { stdenv, lib, fetchurl, fetchFromGitLab, bundlerEnv -, ruby, tzdata, git, nettools, nixosTests -, gitlabEnterprise ? false +, ruby, tzdata, git, nettools, nixosTests, nodejs +, gitlabEnterprise ? false, callPackage, yarn +, yarn2nix-moretea }: let + data = (builtins.fromJSON (builtins.readFile ./data.json)); + + version = data.version; + src = fetchFromGitLab { + owner = data.owner; + repo = data.repo; + rev = data.rev; + sha256 = data.repo_hash; + }; + rubyEnv = bundlerEnv rec { name = "gitlab-env-${version}"; inherit ruby; - gemdir = ./rubyEnv- + (if gitlabEnterprise then "ee" else "ce"); + gemdir = ./rubyEnv; gemset = let x = import (gemdir + "/gemset.nix"); in x // { @@ -19,35 +30,71 @@ let }; }; groups = [ - "default" "unicorn" "ed25519" "metrics" "development" "puma" "test" + "default" "unicorn" "ed25519" "metrics" "development" "puma" "test" "kerberos" ]; # N.B. omniauth_oauth2_generic and apollo_upload_server both provide a # `console` executable. ignoreCollisions = true; }; - flavour = if gitlabEnterprise then "ee" else "ce"; - data = (builtins.fromJSON (builtins.readFile ./data.json)).${flavour}; + yarnOfflineCache = (callPackage ./yarnPkgs.nix {}).offline_cache; - version = data.version; - sources = { - gitlab = fetchFromGitLab { - owner = data.owner; - repo = data.repo; - rev = data.rev; - sha256 = data.repo_hash; - }; - gitlabDeb = fetchurl { - url = data.deb_url; - sha256 = data.deb_hash; - }; + assets = stdenv.mkDerivation { + pname = "gitlab-assets"; + inherit version src; + + nativeBuildInputs = [ rubyEnv.wrappedRuby rubyEnv.bundler nodejs yarn ]; + + configurePhase = '' + runHook preConfigure + + # Some rake tasks try to run yarn automatically, which won't work + rm lib/tasks/yarn.rake + + # The rake tasks won't run without a basic configuration in place + mv config/database.yml.env config/database.yml + mv config/gitlab.yml.example config/gitlab.yml + + # Yarn and bundler wants a real home directory to write cache, config, etc to + export HOME=$NIX_BUILD_TOP/fake_home + + # Make yarn install packages from our offline cache, not the registry + yarn config --offline set yarn-offline-mirror ${yarnOfflineCache} + + # Fixup "resolved"-entries in yarn.lock to match our offline cache + ${yarn2nix-moretea.fixup_yarn_lock}/bin/fixup_yarn_lock yarn.lock + + yarn install --offline --frozen-lockfile --ignore-scripts --no-progress --non-interactive + + patchShebangs node_modules/ + + runHook postConfigure + ''; + + buildPhase = '' + runHook preBuild + + bundle exec rake gettext:po_to_json RAILS_ENV=production NODE_ENV=production + bundle exec rake rake:assets:precompile RAILS_ENV=production NODE_ENV=production + bundle exec rake webpack:compile RAILS_ENV=production NODE_ENV=production NODE_OPTIONS="--max_old_space_size=4096" + bundle exec rake gitlab:assets:fix_urls RAILS_ENV=production NODE_ENV=production + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + mv public/assets $out + + runHook postInstall + ''; }; in - stdenv.mkDerivation { - name = "gitlab${if gitlabEnterprise then "-ee" else ""}-${version}"; + name = "gitlab${lib.optionalString gitlabEnterprise "-ee"}-${version}"; - src = sources.gitlab; + inherit src; buildInputs = [ rubyEnv rubyEnv.wrappedRuby rubyEnv.bundler tzdata git nettools @@ -56,10 +103,15 @@ stdenv.mkDerivation { patches = [ ./remove-hardcoded-locations.patch ]; postPatch = '' + ${lib.optionalString (!gitlabEnterprise) '' + # Remove all proprietary components + rm -rf ee + ''} + # For reasons I don't understand "bundle exec" ignores the # RAILS_ENV causing tests to be executed that fail because we're # not installing development and test gems above. Deleting the - # tests works though.: + # tests works though. rm lib/tasks/test.rake rm config/initializers/gitlab_shell_secret_token.rb @@ -69,27 +121,15 @@ stdenv.mkDerivation { ''; buildPhase = '' - mv config/gitlab.yml.example config/gitlab.yml - - # Building this requires yarn, node &c, so we just get it from the deb - ar p ${sources.gitlabDeb} data.tar.gz | gunzip > gitlab-deb-data.tar - # Work around unpacking deb containing binary with suid bit - tar -f gitlab-deb-data.tar --delete ./opt/gitlab/embedded/bin/ksu - tar -xf gitlab-deb-data.tar - rm gitlab-deb-data.tar - - mv -v opt/gitlab/embedded/service/gitlab-rails/public/assets public - rm -rf opt # only directory in data.tar.gz - - mv config/gitlab.yml config/gitlab.yml.example rm -f config/secrets.yml mv config config.dist + rm -r tmp ''; installPhase = '' - rm -r tmp mkdir -p $out/share cp -r . $out/share/gitlab + ln -sf ${assets} $out/share/gitlab/public/assets rm -rf $out/share/gitlab/log ln -sf /run/gitlab/log $out/share/gitlab/log ln -sf /run/gitlab/uploads $out/share/gitlab/public/uploads @@ -102,7 +142,7 @@ stdenv.mkDerivation { ''; passthru = { - inherit rubyEnv; + inherit rubyEnv assets; ruby = rubyEnv.wrappedRuby; GITALY_SERVER_VERSION = data.passthru.GITALY_SERVER_VERSION; GITLAB_PAGES_VERSION = data.passthru.GITLAB_PAGES_VERSION; @@ -116,7 +156,7 @@ stdenv.mkDerivation { meta = with lib; { homepage = http://www.gitlab.com/; platforms = platforms.linux; - maintainers = with maintainers; [ fpletz globin krav ]; + maintainers = with maintainers; [ fpletz globin krav talyz ]; } // (if gitlabEnterprise then { license = licenses.unfreeRedistributable; # https://gitlab.com/gitlab-org/gitlab-ee/raw/master/LICENSE diff --git a/pkgs/applications/version-management/gitlab/gitaly/Gemfile b/pkgs/applications/version-management/gitlab/gitaly/Gemfile index 1a6eb99b678d..9478dc9a84b4 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/Gemfile +++ b/pkgs/applications/version-management/gitlab/gitaly/Gemfile @@ -6,8 +6,7 @@ gem 'bundler', '>= 1.17.3' gem 'rugged', '~> 0.28' gem 'github-linguist', '~> 6.1', require: 'linguist' gem 'gitlab-markup', '~> 1.7.0' -gem 'activesupport', '~> 5.1.7' -gem 'gitaly-proto', '~> 1.36.0' +gem 'activesupport', '~> 5.2.3' gem 'rdoc', '~> 4.2' gem 'gitlab-gollum-lib', '~> 4.2.7.7', require: false gem 'gitlab-gollum-rugged_adapter', '~> 0.4.4.2', require: false @@ -17,7 +16,7 @@ gem 'faraday', '~> 0.12' gem 'rbtrace', require: false # Labkit provides observability functionality -gem 'gitlab-labkit', '~> 0.3.0' +gem 'gitlab-labkit', '~> 0.5.0' # Detects the open source license the repository includes # This version needs to be in sync with GitLab CE/EE diff --git a/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock b/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock index 0a86273f7cb1..cb292af8cc3f 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock +++ b/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock @@ -2,20 +2,20 @@ GEM remote: https://rubygems.org/ specs: abstract_type (0.0.7) - actionpack (5.1.7) - actionview (= 5.1.7) - activesupport (= 5.1.7) + actionpack (5.2.3) + actionview (= 5.2.3) + activesupport (= 5.2.3) rack (~> 2.0) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.0.2) - actionview (5.1.7) - activesupport (= 5.1.7) + actionview (5.2.3) + activesupport (= 5.2.3) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.0.3) - activesupport (5.1.7) + activesupport (5.2.3) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 0.7, < 2) minitest (~> 5.1) @@ -46,11 +46,9 @@ GEM activesupport (>= 4.2.0) faraday (0.15.4) multipart-post (>= 1.2, < 3) - ffi (1.10.0) + ffi (1.11.1) gemojione (3.3.0) json - gitaly-proto (1.36.0) - grpc (~> 1.0) github-linguist (6.4.1) charlock_holmes (~> 0.7.6) escape_utils (~> 1.2.0) @@ -73,12 +71,13 @@ GEM diff-lcs (~> 1.1) mime-types (>= 1.16) posix-spawn (~> 0.3) - gitlab-labkit (0.3.0) + gitlab-labkit (0.5.2) actionpack (~> 5) activesupport (~> 5) - grpc (~> 1.19.0) + grpc (~> 1.19) jaeger-client (~> 0.10) opentracing (~> 0.4) + redis (> 3.0.0, < 5.0.0) gitlab-markup (1.7.0) gollum-grit_adapter (1.0.1) gitlab-grit (~> 2.7, >= 2.7.1) @@ -111,10 +110,10 @@ GEM mime-types-data (3.2019.0331) mini_portile2 (2.4.0) minitest (5.11.3) - msgpack (1.2.10) + msgpack (1.3.0) multi_json (1.13.1) multipart-post (2.0.0) - nokogiri (1.10.3) + nokogiri (1.10.4) mini_portile2 (~> 2.4.0) nokogumbo (1.5.0) nokogiri @@ -139,7 +138,7 @@ GEM rails-dom-testing (2.0.3) activesupport (>= 4.2.0) nokogiri (>= 1.6) - rails-html-sanitizer (1.0.4) + rails-html-sanitizer (1.2.0) loofah (~> 2.2, >= 2.2.2) rainbow (3.0.0) rbtrace (0.4.11) @@ -147,7 +146,8 @@ GEM msgpack (>= 0.4.3) optimist (>= 3.0.0) rdoc (4.3.0) - rouge (3.5.1) + redis (4.1.2) + rouge (3.11.0) rspec (3.8.0) rspec-core (~> 3.8.0) rspec-expectations (~> 3.8.0) @@ -175,7 +175,7 @@ GEM ruby-progressbar (~> 1.7) unicode-display_width (>= 1.4.0, < 1.7) ruby-progressbar (1.10.0) - rugged (0.28.1) + rugged (0.28.3.1) safe_yaml (1.0.5) sanitize (4.6.6) crass (~> 1.0.2) @@ -213,15 +213,14 @@ PLATFORMS ruby DEPENDENCIES - activesupport (~> 5.1.7) + activesupport (~> 5.2.3) bundler (>= 1.17.3) factory_bot faraday (~> 0.12) - gitaly-proto (~> 1.36.0) github-linguist (~> 6.1) gitlab-gollum-lib (~> 4.2.7.7) gitlab-gollum-rugged_adapter (~> 0.4.4.2) - gitlab-labkit (~> 0.3.0) + gitlab-labkit (~> 0.5.0) gitlab-markup (~> 1.7.0) google-protobuf (~> 3.7.1) grpc (~> 1.19.0) diff --git a/pkgs/applications/version-management/gitlab/gitaly/default.nix b/pkgs/applications/version-management/gitlab/gitaly/default.nix index 873d9f390905..500ae97faeef 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/default.nix +++ b/pkgs/applications/version-management/gitlab/gitaly/default.nix @@ -17,14 +17,14 @@ let }; }; in buildGoPackage rec { - version = "1.53.2"; + version = "1.65.1"; pname = "gitaly"; src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitaly"; rev = "v${version}"; - sha256 = "0x4dhqaxx6n5jlcvf69rglxiz11037ghgcnskks6qnlcbkd85j3d"; + sha256 = "1a39i723na2xk4363a7v48ba23vi04qpg0119dw09g13m0k5hjc3"; }; goPackagePath = "gitlab.com/gitlab-org/gitaly"; @@ -40,7 +40,7 @@ in buildGoPackage rec { postInstall = '' mkdir -p $ruby - cp -rv $src/ruby/{bin,lib,git-hooks,gitlab-shell} $ruby + cp -rv $src/ruby/{bin,lib,proto,git-hooks,gitlab-shell} $ruby # gitlab-shell will try to read its config relative to the source # code by default which doesn't work in nixos because it's a @@ -53,7 +53,8 @@ in buildGoPackage rec { outputs = [ "bin" "out" "ruby" ]; meta = with stdenv.lib; { - homepage = http://www.gitlab.com/; + homepage = https://gitlab.com/gitlab-org/gitaly; + description = "A Git RPC service for handling all the git calls made by GitLab"; platforms = platforms.unix; maintainers = with maintainers; [ roblabla globin fpletz ]; license = licenses.mit; diff --git a/pkgs/applications/version-management/gitlab/gitaly/deps.nix b/pkgs/applications/version-management/gitlab/gitaly/deps.nix index 5522185783d3..3bca67fe3123 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/deps.nix +++ b/pkgs/applications/version-management/gitlab/gitaly/deps.nix @@ -271,6 +271,33 @@ }; } { + goPackagePath = "github.com/kr/pretty"; + fetch = { + type = "git"; + url = "https://github.com/kr/pretty"; + rev = "v0.1.0"; + sha256 = "18m4pwg2abd0j9cn5v3k2ksk9ig4vlwxmlw9rrglanziv9l967qp"; + }; + } + { + goPackagePath = "github.com/kr/pty"; + fetch = { + type = "git"; + url = "https://github.com/kr/pty"; + rev = "v1.1.1"; + sha256 = "0383f0mb9kqjvncqrfpidsf8y6ns5zlrc91c6a74xpyxjwvzl2y6"; + }; + } + { + goPackagePath = "github.com/kr/text"; + fetch = { + type = "git"; + url = "https://github.com/kr/text"; + rev = "v0.1.0"; + sha256 = "1gm5bsl01apvc84bw06hasawyqm4q84vx1pm32wr9jnd7a8vjgj1"; + }; + } + { goPackagePath = "github.com/libgit2/git2go"; fetch = { type = "git"; @@ -478,15 +505,6 @@ }; } { - goPackagePath = "gitlab.com/gitlab-org/gitaly-proto"; - fetch = { - type = "git"; - url = "https://gitlab.com/gitlab-org/gitaly-proto.git"; - rev = "v1.36.0"; - sha256 = "0xma8ys3lf1bdhlkmcis31xs1h1dshcr5796wwfwnzijwk6422m3"; - }; - } - { goPackagePath = "gitlab.com/gitlab-org/labkit"; fetch = { type = "git"; @@ -509,8 +527,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/crypto"; - rev = "c2843e01d9a2"; - sha256 = "01xgxbj5r79nmisdvpq48zfy8pzaaj90bn6ngd4nf33j9ar1dp8r"; + rev = "20be4c3c3ed5"; + sha256 = "1ph7y8v30hc95h1dwr7vrhg1nzs47a261qin6zg8mhf12g5k2lxb"; }; } { @@ -554,8 +572,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/sys"; - rev = "d0b11bdaac8a"; - sha256 = "18yfsmw622l7gc5sqriv5qmck6903vvhivpzp8i3xfy3z33dybdl"; + rev = "953cdadca894"; + sha256 = "0gkha4whk8xkcv3isigbs250akag99isxnd3v9xmy0kl3g88hxy1"; }; } { @@ -626,8 +644,8 @@ fetch = { type = "git"; url = "https://gopkg.in/check.v1"; - rev = "20d25e280405"; - sha256 = "0k1m83ji9l1a7ng8a7v40psbymxasmssbrrhpdv2wl4rhs0nc3np"; + rev = "788fd7840127"; + sha256 = "0v3bim0j375z81zrpr5qv42knqs0y2qv2vkjiqi5axvb78slki1a"; }; } { diff --git a/pkgs/applications/version-management/gitlab/gitaly/gemset.nix b/pkgs/applications/version-management/gitlab/gitaly/gemset.nix index fd1af22dd78e..a5140972ef0f 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/gemset.nix +++ b/pkgs/applications/version-management/gitlab/gitaly/gemset.nix @@ -13,10 +13,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0zyi3dc50ii2msdkawaf11y4xw645ig57ha2jfnr8lpr8s1nlh52"; + sha256 = "1s2iay17i2k0xx36cmnpbrmr5w6x70jk7fq1d8w70xcdw5chm0w1"; type = "gem"; }; - version = "5.1.7"; + version = "5.2.3"; }; actionview = { dependencies = ["activesupport" "builder" "erubi" "rails-dom-testing" "rails-html-sanitizer"]; @@ -24,10 +24,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0i2j580njb767yhf0k5ih3qqg38ybiah80ai8dsr6kjjw35aj747"; + sha256 = "1v49rgf8305grqf6gq7qa47qhamr369igyy0giycz60x86afyr4h"; type = "gem"; }; - version = "5.1.7"; + version = "5.2.3"; }; activesupport = { dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo"]; @@ -35,10 +35,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0znhiy90hdlx66jqhaycin4qrphrymsw68c36a1an7g481zvfv91"; + sha256 = "110vp4frgkw3mpzlmshg2f2ig09cknls2w68ym1r1s39d01v0mi8"; type = "gem"; }; - version = "5.1.7"; + version = "5.2.3"; }; adamantium = { dependencies = ["ice_nine" "memoizable"]; @@ -205,12 +205,14 @@ version = "0.15.4"; }; ffi = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0j8pzj8raxbir5w5k6s7a042sb5k02pg0f8s4na1r5lan901j00p"; + sha256 = "06mvxpjply8qh4j3fj9wh08kdzwkbnvsiysh0vrhlk5cwxzjmblh"; type = "gem"; }; - version = "1.10.0"; + version = "1.11.1"; }; gemojione = { dependencies = ["json"]; @@ -221,17 +223,6 @@ }; version = "3.3.0"; }; - gitaly-proto = { - dependencies = ["grpc"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "11bkrf2z5ppp55cipawdpinrva42x12grp2gl1dp1jdb35crqick"; - type = "gem"; - }; - version = "1.36.0"; - }; github-linguist = { dependencies = ["charlock_holmes" "escape_utils" "mime-types" "rugged"]; groups = ["default"]; @@ -283,15 +274,15 @@ version = "2.8.2"; }; gitlab-labkit = { - dependencies = ["actionpack" "activesupport" "grpc" "jaeger-client" "opentracing"]; + dependencies = ["actionpack" "activesupport" "grpc" "jaeger-client" "opentracing" "redis"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0dvapmdc9axm9dq2gg89qrqb318rkrsabpyybrqvcx1ipbi5k3a1"; + sha256 = "1j06gl4ksd83rycg3fb46bb77iw74i1ivs5li6pyf5klrxjq8k3h"; type = "gem"; }; - version = "0.3.0"; + version = "0.5.2"; }; gitlab-markup = { groups = ["default"]; @@ -489,10 +480,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1w38hilm3dk42dwk8ygiq49bl4in7y80hfqr63hk54mj4gmzi6ch"; + sha256 = "1186lhwnxiw5ryv6dbxrsfy0fajfll2l95kf9pmca50iyiqi86zn"; type = "gem"; }; - version = "1.2.10"; + version = "1.3.0"; }; multi_json = { source = { @@ -516,10 +507,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "02bjydih0j515szfv9mls195cvpyidh6ixm7dwbl3s2sbaxxk5s4"; + sha256 = "0nmdrqqz1gs0fwkgzxjl4wr554gr8dc1fkrqjc2jpsvwgm41rygv"; type = "gem"; }; - version = "1.10.3"; + version = "1.10.4"; }; nokogumbo = { dependencies = ["nokogiri"]; @@ -649,10 +640,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1gv7vr5d9g2xmgpjfq4nxsqr70r9pr042r9ycqqnfvw5cz9c7jwr"; + sha256 = "0ilwxzm3a7bql5c9q2n9g9nb1hax7vd8d65a5yp3d967ld97nvrq"; type = "gem"; }; - version = "1.0.4"; + version = "1.2.0"; }; rainbow = { source = { @@ -679,15 +670,25 @@ }; version = "4.3.0"; }; + redis = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1mymdx7s5sr4mablklaipz679ckczsiigswm1g2v5mc93yj5amw3"; + type = "gem"; + }; + version = "4.1.2"; + }; rouge = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0yfhazlhjc4abgzhkgq8zqmdphvkh52211widkl4zhsbhqh8wg2q"; + sha256 = "1zsyv6abqrk7lpql5f1ja4m88bfy9qndi8xykpss6cpvjdmi3ydb"; type = "gem"; }; - version = "3.5.1"; + version = "3.11.0"; }; rspec = { dependencies = ["rspec-core" "rspec-expectations" "rspec-mocks"]; @@ -778,10 +779,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1yiszpz6y13vvgh3fss1l0ipp0zgsbbc8c28vynnpdyx1sy6krp6"; + sha256 = "03w3k7j27kgzpcc3halkd3w0b677sny2lfwm2lwn2n1ac20dzjc6"; type = "gem"; }; - version = "0.28.1"; + version = "0.28.3.1"; }; safe_yaml = { groups = ["default" "development" "test"]; diff --git a/pkgs/applications/version-management/gitlab/gitlab-shell/Gemfile b/pkgs/applications/version-management/gitlab/gitlab-shell/Gemfile new file mode 100644 index 000000000000..cabe4079df19 --- /dev/null +++ b/pkgs/applications/version-management/gitlab/gitlab-shell/Gemfile @@ -0,0 +1,12 @@ +source 'https://rubygems.org' + +group :development, :test do + gem 'listen', '~> 0.5.0' + gem 'pry', '~> 0.12.2' + gem 'rspec', '~> 3.8.0' + gem 'rspec-parameterized', '~> 0.4.0' + gem 'rubocop', '0.49.1', require: false + gem 'simplecov', '~> 0.9.0', require: false + gem 'vcr', '~> 4.0.0' + gem 'webmock', '~> 3.4.0' +end diff --git a/pkgs/applications/version-management/gitlab/gitlab-shell/Gemfile.lock b/pkgs/applications/version-management/gitlab/gitlab-shell/Gemfile.lock new file mode 100644 index 000000000000..b178b2c07ad9 --- /dev/null +++ b/pkgs/applications/version-management/gitlab/gitlab-shell/Gemfile.lock @@ -0,0 +1,109 @@ +GEM + remote: https://rubygems.org/ + specs: + abstract_type (0.0.7) + adamantium (0.2.0) + ice_nine (~> 0.11.0) + memoizable (~> 0.4.0) + addressable (2.5.2) + public_suffix (>= 2.0.2, < 4.0) + ast (2.4.0) + binding_of_caller (0.8.0) + debug_inspector (>= 0.0.1) + coderay (1.1.2) + concord (0.1.5) + adamantium (~> 0.2.0) + equalizer (~> 0.0.9) + crack (0.4.3) + safe_yaml (~> 1.0.0) + debug_inspector (0.0.3) + diff-lcs (1.3) + docile (1.1.5) + equalizer (0.0.11) + hashdiff (0.3.7) + ice_nine (0.11.2) + listen (0.5.3) + memoizable (0.4.2) + thread_safe (~> 0.3, >= 0.3.1) + method_source (0.9.2) + multi_json (1.13.1) + parallel (1.12.1) + parser (2.5.1.2) + ast (~> 2.4.0) + powerpack (0.1.2) + proc_to_ast (0.1.0) + coderay + parser + unparser + procto (0.0.3) + pry (0.12.2) + coderay (~> 1.1.0) + method_source (~> 0.9.0) + public_suffix (3.0.3) + rainbow (2.2.2) + rake + rake (12.3.3) + rspec (3.8.0) + rspec-core (~> 3.8.0) + rspec-expectations (~> 3.8.0) + rspec-mocks (~> 3.8.0) + rspec-core (3.8.0) + rspec-support (~> 3.8.0) + rspec-expectations (3.8.1) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.8.0) + rspec-mocks (3.8.0) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.8.0) + rspec-parameterized (0.4.0) + binding_of_caller + parser + proc_to_ast + rspec (>= 2.13, < 4) + unparser + rspec-support (3.8.0) + rubocop (0.49.1) + parallel (~> 1.10) + parser (>= 2.3.3.1, < 3.0) + powerpack (~> 0.1) + rainbow (>= 1.99.1, < 3.0) + ruby-progressbar (~> 1.7) + unicode-display_width (~> 1.0, >= 1.0.1) + ruby-progressbar (1.9.0) + safe_yaml (1.0.4) + simplecov (0.9.2) + docile (~> 1.1.0) + multi_json (~> 1.0) + simplecov-html (~> 0.9.0) + simplecov-html (0.9.0) + thread_safe (0.3.6) + unicode-display_width (1.4.0) + unparser (0.2.8) + abstract_type (~> 0.0.7) + adamantium (~> 0.2.0) + concord (~> 0.1.5) + diff-lcs (~> 1.3) + equalizer (~> 0.0.9) + parser (>= 2.3.1.2, < 2.6) + procto (~> 0.0.2) + vcr (4.0.0) + webmock (3.4.2) + addressable (>= 2.3.6) + crack (>= 0.3.2) + hashdiff + +PLATFORMS + ruby + +DEPENDENCIES + listen (~> 0.5.0) + pry (~> 0.12.2) + rspec (~> 3.8.0) + rspec-parameterized (~> 0.4.0) + rubocop (= 0.49.1) + simplecov (~> 0.9.0) + vcr (~> 4.0.0) + webmock (~> 3.4.0) + +BUNDLED WITH + 1.16.3 diff --git a/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix b/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix index cd4784b36c8e..cdc77024a60a 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix +++ b/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix @@ -1,47 +1,72 @@ -{ stdenv, ruby, bundler, fetchFromGitLab, go }: - -stdenv.mkDerivation rec { - version = "9.3.0"; - pname = "gitlab-shell"; +{ stdenv, ruby, bundler, fetchFromGitLab, buildGoPackage, bundlerEnv }: +let + version = "10.0.0"; src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-shell"; rev = "v${version}"; - sha256 = "1r000h4sgplx7giqvqs5iy0zh3drf6qa1iiq0mxlk3h9fshs1348"; + sha256 = "0n1llkb0jrqxm10l9wqmqxjycydqphgz0chbbf395d8pywyz826x"; }; + rubyEnv = bundlerEnv { + name = "gitlab-shell-env"; + inherit ruby; + gemdir = ./.; + }; + goPackage = buildGoPackage { + pname = "gitlab-shell-go"; + inherit src version; - buildInputs = [ ruby bundler go ]; - - patches = [ ./remove-hardcoded-locations.patch ]; + patches = [ ./remove-hardcoded-locations-go.patch ]; - installPhase = '' - export GOCACHE="$TMPDIR/go-cache" + goPackagePath = "gitlab.com/gitlab-org/gitlab-shell"; + goDeps = ./deps.nix; - ruby bin/compile - mkdir -p $out/ - cp -R . $out/ + # gitlab-shell depends on an older version of gitaly which + # contains old, vendored versions of some packages; gitlab-shell + # also explicitly depends on newer versions of these libraries, + # but buildGoPackage exposes the vendored versions instead, + # leading to compilation errors. Since the vendored libraries + # aren't used here anyway, we'll just remove them. + postConfigure = '' + rm -r "$NIX_BUILD_TOP/go/src/gitlab.com/gitlab-org/gitaly/vendor/" + ''; + }; +in +stdenv.mkDerivation { + pname = "gitlab-shell"; + inherit src version; - # Nothing to install ATM for non-development but keeping the - # install command anyway in case that changes in the future: - export HOME=$(pwd) - bundle install -j4 --verbose --local --deployment --without development test - ''; + patches = [ ./remove-hardcoded-locations-ruby.patch ]; # gitlab-shell will try to read its config relative to the source # code by default which doesn't work in nixos because it's a # read-only filesystem postPatch = '' substituteInPlace lib/gitlab_config.rb --replace \ - "File.join(ROOT_PATH, 'config.yml')" \ - "'/run/gitlab/shell-config.yml'" + "File.join(ROOT_PATH, 'config.yml')" \ + "'/run/gitlab/shell-config.yml'" + ''; + + buildInputs = [ rubyEnv.wrappedRuby ]; + + dontBuild = true; + + installPhase = '' + runHook preInstall + + mkdir -p $out/ + cp -R . $out/ + cp ${goPackage.bin}/bin/* $out/bin/ + + runHook postInstall ''; meta = with stdenv.lib; { description = "SSH access and repository management app for GitLab"; homepage = http://www.gitlab.com/; platforms = platforms.unix; - maintainers = with maintainers; [ fpletz globin ]; + maintainers = with maintainers; [ fpletz globin talyz ]; license = licenses.mit; }; } diff --git a/pkgs/applications/version-management/gitlab/gitlab-shell/deps.nix b/pkgs/applications/version-management/gitlab/gitlab-shell/deps.nix new file mode 100644 index 000000000000..55faacc41cd3 --- /dev/null +++ b/pkgs/applications/version-management/gitlab/gitlab-shell/deps.nix @@ -0,0 +1,507 @@ +# file generated from go.mod using vgo2nix (https://github.com/adisbladis/vgo2nix) +[ + { + goPackagePath = "bou.ke/monkey"; + fetch = { + type = "git"; + url = "https://github.com/bouk/monkey"; + rev = "v1.0.1"; + sha256 = "050y07pwx5zk7fchp0lhf35w417sml7lxkkzly8f932fy25rydz5"; + }; + } + { + goPackagePath = "cloud.google.com/go"; + fetch = { + type = "git"; + url = "https://code.googlesource.com/gocloud"; + rev = "v0.26.0"; + sha256 = "149v3ci17g6wd2pm18mzcncq5qpl9hwdjnz3rlbn5rfidyn46la1"; + }; + } + { + goPackagePath = "github.com/certifi/gocertifi"; + fetch = { + type = "git"; + url = "https://github.com/certifi/gocertifi"; + rev = "ee1a9a0726d2"; + sha256 = "08l6lqaw83pva6fa0aafmhmy1mhb145av21772zfh3ij809a37i4"; + }; + } + { + goPackagePath = "github.com/client9/misspell"; + fetch = { + type = "git"; + url = "https://github.com/client9/misspell"; + rev = "v0.3.4"; + sha256 = "1vwf33wsc4la25zk9nylpbp9px3svlmldkm0bha4hp56jws4q9cs"; + }; + } + { + goPackagePath = "github.com/codahale/hdrhistogram"; + fetch = { + type = "git"; + url = "https://github.com/codahale/hdrhistogram"; + rev = "3a0bb77429bd"; + sha256 = "1zampgfjbxy192cbwdi7g86l1idxaam96d834wncnpfdwgh5kl57"; + }; + } + { + 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/fsnotify/fsnotify"; + fetch = { + type = "git"; + url = "https://github.com/fsnotify/fsnotify"; + rev = "v1.4.7"; + sha256 = "07va9crci0ijlivbb7q57d2rz9h27zgn2fsm60spjsqpdbvyrx4g"; + }; + } + { + goPackagePath = "github.com/getsentry/raven-go"; + fetch = { + type = "git"; + url = "https://github.com/getsentry/raven-go"; + rev = "v0.1.0"; + sha256 = "1dl80kar4lzdcfl3w6jssi1ld6bv0rmx6sp6bz6rzysfr9ilm02z"; + }; + } + { + goPackagePath = "github.com/gogo/protobuf"; + fetch = { + type = "git"; + url = "https://github.com/gogo/protobuf"; + rev = "v1.1.1"; + sha256 = "1525pq7r6h3s8dncvq8gxi893p2nq8dxpzvq0nfl5b4p6mq0v1c2"; + }; + } + { + goPackagePath = "github.com/golang/glog"; + fetch = { + type = "git"; + url = "https://github.com/golang/glog"; + rev = "23def4e6c14b"; + sha256 = "0jb2834rw5sykfr937fxi8hxi2zy80sj2bdn9b3jb4b26ksqng30"; + }; + } + { + goPackagePath = "github.com/golang/lint"; + fetch = { + type = "git"; + url = "https://github.com/golang/lint"; + rev = "06c8688daad7"; + sha256 = "0xi94dwvz50a66bq1hp9fyqkym5mcpdxdb1hrfvicldgjf37lc47"; + }; + } + { + goPackagePath = "github.com/golang/mock"; + fetch = { + type = "git"; + url = "https://github.com/golang/mock"; + rev = "v1.1.1"; + sha256 = "0ap8wb6pdl6ccmdb43advjll2ly4sz26wsc3axw0hbrjrybybzgy"; + }; + } + { + goPackagePath = "github.com/golang/protobuf"; + fetch = { + type = "git"; + url = "https://github.com/golang/protobuf"; + rev = "v1.2.0"; + sha256 = "0kf4b59rcbb1cchfny2dm9jyznp8ri2hsb14n8iak1q8986xa0ab"; + }; + } + { + goPackagePath = "github.com/grpc-ecosystem/go-grpc-middleware"; + fetch = { + type = "git"; + url = "https://github.com/grpc-ecosystem/go-grpc-middleware"; + rev = "v1.0.0"; + sha256 = "0lwgxih021xfhfb1xb9la5f98bpgpaiz63sbllx77qwwl2rmhrsp"; + }; + } + { + goPackagePath = "github.com/hpcloud/tail"; + fetch = { + type = "git"; + url = "https://github.com/hpcloud/tail"; + rev = "v1.0.0"; + sha256 = "1njpzc0pi1acg5zx9y6vj9xi6ksbsc5d387rd6904hy6rh2m6kn0"; + }; + } + { + goPackagePath = "github.com/kisielk/gotool"; + fetch = { + type = "git"; + url = "https://github.com/kisielk/gotool"; + rev = "v1.0.0"; + sha256 = "14af2pa0ssyp8bp2mvdw184s5wcysk6akil3wzxmr05wwy951iwn"; + }; + } + { + goPackagePath = "github.com/lightstep/lightstep-tracer-go"; + fetch = { + type = "git"; + url = "https://github.com/lightstep/lightstep-tracer-go"; + rev = "v0.15.6"; + sha256 = "10n5r66g44s6rnz5kf86s4a3p1g55kc1kxqhnk7bx7mlayndgpmb"; + }; + } + { + goPackagePath = "github.com/mattn/go-shellwords"; + fetch = { + type = "git"; + url = "https://github.com/mattn/go-shellwords"; + rev = "2444a32a19f4"; + sha256 = "08zcgr1az1n8zaxzwdd205j86hczgyc52nxfnw5avpw7rrkf7v0d"; + }; + } + { + goPackagePath = "github.com/onsi/ginkgo"; + fetch = { + type = "git"; + url = "https://github.com/onsi/ginkgo"; + rev = "v1.7.0"; + sha256 = "14wgpdrvpc35rdz3859bz53sc1g4vpr1fysy15wy3ff9gmqs14yg"; + }; + } + { + goPackagePath = "github.com/onsi/gomega"; + fetch = { + type = "git"; + url = "https://github.com/onsi/gomega"; + rev = "v1.4.3"; + sha256 = "1c8rqg5i2hz3snmq7s41yar1zjnzilb0fyiyhkg83v97afcfx79v"; + }; + } + { + goPackagePath = "github.com/opentracing/opentracing-go"; + fetch = { + type = "git"; + url = "https://github.com/opentracing/opentracing-go"; + rev = "v1.0.2"; + sha256 = "0i0ghg94dg8lk05mw5n23983wq04yjvkjmdkc9z5y1f3508938h9"; + }; + } + { + goPackagePath = "github.com/otiai10/copy"; + fetch = { + type = "git"; + url = "https://github.com/otiai10/copy"; + rev = "v1.0.1"; + sha256 = "0xmy0kfcx48q10s040579pcjswfaxlwhv7a2z07z9r92fdrgw03k"; + }; + } + { + goPackagePath = "github.com/otiai10/curr"; + fetch = { + type = "git"; + url = "https://github.com/otiai10/curr"; + rev = "f5a3d24e5776"; + sha256 = "01k33ifs9n0pnhwhbfb9ws3q5sa37fi7dhir5vjakpfzdin07y4w"; + }; + } + { + goPackagePath = "github.com/otiai10/mint"; + fetch = { + type = "git"; + url = "https://github.com/otiai10/mint"; + rev = "v1.2.4"; + sha256 = "1mf7b8h3akxbpj1rf3nk0ccqk5idd6z2gh9gm31phr7ll4gykn2m"; + }; + } + { + goPackagePath = "github.com/philhofer/fwd"; + fetch = { + type = "git"; + url = "https://github.com/philhofer/fwd"; + rev = "v1.0.0"; + sha256 = "1pg84khadh79v42y8sjsdgfb54vw2kzv7hpapxkifgj0yvcp30g2"; + }; + } + { + goPackagePath = "github.com/pkg/errors"; + fetch = { + type = "git"; + url = "https://github.com/pkg/errors"; + rev = "v0.8.0"; + sha256 = "001i6n71ghp2l6kdl3qq1v2vmghcz3kicv9a5wgcihrzigm75pp5"; + }; + } + { + 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/sirupsen/logrus"; + fetch = { + type = "git"; + url = "https://github.com/sirupsen/logrus"; + rev = "v1.0.5"; + sha256 = "0g5z7al7kky11ai2dhac6gkp3b5pxsvx72yj3xg4wg3265gbn7yz"; + }; + } + { + goPackagePath = "github.com/stretchr/testify"; + fetch = { + type = "git"; + url = "https://github.com/stretchr/testify"; + rev = "v1.2.2"; + sha256 = "0dlszlshlxbmmfxj5hlwgv3r22x0y1af45gn1vd198nvvs3pnvfs"; + }; + } + { + goPackagePath = "github.com/tinylib/msgp"; + fetch = { + type = "git"; + url = "https://github.com/tinylib/msgp"; + rev = "v1.0.2"; + sha256 = "0pypfknghg1hcjjrqz3f1riaylk6hcxn9h0qyzynb74rp0qmlxjc"; + }; + } + { + goPackagePath = "github.com/uber-go/atomic"; + fetch = { + type = "git"; + url = "https://github.com/uber-go/atomic"; + rev = "v1.3.2"; + sha256 = "11pzvjys5ddjjgrv94pgk9pnip9yyb54z7idf33zk7p7xylpnsv6"; + }; + } + { + goPackagePath = "github.com/uber/jaeger-client-go"; + fetch = { + type = "git"; + url = "https://github.com/uber/jaeger-client-go"; + rev = "v2.15.0"; + sha256 = "0ki23m9zrf3vxp839fnp9ckr4m28y6mpad8g5s5lr5k8jkl0sfwj"; + }; + } + { + goPackagePath = "github.com/uber/jaeger-lib"; + fetch = { + type = "git"; + url = "https://github.com/uber/jaeger-lib"; + rev = "v1.5.0"; + sha256 = "113fwpn80ylx970w8h7nfqnhh18dpx1jadbk7rbr8k68q4di4y0q"; + }; + } + { + goPackagePath = "gitlab.com/gitlab-org/gitaly"; + fetch = { + type = "git"; + url = "https://gitlab.com/gitlab-org/gitaly.git"; + rev = "v1.7.0"; + sha256 = "1hhiyw1ag22mgn6chp8lf29y2fgj90xyb7wjd6s30hayqja7knh1"; + }; + } + { + goPackagePath = "gitlab.com/gitlab-org/gitaly-proto"; + fetch = { + type = "git"; + url = "https://gitlab.com/gitlab-org/gitaly-proto.git"; + rev = "v1.12.0"; + sha256 = "02aqw1q8n84v4f3rc0x7hsg0gkmbqkznp9cl6vrhjvsisv38v695"; + }; + } + { + goPackagePath = "gitlab.com/gitlab-org/labkit"; + fetch = { + type = "git"; + url = "https://gitlab.com/gitlab-org/labkit.git"; + rev = "0c3fc7cdd57c"; + sha256 = "0fpn37v7dhhdgd63v4mq9cna9wdzrsfams13qmjmps3xpdw2wr9i"; + }; + } + { + goPackagePath = "go.uber.org/atomic"; + fetch = { + type = "git"; + url = "https://github.com/uber-go/atomic"; + rev = "v1.3.2"; + sha256 = "11pzvjys5ddjjgrv94pgk9pnip9yyb54z7idf33zk7p7xylpnsv6"; + }; + } + { + goPackagePath = "golang.org/x/crypto"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/crypto"; + rev = "182114d58262"; + sha256 = "0dhagsjpk3wn2f7w148v0h9i651jpk4c0mlsy5sihcnmqz8s764l"; + }; + } + { + goPackagePath = "golang.org/x/lint"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/lint"; + rev = "06c8688daad7"; + sha256 = "0xi94dwvz50a66bq1hp9fyqkym5mcpdxdb1hrfvicldgjf37lc47"; + }; + } + { + goPackagePath = "golang.org/x/net"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/net"; + rev = "10aee1819953"; + sha256 = "1rd6y0fr2gqhx3bsy0ahnacqzbxijkx8wyfmamrb3wbzc01091rl"; + }; + } + { + goPackagePath = "golang.org/x/oauth2"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/oauth2"; + rev = "d2e6202438be"; + sha256 = "0wbn75fd10485nb93bm4kqldqifdim5xqy4v7r5sdvimvf3fyhn7"; + }; + } + { + 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 = "70b957f3b65e"; + sha256 = "146jwkr39asigqbsnsigxpkpb4vydld4k9q34xvvw0bp10qzjxxw"; + }; + } + { + goPackagePath = "golang.org/x/text"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/text"; + rev = "v0.3.0"; + sha256 = "0r6x6zjzhr8ksqlpiwm5gdd7s209kwk5p4lw54xjvz10cs3qlq19"; + }; + } + { + goPackagePath = "golang.org/x/tools"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/tools"; + rev = "6cd1fcedba52"; + sha256 = "00hl0vkmy8impsnmc2dmm55sdhia95k0kqcrjbdpynryn1lamn5d"; + }; + } + { + goPackagePath = "google.golang.org/appengine"; + fetch = { + type = "git"; + url = "https://github.com/golang/appengine"; + rev = "v1.1.0"; + sha256 = "1pz202zszg8f35dk5pfhwgcdi3r6dx1l4yk6x6ly7nb4j45zi96x"; + }; + } + { + goPackagePath = "google.golang.org/genproto"; + fetch = { + type = "git"; + url = "https://github.com/google/go-genproto"; + rev = "bd91e49a0898"; + sha256 = "1f5q04h03q6fksbfkhz13ai5849rkkb8xrmmi7cxs4lzsi6ixkg8"; + }; + } + { + goPackagePath = "google.golang.org/grpc"; + fetch = { + type = "git"; + url = "https://github.com/grpc/grpc-go"; + rev = "v1.16.0"; + sha256 = "0a9xl6c5j7lvsb4q6ry5p892rjm86p47d4f8xrf0r8lxblf79qbg"; + }; + } + { + goPackagePath = "gopkg.in/DataDog/dd-trace-go.v1"; + fetch = { + type = "git"; + url = "https://gopkg.in/DataDog/dd-trace-go.v1"; + rev = "v1.9.0"; + sha256 = "1zfbsmm8fbcwhd6j28q3ijyswn1d3dyhydx3ckqpkkp6qiam3c2j"; + }; + } + { + goPackagePath = "gopkg.in/airbrake/gobrake.v2"; + fetch = { + type = "git"; + url = "https://gopkg.in/airbrake/gobrake.v2"; + rev = "v2.0.9"; + sha256 = "1x06f7n7qlyzqgyz0sdfcidf3w4ldn6zs6qx2mhibggk2z4whcjw"; + }; + } + { + goPackagePath = "gopkg.in/check.v1"; + fetch = { + type = "git"; + url = "https://gopkg.in/check.v1"; + rev = "20d25e280405"; + sha256 = "0k1m83ji9l1a7ng8a7v40psbymxasmssbrrhpdv2wl4rhs0nc3np"; + }; + } + { + goPackagePath = "gopkg.in/fsnotify.v1"; + fetch = { + type = "git"; + url = "https://gopkg.in/fsnotify.v1"; + rev = "v1.4.7"; + sha256 = "07va9crci0ijlivbb7q57d2rz9h27zgn2fsm60spjsqpdbvyrx4g"; + }; + } + { + goPackagePath = "gopkg.in/gemnasium/logrus-airbrake-hook.v2"; + fetch = { + type = "git"; + url = "https://gopkg.in/gemnasium/logrus-airbrake-hook.v2"; + rev = "v2.1.2"; + sha256 = "0sbg0dn6cysmf8f2bi209jwl4jnpiwp4rdghnxlzirw3c32ms5y5"; + }; + } + { + goPackagePath = "gopkg.in/tomb.v1"; + fetch = { + type = "git"; + url = "https://gopkg.in/tomb.v1"; + rev = "dd632973f1e7"; + sha256 = "1lqmq1ag7s4b3gc3ddvr792c5xb5k6sfn0cchr3i2s7f1c231zjv"; + }; + } + { + goPackagePath = "gopkg.in/yaml.v2"; + fetch = { + type = "git"; + url = "https://gopkg.in/yaml.v2"; + rev = "v2.2.1"; + sha256 = "0dwjrs2lp2gdlscs7bsrmyc5yf6mm4fvgw71bzr9mv2qrd2q73s1"; + }; + } + { + goPackagePath = "honnef.co/go/tools"; + fetch = { + type = "git"; + url = "https://github.com/dominikh/go-tools"; + rev = "88497007e858"; + sha256 = "0rinkyx3r2bq45mgcasnn5jb07cwbv3p3s2wwcrzxsarsj6wa5lc"; + }; + } +] diff --git a/pkgs/applications/version-management/gitlab/gitlab-shell/gemset.nix b/pkgs/applications/version-management/gitlab/gitlab-shell/gemset.nix new file mode 100644 index 000000000000..665c21feb1bd --- /dev/null +++ b/pkgs/applications/version-management/gitlab/gitlab-shell/gemset.nix @@ -0,0 +1,451 @@ +{ + abstract_type = { + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "09330cmhrc2wmfhdj9zzg82sv6cdhm3qgdkva5ni5xfjril2pf14"; + type = "gem"; + }; + version = "0.0.7"; + }; + adamantium = { + dependencies = ["ice_nine" "memoizable"]; + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0165r2ikgfwv2rm8dzyijkp74fvg0ni72hpdx8ay2v7cj08dqyak"; + type = "gem"; + }; + version = "0.2.0"; + }; + addressable = { + dependencies = ["public_suffix"]; + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0viqszpkggqi8hq87pqp0xykhvz60g99nwmkwsb0v45kc2liwxvk"; + type = "gem"; + }; + version = "2.5.2"; + }; + ast = { + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "184ssy3w93nkajlz2c70ifm79jp3j737294kbc5fjw69v1w0n9x7"; + type = "gem"; + }; + version = "2.4.0"; + }; + binding_of_caller = { + dependencies = ["debug_inspector"]; + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "05syqlks7463zsy1jdfbbdravdhj9hpj5pv2m74blqpv8bq4vv5g"; + type = "gem"; + }; + version = "0.8.0"; + }; + coderay = { + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "15vav4bhcc2x3jmi3izb11l4d9f3xv8hp2fszb7iqmpsccv1pz4y"; + type = "gem"; + }; + version = "1.1.2"; + }; + concord = { + dependencies = ["adamantium" "equalizer"]; + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1b6cdn0fg4n9gzbdr7zyf4jq40y6h0c0g9cra7wk9hhmsylk91bg"; + type = "gem"; + }; + version = "0.1.5"; + }; + crack = { + dependencies = ["safe_yaml"]; + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0abb0fvgw00akyik1zxnq7yv391va148151qxdghnzngv66bl62k"; + type = "gem"; + }; + version = "0.4.3"; + }; + debug_inspector = { + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0vxr0xa1mfbkfcrn71n7c4f2dj7la5hvphn904vh20j3x4j5lrx0"; + type = "gem"; + }; + version = "0.0.3"; + }; + diff-lcs = { + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "18w22bjz424gzafv6nzv98h0aqkwz3d9xhm7cbr1wfbyas8zayza"; + type = "gem"; + }; + version = "1.3"; + }; + docile = { + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0m8j31whq7bm5ljgmsrlfkiqvacrw6iz9wq10r3gwrv5785y8gjx"; + type = "gem"; + }; + version = "1.1.5"; + }; + equalizer = { + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1kjmx3fygx8njxfrwcmn7clfhjhb6bvv3scy2lyyi0wqyi3brra4"; + type = "gem"; + }; + version = "0.0.11"; + }; + hashdiff = { + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0yj5l2rw8i8jc725hbcpc4wks0qlaaimr3dpaqamfjkjkxl0hjp9"; + type = "gem"; + }; + version = "0.3.7"; + }; + ice_nine = { + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1nv35qg1rps9fsis28hz2cq2fx1i96795f91q4nmkm934xynll2x"; + type = "gem"; + }; + version = "0.11.2"; + }; + listen = { + groups = ["development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0inlw7vix61170vjr87h9izhjm5dbby8rbfrf1iryiv7b3kyvkxl"; + type = "gem"; + }; + version = "0.5.3"; + }; + memoizable = { + dependencies = ["thread_safe"]; + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0v42bvghsvfpzybfazl14qhkrjvx0xlmxz0wwqc960ga1wld5x5c"; + type = "gem"; + }; + version = "0.4.2"; + }; + method_source = { + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1pviwzvdqd90gn6y7illcdd9adapw8fczml933p5vl739dkvl3lq"; + type = "gem"; + }; + version = "0.9.2"; + }; + multi_json = { + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1rl0qy4inf1mp8mybfk56dfga0mvx97zwpmq5xmiwl5r770171nv"; + type = "gem"; + }; + version = "1.13.1"; + }; + parallel = { + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "01hj8v1qnyl5ndrs33g8ld8ibk0rbcqdpkpznr04gkbxd11pqn67"; + type = "gem"; + }; + version = "1.12.1"; + }; + parser = { + dependencies = ["ast"]; + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1zp89zg7iypncszxsjp8kiccrpbdf728jl449g6cnfkz990fyb5k"; + type = "gem"; + }; + version = "2.5.1.2"; + }; + powerpack = { + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1r51d67wd467rpdfl6x43y84vwm8f5ql9l9m85ak1s2sp3nc5hyv"; + type = "gem"; + }; + version = "0.1.2"; + }; + proc_to_ast = { + dependencies = ["coderay" "parser" "unparser"]; + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "14c65w48bbzp5lh1cngqd1y25kqvfnq1iy49hlzshl12dsk3z9wj"; + type = "gem"; + }; + version = "0.1.0"; + }; + procto = { + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "13imvg1x50rz3r0yyfbhxwv72lbf7q28qx9l9nfbb91h2n9ch58c"; + type = "gem"; + }; + version = "0.0.3"; + }; + pry = { + dependencies = ["coderay" "method_source"]; + groups = ["development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "00rm71x0r1jdycwbs83lf9l6p494m99asakbvqxh8rz7zwnlzg69"; + type = "gem"; + }; + version = "0.12.2"; + }; + public_suffix = { + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "08q64b5br692dd3v0a9wq9q5dvycc6kmiqmjbdxkxbfizggsvx6l"; + type = "gem"; + }; + version = "3.0.3"; + }; + rainbow = { + dependencies = ["rake"]; + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "08w2ghc5nv0kcq5b257h7dwjzjz1pqcavajfdx2xjyxqsvh2y34w"; + type = "gem"; + }; + version = "2.2.2"; + }; + rake = { + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1cvaqarr1m84mhc006g3l1vw7sa5qpkcw0138lsxlf769zdllsgp"; + type = "gem"; + }; + version = "12.3.3"; + }; + rspec = { + dependencies = ["rspec-core" "rspec-expectations" "rspec-mocks"]; + groups = ["development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "15ppasvb9qrscwlyjz67ppw1lnxiqnkzx5vkx1bd8x5n3dhikxc3"; + type = "gem"; + }; + version = "3.8.0"; + }; + rspec-core = { + dependencies = ["rspec-support"]; + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1p1s5bnbqp3sxk67y0fh0x884jjym527r0vgmhbm81w7aq6b7l4p"; + type = "gem"; + }; + version = "3.8.0"; + }; + rspec-expectations = { + dependencies = ["diff-lcs" "rspec-support"]; + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0vfqqcjmhdq25jrc8rd7nx4n8xid7s1ynv65ph06bk2xafn3rgll"; + type = "gem"; + }; + version = "3.8.1"; + }; + rspec-mocks = { + dependencies = ["diff-lcs" "rspec-support"]; + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "06y508cjqycb4yfhxmb3nxn0v9xqf17qbd46l1dh4xhncinr4fyp"; + type = "gem"; + }; + version = "3.8.0"; + }; + rspec-parameterized = { + dependencies = ["binding_of_caller" "parser" "proc_to_ast" "rspec" "unparser"]; + groups = ["development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0arynbr6cfjhccwc8gy2xf87nybdnncsnmfwknnh8s7d4mj730p0"; + type = "gem"; + }; + version = "0.4.0"; + }; + rspec-support = { + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0p3m7drixrlhvj2zpc38b11x145bvm311x6f33jjcxmvcm0wq609"; + type = "gem"; + }; + version = "3.8.0"; + }; + rubocop = { + dependencies = ["parallel" "parser" "powerpack" "rainbow" "ruby-progressbar" "unicode-display_width"]; + groups = ["development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1mqyylfzch0967w7nfnqza84sqhljijd9y4bnq8hcmrscch75cxw"; + type = "gem"; + }; + version = "0.49.1"; + }; + ruby-progressbar = { + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1igh1xivf5h5g3y5m9b4i4j2mhz2r43kngh4ww3q1r80ch21nbfk"; + type = "gem"; + }; + version = "1.9.0"; + }; + safe_yaml = { + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1hly915584hyi9q9vgd968x2nsi5yag9jyf5kq60lwzi5scr7094"; + type = "gem"; + }; + version = "1.0.4"; + }; + simplecov = { + dependencies = ["docile" "multi_json" "simplecov-html"]; + groups = ["development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1a3wy9zlmfwl3f47cibnxyxrgfz16y6fmy0dj1vyidzyys4mvy12"; + type = "gem"; + }; + version = "0.9.2"; + }; + simplecov-html = { + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0jv9pmpaxihrcsgcf6mgl3qg7rhf9scl5l2k67d768w9cz63xgvc"; + type = "gem"; + }; + version = "0.9.0"; + }; + thread_safe = { + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0nmhcgq6cgz44srylra07bmaw99f5271l0dpsvl5f75m44l0gmwy"; + type = "gem"; + }; + version = "0.3.6"; + }; + unicode-display_width = { + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0040bsdpcmvp8w31lqi2s9s4p4h031zv52401qidmh25cgyh4a57"; + type = "gem"; + }; + version = "1.4.0"; + }; + unparser = { + dependencies = ["abstract_type" "adamantium" "concord" "diff-lcs" "equalizer" "parser" "procto"]; + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0rh1649846ac17av30x0b0v9l45v0x1j2y1i8m1a7xdd0v4sld0z"; + type = "gem"; + }; + version = "0.2.8"; + }; + vcr = { + groups = ["development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0qh7lkj9b0shph84dw1wsrlaprl0jn1i4339fpsfy99402290zrr"; + type = "gem"; + }; + version = "4.0.0"; + }; + webmock = { + dependencies = ["addressable" "crack" "hashdiff"]; + groups = ["development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "03994dxs4xayvkxqp01dd1ivhg4xxx7z35f7cxw7y2mwj3xn24ib"; + type = "gem"; + }; + version = "3.4.2"; + }; +} \ No newline at end of file diff --git a/pkgs/applications/version-management/gitlab/gitlab-shell/remove-hardcoded-locations-go.patch b/pkgs/applications/version-management/gitlab/gitlab-shell/remove-hardcoded-locations-go.patch new file mode 100644 index 000000000000..a4a1a979b248 --- /dev/null +++ b/pkgs/applications/version-management/gitlab/gitlab-shell/remove-hardcoded-locations-go.patch @@ -0,0 +1,42 @@ +diff --git a/go/internal/config/config.go b/go/internal/config/config.go +index f951fe6..b422fe3 100644 +--- a/go/internal/config/config.go ++++ b/go/internal/config/config.go +@@ -3,7 +3,6 @@ package config + import ( + "io/ioutil" + "net/url" +- "os" + "path" + "strings" + +@@ -44,16 +43,13 @@ type Config struct { + } + + func New() (*Config, error) { +- dir, err := os.Getwd() +- if err != nil { +- return nil, err +- } ++ dir := "/run/gitlab" + + return NewFromDir(dir) + } + + func NewFromDir(dir string) (*Config, error) { +- return newFromFile(path.Join(dir, configFile)) ++ return newFromFile("/run/gitlab/shell-config.yml") + } + + func (c *Config) FeatureEnabled(featureName string) bool { +diff --git a/go/internal/command/fallback/fallback.go b/go/internal/command/fallback/fallback.go +index 2cb76a8..f59ad5e 100644 +--- a/go/internal/command/fallback/fallback.go ++++ b/go/internal/command/fallback/fallback.go +@@ -53,5 +53,5 @@ + func (c *Command) fallbackProgram() string { + fileName := fmt.Sprintf("%s-ruby", c.Executable.Name) + +- return filepath.Join(c.RootDir, "bin", fileName) ++ return filepath.Join("/run/current-system/sw/bin", fileName) + } diff --git a/pkgs/applications/version-management/gitlab/gitlab-shell/remove-hardcoded-locations-ruby.patch b/pkgs/applications/version-management/gitlab/gitlab-shell/remove-hardcoded-locations-ruby.patch new file mode 100644 index 000000000000..64623ae310c0 --- /dev/null +++ b/pkgs/applications/version-management/gitlab/gitlab-shell/remove-hardcoded-locations-ruby.patch @@ -0,0 +1,27 @@ +diff --git a/lib/gitlab_keys.rb b/lib/gitlab_keys.rb +index 0600a18..c46f2d7 100644 +--- a/lib/gitlab_keys.rb ++++ b/lib/gitlab_keys.rb +@@ -2,7 +2,7 @@ class GitlabKeys # rubocop:disable Metrics/ClassLength + attr_accessor :auth_file, :key + + def self.command(whatever) +- "#{ROOT_PATH}/bin/gitlab-shell #{whatever}" ++ "/run/current-system/sw/bin/gitlab-shell #{whatever}" + end + + def self.command_key(key_id) +diff --git a/lib/gitlab_shell.rb b/lib/gitlab_shell.rb +index 2cb76a8..f59ad5e 100644 +--- a/lib/gitlab_shell.rb ++++ b/lib/gitlab_shell.rb +@@ -195,7 +195,8 @@ class GitlabShell # rubocop:disable Metrics/ClassLength + + args = [executable, gitaly_address, json_args] + # We use 'chdir: ROOT_PATH' to let the next executable know where config.yml is. +- Kernel.exec(env, *args, unsetenv_others: true, chdir: ROOT_PATH) ++ # Except we don't, because we're already in the right directory on nixos! ++ Kernel.exec(env, *args, unsetenv_others: true) + end + + def api diff --git a/pkgs/applications/version-management/gitlab/gitlab-shell/remove-hardcoded-locations.patch b/pkgs/applications/version-management/gitlab/gitlab-shell/remove-hardcoded-locations.patch deleted file mode 100644 index d8337ebb9ea4..000000000000 --- a/pkgs/applications/version-management/gitlab/gitlab-shell/remove-hardcoded-locations.patch +++ /dev/null @@ -1,71 +0,0 @@ -diff --git a/go/internal/config/config.go b/go/internal/config/config.go -index f951fe6..b422fe3 100644 ---- a/go/internal/config/config.go -+++ b/go/internal/config/config.go -@@ -3,7 +3,6 @@ package config - import ( - "io/ioutil" - "net/url" -- "os" - "path" - "strings" - -@@ -30,16 +29,13 @@ type Config struct { - } - - func New() (*Config, error) { -- dir, err := os.Getwd() -- if err != nil { -- return nil, err -- } -+ dir := "/run/gitlab" - - return NewFromDir(dir) - } - - func NewFromDir(dir string) (*Config, error) { -- return newFromFile(path.Join(dir, configFile)) -+ return newFromFile("/run/gitlab/shell-config.yml") - } - - func (c *Config) FeatureEnabled(featureName string) bool { -diff --git a/lib/gitlab_keys.rb b/lib/gitlab_keys.rb -index 0600a18..c46f2d7 100644 ---- a/lib/gitlab_keys.rb -+++ b/lib/gitlab_keys.rb -@@ -10,7 +10,7 @@ class GitlabKeys # rubocop:disable Metrics/ClassLength - attr_accessor :auth_file, :key - - def self.command(whatever) -- "#{ROOT_PATH}/bin/gitlab-shell #{whatever}" -+ "/run/current-system/sw/bin/gitlab-shell #{whatever}" - end - - def self.command_key(key_id) -diff --git a/lib/gitlab_shell.rb b/lib/gitlab_shell.rb -index 2cb76a8..f59ad5e 100644 ---- a/lib/gitlab_shell.rb -+++ b/lib/gitlab_shell.rb -@@ -190,7 +190,8 @@ class GitlabShell # rubocop:disable Metrics/ClassLength - - args = [executable, gitaly_address, json_args] - # We use 'chdir: ROOT_PATH' to let the next executable know where config.yml is. -- Kernel.exec(env, *args, unsetenv_others: true, chdir: ROOT_PATH) -+ # Except we don't, because we're already in the right directory on nixos! -+ Kernel.exec(env, *args, unsetenv_others: true) - end - - def api -diff --git a/go/internal/command/fallback/fallback.go b/go/internal/command/fallback/fallback.go -index 2cb76a8..f59ad5e 100644 ---- a/go/internal/command/fallback/fallback.go -+++ b/go/internal/command/fallback/fallback.go -@@ -21,7 +21,7 @@ - ) - - func (c *Command) Execute() error { -- rubyCmd := filepath.Join(c.RootDir, "bin", RubyProgram) -+ rubyCmd := filepath.Join("/run/current-system/sw/bin", RubyProgram) - - // Ensure rubyArgs[0] is the full path to gitlab-shell-ruby - rubyArgs := append([]string{rubyCmd}, c.Args[1:]...) diff --git a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix index 12f354bc2fb9..09a3cee195dd 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix +++ b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix @@ -1,25 +1,37 @@ -{ stdenv, fetchFromGitLab, git, go }: +{ stdenv, fetchFromGitLab, git, buildGoPackage }: -stdenv.mkDerivation rec { +buildGoPackage rec { pname = "gitlab-workhorse"; - version = "8.7.0"; + version = "8.10.0"; src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-workhorse"; rev = "v${version}"; - sha256 = "1zlngc498hnzbxwdjn3ymr0xwrnfgnzzhn9lyf37yfbjl8x28n3z"; + sha256 = "11cfhh48dga5ghfcijb68gbx0nfr5bs3vvp2j1gam9ac37fpvk0x"; }; - buildInputs = [ git go ]; + goPackagePath = "gitlab.com/gitlab-org/gitlab-workhorse"; + goDeps = ./deps.nix; + buildInputs = [ git ]; makeFlags = [ "PREFIX=$(out)" "VERSION=${version}" "GOCACHE=$(TMPDIR)/go-cache" ]; + # gitlab-workhorse depends on an older version of labkit which + # contains old, vendored versions of some packages; gitlab-workhorse + # also explicitly depends on newer versions of these libraries, + # but buildGoPackage exposes the vendored versions instead, + # leading to compilation errors. Since the vendored libraries + # aren't used here anyway, we'll just remove them. + postConfigure = '' + rm -r "$NIX_BUILD_TOP/go/src/gitlab.com/gitlab-org/labkit/vendor" + ''; + meta = with stdenv.lib; { homepage = http://www.gitlab.com/; platforms = platforms.unix; - maintainers = with maintainers; [ fpletz globin ]; + maintainers = with maintainers; [ fpletz globin talyz ]; license = licenses.mit; }; } diff --git a/pkgs/applications/version-management/gitlab/gitlab-workhorse/deps.nix b/pkgs/applications/version-management/gitlab/gitlab-workhorse/deps.nix new file mode 100644 index 000000000000..9db1c002f8fd --- /dev/null +++ b/pkgs/applications/version-management/gitlab/gitlab-workhorse/deps.nix @@ -0,0 +1,885 @@ +# file generated from go.mod using vgo2nix (https://github.com/adisbladis/vgo2nix) +[ + { + goPackagePath = "cloud.google.com/go"; + fetch = { + type = "git"; + url = "https://code.googlesource.com/gocloud"; + rev = "v0.26.0"; + sha256 = "149v3ci17g6wd2pm18mzcncq5qpl9hwdjnz3rlbn5rfidyn46la1"; + }; + } + { + goPackagePath = "github.com/BurntSushi/toml"; + fetch = { + type = "git"; + url = "https://github.com/BurntSushi/toml"; + rev = "v0.3.1"; + sha256 = "1fjdwwfzyzllgiwydknf1pwjvy49qxfsczqx5gz3y0izs7as99j6"; + }; + } + { + goPackagePath = "github.com/FZambia/sentinel"; + fetch = { + type = "git"; + url = "https://github.com/FZambia/sentinel"; + rev = "v1.0.0"; + sha256 = "14cfngdy0n5rg7nrvxg1ydcjd18v0s8h33jx9wkln5ms0d59kfly"; + }; + } + { + goPackagePath = "github.com/alecthomas/template"; + fetch = { + type = "git"; + url = "https://github.com/alecthomas/template"; + rev = "a0175ee3bccc"; + sha256 = "0qjgvvh26vk1cyfq9fadyhfgdj36f1iapbmr5xp6zqipldz8ffxj"; + }; + } + { + goPackagePath = "github.com/alecthomas/units"; + fetch = { + type = "git"; + url = "https://github.com/alecthomas/units"; + rev = "2efee857e7cf"; + sha256 = "1j65b91qb9sbrml9cpabfrcf07wmgzzghrl7809hjjhrmbzri5bl"; + }; + } + { + goPackagePath = "github.com/beorn7/perks"; + fetch = { + type = "git"; + url = "https://github.com/beorn7/perks"; + rev = "v1.0.0"; + sha256 = "1i1nz1f6g55xi2y3aiaz5kqfgvknarbfl4f0sx4nyyb4s7xb1z9x"; + }; + } + { + goPackagePath = "github.com/certifi/gocertifi"; + fetch = { + type = "git"; + url = "https://github.com/certifi/gocertifi"; + rev = "ee1a9a0726d2"; + sha256 = "08l6lqaw83pva6fa0aafmhmy1mhb145av21772zfh3ij809a37i4"; + }; + } + { + goPackagePath = "github.com/client9/misspell"; + fetch = { + type = "git"; + url = "https://github.com/client9/misspell"; + rev = "v0.3.4"; + sha256 = "1vwf33wsc4la25zk9nylpbp9px3svlmldkm0bha4hp56jws4q9cs"; + }; + } + { + goPackagePath = "github.com/client9/reopen"; + fetch = { + type = "git"; + url = "https://github.com/client9/reopen"; + rev = "v1.0.0"; + sha256 = "0f0dpdbmvk7w518c6zjhlmp65y55vvx47x4lq9pgzvcbsvjsf18s"; + }; + } + { + goPackagePath = "github.com/cloudflare/tableflip"; + fetch = { + type = "git"; + url = "https://github.com/cloudflare/tableflip"; + rev = "8392f1641731"; + sha256 = "0by5hk8s0bhhl3kiw658p5g53zvc61k4q2wxnh1w64p5ghd1rfn8"; + }; + } + { + goPackagePath = "github.com/codahale/hdrhistogram"; + fetch = { + type = "git"; + url = "https://github.com/codahale/hdrhistogram"; + rev = "3a0bb77429bd"; + sha256 = "1zampgfjbxy192cbwdi7g86l1idxaam96d834wncnpfdwgh5kl57"; + }; + } + { + 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/dgrijalva/jwt-go"; + fetch = { + type = "git"; + url = "https://github.com/dgrijalva/jwt-go"; + rev = "v3.2.0"; + sha256 = "08m27vlms74pfy5z79w67f9lk9zkx6a9jd68k3c4msxy75ry36mp"; + }; + } + { + goPackagePath = "github.com/fsnotify/fsnotify"; + fetch = { + type = "git"; + url = "https://github.com/fsnotify/fsnotify"; + rev = "v1.4.7"; + sha256 = "07va9crci0ijlivbb7q57d2rz9h27zgn2fsm60spjsqpdbvyrx4g"; + }; + } + { + goPackagePath = "github.com/getsentry/raven-go"; + fetch = { + type = "git"; + url = "https://github.com/getsentry/raven-go"; + rev = "v0.1.2"; + sha256 = "1dl80kar4lzdcfl3w6jssi1ld6bv0rmx6sp6bz6rzysfr9ilm02z"; + }; + } + { + goPackagePath = "github.com/go-kit/kit"; + fetch = { + type = "git"; + url = "https://github.com/go-kit/kit"; + rev = "v0.8.0"; + sha256 = "1rcywbc2pvab06qyf8pc2rdfjv7r6kxdv2v4wnpqnjhz225wqvc0"; + }; + } + { + goPackagePath = "github.com/go-logfmt/logfmt"; + fetch = { + type = "git"; + url = "https://github.com/go-logfmt/logfmt"; + rev = "v0.3.0"; + sha256 = "1gkgh3k5w1xwb2qbjq52p6azq3h1c1rr6pfwjlwj1zrijpzn2xb9"; + }; + } + { + goPackagePath = "github.com/go-stack/stack"; + fetch = { + type = "git"; + url = "https://github.com/go-stack/stack"; + rev = "v1.8.0"; + sha256 = "0wk25751ryyvxclyp8jdk5c3ar0cmfr8lrjb66qbg4808x66b96v"; + }; + } + { + goPackagePath = "github.com/gogo/protobuf"; + fetch = { + type = "git"; + url = "https://github.com/gogo/protobuf"; + rev = "v1.1.1"; + sha256 = "1525pq7r6h3s8dncvq8gxi893p2nq8dxpzvq0nfl5b4p6mq0v1c2"; + }; + } + { + goPackagePath = "github.com/golang/gddo"; + fetch = { + type = "git"; + url = "https://github.com/golang/gddo"; + rev = "af0f2af80721"; + sha256 = "0ja0xwgg31i2fyqn0b9sf1rjsqkw34kwrr0k0iczzn19mhhc3m7j"; + }; + } + { + goPackagePath = "github.com/golang/glog"; + fetch = { + type = "git"; + url = "https://github.com/golang/glog"; + rev = "23def4e6c14b"; + sha256 = "0jb2834rw5sykfr937fxi8hxi2zy80sj2bdn9b3jb4b26ksqng30"; + }; + } + { + goPackagePath = "github.com/golang/lint"; + fetch = { + type = "git"; + url = "https://github.com/golang/lint"; + rev = "06c8688daad7"; + sha256 = "0xi94dwvz50a66bq1hp9fyqkym5mcpdxdb1hrfvicldgjf37lc47"; + }; + } + { + goPackagePath = "github.com/golang/mock"; + fetch = { + type = "git"; + url = "https://github.com/golang/mock"; + rev = "v1.1.1"; + sha256 = "0ap8wb6pdl6ccmdb43advjll2ly4sz26wsc3axw0hbrjrybybzgy"; + }; + } + { + goPackagePath = "github.com/golang/protobuf"; + fetch = { + type = "git"; + url = "https://github.com/golang/protobuf"; + rev = "v1.3.1"; + sha256 = "15am4s4646qy6iv0g3kkqq52rzykqjhm4bf08dk0fy2r58knpsyl"; + }; + } + { + goPackagePath = "github.com/gomodule/redigo"; + fetch = { + type = "git"; + url = "https://github.com/gomodule/redigo"; + rev = "v2.0.0"; + sha256 = "1kg7s8027b4g1sfw0v3nh30c15j407kv684s53gg281r807dnfpk"; + }; + } + { + goPackagePath = "github.com/google/go-cmp"; + fetch = { + type = "git"; + url = "https://github.com/google/go-cmp"; + rev = "v0.3.1"; + sha256 = "1caw49i0plkjxir7kdf5qhwls3krqwfmi7g4h392rdfwi3kfahx1"; + }; + } + { + goPackagePath = "github.com/google/renameio"; + fetch = { + type = "git"; + url = "https://github.com/google/renameio"; + rev = "v0.1.0"; + sha256 = "1ki2x5a9nrj17sn092d6n4zr29lfg5ydv4xz5cp58z6cw8ip43jx"; + }; + } + { + goPackagePath = "github.com/google/uuid"; + fetch = { + type = "git"; + url = "https://github.com/google/uuid"; + rev = "v1.1.1"; + sha256 = "0hfxcf9frkb57k6q0rdkrmnfs78ms21r1qfk9fhlqga2yh5xg8zb"; + }; + } + { + goPackagePath = "github.com/gopherjs/gopherjs"; + fetch = { + type = "git"; + url = "https://github.com/gopherjs/gopherjs"; + rev = "0766667cb4d1"; + sha256 = "13pfc9sxiwjky2lm1xb3i3lcisn8p6mgjk2d927l7r92ysph8dmw"; + }; + } + { + goPackagePath = "github.com/gorilla/websocket"; + fetch = { + type = "git"; + url = "https://github.com/gorilla/websocket"; + rev = "v1.4.0"; + sha256 = "00i4vb31nsfkzzk7swvx3i75r2d960js3dri1875vypk3v2s0pzk"; + }; + } + { + goPackagePath = "github.com/grpc-ecosystem/go-grpc-middleware"; + fetch = { + type = "git"; + url = "https://github.com/grpc-ecosystem/go-grpc-middleware"; + rev = "v1.0.0"; + sha256 = "0lwgxih021xfhfb1xb9la5f98bpgpaiz63sbllx77qwwl2rmhrsp"; + }; + } + { + goPackagePath = "github.com/grpc-ecosystem/go-grpc-prometheus"; + fetch = { + type = "git"; + url = "https://github.com/grpc-ecosystem/go-grpc-prometheus"; + rev = "v1.2.0"; + sha256 = "1lzk54h7np32b3acidg1ggbn8ppbnns0m71gcg9d1qkkdh8zrijl"; + }; + } + { + goPackagePath = "github.com/hpcloud/tail"; + fetch = { + type = "git"; + url = "https://github.com/hpcloud/tail"; + rev = "v1.0.0"; + sha256 = "1njpzc0pi1acg5zx9y6vj9xi6ksbsc5d387rd6904hy6rh2m6kn0"; + }; + } + { + goPackagePath = "github.com/jfbus/httprs"; + fetch = { + type = "git"; + url = "https://github.com/jfbus/httprs"; + rev = "b0af8319bb15"; + sha256 = "05cg9a27i9g92n3bivqrrqznccl5lfadlk97sp9izmd368dl5qvc"; + }; + } + { + goPackagePath = "github.com/jpillora/backoff"; + fetch = { + type = "git"; + url = "https://github.com/jpillora/backoff"; + rev = "8eab2debe79d"; + sha256 = "1m5z0703094vhbbmp6s7n6kk7ci5s1pfjq466mz14zp8d1w0yn3x"; + }; + } + { + goPackagePath = "github.com/json-iterator/go"; + fetch = { + type = "git"; + url = "https://github.com/json-iterator/go"; + rev = "v1.1.6"; + sha256 = "08caswxvdn7nvaqyj5kyny6ghpygandlbw9vxdj7l5vkp7q0s43r"; + }; + } + { + goPackagePath = "github.com/jtolds/gls"; + fetch = { + type = "git"; + url = "https://github.com/jtolds/gls"; + rev = "v4.20.0"; + sha256 = "1k7xd2q2ysv2xsh373qs801v6f359240kx0vrl0ydh7731lngvk6"; + }; + } + { + goPackagePath = "github.com/julienschmidt/httprouter"; + fetch = { + type = "git"; + url = "https://github.com/julienschmidt/httprouter"; + rev = "v1.2.0"; + sha256 = "1k8bylc9s4vpvf5xhqh9h246dl1snxrzzz0614zz88cdh8yzs666"; + }; + } + { + goPackagePath = "github.com/kelseyhightower/envconfig"; + fetch = { + type = "git"; + url = "https://github.com/kelseyhightower/envconfig"; + rev = "v1.3.0"; + sha256 = "1zcq480ig7wbg4378qcfxznp2gzqmk7x6rbxizflvg9v2f376vrw"; + }; + } + { + goPackagePath = "github.com/kisielk/gotool"; + fetch = { + type = "git"; + url = "https://github.com/kisielk/gotool"; + rev = "v1.0.0"; + sha256 = "14af2pa0ssyp8bp2mvdw184s5wcysk6akil3wzxmr05wwy951iwn"; + }; + } + { + goPackagePath = "github.com/konsorten/go-windows-terminal-sequences"; + fetch = { + type = "git"; + url = "https://github.com/konsorten/go-windows-terminal-sequences"; + rev = "v1.0.2"; + sha256 = "09mn209ika7ciy87xf2x31dq5fnqw39jidgaljvmqxwk7ff1hnx7"; + }; + } + { + goPackagePath = "github.com/kr/logfmt"; + fetch = { + type = "git"; + url = "https://github.com/kr/logfmt"; + rev = "b84e30acd515"; + sha256 = "02ldzxgznrfdzvghfraslhgp19la1fczcbzh7wm2zdc6lmpd1qq9"; + }; + } + { + goPackagePath = "github.com/kr/pretty"; + fetch = { + type = "git"; + url = "https://github.com/kr/pretty"; + rev = "v0.1.0"; + sha256 = "18m4pwg2abd0j9cn5v3k2ksk9ig4vlwxmlw9rrglanziv9l967qp"; + }; + } + { + goPackagePath = "github.com/kr/pty"; + fetch = { + type = "git"; + url = "https://github.com/kr/pty"; + rev = "v1.1.1"; + sha256 = "0383f0mb9kqjvncqrfpidsf8y6ns5zlrc91c6a74xpyxjwvzl2y6"; + }; + } + { + goPackagePath = "github.com/kr/text"; + fetch = { + type = "git"; + url = "https://github.com/kr/text"; + rev = "v0.1.0"; + sha256 = "1gm5bsl01apvc84bw06hasawyqm4q84vx1pm32wr9jnd7a8vjgj1"; + }; + } + { + goPackagePath = "github.com/libgit2/git2go"; + fetch = { + type = "git"; + url = "https://github.com/libgit2/git2go"; + rev = "ecaeb7a21d47"; + sha256 = "14r7ryff93r49g94f6kg66xc0y6rwb31lj22s3qmzmlgywk0pgvr"; + }; + } + { + goPackagePath = "github.com/lightstep/lightstep-tracer-go"; + fetch = { + type = "git"; + url = "https://github.com/lightstep/lightstep-tracer-go"; + rev = "v0.15.6"; + sha256 = "10n5r66g44s6rnz5kf86s4a3p1g55kc1kxqhnk7bx7mlayndgpmb"; + }; + } + { + goPackagePath = "github.com/matttproud/golang_protobuf_extensions"; + fetch = { + type = "git"; + url = "https://github.com/matttproud/golang_protobuf_extensions"; + rev = "v1.0.1"; + sha256 = "1d0c1isd2lk9pnfq2nk0aih356j30k3h1gi2w0ixsivi5csl7jya"; + }; + } + { + goPackagePath = "github.com/mitchellh/copystructure"; + fetch = { + type = "git"; + url = "https://github.com/mitchellh/copystructure"; + rev = "v1.0.0"; + sha256 = "05njg92w1088v4yl0js0zdrpfq6k37i9j14mxkr3p90p5yd9rrrr"; + }; + } + { + goPackagePath = "github.com/mitchellh/reflectwalk"; + fetch = { + type = "git"; + url = "https://github.com/mitchellh/reflectwalk"; + rev = "v1.0.0"; + sha256 = "0wzkp0fdx22n8f7y9y37dgmnlrlfsv9zjdb48cbx7rsqsbnny7l0"; + }; + } + { + goPackagePath = "github.com/modern-go/concurrent"; + fetch = { + type = "git"; + url = "https://github.com/modern-go/concurrent"; + rev = "bacd9c7ef1dd"; + sha256 = "0s0fxccsyb8icjmiym5k7prcqx36hvgdwl588y0491gi18k5i4zs"; + }; + } + { + goPackagePath = "github.com/modern-go/reflect2"; + fetch = { + type = "git"; + url = "https://github.com/modern-go/reflect2"; + rev = "v1.0.1"; + sha256 = "06a3sablw53n1dqqbr2f53jyksbxdmmk8axaas4yvnhyfi55k4lf"; + }; + } + { + goPackagePath = "github.com/mwitkow/go-conntrack"; + fetch = { + type = "git"; + url = "https://github.com/mwitkow/go-conntrack"; + rev = "cc309e4a2223"; + sha256 = "0nbrnpk7bkmqg9mzwsxlm0y8m7s9qd9phr1q30qlx2qmdmz7c1mf"; + }; + } + { + goPackagePath = "github.com/onsi/ginkgo"; + fetch = { + type = "git"; + url = "https://github.com/onsi/ginkgo"; + rev = "v1.7.0"; + sha256 = "14wgpdrvpc35rdz3859bz53sc1g4vpr1fysy15wy3ff9gmqs14yg"; + }; + } + { + goPackagePath = "github.com/onsi/gomega"; + fetch = { + type = "git"; + url = "https://github.com/onsi/gomega"; + rev = "v1.4.3"; + sha256 = "1c8rqg5i2hz3snmq7s41yar1zjnzilb0fyiyhkg83v97afcfx79v"; + }; + } + { + goPackagePath = "github.com/opentracing/opentracing-go"; + fetch = { + type = "git"; + url = "https://github.com/opentracing/opentracing-go"; + rev = "v1.0.2"; + sha256 = "0i0ghg94dg8lk05mw5n23983wq04yjvkjmdkc9z5y1f3508938h9"; + }; + } + { + goPackagePath = "github.com/philhofer/fwd"; + fetch = { + type = "git"; + url = "https://github.com/philhofer/fwd"; + rev = "v1.0.0"; + sha256 = "1pg84khadh79v42y8sjsdgfb54vw2kzv7hpapxkifgj0yvcp30g2"; + }; + } + { + goPackagePath = "github.com/pkg/errors"; + fetch = { + type = "git"; + url = "https://github.com/pkg/errors"; + rev = "v0.8.0"; + sha256 = "001i6n71ghp2l6kdl3qq1v2vmghcz3kicv9a5wgcihrzigm75pp5"; + }; + } + { + goPackagePath = "github.com/pmezard/go-difflib"; + fetch = { + type = "git"; + url = "https://github.com/pmezard/go-difflib"; + rev = "v1.0.0"; + sha256 = "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw"; + }; + } + { + goPackagePath = "github.com/prometheus/client_golang"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/client_golang"; + rev = "v1.0.0"; + sha256 = "1f03ndyi3jq7zdxinnvzimz3s4z2374r6dikkc8i42xzb6d1bli6"; + }; + } + { + goPackagePath = "github.com/prometheus/client_model"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/client_model"; + rev = "fd36f4220a90"; + sha256 = "1bs5d72k361llflgl94c22n0w53j30rsfh84smgk8mbjbcmjsaa5"; + }; + } + { + goPackagePath = "github.com/prometheus/common"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/common"; + rev = "v0.4.1"; + sha256 = "0sf4sjdckblz1hqdfvripk3zyp8xq89w7q75kbsyg4c078af896s"; + }; + } + { + goPackagePath = "github.com/prometheus/procfs"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/procfs"; + rev = "v0.0.2"; + sha256 = "0s7pvs7fgnfpmym3cd0k219av321h9sf3yvdlnn3qy0ps280lg7k"; + }; + } + { + goPackagePath = "github.com/rafaeljusto/redigomock"; + fetch = { + type = "git"; + url = "https://github.com/rafaeljusto/redigomock"; + rev = "257e089e14a1"; + sha256 = "1k572vsda7q5l42s1kn5bjkfb30jshsbc96dz4cnghg43qylyd6h"; + }; + } + { + goPackagePath = "github.com/rogpeppe/go-internal"; + fetch = { + type = "git"; + url = "https://github.com/rogpeppe/go-internal"; + rev = "v1.3.0"; + sha256 = "0mcdh1licgnnahwml9y2iq6xy5x9xmjw5frcnds2s3wpjyqrl216"; + }; + } + { + goPackagePath = "github.com/sebest/xff"; + fetch = { + type = "git"; + url = "https://github.com/sebest/xff"; + rev = "6c115e0ffa35"; + sha256 = "0l11d8mc870vxzgi74cc9dqr7kgxjmbfkfi53gc30rsyx877jx4h"; + }; + } + { + goPackagePath = "github.com/sirupsen/logrus"; + fetch = { + type = "git"; + url = "https://github.com/sirupsen/logrus"; + rev = "v1.3.0"; + sha256 = "0ib7k8cwxn53dyxd3af1g81z018n77n6q64pm4miznirf7c2c9gk"; + }; + } + { + goPackagePath = "github.com/smartystreets/assertions"; + fetch = { + type = "git"; + url = "https://github.com/smartystreets/assertions"; + rev = "b2de0cb4f26d"; + sha256 = "1i7ldgavgl35c7gk25p7bvdr282ckng090zr4ch9mk1705akx09y"; + }; + } + { + goPackagePath = "github.com/smartystreets/goconvey"; + fetch = { + type = "git"; + url = "https://github.com/smartystreets/goconvey"; + rev = "505e41936337"; + sha256 = "07zjxwszayal88z1j2bwnqrsa32vg8l4nivks5yfr9j8xfsw7n6m"; + }; + } + { + goPackagePath = "github.com/stretchr/objx"; + fetch = { + type = "git"; + url = "https://github.com/stretchr/objx"; + rev = "v0.1.1"; + sha256 = "0iph0qmpyqg4kwv8jsx6a56a7hhqq8swrazv40ycxk9rzr0s8yls"; + }; + } + { + goPackagePath = "github.com/stretchr/testify"; + fetch = { + type = "git"; + url = "https://github.com/stretchr/testify"; + rev = "v1.3.0"; + sha256 = "0wjchp2c8xbgcbbq32w3kvblk6q6yn533g78nxl6iskq6y95lxsy"; + }; + } + { + goPackagePath = "github.com/tinylib/msgp"; + fetch = { + type = "git"; + url = "https://github.com/tinylib/msgp"; + rev = "v1.1.0"; + sha256 = "08ha23sn14071ywrgxlyj7r523vzdwx1i83dcp1mqa830glgqaff"; + }; + } + { + goPackagePath = "github.com/uber-go/atomic"; + fetch = { + type = "git"; + url = "https://github.com/uber-go/atomic"; + rev = "v1.3.2"; + sha256 = "11pzvjys5ddjjgrv94pgk9pnip9yyb54z7idf33zk7p7xylpnsv6"; + }; + } + { + goPackagePath = "github.com/uber/jaeger-client-go"; + fetch = { + type = "git"; + url = "https://github.com/uber/jaeger-client-go"; + rev = "v2.15.0"; + sha256 = "0ki23m9zrf3vxp839fnp9ckr4m28y6mpad8g5s5lr5k8jkl0sfwj"; + }; + } + { + goPackagePath = "github.com/uber/jaeger-lib"; + fetch = { + type = "git"; + url = "https://github.com/uber/jaeger-lib"; + rev = "v1.5.0"; + sha256 = "113fwpn80ylx970w8h7nfqnhh18dpx1jadbk7rbr8k68q4di4y0q"; + }; + } + { + goPackagePath = "gitlab.com/gitlab-org/gitaly"; + fetch = { + type = "git"; + url = "https://gitlab.com/gitlab-org/gitaly.git"; + rev = "v1.57.0"; + sha256 = "0mgawp5afcv9s4y8fq3mc4dn6hhdg1shbns8vmjwklh9bia988cy"; + }; + } + { + goPackagePath = "gitlab.com/gitlab-org/labkit"; + fetch = { + type = "git"; + url = "https://gitlab.com/gitlab-org/labkit.git"; + rev = "905271af7abb"; + sha256 = "144w5dikd82wz53drml9khlx39pmp6kgqccc5c0xfzpijbj7krbd"; + }; + } + { + goPackagePath = "go.uber.org/atomic"; + fetch = { + type = "git"; + url = "https://github.com/uber-go/atomic"; + rev = "v1.3.2"; + sha256 = "11pzvjys5ddjjgrv94pgk9pnip9yyb54z7idf33zk7p7xylpnsv6"; + }; + } + { + goPackagePath = "golang.org/x/crypto"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/crypto"; + rev = "20be4c3c3ed5"; + sha256 = "1ph7y8v30hc95h1dwr7vrhg1nzs47a261qin6zg8mhf12g5k2lxb"; + }; + } + { + goPackagePath = "golang.org/x/lint"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/lint"; + rev = "06c8688daad7"; + sha256 = "0xi94dwvz50a66bq1hp9fyqkym5mcpdxdb1hrfvicldgjf37lc47"; + }; + } + { + goPackagePath = "golang.org/x/mod"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/mod"; + rev = "4bf6d317e70e"; + sha256 = "19lg1ly3j31anx92p0hynic1gjk417wwxphfdrb2cq1c19kj3r17"; + }; + } + { + goPackagePath = "golang.org/x/net"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/net"; + rev = "d28f0bde5980"; + sha256 = "18xj31h70m7xxb7gc86n9i21w6d7djbjz67zfaljm4jqskz6hxkf"; + }; + } + { + goPackagePath = "golang.org/x/oauth2"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/oauth2"; + rev = "d2e6202438be"; + sha256 = "0wbn75fd10485nb93bm4kqldqifdim5xqy4v7r5sdvimvf3fyhn7"; + }; + } + { + goPackagePath = "golang.org/x/sync"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/sync"; + rev = "112230192c58"; + sha256 = "05i2k43j2d0llq768hg5pf3hb2yhfzp9la1w5wp0rsnnzblr0lfn"; + }; + } + { + goPackagePath = "golang.org/x/sys"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/sys"; + rev = "953cdadca894"; + sha256 = "0gkha4whk8xkcv3isigbs250akag99isxnd3v9xmy0kl3g88hxy1"; + }; + } + { + goPackagePath = "golang.org/x/text"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/text"; + rev = "v0.3.0"; + sha256 = "0r6x6zjzhr8ksqlpiwm5gdd7s209kwk5p4lw54xjvz10cs3qlq19"; + }; + } + { + goPackagePath = "golang.org/x/tools"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/tools"; + rev = "6e04913cbbac"; + sha256 = "1314j8r4cp69a12nqdaljd06r6hmh3b1v4xyrz8prw6gx5jg7h3q"; + }; + } + { + goPackagePath = "google.golang.org/appengine"; + fetch = { + type = "git"; + url = "https://github.com/golang/appengine"; + rev = "v1.1.0"; + sha256 = "1pz202zszg8f35dk5pfhwgcdi3r6dx1l4yk6x6ly7nb4j45zi96x"; + }; + } + { + goPackagePath = "google.golang.org/genproto"; + fetch = { + type = "git"; + url = "https://github.com/google/go-genproto"; + rev = "bd91e49a0898"; + sha256 = "1f5q04h03q6fksbfkhz13ai5849rkkb8xrmmi7cxs4lzsi6ixkg8"; + }; + } + { + goPackagePath = "google.golang.org/grpc"; + fetch = { + type = "git"; + url = "https://github.com/grpc/grpc-go"; + rev = "v1.16.0"; + sha256 = "0a9xl6c5j7lvsb4q6ry5p892rjm86p47d4f8xrf0r8lxblf79qbg"; + }; + } + { + goPackagePath = "gopkg.in/DataDog/dd-trace-go.v1"; + fetch = { + type = "git"; + url = "https://gopkg.in/DataDog/dd-trace-go.v1"; + rev = "v1.7.0"; + sha256 = "0j45skiiayfsaw8id4g20k51zfr0raj47a03q2icka5xrh3qj6yq"; + }; + } + { + goPackagePath = "gopkg.in/alecthomas/kingpin.v2"; + fetch = { + type = "git"; + url = "https://gopkg.in/alecthomas/kingpin.v2"; + rev = "v2.2.6"; + sha256 = "0mndnv3hdngr3bxp7yxfd47cas4prv98sqw534mx7vp38gd88n5r"; + }; + } + { + goPackagePath = "gopkg.in/check.v1"; + fetch = { + type = "git"; + url = "https://gopkg.in/check.v1"; + rev = "788fd7840127"; + sha256 = "0v3bim0j375z81zrpr5qv42knqs0y2qv2vkjiqi5axvb78slki1a"; + }; + } + { + goPackagePath = "gopkg.in/errgo.v2"; + fetch = { + type = "git"; + url = "https://gopkg.in/errgo.v2"; + rev = "v2.1.0"; + sha256 = "065mbihiy7q67wnql0bzl9y1kkvck5ivra68254zbih52jxwrgr2"; + }; + } + { + goPackagePath = "gopkg.in/fsnotify.v1"; + fetch = { + type = "git"; + url = "https://gopkg.in/fsnotify.v1"; + rev = "v1.4.7"; + sha256 = "07va9crci0ijlivbb7q57d2rz9h27zgn2fsm60spjsqpdbvyrx4g"; + }; + } + { + goPackagePath = "gopkg.in/tomb.v1"; + fetch = { + type = "git"; + url = "https://gopkg.in/tomb.v1"; + rev = "dd632973f1e7"; + sha256 = "1lqmq1ag7s4b3gc3ddvr792c5xb5k6sfn0cchr3i2s7f1c231zjv"; + }; + } + { + goPackagePath = "gopkg.in/yaml.v2"; + fetch = { + type = "git"; + url = "https://gopkg.in/yaml.v2"; + rev = "v2.2.2"; + sha256 = "01wj12jzsdqlnidpyjssmj0r4yavlqy7dwrg7adqd8dicjc4ncsa"; + }; + } + { + goPackagePath = "honnef.co/go/tools"; + fetch = { + type = "git"; + url = "https://github.com/dominikh/go-tools"; + rev = "v0.0.1-2019.2.2"; + sha256 = "1vndpwg797z2gw9h9378iq99aqy7nalqx82lgvcsaqnkypdmppnd"; + }; + } +] diff --git a/pkgs/applications/version-management/gitlab/rubyEnv-ce/Gemfile b/pkgs/applications/version-management/gitlab/rubyEnv-ce/Gemfile deleted file mode 100644 index 8bffc2a973d9..000000000000 --- a/pkgs/applications/version-management/gitlab/rubyEnv-ce/Gemfile +++ /dev/null @@ -1,449 +0,0 @@ -source 'https://rubygems.org' - -gem 'rails', '5.2.3' - -# Improves copy-on-write performance for MRI -gem 'nakayoshi_fork', '~> 0.0.4' - -# Responders respond_to and respond_with -gem 'responders', '~> 2.0' - -gem 'sprockets', '~> 3.7.0' - -# Default values for AR models -gem 'default_value_for', '~> 3.2.0' - -# Supported DBs -gem 'mysql2', '~> 0.4.10', group: :mysql -gem 'pg', '~> 1.1', group: :postgres - -gem 'rugged', '~> 0.28' -gem 'grape-path-helpers', '~> 1.1' - -gem 'faraday', '~> 0.12' - -# Authentication libraries -gem 'devise', '~> 4.6' -gem 'doorkeeper', '~> 4.3' -gem 'doorkeeper-openid_connect', '~> 1.5' -gem 'omniauth', '~> 1.8' -gem 'omniauth-auth0', '~> 2.0.0' -gem 'omniauth-azure-oauth2', '~> 0.0.9' -gem 'omniauth-cas3', '~> 1.1.4' -gem 'omniauth-facebook', '~> 4.0.0' -gem 'omniauth-github', '~> 1.3' -gem 'omniauth-gitlab', '~> 1.0.2' -gem 'omniauth-google-oauth2', '~> 0.6.0' -gem 'omniauth-kerberos', '~> 0.3.0', group: :kerberos -gem 'omniauth-oauth2-generic', '~> 0.2.2' -gem 'omniauth-saml', '~> 1.10' -gem 'omniauth-shibboleth', '~> 1.3.0' -gem 'omniauth-twitter', '~> 1.4' -gem 'omniauth_crowd', '~> 2.2.0' -gem 'omniauth-authentiq', '~> 0.3.3' -gem 'omniauth_openid_connect', '~> 0.3.1' -gem "omniauth-ultraauth", '~> 0.0.2' -gem 'omniauth-salesforce', '~> 1.0.5' -gem 'rack-oauth2', '~> 1.9.3' -gem 'jwt', '~> 2.1.0' - -# Spam and anti-bot protection -gem 'recaptcha', '~> 4.11', require: 'recaptcha/rails' -gem 'akismet', '~> 2.0' - -# Two-factor authentication -gem 'devise-two-factor', '~> 3.0.0' -gem 'rqrcode-rails3', '~> 0.1.7' -gem 'attr_encrypted', '~> 3.1.0' -gem 'u2f', '~> 0.2.1' - -# GitLab Pages -gem 'validates_hostname', '~> 1.0.6' -gem 'rubyzip', '~> 1.2.2', require: 'zip' -# GitLab Pages letsencrypt support -gem 'acme-client', '~> 2.0.2' - -# Browser detection -gem 'browser', '~> 2.5' - -# GPG -gem 'gpgme', '~> 2.0.18' - -# LDAP Auth -# GitLab fork with several improvements to original library. For full list of changes -# see https://github.com/intridea/omniauth-ldap/compare/master...gitlabhq:master -gem 'gitlab_omniauth-ldap', '~> 2.1.1', require: 'omniauth-ldap' -gem 'net-ldap' - -# API -gem 'grape', '~> 1.1.0' -gem 'grape-entity', '~> 0.7.1' -gem 'rack-cors', '~> 1.0.0', require: 'rack/cors' - -# GraphQL API -gem 'graphql', '~> 1.8.0' -gem 'graphiql-rails', '~> 1.4.10' -gem 'apollo_upload_server', '~> 2.0.0.beta3' -gem 'graphql-docs', '~> 1.6.0', group: [:development, :test] - -# Disable strong_params so that Mash does not respond to :permitted? -gem 'hashie-forbidden_attributes' - -# Pagination -gem 'kaminari', '~> 1.0' - -# HAML -gem 'hamlit', '~> 2.8.8' - -# Files attachments -gem 'carrierwave', '~> 1.3' -gem 'mini_magick' - -# for backups -gem 'fog-aws', '~> 3.5' -# Locked until fog-google resolves https://github.com/fog/fog-google/issues/421. -# Also see config/initializers/fog_core_patch.rb. -gem 'fog-core', '= 2.1.0' -gem 'fog-google', '~> 1.8' -gem 'fog-local', '~> 0.6' -gem 'fog-openstack', '~> 1.0' -gem 'fog-rackspace', '~> 0.1.1' -gem 'fog-aliyun', '~> 0.3' - -# for Google storage -gem 'google-api-client', '~> 0.23' - -# for aws storage -gem 'unf', '~> 0.1.4' - -# Seed data -gem 'seed-fu', '~> 2.3.7' - -# Markdown and HTML processing -gem 'html-pipeline', '~> 2.8' -gem 'deckar01-task_list', '2.2.0' -gem 'gitlab-markup', '~> 1.7.0' -gem 'github-markup', '~> 1.7.0', require: 'github/markup' -gem 'commonmarker', '~> 0.17' -gem 'RedCloth', '~> 4.3.2' -gem 'rdoc', '~> 6.0' -gem 'org-ruby', '~> 0.9.12' -gem 'creole', '~> 0.5.0' -gem 'wikicloth', '0.8.1' -gem 'asciidoctor', '~> 2.0.10' -gem 'asciidoctor-include-ext', '~> 0.3.1', require: false -gem 'asciidoctor-plantuml', '0.0.9' -gem 'rouge', '~> 3.5' -gem 'truncato', '~> 0.7.11' -gem 'bootstrap_form', '~> 4.2.0' -gem 'nokogiri', '~> 1.10.3' -gem 'escape_utils', '~> 1.1' - -# Calendar rendering -gem 'icalendar' - -# Diffs -gem 'diffy', '~> 3.1.0' - -# Application server -gem 'rack', '~> 2.0.7' - -group :unicorn do - gem 'unicorn', '~> 5.4.1' - gem 'unicorn-worker-killer', '~> 0.4.4' -end - -group :puma do - gem 'puma', '~> 3.12', require: false - gem 'puma_worker_killer', require: false - gem 'rack-timeout', require: false -end - -# State machine -gem 'state_machines-activerecord', '~> 0.5.1' - -# Issue tags -gem 'acts-as-taggable-on', '~> 6.0' - -# Background jobs -gem 'sidekiq', '~> 5.2.7' -gem 'sidekiq-cron', '~> 1.0' -gem 'redis-namespace', '~> 1.6.0' -gem 'gitlab-sidekiq-fetcher', '~> 0.4.0', require: 'sidekiq-reliable-fetch' - -# Cron Parser -gem 'fugit', '~> 1.2.1' - -# HTTP requests -gem 'httparty', '~> 0.16.4' - -# Colored output to console -gem 'rainbow', '~> 3.0' - -# Progress bar -gem 'ruby-progressbar' - -# GitLab settings -gem 'settingslogic', '~> 2.0.9' - -# Linear-time regex library for untrusted regular expressions -gem 're2', '~> 1.1.1' - -# Misc - -gem 'version_sorter', '~> 2.2.4' - -# Export Ruby Regex to Javascript -gem 'js_regex', '~> 3.1' - -# User agent parsing -gem 'device_detector' - -# Cache -gem 'redis-rails', '~> 5.0.2' - -# Redis -gem 'redis', '~> 3.2' -gem 'connection_pool', '~> 2.0' - -# Discord integration -gem 'discordrb-webhooks-blackst0ne', '~> 3.3', require: false - -# HipChat integration -gem 'hipchat', '~> 1.5.0' - -# Jira integration -gem 'jira-ruby', '~> 1.4' - -# Flowdock integration -gem 'flowdock', '~> 0.7' - -# Slack integration -gem 'slack-notifier', '~> 1.5.1' - -# Hangouts Chat integration -gem 'hangouts-chat', '~> 0.0.5' - -# Asana integration -gem 'asana', '~> 0.8.1' - -# FogBugz integration -gem 'ruby-fogbugz', '~> 0.2.1' - -# Kubernetes integration -gem 'kubeclient', '~> 4.2.2' - -# Sanitize user input -gem 'sanitize', '~> 4.6' -gem 'babosa', '~> 1.0.2' - -# Sanitizes SVG input -gem 'loofah', '~> 2.2' - -# Working with license -gem 'licensee', '~> 8.9' - -# Protect against bruteforcing -gem 'rack-attack', '~> 4.4.1' - -# Ace editor -gem 'ace-rails-ap', '~> 4.1.0' - -# Detect and convert string character encoding -gem 'charlock_holmes', '~> 0.7.5' - -# Detect mime content type from content -gem 'mimemagic', '~> 0.3.2' - -# Faster blank -gem 'fast_blank' - -# Parse time & duration -gem 'chronic', '~> 0.10.2' -gem 'chronic_duration', '~> 0.10.6' - -gem 'webpack-rails', '~> 0.9.10' -gem 'rack-proxy', '~> 0.6.0' - -gem 'sassc-rails', '~> 2.1.0' -gem 'uglifier', '~> 2.7.2' - -gem 'addressable', '~> 2.5.2' -gem 'font-awesome-rails', '~> 4.7' -gem 'gemojione', '~> 3.3' -gem 'gon', '~> 6.2' -gem 'request_store', '~> 1.3' -gem 'virtus', '~> 1.0.1' -gem 'base32', '~> 0.3.0' - -# Sentry integration -gem 'sentry-raven', '~> 2.9' - -gem 'premailer-rails', '~> 1.9.7' - -# LabKit: Tracing and Correlation -gem 'gitlab-labkit', '~> 0.3.0' - -# I18n -gem 'ruby_parser', '~> 3.8', require: false -gem 'rails-i18n', '~> 5.1' -gem 'gettext_i18n_rails', '~> 1.8.0' -gem 'gettext_i18n_rails_js', '~> 1.3' -gem 'gettext', '~> 3.2.2', require: false, group: :development - -gem 'batch-loader', '~> 1.4.0' - -# Perf bar -gem 'peek', '~> 1.0.1' -gem 'peek-gc', '~> 0.0.2' -gem 'peek-mysql2', '~> 1.2.0', group: :mysql -gem 'peek-pg', '~> 1.3.0', group: :postgres -gem 'peek-rblineprof', '~> 0.2.0' -gem 'peek-redis', '~> 1.2.0' - -# Memory benchmarks -gem 'derailed_benchmarks', require: false - -# Metrics -group :metrics do - gem 'method_source', '~> 0.8', require: false - gem 'influxdb', '~> 0.2', require: false - - # Prometheus - gem 'prometheus-client-mmap', '~> 0.9.8' - gem 'raindrops', '~> 0.18' -end - -group :development do - gem 'foreman', '~> 0.84.0' - gem 'brakeman', '~> 4.2', require: false - - gem 'letter_opener_web', '~> 1.3.4' - gem 'rblineprof', '~> 0.3.6', platform: :mri, require: false - - # Better errors handler - gem 'better_errors', '~> 2.5.0' - gem 'binding_of_caller', '~> 0.8.0' - - # thin instead webrick - gem 'thin', '~> 1.7.0' -end - -group :development, :test do - gem 'bootsnap', '~> 1.4' - gem 'bullet', '~> 5.5.0', require: !!ENV['ENABLE_BULLET'] - gem 'pry-byebug', '~> 3.5.1', platform: :mri - gem 'pry-rails', '~> 0.3.4' - - gem 'awesome_print', require: false - gem 'fuubar', '~> 2.2.0' - - gem 'database_cleaner', '~> 1.7.0' - gem 'factory_bot_rails', '~> 4.8.2' - gem 'rspec-rails', '~> 3.8.0' - gem 'rspec-retry', '~> 0.6.1' - gem 'rspec_profiling', '~> 0.0.5' - gem 'rspec-set', '~> 0.1.3' - gem 'rspec-parameterized', require: false - - # Prevent occasions where minitest is not bundled in packaged versions of ruby (see #3826) - gem 'minitest', '~> 5.11.0' - - # Generate Fake data - gem 'ffaker', '~> 2.10' - - gem 'capybara', '~> 3.22.0' - gem 'capybara-screenshot', '~> 1.0.22' - gem 'selenium-webdriver', '~> 3.141' - - gem 'spring', '~> 2.0.0' - gem 'spring-commands-rspec', '~> 1.0.4' - - gem 'gitlab-styles', '~> 2.7', require: false - # Pin these dependencies, otherwise a new rule could break the CI pipelines - gem 'rubocop', '~> 0.69.0' - gem 'rubocop-performance', '~> 1.1.0' - gem 'rubocop-rspec', '~> 1.22.1' - - gem 'scss_lint', '~> 0.56.0', require: false - gem 'haml_lint', '~> 0.31.0', require: false - gem 'simplecov', '~> 0.16.1', require: false - gem 'bundler-audit', '~> 0.5.0', require: false - gem 'mdl', '~> 0.5.0', require: false - - gem 'benchmark-ips', '~> 2.3.0', require: false - - gem 'license_finder', '~> 5.4', require: false - gem 'knapsack', '~> 1.17' - - gem 'activerecord_sane_schema_dumper', '1.0' - - gem 'stackprof', '~> 0.2.10', require: false - - gem 'simple_po_parser', '~> 1.1.2', require: false - - gem 'timecop', '~> 0.8.0' -end - -group :test do - gem 'shoulda-matchers', '~> 4.0.1', require: false - gem 'email_spec', '~> 2.2.0' - gem 'json-schema', '~> 2.8.0' - gem 'webmock', '~> 3.5.1' - gem 'rails-controller-testing' - gem 'sham_rack', '~> 1.3.6' - gem 'concurrent-ruby', '~> 1.1' - gem 'test-prof', '~> 0.2.5' - gem 'rspec_junit_formatter' -end - -gem 'octokit', '~> 4.9' - -gem 'mail_room', '~> 0.9.1' - -gem 'email_reply_trimmer', '~> 0.1' -gem 'html2text' - -gem 'ruby-prof', '~> 0.17.0' -gem 'rbtrace', '~> 0.4', require: false -gem 'memory_profiler', '~> 0.9', require: false -gem 'benchmark-memory', '~> 0.1', require: false -gem 'activerecord-explain-analyze', '~> 0.1', require: false - -# OAuth -gem 'oauth2', '~> 1.4' - -# Health check -gem 'health_check', '~> 2.6.0' - -# System information -gem 'vmstat', '~> 2.3.0' -gem 'sys-filesystem', '~> 1.1.6' - -# SSH host key support -gem 'net-ssh', '~> 5.2' -gem 'sshkey', '~> 2.0' - -# Required for ED25519 SSH host key support -group :ed25519 do - gem 'ed25519', '~> 1.2' - gem 'bcrypt_pbkdf', '~> 1.0' -end - -# Gitaly GRPC client -gem 'gitaly-proto', '~> 1.37.0', require: 'gitaly' - -gem 'grpc', '~> 1.19.0' - -gem 'google-protobuf', '~> 3.7.1' - -gem 'toml-rb', '~> 1.0.0', require: false - -# Feature toggles -gem 'flipper', '~> 0.13.0' -gem 'flipper-active_record', '~> 0.13.0' -gem 'flipper-active_support_cache_store', '~> 0.13.0' - -# Structured logging -gem 'lograge', '~> 0.5' -gem 'grape_logging', '~> 1.7' diff --git a/pkgs/applications/version-management/gitlab/rubyEnv-ce/Gemfile.lock b/pkgs/applications/version-management/gitlab/rubyEnv-ce/Gemfile.lock deleted file mode 100644 index 60939ae918c8..000000000000 --- a/pkgs/applications/version-management/gitlab/rubyEnv-ce/Gemfile.lock +++ /dev/null @@ -1,1288 +0,0 @@ -GEM - remote: https://rubygems.org/ - specs: - RedCloth (4.3.2) - abstract_type (0.0.7) - ace-rails-ap (4.1.2) - acme-client (2.0.2) - faraday (~> 0.9, >= 0.9.1) - actioncable (5.2.3) - actionpack (= 5.2.3) - nio4r (~> 2.0) - websocket-driver (>= 0.6.1) - actionmailer (5.2.3) - actionpack (= 5.2.3) - actionview (= 5.2.3) - activejob (= 5.2.3) - mail (~> 2.5, >= 2.5.4) - rails-dom-testing (~> 2.0) - actionpack (5.2.3) - actionview (= 5.2.3) - activesupport (= 5.2.3) - rack (~> 2.0) - rack-test (>= 0.6.3) - rails-dom-testing (~> 2.0) - rails-html-sanitizer (~> 1.0, >= 1.0.2) - actionview (5.2.3) - activesupport (= 5.2.3) - builder (~> 3.1) - erubi (~> 1.4) - rails-dom-testing (~> 2.0) - rails-html-sanitizer (~> 1.0, >= 1.0.3) - activejob (5.2.3) - activesupport (= 5.2.3) - globalid (>= 0.3.6) - activemodel (5.2.3) - activesupport (= 5.2.3) - activerecord (5.2.3) - activemodel (= 5.2.3) - activesupport (= 5.2.3) - arel (>= 9.0) - activerecord-explain-analyze (0.1.0) - activerecord (>= 4) - pg - activerecord_sane_schema_dumper (1.0) - rails (>= 5, < 6) - activestorage (5.2.3) - actionpack (= 5.2.3) - activerecord (= 5.2.3) - marcel (~> 0.3.1) - activesupport (5.2.3) - concurrent-ruby (~> 1.0, >= 1.0.2) - i18n (>= 0.7, < 2) - minitest (~> 5.1) - tzinfo (~> 1.1) - acts-as-taggable-on (6.0.0) - activerecord (~> 5.0) - adamantium (0.2.0) - ice_nine (~> 0.11.0) - memoizable (~> 0.4.0) - addressable (2.5.2) - public_suffix (>= 2.0.2, < 4.0) - aes_key_wrap (1.0.1) - akismet (2.0.0) - apollo_upload_server (2.0.0.beta.3) - graphql (>= 1.8) - rails (>= 4.2) - arel (9.0.0) - asana (0.8.1) - faraday (~> 0.9) - faraday_middleware (~> 0.9) - faraday_middleware-multi_json (~> 0.0) - oauth2 (~> 1.0) - asciidoctor (2.0.10) - asciidoctor-include-ext (0.3.1) - asciidoctor (>= 1.5.6, < 3.0.0) - asciidoctor-plantuml (0.0.9) - asciidoctor (>= 1.5.6, < 3.0.0) - ast (2.4.0) - atomic (1.1.99) - attr_encrypted (3.1.0) - encryptor (~> 3.0.0) - attr_required (1.0.1) - awesome_print (1.8.0) - axiom-types (0.1.1) - descendants_tracker (~> 0.0.4) - ice_nine (~> 0.11.0) - thread_safe (~> 0.3, >= 0.3.1) - babosa (1.0.2) - base32 (0.3.2) - batch-loader (1.4.0) - bcrypt (3.1.12) - bcrypt_pbkdf (1.0.0) - benchmark-ips (2.3.0) - benchmark-memory (0.1.2) - memory_profiler (~> 0.9) - better_errors (2.5.0) - coderay (>= 1.0.0) - erubi (>= 1.0.0) - rack (>= 0.9.0) - bindata (2.4.3) - binding_ninja (0.2.3) - binding_of_caller (0.8.0) - debug_inspector (>= 0.0.1) - bootsnap (1.4.1) - msgpack (~> 1.0) - bootstrap_form (4.2.0) - actionpack (>= 5.0) - activemodel (>= 5.0) - brakeman (4.2.1) - browser (2.5.3) - builder (3.2.3) - bullet (5.5.1) - activesupport (>= 3.0.0) - uniform_notifier (~> 1.10.0) - bundler-audit (0.5.0) - bundler (~> 1.2) - thor (~> 0.18) - byebug (9.1.0) - capybara (3.22.0) - addressable - mini_mime (>= 0.1.3) - nokogiri (~> 1.8) - rack (>= 1.6.0) - rack-test (>= 0.6.3) - regexp_parser (~> 1.5) - xpath (~> 3.2) - capybara-screenshot (1.0.22) - capybara (>= 1.0, < 4) - launchy - carrierwave (1.3.1) - activemodel (>= 4.0.0) - activesupport (>= 4.0.0) - mime-types (>= 1.16) - cause (0.1) - character_set (1.1.2) - charlock_holmes (0.7.6) - childprocess (0.9.0) - ffi (~> 1.0, >= 1.0.11) - chronic (0.10.2) - chronic_duration (0.10.6) - numerizer (~> 0.1.1) - chunky_png (1.3.5) - citrus (3.0.2) - coderay (1.1.2) - coercible (1.0.0) - descendants_tracker (~> 0.0.1) - commonmarker (0.17.13) - ruby-enum (~> 0.5) - concord (0.1.5) - adamantium (~> 0.2.0) - equalizer (~> 0.0.9) - concurrent-ruby (1.1.5) - concurrent-ruby-ext (1.1.5) - concurrent-ruby (= 1.1.5) - connection_pool (2.2.2) - crack (0.4.3) - safe_yaml (~> 1.0.0) - crass (1.0.4) - creole (0.5.0) - css_parser (1.5.0) - addressable - daemons (1.2.6) - database_cleaner (1.7.0) - debug_inspector (0.0.3) - debugger-ruby_core_source (1.3.8) - deckar01-task_list (2.2.0) - html-pipeline - declarative (0.0.10) - declarative-option (0.1.0) - default_value_for (3.2.0) - activerecord (>= 3.2.0, < 6.0) - derailed_benchmarks (1.3.5) - benchmark-ips (~> 2) - get_process_mem (~> 0) - heapy (~> 0) - memory_profiler (~> 0) - rack (>= 1) - rake (> 10, < 13) - thor (~> 0.19) - descendants_tracker (0.0.4) - thread_safe (~> 0.3, >= 0.3.1) - device_detector (1.0.0) - devise (4.6.2) - bcrypt (~> 3.0) - orm_adapter (~> 0.1) - railties (>= 4.1.0, < 6.0) - responders - warden (~> 1.2.3) - devise-two-factor (3.0.0) - activesupport - attr_encrypted (>= 1.3, < 4, != 2) - devise (~> 4.0) - railties - rotp (~> 2.0) - diff-lcs (1.3) - diffy (3.1.0) - discordrb-webhooks-blackst0ne (3.3.0) - rest-client (~> 2.0) - docile (1.3.1) - domain_name (0.5.20180417) - unf (>= 0.0.5, < 1.0.0) - doorkeeper (4.3.2) - railties (>= 4.2) - doorkeeper-openid_connect (1.5.0) - doorkeeper (~> 4.3) - json-jwt (~> 1.6) - ed25519 (1.2.4) - email_reply_trimmer (0.1.6) - email_spec (2.2.0) - htmlentities (~> 4.3.3) - launchy (~> 2.1) - mail (~> 2.7) - encryptor (3.0.0) - equalizer (0.0.11) - erubi (1.8.0) - escape_utils (1.2.1) - et-orbi (1.2.1) - tzinfo - eventmachine (1.2.7) - excon (0.62.0) - execjs (2.6.0) - expression_parser (0.9.0) - extended-markdown-filter (0.6.0) - html-pipeline (~> 2.0) - factory_bot (4.8.2) - activesupport (>= 3.0.0) - factory_bot_rails (4.8.2) - factory_bot (~> 4.8.2) - railties (>= 3.0.0) - faraday (0.12.2) - multipart-post (>= 1.2, < 3) - faraday_middleware (0.12.2) - faraday (>= 0.7.4, < 1.0) - faraday_middleware-multi_json (0.0.6) - faraday_middleware - multi_json - fast_blank (1.0.0) - fast_gettext (1.6.0) - ffaker (2.10.0) - ffi (1.10.0) - flipper (0.13.0) - flipper-active_record (0.13.0) - activerecord (>= 3.2, < 6) - flipper (~> 0.13.0) - flipper-active_support_cache_store (0.13.0) - activesupport (>= 3.2, < 6) - flipper (~> 0.13.0) - flowdock (0.7.1) - httparty (~> 0.7) - multi_json - fog-aliyun (0.3.3) - fog-core - fog-json - ipaddress (~> 0.8) - xml-simple (~> 1.1) - fog-aws (3.5.2) - fog-core (~> 2.1) - fog-json (~> 1.1) - fog-xml (~> 0.1) - ipaddress (~> 0.8) - fog-core (2.1.0) - builder - excon (~> 0.58) - formatador (~> 0.2) - mime-types - fog-google (1.8.2) - fog-core (<= 2.1.0) - fog-json (~> 1.2) - fog-xml (~> 0.1.0) - google-api-client (~> 0.23.0) - fog-json (1.2.0) - fog-core - multi_json (~> 1.10) - fog-local (0.6.0) - fog-core (>= 1.27, < 3.0) - fog-openstack (1.0.8) - fog-core (~> 2.1) - fog-json (>= 1.0) - ipaddress (>= 0.8) - fog-rackspace (0.1.1) - fog-core (>= 1.35) - fog-json (>= 1.0) - fog-xml (>= 0.1) - ipaddress (>= 0.8) - fog-xml (0.1.3) - fog-core - nokogiri (>= 1.5.11, < 2.0.0) - font-awesome-rails (4.7.0.4) - railties (>= 3.2, < 6.0) - foreman (0.84.0) - thor (~> 0.19.1) - formatador (0.2.5) - fugit (1.2.1) - et-orbi (~> 1.1, >= 1.1.8) - raabro (~> 1.1) - fuubar (2.2.0) - rspec-core (~> 3.0) - ruby-progressbar (~> 1.4) - gemoji (3.0.1) - gemojione (3.3.0) - json - get_process_mem (0.2.3) - gettext (3.2.9) - locale (>= 2.0.5) - text (>= 1.3.0) - gettext_i18n_rails (1.8.0) - fast_gettext (>= 0.9.0) - gettext_i18n_rails_js (1.3.0) - gettext (>= 3.0.2) - gettext_i18n_rails (>= 0.7.1) - po_to_json (>= 1.0.0) - rails (>= 3.2.0) - gitaly-proto (1.37.0) - grpc (~> 1.0) - github-markup (1.7.0) - gitlab-labkit (0.3.0) - actionpack (~> 5) - activesupport (~> 5) - grpc (~> 1.19.0) - jaeger-client (~> 0.10) - opentracing (~> 0.4) - gitlab-markup (1.7.0) - gitlab-sidekiq-fetcher (0.4.0) - sidekiq (~> 5) - gitlab-styles (2.7.0) - rubocop (~> 0.69.0) - rubocop-gitlab-security (~> 0.1.0) - rubocop-performance (~> 1.1.0) - rubocop-rspec (~> 1.19) - gitlab_omniauth-ldap (2.1.1) - net-ldap (~> 0.16) - omniauth (~> 1.3) - pyu-ruby-sasl (>= 0.0.3.3, < 0.1) - rubyntlm (~> 0.5) - globalid (0.4.2) - activesupport (>= 4.2.0) - gon (6.2.0) - actionpack (>= 3.0) - multi_json - request_store (>= 1.0) - google-api-client (0.23.4) - addressable (~> 2.5, >= 2.5.1) - googleauth (>= 0.5, < 0.7.0) - httpclient (>= 2.8.1, < 3.0) - mime-types (~> 3.0) - representable (~> 3.0) - retriable (>= 2.0, < 4.0) - google-protobuf (3.7.1) - googleapis-common-protos-types (1.0.4) - google-protobuf (~> 3.0) - googleauth (0.6.6) - faraday (~> 0.12) - jwt (>= 1.4, < 3.0) - memoist (~> 0.12) - multi_json (~> 1.11) - os (>= 0.9, < 2.0) - signet (~> 0.7) - gpgme (2.0.18) - mini_portile2 (~> 2.3) - grape (1.1.0) - activesupport - builder - mustermann-grape (~> 1.0.0) - rack (>= 1.3.0) - rack-accept - virtus (>= 1.0.0) - grape-entity (0.7.1) - activesupport (>= 4.0) - multi_json (>= 1.3.2) - grape-path-helpers (1.1.0) - activesupport - grape (~> 1.0) - rake (~> 12) - grape_logging (1.7.0) - grape - graphiql-rails (1.4.10) - railties - sprockets-rails - graphql (1.8.1) - graphql-docs (1.6.0) - commonmarker (~> 0.16) - escape_utils (~> 1.2) - extended-markdown-filter (~> 0.4) - gemoji (~> 3.0) - graphql (~> 1.6) - html-pipeline (~> 2.8) - sass (~> 3.4) - grpc (1.19.0) - google-protobuf (~> 3.1) - googleapis-common-protos-types (~> 1.0.0) - haml (5.0.4) - temple (>= 0.8.0) - tilt - haml_lint (0.31.0) - haml (>= 4.0, < 5.1) - rainbow - rake (>= 10, < 13) - rubocop (>= 0.50.0) - sysexits (~> 1.1) - hamlit (2.8.8) - temple (>= 0.8.0) - thor - tilt - hangouts-chat (0.0.5) - hashdiff (0.3.8) - hashie (3.5.7) - hashie-forbidden_attributes (0.1.1) - hashie (>= 3.0) - health_check (2.6.0) - rails (>= 4.0) - heapy (0.1.4) - hipchat (1.5.2) - httparty - mimemagic - html-pipeline (2.8.4) - activesupport (>= 2) - nokogiri (>= 1.4) - html2text (0.2.0) - nokogiri (~> 1.6) - htmlentities (4.3.4) - http (3.3.0) - addressable (~> 2.3) - http-cookie (~> 1.0) - http-form_data (~> 2.0) - http_parser.rb (~> 0.6.0) - http-cookie (1.0.3) - domain_name (~> 0.5) - http-form_data (2.1.1) - http_parser.rb (0.6.0) - httparty (0.16.4) - mime-types (~> 3.0) - multi_xml (>= 0.5.2) - httpclient (2.8.3) - i18n (1.6.0) - concurrent-ruby (~> 1.0) - icalendar (2.4.1) - ice_nine (0.11.2) - influxdb (0.2.3) - cause - json - ipaddress (0.8.3) - jaeger-client (0.10.0) - opentracing (~> 0.3) - thrift - jaro_winkler (1.5.2) - jira-ruby (1.4.1) - activesupport - multipart-post - oauth (~> 0.5, >= 0.5.0) - js_regex (3.1.1) - character_set (~> 1.1) - regexp_parser (~> 1.1) - regexp_property_values (~> 0.3) - json (1.8.6) - json-jwt (1.9.4) - activesupport - aes_key_wrap - bindata - json-schema (2.8.0) - addressable (>= 2.4) - jwt (2.1.0) - kaminari (1.0.1) - activesupport (>= 4.1.0) - kaminari-actionview (= 1.0.1) - kaminari-activerecord (= 1.0.1) - kaminari-core (= 1.0.1) - kaminari-actionview (1.0.1) - actionview - kaminari-core (= 1.0.1) - kaminari-activerecord (1.0.1) - activerecord - kaminari-core (= 1.0.1) - kaminari-core (1.0.1) - kgio (2.11.2) - knapsack (1.17.0) - rake - kramdown (1.17.0) - kubeclient (4.2.2) - http (~> 3.0) - recursive-open-struct (~> 1.0, >= 1.0.4) - rest-client (~> 2.0) - launchy (2.4.3) - addressable (~> 2.3) - letter_opener (1.7.0) - launchy (~> 2.2) - letter_opener_web (1.3.4) - actionmailer (>= 3.2) - letter_opener (~> 1.0) - railties (>= 3.2) - license_finder (5.4.0) - bundler - rubyzip - thor - toml (= 0.2.0) - with_env (= 1.1.0) - xml-simple - licensee (8.9.2) - rugged (~> 0.24) - locale (2.1.2) - lograge (0.10.0) - actionpack (>= 4) - activesupport (>= 4) - railties (>= 4) - request_store (~> 1.0) - loofah (2.2.3) - crass (~> 1.0.2) - nokogiri (>= 1.5.9) - mail (2.7.1) - mini_mime (>= 0.1.1) - mail_room (0.9.1) - marcel (0.3.3) - mimemagic (~> 0.3.2) - mdl (0.5.0) - kramdown (~> 1.12, >= 1.12.0) - mixlib-cli (~> 1.7, >= 1.7.0) - mixlib-config (~> 2.2, >= 2.2.1) - memoist (0.16.0) - memoizable (0.4.2) - thread_safe (~> 0.3, >= 0.3.1) - memory_profiler (0.9.13) - method_source (0.9.2) - mime-types (3.2.2) - mime-types-data (~> 3.2015) - mime-types-data (3.2019.0331) - mimemagic (0.3.2) - mini_magick (4.8.0) - mini_mime (1.0.1) - mini_portile2 (2.4.0) - minitest (5.11.3) - mixlib-cli (1.7.0) - mixlib-config (2.2.18) - tomlrb - msgpack (1.2.10) - multi_json (1.13.1) - multi_xml (0.6.0) - multipart-post (2.0.0) - mustermann (1.0.3) - mustermann-grape (1.0.0) - mustermann (~> 1.0.0) - mysql2 (0.4.10) - nakayoshi_fork (0.0.4) - net-ldap (0.16.0) - net-ssh (5.2.0) - netrc (0.11.0) - nio4r (2.3.1) - nokogiri (1.10.3) - mini_portile2 (~> 2.4.0) - nokogumbo (1.5.0) - nokogiri - numerizer (0.1.1) - oauth (0.5.4) - oauth2 (1.4.1) - faraday (>= 0.8, < 0.16.0) - jwt (>= 1.0, < 3.0) - multi_json (~> 1.3) - multi_xml (~> 0.5) - rack (>= 1.2, < 3) - octokit (4.9.0) - sawyer (~> 0.8.0, >= 0.5.3) - omniauth (1.9.0) - hashie (>= 3.4.6, < 3.7.0) - rack (>= 1.6.2, < 3) - omniauth-auth0 (2.0.0) - omniauth-oauth2 (~> 1.4) - omniauth-authentiq (0.3.3) - jwt (>= 1.5) - omniauth-oauth2 (>= 1.5) - omniauth-azure-oauth2 (0.0.10) - jwt (>= 1.0, < 3.0) - omniauth (~> 1.0) - omniauth-oauth2 (~> 1.4) - omniauth-cas3 (1.1.4) - addressable (~> 2.3) - nokogiri (~> 1.7, >= 1.7.1) - omniauth (~> 1.2) - omniauth-facebook (4.0.0) - omniauth-oauth2 (~> 1.2) - omniauth-github (1.3.0) - omniauth (~> 1.5) - omniauth-oauth2 (>= 1.4.0, < 2.0) - omniauth-gitlab (1.0.3) - omniauth (~> 1.0) - omniauth-oauth2 (~> 1.0) - omniauth-google-oauth2 (0.6.0) - jwt (>= 2.0) - omniauth (>= 1.1.1) - omniauth-oauth2 (>= 1.5) - omniauth-kerberos (0.3.0) - omniauth-multipassword - timfel-krb5-auth (~> 0.8) - omniauth-multipassword (0.4.2) - omniauth (~> 1.0) - omniauth-oauth (1.1.0) - oauth - omniauth (~> 1.0) - omniauth-oauth2 (1.6.0) - oauth2 (~> 1.1) - omniauth (~> 1.9) - omniauth-oauth2-generic (0.2.2) - omniauth-oauth2 (~> 1.0) - omniauth-salesforce (1.0.5) - omniauth (~> 1.0) - omniauth-oauth2 (~> 1.0) - omniauth-saml (1.10.0) - omniauth (~> 1.3, >= 1.3.2) - ruby-saml (~> 1.7) - omniauth-shibboleth (1.3.0) - omniauth (>= 1.0.0) - omniauth-twitter (1.4.0) - omniauth-oauth (~> 1.1) - rack - omniauth-ultraauth (0.0.2) - omniauth_openid_connect (~> 0.3.0) - omniauth_crowd (2.2.3) - activesupport - nokogiri (>= 1.4.4) - omniauth (~> 1.0) - omniauth_openid_connect (0.3.1) - addressable (~> 2.5) - omniauth (~> 1.3) - openid_connect (~> 1.1) - openid_connect (1.1.6) - activemodel - attr_required (>= 1.0.0) - json-jwt (>= 1.5.0) - rack-oauth2 (>= 1.6.1) - swd (>= 1.0.0) - tzinfo - validate_email - validate_url - webfinger (>= 1.0.1) - opentracing (0.5.0) - optimist (3.0.0) - org-ruby (0.9.12) - rubypants (~> 0.2) - orm_adapter (0.5.0) - os (1.0.0) - parallel (1.17.0) - parser (2.6.3.0) - ast (~> 2.4.0) - parslet (1.8.2) - peek (1.0.1) - concurrent-ruby (>= 0.9.0) - concurrent-ruby-ext (>= 0.9.0) - railties (>= 4.0.0) - peek-gc (0.0.2) - peek - peek-mysql2 (1.2.0) - concurrent-ruby - concurrent-ruby-ext - mysql2 - peek - peek-pg (1.3.0) - concurrent-ruby - concurrent-ruby-ext - peek - pg - peek-rblineprof (0.2.0) - peek - rblineprof - peek-redis (1.2.0) - atomic (>= 1.0.0) - peek - redis - pg (1.1.4) - po_to_json (1.0.1) - json (>= 1.6.0) - premailer (1.10.4) - addressable - css_parser (>= 1.4.10) - htmlentities (>= 4.0.0) - premailer-rails (1.9.7) - actionmailer (>= 3, < 6) - premailer (~> 1.7, >= 1.7.9) - proc_to_ast (0.1.0) - coderay - parser - unparser - procto (0.0.3) - prometheus-client-mmap (0.9.8) - pry (0.11.3) - coderay (~> 1.1.0) - method_source (~> 0.9.0) - pry-byebug (3.5.1) - byebug (~> 9.1) - pry (~> 0.10) - pry-rails (0.3.6) - pry (>= 0.10.4) - public_suffix (3.1.0) - puma (3.12.0) - puma_worker_killer (0.1.0) - get_process_mem (~> 0.2) - puma (>= 2.7, < 4) - pyu-ruby-sasl (0.0.3.3) - raabro (1.1.6) - rack (2.0.7) - rack-accept (0.4.5) - rack (>= 0.4) - rack-attack (4.4.1) - rack - rack-cors (1.0.2) - rack-oauth2 (1.9.3) - activesupport - attr_required - httpclient - json-jwt (>= 1.9.0) - rack - rack-protection (2.0.5) - rack - rack-proxy (0.6.0) - rack - rack-test (1.1.0) - rack (>= 1.0, < 3) - rack-timeout (0.5.1) - rails (5.2.3) - actioncable (= 5.2.3) - actionmailer (= 5.2.3) - actionpack (= 5.2.3) - actionview (= 5.2.3) - activejob (= 5.2.3) - activemodel (= 5.2.3) - activerecord (= 5.2.3) - activestorage (= 5.2.3) - activesupport (= 5.2.3) - bundler (>= 1.3.0) - railties (= 5.2.3) - sprockets-rails (>= 2.0.0) - rails-controller-testing (1.0.2) - actionpack (~> 5.x, >= 5.0.1) - actionview (~> 5.x, >= 5.0.1) - activesupport (~> 5.x) - rails-dom-testing (2.0.3) - activesupport (>= 4.2.0) - nokogiri (>= 1.6) - rails-html-sanitizer (1.0.4) - loofah (~> 2.2, >= 2.2.2) - rails-i18n (5.1.1) - i18n (>= 0.7, < 2) - railties (>= 5.0, < 6) - railties (5.2.3) - actionpack (= 5.2.3) - activesupport (= 5.2.3) - method_source - rake (>= 0.8.7) - thor (>= 0.19.0, < 2.0) - rainbow (3.0.0) - raindrops (0.19.0) - rake (12.3.2) - rb-fsevent (0.10.2) - rb-inotify (0.9.10) - ffi (>= 0.5.0, < 2) - rblineprof (0.3.6) - debugger-ruby_core_source (~> 1.3) - rbtrace (0.4.11) - ffi (>= 1.0.6) - msgpack (>= 0.4.3) - optimist (>= 3.0.0) - rdoc (6.0.4) - re2 (1.1.1) - recaptcha (4.13.1) - json - recursive-open-struct (1.1.0) - redis (3.3.5) - redis-actionpack (5.0.2) - actionpack (>= 4.0, < 6) - redis-rack (>= 1, < 3) - redis-store (>= 1.1.0, < 2) - redis-activesupport (5.0.4) - activesupport (>= 3, < 6) - redis-store (>= 1.3, < 2) - redis-namespace (1.6.0) - redis (>= 3.0.4) - redis-rack (2.0.4) - rack (>= 1.5, < 3) - redis-store (>= 1.2, < 2) - redis-rails (5.0.2) - redis-actionpack (>= 5.0, < 6) - redis-activesupport (>= 5.0, < 6) - redis-store (>= 1.2, < 2) - redis-store (1.6.0) - redis (>= 2.2, < 5) - regexp_parser (1.5.1) - regexp_property_values (0.3.4) - representable (3.0.4) - declarative (< 0.1.0) - declarative-option (< 0.2.0) - uber (< 0.2.0) - request_store (1.3.1) - responders (2.4.0) - actionpack (>= 4.2.0, < 5.3) - railties (>= 4.2.0, < 5.3) - rest-client (2.0.2) - http-cookie (>= 1.0.2, < 2.0) - mime-types (>= 1.16, < 4.0) - netrc (~> 0.8) - retriable (3.1.2) - rinku (2.0.0) - rotp (2.1.2) - rouge (3.5.1) - rqrcode (0.7.0) - chunky_png - rqrcode-rails3 (0.1.7) - rqrcode (>= 0.4.2) - rspec (3.8.0) - rspec-core (~> 3.8.0) - rspec-expectations (~> 3.8.0) - rspec-mocks (~> 3.8.0) - rspec-core (3.8.2) - rspec-support (~> 3.8.0) - rspec-expectations (3.8.4) - diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.8.0) - rspec-mocks (3.8.1) - diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.8.0) - rspec-parameterized (0.4.2) - binding_ninja (>= 0.2.3) - parser - proc_to_ast - rspec (>= 2.13, < 4) - unparser - rspec-rails (3.8.2) - actionpack (>= 3.0) - activesupport (>= 3.0) - railties (>= 3.0) - rspec-core (~> 3.8.0) - rspec-expectations (~> 3.8.0) - rspec-mocks (~> 3.8.0) - rspec-support (~> 3.8.0) - rspec-retry (0.6.1) - rspec-core (> 3.3) - rspec-set (0.1.3) - rspec-support (3.8.2) - rspec_junit_formatter (0.4.1) - rspec-core (>= 2, < 4, != 2.12.0) - rspec_profiling (0.0.5) - activerecord - pg - rails - sqlite3 - rubocop (0.69.0) - jaro_winkler (~> 1.5.1) - parallel (~> 1.10) - parser (>= 2.6) - rainbow (>= 2.2.2, < 4.0) - ruby-progressbar (~> 1.7) - unicode-display_width (>= 1.4.0, < 1.7) - rubocop-gitlab-security (0.1.1) - rubocop (>= 0.51) - rubocop-performance (1.1.0) - rubocop (>= 0.67.0) - rubocop-rspec (1.22.2) - rubocop (>= 0.52.1) - ruby-enum (0.7.2) - i18n - ruby-fogbugz (0.2.1) - crack (~> 0.4) - ruby-prof (0.17.0) - ruby-progressbar (1.10.0) - ruby-saml (1.7.2) - nokogiri (>= 1.5.10) - ruby_parser (3.13.1) - sexp_processor (~> 4.9) - rubyntlm (0.6.2) - rubypants (0.2.0) - rubyzip (1.2.2) - rugged (0.28.1) - safe_yaml (1.0.4) - sanitize (4.6.6) - crass (~> 1.0.2) - nokogiri (>= 1.4.4) - nokogumbo (~> 1.4) - sass (3.5.5) - sass-listen (~> 4.0.0) - sass-listen (4.0.0) - rb-fsevent (~> 0.9, >= 0.9.4) - rb-inotify (~> 0.9, >= 0.9.7) - sassc (2.0.1) - ffi (~> 1.9) - rake - sassc-rails (2.1.0) - railties (>= 4.0.0) - sassc (>= 2.0) - sprockets (> 3.0) - sprockets-rails - tilt - sawyer (0.8.1) - addressable (>= 2.3.5, < 2.6) - faraday (~> 0.8, < 1.0) - scss_lint (0.56.0) - rake (>= 0.9, < 13) - sass (~> 3.5.3) - seed-fu (2.3.7) - activerecord (>= 3.1) - activesupport (>= 3.1) - selenium-webdriver (3.141.0) - childprocess (~> 0.5) - rubyzip (~> 1.2, >= 1.2.2) - sentry-raven (2.9.0) - faraday (>= 0.7.6, < 1.0) - settingslogic (2.0.9) - sexp_processor (4.12.0) - sham_rack (1.3.6) - rack - shoulda-matchers (4.0.1) - activesupport (>= 4.2.0) - sidekiq (5.2.7) - connection_pool (~> 2.2, >= 2.2.2) - rack (>= 1.5.0) - rack-protection (>= 1.5.0) - redis (>= 3.3.5, < 5) - sidekiq-cron (1.0.4) - fugit (~> 1.1) - sidekiq (>= 4.2.1) - signet (0.11.0) - addressable (~> 2.3) - faraday (~> 0.9) - jwt (>= 1.5, < 3.0) - multi_json (~> 1.10) - simple_po_parser (1.1.2) - simplecov (0.16.1) - docile (~> 1.1) - json (>= 1.8, < 3) - simplecov-html (~> 0.10.0) - simplecov-html (0.10.2) - slack-notifier (1.5.1) - spring (2.0.2) - activesupport (>= 4.2) - spring-commands-rspec (1.0.4) - spring (>= 0.9.1) - sprockets (3.7.2) - concurrent-ruby (~> 1.0) - rack (> 1, < 3) - sprockets-rails (3.2.1) - actionpack (>= 4.0) - activesupport (>= 4.0) - sprockets (>= 3.0.0) - sqlite3 (1.3.13) - sshkey (2.0.0) - stackprof (0.2.10) - state_machines (0.5.0) - state_machines-activemodel (0.5.1) - activemodel (>= 4.1, < 6.0) - state_machines (>= 0.5.0) - state_machines-activerecord (0.5.1) - activerecord (>= 4.1, < 6.0) - state_machines-activemodel (>= 0.5.0) - swd (1.1.2) - activesupport (>= 3) - attr_required (>= 0.0.5) - httpclient (>= 2.4) - sys-filesystem (1.1.6) - ffi - sysexits (1.2.0) - temple (0.8.0) - test-prof (0.2.5) - text (1.3.1) - thin (1.7.2) - daemons (~> 1.0, >= 1.0.9) - eventmachine (~> 1.0, >= 1.0.4) - rack (>= 1, < 3) - thor (0.19.4) - thread_safe (0.3.6) - thrift (0.11.0.0) - tilt (2.0.8) - timecop (0.8.1) - timfel-krb5-auth (0.8.3) - toml (0.2.0) - parslet (~> 1.8.0) - toml-rb (1.0.0) - citrus (~> 3.0, > 3.0) - tomlrb (1.2.8) - truncato (0.7.11) - htmlentities (~> 4.3.1) - nokogiri (>= 1.7.0, <= 2.0) - tzinfo (1.2.5) - thread_safe (~> 0.1) - u2f (0.2.1) - uber (0.1.0) - uglifier (2.7.2) - execjs (>= 0.3.0) - json (>= 1.8.0) - unf (0.1.4) - unf_ext - unf_ext (0.0.7.5) - unicode-display_width (1.6.0) - unicorn (5.4.1) - kgio (~> 2.6) - raindrops (~> 0.7) - unicorn-worker-killer (0.4.4) - get_process_mem (~> 0) - unicorn (>= 4, < 6) - uniform_notifier (1.10.0) - unparser (0.4.5) - abstract_type (~> 0.0.7) - adamantium (~> 0.2.0) - concord (~> 0.1.5) - diff-lcs (~> 1.3) - equalizer (~> 0.0.9) - parser (~> 2.6.3) - procto (~> 0.0.2) - validate_email (0.1.6) - activemodel (>= 3.0) - mail (>= 2.2.5) - validate_url (1.0.8) - activemodel (>= 3.0.0) - public_suffix - validates_hostname (1.0.6) - activerecord (>= 3.0) - activesupport (>= 3.0) - version_sorter (2.2.4) - virtus (1.0.5) - axiom-types (~> 0.1) - coercible (~> 1.0) - descendants_tracker (~> 0.0, >= 0.0.3) - equalizer (~> 0.0, >= 0.0.9) - vmstat (2.3.0) - warden (1.2.7) - rack (>= 1.0) - webfinger (1.1.0) - activesupport - httpclient (>= 2.4) - webmock (3.5.1) - addressable (>= 2.3.6) - crack (>= 0.3.2) - hashdiff - webpack-rails (0.9.11) - railties (>= 3.2.0) - websocket-driver (0.7.0) - websocket-extensions (>= 0.1.0) - websocket-extensions (0.1.3) - wikicloth (0.8.1) - builder - expression_parser - rinku - with_env (1.1.0) - xml-simple (1.1.5) - xpath (3.2.0) - nokogiri (~> 1.8) - -PLATFORMS - ruby - -DEPENDENCIES - RedCloth (~> 4.3.2) - ace-rails-ap (~> 4.1.0) - acme-client (~> 2.0.2) - activerecord-explain-analyze (~> 0.1) - activerecord_sane_schema_dumper (= 1.0) - acts-as-taggable-on (~> 6.0) - addressable (~> 2.5.2) - akismet (~> 2.0) - apollo_upload_server (~> 2.0.0.beta3) - asana (~> 0.8.1) - asciidoctor (~> 2.0.10) - asciidoctor-include-ext (~> 0.3.1) - asciidoctor-plantuml (= 0.0.9) - attr_encrypted (~> 3.1.0) - awesome_print - babosa (~> 1.0.2) - base32 (~> 0.3.0) - batch-loader (~> 1.4.0) - bcrypt_pbkdf (~> 1.0) - benchmark-ips (~> 2.3.0) - benchmark-memory (~> 0.1) - better_errors (~> 2.5.0) - binding_of_caller (~> 0.8.0) - bootsnap (~> 1.4) - bootstrap_form (~> 4.2.0) - brakeman (~> 4.2) - browser (~> 2.5) - bullet (~> 5.5.0) - bundler-audit (~> 0.5.0) - capybara (~> 3.22.0) - capybara-screenshot (~> 1.0.22) - carrierwave (~> 1.3) - charlock_holmes (~> 0.7.5) - chronic (~> 0.10.2) - chronic_duration (~> 0.10.6) - commonmarker (~> 0.17) - concurrent-ruby (~> 1.1) - connection_pool (~> 2.0) - creole (~> 0.5.0) - database_cleaner (~> 1.7.0) - deckar01-task_list (= 2.2.0) - default_value_for (~> 3.2.0) - derailed_benchmarks - device_detector - devise (~> 4.6) - devise-two-factor (~> 3.0.0) - diffy (~> 3.1.0) - discordrb-webhooks-blackst0ne (~> 3.3) - doorkeeper (~> 4.3) - doorkeeper-openid_connect (~> 1.5) - ed25519 (~> 1.2) - email_reply_trimmer (~> 0.1) - email_spec (~> 2.2.0) - escape_utils (~> 1.1) - factory_bot_rails (~> 4.8.2) - faraday (~> 0.12) - fast_blank - ffaker (~> 2.10) - flipper (~> 0.13.0) - flipper-active_record (~> 0.13.0) - flipper-active_support_cache_store (~> 0.13.0) - flowdock (~> 0.7) - fog-aliyun (~> 0.3) - fog-aws (~> 3.5) - fog-core (= 2.1.0) - fog-google (~> 1.8) - fog-local (~> 0.6) - fog-openstack (~> 1.0) - fog-rackspace (~> 0.1.1) - font-awesome-rails (~> 4.7) - foreman (~> 0.84.0) - fugit (~> 1.2.1) - fuubar (~> 2.2.0) - gemojione (~> 3.3) - gettext (~> 3.2.2) - gettext_i18n_rails (~> 1.8.0) - gettext_i18n_rails_js (~> 1.3) - gitaly-proto (~> 1.37.0) - github-markup (~> 1.7.0) - gitlab-labkit (~> 0.3.0) - gitlab-markup (~> 1.7.0) - gitlab-sidekiq-fetcher (~> 0.4.0) - gitlab-styles (~> 2.7) - gitlab_omniauth-ldap (~> 2.1.1) - gon (~> 6.2) - google-api-client (~> 0.23) - google-protobuf (~> 3.7.1) - gpgme (~> 2.0.18) - grape (~> 1.1.0) - grape-entity (~> 0.7.1) - grape-path-helpers (~> 1.1) - grape_logging (~> 1.7) - graphiql-rails (~> 1.4.10) - graphql (~> 1.8.0) - graphql-docs (~> 1.6.0) - grpc (~> 1.19.0) - haml_lint (~> 0.31.0) - hamlit (~> 2.8.8) - hangouts-chat (~> 0.0.5) - hashie-forbidden_attributes - health_check (~> 2.6.0) - hipchat (~> 1.5.0) - html-pipeline (~> 2.8) - html2text - httparty (~> 0.16.4) - icalendar - influxdb (~> 0.2) - jira-ruby (~> 1.4) - js_regex (~> 3.1) - json-schema (~> 2.8.0) - jwt (~> 2.1.0) - kaminari (~> 1.0) - knapsack (~> 1.17) - kubeclient (~> 4.2.2) - letter_opener_web (~> 1.3.4) - license_finder (~> 5.4) - licensee (~> 8.9) - lograge (~> 0.5) - loofah (~> 2.2) - mail_room (~> 0.9.1) - mdl (~> 0.5.0) - memory_profiler (~> 0.9) - method_source (~> 0.8) - mimemagic (~> 0.3.2) - mini_magick - minitest (~> 5.11.0) - mysql2 (~> 0.4.10) - nakayoshi_fork (~> 0.0.4) - net-ldap - net-ssh (~> 5.2) - nokogiri (~> 1.10.3) - oauth2 (~> 1.4) - octokit (~> 4.9) - omniauth (~> 1.8) - omniauth-auth0 (~> 2.0.0) - omniauth-authentiq (~> 0.3.3) - omniauth-azure-oauth2 (~> 0.0.9) - omniauth-cas3 (~> 1.1.4) - omniauth-facebook (~> 4.0.0) - omniauth-github (~> 1.3) - omniauth-gitlab (~> 1.0.2) - omniauth-google-oauth2 (~> 0.6.0) - omniauth-kerberos (~> 0.3.0) - omniauth-oauth2-generic (~> 0.2.2) - omniauth-salesforce (~> 1.0.5) - omniauth-saml (~> 1.10) - omniauth-shibboleth (~> 1.3.0) - omniauth-twitter (~> 1.4) - omniauth-ultraauth (~> 0.0.2) - omniauth_crowd (~> 2.2.0) - omniauth_openid_connect (~> 0.3.1) - org-ruby (~> 0.9.12) - peek (~> 1.0.1) - peek-gc (~> 0.0.2) - peek-mysql2 (~> 1.2.0) - peek-pg (~> 1.3.0) - peek-rblineprof (~> 0.2.0) - peek-redis (~> 1.2.0) - pg (~> 1.1) - premailer-rails (~> 1.9.7) - prometheus-client-mmap (~> 0.9.8) - pry-byebug (~> 3.5.1) - pry-rails (~> 0.3.4) - puma (~> 3.12) - puma_worker_killer - rack (~> 2.0.7) - rack-attack (~> 4.4.1) - rack-cors (~> 1.0.0) - rack-oauth2 (~> 1.9.3) - rack-proxy (~> 0.6.0) - rack-timeout - rails (= 5.2.3) - rails-controller-testing - rails-i18n (~> 5.1) - rainbow (~> 3.0) - raindrops (~> 0.18) - rblineprof (~> 0.3.6) - rbtrace (~> 0.4) - rdoc (~> 6.0) - re2 (~> 1.1.1) - recaptcha (~> 4.11) - redis (~> 3.2) - redis-namespace (~> 1.6.0) - redis-rails (~> 5.0.2) - request_store (~> 1.3) - responders (~> 2.0) - rouge (~> 3.5) - rqrcode-rails3 (~> 0.1.7) - rspec-parameterized - rspec-rails (~> 3.8.0) - rspec-retry (~> 0.6.1) - rspec-set (~> 0.1.3) - rspec_junit_formatter - rspec_profiling (~> 0.0.5) - rubocop (~> 0.69.0) - rubocop-performance (~> 1.1.0) - rubocop-rspec (~> 1.22.1) - ruby-fogbugz (~> 0.2.1) - ruby-prof (~> 0.17.0) - ruby-progressbar - ruby_parser (~> 3.8) - rubyzip (~> 1.2.2) - rugged (~> 0.28) - sanitize (~> 4.6) - sassc-rails (~> 2.1.0) - scss_lint (~> 0.56.0) - seed-fu (~> 2.3.7) - selenium-webdriver (~> 3.141) - sentry-raven (~> 2.9) - settingslogic (~> 2.0.9) - sham_rack (~> 1.3.6) - shoulda-matchers (~> 4.0.1) - sidekiq (~> 5.2.7) - sidekiq-cron (~> 1.0) - simple_po_parser (~> 1.1.2) - simplecov (~> 0.16.1) - slack-notifier (~> 1.5.1) - spring (~> 2.0.0) - spring-commands-rspec (~> 1.0.4) - sprockets (~> 3.7.0) - sshkey (~> 2.0) - stackprof (~> 0.2.10) - state_machines-activerecord (~> 0.5.1) - sys-filesystem (~> 1.1.6) - test-prof (~> 0.2.5) - thin (~> 1.7.0) - timecop (~> 0.8.0) - toml-rb (~> 1.0.0) - truncato (~> 0.7.11) - u2f (~> 0.2.1) - uglifier (~> 2.7.2) - unf (~> 0.1.4) - unicorn (~> 5.4.1) - unicorn-worker-killer (~> 0.4.4) - validates_hostname (~> 1.0.6) - version_sorter (~> 2.2.4) - virtus (~> 1.0.1) - vmstat (~> 2.3.0) - webmock (~> 3.5.1) - webpack-rails (~> 0.9.10) - wikicloth (= 0.8.1) - -BUNDLED WITH - 1.17.3 diff --git a/pkgs/applications/version-management/gitlab/rubyEnv-ce/gemset.nix b/pkgs/applications/version-management/gitlab/rubyEnv-ce/gemset.nix deleted file mode 100644 index 8da7a3262c12..000000000000 --- a/pkgs/applications/version-management/gitlab/rubyEnv-ce/gemset.nix +++ /dev/null @@ -1,4025 +0,0 @@ -{ - abstract_type = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "09330cmhrc2wmfhdj9zzg82sv6cdhm3qgdkva5ni5xfjril2pf14"; - type = "gem"; - }; - version = "0.0.7"; - }; - ace-rails-ap = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "14wj9gsiy7rm0lvs27ffsrh92wndjksj6rlfj3n7jhv1v77w9v2h"; - type = "gem"; - }; - version = "4.1.2"; - }; - acme-client = { - dependencies = ["faraday"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1552fkgaj6qfylwsckgmhck34shjqnfrzymj1ji1kq3r310qqrnp"; - type = "gem"; - }; - version = "2.0.2"; - }; - actioncable = { - dependencies = ["actionpack" "nio4r" "websocket-driver"]; - groups = ["default" "development" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "04wd9rf8sglrqc8jz49apqcxbi51gdj7l1apf5qr4i86iddk6pkm"; - type = "gem"; - }; - version = "5.2.3"; - }; - actionmailer = { - dependencies = ["actionpack" "actionview" "activejob" "mail" "rails-dom-testing"]; - groups = ["default" "development" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "15laym06zcm2021qdhlyr6y9jn1marw436i89hcxqg14a8zvyvwa"; - type = "gem"; - }; - version = "5.2.3"; - }; - actionpack = { - dependencies = ["actionview" "activesupport" "rack" "rack-test" "rails-dom-testing" "rails-html-sanitizer"]; - groups = ["default" "development" "mysql" "postgres" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1s2iay17i2k0xx36cmnpbrmr5w6x70jk7fq1d8w70xcdw5chm0w1"; - type = "gem"; - }; - version = "5.2.3"; - }; - actionview = { - dependencies = ["activesupport" "builder" "erubi" "rails-dom-testing" "rails-html-sanitizer"]; - groups = ["default" "development" "mysql" "postgres" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1v49rgf8305grqf6gq7qa47qhamr369igyy0giycz60x86afyr4h"; - type = "gem"; - }; - version = "5.2.3"; - }; - activejob = { - dependencies = ["activesupport" "globalid"]; - groups = ["default" "development" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "17vizibxbsli5yppgrvmw13wj7a9xy19s5nqxf1k23bbk2s5b87s"; - type = "gem"; - }; - version = "5.2.3"; - }; - activemodel = { - dependencies = ["activesupport"]; - groups = ["default" "development" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0mghh9di8011ara9h1r5a216yzk1vjm9r3p0gdvdi8j1zmkl6k6h"; - type = "gem"; - }; - version = "5.2.3"; - }; - activerecord = { - dependencies = ["activemodel" "activesupport" "arel"]; - groups = ["default" "development" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0d6036f592803iyvp6bw98p3sg638mia5dbw19lvachx6jgzfvpw"; - type = "gem"; - }; - version = "5.2.3"; - }; - activerecord-explain-analyze = { - dependencies = ["activerecord" "pg"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0yvz452ww0vn3n6197gx6zklwa591gc7f1m8accvjd9zw8gv3ssx"; - type = "gem"; - }; - version = "0.1.0"; - }; - activerecord_sane_schema_dumper = { - dependencies = ["rails"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "16jbf461wjaxyq26si5505wcj46mi23mii9hx4wjpva1zn9hz5m2"; - type = "gem"; - }; - version = "1.0"; - }; - activestorage = { - dependencies = ["actionpack" "activerecord" "marcel"]; - groups = ["default" "development" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "04is6ipjqw1f337i8pm8w5bd99rpygqfd0fzzxkr7jd308ggmsjk"; - type = "gem"; - }; - version = "5.2.3"; - }; - activesupport = { - dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo"]; - groups = ["default" "development" "mysql" "postgres" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "110vp4frgkw3mpzlmshg2f2ig09cknls2w68ym1r1s39d01v0mi8"; - type = "gem"; - }; - version = "5.2.3"; - }; - acts-as-taggable-on = { - dependencies = ["activerecord"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0hl52pjgfzy3acdwnbxfqy08m808vlv9dmsyp03d5x7x0y499kvl"; - type = "gem"; - }; - version = "6.0.0"; - }; - adamantium = { - dependencies = ["ice_nine" "memoizable"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0165r2ikgfwv2rm8dzyijkp74fvg0ni72hpdx8ay2v7cj08dqyak"; - type = "gem"; - }; - version = "0.2.0"; - }; - addressable = { - dependencies = ["public_suffix"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0viqszpkggqi8hq87pqp0xykhvz60g99nwmkwsb0v45kc2liwxvk"; - type = "gem"; - }; - version = "2.5.2"; - }; - aes_key_wrap = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0li86k0g812jkzrppb2fvqngvzp09nygywjpn81nx90s01wxqw07"; - type = "gem"; - }; - version = "1.0.1"; - }; - akismet = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0hqpn25iyypkwkrqaibjm5nss5jmlkrddhia7frmz94prvyjr02w"; - type = "gem"; - }; - version = "2.0.0"; - }; - apollo_upload_server = { - dependencies = ["graphql" "rails"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0riijpyicbkqsr46w4mfhh3pq2yrmakkz8mmgbrfjhzbyzac25na"; - type = "gem"; - }; - version = "2.0.0.beta.3"; - }; - arel = { - groups = ["default" "development" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1jk7wlmkr61f6g36w9s2sn46nmdg6wn2jfssrhbhirv5x9n95nk0"; - type = "gem"; - }; - version = "9.0.0"; - }; - asana = { - dependencies = ["faraday" "faraday_middleware" "faraday_middleware-multi_json" "oauth2"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1h0qiywvjjc9iyzq9nz5iaqyh6qsrix4ip0w86j5c4v5g940z6qx"; - type = "gem"; - }; - version = "0.8.1"; - }; - asciidoctor = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1b2ajs3sabl0s27r7lhwkacw0yn0zfk4jpmidg9l8lzp2qlgjgbz"; - type = "gem"; - }; - version = "2.0.10"; - }; - asciidoctor-include-ext = { - dependencies = ["asciidoctor"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1alaqfh31hd98yhqq8fsc50zzqw04p3d83pc35gdx3x9p3j1ds7d"; - type = "gem"; - }; - version = "0.3.1"; - }; - asciidoctor-plantuml = { - dependencies = ["asciidoctor"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0lzxj16w7s3w0wnlpg8lfs9v2xxk3x3c1skynqm1sms7rjhnhlnb"; - type = "gem"; - }; - version = "0.0.9"; - }; - ast = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "184ssy3w93nkajlz2c70ifm79jp3j737294kbc5fjw69v1w0n9x7"; - type = "gem"; - }; - version = "2.4.0"; - }; - atomic = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1kh9rvhjn4dndbfsk3yjq7alds6s2j70rc4k8wdwdyibab8a8gq9"; - type = "gem"; - }; - version = "1.1.99"; - }; - attr_encrypted = { - dependencies = ["encryptor"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0ncv2az1zlj33bsllr6q1qdvbw42gv91lxq0ryclbv8l8xh841jg"; - type = "gem"; - }; - version = "3.1.0"; - }; - attr_required = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1g22axmi2rhhy7w8c3x6gppsawxqavbrnxpnmphh22fk7cwi0kh2"; - type = "gem"; - }; - version = "1.0.1"; - }; - awesome_print = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "14arh1ixfsd6j5md0agyzvksm5svfkvchb90fp32nn7y3avcmc2h"; - type = "gem"; - }; - version = "1.8.0"; - }; - axiom-types = { - dependencies = ["descendants_tracker" "ice_nine" "thread_safe"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "10q3k04pll041mkgy0m5fn2b1lazm6ly1drdbcczl5p57lzi3zy1"; - type = "gem"; - }; - version = "0.1.1"; - }; - babosa = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "05rgxg4pz4bc4xk34w5grv0yp1j94wf571w84lf3xgqcbs42ip2f"; - type = "gem"; - }; - version = "1.0.2"; - }; - base32 = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0b7y8sy6j9v1lvfzd4va88k5vg9yh0xcjzzn3llcw7yxqlcrnbjk"; - type = "gem"; - }; - version = "0.3.2"; - }; - batch-loader = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "09jaxxddqpgq8ynwd2gpjq5rkhw00zdjnqisk9qbpjgxzk6f8gwi"; - type = "gem"; - }; - version = "1.4.0"; - }; - bcrypt = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0ysblqxkclmnhrd0kmb5mr8p38mbar633gdsb14b7dhkhgawgzfy"; - type = "gem"; - }; - version = "3.1.12"; - }; - bcrypt_pbkdf = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0cj4k13c7qvvck7y25i3xarvyqq8d27vl61jddifkc7llnnap1hv"; - type = "gem"; - }; - version = "1.0.0"; - }; - benchmark-ips = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0bh681m54qdsdyvpvflj1wpnj3ybspbpjkr4cnlrl4nk4yikli0j"; - type = "gem"; - }; - version = "2.3.0"; - }; - benchmark-memory = { - dependencies = ["memory_profiler"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "11qw8k6rl79ri00njrf1x9v6vzwgv12rkcvgzvg0sk8pfrkzwyxa"; - type = "gem"; - }; - version = "0.1.2"; - }; - better_errors = { - dependencies = ["coderay" "erubi" "rack"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1pqnxxsqqs7vnqvamk5bzs84dv584g9s0qaf2vqb1v2aj5dabcg7"; - type = "gem"; - }; - version = "2.5.0"; - }; - bindata = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0kxy917xyxckifmnawff65j7g6yb3wh2s45npjq9lqjbi1p86lsr"; - type = "gem"; - }; - version = "2.4.3"; - }; - binding_ninja = { - groups = ["default" "development" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "17fa3sv6p2fw9g8fxpwx1kjhhs28aw41akkba0hlgvk60055b1aa"; - type = "gem"; - }; - version = "0.2.3"; - }; - binding_of_caller = { - dependencies = ["debug_inspector"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "05syqlks7463zsy1jdfbbdravdhj9hpj5pv2m74blqpv8bq4vv5g"; - type = "gem"; - }; - version = "0.8.0"; - }; - bootsnap = { - dependencies = ["msgpack"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1amksyijp9hwpc2jr0yi45hpcp0qiz5r2h8rnf2wi1hdfw6m2hxh"; - type = "gem"; - }; - version = "1.4.1"; - }; - bootstrap_form = { - dependencies = ["actionpack" "activemodel"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "044pi097jwh3z68g1zfmbcl9xchqfcsls1j1nvx1bkyj034v6y7m"; - type = "gem"; - }; - version = "4.2.0"; - }; - brakeman = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "161l4ln7x1vnqrcvbvglznf46f0lvq305vq211xaxp4fv4wwv89v"; - type = "gem"; - }; - version = "4.2.1"; - }; - browser = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0sdx0ny34i6vqxdsc7sy9g0nafdbrw8kvvb5xh9m18x1bzpqk92f"; - type = "gem"; - }; - version = "2.5.3"; - }; - builder = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0qibi5s67lpdv1wgcj66wcymcr04q6j4mzws6a479n0mlrmh5wr1"; - type = "gem"; - }; - version = "3.2.3"; - }; - bullet = { - dependencies = ["activesupport" "uniform_notifier"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1pdq3ckmwxnwrdm2x89zfj68h0yhiln35y8wps2nkvam4kpivyr5"; - type = "gem"; - }; - version = "5.5.1"; - }; - bundler-audit = { - dependencies = ["thor"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1gr7k6m9fda7m66irxzydm8v9xbmlryjj65cagwm1zyi5f317srb"; - type = "gem"; - }; - version = "0.5.0"; - }; - byebug = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1vv7s88w8jb1qg4qz3jrs3x3y5d9jfyyl7wfiz78b5x95ydvx41q"; - type = "gem"; - }; - version = "9.1.0"; - }; - capybara = { - dependencies = ["addressable" "mini_mime" "nokogiri" "rack" "rack-test" "regexp_parser" "xpath"]; - groups = ["development" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1y7ncfji4s3h3wdr2hwsrd32k0va92a6lyx2x8w6a3vkbc94kpch"; - type = "gem"; - }; - version = "3.22.0"; - }; - capybara-screenshot = { - dependencies = ["capybara" "launchy"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1x90lh7nf3zi54arjf430s9xdxr3c12xjq1l28izgxqdk8s40q7q"; - type = "gem"; - }; - version = "1.0.22"; - }; - carrierwave = { - dependencies = ["activemodel" "activesupport" "mime-types"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "10rz94kajilffp83sb767lr62b5f8l4jzqq80cr92wqxdgbszdks"; - type = "gem"; - }; - version = "1.3.1"; - }; - cause = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0digirxqlwdg79mkbn70yc7i9i1qnclm2wjbrc47kqv6236bpj00"; - type = "gem"; - }; - version = "0.1"; - }; - character_set = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "114npdbw1ivyx4vnid8ncnjw4wnjcipf2lvihlg3ibbh7an0m9s9"; - type = "gem"; - }; - version = "1.1.2"; - }; - charlock_holmes = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1nf1l31n10yaark2rrg5qzyzcx9w80681449s3j09qmnipsl8rl5"; - type = "gem"; - }; - version = "0.7.6"; - }; - childprocess = { - dependencies = ["ffi"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0a61922kmvcxyj5l70fycapr87gz1dzzlkfpq85rfqk5vdh3d28p"; - type = "gem"; - }; - version = "0.9.0"; - }; - chronic = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1hrdkn4g8x7dlzxwb1rfgr8kw3bp4ywg5l4y4i9c2g5cwv62yvvn"; - type = "gem"; - }; - version = "0.10.2"; - }; - chronic_duration = { - dependencies = ["numerizer"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1k7sx3xqbrn6s4pishh2pgr4kw6fmw63h00lh503l66k8x0qvigs"; - type = "gem"; - }; - version = "0.10.6"; - }; - chunky_png = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0vf0axgrm95bs3y0x5gdb76xawfh210yxplj7jbwr6z7n88i1axn"; - type = "gem"; - }; - version = "1.3.5"; - }; - citrus = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0l7nhk3gkm1hdchkzzhg2f70m47pc0afxfpl6mkiibc9qcpl3hjf"; - type = "gem"; - }; - version = "3.0.2"; - }; - coderay = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "15vav4bhcc2x3jmi3izb11l4d9f3xv8hp2fszb7iqmpsccv1pz4y"; - type = "gem"; - }; - version = "1.1.2"; - }; - coercible = { - dependencies = ["descendants_tracker"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1p5azydlsz0nkxmcq0i1gzmcfq02lgxc4as7wmf47j1c6ljav0ah"; - type = "gem"; - }; - version = "1.0.0"; - }; - commonmarker = { - dependencies = ["ruby-enum"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1pmjm87p0hxnknp33cxyvkgbr1swfp9gcznssmalm9z8kwyancb9"; - type = "gem"; - }; - version = "0.17.13"; - }; - concord = { - dependencies = ["adamantium" "equalizer"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1b6cdn0fg4n9gzbdr7zyf4jq40y6h0c0g9cra7wk9hhmsylk91bg"; - type = "gem"; - }; - version = "0.1.5"; - }; - concurrent-ruby = { - groups = ["default" "development" "mysql" "postgres" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1x07r23s7836cpp5z9yrlbpljcxpax14yw4fy4bnp6crhr6x24an"; - type = "gem"; - }; - version = "1.1.5"; - }; - concurrent-ruby-ext = { - dependencies = ["concurrent-ruby"]; - groups = ["default" "mysql" "postgres"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "03ypsv2k581yv0b3f0hzvb3mq6mqj8jlbi32jmkj3k175vbc8hvz"; - type = "gem"; - }; - version = "1.1.5"; - }; - connection_pool = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0lflx29mlznf1hn0nihkgllzbj8xp5qasn8j7h838465pi399k68"; - type = "gem"; - }; - version = "2.2.2"; - }; - crack = { - dependencies = ["safe_yaml"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0abb0fvgw00akyik1zxnq7yv391va148151qxdghnzngv66bl62k"; - type = "gem"; - }; - version = "0.4.3"; - }; - crass = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0bpxzy6gjw9ggjynlxschbfsgmx8lv3zw1azkjvnb8b9i895dqfi"; - type = "gem"; - }; - version = "1.0.4"; - }; - creole = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "00rcscz16idp6dx0dk5yi5i0fz593i3r6anbn5bg2q07v3i025wm"; - type = "gem"; - }; - version = "0.5.0"; - }; - css_parser = { - dependencies = ["addressable"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0jlr17cn044yaq4l3d9p42g3bghnamwsprq9c39xn6pxjrn5k1hy"; - type = "gem"; - }; - version = "1.5.0"; - }; - daemons = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0lxqq6dgb8xhliywar2lvkwqy2ssraf9dk4b501pb4ixc2mvxbp2"; - type = "gem"; - }; - version = "1.2.6"; - }; - database_cleaner = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "05i0nf2aj70m61y3fspypdkc6d1qgibf5kav05a71b5gjz0k7y5x"; - type = "gem"; - }; - version = "1.7.0"; - }; - debug_inspector = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0vxr0xa1mfbkfcrn71n7c4f2dj7la5hvphn904vh20j3x4j5lrx0"; - type = "gem"; - }; - version = "0.0.3"; - }; - debugger-ruby_core_source = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1lp5dmm8a8dpwymv6r1y6yr24wxsj0gvgb2b8i7qq9rcv414snwd"; - type = "gem"; - }; - version = "1.3.8"; - }; - deckar01-task_list = { - dependencies = ["html-pipeline"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0s637v5pi5ipmv0gn9g2wwjpxdm27dvppfjd8ml0dc1m0jsm7964"; - type = "gem"; - }; - version = "2.2.0"; - }; - declarative = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0642xvwzzbgi3kp1bg467wma4g3xqrrn0sk369hjam7w579gnv5j"; - type = "gem"; - }; - version = "0.0.10"; - }; - declarative-option = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1g4ibxq566f1frnhdymzi9hxxcm4g2gw4n21mpjk2mhwym4q6l0p"; - type = "gem"; - }; - version = "0.1.0"; - }; - default_value_for = { - dependencies = ["activerecord"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1xj9d1y2fk3kxfm1kyiwasjpw6r1w7c1xjx26sm3c33xhmz57fla"; - type = "gem"; - }; - version = "3.2.0"; - }; - derailed_benchmarks = { - dependencies = ["benchmark-ips" "get_process_mem" "heapy" "memory_profiler" "rack" "rake" "thor"]; - groups = ["development" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1c9djg1r2w461h97zmmdsdgnsrxqm4qfyp7gry9qxbav9skrplb8"; - type = "gem"; - }; - version = "1.3.5"; - }; - descendants_tracker = { - dependencies = ["thread_safe"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "15q8g3fcqyb41qixn6cky0k3p86291y7xsh1jfd851dvrza1vi79"; - type = "gem"; - }; - version = "0.0.4"; - }; - device_detector = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0zbsjj1bgwmsiqiw6x5fzbzp25xc10c02s37ggl2635ha0qzn05q"; - type = "gem"; - }; - version = "1.0.0"; - }; - devise = { - dependencies = ["bcrypt" "orm_adapter" "railties" "responders" "warden"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "04b2p61mqfb6ln8s2lhmvnkd45wjjinykbn9svmhs54kacrrjkcf"; - type = "gem"; - }; - version = "4.6.2"; - }; - devise-two-factor = { - dependencies = ["activesupport" "attr_encrypted" "devise" "railties" "rotp"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1pkldws5lga4mlv4xmcrfb0yivl6qad0l8qyb2hdb50adv6ny4gs"; - type = "gem"; - }; - version = "3.0.0"; - }; - diff-lcs = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "18w22bjz424gzafv6nzv98h0aqkwz3d9xhm7cbr1wfbyas8zayza"; - type = "gem"; - }; - version = "1.3"; - }; - diffy = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1azibizfv91sjbzhjqj1pg2xcv8z9b8a7z6kb3wpl4hpj5hil5kj"; - type = "gem"; - }; - version = "3.1.0"; - }; - discordrb-webhooks-blackst0ne = { - dependencies = ["rest-client"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1f0dw6ci5cbrxrvvqw2kqabpzyjisd4hflbi370rpb4cakkzgw39"; - type = "gem"; - }; - version = "3.3.0"; - }; - docile = { - groups = ["default" "development" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "04d2izkna3ahfn6fwq4xrcafa715d3bbqczxm16fq40fqy87xn17"; - type = "gem"; - }; - version = "1.3.1"; - }; - domain_name = { - dependencies = ["unf"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0abdlwb64ns7ssmiqhdwgl27ly40x2l27l8hs8hn0z4kb3zd2x3v"; - type = "gem"; - }; - version = "0.5.20180417"; - }; - doorkeeper = { - dependencies = ["railties"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "022r03i830b2lvmr0xzlj6ivlvc1zr64hy4a4bsy3flv94da77rz"; - type = "gem"; - }; - version = "4.3.2"; - }; - doorkeeper-openid_connect = { - dependencies = ["doorkeeper" "json-jwt"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1wgrz0xcply5vl6d1m62blqwcbn4v0b27bswyws2y9wbyglz6f95"; - type = "gem"; - }; - version = "1.5.0"; - }; - ed25519 = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1f5kr8za7hvla38fc0n9jiv55iq62k5bzclsa5kdb14l3r4w6qnw"; - type = "gem"; - }; - version = "1.2.4"; - }; - email_reply_trimmer = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0vijywhy1acsq4187ss6w8a7ksswaf1d5np3wbj962b6rqif5vcz"; - type = "gem"; - }; - version = "0.1.6"; - }; - email_spec = { - dependencies = ["htmlentities" "launchy" "mail"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0yadaif80cf2ry0nvhir1s70xmm22xzncq6vfvvffdd8h02ridv0"; - type = "gem"; - }; - version = "2.2.0"; - }; - encryptor = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0s8rvfl0vn8w7k1sgkc234060jh468s3zd45xa64p1jdmfa3zwmb"; - type = "gem"; - }; - version = "3.0.0"; - }; - equalizer = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1kjmx3fygx8njxfrwcmn7clfhjhb6bvv3scy2lyyi0wqyi3brra4"; - type = "gem"; - }; - version = "0.0.11"; - }; - erubi = { - groups = ["default" "development" "mysql" "postgres" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1kagnf6ziahj0d781s6ryy6fwqwa3ad4xbzzj84p9m4nv4c2jir1"; - type = "gem"; - }; - version = "1.8.0"; - }; - escape_utils = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0qminivnyzwmqjhrh3b92halwbk0zcl9xn828p5rnap1szl2yag5"; - type = "gem"; - }; - version = "1.2.1"; - }; - et-orbi = { - dependencies = ["tzinfo"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1swgjb3h2hs5xflb68837l0vd32masbz9c66b1963mxlnnxf5gsg"; - type = "gem"; - }; - version = "1.2.1"; - }; - eventmachine = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0wh9aqb0skz80fhfn66lbpr4f86ya2z5rx6gm5xlfhd05bj1ch4r"; - type = "gem"; - }; - version = "1.2.7"; - }; - excon = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "15l9w0938c19nxmrp09n75qpmm64k12xj69h47yvxzcxcpbgnkb2"; - type = "gem"; - }; - version = "0.62.0"; - }; - execjs = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0grlxwiccbnflxs30r3h7g23xnps5knav1jyqkk3anvm8363ifjw"; - type = "gem"; - }; - version = "2.6.0"; - }; - expression_parser = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1938z3wmmdabqxlh5d5c56xfg1jc6z15p7zjyhvk7364zwydnmib"; - type = "gem"; - }; - version = "0.9.0"; - }; - extended-markdown-filter = { - dependencies = ["html-pipeline"]; - groups = ["default" "development" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "17mi5qayplfaa6p3mfwa36il84ixr0bimqvl0q73lw5i81blp126"; - type = "gem"; - }; - version = "0.6.0"; - }; - factory_bot = { - dependencies = ["activesupport"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0r975ba6y0mcy3aya099gpnjn5gf1h6fbw8f3smmjay5zvin3nwx"; - type = "gem"; - }; - version = "4.8.2"; - }; - factory_bot_rails = { - dependencies = ["factory_bot" "railties"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0cdbp12ih2w77l331frv8gv6bv9dinn1663dy1jn0gb9ss1hwvs2"; - type = "gem"; - }; - version = "4.8.2"; - }; - faraday = { - dependencies = ["multipart-post"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "157c4cmb5g1b3ny6k9qf9z57rfijl54fcq3hnqqf6g31g1m096b2"; - type = "gem"; - }; - version = "0.12.2"; - }; - faraday_middleware = { - dependencies = ["faraday"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1p7icfl28nvl8qqdsngryz1snqic9l8x6bk0dxd7ygn230y0k41d"; - type = "gem"; - }; - version = "0.12.2"; - }; - faraday_middleware-multi_json = { - dependencies = ["faraday_middleware" "multi_json"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0651sxhzbq9xfq3hbpmrp0nbybxnm9ja3m97k386m4bqgamlvz1q"; - type = "gem"; - }; - version = "0.0.6"; - }; - fast_blank = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "16s1ilyvwzmkcgmklbrn0c2pch5n02vf921njx0bld4crgdr6z56"; - type = "gem"; - }; - version = "1.0.0"; - }; - fast_gettext = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1s42dsy3rh9h37d16pwhswf2q9cx25v5fn3q881b5iz6fvdjixv3"; - type = "gem"; - }; - version = "1.6.0"; - }; - ffaker = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "01z5lpssjc0n8lm4xrlja0hh8lv4ngzbybjvd4rdkc5x9ddvh8s3"; - type = "gem"; - }; - version = "2.10.0"; - }; - ffi = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0j8pzj8raxbir5w5k6s7a042sb5k02pg0f8s4na1r5lan901j00p"; - type = "gem"; - }; - version = "1.10.0"; - }; - flipper = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1pdj9y3k6padiicfraxw9ibx9fm8yi2ihh608736lq5nnbf3k6gw"; - type = "gem"; - }; - version = "0.13.0"; - }; - flipper-active_record = { - dependencies = ["activerecord" "flipper"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0rgm4h5h6xcbf17z47sw8ancaxva8x4hwlxmyqpm0vzj1pnc47c1"; - type = "gem"; - }; - version = "0.13.0"; - }; - flipper-active_support_cache_store = { - dependencies = ["activesupport" "flipper"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0zpikmfhadb7l1ny6xbhk5d4840im6yq0wvfsnlw718spxi4ccgk"; - type = "gem"; - }; - version = "0.13.0"; - }; - flowdock = { - dependencies = ["httparty" "multi_json"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "04nrvg4gzgabf5mnnhccl8bwrkvn3y4pm7a1dqzqhpvfr4m5pafg"; - type = "gem"; - }; - version = "0.7.1"; - }; - fog-aliyun = { - dependencies = ["fog-core" "fog-json" "ipaddress" "xml-simple"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1vl5zf9wr6qwm1awxscyifvrrfqnyacidxgzhkba2wqlgizk3anh"; - type = "gem"; - }; - version = "0.3.3"; - }; - fog-aws = { - dependencies = ["fog-core" "fog-json" "fog-xml" "ipaddress"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "086kyvdhf1k8nk7f4gmybjc3k0m88f9pw99frddcy1w96pj5kyg4"; - type = "gem"; - }; - version = "3.5.2"; - }; - fog-core = { - dependencies = ["builder" "excon" "formatador" "mime-types"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1agd6xgzk0rxrsjdpn94v4hy89s0nm2cs4zg2p880w2dan9xgrak"; - type = "gem"; - }; - version = "2.1.0"; - }; - fog-google = { - dependencies = ["fog-core" "fog-json" "fog-xml" "google-api-client"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0rxhcf2rhs8ml9j9xppz1yxgig3s1l5hm6yz582lqrs8bdmq028m"; - type = "gem"; - }; - version = "1.8.2"; - }; - fog-json = { - dependencies = ["fog-core" "multi_json"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1zj8llzc119zafbmfa4ai3z5s7c4vp9akfs0f9l2piyvcarmlkyx"; - type = "gem"; - }; - version = "1.2.0"; - }; - fog-local = { - dependencies = ["fog-core"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0ba4lln35nryi6dcbz68vxg9ml6v8cc8s8c82f7syfd84bz76x21"; - type = "gem"; - }; - version = "0.6.0"; - }; - fog-openstack = { - dependencies = ["fog-core" "fog-json" "ipaddress"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "171xnsl6w0j7yi6sp26dcqahx4r4gb2cf359gmy11g5iwnsll5wg"; - type = "gem"; - }; - version = "1.0.8"; - }; - fog-rackspace = { - dependencies = ["fog-core" "fog-json" "fog-xml" "ipaddress"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0y2bli061g37l9p4w0ljqbmg830rp2qz6sf8b0ck4cnx68j7m32a"; - type = "gem"; - }; - version = "0.1.1"; - }; - fog-xml = { - dependencies = ["fog-core" "nokogiri"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "043lwdw2wsi6d55ifk0w3izi5l1d1h0alwyr3fixic7b94kc812n"; - type = "gem"; - }; - version = "0.1.3"; - }; - font-awesome-rails = { - dependencies = ["railties"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "11mf7bk2737pyxjwba3a9lpgcxzbp0vgq01n2dn30774zysc90hj"; - type = "gem"; - }; - version = "4.7.0.4"; - }; - foreman = { - dependencies = ["thor"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "06mq39lpmc17bxzlwhad9d8i0lcnbb08xr18smh2x79mm631wsw0"; - type = "gem"; - }; - version = "0.84.0"; - }; - formatador = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1gc26phrwlmlqrmz4bagq1wd5b7g64avpx0ghxr9xdxcvmlii0l0"; - type = "gem"; - }; - version = "0.2.5"; - }; - fugit = { - dependencies = ["et-orbi" "raabro"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1x5h31hl75x0p5s36hinywg18ijlxjhnlb5p02aqcjjkx777rcav"; - type = "gem"; - }; - version = "1.2.1"; - }; - fuubar = { - dependencies = ["rspec-core" "ruby-progressbar"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0jlv2wisgnim29h47shvqhipbz1wgndfdr7i6y5wcfag0z2660lv"; - type = "gem"; - }; - version = "2.2.0"; - }; - gemoji = { - groups = ["default" "development" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0vgklpmhdz98xayln5hhqv4ffdyrglzwdixkn5gsk9rj94pkymc0"; - type = "gem"; - }; - version = "3.0.1"; - }; - gemojione = { - dependencies = ["json"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0ayk8r147k1s38nj18pwk76npx1p7jhi86silk800nj913pjvrhj"; - type = "gem"; - }; - version = "3.3.0"; - }; - get_process_mem = { - groups = ["default" "development" "puma" "test" "unicorn"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1bvfjdign16r0zwm2rlfrq0sk1licvmlgbnlpnyckniv5r7i080g"; - type = "gem"; - }; - version = "0.2.3"; - }; - gettext = { - dependencies = ["locale" "text"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0764vj7gacn0aypm2bf6m46dzjzwzrjlmbyx6qwwwzbmi94r40wr"; - type = "gem"; - }; - version = "3.2.9"; - }; - gettext_i18n_rails = { - dependencies = ["fast_gettext"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0vs918a03mqvx9aczaqdg9d2q9s3c6swqavzn82qgq5i822czrcm"; - type = "gem"; - }; - version = "1.8.0"; - }; - gettext_i18n_rails_js = { - dependencies = ["gettext" "gettext_i18n_rails" "po_to_json" "rails"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "11yn5cf92wsmlj5c1065mg6swf8gq9l6g9ahikvvyf9npvjay42x"; - type = "gem"; - }; - version = "1.3.0"; - }; - gitaly-proto = { - dependencies = ["grpc"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1lx2cids0r175agdz3wa25ivi17vxx2kryb2v29gdsrpg3pyyq7j"; - type = "gem"; - }; - version = "1.37.0"; - }; - github-markup = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "17g6g18gdjg63k75sfwiskjzl9i0hfcnrkcpb4fwrnb20v3jgswp"; - type = "gem"; - }; - version = "1.7.0"; - }; - gitlab-labkit = { - dependencies = ["actionpack" "activesupport" "grpc" "jaeger-client" "opentracing"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0dvapmdc9axm9dq2gg89qrqb318rkrsabpyybrqvcx1ipbi5k3a1"; - type = "gem"; - }; - version = "0.3.0"; - }; - gitlab-markup = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0rqf3jmyn78r3ysy3bjyx7s4yv3xipxlmqlmbyrbksna19rrx08d"; - type = "gem"; - }; - version = "1.7.0"; - }; - gitlab-sidekiq-fetcher = { - dependencies = ["sidekiq"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1xaag97iclmiay8fx7dkiws8dsws2gi6l0axq4yljq5g7xm78qjr"; - type = "gem"; - }; - version = "0.4.0"; - }; - gitlab-styles = { - dependencies = ["rubocop" "rubocop-gitlab-security" "rubocop-performance" "rubocop-rspec"]; - groups = ["development" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1vxlvbq4jpq0cfjqippz9d3j73sq9qg3pna5pb0l8jr0rc0xs89y"; - type = "gem"; - }; - version = "2.7.0"; - }; - gitlab_omniauth-ldap = { - dependencies = ["net-ldap" "omniauth" "pyu-ruby-sasl" "rubyntlm"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1f8cjbzlhckarmm59l380jjy33a3hlljg69b3zkh8rhy1xd3xr90"; - type = "gem"; - }; - version = "2.1.1"; - }; - globalid = { - dependencies = ["activesupport"]; - groups = ["default" "development" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1zkxndvck72bfw235bd9nl2ii0lvs5z88q14706cmn702ww2mxv1"; - type = "gem"; - }; - version = "0.4.2"; - }; - gon = { - dependencies = ["actionpack" "multi_json" "request_store"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0q9nvnw98mbb40h7mlzn1zk40r2l29yybhinmiqhrq8a6adsv806"; - type = "gem"; - }; - version = "6.2.0"; - }; - google-api-client = { - dependencies = ["addressable" "googleauth" "httpclient" "mime-types" "representable" "retriable"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "05h2lca9b334ayabgs3h0mzc2wg3csvkqv1lv3iirpgf90ypbk1k"; - type = "gem"; - }; - version = "0.23.4"; - }; - google-protobuf = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "04988m3hmllg4sl4syjb35x0wzsg7rj1nmvhx3d9ihml22w76gb2"; - type = "gem"; - }; - version = "3.7.1"; - }; - googleapis-common-protos-types = { - dependencies = ["google-protobuf"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0hyr94cafiqj0k8q19hnl658pmbz2b404akikzfv4hdb1j1bwsg1"; - type = "gem"; - }; - version = "1.0.4"; - }; - googleauth = { - dependencies = ["faraday" "jwt" "memoist" "multi_json" "os" "signet"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1747p1dhpvz76i98xnjrvaj785y1232svm0nc8g9by6pz835gp2l"; - type = "gem"; - }; - version = "0.6.6"; - }; - gpgme = { - dependencies = ["mini_portile2"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "12fqirxr964mc8jwsfl5nif6q4wcckrmj7w4c9ci4xg9xy2b9v6m"; - type = "gem"; - }; - version = "2.0.18"; - }; - grape = { - dependencies = ["activesupport" "builder" "mustermann-grape" "rack" "rack-accept" "virtus"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "04bam0iq9sad1df361317zz4knwci905yig502khl8gm1lp1168c"; - type = "gem"; - }; - version = "1.1.0"; - }; - grape-entity = { - dependencies = ["activesupport" "multi_json"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1w78wylkhdkc0s6n6d20hggbb3pl3ladzzd5lx6ack2iswybx7b9"; - type = "gem"; - }; - version = "0.7.1"; - }; - grape-path-helpers = { - dependencies = ["activesupport" "grape" "rake"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "16l6lrv4h4ls0lrpj35pc00431q2rx6r9n47337qyvprxs3v0a01"; - type = "gem"; - }; - version = "1.1.0"; - }; - grape_logging = { - dependencies = ["grape"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0lg2vhk0dlnyqs2rz8wilfm039q5mbsp5nvf51asir48a1rf9yza"; - type = "gem"; - }; - version = "1.7.0"; - }; - graphiql-rails = { - dependencies = ["railties" "sprockets-rails"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "10q5zipwgjgaan9lfqakdkm5ry8afgkq79bkimgksn6jyyvpz6w8"; - type = "gem"; - }; - version = "1.4.10"; - }; - graphql = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "10bnl8yjyg5x6h787cfkpd5gphl5z5jblj8fc9lbmgk27n2knssl"; - type = "gem"; - }; - version = "1.8.1"; - }; - graphql-docs = { - dependencies = ["commonmarker" "escape_utils" "extended-markdown-filter" "gemoji" "graphql" "html-pipeline" "sass"]; - groups = ["development" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "12wzsikbn54b2hcv100hz7isq5gdjm5w5b8xya64ra5sw6sabq8d"; - type = "gem"; - }; - version = "1.6.0"; - }; - grpc = { - dependencies = ["google-protobuf" "googleapis-common-protos-types"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1rdywzism5vxz8pnml6xjb9f19diclyy74014z69q01jzqwi1wgs"; - type = "gem"; - }; - version = "1.19.0"; - }; - haml = { - dependencies = ["temple" "tilt"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1q0a9fvqh8kn6wm97fcks6qzbjd400bv8bx748w8v87m7p4klhac"; - type = "gem"; - }; - version = "5.0.4"; - }; - haml_lint = { - dependencies = ["haml" "rainbow" "rake" "rubocop" "sysexits"]; - groups = ["development" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1k6pvb2lc6d72nq01jqmi3mxpp80m9mmbc265kgaxmcnjxqhacb1"; - type = "gem"; - }; - version = "0.31.0"; - }; - hamlit = { - dependencies = ["temple" "thor" "tilt"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0hk338vkzmwszxdh0q02iw88rbr3bj3fd7fzn4psm8wy80zcgl9i"; - type = "gem"; - }; - version = "2.8.8"; - }; - hangouts-chat = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1dmnv3723c22683bzys8walkl6wi74xzawxjbhwqzjdbwk3bdgmx"; - type = "gem"; - }; - version = "0.0.5"; - }; - hashdiff = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "19ykg5pax8798nh1yv71adkx0zzs7gn2rxjj86v7nsw0jba5lask"; - type = "gem"; - }; - version = "0.3.8"; - }; - hashie = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1hh5lybf8hm7d7xs4xm8hxvm8xqrs2flc8fnwkrclaj746izw6xb"; - type = "gem"; - }; - version = "3.5.7"; - }; - hashie-forbidden_attributes = { - dependencies = ["hashie"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1chgg5d2iddja6ww02x34g8avg11fzmzcb8yvnqlykii79zx6vis"; - type = "gem"; - }; - version = "0.1.1"; - }; - health_check = { - dependencies = ["rails"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1mfa180nyzz1j0abfihm5nm3lmzq99362ibcphky6rh5vwhckvm8"; - type = "gem"; - }; - version = "2.6.0"; - }; - heapy = { - groups = ["default" "development" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1r9f38fpgjgaxskkwvsliijj6vfmgsff9pnranvvvzkdl67hk1hw"; - type = "gem"; - }; - version = "0.1.4"; - }; - hipchat = { - dependencies = ["httparty" "mimemagic"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0hgy5jav479vbzzk53lazhpjj094dcsqw6w1d6zjn52p72bwq60k"; - type = "gem"; - }; - version = "1.5.2"; - }; - html-pipeline = { - dependencies = ["activesupport" "nokogiri"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1mpj5y13jk1arqkhdk66n49kyglmci980c1l6np7pqgyjllb68ad"; - type = "gem"; - }; - version = "2.8.4"; - }; - html2text = { - dependencies = ["nokogiri"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0kxdj8pf9pss9xgs8aac0alj5g1fi225yzdhh33lzampkazg1hii"; - type = "gem"; - }; - version = "0.2.0"; - }; - htmlentities = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1nkklqsn8ir8wizzlakncfv42i32wc0w9hxp00hvdlgjr7376nhj"; - type = "gem"; - }; - version = "4.3.4"; - }; - http = { - dependencies = ["addressable" "http-cookie" "http-form_data" "http_parser.rb"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1jlm5prw437wqpfxcigh88lfap3m7g8mnmj5as7qw6dzqnvrxwmc"; - type = "gem"; - }; - version = "3.3.0"; - }; - http-cookie = { - dependencies = ["domain_name"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "004cgs4xg5n6byjs7qld0xhsjq3n6ydfh897myr2mibvh6fjc49g"; - type = "gem"; - }; - version = "1.0.3"; - }; - http-form_data = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "15lpn604byf7cyxnw949xz4rvpcknqp7a48q73nm630gqxsa76f3"; - type = "gem"; - }; - version = "2.1.1"; - }; - "http_parser.rb" = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "15nidriy0v5yqfjsgsra51wmknxci2n2grliz78sf9pga3n0l7gi"; - type = "gem"; - }; - version = "0.6.0"; - }; - httparty = { - dependencies = ["mime-types" "multi_xml"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "109xvhl35dsk9zp65n5pdkhiijhqxdyvajbs74nkp4z8yl09vj32"; - type = "gem"; - }; - version = "0.16.4"; - }; - httpclient = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "19mxmvghp7ki3klsxwrlwr431li7hm1lczhhj8z4qihl2acy8l99"; - type = "gem"; - }; - version = "2.8.3"; - }; - i18n = { - dependencies = ["concurrent-ruby"]; - groups = ["default" "development" "mysql" "postgres" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1hfxnlyr618s25xpafw9mypa82qppjccbh292c4l3bj36az7f6wl"; - type = "gem"; - }; - version = "1.6.0"; - }; - icalendar = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1xsydpp2xph00awi25axv2mwjd5p2rlgd4qb3kh05lvq795kirxd"; - type = "gem"; - }; - version = "2.4.1"; - }; - ice_nine = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1nv35qg1rps9fsis28hz2cq2fx1i96795f91q4nmkm934xynll2x"; - type = "gem"; - }; - version = "0.11.2"; - }; - influxdb = { - dependencies = ["cause" "json"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1vhg5nd88nwvfa76lqcczld916nljswwq6clsixrzi3js8ym9y1w"; - type = "gem"; - }; - version = "0.2.3"; - }; - ipaddress = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1x86s0s11w202j6ka40jbmywkrx8fhq8xiy8mwvnkhllj57hqr45"; - type = "gem"; - }; - version = "0.8.3"; - }; - jaeger-client = { - dependencies = ["opentracing" "thrift"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "198m72c9w3wfwr1mq22dcjjm7d4jd0bci4lrq6zq2zvlzhi04n8l"; - type = "gem"; - }; - version = "0.10.0"; - }; - jaro_winkler = { - groups = ["default" "development" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1zz27z88qznix4r65gd9h56gl177snlfpgv10b0s69vi8qpl909l"; - type = "gem"; - }; - version = "1.5.2"; - }; - jira-ruby = { - dependencies = ["activesupport" "multipart-post" "oauth"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "14019mliqwcppj6qp2wdhh5gbvs2yh2idibag13m9a18ag965bhw"; - type = "gem"; - }; - version = "1.4.1"; - }; - js_regex = { - dependencies = ["character_set" "regexp_parser" "regexp_property_values"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0wi4h4f3knb0yp4zq2spks3dpmdzz9wa54d6xk88md0h4v2x33cq"; - type = "gem"; - }; - version = "3.1.1"; - }; - json = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0qmj7fypgb9vag723w1a49qihxrcf5shzars106ynw2zk352gbv5"; - type = "gem"; - }; - version = "1.8.6"; - }; - json-jwt = { - dependencies = ["activesupport" "aes_key_wrap" "bindata"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "065k7vffdki73f4nz89lxi6wxmcw5dlf593831pgvlbralll6x3r"; - type = "gem"; - }; - version = "1.9.4"; - }; - json-schema = { - dependencies = ["addressable"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "11di8qyam6bmqn0fvvvf3crgaqy4sil0d406ymx0jacn3ff98ymz"; - type = "gem"; - }; - version = "2.8.0"; - }; - jwt = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1w0kaqrbl71cq9sbnixc20x5lqah3hs2i93xmhlfdg2y3by7yzky"; - type = "gem"; - }; - version = "2.1.0"; - }; - kaminari = { - dependencies = ["activesupport" "kaminari-actionview" "kaminari-activerecord" "kaminari-core"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0invfvfb252ihsdr65rylkvd1x2wy004jval52v3i8ybb0jhc5hi"; - type = "gem"; - }; - version = "1.0.1"; - }; - kaminari-actionview = { - dependencies = ["actionview" "kaminari-core"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0mhhsm6xhmwqc7hfw7xnk1kdbfg468bqs5awcqm5j6j8b9zyjvdi"; - type = "gem"; - }; - version = "1.0.1"; - }; - kaminari-activerecord = { - dependencies = ["activerecord" "kaminari-core"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1kb5aj6iy1cwcq5548jd3w1ipxicnzmnx2ay1s4hvad2gvrd4g93"; - type = "gem"; - }; - version = "1.0.1"; - }; - kaminari-core = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0r2n293ad1xr9wgn8cr53nfzwls4w3p1xi4kjfjgl1z0yf05mpwr"; - type = "gem"; - }; - version = "1.0.1"; - }; - kgio = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1528pyj1szzzp3pgj05fzjd36qjrxm9yj2x5radc9p1z7vl67y50"; - type = "gem"; - }; - version = "2.11.2"; - }; - knapsack = { - dependencies = ["rake"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1c69rcwfrdrnx8ddl6k1qxhw9f2dj5x5bbddz435isl2hfr5zh92"; - type = "gem"; - }; - version = "1.17.0"; - }; - kramdown = { - groups = ["default" "development" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1n1c4jmrh5ig8iv1rw81s4mw4xsp4v97hvf8zkigv4hn5h542qjq"; - type = "gem"; - }; - version = "1.17.0"; - }; - kubeclient = { - dependencies = ["http" "recursive-open-struct" "rest-client"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "10761kwhgclnf2lrdjspmxnw90z7i0l85inranfxc688ing0d5xn"; - type = "gem"; - }; - version = "4.2.2"; - }; - launchy = { - dependencies = ["addressable"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "190lfbiy1vwxhbgn4nl4dcbzxvm049jwc158r2x7kq3g5khjrxa2"; - type = "gem"; - }; - version = "2.4.3"; - }; - letter_opener = { - dependencies = ["launchy"]; - groups = ["default" "development"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "09a7kgsmr10a0hrc9bwxglgqvppjxij9w8bxx91mnvh0ivaw0nq9"; - type = "gem"; - }; - version = "1.7.0"; - }; - letter_opener_web = { - dependencies = ["actionmailer" "letter_opener" "railties"]; - groups = ["development"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "17qhwrkncrrp1bi2f7fbkm5lpnkdsiwy8jcvgr2wa97ck8y4x2bb"; - type = "gem"; - }; - version = "1.3.4"; - }; - license_finder = { - dependencies = ["rubyzip" "thor" "toml" "with_env" "xml-simple"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "01rhqm5m3m22gq6q9f1x9fh3x3wrf9khnnsycblj0xg5frdjv77v"; - type = "gem"; - }; - version = "5.4.0"; - }; - licensee = { - dependencies = ["rugged"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0w6d2smhg3kzcx4m2ii06akakypwhiglansk51bpx290hhc8h3pc"; - type = "gem"; - }; - version = "8.9.2"; - }; - locale = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1sls9bq4krx0fmnzmlbn64dw23c4d6pz46ynjzrn9k8zyassdd0x"; - type = "gem"; - }; - version = "2.1.2"; - }; - lograge = { - dependencies = ["actionpack" "activesupport" "railties" "request_store"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "00lcn7s3slfn32di4qwlx2yj5f9r2pcnd0naxrvqqwypcg1z2sdd"; - type = "gem"; - }; - version = "0.10.0"; - }; - loofah = { - dependencies = ["crass" "nokogiri"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1ccsid33xjajd0im2xv941aywi58z7ihwkvaf1w2bv89vn5bhsjg"; - type = "gem"; - }; - version = "2.2.3"; - }; - mail = { - dependencies = ["mini_mime"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "00wwz6ys0502dpk8xprwcqfwyf3hmnx6lgxaiq6vj43mkx43sapc"; - type = "gem"; - }; - version = "2.7.1"; - }; - mail_room = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "16b8yjd1if665mwaindwys06nkkcs0jw3dcsqvn6qbp6alfigqaa"; - type = "gem"; - }; - version = "0.9.1"; - }; - marcel = { - dependencies = ["mimemagic"]; - groups = ["default" "development" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1nxbjmcyg8vlw6zwagf17l9y2mwkagmmkg95xybpn4bmf3rfnksx"; - type = "gem"; - }; - version = "0.3.3"; - }; - mdl = { - dependencies = ["kramdown" "mixlib-cli" "mixlib-config"]; - groups = ["development" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "047hp8z1ma630wp38bm1giklkf385rp6wly8aidn825q831w2g4i"; - type = "gem"; - }; - version = "0.5.0"; - }; - memoist = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0pq8fhqh8w25qcw9v3vzfb0i6jp0k3949ahxc3wrwz2791dpbgbh"; - type = "gem"; - }; - version = "0.16.0"; - }; - memoizable = { - dependencies = ["thread_safe"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0v42bvghsvfpzybfazl14qhkrjvx0xlmxz0wwqc960ga1wld5x5c"; - type = "gem"; - }; - version = "0.4.2"; - }; - memory_profiler = { - groups = ["default" "development" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1xki7jrbzylsmk1brjibmhifb0x70skr55pdq4rvxcyrlnrrvyxz"; - type = "gem"; - }; - version = "0.9.13"; - }; - method_source = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1pviwzvdqd90gn6y7illcdd9adapw8fczml933p5vl739dkvl3lq"; - type = "gem"; - }; - version = "0.9.2"; - }; - mime-types = { - dependencies = ["mime-types-data"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0fjxy1jm52ixpnv3vg9ld9pr9f35gy0jp66i1njhqjvmnvq0iwwk"; - type = "gem"; - }; - version = "3.2.2"; - }; - mime-types-data = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1m00pg19cm47n1qlcxgl91ajh2yq0fszvn1vy8fy0s1jkrp9fw4a"; - type = "gem"; - }; - version = "3.2019.0331"; - }; - mimemagic = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "00ibc1mhvdfyfyl103xwb45621nwyqxf124cni5hyfhag0fn1c3q"; - type = "gem"; - }; - version = "0.3.2"; - }; - mini_magick = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1djxfs9rxw6q6vr6wb4ndxhp1vj1zbwb55s1kf6mz9bzgmswqg0n"; - type = "gem"; - }; - version = "4.8.0"; - }; - mini_mime = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1q4pshq387lzv9m39jv32vwb8wrq3wc4jwgl4jk209r4l33v09d3"; - type = "gem"; - }; - version = "1.0.1"; - }; - mini_portile2 = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "15zplpfw3knqifj9bpf604rb3wc1vhq6363pd6lvhayng8wql5vy"; - type = "gem"; - }; - version = "2.4.0"; - }; - minitest = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0icglrhghgwdlnzzp4jf76b0mbc71s80njn5afyfjn4wqji8mqbq"; - type = "gem"; - }; - version = "5.11.3"; - }; - mixlib-cli = { - groups = ["default" "development" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0647msh7kp7lzyf6m72g6snpirvhimjm22qb8xgv9pdhbcrmcccp"; - type = "gem"; - }; - version = "1.7.0"; - }; - mixlib-config = { - dependencies = ["tomlrb"]; - groups = ["default" "development" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1gm6yj9cbbgsl9x4xqxga0vz5w0ksq2jnq1wj8hvgm5c4wfcrswb"; - type = "gem"; - }; - version = "2.2.18"; - }; - msgpack = { - groups = ["default" "development" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1w38hilm3dk42dwk8ygiq49bl4in7y80hfqr63hk54mj4gmzi6ch"; - type = "gem"; - }; - version = "1.2.10"; - }; - multi_json = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1rl0qy4inf1mp8mybfk56dfga0mvx97zwpmq5xmiwl5r770171nv"; - type = "gem"; - }; - version = "1.13.1"; - }; - multi_xml = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0lmd4f401mvravi1i1yq7b2qjjli0yq7dfc4p1nj5nwajp7r6hyj"; - type = "gem"; - }; - version = "0.6.0"; - }; - multipart-post = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "09k0b3cybqilk1gwrwwain95rdypixb2q9w65gd44gfzsd84xi1x"; - type = "gem"; - }; - version = "2.0.0"; - }; - mustermann = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0lycgkmnyy0bf29nnd2zql5a6pcf8sp69g9v4xw0gcfcxgpwp7i1"; - type = "gem"; - }; - version = "1.0.3"; - }; - mustermann-grape = { - dependencies = ["mustermann"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "10xdggddjl8nraq7pbli31lwgrzxzz8gp558i811lsv71fqbmhzr"; - type = "gem"; - }; - version = "1.0.0"; - }; - mysql2 = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0qjd97w6a0w9aldsrhb2y6jrc4wnnlbj5j8kcl7pp7vviwa0r5iq"; - type = "gem"; - }; - version = "0.4.10"; - }; - nakayoshi_fork = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1mj5czi7rxxmfq4v9qjz74lcqypvnjxhxqfs71zhb2rsfa97a6jg"; - type = "gem"; - }; - version = "0.0.4"; - }; - net-ldap = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1fh4l8zfsrvghanpnjxk944k7yl093qpw4759xs6f1v9kb73ihfq"; - type = "gem"; - }; - version = "0.16.0"; - }; - net-ssh = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "101wd2px9lady54aqmkibvy4j62zk32w0rjz4vnigyg974fsga40"; - type = "gem"; - }; - version = "5.2.0"; - }; - netrc = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0gzfmcywp1da8nzfqsql2zqi648mfnx6qwkig3cv36n9m0yy676y"; - type = "gem"; - }; - version = "0.11.0"; - }; - nio4r = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1a41ca1kpdmrypjp9xbgvckpy8g26zxphkja9vk7j5wl4n8yvlyr"; - type = "gem"; - }; - version = "2.3.1"; - }; - nokogiri = { - dependencies = ["mini_portile2"]; - groups = ["default" "development" "mysql" "postgres" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "02bjydih0j515szfv9mls195cvpyidh6ixm7dwbl3s2sbaxxk5s4"; - type = "gem"; - }; - version = "1.10.3"; - }; - nokogumbo = { - dependencies = ["nokogiri"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "09qc1c7acv9qm48vk2kzvnrq4ij8jrql1cv33nmv2nwmlggy0jyj"; - type = "gem"; - }; - version = "1.5.0"; - }; - numerizer = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0vrk9jbv4p4dcz0wzr72wrf5kajblhc5l9qf7adbcwi4qvz9xv0h"; - type = "gem"; - }; - version = "0.1.1"; - }; - oauth = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1zszdg8q1b135z7l7crjj234k4j0m347hywp5kj6zsq7q78pw09y"; - type = "gem"; - }; - version = "0.5.4"; - }; - oauth2 = { - dependencies = ["faraday" "jwt" "multi_json" "multi_xml" "rack"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0av6nlb5y2sm6m8fx669ywrqa9858yqaqfqzny75nqp3anag89qh"; - type = "gem"; - }; - version = "1.4.1"; - }; - octokit = { - dependencies = ["sawyer"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1ssn5iyax07a22mvmj0y45bfy8ali129bl1qmasp6bcg03bvk298"; - type = "gem"; - }; - version = "4.9.0"; - }; - omniauth = { - dependencies = ["hashie" "rack"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1p16h1rp8by05k8gfw17xjhgwp60dk8qmj1xalv1n23kmxfsxb1x"; - type = "gem"; - }; - version = "1.9.0"; - }; - omniauth-auth0 = { - dependencies = ["omniauth-oauth2"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0id5gn14av81kh41cq4q6c9knyvzl7vc4rs3m4pmpd43g2z6jdw2"; - type = "gem"; - }; - version = "2.0.0"; - }; - omniauth-authentiq = { - dependencies = ["jwt" "omniauth-oauth2"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0k7vajxwplsp188xfj4mi9iqbc7f7djqh02by4mphc51hl87kcqi"; - type = "gem"; - }; - version = "0.3.3"; - }; - omniauth-azure-oauth2 = { - dependencies = ["jwt" "omniauth" "omniauth-oauth2"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1a3iqy63l1jd6na4y0bj4a8mlp7gcn3a0awnz9g79fa8n4v2g8n4"; - type = "gem"; - }; - version = "0.0.10"; - }; - omniauth-cas3 = { - dependencies = ["addressable" "nokogiri" "omniauth"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "191b4jm4djmmy54yxfxj3c889r2wn3g6sfsdj6l1rjy0kw1m2qgx"; - type = "gem"; - }; - version = "1.1.4"; - }; - omniauth-facebook = { - dependencies = ["omniauth-oauth2"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "03zjla9i446fk1jkw7arh67c39jfhp5bhkmhvbw8vczxr1jkbbh5"; - type = "gem"; - }; - version = "4.0.0"; - }; - omniauth-github = { - dependencies = ["omniauth" "omniauth-oauth2"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0yg7k4p95ybcsii17spqarl8rpfzkq0kb19ab6wl4lc922zgfbqc"; - type = "gem"; - }; - version = "1.3.0"; - }; - omniauth-gitlab = { - dependencies = ["omniauth" "omniauth-oauth2"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "19ydk2zd2mz8zi80z3l03pajpm9357sg3lrankrcb3pirkkdb9fp"; - type = "gem"; - }; - version = "1.0.3"; - }; - omniauth-google-oauth2 = { - dependencies = ["jwt" "omniauth" "omniauth-oauth2"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "03v2gqpsbdhkqaxhvzr83za885awm6pgskv3mkyfvang7mr321df"; - type = "gem"; - }; - version = "0.6.0"; - }; - omniauth-kerberos = { - dependencies = ["omniauth-multipassword" "timfel-krb5-auth"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "05xsv76qjxcxzrvabaar2bchv7435y8l2j0wk4zgchh3yv85kiq7"; - type = "gem"; - }; - version = "0.3.0"; - }; - omniauth-multipassword = { - dependencies = ["omniauth"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0qykp76hw80lkgb39hyzrv68hkbivc8cv0vbvrnycjh9fwfp1lv8"; - type = "gem"; - }; - version = "0.4.2"; - }; - omniauth-oauth = { - dependencies = ["oauth" "omniauth"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1n5vk4by7hkyc09d9blrw2argry5awpw4gbw1l4n2s9b3j4qz037"; - type = "gem"; - }; - version = "1.1.0"; - }; - omniauth-oauth2 = { - dependencies = ["oauth2" "omniauth"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "11mi36l9d97r77q99jnafdc1yaa0a9wahhpp7dj7ank8q52g7g79"; - type = "gem"; - }; - version = "1.6.0"; - }; - omniauth-oauth2-generic = { - dependencies = ["omniauth-oauth2"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1m6vpip3rm1spx1x9y1kjczzailsph1xqgaakqylzq3jqkv18273"; - type = "gem"; - }; - version = "0.2.2"; - }; - omniauth-salesforce = { - dependencies = ["omniauth" "omniauth-oauth2"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0sr7xmffx6dbsrvnh6spka5ljyzf69iac754xw5r1736py41qhpj"; - type = "gem"; - }; - version = "1.0.5"; - }; - omniauth-saml = { - dependencies = ["omniauth" "ruby-saml"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "17lji8i4q9k3yi8lmjwlw8rfpp2sc74jv8d6flgq85lg5brfqq1p"; - type = "gem"; - }; - version = "1.10.0"; - }; - omniauth-shibboleth = { - dependencies = ["omniauth"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "04yin7j8xpr8llvank3ivzahqkc6ss5bppc7q6znzdswxmf75fxh"; - type = "gem"; - }; - version = "1.3.0"; - }; - omniauth-twitter = { - dependencies = ["omniauth-oauth" "rack"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0r5j65hkpgzhvvbs90id3nfsjgsad6ymzggbm7zlaxvnrmvnrk65"; - type = "gem"; - }; - version = "1.4.0"; - }; - omniauth-ultraauth = { - dependencies = ["omniauth_openid_connect"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1z8gz8ql4vb8y5n4lr67afnjmp23bpqi18dmda5psigvd2jddyn8"; - type = "gem"; - }; - version = "0.0.2"; - }; - omniauth_crowd = { - dependencies = ["activesupport" "nokogiri" "omniauth"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "12g5ck05h6kr9mnp870x8pkxsadg81ca70hg8n3k8xx007lfw2q7"; - type = "gem"; - }; - version = "2.2.3"; - }; - omniauth_openid_connect = { - dependencies = ["addressable" "omniauth" "openid_connect"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0ja7cjlm4z0k0pwwy64djl58pay3lzkw7im565fybs4a8q4wmacb"; - type = "gem"; - }; - version = "0.3.1"; - }; - openid_connect = { - dependencies = ["activemodel" "attr_required" "json-jwt" "rack-oauth2" "swd" "tzinfo" "validate_email" "validate_url" "webfinger"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1r13bv18nyvw0g1nw3fzffvv2si99zj24w0k5zgawf4q6nn5f7vd"; - type = "gem"; - }; - version = "1.1.6"; - }; - opentracing = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "11lj1d8vq0hkb5hjz8q4lm82cddrggpbb33dhqfn7rxhwsmxgdfy"; - type = "gem"; - }; - version = "0.5.0"; - }; - optimist = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "05jxrp3nbn5iilc1k7ir90mfnwc5abc9h78s5rpm3qafwqxvcj4j"; - type = "gem"; - }; - version = "3.0.0"; - }; - org-ruby = { - dependencies = ["rubypants"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0x69s7aysfiwlcpd9hkvksfyld34d8kxr62adb59vjvh8hxfrjwk"; - type = "gem"; - }; - version = "0.9.12"; - }; - orm_adapter = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1fg9jpjlzf5y49qs9mlpdrgs5rpcyihq1s4k79nv9js0spjhnpda"; - type = "gem"; - }; - version = "0.5.0"; - }; - os = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1s401gvhqgs2r8hh43ia205mxsy1wc0ib4k76wzkdpspfcnfr1rk"; - type = "gem"; - }; - version = "1.0.0"; - }; - parallel = { - groups = ["default" "development" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1x1gzgjrdlkm1aw0hfpyphsxcx90qgs3y4gmp9km3dvf4hc4qm8r"; - type = "gem"; - }; - version = "1.17.0"; - }; - parser = { - dependencies = ["ast"]; - groups = ["default" "development" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1pnks149x0fzgqiw53qlmvcd8bi746cxdw03sjljby5s97p1fskn"; - type = "gem"; - }; - version = "2.6.3.0"; - }; - parslet = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "12nrzfwjphjlakb9pmpj70hgjwgzvnr8i1zfzddifgyd44vspl88"; - type = "gem"; - }; - version = "1.8.2"; - }; - peek = { - dependencies = ["concurrent-ruby" "concurrent-ruby-ext" "railties"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1998vcsli215d6qrn9821gr2qip60xki2p7n2dpn8i1n68hyshcn"; - type = "gem"; - }; - version = "1.0.1"; - }; - peek-gc = { - dependencies = ["peek"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "094h3mr9q8wzbqsj0girpyjvj4bcxax8m438igp42n75xv0bhwi9"; - type = "gem"; - }; - version = "0.0.2"; - }; - peek-mysql2 = { - dependencies = ["concurrent-ruby" "concurrent-ruby-ext" "mysql2" "peek"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0avmwm3yw0kx0z8gh4cpqj79jb5aicd0h3yzrcdfpzwks56h1k9z"; - type = "gem"; - }; - version = "1.2.0"; - }; - peek-pg = { - dependencies = ["concurrent-ruby" "concurrent-ruby-ext" "peek" "pg"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "17yk8xrh7yh57wg6vi3s8km9qd9f910n94r511mdyqd7aizlfb7c"; - type = "gem"; - }; - version = "1.3.0"; - }; - peek-rblineprof = { - dependencies = ["peek" "rblineprof"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0ywk1gvsnhrkhqq2ibwsg7099kg5m2vs4nmzy0wf65kb0ywl0m9c"; - type = "gem"; - }; - version = "0.2.0"; - }; - peek-redis = { - dependencies = ["atomic" "peek" "redis"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0v91cni591d9wdrmvgam20gr3504x84mh1l95da4rz5a9436jm33"; - type = "gem"; - }; - version = "1.2.0"; - }; - pg = { - groups = ["development" "postgres" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0fmnyxcyrvgdbgq7m09whgn9i8rwfybk0w8aii1nc4g5kqw0k2jy"; - type = "gem"; - }; - version = "1.1.4"; - }; - po_to_json = { - dependencies = ["json"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1xvanl437305mry1gd57yvcg7xrfhri91czr32bjr8j2djm8hwba"; - type = "gem"; - }; - version = "1.0.1"; - }; - premailer = { - dependencies = ["addressable" "css_parser" "htmlentities"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "10w6f7r6snpkcnv3byxma9b08lyqzcfxkm083scb2dr2ly4xkzyf"; - type = "gem"; - }; - version = "1.10.4"; - }; - premailer-rails = { - dependencies = ["actionmailer" "premailer"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "05czxmx6hnykg6g23hy2ww2bf86a69njbi02sv7lrds4w776jhim"; - type = "gem"; - }; - version = "1.9.7"; - }; - proc_to_ast = { - dependencies = ["coderay" "parser" "unparser"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "14c65w48bbzp5lh1cngqd1y25kqvfnq1iy49hlzshl12dsk3z9wj"; - type = "gem"; - }; - version = "0.1.0"; - }; - procto = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "13imvg1x50rz3r0yyfbhxwv72lbf7q28qx9l9nfbb91h2n9ch58c"; - type = "gem"; - }; - version = "0.0.3"; - }; - prometheus-client-mmap = { - groups = ["metrics"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "01f1zkpi7qsmgmk17fpq6ck7jn64sa9afsq20vc5k9f6mpyqkncd"; - type = "gem"; - }; - version = "0.9.8"; - }; - pry = { - dependencies = ["coderay" "method_source"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1mh312k3y94sj0pi160wpia0ps8f4kmzvm505i6bvwynfdh7v30g"; - type = "gem"; - }; - version = "0.11.3"; - }; - pry-byebug = { - dependencies = ["byebug" "pry"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1f9kj1qp14qb8crg2rdzf22pr6ngxvy4n6ipymla8q1yjr842625"; - type = "gem"; - }; - version = "3.5.1"; - }; - pry-rails = { - dependencies = ["pry"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0k2d43bwmqbswfra4fkadjjbszwb11pr7qdkma91qrcrk62wqxvy"; - type = "gem"; - }; - version = "0.3.6"; - }; - public_suffix = { - groups = ["default" "development" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1c7c5xxkx91hwj4572hbnyvxmydb90q69wlpr2l0dxrmwx2p365l"; - type = "gem"; - }; - version = "3.1.0"; - }; - puma = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1k7dqxnq0dnf5rxkgs9rknclkn3ah7lsdrk6nrqxla8qzy31wliq"; - type = "gem"; - }; - version = "3.12.0"; - }; - puma_worker_killer = { - dependencies = ["get_process_mem" "puma"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1m08qi8mxpp20zqqjj9yzcrx0sn29n5fn5avlf1lnl0n7qa9c03i"; - type = "gem"; - }; - version = "0.1.0"; - }; - pyu-ruby-sasl = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1rcpjiz9lrvyb3rd8k8qni0v4ps08psympffyldmmnrqayyad0sn"; - type = "gem"; - }; - version = "0.0.3.3"; - }; - raabro = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0xzdmbn48753f6k0ckirp8ja5p0xn1a92wbwxfyggyhj0hza9ylq"; - type = "gem"; - }; - version = "1.1.6"; - }; - rack = { - groups = ["default" "development" "kerberos" "mysql" "postgres" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0z90vflxbgjy2n84r7mbyax3i2vyvvrxxrf86ljzn5rw65jgnn2i"; - type = "gem"; - }; - version = "2.0.7"; - }; - rack-accept = { - dependencies = ["rack"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "18jdipx17b4ki33cfqvliapd31sbfvs4mv727awynr6v95a7n936"; - type = "gem"; - }; - version = "0.4.5"; - }; - rack-attack = { - dependencies = ["rack"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1czx68p70x98y21dkdndsb64lrxf9qrv09wl1dbcxrypcjnpsdl1"; - type = "gem"; - }; - version = "4.4.1"; - }; - rack-cors = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1j27vy1bmhbqcyzhxg8d07qassmax769xjalfwcwz6qfiq8cf013"; - type = "gem"; - }; - version = "1.0.2"; - }; - rack-oauth2 = { - dependencies = ["activesupport" "attr_required" "httpclient" "json-jwt" "rack"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0kmxj9hbjhhcs3yyb433s82hkpmzb536m0mwfadjiaisganx1cii"; - type = "gem"; - }; - version = "1.9.3"; - }; - rack-protection = { - dependencies = ["rack"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "15167q25rmxipqwi6hjqj3i1byi9iwl3xq9b7mdar7qiz39pmjsk"; - type = "gem"; - }; - version = "2.0.5"; - }; - rack-proxy = { - dependencies = ["rack"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1bpbcb9ch94ha2q7gdri88ry7ch0z6ian289kah9ayxyqg19j6f4"; - type = "gem"; - }; - version = "0.6.0"; - }; - rack-test = { - dependencies = ["rack"]; - groups = ["default" "development" "mysql" "postgres" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0rh8h376mx71ci5yklnpqqn118z3bl67nnv5k801qaqn1zs62h8m"; - type = "gem"; - }; - version = "1.1.0"; - }; - rack-timeout = { - groups = ["puma"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "15xph8h6v0lvq9pxm3bc9i9pnk2k68rgdr1mp0dw4l7v1xvhs78a"; - type = "gem"; - }; - version = "0.5.1"; - }; - rails = { - dependencies = ["actioncable" "actionmailer" "actionpack" "actionview" "activejob" "activemodel" "activerecord" "activestorage" "activesupport" "railties" "sprockets-rails"]; - groups = ["default" "development" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1p7cszi3n9ksxchxnccmz61pd1i3rjg4813dsdinsm8xm5k1pdgr"; - type = "gem"; - }; - version = "5.2.3"; - }; - rails-controller-testing = { - dependencies = ["actionpack" "actionview" "activesupport"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "16kdkk73mhhs73iz3i1i0ryjm84dadiyh817b3nh8acdi490jyhy"; - type = "gem"; - }; - version = "1.0.2"; - }; - rails-dom-testing = { - dependencies = ["activesupport" "nokogiri"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1lfq2a7kp2x64dzzi5p4cjcbiv62vxh9lyqk2f0rqq3fkzrw8h5i"; - type = "gem"; - }; - version = "2.0.3"; - }; - rails-html-sanitizer = { - dependencies = ["loofah"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1gv7vr5d9g2xmgpjfq4nxsqr70r9pr042r9ycqqnfvw5cz9c7jwr"; - type = "gem"; - }; - version = "1.0.4"; - }; - rails-i18n = { - dependencies = ["i18n" "railties"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1rqij2ggqz5iq36lbibhnd7pl4qxrvv9kgw9s0c6594vzbbxmhs0"; - type = "gem"; - }; - version = "5.1.1"; - }; - railties = { - dependencies = ["actionpack" "activesupport" "method_source" "rake" "thor"]; - groups = ["default" "development" "mysql" "postgres" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1gn9fwb5wm08fbj7zpilqgblfl315l5b7pg4jsvxlizvrzg8h8q4"; - type = "gem"; - }; - version = "5.2.3"; - }; - rainbow = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0bb2fpjspydr6x0s8pn1pqkzmxszvkfapv0p4627mywl7ky4zkhk"; - type = "gem"; - }; - version = "3.0.0"; - }; - raindrops = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1qpbd9jif40c53fz2r0l8khfl016y8s8bkx37ibcaafclbl3xygp"; - type = "gem"; - }; - version = "0.19.0"; - }; - rake = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1sy5a7nh6xjdc9yhcw31jji7ssrf9v5806hn95gbrzr998a2ydjn"; - type = "gem"; - }; - version = "12.3.2"; - }; - rb-fsevent = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1fbpmjypwxkb8r7y1kmhmyp6gawa4byw0yb3jc3dn9ly4ld9lizf"; - type = "gem"; - }; - version = "0.10.2"; - }; - rb-inotify = { - dependencies = ["ffi"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0yfsgw5n7pkpyky6a9wkf1g9jafxb0ja7gz0qw0y14fd2jnzfh71"; - type = "gem"; - }; - version = "0.9.10"; - }; - rblineprof = { - dependencies = ["debugger-ruby_core_source"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0m58kdjgncwf0h1qry3qk5h4bg8sj0idykqqijqcrr09mxfd9yc6"; - type = "gem"; - }; - version = "0.3.6"; - }; - rbtrace = { - dependencies = ["ffi" "msgpack" "optimist"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1lwsq08i0aj8na5q5ba3gg02sx3wl58fi6m52svl5p7cy56ycdwi"; - type = "gem"; - }; - version = "0.4.11"; - }; - rdoc = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0anv42cqcdc6g4n386mrva7mgav5i0c2ry3yzvzzc6z6hymkmcr7"; - type = "gem"; - }; - version = "6.0.4"; - }; - re2 = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "00wf9k1hkv3z3nfkrnfyyfq9ah0l7k14awqys3h2hqz4c21pqd2i"; - type = "gem"; - }; - version = "1.1.1"; - }; - recaptcha = { - dependencies = ["json"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "121pkq8kwqjh4l751xzx15bjp5vmf5pirfmpb11h71zsiavjqv6w"; - type = "gem"; - }; - version = "4.13.1"; - }; - recursive-open-struct = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0wfcyigmf5mwrxy76p0bi4sdb4h9afs8jc73pjav5cnqszljjl3c"; - type = "gem"; - }; - version = "1.1.0"; - }; - RedCloth = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0m9dv7ya9q93r8x1pg2gi15rxlbck8m178j1fz7r5v6wr1avrrqy"; - type = "gem"; - }; - version = "4.3.2"; - }; - redis = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0i415x8gi0c5vsiy6ikvx5js6fhc4x80a5lqv8iidy2iymd20irv"; - type = "gem"; - }; - version = "3.3.5"; - }; - redis-actionpack = { - dependencies = ["actionpack" "redis-rack" "redis-store"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "15k41gz7nygd4yydk2yd25gghya1j7q6zifk4mdrra6bwnwjbm63"; - type = "gem"; - }; - version = "5.0.2"; - }; - redis-activesupport = { - dependencies = ["activesupport" "redis-store"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0rq5dhrzc1l8c7f5gx9r7mvnsk5206dfwih3yv5si5rf42nx2ay5"; - type = "gem"; - }; - version = "5.0.4"; - }; - redis-namespace = { - dependencies = ["redis"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0r7daagrjjribn098dxwbv9zivrbq2rsffbkj2ccxyn9lmjjbgah"; - type = "gem"; - }; - version = "1.6.0"; - }; - redis-rack = { - dependencies = ["rack" "redis-store"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0px0wv8zripc6lrn3k0k61j6nlxda145q8sz50yvnig17wlk36gb"; - type = "gem"; - }; - version = "2.0.4"; - }; - redis-rails = { - dependencies = ["redis-actionpack" "redis-activesupport" "redis-store"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0hjvkyaw5hgz7v6fgwdk8pb966z44h1gv8jarmb0gwhkqmjnsh40"; - type = "gem"; - }; - version = "5.0.2"; - }; - redis-store = { - dependencies = ["redis"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1mrcnjgkbmx1zf569mly82agdizqayjvnp2k6055k1iy07in3j8b"; - type = "gem"; - }; - version = "1.6.0"; - }; - regexp_parser = { - groups = ["default" "development" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0dsgjb3kszk6a82s6gl0h6a8vncjrxmcbk0r4mcxcdcad2b7vb2d"; - type = "gem"; - }; - version = "1.5.1"; - }; - regexp_property_values = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "05ka0bkhghs9b9pv6q443k8y1c5xalmm0vylj9zd450ksncxj1yr"; - type = "gem"; - }; - version = "0.3.4"; - }; - representable = { - dependencies = ["declarative" "declarative-option" "uber"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0qm9rgi1j5a6nv726ka4mmixivlxfsg91h8rpp72wwd4vqbkkm07"; - type = "gem"; - }; - version = "3.0.4"; - }; - request_store = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1va9x0b3ww4chcfqlmi8b14db39di1mwa7qrjbh7ma0lhndvs2zv"; - type = "gem"; - }; - version = "1.3.1"; - }; - responders = { - dependencies = ["actionpack" "railties"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1rhdyyvvm26f2l3fgwdp6xasfl2y0whwgy766bhdwz697mf78zfn"; - type = "gem"; - }; - version = "2.4.0"; - }; - rest-client = { - dependencies = ["http-cookie" "mime-types" "netrc"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1hzcs2r7b5bjkf2x2z3n8z6082maz0j8vqjiciwgg3hzb63f958j"; - type = "gem"; - }; - version = "2.0.2"; - }; - retriable = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1q48hqws2dy1vws9schc0kmina40gy7sn5qsndpsfqdslh65snha"; - type = "gem"; - }; - version = "3.1.2"; - }; - rinku = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "11cakxzp7qi04d41hbqkh92n52mm4z2ba8sqyhxbmfi4kypmls9y"; - type = "gem"; - }; - version = "2.0.0"; - }; - rotp = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1w8d6svhq3y9y952r8cqirxvdx12zlkb7zxjb44bcbidb2sisy4d"; - type = "gem"; - }; - version = "2.1.2"; - }; - rouge = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0yfhazlhjc4abgzhkgq8zqmdphvkh52211widkl4zhsbhqh8wg2q"; - type = "gem"; - }; - version = "3.5.1"; - }; - rqrcode = { - dependencies = ["chunky_png"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "188n1mvc7klrlw30bai16sdg4yannmy7cz0sg0nvm6f1kjx5qflb"; - type = "gem"; - }; - version = "0.7.0"; - }; - rqrcode-rails3 = { - dependencies = ["rqrcode"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1i28rwmj24ssk91chn0g7qsnvn003y3s5a7jsrg3w4l5ckr841bg"; - type = "gem"; - }; - version = "0.1.7"; - }; - rspec = { - dependencies = ["rspec-core" "rspec-expectations" "rspec-mocks"]; - groups = ["default" "development" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "15ppasvb9qrscwlyjz67ppw1lnxiqnkzx5vkx1bd8x5n3dhikxc3"; - type = "gem"; - }; - version = "3.8.0"; - }; - rspec-core = { - dependencies = ["rspec-support"]; - groups = ["default" "development" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0spjgmd3yx6q28q950r32bi0cs8h2si53zn6rq8s7n1i4zp4zwbf"; - type = "gem"; - }; - version = "3.8.2"; - }; - rspec-expectations = { - dependencies = ["diff-lcs" "rspec-support"]; - groups = ["default" "development" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0x3iddjjaramqb0yb51c79p2qajgi9wb5b59bzv25czddigyk49r"; - type = "gem"; - }; - version = "3.8.4"; - }; - rspec-mocks = { - dependencies = ["diff-lcs" "rspec-support"]; - groups = ["default" "development" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "12zplnsv4p6wvvxsk8xn6nm87a5qadxlkk497zlxfczd0jfawrni"; - type = "gem"; - }; - version = "3.8.1"; - }; - rspec-parameterized = { - dependencies = ["binding_ninja" "parser" "proc_to_ast" "rspec" "unparser"]; - groups = ["development" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1c0892jbaznnldk1wi24qxm70g4zhw2idqx516rhgdzgd7yh5j31"; - type = "gem"; - }; - version = "0.4.2"; - }; - rspec-rails = { - dependencies = ["actionpack" "activesupport" "railties" "rspec-core" "rspec-expectations" "rspec-mocks" "rspec-support"]; - groups = ["development" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1pf6n9l4sw1arlax1bdbm1znsvl8cgna2n6k6yk1bi8vz2n73ls1"; - type = "gem"; - }; - version = "3.8.2"; - }; - rspec-retry = { - dependencies = ["rspec-core"]; - groups = ["development" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1nnqcg2yd3nn187zbvh4cgx8xsvdk56lz1985qy7232v7i8yidw6"; - type = "gem"; - }; - version = "0.6.1"; - }; - rspec-set = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "06vw8b5w1a58838cw9ssmy3r6f8vrjh54h7dp97rwv831gn5zlyk"; - type = "gem"; - }; - version = "0.1.3"; - }; - rspec-support = { - groups = ["default" "development" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "139mbhfdr10flm2ffryvxkyqgqs1gjdclc1xhyh7i7njfqayxk7g"; - type = "gem"; - }; - version = "3.8.2"; - }; - rspec_junit_formatter = { - dependencies = ["rspec-core"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1aynmrgnv26pkprrajvp7advb8nbh0x4pkwk6jwq8qmwzarzk21p"; - type = "gem"; - }; - version = "0.4.1"; - }; - rspec_profiling = { - dependencies = ["activerecord" "pg" "rails" "sqlite3"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1g7q7gav26bpiprx4dhlvdh4zdrhwiky9jbmsp14gyfiabqdz4sz"; - type = "gem"; - }; - version = "0.0.5"; - }; - rubocop = { - dependencies = ["jaro_winkler" "parallel" "parser" "rainbow" "ruby-progressbar" "unicode-display_width"]; - groups = ["development" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1cmw8ajaiidvrzjcsljh47f4l3lmcazqrzljgalj3szkr8ibkk5i"; - type = "gem"; - }; - version = "0.69.0"; - }; - rubocop-gitlab-security = { - dependencies = ["rubocop"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0v0040kpx46fxz3p7dsdjgvsx89qjhwy17n8vxnqg9a7g1rfvxln"; - type = "gem"; - }; - version = "0.1.1"; - }; - rubocop-performance = { - dependencies = ["rubocop"]; - groups = ["development" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0azzgj62w24wa4hza1qn7i9b9crxdh907kydlzcvhismx41h3lzk"; - type = "gem"; - }; - version = "1.1.0"; - }; - rubocop-rspec = { - dependencies = ["rubocop"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0vk51h9swvgshan8vp8yjz03qv9vn5vs29i9iddhjwcwgzsganla"; - type = "gem"; - }; - version = "1.22.2"; - }; - ruby-enum = { - dependencies = ["i18n"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0h62avini866kxpjzqxlqnajma3yvj0y25l6hn9h2mv5pp6fcrhx"; - type = "gem"; - }; - version = "0.7.2"; - }; - ruby-fogbugz = { - dependencies = ["crack"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1jj0gpkycbrivkh2q3429vj6mbgx6axxisg69slj3c4mgvzfgchm"; - type = "gem"; - }; - version = "0.2.1"; - }; - ruby-prof = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "02z4lh1iv1d8751a1l6r4hfc9mp61gf80g4qc4l6gbync3j3hf2c"; - type = "gem"; - }; - version = "0.17.0"; - }; - ruby-progressbar = { - groups = ["default" "development" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1cv2ym3rl09svw8940ny67bav7b2db4ms39i4raaqzkf59jmhglk"; - type = "gem"; - }; - version = "1.10.0"; - }; - ruby-saml = { - dependencies = ["nokogiri"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0k9d88fa8bp5szivbwq0qi960y3r2kp6jhnkmsp3n2rvwpn936i3"; - type = "gem"; - }; - version = "1.7.2"; - }; - ruby_parser = { - dependencies = ["sexp_processor"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0s3hsccsmrirc2hy3r51kl8g9cfmcn7jxaa0asadg1kn78h1sgr7"; - type = "gem"; - }; - version = "3.13.1"; - }; - rubyntlm = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1p6bxsklkbcqni4bcq6jajc2n57g0w5rzn4r49c3lb04wz5xg0dy"; - type = "gem"; - }; - version = "0.6.2"; - }; - rubypants = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1vpdkrc4c8qhrxph41wqwswl28q5h5h994gy4c1mlrckqzm3hzph"; - type = "gem"; - }; - version = "0.2.0"; - }; - rubyzip = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1n1lb2sdwh9h27y244hxzg1lrxxg2m53pk1vq7p33bna003qkyrj"; - type = "gem"; - }; - version = "1.2.2"; - }; - rugged = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1yiszpz6y13vvgh3fss1l0ipp0zgsbbc8c28vynnpdyx1sy6krp6"; - type = "gem"; - }; - version = "0.28.1"; - }; - safe_yaml = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1hly915584hyi9q9vgd968x2nsi5yag9jyf5kq60lwzi5scr7094"; - type = "gem"; - }; - version = "1.0.4"; - }; - sanitize = { - dependencies = ["crass" "nokogiri" "nokogumbo"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0j4j2a2mkk1a70vbx959pvx0gvr1zb9snjwvsppwj28bp0p0b2bv"; - type = "gem"; - }; - version = "4.6.6"; - }; - sass = { - dependencies = ["sass-listen"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "10401m2xlv6vaxfwzy4xxmk51ddcnkvwi918cw3jkki0qqdl7d8v"; - type = "gem"; - }; - version = "3.5.5"; - }; - sass-listen = { - dependencies = ["rb-fsevent" "rb-inotify"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0xw3q46cmahkgyldid5hwyiwacp590zj2vmswlll68ryvmvcp7df"; - type = "gem"; - }; - version = "4.0.0"; - }; - sassc = { - dependencies = ["ffi" "rake"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1sr4825rlwsrl7xrsm0sgalcpf5zgp4i56dbi3qxfa9lhs8r6zh4"; - type = "gem"; - }; - version = "2.0.1"; - }; - sassc-rails = { - dependencies = ["railties" "sassc" "sprockets" "sprockets-rails" "tilt"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "18mgdjxdzpbw92zrllynxw7jn7yihi85j3dg7i4f6c39w1scqkbn"; - type = "gem"; - }; - version = "2.1.0"; - }; - sawyer = { - dependencies = ["addressable" "faraday"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0sv1463r7bqzvx4drqdmd36m7rrv6sf1v3c6vswpnq3k6vdw2dvd"; - type = "gem"; - }; - version = "0.8.1"; - }; - scss_lint = { - dependencies = ["rake" "sass"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "01bfkrjn1i0hfg1ifwn1rs7vqwdbdw158krwr5fm6iasd9zgl10g"; - type = "gem"; - }; - version = "0.56.0"; - }; - seed-fu = { - dependencies = ["activerecord" "activesupport"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0x6gclryl0hds3zms095d2iyafcvm2kfrm7362vrkxws7r2775pi"; - type = "gem"; - }; - version = "2.3.7"; - }; - selenium-webdriver = { - dependencies = ["childprocess" "rubyzip"]; - groups = ["development" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "114hv2ajmh6d186v2w887yqakqcxyxq367l0iakrrpvwviknrhfs"; - type = "gem"; - }; - version = "3.141.0"; - }; - sentry-raven = { - dependencies = ["faraday"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1j9rwbig24ry0smgvmkzdjrzyszniaswipinvflzxzzaz52v7483"; - type = "gem"; - }; - version = "2.9.0"; - }; - settingslogic = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1ria5zcrk1nf0b9yia15mdpzw0dqr6wjpbj8dsdbbps81lfsj9ar"; - type = "gem"; - }; - version = "2.0.9"; - }; - sexp_processor = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0w24rgmyjf7yz0xr2qhbr8z48h4m6gvbggr8nc1pldwn9rbi04b7"; - type = "gem"; - }; - version = "4.12.0"; - }; - sham_rack = { - dependencies = ["rack"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0zs6hpgg87x5jrykjxgfp2i7m5aja53s5kamdhxam16wki1hid3i"; - type = "gem"; - }; - version = "1.3.6"; - }; - shoulda-matchers = { - dependencies = ["activesupport"]; - groups = ["test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1s6a2i39lsqq8rrkk2pddqcb10bsihxy3v5gpnc2gk8xakj1brdq"; - type = "gem"; - }; - version = "4.0.1"; - }; - sidekiq = { - dependencies = ["connection_pool" "rack" "rack-protection" "redis"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "131zv8i341bkacxx7n1id2cmblkbs379farnibqg8c7bycd1iajq"; - type = "gem"; - }; - version = "5.2.7"; - }; - sidekiq-cron = { - dependencies = ["fugit" "sidekiq"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1aliswahmpxn1ib2brn4126gk97ac3zdnwr71mn8vzbr3vdd7fl0"; - type = "gem"; - }; - version = "1.0.4"; - }; - signet = { - dependencies = ["addressable" "faraday" "jwt" "multi_json"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1f5d3bz5bjc4b0r2jmqd15qf07lgsqkgd25f0h46jihrf9l5fsi4"; - type = "gem"; - }; - version = "0.11.0"; - }; - simple_po_parser = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "08wkp4gcrd89k5yari9j94if9ffkj3rka4llcwrhdgsi3l15p5f3"; - type = "gem"; - }; - version = "1.1.2"; - }; - simplecov = { - dependencies = ["docile" "json" "simplecov-html"]; - groups = ["development" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1sfyfgf7zrp2n42v7rswkqgk3bbwk1bnsphm24y7laxv3f8z0947"; - type = "gem"; - }; - version = "0.16.1"; - }; - simplecov-html = { - groups = ["default" "development" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1lihraa4rgxk8wbfl77fy9sf0ypk31iivly8vl3w04srd7i0clzn"; - type = "gem"; - }; - version = "0.10.2"; - }; - slack-notifier = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0xavibxh00gy62mm79l6id9l2fldjmdqifk8alqfqy5z38ffwah6"; - type = "gem"; - }; - version = "1.5.1"; - }; - spring = { - dependencies = ["activesupport"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "168yz9c1fv21wc5i8q7n43b9nk33ivg3ws1fn6x0afgryz3ssx75"; - type = "gem"; - }; - version = "2.0.2"; - }; - spring-commands-rspec = { - dependencies = ["spring"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0b0svpq3md1pjz5drpa5pxwg8nk48wrshq8lckim4x3nli7ya0k2"; - type = "gem"; - }; - version = "1.0.4"; - }; - sprockets = { - dependencies = ["concurrent-ruby" "rack"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "182jw5a0fbqah5w9jancvfmjbk88h8bxdbwnl4d3q809rpxdg8ay"; - type = "gem"; - }; - version = "3.7.2"; - }; - sprockets-rails = { - dependencies = ["actionpack" "activesupport" "sprockets"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0ab42pm8p5zxpv3sfraq45b9lj39cz9mrpdirm30vywzrwwkm5p1"; - type = "gem"; - }; - version = "3.2.1"; - }; - sqlite3 = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "01ifzp8nwzqppda419c9wcvr8n82ysmisrs0hph9pdmv1lpa4f5i"; - type = "gem"; - }; - version = "1.3.13"; - }; - sshkey = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "03bkn55qsng484iqwz2lmm6rkimj01vsvhwk661s3lnmpkl65lbp"; - type = "gem"; - }; - version = "2.0.0"; - }; - stackprof = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1c88j2d6ipjw5s3hgdgfww37gysgrkicawagj33hv3knijjc9ski"; - type = "gem"; - }; - version = "0.2.10"; - }; - state_machines = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "00mi16hg3rhkxz4y58s173cbnjlba41y9bfcim90p4ja6yfj9ri3"; - type = "gem"; - }; - version = "0.5.0"; - }; - state_machines-activemodel = { - dependencies = ["activemodel" "state_machines"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0chhm5hs1y83dq8haff10m66r3yrm7jab35r9xg6adn6qd8ynv2l"; - type = "gem"; - }; - version = "0.5.1"; - }; - state_machines-activerecord = { - dependencies = ["activerecord" "state_machines-activemodel"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "00h07gd4kb22ahgv61r8zca9hqxaw44fnk2sc28j00c1nmwsw6r3"; - type = "gem"; - }; - version = "0.5.1"; - }; - swd = { - dependencies = ["activesupport" "attr_required" "httpclient"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1s2vjb6f13za7p1iycl2p73d3p202xa6xny9fjrp8ynwsqix7lyd"; - type = "gem"; - }; - version = "1.1.2"; - }; - sys-filesystem = { - dependencies = ["ffi"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "092wj7936i5inzafi09wqh5c8dbak588q21k652dsrdjf5qi10zq"; - type = "gem"; - }; - version = "1.1.6"; - }; - sysexits = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0qjng6pllznmprzx8vb0zg0c86hdrkyjs615q41s9fjpmv2430jr"; - type = "gem"; - }; - version = "1.2.0"; - }; - temple = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "00nxf610nzi4n1i2lkby43nrnarvl89fcl6lg19406msr0k3ycmq"; - type = "gem"; - }; - version = "0.8.0"; - }; - test-prof = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "08nvn3c1mzgcjgk9lr3py0zjd8fjjrm3ncn9rpqkfbx429mgw2l3"; - type = "gem"; - }; - version = "0.2.5"; - }; - text = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1x6kkmsr49y3rnrin91rv8mpc3dhrf3ql08kbccw8yffq61brfrg"; - type = "gem"; - }; - version = "1.3.1"; - }; - thin = { - dependencies = ["daemons" "eventmachine" "rack"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0nagbf9pwy1vg09k6j4xqhbjjzrg5dwzvkn4ffvlj76fsn6vv61f"; - type = "gem"; - }; - version = "1.7.2"; - }; - thor = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "01n5dv9kql60m6a00zc0r66jvaxx98qhdny3klyj0p3w34pad2ns"; - type = "gem"; - }; - version = "0.19.4"; - }; - thread_safe = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0nmhcgq6cgz44srylra07bmaw99f5271l0dpsvl5f75m44l0gmwy"; - type = "gem"; - }; - version = "0.3.6"; - }; - thrift = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "02p107kwx7jnkh6fpdgvaji0xdg6xkaarngkqjml6s4zny4m8slv"; - type = "gem"; - }; - version = "0.11.0.0"; - }; - tilt = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0020mrgdf11q23hm1ddd6fv691l51vi10af00f137ilcdb2ycfra"; - type = "gem"; - }; - version = "2.0.8"; - }; - timecop = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0vwbkwqyxhavzvr1820hqwz43ylnfcf6w4x6sag0nghi44sr9kmx"; - type = "gem"; - }; - version = "0.8.1"; - }; - timfel-krb5-auth = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "105vajc0jkqgcx1wbp0ad262sdry4l1irk7jpaawv8vzfjfqqf5b"; - type = "gem"; - }; - version = "0.8.3"; - }; - toml = { - dependencies = ["parslet"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0xj460rkyqvg74xc8kivmbvgc46c6mm7r8mbjs5m2gq8khf8sbki"; - type = "gem"; - }; - version = "0.2.0"; - }; - toml-rb = { - dependencies = ["citrus"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0pz6z1mc7rnv4chkbx3mdn4q1lpp0j596dq57kbq39jv0wn0wi4d"; - type = "gem"; - }; - version = "1.0.0"; - }; - tomlrb = { - groups = ["default" "development" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0g28ssfal6vry3cmhy509ba3vi5d5aggz1gnffnvvmc8ml8vkpiv"; - type = "gem"; - }; - version = "1.2.8"; - }; - truncato = { - dependencies = ["htmlentities" "nokogiri"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0z36dprfj9l4jwgwb2wv4v3cilm53v7i1ywfmm5f1dl352id3ak4"; - type = "gem"; - }; - version = "0.7.11"; - }; - tzinfo = { - dependencies = ["thread_safe"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1fjx9j327xpkkdlxwmkl3a8wqj7i4l4jwlrv3z13mg95z9wl253z"; - type = "gem"; - }; - version = "1.2.5"; - }; - u2f = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0lsm1hvwcaa9sq13ab1l1zjk0fgcy951ay11v2acx0h6q1iv21vr"; - type = "gem"; - }; - version = "0.2.1"; - }; - uber = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1p1mm7mngg40x05z52md3mbamkng0zpajbzqjjwmsyw0zw3v9vjv"; - type = "gem"; - }; - version = "0.1.0"; - }; - uglifier = { - dependencies = ["execjs" "json"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0mzs64z3m1b98rh6ssxpqfz9sc87f6ml6906b0m57vydzfgrh1cz"; - type = "gem"; - }; - version = "2.7.2"; - }; - unf = { - dependencies = ["unf_ext"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0bh2cf73i2ffh4fcpdn9ir4mhq8zi50ik0zqa1braahzadx536a9"; - type = "gem"; - }; - version = "0.1.4"; - }; - unf_ext = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "06p1i6qhy34bpb8q8ms88y6f2kz86azwm098yvcc0nyqk9y729j1"; - type = "gem"; - }; - version = "0.0.7.5"; - }; - unicode-display_width = { - groups = ["default" "development" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "08kfiniak1pvg3gn5k6snpigzvhvhyg7slmm0s2qx5zkj62c1z2w"; - type = "gem"; - }; - version = "1.6.0"; - }; - unicorn = { - dependencies = ["kgio" "raindrops"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1qfhvzs4i6ja1s43j8p1kfbzm10n7a02ngki30a38y5m46a2qrak"; - type = "gem"; - }; - version = "5.4.1"; - }; - unicorn-worker-killer = { - dependencies = ["get_process_mem" "unicorn"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0rrdxpwdsapx47axjin8ymxb4f685qlpx8a26bql4ay1559c3gva"; - type = "gem"; - }; - version = "0.4.4"; - }; - uniform_notifier = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1jha0l7x602g5rvah960xl9r0f3q25gslj39i0x1vai8i5z6zr1l"; - type = "gem"; - }; - version = "1.10.0"; - }; - unparser = { - dependencies = ["abstract_type" "adamantium" "concord" "diff-lcs" "equalizer" "parser" "procto"]; - groups = ["default" "development" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "03vjj74kj86vlazhiclf63kf6gajs66k8ni34q70fdhf97d7b60c"; - type = "gem"; - }; - version = "0.4.5"; - }; - validate_email = { - dependencies = ["activemodel" "mail"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1r1fz29l699arka177c9xw7409d1a3ff95bf7a6pmc97slb91zlx"; - type = "gem"; - }; - version = "0.1.6"; - }; - validate_url = { - dependencies = ["activemodel" "public_suffix"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1k0bfxzvdcf1nrqhvnyhijc4mwab9wn4qvqb0ynq6p8dj0f866zi"; - type = "gem"; - }; - version = "1.0.8"; - }; - validates_hostname = { - dependencies = ["activerecord" "activesupport"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "04p1l0v98j4ffvaks1ig9mygx5grpbpdgz7haq3mygva9iy8ykja"; - type = "gem"; - }; - version = "1.0.6"; - }; - version_sorter = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0hbdw3vh856f5yg5mbj4498l6vh90cd3pn22ikr3ranzkrh73l3s"; - type = "gem"; - }; - version = "2.2.4"; - }; - virtus = { - dependencies = ["axiom-types" "coercible" "descendants_tracker" "equalizer"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "06iphwi3c4f7y9i2rvhvaizfswqbaflilziz4dxqngrdysgkn1fk"; - type = "gem"; - }; - version = "1.0.5"; - }; - vmstat = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0vb5mwc71p8rlm30hnll3lb4z70ipl5rmilskpdrq2mxwfilcm5b"; - type = "gem"; - }; - version = "2.3.0"; - }; - warden = { - dependencies = ["rack"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0va966lhpylcwbqb9n151kkihx30agh0a57mwjwdxyanll4s1q12"; - type = "gem"; - }; - version = "1.2.7"; - }; - webfinger = { - dependencies = ["activesupport" "httpclient"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0m0jh8k7c0ifh2jhbn7ihqrmn5fi754wflva97zgy70hpdvxyjar"; - type = "gem"; - }; - version = "1.1.0"; - }; - webmock = { - dependencies = ["addressable" "crack" "hashdiff"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0gg0c2sxq7rni0b93w47h7p7cn590xdhf5va7ska48inpipwlgxp"; - type = "gem"; - }; - version = "3.5.1"; - }; - webpack-rails = { - dependencies = ["railties"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0fsjxw730bh4k1dfnbjm645fgjyqrh830l1z7brqbsm6306ig1rr"; - type = "gem"; - }; - version = "0.9.11"; - }; - websocket-driver = { - dependencies = ["websocket-extensions"]; - groups = ["default" "development" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1551k3fs3kkb3ghqfj3n5lps0ikb9pyrdnzmvgfdxy8574n4g1dn"; - type = "gem"; - }; - version = "0.7.0"; - }; - websocket-extensions = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "034sdr7fd34yag5l6y156rkbhiqgmy395m231dwhlpcswhs6d270"; - type = "gem"; - }; - version = "0.1.3"; - }; - wikicloth = { - dependencies = ["builder" "expression_parser" "rinku"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1jp6c2yzyqbap8jdiw8yz6l08sradky1llhyhmrg934l1b5akj3s"; - type = "gem"; - }; - version = "0.8.1"; - }; - with_env = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1r5ns064mbb99hf1dyxsk9183hznc5i7mn3bi86zka6dlvqf9csh"; - type = "gem"; - }; - version = "1.1.0"; - }; - xml-simple = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0xlqplda3fix5pcykzsyzwgnbamb3qrqkgbrhhfz2a2fxhrkvhw8"; - type = "gem"; - }; - version = "1.1.5"; - }; - xpath = { - dependencies = ["nokogiri"]; - groups = ["default" "development" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0bh8lk9hvlpn7vmi6h4hkcwjzvs2y0cmkk3yjjdr8fxvj6fsgzbd"; - type = "gem"; - }; - version = "3.2.0"; - }; -} \ No newline at end of file diff --git a/pkgs/applications/version-management/gitlab/rubyEnv-ee/Gemfile b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile index 62ee2990dfa6..864e514ae0d4 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv-ee/Gemfile +++ b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile @@ -2,6 +2,8 @@ source 'https://rubygems.org' gem 'rails', '5.2.3' +gem 'bootsnap', '~> 1.4' + # Improves copy-on-write performance for MRI gem 'nakayoshi_fork', '~> 0.0.4' @@ -14,8 +16,7 @@ gem 'sprockets', '~> 3.7.0' gem 'default_value_for', '~> 3.2.0' # Supported DBs -gem 'mysql2', '~> 0.4.10', group: :mysql -gem 'pg', '~> 1.1', group: :postgres +gem 'pg', '~> 1.1' gem 'rugged', '~> 0.28' gem 'grape-path-helpers', '~> 1.1' @@ -53,6 +54,7 @@ gem 'gssapi', group: :kerberos # Spam and anti-bot protection gem 'recaptcha', '~> 4.11', require: 'recaptcha/rails' gem 'akismet', '~> 2.0' +gem 'invisible_captcha', '~> 0.12.1' # Two-factor authentication gem 'devise-two-factor', '~> 3.0.0' @@ -84,7 +86,10 @@ gem 'grape-entity', '~> 0.7.1' gem 'rack-cors', '~> 1.0.0', require: 'rack/cors' # GraphQL API -gem 'graphql', '~> 1.8.0' +gem 'graphql', '~> 1.9.11' +# NOTE: graphiql-rails v1.5+ doesn't work: https://gitlab.com/gitlab-org/gitlab-ce/issues/67293 +# TODO: remove app/views/graphiql/rails/editors/show.html.erb when https://github.com/rmosolgo/graphiql-rails/pull/71 is released: +# https://gitlab.com/gitlab-org/gitlab-ce/issues/67263 gem 'graphiql-rails', '~> 1.4.10' gem 'apollo_upload_server', '~> 2.0.0.beta3' gem 'graphql-docs', '~> 1.6.0', group: [:development, :test] @@ -107,7 +112,7 @@ gem 'fog-aws', '~> 3.5' # Locked until fog-google resolves https://github.com/fog/fog-google/issues/421. # Also see config/initializers/fog_core_patch.rb. gem 'fog-core', '= 2.1.0' -gem 'fog-google', '~> 1.8' +gem 'fog-google', '~> 1.9' gem 'fog-local', '~> 0.6' gem 'fog-openstack', '~> 1.0' gem 'fog-rackspace', '~> 0.1.1' @@ -143,10 +148,10 @@ gem 'wikicloth', '0.8.1' gem 'asciidoctor', '~> 2.0.10' gem 'asciidoctor-include-ext', '~> 0.3.1', require: false gem 'asciidoctor-plantuml', '0.0.9' -gem 'rouge', '~> 3.5' +gem 'rouge', '~> 3.7' gem 'truncato', '~> 0.7.11' gem 'bootstrap_form', '~> 4.2.0' -gem 'nokogiri', '~> 1.10.3' +gem 'nokogiri', '~> 1.10.4' gem 'escape_utils', '~> 1.1' # Calendar rendering @@ -179,7 +184,7 @@ gem 'acts-as-taggable-on', '~> 6.0' gem 'sidekiq', '~> 5.2.7' gem 'sidekiq-cron', '~> 1.0' gem 'redis-namespace', '~> 1.6.0' -gem 'gitlab-sidekiq-fetcher', '~> 0.4.0', require: 'sidekiq-reliable-fetch' +gem 'gitlab-sidekiq-fetcher', '0.5.2', require: 'sidekiq-reliable-fetch' # Cron Parser gem 'fugit', '~> 1.2.1' @@ -209,13 +214,13 @@ gem 'js_regex', '~> 3.1' # User agent parsing gem 'device_detector' -# Cache -gem 'redis-rails', '~> 5.0.2' - # Redis -gem 'redis', '~> 3.2' +gem 'redis', '~> 4.0' gem 'connection_pool', '~> 2.0' +# Redis session store +gem 'redis-rails', '~> 5.0.2' + # Discord integration gem 'discordrb-webhooks-blackst0ne', '~> 3.3', require: false @@ -223,7 +228,8 @@ gem 'discordrb-webhooks-blackst0ne', '~> 3.3', require: false gem 'hipchat', '~> 1.5.0' # Jira integration -gem 'jira-ruby', '~> 1.4' +gem 'jira-ruby', '~> 1.7' +gem 'atlassian-jwt', '~> 0.2.0' # Flowdock integration gem 'flowdock', '~> 0.7' @@ -241,7 +247,7 @@ gem 'asana', '~> 0.8.1' gem 'ruby-fogbugz', '~> 0.2.1' # Kubernetes integration -gem 'kubeclient', '~> 4.2.2' +gem 'kubeclient', '~> 4.4.0' # Sanitize user input gem 'sanitize', '~> 4.6' @@ -270,7 +276,7 @@ gem 'fast_blank' # Parse time & duration gem 'chronic', '~> 0.10.2' -gem 'chronic_duration', '~> 0.10.6' +gem 'gitlab_chronic_duration', '~> 0.10.6.1' gem 'webpack-rails', '~> 0.9.10' gem 'rack-proxy', '~> 0.6.0' @@ -283,7 +289,6 @@ gem 'font-awesome-rails', '~> 4.7' gem 'gemojione', '~> 3.3' gem 'gon', '~> 6.2' gem 'request_store', '~> 1.3' -gem 'virtus', '~> 1.0.1' gem 'base32', '~> 0.3.0' gem "gitlab-license", "~> 1.0" @@ -294,7 +299,7 @@ gem 'sentry-raven', '~> 2.9' gem 'premailer-rails', '~> 1.9.7' # LabKit: Tracing and Correlation -gem 'gitlab-labkit', '~> 0.3.0' +gem 'gitlab-labkit', '~> 0.5' # I18n gem 'ruby_parser', '~> 3.8', require: false @@ -306,12 +311,8 @@ gem 'gettext', '~> 3.2.2', require: false, group: :development gem 'batch-loader', '~> 1.4.0' # Perf bar -gem 'peek', '~> 1.0.1' -gem 'peek-gc', '~> 0.0.2' -gem 'peek-mysql2', '~> 1.2.0', group: :mysql -gem 'peek-pg', '~> 1.3.0', group: :postgres -gem 'peek-rblineprof', '~> 0.2.0' -gem 'peek-redis', '~> 1.2.0' +# https://gitlab.com/gitlab-org/gitlab-ee/issues/13996 +gem 'gitlab-peek', '~> 0.0.1', require: 'peek' # Snowplow events tracking gem 'snowplow-tracker', '~> 0.6.1' @@ -325,13 +326,14 @@ group :metrics do gem 'influxdb', '~> 0.2', require: false # Prometheus - gem 'prometheus-client-mmap', '~> 0.9.8' + gem 'prometheus-client-mmap', '~> 0.9.10' gem 'raindrops', '~> 0.18' end group :development do gem 'foreman', '~> 0.84.0' gem 'brakeman', '~> 4.2', require: false + gem 'danger', '~> 6.0', require: false gem 'letter_opener_web', '~> 1.3.4' gem 'rblineprof', '~> 0.3.6', platform: :mri, require: false @@ -345,7 +347,6 @@ group :development do end group :development, :test do - gem 'bootsnap', '~> 1.4' gem 'bullet', '~> 5.5.0', require: !!ENV['ENABLE_BULLET'] gem 'pry-byebug', '~> 3.5.1', platform: :mri gem 'pry-rails', '~> 0.3.4' @@ -384,15 +385,12 @@ group :development, :test do gem 'haml_lint', '~> 0.31.0', require: false gem 'simplecov', '~> 0.16.1', require: false gem 'bundler-audit', '~> 0.5.0', require: false - gem 'mdl', '~> 0.5.0', require: false gem 'benchmark-ips', '~> 2.3.0', require: false gem 'license_finder', '~> 5.4', require: false gem 'knapsack', '~> 1.17' - gem 'activerecord_sane_schema_dumper', '1.0' - gem 'stackprof', '~> 0.2.10', require: false gem 'simple_po_parser', '~> 1.1.2', require: false @@ -406,7 +404,6 @@ group :test do gem 'json-schema', '~> 2.8.0' gem 'webmock', '~> 3.5.1' gem 'rails-controller-testing' - gem 'sham_rack', '~> 1.3.6' gem 'concurrent-ruby', '~> 1.1' gem 'test-prof', '~> 0.2.5' gem 'rspec_junit_formatter' @@ -419,7 +416,7 @@ gem 'mail_room', '~> 0.9.1' gem 'email_reply_trimmer', '~> 0.1' gem 'html2text' -gem 'ruby-prof', '~> 0.17.0' +gem 'ruby-prof', '~> 1.0.0' gem 'rbtrace', '~> 0.4', require: false gem 'memory_profiler', '~> 0.9', require: false gem 'benchmark-memory', '~> 0.1', require: false @@ -448,8 +445,8 @@ group :ed25519 do gem 'bcrypt_pbkdf', '~> 1.0' end -# Gitaly GRPC client -gem 'gitaly-proto', '~> 1.37.0', require: 'gitaly' +# Gitaly GRPC protocol definitions +gem 'gitaly', '~> 1.58.0' gem 'grpc', '~> 1.19.0' @@ -461,6 +458,7 @@ gem 'toml-rb', '~> 1.0.0', require: false gem 'flipper', '~> 0.13.0' gem 'flipper-active_record', '~> 0.13.0' gem 'flipper-active_support_cache_store', '~> 0.13.0' +gem 'unleash', '~> 0.1.5' # Structured logging gem 'lograge', '~> 0.5' @@ -468,3 +466,6 @@ gem 'grape_logging', '~> 1.7' # DNS Lookup gem 'net-dns', '~> 0.9.0' + +# Countries list +gem 'countries', '~> 3.0' diff --git a/pkgs/applications/version-management/gitlab/rubyEnv-ee/Gemfile.lock b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock index 0a6d7fe1370b..fec34622be39 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv-ee/Gemfile.lock +++ b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock @@ -41,8 +41,6 @@ GEM activerecord-explain-analyze (0.1.0) activerecord (>= 4) pg - activerecord_sane_schema_dumper (1.0) - rails (>= 5, < 6) activestorage (5.2.3) actionpack (= 5.2.3) activerecord (= 5.2.3) @@ -76,7 +74,8 @@ GEM asciidoctor-plantuml (0.0.9) asciidoctor (>= 1.5.6, < 3.0.0) ast (2.4.0) - atomic (1.1.99) + atlassian-jwt (0.2.0) + jwt (~> 2.1.0) attr_encrypted (3.1.0) encryptor (~> 3.0.0) attr_required (1.0.1) @@ -109,7 +108,7 @@ GEM binding_ninja (0.2.3) binding_of_caller (0.8.0) debug_inspector (>= 0.0.1) - bootsnap (1.4.1) + bootsnap (1.4.4) msgpack (~> 1.0) bootstrap_form (4.2.0) actionpack (>= 5.0) @@ -145,23 +144,31 @@ GEM childprocess (0.9.0) ffi (~> 1.0, >= 1.0.11) chronic (0.10.2) - chronic_duration (0.10.6) - numerizer (~> 0.1.1) chunky_png (1.3.5) citrus (3.0.2) + claide (1.0.3) + claide-plugins (0.9.2) + cork + nap + open4 (~> 1.3) coderay (1.1.2) coercible (1.0.0) descendants_tracker (~> 0.0.1) + colored2 (3.1.2) commonmarker (0.17.13) ruby-enum (~> 0.5) concord (0.1.5) adamantium (~> 0.2.0) equalizer (~> 0.0.9) concurrent-ruby (1.1.5) - concurrent-ruby-ext (1.1.5) - concurrent-ruby (= 1.1.5) connection_pool (2.2.2) contracts (0.11.0) + cork (0.3.0) + colored2 (~> 3.1) + countries (3.0.0) + i18n_data (~> 0.8.0) + sixarm_ruby_unaccent (~> 1.1) + unicode_utils (~> 1.4) crack (0.4.3) safe_yaml (~> 1.0.0) crass (1.0.4) @@ -169,6 +176,19 @@ GEM css_parser (1.5.0) addressable daemons (1.2.6) + danger (6.0.9) + claide (~> 1.0) + claide-plugins (>= 0.9.2) + colored2 (~> 3.1) + cork (~> 0.1) + faraday (~> 0.9) + faraday-http-cache (~> 2.0) + git (~> 1.5) + kramdown (~> 2.0) + kramdown-parser-gfm (~> 1.0) + no_proxy_fix + octokit (~> 4.7) + terminal-table (~> 1) database_cleaner (1.7.0) debug_inspector (0.0.3) debugger-ruby_core_source (1.3.8) @@ -251,6 +271,8 @@ GEM railties (>= 3.0.0) faraday (0.12.2) multipart-post (>= 1.2, < 3) + faraday-http-cache (2.0.0) + faraday (~> 0.8) faraday_middleware (0.12.2) faraday (>= 0.7.4, < 1.0) faraday_middleware-aws-signers-v4 (0.1.7) @@ -262,7 +284,7 @@ GEM fast_blank (1.0.0) fast_gettext (1.6.0) ffaker (2.10.0) - ffi (1.10.0) + ffi (1.11.1) flipper (0.13.0) flipper-active_record (0.13.0) activerecord (>= 3.2, < 6) @@ -288,7 +310,7 @@ GEM excon (~> 0.58) formatador (~> 0.2) mime-types - fog-google (1.8.2) + fog-google (1.9.1) fog-core (<= 2.1.0) fog-json (~> 1.2) fog-xml (~> 0.1.0) @@ -335,24 +357,30 @@ GEM gettext_i18n_rails (>= 0.7.1) po_to_json (>= 1.0.0) rails (>= 3.2.0) - gitaly-proto (1.37.0) + git (1.5.0) + gitaly (1.58.0) grpc (~> 1.0) github-markup (1.7.0) - gitlab-labkit (0.3.0) + gitlab-labkit (0.5.2) actionpack (~> 5) activesupport (~> 5) - grpc (~> 1.19.0) + grpc (~> 1.19) jaeger-client (~> 0.10) opentracing (~> 0.4) + redis (> 3.0.0, < 5.0.0) gitlab-license (1.0.0) gitlab-markup (1.7.0) - gitlab-sidekiq-fetcher (0.4.0) + gitlab-peek (0.0.1) + railties (>= 4.0.0) + gitlab-sidekiq-fetcher (0.5.2) sidekiq (~> 5) - gitlab-styles (2.7.0) + gitlab-styles (2.8.0) rubocop (~> 0.69.0) rubocop-gitlab-security (~> 0.1.0) rubocop-performance (~> 1.1.0) rubocop-rspec (~> 1.19) + gitlab_chronic_duration (0.10.6.1) + numerizer (~> 0.1.1) gitlab_omniauth-ldap (2.1.1) net-ldap (~> 0.16) omniauth (~> 1.3) @@ -402,7 +430,7 @@ GEM graphiql-rails (1.4.10) railties sprockets-rails - graphql (1.8.1) + graphql (1.9.11) graphql-docs (1.6.0) commonmarker (~> 0.16) escape_utils (~> 1.2) @@ -461,18 +489,22 @@ GEM httpclient (2.8.3) i18n (1.6.0) concurrent-ruby (~> 1.0) + i18n_data (0.8.0) icalendar (2.4.1) ice_nine (0.11.2) influxdb (0.2.3) cause json + invisible_captcha (0.12.1) + rails (>= 3.2.0) ipaddress (0.8.3) jaeger-client (0.10.0) opentracing (~> 0.3) thrift - jaro_winkler (1.5.2) - jira-ruby (1.4.1) + jaro_winkler (1.5.3) + jira-ruby (1.7.1) activesupport + atlassian-jwt multipart-post oauth (~> 0.5, >= 0.5.0) jmespath (1.3.1) @@ -503,8 +535,10 @@ GEM kgio (2.11.2) knapsack (1.17.0) rake - kramdown (1.17.0) - kubeclient (4.2.2) + kramdown (2.1.0) + kramdown-parser-gfm (1.1.0) + kramdown (~> 2.0) + kubeclient (4.4.0) http (~> 3.0) recursive-open-struct (~> 1.0, >= 1.0.4) rest-client (~> 2.0) @@ -539,10 +573,6 @@ GEM mail_room (0.9.1) marcel (0.3.3) mimemagic (~> 0.3.2) - mdl (0.5.0) - kramdown (~> 1.12, >= 1.12.0) - mixlib-cli (~> 1.7, >= 1.7.0) - mixlib-config (~> 2.2, >= 2.2.1) memoist (0.16.0) memoizable (0.4.2) thread_safe (~> 0.3, >= 0.3.1) @@ -552,29 +582,28 @@ GEM mime-types-data (~> 3.2015) mime-types-data (3.2019.0331) mimemagic (0.3.2) - mini_magick (4.8.0) + mini_magick (4.9.5) mini_mime (1.0.1) mini_portile2 (2.4.0) minitest (5.11.3) - mixlib-cli (1.7.0) - mixlib-config (2.2.18) - tomlrb - msgpack (1.2.10) + msgpack (1.3.0) multi_json (1.13.1) multi_xml (0.6.0) multipart-post (2.0.0) + murmurhash3 (0.1.6) mustermann (1.0.3) mustermann-grape (1.0.0) mustermann (~> 1.0.0) - mysql2 (0.4.10) nakayoshi_fork (0.0.4) + nap (1.1.0) net-dns (0.9.0) net-ldap (0.16.0) net-ntp (2.1.3) net-ssh (5.2.0) netrc (0.11.0) nio4r (2.3.1) - nokogiri (1.10.3) + no_proxy_fix (0.1.2) + nokogiri (1.10.4) mini_portile2 (~> 2.4.0) nokogumbo (1.5.0) nokogiri @@ -650,6 +679,7 @@ GEM addressable (~> 2.5) omniauth (~> 1.3) openid_connect (~> 1.1) + open4 (1.3.4) openid_connect (1.1.6) activemodel attr_required (>= 1.0.0) @@ -670,29 +700,6 @@ GEM parser (2.6.3.0) ast (~> 2.4.0) parslet (1.8.2) - peek (1.0.1) - concurrent-ruby (>= 0.9.0) - concurrent-ruby-ext (>= 0.9.0) - railties (>= 4.0.0) - peek-gc (0.0.2) - peek - peek-mysql2 (1.2.0) - concurrent-ruby - concurrent-ruby-ext - mysql2 - peek - peek-pg (1.3.0) - concurrent-ruby - concurrent-ruby-ext - peek - pg - peek-rblineprof (0.2.0) - peek - rblineprof - peek-redis (1.2.0) - atomic (>= 1.0.0) - peek - redis pg (1.1.4) po_to_json (1.0.1) json (>= 1.6.0) @@ -708,7 +715,7 @@ GEM parser unparser procto (0.0.3) - prometheus-client-mmap (0.9.8) + prometheus-client-mmap (0.9.10) pry (0.11.3) coderay (~> 1.1.0) method_source (~> 0.9.0) @@ -763,7 +770,7 @@ GEM rails-dom-testing (2.0.3) activesupport (>= 4.2.0) nokogiri (>= 1.6) - rails-html-sanitizer (1.0.4) + rails-html-sanitizer (1.2.0) loofah (~> 2.2, >= 2.2.2) rails-i18n (5.1.1) i18n (>= 0.7, < 2) @@ -791,17 +798,17 @@ GEM recaptcha (4.13.1) json recursive-open-struct (1.1.0) - redis (3.3.5) + redis (4.1.2) redis-actionpack (5.0.2) actionpack (>= 4.0, < 6) redis-rack (>= 1, < 3) redis-store (>= 1.1.0, < 2) - redis-activesupport (5.0.4) + redis-activesupport (5.0.7) activesupport (>= 3, < 6) redis-store (>= 1.3, < 2) redis-namespace (1.6.0) redis (>= 3.0.4) - redis-rack (2.0.4) + redis-rack (2.0.5) rack (>= 1.5, < 3) redis-store (>= 1.2, < 2) redis-rails (5.0.2) @@ -827,7 +834,7 @@ GEM retriable (3.1.2) rinku (2.0.0) rotp (2.1.2) - rouge (3.5.1) + rouge (3.7.0) rqrcode (0.7.0) chunky_png rqrcode-rails3 (0.1.7) @@ -886,8 +893,8 @@ GEM i18n ruby-fogbugz (0.2.1) crack (~> 0.4) - ruby-prof (0.17.0) - ruby-progressbar (1.10.0) + ruby-prof (1.0.0) + ruby-progressbar (1.10.1) ruby-saml (1.7.2) nokogiri (>= 1.5.10) ruby_parser (3.13.1) @@ -895,7 +902,7 @@ GEM rubyntlm (0.6.2) rubypants (0.2.0) rubyzip (1.2.2) - rugged (0.28.1) + rugged (0.28.3.1) safe_yaml (1.0.4) sanitize (4.6.6) crass (~> 1.0.2) @@ -931,8 +938,6 @@ GEM faraday (>= 0.7.6, < 1.0) settingslogic (2.0.9) sexp_processor (4.12.0) - sham_rack (1.3.6) - rack shoulda-matchers (4.0.1) activesupport (>= 4.2.0) sidekiq (5.2.7) @@ -954,6 +959,7 @@ GEM json (>= 1.8, < 3) simplecov-html (~> 0.10.0) simplecov-html (0.10.2) + sixarm_ruby_unaccent (1.2.0) slack-notifier (1.5.1) snowplow-tracker (0.6.1) contracts (~> 0.7, <= 0.11) @@ -986,6 +992,8 @@ GEM ffi sysexits (1.2.0) temple (0.8.1) + terminal-table (1.8.0) + unicode-display_width (~> 1.1, >= 1.1.1) test-prof (0.2.5) text (1.3.1) thin (1.7.2) @@ -1002,7 +1010,6 @@ GEM parslet (~> 1.8.0) toml-rb (1.0.0) citrus (~> 3.0, > 3.0) - tomlrb (1.2.8) truncato (0.7.11) htmlentities (~> 4.3.1) nokogiri (>= 1.7.0, <= 2.0) @@ -1017,6 +1024,7 @@ GEM unf_ext unf_ext (0.0.7.5) unicode-display_width (1.6.0) + unicode_utils (1.4.0) unicorn (5.4.1) kgio (~> 2.6) raindrops (~> 0.7) @@ -1024,6 +1032,8 @@ GEM get_process_mem (~> 0) unicorn (>= 4, < 6) uniform_notifier (1.10.0) + unleash (0.1.5) + murmurhash3 (~> 0.1.6) unparser (0.4.5) abstract_type (~> 0.0.7) adamantium (~> 0.2.0) @@ -1079,7 +1089,6 @@ DEPENDENCIES ace-rails-ap (~> 4.1.0) acme-client (~> 2.0.2) activerecord-explain-analyze (~> 0.1) - activerecord_sane_schema_dumper (= 1.0) acts-as-taggable-on (~> 6.0) addressable (~> 2.5.2) akismet (~> 2.0) @@ -1088,6 +1097,7 @@ DEPENDENCIES asciidoctor (~> 2.0.10) asciidoctor-include-ext (~> 0.3.1) asciidoctor-plantuml (= 0.0.9) + atlassian-jwt (~> 0.2.0) attr_encrypted (~> 3.1.0) awesome_print aws-sdk @@ -1110,11 +1120,12 @@ DEPENDENCIES carrierwave (~> 1.3) charlock_holmes (~> 0.7.5) chronic (~> 0.10.2) - chronic_duration (~> 0.10.6) commonmarker (~> 0.17) concurrent-ruby (~> 1.1) connection_pool (~> 2.0) + countries (~> 3.0) creole (~> 0.5.0) + danger (~> 6.0) database_cleaner (~> 1.7.0) deckar01-task_list (= 2.2.0) default_value_for (~> 3.2.0) @@ -1145,7 +1156,7 @@ DEPENDENCIES fog-aliyun (~> 0.3) fog-aws (~> 3.5) fog-core (= 2.1.0) - fog-google (~> 1.8) + fog-google (~> 1.9) fog-local (~> 0.6) fog-openstack (~> 1.0) fog-rackspace (~> 0.1.1) @@ -1157,13 +1168,15 @@ DEPENDENCIES gettext (~> 3.2.2) gettext_i18n_rails (~> 1.8.0) gettext_i18n_rails_js (~> 1.3) - gitaly-proto (~> 1.37.0) + gitaly (~> 1.58.0) github-markup (~> 1.7.0) - gitlab-labkit (~> 0.3.0) + gitlab-labkit (~> 0.5) gitlab-license (~> 1.0) gitlab-markup (~> 1.7.0) - gitlab-sidekiq-fetcher (~> 0.4.0) + gitlab-peek (~> 0.0.1) + gitlab-sidekiq-fetcher (= 0.5.2) gitlab-styles (~> 2.7) + gitlab_chronic_duration (~> 0.10.6.1) gitlab_omniauth-ldap (~> 2.1.1) gon (~> 6.2) google-api-client (~> 0.23) @@ -1174,7 +1187,7 @@ DEPENDENCIES grape-path-helpers (~> 1.1) grape_logging (~> 1.7) graphiql-rails (~> 1.4.10) - graphql (~> 1.8.0) + graphql (~> 1.9.11) graphql-docs (~> 1.6.0) grpc (~> 1.19.0) gssapi @@ -1189,32 +1202,31 @@ DEPENDENCIES httparty (~> 0.16.4) icalendar influxdb (~> 0.2) - jira-ruby (~> 1.4) + invisible_captcha (~> 0.12.1) + jira-ruby (~> 1.7) js_regex (~> 3.1) json-schema (~> 2.8.0) jwt (~> 2.1.0) kaminari (~> 1.0) knapsack (~> 1.17) - kubeclient (~> 4.2.2) + kubeclient (~> 4.4.0) letter_opener_web (~> 1.3.4) license_finder (~> 5.4) licensee (~> 8.9) lograge (~> 0.5) loofah (~> 2.2) mail_room (~> 0.9.1) - mdl (~> 0.5.0) memory_profiler (~> 0.9) method_source (~> 0.8) mimemagic (~> 0.3.2) mini_magick minitest (~> 5.11.0) - mysql2 (~> 0.4.10) nakayoshi_fork (~> 0.0.4) net-dns (~> 0.9.0) net-ldap net-ntp net-ssh (~> 5.2) - nokogiri (~> 1.10.3) + nokogiri (~> 1.10.4) oauth2 (~> 1.4) octokit (~> 4.9) omniauth (~> 1.8) @@ -1236,15 +1248,9 @@ DEPENDENCIES omniauth_crowd (~> 2.2.0) omniauth_openid_connect (~> 0.3.1) org-ruby (~> 0.9.12) - peek (~> 1.0.1) - peek-gc (~> 0.0.2) - peek-mysql2 (~> 1.2.0) - peek-pg (~> 1.3.0) - peek-rblineprof (~> 0.2.0) - peek-redis (~> 1.2.0) pg (~> 1.1) premailer-rails (~> 1.9.7) - prometheus-client-mmap (~> 0.9.8) + prometheus-client-mmap (~> 0.9.10) pry-byebug (~> 3.5.1) pry-rails (~> 0.3.4) puma (~> 3.12) @@ -1265,12 +1271,12 @@ DEPENDENCIES rdoc (~> 6.0) re2 (~> 1.1.1) recaptcha (~> 4.11) - redis (~> 3.2) + redis (~> 4.0) redis-namespace (~> 1.6.0) redis-rails (~> 5.0.2) request_store (~> 1.3) responders (~> 2.0) - rouge (~> 3.5) + rouge (~> 3.7) rqrcode-rails3 (~> 0.1.7) rspec-parameterized rspec-rails (~> 3.8.0) @@ -1282,7 +1288,7 @@ DEPENDENCIES rubocop-performance (~> 1.1.0) rubocop-rspec (~> 1.22.1) ruby-fogbugz (~> 0.2.1) - ruby-prof (~> 0.17.0) + ruby-prof (~> 1.0.0) ruby-progressbar ruby_parser (~> 3.8) rubyzip (~> 1.2.2) @@ -1294,7 +1300,6 @@ DEPENDENCIES selenium-webdriver (~> 3.141) sentry-raven (~> 2.9) settingslogic (~> 2.0.9) - sham_rack (~> 1.3.6) shoulda-matchers (~> 4.0.1) sidekiq (~> 5.2.7) sidekiq-cron (~> 1.0) @@ -1319,9 +1324,9 @@ DEPENDENCIES unf (~> 0.1.4) unicorn (~> 5.4.1) unicorn-worker-killer (~> 0.4.4) + unleash (~> 0.1.5) validates_hostname (~> 1.0.6) version_sorter (~> 2.2.4) - virtus (~> 1.0.1) vmstat (~> 2.3.0) webmock (~> 3.5.1) webpack-rails (~> 0.9.10) diff --git a/pkgs/applications/version-management/gitlab/rubyEnv-ee/gemset.nix b/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix index 8050743ab258..4e71ea72ed99 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv-ee/gemset.nix +++ b/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix @@ -1,5 +1,7 @@ { abstract_type = { + groups = ["default" "development" "test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "09330cmhrc2wmfhdj9zzg82sv6cdhm3qgdkva5ni5xfjril2pf14"; @@ -8,6 +10,8 @@ version = "0.0.7"; }; ace-rails-ap = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "14wj9gsiy7rm0lvs27ffsrh92wndjksj6rlfj3n7jhv1v77w9v2h"; @@ -50,7 +54,7 @@ }; actionpack = { dependencies = ["actionview" "activesupport" "rack" "rack-test" "rails-dom-testing" "rails-html-sanitizer"]; - groups = ["default" "development" "mysql" "postgres" "test"]; + groups = ["default" "development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; @@ -61,7 +65,7 @@ }; actionview = { dependencies = ["activesupport" "builder" "erubi" "rails-dom-testing" "rails-html-sanitizer"]; - groups = ["default" "development" "mysql" "postgres" "test"]; + groups = ["default" "development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; @@ -114,15 +118,6 @@ }; version = "0.1.0"; }; - activerecord_sane_schema_dumper = { - dependencies = ["rails"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "16jbf461wjaxyq26si5505wcj46mi23mii9hx4wjpva1zn9hz5m2"; - type = "gem"; - }; - version = "1.0"; - }; activestorage = { dependencies = ["actionpack" "activerecord" "marcel"]; groups = ["default" "development" "test"]; @@ -136,7 +131,7 @@ }; activesupport = { dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo"]; - groups = ["default" "development" "mysql" "postgres" "test"]; + groups = ["default" "development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; @@ -158,6 +153,8 @@ }; adamantium = { dependencies = ["ice_nine" "memoizable"]; + groups = ["default" "development" "test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0165r2ikgfwv2rm8dzyijkp74fvg0ni72hpdx8ay2v7cj08dqyak"; @@ -167,6 +164,8 @@ }; addressable = { dependencies = ["public_suffix"]; + groups = ["default" "development" "test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0viqszpkggqi8hq87pqp0xykhvz60g99nwmkwsb0v45kc2liwxvk"; @@ -175,6 +174,8 @@ version = "2.5.2"; }; aes_key_wrap = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0li86k0g812jkzrppb2fvqngvzp09nygywjpn81nx90s01wxqw07"; @@ -183,6 +184,8 @@ version = "1.0.1"; }; akismet = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0hqpn25iyypkwkrqaibjm5nss5jmlkrddhia7frmz94prvyjr02w"; @@ -213,6 +216,8 @@ }; asana = { dependencies = ["faraday" "faraday_middleware" "faraday_middleware-multi_json" "oauth2"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "1h0qiywvjjc9iyzq9nz5iaqyh6qsrix4ip0w86j5c4v5g940z6qx"; @@ -253,6 +258,8 @@ version = "0.0.9"; }; ast = { + groups = ["default" "development" "test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "184ssy3w93nkajlz2c70ifm79jp3j737294kbc5fjw69v1w0n9x7"; @@ -260,16 +267,21 @@ }; version = "2.4.0"; }; - atomic = { + atlassian-jwt = { + dependencies = ["jwt"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1kh9rvhjn4dndbfsk3yjq7alds6s2j70rc4k8wdwdyibab8a8gq9"; + sha256 = "1ckfiiwv7dnifra7zhbggj96g0x0kzkv0x9n1is7lb86svlm7rjj"; type = "gem"; }; - version = "1.1.99"; + version = "0.2.0"; }; attr_encrypted = { dependencies = ["encryptor"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0ncv2az1zlj33bsllr6q1qdvbw42gv91lxq0ryclbv8l8xh841jg"; @@ -288,6 +300,8 @@ version = "1.0.1"; }; awesome_print = { + groups = ["development" "test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "14arh1ixfsd6j5md0agyzvksm5svfkvchb90fp32nn7y3avcmc2h"; @@ -297,6 +311,8 @@ }; aws-sdk = { dependencies = ["aws-sdk-resources"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "03r754cqa0jayf1nxpcmp1anaypxwpcjyjaq5cz7i04l9jdxvsnn"; @@ -306,6 +322,8 @@ }; aws-sdk-core = { dependencies = ["aws-sigv4" "jmespath"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "1pq09wwb74y4m5adk4hi4zlz05q6sxjxij6g71v6nkd0z83hi34x"; @@ -315,6 +333,8 @@ }; aws-sdk-resources = { dependencies = ["aws-sdk-core"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "15m56k12x9gzkcyhwrab1qhi3wqla0qmv84dkqcjwp44d7c2xjyi"; @@ -323,6 +343,8 @@ version = "2.9.32"; }; aws-sigv4 = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0cnrfxbaxn86qrxhfidg10f89ka1hddihakdhcvnri0dljaw7dsz"; @@ -332,6 +354,8 @@ }; axiom-types = { dependencies = ["descendants_tracker" "ice_nine" "thread_safe"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "10q3k04pll041mkgy0m5fn2b1lazm6ly1drdbcczl5p57lzi3zy1"; @@ -340,6 +364,8 @@ version = "0.1.1"; }; babosa = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "05rgxg4pz4bc4xk34w5grv0yp1j94wf571w84lf3xgqcbs42ip2f"; @@ -348,6 +374,8 @@ version = "1.0.2"; }; base32 = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0b7y8sy6j9v1lvfzd4va88k5vg9yh0xcjzzn3llcw7yxqlcrnbjk"; @@ -366,6 +394,8 @@ version = "1.4.0"; }; bcrypt = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0ysblqxkclmnhrd0kmb5mr8p38mbar633gdsb14b7dhkhgawgzfy"; @@ -374,6 +404,8 @@ version = "3.1.12"; }; bcrypt_pbkdf = { + groups = ["ed25519"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0cj4k13c7qvvck7y25i3xarvyqq8d27vl61jddifkc7llnnap1hv"; @@ -382,6 +414,8 @@ version = "1.0.0"; }; benchmark-ips = { + groups = ["development" "test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0bh681m54qdsdyvpvflj1wpnj3ybspbpjkr4cnlrl4nk4yikli0j"; @@ -402,6 +436,8 @@ }; better_errors = { dependencies = ["coderay" "erubi" "rack"]; + groups = ["development"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "1pqnxxsqqs7vnqvamk5bzs84dv584g9s0qaf2vqb1v2aj5dabcg7"; @@ -410,6 +446,8 @@ version = "2.5.0"; }; bindata = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0kxy917xyxckifmnawff65j7g6yb3wh2s45npjq9lqjbi1p86lsr"; @@ -429,6 +467,8 @@ }; binding_of_caller = { dependencies = ["debug_inspector"]; + groups = ["development"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "05syqlks7463zsy1jdfbbdravdhj9hpj5pv2m74blqpv8bq4vv5g"; @@ -438,12 +478,14 @@ }; bootsnap = { dependencies = ["msgpack"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1amksyijp9hwpc2jr0yi45hpcp0qiz5r2h8rnf2wi1hdfw6m2hxh"; + sha256 = "1jcc0x0l3jqap8r8l1j994ljh93c8hcppm59mjzpa0hdvprh23av"; type = "gem"; }; - version = "1.4.1"; + version = "1.4.4"; }; bootstrap_form = { dependencies = ["actionpack" "activemodel"]; @@ -457,6 +499,8 @@ version = "4.2.0"; }; brakeman = { + groups = ["development"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "161l4ln7x1vnqrcvbvglznf46f0lvq305vq211xaxp4fv4wwv89v"; @@ -465,6 +509,8 @@ version = "4.2.1"; }; browser = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0sdx0ny34i6vqxdsc7sy9g0nafdbrw8kvvb5xh9m18x1bzpqk92f"; @@ -473,6 +519,8 @@ version = "2.5.3"; }; builder = { + groups = ["default" "development" "test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0qibi5s67lpdv1wgcj66wcymcr04q6j4mzws6a479n0mlrmh5wr1"; @@ -482,6 +530,8 @@ }; bullet = { dependencies = ["activesupport" "uniform_notifier"]; + groups = ["development" "test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "1pdq3ckmwxnwrdm2x89zfj68h0yhiln35y8wps2nkvam4kpivyr5"; @@ -491,6 +541,8 @@ }; bundler-audit = { dependencies = ["thor"]; + groups = ["development" "test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "1gr7k6m9fda7m66irxzydm8v9xbmlryjj65cagwm1zyi5f317srb"; @@ -499,6 +551,12 @@ version = "0.5.0"; }; byebug = { + groups = ["default" "development" "test"]; + platforms = [{ + engine = "maglev"; + } { + engine = "ruby"; + }]; source = { remotes = ["https://rubygems.org"]; sha256 = "1vv7s88w8jb1qg4qz3jrs3x3y5d9jfyyl7wfiz78b5x95ydvx41q"; @@ -519,6 +577,8 @@ }; capybara-screenshot = { dependencies = ["capybara" "launchy"]; + groups = ["development" "test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "1x90lh7nf3zi54arjf430s9xdxr3c12xjq1l28izgxqdk8s40q7q"; @@ -528,6 +588,8 @@ }; carrierwave = { dependencies = ["activemodel" "activesupport" "mime-types"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "10rz94kajilffp83sb767lr62b5f8l4jzqq80cr92wqxdgbszdks"; @@ -536,6 +598,8 @@ version = "1.3.1"; }; cause = { + groups = ["default" "metrics"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0digirxqlwdg79mkbn70yc7i9i1qnclm2wjbrc47kqv6236bpj00"; @@ -544,6 +608,8 @@ version = "0.1"; }; character_set = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "114npdbw1ivyx4vnid8ncnjw4wnjcipf2lvihlg3ibbh7an0m9s9"; @@ -552,6 +618,8 @@ version = "1.1.2"; }; charlock_holmes = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "1nf1l31n10yaark2rrg5qzyzcx9w80681449s3j09qmnipsl8rl5"; @@ -561,6 +629,8 @@ }; childprocess = { dependencies = ["ffi"]; + groups = ["default" "development" "test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0a61922kmvcxyj5l70fycapr87gz1dzzlkfpq85rfqk5vdh3d28p"; @@ -569,6 +639,8 @@ version = "0.9.0"; }; chronic = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "1hrdkn4g8x7dlzxwb1rfgr8kw3bp4ywg5l4y4i9c2g5cwv62yvvn"; @@ -576,16 +648,9 @@ }; version = "0.10.2"; }; - chronic_duration = { - dependencies = ["numerizer"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1k7sx3xqbrn6s4pishh2pgr4kw6fmw63h00lh503l66k8x0qvigs"; - type = "gem"; - }; - version = "0.10.6"; - }; chunky_png = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0vf0axgrm95bs3y0x5gdb76xawfh210yxplj7jbwr6z7n88i1axn"; @@ -594,6 +659,8 @@ version = "1.3.5"; }; citrus = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0l7nhk3gkm1hdchkzzhg2f70m47pc0afxfpl6mkiibc9qcpl3hjf"; @@ -601,7 +668,34 @@ }; version = "3.0.2"; }; + claide = { + groups = ["default" "development"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0kasxsms24fgcdsq680nz99d5lazl9rmz1qkil2y5gbbssx89g0z"; + type = "gem"; + }; + version = "1.0.3"; + }; + claide-plugins = { + dependencies = ["cork" "nap" "open4"]; + groups = ["default" "development"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0bhw5j985qs48v217gnzva31rw5qvkf7qj8mhp73pcks0sy7isn7"; + type = "gem"; + }; + version = "0.9.2"; + }; coderay = { + groups = ["default" "development" "test"]; + platforms = [{ + engine = "maglev"; + } { + engine = "ruby"; + }]; source = { remotes = ["https://rubygems.org"]; sha256 = "15vav4bhcc2x3jmi3izb11l4d9f3xv8hp2fszb7iqmpsccv1pz4y"; @@ -611,6 +705,8 @@ }; coercible = { dependencies = ["descendants_tracker"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "1p5azydlsz0nkxmcq0i1gzmcfq02lgxc4as7wmf47j1c6ljav0ah"; @@ -618,8 +714,20 @@ }; version = "1.0.0"; }; + colored2 = { + groups = ["default" "development"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0jlbqa9q4mvrm73aw9mxh23ygzbjiqwisl32d8szfb5fxvbjng5i"; + type = "gem"; + }; + version = "3.1.2"; + }; commonmarker = { dependencies = ["ruby-enum"]; + groups = ["default" "development" "test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "1pmjm87p0hxnknp33cxyvkgbr1swfp9gcznssmalm9z8kwyancb9"; @@ -629,6 +737,8 @@ }; concord = { dependencies = ["adamantium" "equalizer"]; + groups = ["default" "development" "test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "1b6cdn0fg4n9gzbdr7zyf4jq40y6h0c0g9cra7wk9hhmsylk91bg"; @@ -637,7 +747,7 @@ version = "0.1.5"; }; concurrent-ruby = { - groups = ["default" "development" "mysql" "postgres" "test"]; + groups = ["default" "development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; @@ -646,18 +756,9 @@ }; version = "1.1.5"; }; - concurrent-ruby-ext = { - dependencies = ["concurrent-ruby"]; - groups = ["default" "mysql" "postgres"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "03ypsv2k581yv0b3f0hzvb3mq6mqj8jlbi32jmkj3k175vbc8hvz"; - type = "gem"; - }; - version = "1.1.5"; - }; connection_pool = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0lflx29mlznf1hn0nihkgllzbj8xp5qasn8j7h838465pi399k68"; @@ -675,8 +776,32 @@ }; version = "0.11.0"; }; + cork = { + dependencies = ["colored2"]; + groups = ["default" "development"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1g6l780z1nj4s3jr11ipwcj8pjbibvli82my396m3y32w98ar850"; + type = "gem"; + }; + version = "0.3.0"; + }; + countries = { + dependencies = ["i18n_data" "sixarm_ruby_unaccent" "unicode_utils"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0w278pjhwkbin7jpr7m47wac7gj5n4l2him9k2q4ngzq6rs2id7c"; + type = "gem"; + }; + version = "3.0.0"; + }; crack = { dependencies = ["safe_yaml"]; + groups = ["default" "test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0abb0fvgw00akyik1zxnq7yv391va148151qxdghnzngv66bl62k"; @@ -685,6 +810,8 @@ version = "0.4.3"; }; crass = { + groups = ["default" "development" "test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0bpxzy6gjw9ggjynlxschbfsgmx8lv3zw1azkjvnb8b9i895dqfi"; @@ -693,6 +820,8 @@ version = "1.0.4"; }; creole = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "00rcscz16idp6dx0dk5yi5i0fz593i3r6anbn5bg2q07v3i025wm"; @@ -702,6 +831,8 @@ }; css_parser = { dependencies = ["addressable"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0jlr17cn044yaq4l3d9p42g3bghnamwsprq9c39xn6pxjrn5k1hy"; @@ -710,6 +841,8 @@ version = "1.5.0"; }; daemons = { + groups = ["default" "development"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0lxqq6dgb8xhliywar2lvkwqy2ssraf9dk4b501pb4ixc2mvxbp2"; @@ -717,7 +850,20 @@ }; version = "1.2.6"; }; + danger = { + dependencies = ["claide" "claide-plugins" "colored2" "cork" "faraday" "faraday-http-cache" "git" "kramdown" "kramdown-parser-gfm" "no_proxy_fix" "octokit" "terminal-table"]; + groups = ["development"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0gyxfs7pkcg90llhpl2nwfqqcqi0qngqhk8gpyrffj6m0lm1m6wl"; + type = "gem"; + }; + version = "6.0.9"; + }; database_cleaner = { + groups = ["development" "test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "05i0nf2aj70m61y3fspypdkc6d1qgibf5kav05a71b5gjz0k7y5x"; @@ -726,6 +872,8 @@ version = "1.7.0"; }; debug_inspector = { + groups = ["default" "development"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0vxr0xa1mfbkfcrn71n7c4f2dj7la5hvphn904vh20j3x4j5lrx0"; @@ -734,6 +882,12 @@ version = "0.0.3"; }; debugger-ruby_core_source = { + groups = ["default" "development"]; + platforms = [{ + engine = "maglev"; + } { + engine = "ruby"; + }]; source = { remotes = ["https://rubygems.org"]; sha256 = "1lp5dmm8a8dpwymv6r1y6yr24wxsj0gvgb2b8i7qq9rcv414snwd"; @@ -743,6 +897,8 @@ }; deckar01-task_list = { dependencies = ["html-pipeline"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0s637v5pi5ipmv0gn9g2wwjpxdm27dvppfjd8ml0dc1m0jsm7964"; @@ -751,6 +907,8 @@ version = "2.2.0"; }; declarative = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0642xvwzzbgi3kp1bg467wma4g3xqrrn0sk369hjam7w579gnv5j"; @@ -759,6 +917,8 @@ version = "0.0.10"; }; declarative-option = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "1g4ibxq566f1frnhdymzi9hxxcm4g2gw4n21mpjk2mhwym4q6l0p"; @@ -779,7 +939,7 @@ }; derailed_benchmarks = { dependencies = ["benchmark-ips" "get_process_mem" "heapy" "memory_profiler" "rack" "rake" "thor"]; - groups = ["development" "test"]; + groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; @@ -790,6 +950,8 @@ }; descendants_tracker = { dependencies = ["thread_safe"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "15q8g3fcqyb41qixn6cky0k3p86291y7xsh1jfd851dvrza1vi79"; @@ -798,6 +960,8 @@ version = "0.0.4"; }; device_detector = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0zbsjj1bgwmsiqiw6x5fzbzp25xc10c02s37ggl2635ha0qzn05q"; @@ -818,6 +982,8 @@ }; devise-two-factor = { dependencies = ["activesupport" "attr_encrypted" "devise" "railties" "rotp"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "1pkldws5lga4mlv4xmcrfb0yivl6qad0l8qyb2hdb50adv6ny4gs"; @@ -826,6 +992,8 @@ version = "3.0.0"; }; diff-lcs = { + groups = ["default" "development" "test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "18w22bjz424gzafv6nzv98h0aqkwz3d9xhm7cbr1wfbyas8zayza"; @@ -834,6 +1002,8 @@ version = "1.3"; }; diffy = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "1azibizfv91sjbzhjqj1pg2xcv8z9b8a7z6kb3wpl4hpj5hil5kj"; @@ -843,6 +1013,8 @@ }; discordrb-webhooks-blackst0ne = { dependencies = ["rest-client"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "1f0dw6ci5cbrxrvvqw2kqabpzyjisd4hflbi370rpb4cakkzgw39"; @@ -862,6 +1034,8 @@ }; domain_name = { dependencies = ["unf"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0abdlwb64ns7ssmiqhdwgl27ly40x2l27l8hs8hn0z4kb3zd2x3v"; @@ -871,6 +1045,8 @@ }; doorkeeper = { dependencies = ["railties"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "022r03i830b2lvmr0xzlj6ivlvc1zr64hy4a4bsy3flv94da77rz"; @@ -880,6 +1056,8 @@ }; doorkeeper-openid_connect = { dependencies = ["doorkeeper" "json-jwt"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "1wgrz0xcply5vl6d1m62blqwcbn4v0b27bswyws2y9wbyglz6f95"; @@ -888,6 +1066,8 @@ version = "1.5.0"; }; ed25519 = { + groups = ["ed25519"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "1f5kr8za7hvla38fc0n9jiv55iq62k5bzclsa5kdb14l3r4w6qnw"; @@ -897,6 +1077,8 @@ }; elasticsearch = { dependencies = ["elasticsearch-api" "elasticsearch-transport"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0fik4nrxyi28zy1xwi4rygn0pf1sm1gskcrvbsnmqfrsdd6l4ga4"; @@ -906,6 +1088,8 @@ }; elasticsearch-api = { dependencies = ["multi_json"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0aal128hq59l5kscl2ag2cv24g1sp5ysdb4jxkqmj0b1l9rv16mw"; @@ -915,6 +1099,8 @@ }; elasticsearch-model = { dependencies = ["activesupport" "elasticsearch" "hashie"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "10kbsdxd192g8x60fhaxs4gqpgwag68d53flcw8rwvdm0i8smyzf"; @@ -923,6 +1109,8 @@ version = "0.1.9"; }; elasticsearch-rails = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "081hm2dc3l6kky027wm3s8k6lmiygg0hnrggnidchbl94nlalw2z"; @@ -932,6 +1120,8 @@ }; elasticsearch-transport = { dependencies = ["faraday" "multi_json"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "1a7fak70ajdqw1ahd2gmgijka52pjjfr3chaakkxa5fk3rwwna26"; @@ -940,6 +1130,8 @@ version = "5.0.3"; }; email_reply_trimmer = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0vijywhy1acsq4187ss6w8a7ksswaf1d5np3wbj962b6rqif5vcz"; @@ -949,6 +1141,8 @@ }; email_spec = { dependencies = ["htmlentities" "launchy" "mail"]; + groups = ["test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0yadaif80cf2ry0nvhir1s70xmm22xzncq6vfvvffdd8h02ridv0"; @@ -957,6 +1151,8 @@ version = "2.2.0"; }; encryptor = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0s8rvfl0vn8w7k1sgkc234060jh468s3zd45xa64p1jdmfa3zwmb"; @@ -965,6 +1161,8 @@ version = "3.0.0"; }; equalizer = { + groups = ["default" "development" "test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "1kjmx3fygx8njxfrwcmn7clfhjhb6bvv3scy2lyyi0wqyi3brra4"; @@ -973,7 +1171,7 @@ version = "0.0.11"; }; erubi = { - groups = ["default" "development" "mysql" "postgres" "test"]; + groups = ["default" "development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; @@ -983,6 +1181,8 @@ version = "1.8.0"; }; escape_utils = { + groups = ["default" "development" "test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0qminivnyzwmqjhrh3b92halwbk0zcl9xn828p5rnap1szl2yag5"; @@ -1002,6 +1202,8 @@ version = "1.2.1"; }; eventmachine = { + groups = ["default" "development"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0wh9aqb0skz80fhfn66lbpr4f86ya2z5rx6gm5xlfhd05bj1ch4r"; @@ -1010,6 +1212,8 @@ version = "1.2.7"; }; excon = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "15l9w0938c19nxmrp09n75qpmm64k12xj69h47yvxzcxcpbgnkb2"; @@ -1018,6 +1222,8 @@ version = "0.62.0"; }; execjs = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0grlxwiccbnflxs30r3h7g23xnps5knav1jyqkk3anvm8363ifjw"; @@ -1026,6 +1232,8 @@ version = "2.6.0"; }; expression_parser = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "1938z3wmmdabqxlh5d5c56xfg1jc6z15p7zjyhvk7364zwydnmib"; @@ -1046,6 +1254,8 @@ }; factory_bot = { dependencies = ["activesupport"]; + groups = ["default" "development" "test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0r975ba6y0mcy3aya099gpnjn5gf1h6fbw8f3smmjay5zvin3nwx"; @@ -1055,6 +1265,8 @@ }; factory_bot_rails = { dependencies = ["factory_bot" "railties"]; + groups = ["development" "test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0cdbp12ih2w77l331frv8gv6bv9dinn1663dy1jn0gb9ss1hwvs2"; @@ -1064,6 +1276,8 @@ }; faraday = { dependencies = ["multipart-post"]; + groups = ["default" "development"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "157c4cmb5g1b3ny6k9qf9z57rfijl54fcq3hnqqf6g31g1m096b2"; @@ -1071,8 +1285,21 @@ }; version = "0.12.2"; }; + faraday-http-cache = { + dependencies = ["faraday"]; + groups = ["default" "development"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "08j86fgcwl7z792qyijdsq680arzpfiydqd24ja405z2rbm7r2i0"; + type = "gem"; + }; + version = "2.0.0"; + }; faraday_middleware = { dependencies = ["faraday"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "1p7icfl28nvl8qqdsngryz1snqic9l8x6bk0dxd7ygn230y0k41d"; @@ -1082,6 +1309,8 @@ }; faraday_middleware-aws-signers-v4 = { dependencies = ["aws-sdk-resources" "faraday"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0y88xcbq8k2ijhsqdava5493p26k49agvnzca6vkl3qwfv3ambhp"; @@ -1091,6 +1320,8 @@ }; faraday_middleware-multi_json = { dependencies = ["faraday_middleware" "multi_json"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0651sxhzbq9xfq3hbpmrp0nbybxnm9ja3m97k386m4bqgamlvz1q"; @@ -1099,6 +1330,8 @@ version = "0.0.6"; }; fast_blank = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "16s1ilyvwzmkcgmklbrn0c2pch5n02vf921njx0bld4crgdr6z56"; @@ -1107,6 +1340,8 @@ version = "1.0.0"; }; fast_gettext = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "1s42dsy3rh9h37d16pwhswf2q9cx25v5fn3q881b5iz6fvdjixv3"; @@ -1115,6 +1350,8 @@ version = "1.6.0"; }; ffaker = { + groups = ["development" "test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "01z5lpssjc0n8lm4xrlja0hh8lv4ngzbybjvd4rdkc5x9ddvh8s3"; @@ -1123,14 +1360,18 @@ version = "2.10.0"; }; ffi = { + groups = ["default" "development" "kerberos" "test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0j8pzj8raxbir5w5k6s7a042sb5k02pg0f8s4na1r5lan901j00p"; + sha256 = "06mvxpjply8qh4j3fj9wh08kdzwkbnvsiysh0vrhlk5cwxzjmblh"; type = "gem"; }; - version = "1.10.0"; + version = "1.11.1"; }; flipper = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "1pdj9y3k6padiicfraxw9ibx9fm8yi2ihh608736lq5nnbf3k6gw"; @@ -1140,6 +1381,8 @@ }; flipper-active_record = { dependencies = ["activerecord" "flipper"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0rgm4h5h6xcbf17z47sw8ancaxva8x4hwlxmyqpm0vzj1pnc47c1"; @@ -1149,6 +1392,8 @@ }; flipper-active_support_cache_store = { dependencies = ["activesupport" "flipper"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0zpikmfhadb7l1ny6xbhk5d4840im6yq0wvfsnlw718spxi4ccgk"; @@ -1158,6 +1403,8 @@ }; flowdock = { dependencies = ["httparty" "multi_json"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "04nrvg4gzgabf5mnnhccl8bwrkvn3y4pm7a1dqzqhpvfr4m5pafg"; @@ -1167,6 +1414,8 @@ }; fog-aliyun = { dependencies = ["fog-core" "fog-json" "ipaddress" "xml-simple"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "1vl5zf9wr6qwm1awxscyifvrrfqnyacidxgzhkba2wqlgizk3anh"; @@ -1187,6 +1436,8 @@ }; fog-core = { dependencies = ["builder" "excon" "formatador" "mime-types"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "1agd6xgzk0rxrsjdpn94v4hy89s0nm2cs4zg2p880w2dan9xgrak"; @@ -1196,15 +1447,19 @@ }; fog-google = { dependencies = ["fog-core" "fog-json" "fog-xml" "google-api-client"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0rxhcf2rhs8ml9j9xppz1yxgig3s1l5hm6yz582lqrs8bdmq028m"; + sha256 = "1784xynmgvj1x9phy42nbd3fcgj040zps6wn7msi6vnj1sg4wpfy"; type = "gem"; }; - version = "1.8.2"; + version = "1.9.1"; }; fog-json = { dependencies = ["fog-core" "multi_json"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "1zj8llzc119zafbmfa4ai3z5s7c4vp9akfs0f9l2piyvcarmlkyx"; @@ -1214,6 +1469,8 @@ }; fog-local = { dependencies = ["fog-core"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0ba4lln35nryi6dcbz68vxg9ml6v8cc8s8c82f7syfd84bz76x21"; @@ -1223,6 +1480,8 @@ }; fog-openstack = { dependencies = ["fog-core" "fog-json" "ipaddress"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "171xnsl6w0j7yi6sp26dcqahx4r4gb2cf359gmy11g5iwnsll5wg"; @@ -1232,6 +1491,8 @@ }; fog-rackspace = { dependencies = ["fog-core" "fog-json" "fog-xml" "ipaddress"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0y2bli061g37l9p4w0ljqbmg830rp2qz6sf8b0ck4cnx68j7m32a"; @@ -1241,6 +1502,8 @@ }; fog-xml = { dependencies = ["fog-core" "nokogiri"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "043lwdw2wsi6d55ifk0w3izi5l1d1h0alwyr3fixic7b94kc812n"; @@ -1261,6 +1524,8 @@ }; foreman = { dependencies = ["thor"]; + groups = ["development"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "06mq39lpmc17bxzlwhad9d8i0lcnbb08xr18smh2x79mm631wsw0"; @@ -1269,6 +1534,8 @@ version = "0.84.0"; }; formatador = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "1gc26phrwlmlqrmz4bagq1wd5b7g64avpx0ghxr9xdxcvmlii0l0"; @@ -1289,6 +1556,8 @@ }; fuubar = { dependencies = ["rspec-core" "ruby-progressbar"]; + groups = ["development" "test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0jlv2wisgnim29h47shvqhipbz1wgndfdr7i6y5wcfag0z2660lv"; @@ -1308,6 +1577,8 @@ }; gemojione = { dependencies = ["json"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0ayk8r147k1s38nj18pwk76npx1p7jhi86silk800nj913pjvrhj"; @@ -1316,7 +1587,7 @@ version = "3.3.0"; }; get_process_mem = { - groups = ["default" "development" "puma" "test" "unicorn"]; + groups = ["default" "puma" "unicorn"]; platforms = []; source = { remotes = ["https://rubygems.org"]; @@ -1327,6 +1598,8 @@ }; gettext = { dependencies = ["locale" "text"]; + groups = ["development"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0764vj7gacn0aypm2bf6m46dzjzwzrjlmbyx6qwwwzbmi94r40wr"; @@ -1336,6 +1609,8 @@ }; gettext_i18n_rails = { dependencies = ["fast_gettext"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0vs918a03mqvx9aczaqdg9d2q9s3c6swqavzn82qgq5i822czrcm"; @@ -1345,6 +1620,8 @@ }; gettext_i18n_rails_js = { dependencies = ["gettext" "gettext_i18n_rails" "po_to_json" "rails"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "11yn5cf92wsmlj5c1065mg6swf8gq9l6g9ahikvvyf9npvjay42x"; @@ -1352,18 +1629,30 @@ }; version = "1.3.0"; }; - gitaly-proto = { + git = { + groups = ["default" "development"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0bf83icwypi3p3pd97vlqbnp3hvf31ncd440m9kh9y7x6yk74wyh"; + type = "gem"; + }; + version = "1.5.0"; + }; + gitaly = { dependencies = ["grpc"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1lx2cids0r175agdz3wa25ivi17vxx2kryb2v29gdsrpg3pyyq7j"; + sha256 = "00di7rl1171rvpncxnfdpnmqc32kx9xmi6nwrn52k8cyrxzz2ixf"; type = "gem"; }; - version = "1.37.0"; + version = "1.58.0"; }; github-markup = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "17g6g18gdjg63k75sfwiskjzl9i0hfcnrkcpb4fwrnb20v3jgswp"; @@ -1372,17 +1661,19 @@ version = "1.7.0"; }; gitlab-labkit = { - dependencies = ["actionpack" "activesupport" "grpc" "jaeger-client" "opentracing"]; + dependencies = ["actionpack" "activesupport" "grpc" "jaeger-client" "opentracing" "redis"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0dvapmdc9axm9dq2gg89qrqb318rkrsabpyybrqvcx1ipbi5k3a1"; + sha256 = "1j06gl4ksd83rycg3fb46bb77iw74i1ivs5li6pyf5klrxjq8k3h"; type = "gem"; }; - version = "0.3.0"; + version = "0.5.2"; }; gitlab-license = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "1q26cgp3ln3b36n3sc69r6hxafkxjwdr3m0d7jlch5j7vyib9bih"; @@ -1400,16 +1691,27 @@ }; version = "1.7.0"; }; + gitlab-peek = { + dependencies = ["railties"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0r5a1cjhw8dyz1az9rhqh252rvsjhvbs28wnmk0lnqkvyydip4ql"; + type = "gem"; + }; + version = "0.0.1"; + }; gitlab-sidekiq-fetcher = { dependencies = ["sidekiq"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1xaag97iclmiay8fx7dkiws8dsws2gi6l0axq4yljq5g7xm78qjr"; + sha256 = "0dvx2klf1a1xyf15q34fn59291v6jwx3z315rxb2dmkvcr9873m1"; type = "gem"; }; - version = "0.4.0"; + version = "0.5.2"; }; gitlab-styles = { dependencies = ["rubocop" "rubocop-gitlab-security" "rubocop-performance" "rubocop-rspec"]; @@ -1417,13 +1719,26 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1vxlvbq4jpq0cfjqippz9d3j73sq9qg3pna5pb0l8jr0rc0xs89y"; + sha256 = "0kxn5j4gk2bidxfi3lnx8sl58kwh0fp89p75pbwwz3cd88d4vgsq"; + type = "gem"; + }; + version = "2.8.0"; + }; + gitlab_chronic_duration = { + dependencies = ["numerizer"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0rajna3aijqj8ap55xggawyh2xzh1vkrmzkjh3ja5x05qsf9csgs"; type = "gem"; }; - version = "2.7.0"; + version = "0.10.6.1"; }; gitlab_omniauth-ldap = { dependencies = ["net-ldap" "omniauth" "pyu-ruby-sasl" "rubyntlm"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "1f8cjbzlhckarmm59l380jjy33a3hlljg69b3zkh8rhy1xd3xr90"; @@ -1444,6 +1759,8 @@ }; gon = { dependencies = ["actionpack" "multi_json" "request_store"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0q9nvnw98mbb40h7mlzn1zk40r2l29yybhinmiqhrq8a6adsv806"; @@ -1453,6 +1770,8 @@ }; google-api-client = { dependencies = ["addressable" "googleauth" "httpclient" "mime-types" "representable" "retriable"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "05h2lca9b334ayabgs3h0mzc2wg3csvkqv1lv3iirpgf90ypbk1k"; @@ -1483,6 +1802,8 @@ }; googleauth = { dependencies = ["faraday" "jwt" "memoist" "multi_json" "os" "signet"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "1747p1dhpvz76i98xnjrvaj785y1232svm0nc8g9by6pz835gp2l"; @@ -1492,6 +1813,8 @@ }; gpgme = { dependencies = ["mini_portile2"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "12fqirxr964mc8jwsfl5nif6q4wcckrmj7w4c9ci4xg9xy2b9v6m"; @@ -1501,6 +1824,8 @@ }; grape = { dependencies = ["activesupport" "builder" "mustermann-grape" "rack" "rack-accept" "virtus"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "04bam0iq9sad1df361317zz4knwci905yig502khl8gm1lp1168c"; @@ -1510,6 +1835,8 @@ }; grape-entity = { dependencies = ["activesupport" "multi_json"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "1w78wylkhdkc0s6n6d20hggbb3pl3ladzzd5lx6ack2iswybx7b9"; @@ -1530,6 +1857,8 @@ }; grape_logging = { dependencies = ["grape"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0lg2vhk0dlnyqs2rz8wilfm039q5mbsp5nvf51asir48a1rf9yza"; @@ -1539,6 +1868,8 @@ }; graphiql-rails = { dependencies = ["railties" "sprockets-rails"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "10q5zipwgjgaan9lfqakdkm5ry8afgkq79bkimgksn6jyyvpz6w8"; @@ -1547,12 +1878,14 @@ version = "1.4.10"; }; graphql = { + groups = ["default" "development" "test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "10bnl8yjyg5x6h787cfkpd5gphl5z5jblj8fc9lbmgk27n2knssl"; + sha256 = "17gpvpv3zpmcbzgdx9skaaj5frxw12ja5hssk7xwzckna0v782vh"; type = "gem"; }; - version = "1.8.1"; + version = "1.9.11"; }; graphql-docs = { dependencies = ["commonmarker" "escape_utils" "extended-markdown-filter" "gemoji" "graphql" "html-pipeline" "sass"]; @@ -1578,6 +1911,8 @@ }; gssapi = { dependencies = ["ffi"]; + groups = ["kerberos"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0j93nsf9j57p7x4aafalvjg8hia2mmqv3aky7fmw2ck5yci343ix"; @@ -1587,6 +1922,8 @@ }; haml = { dependencies = ["temple" "tilt"]; + groups = ["default" "development" "test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "1q0a9fvqh8kn6wm97fcks6qzbjd400bv8bx748w8v87m7p4klhac"; @@ -1607,6 +1944,8 @@ }; hamlit = { dependencies = ["temple" "thor" "tilt"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0hk338vkzmwszxdh0q02iw88rbr3bj3fd7fzn4psm8wy80zcgl9i"; @@ -1615,6 +1954,8 @@ version = "2.8.8"; }; hangouts-chat = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "1dmnv3723c22683bzys8walkl6wi74xzawxjbhwqzjdbwk3bdgmx"; @@ -1623,6 +1964,8 @@ version = "0.0.5"; }; hashdiff = { + groups = ["default" "test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "19ykg5pax8798nh1yv71adkx0zzs7gn2rxjj86v7nsw0jba5lask"; @@ -1631,6 +1974,8 @@ version = "0.3.8"; }; hashie = { + groups = ["default" "kerberos"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "1hh5lybf8hm7d7xs4xm8hxvm8xqrs2flc8fnwkrclaj746izw6xb"; @@ -1640,6 +1985,8 @@ }; hashie-forbidden_attributes = { dependencies = ["hashie"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "1chgg5d2iddja6ww02x34g8avg11fzmzcb8yvnqlykii79zx6vis"; @@ -1649,6 +1996,8 @@ }; health_check = { dependencies = ["rails"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "1mfa180nyzz1j0abfihm5nm3lmzq99362ibcphky6rh5vwhckvm8"; @@ -1657,7 +2006,7 @@ version = "2.6.0"; }; heapy = { - groups = ["default" "development" "test"]; + groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; @@ -1679,6 +2028,8 @@ }; html-pipeline = { dependencies = ["activesupport" "nokogiri"]; + groups = ["default" "development" "test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "1mpj5y13jk1arqkhdk66n49kyglmci980c1l6np7pqgyjllb68ad"; @@ -1688,6 +2039,8 @@ }; html2text = { dependencies = ["nokogiri"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0kxdj8pf9pss9xgs8aac0alj5g1fi225yzdhh33lzampkazg1hii"; @@ -1696,6 +2049,8 @@ version = "0.2.0"; }; htmlentities = { + groups = ["default" "test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "1nkklqsn8ir8wizzlakncfv42i32wc0w9hxp00hvdlgjr7376nhj"; @@ -1705,6 +2060,8 @@ }; http = { dependencies = ["addressable" "http-cookie" "http-form_data" "http_parser.rb"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "1jlm5prw437wqpfxcigh88lfap3m7g8mnmj5as7qw6dzqnvrxwmc"; @@ -1714,6 +2071,8 @@ }; http-cookie = { dependencies = ["domain_name"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "004cgs4xg5n6byjs7qld0xhsjq3n6ydfh897myr2mibvh6fjc49g"; @@ -1722,6 +2081,8 @@ version = "1.0.3"; }; http-form_data = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "15lpn604byf7cyxnw949xz4rvpcknqp7a48q73nm630gqxsa76f3"; @@ -1730,6 +2091,8 @@ version = "2.1.1"; }; "http_parser.rb" = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "15nidriy0v5yqfjsgsra51wmknxci2n2grliz78sf9pga3n0l7gi"; @@ -1749,6 +2112,8 @@ version = "0.16.4"; }; httpclient = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "19mxmvghp7ki3klsxwrlwr431li7hm1lczhhj8z4qihl2acy8l99"; @@ -1758,7 +2123,7 @@ }; i18n = { dependencies = ["concurrent-ruby"]; - groups = ["default" "development" "mysql" "postgres" "test"]; + groups = ["default" "development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; @@ -1767,7 +2132,19 @@ }; version = "1.6.0"; }; + i18n_data = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0v0cdwxiaqdwhaljd7z0fbx29q3r5kjl93xnjm5abi1x37645ncj"; + type = "gem"; + }; + version = "0.8.0"; + }; icalendar = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "1xsydpp2xph00awi25axv2mwjd5p2rlgd4qb3kh05lvq795kirxd"; @@ -1776,6 +2153,8 @@ version = "2.4.1"; }; ice_nine = { + groups = ["default" "development" "test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "1nv35qg1rps9fsis28hz2cq2fx1i96795f91q4nmkm934xynll2x"; @@ -1785,6 +2164,8 @@ }; influxdb = { dependencies = ["cause" "json"]; + groups = ["metrics"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "1vhg5nd88nwvfa76lqcczld916nljswwq6clsixrzi3js8ym9y1w"; @@ -1792,7 +2173,20 @@ }; version = "0.2.3"; }; + invisible_captcha = { + dependencies = ["rails"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "15510dh1vh7l2xs2a4956nhxpnf10168r62i497nmcbyqpp1df88"; + type = "gem"; + }; + version = "0.12.1"; + }; ipaddress = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "1x86s0s11w202j6ka40jbmywkrx8fhq8xiy8mwvnkhllj57hqr45"; @@ -1802,6 +2196,8 @@ }; jaeger-client = { dependencies = ["opentracing" "thrift"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "198m72c9w3wfwr1mq22dcjjm7d4jd0bci4lrq6zq2zvlzhi04n8l"; @@ -1814,21 +2210,25 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1zz27z88qznix4r65gd9h56gl177snlfpgv10b0s69vi8qpl909l"; + sha256 = "1930v0chc1q4fr7hn0y1j34mw0v032a8kh0by4d4sbz8ksy056kf"; type = "gem"; }; - version = "1.5.2"; + version = "1.5.3"; }; jira-ruby = { - dependencies = ["activesupport" "multipart-post" "oauth"]; + dependencies = ["activesupport" "atlassian-jwt" "multipart-post" "oauth"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "14019mliqwcppj6qp2wdhh5gbvs2yh2idibag13m9a18ag965bhw"; + sha256 = "0hb3645x0p3bkmqcgc9b2q4b5kn02wgmb03brx7ag1h5y79an4q5"; type = "gem"; }; - version = "1.4.1"; + version = "1.7.1"; }; jmespath = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "07w8ipjg59qavijq59hl82zs74jf3jsp7vxl9q3a2d0wpv5akz3y"; @@ -1838,6 +2238,8 @@ }; js_regex = { dependencies = ["character_set" "regexp_parser" "regexp_property_values"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0wi4h4f3knb0yp4zq2spks3dpmdzz9wa54d6xk88md0h4v2x33cq"; @@ -1846,6 +2248,8 @@ version = "3.1.1"; }; json = { + groups = ["default" "development" "metrics" "test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0qmj7fypgb9vag723w1a49qihxrcf5shzars106ynw2zk352gbv5"; @@ -1855,6 +2259,8 @@ }; json-jwt = { dependencies = ["activesupport" "aes_key_wrap" "bindata"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "065k7vffdki73f4nz89lxi6wxmcw5dlf593831pgvlbralll6x3r"; @@ -1864,6 +2270,8 @@ }; json-schema = { dependencies = ["addressable"]; + groups = ["test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "11di8qyam6bmqn0fvvvf3crgaqy4sil0d406ymx0jacn3ff98ymz"; @@ -1872,6 +2280,8 @@ version = "2.8.0"; }; jwt = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "1w0kaqrbl71cq9sbnixc20x5lqah3hs2i93xmhlfdg2y3by7yzky"; @@ -1881,6 +2291,8 @@ }; kaminari = { dependencies = ["activesupport" "kaminari-actionview" "kaminari-activerecord" "kaminari-core"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0invfvfb252ihsdr65rylkvd1x2wy004jval52v3i8ybb0jhc5hi"; @@ -1890,6 +2302,8 @@ }; kaminari-actionview = { dependencies = ["actionview" "kaminari-core"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0mhhsm6xhmwqc7hfw7xnk1kdbfg468bqs5awcqm5j6j8b9zyjvdi"; @@ -1899,6 +2313,8 @@ }; kaminari-activerecord = { dependencies = ["activerecord" "kaminari-core"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "1kb5aj6iy1cwcq5548jd3w1ipxicnzmnx2ay1s4hvad2gvrd4g93"; @@ -1907,6 +2323,8 @@ version = "1.0.1"; }; kaminari-core = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0r2n293ad1xr9wgn8cr53nfzwls4w3p1xi4kjfjgl1z0yf05mpwr"; @@ -1915,6 +2333,8 @@ version = "1.0.1"; }; kgio = { + groups = ["default" "unicorn"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "1528pyj1szzzp3pgj05fzjd36qjrxm9yj2x5radc9p1z7vl67y50"; @@ -1924,6 +2344,8 @@ }; knapsack = { dependencies = ["rake"]; + groups = ["development" "test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "1c69rcwfrdrnx8ddl6k1qxhw9f2dj5x5bbddz435isl2hfr5zh92"; @@ -1932,26 +2354,41 @@ version = "1.17.0"; }; kramdown = { - groups = ["default" "development" "test"]; + groups = ["default" "development"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1n1c4jmrh5ig8iv1rw81s4mw4xsp4v97hvf8zkigv4hn5h542qjq"; + sha256 = "1dl840bvx8d9nq6lg3mxqyvbiqnr6lk3jfsm6r8zhz7p5srmd688"; type = "gem"; }; - version = "1.17.0"; + version = "2.1.0"; + }; + kramdown-parser-gfm = { + dependencies = ["kramdown"]; + groups = ["default" "development"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0a8pb3v951f4x7h968rqfsa19c8arz21zw1vaj42jza22rap8fgv"; + type = "gem"; + }; + version = "1.1.0"; }; kubeclient = { dependencies = ["http" "recursive-open-struct" "rest-client"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "10761kwhgclnf2lrdjspmxnw90z7i0l85inranfxc688ing0d5xn"; + sha256 = "0gj6z90p3nm43bafbp97b78zi764gy88590g2y4lm8zcgk8k586r"; type = "gem"; }; - version = "4.2.2"; + version = "4.4.0"; }; launchy = { dependencies = ["addressable"]; + groups = ["default" "development" "test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "190lfbiy1vwxhbgn4nl4dcbzxvm049jwc158r2x7kq3g5khjrxa2"; @@ -1983,6 +2420,8 @@ }; license_finder = { dependencies = ["rubyzip" "thor" "toml" "with_env" "xml-simple"]; + groups = ["development" "test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "01rhqm5m3m22gq6q9f1x9fh3x3wrf9khnnsycblj0xg5frdjv77v"; @@ -1992,6 +2431,8 @@ }; licensee = { dependencies = ["rugged"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0w6d2smhg3kzcx4m2ii06akakypwhiglansk51bpx290hhc8h3pc"; @@ -2000,6 +2441,8 @@ version = "8.9.2"; }; locale = { + groups = ["default" "development"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "1sls9bq4krx0fmnzmlbn64dw23c4d6pz46ynjzrn9k8zyassdd0x"; @@ -2009,6 +2452,8 @@ }; lograge = { dependencies = ["actionpack" "activesupport" "railties" "request_store"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "00lcn7s3slfn32di4qwlx2yj5f9r2pcnd0naxrvqqwypcg1z2sdd"; @@ -2018,6 +2463,8 @@ }; loofah = { dependencies = ["crass" "nokogiri"]; + groups = ["default" "development" "test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "1ccsid33xjajd0im2xv941aywi58z7ihwkvaf1w2bv89vn5bhsjg"; @@ -2027,6 +2474,8 @@ }; mail = { dependencies = ["mini_mime"]; + groups = ["default" "development" "test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "00wwz6ys0502dpk8xprwcqfwyf3hmnx6lgxaiq6vj43mkx43sapc"; @@ -2035,6 +2484,8 @@ version = "2.7.1"; }; mail_room = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "16b8yjd1if665mwaindwys06nkkcs0jw3dcsqvn6qbp6alfigqaa"; @@ -2053,18 +2504,9 @@ }; version = "0.3.3"; }; - mdl = { - dependencies = ["kramdown" "mixlib-cli" "mixlib-config"]; - groups = ["development" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "047hp8z1ma630wp38bm1giklkf385rp6wly8aidn825q831w2g4i"; - type = "gem"; - }; - version = "0.5.0"; - }; memoist = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0pq8fhqh8w25qcw9v3vzfb0i6jp0k3949ahxc3wrwz2791dpbgbh"; @@ -2074,6 +2516,8 @@ }; memoizable = { dependencies = ["thread_safe"]; + groups = ["default" "development" "test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0v42bvghsvfpzybfazl14qhkrjvx0xlmxz0wwqc960ga1wld5x5c"; @@ -2082,7 +2526,7 @@ version = "0.4.2"; }; memory_profiler = { - groups = ["default" "development" "test"]; + groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; @@ -2092,6 +2536,12 @@ version = "0.9.13"; }; method_source = { + groups = ["default" "development" "metrics" "test"]; + platforms = [{ + engine = "maglev"; + } { + engine = "ruby"; + }]; source = { remotes = ["https://rubygems.org"]; sha256 = "1pviwzvdqd90gn6y7illcdd9adapw8fczml933p5vl739dkvl3lq"; @@ -2101,6 +2551,8 @@ }; mime-types = { dependencies = ["mime-types-data"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0fjxy1jm52ixpnv3vg9ld9pr9f35gy0jp66i1njhqjvmnvq0iwwk"; @@ -2119,6 +2571,8 @@ version = "3.2019.0331"; }; mimemagic = { + groups = ["default" "development" "test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "00ibc1mhvdfyfyl103xwb45621nwyqxf124cni5hyfhag0fn1c3q"; @@ -2127,14 +2581,18 @@ version = "0.3.2"; }; mini_magick = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1djxfs9rxw6q6vr6wb4ndxhp1vj1zbwb55s1kf6mz9bzgmswqg0n"; + sha256 = "0qy09qrd5bwh8mkbj514n5vcw9ni73218h9s3zmvbpmdwrnzi8j4"; type = "gem"; }; - version = "4.8.0"; + version = "4.9.5"; }; mini_mime = { + groups = ["default" "development" "test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "1q4pshq387lzv9m39jv32vwb8wrq3wc4jwgl4jk209r4l33v09d3"; @@ -2143,6 +2601,8 @@ version = "1.0.1"; }; mini_portile2 = { + groups = ["default" "development" "test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "15zplpfw3knqifj9bpf604rb3wc1vhq6363pd6lvhayng8wql5vy"; @@ -2151,6 +2611,8 @@ version = "2.4.0"; }; minitest = { + groups = ["development" "test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0icglrhghgwdlnzzp4jf76b0mbc71s80njn5afyfjn4wqji8mqbq"; @@ -2158,38 +2620,19 @@ }; version = "5.11.3"; }; - mixlib-cli = { - groups = ["default" "development" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0647msh7kp7lzyf6m72g6snpirvhimjm22qb8xgv9pdhbcrmcccp"; - type = "gem"; - }; - version = "1.7.0"; - }; - mixlib-config = { - dependencies = ["tomlrb"]; - groups = ["default" "development" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1gm6yj9cbbgsl9x4xqxga0vz5w0ksq2jnq1wj8hvgm5c4wfcrswb"; - type = "gem"; - }; - version = "2.2.18"; - }; msgpack = { - groups = ["default" "development" "test"]; + groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1w38hilm3dk42dwk8ygiq49bl4in7y80hfqr63hk54mj4gmzi6ch"; + sha256 = "1186lhwnxiw5ryv6dbxrsfy0fajfll2l95kf9pmca50iyiqi86zn"; type = "gem"; }; - version = "1.2.10"; + version = "1.3.0"; }; multi_json = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "1rl0qy4inf1mp8mybfk56dfga0mvx97zwpmq5xmiwl5r770171nv"; @@ -2198,6 +2641,8 @@ version = "1.13.1"; }; multi_xml = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0lmd4f401mvravi1i1yq7b2qjjli0yq7dfc4p1nj5nwajp7r6hyj"; @@ -2206,6 +2651,8 @@ version = "0.6.0"; }; multipart-post = { + groups = ["default" "development"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "09k0b3cybqilk1gwrwwain95rdypixb2q9w65gd44gfzsd84xi1x"; @@ -2213,7 +2660,19 @@ }; version = "2.0.0"; }; + murmurhash3 = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1szwcm44z5jg1l4dq73zyjw4rjin23ihkhrw5cpcjrb6cg8hd3y7"; + type = "gem"; + }; + version = "0.1.6"; + }; mustermann = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0lycgkmnyy0bf29nnd2zql5a6pcf8sp69g9v4xw0gcfcxgpwp7i1"; @@ -2223,6 +2682,8 @@ }; mustermann-grape = { dependencies = ["mustermann"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "10xdggddjl8nraq7pbli31lwgrzxzz8gp558i811lsv71fqbmhzr"; @@ -2230,23 +2691,29 @@ }; version = "1.0.0"; }; - mysql2 = { + nakayoshi_fork = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0qjd97w6a0w9aldsrhb2y6jrc4wnnlbj5j8kcl7pp7vviwa0r5iq"; + sha256 = "1mj5czi7rxxmfq4v9qjz74lcqypvnjxhxqfs71zhb2rsfa97a6jg"; type = "gem"; }; - version = "0.4.10"; + version = "0.0.4"; }; - nakayoshi_fork = { + nap = { + groups = ["default" "development"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1mj5czi7rxxmfq4v9qjz74lcqypvnjxhxqfs71zhb2rsfa97a6jg"; + sha256 = "0xm5xssxk5s03wjarpipfm39qmgxsalb46v1prsis14x1xk935ll"; type = "gem"; }; - version = "0.0.4"; + version = "1.1.0"; }; net-dns = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "18d97xjphw21naaqfhgxp95ikr1d79rx708b2df3xm01j6isqy1d"; @@ -2255,6 +2722,8 @@ version = "0.9.0"; }; net-ldap = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "1fh4l8zfsrvghanpnjxk944k7yl093qpw4759xs6f1v9kb73ihfq"; @@ -2263,6 +2732,8 @@ version = "0.16.0"; }; net-ntp = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0z96m7nnb9f634cz4i6p0x89z7g9i9h97cnk5f3x3q5x090kzisv"; @@ -2281,6 +2752,8 @@ version = "5.2.0"; }; netrc = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0gzfmcywp1da8nzfqsql2zqi648mfnx6qwkig3cv36n9m0yy676y"; @@ -2289,6 +2762,8 @@ version = "0.11.0"; }; nio4r = { + groups = ["default" "development" "test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "1a41ca1kpdmrypjp9xbgvckpy8g26zxphkja9vk7j5wl4n8yvlyr"; @@ -2296,19 +2771,31 @@ }; version = "2.3.1"; }; + no_proxy_fix = { + groups = ["default" "development"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "006dmdb640v1kq0sll3dnlwj1b0kpf3i1p27ygyffv8lpcqlr6sf"; + type = "gem"; + }; + version = "0.1.2"; + }; nokogiri = { dependencies = ["mini_portile2"]; - groups = ["default" "development" "mysql" "postgres" "test"]; + groups = ["default" "development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "02bjydih0j515szfv9mls195cvpyidh6ixm7dwbl3s2sbaxxk5s4"; + sha256 = "0nmdrqqz1gs0fwkgzxjl4wr554gr8dc1fkrqjc2jpsvwgm41rygv"; type = "gem"; }; - version = "1.10.3"; + version = "1.10.4"; }; nokogumbo = { dependencies = ["nokogiri"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "09qc1c7acv9qm48vk2kzvnrq4ij8jrql1cv33nmv2nwmlggy0jyj"; @@ -2317,6 +2804,8 @@ version = "1.5.0"; }; numerizer = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0vrk9jbv4p4dcz0wzr72wrf5kajblhc5l9qf7adbcwi4qvz9xv0h"; @@ -2325,6 +2814,8 @@ version = "0.1.1"; }; oauth = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "1zszdg8q1b135z7l7crjj234k4j0m347hywp5kj6zsq7q78pw09y"; @@ -2334,6 +2825,8 @@ }; oauth2 = { dependencies = ["faraday" "jwt" "multi_json" "multi_xml" "rack"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0av6nlb5y2sm6m8fx669ywrqa9858yqaqfqzny75nqp3anag89qh"; @@ -2343,6 +2836,8 @@ }; octokit = { dependencies = ["sawyer"]; + groups = ["default" "development"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "1ssn5iyax07a22mvmj0y45bfy8ali129bl1qmasp6bcg03bvk298"; @@ -2352,6 +2847,8 @@ }; omniauth = { dependencies = ["hashie" "rack"]; + groups = ["default" "kerberos"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "1p16h1rp8by05k8gfw17xjhgwp60dk8qmj1xalv1n23kmxfsxb1x"; @@ -2361,6 +2858,8 @@ }; omniauth-auth0 = { dependencies = ["omniauth-oauth2"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0id5gn14av81kh41cq4q6c9knyvzl7vc4rs3m4pmpd43g2z6jdw2"; @@ -2370,6 +2869,8 @@ }; omniauth-authentiq = { dependencies = ["jwt" "omniauth-oauth2"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0k7vajxwplsp188xfj4mi9iqbc7f7djqh02by4mphc51hl87kcqi"; @@ -2379,6 +2880,8 @@ }; omniauth-azure-oauth2 = { dependencies = ["jwt" "omniauth" "omniauth-oauth2"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "1a3iqy63l1jd6na4y0bj4a8mlp7gcn3a0awnz9g79fa8n4v2g8n4"; @@ -2388,6 +2891,8 @@ }; omniauth-cas3 = { dependencies = ["addressable" "nokogiri" "omniauth"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "191b4jm4djmmy54yxfxj3c889r2wn3g6sfsdj6l1rjy0kw1m2qgx"; @@ -2397,6 +2902,8 @@ }; omniauth-facebook = { dependencies = ["omniauth-oauth2"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "03zjla9i446fk1jkw7arh67c39jfhp5bhkmhvbw8vczxr1jkbbh5"; @@ -2406,6 +2913,8 @@ }; omniauth-github = { dependencies = ["omniauth" "omniauth-oauth2"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0yg7k4p95ybcsii17spqarl8rpfzkq0kb19ab6wl4lc922zgfbqc"; @@ -2415,6 +2924,8 @@ }; omniauth-gitlab = { dependencies = ["omniauth" "omniauth-oauth2"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "19ydk2zd2mz8zi80z3l03pajpm9357sg3lrankrcb3pirkkdb9fp"; @@ -2424,6 +2935,8 @@ }; omniauth-google-oauth2 = { dependencies = ["jwt" "omniauth" "omniauth-oauth2"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "03v2gqpsbdhkqaxhvzr83za885awm6pgskv3mkyfvang7mr321df"; @@ -2433,6 +2946,8 @@ }; omniauth-kerberos = { dependencies = ["omniauth-multipassword" "timfel-krb5-auth"]; + groups = ["kerberos"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "05xsv76qjxcxzrvabaar2bchv7435y8l2j0wk4zgchh3yv85kiq7"; @@ -2442,6 +2957,8 @@ }; omniauth-multipassword = { dependencies = ["omniauth"]; + groups = ["default" "kerberos"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0qykp76hw80lkgb39hyzrv68hkbivc8cv0vbvrnycjh9fwfp1lv8"; @@ -2451,6 +2968,8 @@ }; omniauth-oauth = { dependencies = ["oauth" "omniauth"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "1n5vk4by7hkyc09d9blrw2argry5awpw4gbw1l4n2s9b3j4qz037"; @@ -2460,6 +2979,8 @@ }; omniauth-oauth2 = { dependencies = ["oauth2" "omniauth"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "11mi36l9d97r77q99jnafdc1yaa0a9wahhpp7dj7ank8q52g7g79"; @@ -2469,6 +2990,8 @@ }; omniauth-oauth2-generic = { dependencies = ["omniauth-oauth2"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "1m6vpip3rm1spx1x9y1kjczzailsph1xqgaakqylzq3jqkv18273"; @@ -2489,6 +3012,8 @@ }; omniauth-saml = { dependencies = ["omniauth" "ruby-saml"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "17lji8i4q9k3yi8lmjwlw8rfpp2sc74jv8d6flgq85lg5brfqq1p"; @@ -2498,6 +3023,8 @@ }; omniauth-shibboleth = { dependencies = ["omniauth"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "04yin7j8xpr8llvank3ivzahqkc6ss5bppc7q6znzdswxmf75fxh"; @@ -2507,6 +3034,8 @@ }; omniauth-twitter = { dependencies = ["omniauth-oauth" "rack"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0r5j65hkpgzhvvbs90id3nfsjgsad6ymzggbm7zlaxvnrmvnrk65"; @@ -2527,6 +3056,8 @@ }; omniauth_crowd = { dependencies = ["activesupport" "nokogiri" "omniauth"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "12g5ck05h6kr9mnp870x8pkxsadg81ca70hg8n3k8xx007lfw2q7"; @@ -2545,6 +3076,16 @@ }; version = "0.3.1"; }; + open4 = { + groups = ["default" "development"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1cgls3f9dlrpil846q0w7h66vsc33jqn84nql4gcqkk221rh7px1"; + type = "gem"; + }; + version = "1.3.4"; + }; openid_connect = { dependencies = ["activemodel" "attr_required" "json-jwt" "rack-oauth2" "swd" "tzinfo" "validate_email" "validate_url" "webfinger"]; groups = ["default"]; @@ -2567,6 +3108,8 @@ version = "0.5.0"; }; optimist = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "05jxrp3nbn5iilc1k7ir90mfnwc5abc9h78s5rpm3qafwqxvcj4j"; @@ -2576,6 +3119,8 @@ }; org-ruby = { dependencies = ["rubypants"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0x69s7aysfiwlcpd9hkvksfyld34d8kxr62adb59vjvh8hxfrjwk"; @@ -2584,6 +3129,8 @@ version = "0.9.12"; }; orm_adapter = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "1fg9jpjlzf5y49qs9mlpdrgs5rpcyihq1s4k79nv9js0spjhnpda"; @@ -2592,6 +3139,8 @@ version = "0.5.0"; }; os = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "1s401gvhqgs2r8hh43ia205mxsy1wc0ib4k76wzkdpspfcnfr1rk"; @@ -2621,6 +3170,8 @@ version = "2.6.3.0"; }; parslet = { + groups = ["default" "development" "test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "12nrzfwjphjlakb9pmpj70hgjwgzvnr8i1zfzddifgyd44vspl88"; @@ -2628,62 +3179,8 @@ }; version = "1.8.2"; }; - peek = { - dependencies = ["concurrent-ruby" "concurrent-ruby-ext" "railties"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1998vcsli215d6qrn9821gr2qip60xki2p7n2dpn8i1n68hyshcn"; - type = "gem"; - }; - version = "1.0.1"; - }; - peek-gc = { - dependencies = ["peek"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "094h3mr9q8wzbqsj0girpyjvj4bcxax8m438igp42n75xv0bhwi9"; - type = "gem"; - }; - version = "0.0.2"; - }; - peek-mysql2 = { - dependencies = ["concurrent-ruby" "concurrent-ruby-ext" "mysql2" "peek"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0avmwm3yw0kx0z8gh4cpqj79jb5aicd0h3yzrcdfpzwks56h1k9z"; - type = "gem"; - }; - version = "1.2.0"; - }; - peek-pg = { - dependencies = ["concurrent-ruby" "concurrent-ruby-ext" "peek" "pg"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "17yk8xrh7yh57wg6vi3s8km9qd9f910n94r511mdyqd7aizlfb7c"; - type = "gem"; - }; - version = "1.3.0"; - }; - peek-rblineprof = { - dependencies = ["peek" "rblineprof"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0ywk1gvsnhrkhqq2ibwsg7099kg5m2vs4nmzy0wf65kb0ywl0m9c"; - type = "gem"; - }; - version = "0.2.0"; - }; - peek-redis = { - dependencies = ["atomic" "peek" "redis"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0v91cni591d9wdrmvgam20gr3504x84mh1l95da4rz5a9436jm33"; - type = "gem"; - }; - version = "1.2.0"; - }; pg = { - groups = ["development" "postgres" "test"]; + groups = ["default" "development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; @@ -2694,6 +3191,8 @@ }; po_to_json = { dependencies = ["json"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "1xvanl437305mry1gd57yvcg7xrfhri91czr32bjr8j2djm8hwba"; @@ -2703,6 +3202,8 @@ }; premailer = { dependencies = ["addressable" "css_parser" "htmlentities"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "10w6f7r6snpkcnv3byxma9b08lyqzcfxkm083scb2dr2ly4xkzyf"; @@ -2712,6 +3213,8 @@ }; premailer-rails = { dependencies = ["actionmailer" "premailer"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "05czxmx6hnykg6g23hy2ww2bf86a69njbi02sv7lrds4w776jhim"; @@ -2721,6 +3224,8 @@ }; proc_to_ast = { dependencies = ["coderay" "parser" "unparser"]; + groups = ["default" "development" "test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "14c65w48bbzp5lh1cngqd1y25kqvfnq1iy49hlzshl12dsk3z9wj"; @@ -2729,6 +3234,8 @@ version = "0.1.0"; }; procto = { + groups = ["default" "development" "test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "13imvg1x50rz3r0yyfbhxwv72lbf7q28qx9l9nfbb91h2n9ch58c"; @@ -2741,13 +3248,19 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "01f1zkpi7qsmgmk17fpq6ck7jn64sa9afsq20vc5k9f6mpyqkncd"; + sha256 = "0immyg4as0isyj2dcjf44n0avg1jv5kx1qk0asrgb5ayzwmjqg1k"; type = "gem"; }; - version = "0.9.8"; + version = "0.9.10"; }; pry = { dependencies = ["coderay" "method_source"]; + groups = ["default" "development" "test"]; + platforms = [{ + engine = "maglev"; + } { + engine = "ruby"; + }]; source = { remotes = ["https://rubygems.org"]; sha256 = "1mh312k3y94sj0pi160wpia0ps8f4kmzvm505i6bvwynfdh7v30g"; @@ -2757,6 +3270,12 @@ }; pry-byebug = { dependencies = ["byebug" "pry"]; + groups = ["development" "test"]; + platforms = [{ + engine = "maglev"; + } { + engine = "ruby"; + }]; source = { remotes = ["https://rubygems.org"]; sha256 = "1f9kj1qp14qb8crg2rdzf22pr6ngxvy4n6ipymla8q1yjr842625"; @@ -2766,6 +3285,8 @@ }; pry-rails = { dependencies = ["pry"]; + groups = ["development" "test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0k2d43bwmqbswfra4fkadjjbszwb11pr7qdkma91qrcrk62wqxvy"; @@ -2784,6 +3305,8 @@ version = "3.1.0"; }; puma = { + groups = ["puma"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "1k7dqxnq0dnf5rxkgs9rknclkn3ah7lsdrk6nrqxla8qzy31wliq"; @@ -2793,6 +3316,8 @@ }; puma_worker_killer = { dependencies = ["get_process_mem" "puma"]; + groups = ["puma"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "1m08qi8mxpp20zqqjj9yzcrx0sn29n5fn5avlf1lnl0n7qa9c03i"; @@ -2801,6 +3326,8 @@ version = "0.1.0"; }; pyu-ruby-sasl = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "1rcpjiz9lrvyb3rd8k8qni0v4ps08psympffyldmmnrqayyad0sn"; @@ -2809,6 +3336,8 @@ version = "0.0.3.3"; }; raabro = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0xzdmbn48753f6k0ckirp8ja5p0xn1a92wbwxfyggyhj0hza9ylq"; @@ -2817,7 +3346,7 @@ version = "1.1.6"; }; rack = { - groups = ["default" "development" "kerberos" "mysql" "postgres" "test"]; + groups = ["default" "development" "kerberos" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; @@ -2828,6 +3357,8 @@ }; rack-accept = { dependencies = ["rack"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "18jdipx17b4ki33cfqvliapd31sbfvs4mv727awynr6v95a7n936"; @@ -2837,6 +3368,8 @@ }; rack-attack = { dependencies = ["rack"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "1czx68p70x98y21dkdndsb64lrxf9qrv09wl1dbcxrypcjnpsdl1"; @@ -2845,6 +3378,8 @@ version = "4.4.1"; }; rack-cors = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "1j27vy1bmhbqcyzhxg8d07qassmax769xjalfwcwz6qfiq8cf013"; @@ -2865,6 +3400,8 @@ }; rack-protection = { dependencies = ["rack"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "15167q25rmxipqwi6hjqj3i1byi9iwl3xq9b7mdar7qiz39pmjsk"; @@ -2874,6 +3411,8 @@ }; rack-proxy = { dependencies = ["rack"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "1bpbcb9ch94ha2q7gdri88ry7ch0z6ian289kah9ayxyqg19j6f4"; @@ -2883,7 +3422,7 @@ }; rack-test = { dependencies = ["rack"]; - groups = ["default" "development" "mysql" "postgres" "test"]; + groups = ["default" "development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; @@ -2915,6 +3454,8 @@ }; rails-controller-testing = { dependencies = ["actionpack" "actionview" "activesupport"]; + groups = ["test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "16kdkk73mhhs73iz3i1i0ryjm84dadiyh817b3nh8acdi490jyhy"; @@ -2924,6 +3465,8 @@ }; rails-dom-testing = { dependencies = ["activesupport" "nokogiri"]; + groups = ["default" "development" "test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "1lfq2a7kp2x64dzzi5p4cjcbiv62vxh9lyqk2f0rqq3fkzrw8h5i"; @@ -2933,15 +3476,19 @@ }; rails-html-sanitizer = { dependencies = ["loofah"]; + groups = ["default" "development" "test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1gv7vr5d9g2xmgpjfq4nxsqr70r9pr042r9ycqqnfvw5cz9c7jwr"; + sha256 = "0ilwxzm3a7bql5c9q2n9g9nb1hax7vd8d65a5yp3d967ld97nvrq"; type = "gem"; }; - version = "1.0.4"; + version = "1.2.0"; }; rails-i18n = { dependencies = ["i18n" "railties"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "1rqij2ggqz5iq36lbibhnd7pl4qxrvv9kgw9s0c6594vzbbxmhs0"; @@ -2951,7 +3498,7 @@ }; railties = { dependencies = ["actionpack" "activesupport" "method_source" "rake" "thor"]; - groups = ["default" "development" "mysql" "postgres" "test"]; + groups = ["default" "development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; @@ -2961,6 +3508,8 @@ version = "5.2.3"; }; rainbow = { + groups = ["default" "development" "test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0bb2fpjspydr6x0s8pn1pqkzmxszvkfapv0p4627mywl7ky4zkhk"; @@ -2969,6 +3518,8 @@ version = "3.0.0"; }; raindrops = { + groups = ["metrics" "unicorn"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "1qpbd9jif40c53fz2r0l8khfl016y8s8bkx37ibcaafclbl3xygp"; @@ -2977,6 +3528,8 @@ version = "0.19.0"; }; rake = { + groups = ["default" "development" "test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "1sy5a7nh6xjdc9yhcw31jji7ssrf9v5806hn95gbrzr998a2ydjn"; @@ -2985,6 +3538,8 @@ version = "12.3.2"; }; rb-fsevent = { + groups = ["default" "development" "test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "1fbpmjypwxkb8r7y1kmhmyp6gawa4byw0yb3jc3dn9ly4ld9lizf"; @@ -2994,6 +3549,8 @@ }; rb-inotify = { dependencies = ["ffi"]; + groups = ["default" "development" "test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0yfsgw5n7pkpyky6a9wkf1g9jafxb0ja7gz0qw0y14fd2jnzfh71"; @@ -3003,6 +3560,12 @@ }; rblineprof = { dependencies = ["debugger-ruby_core_source"]; + groups = ["development"]; + platforms = [{ + engine = "maglev"; + } { + engine = "ruby"; + }]; source = { remotes = ["https://rubygems.org"]; sha256 = "0m58kdjgncwf0h1qry3qk5h4bg8sj0idykqqijqcrr09mxfd9yc6"; @@ -3012,6 +3575,8 @@ }; rbtrace = { dependencies = ["ffi" "msgpack" "optimist"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "1lwsq08i0aj8na5q5ba3gg02sx3wl58fi6m52svl5p7cy56ycdwi"; @@ -3020,6 +3585,8 @@ version = "0.4.11"; }; rdoc = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0anv42cqcdc6g4n386mrva7mgav5i0c2ry3yzvzzc6z6hymkmcr7"; @@ -3028,6 +3595,8 @@ version = "6.0.4"; }; re2 = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "00wf9k1hkv3z3nfkrnfyyfq9ah0l7k14awqys3h2hqz4c21pqd2i"; @@ -3047,6 +3616,8 @@ version = "4.13.1"; }; recursive-open-struct = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0wfcyigmf5mwrxy76p0bi4sdb4h9afs8jc73pjav5cnqszljjl3c"; @@ -3055,6 +3626,8 @@ version = "1.1.0"; }; RedCloth = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0m9dv7ya9q93r8x1pg2gi15rxlbck8m178j1fz7r5v6wr1avrrqy"; @@ -3063,15 +3636,19 @@ version = "4.3.2"; }; redis = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0i415x8gi0c5vsiy6ikvx5js6fhc4x80a5lqv8iidy2iymd20irv"; + sha256 = "1mymdx7s5sr4mablklaipz679ckczsiigswm1g2v5mc93yj5amw3"; type = "gem"; }; - version = "3.3.5"; + version = "4.1.2"; }; redis-actionpack = { dependencies = ["actionpack" "redis-rack" "redis-store"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "15k41gz7nygd4yydk2yd25gghya1j7q6zifk4mdrra6bwnwjbm63"; @@ -3081,15 +3658,19 @@ }; redis-activesupport = { dependencies = ["activesupport" "redis-store"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0rq5dhrzc1l8c7f5gx9r7mvnsk5206dfwih3yv5si5rf42nx2ay5"; + sha256 = "0y1df62gpqgy0yrlmgl05rp4kb0xvn0kylprhv1k32bs33dgpv62"; type = "gem"; }; - version = "5.0.4"; + version = "5.0.7"; }; redis-namespace = { dependencies = ["redis"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0r7daagrjjribn098dxwbv9zivrbq2rsffbkj2ccxyn9lmjjbgah"; @@ -3099,15 +3680,19 @@ }; redis-rack = { dependencies = ["rack" "redis-store"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0px0wv8zripc6lrn3k0k61j6nlxda145q8sz50yvnig17wlk36gb"; + sha256 = "03xgdmq4fh187aqlh8z05idbxrmgddcarlb8x1kw4wjfcsf5afqi"; type = "gem"; }; - version = "2.0.4"; + version = "2.0.5"; }; redis-rails = { dependencies = ["redis-actionpack" "redis-activesupport" "redis-store"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0hjvkyaw5hgz7v6fgwdk8pb966z44h1gv8jarmb0gwhkqmjnsh40"; @@ -3117,6 +3702,8 @@ }; redis-store = { dependencies = ["redis"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "1mrcnjgkbmx1zf569mly82agdizqayjvnp2k6055k1iy07in3j8b"; @@ -3135,6 +3722,8 @@ version = "1.5.1"; }; regexp_property_values = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "05ka0bkhghs9b9pv6q443k8y1c5xalmm0vylj9zd450ksncxj1yr"; @@ -3144,6 +3733,8 @@ }; representable = { dependencies = ["declarative" "declarative-option" "uber"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0qm9rgi1j5a6nv726ka4mmixivlxfsg91h8rpp72wwd4vqbkkm07"; @@ -3152,6 +3743,8 @@ version = "3.0.4"; }; request_store = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "1va9x0b3ww4chcfqlmi8b14db39di1mwa7qrjbh7ma0lhndvs2zv"; @@ -3161,6 +3754,8 @@ }; responders = { dependencies = ["actionpack" "railties"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "1rhdyyvvm26f2l3fgwdp6xasfl2y0whwgy766bhdwz697mf78zfn"; @@ -3170,6 +3765,8 @@ }; rest-client = { dependencies = ["http-cookie" "mime-types" "netrc"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "1hzcs2r7b5bjkf2x2z3n8z6082maz0j8vqjiciwgg3hzb63f958j"; @@ -3178,6 +3775,8 @@ version = "2.0.2"; }; retriable = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "1q48hqws2dy1vws9schc0kmina40gy7sn5qsndpsfqdslh65snha"; @@ -3186,6 +3785,8 @@ version = "3.1.2"; }; rinku = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "11cakxzp7qi04d41hbqkh92n52mm4z2ba8sqyhxbmfi4kypmls9y"; @@ -3194,6 +3795,8 @@ version = "2.0.0"; }; rotp = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "1w8d6svhq3y9y952r8cqirxvdx12zlkb7zxjb44bcbidb2sisy4d"; @@ -3206,13 +3809,15 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0yfhazlhjc4abgzhkgq8zqmdphvkh52211widkl4zhsbhqh8wg2q"; + sha256 = "0pv628bqalippv8vjs3003qpl3zab9g44vqzydgcwxd628r5k9sv"; type = "gem"; }; - version = "3.5.1"; + version = "3.7.0"; }; rqrcode = { dependencies = ["chunky_png"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "188n1mvc7klrlw30bai16sdg4yannmy7cz0sg0nvm6f1kjx5qflb"; @@ -3222,6 +3827,8 @@ }; rqrcode-rails3 = { dependencies = ["rqrcode"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "1i28rwmj24ssk91chn0g7qsnvn003y3s5a7jsrg3w4l5ckr841bg"; @@ -3307,6 +3914,8 @@ version = "0.6.1"; }; rspec-set = { + groups = ["development" "test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "06vw8b5w1a58838cw9ssmy3r6f8vrjh54h7dp97rwv831gn5zlyk"; @@ -3326,6 +3935,8 @@ }; rspec_junit_formatter = { dependencies = ["rspec-core"]; + groups = ["test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "1aynmrgnv26pkprrajvp7advb8nbh0x4pkwk6jwq8qmwzarzk21p"; @@ -3335,6 +3946,8 @@ }; rspec_profiling = { dependencies = ["activerecord" "pg" "rails" "sqlite3"]; + groups = ["development" "test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "1g7q7gav26bpiprx4dhlvdh4zdrhwiky9jbmsp14gyfiabqdz4sz"; @@ -3355,6 +3968,8 @@ }; rubocop-gitlab-security = { dependencies = ["rubocop"]; + groups = ["default" "development" "test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0v0040kpx46fxz3p7dsdjgvsx89qjhwy17n8vxnqg9a7g1rfvxln"; @@ -3375,6 +3990,8 @@ }; rubocop-rspec = { dependencies = ["rubocop"]; + groups = ["development" "test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0vk51h9swvgshan8vp8yjz03qv9vn5vs29i9iddhjwcwgzsganla"; @@ -3384,6 +4001,8 @@ }; ruby-enum = { dependencies = ["i18n"]; + groups = ["default" "development" "test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0h62avini866kxpjzqxlqnajma3yvj0y25l6hn9h2mv5pp6fcrhx"; @@ -3393,6 +4012,8 @@ }; ruby-fogbugz = { dependencies = ["crack"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "1jj0gpkycbrivkh2q3429vj6mbgx6axxisg69slj3c4mgvzfgchm"; @@ -3401,25 +4022,29 @@ version = "0.2.1"; }; ruby-prof = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "02z4lh1iv1d8751a1l6r4hfc9mp61gf80g4qc4l6gbync3j3hf2c"; + sha256 = "0ac3mv3x468s820f6wnp5whzl59y5844wmdjg47a8mbp0kkmnn58"; type = "gem"; }; - version = "0.17.0"; + version = "1.0.0"; }; ruby-progressbar = { groups = ["default" "development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1cv2ym3rl09svw8940ny67bav7b2db4ms39i4raaqzkf59jmhglk"; + sha256 = "1k77i0d4wsn23ggdd2msrcwfy0i376cglfqypkk2q77r2l3408zf"; type = "gem"; }; - version = "1.10.0"; + version = "1.10.1"; }; ruby-saml = { dependencies = ["nokogiri"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0k9d88fa8bp5szivbwq0qi960y3r2kp6jhnkmsp3n2rvwpn936i3"; @@ -3439,6 +4064,8 @@ version = "3.13.1"; }; rubyntlm = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "1p6bxsklkbcqni4bcq6jajc2n57g0w5rzn4r49c3lb04wz5xg0dy"; @@ -3447,6 +4074,8 @@ version = "0.6.2"; }; rubypants = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "1vpdkrc4c8qhrxph41wqwswl28q5h5h994gy4c1mlrckqzm3hzph"; @@ -3455,6 +4084,8 @@ version = "0.2.0"; }; rubyzip = { + groups = ["default" "development" "test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "1n1lb2sdwh9h27y244hxzg1lrxxg2m53pk1vq7p33bna003qkyrj"; @@ -3467,12 +4098,14 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1yiszpz6y13vvgh3fss1l0ipp0zgsbbc8c28vynnpdyx1sy6krp6"; + sha256 = "03w3k7j27kgzpcc3halkd3w0b677sny2lfwm2lwn2n1ac20dzjc6"; type = "gem"; }; - version = "0.28.1"; + version = "0.28.3.1"; }; safe_yaml = { + groups = ["default" "test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "1hly915584hyi9q9vgd968x2nsi5yag9jyf5kq60lwzi5scr7094"; @@ -3482,6 +4115,8 @@ }; sanitize = { dependencies = ["crass" "nokogiri" "nokogumbo"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0j4j2a2mkk1a70vbx959pvx0gvr1zb9snjwvsppwj28bp0p0b2bv"; @@ -3491,6 +4126,8 @@ }; sass = { dependencies = ["sass-listen"]; + groups = ["default" "development" "test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "10401m2xlv6vaxfwzy4xxmk51ddcnkvwi918cw3jkki0qqdl7d8v"; @@ -3500,6 +4137,8 @@ }; sass-listen = { dependencies = ["rb-fsevent" "rb-inotify"]; + groups = ["default" "development" "test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0xw3q46cmahkgyldid5hwyiwacp590zj2vmswlll68ryvmvcp7df"; @@ -3531,6 +4170,8 @@ }; sawyer = { dependencies = ["addressable" "faraday"]; + groups = ["default" "development"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0sv1463r7bqzvx4drqdmd36m7rrv6sf1v3c6vswpnq3k6vdw2dvd"; @@ -3540,6 +4181,8 @@ }; scss_lint = { dependencies = ["rake" "sass"]; + groups = ["development" "test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "01bfkrjn1i0hfg1ifwn1rs7vqwdbdw158krwr5fm6iasd9zgl10g"; @@ -3549,6 +4192,8 @@ }; seed-fu = { dependencies = ["activerecord" "activesupport"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0x6gclryl0hds3zms095d2iyafcvm2kfrm7362vrkxws7r2775pi"; @@ -3579,6 +4224,8 @@ version = "2.9.0"; }; settingslogic = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "1ria5zcrk1nf0b9yia15mdpzw0dqr6wjpbj8dsdbbps81lfsj9ar"; @@ -3596,15 +4243,6 @@ }; version = "4.12.0"; }; - sham_rack = { - dependencies = ["rack"]; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0zs6hpgg87x5jrykjxgfp2i7m5aja53s5kamdhxam16wki1hid3i"; - type = "gem"; - }; - version = "1.3.6"; - }; shoulda-matchers = { dependencies = ["activesupport"]; groups = ["test"]; @@ -3629,6 +4267,8 @@ }; sidekiq-cron = { dependencies = ["fugit" "sidekiq"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "1aliswahmpxn1ib2brn4126gk97ac3zdnwr71mn8vzbr3vdd7fl0"; @@ -3638,6 +4278,8 @@ }; signet = { dependencies = ["addressable" "faraday" "jwt" "multi_json"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "1f5d3bz5bjc4b0r2jmqd15qf07lgsqkgd25f0h46jihrf9l5fsi4"; @@ -3646,6 +4288,8 @@ version = "0.11.0"; }; simple_po_parser = { + groups = ["development" "test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "08wkp4gcrd89k5yari9j94if9ffkj3rka4llcwrhdgsi3l15p5f3"; @@ -3674,7 +4318,19 @@ }; version = "0.10.2"; }; + sixarm_ruby_unaccent = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "11237b8r8p7fc0cpn04v9wa7ggzq0xm6flh10h1lnb6zgc3schq0"; + type = "gem"; + }; + version = "1.2.0"; + }; slack-notifier = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0xavibxh00gy62mm79l6id9l2fldjmdqifk8alqfqy5z38ffwah6"; @@ -3695,6 +4351,8 @@ }; spring = { dependencies = ["activesupport"]; + groups = ["development" "test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "168yz9c1fv21wc5i8q7n43b9nk33ivg3ws1fn6x0afgryz3ssx75"; @@ -3704,6 +4362,8 @@ }; spring-commands-rspec = { dependencies = ["spring"]; + groups = ["development" "test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0b0svpq3md1pjz5drpa5pxwg8nk48wrshq8lckim4x3nli7ya0k2"; @@ -3713,6 +4373,8 @@ }; sprockets = { dependencies = ["concurrent-ruby" "rack"]; + groups = ["default" "development" "test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "182jw5a0fbqah5w9jancvfmjbk88h8bxdbwnl4d3q809rpxdg8ay"; @@ -3722,6 +4384,8 @@ }; sprockets-rails = { dependencies = ["actionpack" "activesupport" "sprockets"]; + groups = ["default" "development" "test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0ab42pm8p5zxpv3sfraq45b9lj39cz9mrpdirm30vywzrwwkm5p1"; @@ -3730,6 +4394,8 @@ version = "3.2.1"; }; sqlite3 = { + groups = ["default" "development" "test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "01ifzp8nwzqppda419c9wcvr8n82ysmisrs0hph9pdmv1lpa4f5i"; @@ -3738,6 +4404,8 @@ version = "1.3.13"; }; sshkey = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "03bkn55qsng484iqwz2lmm6rkimj01vsvhwk661s3lnmpkl65lbp"; @@ -3746,6 +4414,8 @@ version = "2.0.0"; }; stackprof = { + groups = ["development" "test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "1c88j2d6ipjw5s3hgdgfww37gysgrkicawagj33hv3knijjc9ski"; @@ -3754,6 +4424,8 @@ version = "0.2.10"; }; state_machines = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "00mi16hg3rhkxz4y58s173cbnjlba41y9bfcim90p4ja6yfj9ri3"; @@ -3763,6 +4435,8 @@ }; state_machines-activemodel = { dependencies = ["activemodel" "state_machines"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0chhm5hs1y83dq8haff10m66r3yrm7jab35r9xg6adn6qd8ynv2l"; @@ -3772,6 +4446,8 @@ }; state_machines-activerecord = { dependencies = ["activerecord" "state_machines-activemodel"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "00h07gd4kb22ahgv61r8zca9hqxaw44fnk2sc28j00c1nmwsw6r3"; @@ -3792,6 +4468,8 @@ }; sys-filesystem = { dependencies = ["ffi"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "092wj7936i5inzafi09wqh5c8dbak588q21k652dsrdjf5qi10zq"; @@ -3800,6 +4478,8 @@ version = "1.1.6"; }; sysexits = { + groups = ["default" "development" "test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0qjng6pllznmprzx8vb0zg0c86hdrkyjs615q41s9fjpmv2430jr"; @@ -3817,7 +4497,20 @@ }; version = "0.8.1"; }; + terminal-table = { + dependencies = ["unicode-display_width"]; + groups = ["default" "development"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1512cngw35hsmhvw4c05rscihc59mnj09m249sm9p3pik831ydqk"; + type = "gem"; + }; + version = "1.8.0"; + }; test-prof = { + groups = ["test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "08nvn3c1mzgcjgk9lr3py0zjd8fjjrm3ncn9rpqkfbx429mgw2l3"; @@ -3826,6 +4519,8 @@ version = "0.2.5"; }; text = { + groups = ["default" "development"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "1x6kkmsr49y3rnrin91rv8mpc3dhrf3ql08kbccw8yffq61brfrg"; @@ -3835,6 +4530,8 @@ }; thin = { dependencies = ["daemons" "eventmachine" "rack"]; + groups = ["development"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0nagbf9pwy1vg09k6j4xqhbjjzrg5dwzvkn4ffvlj76fsn6vv61f"; @@ -3843,6 +4540,8 @@ version = "1.7.2"; }; thor = { + groups = ["default" "development" "test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "01n5dv9kql60m6a00zc0r66jvaxx98qhdny3klyj0p3w34pad2ns"; @@ -3851,6 +4550,8 @@ version = "0.19.4"; }; thread_safe = { + groups = ["default" "development" "test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0nmhcgq6cgz44srylra07bmaw99f5271l0dpsvl5f75m44l0gmwy"; @@ -3859,6 +4560,8 @@ version = "0.3.6"; }; thrift = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "02p107kwx7jnkh6fpdgvaji0xdg6xkaarngkqjml6s4zny4m8slv"; @@ -3877,6 +4580,8 @@ version = "2.0.9"; }; timecop = { + groups = ["development" "test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0vwbkwqyxhavzvr1820hqwz43ylnfcf6w4x6sag0nghi44sr9kmx"; @@ -3885,6 +4590,8 @@ version = "0.8.1"; }; timfel-krb5-auth = { + groups = ["default" "kerberos"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "105vajc0jkqgcx1wbp0ad262sdry4l1irk7jpaawv8vzfjfqqf5b"; @@ -3894,6 +4601,8 @@ }; toml = { dependencies = ["parslet"]; + groups = ["default" "development" "test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0xj460rkyqvg74xc8kivmbvgc46c6mm7r8mbjs5m2gq8khf8sbki"; @@ -3903,6 +4612,8 @@ }; toml-rb = { dependencies = ["citrus"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0pz6z1mc7rnv4chkbx3mdn4q1lpp0j596dq57kbq39jv0wn0wi4d"; @@ -3910,18 +4621,10 @@ }; version = "1.0.0"; }; - tomlrb = { - groups = ["default" "development" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0g28ssfal6vry3cmhy509ba3vi5d5aggz1gnffnvvmc8ml8vkpiv"; - type = "gem"; - }; - version = "1.2.8"; - }; truncato = { dependencies = ["htmlentities" "nokogiri"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0z36dprfj9l4jwgwb2wv4v3cilm53v7i1ywfmm5f1dl352id3ak4"; @@ -3931,6 +4634,8 @@ }; tzinfo = { dependencies = ["thread_safe"]; + groups = ["default" "development" "test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "1fjx9j327xpkkdlxwmkl3a8wqj7i4l4jwlrv3z13mg95z9wl253z"; @@ -3939,6 +4644,8 @@ version = "1.2.5"; }; u2f = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0lsm1hvwcaa9sq13ab1l1zjk0fgcy951ay11v2acx0h6q1iv21vr"; @@ -3947,6 +4654,8 @@ version = "0.2.1"; }; uber = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "1p1mm7mngg40x05z52md3mbamkng0zpajbzqjjwmsyw0zw3v9vjv"; @@ -3956,6 +4665,8 @@ }; uglifier = { dependencies = ["execjs" "json"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0mzs64z3m1b98rh6ssxpqfz9sc87f6ml6906b0m57vydzfgrh1cz"; @@ -3965,6 +4676,8 @@ }; unf = { dependencies = ["unf_ext"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0bh2cf73i2ffh4fcpdn9ir4mhq8zi50ik0zqa1braahzadx536a9"; @@ -3973,6 +4686,8 @@ version = "0.1.4"; }; unf_ext = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "06p1i6qhy34bpb8q8ms88y6f2kz86azwm098yvcc0nyqk9y729j1"; @@ -3990,8 +4705,20 @@ }; version = "1.6.0"; }; + unicode_utils = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0h1a5yvrxzlf0lxxa1ya31jcizslf774arnsd89vgdhk4g7x08mr"; + type = "gem"; + }; + version = "1.4.0"; + }; unicorn = { dependencies = ["kgio" "raindrops"]; + groups = ["unicorn"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "1qfhvzs4i6ja1s43j8p1kfbzm10n7a02ngki30a38y5m46a2qrak"; @@ -4001,6 +4728,8 @@ }; unicorn-worker-killer = { dependencies = ["get_process_mem" "unicorn"]; + groups = ["unicorn"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0rrdxpwdsapx47axjin8ymxb4f685qlpx8a26bql4ay1559c3gva"; @@ -4009,6 +4738,8 @@ version = "0.4.4"; }; uniform_notifier = { + groups = ["default" "development" "test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "1jha0l7x602g5rvah960xl9r0f3q25gslj39i0x1vai8i5z6zr1l"; @@ -4016,6 +4747,17 @@ }; version = "1.10.0"; }; + unleash = { + dependencies = ["murmurhash3"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0xs2ml9cwskddsxick3a9wnasy7q6wmc0dbydfcaspfl2cjmp1rk"; + type = "gem"; + }; + version = "0.1.5"; + }; unparser = { dependencies = ["abstract_type" "adamantium" "concord" "diff-lcs" "equalizer" "parser" "procto"]; groups = ["default" "development" "test"]; @@ -4051,6 +4793,8 @@ }; validates_hostname = { dependencies = ["activerecord" "activesupport"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "04p1l0v98j4ffvaks1ig9mygx5grpbpdgz7haq3mygva9iy8ykja"; @@ -4059,6 +4803,8 @@ version = "1.0.6"; }; version_sorter = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0hbdw3vh856f5yg5mbj4498l6vh90cd3pn22ikr3ranzkrh73l3s"; @@ -4068,6 +4814,8 @@ }; virtus = { dependencies = ["axiom-types" "coercible" "descendants_tracker" "equalizer"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "06iphwi3c4f7y9i2rvhvaizfswqbaflilziz4dxqngrdysgkn1fk"; @@ -4076,6 +4824,8 @@ version = "1.0.5"; }; vmstat = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0vb5mwc71p8rlm30hnll3lb4z70ipl5rmilskpdrq2mxwfilcm5b"; @@ -4085,6 +4835,8 @@ }; warden = { dependencies = ["rack"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0va966lhpylcwbqb9n151kkihx30agh0a57mwjwdxyanll4s1q12"; @@ -4105,6 +4857,8 @@ }; webmock = { dependencies = ["addressable" "crack" "hashdiff"]; + groups = ["test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0gg0c2sxq7rni0b93w47h7p7cn590xdhf5va7ska48inpipwlgxp"; @@ -4114,6 +4868,8 @@ }; webpack-rails = { dependencies = ["railties"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0fsjxw730bh4k1dfnbjm645fgjyqrh830l1z7brqbsm6306ig1rr"; @@ -4133,6 +4889,8 @@ version = "0.7.0"; }; websocket-extensions = { + groups = ["default" "development" "test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "034sdr7fd34yag5l6y156rkbhiqgmy395m231dwhlpcswhs6d270"; @@ -4142,6 +4900,8 @@ }; wikicloth = { dependencies = ["builder" "expression_parser" "rinku"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "1jp6c2yzyqbap8jdiw8yz6l08sradky1llhyhmrg934l1b5akj3s"; @@ -4150,6 +4910,8 @@ version = "0.8.1"; }; with_env = { + groups = ["default" "development" "test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "1r5ns064mbb99hf1dyxsk9183hznc5i7mn3bi86zka6dlvqf9csh"; @@ -4158,6 +4920,8 @@ version = "1.1.0"; }; xml-simple = { + groups = ["default" "development" "test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0xlqplda3fix5pcykzsyzwgnbamb3qrqkgbrhhfz2a2fxhrkvhw8"; diff --git a/pkgs/applications/version-management/gitlab/update.py b/pkgs/applications/version-management/gitlab/update.py index 650bd73aa845..38acf41c6f2f 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 common-updater-scripts nix nix-prefetch-git python3 python3Packages.requests python3Packages.lxml python3Packages.click python3Packages.click-log vgo2nix +#! nix-shell -i python3 -p bundix common-updater-scripts nix nix-prefetch-git python3 python3Packages.requests python3Packages.lxml python3Packages.click python3Packages.click-log vgo2nix yarn2nix-moretea.yarn2nix import click import click_log @@ -20,7 +20,7 @@ logger = logging.getLogger(__name__) class GitLabRepo: version_regex = re.compile(r"^v\d+\.\d+\.\d+(\-rc\d+)?(\-ee)?") - def __init__(self, owner: str, repo: str): + def __init__(self, owner: str = 'gitlab-org', repo: str = 'gitlab'): self.owner = owner self.repo = repo @@ -46,24 +46,6 @@ class GitLabRepo: j = json.loads(out) return j['sha256'] - def get_deb_url(self, flavour: str, version: str, arch: str = 'amd64') -> str: - """ - gitlab builds debian packages, which we currently need as we don't build the frontend on our own - this returns the url of a given flavour, version and arch - :param flavour: 'ce' or 'ee' - :param version: a version, without 'v' prefix and '-ee' suffix - :param arch: amd64 - :return: url of the debian package - """ - if self.owner != "gitlab-org" or self.repo not in ['gitlab-ce', 'gitlab-ee']: - raise Exception(f"don't know how to get deb_url for {self.url}") - return f"https://packages.gitlab.com/gitlab/gitlab-{flavour}/packages" + \ - f"/debian/stretch/gitlab-{flavour}_{version}-{flavour}.0_{arch}.deb/download.deb" - - def get_deb_hash(self, flavour: str, version: str) -> str: - out = subprocess.check_output(['nix-prefetch-url', self.get_deb_url(flavour, version)]) - return out.decode('utf-8').strip() - @staticmethod def rev2version(tag: str) -> str: """ @@ -86,46 +68,19 @@ class GitLabRepo: """ return requests.get(self.url + f"/raw/{rev}/{filepath}").text - def get_data(self, rev, flavour): + def get_data(self, rev): version = self.rev2version(rev) passthru = {v: self.get_file(v, rev).strip() for v in ['GITALY_SERVER_VERSION', 'GITLAB_PAGES_VERSION', 'GITLAB_SHELL_VERSION', 'GITLAB_WORKHORSE_VERSION']} return dict(version=self.rev2version(rev), repo_hash=self.get_git_hash(rev), - deb_hash=self.get_deb_hash(flavour, version), - deb_url=self.get_deb_url(flavour, version), owner=self.owner, repo=self.repo, rev=rev, passthru=passthru) -def _flavour2gitlabrepo(flavour: str): - if flavour not in ['ce', 'ee']: - raise Exception(f"unknown gitlab flavour: {flavour}, needs to be ce or ee") - - owner = 'gitlab-org' - repo = 'gitlab-' + flavour - - return GitLabRepo(owner, repo) - - -def _update_data_json(filename: str, repo: GitLabRepo, rev: str, flavour: str): - flavour_data = repo.get_data(rev, flavour) - - if not os.path.exists(filename): - with open(filename, 'w') as f: - json.dump({flavour: flavour_data}, f, indent=2) - else: - with open(filename, 'r+') as f: - data = json.load(f) - data[flavour] = flavour_data - f.seek(0) - f.truncate() - json.dump(data, f, indent=2) - - def _get_data_json(): data_file_path = pathlib.Path(__file__).parent / 'data.json' with open(data_file_path, 'r') as f: @@ -146,100 +101,139 @@ def cli(): @cli.command('update-data') @click.option('--rev', default='latest', help='The rev to use, \'latest\' points to the latest (stable) tag') -@click.argument('flavour') -def update_data(rev: str, flavour: str): - """Update data.nix for a selected flavour""" - r = _flavour2gitlabrepo(flavour) +def update_data(rev: str): + """Update data.nix""" + repo = GitLabRepo() if rev == 'latest': # filter out pre and re releases - rev = next(filter(lambda x: not ('rc' in x or x.endswith('pre')), r.tags)) + rev = next(filter(lambda x: not ('rc' in x or x.endswith('pre')), repo.tags)) logger.debug(f"Using rev {rev}") - version = r.rev2version(rev) + version = repo.rev2version(rev) logger.debug(f"Using version {version}") data_file_path = pathlib.Path(__file__).parent / 'data.json' - _update_data_json(filename=data_file_path.as_posix(), - repo=r, - rev=rev, - flavour=flavour) + data = repo.get_data(rev) + with open(data_file_path.as_posix(), 'w') as f: + json.dump(data, f, indent=2) -@cli.command('update-rubyenv') -@click.argument('flavour') -def update_rubyenv(flavour): - """Update rubyEnv-${flavour}""" - if flavour not in ['ce', 'ee']: - raise Exception(f"unknown gitlab flavour: {flavour}, needs to be ce or ee") - r = _flavour2gitlabrepo(flavour) - rubyenv_dir = pathlib.Path(__file__).parent / f"rubyEnv-{flavour}" +@cli.command('update-rubyenv') +def update_rubyenv(): + """Update rubyEnv""" + repo = GitLabRepo() + rubyenv_dir = pathlib.Path(__file__).parent / f"rubyEnv" # load rev from data.json data = _get_data_json() - rev = data[flavour]['rev'] + rev = data['rev'] for fn in ['Gemfile.lock', 'Gemfile']: with open(rubyenv_dir / fn, 'w') as f: - f.write(r.get_file(fn, rev)) + f.write(repo.get_file(fn, rev)) subprocess.check_output(['bundix'], cwd=rubyenv_dir) +@cli.command('update-yarnpkgs') +def update_yarnpkgs(): + """Update yarnPkgs""" + + repo = GitLabRepo() + yarnpkgs_dir = pathlib.Path(__file__).parent + + # load rev from data.json + data = _get_data_json() + rev = data['rev'] + + with open(yarnpkgs_dir / 'yarn.lock', 'w') as f: + f.write(repo.get_file('yarn.lock', rev)) + + with open(yarnpkgs_dir / 'yarnPkgs.nix', 'w') as f: + subprocess.run(['yarn2nix'], cwd=yarnpkgs_dir, check=True, stdout=f) + + os.unlink(yarnpkgs_dir / 'yarn.lock') + + @cli.command('update-gitaly') def update_gitaly(): """Update gitaly""" data = _get_data_json() - gitaly_server_version = data['ce']['passthru']['GITALY_SERVER_VERSION'] - r = GitLabRepo('gitlab-org', 'gitaly') + gitaly_server_version = data['passthru']['GITALY_SERVER_VERSION'] + repo = GitLabRepo(repo='gitaly') gitaly_dir = pathlib.Path(__file__).parent / 'gitaly' for fn in ['Gemfile.lock', 'Gemfile']: with open(gitaly_dir / fn, 'w') as f: - f.write(r.get_file(f"ruby/{fn}", f"v{gitaly_server_version}")) + 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(r.get_file(fn, f"v{gitaly_server_version}")) + f.write(repo.get_file(fn, f"v{gitaly_server_version}")) subprocess.check_output(['bundix'], cwd=gitaly_dir) subprocess.check_output(['vgo2nix'], cwd=gitaly_dir) for fn in ['go.mod', 'go.sum']: os.unlink(gitaly_dir / fn) - # currently broken, as `gitaly.meta.position` returns - # pkgs/development/go-modules/generic/default.nix - # so update-source-version doesn't know where to update hashes - # _call_update_source_version('gitaly', gitaly_server_version) - gitaly_hash = r.get_git_hash(f"v{gitaly_server_version}") - click.echo(f"Please update gitaly/default.nix to version {gitaly_server_version} and hash {gitaly_hash}") + + _call_update_source_version('gitaly', gitaly_server_version) @cli.command('update-gitlab-shell') def update_gitlab_shell(): """Update gitlab-shell""" data = _get_data_json() - gitlab_shell_version = data['ce']['passthru']['GITLAB_SHELL_VERSION'] + gitlab_shell_version = data['passthru']['GITLAB_SHELL_VERSION'] _call_update_source_version('gitlab-shell', gitlab_shell_version) + repo = GitLabRepo(repo='gitlab-shell') + gitlab_shell_dir = pathlib.Path(__file__).parent / 'gitlab-shell' + + for fn in ['Gemfile.lock', 'Gemfile']: + with open(gitlab_shell_dir / fn, 'w') as f: + f.write(repo.get_file(fn, f"v{gitlab_shell_version}")) + + for fn in ['go.mod', 'go.sum']: + with open(gitlab_shell_dir / fn, 'w') as f: + f.write(repo.get_file(f"go/{fn}", f"v{gitlab_shell_version}")) + + subprocess.check_output(['bundix'], cwd=gitlab_shell_dir) + subprocess.check_output(['vgo2nix'], 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-shell""" + """Update gitlab-workhorse""" data = _get_data_json() - gitlab_workhorse_version = data['ce']['passthru']['GITLAB_WORKHORSE_VERSION'] + gitlab_workhorse_version = data['passthru']['GITLAB_WORKHORSE_VERSION'] _call_update_source_version('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}")) + + subprocess.check_output(['vgo2nix'], cwd=gitlab_workhorse_dir) + + for fn in ['go.mod', 'go.sum']: + os.unlink(gitlab_workhorse_dir / fn) @cli.command('update-all') @click.pass_context def update_all(ctx): - """Update gitlab ce and ee data.nix and rubyenvs to the latest stable release""" - for flavour in ['ce', 'ee']: - ctx.invoke(update_data, rev='latest', flavour=flavour) - ctx.invoke(update_rubyenv, flavour=flavour) + """Update all gitlab components to the latest stable release""" + ctx.invoke(update_data, rev='latest') + ctx.invoke(update_rubyenv) + ctx.invoke(update_yarnpkgs) ctx.invoke(update_gitaly) ctx.invoke(update_gitlab_shell) ctx.invoke(update_gitlab_workhorse) diff --git a/pkgs/applications/version-management/gitlab/yarnPkgs.nix b/pkgs/applications/version-management/gitlab/yarnPkgs.nix new file mode 100644 index 000000000000..350d8a1ab0df --- /dev/null +++ b/pkgs/applications/version-management/gitlab/yarnPkgs.nix @@ -0,0 +1,14221 @@ +{ fetchurl, fetchgit, linkFarm, runCommandNoCC, gnutar }: rec { + offline_cache = linkFarm "offline" packages; + packages = [ + { + name = "_babel_code_frame___code_frame_7.5.5.tgz"; + path = fetchurl { + name = "_babel_code_frame___code_frame_7.5.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.5.5.tgz"; + sha1 = "bc0782f6d69f7b7d49531219699b988f669a8f9d"; + }; + } + { + name = "_babel_core___core_7.5.5.tgz"; + path = fetchurl { + name = "_babel_core___core_7.5.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/core/-/core-7.5.5.tgz"; + sha1 = "17b2686ef0d6bc58f963dddd68ab669755582c30"; + }; + } + { + name = "_babel_generator___generator_7.5.5.tgz"; + path = fetchurl { + name = "_babel_generator___generator_7.5.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/generator/-/generator-7.5.5.tgz"; + sha1 = "873a7f936a3c89491b43536d12245b626664e3cf"; + }; + } + { + name = "_babel_helper_annotate_as_pure___helper_annotate_as_pure_7.0.0.tgz"; + path = fetchurl { + name = "_babel_helper_annotate_as_pure___helper_annotate_as_pure_7.0.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.0.0.tgz"; + sha1 = "323d39dd0b50e10c7c06ca7d7638e6864d8c5c32"; + }; + } + { + name = "_babel_helper_builder_binary_assignment_operator_visitor___helper_builder_binary_assignment_operator_visitor_7.1.0.tgz"; + path = fetchurl { + name = "_babel_helper_builder_binary_assignment_operator_visitor___helper_builder_binary_assignment_operator_visitor_7.1.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.1.0.tgz"; + sha1 = "6b69628dfe4087798e0c4ed98e3d4a6b2fbd2f5f"; + }; + } + { + name = "_babel_helper_builder_react_jsx___helper_builder_react_jsx_7.3.0.tgz"; + path = fetchurl { + name = "_babel_helper_builder_react_jsx___helper_builder_react_jsx_7.3.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-builder-react-jsx/-/helper-builder-react-jsx-7.3.0.tgz"; + sha1 = "a1ac95a5d2b3e88ae5e54846bf462eeb81b318a4"; + }; + } + { + name = "_babel_helper_call_delegate___helper_call_delegate_7.4.4.tgz"; + path = fetchurl { + name = "_babel_helper_call_delegate___helper_call_delegate_7.4.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-call-delegate/-/helper-call-delegate-7.4.4.tgz"; + sha1 = "87c1f8ca19ad552a736a7a27b1c1fcf8b1ff1f43"; + }; + } + { + name = "_babel_helper_create_class_features_plugin___helper_create_class_features_plugin_7.5.5.tgz"; + path = fetchurl { + name = "_babel_helper_create_class_features_plugin___helper_create_class_features_plugin_7.5.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.5.5.tgz"; + sha1 = "401f302c8ddbc0edd36f7c6b2887d8fa1122e5a4"; + }; + } + { + name = "_babel_helper_define_map___helper_define_map_7.5.5.tgz"; + path = fetchurl { + name = "_babel_helper_define_map___helper_define_map_7.5.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-define-map/-/helper-define-map-7.5.5.tgz"; + sha1 = "3dec32c2046f37e09b28c93eb0b103fd2a25d369"; + }; + } + { + name = "_babel_helper_explode_assignable_expression___helper_explode_assignable_expression_7.1.0.tgz"; + path = fetchurl { + name = "_babel_helper_explode_assignable_expression___helper_explode_assignable_expression_7.1.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.1.0.tgz"; + sha1 = "537fa13f6f1674df745b0c00ec8fe4e99681c8f6"; + }; + } + { + name = "_babel_helper_function_name___helper_function_name_7.1.0.tgz"; + path = fetchurl { + name = "_babel_helper_function_name___helper_function_name_7.1.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.1.0.tgz"; + sha1 = "a0ceb01685f73355d4360c1247f582bfafc8ff53"; + }; + } + { + name = "_babel_helper_get_function_arity___helper_get_function_arity_7.0.0.tgz"; + path = fetchurl { + name = "_babel_helper_get_function_arity___helper_get_function_arity_7.0.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.0.0.tgz"; + sha1 = "83572d4320e2a4657263734113c42868b64e49c3"; + }; + } + { + name = "_babel_helper_hoist_variables___helper_hoist_variables_7.4.4.tgz"; + path = fetchurl { + name = "_babel_helper_hoist_variables___helper_hoist_variables_7.4.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.4.4.tgz"; + sha1 = "0298b5f25c8c09c53102d52ac4a98f773eb2850a"; + }; + } + { + name = "_babel_helper_member_expression_to_functions___helper_member_expression_to_functions_7.5.5.tgz"; + path = fetchurl { + name = "_babel_helper_member_expression_to_functions___helper_member_expression_to_functions_7.5.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.5.5.tgz"; + sha1 = "1fb5b8ec4453a93c439ee9fe3aeea4a84b76b590"; + }; + } + { + name = "_babel_helper_module_imports___helper_module_imports_7.0.0.tgz"; + path = fetchurl { + name = "_babel_helper_module_imports___helper_module_imports_7.0.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.0.0.tgz"; + sha1 = "96081b7111e486da4d2cd971ad1a4fe216cc2e3d"; + }; + } + { + name = "_babel_helper_module_transforms___helper_module_transforms_7.5.5.tgz"; + path = fetchurl { + name = "_babel_helper_module_transforms___helper_module_transforms_7.5.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.5.5.tgz"; + sha1 = "f84ff8a09038dcbca1fd4355661a500937165b4a"; + }; + } + { + name = "_babel_helper_optimise_call_expression___helper_optimise_call_expression_7.0.0.tgz"; + path = fetchurl { + name = "_babel_helper_optimise_call_expression___helper_optimise_call_expression_7.0.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.0.0.tgz"; + sha1 = "a2920c5702b073c15de51106200aa8cad20497d5"; + }; + } + { + name = "_babel_helper_plugin_utils___helper_plugin_utils_7.0.0.tgz"; + path = fetchurl { + name = "_babel_helper_plugin_utils___helper_plugin_utils_7.0.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.0.0.tgz"; + sha1 = "bbb3fbee98661c569034237cc03967ba99b4f250"; + }; + } + { + name = "_babel_helper_regex___helper_regex_7.5.5.tgz"; + path = fetchurl { + name = "_babel_helper_regex___helper_regex_7.5.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-regex/-/helper-regex-7.5.5.tgz"; + sha1 = "0aa6824f7100a2e0e89c1527c23936c152cab351"; + }; + } + { + name = "_babel_helper_remap_async_to_generator___helper_remap_async_to_generator_7.1.0.tgz"; + path = fetchurl { + name = "_babel_helper_remap_async_to_generator___helper_remap_async_to_generator_7.1.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.1.0.tgz"; + sha1 = "361d80821b6f38da75bd3f0785ece20a88c5fe7f"; + }; + } + { + name = "_babel_helper_replace_supers___helper_replace_supers_7.5.5.tgz"; + path = fetchurl { + name = "_babel_helper_replace_supers___helper_replace_supers_7.5.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.5.5.tgz"; + sha1 = "f84ce43df031222d2bad068d2626cb5799c34bc2"; + }; + } + { + name = "_babel_helper_simple_access___helper_simple_access_7.1.0.tgz"; + path = fetchurl { + name = "_babel_helper_simple_access___helper_simple_access_7.1.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.1.0.tgz"; + sha1 = "65eeb954c8c245beaa4e859da6188f39d71e585c"; + }; + } + { + name = "_babel_helper_split_export_declaration___helper_split_export_declaration_7.4.4.tgz"; + path = fetchurl { + name = "_babel_helper_split_export_declaration___helper_split_export_declaration_7.4.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.4.4.tgz"; + sha1 = "ff94894a340be78f53f06af038b205c49d993677"; + }; + } + { + name = "_babel_helper_wrap_function___helper_wrap_function_7.2.0.tgz"; + path = fetchurl { + name = "_babel_helper_wrap_function___helper_wrap_function_7.2.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.2.0.tgz"; + sha1 = "c4e0012445769e2815b55296ead43a958549f6fa"; + }; + } + { + name = "_babel_helpers___helpers_7.5.5.tgz"; + path = fetchurl { + name = "_babel_helpers___helpers_7.5.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.5.5.tgz"; + sha1 = "63908d2a73942229d1e6685bc2a0e730dde3b75e"; + }; + } + { + name = "_babel_highlight___highlight_7.5.0.tgz"; + path = fetchurl { + name = "_babel_highlight___highlight_7.5.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.5.0.tgz"; + sha1 = "56d11312bd9248fa619591d02472be6e8cb32540"; + }; + } + { + name = "_babel_parser___parser_7.1.3.tgz"; + path = fetchurl { + name = "_babel_parser___parser_7.1.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/parser/-/parser-7.1.3.tgz"; + sha1 = "2c92469bac2b7fbff810b67fca07bd138b48af77"; + }; + } + { + name = "_babel_parser___parser_7.5.5.tgz"; + path = fetchurl { + name = "_babel_parser___parser_7.5.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/parser/-/parser-7.5.5.tgz"; + sha1 = "02f077ac8817d3df4a832ef59de67565e71cca4b"; + }; + } + { + name = "_babel_plugin_proposal_async_generator_functions___plugin_proposal_async_generator_functions_7.2.0.tgz"; + path = fetchurl { + name = "_babel_plugin_proposal_async_generator_functions___plugin_proposal_async_generator_functions_7.2.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.2.0.tgz"; + sha1 = "b289b306669dce4ad20b0252889a15768c9d417e"; + }; + } + { + name = "_babel_plugin_proposal_class_properties___plugin_proposal_class_properties_7.5.5.tgz"; + path = fetchurl { + name = "_babel_plugin_proposal_class_properties___plugin_proposal_class_properties_7.5.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.5.5.tgz"; + sha1 = "a974cfae1e37c3110e71f3c6a2e48b8e71958cd4"; + }; + } + { + name = "_babel_plugin_proposal_decorators___plugin_proposal_decorators_7.4.4.tgz"; + path = fetchurl { + name = "_babel_plugin_proposal_decorators___plugin_proposal_decorators_7.4.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.4.4.tgz"; + sha1 = "de9b2a1a8ab0196f378e2a82f10b6e2a36f21cc0"; + }; + } + { + name = "_babel_plugin_proposal_do_expressions___plugin_proposal_do_expressions_7.5.0.tgz"; + path = fetchurl { + name = "_babel_plugin_proposal_do_expressions___plugin_proposal_do_expressions_7.5.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-do-expressions/-/plugin-proposal-do-expressions-7.5.0.tgz"; + sha1 = "ceb594d4a618545b00aa0b5cd61cad4aaaeb7a5a"; + }; + } + { + name = "_babel_plugin_proposal_dynamic_import___plugin_proposal_dynamic_import_7.5.0.tgz"; + path = fetchurl { + name = "_babel_plugin_proposal_dynamic_import___plugin_proposal_dynamic_import_7.5.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.5.0.tgz"; + sha1 = "e532202db4838723691b10a67b8ce509e397c506"; + }; + } + { + name = "_babel_plugin_proposal_export_default_from___plugin_proposal_export_default_from_7.5.2.tgz"; + path = fetchurl { + name = "_babel_plugin_proposal_export_default_from___plugin_proposal_export_default_from_7.5.2.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-export-default-from/-/plugin-proposal-export-default-from-7.5.2.tgz"; + sha1 = "2c0ac2dcc36e3b2443fead2c3c5fc796fb1b5145"; + }; + } + { + name = "_babel_plugin_proposal_export_namespace_from___plugin_proposal_export_namespace_from_7.5.2.tgz"; + path = fetchurl { + name = "_babel_plugin_proposal_export_namespace_from___plugin_proposal_export_namespace_from_7.5.2.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.5.2.tgz"; + sha1 = "ccd5ed05b06d700688ff1db01a9dd27155e0d2a0"; + }; + } + { + name = "_babel_plugin_proposal_function_bind___plugin_proposal_function_bind_7.2.0.tgz"; + path = fetchurl { + name = "_babel_plugin_proposal_function_bind___plugin_proposal_function_bind_7.2.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-function-bind/-/plugin-proposal-function-bind-7.2.0.tgz"; + sha1 = "94dc2cdc505cafc4e225c0014335a01648056bf7"; + }; + } + { + name = "_babel_plugin_proposal_function_sent___plugin_proposal_function_sent_7.5.0.tgz"; + path = fetchurl { + name = "_babel_plugin_proposal_function_sent___plugin_proposal_function_sent_7.5.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-function-sent/-/plugin-proposal-function-sent-7.5.0.tgz"; + sha1 = "39233aa801145e7d8072077cdb2d25f781c1ffd7"; + }; + } + { + name = "_babel_plugin_proposal_json_strings___plugin_proposal_json_strings_7.2.0.tgz"; + path = fetchurl { + name = "_babel_plugin_proposal_json_strings___plugin_proposal_json_strings_7.2.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.2.0.tgz"; + sha1 = "568ecc446c6148ae6b267f02551130891e29f317"; + }; + } + { + name = "_babel_plugin_proposal_logical_assignment_operators___plugin_proposal_logical_assignment_operators_7.2.0.tgz"; + path = fetchurl { + name = "_babel_plugin_proposal_logical_assignment_operators___plugin_proposal_logical_assignment_operators_7.2.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.2.0.tgz"; + sha1 = "8a5cea6c42a7c87446959e02fff5fad012c56f57"; + }; + } + { + name = "_babel_plugin_proposal_nullish_coalescing_operator___plugin_proposal_nullish_coalescing_operator_7.4.4.tgz"; + path = fetchurl { + name = "_babel_plugin_proposal_nullish_coalescing_operator___plugin_proposal_nullish_coalescing_operator_7.4.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.4.4.tgz"; + sha1 = "41c360d59481d88e0ce3a3f837df10121a769b39"; + }; + } + { + name = "_babel_plugin_proposal_numeric_separator___plugin_proposal_numeric_separator_7.2.0.tgz"; + path = fetchurl { + name = "_babel_plugin_proposal_numeric_separator___plugin_proposal_numeric_separator_7.2.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.2.0.tgz"; + sha1 = "646854daf4cd22fd6733f6076013a936310443ac"; + }; + } + { + name = "_babel_plugin_proposal_object_rest_spread___plugin_proposal_object_rest_spread_7.5.5.tgz"; + path = fetchurl { + name = "_babel_plugin_proposal_object_rest_spread___plugin_proposal_object_rest_spread_7.5.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.5.5.tgz"; + sha1 = "61939744f71ba76a3ae46b5eea18a54c16d22e58"; + }; + } + { + name = "_babel_plugin_proposal_optional_catch_binding___plugin_proposal_optional_catch_binding_7.2.0.tgz"; + path = fetchurl { + name = "_babel_plugin_proposal_optional_catch_binding___plugin_proposal_optional_catch_binding_7.2.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.2.0.tgz"; + sha1 = "135d81edb68a081e55e56ec48541ece8065c38f5"; + }; + } + { + name = "_babel_plugin_proposal_optional_chaining___plugin_proposal_optional_chaining_7.2.0.tgz"; + path = fetchurl { + name = "_babel_plugin_proposal_optional_chaining___plugin_proposal_optional_chaining_7.2.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.2.0.tgz"; + sha1 = "ae454f4c21c6c2ce8cb2397dc332ae8b420c5441"; + }; + } + { + name = "_babel_plugin_proposal_pipeline_operator___plugin_proposal_pipeline_operator_7.5.0.tgz"; + path = fetchurl { + name = "_babel_plugin_proposal_pipeline_operator___plugin_proposal_pipeline_operator_7.5.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-pipeline-operator/-/plugin-proposal-pipeline-operator-7.5.0.tgz"; + sha1 = "4100ec55ef4f6a4c2490b5f5a4f2a22dfa272c06"; + }; + } + { + name = "_babel_plugin_proposal_private_methods___plugin_proposal_private_methods_7.4.4.tgz"; + path = fetchurl { + name = "_babel_plugin_proposal_private_methods___plugin_proposal_private_methods_7.4.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.4.4.tgz"; + sha1 = "307b7db29d8ae2d259e7c0e6e665b1922d7ac856"; + }; + } + { + name = "_babel_plugin_proposal_throw_expressions___plugin_proposal_throw_expressions_7.2.0.tgz"; + path = fetchurl { + name = "_babel_plugin_proposal_throw_expressions___plugin_proposal_throw_expressions_7.2.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-throw-expressions/-/plugin-proposal-throw-expressions-7.2.0.tgz"; + sha1 = "2d9e452d370f139000e51db65d0a85dc60c64739"; + }; + } + { + name = "_babel_plugin_proposal_unicode_property_regex___plugin_proposal_unicode_property_regex_7.4.4.tgz"; + path = fetchurl { + name = "_babel_plugin_proposal_unicode_property_regex___plugin_proposal_unicode_property_regex_7.4.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.4.4.tgz"; + sha1 = "501ffd9826c0b91da22690720722ac7cb1ca9c78"; + }; + } + { + name = "_babel_plugin_syntax_async_generators___plugin_syntax_async_generators_7.2.0.tgz"; + path = fetchurl { + name = "_babel_plugin_syntax_async_generators___plugin_syntax_async_generators_7.2.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.2.0.tgz"; + sha1 = "69e1f0db34c6f5a0cf7e2b3323bf159a76c8cb7f"; + }; + } + { + name = "_babel_plugin_syntax_decorators___plugin_syntax_decorators_7.2.0.tgz"; + path = fetchurl { + name = "_babel_plugin_syntax_decorators___plugin_syntax_decorators_7.2.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-syntax-decorators/-/plugin-syntax-decorators-7.2.0.tgz"; + sha1 = "c50b1b957dcc69e4b1127b65e1c33eef61570c1b"; + }; + } + { + name = "_babel_plugin_syntax_do_expressions___plugin_syntax_do_expressions_7.2.0.tgz"; + path = fetchurl { + name = "_babel_plugin_syntax_do_expressions___plugin_syntax_do_expressions_7.2.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-syntax-do-expressions/-/plugin-syntax-do-expressions-7.2.0.tgz"; + sha1 = "f3d4b01be05ecde2892086d7cfd5f1fa1ead5a2a"; + }; + } + { + name = "_babel_plugin_syntax_dynamic_import___plugin_syntax_dynamic_import_7.2.0.tgz"; + path = fetchurl { + name = "_babel_plugin_syntax_dynamic_import___plugin_syntax_dynamic_import_7.2.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.2.0.tgz"; + sha1 = "69c159ffaf4998122161ad8ebc5e6d1f55df8612"; + }; + } + { + name = "_babel_plugin_syntax_export_default_from___plugin_syntax_export_default_from_7.2.0.tgz"; + path = fetchurl { + name = "_babel_plugin_syntax_export_default_from___plugin_syntax_export_default_from_7.2.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-syntax-export-default-from/-/plugin-syntax-export-default-from-7.2.0.tgz"; + sha1 = "edd83b7adc2e0d059e2467ca96c650ab6d2f3820"; + }; + } + { + name = "_babel_plugin_syntax_export_namespace_from___plugin_syntax_export_namespace_from_7.2.0.tgz"; + path = fetchurl { + name = "_babel_plugin_syntax_export_namespace_from___plugin_syntax_export_namespace_from_7.2.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-syntax-export-namespace-from/-/plugin-syntax-export-namespace-from-7.2.0.tgz"; + sha1 = "8d257838c6b3b779db52c0224443459bd27fb039"; + }; + } + { + name = "_babel_plugin_syntax_flow___plugin_syntax_flow_7.2.0.tgz"; + path = fetchurl { + name = "_babel_plugin_syntax_flow___plugin_syntax_flow_7.2.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-syntax-flow/-/plugin-syntax-flow-7.2.0.tgz"; + sha1 = "a765f061f803bc48f240c26f8747faf97c26bf7c"; + }; + } + { + name = "_babel_plugin_syntax_function_bind___plugin_syntax_function_bind_7.2.0.tgz"; + path = fetchurl { + name = "_babel_plugin_syntax_function_bind___plugin_syntax_function_bind_7.2.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-syntax-function-bind/-/plugin-syntax-function-bind-7.2.0.tgz"; + sha1 = "68fe85b0c0da67125f87bf239c68051b06c66309"; + }; + } + { + name = "_babel_plugin_syntax_function_sent___plugin_syntax_function_sent_7.2.0.tgz"; + path = fetchurl { + name = "_babel_plugin_syntax_function_sent___plugin_syntax_function_sent_7.2.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-syntax-function-sent/-/plugin-syntax-function-sent-7.2.0.tgz"; + sha1 = "91474d4d400604e4c6cbd4d77cd6cb3b8565576c"; + }; + } + { + name = "_babel_plugin_syntax_import_meta___plugin_syntax_import_meta_7.2.0.tgz"; + path = fetchurl { + name = "_babel_plugin_syntax_import_meta___plugin_syntax_import_meta_7.2.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-syntax-import-meta/-/plugin-syntax-import-meta-7.2.0.tgz"; + sha1 = "2333ef4b875553a3bcd1e93f8ebc09f5b9213a40"; + }; + } + { + name = "_babel_plugin_syntax_json_strings___plugin_syntax_json_strings_7.2.0.tgz"; + path = fetchurl { + name = "_babel_plugin_syntax_json_strings___plugin_syntax_json_strings_7.2.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.2.0.tgz"; + sha1 = "72bd13f6ffe1d25938129d2a186b11fd62951470"; + }; + } + { + name = "_babel_plugin_syntax_jsx___plugin_syntax_jsx_7.2.0.tgz"; + path = fetchurl { + name = "_babel_plugin_syntax_jsx___plugin_syntax_jsx_7.2.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.2.0.tgz"; + sha1 = "0b85a3b4bc7cdf4cc4b8bf236335b907ca22e7c7"; + }; + } + { + name = "_babel_plugin_syntax_logical_assignment_operators___plugin_syntax_logical_assignment_operators_7.2.0.tgz"; + path = fetchurl { + name = "_babel_plugin_syntax_logical_assignment_operators___plugin_syntax_logical_assignment_operators_7.2.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.2.0.tgz"; + sha1 = "fcab7388530e96c6f277ce494c55caa6c141fcfb"; + }; + } + { + name = "_babel_plugin_syntax_nullish_coalescing_operator___plugin_syntax_nullish_coalescing_operator_7.2.0.tgz"; + path = fetchurl { + name = "_babel_plugin_syntax_nullish_coalescing_operator___plugin_syntax_nullish_coalescing_operator_7.2.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.2.0.tgz"; + sha1 = "f75083dfd5ade73e783db729bbd87e7b9efb7624"; + }; + } + { + name = "_babel_plugin_syntax_numeric_separator___plugin_syntax_numeric_separator_7.2.0.tgz"; + path = fetchurl { + name = "_babel_plugin_syntax_numeric_separator___plugin_syntax_numeric_separator_7.2.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.2.0.tgz"; + sha1 = "7470fe070c2944469a756752a69a6963135018be"; + }; + } + { + name = "_babel_plugin_syntax_object_rest_spread___plugin_syntax_object_rest_spread_7.2.0.tgz"; + path = fetchurl { + name = "_babel_plugin_syntax_object_rest_spread___plugin_syntax_object_rest_spread_7.2.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.2.0.tgz"; + sha1 = "3b7a3e733510c57e820b9142a6579ac8b0dfad2e"; + }; + } + { + name = "_babel_plugin_syntax_optional_catch_binding___plugin_syntax_optional_catch_binding_7.2.0.tgz"; + path = fetchurl { + name = "_babel_plugin_syntax_optional_catch_binding___plugin_syntax_optional_catch_binding_7.2.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.2.0.tgz"; + sha1 = "a94013d6eda8908dfe6a477e7f9eda85656ecf5c"; + }; + } + { + name = "_babel_plugin_syntax_optional_chaining___plugin_syntax_optional_chaining_7.2.0.tgz"; + path = fetchurl { + name = "_babel_plugin_syntax_optional_chaining___plugin_syntax_optional_chaining_7.2.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.2.0.tgz"; + sha1 = "a59d6ae8c167e7608eaa443fda9fa8fa6bf21dff"; + }; + } + { + name = "_babel_plugin_syntax_pipeline_operator___plugin_syntax_pipeline_operator_7.5.0.tgz"; + path = fetchurl { + name = "_babel_plugin_syntax_pipeline_operator___plugin_syntax_pipeline_operator_7.5.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-syntax-pipeline-operator/-/plugin-syntax-pipeline-operator-7.5.0.tgz"; + sha1 = "8ea7c2c22847c797748bf07752722a317079dc1e"; + }; + } + { + name = "_babel_plugin_syntax_throw_expressions___plugin_syntax_throw_expressions_7.2.0.tgz"; + path = fetchurl { + name = "_babel_plugin_syntax_throw_expressions___plugin_syntax_throw_expressions_7.2.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-syntax-throw-expressions/-/plugin-syntax-throw-expressions-7.2.0.tgz"; + sha1 = "79001ee2afe1b174b1733cdc2fc69c9a46a0f1f8"; + }; + } + { + name = "_babel_plugin_transform_arrow_functions___plugin_transform_arrow_functions_7.2.0.tgz"; + path = fetchurl { + name = "_babel_plugin_transform_arrow_functions___plugin_transform_arrow_functions_7.2.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.2.0.tgz"; + sha1 = "9aeafbe4d6ffc6563bf8f8372091628f00779550"; + }; + } + { + name = "_babel_plugin_transform_async_to_generator___plugin_transform_async_to_generator_7.5.0.tgz"; + path = fetchurl { + name = "_babel_plugin_transform_async_to_generator___plugin_transform_async_to_generator_7.5.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.5.0.tgz"; + sha1 = "89a3848a0166623b5bc481164b5936ab947e887e"; + }; + } + { + name = "_babel_plugin_transform_block_scoped_functions___plugin_transform_block_scoped_functions_7.2.0.tgz"; + path = fetchurl { + name = "_babel_plugin_transform_block_scoped_functions___plugin_transform_block_scoped_functions_7.2.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.2.0.tgz"; + sha1 = "5d3cc11e8d5ddd752aa64c9148d0db6cb79fd190"; + }; + } + { + name = "_babel_plugin_transform_block_scoping___plugin_transform_block_scoping_7.5.5.tgz"; + path = fetchurl { + name = "_babel_plugin_transform_block_scoping___plugin_transform_block_scoping_7.5.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.5.5.tgz"; + sha1 = "a35f395e5402822f10d2119f6f8e045e3639a2ce"; + }; + } + { + name = "_babel_plugin_transform_classes___plugin_transform_classes_7.5.5.tgz"; + path = fetchurl { + name = "_babel_plugin_transform_classes___plugin_transform_classes_7.5.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.5.5.tgz"; + sha1 = "d094299d9bd680a14a2a0edae38305ad60fb4de9"; + }; + } + { + name = "_babel_plugin_transform_computed_properties___plugin_transform_computed_properties_7.2.0.tgz"; + path = fetchurl { + name = "_babel_plugin_transform_computed_properties___plugin_transform_computed_properties_7.2.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.2.0.tgz"; + sha1 = "83a7df6a658865b1c8f641d510c6f3af220216da"; + }; + } + { + name = "_babel_plugin_transform_destructuring___plugin_transform_destructuring_7.5.0.tgz"; + path = fetchurl { + name = "_babel_plugin_transform_destructuring___plugin_transform_destructuring_7.5.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.5.0.tgz"; + sha1 = "f6c09fdfe3f94516ff074fe877db7bc9ef05855a"; + }; + } + { + name = "_babel_plugin_transform_dotall_regex___plugin_transform_dotall_regex_7.4.4.tgz"; + path = fetchurl { + name = "_babel_plugin_transform_dotall_regex___plugin_transform_dotall_regex_7.4.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.4.4.tgz"; + sha1 = "361a148bc951444312c69446d76ed1ea8e4450c3"; + }; + } + { + name = "_babel_plugin_transform_duplicate_keys___plugin_transform_duplicate_keys_7.5.0.tgz"; + path = fetchurl { + name = "_babel_plugin_transform_duplicate_keys___plugin_transform_duplicate_keys_7.5.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.5.0.tgz"; + sha1 = "c5dbf5106bf84cdf691222c0974c12b1df931853"; + }; + } + { + name = "_babel_plugin_transform_exponentiation_operator___plugin_transform_exponentiation_operator_7.2.0.tgz"; + path = fetchurl { + name = "_babel_plugin_transform_exponentiation_operator___plugin_transform_exponentiation_operator_7.2.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.2.0.tgz"; + sha1 = "a63868289e5b4007f7054d46491af51435766008"; + }; + } + { + name = "_babel_plugin_transform_flow_strip_types___plugin_transform_flow_strip_types_7.4.4.tgz"; + path = fetchurl { + name = "_babel_plugin_transform_flow_strip_types___plugin_transform_flow_strip_types_7.4.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-flow-strip-types/-/plugin-transform-flow-strip-types-7.4.4.tgz"; + sha1 = "d267a081f49a8705fc9146de0768c6b58dccd8f7"; + }; + } + { + name = "_babel_plugin_transform_for_of___plugin_transform_for_of_7.4.4.tgz"; + path = fetchurl { + name = "_babel_plugin_transform_for_of___plugin_transform_for_of_7.4.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.4.4.tgz"; + sha1 = "0267fc735e24c808ba173866c6c4d1440fc3c556"; + }; + } + { + name = "_babel_plugin_transform_function_name___plugin_transform_function_name_7.4.4.tgz"; + path = fetchurl { + name = "_babel_plugin_transform_function_name___plugin_transform_function_name_7.4.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.4.4.tgz"; + sha1 = "e1436116abb0610c2259094848754ac5230922ad"; + }; + } + { + name = "_babel_plugin_transform_literals___plugin_transform_literals_7.2.0.tgz"; + path = fetchurl { + name = "_babel_plugin_transform_literals___plugin_transform_literals_7.2.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.2.0.tgz"; + sha1 = "690353e81f9267dad4fd8cfd77eafa86aba53ea1"; + }; + } + { + name = "_babel_plugin_transform_member_expression_literals___plugin_transform_member_expression_literals_7.2.0.tgz"; + path = fetchurl { + name = "_babel_plugin_transform_member_expression_literals___plugin_transform_member_expression_literals_7.2.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.2.0.tgz"; + sha1 = "fa10aa5c58a2cb6afcf2c9ffa8cb4d8b3d489a2d"; + }; + } + { + name = "_babel_plugin_transform_modules_amd___plugin_transform_modules_amd_7.5.0.tgz"; + path = fetchurl { + name = "_babel_plugin_transform_modules_amd___plugin_transform_modules_amd_7.5.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.5.0.tgz"; + sha1 = "ef00435d46da0a5961aa728a1d2ecff063e4fb91"; + }; + } + { + name = "_babel_plugin_transform_modules_commonjs___plugin_transform_modules_commonjs_7.5.0.tgz"; + path = fetchurl { + name = "_babel_plugin_transform_modules_commonjs___plugin_transform_modules_commonjs_7.5.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.5.0.tgz"; + sha1 = "425127e6045231360858eeaa47a71d75eded7a74"; + }; + } + { + name = "_babel_plugin_transform_modules_systemjs___plugin_transform_modules_systemjs_7.5.0.tgz"; + path = fetchurl { + name = "_babel_plugin_transform_modules_systemjs___plugin_transform_modules_systemjs_7.5.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.5.0.tgz"; + sha1 = "e75266a13ef94202db2a0620977756f51d52d249"; + }; + } + { + name = "_babel_plugin_transform_modules_umd___plugin_transform_modules_umd_7.2.0.tgz"; + path = fetchurl { + name = "_babel_plugin_transform_modules_umd___plugin_transform_modules_umd_7.2.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.2.0.tgz"; + sha1 = "7678ce75169f0877b8eb2235538c074268dd01ae"; + }; + } + { + name = "_babel_plugin_transform_named_capturing_groups_regex___plugin_transform_named_capturing_groups_regex_7.4.5.tgz"; + path = fetchurl { + name = "_babel_plugin_transform_named_capturing_groups_regex___plugin_transform_named_capturing_groups_regex_7.4.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.4.5.tgz"; + sha1 = "9d269fd28a370258199b4294736813a60bbdd106"; + }; + } + { + name = "_babel_plugin_transform_new_target___plugin_transform_new_target_7.4.4.tgz"; + path = fetchurl { + name = "_babel_plugin_transform_new_target___plugin_transform_new_target_7.4.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.4.4.tgz"; + sha1 = "18d120438b0cc9ee95a47f2c72bc9768fbed60a5"; + }; + } + { + name = "_babel_plugin_transform_object_super___plugin_transform_object_super_7.5.5.tgz"; + path = fetchurl { + name = "_babel_plugin_transform_object_super___plugin_transform_object_super_7.5.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.5.5.tgz"; + sha1 = "c70021df834073c65eb613b8679cc4a381d1a9f9"; + }; + } + { + name = "_babel_plugin_transform_parameters___plugin_transform_parameters_7.4.4.tgz"; + path = fetchurl { + name = "_babel_plugin_transform_parameters___plugin_transform_parameters_7.4.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.4.4.tgz"; + sha1 = "7556cf03f318bd2719fe4c922d2d808be5571e16"; + }; + } + { + name = "_babel_plugin_transform_property_literals___plugin_transform_property_literals_7.2.0.tgz"; + path = fetchurl { + name = "_babel_plugin_transform_property_literals___plugin_transform_property_literals_7.2.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.2.0.tgz"; + sha1 = "03e33f653f5b25c4eb572c98b9485055b389e905"; + }; + } + { + name = "_babel_plugin_transform_react_display_name___plugin_transform_react_display_name_7.2.0.tgz"; + path = fetchurl { + name = "_babel_plugin_transform_react_display_name___plugin_transform_react_display_name_7.2.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.2.0.tgz"; + sha1 = "ebfaed87834ce8dc4279609a4f0c324c156e3eb0"; + }; + } + { + name = "_babel_plugin_transform_react_jsx_self___plugin_transform_react_jsx_self_7.2.0.tgz"; + path = fetchurl { + name = "_babel_plugin_transform_react_jsx_self___plugin_transform_react_jsx_self_7.2.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-self/-/plugin-transform-react-jsx-self-7.2.0.tgz"; + sha1 = "461e21ad9478f1031dd5e276108d027f1b5240ba"; + }; + } + { + name = "_babel_plugin_transform_react_jsx_source___plugin_transform_react_jsx_source_7.5.0.tgz"; + path = fetchurl { + name = "_babel_plugin_transform_react_jsx_source___plugin_transform_react_jsx_source_7.5.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-source/-/plugin-transform-react-jsx-source-7.5.0.tgz"; + sha1 = "583b10c49cf057e237085bcbd8cc960bd83bd96b"; + }; + } + { + name = "_babel_plugin_transform_react_jsx___plugin_transform_react_jsx_7.3.0.tgz"; + path = fetchurl { + name = "_babel_plugin_transform_react_jsx___plugin_transform_react_jsx_7.3.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.3.0.tgz"; + sha1 = "f2cab99026631c767e2745a5368b331cfe8f5290"; + }; + } + { + name = "_babel_plugin_transform_regenerator___plugin_transform_regenerator_7.4.5.tgz"; + path = fetchurl { + name = "_babel_plugin_transform_regenerator___plugin_transform_regenerator_7.4.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.4.5.tgz"; + sha1 = "629dc82512c55cee01341fb27bdfcb210354680f"; + }; + } + { + name = "_babel_plugin_transform_reserved_words___plugin_transform_reserved_words_7.2.0.tgz"; + path = fetchurl { + name = "_babel_plugin_transform_reserved_words___plugin_transform_reserved_words_7.2.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.2.0.tgz"; + sha1 = "4792af87c998a49367597d07fedf02636d2e1634"; + }; + } + { + name = "_babel_plugin_transform_shorthand_properties___plugin_transform_shorthand_properties_7.2.0.tgz"; + path = fetchurl { + name = "_babel_plugin_transform_shorthand_properties___plugin_transform_shorthand_properties_7.2.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.2.0.tgz"; + sha1 = "6333aee2f8d6ee7e28615457298934a3b46198f0"; + }; + } + { + name = "_babel_plugin_transform_spread___plugin_transform_spread_7.2.2.tgz"; + path = fetchurl { + name = "_babel_plugin_transform_spread___plugin_transform_spread_7.2.2.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.2.2.tgz"; + sha1 = "3103a9abe22f742b6d406ecd3cd49b774919b406"; + }; + } + { + name = "_babel_plugin_transform_sticky_regex___plugin_transform_sticky_regex_7.2.0.tgz"; + path = fetchurl { + name = "_babel_plugin_transform_sticky_regex___plugin_transform_sticky_regex_7.2.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.2.0.tgz"; + sha1 = "a1e454b5995560a9c1e0d537dfc15061fd2687e1"; + }; + } + { + name = "_babel_plugin_transform_template_literals___plugin_transform_template_literals_7.4.4.tgz"; + path = fetchurl { + name = "_babel_plugin_transform_template_literals___plugin_transform_template_literals_7.4.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.4.4.tgz"; + sha1 = "9d28fea7bbce637fb7612a0750989d8321d4bcb0"; + }; + } + { + name = "_babel_plugin_transform_typeof_symbol___plugin_transform_typeof_symbol_7.2.0.tgz"; + path = fetchurl { + name = "_babel_plugin_transform_typeof_symbol___plugin_transform_typeof_symbol_7.2.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.2.0.tgz"; + sha1 = "117d2bcec2fbf64b4b59d1f9819894682d29f2b2"; + }; + } + { + name = "_babel_plugin_transform_unicode_regex___plugin_transform_unicode_regex_7.4.4.tgz"; + path = fetchurl { + name = "_babel_plugin_transform_unicode_regex___plugin_transform_unicode_regex_7.4.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.4.4.tgz"; + sha1 = "ab4634bb4f14d36728bf5978322b35587787970f"; + }; + } + { + name = "_babel_preset_env___preset_env_7.5.5.tgz"; + path = fetchurl { + name = "_babel_preset_env___preset_env_7.5.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.5.5.tgz"; + sha1 = "bc470b53acaa48df4b8db24a570d6da1fef53c9a"; + }; + } + { + name = "_babel_preset_flow___preset_flow_7.0.0.tgz"; + path = fetchurl { + name = "_babel_preset_flow___preset_flow_7.0.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/preset-flow/-/preset-flow-7.0.0.tgz"; + sha1 = "afd764835d9535ec63d8c7d4caf1c06457263da2"; + }; + } + { + name = "_babel_preset_react___preset_react_7.0.0.tgz"; + path = fetchurl { + name = "_babel_preset_react___preset_react_7.0.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/preset-react/-/preset-react-7.0.0.tgz"; + sha1 = "e86b4b3d99433c7b3e9e91747e2653958bc6b3c0"; + }; + } + { + name = "_babel_preset_stage_0___preset_stage_0_7.0.0.tgz"; + path = fetchurl { + name = "_babel_preset_stage_0___preset_stage_0_7.0.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/preset-stage-0/-/preset-stage-0-7.0.0.tgz"; + sha1 = "999aaec79ee8f0a763042c68c06539c97c6e0646"; + }; + } + { + name = "_babel_standalone___standalone_7.5.5.tgz"; + path = fetchurl { + name = "_babel_standalone___standalone_7.5.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/standalone/-/standalone-7.5.5.tgz"; + sha1 = "9d3143f6078ff408db694a4254bd6f03c5c33962"; + }; + } + { + name = "_babel_template___template_7.4.4.tgz"; + path = fetchurl { + name = "_babel_template___template_7.4.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/template/-/template-7.4.4.tgz"; + sha1 = "f4b88d1225689a08f5bc3a17483545be9e4ed237"; + }; + } + { + name = "_babel_traverse___traverse_7.5.5.tgz"; + path = fetchurl { + name = "_babel_traverse___traverse_7.5.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.5.5.tgz"; + sha1 = "f664f8f368ed32988cd648da9f72d5ca70f165bb"; + }; + } + { + name = "_babel_types___types_7.5.5.tgz"; + path = fetchurl { + name = "_babel_types___types_7.5.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/types/-/types-7.5.5.tgz"; + sha1 = "97b9f728e182785909aa4ab56264f090a028d18a"; + }; + } + { + name = "_braintree_sanitize_url___sanitize_url_3.1.0.tgz"; + path = fetchurl { + name = "_braintree_sanitize_url___sanitize_url_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/@braintree/sanitize-url/-/sanitize-url-3.1.0.tgz"; + sha1 = "8ff71d51053cd5ee4981e5a501d80a536244f7fd"; + }; + } + { + name = "_cnakazawa_watch___watch_1.0.3.tgz"; + path = fetchurl { + name = "_cnakazawa_watch___watch_1.0.3.tgz"; + url = "https://registry.yarnpkg.com/@cnakazawa/watch/-/watch-1.0.3.tgz"; + sha1 = "099139eaec7ebf07a27c1786a3ff64f39464d2ef"; + }; + } + { + name = "_gitlab_eslint_config___eslint_config_1.6.0.tgz"; + path = fetchurl { + name = "_gitlab_eslint_config___eslint_config_1.6.0.tgz"; + url = "https://registry.yarnpkg.com/@gitlab/eslint-config/-/eslint-config-1.6.0.tgz"; + sha1 = "1fd247d6ab477d53d4c330e05f007e3afa303689"; + }; + } + { + name = "_gitlab_eslint_plugin_i18n___eslint_plugin_i18n_1.1.0.tgz"; + path = fetchurl { + name = "_gitlab_eslint_plugin_i18n___eslint_plugin_i18n_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/@gitlab/eslint-plugin-i18n/-/eslint-plugin-i18n-1.1.0.tgz"; + sha1 = "e494d599e644ce3a094ea85f87dbbda41a924c5e"; + }; + } + { + name = "_gitlab_eslint_plugin_vue_i18n___eslint_plugin_vue_i18n_1.2.0.tgz"; + path = fetchurl { + name = "_gitlab_eslint_plugin_vue_i18n___eslint_plugin_vue_i18n_1.2.0.tgz"; + url = "https://registry.yarnpkg.com/@gitlab/eslint-plugin-vue-i18n/-/eslint-plugin-vue-i18n-1.2.0.tgz"; + sha1 = "6dcd8bf6bdd7a31c1c4c2c4114762508af435836"; + }; + } + { + name = "_gitlab_svgs___svgs_1.73.0.tgz"; + path = fetchurl { + name = "_gitlab_svgs___svgs_1.73.0.tgz"; + url = "https://registry.yarnpkg.com/@gitlab/svgs/-/svgs-1.73.0.tgz"; + sha1 = "e44b347e4be77b94474c80cf5c2ee26ca0325c2f"; + }; + } + { + name = "_gitlab_ui___ui_5.25.2.tgz"; + path = fetchurl { + name = "_gitlab_ui___ui_5.25.2.tgz"; + url = "https://registry.yarnpkg.com/@gitlab/ui/-/ui-5.25.2.tgz"; + sha1 = "599954fefcc228d31a398dbe3c1e2287a0fcdb3e"; + }; + } + { + name = "_gitlab_visual_review_tools___visual_review_tools_1.0.1.tgz"; + path = fetchurl { + name = "_gitlab_visual_review_tools___visual_review_tools_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/@gitlab/visual-review-tools/-/visual-review-tools-1.0.1.tgz"; + sha1 = "7e588328ed018d91560633d56865d65b72c3a11b"; + }; + } + { + name = "_gitlab_vue_toasted___vue_toasted_1.2.1.tgz"; + path = fetchurl { + name = "_gitlab_vue_toasted___vue_toasted_1.2.1.tgz"; + url = "https://registry.yarnpkg.com/@gitlab/vue-toasted/-/vue-toasted-1.2.1.tgz"; + sha1 = "f407b5aa710863e5b7f021f4a1f66160331ab263"; + }; + } + { + name = "_jest_console___console_24.7.1.tgz"; + path = fetchurl { + name = "_jest_console___console_24.7.1.tgz"; + url = "https://registry.yarnpkg.com/@jest/console/-/console-24.7.1.tgz"; + sha1 = "32a9e42535a97aedfe037e725bd67e954b459545"; + }; + } + { + name = "_jest_core___core_24.8.0.tgz"; + path = fetchurl { + name = "_jest_core___core_24.8.0.tgz"; + url = "https://registry.yarnpkg.com/@jest/core/-/core-24.8.0.tgz"; + sha1 = "fbbdcd42a41d0d39cddbc9f520c8bab0c33eed5b"; + }; + } + { + name = "_jest_environment___environment_24.8.0.tgz"; + path = fetchurl { + name = "_jest_environment___environment_24.8.0.tgz"; + url = "https://registry.yarnpkg.com/@jest/environment/-/environment-24.8.0.tgz"; + sha1 = "0342261383c776bdd652168f68065ef144af0eac"; + }; + } + { + name = "_jest_fake_timers___fake_timers_24.8.0.tgz"; + path = fetchurl { + name = "_jest_fake_timers___fake_timers_24.8.0.tgz"; + url = "https://registry.yarnpkg.com/@jest/fake-timers/-/fake-timers-24.8.0.tgz"; + sha1 = "2e5b80a4f78f284bcb4bd5714b8e10dd36a8d3d1"; + }; + } + { + name = "_jest_reporters___reporters_24.8.0.tgz"; + path = fetchurl { + name = "_jest_reporters___reporters_24.8.0.tgz"; + url = "https://registry.yarnpkg.com/@jest/reporters/-/reporters-24.8.0.tgz"; + sha1 = "075169cd029bddec54b8f2c0fc489fd0b9e05729"; + }; + } + { + name = "_jest_source_map___source_map_24.3.0.tgz"; + path = fetchurl { + name = "_jest_source_map___source_map_24.3.0.tgz"; + url = "https://registry.yarnpkg.com/@jest/source-map/-/source-map-24.3.0.tgz"; + sha1 = "563be3aa4d224caf65ff77edc95cd1ca4da67f28"; + }; + } + { + name = "_jest_test_result___test_result_24.8.0.tgz"; + path = fetchurl { + name = "_jest_test_result___test_result_24.8.0.tgz"; + url = "https://registry.yarnpkg.com/@jest/test-result/-/test-result-24.8.0.tgz"; + sha1 = "7675d0aaf9d2484caa65e048d9b467d160f8e9d3"; + }; + } + { + name = "_jest_test_sequencer___test_sequencer_24.8.0.tgz"; + path = fetchurl { + name = "_jest_test_sequencer___test_sequencer_24.8.0.tgz"; + url = "https://registry.yarnpkg.com/@jest/test-sequencer/-/test-sequencer-24.8.0.tgz"; + sha1 = "2f993bcf6ef5eb4e65e8233a95a3320248cf994b"; + }; + } + { + name = "_jest_transform___transform_24.8.0.tgz"; + path = fetchurl { + name = "_jest_transform___transform_24.8.0.tgz"; + url = "https://registry.yarnpkg.com/@jest/transform/-/transform-24.8.0.tgz"; + sha1 = "628fb99dce4f9d254c6fd9341e3eea262e06fef5"; + }; + } + { + name = "_jest_types___types_24.8.0.tgz"; + path = fetchurl { + name = "_jest_types___types_24.8.0.tgz"; + url = "https://registry.yarnpkg.com/@jest/types/-/types-24.8.0.tgz"; + sha1 = "f31e25948c58f0abd8c845ae26fcea1491dea7ad"; + }; + } + { + name = "_mrmlnc_readdir_enhanced___readdir_enhanced_2.2.1.tgz"; + path = fetchurl { + name = "_mrmlnc_readdir_enhanced___readdir_enhanced_2.2.1.tgz"; + url = "https://registry.yarnpkg.com/@mrmlnc/readdir-enhanced/-/readdir-enhanced-2.2.1.tgz"; + sha1 = "524af240d1a360527b730475ecfa1344aa540dde"; + }; + } + { + name = "_nodelib_fs.stat___fs.stat_1.1.3.tgz"; + path = fetchurl { + name = "_nodelib_fs.stat___fs.stat_1.1.3.tgz"; + url = "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-1.1.3.tgz"; + sha1 = "2b5a3ab3f918cca48a8c754c08168e3f03eba61b"; + }; + } + { + name = "_nuxt_opencollective___opencollective_0.2.2.tgz"; + path = fetchurl { + name = "_nuxt_opencollective___opencollective_0.2.2.tgz"; + url = "https://registry.yarnpkg.com/@nuxt/opencollective/-/opencollective-0.2.2.tgz"; + sha1 = "17adc7d380457379cd14cbb64a435ea196cc4a6e"; + }; + } + { + name = "_sindresorhus_is___is_0.7.0.tgz"; + path = fetchurl { + name = "_sindresorhus_is___is_0.7.0.tgz"; + url = "https://registry.yarnpkg.com/@sindresorhus/is/-/is-0.7.0.tgz"; + sha1 = "9a06f4f137ee84d7df0460c1fdb1135ffa6c50fd"; + }; + } + { + name = "_types_anymatch___anymatch_1.3.0.tgz"; + path = fetchurl { + name = "_types_anymatch___anymatch_1.3.0.tgz"; + url = "https://registry.yarnpkg.com/@types/anymatch/-/anymatch-1.3.0.tgz"; + sha1 = "d1d55958d1fccc5527d4aba29fc9c4b942f563ff"; + }; + } + { + name = "_types_babel__core___babel__core_7.1.2.tgz"; + path = fetchurl { + name = "_types_babel__core___babel__core_7.1.2.tgz"; + url = "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.1.2.tgz"; + sha1 = "608c74f55928033fce18b99b213c16be4b3d114f"; + }; + } + { + name = "_types_babel__generator___babel__generator_7.0.2.tgz"; + path = fetchurl { + name = "_types_babel__generator___babel__generator_7.0.2.tgz"; + url = "https://registry.yarnpkg.com/@types/babel__generator/-/babel__generator-7.0.2.tgz"; + sha1 = "d2112a6b21fad600d7674274293c85dce0cb47fc"; + }; + } + { + name = "_types_babel__template___babel__template_7.0.2.tgz"; + path = fetchurl { + name = "_types_babel__template___babel__template_7.0.2.tgz"; + url = "https://registry.yarnpkg.com/@types/babel__template/-/babel__template-7.0.2.tgz"; + sha1 = "4ff63d6b52eddac1de7b975a5223ed32ecea9307"; + }; + } + { + name = "_types_babel__traverse___babel__traverse_7.0.6.tgz"; + path = fetchurl { + name = "_types_babel__traverse___babel__traverse_7.0.6.tgz"; + url = "https://registry.yarnpkg.com/@types/babel__traverse/-/babel__traverse-7.0.6.tgz"; + sha1 = "328dd1a8fc4cfe3c8458be9477b219ea158fd7b2"; + }; + } + { + name = "_types_events___events_1.2.0.tgz"; + path = fetchurl { + name = "_types_events___events_1.2.0.tgz"; + url = "https://registry.yarnpkg.com/@types/events/-/events-1.2.0.tgz"; + sha1 = "81a6731ce4df43619e5c8c945383b3e62a89ea86"; + }; + } + { + name = "_types_glob___glob_7.1.1.tgz"; + path = fetchurl { + name = "_types_glob___glob_7.1.1.tgz"; + url = "https://registry.yarnpkg.com/@types/glob/-/glob-7.1.1.tgz"; + sha1 = "aa59a1c6e3fbc421e07ccd31a944c30eba521575"; + }; + } + { + name = "_types_istanbul_lib_coverage___istanbul_lib_coverage_2.0.1.tgz"; + path = fetchurl { + name = "_types_istanbul_lib_coverage___istanbul_lib_coverage_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.1.tgz"; + sha1 = "42995b446db9a48a11a07ec083499a860e9138ff"; + }; + } + { + name = "_types_istanbul_lib_report___istanbul_lib_report_1.1.1.tgz"; + path = fetchurl { + name = "_types_istanbul_lib_report___istanbul_lib_report_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/@types/istanbul-lib-report/-/istanbul-lib-report-1.1.1.tgz"; + sha1 = "e5471e7fa33c61358dd38426189c037a58433b8c"; + }; + } + { + name = "_types_istanbul_reports___istanbul_reports_1.1.1.tgz"; + path = fetchurl { + name = "_types_istanbul_reports___istanbul_reports_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/@types/istanbul-reports/-/istanbul-reports-1.1.1.tgz"; + sha1 = "7a8cbf6a406f36c8add871625b278eaf0b0d255a"; + }; + } + { + name = "_types_jquery___jquery_2.0.48.tgz"; + path = fetchurl { + name = "_types_jquery___jquery_2.0.48.tgz"; + url = "https://registry.yarnpkg.com/@types/jquery/-/jquery-2.0.48.tgz"; + sha1 = "3e90d8cde2d29015e5583017f7830cb3975b2eef"; + }; + } + { + name = "_types_minimatch___minimatch_3.0.3.tgz"; + path = fetchurl { + name = "_types_minimatch___minimatch_3.0.3.tgz"; + url = "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.3.tgz"; + sha1 = "3dca0e3f33b200fc7d1139c0cd96c1268cadfd9d"; + }; + } + { + name = "_types_node___node_10.12.9.tgz"; + path = fetchurl { + name = "_types_node___node_10.12.9.tgz"; + url = "https://registry.yarnpkg.com/@types/node/-/node-10.12.9.tgz"; + sha1 = "a07bfa74331471e1dc22a47eb72026843f7b95c8"; + }; + } + { + name = "_types_parse5___parse5_5.0.0.tgz"; + path = fetchurl { + name = "_types_parse5___parse5_5.0.0.tgz"; + url = "https://registry.yarnpkg.com/@types/parse5/-/parse5-5.0.0.tgz"; + sha1 = "9ae2106efc443d7c1e26570aa8247828c9c80f11"; + }; + } + { + name = "_types_semver___semver_5.5.0.tgz"; + path = fetchurl { + name = "_types_semver___semver_5.5.0.tgz"; + url = "https://registry.yarnpkg.com/@types/semver/-/semver-5.5.0.tgz"; + sha1 = "146c2a29ee7d3bae4bf2fcb274636e264c813c45"; + }; + } + { + name = "_types_stack_utils___stack_utils_1.0.1.tgz"; + path = fetchurl { + name = "_types_stack_utils___stack_utils_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/@types/stack-utils/-/stack-utils-1.0.1.tgz"; + sha1 = "0a851d3bd96498fa25c33ab7278ed3bd65f06c3e"; + }; + } + { + name = "_types_tapable___tapable_1.0.4.tgz"; + path = fetchurl { + name = "_types_tapable___tapable_1.0.4.tgz"; + url = "https://registry.yarnpkg.com/@types/tapable/-/tapable-1.0.4.tgz"; + sha1 = "b4ffc7dc97b498c969b360a41eee247f82616370"; + }; + } + { + name = "_types_uglify_js___uglify_js_3.0.4.tgz"; + path = fetchurl { + name = "_types_uglify_js___uglify_js_3.0.4.tgz"; + url = "https://registry.yarnpkg.com/@types/uglify-js/-/uglify-js-3.0.4.tgz"; + sha1 = "96beae23df6f561862a830b4288a49e86baac082"; + }; + } + { + name = "_types_unist___unist_2.0.3.tgz"; + path = fetchurl { + name = "_types_unist___unist_2.0.3.tgz"; + url = "https://registry.yarnpkg.com/@types/unist/-/unist-2.0.3.tgz"; + sha1 = "9c088679876f374eb5983f150d4787aa6fb32d7e"; + }; + } + { + name = "_types_vfile_message___vfile_message_1.0.1.tgz"; + path = fetchurl { + name = "_types_vfile_message___vfile_message_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/@types/vfile-message/-/vfile-message-1.0.1.tgz"; + sha1 = "e1e9895cc6b36c462d4244e64e6d0b6eaf65355a"; + }; + } + { + name = "_types_vfile___vfile_3.0.2.tgz"; + path = fetchurl { + name = "_types_vfile___vfile_3.0.2.tgz"; + url = "https://registry.yarnpkg.com/@types/vfile/-/vfile-3.0.2.tgz"; + sha1 = "19c18cd232df11ce6fa6ad80259bc86c366b09b9"; + }; + } + { + name = "_types_webpack___webpack_4.4.23.tgz"; + path = fetchurl { + name = "_types_webpack___webpack_4.4.23.tgz"; + url = "https://registry.yarnpkg.com/@types/webpack/-/webpack-4.4.23.tgz"; + sha1 = "059d6f4598cfd65ddee0e2db38317ef989696712"; + }; + } + { + name = "_types_yargs___yargs_12.0.12.tgz"; + path = fetchurl { + name = "_types_yargs___yargs_12.0.12.tgz"; + url = "https://registry.yarnpkg.com/@types/yargs/-/yargs-12.0.12.tgz"; + sha1 = "45dd1d0638e8c8f153e87d296907659296873916"; + }; + } + { + name = "_types_zen_observable___zen_observable_0.8.0.tgz"; + path = fetchurl { + name = "_types_zen_observable___zen_observable_0.8.0.tgz"; + url = "https://registry.yarnpkg.com/@types/zen-observable/-/zen-observable-0.8.0.tgz"; + sha1 = "8b63ab7f1aa5321248aad5ac890a485656dcea4d"; + }; + } + { + name = "_vue_component_compiler_utils___component_compiler_utils_2.6.0.tgz"; + path = fetchurl { + name = "_vue_component_compiler_utils___component_compiler_utils_2.6.0.tgz"; + url = "https://registry.yarnpkg.com/@vue/component-compiler-utils/-/component-compiler-utils-2.6.0.tgz"; + sha1 = "aa46d2a6f7647440b0b8932434d22f12371e543b"; + }; + } + { + name = "_vue_test_utils___test_utils_1.0.0_beta.25.tgz"; + path = fetchurl { + name = "_vue_test_utils___test_utils_1.0.0_beta.25.tgz"; + url = "https://registry.yarnpkg.com/@vue/test-utils/-/test-utils-1.0.0-beta.25.tgz"; + sha1 = "4703076de3076bac42cdd242cd53e6fb8752ed8c"; + }; + } + { + name = "_webassemblyjs_ast___ast_1.7.11.tgz"; + path = fetchurl { + name = "_webassemblyjs_ast___ast_1.7.11.tgz"; + url = "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.7.11.tgz"; + sha1 = "b988582cafbb2b095e8b556526f30c90d057cace"; + }; + } + { + name = "_webassemblyjs_floating_point_hex_parser___floating_point_hex_parser_1.7.11.tgz"; + path = fetchurl { + name = "_webassemblyjs_floating_point_hex_parser___floating_point_hex_parser_1.7.11.tgz"; + url = "https://registry.yarnpkg.com/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.7.11.tgz"; + sha1 = "a69f0af6502eb9a3c045555b1a6129d3d3f2e313"; + }; + } + { + name = "_webassemblyjs_helper_api_error___helper_api_error_1.7.11.tgz"; + path = fetchurl { + name = "_webassemblyjs_helper_api_error___helper_api_error_1.7.11.tgz"; + url = "https://registry.yarnpkg.com/@webassemblyjs/helper-api-error/-/helper-api-error-1.7.11.tgz"; + sha1 = "c7b6bb8105f84039511a2b39ce494f193818a32a"; + }; + } + { + name = "_webassemblyjs_helper_buffer___helper_buffer_1.7.11.tgz"; + path = fetchurl { + name = "_webassemblyjs_helper_buffer___helper_buffer_1.7.11.tgz"; + url = "https://registry.yarnpkg.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.7.11.tgz"; + sha1 = "3122d48dcc6c9456ed982debe16c8f37101df39b"; + }; + } + { + name = "_webassemblyjs_helper_code_frame___helper_code_frame_1.7.11.tgz"; + path = fetchurl { + name = "_webassemblyjs_helper_code_frame___helper_code_frame_1.7.11.tgz"; + url = "https://registry.yarnpkg.com/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.7.11.tgz"; + sha1 = "cf8f106e746662a0da29bdef635fcd3d1248364b"; + }; + } + { + name = "_webassemblyjs_helper_fsm___helper_fsm_1.7.11.tgz"; + path = fetchurl { + name = "_webassemblyjs_helper_fsm___helper_fsm_1.7.11.tgz"; + url = "https://registry.yarnpkg.com/@webassemblyjs/helper-fsm/-/helper-fsm-1.7.11.tgz"; + sha1 = "df38882a624080d03f7503f93e3f17ac5ac01181"; + }; + } + { + name = "_webassemblyjs_helper_module_context___helper_module_context_1.7.11.tgz"; + path = fetchurl { + name = "_webassemblyjs_helper_module_context___helper_module_context_1.7.11.tgz"; + url = "https://registry.yarnpkg.com/@webassemblyjs/helper-module-context/-/helper-module-context-1.7.11.tgz"; + sha1 = "d874d722e51e62ac202476935d649c802fa0e209"; + }; + } + { + name = "_webassemblyjs_helper_wasm_bytecode___helper_wasm_bytecode_1.7.11.tgz"; + path = fetchurl { + name = "_webassemblyjs_helper_wasm_bytecode___helper_wasm_bytecode_1.7.11.tgz"; + url = "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.7.11.tgz"; + sha1 = "dd9a1e817f1c2eb105b4cf1013093cb9f3c9cb06"; + }; + } + { + name = "_webassemblyjs_helper_wasm_section___helper_wasm_section_1.7.11.tgz"; + path = fetchurl { + name = "_webassemblyjs_helper_wasm_section___helper_wasm_section_1.7.11.tgz"; + url = "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.7.11.tgz"; + sha1 = "9c9ac41ecf9fbcfffc96f6d2675e2de33811e68a"; + }; + } + { + name = "_webassemblyjs_ieee754___ieee754_1.7.11.tgz"; + path = fetchurl { + name = "_webassemblyjs_ieee754___ieee754_1.7.11.tgz"; + url = "https://registry.yarnpkg.com/@webassemblyjs/ieee754/-/ieee754-1.7.11.tgz"; + sha1 = "c95839eb63757a31880aaec7b6512d4191ac640b"; + }; + } + { + name = "_webassemblyjs_leb128___leb128_1.7.11.tgz"; + path = fetchurl { + name = "_webassemblyjs_leb128___leb128_1.7.11.tgz"; + url = "https://registry.yarnpkg.com/@webassemblyjs/leb128/-/leb128-1.7.11.tgz"; + sha1 = "d7267a1ee9c4594fd3f7e37298818ec65687db63"; + }; + } + { + name = "_webassemblyjs_utf8___utf8_1.7.11.tgz"; + path = fetchurl { + name = "_webassemblyjs_utf8___utf8_1.7.11.tgz"; + url = "https://registry.yarnpkg.com/@webassemblyjs/utf8/-/utf8-1.7.11.tgz"; + sha1 = "06d7218ea9fdc94a6793aa92208160db3d26ee82"; + }; + } + { + name = "_webassemblyjs_wasm_edit___wasm_edit_1.7.11.tgz"; + path = fetchurl { + name = "_webassemblyjs_wasm_edit___wasm_edit_1.7.11.tgz"; + url = "https://registry.yarnpkg.com/@webassemblyjs/wasm-edit/-/wasm-edit-1.7.11.tgz"; + sha1 = "8c74ca474d4f951d01dbae9bd70814ee22a82005"; + }; + } + { + name = "_webassemblyjs_wasm_gen___wasm_gen_1.7.11.tgz"; + path = fetchurl { + name = "_webassemblyjs_wasm_gen___wasm_gen_1.7.11.tgz"; + url = "https://registry.yarnpkg.com/@webassemblyjs/wasm-gen/-/wasm-gen-1.7.11.tgz"; + sha1 = "9bbba942f22375686a6fb759afcd7ac9c45da1a8"; + }; + } + { + name = "_webassemblyjs_wasm_opt___wasm_opt_1.7.11.tgz"; + path = fetchurl { + name = "_webassemblyjs_wasm_opt___wasm_opt_1.7.11.tgz"; + url = "https://registry.yarnpkg.com/@webassemblyjs/wasm-opt/-/wasm-opt-1.7.11.tgz"; + sha1 = "b331e8e7cef8f8e2f007d42c3a36a0580a7d6ca7"; + }; + } + { + name = "_webassemblyjs_wasm_parser___wasm_parser_1.7.11.tgz"; + path = fetchurl { + name = "_webassemblyjs_wasm_parser___wasm_parser_1.7.11.tgz"; + url = "https://registry.yarnpkg.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.7.11.tgz"; + sha1 = "6e3d20fa6a3519f6b084ef9391ad58211efb0a1a"; + }; + } + { + name = "_webassemblyjs_wast_parser___wast_parser_1.7.11.tgz"; + path = fetchurl { + name = "_webassemblyjs_wast_parser___wast_parser_1.7.11.tgz"; + url = "https://registry.yarnpkg.com/@webassemblyjs/wast-parser/-/wast-parser-1.7.11.tgz"; + sha1 = "25bd117562ca8c002720ff8116ef9072d9ca869c"; + }; + } + { + name = "_webassemblyjs_wast_printer___wast_printer_1.7.11.tgz"; + path = fetchurl { + name = "_webassemblyjs_wast_printer___wast_printer_1.7.11.tgz"; + url = "https://registry.yarnpkg.com/@webassemblyjs/wast-printer/-/wast-printer-1.7.11.tgz"; + sha1 = "c4245b6de242cb50a2cc950174fdbf65c78d7813"; + }; + } + { + name = "_xtuc_ieee754___ieee754_1.2.0.tgz"; + path = fetchurl { + name = "_xtuc_ieee754___ieee754_1.2.0.tgz"; + url = "https://registry.yarnpkg.com/@xtuc/ieee754/-/ieee754-1.2.0.tgz"; + sha1 = "eef014a3145ae477a1cbc00cd1e552336dceb790"; + }; + } + { + name = "_xtuc_long___long_4.2.1.tgz"; + path = fetchurl { + name = "_xtuc_long___long_4.2.1.tgz"; + url = "https://registry.yarnpkg.com/@xtuc/long/-/long-4.2.1.tgz"; + sha1 = "5c85d662f76fa1d34575766c5dcd6615abcd30d8"; + }; + } + { + name = "_yarnpkg_lockfile___lockfile_1.1.0.tgz"; + path = fetchurl { + name = "_yarnpkg_lockfile___lockfile_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/@yarnpkg/lockfile/-/lockfile-1.1.0.tgz"; + sha1 = "e77a97fbd345b76d83245edcd17d393b1b41fb31"; + }; + } + { + name = "JSONStream___JSONStream_1.3.5.tgz"; + path = fetchurl { + name = "JSONStream___JSONStream_1.3.5.tgz"; + url = "https://registry.yarnpkg.com/JSONStream/-/JSONStream-1.3.5.tgz"; + sha1 = "3208c1f08d3a4d99261ab64f92302bc15e111ca0"; + }; + } + { + name = "abab___abab_2.0.0.tgz"; + path = fetchurl { + name = "abab___abab_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/abab/-/abab-2.0.0.tgz"; + sha1 = "aba0ab4c5eee2d4c79d3487d85450fb2376ebb0f"; + }; + } + { + name = "abbrev___abbrev_1.0.9.tgz"; + path = fetchurl { + name = "abbrev___abbrev_1.0.9.tgz"; + url = "https://registry.yarnpkg.com/abbrev/-/abbrev-1.0.9.tgz"; + sha1 = "91b4792588a7738c25f35dd6f63752a2f8776135"; + }; + } + { + name = "accepts___accepts_1.3.5.tgz"; + path = fetchurl { + name = "accepts___accepts_1.3.5.tgz"; + url = "https://registry.yarnpkg.com/accepts/-/accepts-1.3.5.tgz"; + sha1 = "eb777df6011723a3b14e8a72c0805c8e86746bd2"; + }; + } + { + name = "acorn_dynamic_import___acorn_dynamic_import_4.0.0.tgz"; + path = fetchurl { + name = "acorn_dynamic_import___acorn_dynamic_import_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/acorn-dynamic-import/-/acorn-dynamic-import-4.0.0.tgz"; + sha1 = "482210140582a36b83c3e342e1cfebcaa9240948"; + }; + } + { + name = "acorn_globals___acorn_globals_4.3.0.tgz"; + path = fetchurl { + name = "acorn_globals___acorn_globals_4.3.0.tgz"; + url = "https://registry.yarnpkg.com/acorn-globals/-/acorn-globals-4.3.0.tgz"; + sha1 = "e3b6f8da3c1552a95ae627571f7dd6923bb54103"; + }; + } + { + name = "acorn_jsx___acorn_jsx_5.0.1.tgz"; + path = fetchurl { + name = "acorn_jsx___acorn_jsx_5.0.1.tgz"; + url = "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.0.1.tgz"; + sha1 = "32a064fd925429216a09b141102bfdd185fae40e"; + }; + } + { + name = "acorn_walk___acorn_walk_6.2.0.tgz"; + path = fetchurl { + name = "acorn_walk___acorn_walk_6.2.0.tgz"; + url = "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-6.2.0.tgz"; + sha1 = "123cb8f3b84c2171f1f7fb252615b1c78a6b1a8c"; + }; + } + { + name = "acorn___acorn_5.7.3.tgz"; + path = fetchurl { + name = "acorn___acorn_5.7.3.tgz"; + url = "https://registry.yarnpkg.com/acorn/-/acorn-5.7.3.tgz"; + sha1 = "67aa231bf8812974b85235a96771eb6bd07ea279"; + }; + } + { + name = "acorn___acorn_6.2.1.tgz"; + path = fetchurl { + name = "acorn___acorn_6.2.1.tgz"; + url = "https://registry.yarnpkg.com/acorn/-/acorn-6.2.1.tgz"; + sha1 = "3ed8422d6dec09e6121cc7a843ca86a330a86b51"; + }; + } + { + name = "after___after_0.8.2.tgz"; + path = fetchurl { + name = "after___after_0.8.2.tgz"; + url = "https://registry.yarnpkg.com/after/-/after-0.8.2.tgz"; + sha1 = "fedb394f9f0e02aa9768e702bda23b505fae7e1f"; + }; + } + { + name = "ajv_errors___ajv_errors_1.0.0.tgz"; + path = fetchurl { + name = "ajv_errors___ajv_errors_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/ajv-errors/-/ajv-errors-1.0.0.tgz"; + sha1 = "ecf021fa108fd17dfb5e6b383f2dd233e31ffc59"; + }; + } + { + name = "ajv_keywords___ajv_keywords_3.2.0.tgz"; + path = fetchurl { + name = "ajv_keywords___ajv_keywords_3.2.0.tgz"; + url = "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.2.0.tgz"; + sha1 = "e86b819c602cf8821ad637413698f1dec021847a"; + }; + } + { + name = "ajv___ajv_6.10.2.tgz"; + path = fetchurl { + name = "ajv___ajv_6.10.2.tgz"; + url = "https://registry.yarnpkg.com/ajv/-/ajv-6.10.2.tgz"; + sha1 = "d3cea04d6b017b2894ad69040fec8b623eb4bd52"; + }; + } + { + name = "amdefine___amdefine_1.0.1.tgz"; + path = fetchurl { + name = "amdefine___amdefine_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/amdefine/-/amdefine-1.0.1.tgz"; + sha1 = "4a5282ac164729e93619bcfd3ad151f817ce91f5"; + }; + } + { + name = "ansi_align___ansi_align_2.0.0.tgz"; + path = fetchurl { + name = "ansi_align___ansi_align_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/ansi-align/-/ansi-align-2.0.0.tgz"; + sha1 = "c36aeccba563b89ceb556f3690f0b1d9e3547f7f"; + }; + } + { + name = "ansi_colors___ansi_colors_3.2.4.tgz"; + path = fetchurl { + name = "ansi_colors___ansi_colors_3.2.4.tgz"; + url = "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-3.2.4.tgz"; + sha1 = "e3a3da4bfbae6c86a9c285625de124a234026fbf"; + }; + } + { + name = "ansi_escapes___ansi_escapes_3.2.0.tgz"; + path = fetchurl { + name = "ansi_escapes___ansi_escapes_3.2.0.tgz"; + url = "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-3.2.0.tgz"; + sha1 = "8780b98ff9dbf5638152d1f1fe5c1d7b4442976b"; + }; + } + { + name = "ansi_html___ansi_html_0.0.7.tgz"; + path = fetchurl { + name = "ansi_html___ansi_html_0.0.7.tgz"; + url = "https://registry.yarnpkg.com/ansi-html/-/ansi-html-0.0.7.tgz"; + sha1 = "813584021962a9e9e6fd039f940d12f56ca7859e"; + }; + } + { + name = "ansi_regex___ansi_regex_2.1.1.tgz"; + path = fetchurl { + name = "ansi_regex___ansi_regex_2.1.1.tgz"; + url = "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz"; + sha1 = "c3b33ab5ee360d86e0e628f0468ae7ef27d654df"; + }; + } + { + name = "ansi_regex___ansi_regex_3.0.0.tgz"; + path = fetchurl { + name = "ansi_regex___ansi_regex_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-3.0.0.tgz"; + sha1 = "ed0317c322064f79466c02966bddb605ab37d998"; + }; + } + { + 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_styles___ansi_styles_2.2.1.tgz"; + path = fetchurl { + name = "ansi_styles___ansi_styles_2.2.1.tgz"; + url = "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz"; + sha1 = "b432dd3358b634cf75e1e4664368240533c1ddbe"; + }; + } + { + 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 = "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.0.3.tgz"; + path = fetchurl { + name = "anymatch___anymatch_3.0.3.tgz"; + url = "https://registry.yarnpkg.com/anymatch/-/anymatch-3.0.3.tgz"; + sha1 = "2fb624fe0e84bccab00afee3d0006ed310f22f09"; + }; + } + { + name = "apollo_cache_inmemory___apollo_cache_inmemory_1.5.1.tgz"; + path = fetchurl { + name = "apollo_cache_inmemory___apollo_cache_inmemory_1.5.1.tgz"; + url = "https://registry.yarnpkg.com/apollo-cache-inmemory/-/apollo-cache-inmemory-1.5.1.tgz"; + sha1 = "265d1ee67b0bf0aca9c37629d410bfae44e62953"; + }; + } + { + name = "apollo_cache___apollo_cache_1.2.1.tgz"; + path = fetchurl { + name = "apollo_cache___apollo_cache_1.2.1.tgz"; + url = "https://registry.yarnpkg.com/apollo-cache/-/apollo-cache-1.2.1.tgz"; + sha1 = "aae71eb4a11f1f7322adc343f84b1a39b0693644"; + }; + } + { + name = "apollo_client___apollo_client_2.5.1.tgz"; + path = fetchurl { + name = "apollo_client___apollo_client_2.5.1.tgz"; + url = "https://registry.yarnpkg.com/apollo-client/-/apollo-client-2.5.1.tgz"; + sha1 = "36126ed1d32edd79c3713c6684546a3bea80e6d1"; + }; + } + { + name = "apollo_link_batch_http___apollo_link_batch_http_1.2.11.tgz"; + path = fetchurl { + name = "apollo_link_batch_http___apollo_link_batch_http_1.2.11.tgz"; + url = "https://registry.yarnpkg.com/apollo-link-batch-http/-/apollo-link-batch-http-1.2.11.tgz"; + sha1 = "ae42dbcc02820658e1e267d05bf2aae7ac208088"; + }; + } + { + name = "apollo_link_batch___apollo_link_batch_1.1.12.tgz"; + path = fetchurl { + name = "apollo_link_batch___apollo_link_batch_1.1.12.tgz"; + url = "https://registry.yarnpkg.com/apollo-link-batch/-/apollo-link-batch-1.1.12.tgz"; + sha1 = "64eb231082f182b0395ef7ab903600627f6c7fe8"; + }; + } + { + name = "apollo_link_dedup___apollo_link_dedup_1.0.10.tgz"; + path = fetchurl { + name = "apollo_link_dedup___apollo_link_dedup_1.0.10.tgz"; + url = "https://registry.yarnpkg.com/apollo-link-dedup/-/apollo-link-dedup-1.0.10.tgz"; + sha1 = "7b94589fe7f969777efd18a129043c78430800ae"; + }; + } + { + name = "apollo_link_http_common___apollo_link_http_common_0.2.13.tgz"; + path = fetchurl { + name = "apollo_link_http_common___apollo_link_http_common_0.2.13.tgz"; + url = "https://registry.yarnpkg.com/apollo-link-http-common/-/apollo-link-http-common-0.2.13.tgz"; + sha1 = "c688f6baaffdc7b269b2db7ae89dae7c58b5b350"; + }; + } + { + name = "apollo_link___apollo_link_1.2.11.tgz"; + path = fetchurl { + name = "apollo_link___apollo_link_1.2.11.tgz"; + url = "https://registry.yarnpkg.com/apollo-link/-/apollo-link-1.2.11.tgz"; + sha1 = "493293b747ad3237114ccd22e9f559e5e24a194d"; + }; + } + { + name = "apollo_upload_client___apollo_upload_client_10.0.0.tgz"; + path = fetchurl { + name = "apollo_upload_client___apollo_upload_client_10.0.0.tgz"; + url = "https://registry.yarnpkg.com/apollo-upload-client/-/apollo-upload-client-10.0.0.tgz"; + sha1 = "6cc3d0ea2aef40bc237b655f5042809cacee1859"; + }; + } + { + name = "apollo_utilities___apollo_utilities_1.2.1.tgz"; + path = fetchurl { + name = "apollo_utilities___apollo_utilities_1.2.1.tgz"; + url = "https://registry.yarnpkg.com/apollo-utilities/-/apollo-utilities-1.2.1.tgz"; + sha1 = "1c3a1ebf5607d7c8efe7636daaf58e7463b41b3c"; + }; + } + { + name = "append_buffer___append_buffer_1.0.2.tgz"; + path = fetchurl { + name = "append_buffer___append_buffer_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/append-buffer/-/append-buffer-1.0.2.tgz"; + sha1 = "d8220cf466081525efea50614f3de6514dfa58f1"; + }; + } + { + name = "append_transform___append_transform_1.0.0.tgz"; + path = fetchurl { + name = "append_transform___append_transform_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/append-transform/-/append-transform-1.0.0.tgz"; + sha1 = "046a52ae582a228bd72f58acfbe2967c678759ab"; + }; + } + { + name = "aproba___aproba_1.2.0.tgz"; + path = fetchurl { + name = "aproba___aproba_1.2.0.tgz"; + url = "https://registry.yarnpkg.com/aproba/-/aproba-1.2.0.tgz"; + sha1 = "6802e6264efd18c790a1b0d517f0f2627bf2c94a"; + }; + } + { + name = "are_we_there_yet___are_we_there_yet_1.1.5.tgz"; + path = fetchurl { + name = "are_we_there_yet___are_we_there_yet_1.1.5.tgz"; + url = "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz"; + sha1 = "4b35c2944f062a8bfcda66410760350fe9ddfc21"; + }; + } + { + 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_equal___array_equal_1.0.0.tgz"; + path = fetchurl { + name = "array_equal___array_equal_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/array-equal/-/array-equal-1.0.0.tgz"; + sha1 = "8c2a5ef2472fd9ea742b04c77a75093ba2757c93"; + }; + } + { + name = "array_find_index___array_find_index_1.0.2.tgz"; + path = fetchurl { + name = "array_find_index___array_find_index_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/array-find-index/-/array-find-index-1.0.2.tgz"; + sha1 = "df010aa1287e164bbda6f9723b0a96a1ec4187a1"; + }; + } + { + name = "array_find___array_find_1.0.0.tgz"; + path = fetchurl { + name = "array_find___array_find_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/array-find/-/array-find-1.0.0.tgz"; + sha1 = "6c8e286d11ed768327f8e62ecee87353ca3e78b8"; + }; + } + { + name = "array_flatten___array_flatten_1.1.1.tgz"; + path = fetchurl { + name = "array_flatten___array_flatten_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/array-flatten/-/array-flatten-1.1.1.tgz"; + sha1 = "9a5f699051b1e7073328f2a008968b64ea2955d2"; + }; + } + { + name = "array_flatten___array_flatten_2.1.1.tgz"; + path = fetchurl { + name = "array_flatten___array_flatten_2.1.1.tgz"; + url = "https://registry.yarnpkg.com/array-flatten/-/array-flatten-2.1.1.tgz"; + sha1 = "426bb9da84090c1838d812c8150af20a8331e296"; + }; + } + { + name = "array_union___array_union_1.0.2.tgz"; + path = fetchurl { + name = "array_union___array_union_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/array-union/-/array-union-1.0.2.tgz"; + sha1 = "9a34410e4f4e3da23dea375be5be70f24778ec39"; + }; + } + { + name = "array_uniq___array_uniq_1.0.3.tgz"; + path = fetchurl { + name = "array_uniq___array_uniq_1.0.3.tgz"; + url = "https://registry.yarnpkg.com/array-uniq/-/array-uniq-1.0.3.tgz"; + sha1 = "af6ac877a25cc7f74e058894753858dfdb24fdb6"; + }; + } + { + 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 = "arraybuffer.slice___arraybuffer.slice_0.0.7.tgz"; + path = fetchurl { + name = "arraybuffer.slice___arraybuffer.slice_0.0.7.tgz"; + url = "https://registry.yarnpkg.com/arraybuffer.slice/-/arraybuffer.slice-0.0.7.tgz"; + sha1 = "3bbc4275dd584cc1b10809b89d4e8b63a69e7675"; + }; + } + { + name = "arrify___arrify_1.0.1.tgz"; + path = fetchurl { + name = "arrify___arrify_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/arrify/-/arrify-1.0.1.tgz"; + sha1 = "898508da2226f380df904728456849c1501a4b0d"; + }; + } + { + name = "asn1.js___asn1.js_4.10.1.tgz"; + path = fetchurl { + name = "asn1.js___asn1.js_4.10.1.tgz"; + url = "https://registry.yarnpkg.com/asn1.js/-/asn1.js-4.10.1.tgz"; + sha1 = "b9c2bf5805f1e64aadeed6df3a2bfafb5a73f5a0"; + }; + } + { + 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 = "assert___assert_1.4.1.tgz"; + path = fetchurl { + name = "assert___assert_1.4.1.tgz"; + url = "https://registry.yarnpkg.com/assert/-/assert-1.4.1.tgz"; + sha1 = "99912d591836b5a6f5b345c0f07eefc08fc65d91"; + }; + } + { + 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_each___async_each_1.0.1.tgz"; + path = fetchurl { + name = "async_each___async_each_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/async-each/-/async-each-1.0.1.tgz"; + sha1 = "19d386a1d9edc6e7c1c85d388aedbcc56d33602d"; + }; + } + { + name = "async_foreach___async_foreach_0.1.3.tgz"; + path = fetchurl { + name = "async_foreach___async_foreach_0.1.3.tgz"; + url = "https://registry.yarnpkg.com/async-foreach/-/async-foreach-0.1.3.tgz"; + sha1 = "36121f845c0578172de419a97dbeb1d16ec34542"; + }; + } + { + name = "async_limiter___async_limiter_1.0.0.tgz"; + path = fetchurl { + name = "async_limiter___async_limiter_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/async-limiter/-/async-limiter-1.0.0.tgz"; + sha1 = "78faed8c3d074ab81f22b4e985d79e8738f720f8"; + }; + } + { + name = "async___async_1.5.2.tgz"; + path = fetchurl { + name = "async___async_1.5.2.tgz"; + url = "https://registry.yarnpkg.com/async/-/async-1.5.2.tgz"; + sha1 = "ec6a61ae56480c0c3cb241c95618e20892f9672a"; + }; + } + { + name = "async___async_2.6.3.tgz"; + path = fetchurl { + name = "async___async_2.6.3.tgz"; + url = "https://registry.yarnpkg.com/async/-/async-2.6.3.tgz"; + sha1 = "d72625e2344a3656e3a3ad4fa749fa83299d82ff"; + }; + } + { + 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.js___at.js_1.5.4.tgz"; + path = fetchurl { + name = "at.js___at.js_1.5.4.tgz"; + url = "https://registry.yarnpkg.com/at.js/-/at.js-1.5.4.tgz"; + sha1 = "8fc60cc80eadbe4874449b166a818e7ae1d784c1"; + }; + } + { + 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 = "autoprefixer___autoprefixer_9.6.1.tgz"; + path = fetchurl { + name = "autoprefixer___autoprefixer_9.6.1.tgz"; + url = "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-9.6.1.tgz"; + sha1 = "51967a02d2d2300bb01866c1611ec8348d355a47"; + }; + } + { + name = "autosize___autosize_4.0.0.tgz"; + path = fetchurl { + name = "autosize___autosize_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/autosize/-/autosize-4.0.0.tgz"; + sha1 = "7a0599b1ba84d73bd7589b0d9da3870152c69237"; + }; + } + { + name = "aws_sdk___aws_sdk_2.526.0.tgz"; + path = fetchurl { + name = "aws_sdk___aws_sdk_2.526.0.tgz"; + url = "https://registry.yarnpkg.com/aws-sdk/-/aws-sdk-2.526.0.tgz"; + sha1 = "e0f899be59edb7d50eb8cca7978bcd401a5d48c2"; + }; + } + { + 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.8.0.tgz"; + path = fetchurl { + name = "aws4___aws4_1.8.0.tgz"; + url = "https://registry.yarnpkg.com/aws4/-/aws4-1.8.0.tgz"; + sha1 = "f0e003d9ca9e7f59c7a508945d7b2ef9a04a542f"; + }; + } + { + name = "axios_mock_adapter___axios_mock_adapter_1.15.0.tgz"; + path = fetchurl { + name = "axios_mock_adapter___axios_mock_adapter_1.15.0.tgz"; + url = "https://registry.yarnpkg.com/axios-mock-adapter/-/axios-mock-adapter-1.15.0.tgz"; + sha1 = "fbc06825d8302c95c3334d21023bba996255d45d"; + }; + } + { + name = "axios___axios_0.19.0.tgz"; + path = fetchurl { + name = "axios___axios_0.19.0.tgz"; + url = "https://registry.yarnpkg.com/axios/-/axios-0.19.0.tgz"; + sha1 = "8e09bff3d9122e133f7b8101c8fbdd00ed3d2ab8"; + }; + } + { + name = "babel_code_frame___babel_code_frame_6.26.0.tgz"; + path = fetchurl { + name = "babel_code_frame___babel_code_frame_6.26.0.tgz"; + url = "https://registry.yarnpkg.com/babel-code-frame/-/babel-code-frame-6.26.0.tgz"; + sha1 = "63fd43f7dc1e3bb7ce35947db8fe369a3f58c74b"; + }; + } + { + name = "babel_eslint___babel_eslint_10.0.1.tgz"; + path = fetchurl { + name = "babel_eslint___babel_eslint_10.0.1.tgz"; + url = "https://registry.yarnpkg.com/babel-eslint/-/babel-eslint-10.0.1.tgz"; + sha1 = "919681dc099614cd7d31d45c8908695092a1faed"; + }; + } + { + name = "babel_jest___babel_jest_24.8.0.tgz"; + path = fetchurl { + name = "babel_jest___babel_jest_24.8.0.tgz"; + url = "https://registry.yarnpkg.com/babel-jest/-/babel-jest-24.8.0.tgz"; + sha1 = "5c15ff2b28e20b0f45df43fe6b7f2aae93dba589"; + }; + } + { + name = "babel_loader___babel_loader_8.0.5.tgz"; + path = fetchurl { + name = "babel_loader___babel_loader_8.0.5.tgz"; + url = "https://registry.yarnpkg.com/babel-loader/-/babel-loader-8.0.5.tgz"; + sha1 = "225322d7509c2157655840bba52e46b6c2f2fe33"; + }; + } + { + name = "babel_plugin_dynamic_import_node___babel_plugin_dynamic_import_node_2.3.0.tgz"; + path = fetchurl { + name = "babel_plugin_dynamic_import_node___babel_plugin_dynamic_import_node_2.3.0.tgz"; + url = "https://registry.yarnpkg.com/babel-plugin-dynamic-import-node/-/babel-plugin-dynamic-import-node-2.3.0.tgz"; + sha1 = "f00f507bdaa3c3e3ff6e7e5e98d90a7acab96f7f"; + }; + } + { + name = "babel_plugin_istanbul___babel_plugin_istanbul_5.1.0.tgz"; + path = fetchurl { + name = "babel_plugin_istanbul___babel_plugin_istanbul_5.1.0.tgz"; + url = "https://registry.yarnpkg.com/babel-plugin-istanbul/-/babel-plugin-istanbul-5.1.0.tgz"; + sha1 = "6892f529eff65a3e2d33d87dc5888ffa2ecd4a30"; + }; + } + { + name = "babel_plugin_jest_hoist___babel_plugin_jest_hoist_24.6.0.tgz"; + path = fetchurl { + name = "babel_plugin_jest_hoist___babel_plugin_jest_hoist_24.6.0.tgz"; + url = "https://registry.yarnpkg.com/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-24.6.0.tgz"; + sha1 = "f7f7f7ad150ee96d7a5e8e2c5da8319579e78019"; + }; + } + { + name = "babel_plugin_rewire___babel_plugin_rewire_1.2.0.tgz"; + path = fetchurl { + name = "babel_plugin_rewire___babel_plugin_rewire_1.2.0.tgz"; + url = "https://registry.yarnpkg.com/babel-plugin-rewire/-/babel-plugin-rewire-1.2.0.tgz"; + sha1 = "822562d72ed2c84e47c0f95ee232c920853e9d89"; + }; + } + { + name = "babel_preset_jest___babel_preset_jest_24.6.0.tgz"; + path = fetchurl { + name = "babel_preset_jest___babel_preset_jest_24.6.0.tgz"; + url = "https://registry.yarnpkg.com/babel-preset-jest/-/babel-preset-jest-24.6.0.tgz"; + sha1 = "66f06136eefce87797539c0d63f1769cc3915984"; + }; + } + { + name = "babelify___babelify_10.0.0.tgz"; + path = fetchurl { + name = "babelify___babelify_10.0.0.tgz"; + url = "https://registry.yarnpkg.com/babelify/-/babelify-10.0.0.tgz"; + sha1 = "fe73b1a22583f06680d8d072e25a1e0d1d1d7fb5"; + }; + } + { + name = "babylon___babylon_7.0.0_beta.19.tgz"; + path = fetchurl { + name = "babylon___babylon_7.0.0_beta.19.tgz"; + url = "https://registry.yarnpkg.com/babylon/-/babylon-7.0.0-beta.19.tgz"; + sha1 = "e928c7e807e970e0536b078ab3e0c48f9e052503"; + }; + } + { + name = "backo2___backo2_1.0.2.tgz"; + path = fetchurl { + name = "backo2___backo2_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/backo2/-/backo2-1.0.2.tgz"; + sha1 = "31ab1ac8b129363463e35b3ebb69f4dfcfba7947"; + }; + } + { + name = "bail___bail_1.0.3.tgz"; + path = fetchurl { + name = "bail___bail_1.0.3.tgz"; + url = "https://registry.yarnpkg.com/bail/-/bail-1.0.3.tgz"; + sha1 = "63cfb9ddbac829b02a3128cd53224be78e6c21a3"; + }; + } + { + 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_arraybuffer___base64_arraybuffer_0.1.5.tgz"; + path = fetchurl { + name = "base64_arraybuffer___base64_arraybuffer_0.1.5.tgz"; + url = "https://registry.yarnpkg.com/base64-arraybuffer/-/base64-arraybuffer-0.1.5.tgz"; + sha1 = "73926771923b5a19747ad666aa5cd4bf9c6e9ce8"; + }; + } + { + name = "base64_js___base64_js_1.2.3.tgz"; + path = fetchurl { + name = "base64_js___base64_js_1.2.3.tgz"; + url = "https://registry.yarnpkg.com/base64-js/-/base64-js-1.2.3.tgz"; + sha1 = "fb13668233d9614cf5fb4bce95a9ba4096cdf801"; + }; + } + { + name = "base64id___base64id_1.0.0.tgz"; + path = fetchurl { + name = "base64id___base64id_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/base64id/-/base64id-1.0.0.tgz"; + sha1 = "47688cb99bb6804f0e06d3e763b1c32e57d8e6b6"; + }; + } + { + 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 = "batch___batch_0.6.1.tgz"; + path = fetchurl { + name = "batch___batch_0.6.1.tgz"; + url = "https://registry.yarnpkg.com/batch/-/batch-0.6.1.tgz"; + sha1 = "dc34314f4e679318093fc760272525f94bf25c16"; + }; + } + { + 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 = "better_assert___better_assert_1.0.2.tgz"; + path = fetchurl { + name = "better_assert___better_assert_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/better-assert/-/better-assert-1.0.2.tgz"; + sha1 = "40866b9e1b9e0b55b481894311e68faffaebc522"; + }; + } + { + name = "bfj___bfj_6.1.1.tgz"; + path = fetchurl { + name = "bfj___bfj_6.1.1.tgz"; + url = "https://registry.yarnpkg.com/bfj/-/bfj-6.1.1.tgz"; + sha1 = "05a3b7784fbd72cfa3c22e56002ef99336516c48"; + }; + } + { + name = "big.js___big.js_5.2.2.tgz"; + path = fetchurl { + name = "big.js___big.js_5.2.2.tgz"; + url = "https://registry.yarnpkg.com/big.js/-/big.js-5.2.2.tgz"; + sha1 = "65f0af382f578bcdc742bd9c281e9cb2d7768328"; + }; + } + { + name = "binary_extensions___binary_extensions_1.11.0.tgz"; + path = fetchurl { + name = "binary_extensions___binary_extensions_1.11.0.tgz"; + url = "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-1.11.0.tgz"; + sha1 = "46aa1751fb6a2f93ee5e689bb1087d4b14c6c205"; + }; + } + { + name = "binary_extensions___binary_extensions_2.0.0.tgz"; + path = fetchurl { + name = "binary_extensions___binary_extensions_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-2.0.0.tgz"; + sha1 = "23c0df14f6a88077f5f986c0d167ec03c3d5537c"; + }; + } + { + name = "binaryextensions___binaryextensions_2.1.1.tgz"; + path = fetchurl { + name = "binaryextensions___binaryextensions_2.1.1.tgz"; + url = "https://registry.yarnpkg.com/binaryextensions/-/binaryextensions-2.1.1.tgz"; + sha1 = "3209a51ca4a4ad541a3b8d3d6a6d5b83a2485935"; + }; + } + { + name = "blob___blob_0.0.4.tgz"; + path = fetchurl { + name = "blob___blob_0.0.4.tgz"; + url = "https://registry.yarnpkg.com/blob/-/blob-0.0.4.tgz"; + sha1 = "bcf13052ca54463f30f9fc7e95b9a47630a94921"; + }; + } + { + name = "block_stream___block_stream_0.0.9.tgz"; + path = fetchurl { + name = "block_stream___block_stream_0.0.9.tgz"; + url = "https://registry.yarnpkg.com/block-stream/-/block-stream-0.0.9.tgz"; + sha1 = "13ebfe778a03205cfe03751481ebb4b3300c126a"; + }; + } + { + name = "bluebird___bluebird_3.5.5.tgz"; + path = fetchurl { + name = "bluebird___bluebird_3.5.5.tgz"; + url = "https://registry.yarnpkg.com/bluebird/-/bluebird-3.5.5.tgz"; + sha1 = "a8d0afd73251effbbd5fe384a77d73003c17a71f"; + }; + } + { + name = "bn.js___bn.js_4.11.8.tgz"; + path = fetchurl { + name = "bn.js___bn.js_4.11.8.tgz"; + url = "https://registry.yarnpkg.com/bn.js/-/bn.js-4.11.8.tgz"; + sha1 = "2cde09eb5ee341f484746bb0309b3253b1b1442f"; + }; + } + { + name = "body_parser___body_parser_1.18.2.tgz"; + path = fetchurl { + name = "body_parser___body_parser_1.18.2.tgz"; + url = "https://registry.yarnpkg.com/body-parser/-/body-parser-1.18.2.tgz"; + sha1 = "87678a19d84b47d859b83199bd59bce222b10454"; + }; + } + { + name = "body___body_5.1.0.tgz"; + path = fetchurl { + name = "body___body_5.1.0.tgz"; + url = "https://registry.yarnpkg.com/body/-/body-5.1.0.tgz"; + sha1 = "e4ba0ce410a46936323367609ecb4e6553125069"; + }; + } + { + name = "bonjour___bonjour_3.5.0.tgz"; + path = fetchurl { + name = "bonjour___bonjour_3.5.0.tgz"; + url = "https://registry.yarnpkg.com/bonjour/-/bonjour-3.5.0.tgz"; + sha1 = "8e890a183d8ee9a2393b3844c691a42bcf7bc9f5"; + }; + } + { + name = "bootstrap_vue___bootstrap_vue_2.0.0_rc.27.tgz"; + path = fetchurl { + name = "bootstrap_vue___bootstrap_vue_2.0.0_rc.27.tgz"; + url = "https://registry.yarnpkg.com/bootstrap-vue/-/bootstrap-vue-2.0.0-rc.27.tgz"; + sha1 = "884a46a71948d13c9729134cb564467f79a7b2b9"; + }; + } + { + name = "bootstrap___bootstrap_4.3.1.tgz"; + path = fetchurl { + name = "bootstrap___bootstrap_4.3.1.tgz"; + url = "https://registry.yarnpkg.com/bootstrap/-/bootstrap-4.3.1.tgz"; + sha1 = "280ca8f610504d99d7b6b4bfc4b68cec601704ac"; + }; + } + { + name = "boxen___boxen_1.3.0.tgz"; + path = fetchurl { + name = "boxen___boxen_1.3.0.tgz"; + url = "https://registry.yarnpkg.com/boxen/-/boxen-1.3.0.tgz"; + sha1 = "55c6c39a8ba58d9c61ad22cd877532deb665a20b"; + }; + } + { + name = "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 = "brorand___brorand_1.1.0.tgz"; + path = fetchurl { + name = "brorand___brorand_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/brorand/-/brorand-1.1.0.tgz"; + sha1 = "12c25efe40a45e3c323eb8675a0a0ce57b22371f"; + }; + } + { + name = "browser_process_hrtime___browser_process_hrtime_0.1.3.tgz"; + path = fetchurl { + name = "browser_process_hrtime___browser_process_hrtime_0.1.3.tgz"; + url = "https://registry.yarnpkg.com/browser-process-hrtime/-/browser-process-hrtime-0.1.3.tgz"; + sha1 = "616f00faef1df7ec1b5bf9cfe2bdc3170f26c7b4"; + }; + } + { + name = "browser_resolve___browser_resolve_1.11.3.tgz"; + path = fetchurl { + name = "browser_resolve___browser_resolve_1.11.3.tgz"; + url = "https://registry.yarnpkg.com/browser-resolve/-/browser-resolve-1.11.3.tgz"; + sha1 = "9b7cbb3d0f510e4cb86bdbd796124d28b5890af6"; + }; + } + { + name = "browserify_aes___browserify_aes_1.1.1.tgz"; + path = fetchurl { + name = "browserify_aes___browserify_aes_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/browserify-aes/-/browserify-aes-1.1.1.tgz"; + sha1 = "38b7ab55edb806ff2dcda1a7f1620773a477c49f"; + }; + } + { + name = "browserify_cipher___browserify_cipher_1.0.0.tgz"; + path = fetchurl { + name = "browserify_cipher___browserify_cipher_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/browserify-cipher/-/browserify-cipher-1.0.0.tgz"; + sha1 = "9988244874bf5ed4e28da95666dcd66ac8fc363a"; + }; + } + { + name = "browserify_des___browserify_des_1.0.0.tgz"; + path = fetchurl { + name = "browserify_des___browserify_des_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/browserify-des/-/browserify-des-1.0.0.tgz"; + sha1 = "daa277717470922ed2fe18594118a175439721dd"; + }; + } + { + name = "browserify_rsa___browserify_rsa_4.0.1.tgz"; + path = fetchurl { + name = "browserify_rsa___browserify_rsa_4.0.1.tgz"; + url = "https://registry.yarnpkg.com/browserify-rsa/-/browserify-rsa-4.0.1.tgz"; + sha1 = "21e0abfaf6f2029cf2fafb133567a701d4135524"; + }; + } + { + name = "browserify_sign___browserify_sign_4.0.4.tgz"; + path = fetchurl { + name = "browserify_sign___browserify_sign_4.0.4.tgz"; + url = "https://registry.yarnpkg.com/browserify-sign/-/browserify-sign-4.0.4.tgz"; + sha1 = "aa4eb68e5d7b658baa6bf6a57e630cbd7a93d298"; + }; + } + { + name = "browserify_zlib___browserify_zlib_0.2.0.tgz"; + path = fetchurl { + name = "browserify_zlib___browserify_zlib_0.2.0.tgz"; + url = "https://registry.yarnpkg.com/browserify-zlib/-/browserify-zlib-0.2.0.tgz"; + sha1 = "2869459d9aa3be245fe8fe2ca1f46e2e7f54d73f"; + }; + } + { + name = "browserslist___browserslist_4.6.6.tgz"; + path = fetchurl { + name = "browserslist___browserslist_4.6.6.tgz"; + url = "https://registry.yarnpkg.com/browserslist/-/browserslist-4.6.6.tgz"; + sha1 = "6e4bf467cde520bc9dbdf3747dafa03531cec453"; + }; + } + { + name = "bs_logger___bs_logger_0.2.6.tgz"; + path = fetchurl { + name = "bs_logger___bs_logger_0.2.6.tgz"; + url = "https://registry.yarnpkg.com/bs-logger/-/bs-logger-0.2.6.tgz"; + sha1 = "eb7d365307a72cf974cc6cda76b68354ad336bd8"; + }; + } + { + name = "bser___bser_2.0.0.tgz"; + path = fetchurl { + name = "bser___bser_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/bser/-/bser-2.0.0.tgz"; + sha1 = "9ac78d3ed5d915804fd87acb158bc797147a1719"; + }; + } + { + name = "buffer_equal___buffer_equal_1.0.0.tgz"; + path = fetchurl { + name = "buffer_equal___buffer_equal_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/buffer-equal/-/buffer-equal-1.0.0.tgz"; + sha1 = "59616b498304d556abd466966b22eeda3eca5fbe"; + }; + } + { + 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_indexof___buffer_indexof_1.1.0.tgz"; + path = fetchurl { + name = "buffer_indexof___buffer_indexof_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/buffer-indexof/-/buffer-indexof-1.1.0.tgz"; + sha1 = "f54f647c4f4e25228baa656a2e57e43d5f270982"; + }; + } + { + name = "buffer_shims___buffer_shims_1.0.0.tgz"; + path = fetchurl { + name = "buffer_shims___buffer_shims_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/buffer-shims/-/buffer-shims-1.0.0.tgz"; + sha1 = "9978ce317388c649ad8793028c3477ef044a8b51"; + }; + } + { + name = "buffer_xor___buffer_xor_1.0.3.tgz"; + path = fetchurl { + name = "buffer_xor___buffer_xor_1.0.3.tgz"; + url = "https://registry.yarnpkg.com/buffer-xor/-/buffer-xor-1.0.3.tgz"; + sha1 = "26e61ed1422fb70dd42e6e36729ed51d855fe8d9"; + }; + } + { + name = "buffer___buffer_4.9.1.tgz"; + path = fetchurl { + name = "buffer___buffer_4.9.1.tgz"; + url = "https://registry.yarnpkg.com/buffer/-/buffer-4.9.1.tgz"; + sha1 = "6d1bb601b07a4efced97094132093027c95bc298"; + }; + } + { + name = "builtin_status_codes___builtin_status_codes_3.0.0.tgz"; + path = fetchurl { + name = "builtin_status_codes___builtin_status_codes_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz"; + sha1 = "85982878e21b98e1c66425e03d0174788f569ee8"; + }; + } + { + name = "bytes___bytes_1.0.0.tgz"; + path = fetchurl { + name = "bytes___bytes_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/bytes/-/bytes-1.0.0.tgz"; + sha1 = "3569ede8ba34315fab99c3e92cb04c7220de1fa8"; + }; + } + { + name = "bytes___bytes_3.0.0.tgz"; + path = fetchurl { + name = "bytes___bytes_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/bytes/-/bytes-3.0.0.tgz"; + sha1 = "d32815404d689699f85a4ea4fa8755dd13a96048"; + }; + } + { + name = "cacache___cacache_11.3.3.tgz"; + path = fetchurl { + name = "cacache___cacache_11.3.3.tgz"; + url = "https://registry.yarnpkg.com/cacache/-/cacache-11.3.3.tgz"; + sha1 = "8bd29df8c6a718a6ebd2d010da4d7972ae3bbadc"; + }; + } + { + 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 = "cache_loader___cache_loader_2.0.1.tgz"; + path = fetchurl { + name = "cache_loader___cache_loader_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/cache-loader/-/cache-loader-2.0.1.tgz"; + sha1 = "5758f41a62d7c23941e3c3c7016e6faeb03acb07"; + }; + } + { + name = "cacheable_request___cacheable_request_2.1.4.tgz"; + path = fetchurl { + name = "cacheable_request___cacheable_request_2.1.4.tgz"; + url = "https://registry.yarnpkg.com/cacheable-request/-/cacheable-request-2.1.4.tgz"; + sha1 = "0d808801b6342ad33c91df9d0b44dc09b91e5c3d"; + }; + } + { + name = "cached_path_relative___cached_path_relative_1.0.2.tgz"; + path = fetchurl { + name = "cached_path_relative___cached_path_relative_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/cached-path-relative/-/cached-path-relative-1.0.2.tgz"; + sha1 = "a13df4196d26776220cc3356eb147a52dba2c6db"; + }; + } + { + name = "call_me_maybe___call_me_maybe_1.0.1.tgz"; + path = fetchurl { + name = "call_me_maybe___call_me_maybe_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/call-me-maybe/-/call-me-maybe-1.0.1.tgz"; + sha1 = "26d208ea89e37b5cbde60250a15f031c16a4d66b"; + }; + } + { + name = "caller_callsite___caller_callsite_2.0.0.tgz"; + path = fetchurl { + name = "caller_callsite___caller_callsite_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/caller-callsite/-/caller-callsite-2.0.0.tgz"; + sha1 = "847e0fce0a223750a9a027c54b33731ad3154134"; + }; + } + { + name = "caller_path___caller_path_0.1.0.tgz"; + path = fetchurl { + name = "caller_path___caller_path_0.1.0.tgz"; + url = "https://registry.yarnpkg.com/caller-path/-/caller-path-0.1.0.tgz"; + sha1 = "94085ef63581ecd3daa92444a8fe94e82577751f"; + }; + } + { + name = "caller_path___caller_path_2.0.0.tgz"; + path = fetchurl { + name = "caller_path___caller_path_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/caller-path/-/caller-path-2.0.0.tgz"; + sha1 = "468f83044e369ab2010fac5f06ceee15bb2cb1f4"; + }; + } + { + name = "callsite___callsite_1.0.0.tgz"; + path = fetchurl { + name = "callsite___callsite_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/callsite/-/callsite-1.0.0.tgz"; + sha1 = "280398e5d664bd74038b6f0905153e6e8af1bc20"; + }; + } + { + name = "callsites___callsites_0.2.0.tgz"; + path = fetchurl { + name = "callsites___callsites_0.2.0.tgz"; + url = "https://registry.yarnpkg.com/callsites/-/callsites-0.2.0.tgz"; + sha1 = "afab96262910a7f33c19a5775825c69f34e350ca"; + }; + } + { + name = "callsites___callsites_2.0.0.tgz"; + path = fetchurl { + name = "callsites___callsites_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/callsites/-/callsites-2.0.0.tgz"; + sha1 = "06eb84f00eea413da86affefacbffb36093b3c50"; + }; + } + { + name = "callsites___callsites_3.0.0.tgz"; + path = fetchurl { + name = "callsites___callsites_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/callsites/-/callsites-3.0.0.tgz"; + sha1 = "fb7eb569b72ad7a45812f93fd9430a3e410b3dd3"; + }; + } + { + name = "camel_case___camel_case_3.0.0.tgz"; + path = fetchurl { + name = "camel_case___camel_case_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/camel-case/-/camel-case-3.0.0.tgz"; + sha1 = "ca3c3688a4e9cf3a4cda777dc4dcbc713249cf73"; + }; + } + { + name = "camelcase_keys___camelcase_keys_2.1.0.tgz"; + path = fetchurl { + name = "camelcase_keys___camelcase_keys_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/camelcase-keys/-/camelcase-keys-2.1.0.tgz"; + sha1 = "308beeaffdf28119051efa1d932213c91b8f92e7"; + }; + } + { + name = "camelcase_keys___camelcase_keys_4.2.0.tgz"; + path = fetchurl { + name = "camelcase_keys___camelcase_keys_4.2.0.tgz"; + url = "https://registry.yarnpkg.com/camelcase-keys/-/camelcase-keys-4.2.0.tgz"; + sha1 = "a2aa5fb1af688758259c32c141426d78923b9b77"; + }; + } + { + name = "camelcase___camelcase_2.1.1.tgz"; + path = fetchurl { + name = "camelcase___camelcase_2.1.1.tgz"; + url = "https://registry.yarnpkg.com/camelcase/-/camelcase-2.1.1.tgz"; + sha1 = "7c1d16d679a1bbe59ca02cacecfb011e201f5a1f"; + }; + } + { + name = "camelcase___camelcase_3.0.0.tgz"; + path = fetchurl { + name = "camelcase___camelcase_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/camelcase/-/camelcase-3.0.0.tgz"; + sha1 = "32fc4b9fcdaf845fcdf7e73bb97cac2261f0ab0a"; + }; + } + { + name = "camelcase___camelcase_4.1.0.tgz"; + path = fetchurl { + name = "camelcase___camelcase_4.1.0.tgz"; + url = "https://registry.yarnpkg.com/camelcase/-/camelcase-4.1.0.tgz"; + sha1 = "d545635be1e33c542649c69173e5de6acfae34dd"; + }; + } + { + 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 = "caniuse_lite___caniuse_lite_1.0.30000985.tgz"; + path = fetchurl { + name = "caniuse_lite___caniuse_lite_1.0.30000985.tgz"; + url = "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000985.tgz"; + sha1 = "0eb40f6c8a8c219155cbe43c4975c0efb4a0f77f"; + }; + } + { + 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 = "capture_stack_trace___capture_stack_trace_1.0.0.tgz"; + path = fetchurl { + name = "capture_stack_trace___capture_stack_trace_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/capture-stack-trace/-/capture-stack-trace-1.0.0.tgz"; + sha1 = "4a6fa07399c26bba47f0b2496b4d0fb408c5550d"; + }; + } + { + name = "caseless___caseless_0.12.0.tgz"; + path = fetchurl { + name = "caseless___caseless_0.12.0.tgz"; + url = "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz"; + sha1 = "1b681c21ff84033c826543090689420d187151dc"; + }; + } + { + name = "catharsis___catharsis_0.8.9.tgz"; + path = fetchurl { + name = "catharsis___catharsis_0.8.9.tgz"; + url = "https://registry.yarnpkg.com/catharsis/-/catharsis-0.8.9.tgz"; + sha1 = "98cc890ca652dd2ef0e70b37925310ff9e90fc8b"; + }; + } + { + name = "ccount___ccount_1.0.3.tgz"; + path = fetchurl { + name = "ccount___ccount_1.0.3.tgz"; + url = "https://registry.yarnpkg.com/ccount/-/ccount-1.0.3.tgz"; + sha1 = "f1cec43f332e2ea5a569fd46f9f5bde4e6102aff"; + }; + } + { + name = "chalk___chalk_1.1.3.tgz"; + path = fetchurl { + name = "chalk___chalk_1.1.3.tgz"; + url = "https://registry.yarnpkg.com/chalk/-/chalk-1.1.3.tgz"; + sha1 = "a8115c55e4a702fe4d150abd3872822a7e09fc98"; + }; + } + { + 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 = "character_entities_html4___character_entities_html4_1.1.2.tgz"; + path = fetchurl { + name = "character_entities_html4___character_entities_html4_1.1.2.tgz"; + url = "https://registry.yarnpkg.com/character-entities-html4/-/character-entities-html4-1.1.2.tgz"; + sha1 = "c44fdde3ce66b52e8d321d6c1bf46101f0150610"; + }; + } + { + name = "character_entities_legacy___character_entities_legacy_1.1.2.tgz"; + path = fetchurl { + name = "character_entities_legacy___character_entities_legacy_1.1.2.tgz"; + url = "https://registry.yarnpkg.com/character-entities-legacy/-/character-entities-legacy-1.1.2.tgz"; + sha1 = "7c6defb81648498222c9855309953d05f4d63a9c"; + }; + } + { + name = "character_entities___character_entities_1.2.2.tgz"; + path = fetchurl { + name = "character_entities___character_entities_1.2.2.tgz"; + url = "https://registry.yarnpkg.com/character-entities/-/character-entities-1.2.2.tgz"; + sha1 = "58c8f371c0774ef0ba9b2aca5f00d8f100e6e363"; + }; + } + { + name = "character_reference_invalid___character_reference_invalid_1.1.2.tgz"; + path = fetchurl { + name = "character_reference_invalid___character_reference_invalid_1.1.2.tgz"; + url = "https://registry.yarnpkg.com/character-reference-invalid/-/character-reference-invalid-1.1.2.tgz"; + sha1 = "21e421ad3d84055952dab4a43a04e73cd425d3ed"; + }; + } + { + name = "chardet___chardet_0.5.0.tgz"; + path = fetchurl { + name = "chardet___chardet_0.5.0.tgz"; + url = "https://registry.yarnpkg.com/chardet/-/chardet-0.5.0.tgz"; + sha1 = "fe3ac73c00c3d865ffcc02a0682e2c20b6a06029"; + }; + } + { + name = "charenc___charenc_0.0.2.tgz"; + path = fetchurl { + name = "charenc___charenc_0.0.2.tgz"; + url = "https://registry.yarnpkg.com/charenc/-/charenc-0.0.2.tgz"; + sha1 = "c0a1d2f3a7092e03774bfa83f14c0fc5790a8667"; + }; + } + { + name = "chart.js___chart.js_2.7.2.tgz"; + path = fetchurl { + name = "chart.js___chart.js_2.7.2.tgz"; + url = "https://registry.yarnpkg.com/chart.js/-/chart.js-2.7.2.tgz"; + sha1 = "3c9fde4dc5b95608211bdefeda7e5d33dffa5714"; + }; + } + { + name = "chartjs_color_string___chartjs_color_string_0.5.0.tgz"; + path = fetchurl { + name = "chartjs_color_string___chartjs_color_string_0.5.0.tgz"; + url = "https://registry.yarnpkg.com/chartjs-color-string/-/chartjs-color-string-0.5.0.tgz"; + sha1 = "8d3752d8581d86687c35bfe2cb80ac5213ceb8c1"; + }; + } + { + name = "chartjs_color___chartjs_color_2.2.0.tgz"; + path = fetchurl { + name = "chartjs_color___chartjs_color_2.2.0.tgz"; + url = "https://registry.yarnpkg.com/chartjs-color/-/chartjs-color-2.2.0.tgz"; + sha1 = "84a2fb755787ed85c39dd6dd8c7b1d88429baeae"; + }; + } + { + name = "check_types___check_types_7.3.0.tgz"; + path = fetchurl { + name = "check_types___check_types_7.3.0.tgz"; + url = "https://registry.yarnpkg.com/check-types/-/check-types-7.3.0.tgz"; + sha1 = "468f571a4435c24248f5fd0cb0e8d87c3c341e7d"; + }; + } + { + name = "chokidar___chokidar_2.0.4.tgz"; + path = fetchurl { + name = "chokidar___chokidar_2.0.4.tgz"; + url = "https://registry.yarnpkg.com/chokidar/-/chokidar-2.0.4.tgz"; + sha1 = "356ff4e2b0e8e43e322d18a372460bbcf3accd26"; + }; + } + { + name = "chokidar___chokidar_3.0.2.tgz"; + path = fetchurl { + name = "chokidar___chokidar_3.0.2.tgz"; + url = "https://registry.yarnpkg.com/chokidar/-/chokidar-3.0.2.tgz"; + sha1 = "0d1cd6d04eb2df0327446188cd13736a3367d681"; + }; + } + { + name = "chownr___chownr_1.1.1.tgz"; + path = fetchurl { + name = "chownr___chownr_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/chownr/-/chownr-1.1.1.tgz"; + sha1 = "54726b8b8fff4df053c42187e801fb4412df1494"; + }; + } + { + name = "chrome_trace_event___chrome_trace_event_1.0.0.tgz"; + path = fetchurl { + name = "chrome_trace_event___chrome_trace_event_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/chrome-trace-event/-/chrome-trace-event-1.0.0.tgz"; + sha1 = "45a91bd2c20c9411f0963b5aaeb9a1b95e09cc48"; + }; + } + { + name = "ci_info___ci_info_1.6.0.tgz"; + path = fetchurl { + name = "ci_info___ci_info_1.6.0.tgz"; + url = "https://registry.yarnpkg.com/ci-info/-/ci-info-1.6.0.tgz"; + sha1 = "2ca20dbb9ceb32d4524a683303313f0304b1e497"; + }; + } + { + name = "ci_info___ci_info_2.0.0.tgz"; + path = fetchurl { + 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 = "cipher_base___cipher_base_1.0.4.tgz"; + path = fetchurl { + name = "cipher_base___cipher_base_1.0.4.tgz"; + url = "https://registry.yarnpkg.com/cipher-base/-/cipher-base-1.0.4.tgz"; + sha1 = "8760e4ecc272f4c363532f926d874aae2c1397de"; + }; + } + { + name = "circular_json___circular_json_0.3.3.tgz"; + path = fetchurl { + name = "circular_json___circular_json_0.3.3.tgz"; + url = "https://registry.yarnpkg.com/circular-json/-/circular-json-0.3.3.tgz"; + sha1 = "815c99ea84f6809529d2f45791bdf82711352d66"; + }; + } + { + 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 = "classlist_polyfill___classlist_polyfill_1.2.0.tgz"; + path = fetchurl { + name = "classlist_polyfill___classlist_polyfill_1.2.0.tgz"; + url = "https://registry.yarnpkg.com/classlist-polyfill/-/classlist-polyfill-1.2.0.tgz"; + sha1 = "935bc2dfd9458a876b279617514638bcaa964a2e"; + }; + } + { + name = "clean_css___clean_css_4.2.1.tgz"; + path = fetchurl { + name = "clean_css___clean_css_4.2.1.tgz"; + url = "https://registry.yarnpkg.com/clean-css/-/clean-css-4.2.1.tgz"; + sha1 = "2d411ef76b8569b6d0c84068dabe85b0aa5e5c17"; + }; + } + { + name = "cli_boxes___cli_boxes_1.0.0.tgz"; + path = fetchurl { + name = "cli_boxes___cli_boxes_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/cli-boxes/-/cli-boxes-1.0.0.tgz"; + sha1 = "4fa917c3e59c94a004cd61f8ee509da651687143"; + }; + } + { + name = "cli_cursor___cli_cursor_2.1.0.tgz"; + path = fetchurl { + name = "cli_cursor___cli_cursor_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-2.1.0.tgz"; + sha1 = "b35dac376479facc3e94747d41d0d0f5238ffcb5"; + }; + } + { + name = "cli_width___cli_width_2.1.0.tgz"; + path = fetchurl { + name = "cli_width___cli_width_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/cli-width/-/cli-width-2.1.0.tgz"; + sha1 = "b234ca209b29ef66fc518d9b98d5847b00edf00a"; + }; + } + { + name = "clipboard___clipboard_1.7.1.tgz"; + path = fetchurl { + name = "clipboard___clipboard_1.7.1.tgz"; + url = "https://registry.yarnpkg.com/clipboard/-/clipboard-1.7.1.tgz"; + sha1 = "360d6d6946e99a7a1fef395e42ba92b5e9b5a16b"; + }; + } + { + name = "cliui___cliui_3.2.0.tgz"; + path = fetchurl { + name = "cliui___cliui_3.2.0.tgz"; + url = "https://registry.yarnpkg.com/cliui/-/cliui-3.2.0.tgz"; + sha1 = "120601537a916d29940f934da3b48d585a39213d"; + }; + } + { + name = "cliui___cliui_4.1.0.tgz"; + path = fetchurl { + name = "cliui___cliui_4.1.0.tgz"; + url = "https://registry.yarnpkg.com/cliui/-/cliui-4.1.0.tgz"; + sha1 = "348422dbe82d800b3022eef4f6ac10bf2e4d1b49"; + }; + } + { + name = "clone_buffer___clone_buffer_1.0.0.tgz"; + path = fetchurl { + name = "clone_buffer___clone_buffer_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/clone-buffer/-/clone-buffer-1.0.0.tgz"; + sha1 = "e3e25b207ac4e701af721e2cb5a16792cac3dc58"; + }; + } + { + name = "clone_deep___clone_deep_4.0.1.tgz"; + path = fetchurl { + name = "clone_deep___clone_deep_4.0.1.tgz"; + url = "https://registry.yarnpkg.com/clone-deep/-/clone-deep-4.0.1.tgz"; + sha1 = "c19fd9bdbbf85942b4fd979c84dcf7d5f07c2387"; + }; + } + { + name = "clone_regexp___clone_regexp_2.2.0.tgz"; + path = fetchurl { + name = "clone_regexp___clone_regexp_2.2.0.tgz"; + url = "https://registry.yarnpkg.com/clone-regexp/-/clone-regexp-2.2.0.tgz"; + sha1 = "7d65e00885cd8796405c35a737e7a86b7429e36f"; + }; + } + { + name = "clone_response___clone_response_1.0.2.tgz"; + path = fetchurl { + name = "clone_response___clone_response_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/clone-response/-/clone-response-1.0.2.tgz"; + sha1 = "d1dc973920314df67fbeb94223b4ee350239e96b"; + }; + } + { + name = "clone_stats___clone_stats_1.0.0.tgz"; + path = fetchurl { + name = "clone_stats___clone_stats_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/clone-stats/-/clone-stats-1.0.0.tgz"; + sha1 = "b3782dff8bb5474e18b9b6bf0fdfe782f8777680"; + }; + } + { + name = "clone___clone_2.1.2.tgz"; + path = fetchurl { + name = "clone___clone_2.1.2.tgz"; + url = "https://registry.yarnpkg.com/clone/-/clone-2.1.2.tgz"; + sha1 = "1b7f4b9f591f1e8f83670401600345a02887435f"; + }; + } + { + name = "cloneable_readable___cloneable_readable_1.1.3.tgz"; + path = fetchurl { + name = "cloneable_readable___cloneable_readable_1.1.3.tgz"; + url = "https://registry.yarnpkg.com/cloneable-readable/-/cloneable-readable-1.1.3.tgz"; + sha1 = "120a00cb053bfb63a222e709f9683ea2e11d8cec"; + }; + } + { + 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 = "code_point_at___code_point_at_1.1.0.tgz"; + path = fetchurl { + name = "code_point_at___code_point_at_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz"; + sha1 = "0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77"; + }; + } + { + name = "codesandbox_api___codesandbox_api_0.0.20.tgz"; + path = fetchurl { + name = "codesandbox_api___codesandbox_api_0.0.20.tgz"; + url = "https://registry.yarnpkg.com/codesandbox-api/-/codesandbox-api-0.0.20.tgz"; + sha1 = "174bcd76c9f31521175c6bceabc37da6b1fbc30b"; + }; + } + { + name = "codesandbox_import_util_types___codesandbox_import_util_types_1.2.11.tgz"; + path = fetchurl { + name = "codesandbox_import_util_types___codesandbox_import_util_types_1.2.11.tgz"; + url = "https://registry.yarnpkg.com/codesandbox-import-util-types/-/codesandbox-import-util-types-1.2.11.tgz"; + sha1 = "68e812f21d6b309e9a52eec5cf027c3e63b4c703"; + }; + } + { + name = "codesandbox_import_utils___codesandbox_import_utils_1.2.11.tgz"; + path = fetchurl { + name = "codesandbox_import_utils___codesandbox_import_utils_1.2.11.tgz"; + url = "https://registry.yarnpkg.com/codesandbox-import-utils/-/codesandbox-import-utils-1.2.11.tgz"; + sha1 = "b88423a4a7c785175c784c84e87f5950820280e1"; + }; + } + { + name = "collapse_white_space___collapse_white_space_1.0.5.tgz"; + path = fetchurl { + name = "collapse_white_space___collapse_white_space_1.0.5.tgz"; + url = "https://registry.yarnpkg.com/collapse-white-space/-/collapse-white-space-1.0.5.tgz"; + sha1 = "c2495b699ab1ed380d29a1091e01063e75dbbe3a"; + }; + } + { + 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_0.5.3.tgz"; + path = fetchurl { + name = "color_convert___color_convert_0.5.3.tgz"; + url = "https://registry.yarnpkg.com/color-convert/-/color-convert-0.5.3.tgz"; + sha1 = "bdb6c69ce660fadffe0b0007cc447e1b9f7282bd"; + }; + } + { + name = "color_convert___color_convert_1.9.3.tgz"; + path = fetchurl { + 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_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 = "colors___colors_1.3.3.tgz"; + path = fetchurl { + name = "colors___colors_1.3.3.tgz"; + url = "https://registry.yarnpkg.com/colors/-/colors-1.3.3.tgz"; + sha1 = "39e005d546afe01e01f9c4ca8fa50f686a01205d"; + }; + } + { + name = "combined_stream___combined_stream_1.0.7.tgz"; + path = fetchurl { + name = "combined_stream___combined_stream_1.0.7.tgz"; + url = "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.7.tgz"; + sha1 = "2d1d24317afb8abe95d6d2c0b07b57813539d828"; + }; + } + { + name = "comma_separated_tokens___comma_separated_tokens_1.0.7.tgz"; + path = fetchurl { + name = "comma_separated_tokens___comma_separated_tokens_1.0.7.tgz"; + url = "https://registry.yarnpkg.com/comma-separated-tokens/-/comma-separated-tokens-1.0.7.tgz"; + sha1 = "419cd7fb3258b1ed838dc0953167a25e152f5b59"; + }; + } + { + name = "commander___commander_2.20.0.tgz"; + path = fetchurl { + name = "commander___commander_2.20.0.tgz"; + url = "https://registry.yarnpkg.com/commander/-/commander-2.20.0.tgz"; + sha1 = "d58bb2b5c1ee8f87b0d340027e9e94e222c5a422"; + }; + } + { + name = "commander___commander_2.17.1.tgz"; + path = fetchurl { + name = "commander___commander_2.17.1.tgz"; + url = "https://registry.yarnpkg.com/commander/-/commander-2.17.1.tgz"; + sha1 = "bd77ab7de6de94205ceacc72f1716d29f20a77bf"; + }; + } + { + name = "commander___commander_2.9.0.tgz"; + path = fetchurl { + name = "commander___commander_2.9.0.tgz"; + url = "https://registry.yarnpkg.com/commander/-/commander-2.9.0.tgz"; + sha1 = "9c99094176e12240cb22d6c5146098400fe0f7d4"; + }; + } + { + name = "commondir___commondir_1.0.1.tgz"; + path = fetchurl { + name = "commondir___commondir_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/commondir/-/commondir-1.0.1.tgz"; + sha1 = "ddd800da0c66127393cca5950ea968a3aaf1253b"; + }; + } + { + name = "compare_versions___compare_versions_3.5.1.tgz"; + path = fetchurl { + name = "compare_versions___compare_versions_3.5.1.tgz"; + url = "https://registry.yarnpkg.com/compare-versions/-/compare-versions-3.5.1.tgz"; + sha1 = "26e1f5cf0d48a77eced5046b9f67b6b61075a393"; + }; + } + { + name = "component_bind___component_bind_1.0.0.tgz"; + path = fetchurl { + name = "component_bind___component_bind_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/component-bind/-/component-bind-1.0.0.tgz"; + sha1 = "00c608ab7dcd93897c0009651b1d3a8e1e73bbd1"; + }; + } + { + name = "component_emitter___component_emitter_1.2.1.tgz"; + path = fetchurl { + name = "component_emitter___component_emitter_1.2.1.tgz"; + url = "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.2.1.tgz"; + sha1 = "137918d6d78283f7df7a6b7c5a63e140e69425e6"; + }; + } + { + name = "component_inherit___component_inherit_0.0.3.tgz"; + path = fetchurl { + name = "component_inherit___component_inherit_0.0.3.tgz"; + url = "https://registry.yarnpkg.com/component-inherit/-/component-inherit-0.0.3.tgz"; + sha1 = "645fc4adf58b72b649d5cae65135619db26ff143"; + }; + } + { + name = "compressible___compressible_2.0.15.tgz"; + path = fetchurl { + name = "compressible___compressible_2.0.15.tgz"; + url = "https://registry.yarnpkg.com/compressible/-/compressible-2.0.15.tgz"; + sha1 = "857a9ab0a7e5a07d8d837ed43fe2defff64fe212"; + }; + } + { + name = "compression_webpack_plugin___compression_webpack_plugin_2.0.0.tgz"; + path = fetchurl { + name = "compression_webpack_plugin___compression_webpack_plugin_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/compression-webpack-plugin/-/compression-webpack-plugin-2.0.0.tgz"; + sha1 = "46476350c1eb27f783dccc79ac2f709baa2cffbc"; + }; + } + { + name = "compression___compression_1.7.3.tgz"; + path = fetchurl { + name = "compression___compression_1.7.3.tgz"; + url = "https://registry.yarnpkg.com/compression/-/compression-1.7.3.tgz"; + sha1 = "27e0e176aaf260f7f2c2813c3e440adb9f1993db"; + }; + } + { + 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 = "concat_stream___concat_stream_1.5.2.tgz"; + path = fetchurl { + name = "concat_stream___concat_stream_1.5.2.tgz"; + url = "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.5.2.tgz"; + sha1 = "708978624d856af41a5a741defdd261da752c266"; + }; + } + { + 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_3.1.1.tgz"; + path = fetchurl { + name = "configstore___configstore_3.1.1.tgz"; + url = "https://registry.yarnpkg.com/configstore/-/configstore-3.1.1.tgz"; + sha1 = "094ee662ab83fad9917678de114faaea8fcdca90"; + }; + } + { + name = "connect_history_api_fallback___connect_history_api_fallback_1.3.0.tgz"; + path = fetchurl { + name = "connect_history_api_fallback___connect_history_api_fallback_1.3.0.tgz"; + url = "https://registry.yarnpkg.com/connect-history-api-fallback/-/connect-history-api-fallback-1.3.0.tgz"; + sha1 = "e51d17f8f0ef0db90a64fdb47de3051556e9f169"; + }; + } + { + name = "connect___connect_3.6.6.tgz"; + path = fetchurl { + name = "connect___connect_3.6.6.tgz"; + url = "https://registry.yarnpkg.com/connect/-/connect-3.6.6.tgz"; + sha1 = "09eff6c55af7236e137135a72574858b6786f524"; + }; + } + { + name = "consola___consola_2.9.0.tgz"; + path = fetchurl { + name = "consola___consola_2.9.0.tgz"; + url = "https://registry.yarnpkg.com/consola/-/consola-2.9.0.tgz"; + sha1 = "57760e3a65a53ec27337f4add31505802d902278"; + }; + } + { + name = "console_browserify___console_browserify_1.1.0.tgz"; + path = fetchurl { + name = "console_browserify___console_browserify_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/console-browserify/-/console-browserify-1.1.0.tgz"; + sha1 = "f0241c45730a9fc6323b206dbf38edc741d0bb10"; + }; + } + { + name = "console_control_strings___console_control_strings_1.1.0.tgz"; + path = fetchurl { + name = "console_control_strings___console_control_strings_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz"; + sha1 = "3d7cf4464db6446ea644bf4b39507f9851008e8e"; + }; + } + { + name = "consolidate___consolidate_0.15.1.tgz"; + path = fetchurl { + name = "consolidate___consolidate_0.15.1.tgz"; + url = "https://registry.yarnpkg.com/consolidate/-/consolidate-0.15.1.tgz"; + sha1 = "21ab043235c71a07d45d9aad98593b0dba56bab7"; + }; + } + { + name = "constants_browserify___constants_browserify_1.0.0.tgz"; + path = fetchurl { + name = "constants_browserify___constants_browserify_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/constants-browserify/-/constants-browserify-1.0.0.tgz"; + sha1 = "c20b96d8c617748aaf1c16021760cd27fcb8cb75"; + }; + } + { + name = "contains_path___contains_path_0.1.0.tgz"; + path = fetchurl { + name = "contains_path___contains_path_0.1.0.tgz"; + url = "https://registry.yarnpkg.com/contains-path/-/contains-path-0.1.0.tgz"; + sha1 = "fe8cf184ff6670b6baef01a9d4861a5cbec4120a"; + }; + } + { + name = "content_disposition___content_disposition_0.5.2.tgz"; + path = fetchurl { + name = "content_disposition___content_disposition_0.5.2.tgz"; + url = "https://registry.yarnpkg.com/content-disposition/-/content-disposition-0.5.2.tgz"; + sha1 = "0cf68bb9ddf5f2be7961c3a85178cb85dba78cb4"; + }; + } + { + name = "content_type___content_type_1.0.4.tgz"; + path = fetchurl { + name = "content_type___content_type_1.0.4.tgz"; + url = "https://registry.yarnpkg.com/content-type/-/content-type-1.0.4.tgz"; + sha1 = "e138cc75e040c727b1966fe5e5f8c9aee256fe3b"; + }; + } + { + name = "continuable_cache___continuable_cache_0.3.1.tgz"; + path = fetchurl { + name = "continuable_cache___continuable_cache_0.3.1.tgz"; + url = "https://registry.yarnpkg.com/continuable-cache/-/continuable-cache-0.3.1.tgz"; + sha1 = "bd727a7faed77e71ff3985ac93351a912733ad0f"; + }; + } + { + name = "convert_source_map___convert_source_map_1.6.0.tgz"; + path = fetchurl { + name = "convert_source_map___convert_source_map_1.6.0.tgz"; + url = "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.6.0.tgz"; + sha1 = "51b537a8c43e0f04dec1993bffcdd504e758ac20"; + }; + } + { + name = "cookie_signature___cookie_signature_1.0.6.tgz"; + path = fetchurl { + name = "cookie_signature___cookie_signature_1.0.6.tgz"; + url = "https://registry.yarnpkg.com/cookie-signature/-/cookie-signature-1.0.6.tgz"; + sha1 = "e303a882b342cc3ee8ca513a79999734dab3ae2c"; + }; + } + { + name = "cookie___cookie_0.3.1.tgz"; + path = fetchurl { + name = "cookie___cookie_0.3.1.tgz"; + url = "https://registry.yarnpkg.com/cookie/-/cookie-0.3.1.tgz"; + sha1 = "e7e0a1f9ef43b4c8ba925c5c5a96e806d16873bb"; + }; + } + { + name = "copy_concurrently___copy_concurrently_1.0.5.tgz"; + path = fetchurl { + name = "copy_concurrently___copy_concurrently_1.0.5.tgz"; + url = "https://registry.yarnpkg.com/copy-concurrently/-/copy-concurrently-1.0.5.tgz"; + sha1 = "92297398cae34937fcafd6ec8139c18051f0b5e0"; + }; + } + { + 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 = "copy_to_clipboard___copy_to_clipboard_3.0.8.tgz"; + path = fetchurl { + name = "copy_to_clipboard___copy_to_clipboard_3.0.8.tgz"; + url = "https://registry.yarnpkg.com/copy-to-clipboard/-/copy-to-clipboard-3.0.8.tgz"; + sha1 = "f4e82f4a8830dce4666b7eb8ded0c9bcc313aba9"; + }; + } + { + name = "copy_webpack_plugin___copy_webpack_plugin_5.0.4.tgz"; + path = fetchurl { + name = "copy_webpack_plugin___copy_webpack_plugin_5.0.4.tgz"; + url = "https://registry.yarnpkg.com/copy-webpack-plugin/-/copy-webpack-plugin-5.0.4.tgz"; + sha1 = "c78126f604e24f194c6ec2f43a64e232b5d43655"; + }; + } + { + name = "core_js_compat___core_js_compat_3.1.4.tgz"; + path = fetchurl { + name = "core_js_compat___core_js_compat_3.1.4.tgz"; + url = "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.1.4.tgz"; + sha1 = "e4d0c40fbd01e65b1d457980fe4112d4358a7408"; + }; + } + { + name = "core_js_pure___core_js_pure_3.1.4.tgz"; + path = fetchurl { + name = "core_js_pure___core_js_pure_3.1.4.tgz"; + url = "https://registry.yarnpkg.com/core-js-pure/-/core-js-pure-3.1.4.tgz"; + sha1 = "5fa17dc77002a169a3566cc48dc774d2e13e3769"; + }; + } + { + name = "core_js___core_js_3.1.3.tgz"; + path = fetchurl { + name = "core_js___core_js_3.1.3.tgz"; + url = "https://registry.yarnpkg.com/core-js/-/core-js-3.1.3.tgz"; + sha1 = "95700bca5f248f5f78c0ec63e784eca663ec4138"; + }; + } + { + name = "core_js___core_js_2.3.0.tgz"; + path = fetchurl { + name = "core_js___core_js_2.3.0.tgz"; + url = "https://registry.yarnpkg.com/core-js/-/core-js-2.3.0.tgz"; + sha1 = "fab83fbb0b2d8dc85fa636c4b9d34c75420c6d65"; + }; + } + { + 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 = "cosmiconfig___cosmiconfig_5.2.1.tgz"; + path = fetchurl { + name = "cosmiconfig___cosmiconfig_5.2.1.tgz"; + url = "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-5.2.1.tgz"; + sha1 = "040f726809c591e77a17c0a3626ca45b4f168b1a"; + }; + } + { + name = "create_ecdh___create_ecdh_4.0.0.tgz"; + path = fetchurl { + name = "create_ecdh___create_ecdh_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/create-ecdh/-/create-ecdh-4.0.0.tgz"; + sha1 = "888c723596cdf7612f6498233eebd7a35301737d"; + }; + } + { + name = "create_error_class___create_error_class_3.0.2.tgz"; + path = fetchurl { + name = "create_error_class___create_error_class_3.0.2.tgz"; + url = "https://registry.yarnpkg.com/create-error-class/-/create-error-class-3.0.2.tgz"; + sha1 = "06be7abef947a3f14a30fd610671d401bca8b7b6"; + }; + } + { + name = "create_hash___create_hash_1.1.3.tgz"; + path = fetchurl { + name = "create_hash___create_hash_1.1.3.tgz"; + url = "https://registry.yarnpkg.com/create-hash/-/create-hash-1.1.3.tgz"; + sha1 = "606042ac8b9262750f483caddab0f5819172d8fd"; + }; + } + { + name = "create_hmac___create_hmac_1.1.6.tgz"; + path = fetchurl { + name = "create_hmac___create_hmac_1.1.6.tgz"; + url = "https://registry.yarnpkg.com/create-hmac/-/create-hmac-1.1.6.tgz"; + sha1 = "acb9e221a4e17bdb076e90657c42b93e3726cf06"; + }; + } + { + name = "cropper___cropper_2.3.0.tgz"; + path = fetchurl { + name = "cropper___cropper_2.3.0.tgz"; + url = "https://registry.yarnpkg.com/cropper/-/cropper-2.3.0.tgz"; + sha1 = "607461d4e7aa7a7fe15a26834b14b7f0c2801562"; + }; + } + { + name = "cross_spawn___cross_spawn_3.0.1.tgz"; + path = fetchurl { + name = "cross_spawn___cross_spawn_3.0.1.tgz"; + url = "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-3.0.1.tgz"; + sha1 = "1256037ecb9f0c5f79e3d6ef135e30770184b982"; + }; + } + { + name = "cross_spawn___cross_spawn_5.1.0.tgz"; + path = fetchurl { + name = "cross_spawn___cross_spawn_5.1.0.tgz"; + url = "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-5.1.0.tgz"; + sha1 = "e8bd0efee58fcff6f8f94510a0a554bbfa235449"; + }; + } + { + name = "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 = "crypt___crypt_0.0.2.tgz"; + path = fetchurl { + name = "crypt___crypt_0.0.2.tgz"; + url = "https://registry.yarnpkg.com/crypt/-/crypt-0.0.2.tgz"; + sha1 = "88d7ff7ec0dfb86f713dc87bbb42d044d3e6c41b"; + }; + } + { + name = "crypto_browserify___crypto_browserify_3.12.0.tgz"; + path = fetchurl { + name = "crypto_browserify___crypto_browserify_3.12.0.tgz"; + url = "https://registry.yarnpkg.com/crypto-browserify/-/crypto-browserify-3.12.0.tgz"; + sha1 = "396cf9f3137f03e4b8e532c58f698254e00f80ec"; + }; + } + { + name = "crypto_random_string___crypto_random_string_1.0.0.tgz"; + path = fetchurl { + name = "crypto_random_string___crypto_random_string_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/crypto-random-string/-/crypto-random-string-1.0.0.tgz"; + sha1 = "a230f64f568310e1498009940790ec99545bca7e"; + }; + } + { + name = "css_b64_images___css_b64_images_0.2.5.tgz"; + path = fetchurl { + name = "css_b64_images___css_b64_images_0.2.5.tgz"; + url = "https://registry.yarnpkg.com/css-b64-images/-/css-b64-images-0.2.5.tgz"; + sha1 = "42005d83204b2b4a5d93b6b1a5644133b5927a02"; + }; + } + { + name = "css_loader___css_loader_1.0.1.tgz"; + path = fetchurl { + name = "css_loader___css_loader_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/css-loader/-/css-loader-1.0.1.tgz"; + sha1 = "6885bb5233b35ec47b006057da01cc640b6b79fe"; + }; + } + { + name = "css_selector_parser___css_selector_parser_1.3.0.tgz"; + path = fetchurl { + name = "css_selector_parser___css_selector_parser_1.3.0.tgz"; + url = "https://registry.yarnpkg.com/css-selector-parser/-/css-selector-parser-1.3.0.tgz"; + sha1 = "5f1ad43e2d8eefbfdc304fcd39a521664943e3eb"; + }; + } + { + name = "css_selector_tokenizer___css_selector_tokenizer_0.7.0.tgz"; + path = fetchurl { + name = "css_selector_tokenizer___css_selector_tokenizer_0.7.0.tgz"; + url = "https://registry.yarnpkg.com/css-selector-tokenizer/-/css-selector-tokenizer-0.7.0.tgz"; + sha1 = "e6988474ae8c953477bf5e7efecfceccd9cf4c86"; + }; + } + { + name = "css___css_2.2.4.tgz"; + path = fetchurl { + name = "css___css_2.2.4.tgz"; + url = "https://registry.yarnpkg.com/css/-/css-2.2.4.tgz"; + sha1 = "c646755c73971f2bba6a601e2cf2fd71b1298929"; + }; + } + { + name = "cssesc___cssesc_0.1.0.tgz"; + path = fetchurl { + name = "cssesc___cssesc_0.1.0.tgz"; + url = "https://registry.yarnpkg.com/cssesc/-/cssesc-0.1.0.tgz"; + sha1 = "c814903e45623371a0477b40109aaafbeeaddbb4"; + }; + } + { + name = "cssesc___cssesc_2.0.0.tgz"; + path = fetchurl { + name = "cssesc___cssesc_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/cssesc/-/cssesc-2.0.0.tgz"; + sha1 = "3b13bd1bb1cb36e1bcb5a4dcd27f54c5dcb35703"; + }; + } + { + name = "cssesc___cssesc_3.0.0.tgz"; + path = fetchurl { + name = "cssesc___cssesc_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/cssesc/-/cssesc-3.0.0.tgz"; + sha1 = "37741919903b868565e1c09ea747445cd18983ee"; + }; + } + { + name = "cssom___cssom_0.3.4.tgz"; + path = fetchurl { + name = "cssom___cssom_0.3.4.tgz"; + url = "https://registry.yarnpkg.com/cssom/-/cssom-0.3.4.tgz"; + sha1 = "8cd52e8a3acfd68d3aed38ee0a640177d2f9d797"; + }; + } + { + name = "cssstyle___cssstyle_1.1.1.tgz"; + path = fetchurl { + name = "cssstyle___cssstyle_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/cssstyle/-/cssstyle-1.1.1.tgz"; + sha1 = "18b038a9c44d65f7a8e428a653b9f6fe42faf5fb"; + }; + } + { + name = "currently_unhandled___currently_unhandled_0.4.1.tgz"; + path = fetchurl { + name = "currently_unhandled___currently_unhandled_0.4.1.tgz"; + url = "https://registry.yarnpkg.com/currently-unhandled/-/currently-unhandled-0.4.1.tgz"; + sha1 = "988df33feab191ef799a61369dd76c17adf957ea"; + }; + } + { + name = "custom_event___custom_event_1.0.1.tgz"; + path = fetchurl { + name = "custom_event___custom_event_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/custom-event/-/custom-event-1.0.1.tgz"; + sha1 = "5d02a46850adf1b4a317946a3928fccb5bfd0425"; + }; + } + { + name = "custom_jquery_matchers___custom_jquery_matchers_2.1.0.tgz"; + path = fetchurl { + name = "custom_jquery_matchers___custom_jquery_matchers_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/custom-jquery-matchers/-/custom-jquery-matchers-2.1.0.tgz"; + sha1 = "e5988fa9715c416b0986b372563f872d9e91e024"; + }; + } + { + name = "cyclist___cyclist_0.2.2.tgz"; + path = fetchurl { + name = "cyclist___cyclist_0.2.2.tgz"; + url = "https://registry.yarnpkg.com/cyclist/-/cyclist-0.2.2.tgz"; + sha1 = "1b33792e11e914a2fd6d6ed6447464444e5fa640"; + }; + } + { + name = "d3_array___d3_array_1.2.1.tgz"; + path = fetchurl { + name = "d3_array___d3_array_1.2.1.tgz"; + url = "https://registry.yarnpkg.com/d3-array/-/d3-array-1.2.1.tgz"; + sha1 = "d1ca33de2f6ac31efadb8e050a021d7e2396d5dc"; + }; + } + { + name = "d3_axis___d3_axis_1.0.8.tgz"; + path = fetchurl { + name = "d3_axis___d3_axis_1.0.8.tgz"; + url = "https://registry.yarnpkg.com/d3-axis/-/d3-axis-1.0.8.tgz"; + sha1 = "31a705a0b535e65759de14173a31933137f18efa"; + }; + } + { + name = "d3_brush___d3_brush_1.0.4.tgz"; + path = fetchurl { + name = "d3_brush___d3_brush_1.0.4.tgz"; + url = "https://registry.yarnpkg.com/d3-brush/-/d3-brush-1.0.4.tgz"; + sha1 = "00c2f238019f24f6c0a194a26d41a1530ffe7bc4"; + }; + } + { + name = "d3_chord___d3_chord_1.0.4.tgz"; + path = fetchurl { + name = "d3_chord___d3_chord_1.0.4.tgz"; + url = "https://registry.yarnpkg.com/d3-chord/-/d3-chord-1.0.4.tgz"; + sha1 = "7dec4f0ba886f713fe111c45f763414f6f74ca2c"; + }; + } + { + name = "d3_collection___d3_collection_1.0.4.tgz"; + path = fetchurl { + name = "d3_collection___d3_collection_1.0.4.tgz"; + url = "https://registry.yarnpkg.com/d3-collection/-/d3-collection-1.0.4.tgz"; + sha1 = "342dfd12837c90974f33f1cc0a785aea570dcdc2"; + }; + } + { + name = "d3_color___d3_color_1.0.3.tgz"; + path = fetchurl { + name = "d3_color___d3_color_1.0.3.tgz"; + url = "https://registry.yarnpkg.com/d3-color/-/d3-color-1.0.3.tgz"; + sha1 = "bc7643fca8e53a8347e2fbdaffa236796b58509b"; + }; + } + { + name = "d3_contour___d3_contour_1.3.2.tgz"; + path = fetchurl { + name = "d3_contour___d3_contour_1.3.2.tgz"; + url = "https://registry.yarnpkg.com/d3-contour/-/d3-contour-1.3.2.tgz"; + sha1 = "652aacd500d2264cb3423cee10db69f6f59bead3"; + }; + } + { + name = "d3_dispatch___d3_dispatch_1.0.3.tgz"; + path = fetchurl { + name = "d3_dispatch___d3_dispatch_1.0.3.tgz"; + url = "https://registry.yarnpkg.com/d3-dispatch/-/d3-dispatch-1.0.3.tgz"; + sha1 = "46e1491eaa9b58c358fce5be4e8bed626e7871f8"; + }; + } + { + name = "d3_drag___d3_drag_1.2.1.tgz"; + path = fetchurl { + name = "d3_drag___d3_drag_1.2.1.tgz"; + url = "https://registry.yarnpkg.com/d3-drag/-/d3-drag-1.2.1.tgz"; + sha1 = "df8dd4c502fb490fc7462046a8ad98a5c479282d"; + }; + } + { + name = "d3_dsv___d3_dsv_1.0.8.tgz"; + path = fetchurl { + name = "d3_dsv___d3_dsv_1.0.8.tgz"; + url = "https://registry.yarnpkg.com/d3-dsv/-/d3-dsv-1.0.8.tgz"; + sha1 = "907e240d57b386618dc56468bacfe76bf19764ae"; + }; + } + { + name = "d3_ease___d3_ease_1.0.3.tgz"; + path = fetchurl { + name = "d3_ease___d3_ease_1.0.3.tgz"; + url = "https://registry.yarnpkg.com/d3-ease/-/d3-ease-1.0.3.tgz"; + sha1 = "68bfbc349338a380c44d8acc4fbc3304aa2d8c0e"; + }; + } + { + name = "d3_fetch___d3_fetch_1.1.2.tgz"; + path = fetchurl { + name = "d3_fetch___d3_fetch_1.1.2.tgz"; + url = "https://registry.yarnpkg.com/d3-fetch/-/d3-fetch-1.1.2.tgz"; + sha1 = "957c8fbc6d4480599ba191b1b2518bf86b3e1be2"; + }; + } + { + name = "d3_force___d3_force_1.1.0.tgz"; + path = fetchurl { + name = "d3_force___d3_force_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/d3-force/-/d3-force-1.1.0.tgz"; + sha1 = "cebf3c694f1078fcc3d4daf8e567b2fbd70d4ea3"; + }; + } + { + name = "d3_format___d3_format_1.2.2.tgz"; + path = fetchurl { + name = "d3_format___d3_format_1.2.2.tgz"; + url = "https://registry.yarnpkg.com/d3-format/-/d3-format-1.2.2.tgz"; + sha1 = "1a39c479c8a57fe5051b2e67a3bee27061a74e7a"; + }; + } + { + name = "d3_geo___d3_geo_1.9.1.tgz"; + path = fetchurl { + name = "d3_geo___d3_geo_1.9.1.tgz"; + url = "https://registry.yarnpkg.com/d3-geo/-/d3-geo-1.9.1.tgz"; + sha1 = "157e3b0f917379d0f73bebfff3be537f49fa7356"; + }; + } + { + name = "d3_hierarchy___d3_hierarchy_1.1.5.tgz"; + path = fetchurl { + name = "d3_hierarchy___d3_hierarchy_1.1.5.tgz"; + url = "https://registry.yarnpkg.com/d3-hierarchy/-/d3-hierarchy-1.1.5.tgz"; + sha1 = "a1c845c42f84a206bcf1c01c01098ea4ddaa7a26"; + }; + } + { + name = "d3_interpolate___d3_interpolate_1.1.6.tgz"; + path = fetchurl { + name = "d3_interpolate___d3_interpolate_1.1.6.tgz"; + url = "https://registry.yarnpkg.com/d3-interpolate/-/d3-interpolate-1.1.6.tgz"; + sha1 = "2cf395ae2381804df08aa1bf766b7f97b5f68fb6"; + }; + } + { + name = "d3_path___d3_path_1.0.5.tgz"; + path = fetchurl { + name = "d3_path___d3_path_1.0.5.tgz"; + url = "https://registry.yarnpkg.com/d3-path/-/d3-path-1.0.5.tgz"; + sha1 = "241eb1849bd9e9e8021c0d0a799f8a0e8e441764"; + }; + } + { + name = "d3_polygon___d3_polygon_1.0.3.tgz"; + path = fetchurl { + name = "d3_polygon___d3_polygon_1.0.3.tgz"; + url = "https://registry.yarnpkg.com/d3-polygon/-/d3-polygon-1.0.3.tgz"; + sha1 = "16888e9026460933f2b179652ad378224d382c62"; + }; + } + { + name = "d3_quadtree___d3_quadtree_1.0.3.tgz"; + path = fetchurl { + name = "d3_quadtree___d3_quadtree_1.0.3.tgz"; + url = "https://registry.yarnpkg.com/d3-quadtree/-/d3-quadtree-1.0.3.tgz"; + sha1 = "ac7987e3e23fe805a990f28e1b50d38fcb822438"; + }; + } + { + name = "d3_queue___d3_queue_3.0.7.tgz"; + path = fetchurl { + name = "d3_queue___d3_queue_3.0.7.tgz"; + url = "https://registry.yarnpkg.com/d3-queue/-/d3-queue-3.0.7.tgz"; + sha1 = "c93a2e54b417c0959129d7d73f6cf7d4292e7618"; + }; + } + { + name = "d3_random___d3_random_1.1.0.tgz"; + path = fetchurl { + name = "d3_random___d3_random_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/d3-random/-/d3-random-1.1.0.tgz"; + sha1 = "6642e506c6fa3a648595d2b2469788a8d12529d3"; + }; + } + { + name = "d3_request___d3_request_1.0.6.tgz"; + path = fetchurl { + name = "d3_request___d3_request_1.0.6.tgz"; + url = "https://registry.yarnpkg.com/d3-request/-/d3-request-1.0.6.tgz"; + sha1 = "a1044a9ef4ec28c824171c9379fae6d79474b19f"; + }; + } + { + name = "d3_scale_chromatic___d3_scale_chromatic_1.3.3.tgz"; + path = fetchurl { + name = "d3_scale_chromatic___d3_scale_chromatic_1.3.3.tgz"; + url = "https://registry.yarnpkg.com/d3-scale-chromatic/-/d3-scale-chromatic-1.3.3.tgz"; + sha1 = "dad4366f0edcb288f490128979c3c793583ed3c0"; + }; + } + { + name = "d3_scale___d3_scale_1.0.7.tgz"; + path = fetchurl { + name = "d3_scale___d3_scale_1.0.7.tgz"; + url = "https://registry.yarnpkg.com/d3-scale/-/d3-scale-1.0.7.tgz"; + sha1 = "fa90324b3ea8a776422bd0472afab0b252a0945d"; + }; + } + { + name = "d3_scale___d3_scale_2.2.2.tgz"; + path = fetchurl { + name = "d3_scale___d3_scale_2.2.2.tgz"; + url = "https://registry.yarnpkg.com/d3-scale/-/d3-scale-2.2.2.tgz"; + sha1 = "4e880e0b2745acaaddd3ede26a9e908a9e17b81f"; + }; + } + { + name = "d3_selection___d3_selection_1.3.0.tgz"; + path = fetchurl { + name = "d3_selection___d3_selection_1.3.0.tgz"; + url = "https://registry.yarnpkg.com/d3-selection/-/d3-selection-1.3.0.tgz"; + sha1 = "d53772382d3dc4f7507bfb28bcd2d6aed2a0ad6d"; + }; + } + { + name = "d3_shape___d3_shape_1.2.0.tgz"; + path = fetchurl { + name = "d3_shape___d3_shape_1.2.0.tgz"; + url = "https://registry.yarnpkg.com/d3-shape/-/d3-shape-1.2.0.tgz"; + sha1 = "45d01538f064bafd05ea3d6d2cb748fd8c41f777"; + }; + } + { + name = "d3_time_format___d3_time_format_2.1.1.tgz"; + path = fetchurl { + name = "d3_time_format___d3_time_format_2.1.1.tgz"; + url = "https://registry.yarnpkg.com/d3-time-format/-/d3-time-format-2.1.1.tgz"; + sha1 = "85b7cdfbc9ffca187f14d3c456ffda268081bb31"; + }; + } + { + name = "d3_time___d3_time_1.0.8.tgz"; + path = fetchurl { + name = "d3_time___d3_time_1.0.8.tgz"; + url = "https://registry.yarnpkg.com/d3-time/-/d3-time-1.0.8.tgz"; + sha1 = "dbd2d6007bf416fe67a76d17947b784bffea1e84"; + }; + } + { + name = "d3_timer___d3_timer_1.0.7.tgz"; + path = fetchurl { + name = "d3_timer___d3_timer_1.0.7.tgz"; + url = "https://registry.yarnpkg.com/d3-timer/-/d3-timer-1.0.7.tgz"; + sha1 = "df9650ca587f6c96607ff4e60cc38229e8dd8531"; + }; + } + { + name = "d3_transition___d3_transition_1.1.1.tgz"; + path = fetchurl { + name = "d3_transition___d3_transition_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/d3-transition/-/d3-transition-1.1.1.tgz"; + sha1 = "d8ef89c3b848735b060e54a39b32aaebaa421039"; + }; + } + { + name = "d3_voronoi___d3_voronoi_1.1.2.tgz"; + path = fetchurl { + name = "d3_voronoi___d3_voronoi_1.1.2.tgz"; + url = "https://registry.yarnpkg.com/d3-voronoi/-/d3-voronoi-1.1.2.tgz"; + sha1 = "1687667e8f13a2d158c80c1480c5a29cb0d8973c"; + }; + } + { + name = "d3_zoom___d3_zoom_1.7.1.tgz"; + path = fetchurl { + name = "d3_zoom___d3_zoom_1.7.1.tgz"; + url = "https://registry.yarnpkg.com/d3-zoom/-/d3-zoom-1.7.1.tgz"; + sha1 = "02f43b3c3e2db54f364582d7e4a236ccc5506b63"; + }; + } + { + name = "d3___d3_4.13.0.tgz"; + path = fetchurl { + name = "d3___d3_4.13.0.tgz"; + url = "https://registry.yarnpkg.com/d3/-/d3-4.13.0.tgz"; + sha1 = "ab236ff8cf0cfc27a81e69bf2fb7518bc9b4f33d"; + }; + } + { + name = "d3___d3_5.9.2.tgz"; + path = fetchurl { + name = "d3___d3_5.9.2.tgz"; + url = "https://registry.yarnpkg.com/d3/-/d3-5.9.2.tgz"; + sha1 = "64e8a7e9c3d96d9e6e4999d2c8a2c829767e67f5"; + }; + } + { + name = "dagre_d3_renderer___dagre_d3_renderer_0.5.8.tgz"; + path = fetchurl { + name = "dagre_d3_renderer___dagre_d3_renderer_0.5.8.tgz"; + url = "https://registry.yarnpkg.com/dagre-d3-renderer/-/dagre-d3-renderer-0.5.8.tgz"; + sha1 = "aa071bb71d3c4d67426925906f3f6ddead49c1a3"; + }; + } + { + name = "dagre_layout___dagre_layout_0.8.8.tgz"; + path = fetchurl { + name = "dagre_layout___dagre_layout_0.8.8.tgz"; + url = "https://registry.yarnpkg.com/dagre-layout/-/dagre-layout-0.8.8.tgz"; + sha1 = "9b6792f24229f402441c14162c1049e3f261f6d9"; + }; + } + { + 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_1.1.0.tgz"; + path = fetchurl { + name = "data_urls___data_urls_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/data-urls/-/data-urls-1.1.0.tgz"; + sha1 = "15ee0582baa5e22bb59c77140da8f9c76963bbfe"; + }; + } + { + name = "date_format___date_format_2.1.0.tgz"; + path = fetchurl { + name = "date_format___date_format_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/date-format/-/date-format-2.1.0.tgz"; + sha1 = "31d5b5ea211cf5fd764cd38baf9d033df7e125cf"; + }; + } + { + name = "date_now___date_now_0.1.4.tgz"; + path = fetchurl { + name = "date_now___date_now_0.1.4.tgz"; + url = "https://registry.yarnpkg.com/date-now/-/date-now-0.1.4.tgz"; + sha1 = "eaf439fd4d4848ad74e5cc7dbef200672b9e345b"; + }; + } + { + name = "dateformat___dateformat_3.0.3.tgz"; + path = fetchurl { + name = "dateformat___dateformat_3.0.3.tgz"; + url = "https://registry.yarnpkg.com/dateformat/-/dateformat-3.0.3.tgz"; + sha1 = "a6e37499a4d9a9cf85ef5872044d62901c9889ae"; + }; + } + { + name = "de_indent___de_indent_1.0.2.tgz"; + path = fetchurl { + name = "de_indent___de_indent_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/de-indent/-/de-indent-1.0.2.tgz"; + sha1 = "b2038e846dc33baa5796128d0804b455b8c1e21d"; + }; + } + { + 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_3.1.0.tgz"; + path = fetchurl { + name = "debug___debug_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/debug/-/debug-3.1.0.tgz"; + sha1 = "5bb5a0672628b64149566ba16819e61518c67261"; + }; + } + { + name = "debug___debug_3.2.6.tgz"; + path = fetchurl { + name = "debug___debug_3.2.6.tgz"; + url = "https://registry.yarnpkg.com/debug/-/debug-3.2.6.tgz"; + sha1 = "e83d17de16d8a7efb7717edbe5fb10135eee629b"; + }; + } + { + name = "debug___debug_4.1.1.tgz"; + path = fetchurl { + name = "debug___debug_4.1.1.tgz"; + url = "https://registry.yarnpkg.com/debug/-/debug-4.1.1.tgz"; + sha1 = "3b72260255109c6b589cee050f1d516139664791"; + }; + } + { + name = "decamelize_keys___decamelize_keys_1.1.0.tgz"; + path = fetchurl { + name = "decamelize_keys___decamelize_keys_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/decamelize-keys/-/decamelize-keys-1.1.0.tgz"; + sha1 = "d171a87933252807eb3cb61dc1c1445d078df2d9"; + }; + } + { + 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 = "decamelize___decamelize_2.0.0.tgz"; + path = fetchurl { + name = "decamelize___decamelize_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/decamelize/-/decamelize-2.0.0.tgz"; + sha1 = "656d7bbc8094c4c788ea53c5840908c9c7d063c7"; + }; + } + { + name = "deckar01_task_list___deckar01_task_list_2.2.0.tgz"; + path = fetchurl { + name = "deckar01_task_list___deckar01_task_list_2.2.0.tgz"; + url = "https://registry.yarnpkg.com/deckar01-task_list/-/deckar01-task_list-2.2.0.tgz"; + sha1 = "5cc3ea06f01d3d786b1a667064a462eb5d069bd3"; + }; + } + { + 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_equal___deep_equal_1.0.1.tgz"; + path = fetchurl { + name = "deep_equal___deep_equal_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/deep-equal/-/deep-equal-1.0.1.tgz"; + sha1 = "f5d260292b660e084eff4cdbc9f08ad3247448b5"; + }; + } + { + 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_extend___deep_extend_0.5.1.tgz"; + path = fetchurl { + name = "deep_extend___deep_extend_0.5.1.tgz"; + url = "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.5.1.tgz"; + sha1 = "b894a9dd90d3023fbf1c55a394fb858eb2066f1f"; + }; + } + { + 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 = "default_gateway___default_gateway_2.7.2.tgz"; + path = fetchurl { + name = "default_gateway___default_gateway_2.7.2.tgz"; + url = "https://registry.yarnpkg.com/default-gateway/-/default-gateway-2.7.2.tgz"; + sha1 = "b7ef339e5e024b045467af403d50348db4642d0f"; + }; + } + { + name = "default_require_extensions___default_require_extensions_2.0.0.tgz"; + path = fetchurl { + name = "default_require_extensions___default_require_extensions_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/default-require-extensions/-/default-require-extensions-2.0.0.tgz"; + sha1 = "f5f8fbb18a7d6d50b21f641f649ebb522cfe24f7"; + }; + } + { + 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 = "defined___defined_1.0.0.tgz"; + path = fetchurl { + name = "defined___defined_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/defined/-/defined-1.0.0.tgz"; + sha1 = "c98d9bcef75674188e110969151199e39b1fa693"; + }; + } + { + name = "del___del_2.2.2.tgz"; + path = fetchurl { + name = "del___del_2.2.2.tgz"; + url = "https://registry.yarnpkg.com/del/-/del-2.2.2.tgz"; + sha1 = "c12c981d067846c84bcaf862cff930d907ffd1a8"; + }; + } + { + name = "del___del_3.0.0.tgz"; + path = fetchurl { + name = "del___del_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/del/-/del-3.0.0.tgz"; + sha1 = "53ecf699ffcbcb39637691ab13baf160819766e5"; + }; + } + { + 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 = "delegate___delegate_3.1.2.tgz"; + path = fetchurl { + name = "delegate___delegate_3.1.2.tgz"; + url = "https://registry.yarnpkg.com/delegate/-/delegate-3.1.2.tgz"; + sha1 = "1e1bc6f5cadda6cb6cbf7e6d05d0bcdd5712aebe"; + }; + } + { + name = "delegates___delegates_1.0.0.tgz"; + path = fetchurl { + name = "delegates___delegates_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz"; + sha1 = "84c6e159b81904fdca59a0ef44cd870d31250f9a"; + }; + } + { + name = "depd___depd_1.1.1.tgz"; + path = fetchurl { + name = "depd___depd_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/depd/-/depd-1.1.1.tgz"; + sha1 = "5783b4e1c459f06fa5ca27f991f3d06e7a310359"; + }; + } + { + name = "depd___depd_1.1.2.tgz"; + path = fetchurl { + name = "depd___depd_1.1.2.tgz"; + url = "https://registry.yarnpkg.com/depd/-/depd-1.1.2.tgz"; + sha1 = "9bcd52e14c097763e749b274c4346ed2e560b5a9"; + }; + } + { + name = "des.js___des.js_1.0.0.tgz"; + path = fetchurl { + name = "des.js___des.js_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/des.js/-/des.js-1.0.0.tgz"; + sha1 = "c074d2e2aa6a8a9a07dbd61f9a15c2cd83ec8ecc"; + }; + } + { + name = "destroy___destroy_1.0.4.tgz"; + path = fetchurl { + name = "destroy___destroy_1.0.4.tgz"; + url = "https://registry.yarnpkg.com/destroy/-/destroy-1.0.4.tgz"; + sha1 = "978857442c44749e4206613e37946205826abd80"; + }; + } + { + name = "detab___detab_2.0.2.tgz"; + path = fetchurl { + name = "detab___detab_2.0.2.tgz"; + url = "https://registry.yarnpkg.com/detab/-/detab-2.0.2.tgz"; + sha1 = "074970d1a807b045d0258a4235df5928dd683561"; + }; + } + { + name = "detect_file___detect_file_1.0.0.tgz"; + path = fetchurl { + name = "detect_file___detect_file_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/detect-file/-/detect-file-1.0.0.tgz"; + sha1 = "f0d66d03672a825cb1b73bdb3fe62310c8e552b7"; + }; + } + { + name = "detect_libc___detect_libc_1.0.3.tgz"; + path = fetchurl { + name = "detect_libc___detect_libc_1.0.3.tgz"; + url = "https://registry.yarnpkg.com/detect-libc/-/detect-libc-1.0.3.tgz"; + sha1 = "fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b"; + }; + } + { + name = "detect_newline___detect_newline_2.1.0.tgz"; + path = fetchurl { + name = "detect_newline___detect_newline_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/detect-newline/-/detect-newline-2.1.0.tgz"; + sha1 = "f41f1c10be4b00e87b5f13da680759f2c5bfd3e2"; + }; + } + { + name = "detect_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 = "detective___detective_4.7.1.tgz"; + path = fetchurl { + name = "detective___detective_4.7.1.tgz"; + url = "https://registry.yarnpkg.com/detective/-/detective-4.7.1.tgz"; + sha1 = "0eca7314338442febb6d65da54c10bb1c82b246e"; + }; + } + { + name = "di___di_0.0.1.tgz"; + path = fetchurl { + name = "di___di_0.0.1.tgz"; + url = "https://registry.yarnpkg.com/di/-/di-0.0.1.tgz"; + sha1 = "806649326ceaa7caa3306d75d985ea2748ba913c"; + }; + } + { + name = "diff_sequences___diff_sequences_24.3.0.tgz"; + path = fetchurl { + name = "diff_sequences___diff_sequences_24.3.0.tgz"; + url = "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-24.3.0.tgz"; + sha1 = "0f20e8a1df1abddaf4d9c226680952e64118b975"; + }; + } + { + name = "diff___diff_3.5.0.tgz"; + path = fetchurl { + name = "diff___diff_3.5.0.tgz"; + url = "https://registry.yarnpkg.com/diff/-/diff-3.5.0.tgz"; + sha1 = "800c0dd1e0a8bfbc95835c202ad220fe317e5a12"; + }; + } + { + name = "diff___diff_4.0.1.tgz"; + path = fetchurl { + name = "diff___diff_4.0.1.tgz"; + url = "https://registry.yarnpkg.com/diff/-/diff-4.0.1.tgz"; + sha1 = "0c667cb467ebbb5cea7f14f135cc2dba7780a8ff"; + }; + } + { + name = "diffie_hellman___diffie_hellman_5.0.2.tgz"; + path = fetchurl { + name = "diffie_hellman___diffie_hellman_5.0.2.tgz"; + url = "https://registry.yarnpkg.com/diffie-hellman/-/diffie-hellman-5.0.2.tgz"; + sha1 = "b5835739270cfe26acf632099fded2a07f209e5e"; + }; + } + { + name = "dir_glob___dir_glob_2.2.2.tgz"; + path = fetchurl { + name = "dir_glob___dir_glob_2.2.2.tgz"; + url = "https://registry.yarnpkg.com/dir-glob/-/dir-glob-2.2.2.tgz"; + sha1 = "fa09f0694153c8918b18ba0deafae94769fc50c4"; + }; + } + { + name = "dns_equal___dns_equal_1.0.0.tgz"; + path = fetchurl { + name = "dns_equal___dns_equal_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/dns-equal/-/dns-equal-1.0.0.tgz"; + sha1 = "b39e7f1da6eb0a75ba9c17324b34753c47e0654d"; + }; + } + { + name = "dns_packet___dns_packet_1.2.2.tgz"; + path = fetchurl { + name = "dns_packet___dns_packet_1.2.2.tgz"; + url = "https://registry.yarnpkg.com/dns-packet/-/dns-packet-1.2.2.tgz"; + sha1 = "a8a26bec7646438963fc86e06f8f8b16d6c8bf7a"; + }; + } + { + name = "dns_txt___dns_txt_2.0.2.tgz"; + path = fetchurl { + name = "dns_txt___dns_txt_2.0.2.tgz"; + url = "https://registry.yarnpkg.com/dns-txt/-/dns-txt-2.0.2.tgz"; + sha1 = "b91d806f5d27188e4ab3e7d107d881a1cc4642b6"; + }; + } + { + name = "docdash___docdash_1.0.2.tgz"; + path = fetchurl { + name = "docdash___docdash_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/docdash/-/docdash-1.0.2.tgz"; + sha1 = "0449a8f6bb247f563020b78a5485dea95ae2e094"; + }; + } + { + name = "doctrine_temporary_fork___doctrine_temporary_fork_2.1.0.tgz"; + path = fetchurl { + name = "doctrine_temporary_fork___doctrine_temporary_fork_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/doctrine-temporary-fork/-/doctrine-temporary-fork-2.1.0.tgz"; + sha1 = "36f2154f556ee4f1e60311d391cd23de5187ed57"; + }; + } + { + name = "doctrine___doctrine_1.5.0.tgz"; + path = fetchurl { + name = "doctrine___doctrine_1.5.0.tgz"; + url = "https://registry.yarnpkg.com/doctrine/-/doctrine-1.5.0.tgz"; + sha1 = "379dce730f6166f76cefa4e6707a159b02c5a6fa"; + }; + } + { + name = "doctrine___doctrine_2.1.0.tgz"; + path = fetchurl { + name = "doctrine___doctrine_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/doctrine/-/doctrine-2.1.0.tgz"; + sha1 = "5cd01fc101621b42c4cd7f5d1a66243716d3f39d"; + }; + } + { + name = "document_register_element___document_register_element_1.13.1.tgz"; + path = fetchurl { + name = "document_register_element___document_register_element_1.13.1.tgz"; + url = "https://registry.yarnpkg.com/document-register-element/-/document-register-element-1.13.1.tgz"; + sha1 = "dad8cb7be38e04ee3f56842e6cf81af46c1249ba"; + }; + } + { + name = "documentation___documentation_12.0.3.tgz"; + path = fetchurl { + name = "documentation___documentation_12.0.3.tgz"; + url = "https://registry.yarnpkg.com/documentation/-/documentation-12.0.3.tgz"; + sha1 = "32f91da8e5cb4104f69db9fd32c87773a1ad6240"; + }; + } + { + name = "dom_serialize___dom_serialize_2.2.1.tgz"; + path = fetchurl { + name = "dom_serialize___dom_serialize_2.2.1.tgz"; + url = "https://registry.yarnpkg.com/dom-serialize/-/dom-serialize-2.2.1.tgz"; + sha1 = "562ae8999f44be5ea3076f5419dcd59eb43ac95b"; + }; + } + { + name = "dom_serializer___dom_serializer_0.1.0.tgz"; + path = fetchurl { + name = "dom_serializer___dom_serializer_0.1.0.tgz"; + url = "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-0.1.0.tgz"; + sha1 = "073c697546ce0780ce23be4a28e293e40bc30c82"; + }; + } + { + name = "domain_browser___domain_browser_1.1.7.tgz"; + path = fetchurl { + name = "domain_browser___domain_browser_1.1.7.tgz"; + url = "https://registry.yarnpkg.com/domain-browser/-/domain-browser-1.1.7.tgz"; + sha1 = "867aa4b093faa05f1de08c06f4d7b21fdf8698bc"; + }; + } + { + name = "domelementtype___domelementtype_1.3.0.tgz"; + path = fetchurl { + name = "domelementtype___domelementtype_1.3.0.tgz"; + url = "https://registry.yarnpkg.com/domelementtype/-/domelementtype-1.3.0.tgz"; + sha1 = "b17aed82e8ab59e52dd9c19b1756e0fc187204c2"; + }; + } + { + name = "domelementtype___domelementtype_1.1.3.tgz"; + path = fetchurl { + name = "domelementtype___domelementtype_1.1.3.tgz"; + url = "https://registry.yarnpkg.com/domelementtype/-/domelementtype-1.1.3.tgz"; + sha1 = "bd28773e2642881aec51544924299c5cd822185b"; + }; + } + { + name = "domexception___domexception_1.0.1.tgz"; + path = fetchurl { + name = "domexception___domexception_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/domexception/-/domexception-1.0.1.tgz"; + sha1 = "937442644ca6a31261ef36e3ec677fe805582c90"; + }; + } + { + name = "domhandler___domhandler_2.4.1.tgz"; + path = fetchurl { + name = "domhandler___domhandler_2.4.1.tgz"; + url = "https://registry.yarnpkg.com/domhandler/-/domhandler-2.4.1.tgz"; + sha1 = "892e47000a99be55bbf3774ffea0561d8879c259"; + }; + } + { + name = "domutils___domutils_1.6.2.tgz"; + path = fetchurl { + name = "domutils___domutils_1.6.2.tgz"; + url = "https://registry.yarnpkg.com/domutils/-/domutils-1.6.2.tgz"; + sha1 = "1958cc0b4c9426e9ed367fb1c8e854891b0fa3ff"; + }; + } + { + name = "dot_prop___dot_prop_4.2.0.tgz"; + path = fetchurl { + name = "dot_prop___dot_prop_4.2.0.tgz"; + url = "https://registry.yarnpkg.com/dot-prop/-/dot-prop-4.2.0.tgz"; + sha1 = "1f19e0c2e1aa0e32797c49799f2837ac6af69c57"; + }; + } + { + name = "dropzone___dropzone_4.2.0.tgz"; + path = fetchurl { + name = "dropzone___dropzone_4.2.0.tgz"; + url = "https://registry.yarnpkg.com/dropzone/-/dropzone-4.2.0.tgz"; + sha1 = "fbe7acbb9918e0706489072ef663effeef8a79f3"; + }; + } + { + name = "duplexer2___duplexer2_0.1.4.tgz"; + path = fetchurl { + name = "duplexer2___duplexer2_0.1.4.tgz"; + url = "https://registry.yarnpkg.com/duplexer2/-/duplexer2-0.1.4.tgz"; + sha1 = "8b12dab878c0d69e3e7891051662a32fc6bddcc1"; + }; + } + { + 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 = "duplexer___duplexer_0.1.1.tgz"; + path = fetchurl { + name = "duplexer___duplexer_0.1.1.tgz"; + url = "https://registry.yarnpkg.com/duplexer/-/duplexer-0.1.1.tgz"; + sha1 = "ace6ff808c1ce66b57d1ebf97977acb02334cfc1"; + }; + } + { + name = "duplexify___duplexify_3.7.1.tgz"; + path = fetchurl { + name = "duplexify___duplexify_3.7.1.tgz"; + url = "https://registry.yarnpkg.com/duplexify/-/duplexify-3.7.1.tgz"; + sha1 = "2a4df5317f6ccfd91f86d6fd25d8d8a103b88309"; + }; + } + { + 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 = "echarts___echarts_4.2.1.tgz"; + path = fetchurl { + name = "echarts___echarts_4.2.1.tgz"; + url = "https://registry.yarnpkg.com/echarts/-/echarts-4.2.1.tgz"; + sha1 = "9a8ea3b03354f86f824d97625c334cf16965ef03"; + }; + } + { + name = "editions___editions_1.3.4.tgz"; + path = fetchurl { + name = "editions___editions_1.3.4.tgz"; + url = "https://registry.yarnpkg.com/editions/-/editions-1.3.4.tgz"; + sha1 = "3662cb592347c3168eb8e498a0ff73271d67f50b"; + }; + } + { + name = "editorconfig___editorconfig_0.15.2.tgz"; + path = fetchurl { + name = "editorconfig___editorconfig_0.15.2.tgz"; + url = "https://registry.yarnpkg.com/editorconfig/-/editorconfig-0.15.2.tgz"; + sha1 = "047be983abb9ab3c2eefe5199cb2b7c5689f0702"; + }; + } + { + name = "ee_first___ee_first_1.1.1.tgz"; + path = fetchurl { + name = "ee_first___ee_first_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz"; + sha1 = "590c61156b0ae2f4f0255732a158b266bc56b21d"; + }; + } + { + name = "ejs___ejs_2.6.1.tgz"; + path = fetchurl { + name = "ejs___ejs_2.6.1.tgz"; + url = "https://registry.yarnpkg.com/ejs/-/ejs-2.6.1.tgz"; + sha1 = "498ec0d495655abc6f23cd61868d926464071aa0"; + }; + } + { + name = "electron_to_chromium___electron_to_chromium_1.3.199.tgz"; + path = fetchurl { + name = "electron_to_chromium___electron_to_chromium_1.3.199.tgz"; + url = "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.199.tgz"; + sha1 = "f9a62a74cda77854310a2abffde8b75591ea09a1"; + }; + } + { + name = "elliptic___elliptic_6.4.0.tgz"; + path = fetchurl { + name = "elliptic___elliptic_6.4.0.tgz"; + url = "https://registry.yarnpkg.com/elliptic/-/elliptic-6.4.0.tgz"; + sha1 = "cac9af8762c85836187003c8dfe193e5e2eae5df"; + }; + } + { + name = "emoji_regex___emoji_regex_6.1.1.tgz"; + path = fetchurl { + name = "emoji_regex___emoji_regex_6.1.1.tgz"; + url = "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-6.1.1.tgz"; + sha1 = "c6cd0ec1b0642e2a3c67a1137efc5e796da4f88e"; + }; + } + { + 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 = "emoji_unicode_version___emoji_unicode_version_0.2.1.tgz"; + path = fetchurl { + name = "emoji_unicode_version___emoji_unicode_version_0.2.1.tgz"; + url = "https://registry.yarnpkg.com/emoji-unicode-version/-/emoji-unicode-version-0.2.1.tgz"; + sha1 = "0ebf3666b5414097971d34994e299fce75cdbafc"; + }; + } + { + name = "emojis_list___emojis_list_2.1.0.tgz"; + path = fetchurl { + name = "emojis_list___emojis_list_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/emojis-list/-/emojis-list-2.1.0.tgz"; + sha1 = "4daa4d9db00f9819880c79fa457ae5b09a1fd389"; + }; + } + { + 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.1.tgz"; + path = fetchurl { + name = "end_of_stream___end_of_stream_1.4.1.tgz"; + url = "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.1.tgz"; + sha1 = "ed29634d19baba463b6ce6b80a37213eab71ec43"; + }; + } + { + name = "engine.io_client___engine.io_client_3.2.1.tgz"; + path = fetchurl { + name = "engine.io_client___engine.io_client_3.2.1.tgz"; + url = "https://registry.yarnpkg.com/engine.io-client/-/engine.io-client-3.2.1.tgz"; + sha1 = "6f54c0475de487158a1a7c77d10178708b6add36"; + }; + } + { + name = "engine.io_parser___engine.io_parser_2.1.2.tgz"; + path = fetchurl { + name = "engine.io_parser___engine.io_parser_2.1.2.tgz"; + url = "https://registry.yarnpkg.com/engine.io-parser/-/engine.io-parser-2.1.2.tgz"; + sha1 = "4c0f4cff79aaeecbbdcfdea66a823c6085409196"; + }; + } + { + name = "engine.io___engine.io_3.2.0.tgz"; + path = fetchurl { + name = "engine.io___engine.io_3.2.0.tgz"; + url = "https://registry.yarnpkg.com/engine.io/-/engine.io-3.2.0.tgz"; + sha1 = "54332506f42f2edc71690d2f2a42349359f3bf7d"; + }; + } + { + name = "enhanced_resolve___enhanced_resolve_4.1.0.tgz"; + path = fetchurl { + name = "enhanced_resolve___enhanced_resolve_4.1.0.tgz"; + url = "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-4.1.0.tgz"; + sha1 = "41c7e0bfdfe74ac1ffe1e57ad6a5c6c9f3742a7f"; + }; + } + { + name = "enhanced_resolve___enhanced_resolve_0.9.1.tgz"; + path = fetchurl { + name = "enhanced_resolve___enhanced_resolve_0.9.1.tgz"; + url = "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-0.9.1.tgz"; + sha1 = "4d6e689b3725f86090927ccc86cd9f1635b89e2e"; + }; + } + { + name = "ent___ent_2.2.0.tgz"; + path = fetchurl { + name = "ent___ent_2.2.0.tgz"; + url = "https://registry.yarnpkg.com/ent/-/ent-2.2.0.tgz"; + sha1 = "e964219325a21d05f44466a2f686ed6ce5f5dd1d"; + }; + } + { + name = "entities___entities_1.1.1.tgz"; + path = fetchurl { + name = "entities___entities_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/entities/-/entities-1.1.1.tgz"; + sha1 = "6e5c2d0a5621b5dadaecef80b90edfb5cd7772f0"; + }; + } + { + name = "errno___errno_0.1.7.tgz"; + path = fetchurl { + name = "errno___errno_0.1.7.tgz"; + url = "https://registry.yarnpkg.com/errno/-/errno-0.1.7.tgz"; + sha1 = "4684d71779ad39af177e3f007996f7c67c852618"; + }; + } + { + 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 = "error___error_7.0.2.tgz"; + path = fetchurl { + name = "error___error_7.0.2.tgz"; + url = "https://registry.yarnpkg.com/error/-/error-7.0.2.tgz"; + sha1 = "a5f75fff4d9926126ddac0ea5dc38e689153cb02"; + }; + } + { + name = "es_abstract___es_abstract_1.13.0.tgz"; + path = fetchurl { + name = "es_abstract___es_abstract_1.13.0.tgz"; + url = "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.13.0.tgz"; + sha1 = "ac86145fdd5099d8dd49558ccba2eaf9b88e24e9"; + }; + } + { + name = "es_to_primitive___es_to_primitive_1.2.0.tgz"; + path = fetchurl { + name = "es_to_primitive___es_to_primitive_1.2.0.tgz"; + url = "https://registry.yarnpkg.com/es-to-primitive/-/es-to-primitive-1.2.0.tgz"; + sha1 = "edf72478033456e8dda8ef09e00ad9650707f377"; + }; + } + { + name = "es6_promise___es6_promise_3.0.2.tgz"; + path = fetchurl { + name = "es6_promise___es6_promise_3.0.2.tgz"; + url = "https://registry.yarnpkg.com/es6-promise/-/es6-promise-3.0.2.tgz"; + sha1 = "010d5858423a5f118979665f46486a95c6ee2bb6"; + }; + } + { + name = "escape_html___escape_html_1.0.3.tgz"; + path = fetchurl { + name = "escape_html___escape_html_1.0.3.tgz"; + url = "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz"; + sha1 = "0258eae4d3d0c0974de1c169188ef0051d1d1988"; + }; + } + { + 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 = "escaper___escaper_2.5.3.tgz"; + path = fetchurl { + name = "escaper___escaper_2.5.3.tgz"; + url = "https://registry.yarnpkg.com/escaper/-/escaper-2.5.3.tgz"; + sha1 = "8b8fe90ba364054151ab7eff18b4ce43b1e13ab5"; + }; + } + { + name = "escodegen___escodegen_1.11.0.tgz"; + path = fetchurl { + name = "escodegen___escodegen_1.11.0.tgz"; + url = "https://registry.yarnpkg.com/escodegen/-/escodegen-1.11.0.tgz"; + sha1 = "b27a9389481d5bfd5bec76f7bb1eb3f8f4556589"; + }; + } + { + name = "eslint_config_airbnb_base___eslint_config_airbnb_base_13.1.0.tgz"; + path = fetchurl { + name = "eslint_config_airbnb_base___eslint_config_airbnb_base_13.1.0.tgz"; + url = "https://registry.yarnpkg.com/eslint-config-airbnb-base/-/eslint-config-airbnb-base-13.1.0.tgz"; + sha1 = "b5a1b480b80dfad16433d6c4ad84e6605052c05c"; + }; + } + { + name = "eslint_config_prettier___eslint_config_prettier_3.3.0.tgz"; + path = fetchurl { + name = "eslint_config_prettier___eslint_config_prettier_3.3.0.tgz"; + url = "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-3.3.0.tgz"; + sha1 = "41afc8d3b852e757f06274ed6c44ca16f939a57d"; + }; + } + { + name = "eslint_import_resolver_jest___eslint_import_resolver_jest_2.1.1.tgz"; + path = fetchurl { + name = "eslint_import_resolver_jest___eslint_import_resolver_jest_2.1.1.tgz"; + url = "https://registry.yarnpkg.com/eslint-import-resolver-jest/-/eslint-import-resolver-jest-2.1.1.tgz"; + sha1 = "78c1934e3b5b77283326f036e089cc3b9fae6346"; + }; + } + { + name = "eslint_import_resolver_node___eslint_import_resolver_node_0.3.2.tgz"; + path = fetchurl { + name = "eslint_import_resolver_node___eslint_import_resolver_node_0.3.2.tgz"; + url = "https://registry.yarnpkg.com/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.2.tgz"; + sha1 = "58f15fb839b8d0576ca980413476aab2472db66a"; + }; + } + { + name = "eslint_import_resolver_webpack___eslint_import_resolver_webpack_0.10.1.tgz"; + path = fetchurl { + name = "eslint_import_resolver_webpack___eslint_import_resolver_webpack_0.10.1.tgz"; + url = "https://registry.yarnpkg.com/eslint-import-resolver-webpack/-/eslint-import-resolver-webpack-0.10.1.tgz"; + sha1 = "4cbceed2c0c43e488a74775c30861e58e00fb290"; + }; + } + { + name = "eslint_module_utils___eslint_module_utils_2.3.0.tgz"; + path = fetchurl { + name = "eslint_module_utils___eslint_module_utils_2.3.0.tgz"; + url = "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.3.0.tgz"; + sha1 = "546178dab5e046c8b562bbb50705e2456d7bda49"; + }; + } + { + name = "eslint_plugin_filenames___eslint_plugin_filenames_1.3.2.tgz"; + path = fetchurl { + name = "eslint_plugin_filenames___eslint_plugin_filenames_1.3.2.tgz"; + url = "https://registry.yarnpkg.com/eslint-plugin-filenames/-/eslint-plugin-filenames-1.3.2.tgz"; + sha1 = "7094f00d7aefdd6999e3ac19f72cea058e590cf7"; + }; + } + { + name = "eslint_plugin_import___eslint_plugin_import_2.16.0.tgz"; + path = fetchurl { + name = "eslint_plugin_import___eslint_plugin_import_2.16.0.tgz"; + url = "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.16.0.tgz"; + sha1 = "97ac3e75d0791c4fac0e15ef388510217be7f66f"; + }; + } + { + name = "eslint_plugin_jasmine___eslint_plugin_jasmine_2.10.1.tgz"; + path = fetchurl { + name = "eslint_plugin_jasmine___eslint_plugin_jasmine_2.10.1.tgz"; + url = "https://registry.yarnpkg.com/eslint-plugin-jasmine/-/eslint-plugin-jasmine-2.10.1.tgz"; + sha1 = "5733b709e751f4bc40e31e1c16989bd2cdfbec97"; + }; + } + { + name = "eslint_plugin_jest___eslint_plugin_jest_22.3.0.tgz"; + path = fetchurl { + name = "eslint_plugin_jest___eslint_plugin_jest_22.3.0.tgz"; + url = "https://registry.yarnpkg.com/eslint-plugin-jest/-/eslint-plugin-jest-22.3.0.tgz"; + sha1 = "a10f10dedfc92def774ec9bb5bfbd2fb8e1c96d2"; + }; + } + { + name = "eslint_plugin_promise___eslint_plugin_promise_4.1.1.tgz"; + path = fetchurl { + name = "eslint_plugin_promise___eslint_plugin_promise_4.1.1.tgz"; + url = "https://registry.yarnpkg.com/eslint-plugin-promise/-/eslint-plugin-promise-4.1.1.tgz"; + sha1 = "1e08cb68b5b2cd8839f8d5864c796f56d82746db"; + }; + } + { + name = "eslint_plugin_vue___eslint_plugin_vue_5.0.0.tgz"; + path = fetchurl { + name = "eslint_plugin_vue___eslint_plugin_vue_5.0.0.tgz"; + url = "https://registry.yarnpkg.com/eslint-plugin-vue/-/eslint-plugin-vue-5.0.0.tgz"; + sha1 = "4a2cc1c0e71ea45e1bd9c1a60f925bfe68bb5710"; + }; + } + { + name = "eslint_restricted_globals___eslint_restricted_globals_0.1.1.tgz"; + path = fetchurl { + name = "eslint_restricted_globals___eslint_restricted_globals_0.1.1.tgz"; + url = "https://registry.yarnpkg.com/eslint-restricted-globals/-/eslint-restricted-globals-0.1.1.tgz"; + sha1 = "35f0d5cbc64c2e3ed62e93b4b1a7af05ba7ed4d7"; + }; + } + { + name = "eslint_scope___eslint_scope_3.7.1.tgz"; + path = fetchurl { + name = "eslint_scope___eslint_scope_3.7.1.tgz"; + url = "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-3.7.1.tgz"; + sha1 = "3d63c3edfda02e06e01a452ad88caacc7cdcb6e8"; + }; + } + { + name = "eslint_scope___eslint_scope_4.0.0.tgz"; + path = fetchurl { + name = "eslint_scope___eslint_scope_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-4.0.0.tgz"; + sha1 = "50bf3071e9338bcdc43331794a0cb533f0136172"; + }; + } + { + name = "eslint_utils___eslint_utils_1.4.2.tgz"; + path = fetchurl { + name = "eslint_utils___eslint_utils_1.4.2.tgz"; + url = "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-1.4.2.tgz"; + sha1 = "166a5180ef6ab7eb462f162fd0e6f2463d7309ab"; + }; + } + { + name = "eslint_visitor_keys___eslint_visitor_keys_1.0.0.tgz"; + path = fetchurl { + name = "eslint_visitor_keys___eslint_visitor_keys_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.0.0.tgz"; + sha1 = "3f3180fb2e291017716acb4c9d6d5b5c34a6a81d"; + }; + } + { + name = "eslint___eslint_5.9.0.tgz"; + path = fetchurl { + name = "eslint___eslint_5.9.0.tgz"; + url = "https://registry.yarnpkg.com/eslint/-/eslint-5.9.0.tgz"; + sha1 = "b234b6d15ef84b5849c6de2af43195a2d59d408e"; + }; + } + { + name = "espree___espree_4.1.0.tgz"; + path = fetchurl { + name = "espree___espree_4.1.0.tgz"; + url = "https://registry.yarnpkg.com/espree/-/espree-4.1.0.tgz"; + sha1 = "728d5451e0fd156c04384a7ad89ed51ff54eb25f"; + }; + } + { + name = "espree___espree_5.0.1.tgz"; + path = fetchurl { + name = "espree___espree_5.0.1.tgz"; + url = "https://registry.yarnpkg.com/espree/-/espree-5.0.1.tgz"; + sha1 = "5d6526fa4fc7f0788a5cf75b15f30323e2f81f7a"; + }; + } + { + name = "esprima___esprima_3.1.3.tgz"; + path = fetchurl { + name = "esprima___esprima_3.1.3.tgz"; + url = "https://registry.yarnpkg.com/esprima/-/esprima-3.1.3.tgz"; + sha1 = "fdca51cee6133895e3c88d535ce49dbff62a4633"; + }; + } + { + name = "esprima___esprima_4.0.1.tgz"; + path = fetchurl { + name = "esprima___esprima_4.0.1.tgz"; + url = "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz"; + sha1 = "13b04cdb3e6c5d19df91ab6987a8695619b0aa71"; + }; + } + { + name = "esquery___esquery_1.0.1.tgz"; + path = fetchurl { + name = "esquery___esquery_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/esquery/-/esquery-1.0.1.tgz"; + sha1 = "406c51658b1f5991a5f9b62b1dc25b00e3e5c708"; + }; + } + { + name = "esrecurse___esrecurse_4.2.1.tgz"; + path = fetchurl { + name = "esrecurse___esrecurse_4.2.1.tgz"; + url = "https://registry.yarnpkg.com/esrecurse/-/esrecurse-4.2.1.tgz"; + sha1 = "007a3b9fdbc2b3bb87e4879ea19c92fdbd3942cf"; + }; + } + { + name = "estraverse___estraverse_4.2.0.tgz"; + path = fetchurl { + name = "estraverse___estraverse_4.2.0.tgz"; + url = "https://registry.yarnpkg.com/estraverse/-/estraverse-4.2.0.tgz"; + sha1 = "0dee3fed31fcd469618ce7342099fc1afa0bdb13"; + }; + } + { + name = "esutils___esutils_2.0.2.tgz"; + path = fetchurl { + name = "esutils___esutils_2.0.2.tgz"; + url = "https://registry.yarnpkg.com/esutils/-/esutils-2.0.2.tgz"; + sha1 = "0abf4f1caa5bcb1f7a9d8acc6dea4faaa04bac9b"; + }; + } + { + name = "etag___etag_1.8.1.tgz"; + path = fetchurl { + name = "etag___etag_1.8.1.tgz"; + url = "https://registry.yarnpkg.com/etag/-/etag-1.8.1.tgz"; + sha1 = "41ae2eeb65efa62268aebfea83ac7d79299b0887"; + }; + } + { + name = "eve_raphael___eve_raphael_0.5.0.tgz"; + path = fetchurl { + name = "eve_raphael___eve_raphael_0.5.0.tgz"; + url = "https://registry.yarnpkg.com/eve-raphael/-/eve-raphael-0.5.0.tgz"; + sha1 = "17c754b792beef3fa6684d79cf5a47c63c4cda30"; + }; + } + { + name = "eventemitter3___eventemitter3_1.2.0.tgz"; + path = fetchurl { + name = "eventemitter3___eventemitter3_1.2.0.tgz"; + url = "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-1.2.0.tgz"; + sha1 = "1c86991d816ad1e504750e73874224ecf3bec508"; + }; + } + { + name = "events___events_1.1.1.tgz"; + path = fetchurl { + name = "events___events_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/events/-/events-1.1.1.tgz"; + sha1 = "9ebdb7635ad099c70dcc4c2a1f5004288e8bd924"; + }; + } + { + name = "eventsource___eventsource_1.0.7.tgz"; + path = fetchurl { + name = "eventsource___eventsource_1.0.7.tgz"; + url = "https://registry.yarnpkg.com/eventsource/-/eventsource-1.0.7.tgz"; + sha1 = "8fbc72c93fcd34088090bc0a4e64f4b5cee6d8d0"; + }; + } + { + name = "evp_bytestokey___evp_bytestokey_1.0.3.tgz"; + path = fetchurl { + name = "evp_bytestokey___evp_bytestokey_1.0.3.tgz"; + url = "https://registry.yarnpkg.com/evp_bytestokey/-/evp_bytestokey-1.0.3.tgz"; + sha1 = "7fcbdb198dc71959432efe13842684e0525acb02"; + }; + } + { + name = "exec_sh___exec_sh_0.3.2.tgz"; + path = fetchurl { + name = "exec_sh___exec_sh_0.3.2.tgz"; + url = "https://registry.yarnpkg.com/exec-sh/-/exec-sh-0.3.2.tgz"; + sha1 = "6738de2eb7c8e671d0366aea0b0db8c6f7d7391b"; + }; + } + { + name = "execa___execa_0.10.0.tgz"; + path = fetchurl { + name = "execa___execa_0.10.0.tgz"; + url = "https://registry.yarnpkg.com/execa/-/execa-0.10.0.tgz"; + sha1 = "ff456a8f53f90f8eccc71a96d11bdfc7f082cb50"; + }; + } + { + name = "execa___execa_0.7.0.tgz"; + path = fetchurl { + name = "execa___execa_0.7.0.tgz"; + url = "https://registry.yarnpkg.com/execa/-/execa-0.7.0.tgz"; + sha1 = "944becd34cc41ee32a63a9faf27ad5a65fc59777"; + }; + } + { + name = "execa___execa_1.0.0.tgz"; + path = fetchurl { + name = "execa___execa_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/execa/-/execa-1.0.0.tgz"; + sha1 = "c6236a5bb4df6d6f15e88e7f017798216749ddd8"; + }; + } + { + name = "execall___execall_2.0.0.tgz"; + path = fetchurl { + name = "execall___execall_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/execall/-/execall-2.0.0.tgz"; + sha1 = "16a06b5fe5099df7d00be5d9c06eecded1663b45"; + }; + } + { + 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 = "expand_tilde___expand_tilde_2.0.2.tgz"; + path = fetchurl { + name = "expand_tilde___expand_tilde_2.0.2.tgz"; + url = "https://registry.yarnpkg.com/expand-tilde/-/expand-tilde-2.0.2.tgz"; + sha1 = "97e801aa052df02454de46b02bf621642cdc8502"; + }; + } + { + name = "expect___expect_24.8.0.tgz"; + path = fetchurl { + name = "expect___expect_24.8.0.tgz"; + url = "https://registry.yarnpkg.com/expect/-/expect-24.8.0.tgz"; + sha1 = "471f8ec256b7b6129ca2524b2a62f030df38718d"; + }; + } + { + name = "exports_loader___exports_loader_0.7.0.tgz"; + path = fetchurl { + name = "exports_loader___exports_loader_0.7.0.tgz"; + url = "https://registry.yarnpkg.com/exports-loader/-/exports-loader-0.7.0.tgz"; + sha1 = "84881c784dea6036b8e1cd1dac3da9b6409e21a5"; + }; + } + { + name = "https___registry.npmjs.org_express___express_4.16.3.tgz"; + path = fetchurl { + name = "https___registry.npmjs.org_express___express_4.16.3.tgz"; + url = "https://registry.npmjs.org/express/-/express-4.16.3.tgz"; + sha1 = "6af8a502350db3246ecc4becf6b5a34d22f7ed53"; + }; + } + { + 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 = "external_editor___external_editor_3.0.0.tgz"; + path = fetchurl { + name = "external_editor___external_editor_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/external-editor/-/external-editor-3.0.0.tgz"; + sha1 = "dc35c48c6f98a30ca27a20e9687d7f3c77704bb6"; + }; + } + { + 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_files___extract_files_5.0.1.tgz"; + path = fetchurl { + name = "extract_files___extract_files_5.0.1.tgz"; + url = "https://registry.yarnpkg.com/extract-files/-/extract-files-5.0.1.tgz"; + sha1 = "c9492a8410be643e260a376f0151361993d5f659"; + }; + } + { + name = "extract_from_css___extract_from_css_0.4.4.tgz"; + path = fetchurl { + name = "extract_from_css___extract_from_css_0.4.4.tgz"; + url = "https://registry.yarnpkg.com/extract-from-css/-/extract-from-css-0.4.4.tgz"; + sha1 = "1ea7df2e7c7c6eb9922fa08e8adaea486f6f8f92"; + }; + } + { + 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 = "fast_deep_equal___fast_deep_equal_2.0.1.tgz"; + path = fetchurl { + name = "fast_deep_equal___fast_deep_equal_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz"; + sha1 = "7b05218ddf9667bf7f370bf7fdb2cb15fdd0aa49"; + }; + } + { + name = "fast_glob___fast_glob_2.2.6.tgz"; + path = fetchurl { + name = "fast_glob___fast_glob_2.2.6.tgz"; + url = "https://registry.yarnpkg.com/fast-glob/-/fast-glob-2.2.6.tgz"; + sha1 = "a5d5b697ec8deda468d85a74035290a025a95295"; + }; + } + { + name = "fast_json_stable_stringify___fast_json_stable_stringify_2.0.0.tgz"; + path = fetchurl { + name = "fast_json_stable_stringify___fast_json_stable_stringify_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz"; + sha1 = "d5142c0caee6b1189f87d3a76111064f86c8bbf2"; + }; + } + { + name = "fast_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 = "fastparse___fastparse_1.1.1.tgz"; + path = fetchurl { + name = "fastparse___fastparse_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/fastparse/-/fastparse-1.1.1.tgz"; + sha1 = "d1e2643b38a94d7583b479060e6c4affc94071f8"; + }; + } + { + name = "fault___fault_1.0.2.tgz"; + path = fetchurl { + name = "fault___fault_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/fault/-/fault-1.0.2.tgz"; + sha1 = "c3d0fec202f172a3a4d414042ad2bb5e2a3ffbaa"; + }; + } + { + name = "faye_websocket___faye_websocket_0.10.0.tgz"; + path = fetchurl { + name = "faye_websocket___faye_websocket_0.10.0.tgz"; + url = "https://registry.yarnpkg.com/faye-websocket/-/faye-websocket-0.10.0.tgz"; + sha1 = "4e492f8d04dfb6f89003507f6edbf2d501e7c6f4"; + }; + } + { + name = "faye_websocket___faye_websocket_0.11.1.tgz"; + path = fetchurl { + name = "faye_websocket___faye_websocket_0.11.1.tgz"; + url = "https://registry.yarnpkg.com/faye-websocket/-/faye-websocket-0.11.1.tgz"; + sha1 = "f0efe18c4f56e4f40afc7e06c719fd5ee6188f38"; + }; + } + { + name = "fb_watchman___fb_watchman_2.0.0.tgz"; + path = fetchurl { + name = "fb_watchman___fb_watchman_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/fb-watchman/-/fb-watchman-2.0.0.tgz"; + sha1 = "54e9abf7dfa2f26cd9b1636c588c1afc05de5d58"; + }; + } + { + name = "figgy_pudding___figgy_pudding_3.5.1.tgz"; + path = fetchurl { + name = "figgy_pudding___figgy_pudding_3.5.1.tgz"; + url = "https://registry.yarnpkg.com/figgy-pudding/-/figgy-pudding-3.5.1.tgz"; + sha1 = "862470112901c727a0e495a80744bd5baa1d6790"; + }; + } + { + name = "figures___figures_2.0.0.tgz"; + path = fetchurl { + name = "figures___figures_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/figures/-/figures-2.0.0.tgz"; + sha1 = "3ab1a2d2a62c8bfb431a0c94cb797a2fce27c962"; + }; + } + { + name = "file_entry_cache___file_entry_cache_2.0.0.tgz"; + path = fetchurl { + name = "file_entry_cache___file_entry_cache_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-2.0.0.tgz"; + sha1 = "c392990c3e684783d838b8c84a45d8a048458361"; + }; + } + { + name = "file_entry_cache___file_entry_cache_5.0.1.tgz"; + path = fetchurl { + name = "file_entry_cache___file_entry_cache_5.0.1.tgz"; + url = "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-5.0.1.tgz"; + sha1 = "ca0f6efa6dd3d561333fb14515065c2fafdf439c"; + }; + } + { + name = "file_loader___file_loader_3.0.1.tgz"; + path = fetchurl { + name = "file_loader___file_loader_3.0.1.tgz"; + url = "https://registry.yarnpkg.com/file-loader/-/file-loader-3.0.1.tgz"; + sha1 = "f8e0ba0b599918b51adfe45d66d1e771ad560faa"; + }; + } + { + name = "fileset___fileset_2.0.3.tgz"; + path = fetchurl { + name = "fileset___fileset_2.0.3.tgz"; + url = "https://registry.yarnpkg.com/fileset/-/fileset-2.0.3.tgz"; + sha1 = "8e7548a96d3cc2327ee5e674168723a333bba2a0"; + }; + } + { + name = "filesize___filesize_3.6.1.tgz"; + path = fetchurl { + name = "filesize___filesize_3.6.1.tgz"; + url = "https://registry.yarnpkg.com/filesize/-/filesize-3.6.1.tgz"; + sha1 = "090bb3ee01b6f801a8a8be99d31710b3422bb317"; + }; + } + { + 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 = "finalhandler___finalhandler_1.1.0.tgz"; + path = fetchurl { + name = "finalhandler___finalhandler_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.1.0.tgz"; + sha1 = "ce0b6855b45853e791b2fcc680046d88253dd7f5"; + }; + } + { + name = "finalhandler___finalhandler_1.1.1.tgz"; + path = fetchurl { + name = "finalhandler___finalhandler_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.1.1.tgz"; + sha1 = "eebf4ed840079c83f4249038c9d703008301b105"; + }; + } + { + name = "find_cache_dir___find_cache_dir_2.1.0.tgz"; + path = fetchurl { + name = "find_cache_dir___find_cache_dir_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-2.1.0.tgz"; + sha1 = "8d0f94cd13fe43c6c7c261a0d86115ca918c05f7"; + }; + } + { + name = "find_root___find_root_1.1.0.tgz"; + path = fetchurl { + name = "find_root___find_root_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/find-root/-/find-root-1.1.0.tgz"; + sha1 = "abcfc8ba76f708c42a97b3d685b7e9450bfb9ce4"; + }; + } + { + name = "find_up___find_up_1.1.2.tgz"; + path = fetchurl { + name = "find_up___find_up_1.1.2.tgz"; + url = "https://registry.yarnpkg.com/find-up/-/find-up-1.1.2.tgz"; + sha1 = "6b2e9822b1a2ce0a60ab64d610eccad53cb24d0f"; + }; + } + { + name = "find_up___find_up_2.1.0.tgz"; + path = fetchurl { + name = "find_up___find_up_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/find-up/-/find-up-2.1.0.tgz"; + sha1 = "45d1b7e506c717ddd482775a2b77920a3c0c57a7"; + }; + } + { + name = "find_up___find_up_3.0.0.tgz"; + path = fetchurl { + name = "find_up___find_up_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/find-up/-/find-up-3.0.0.tgz"; + sha1 = "49169f1d7993430646da61ecc5ae355c21c97b73"; + }; + } + { + name = "findup_sync___findup_sync_2.0.0.tgz"; + path = fetchurl { + name = "findup_sync___findup_sync_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/findup-sync/-/findup-sync-2.0.0.tgz"; + sha1 = "9326b1488c22d1a6088650a86901b2d9a90a2cbc"; + }; + } + { + name = "flat_cache___flat_cache_1.2.2.tgz"; + path = fetchurl { + name = "flat_cache___flat_cache_1.2.2.tgz"; + url = "https://registry.yarnpkg.com/flat-cache/-/flat-cache-1.2.2.tgz"; + sha1 = "fa86714e72c21db88601761ecf2f555d1abc6b96"; + }; + } + { + name = "flat_cache___flat_cache_2.0.1.tgz"; + path = fetchurl { + name = "flat_cache___flat_cache_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/flat-cache/-/flat-cache-2.0.1.tgz"; + sha1 = "5d296d6f04bda44a4630a301413bdbc2ec085ec0"; + }; + } + { + name = "flatted___flatted_2.0.0.tgz"; + path = fetchurl { + name = "flatted___flatted_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/flatted/-/flatted-2.0.0.tgz"; + sha1 = "55122b6536ea496b4b44893ee2608141d10d9916"; + }; + } + { + name = "flush_write_stream___flush_write_stream_1.1.1.tgz"; + path = fetchurl { + name = "flush_write_stream___flush_write_stream_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/flush-write-stream/-/flush-write-stream-1.1.1.tgz"; + sha1 = "8dd7d873a1babc207d94ead0c2e0e44276ebf2e8"; + }; + } + { + name = "follow_redirects___follow_redirects_1.5.10.tgz"; + path = fetchurl { + name = "follow_redirects___follow_redirects_1.5.10.tgz"; + url = "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.5.10.tgz"; + sha1 = "7b7a9f9aea2fdff36786a94ff643ed07f4ff5e2a"; + }; + } + { + name = "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 = "format___format_0.2.2.tgz"; + path = fetchurl { + name = "format___format_0.2.2.tgz"; + url = "https://registry.yarnpkg.com/format/-/format-0.2.2.tgz"; + sha1 = "d6170107e9efdc4ed30c9dc39016df942b5cb58b"; + }; + } + { + name = "formdata_polyfill___formdata_polyfill_3.0.11.tgz"; + path = fetchurl { + name = "formdata_polyfill___formdata_polyfill_3.0.11.tgz"; + url = "https://registry.yarnpkg.com/formdata-polyfill/-/formdata-polyfill-3.0.11.tgz"; + sha1 = "c82b4b4bea3356c0a6752219e54ce1edb2a7fb5b"; + }; + } + { + name = "forwarded___forwarded_0.1.2.tgz"; + path = fetchurl { + name = "forwarded___forwarded_0.1.2.tgz"; + url = "https://registry.yarnpkg.com/forwarded/-/forwarded-0.1.2.tgz"; + sha1 = "98c23dab1175657b8c0573e8ceccd91b0ff18c84"; + }; + } + { + 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 = "fresh___fresh_0.5.2.tgz"; + path = fetchurl { + name = "fresh___fresh_0.5.2.tgz"; + url = "https://registry.yarnpkg.com/fresh/-/fresh-0.5.2.tgz"; + sha1 = "3d8cadd90d976569fa835ab1f8e4b23a105605a7"; + }; + } + { + name = "from2___from2_2.3.0.tgz"; + path = fetchurl { + name = "from2___from2_2.3.0.tgz"; + url = "https://registry.yarnpkg.com/from2/-/from2-2.3.0.tgz"; + sha1 = "8bfb5502bde4a4d36cfdeea007fcca21d7e382af"; + }; + } + { + name = "fs_extra___fs_extra_7.0.1.tgz"; + path = fetchurl { + name = "fs_extra___fs_extra_7.0.1.tgz"; + url = "https://registry.yarnpkg.com/fs-extra/-/fs-extra-7.0.1.tgz"; + sha1 = "4f189c44aa123b895f722804f55ea23eadc348e9"; + }; + } + { + name = "fs_minipass___fs_minipass_1.2.6.tgz"; + path = fetchurl { + name = "fs_minipass___fs_minipass_1.2.6.tgz"; + url = "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-1.2.6.tgz"; + sha1 = "2c5cc30ded81282bfe8a0d7c7c1853ddeb102c07"; + }; + } + { + name = "fs_mkdirp_stream___fs_mkdirp_stream_1.0.0.tgz"; + path = fetchurl { + name = "fs_mkdirp_stream___fs_mkdirp_stream_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/fs-mkdirp-stream/-/fs-mkdirp-stream-1.0.0.tgz"; + sha1 = "0b7815fc3201c6a69e14db98ce098c16935259eb"; + }; + } + { + name = "fs_write_stream_atomic___fs_write_stream_atomic_1.0.10.tgz"; + path = fetchurl { + name = "fs_write_stream_atomic___fs_write_stream_atomic_1.0.10.tgz"; + url = "https://registry.yarnpkg.com/fs-write-stream-atomic/-/fs-write-stream-atomic-1.0.10.tgz"; + sha1 = "b47df53493ef911df75731e70a9ded0189db40c9"; + }; + } + { + 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_1.2.9.tgz"; + path = fetchurl { + name = "fsevents___fsevents_1.2.9.tgz"; + url = "https://registry.yarnpkg.com/fsevents/-/fsevents-1.2.9.tgz"; + sha1 = "3f5ed66583ccd6f400b5a00db6f7e861363e388f"; + }; + } + { + name = "fsevents___fsevents_2.0.7.tgz"; + path = fetchurl { + name = "fsevents___fsevents_2.0.7.tgz"; + url = "https://registry.yarnpkg.com/fsevents/-/fsevents-2.0.7.tgz"; + sha1 = "382c9b443c6cbac4c57187cdda23aa3bf1ccfc2a"; + }; + } + { + name = "fstream___fstream_1.0.12.tgz"; + path = fetchurl { + name = "fstream___fstream_1.0.12.tgz"; + url = "https://registry.yarnpkg.com/fstream/-/fstream-1.0.12.tgz"; + sha1 = "4e8ba8ee2d48be4f7d0de505455548eae5932045"; + }; + } + { + 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 = "fuzzaldrin_plus___fuzzaldrin_plus_0.5.0.tgz"; + path = fetchurl { + name = "fuzzaldrin_plus___fuzzaldrin_plus_0.5.0.tgz"; + url = "https://registry.yarnpkg.com/fuzzaldrin-plus/-/fuzzaldrin-plus-0.5.0.tgz"; + sha1 = "ef5f26f0c2fc7e9e9a16ea149a802d6cb4804b1e"; + }; + } + { + name = "gauge___gauge_2.7.4.tgz"; + path = fetchurl { + name = "gauge___gauge_2.7.4.tgz"; + url = "https://registry.yarnpkg.com/gauge/-/gauge-2.7.4.tgz"; + sha1 = "2c03405c7538c39d7eb37b317022e325fb018bf7"; + }; + } + { + name = "gaze___gaze_1.1.3.tgz"; + path = fetchurl { + name = "gaze___gaze_1.1.3.tgz"; + url = "https://registry.yarnpkg.com/gaze/-/gaze-1.1.3.tgz"; + sha1 = "c441733e13b927ac8c0ff0b4c3b033f28812924a"; + }; + } + { + name = "get_caller_file___get_caller_file_1.0.3.tgz"; + path = fetchurl { + name = "get_caller_file___get_caller_file_1.0.3.tgz"; + url = "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-1.0.3.tgz"; + sha1 = "f978fa4c90d1dfe7ff2d6beda2a515e713bdcf4a"; + }; + } + { + name = "get_port___get_port_4.2.0.tgz"; + path = fetchurl { + name = "get_port___get_port_4.2.0.tgz"; + url = "https://registry.yarnpkg.com/get-port/-/get-port-4.2.0.tgz"; + sha1 = "e37368b1e863b7629c43c5a323625f95cf24b119"; + }; + } + { + name = "get_stdin___get_stdin_4.0.1.tgz"; + path = fetchurl { + name = "get_stdin___get_stdin_4.0.1.tgz"; + url = "https://registry.yarnpkg.com/get-stdin/-/get-stdin-4.0.1.tgz"; + sha1 = "b968c6b0a04384324902e8bf1a5df32579a450fe"; + }; + } + { + name = "get_stdin___get_stdin_6.0.0.tgz"; + path = fetchurl { + name = "get_stdin___get_stdin_6.0.0.tgz"; + url = "https://registry.yarnpkg.com/get-stdin/-/get-stdin-6.0.0.tgz"; + sha1 = "9e09bf712b360ab9225e812048f71fde9c89657b"; + }; + } + { + name = "get_stdin___get_stdin_7.0.0.tgz"; + path = fetchurl { + name = "get_stdin___get_stdin_7.0.0.tgz"; + url = "https://registry.yarnpkg.com/get-stdin/-/get-stdin-7.0.0.tgz"; + sha1 = "8d5de98f15171a125c5e516643c7a6d0ea8a96f6"; + }; + } + { + name = "get_stdin___get_stdin_5.0.1.tgz"; + path = fetchurl { + name = "get_stdin___get_stdin_5.0.1.tgz"; + url = "https://registry.yarnpkg.com/get-stdin/-/get-stdin-5.0.1.tgz"; + sha1 = "122e161591e21ff4c52530305693f20e6393a398"; + }; + } + { + name = "get_stream___get_stream_3.0.0.tgz"; + path = fetchurl { + name = "get_stream___get_stream_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/get-stream/-/get-stream-3.0.0.tgz"; + sha1 = "8e943d1358dc37555054ecbe2edb05aa174ede14"; + }; + } + { + name = "get_stream___get_stream_4.1.0.tgz"; + path = fetchurl { + 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_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 = "gettext_extractor_vue___gettext_extractor_vue_4.0.2.tgz"; + path = fetchurl { + name = "gettext_extractor_vue___gettext_extractor_vue_4.0.2.tgz"; + url = "https://registry.yarnpkg.com/gettext-extractor-vue/-/gettext-extractor-vue-4.0.2.tgz"; + sha1 = "16e1cdbdaf37e5bdf3cb0aff63685bdc5e74e906"; + }; + } + { + name = "gettext_extractor___gettext_extractor_3.4.3.tgz"; + path = fetchurl { + name = "gettext_extractor___gettext_extractor_3.4.3.tgz"; + url = "https://registry.yarnpkg.com/gettext-extractor/-/gettext-extractor-3.4.3.tgz"; + sha1 = "882679cefc71888eb6e69297e6b2dc14c0384fef"; + }; + } + { + name = "git_up___git_up_2.1.0.tgz"; + path = fetchurl { + name = "git_up___git_up_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/git-up/-/git-up-2.1.0.tgz"; + sha1 = "2f14cfe78327e7c4a2b92fcac7bfc674fdfad40c"; + }; + } + { + name = "git_url_parse___git_url_parse_10.1.0.tgz"; + path = fetchurl { + name = "git_url_parse___git_url_parse_10.1.0.tgz"; + url = "https://registry.yarnpkg.com/git-url-parse/-/git-url-parse-10.1.0.tgz"; + sha1 = "a27813218f8777e91d15f1c121b83bf14721b67e"; + }; + } + { + name = "github_slugger___github_slugger_1.2.0.tgz"; + path = fetchurl { + name = "github_slugger___github_slugger_1.2.0.tgz"; + url = "https://registry.yarnpkg.com/github-slugger/-/github-slugger-1.2.0.tgz"; + sha1 = "8ada3286fd046d8951c3c952a8d7854cfd90fd9a"; + }; + } + { + name = "github_slugger___github_slugger_1.2.1.tgz"; + path = fetchurl { + name = "github_slugger___github_slugger_1.2.1.tgz"; + url = "https://registry.yarnpkg.com/github-slugger/-/github-slugger-1.2.1.tgz"; + sha1 = "47e904e70bf2dccd0014748142d31126cfd49508"; + }; + } + { + name = "glob_parent___glob_parent_3.1.0.tgz"; + path = fetchurl { + name = "glob_parent___glob_parent_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/glob-parent/-/glob-parent-3.1.0.tgz"; + sha1 = "9e6af6299d8d3bd2bd40430832bd113df906c5ae"; + }; + } + { + name = "glob_parent___glob_parent_5.0.0.tgz"; + path = fetchurl { + name = "glob_parent___glob_parent_5.0.0.tgz"; + url = "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.0.0.tgz"; + sha1 = "1dc99f0f39b006d3e92c2c284068382f0c20e954"; + }; + } + { + name = "glob_stream___glob_stream_6.1.0.tgz"; + path = fetchurl { + name = "glob_stream___glob_stream_6.1.0.tgz"; + url = "https://registry.yarnpkg.com/glob-stream/-/glob-stream-6.1.0.tgz"; + sha1 = "7045c99413b3eb94888d83ab46d0b404cc7bdde4"; + }; + } + { + name = "glob_to_regexp___glob_to_regexp_0.3.0.tgz"; + path = fetchurl { + name = "glob_to_regexp___glob_to_regexp_0.3.0.tgz"; + url = "https://registry.yarnpkg.com/glob-to-regexp/-/glob-to-regexp-0.3.0.tgz"; + sha1 = "8c5a1494d2066c570cc3bfe4496175acc4d502ab"; + }; + } + { + name = "glob_to_regexp___glob_to_regexp_0.4.1.tgz"; + path = fetchurl { + name = "glob_to_regexp___glob_to_regexp_0.4.1.tgz"; + url = "https://registry.yarnpkg.com/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz"; + sha1 = "c75297087c851b9a578bd217dd59a92f59fe546e"; + }; + } + { + name = "glob___glob_7.1.4.tgz"; + path = fetchurl { + name = "glob___glob_7.1.4.tgz"; + url = "https://registry.yarnpkg.com/glob/-/glob-7.1.4.tgz"; + sha1 = "aa608a2f6c577ad357e1ae5a5c26d9a8d1969255"; + }; + } + { + name = "global_dirs___global_dirs_0.1.1.tgz"; + path = fetchurl { + name = "global_dirs___global_dirs_0.1.1.tgz"; + url = "https://registry.yarnpkg.com/global-dirs/-/global-dirs-0.1.1.tgz"; + sha1 = "b319c0dd4607f353f3be9cca4c72fc148c49f445"; + }; + } + { + name = "global_modules_path___global_modules_path_2.3.1.tgz"; + path = fetchurl { + name = "global_modules_path___global_modules_path_2.3.1.tgz"; + url = "https://registry.yarnpkg.com/global-modules-path/-/global-modules-path-2.3.1.tgz"; + sha1 = "e541f4c800a1a8514a990477b267ac67525b9931"; + }; + } + { + name = "global_modules___global_modules_1.0.0.tgz"; + path = fetchurl { + name = "global_modules___global_modules_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/global-modules/-/global-modules-1.0.0.tgz"; + sha1 = "6d770f0eb523ac78164d72b5e71a8877265cc3ea"; + }; + } + { + name = "global_modules___global_modules_2.0.0.tgz"; + path = fetchurl { + name = "global_modules___global_modules_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/global-modules/-/global-modules-2.0.0.tgz"; + sha1 = "997605ad2345f27f51539bea26574421215c7780"; + }; + } + { + name = "global_prefix___global_prefix_1.0.2.tgz"; + path = fetchurl { + name = "global_prefix___global_prefix_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/global-prefix/-/global-prefix-1.0.2.tgz"; + sha1 = "dbf743c6c14992593c655568cb66ed32c0122ebe"; + }; + } + { + name = "global_prefix___global_prefix_3.0.0.tgz"; + path = fetchurl { + name = "global_prefix___global_prefix_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/global-prefix/-/global-prefix-3.0.0.tgz"; + sha1 = "fc85f73064df69f50421f47f883fe5b913ba9b97"; + }; + } + { + name = "globals_docs___globals_docs_2.4.0.tgz"; + path = fetchurl { + name = "globals_docs___globals_docs_2.4.0.tgz"; + url = "https://registry.yarnpkg.com/globals-docs/-/globals-docs-2.4.0.tgz"; + sha1 = "f2c647544eb6161c7c38452808e16e693c2dafbb"; + }; + } + { + 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 = "globby___globby_5.0.0.tgz"; + path = fetchurl { + name = "globby___globby_5.0.0.tgz"; + url = "https://registry.yarnpkg.com/globby/-/globby-5.0.0.tgz"; + sha1 = "ebd84667ca0dbb330b99bcfc68eac2bc54370e0d"; + }; + } + { + name = "globby___globby_6.1.0.tgz"; + path = fetchurl { + name = "globby___globby_6.1.0.tgz"; + url = "https://registry.yarnpkg.com/globby/-/globby-6.1.0.tgz"; + sha1 = "f5a6d70e8395e21c858fb0489d64df02424d506c"; + }; + } + { + name = "globby___globby_7.1.1.tgz"; + path = fetchurl { + name = "globby___globby_7.1.1.tgz"; + url = "https://registry.yarnpkg.com/globby/-/globby-7.1.1.tgz"; + sha1 = "fb2ccff9401f8600945dfada97440cca972b8680"; + }; + } + { + name = "globby___globby_9.2.0.tgz"; + path = fetchurl { + name = "globby___globby_9.2.0.tgz"; + url = "https://registry.yarnpkg.com/globby/-/globby-9.2.0.tgz"; + sha1 = "fd029a706c703d29bdd170f4b6db3a3f7a7cb63d"; + }; + } + { + name = "globjoin___globjoin_0.1.4.tgz"; + path = fetchurl { + name = "globjoin___globjoin_0.1.4.tgz"; + url = "https://registry.yarnpkg.com/globjoin/-/globjoin-0.1.4.tgz"; + sha1 = "2f4494ac8919e3767c5cbb691e9f463324285d43"; + }; + } + { + name = "globule___globule_1.2.1.tgz"; + path = fetchurl { + name = "globule___globule_1.2.1.tgz"; + url = "https://registry.yarnpkg.com/globule/-/globule-1.2.1.tgz"; + sha1 = "5dffb1b191f22d20797a9369b49eab4e9839696d"; + }; + } + { + name = "gonzales_pe___gonzales_pe_4.2.3.tgz"; + path = fetchurl { + name = "gonzales_pe___gonzales_pe_4.2.3.tgz"; + url = "https://registry.yarnpkg.com/gonzales-pe/-/gonzales-pe-4.2.3.tgz"; + sha1 = "41091703625433285e0aee3aa47829fc1fbeb6f2"; + }; + } + { + name = "good_listener___good_listener_1.2.2.tgz"; + path = fetchurl { + name = "good_listener___good_listener_1.2.2.tgz"; + url = "https://registry.yarnpkg.com/good-listener/-/good-listener-1.2.2.tgz"; + sha1 = "d53b30cdf9313dffb7dc9a0d477096aa6d145c50"; + }; + } + { + name = "got___got_6.7.1.tgz"; + path = fetchurl { + name = "got___got_6.7.1.tgz"; + url = "https://registry.yarnpkg.com/got/-/got-6.7.1.tgz"; + sha1 = "240cd05785a9a18e561dc1b44b41c763ef1e8db0"; + }; + } + { + name = "got___got_8.3.0.tgz"; + path = fetchurl { + name = "got___got_8.3.0.tgz"; + url = "https://registry.yarnpkg.com/got/-/got-8.3.0.tgz"; + sha1 = "6ba26e75f8a6cc4c6b3eb1fe7ce4fec7abac8533"; + }; + } + { + name = "graceful_fs___graceful_fs_4.2.0.tgz"; + path = fetchurl { + name = "graceful_fs___graceful_fs_4.2.0.tgz"; + url = "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.0.tgz"; + sha1 = "8d8fdc73977cb04104721cb53666c1ca64cd328b"; + }; + } + { + name = "graceful_readlink___graceful_readlink_1.0.1.tgz"; + path = fetchurl { + name = "graceful_readlink___graceful_readlink_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/graceful-readlink/-/graceful-readlink-1.0.1.tgz"; + sha1 = "4cafad76bc62f02fa039b2f94e9a3dd3a391a725"; + }; + } + { + name = "graphlibrary___graphlibrary_2.2.0.tgz"; + path = fetchurl { + name = "graphlibrary___graphlibrary_2.2.0.tgz"; + url = "https://registry.yarnpkg.com/graphlibrary/-/graphlibrary-2.2.0.tgz"; + sha1 = "017a14899775228dec4497a39babfdd6bf56eac6"; + }; + } + { + name = "graphql_tag___graphql_tag_2.10.0.tgz"; + path = fetchurl { + name = "graphql_tag___graphql_tag_2.10.0.tgz"; + url = "https://registry.yarnpkg.com/graphql-tag/-/graphql-tag-2.10.0.tgz"; + sha1 = "87da024be863e357551b2b8700e496ee2d4353ae"; + }; + } + { + name = "graphql___graphql_14.0.2.tgz"; + path = fetchurl { + name = "graphql___graphql_14.0.2.tgz"; + url = "https://registry.yarnpkg.com/graphql/-/graphql-14.0.2.tgz"; + sha1 = "7dded337a4c3fd2d075692323384034b357f5650"; + }; + } + { + 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 = "gzip_size___gzip_size_5.0.0.tgz"; + path = fetchurl { + name = "gzip_size___gzip_size_5.0.0.tgz"; + url = "https://registry.yarnpkg.com/gzip-size/-/gzip-size-5.0.0.tgz"; + sha1 = "a55ecd99222f4c48fd8c01c625ce3b349d0a0e80"; + }; + } + { + name = "handle_thing___handle_thing_2.0.0.tgz"; + path = fetchurl { + name = "handle_thing___handle_thing_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/handle-thing/-/handle-thing-2.0.0.tgz"; + sha1 = "0e039695ff50c93fc288557d696f3c1dc6776754"; + }; + } + { + name = "handlebars___handlebars_4.1.2.tgz"; + path = fetchurl { + name = "handlebars___handlebars_4.1.2.tgz"; + url = "https://registry.yarnpkg.com/handlebars/-/handlebars-4.1.2.tgz"; + sha1 = "b6b37c1ced0306b221e094fc7aca3ec23b131b67"; + }; + } + { + 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.3.tgz"; + path = fetchurl { + name = "har_validator___har_validator_5.1.3.tgz"; + url = "https://registry.yarnpkg.com/har-validator/-/har-validator-5.1.3.tgz"; + sha1 = "1ef89ebd3e4996557675eed9893110dc350fa080"; + }; + } + { + name = "has_ansi___has_ansi_2.0.0.tgz"; + path = fetchurl { + name = "has_ansi___has_ansi_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/has-ansi/-/has-ansi-2.0.0.tgz"; + sha1 = "34f5049ce1ecdf2b0649af3ef24e45ed35416d91"; + }; + } + { + name = "has_binary2___has_binary2_1.0.2.tgz"; + path = fetchurl { + name = "has_binary2___has_binary2_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/has-binary2/-/has-binary2-1.0.2.tgz"; + sha1 = "e83dba49f0b9be4d026d27365350d9f03f54be98"; + }; + } + { + name = "has_cors___has_cors_1.1.0.tgz"; + path = fetchurl { + name = "has_cors___has_cors_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/has-cors/-/has-cors-1.1.0.tgz"; + sha1 = "5e474793f7ea9843d1bb99c23eef49ff126fff39"; + }; + } + { + 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_symbol_support_x___has_symbol_support_x_1.3.0.tgz"; + path = fetchurl { + name = "has_symbol_support_x___has_symbol_support_x_1.3.0.tgz"; + url = "https://registry.yarnpkg.com/has-symbol-support-x/-/has-symbol-support-x-1.3.0.tgz"; + sha1 = "588bd6927eaa0e296afae24160659167fc2be4f8"; + }; + } + { + name = "has_symbols___has_symbols_1.0.0.tgz"; + path = fetchurl { + name = "has_symbols___has_symbols_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.0.tgz"; + sha1 = "ba1a8f1af2a0fc39650f5c850367704122063b44"; + }; + } + { + name = "has_to_string_tag_x___has_to_string_tag_x_1.3.0.tgz"; + path = fetchurl { + name = "has_to_string_tag_x___has_to_string_tag_x_1.3.0.tgz"; + url = "https://registry.yarnpkg.com/has-to-string-tag-x/-/has-to-string-tag-x-1.3.0.tgz"; + sha1 = "78e3d98c3c0ec9413e970eb8d766249a1e13058f"; + }; + } + { + name = "has_unicode___has_unicode_2.0.1.tgz"; + path = fetchurl { + name = "has_unicode___has_unicode_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz"; + sha1 = "e0e6fe6a28cf51138855e086d1691e771de2a8b9"; + }; + } + { + 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___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 = "hash_base___hash_base_2.0.2.tgz"; + path = fetchurl { + name = "hash_base___hash_base_2.0.2.tgz"; + url = "https://registry.yarnpkg.com/hash-base/-/hash-base-2.0.2.tgz"; + sha1 = "66ea1d856db4e8a5470cadf6fce23ae5244ef2e1"; + }; + } + { + name = "hash_base___hash_base_3.0.4.tgz"; + path = fetchurl { + name = "hash_base___hash_base_3.0.4.tgz"; + url = "https://registry.yarnpkg.com/hash-base/-/hash-base-3.0.4.tgz"; + sha1 = "5fc8686847ecd73499403319a6b0a3f3f6ae4918"; + }; + } + { + name = "hash_sum___hash_sum_1.0.2.tgz"; + path = fetchurl { + name = "hash_sum___hash_sum_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/hash-sum/-/hash-sum-1.0.2.tgz"; + sha1 = "33b40777754c6432573c120cc3808bbd10d47f04"; + }; + } + { + name = "hash.js___hash.js_1.1.3.tgz"; + path = fetchurl { + name = "hash.js___hash.js_1.1.3.tgz"; + url = "https://registry.yarnpkg.com/hash.js/-/hash.js-1.1.3.tgz"; + sha1 = "340dedbe6290187151c1ea1d777a3448935df846"; + }; + } + { + name = "hast_util_is_element___hast_util_is_element_1.0.3.tgz"; + path = fetchurl { + name = "hast_util_is_element___hast_util_is_element_1.0.3.tgz"; + url = "https://registry.yarnpkg.com/hast-util-is-element/-/hast-util-is-element-1.0.3.tgz"; + sha1 = "423b4b26fe8bf1f25950fe052e9ce8f83fd5f6a4"; + }; + } + { + name = "hast_util_sanitize___hast_util_sanitize_1.3.1.tgz"; + path = fetchurl { + name = "hast_util_sanitize___hast_util_sanitize_1.3.1.tgz"; + url = "https://registry.yarnpkg.com/hast-util-sanitize/-/hast-util-sanitize-1.3.1.tgz"; + sha1 = "4e60d66336bd67e52354d581967467029a933f2e"; + }; + } + { + name = "hast_util_to_html___hast_util_to_html_4.0.1.tgz"; + path = fetchurl { + name = "hast_util_to_html___hast_util_to_html_4.0.1.tgz"; + url = "https://registry.yarnpkg.com/hast-util-to-html/-/hast-util-to-html-4.0.1.tgz"; + sha1 = "3666b05afb62bd69f8f5e6c94db04dea19438e2a"; + }; + } + { + name = "hast_util_whitespace___hast_util_whitespace_1.0.3.tgz"; + path = fetchurl { + name = "hast_util_whitespace___hast_util_whitespace_1.0.3.tgz"; + url = "https://registry.yarnpkg.com/hast-util-whitespace/-/hast-util-whitespace-1.0.3.tgz"; + sha1 = "6d161b307bd0693b5ec000c7c7e8b5445109ee34"; + }; + } + { + name = "he___he_1.2.0.tgz"; + path = fetchurl { + name = "he___he_1.2.0.tgz"; + url = "https://registry.yarnpkg.com/he/-/he-1.2.0.tgz"; + sha1 = "84ae65fa7eafb165fddb61566ae14baf05664f0f"; + }; + } + { + name = "highlight.js___highlight.js_9.15.8.tgz"; + path = fetchurl { + name = "highlight.js___highlight.js_9.15.8.tgz"; + url = "https://registry.yarnpkg.com/highlight.js/-/highlight.js-9.15.8.tgz"; + sha1 = "f344fda123f36f1a65490e932cf90569e4999971"; + }; + } + { + name = "highlight.js___highlight.js_9.13.1.tgz"; + path = fetchurl { + name = "highlight.js___highlight.js_9.13.1.tgz"; + url = "https://registry.yarnpkg.com/highlight.js/-/highlight.js-9.13.1.tgz"; + sha1 = "054586d53a6863311168488a0f58d6c505ce641e"; + }; + } + { + name = "hmac_drbg___hmac_drbg_1.0.1.tgz"; + path = fetchurl { + name = "hmac_drbg___hmac_drbg_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/hmac-drbg/-/hmac-drbg-1.0.1.tgz"; + sha1 = "d2745701025a6c775a6c545793ed502fc0c649a1"; + }; + } + { + name = "homedir_polyfill___homedir_polyfill_1.0.1.tgz"; + path = fetchurl { + name = "homedir_polyfill___homedir_polyfill_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/homedir-polyfill/-/homedir-polyfill-1.0.1.tgz"; + sha1 = "4c2bbc8a758998feebf5ed68580f76d46768b4bc"; + }; + } + { + name = "hoopy___hoopy_0.1.4.tgz"; + path = fetchurl { + name = "hoopy___hoopy_0.1.4.tgz"; + url = "https://registry.yarnpkg.com/hoopy/-/hoopy-0.1.4.tgz"; + sha1 = "609207d661100033a9a9402ad3dea677381c1b1d"; + }; + } + { + name = "hosted_git_info___hosted_git_info_2.2.0.tgz"; + path = fetchurl { + name = "hosted_git_info___hosted_git_info_2.2.0.tgz"; + url = "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.2.0.tgz"; + sha1 = "7a0d097863d886c0fabbdcd37bf1758d8becf8a5"; + }; + } + { + name = "hpack.js___hpack.js_2.1.6.tgz"; + path = fetchurl { + name = "hpack.js___hpack.js_2.1.6.tgz"; + url = "https://registry.yarnpkg.com/hpack.js/-/hpack.js-2.1.6.tgz"; + sha1 = "87774c0949e513f42e84575b3c45681fade2a0b2"; + }; + } + { + name = "html_encoding_sniffer___html_encoding_sniffer_1.0.2.tgz"; + path = fetchurl { + name = "html_encoding_sniffer___html_encoding_sniffer_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/html-encoding-sniffer/-/html-encoding-sniffer-1.0.2.tgz"; + sha1 = "e70d84b94da53aa375e11fe3a351be6642ca46f8"; + }; + } + { + name = "html_entities___html_entities_1.2.0.tgz"; + path = fetchurl { + name = "html_entities___html_entities_1.2.0.tgz"; + url = "https://registry.yarnpkg.com/html-entities/-/html-entities-1.2.0.tgz"; + sha1 = "41948caf85ce82fed36e4e6a0ed371a6664379e2"; + }; + } + { + name = "html_minifier___html_minifier_4.0.0.tgz"; + path = fetchurl { + name = "html_minifier___html_minifier_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/html-minifier/-/html-minifier-4.0.0.tgz"; + sha1 = "cca9aad8bce1175e02e17a8c33e46d8988889f56"; + }; + } + { + name = "html_tags___html_tags_3.0.0.tgz"; + path = fetchurl { + name = "html_tags___html_tags_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/html-tags/-/html-tags-3.0.0.tgz"; + sha1 = "41f57708c9e6b7b46a00a22317d614c4a2bab166"; + }; + } + { + name = "html_void_elements___html_void_elements_1.0.4.tgz"; + path = fetchurl { + name = "html_void_elements___html_void_elements_1.0.4.tgz"; + url = "https://registry.yarnpkg.com/html-void-elements/-/html-void-elements-1.0.4.tgz"; + sha1 = "95e8bb5ecd6b88766569c2645f2b5f1591db9ba5"; + }; + } + { + name = "htmlparser2___htmlparser2_3.10.0.tgz"; + path = fetchurl { + name = "htmlparser2___htmlparser2_3.10.0.tgz"; + url = "https://registry.yarnpkg.com/htmlparser2/-/htmlparser2-3.10.0.tgz"; + sha1 = "5f5e422dcf6119c0d983ed36260ce9ded0bee464"; + }; + } + { + name = "http_cache_semantics___http_cache_semantics_3.8.1.tgz"; + path = fetchurl { + name = "http_cache_semantics___http_cache_semantics_3.8.1.tgz"; + url = "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-3.8.1.tgz"; + sha1 = "39b0e16add9b605bf0a9ef3d9daaf4843b4cacd2"; + }; + } + { + name = "http_deceiver___http_deceiver_1.2.7.tgz"; + path = fetchurl { + name = "http_deceiver___http_deceiver_1.2.7.tgz"; + url = "https://registry.yarnpkg.com/http-deceiver/-/http-deceiver-1.2.7.tgz"; + sha1 = "fa7168944ab9a519d337cb0bec7284dc3e723d87"; + }; + } + { + name = "http_errors___http_errors_1.6.2.tgz"; + path = fetchurl { + name = "http_errors___http_errors_1.6.2.tgz"; + url = "https://registry.yarnpkg.com/http-errors/-/http-errors-1.6.2.tgz"; + sha1 = "0a002cc85707192a7e7946ceedc11155f60ec736"; + }; + } + { + name = "http_proxy_middleware___http_proxy_middleware_0.18.0.tgz"; + path = fetchurl { + name = "http_proxy_middleware___http_proxy_middleware_0.18.0.tgz"; + url = "https://registry.yarnpkg.com/http-proxy-middleware/-/http-proxy-middleware-0.18.0.tgz"; + sha1 = "0987e6bb5a5606e5a69168d8f967a87f15dd8aab"; + }; + } + { + name = "http_proxy___http_proxy_1.16.2.tgz"; + path = fetchurl { + name = "http_proxy___http_proxy_1.16.2.tgz"; + url = "https://registry.yarnpkg.com/http-proxy/-/http-proxy-1.16.2.tgz"; + sha1 = "06dff292952bf64dbe8471fa9df73066d4f37742"; + }; + } + { + 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 = "https_browserify___https_browserify_1.0.0.tgz"; + path = fetchurl { + name = "https_browserify___https_browserify_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/https-browserify/-/https-browserify-1.0.0.tgz"; + sha1 = "ec06c10e0a34c0f2faf199f7fd7fc78fffd03c73"; + }; + } + { + 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.4.19.tgz"; + path = fetchurl { + name = "iconv_lite___iconv_lite_0.4.19.tgz"; + url = "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.19.tgz"; + sha1 = "f7468f60135f5e5dad3399c0a81be9a1603a082b"; + }; + } + { + name = "icss_replace_symbols___icss_replace_symbols_1.1.0.tgz"; + path = fetchurl { + name = "icss_replace_symbols___icss_replace_symbols_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/icss-replace-symbols/-/icss-replace-symbols-1.1.0.tgz"; + sha1 = "06ea6f83679a7749e386cfe1fe812ae5db223ded"; + }; + } + { + name = "icss_utils___icss_utils_2.1.0.tgz"; + path = fetchurl { + name = "icss_utils___icss_utils_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/icss-utils/-/icss-utils-2.1.0.tgz"; + sha1 = "83f0a0ec378bf3246178b6c2ad9136f135b1c962"; + }; + } + { + name = "ieee754___ieee754_1.1.8.tgz"; + path = fetchurl { + name = "ieee754___ieee754_1.1.8.tgz"; + url = "https://registry.yarnpkg.com/ieee754/-/ieee754-1.1.8.tgz"; + sha1 = "be33d40ac10ef1926701f6f08a2d86fbfd1ad3e4"; + }; + } + { + name = "iferr___iferr_0.1.5.tgz"; + path = fetchurl { + name = "iferr___iferr_0.1.5.tgz"; + url = "https://registry.yarnpkg.com/iferr/-/iferr-0.1.5.tgz"; + sha1 = "c60eed69e6d8fdb6b3104a1fcbca1c192dc5b501"; + }; + } + { + name = "ignore_by_default___ignore_by_default_1.0.1.tgz"; + path = fetchurl { + name = "ignore_by_default___ignore_by_default_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/ignore-by-default/-/ignore-by-default-1.0.1.tgz"; + sha1 = "48ca6d72f6c6a3af00a9ad4ae6876be3889e2b09"; + }; + } + { + name = "ignore_walk___ignore_walk_3.0.1.tgz"; + path = fetchurl { + name = "ignore_walk___ignore_walk_3.0.1.tgz"; + url = "https://registry.yarnpkg.com/ignore-walk/-/ignore-walk-3.0.1.tgz"; + sha1 = "a83e62e7d272ac0e3b551aaa82831a19b69f82f8"; + }; + } + { + name = "ignore___ignore_3.3.10.tgz"; + path = fetchurl { + name = "ignore___ignore_3.3.10.tgz"; + url = "https://registry.yarnpkg.com/ignore/-/ignore-3.3.10.tgz"; + sha1 = "0a97fb876986e8081c631160f8f9f389157f0043"; + }; + } + { + 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 = "ignore___ignore_5.1.2.tgz"; + path = fetchurl { + name = "ignore___ignore_5.1.2.tgz"; + url = "https://registry.yarnpkg.com/ignore/-/ignore-5.1.2.tgz"; + sha1 = "e28e584d43ad7e92f96995019cc43b9e1ac49558"; + }; + } + { + name = "immediate___immediate_3.0.6.tgz"; + path = fetchurl { + name = "immediate___immediate_3.0.6.tgz"; + url = "https://registry.yarnpkg.com/immediate/-/immediate-3.0.6.tgz"; + sha1 = "9db1dbd0faf8de6fbe0f5dd5e56bb606280de69b"; + }; + } + { + name = "immutable_tuple___immutable_tuple_0.4.9.tgz"; + path = fetchurl { + name = "immutable_tuple___immutable_tuple_0.4.9.tgz"; + url = "https://registry.yarnpkg.com/immutable-tuple/-/immutable-tuple-0.4.9.tgz"; + sha1 = "473ebdd6c169c461913a454bf87ef8f601a20ff0"; + }; + } + { + name = "import_fresh___import_fresh_2.0.0.tgz"; + path = fetchurl { + name = "import_fresh___import_fresh_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/import-fresh/-/import-fresh-2.0.0.tgz"; + sha1 = "d81355c15612d386c61f9ddd3922d4304822a546"; + }; + } + { + 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_lazy___import_lazy_4.0.0.tgz"; + path = fetchurl { + name = "import_lazy___import_lazy_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/import-lazy/-/import-lazy-4.0.0.tgz"; + sha1 = "e8eb627483a0a43da3c03f3e35548be5cb0cc153"; + }; + } + { + name = "import_local___import_local_2.0.0.tgz"; + path = fetchurl { + name = "import_local___import_local_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/import-local/-/import-local-2.0.0.tgz"; + sha1 = "55070be38a5993cf18ef6db7e961f5bee5c5a09d"; + }; + } + { + name = "imports_loader___imports_loader_0.8.0.tgz"; + path = fetchurl { + name = "imports_loader___imports_loader_0.8.0.tgz"; + url = "https://registry.yarnpkg.com/imports-loader/-/imports-loader-0.8.0.tgz"; + sha1 = "030ea51b8ca05977c40a3abfd9b4088fe0be9a69"; + }; + } + { + 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 = "in_publish___in_publish_2.0.0.tgz"; + path = fetchurl { + name = "in_publish___in_publish_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/in-publish/-/in-publish-2.0.0.tgz"; + sha1 = "e20ff5e3a2afc2690320b6dc552682a9c7fadf51"; + }; + } + { + name = "indent_string___indent_string_2.1.0.tgz"; + path = fetchurl { + name = "indent_string___indent_string_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/indent-string/-/indent-string-2.1.0.tgz"; + sha1 = "8e2d48348742121b4a8218b7a137e9a52049dc80"; + }; + } + { + name = "indent_string___indent_string_3.2.0.tgz"; + path = fetchurl { + name = "indent_string___indent_string_3.2.0.tgz"; + url = "https://registry.yarnpkg.com/indent-string/-/indent-string-3.2.0.tgz"; + sha1 = "4a5fd6d27cc332f37e5419a504dbb837105c9289"; + }; + } + { + name = "indexes_of___indexes_of_1.0.1.tgz"; + path = fetchurl { + name = "indexes_of___indexes_of_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/indexes-of/-/indexes-of-1.0.1.tgz"; + sha1 = "f30f716c8e2bd346c7b67d3df3915566a7c05607"; + }; + } + { + name = "indexof___indexof_0.0.1.tgz"; + path = fetchurl { + name = "indexof___indexof_0.0.1.tgz"; + url = "https://registry.yarnpkg.com/indexof/-/indexof-0.0.1.tgz"; + sha1 = "82dc336d232b9062179d05ab3293a66059fd435d"; + }; + } + { + 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.3.tgz"; + path = fetchurl { + name = "inherits___inherits_2.0.3.tgz"; + url = "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz"; + sha1 = "633c2c83e3da42a502f52466022480f4208261de"; + }; + } + { + name = "inherits___inherits_2.0.1.tgz"; + path = fetchurl { + name = "inherits___inherits_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/inherits/-/inherits-2.0.1.tgz"; + sha1 = "b17d08d326b4423e568eff719f91b0b1cbdf69f1"; + }; + } + { + name = "ini___ini_1.3.5.tgz"; + path = fetchurl { + name = "ini___ini_1.3.5.tgz"; + url = "https://registry.yarnpkg.com/ini/-/ini-1.3.5.tgz"; + sha1 = "eee25f56db1c9ec6085e0c22778083f596abf927"; + }; + } + { + name = "inquirer___inquirer_6.2.0.tgz"; + path = fetchurl { + name = "inquirer___inquirer_6.2.0.tgz"; + url = "https://registry.yarnpkg.com/inquirer/-/inquirer-6.2.0.tgz"; + sha1 = "51adcd776f661369dc1e894859c2560a224abdd8"; + }; + } + { + name = "internal_ip___internal_ip_3.0.1.tgz"; + path = fetchurl { + name = "internal_ip___internal_ip_3.0.1.tgz"; + url = "https://registry.yarnpkg.com/internal-ip/-/internal-ip-3.0.1.tgz"; + sha1 = "df5c99876e1d2eb2ea2d74f520e3f669a00ece27"; + }; + } + { + name = "interpret___interpret_1.1.0.tgz"; + path = fetchurl { + name = "interpret___interpret_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/interpret/-/interpret-1.1.0.tgz"; + sha1 = "7ed1b1410c6a0e0f78cf95d3b8440c63f78b8614"; + }; + } + { + name = "into_stream___into_stream_3.1.0.tgz"; + path = fetchurl { + name = "into_stream___into_stream_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/into-stream/-/into-stream-3.1.0.tgz"; + sha1 = "96fb0a936c12babd6ff1752a17d05616abd094c6"; + }; + } + { + name = "invariant___invariant_2.2.4.tgz"; + path = fetchurl { + name = "invariant___invariant_2.2.4.tgz"; + url = "https://registry.yarnpkg.com/invariant/-/invariant-2.2.4.tgz"; + sha1 = "610f3c92c9359ce1db616e538008d23ff35158e6"; + }; + } + { + name = "invert_kv___invert_kv_1.0.0.tgz"; + path = fetchurl { + name = "invert_kv___invert_kv_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/invert-kv/-/invert-kv-1.0.0.tgz"; + sha1 = "104a8e4aaca6d3d8cd157a8ef8bfab2d7a3ffdb6"; + }; + } + { + name = "invert_kv___invert_kv_2.0.0.tgz"; + path = fetchurl { + name = "invert_kv___invert_kv_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/invert-kv/-/invert-kv-2.0.0.tgz"; + sha1 = "7393f5afa59ec9ff5f67a27620d11c226e3eec02"; + }; + } + { + 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 = "ip___ip_1.1.5.tgz"; + path = fetchurl { + name = "ip___ip_1.1.5.tgz"; + url = "https://registry.yarnpkg.com/ip/-/ip-1.1.5.tgz"; + sha1 = "bdded70114290828c0a039e72ef25f5aaec4354a"; + }; + } + { + name = "ipaddr.js___ipaddr.js_1.8.0.tgz"; + path = fetchurl { + name = "ipaddr.js___ipaddr.js_1.8.0.tgz"; + url = "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.8.0.tgz"; + sha1 = "eaa33d6ddd7ace8f7f6fe0c9ca0440e706738b1e"; + }; + } + { + name = "is_absolute___is_absolute_1.0.0.tgz"; + path = fetchurl { + name = "is_absolute___is_absolute_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/is-absolute/-/is-absolute-1.0.0.tgz"; + sha1 = "395e1ae84b11f26ad1795e73c17378e48a301576"; + }; + } + { + 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_alphabetical___is_alphabetical_1.0.2.tgz"; + path = fetchurl { + name = "is_alphabetical___is_alphabetical_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/is-alphabetical/-/is-alphabetical-1.0.2.tgz"; + sha1 = "1fa6e49213cb7885b75d15862fb3f3d96c884f41"; + }; + } + { + name = "is_alphanumeric___is_alphanumeric_1.0.0.tgz"; + path = fetchurl { + name = "is_alphanumeric___is_alphanumeric_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/is-alphanumeric/-/is-alphanumeric-1.0.0.tgz"; + sha1 = "4a9cef71daf4c001c1d81d63d140cf53fd6889f4"; + }; + } + { + name = "is_alphanumerical___is_alphanumerical_1.0.2.tgz"; + path = fetchurl { + name = "is_alphanumerical___is_alphanumerical_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/is-alphanumerical/-/is-alphanumerical-1.0.2.tgz"; + sha1 = "1138e9ae5040158dc6ff76b820acd6b7a181fd40"; + }; + } + { + 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_binary_path___is_binary_path_1.0.1.tgz"; + path = fetchurl { + name = "is_binary_path___is_binary_path_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/is-binary-path/-/is-binary-path-1.0.1.tgz"; + sha1 = "75f16642b480f187a711c814161fd3a4a7655898"; + }; + } + { + name = "is_binary_path___is_binary_path_2.1.0.tgz"; + path = fetchurl { + name = "is_binary_path___is_binary_path_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/is-binary-path/-/is-binary-path-2.1.0.tgz"; + sha1 = "ea1f7f3b80f064236e83470f86c09c254fb45b09"; + }; + } + { + 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_buffer___is_buffer_2.0.3.tgz"; + path = fetchurl { + name = "is_buffer___is_buffer_2.0.3.tgz"; + url = "https://registry.yarnpkg.com/is-buffer/-/is-buffer-2.0.3.tgz"; + sha1 = "4ecf3fcf749cbd1e472689e109ac66261a25e725"; + }; + } + { + name = "is_callable___is_callable_1.1.4.tgz"; + path = fetchurl { + name = "is_callable___is_callable_1.1.4.tgz"; + url = "https://registry.yarnpkg.com/is-callable/-/is-callable-1.1.4.tgz"; + sha1 = "1e1adf219e1eeb684d691f9d6a05ff0d30a24d75"; + }; + } + { + name = "is_ci___is_ci_1.2.1.tgz"; + path = fetchurl { + name = "is_ci___is_ci_1.2.1.tgz"; + url = "https://registry.yarnpkg.com/is-ci/-/is-ci-1.2.1.tgz"; + sha1 = "e3779c8ee17fccf428488f6e281187f2e632841c"; + }; + } + { + name = "is_ci___is_ci_2.0.0.tgz"; + path = fetchurl { + 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_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_date_object___is_date_object_1.0.1.tgz"; + path = fetchurl { + name = "is_date_object___is_date_object_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.1.tgz"; + sha1 = "9aa20eb6aeebbff77fbd33e74ca01b33581d3a16"; + }; + } + { + name = "is_decimal___is_decimal_1.0.2.tgz"; + path = fetchurl { + name = "is_decimal___is_decimal_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/is-decimal/-/is-decimal-1.0.2.tgz"; + sha1 = "894662d6a8709d307f3a276ca4339c8fa5dff0ff"; + }; + } + { + 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_directory___is_directory_0.3.1.tgz"; + path = fetchurl { + name = "is_directory___is_directory_0.3.1.tgz"; + url = "https://registry.yarnpkg.com/is-directory/-/is-directory-0.3.1.tgz"; + sha1 = "61339b6f2475fc772fd9c9d83f5c8575dc154ae1"; + }; + } + { + 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_finite___is_finite_1.0.2.tgz"; + path = fetchurl { + name = "is_finite___is_finite_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/is-finite/-/is-finite-1.0.2.tgz"; + sha1 = "cc6677695602be550ef11e8b4aa6305342b6d0aa"; + }; + } + { + name = "is_fullwidth_code_point___is_fullwidth_code_point_1.0.0.tgz"; + path = fetchurl { + name = "is_fullwidth_code_point___is_fullwidth_code_point_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz"; + sha1 = "ef9e31386f031a7f0d643af82fde50c457ef00cb"; + }; + } + { + 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_3.1.0.tgz"; + path = fetchurl { + name = "is_glob___is_glob_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/is-glob/-/is-glob-3.1.0.tgz"; + sha1 = "7ba5ae24217804ac70707b96922567486cc3e84a"; + }; + } + { + 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_hexadecimal___is_hexadecimal_1.0.2.tgz"; + path = fetchurl { + name = "is_hexadecimal___is_hexadecimal_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/is-hexadecimal/-/is-hexadecimal-1.0.2.tgz"; + sha1 = "b6e710d7d07bb66b98cb8cece5c9b4921deeb835"; + }; + } + { + name = "is_installed_globally___is_installed_globally_0.1.0.tgz"; + path = fetchurl { + name = "is_installed_globally___is_installed_globally_0.1.0.tgz"; + url = "https://registry.yarnpkg.com/is-installed-globally/-/is-installed-globally-0.1.0.tgz"; + sha1 = "0dfd98f5a9111716dd535dda6492f67bf3d25a80"; + }; + } + { + name = "is_negated_glob___is_negated_glob_1.0.0.tgz"; + path = fetchurl { + name = "is_negated_glob___is_negated_glob_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/is-negated-glob/-/is-negated-glob-1.0.0.tgz"; + sha1 = "6910bca5da8c95e784b5751b976cf5a10fee36d2"; + }; + } + { + name = "is_npm___is_npm_1.0.0.tgz"; + path = fetchurl { + name = "is_npm___is_npm_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/is-npm/-/is-npm-1.0.0.tgz"; + sha1 = "f2fb63a65e4905b406c86072765a1a4dc793b9f4"; + }; + } + { + name = "is_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_1.0.1.tgz"; + path = fetchurl { + name = "is_obj___is_obj_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/is-obj/-/is-obj-1.0.1.tgz"; + sha1 = "3e4729ac1f5fde025cd7d83a896dab9f4f67db0f"; + }; + } + { + name = "is_object___is_object_1.0.1.tgz"; + path = fetchurl { + name = "is_object___is_object_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/is-object/-/is-object-1.0.1.tgz"; + sha1 = "8952688c5ec2ffd6b03ecc85e769e02903083470"; + }; + } + { + name = "is_path_cwd___is_path_cwd_1.0.0.tgz"; + path = fetchurl { + name = "is_path_cwd___is_path_cwd_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/is-path-cwd/-/is-path-cwd-1.0.0.tgz"; + sha1 = "d225ec23132e89edd38fda767472e62e65f1106d"; + }; + } + { + name = "is_path_in_cwd___is_path_in_cwd_1.0.0.tgz"; + path = fetchurl { + name = "is_path_in_cwd___is_path_in_cwd_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/is-path-in-cwd/-/is-path-in-cwd-1.0.0.tgz"; + sha1 = "6477582b8214d602346094567003be8a9eac04dc"; + }; + } + { + name = "is_path_inside___is_path_inside_1.0.0.tgz"; + path = fetchurl { + name = "is_path_inside___is_path_inside_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-1.0.0.tgz"; + sha1 = "fc06e5a1683fbda13de667aff717bbc10a48f37f"; + }; + } + { + name = "is_plain_obj___is_plain_obj_1.1.0.tgz"; + path = fetchurl { + name = "is_plain_obj___is_plain_obj_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-1.1.0.tgz"; + sha1 = "71a50c8429dfca773c92a390a4a03b39fcd51d3e"; + }; + } + { + 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_promise___is_promise_2.1.0.tgz"; + path = fetchurl { + name = "is_promise___is_promise_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/is-promise/-/is-promise-2.1.0.tgz"; + sha1 = "79a2a9ece7f096e80f36d2b2f3bc16c1ff4bf3fa"; + }; + } + { + name = "is_redirect___is_redirect_1.0.0.tgz"; + path = fetchurl { + name = "is_redirect___is_redirect_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/is-redirect/-/is-redirect-1.0.0.tgz"; + sha1 = "1d03dded53bd8db0f30c26e4f95d36fc7c87dc24"; + }; + } + { + name = "is_regex___is_regex_1.0.4.tgz"; + path = fetchurl { + name = "is_regex___is_regex_1.0.4.tgz"; + url = "https://registry.yarnpkg.com/is-regex/-/is-regex-1.0.4.tgz"; + sha1 = "5517489b547091b0930e095654ced25ee97e9491"; + }; + } + { + name = "is_regexp___is_regexp_1.0.0.tgz"; + path = fetchurl { + name = "is_regexp___is_regexp_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/is-regexp/-/is-regexp-1.0.0.tgz"; + sha1 = "fd2d883545c46bac5a633e7b9a09e87fa2cb5069"; + }; + } + { + name = "is_regexp___is_regexp_2.1.0.tgz"; + path = fetchurl { + name = "is_regexp___is_regexp_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/is-regexp/-/is-regexp-2.1.0.tgz"; + sha1 = "cd734a56864e23b956bf4e7c66c396a4c0b22c2d"; + }; + } + { + name = "is_relative___is_relative_1.0.0.tgz"; + path = fetchurl { + name = "is_relative___is_relative_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/is-relative/-/is-relative-1.0.0.tgz"; + sha1 = "a1bb6935ce8c5dba1e8b9754b9b2dcc020e2260d"; + }; + } + { + name = "is_resolvable___is_resolvable_1.1.0.tgz"; + path = fetchurl { + name = "is_resolvable___is_resolvable_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/is-resolvable/-/is-resolvable-1.1.0.tgz"; + sha1 = "fb18f87ce1feb925169c9a407c19318a3206ed88"; + }; + } + { + name = "is_retry_allowed___is_retry_allowed_1.1.0.tgz"; + path = fetchurl { + name = "is_retry_allowed___is_retry_allowed_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/is-retry-allowed/-/is-retry-allowed-1.1.0.tgz"; + sha1 = "11a060568b67339444033d0125a61a20d564fb34"; + }; + } + { + name = "is_ssh___is_ssh_1.3.1.tgz"; + path = fetchurl { + name = "is_ssh___is_ssh_1.3.1.tgz"; + url = "https://registry.yarnpkg.com/is-ssh/-/is-ssh-1.3.1.tgz"; + sha1 = "f349a8cadd24e65298037a522cf7520f2e81a0f3"; + }; + } + { + 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_symbol___is_symbol_1.0.2.tgz"; + path = fetchurl { + name = "is_symbol___is_symbol_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.0.2.tgz"; + sha1 = "a055f6ae57192caee329e7a860118b497a950f38"; + }; + } + { + 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_unc_path___is_unc_path_1.0.0.tgz"; + path = fetchurl { + name = "is_unc_path___is_unc_path_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/is-unc-path/-/is-unc-path-1.0.0.tgz"; + sha1 = "d731e8898ed090a12c352ad2eaed5095ad322c9d"; + }; + } + { + name = "is_utf8___is_utf8_0.2.1.tgz"; + path = fetchurl { + name = "is_utf8___is_utf8_0.2.1.tgz"; + url = "https://registry.yarnpkg.com/is-utf8/-/is-utf8-0.2.1.tgz"; + sha1 = "4b0da1442104d1b336340e80797e865cf39f7d72"; + }; + } + { + name = "is_valid_glob___is_valid_glob_1.0.0.tgz"; + path = fetchurl { + name = "is_valid_glob___is_valid_glob_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/is-valid-glob/-/is-valid-glob-1.0.0.tgz"; + sha1 = "29bf3eff701be2d4d315dbacc39bc39fe8f601aa"; + }; + } + { + name = "is_whitespace_character___is_whitespace_character_1.0.2.tgz"; + path = fetchurl { + name = "is_whitespace_character___is_whitespace_character_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/is-whitespace-character/-/is-whitespace-character-1.0.2.tgz"; + sha1 = "ede53b4c6f6fb3874533751ec9280d01928d03ed"; + }; + } + { + 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_word_character___is_word_character_1.0.2.tgz"; + path = fetchurl { + name = "is_word_character___is_word_character_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/is-word-character/-/is-word-character-1.0.2.tgz"; + sha1 = "46a5dac3f2a1840898b91e576cd40d493f3ae553"; + }; + } + { + name = "is_wsl___is_wsl_1.1.0.tgz"; + path = fetchurl { + name = "is_wsl___is_wsl_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/is-wsl/-/is-wsl-1.1.0.tgz"; + sha1 = "1f16e4aa22b04d1336b66188a66af3c600c3a66d"; + }; + } + { + 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 = "isarray___isarray_2.0.1.tgz"; + path = fetchurl { + name = "isarray___isarray_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/isarray/-/isarray-2.0.1.tgz"; + sha1 = "a37d94ed9cda2d59865c9f76fe596ee1f338741e"; + }; + } + { + name = "isbinaryfile___isbinaryfile_3.0.2.tgz"; + path = fetchurl { + name = "isbinaryfile___isbinaryfile_3.0.2.tgz"; + url = "https://registry.yarnpkg.com/isbinaryfile/-/isbinaryfile-3.0.2.tgz"; + sha1 = "4a3e974ec0cba9004d3fc6cde7209ea69368a621"; + }; + } + { + 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_api___istanbul_api_2.1.6.tgz"; + path = fetchurl { + name = "istanbul_api___istanbul_api_2.1.6.tgz"; + url = "https://registry.yarnpkg.com/istanbul-api/-/istanbul-api-2.1.6.tgz"; + sha1 = "d61702a9d1c66ad89d92e66d401e16b0bda4a35f"; + }; + } + { + name = "istanbul_lib_coverage___istanbul_lib_coverage_2.0.5.tgz"; + path = fetchurl { + name = "istanbul_lib_coverage___istanbul_lib_coverage_2.0.5.tgz"; + url = "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.5.tgz"; + sha1 = "675f0ab69503fad4b1d849f736baaca803344f49"; + }; + } + { + name = "istanbul_lib_hook___istanbul_lib_hook_2.0.7.tgz"; + path = fetchurl { + name = "istanbul_lib_hook___istanbul_lib_hook_2.0.7.tgz"; + url = "https://registry.yarnpkg.com/istanbul-lib-hook/-/istanbul-lib-hook-2.0.7.tgz"; + sha1 = "c95695f383d4f8f60df1f04252a9550e15b5b133"; + }; + } + { + name = "istanbul_lib_instrument___istanbul_lib_instrument_3.3.0.tgz"; + path = fetchurl { + name = "istanbul_lib_instrument___istanbul_lib_instrument_3.3.0.tgz"; + url = "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-3.3.0.tgz"; + sha1 = "a5f63d91f0bbc0c3e479ef4c5de027335ec6d630"; + }; + } + { + name = "istanbul_lib_report___istanbul_lib_report_2.0.8.tgz"; + path = fetchurl { + name = "istanbul_lib_report___istanbul_lib_report_2.0.8.tgz"; + url = "https://registry.yarnpkg.com/istanbul-lib-report/-/istanbul-lib-report-2.0.8.tgz"; + sha1 = "5a8113cd746d43c4889eba36ab10e7d50c9b4f33"; + }; + } + { + name = "istanbul_lib_source_maps___istanbul_lib_source_maps_3.0.6.tgz"; + path = fetchurl { + name = "istanbul_lib_source_maps___istanbul_lib_source_maps_3.0.6.tgz"; + url = "https://registry.yarnpkg.com/istanbul-lib-source-maps/-/istanbul-lib-source-maps-3.0.6.tgz"; + sha1 = "284997c48211752ec486253da97e3879defba8c8"; + }; + } + { + name = "istanbul_reports___istanbul_reports_2.2.6.tgz"; + path = fetchurl { + name = "istanbul_reports___istanbul_reports_2.2.6.tgz"; + url = "https://registry.yarnpkg.com/istanbul-reports/-/istanbul-reports-2.2.6.tgz"; + sha1 = "7b4f2660d82b29303a8fe6091f8ca4bf058da1af"; + }; + } + { + name = "istextorbinary___istextorbinary_2.2.1.tgz"; + path = fetchurl { + name = "istextorbinary___istextorbinary_2.2.1.tgz"; + url = "https://registry.yarnpkg.com/istextorbinary/-/istextorbinary-2.2.1.tgz"; + sha1 = "a5231a08ef6dd22b268d0895084cf8d58b5bec53"; + }; + } + { + name = "isurl___isurl_1.0.0.tgz"; + path = fetchurl { + name = "isurl___isurl_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/isurl/-/isurl-1.0.0.tgz"; + sha1 = "b27f4f49f3cdaa3ea44a0a5b7f3462e6edc39d67"; + }; + } + { + name = "iterall___iterall_1.2.2.tgz"; + path = fetchurl { + name = "iterall___iterall_1.2.2.tgz"; + url = "https://registry.yarnpkg.com/iterall/-/iterall-1.2.2.tgz"; + sha1 = "92d70deb8028e0c39ff3164fdbf4d8b088130cd7"; + }; + } + { + name = "jasmine_core___jasmine_core_2.9.0.tgz"; + path = fetchurl { + name = "jasmine_core___jasmine_core_2.9.0.tgz"; + url = "https://registry.yarnpkg.com/jasmine-core/-/jasmine-core-2.9.0.tgz"; + sha1 = "bfbb56defcd30789adec5a3fbba8504233289c72"; + }; + } + { + name = "jasmine_diff___jasmine_diff_0.1.3.tgz"; + path = fetchurl { + name = "jasmine_diff___jasmine_diff_0.1.3.tgz"; + url = "https://registry.yarnpkg.com/jasmine-diff/-/jasmine-diff-0.1.3.tgz"; + sha1 = "93ccc2dcc41028c5ddd4606558074839f2deeaa8"; + }; + } + { + name = "jasmine_jquery___jasmine_jquery_2.1.1.tgz"; + path = fetchurl { + name = "jasmine_jquery___jasmine_jquery_2.1.1.tgz"; + url = "https://registry.yarnpkg.com/jasmine-jquery/-/jasmine-jquery-2.1.1.tgz"; + sha1 = "d4095e646944a26763235769ab018d9f30f0d47b"; + }; + } + { + name = "jed___jed_1.1.1.tgz"; + path = fetchurl { + name = "jed___jed_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/jed/-/jed-1.1.1.tgz"; + sha1 = "7a549bbd9ffe1585b0cd0a191e203055bee574b4"; + }; + } + { + name = "jest_changed_files___jest_changed_files_24.8.0.tgz"; + path = fetchurl { + name = "jest_changed_files___jest_changed_files_24.8.0.tgz"; + url = "https://registry.yarnpkg.com/jest-changed-files/-/jest-changed-files-24.8.0.tgz"; + sha1 = "7e7eb21cf687587a85e50f3d249d1327e15b157b"; + }; + } + { + name = "jest_cli___jest_cli_24.8.0.tgz"; + path = fetchurl { + name = "jest_cli___jest_cli_24.8.0.tgz"; + url = "https://registry.yarnpkg.com/jest-cli/-/jest-cli-24.8.0.tgz"; + sha1 = "b075ac914492ed114fa338ade7362a301693e989"; + }; + } + { + name = "jest_config___jest_config_24.8.0.tgz"; + path = fetchurl { + name = "jest_config___jest_config_24.8.0.tgz"; + url = "https://registry.yarnpkg.com/jest-config/-/jest-config-24.8.0.tgz"; + sha1 = "77db3d265a6f726294687cbbccc36f8a76ee0f4f"; + }; + } + { + name = "jest_diff___jest_diff_24.8.0.tgz"; + path = fetchurl { + name = "jest_diff___jest_diff_24.8.0.tgz"; + url = "https://registry.yarnpkg.com/jest-diff/-/jest-diff-24.8.0.tgz"; + sha1 = "146435e7d1e3ffdf293d53ff97e193f1d1546172"; + }; + } + { + name = "jest_docblock___jest_docblock_24.3.0.tgz"; + path = fetchurl { + name = "jest_docblock___jest_docblock_24.3.0.tgz"; + url = "https://registry.yarnpkg.com/jest-docblock/-/jest-docblock-24.3.0.tgz"; + sha1 = "b9c32dac70f72e4464520d2ba4aec02ab14db5dd"; + }; + } + { + name = "jest_each___jest_each_24.8.0.tgz"; + path = fetchurl { + name = "jest_each___jest_each_24.8.0.tgz"; + url = "https://registry.yarnpkg.com/jest-each/-/jest-each-24.8.0.tgz"; + sha1 = "a05fd2bf94ddc0b1da66c6d13ec2457f35e52775"; + }; + } + { + name = "jest_environment_jsdom___jest_environment_jsdom_24.8.0.tgz"; + path = fetchurl { + name = "jest_environment_jsdom___jest_environment_jsdom_24.8.0.tgz"; + url = "https://registry.yarnpkg.com/jest-environment-jsdom/-/jest-environment-jsdom-24.8.0.tgz"; + sha1 = "300f6949a146cabe1c9357ad9e9ecf9f43f38857"; + }; + } + { + name = "jest_environment_node___jest_environment_node_24.8.0.tgz"; + path = fetchurl { + name = "jest_environment_node___jest_environment_node_24.8.0.tgz"; + url = "https://registry.yarnpkg.com/jest-environment-node/-/jest-environment-node-24.8.0.tgz"; + sha1 = "d3f726ba8bc53087a60e7a84ca08883a4c892231"; + }; + } + { + name = "jest_get_type___jest_get_type_24.8.0.tgz"; + path = fetchurl { + name = "jest_get_type___jest_get_type_24.8.0.tgz"; + url = "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-24.8.0.tgz"; + sha1 = "a7440de30b651f5a70ea3ed7ff073a32dfe646fc"; + }; + } + { + name = "jest_haste_map___jest_haste_map_24.8.0.tgz"; + path = fetchurl { + name = "jest_haste_map___jest_haste_map_24.8.0.tgz"; + url = "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-24.8.0.tgz"; + sha1 = "51794182d877b3ddfd6e6d23920e3fe72f305800"; + }; + } + { + name = "jest_jasmine2___jest_jasmine2_24.8.0.tgz"; + path = fetchurl { + name = "jest_jasmine2___jest_jasmine2_24.8.0.tgz"; + url = "https://registry.yarnpkg.com/jest-jasmine2/-/jest-jasmine2-24.8.0.tgz"; + sha1 = "a9c7e14c83dd77d8b15e820549ce8987cc8cd898"; + }; + } + { + name = "jest_junit___jest_junit_6.3.0.tgz"; + path = fetchurl { + name = "jest_junit___jest_junit_6.3.0.tgz"; + url = "https://registry.yarnpkg.com/jest-junit/-/jest-junit-6.3.0.tgz"; + sha1 = "99e64ebc54eddcb21238f0cc49f5820c89a8c785"; + }; + } + { + name = "jest_leak_detector___jest_leak_detector_24.8.0.tgz"; + path = fetchurl { + name = "jest_leak_detector___jest_leak_detector_24.8.0.tgz"; + url = "https://registry.yarnpkg.com/jest-leak-detector/-/jest-leak-detector-24.8.0.tgz"; + sha1 = "c0086384e1f650c2d8348095df769f29b48e6980"; + }; + } + { + name = "jest_matcher_utils___jest_matcher_utils_24.8.0.tgz"; + path = fetchurl { + name = "jest_matcher_utils___jest_matcher_utils_24.8.0.tgz"; + url = "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-24.8.0.tgz"; + sha1 = "2bce42204c9af12bde46f83dc839efe8be832495"; + }; + } + { + name = "jest_message_util___jest_message_util_24.8.0.tgz"; + path = fetchurl { + name = "jest_message_util___jest_message_util_24.8.0.tgz"; + url = "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-24.8.0.tgz"; + sha1 = "0d6891e72a4beacc0292b638685df42e28d6218b"; + }; + } + { + name = "jest_mock___jest_mock_24.8.0.tgz"; + path = fetchurl { + name = "jest_mock___jest_mock_24.8.0.tgz"; + url = "https://registry.yarnpkg.com/jest-mock/-/jest-mock-24.8.0.tgz"; + sha1 = "2f9d14d37699e863f1febf4e4d5a33b7fdbbde56"; + }; + } + { + name = "jest_pnp_resolver___jest_pnp_resolver_1.2.1.tgz"; + path = fetchurl { + name = "jest_pnp_resolver___jest_pnp_resolver_1.2.1.tgz"; + url = "https://registry.yarnpkg.com/jest-pnp-resolver/-/jest-pnp-resolver-1.2.1.tgz"; + sha1 = "ecdae604c077a7fbc70defb6d517c3c1c898923a"; + }; + } + { + name = "jest_regex_util___jest_regex_util_24.3.0.tgz"; + path = fetchurl { + name = "jest_regex_util___jest_regex_util_24.3.0.tgz"; + url = "https://registry.yarnpkg.com/jest-regex-util/-/jest-regex-util-24.3.0.tgz"; + sha1 = "d5a65f60be1ae3e310d5214a0307581995227b36"; + }; + } + { + name = "jest_resolve_dependencies___jest_resolve_dependencies_24.8.0.tgz"; + path = fetchurl { + name = "jest_resolve_dependencies___jest_resolve_dependencies_24.8.0.tgz"; + url = "https://registry.yarnpkg.com/jest-resolve-dependencies/-/jest-resolve-dependencies-24.8.0.tgz"; + sha1 = "19eec3241f2045d3f990dba331d0d7526acff8e0"; + }; + } + { + name = "jest_resolve___jest_resolve_24.8.0.tgz"; + path = fetchurl { + name = "jest_resolve___jest_resolve_24.8.0.tgz"; + url = "https://registry.yarnpkg.com/jest-resolve/-/jest-resolve-24.8.0.tgz"; + sha1 = "84b8e5408c1f6a11539793e2b5feb1b6e722439f"; + }; + } + { + name = "jest_runner___jest_runner_24.8.0.tgz"; + path = fetchurl { + name = "jest_runner___jest_runner_24.8.0.tgz"; + url = "https://registry.yarnpkg.com/jest-runner/-/jest-runner-24.8.0.tgz"; + sha1 = "4f9ae07b767db27b740d7deffad0cf67ccb4c5bb"; + }; + } + { + name = "jest_runtime___jest_runtime_24.8.0.tgz"; + path = fetchurl { + name = "jest_runtime___jest_runtime_24.8.0.tgz"; + url = "https://registry.yarnpkg.com/jest-runtime/-/jest-runtime-24.8.0.tgz"; + sha1 = "05f94d5b05c21f6dc54e427cd2e4980923350620"; + }; + } + { + name = "jest_serializer___jest_serializer_24.4.0.tgz"; + path = fetchurl { + name = "jest_serializer___jest_serializer_24.4.0.tgz"; + url = "https://registry.yarnpkg.com/jest-serializer/-/jest-serializer-24.4.0.tgz"; + sha1 = "f70c5918c8ea9235ccb1276d232e459080588db3"; + }; + } + { + name = "jest_snapshot___jest_snapshot_24.8.0.tgz"; + path = fetchurl { + name = "jest_snapshot___jest_snapshot_24.8.0.tgz"; + url = "https://registry.yarnpkg.com/jest-snapshot/-/jest-snapshot-24.8.0.tgz"; + sha1 = "3bec6a59da2ff7bc7d097a853fb67f9d415cb7c6"; + }; + } + { + name = "jest_transform_graphql___jest_transform_graphql_2.1.0.tgz"; + path = fetchurl { + name = "jest_transform_graphql___jest_transform_graphql_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/jest-transform-graphql/-/jest-transform-graphql-2.1.0.tgz"; + sha1 = "903cb66bb27bc2772fd3e5dd4f7e9b57230f5829"; + }; + } + { + name = "jest_util___jest_util_24.8.0.tgz"; + path = fetchurl { + name = "jest_util___jest_util_24.8.0.tgz"; + url = "https://registry.yarnpkg.com/jest-util/-/jest-util-24.8.0.tgz"; + sha1 = "41f0e945da11df44cc76d64ffb915d0716f46cd1"; + }; + } + { + name = "jest_validate___jest_validate_24.8.0.tgz"; + path = fetchurl { + name = "jest_validate___jest_validate_24.8.0.tgz"; + url = "https://registry.yarnpkg.com/jest-validate/-/jest-validate-24.8.0.tgz"; + sha1 = "624c41533e6dfe356ffadc6e2423a35c2d3b4849"; + }; + } + { + name = "jest_watcher___jest_watcher_24.8.0.tgz"; + path = fetchurl { + name = "jest_watcher___jest_watcher_24.8.0.tgz"; + url = "https://registry.yarnpkg.com/jest-watcher/-/jest-watcher-24.8.0.tgz"; + sha1 = "58d49915ceddd2de85e238f6213cef1c93715de4"; + }; + } + { + name = "jest_worker___jest_worker_24.6.0.tgz"; + path = fetchurl { + name = "jest_worker___jest_worker_24.6.0.tgz"; + url = "https://registry.yarnpkg.com/jest-worker/-/jest-worker-24.6.0.tgz"; + sha1 = "7f81ceae34b7cde0c9827a6980c35b7cdc0161b3"; + }; + } + { + name = "jest___jest_24.8.0.tgz"; + path = fetchurl { + name = "jest___jest_24.8.0.tgz"; + url = "https://registry.yarnpkg.com/jest/-/jest-24.8.0.tgz"; + sha1 = "d5dff1984d0d1002196e9b7f12f75af1b2809081"; + }; + } + { + name = "jmespath___jmespath_0.15.0.tgz"; + path = fetchurl { + name = "jmespath___jmespath_0.15.0.tgz"; + url = "https://registry.yarnpkg.com/jmespath/-/jmespath-0.15.0.tgz"; + sha1 = "a3f222a9aae9f966f5d27c796510e28091764217"; + }; + } + { + name = "jquery_ujs___jquery_ujs_1.2.2.tgz"; + path = fetchurl { + name = "jquery_ujs___jquery_ujs_1.2.2.tgz"; + url = "https://registry.yarnpkg.com/jquery-ujs/-/jquery-ujs-1.2.2.tgz"; + sha1 = "6a8ef1020e6b6dda385b90a4bddc128c21c56397"; + }; + } + { + name = "jquery.caret___jquery.caret_0.3.1.tgz"; + path = fetchurl { + name = "jquery.caret___jquery.caret_0.3.1.tgz"; + url = "https://registry.yarnpkg.com/jquery.caret/-/jquery.caret-0.3.1.tgz"; + sha1 = "9c093318faf327eff322e826ca9f3241368bc7b8"; + }; + } + { + name = "jquery.waitforimages___jquery.waitforimages_2.2.0.tgz"; + path = fetchurl { + name = "jquery.waitforimages___jquery.waitforimages_2.2.0.tgz"; + url = "https://registry.yarnpkg.com/jquery.waitforimages/-/jquery.waitforimages-2.2.0.tgz"; + sha1 = "63f23131055a1b060dc913e6d874bcc9b9e6b16b"; + }; + } + { + name = "jquery___jquery_3.4.1.tgz"; + path = fetchurl { + name = "jquery___jquery_3.4.1.tgz"; + url = "https://registry.yarnpkg.com/jquery/-/jquery-3.4.1.tgz"; + sha1 = "714f1f8d9dde4bdfa55764ba37ef214630d80ef2"; + }; + } + { + name = "js_base64___js_base64_2.5.1.tgz"; + path = fetchurl { + name = "js_base64___js_base64_2.5.1.tgz"; + url = "https://registry.yarnpkg.com/js-base64/-/js-base64-2.5.1.tgz"; + sha1 = "1efa39ef2c5f7980bb1784ade4a8af2de3291121"; + }; + } + { + name = "js_beautify___js_beautify_1.8.9.tgz"; + path = fetchurl { + name = "js_beautify___js_beautify_1.8.9.tgz"; + url = "https://registry.yarnpkg.com/js-beautify/-/js-beautify-1.8.9.tgz"; + sha1 = "08e3c05ead3ecfbd4f512c3895b1cda76c87d523"; + }; + } + { + name = "js_cookie___js_cookie_2.1.3.tgz"; + path = fetchurl { + name = "js_cookie___js_cookie_2.1.3.tgz"; + url = "https://registry.yarnpkg.com/js-cookie/-/js-cookie-2.1.3.tgz"; + sha1 = "48071625217ac9ecfab8c343a13d42ec09ff0526"; + }; + } + { + name = "js_levenshtein___js_levenshtein_1.1.4.tgz"; + path = fetchurl { + name = "js_levenshtein___js_levenshtein_1.1.4.tgz"; + url = "https://registry.yarnpkg.com/js-levenshtein/-/js-levenshtein-1.1.4.tgz"; + sha1 = "3a56e3cbf589ca0081eb22cd9ba0b1290a16d26e"; + }; + } + { + 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_tokens___js_tokens_3.0.2.tgz"; + path = fetchurl { + name = "js_tokens___js_tokens_3.0.2.tgz"; + url = "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.2.tgz"; + sha1 = "9866df395102130e38f7f996bceb65443209c25b"; + }; + } + { + name = "js_yaml___js_yaml_3.13.1.tgz"; + path = fetchurl { + name = "js_yaml___js_yaml_3.13.1.tgz"; + url = "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.13.1.tgz"; + sha1 = "aff151b30bfdfa8e49e05da22e7415e9dfa37847"; + }; + } + { + name = "js2xmlparser___js2xmlparser_3.0.0.tgz"; + path = fetchurl { + name = "js2xmlparser___js2xmlparser_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/js2xmlparser/-/js2xmlparser-3.0.0.tgz"; + sha1 = "3fb60eaa089c5440f9319f51760ccd07e2499733"; + }; + } + { + 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 = "jsdoc_vue___jsdoc_vue_1.0.0.tgz"; + path = fetchurl { + name = "jsdoc_vue___jsdoc_vue_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/jsdoc-vue/-/jsdoc-vue-1.0.0.tgz"; + sha1 = "ff3ac1ba6bc4a74079bb79058a7bf0066e346235"; + }; + } + { + name = "jsdoc___jsdoc_3.5.5.tgz"; + path = fetchurl { + name = "jsdoc___jsdoc_3.5.5.tgz"; + url = "https://registry.yarnpkg.com/jsdoc/-/jsdoc-3.5.5.tgz"; + sha1 = "484521b126e81904d632ff83ec9aaa096708fa4d"; + }; + } + { + name = "jsdom___jsdom_11.12.0.tgz"; + path = fetchurl { + name = "jsdom___jsdom_11.12.0.tgz"; + url = "https://registry.yarnpkg.com/jsdom/-/jsdom-11.12.0.tgz"; + sha1 = "1a80d40ddd378a1de59656e9e6dc5a3ba8657bc8"; + }; + } + { + name = "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 = "jsesc___jsesc_0.5.0.tgz"; + path = fetchurl { + name = "jsesc___jsesc_0.5.0.tgz"; + url = "https://registry.yarnpkg.com/jsesc/-/jsesc-0.5.0.tgz"; + sha1 = "e7dee66e35d6fc16f710fe91d5cf69f70f08911d"; + }; + } + { + name = "json_buffer___json_buffer_3.0.0.tgz"; + path = fetchurl { + name = "json_buffer___json_buffer_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/json-buffer/-/json-buffer-3.0.0.tgz"; + sha1 = "5b1f397afc75d677bde8bcfc0e47e1f9a3d9a898"; + }; + } + { + name = "json_parse_better_errors___json_parse_better_errors_1.0.2.tgz"; + path = fetchurl { + name = "json_parse_better_errors___json_parse_better_errors_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz"; + sha1 = "bb867cfb3450e69107c131d1c514bab3dc8bcaa9"; + }; + } + { + 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 = "json3___json3_3.3.2.tgz"; + path = fetchurl { + name = "json3___json3_3.3.2.tgz"; + url = "https://registry.yarnpkg.com/json3/-/json3-3.3.2.tgz"; + sha1 = "3c0434743df93e2f5c42aee7b19bcb483575f4e1"; + }; + } + { + name = "json5___json5_2.1.0.tgz"; + path = fetchurl { + name = "json5___json5_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/json5/-/json5-2.1.0.tgz"; + sha1 = "e7a0c62c48285c628d20a10b85c89bb807c32850"; + }; + } + { + name = "json5___json5_1.0.1.tgz"; + path = fetchurl { + name = "json5___json5_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/json5/-/json5-1.0.1.tgz"; + sha1 = "779fb0018604fa854eacbf6252180d83543e3dbe"; + }; + } + { + 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 = "jsonparse___jsonparse_1.3.1.tgz"; + path = fetchurl { + name = "jsonparse___jsonparse_1.3.1.tgz"; + url = "https://registry.yarnpkg.com/jsonparse/-/jsonparse-1.3.1.tgz"; + sha1 = "3f4dae4a91fac315f71062f8521cc239f1366280"; + }; + } + { + 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 = "jszip_utils___jszip_utils_0.0.2.tgz"; + path = fetchurl { + name = "jszip_utils___jszip_utils_0.0.2.tgz"; + url = "https://registry.yarnpkg.com/jszip-utils/-/jszip-utils-0.0.2.tgz"; + sha1 = "457d5cbca60a1c2e0706e9da2b544e8e7bc50bf8"; + }; + } + { + name = "jszip___jszip_3.1.3.tgz"; + path = fetchurl { + name = "jszip___jszip_3.1.3.tgz"; + url = "https://registry.yarnpkg.com/jszip/-/jszip-3.1.3.tgz"; + sha1 = "8a920403b2b1651c0fc126be90192d9080957c37"; + }; + } + { + name = "karma_chrome_launcher___karma_chrome_launcher_3.0.0.tgz"; + path = fetchurl { + name = "karma_chrome_launcher___karma_chrome_launcher_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/karma-chrome-launcher/-/karma-chrome-launcher-3.0.0.tgz"; + sha1 = "5c3a7f877a304e90781c28fcd9a49e334a890f42"; + }; + } + { + name = "karma_coverage_istanbul_reporter___karma_coverage_istanbul_reporter_2.1.0.tgz"; + path = fetchurl { + name = "karma_coverage_istanbul_reporter___karma_coverage_istanbul_reporter_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/karma-coverage-istanbul-reporter/-/karma-coverage-istanbul-reporter-2.1.0.tgz"; + sha1 = "5f1bcc13c5e14ee1d91821ee8946861674f54c75"; + }; + } + { + name = "karma_jasmine___karma_jasmine_1.1.2.tgz"; + path = fetchurl { + name = "karma_jasmine___karma_jasmine_1.1.2.tgz"; + url = "https://registry.yarnpkg.com/karma-jasmine/-/karma-jasmine-1.1.2.tgz"; + sha1 = "394f2b25ffb4a644b9ada6f22d443e2fd08886c3"; + }; + } + { + name = "karma_junit_reporter___karma_junit_reporter_1.2.0.tgz"; + path = fetchurl { + name = "karma_junit_reporter___karma_junit_reporter_1.2.0.tgz"; + url = "https://registry.yarnpkg.com/karma-junit-reporter/-/karma-junit-reporter-1.2.0.tgz"; + sha1 = "4f9c40cedfb1a395f8aef876abf96189917c6396"; + }; + } + { + name = "karma_mocha_reporter___karma_mocha_reporter_2.2.5.tgz"; + path = fetchurl { + name = "karma_mocha_reporter___karma_mocha_reporter_2.2.5.tgz"; + url = "https://registry.yarnpkg.com/karma-mocha-reporter/-/karma-mocha-reporter-2.2.5.tgz"; + sha1 = "15120095e8ed819186e47a0b012f3cd741895560"; + }; + } + { + name = "karma_sourcemap_loader___karma_sourcemap_loader_0.3.7.tgz"; + path = fetchurl { + name = "karma_sourcemap_loader___karma_sourcemap_loader_0.3.7.tgz"; + url = "https://registry.yarnpkg.com/karma-sourcemap-loader/-/karma-sourcemap-loader-0.3.7.tgz"; + sha1 = "91322c77f8f13d46fed062b042e1009d4c4505d8"; + }; + } + { + name = "karma_webpack___karma_webpack_4.0.2.tgz"; + path = fetchurl { + name = "karma_webpack___karma_webpack_4.0.2.tgz"; + url = "https://registry.yarnpkg.com/karma-webpack/-/karma-webpack-4.0.2.tgz"; + sha1 = "23219bd95bdda853e3073d3874d34447c77bced0"; + }; + } + { + name = "karma___karma_4.2.0.tgz"; + path = fetchurl { + name = "karma___karma_4.2.0.tgz"; + url = "https://registry.yarnpkg.com/karma/-/karma-4.2.0.tgz"; + sha1 = "27e88b310cde090d016980ff5444e3a239196fca"; + }; + } + { + name = "katex___katex_0.10.0.tgz"; + path = fetchurl { + name = "katex___katex_0.10.0.tgz"; + url = "https://registry.yarnpkg.com/katex/-/katex-0.10.0.tgz"; + sha1 = "da562e5d0d5cc3aa602e27af8a9b8710bfbce765"; + }; + } + { + name = "keyv___keyv_3.0.0.tgz"; + path = fetchurl { + name = "keyv___keyv_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/keyv/-/keyv-3.0.0.tgz"; + sha1 = "44923ba39e68b12a7cec7df6c3268c031f2ef373"; + }; + } + { + name = "killable___killable_1.0.0.tgz"; + path = fetchurl { + name = "killable___killable_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/killable/-/killable-1.0.0.tgz"; + sha1 = "da8b84bd47de5395878f95d64d02f2449fe05e6b"; + }; + } + { + 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.2.tgz"; + path = fetchurl { + name = "kind_of___kind_of_6.0.2.tgz"; + url = "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.2.tgz"; + sha1 = "01146b36a6218e64e58f3a8d66de5d7fc6f6d051"; + }; + } + { + name = "klaw___klaw_2.0.0.tgz"; + path = fetchurl { + name = "klaw___klaw_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/klaw/-/klaw-2.0.0.tgz"; + sha1 = "59c128e0dc5ce410201151194eeb9cbf858650f6"; + }; + } + { + 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 = "known_css_properties___known_css_properties_0.14.0.tgz"; + path = fetchurl { + name = "known_css_properties___known_css_properties_0.14.0.tgz"; + url = "https://registry.yarnpkg.com/known-css-properties/-/known-css-properties-0.14.0.tgz"; + sha1 = "d7032b4334a32dc22e6e46b081ec789daf18756c"; + }; + } + { + name = "latest_version___latest_version_3.1.0.tgz"; + path = fetchurl { + name = "latest_version___latest_version_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/latest-version/-/latest-version-3.1.0.tgz"; + sha1 = "a205383fea322b33b5ae3b18abee0dc2f356ee15"; + }; + } + { + name = "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 = "lcid___lcid_1.0.0.tgz"; + path = fetchurl { + name = "lcid___lcid_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/lcid/-/lcid-1.0.0.tgz"; + sha1 = "308accafa0bc483a3867b4b6f2b9506251d1b835"; + }; + } + { + name = "lcid___lcid_2.0.0.tgz"; + path = fetchurl { + name = "lcid___lcid_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/lcid/-/lcid-2.0.0.tgz"; + sha1 = "6ef5d2df60e52f82eb228a4c373e8d1f397253cf"; + }; + } + { + name = "lead___lead_1.0.0.tgz"; + path = fetchurl { + name = "lead___lead_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/lead/-/lead-1.0.0.tgz"; + sha1 = "6f14f99a37be3a9dd784f5495690e5903466ee42"; + }; + } + { + name = "left_pad___left_pad_1.3.0.tgz"; + path = fetchurl { + name = "left_pad___left_pad_1.3.0.tgz"; + url = "https://registry.yarnpkg.com/left-pad/-/left-pad-1.3.0.tgz"; + sha1 = "5b8a3a7765dfe001261dde915589e782f8c94d1e"; + }; + } + { + name = "leven___leven_2.1.0.tgz"; + path = fetchurl { + name = "leven___leven_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/leven/-/leven-2.1.0.tgz"; + sha1 = "c2e7a9f772094dee9d34202ae8acce4687875580"; + }; + } + { + name = "leven___leven_3.1.0.tgz"; + path = fetchurl { + name = "leven___leven_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/leven/-/leven-3.1.0.tgz"; + sha1 = "77891de834064cccba82ae7842bb6b14a13ed7f2"; + }; + } + { + 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 = "lie___lie_3.1.1.tgz"; + path = fetchurl { + name = "lie___lie_3.1.1.tgz"; + url = "https://registry.yarnpkg.com/lie/-/lie-3.1.1.tgz"; + sha1 = "9a436b2cc7746ca59de7a41fa469b3efb76bd87e"; + }; + } + { + name = "lightercollective___lightercollective_0.1.0.tgz"; + path = fetchurl { + name = "lightercollective___lightercollective_0.1.0.tgz"; + url = "https://registry.yarnpkg.com/lightercollective/-/lightercollective-0.1.0.tgz"; + sha1 = "70df102c530dcb8d0ccabfe6175a8d00d5f61300"; + }; + } + { + name = "linkify_it___linkify_it_2.1.0.tgz"; + path = fetchurl { + name = "linkify_it___linkify_it_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/linkify-it/-/linkify-it-2.1.0.tgz"; + sha1 = "c4caf38a6cd7ac2212ef3c7d2bde30a91561f9db"; + }; + } + { + name = "livereload_js___livereload_js_2.4.0.tgz"; + path = fetchurl { + name = "livereload_js___livereload_js_2.4.0.tgz"; + url = "https://registry.yarnpkg.com/livereload-js/-/livereload-js-2.4.0.tgz"; + sha1 = "447c31cf1ea9ab52fc20db615c5ddf678f78009c"; + }; + } + { + name = "load_json_file___load_json_file_1.1.0.tgz"; + path = fetchurl { + name = "load_json_file___load_json_file_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/load-json-file/-/load-json-file-1.1.0.tgz"; + sha1 = "956905708d58b4bab4c2261b04f59f31c99374c0"; + }; + } + { + name = "load_json_file___load_json_file_2.0.0.tgz"; + path = fetchurl { + name = "load_json_file___load_json_file_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/load-json-file/-/load-json-file-2.0.0.tgz"; + sha1 = "7947e42149af80d696cbf797bcaabcfe1fe29ca8"; + }; + } + { + name = "load_json_file___load_json_file_4.0.0.tgz"; + path = fetchurl { + name = "load_json_file___load_json_file_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/load-json-file/-/load-json-file-4.0.0.tgz"; + sha1 = "2f5f45ab91e33216234fd53adab668eb4ec0993b"; + }; + } + { + name = "loader_runner___loader_runner_2.3.0.tgz"; + path = fetchurl { + name = "loader_runner___loader_runner_2.3.0.tgz"; + url = "https://registry.yarnpkg.com/loader-runner/-/loader-runner-2.3.0.tgz"; + sha1 = "f482aea82d543e07921700d5a46ef26fdac6b8a2"; + }; + } + { + name = "loader_utils___loader_utils_1.2.3.tgz"; + path = fetchurl { + name = "loader_utils___loader_utils_1.2.3.tgz"; + url = "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.2.3.tgz"; + sha1 = "1ff5dc6911c9f0a062531a4c04b609406108c2c7"; + }; + } + { + name = "locate_path___locate_path_2.0.0.tgz"; + path = fetchurl { + name = "locate_path___locate_path_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/locate-path/-/locate-path-2.0.0.tgz"; + sha1 = "2b568b265eec944c6d9c0de9c3dbbbca0354cd8e"; + }; + } + { + name = "locate_path___locate_path_3.0.0.tgz"; + path = fetchurl { + name = "locate_path___locate_path_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/locate-path/-/locate-path-3.0.0.tgz"; + sha1 = "dbec3b3ab759758071b58fe59fc41871af21400e"; + }; + } + { + name = "lodash.camelcase___lodash.camelcase_4.3.0.tgz"; + path = fetchurl { + name = "lodash.camelcase___lodash.camelcase_4.3.0.tgz"; + url = "https://registry.yarnpkg.com/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz"; + sha1 = "b28aa6288a2b9fc651035c7711f65ab6190331a6"; + }; + } + { + name = "lodash.clonedeep___lodash.clonedeep_4.5.0.tgz"; + path = fetchurl { + name = "lodash.clonedeep___lodash.clonedeep_4.5.0.tgz"; + url = "https://registry.yarnpkg.com/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz"; + sha1 = "e23f3f9c4f8fbdde872529c1071857a086e5ccef"; + }; + } + { + name = "lodash.debounce___lodash.debounce_4.0.8.tgz"; + path = fetchurl { + name = "lodash.debounce___lodash.debounce_4.0.8.tgz"; + url = "https://registry.yarnpkg.com/lodash.debounce/-/lodash.debounce-4.0.8.tgz"; + sha1 = "82d79bff30a67c4005ffd5e2515300ad9ca4d7af"; + }; + } + { + name = "lodash.differencewith___lodash.differencewith_4.5.0.tgz"; + path = fetchurl { + name = "lodash.differencewith___lodash.differencewith_4.5.0.tgz"; + url = "https://registry.yarnpkg.com/lodash.differencewith/-/lodash.differencewith-4.5.0.tgz"; + sha1 = "bafafbc918b55154e179176a00bb0aefaac854b7"; + }; + } + { + name = "lodash.escaperegexp___lodash.escaperegexp_4.1.2.tgz"; + path = fetchurl { + name = "lodash.escaperegexp___lodash.escaperegexp_4.1.2.tgz"; + url = "https://registry.yarnpkg.com/lodash.escaperegexp/-/lodash.escaperegexp-4.1.2.tgz"; + sha1 = "64762c48618082518ac3df4ccf5d5886dae20347"; + }; + } + { + name = "lodash.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.isequal___lodash.isequal_4.5.0.tgz"; + path = fetchurl { + name = "lodash.isequal___lodash.isequal_4.5.0.tgz"; + url = "https://registry.yarnpkg.com/lodash.isequal/-/lodash.isequal-4.5.0.tgz"; + sha1 = "415c4478f2bcc30120c22ce10ed3226f7d3e18e0"; + }; + } + { + name = "lodash.kebabcase___lodash.kebabcase_4.1.1.tgz"; + path = fetchurl { + name = "lodash.kebabcase___lodash.kebabcase_4.1.1.tgz"; + url = "https://registry.yarnpkg.com/lodash.kebabcase/-/lodash.kebabcase-4.1.1.tgz"; + sha1 = "8489b1cb0d29ff88195cceca448ff6d6cc295c36"; + }; + } + { + name = "lodash.mergewith___lodash.mergewith_4.6.2.tgz"; + path = fetchurl { + name = "lodash.mergewith___lodash.mergewith_4.6.2.tgz"; + url = "https://registry.yarnpkg.com/lodash.mergewith/-/lodash.mergewith-4.6.2.tgz"; + sha1 = "617121f89ac55f59047c7aec1ccd6654c6590f55"; + }; + } + { + name = "lodash.snakecase___lodash.snakecase_4.1.1.tgz"; + path = fetchurl { + name = "lodash.snakecase___lodash.snakecase_4.1.1.tgz"; + url = "https://registry.yarnpkg.com/lodash.snakecase/-/lodash.snakecase-4.1.1.tgz"; + sha1 = "39d714a35357147837aefd64b5dcbb16becd8f8d"; + }; + } + { + 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.upperfirst___lodash.upperfirst_4.3.1.tgz"; + path = fetchurl { + name = "lodash.upperfirst___lodash.upperfirst_4.3.1.tgz"; + url = "https://registry.yarnpkg.com/lodash.upperfirst/-/lodash.upperfirst-4.3.1.tgz"; + sha1 = "1365edf431480481ef0d1c68957a5ed99d49f7ce"; + }; + } + { + name = "lodash___lodash_4.17.15.tgz"; + path = fetchurl { + name = "lodash___lodash_4.17.15.tgz"; + url = "https://registry.yarnpkg.com/lodash/-/lodash-4.17.15.tgz"; + sha1 = "b447f6670a0455bbfeedd11392eff330ea097548"; + }; + } + { + name = "log_symbols___log_symbols_2.2.0.tgz"; + path = fetchurl { + name = "log_symbols___log_symbols_2.2.0.tgz"; + url = "https://registry.yarnpkg.com/log-symbols/-/log-symbols-2.2.0.tgz"; + sha1 = "5740e1c5d6f0dfda4ad9323b5332107ef6b4c40a"; + }; + } + { + name = "log_symbols___log_symbols_3.0.0.tgz"; + path = fetchurl { + name = "log_symbols___log_symbols_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/log-symbols/-/log-symbols-3.0.0.tgz"; + sha1 = "f3a08516a5dea893336a7dee14d18a1cfdab77c4"; + }; + } + { + name = "log4js___log4js_4.5.1.tgz"; + path = fetchurl { + name = "log4js___log4js_4.5.1.tgz"; + url = "https://registry.yarnpkg.com/log4js/-/log4js-4.5.1.tgz"; + sha1 = "e543625e97d9e6f3e6e7c9fc196dd6ab2cae30b5"; + }; + } + { + name = "loglevel___loglevel_1.4.1.tgz"; + path = fetchurl { + name = "loglevel___loglevel_1.4.1.tgz"; + url = "https://registry.yarnpkg.com/loglevel/-/loglevel-1.4.1.tgz"; + sha1 = "95b383f91a3c2756fd4ab093667e4309161f2bcd"; + }; + } + { + name = "longest_streak___longest_streak_2.0.2.tgz"; + path = fetchurl { + name = "longest_streak___longest_streak_2.0.2.tgz"; + url = "https://registry.yarnpkg.com/longest-streak/-/longest-streak-2.0.2.tgz"; + sha1 = "2421b6ba939a443bb9ffebf596585a50b4c38e2e"; + }; + } + { + name = "loose_envify___loose_envify_1.4.0.tgz"; + path = fetchurl { + name = "loose_envify___loose_envify_1.4.0.tgz"; + url = "https://registry.yarnpkg.com/loose-envify/-/loose-envify-1.4.0.tgz"; + sha1 = "71ee51fa7be4caec1a63839f7e682d8132d30caf"; + }; + } + { + name = "loud_rejection___loud_rejection_1.6.0.tgz"; + path = fetchurl { + name = "loud_rejection___loud_rejection_1.6.0.tgz"; + url = "https://registry.yarnpkg.com/loud-rejection/-/loud-rejection-1.6.0.tgz"; + sha1 = "5b46f80147edee578870f086d04821cf998e551f"; + }; + } + { + name = "lower_case___lower_case_1.1.4.tgz"; + path = fetchurl { + name = "lower_case___lower_case_1.1.4.tgz"; + url = "https://registry.yarnpkg.com/lower-case/-/lower-case-1.1.4.tgz"; + sha1 = "9a2cabd1b9e8e0ae993a4bf7d5875c39c42e8eac"; + }; + } + { + name = "lowercase_keys___lowercase_keys_1.0.0.tgz"; + path = fetchurl { + name = "lowercase_keys___lowercase_keys_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-1.0.0.tgz"; + sha1 = "4e3366b39e7f5457e35f1324bdf6f88d0bfc7306"; + }; + } + { + name = "lowlight___lowlight_1.11.0.tgz"; + path = fetchurl { + name = "lowlight___lowlight_1.11.0.tgz"; + url = "https://registry.yarnpkg.com/lowlight/-/lowlight-1.11.0.tgz"; + sha1 = "1304d83005126d4e8b1dc0f07981e9b689ec2efc"; + }; + } + { + name = "lru_cache___lru_cache_4.1.5.tgz"; + path = fetchurl { + name = "lru_cache___lru_cache_4.1.5.tgz"; + url = "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.1.5.tgz"; + sha1 = "8bbe50ea85bed59bc9e33dcab8235ee9bcf443cd"; + }; + } + { + name = "lru_cache___lru_cache_5.1.1.tgz"; + path = fetchurl { + name = "lru_cache___lru_cache_5.1.1.tgz"; + url = "https://registry.yarnpkg.com/lru-cache/-/lru-cache-5.1.1.tgz"; + sha1 = "1da27e6710271947695daf6848e847f01d84b920"; + }; + } + { + name = "lz_string___lz_string_1.4.4.tgz"; + path = fetchurl { + name = "lz_string___lz_string_1.4.4.tgz"; + url = "https://registry.yarnpkg.com/lz-string/-/lz-string-1.4.4.tgz"; + sha1 = "c0d8eaf36059f705796e1e344811cf4c498d3a26"; + }; + } + { + name = "make_dir___make_dir_1.3.0.tgz"; + path = fetchurl { + name = "make_dir___make_dir_1.3.0.tgz"; + url = "https://registry.yarnpkg.com/make-dir/-/make-dir-1.3.0.tgz"; + sha1 = "79c1033b80515bd6d24ec9933e860ca75ee27f0c"; + }; + } + { + name = "make_dir___make_dir_2.1.0.tgz"; + path = fetchurl { + name = "make_dir___make_dir_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/make-dir/-/make-dir-2.1.0.tgz"; + sha1 = "5f0310e18b8be898cc07009295a30ae41e91e6f5"; + }; + } + { + name = "make_error___make_error_1.3.5.tgz"; + path = fetchurl { + name = "make_error___make_error_1.3.5.tgz"; + url = "https://registry.yarnpkg.com/make-error/-/make-error-1.3.5.tgz"; + sha1 = "efe4e81f6db28cadd605c70f29c831b58ef776c8"; + }; + } + { + name = "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_age_cleaner___map_age_cleaner_0.1.3.tgz"; + path = fetchurl { + name = "map_age_cleaner___map_age_cleaner_0.1.3.tgz"; + url = "https://registry.yarnpkg.com/map-age-cleaner/-/map-age-cleaner-0.1.3.tgz"; + sha1 = "7d583a7306434c055fe474b0f45078e6e1b4b92a"; + }; + } + { + 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_obj___map_obj_1.0.1.tgz"; + path = fetchurl { + name = "map_obj___map_obj_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/map-obj/-/map-obj-1.0.1.tgz"; + sha1 = "d933ceb9205d82bdcf4886f6742bdc2b4dea146d"; + }; + } + { + name = "map_obj___map_obj_2.0.0.tgz"; + path = fetchurl { + name = "map_obj___map_obj_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/map-obj/-/map-obj-2.0.0.tgz"; + sha1 = "a65cd29087a92598b8791257a523e021222ac1f9"; + }; + } + { + 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 = "markdown_escapes___markdown_escapes_1.0.2.tgz"; + path = fetchurl { + name = "markdown_escapes___markdown_escapes_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/markdown-escapes/-/markdown-escapes-1.0.2.tgz"; + sha1 = "e639cbde7b99c841c0bacc8a07982873b46d2122"; + }; + } + { + name = "markdown_it___markdown_it_9.0.1.tgz"; + path = fetchurl { + name = "markdown_it___markdown_it_9.0.1.tgz"; + url = "https://registry.yarnpkg.com/markdown-it/-/markdown-it-9.0.1.tgz"; + sha1 = "aafe363c43718720b6575fd10625cde6e4ff2d47"; + }; + } + { + name = "markdown_it___markdown_it_8.4.2.tgz"; + path = fetchurl { + name = "markdown_it___markdown_it_8.4.2.tgz"; + url = "https://registry.yarnpkg.com/markdown-it/-/markdown-it-8.4.2.tgz"; + sha1 = "386f98998dc15a37722aa7722084f4020bdd9b54"; + }; + } + { + name = "markdown_table___markdown_table_1.1.2.tgz"; + path = fetchurl { + name = "markdown_table___markdown_table_1.1.2.tgz"; + url = "https://registry.yarnpkg.com/markdown-table/-/markdown-table-1.1.2.tgz"; + sha1 = "c78db948fa879903a41bce522e3b96f801c63786"; + }; + } + { + name = "markdownlint_cli___markdownlint_cli_0.18.0.tgz"; + path = fetchurl { + name = "markdownlint_cli___markdownlint_cli_0.18.0.tgz"; + url = "https://registry.yarnpkg.com/markdownlint-cli/-/markdownlint-cli-0.18.0.tgz"; + sha1 = "bd1cee72739049d42dcea5f6db0c0f57c6eb8096"; + }; + } + { + name = "markdownlint___markdownlint_0.16.0.tgz"; + path = fetchurl { + name = "markdownlint___markdownlint_0.16.0.tgz"; + url = "https://registry.yarnpkg.com/markdownlint/-/markdownlint-0.16.0.tgz"; + sha1 = "69f73cc755a44231fbe5dc7c37a5909cedc0ac6e"; + }; + } + { + name = "marked___marked_0.3.19.tgz"; + path = fetchurl { + name = "marked___marked_0.3.19.tgz"; + url = "https://registry.yarnpkg.com/marked/-/marked-0.3.19.tgz"; + sha1 = "5d47f709c4c9fc3c216b6d46127280f40b39d790"; + }; + } + { + name = "mathml_tag_names___mathml_tag_names_2.1.1.tgz"; + path = fetchurl { + name = "mathml_tag_names___mathml_tag_names_2.1.1.tgz"; + url = "https://registry.yarnpkg.com/mathml-tag-names/-/mathml-tag-names-2.1.1.tgz"; + sha1 = "6dff66c99d55ecf739ca53c492e626f1d12a33cc"; + }; + } + { + name = "md5.js___md5.js_1.3.4.tgz"; + path = fetchurl { + name = "md5.js___md5.js_1.3.4.tgz"; + url = "https://registry.yarnpkg.com/md5.js/-/md5.js-1.3.4.tgz"; + sha1 = "e9bdbde94a20a5ac18b04340fc5764d5b09d901d"; + }; + } + { + name = "md5___md5_2.2.1.tgz"; + path = fetchurl { + name = "md5___md5_2.2.1.tgz"; + url = "https://registry.yarnpkg.com/md5/-/md5-2.2.1.tgz"; + sha1 = "53ab38d5fe3c8891ba465329ea23fac0540126f9"; + }; + } + { + name = "mdast_util_compact___mdast_util_compact_1.0.2.tgz"; + path = fetchurl { + name = "mdast_util_compact___mdast_util_compact_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/mdast-util-compact/-/mdast-util-compact-1.0.2.tgz"; + sha1 = "c12ebe16fffc84573d3e19767726de226e95f649"; + }; + } + { + name = "mdast_util_definitions___mdast_util_definitions_1.2.4.tgz"; + path = fetchurl { + name = "mdast_util_definitions___mdast_util_definitions_1.2.4.tgz"; + url = "https://registry.yarnpkg.com/mdast-util-definitions/-/mdast-util-definitions-1.2.4.tgz"; + sha1 = "2b54ad4eecaff9d9fcb6bf6f9f6b68b232d77ca7"; + }; + } + { + name = "mdast_util_inject___mdast_util_inject_1.1.0.tgz"; + path = fetchurl { + name = "mdast_util_inject___mdast_util_inject_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/mdast-util-inject/-/mdast-util-inject-1.1.0.tgz"; + sha1 = "db06b8b585be959a2dcd2f87f472ba9b756f3675"; + }; + } + { + name = "mdast_util_to_hast___mdast_util_to_hast_3.0.4.tgz"; + path = fetchurl { + name = "mdast_util_to_hast___mdast_util_to_hast_3.0.4.tgz"; + url = "https://registry.yarnpkg.com/mdast-util-to-hast/-/mdast-util-to-hast-3.0.4.tgz"; + sha1 = "132001b266031192348d3366a6b011f28e54dc40"; + }; + } + { + name = "mdast_util_to_string___mdast_util_to_string_1.0.6.tgz"; + path = fetchurl { + name = "mdast_util_to_string___mdast_util_to_string_1.0.6.tgz"; + url = "https://registry.yarnpkg.com/mdast-util-to-string/-/mdast-util-to-string-1.0.6.tgz"; + sha1 = "7d85421021343b33de1552fc71cb8e5b4ae7536d"; + }; + } + { + name = "mdast_util_toc___mdast_util_toc_3.1.0.tgz"; + path = fetchurl { + name = "mdast_util_toc___mdast_util_toc_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/mdast-util-toc/-/mdast-util-toc-3.1.0.tgz"; + sha1 = "395eeb877f067f9d2165d990d77c7eea6f740934"; + }; + } + { + name = "mdurl___mdurl_1.0.1.tgz"; + path = fetchurl { + name = "mdurl___mdurl_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/mdurl/-/mdurl-1.0.1.tgz"; + sha1 = "fe85b2ec75a59037f2adfec100fd6c601761152e"; + }; + } + { + name = "media_typer___media_typer_0.3.0.tgz"; + path = fetchurl { + name = "media_typer___media_typer_0.3.0.tgz"; + url = "https://registry.yarnpkg.com/media-typer/-/media-typer-0.3.0.tgz"; + sha1 = "8710d7af0aa626f8fffa1ce00168545263255748"; + }; + } + { + name = "mem___mem_4.3.0.tgz"; + path = fetchurl { + name = "mem___mem_4.3.0.tgz"; + url = "https://registry.yarnpkg.com/mem/-/mem-4.3.0.tgz"; + sha1 = "461af497bc4ae09608cdb2e60eefb69bff744178"; + }; + } + { + name = "memory_fs___memory_fs_0.2.0.tgz"; + path = fetchurl { + name = "memory_fs___memory_fs_0.2.0.tgz"; + url = "https://registry.yarnpkg.com/memory-fs/-/memory-fs-0.2.0.tgz"; + sha1 = "f2bb25368bc121e391c2520de92969caee0a0290"; + }; + } + { + name = "memory_fs___memory_fs_0.4.1.tgz"; + path = fetchurl { + name = "memory_fs___memory_fs_0.4.1.tgz"; + url = "https://registry.yarnpkg.com/memory-fs/-/memory-fs-0.4.1.tgz"; + sha1 = "3a9a20b8462523e447cfbc7e8bb80ed667bfc552"; + }; + } + { + name = "meow___meow_3.7.0.tgz"; + path = fetchurl { + name = "meow___meow_3.7.0.tgz"; + url = "https://registry.yarnpkg.com/meow/-/meow-3.7.0.tgz"; + sha1 = "72cb668b425228290abbfa856892587308a801fb"; + }; + } + { + name = "meow___meow_5.0.0.tgz"; + path = fetchurl { + name = "meow___meow_5.0.0.tgz"; + url = "https://registry.yarnpkg.com/meow/-/meow-5.0.0.tgz"; + sha1 = "dfc73d63a9afc714a5e371760eb5c88b91078aa4"; + }; + } + { + name = "merge_descriptors___merge_descriptors_1.0.1.tgz"; + path = fetchurl { + name = "merge_descriptors___merge_descriptors_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/merge-descriptors/-/merge-descriptors-1.0.1.tgz"; + sha1 = "b00aaa556dd8b44568150ec9d1b953f3f90cbb61"; + }; + } + { + name = "merge_source_map___merge_source_map_1.1.0.tgz"; + path = fetchurl { + name = "merge_source_map___merge_source_map_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/merge-source-map/-/merge-source-map-1.1.0.tgz"; + sha1 = "2fdde7e6020939f70906a68f2d7ae685e4c8c646"; + }; + } + { + name = "merge_stream___merge_stream_1.0.1.tgz"; + path = fetchurl { + name = "merge_stream___merge_stream_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/merge-stream/-/merge-stream-1.0.1.tgz"; + sha1 = "4041202d508a342ba00174008df0c251b8c135e1"; + }; + } + { + name = "merge2___merge2_1.2.3.tgz"; + path = fetchurl { + name = "merge2___merge2_1.2.3.tgz"; + url = "https://registry.yarnpkg.com/merge2/-/merge2-1.2.3.tgz"; + sha1 = "7ee99dbd69bb6481689253f018488a1b902b0ed5"; + }; + } + { + name = "mermaid___mermaid_8.2.6.tgz"; + path = fetchurl { + name = "mermaid___mermaid_8.2.6.tgz"; + url = "https://registry.yarnpkg.com/mermaid/-/mermaid-8.2.6.tgz"; + sha1 = "e73f396461a435c39a998819171c2114f59e46e1"; + }; + } + { + name = "methods___methods_1.1.2.tgz"; + path = fetchurl { + name = "methods___methods_1.1.2.tgz"; + url = "https://registry.yarnpkg.com/methods/-/methods-1.1.2.tgz"; + sha1 = "5529a4d67654134edcc5266656835b0f851afcee"; + }; + } + { + 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 = "miller_rabin___miller_rabin_4.0.1.tgz"; + path = fetchurl { + name = "miller_rabin___miller_rabin_4.0.1.tgz"; + url = "https://registry.yarnpkg.com/miller-rabin/-/miller-rabin-4.0.1.tgz"; + sha1 = "f080351c865b0dc562a8462966daa53543c78a4d"; + }; + } + { + name = "mime_db___mime_db_1.37.0.tgz"; + path = fetchurl { + name = "mime_db___mime_db_1.37.0.tgz"; + url = "https://registry.yarnpkg.com/mime-db/-/mime-db-1.37.0.tgz"; + sha1 = "0b6a0ce6fdbe9576e25f1f2d2fde8830dc0ad0d8"; + }; + } + { + name = "mime_types___mime_types_2.1.21.tgz"; + path = fetchurl { + name = "mime_types___mime_types_2.1.21.tgz"; + url = "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.21.tgz"; + sha1 = "28995aa1ecb770742fe6ae7e58f9181c744b3f96"; + }; + } + { + name = "mime___mime_1.4.1.tgz"; + path = fetchurl { + name = "mime___mime_1.4.1.tgz"; + url = "https://registry.yarnpkg.com/mime/-/mime-1.4.1.tgz"; + sha1 = "121f9ebc49e3766f311a76e1fa1c8003c4b03aa6"; + }; + } + { + name = "mime___mime_2.4.4.tgz"; + path = fetchurl { + name = "mime___mime_2.4.4.tgz"; + url = "https://registry.yarnpkg.com/mime/-/mime-2.4.4.tgz"; + sha1 = "bd7b91135fc6b01cde3e9bae33d659b63d8857e5"; + }; + } + { + name = "mimic_fn___mimic_fn_1.2.0.tgz"; + path = fetchurl { + name = "mimic_fn___mimic_fn_1.2.0.tgz"; + url = "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-1.2.0.tgz"; + sha1 = "820c86a39334640e99516928bd03fca88057d022"; + }; + } + { + 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.0.tgz"; + path = fetchurl { + name = "mimic_response___mimic_response_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/mimic-response/-/mimic-response-1.0.0.tgz"; + sha1 = "df3d3652a73fded6b9b0b24146e6fd052353458e"; + }; + } + { + name = "minify___minify_4.1.2.tgz"; + path = fetchurl { + name = "minify___minify_4.1.2.tgz"; + url = "https://registry.yarnpkg.com/minify/-/minify-4.1.2.tgz"; + sha1 = "88755f4faa5f7ab6d0c64fdd659aa34ea658f180"; + }; + } + { + name = "minimalistic_assert___minimalistic_assert_1.0.0.tgz"; + path = fetchurl { + name = "minimalistic_assert___minimalistic_assert_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/minimalistic-assert/-/minimalistic-assert-1.0.0.tgz"; + sha1 = "702be2dda6b37f4836bcb3f5db56641b64a1d3d3"; + }; + } + { + name = "minimalistic_crypto_utils___minimalistic_crypto_utils_1.0.1.tgz"; + path = fetchurl { + name = "minimalistic_crypto_utils___minimalistic_crypto_utils_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz"; + sha1 = "f6c00c1c0b082246e5c4d99dfb8c7c083b2b582a"; + }; + } + { + 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_options___minimist_options_3.0.2.tgz"; + path = fetchurl { + name = "minimist_options___minimist_options_3.0.2.tgz"; + url = "https://registry.yarnpkg.com/minimist-options/-/minimist-options-3.0.2.tgz"; + sha1 = "fba4c8191339e13ecf4d61beb03f070103f3d954"; + }; + } + { + name = "minimist___minimist_0.0.8.tgz"; + path = fetchurl { + name = "minimist___minimist_0.0.8.tgz"; + url = "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz"; + sha1 = "857fcabfc3397d2625b8228262e86aa7a011b05d"; + }; + } + { + name = "minimist___minimist_1.1.3.tgz"; + path = fetchurl { + name = "minimist___minimist_1.1.3.tgz"; + url = "https://registry.yarnpkg.com/minimist/-/minimist-1.1.3.tgz"; + sha1 = "3bedfd91a92d39016fcfaa1c681e8faa1a1efda8"; + }; + } + { + name = "minimist___minimist_1.2.0.tgz"; + path = fetchurl { + name = "minimist___minimist_1.2.0.tgz"; + url = "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz"; + sha1 = "a35008b20f41383eec1fb914f4cd5df79a264284"; + }; + } + { + name = "minipass___minipass_2.3.5.tgz"; + path = fetchurl { + name = "minipass___minipass_2.3.5.tgz"; + url = "https://registry.yarnpkg.com/minipass/-/minipass-2.3.5.tgz"; + sha1 = "cacebe492022497f656b0f0f51e2682a9ed2d848"; + }; + } + { + name = "minizlib___minizlib_1.2.1.tgz"; + path = fetchurl { + name = "minizlib___minizlib_1.2.1.tgz"; + url = "https://registry.yarnpkg.com/minizlib/-/minizlib-1.2.1.tgz"; + sha1 = "dd27ea6136243c7c880684e8672bb3a45fd9b614"; + }; + } + { + name = "mississippi___mississippi_3.0.0.tgz"; + path = fetchurl { + name = "mississippi___mississippi_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/mississippi/-/mississippi-3.0.0.tgz"; + sha1 = "ea0a3291f97e0b5e8776b363d5f0a12d94c67022"; + }; + } + { + 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 = "https___registry.npmjs.org_mkdirp___mkdirp_0.5.1.tgz"; + path = fetchurl { + name = "https___registry.npmjs.org_mkdirp___mkdirp_0.5.1.tgz"; + url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz"; + sha1 = "30057438eac6cf7f8c4767f38648d6697d75c903"; + }; + } + { + name = "module_deps_sortable___module_deps_sortable_5.0.0.tgz"; + path = fetchurl { + name = "module_deps_sortable___module_deps_sortable_5.0.0.tgz"; + url = "https://registry.yarnpkg.com/module-deps-sortable/-/module-deps-sortable-5.0.0.tgz"; + sha1 = "99db5bb08f7eab55e4c31f6b7c722c6a2144ba74"; + }; + } + { + name = "moment_mini___moment_mini_2.22.1.tgz"; + path = fetchurl { + name = "moment_mini___moment_mini_2.22.1.tgz"; + url = "https://registry.yarnpkg.com/moment-mini/-/moment-mini-2.22.1.tgz"; + sha1 = "bc32d73e43a4505070be6b53494b17623183420d"; + }; + } + { + name = "moment___moment_2.24.0.tgz"; + path = fetchurl { + name = "moment___moment_2.24.0.tgz"; + url = "https://registry.yarnpkg.com/moment/-/moment-2.24.0.tgz"; + sha1 = "0d055d53f5052aa653c9f6eb68bb5d12bf5c2b5b"; + }; + } + { + name = "monaco_editor_webpack_plugin___monaco_editor_webpack_plugin_1.7.0.tgz"; + path = fetchurl { + name = "monaco_editor_webpack_plugin___monaco_editor_webpack_plugin_1.7.0.tgz"; + url = "https://registry.yarnpkg.com/monaco-editor-webpack-plugin/-/monaco-editor-webpack-plugin-1.7.0.tgz"; + sha1 = "920cbeecca25f15d70d568a7e11b0ba4daf1ae83"; + }; + } + { + name = "monaco_editor___monaco_editor_0.15.6.tgz"; + path = fetchurl { + name = "monaco_editor___monaco_editor_0.15.6.tgz"; + url = "https://registry.yarnpkg.com/monaco-editor/-/monaco-editor-0.15.6.tgz"; + sha1 = "d63b3b06f86f803464f003b252627c3eb4a09483"; + }; + } + { + name = "mousetrap___mousetrap_1.4.6.tgz"; + path = fetchurl { + name = "mousetrap___mousetrap_1.4.6.tgz"; + url = "https://registry.yarnpkg.com/mousetrap/-/mousetrap-1.4.6.tgz"; + sha1 = "eaca72e22e56d5b769b7555873b688c3332e390a"; + }; + } + { + name = "move_concurrently___move_concurrently_1.0.1.tgz"; + path = fetchurl { + name = "move_concurrently___move_concurrently_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/move-concurrently/-/move-concurrently-1.0.1.tgz"; + sha1 = "be2c005fda32e0b29af1f05d7c4b33214c701f92"; + }; + } + { + 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.1.tgz"; + path = fetchurl { + name = "ms___ms_2.1.1.tgz"; + url = "https://registry.yarnpkg.com/ms/-/ms-2.1.1.tgz"; + sha1 = "30a5864eb3ebb0a66f2ebe6d727af06a09d86e0a"; + }; + } + { + name = "multicast_dns_service_types___multicast_dns_service_types_1.1.0.tgz"; + path = fetchurl { + name = "multicast_dns_service_types___multicast_dns_service_types_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/multicast-dns-service-types/-/multicast-dns-service-types-1.1.0.tgz"; + sha1 = "899f11d9686e5e05cb91b35d5f0e63b773cfc901"; + }; + } + { + name = "multicast_dns___multicast_dns_6.1.1.tgz"; + path = fetchurl { + name = "multicast_dns___multicast_dns_6.1.1.tgz"; + url = "https://registry.yarnpkg.com/multicast-dns/-/multicast-dns-6.1.1.tgz"; + sha1 = "6e7de86a570872ab17058adea7160bbeca814dde"; + }; + } + { + name = "mute_stream___mute_stream_0.0.7.tgz"; + path = fetchurl { + name = "mute_stream___mute_stream_0.0.7.tgz"; + url = "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.7.tgz"; + sha1 = "3075ce93bc21b8fab43e1bc4da7e8115ed1e7bab"; + }; + } + { + name = "nan___nan_2.14.0.tgz"; + path = fetchurl { + name = "nan___nan_2.14.0.tgz"; + url = "https://registry.yarnpkg.com/nan/-/nan-2.14.0.tgz"; + sha1 = "7818f722027b2459a86f0295d434d1fc2336c52c"; + }; + } + { + 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 = "needle___needle_2.4.0.tgz"; + path = fetchurl { + name = "needle___needle_2.4.0.tgz"; + url = "https://registry.yarnpkg.com/needle/-/needle-2.4.0.tgz"; + sha1 = "6833e74975c444642590e15a750288c5f939b57c"; + }; + } + { + name = "negotiator___negotiator_0.6.1.tgz"; + path = fetchurl { + name = "negotiator___negotiator_0.6.1.tgz"; + url = "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.1.tgz"; + sha1 = "2b327184e8992101177b28563fb5e7102acd0ca9"; + }; + } + { + name = "neo_async___neo_async_2.6.1.tgz"; + path = fetchurl { + name = "neo_async___neo_async_2.6.1.tgz"; + url = "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.1.tgz"; + sha1 = "ac27ada66167fa8849a6addd837f6b189ad2081c"; + }; + } + { + 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 = "no_case___no_case_2.3.2.tgz"; + path = fetchurl { + name = "no_case___no_case_2.3.2.tgz"; + url = "https://registry.yarnpkg.com/no-case/-/no-case-2.3.2.tgz"; + sha1 = "60b813396be39b3f1288a4c1ed5d1e7d28b464ac"; + }; + } + { + name = "node_ensure___node_ensure_0.0.0.tgz"; + path = fetchurl { + name = "node_ensure___node_ensure_0.0.0.tgz"; + url = "https://registry.yarnpkg.com/node-ensure/-/node-ensure-0.0.0.tgz"; + sha1 = "ecae764150de99861ec5c810fd5d096b183932a7"; + }; + } + { + name = "node_fetch___node_fetch_2.6.0.tgz"; + path = fetchurl { + name = "node_fetch___node_fetch_2.6.0.tgz"; + url = "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.0.tgz"; + sha1 = "e633456386d4aa55863f676a7ab0daa8fdecb0fd"; + }; + } + { + name = "node_forge___node_forge_0.6.33.tgz"; + path = fetchurl { + name = "node_forge___node_forge_0.6.33.tgz"; + url = "https://registry.yarnpkg.com/node-forge/-/node-forge-0.6.33.tgz"; + sha1 = "463811879f573d45155ad6a9f43dc296e8e85ebc"; + }; + } + { + name = "node_gyp___node_gyp_3.8.0.tgz"; + path = fetchurl { + name = "node_gyp___node_gyp_3.8.0.tgz"; + url = "https://registry.yarnpkg.com/node-gyp/-/node-gyp-3.8.0.tgz"; + sha1 = "540304261c330e80d0d5edce253a68cb3964218c"; + }; + } + { + 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_libs_browser___node_libs_browser_2.1.0.tgz"; + path = fetchurl { + name = "node_libs_browser___node_libs_browser_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/node-libs-browser/-/node-libs-browser-2.1.0.tgz"; + sha1 = "5f94263d404f6e44767d726901fff05478d600df"; + }; + } + { + 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_5.4.0.tgz"; + path = fetchurl { + name = "node_notifier___node_notifier_5.4.0.tgz"; + url = "https://registry.yarnpkg.com/node-notifier/-/node-notifier-5.4.0.tgz"; + sha1 = "7b455fdce9f7de0c63538297354f3db468426e6a"; + }; + } + { + name = "node_pre_gyp___node_pre_gyp_0.12.0.tgz"; + path = fetchurl { + name = "node_pre_gyp___node_pre_gyp_0.12.0.tgz"; + url = "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.12.0.tgz"; + sha1 = "39ba4bb1439da030295f899e3b520b7785766149"; + }; + } + { + name = "node_releases___node_releases_1.1.25.tgz"; + path = fetchurl { + name = "node_releases___node_releases_1.1.25.tgz"; + url = "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.25.tgz"; + sha1 = "0c2d7dbc7fed30fbe02a9ee3007b8c90bf0133d3"; + }; + } + { + name = "node_sass___node_sass_4.12.0.tgz"; + path = fetchurl { + name = "node_sass___node_sass_4.12.0.tgz"; + url = "https://registry.yarnpkg.com/node-sass/-/node-sass-4.12.0.tgz"; + sha1 = "0914f531932380114a30cc5fa4fa63233a25f017"; + }; + } + { + name = "nodemon___nodemon_1.18.9.tgz"; + path = fetchurl { + name = "nodemon___nodemon_1.18.9.tgz"; + url = "https://registry.yarnpkg.com/nodemon/-/nodemon-1.18.9.tgz"; + sha1 = "90b467efd3b3c81b9453380aeb2a2cba535d0ead"; + }; + } + { + name = "nopt___nopt_3.0.6.tgz"; + path = fetchurl { + name = "nopt___nopt_3.0.6.tgz"; + url = "https://registry.yarnpkg.com/nopt/-/nopt-3.0.6.tgz"; + sha1 = "c6465dbf08abcd4db359317f79ac68a646b28ff9"; + }; + } + { + name = "nopt___nopt_4.0.1.tgz"; + path = fetchurl { + name = "nopt___nopt_4.0.1.tgz"; + url = "https://registry.yarnpkg.com/nopt/-/nopt-4.0.1.tgz"; + sha1 = "d0d4685afd5415193c8c7505602d0d17cd64474d"; + }; + } + { + name = "nopt___nopt_1.0.10.tgz"; + path = fetchurl { + name = "nopt___nopt_1.0.10.tgz"; + url = "https://registry.yarnpkg.com/nopt/-/nopt-1.0.10.tgz"; + sha1 = "6ddd21bd2a31417b92727dd585f8a6f37608ebee"; + }; + } + { + 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_range___normalize_range_0.1.2.tgz"; + path = fetchurl { + name = "normalize_range___normalize_range_0.1.2.tgz"; + url = "https://registry.yarnpkg.com/normalize-range/-/normalize-range-0.1.2.tgz"; + sha1 = "2d10c06bdfd312ea9777695a4d28439456b75942"; + }; + } + { + name = "normalize_selector___normalize_selector_0.2.0.tgz"; + path = fetchurl { + name = "normalize_selector___normalize_selector_0.2.0.tgz"; + url = "https://registry.yarnpkg.com/normalize-selector/-/normalize-selector-0.2.0.tgz"; + sha1 = "d0b145eb691189c63a78d201dc4fdb1293ef0c03"; + }; + } + { + name = "normalize_url___normalize_url_2.0.1.tgz"; + path = fetchurl { + name = "normalize_url___normalize_url_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/normalize-url/-/normalize-url-2.0.1.tgz"; + sha1 = "835a9da1551fa26f70e92329069a23aa6574d7e6"; + }; + } + { + name = "normalize_url___normalize_url_1.9.1.tgz"; + path = fetchurl { + name = "normalize_url___normalize_url_1.9.1.tgz"; + url = "https://registry.yarnpkg.com/normalize-url/-/normalize-url-1.9.1.tgz"; + sha1 = "2cc0d66b31ea23036458436e3620d85954c66c3c"; + }; + } + { + name = "now_and_later___now_and_later_2.0.1.tgz"; + path = fetchurl { + name = "now_and_later___now_and_later_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/now-and-later/-/now-and-later-2.0.1.tgz"; + sha1 = "8e579c8685764a7cc02cb680380e94f43ccb1f7c"; + }; + } + { + name = "npm_bundled___npm_bundled_1.0.6.tgz"; + path = fetchurl { + name = "npm_bundled___npm_bundled_1.0.6.tgz"; + url = "https://registry.yarnpkg.com/npm-bundled/-/npm-bundled-1.0.6.tgz"; + sha1 = "e7ba9aadcef962bb61248f91721cd932b3fe6bdd"; + }; + } + { + name = "npm_packlist___npm_packlist_1.4.1.tgz"; + path = fetchurl { + name = "npm_packlist___npm_packlist_1.4.1.tgz"; + url = "https://registry.yarnpkg.com/npm-packlist/-/npm-packlist-1.4.1.tgz"; + sha1 = "19064cdf988da80ea3cee45533879d90192bbfbc"; + }; + } + { + name = "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 = "npmlog___npmlog_4.1.2.tgz"; + path = fetchurl { + name = "npmlog___npmlog_4.1.2.tgz"; + url = "https://registry.yarnpkg.com/npmlog/-/npmlog-4.1.2.tgz"; + sha1 = "08a7f2a8bf734604779a9efa4ad5cc717abb954b"; + }; + } + { + name = "num2fraction___num2fraction_1.2.2.tgz"; + path = fetchurl { + name = "num2fraction___num2fraction_1.2.2.tgz"; + url = "https://registry.yarnpkg.com/num2fraction/-/num2fraction-1.2.2.tgz"; + sha1 = "6f682b6a027a4e9ddfa4564cd2589d1d4e669ede"; + }; + } + { + name = "number_is_nan___number_is_nan_1.0.1.tgz"; + path = fetchurl { + name = "number_is_nan___number_is_nan_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz"; + sha1 = "097b602b53422a522c1afb8790318336941a011d"; + }; + } + { + name = "nwsapi___nwsapi_2.0.9.tgz"; + path = fetchurl { + name = "nwsapi___nwsapi_2.0.9.tgz"; + url = "https://registry.yarnpkg.com/nwsapi/-/nwsapi-2.0.9.tgz"; + sha1 = "77ac0cdfdcad52b6a1151a84e73254edc33ed016"; + }; + } + { + 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_assign___object_assign_4.1.1.tgz"; + path = fetchurl { + name = "object_assign___object_assign_4.1.1.tgz"; + url = "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz"; + sha1 = "2109adc7965887cfc05cbbd442cac8bfbb360863"; + }; + } + { + name = "object_component___object_component_0.0.3.tgz"; + path = fetchurl { + name = "object_component___object_component_0.0.3.tgz"; + url = "https://registry.yarnpkg.com/object-component/-/object-component-0.0.3.tgz"; + sha1 = "f0c69aa50efc95b866c186f400a33769cb2f1291"; + }; + } + { + 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.assign___object.assign_4.1.0.tgz"; + path = fetchurl { + name = "object.assign___object.assign_4.1.0.tgz"; + url = "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.0.tgz"; + sha1 = "968bf1100d7956bb3ca086f006f846b3bc4008da"; + }; + } + { + name = "object.entries___object.entries_1.0.4.tgz"; + path = fetchurl { + name = "object.entries___object.entries_1.0.4.tgz"; + url = "https://registry.yarnpkg.com/object.entries/-/object.entries-1.0.4.tgz"; + sha1 = "1bf9a4dd2288f5b33f3a993d257661f05d161a5f"; + }; + } + { + name = "object.getownpropertydescriptors___object.getownpropertydescriptors_2.0.3.tgz"; + path = fetchurl { + name = "object.getownpropertydescriptors___object.getownpropertydescriptors_2.0.3.tgz"; + url = "https://registry.yarnpkg.com/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.0.3.tgz"; + sha1 = "8758c846f5b407adab0f236e0986f14b051caa16"; + }; + } + { + name = "object.pick___object.pick_1.3.0.tgz"; + path = fetchurl { + 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 = "obuf___obuf_1.1.2.tgz"; + path = fetchurl { + name = "obuf___obuf_1.1.2.tgz"; + url = "https://registry.yarnpkg.com/obuf/-/obuf-1.1.2.tgz"; + sha1 = "09bea3343d41859ebd446292d11c9d4db619084e"; + }; + } + { + name = "on_finished___on_finished_2.3.0.tgz"; + path = fetchurl { + name = "on_finished___on_finished_2.3.0.tgz"; + url = "https://registry.yarnpkg.com/on-finished/-/on-finished-2.3.0.tgz"; + sha1 = "20f1336481b083cd75337992a16971aa2d906947"; + }; + } + { + name = "on_headers___on_headers_1.0.1.tgz"; + path = fetchurl { + name = "on_headers___on_headers_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/on-headers/-/on-headers-1.0.1.tgz"; + sha1 = "928f5d0f470d49342651ea6794b0857c100693f7"; + }; + } + { + 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_2.0.1.tgz"; + path = fetchurl { + name = "onetime___onetime_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/onetime/-/onetime-2.0.1.tgz"; + sha1 = "067428230fd67443b2794b22bba528b6867962d4"; + }; + } + { + name = "opener___opener_1.5.1.tgz"; + path = fetchurl { + name = "opener___opener_1.5.1.tgz"; + url = "https://registry.yarnpkg.com/opener/-/opener-1.5.1.tgz"; + sha1 = "6d2f0e77f1a0af0032aca716c2c1fbb8e7e8abed"; + }; + } + { + name = "opn___opn_5.2.0.tgz"; + path = fetchurl { + name = "opn___opn_5.2.0.tgz"; + url = "https://registry.yarnpkg.com/opn/-/opn-5.2.0.tgz"; + sha1 = "71fdf934d6827d676cecbea1531f95d354641225"; + }; + } + { + name = "optimism___optimism_0.6.9.tgz"; + path = fetchurl { + name = "optimism___optimism_0.6.9.tgz"; + url = "https://registry.yarnpkg.com/optimism/-/optimism-0.6.9.tgz"; + sha1 = "19258ff8b3be0cea29ac35f06bff818e026e30bb"; + }; + } + { + name = "optimist___optimist_0.6.1.tgz"; + path = fetchurl { + name = "optimist___optimist_0.6.1.tgz"; + url = "https://registry.yarnpkg.com/optimist/-/optimist-0.6.1.tgz"; + sha1 = "da3ea74686fa21a19a111c326e90eb15a0196686"; + }; + } + { + name = "optionator___optionator_0.8.2.tgz"; + path = fetchurl { + name = "optionator___optionator_0.8.2.tgz"; + url = "https://registry.yarnpkg.com/optionator/-/optionator-0.8.2.tgz"; + sha1 = "364c5e409d3f4d6301d6c0b4c05bba50180aeb64"; + }; + } + { + name = "ordered_read_streams___ordered_read_streams_1.0.1.tgz"; + path = fetchurl { + name = "ordered_read_streams___ordered_read_streams_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/ordered-read-streams/-/ordered-read-streams-1.0.1.tgz"; + sha1 = "77c0cb37c41525d64166d990ffad7ec6a0e1363e"; + }; + } + { + name = "orderedmap___orderedmap_1.0.0.tgz"; + path = fetchurl { + name = "orderedmap___orderedmap_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/orderedmap/-/orderedmap-1.0.0.tgz"; + sha1 = "d90fc2ba1ed085190907d601dec6e6a53f8d41ba"; + }; + } + { + name = "original___original_1.0.2.tgz"; + path = fetchurl { + name = "original___original_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/original/-/original-1.0.2.tgz"; + sha1 = "e442a61cffe1c5fd20a65f3261c26663b303f25f"; + }; + } + { + name = "os_browserify___os_browserify_0.3.0.tgz"; + path = fetchurl { + name = "os_browserify___os_browserify_0.3.0.tgz"; + url = "https://registry.yarnpkg.com/os-browserify/-/os-browserify-0.3.0.tgz"; + sha1 = "854373c7f5c2315914fc9bfc6bd8238fdda1ec27"; + }; + } + { + name = "os_homedir___os_homedir_1.0.2.tgz"; + path = fetchurl { + name = "os_homedir___os_homedir_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/os-homedir/-/os-homedir-1.0.2.tgz"; + sha1 = "ffbc4988336e0e833de0c168c7ef152121aa7fb3"; + }; + } + { + name = "os_locale___os_locale_1.4.0.tgz"; + path = fetchurl { + name = "os_locale___os_locale_1.4.0.tgz"; + url = "https://registry.yarnpkg.com/os-locale/-/os-locale-1.4.0.tgz"; + sha1 = "20f9f17ae29ed345e8bde583b13d2009803c14d9"; + }; + } + { + name = "os_locale___os_locale_3.1.0.tgz"; + path = fetchurl { + name = "os_locale___os_locale_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/os-locale/-/os-locale-3.1.0.tgz"; + sha1 = "a802a6ee17f24c10483ab9935719cef4ed16bf1a"; + }; + } + { + name = "os_tmpdir___os_tmpdir_1.0.2.tgz"; + path = fetchurl { + name = "os_tmpdir___os_tmpdir_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz"; + sha1 = "bbe67406c79aa85c5cfec766fe5734555dfa1274"; + }; + } + { + name = "osenv___osenv_0.1.5.tgz"; + path = fetchurl { + name = "osenv___osenv_0.1.5.tgz"; + url = "https://registry.yarnpkg.com/osenv/-/osenv-0.1.5.tgz"; + sha1 = "85cdfafaeb28e8677f416e287592b5f3f49ea410"; + }; + } + { + name = "p_cancelable___p_cancelable_0.4.1.tgz"; + path = fetchurl { + name = "p_cancelable___p_cancelable_0.4.1.tgz"; + url = "https://registry.yarnpkg.com/p-cancelable/-/p-cancelable-0.4.1.tgz"; + sha1 = "35f363d67d52081c8d9585e37bcceb7e0bbcb2a0"; + }; + } + { + name = "p_defer___p_defer_1.0.0.tgz"; + path = fetchurl { + name = "p_defer___p_defer_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/p-defer/-/p-defer-1.0.0.tgz"; + sha1 = "9f6eb182f6c9aa8cd743004a7d4f96b196b0fb0c"; + }; + } + { + name = "p_each_series___p_each_series_1.0.0.tgz"; + path = fetchurl { + name = "p_each_series___p_each_series_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/p-each-series/-/p-each-series-1.0.0.tgz"; + sha1 = "930f3d12dd1f50e7434457a22cd6f04ac6ad7f71"; + }; + } + { + name = "p_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_is_promise___p_is_promise_1.1.0.tgz"; + path = fetchurl { + name = "p_is_promise___p_is_promise_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/p-is-promise/-/p-is-promise-1.1.0.tgz"; + sha1 = "9c9456989e9f6588017b0434d56097675c3da05e"; + }; + } + { + name = "p_is_promise___p_is_promise_2.1.0.tgz"; + path = fetchurl { + name = "p_is_promise___p_is_promise_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/p-is-promise/-/p-is-promise-2.1.0.tgz"; + sha1 = "918cebaea248a62cf7ffab8e3bca8c5f882fc42e"; + }; + } + { + name = "p_limit___p_limit_1.2.0.tgz"; + path = fetchurl { + name = "p_limit___p_limit_1.2.0.tgz"; + url = "https://registry.yarnpkg.com/p-limit/-/p-limit-1.2.0.tgz"; + sha1 = "0e92b6bedcb59f022c13d0f1949dc82d15909f1c"; + }; + } + { + name = "p_limit___p_limit_2.2.0.tgz"; + path = fetchurl { + name = "p_limit___p_limit_2.2.0.tgz"; + url = "https://registry.yarnpkg.com/p-limit/-/p-limit-2.2.0.tgz"; + sha1 = "417c9941e6027a9abcba5092dd2904e255b5fbc2"; + }; + } + { + name = "p_locate___p_locate_2.0.0.tgz"; + path = fetchurl { + name = "p_locate___p_locate_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/p-locate/-/p-locate-2.0.0.tgz"; + sha1 = "20a0103b222a70c8fd39cc2e580680f3dde5ec43"; + }; + } + { + name = "p_locate___p_locate_3.0.0.tgz"; + path = fetchurl { + name = "p_locate___p_locate_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/p-locate/-/p-locate-3.0.0.tgz"; + sha1 = "322d69a05c0264b25997d9f40cd8a891ab0064a4"; + }; + } + { + name = "p_map___p_map_1.1.1.tgz"; + path = fetchurl { + name = "p_map___p_map_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/p-map/-/p-map-1.1.1.tgz"; + sha1 = "05f5e4ae97a068371bc2a5cc86bfbdbc19c4ae7a"; + }; + } + { + name = "p_reduce___p_reduce_1.0.0.tgz"; + path = fetchurl { + name = "p_reduce___p_reduce_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/p-reduce/-/p-reduce-1.0.0.tgz"; + sha1 = "18c2b0dd936a4690a529f8231f58a0fdb6a47dfa"; + }; + } + { + name = "p_timeout___p_timeout_2.0.1.tgz"; + path = fetchurl { + name = "p_timeout___p_timeout_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/p-timeout/-/p-timeout-2.0.1.tgz"; + sha1 = "d8dd1979595d2dc0139e1fe46b8b646cb3cdf038"; + }; + } + { + name = "p_try___p_try_1.0.0.tgz"; + path = fetchurl { + name = "p_try___p_try_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/p-try/-/p-try-1.0.0.tgz"; + sha1 = "cbc79cdbaf8fd4228e13f621f2b1a237c1b207b3"; + }; + } + { + 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_4.0.1.tgz"; + path = fetchurl { + name = "package_json___package_json_4.0.1.tgz"; + url = "https://registry.yarnpkg.com/package-json/-/package-json-4.0.1.tgz"; + sha1 = "8869a0401253661c4c4ca3da6c2121ed555f5eed"; + }; + } + { + name = "pako___pako_1.0.6.tgz"; + path = fetchurl { + name = "pako___pako_1.0.6.tgz"; + url = "https://registry.yarnpkg.com/pako/-/pako-1.0.6.tgz"; + sha1 = "0101211baa70c4bca4a0f63f2206e97b7dfaf258"; + }; + } + { + name = "parallel_transform___parallel_transform_1.1.0.tgz"; + path = fetchurl { + name = "parallel_transform___parallel_transform_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/parallel-transform/-/parallel-transform-1.1.0.tgz"; + sha1 = "d410f065b05da23081fcd10f28854c29bda33b06"; + }; + } + { + name = "param_case___param_case_2.1.1.tgz"; + path = fetchurl { + name = "param_case___param_case_2.1.1.tgz"; + url = "https://registry.yarnpkg.com/param-case/-/param-case-2.1.1.tgz"; + sha1 = "df94fd8cf6531ecf75e6bef9a0858fbc72be2247"; + }; + } + { + name = "parse_asn1___parse_asn1_5.1.0.tgz"; + path = fetchurl { + name = "parse_asn1___parse_asn1_5.1.0.tgz"; + url = "https://registry.yarnpkg.com/parse-asn1/-/parse-asn1-5.1.0.tgz"; + sha1 = "37c4f9b7ed3ab65c74817b5f2480937fbf97c712"; + }; + } + { + name = "parse_entities___parse_entities_1.2.0.tgz"; + path = fetchurl { + name = "parse_entities___parse_entities_1.2.0.tgz"; + url = "https://registry.yarnpkg.com/parse-entities/-/parse-entities-1.2.0.tgz"; + sha1 = "9deac087661b2e36814153cb78d7e54a4c5fd6f4"; + }; + } + { + name = "parse_filepath___parse_filepath_1.0.2.tgz"; + path = fetchurl { + name = "parse_filepath___parse_filepath_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/parse-filepath/-/parse-filepath-1.0.2.tgz"; + sha1 = "a632127f53aaf3d15876f5872f3ffac763d6c891"; + }; + } + { + name = "parse_git_config___parse_git_config_0.2.0.tgz"; + path = fetchurl { + name = "parse_git_config___parse_git_config_0.2.0.tgz"; + url = "https://registry.yarnpkg.com/parse-git-config/-/parse-git-config-0.2.0.tgz"; + sha1 = "272833fdd15fea146fb75d336d236b963b6ff706"; + }; + } + { + name = "parse_json___parse_json_2.2.0.tgz"; + path = fetchurl { + name = "parse_json___parse_json_2.2.0.tgz"; + url = "https://registry.yarnpkg.com/parse-json/-/parse-json-2.2.0.tgz"; + sha1 = "f480f40434ef80741f8469099f8dea18f55a4dc9"; + }; + } + { + name = "parse_json___parse_json_4.0.0.tgz"; + path = fetchurl { + name = "parse_json___parse_json_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/parse-json/-/parse-json-4.0.0.tgz"; + sha1 = "be35f5425be1f7f6c747184f98a788cb99477ee0"; + }; + } + { + name = "parse_passwd___parse_passwd_1.0.0.tgz"; + path = fetchurl { + name = "parse_passwd___parse_passwd_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/parse-passwd/-/parse-passwd-1.0.0.tgz"; + sha1 = "6d5b934a456993b23d37f40a382d6f1666a8e5c6"; + }; + } + { + name = "parse_path___parse_path_3.0.4.tgz"; + path = fetchurl { + name = "parse_path___parse_path_3.0.4.tgz"; + url = "https://registry.yarnpkg.com/parse-path/-/parse-path-3.0.4.tgz"; + sha1 = "a48b7b529da41f34d9d1428602a39b29fc7180e4"; + }; + } + { + name = "parse_url___parse_url_3.0.2.tgz"; + path = fetchurl { + name = "parse_url___parse_url_3.0.2.tgz"; + url = "https://registry.yarnpkg.com/parse-url/-/parse-url-3.0.2.tgz"; + sha1 = "602787a7063a795d72b8673197505e72f60610be"; + }; + } + { + name = "parse5___parse5_4.0.0.tgz"; + path = fetchurl { + name = "parse5___parse5_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/parse5/-/parse5-4.0.0.tgz"; + sha1 = "6d78656e3da8d78b4ec0b906f7c08ef1dfe3f608"; + }; + } + { + name = "parse5___parse5_5.0.0.tgz"; + path = fetchurl { + name = "parse5___parse5_5.0.0.tgz"; + url = "https://registry.yarnpkg.com/parse5/-/parse5-5.0.0.tgz"; + sha1 = "4d02710d44f3c3846197a11e205d4ef17842b81a"; + }; + } + { + name = "parseqs___parseqs_0.0.5.tgz"; + path = fetchurl { + name = "parseqs___parseqs_0.0.5.tgz"; + url = "https://registry.yarnpkg.com/parseqs/-/parseqs-0.0.5.tgz"; + sha1 = "d5208a3738e46766e291ba2ea173684921a8b89d"; + }; + } + { + name = "parseuri___parseuri_0.0.5.tgz"; + path = fetchurl { + name = "parseuri___parseuri_0.0.5.tgz"; + url = "https://registry.yarnpkg.com/parseuri/-/parseuri-0.0.5.tgz"; + sha1 = "80204a50d4dbb779bfdc6ebe2778d90e4bce320a"; + }; + } + { + name = "parseurl___parseurl_1.3.2.tgz"; + path = fetchurl { + name = "parseurl___parseurl_1.3.2.tgz"; + url = "https://registry.yarnpkg.com/parseurl/-/parseurl-1.3.2.tgz"; + sha1 = "fc289d4ed8993119460c156253262cdc8de65bf3"; + }; + } + { + 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_browserify___path_browserify_0.0.0.tgz"; + path = fetchurl { + name = "path_browserify___path_browserify_0.0.0.tgz"; + url = "https://registry.yarnpkg.com/path-browserify/-/path-browserify-0.0.0.tgz"; + sha1 = "a0b870729aae214005b7d5032ec2cbbb0fb4451a"; + }; + } + { + name = "path_dirname___path_dirname_1.0.2.tgz"; + path = fetchurl { + name = "path_dirname___path_dirname_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/path-dirname/-/path-dirname-1.0.2.tgz"; + sha1 = "cc33d24d525e099a5388c0336c6e32b9160609e0"; + }; + } + { + name = "path_exists___path_exists_2.1.0.tgz"; + path = fetchurl { + name = "path_exists___path_exists_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/path-exists/-/path-exists-2.1.0.tgz"; + sha1 = "0feb6c64f0fc518d9a754dd5efb62c7022761f4b"; + }; + } + { + name = "path_exists___path_exists_3.0.0.tgz"; + path = fetchurl { + name = "path_exists___path_exists_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/path-exists/-/path-exists-3.0.0.tgz"; + sha1 = "ce0ebeaa5f78cb18925ea7d810d7b59b010fd515"; + }; + } + { + 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_is_inside___path_is_inside_1.0.2.tgz"; + path = fetchurl { + name = "path_is_inside___path_is_inside_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/path-is-inside/-/path-is-inside-1.0.2.tgz"; + sha1 = "365417dede44430d1c11af61027facf074bdfc53"; + }; + } + { + 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_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 = "path_root_regex___path_root_regex_0.1.2.tgz"; + path = fetchurl { + name = "path_root_regex___path_root_regex_0.1.2.tgz"; + url = "https://registry.yarnpkg.com/path-root-regex/-/path-root-regex-0.1.2.tgz"; + sha1 = "bfccdc8df5b12dc52c8b43ec38d18d72c04ba96d"; + }; + } + { + name = "path_root___path_root_0.1.1.tgz"; + path = fetchurl { + name = "path_root___path_root_0.1.1.tgz"; + url = "https://registry.yarnpkg.com/path-root/-/path-root-0.1.1.tgz"; + sha1 = "9a4a6814cac1c0cd73360a95f32083c8ea4745b7"; + }; + } + { + name = "path_to_regexp___path_to_regexp_0.1.7.tgz"; + path = fetchurl { + name = "path_to_regexp___path_to_regexp_0.1.7.tgz"; + url = "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-0.1.7.tgz"; + sha1 = "df604178005f522f15eb4490e7247a1bfaa67f8c"; + }; + } + { + name = "path_type___path_type_1.1.0.tgz"; + path = fetchurl { + name = "path_type___path_type_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/path-type/-/path-type-1.1.0.tgz"; + sha1 = "59c44f7ee491da704da415da5a4070ba4f8fe441"; + }; + } + { + name = "path_type___path_type_2.0.0.tgz"; + path = fetchurl { + name = "path_type___path_type_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/path-type/-/path-type-2.0.0.tgz"; + sha1 = "f012ccb8415b7096fc2daa1054c3d72389594c73"; + }; + } + { + name = "path_type___path_type_3.0.0.tgz"; + path = fetchurl { + name = "path_type___path_type_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/path-type/-/path-type-3.0.0.tgz"; + sha1 = "cef31dc8e0a1a3bb0d105c0cd97cf3bf47f4e36f"; + }; + } + { + name = "pbkdf2___pbkdf2_3.0.14.tgz"; + path = fetchurl { + name = "pbkdf2___pbkdf2_3.0.14.tgz"; + url = "https://registry.yarnpkg.com/pbkdf2/-/pbkdf2-3.0.14.tgz"; + sha1 = "a35e13c64799b06ce15320f459c230e68e73bade"; + }; + } + { + name = "pdfjs_dist___pdfjs_dist_2.1.266.tgz"; + path = fetchurl { + name = "pdfjs_dist___pdfjs_dist_2.1.266.tgz"; + url = "https://registry.yarnpkg.com/pdfjs-dist/-/pdfjs-dist-2.1.266.tgz"; + sha1 = "cded02268b389559e807f410d2a729db62160026"; + }; + } + { + 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.0.7.tgz"; + path = fetchurl { + name = "picomatch___picomatch_2.0.7.tgz"; + url = "https://registry.yarnpkg.com/picomatch/-/picomatch-2.0.7.tgz"; + sha1 = "514169d8c7cd0bdbeecc8a2609e34a7163de69f6"; + }; + } + { + name = "pify___pify_2.3.0.tgz"; + path = fetchurl { + name = "pify___pify_2.3.0.tgz"; + url = "https://registry.yarnpkg.com/pify/-/pify-2.3.0.tgz"; + sha1 = "ed141a6ac043a849ea588498e7dca8b15330e90c"; + }; + } + { + 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 = "pify___pify_4.0.1.tgz"; + path = fetchurl { + name = "pify___pify_4.0.1.tgz"; + url = "https://registry.yarnpkg.com/pify/-/pify-4.0.1.tgz"; + sha1 = "4b2cd25c50d598735c50292224fd8c6df41e3231"; + }; + } + { + name = "pikaday___pikaday_1.8.0.tgz"; + path = fetchurl { + name = "pikaday___pikaday_1.8.0.tgz"; + url = "https://registry.yarnpkg.com/pikaday/-/pikaday-1.8.0.tgz"; + sha1 = "ce930e257042e852e6aadee1115e01554b2d71c5"; + }; + } + { + name = "pinkie_promise___pinkie_promise_2.0.1.tgz"; + path = fetchurl { + name = "pinkie_promise___pinkie_promise_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/pinkie-promise/-/pinkie-promise-2.0.1.tgz"; + sha1 = "2135d6dfa7a358c069ac9b178776288228450ffa"; + }; + } + { + name = "pinkie___pinkie_2.0.4.tgz"; + path = fetchurl { + name = "pinkie___pinkie_2.0.4.tgz"; + url = "https://registry.yarnpkg.com/pinkie/-/pinkie-2.0.4.tgz"; + sha1 = "72556b80cfa0d48a974e80e77248e80ed4f7f870"; + }; + } + { + 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 = "pixelmatch___pixelmatch_4.0.2.tgz"; + path = fetchurl { + name = "pixelmatch___pixelmatch_4.0.2.tgz"; + url = "https://registry.yarnpkg.com/pixelmatch/-/pixelmatch-4.0.2.tgz"; + sha1 = "8f47dcec5011b477b67db03c243bc1f3085e8854"; + }; + } + { + name = "pkg_dir___pkg_dir_2.0.0.tgz"; + path = fetchurl { + name = "pkg_dir___pkg_dir_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-2.0.0.tgz"; + sha1 = "f6d5d1109e19d63edf428e0bd57e12777615334b"; + }; + } + { + name = "pkg_dir___pkg_dir_3.0.0.tgz"; + path = fetchurl { + name = "pkg_dir___pkg_dir_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-3.0.0.tgz"; + sha1 = "2749020f239ed990881b1f71210d51eb6523bea3"; + }; + } + { + name = "pluralize___pluralize_7.0.0.tgz"; + path = fetchurl { + name = "pluralize___pluralize_7.0.0.tgz"; + url = "https://registry.yarnpkg.com/pluralize/-/pluralize-7.0.0.tgz"; + sha1 = "298b89df8b93b0221dbf421ad2b1b1ea23fc6777"; + }; + } + { + name = "pn___pn_1.1.0.tgz"; + path = fetchurl { + name = "pn___pn_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/pn/-/pn-1.1.0.tgz"; + sha1 = "e2f4cef0e219f463c179ab37463e4e1ecdccbafb"; + }; + } + { + name = "pngjs___pngjs_3.3.3.tgz"; + path = fetchurl { + name = "pngjs___pngjs_3.3.3.tgz"; + url = "https://registry.yarnpkg.com/pngjs/-/pngjs-3.3.3.tgz"; + sha1 = "85173703bde3edac8998757b96e5821d0966a21b"; + }; + } + { + name = "pofile___pofile_1.0.11.tgz"; + path = fetchurl { + name = "pofile___pofile_1.0.11.tgz"; + url = "https://registry.yarnpkg.com/pofile/-/pofile-1.0.11.tgz"; + sha1 = "35aff58c17491d127a07336d5522ebc9df57c954"; + }; + } + { + name = "popper.js___popper.js_1.15.0.tgz"; + path = fetchurl { + name = "popper.js___popper.js_1.15.0.tgz"; + url = "https://registry.yarnpkg.com/popper.js/-/popper.js-1.15.0.tgz"; + sha1 = "5560b99bbad7647e9faa475c6b8056621f5a4ff2"; + }; + } + { + name = "portal_vue___portal_vue_2.1.5.tgz"; + path = fetchurl { + name = "portal_vue___portal_vue_2.1.5.tgz"; + url = "https://registry.yarnpkg.com/portal-vue/-/portal-vue-2.1.5.tgz"; + sha1 = "ecd0997cb32958205151cb72f40fd4f38d175e5c"; + }; + } + { + name = "portfinder___portfinder_1.0.13.tgz"; + path = fetchurl { + name = "portfinder___portfinder_1.0.13.tgz"; + url = "https://registry.yarnpkg.com/portfinder/-/portfinder-1.0.13.tgz"; + sha1 = "bb32ecd87c27104ae6ee44b5a3ccbf0ebb1aede9"; + }; + } + { + 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 = "postcss_html___postcss_html_0.36.0.tgz"; + path = fetchurl { + name = "postcss_html___postcss_html_0.36.0.tgz"; + url = "https://registry.yarnpkg.com/postcss-html/-/postcss-html-0.36.0.tgz"; + sha1 = "b40913f94eaacc2453fd30a1327ad6ee1f88b204"; + }; + } + { + name = "postcss_jsx___postcss_jsx_0.36.2.tgz"; + path = fetchurl { + name = "postcss_jsx___postcss_jsx_0.36.2.tgz"; + url = "https://registry.yarnpkg.com/postcss-jsx/-/postcss-jsx-0.36.2.tgz"; + sha1 = "34bcd6752426a60b8df73f069e7595383060a794"; + }; + } + { + name = "postcss_less___postcss_less_3.1.4.tgz"; + path = fetchurl { + name = "postcss_less___postcss_less_3.1.4.tgz"; + url = "https://registry.yarnpkg.com/postcss-less/-/postcss-less-3.1.4.tgz"; + sha1 = "369f58642b5928ef898ffbc1a6e93c958304c5ad"; + }; + } + { + name = "postcss_markdown___postcss_markdown_0.36.0.tgz"; + path = fetchurl { + name = "postcss_markdown___postcss_markdown_0.36.0.tgz"; + url = "https://registry.yarnpkg.com/postcss-markdown/-/postcss-markdown-0.36.0.tgz"; + sha1 = "7f22849ae0e3db18820b7b0d5e7833f13a447560"; + }; + } + { + name = "postcss_media_query_parser___postcss_media_query_parser_0.2.3.tgz"; + path = fetchurl { + name = "postcss_media_query_parser___postcss_media_query_parser_0.2.3.tgz"; + url = "https://registry.yarnpkg.com/postcss-media-query-parser/-/postcss-media-query-parser-0.2.3.tgz"; + sha1 = "27b39c6f4d94f81b1a73b8f76351c609e5cef244"; + }; + } + { + name = "postcss_modules_extract_imports___postcss_modules_extract_imports_1.2.1.tgz"; + path = fetchurl { + name = "postcss_modules_extract_imports___postcss_modules_extract_imports_1.2.1.tgz"; + url = "https://registry.yarnpkg.com/postcss-modules-extract-imports/-/postcss-modules-extract-imports-1.2.1.tgz"; + sha1 = "dc87e34148ec7eab5f791f7cd5849833375b741a"; + }; + } + { + name = "postcss_modules_local_by_default___postcss_modules_local_by_default_1.2.0.tgz"; + path = fetchurl { + name = "postcss_modules_local_by_default___postcss_modules_local_by_default_1.2.0.tgz"; + url = "https://registry.yarnpkg.com/postcss-modules-local-by-default/-/postcss-modules-local-by-default-1.2.0.tgz"; + sha1 = "f7d80c398c5a393fa7964466bd19500a7d61c069"; + }; + } + { + name = "postcss_modules_scope___postcss_modules_scope_1.1.0.tgz"; + path = fetchurl { + name = "postcss_modules_scope___postcss_modules_scope_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/postcss-modules-scope/-/postcss-modules-scope-1.1.0.tgz"; + sha1 = "d6ea64994c79f97b62a72b426fbe6056a194bb90"; + }; + } + { + name = "postcss_modules_values___postcss_modules_values_1.3.0.tgz"; + path = fetchurl { + name = "postcss_modules_values___postcss_modules_values_1.3.0.tgz"; + url = "https://registry.yarnpkg.com/postcss-modules-values/-/postcss-modules-values-1.3.0.tgz"; + sha1 = "ecffa9d7e192518389f42ad0e83f72aec456ea20"; + }; + } + { + name = "postcss_reporter___postcss_reporter_6.0.1.tgz"; + path = fetchurl { + name = "postcss_reporter___postcss_reporter_6.0.1.tgz"; + url = "https://registry.yarnpkg.com/postcss-reporter/-/postcss-reporter-6.0.1.tgz"; + sha1 = "7c055120060a97c8837b4e48215661aafb74245f"; + }; + } + { + name = "postcss_resolve_nested_selector___postcss_resolve_nested_selector_0.1.1.tgz"; + path = fetchurl { + name = "postcss_resolve_nested_selector___postcss_resolve_nested_selector_0.1.1.tgz"; + url = "https://registry.yarnpkg.com/postcss-resolve-nested-selector/-/postcss-resolve-nested-selector-0.1.1.tgz"; + sha1 = "29ccbc7c37dedfac304e9fff0bf1596b3f6a0e4e"; + }; + } + { + name = "postcss_safe_parser___postcss_safe_parser_4.0.1.tgz"; + path = fetchurl { + name = "postcss_safe_parser___postcss_safe_parser_4.0.1.tgz"; + url = "https://registry.yarnpkg.com/postcss-safe-parser/-/postcss-safe-parser-4.0.1.tgz"; + sha1 = "8756d9e4c36fdce2c72b091bbc8ca176ab1fcdea"; + }; + } + { + name = "postcss_sass___postcss_sass_0.3.5.tgz"; + path = fetchurl { + name = "postcss_sass___postcss_sass_0.3.5.tgz"; + url = "https://registry.yarnpkg.com/postcss-sass/-/postcss-sass-0.3.5.tgz"; + sha1 = "6d3e39f101a53d2efa091f953493116d32beb68c"; + }; + } + { + name = "postcss_scss___postcss_scss_2.0.0.tgz"; + path = fetchurl { + name = "postcss_scss___postcss_scss_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/postcss-scss/-/postcss-scss-2.0.0.tgz"; + sha1 = "248b0a28af77ea7b32b1011aba0f738bda27dea1"; + }; + } + { + name = "postcss_selector_parser___postcss_selector_parser_3.1.1.tgz"; + path = fetchurl { + name = "postcss_selector_parser___postcss_selector_parser_3.1.1.tgz"; + url = "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-3.1.1.tgz"; + sha1 = "4f875f4afb0c96573d5cf4d74011aee250a7e865"; + }; + } + { + name = "postcss_selector_parser___postcss_selector_parser_5.0.0.tgz"; + path = fetchurl { + name = "postcss_selector_parser___postcss_selector_parser_5.0.0.tgz"; + url = "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-5.0.0.tgz"; + sha1 = "249044356697b33b64f1a8f7c80922dddee7195c"; + }; + } + { + name = "postcss_selector_parser___postcss_selector_parser_6.0.2.tgz"; + path = fetchurl { + name = "postcss_selector_parser___postcss_selector_parser_6.0.2.tgz"; + url = "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.2.tgz"; + sha1 = "934cf799d016c83411859e09dcecade01286ec5c"; + }; + } + { + name = "postcss_syntax___postcss_syntax_0.36.2.tgz"; + path = fetchurl { + name = "postcss_syntax___postcss_syntax_0.36.2.tgz"; + url = "https://registry.yarnpkg.com/postcss-syntax/-/postcss-syntax-0.36.2.tgz"; + sha1 = "f08578c7d95834574e5593a82dfbfa8afae3b51c"; + }; + } + { + name = "postcss_value_parser___postcss_value_parser_3.3.1.tgz"; + path = fetchurl { + name = "postcss_value_parser___postcss_value_parser_3.3.1.tgz"; + url = "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz"; + sha1 = "9ff822547e2893213cf1c30efa51ac5fd1ba8281"; + }; + } + { + name = "postcss_value_parser___postcss_value_parser_4.0.0.tgz"; + path = fetchurl { + name = "postcss_value_parser___postcss_value_parser_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-4.0.0.tgz"; + sha1 = "99a983d365f7b2ad8d0f9b8c3094926eab4b936d"; + }; + } + { + name = "postcss___postcss_6.0.23.tgz"; + path = fetchurl { + name = "postcss___postcss_6.0.23.tgz"; + url = "https://registry.yarnpkg.com/postcss/-/postcss-6.0.23.tgz"; + sha1 = "61c82cc328ac60e677645f979054eb98bc0e3324"; + }; + } + { + name = "postcss___postcss_7.0.17.tgz"; + path = fetchurl { + name = "postcss___postcss_7.0.17.tgz"; + url = "https://registry.yarnpkg.com/postcss/-/postcss-7.0.17.tgz"; + sha1 = "4da1bdff5322d4a0acaab4d87f3e782436bad31f"; + }; + } + { + 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_1.0.4.tgz"; + path = fetchurl { + name = "prepend_http___prepend_http_1.0.4.tgz"; + url = "https://registry.yarnpkg.com/prepend-http/-/prepend-http-1.0.4.tgz"; + sha1 = "d4f4562b0ce3696e41ac52d0e002e57a635dc6dc"; + }; + } + { + name = "prepend_http___prepend_http_2.0.0.tgz"; + 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 = "prettier___prettier_1.16.3.tgz"; + path = fetchurl { + name = "prettier___prettier_1.16.3.tgz"; + url = "https://registry.yarnpkg.com/prettier/-/prettier-1.16.3.tgz"; + sha1 = "8c62168453badef702f34b45b6ee899574a6a65d"; + }; + } + { + name = "prettier___prettier_1.18.2.tgz"; + path = fetchurl { + name = "prettier___prettier_1.18.2.tgz"; + url = "https://registry.yarnpkg.com/prettier/-/prettier-1.18.2.tgz"; + sha1 = "6823e7c5900017b4bd3acf46fe9ac4b4d7bda9ea"; + }; + } + { + name = "pretty_format___pretty_format_24.8.0.tgz"; + path = fetchurl { + name = "pretty_format___pretty_format_24.8.0.tgz"; + url = "https://registry.yarnpkg.com/pretty-format/-/pretty-format-24.8.0.tgz"; + sha1 = "8dae7044f58db7cb8be245383b565a963e3c27f2"; + }; + } + { + name = "prismjs___prismjs_1.6.0.tgz"; + path = fetchurl { + name = "prismjs___prismjs_1.6.0.tgz"; + url = "https://registry.yarnpkg.com/prismjs/-/prismjs-1.6.0.tgz"; + sha1 = "118d95fb7a66dba2272e343b345f5236659db365"; + }; + } + { + name = "private___private_0.1.8.tgz"; + path = fetchurl { + name = "private___private_0.1.8.tgz"; + url = "https://registry.yarnpkg.com/private/-/private-0.1.8.tgz"; + sha1 = "2381edb3689f7a53d653190060fcf822d2f368ff"; + }; + } + { + 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 = "process_nextick_args___process_nextick_args_1.0.7.tgz"; + path = fetchurl { + name = "process_nextick_args___process_nextick_args_1.0.7.tgz"; + url = "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-1.0.7.tgz"; + sha1 = "150e20b756590ad3f91093f25a4f2ad8bff30ba3"; + }; + } + { + name = "process___process_0.11.10.tgz"; + path = fetchurl { + name = "process___process_0.11.10.tgz"; + url = "https://registry.yarnpkg.com/process/-/process-0.11.10.tgz"; + sha1 = "7332300e840161bda3e69a1d1d91a7d4bc16f182"; + }; + } + { + name = "progress___progress_2.0.0.tgz"; + path = fetchurl { + name = "progress___progress_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/progress/-/progress-2.0.0.tgz"; + sha1 = "8a1be366bf8fc23db2bd23f10c6fe920b4389d1f"; + }; + } + { + name = "promise_inflight___promise_inflight_1.0.1.tgz"; + path = fetchurl { + name = "promise_inflight___promise_inflight_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/promise-inflight/-/promise-inflight-1.0.1.tgz"; + sha1 = "98472870bf228132fcbdd868129bad12c3c029e3"; + }; + } + { + name = "prompts___prompts_2.1.0.tgz"; + path = fetchurl { + name = "prompts___prompts_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/prompts/-/prompts-2.1.0.tgz"; + sha1 = "bf90bc71f6065d255ea2bdc0fe6520485c1b45db"; + }; + } + { + name = "property_information___property_information_4.2.0.tgz"; + path = fetchurl { + name = "property_information___property_information_4.2.0.tgz"; + url = "https://registry.yarnpkg.com/property-information/-/property-information-4.2.0.tgz"; + sha1 = "f0e66e07cbd6fed31d96844d958d153ad3eb486e"; + }; + } + { + name = "prosemirror_commands___prosemirror_commands_1.0.7.tgz"; + path = fetchurl { + name = "prosemirror_commands___prosemirror_commands_1.0.7.tgz"; + url = "https://registry.yarnpkg.com/prosemirror-commands/-/prosemirror-commands-1.0.7.tgz"; + sha1 = "e5a2ba821e29ea7065c88277fe2c3d7f6b0b9d37"; + }; + } + { + name = "prosemirror_dropcursor___prosemirror_dropcursor_1.1.1.tgz"; + path = fetchurl { + name = "prosemirror_dropcursor___prosemirror_dropcursor_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/prosemirror-dropcursor/-/prosemirror-dropcursor-1.1.1.tgz"; + sha1 = "c60ed1ed6c58804a06a75db06a0d993b087b7622"; + }; + } + { + name = "prosemirror_gapcursor___prosemirror_gapcursor_1.0.3.tgz"; + path = fetchurl { + name = "prosemirror_gapcursor___prosemirror_gapcursor_1.0.3.tgz"; + url = "https://registry.yarnpkg.com/prosemirror-gapcursor/-/prosemirror-gapcursor-1.0.3.tgz"; + sha1 = "acc6537fc5a35e9b38966f91a199a382dfc715c4"; + }; + } + { + name = "prosemirror_history___prosemirror_history_1.0.3.tgz"; + path = fetchurl { + name = "prosemirror_history___prosemirror_history_1.0.3.tgz"; + url = "https://registry.yarnpkg.com/prosemirror-history/-/prosemirror-history-1.0.3.tgz"; + sha1 = "5fb8591adfc272afaaf0b41bec64ee7d9522a118"; + }; + } + { + name = "prosemirror_inputrules___prosemirror_inputrules_1.0.1.tgz"; + path = fetchurl { + name = "prosemirror_inputrules___prosemirror_inputrules_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/prosemirror-inputrules/-/prosemirror-inputrules-1.0.1.tgz"; + sha1 = "f63305fd966379f218e82ca76a2a9b328b66dc7b"; + }; + } + { + name = "prosemirror_keymap___prosemirror_keymap_1.0.1.tgz"; + path = fetchurl { + name = "prosemirror_keymap___prosemirror_keymap_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/prosemirror-keymap/-/prosemirror-keymap-1.0.1.tgz"; + sha1 = "03ef32b828e3a859dfb570eb84928bf2e5330bc2"; + }; + } + { + name = "prosemirror_markdown___prosemirror_markdown_1.3.0.tgz"; + path = fetchurl { + name = "prosemirror_markdown___prosemirror_markdown_1.3.0.tgz"; + url = "https://registry.yarnpkg.com/prosemirror-markdown/-/prosemirror-markdown-1.3.0.tgz"; + sha1 = "a100d14c27da7d8fb70818230d786898eeadb7fa"; + }; + } + { + name = "prosemirror_model___prosemirror_model_1.6.4.tgz"; + path = fetchurl { + name = "prosemirror_model___prosemirror_model_1.6.4.tgz"; + url = "https://registry.yarnpkg.com/prosemirror-model/-/prosemirror-model-1.6.4.tgz"; + sha1 = "2ac37a629448a7dbfd1635450e2fdd63c3450d7d"; + }; + } + { + name = "prosemirror_schema_list___prosemirror_schema_list_1.0.1.tgz"; + path = fetchurl { + name = "prosemirror_schema_list___prosemirror_schema_list_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/prosemirror-schema-list/-/prosemirror-schema-list-1.0.1.tgz"; + sha1 = "f216e0cf4809b6074aa27912449ac89897f1ae94"; + }; + } + { + name = "prosemirror_state___prosemirror_state_1.2.2.tgz"; + path = fetchurl { + name = "prosemirror_state___prosemirror_state_1.2.2.tgz"; + url = "https://registry.yarnpkg.com/prosemirror-state/-/prosemirror-state-1.2.2.tgz"; + sha1 = "8df26d95fd6fd327c0f9984a760e84d863204154"; + }; + } + { + name = "prosemirror_tables___prosemirror_tables_0.7.10.tgz"; + path = fetchurl { + name = "prosemirror_tables___prosemirror_tables_0.7.10.tgz"; + url = "https://registry.yarnpkg.com/prosemirror-tables/-/prosemirror-tables-0.7.10.tgz"; + sha1 = "4b0f623422b4b8f84cdc9c559f8a87579846b3ba"; + }; + } + { + name = "prosemirror_transform___prosemirror_transform_1.1.3.tgz"; + path = fetchurl { + name = "prosemirror_transform___prosemirror_transform_1.1.3.tgz"; + url = "https://registry.yarnpkg.com/prosemirror-transform/-/prosemirror-transform-1.1.3.tgz"; + sha1 = "28cfdf1f9ee514edc40466be7b7db39eed545fdf"; + }; + } + { + name = "prosemirror_utils___prosemirror_utils_0.7.5.tgz"; + path = fetchurl { + name = "prosemirror_utils___prosemirror_utils_0.7.5.tgz"; + url = "https://registry.yarnpkg.com/prosemirror-utils/-/prosemirror-utils-0.7.5.tgz"; + sha1 = "11b477647b672ec8f10679ab298a5823dad6457a"; + }; + } + { + name = "prosemirror_view___prosemirror_view_1.6.8.tgz"; + path = fetchurl { + name = "prosemirror_view___prosemirror_view_1.6.8.tgz"; + url = "https://registry.yarnpkg.com/prosemirror-view/-/prosemirror-view-1.6.8.tgz"; + sha1 = "33fc1a6e2731633e5d6dc1af1967378f15810b74"; + }; + } + { + 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 = "protocols___protocols_1.4.7.tgz"; + path = fetchurl { + name = "protocols___protocols_1.4.7.tgz"; + url = "https://registry.yarnpkg.com/protocols/-/protocols-1.4.7.tgz"; + sha1 = "95f788a4f0e979b291ffefcf5636ad113d037d32"; + }; + } + { + name = "proxy_addr___proxy_addr_2.0.4.tgz"; + path = fetchurl { + name = "proxy_addr___proxy_addr_2.0.4.tgz"; + url = "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-2.0.4.tgz"; + sha1 = "ecfc733bf22ff8c6f407fa275327b9ab67e48b93"; + }; + } + { + name = "prr___prr_1.0.1.tgz"; + path = fetchurl { + name = "prr___prr_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/prr/-/prr-1.0.1.tgz"; + sha1 = "d3fc114ba06995a45ec6893f484ceb1d78f5f476"; + }; + } + { + name = "pseudomap___pseudomap_1.0.2.tgz"; + path = fetchurl { + name = "pseudomap___pseudomap_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/pseudomap/-/pseudomap-1.0.2.tgz"; + sha1 = "f052a28da70e618917ef0a8ac34c1ae5a68286b3"; + }; + } + { + name = "psl___psl_1.1.29.tgz"; + path = fetchurl { + name = "psl___psl_1.1.29.tgz"; + url = "https://registry.yarnpkg.com/psl/-/psl-1.1.29.tgz"; + sha1 = "60f580d360170bb722a797cc704411e6da850c67"; + }; + } + { + name = "pstree.remy___pstree.remy_1.1.6.tgz"; + path = fetchurl { + name = "pstree.remy___pstree.remy_1.1.6.tgz"; + url = "https://registry.yarnpkg.com/pstree.remy/-/pstree.remy-1.1.6.tgz"; + sha1 = "73a55aad9e2d95814927131fbf4dc1b62d259f47"; + }; + } + { + name = "public_encrypt___public_encrypt_4.0.0.tgz"; + path = fetchurl { + name = "public_encrypt___public_encrypt_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/public-encrypt/-/public-encrypt-4.0.0.tgz"; + sha1 = "39f699f3a46560dd5ebacbca693caf7c65c18cc6"; + }; + } + { + name = "pump___pump_2.0.1.tgz"; + path = fetchurl { + name = "pump___pump_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/pump/-/pump-2.0.1.tgz"; + sha1 = "12399add6e4cf7526d973cbc8b5ce2e2908b3909"; + }; + } + { + 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 = "pumpify___pumpify_1.5.1.tgz"; + path = fetchurl { + name = "pumpify___pumpify_1.5.1.tgz"; + url = "https://registry.yarnpkg.com/pumpify/-/pumpify-1.5.1.tgz"; + sha1 = "36513be246ab27570b1a374a5ce278bfd74370ce"; + }; + } + { + name = "punycode___punycode_1.3.2.tgz"; + path = fetchurl { + name = "punycode___punycode_1.3.2.tgz"; + url = "https://registry.yarnpkg.com/punycode/-/punycode-1.3.2.tgz"; + sha1 = "9653a036fb7c1ee42342f2325cceefea3926c48d"; + }; + } + { + name = "punycode___punycode_1.4.1.tgz"; + path = fetchurl { + name = "punycode___punycode_1.4.1.tgz"; + url = "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz"; + sha1 = "c0d5a63b2718800ad8e1eb0fa5269c84dd41845e"; + }; + } + { + name = "punycode___punycode_2.1.1.tgz"; + path = fetchurl { + name = "punycode___punycode_2.1.1.tgz"; + url = "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz"; + sha1 = "b58b010ac40c22c5657616c8d2c2c02c7bf479ec"; + }; + } + { + name = "qjobs___qjobs_1.2.0.tgz"; + path = fetchurl { + name = "qjobs___qjobs_1.2.0.tgz"; + url = "https://registry.yarnpkg.com/qjobs/-/qjobs-1.2.0.tgz"; + sha1 = "c45e9c61800bd087ef88d7e256423bdd49e5d071"; + }; + } + { + name = "qs___qs_6.5.1.tgz"; + path = fetchurl { + name = "qs___qs_6.5.1.tgz"; + url = "https://registry.yarnpkg.com/qs/-/qs-6.5.1.tgz"; + sha1 = "349cdf6eef89ec45c12d7d5eb3fc0c870343a6d8"; + }; + } + { + 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 = "query_string___query_string_4.3.4.tgz"; + path = fetchurl { + name = "query_string___query_string_4.3.4.tgz"; + url = "https://registry.yarnpkg.com/query-string/-/query-string-4.3.4.tgz"; + sha1 = "bbb693b9ca915c232515b228b1a02b609043dbeb"; + }; + } + { + name = "query_string___query_string_5.1.1.tgz"; + path = fetchurl { + name = "query_string___query_string_5.1.1.tgz"; + url = "https://registry.yarnpkg.com/query-string/-/query-string-5.1.1.tgz"; + sha1 = "a78c012b71c17e05f2e3fa2319dd330682efb3cb"; + }; + } + { + name = "querystring_es3___querystring_es3_0.2.1.tgz"; + path = fetchurl { + name = "querystring_es3___querystring_es3_0.2.1.tgz"; + url = "https://registry.yarnpkg.com/querystring-es3/-/querystring-es3-0.2.1.tgz"; + sha1 = "9ec61f79049875707d69414596fd907a4d711e73"; + }; + } + { + name = "querystring___querystring_0.2.0.tgz"; + path = fetchurl { + name = "querystring___querystring_0.2.0.tgz"; + url = "https://registry.yarnpkg.com/querystring/-/querystring-0.2.0.tgz"; + sha1 = "b209849203bb25df820da756e747005878521620"; + }; + } + { + name = "querystringify___querystringify_2.1.0.tgz"; + path = fetchurl { + name = "querystringify___querystringify_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/querystringify/-/querystringify-2.1.0.tgz"; + sha1 = "7ded8dfbf7879dcc60d0a644ac6754b283ad17ef"; + }; + } + { + name = "quick_lru___quick_lru_1.1.0.tgz"; + path = fetchurl { + name = "quick_lru___quick_lru_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/quick-lru/-/quick-lru-1.1.0.tgz"; + sha1 = "4360b17c61136ad38078397ff11416e186dcfbb8"; + }; + } + { + name = "randombytes___randombytes_2.0.6.tgz"; + path = fetchurl { + name = "randombytes___randombytes_2.0.6.tgz"; + url = "https://registry.yarnpkg.com/randombytes/-/randombytes-2.0.6.tgz"; + sha1 = "d302c522948588848a8d300c932b44c24231da80"; + }; + } + { + name = "randomfill___randomfill_1.0.4.tgz"; + path = fetchurl { + name = "randomfill___randomfill_1.0.4.tgz"; + url = "https://registry.yarnpkg.com/randomfill/-/randomfill-1.0.4.tgz"; + sha1 = "c92196fc86ab42be983f1bf31778224931d61458"; + }; + } + { + name = "range_parser___range_parser_1.2.1.tgz"; + path = fetchurl { + name = "range_parser___range_parser_1.2.1.tgz"; + url = "https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.1.tgz"; + sha1 = "3cf37023d199e1c24d1a55b84800c2f3e6468031"; + }; + } + { + name = "raphael___raphael_2.2.7.tgz"; + path = fetchurl { + name = "raphael___raphael_2.2.7.tgz"; + url = "https://registry.yarnpkg.com/raphael/-/raphael-2.2.7.tgz"; + sha1 = "231b19141f8d086986d8faceb66f8b562ee2c810"; + }; + } + { + name = "raven_js___raven_js_3.22.1.tgz"; + path = fetchurl { + name = "raven_js___raven_js_3.22.1.tgz"; + url = "https://registry.yarnpkg.com/raven-js/-/raven-js-3.22.1.tgz"; + sha1 = "1117f00dfefaa427ef6e1a7d50bbb1fb998a24da"; + }; + } + { + name = "raw_body___raw_body_2.3.2.tgz"; + path = fetchurl { + name = "raw_body___raw_body_2.3.2.tgz"; + url = "https://registry.yarnpkg.com/raw-body/-/raw-body-2.3.2.tgz"; + sha1 = "bcd60c77d3eb93cde0050295c3f379389bc88f89"; + }; + } + { + name = "raw_body___raw_body_1.1.7.tgz"; + path = fetchurl { + name = "raw_body___raw_body_1.1.7.tgz"; + url = "https://registry.yarnpkg.com/raw-body/-/raw-body-1.1.7.tgz"; + sha1 = "1d027c2bfa116acc6623bca8f00016572a87d425"; + }; + } + { + name = "raw_loader___raw_loader_1.0.0.tgz"; + path = fetchurl { + name = "raw_loader___raw_loader_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/raw-loader/-/raw-loader-1.0.0.tgz"; + sha1 = "3f9889e73dadbda9a424bce79809b4133ad46405"; + }; + } + { + 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_16.8.6.tgz"; + path = fetchurl { + name = "react_is___react_is_16.8.6.tgz"; + url = "https://registry.yarnpkg.com/react-is/-/react-is-16.8.6.tgz"; + sha1 = "5bbc1e2d29141c9fbdfed456343fe2bc430a6a16"; + }; + } + { + name = "read_pkg_up___read_pkg_up_1.0.1.tgz"; + path = fetchurl { + name = "read_pkg_up___read_pkg_up_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-1.0.1.tgz"; + sha1 = "9d63c13276c065918d57f002a57f40a1b643fb02"; + }; + } + { + name = "read_pkg_up___read_pkg_up_2.0.0.tgz"; + path = fetchurl { + name = "read_pkg_up___read_pkg_up_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-2.0.0.tgz"; + sha1 = "6b72a8048984e0c41e79510fd5e9fa99b3b549be"; + }; + } + { + name = "read_pkg_up___read_pkg_up_3.0.0.tgz"; + path = fetchurl { + name = "read_pkg_up___read_pkg_up_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-3.0.0.tgz"; + sha1 = "3ed496685dba0f8fe118d0691dc51f4a1ff96f07"; + }; + } + { + name = "read_pkg_up___read_pkg_up_4.0.0.tgz"; + path = fetchurl { + name = "read_pkg_up___read_pkg_up_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-4.0.0.tgz"; + sha1 = "1b221c6088ba7799601c808f91161c66e58f8978"; + }; + } + { + name = "read_pkg___read_pkg_1.1.0.tgz"; + path = fetchurl { + name = "read_pkg___read_pkg_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/read-pkg/-/read-pkg-1.1.0.tgz"; + sha1 = "f5ffaa5ecd29cb31c0474bca7d756b6bb29e3f28"; + }; + } + { + name = "read_pkg___read_pkg_2.0.0.tgz"; + path = fetchurl { + name = "read_pkg___read_pkg_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/read-pkg/-/read-pkg-2.0.0.tgz"; + sha1 = "8ef1c0623c6a6db0dc6713c4bfac46332b2368f8"; + }; + } + { + name = "read_pkg___read_pkg_3.0.0.tgz"; + path = fetchurl { + name = "read_pkg___read_pkg_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/read-pkg/-/read-pkg-3.0.0.tgz"; + sha1 = "9cbc686978fee65d16c00e2b19c237fcf6e38389"; + }; + } + { + name = "readable_stream___readable_stream_2.3.6.tgz"; + path = fetchurl { + name = "readable_stream___readable_stream_2.3.6.tgz"; + url = "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.6.tgz"; + sha1 = "b11c27d88b8ff1fbe070643cf94b0c79ae1b0aaf"; + }; + } + { + name = "readable_stream___readable_stream_3.0.6.tgz"; + path = fetchurl { + name = "readable_stream___readable_stream_3.0.6.tgz"; + url = "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.0.6.tgz"; + sha1 = "351302e4c68b5abd6a2ed55376a7f9a25be3057a"; + }; + } + { + name = "readable_stream___readable_stream_2.0.6.tgz"; + path = fetchurl { + name = "readable_stream___readable_stream_2.0.6.tgz"; + url = "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.0.6.tgz"; + sha1 = "8f90341e68a53ccc928788dacfcd11b36eb9b78e"; + }; + } + { + name = "readable_stream___readable_stream_2.1.5.tgz"; + path = fetchurl { + name = "readable_stream___readable_stream_2.1.5.tgz"; + url = "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.1.5.tgz"; + sha1 = "66fa8b720e1438b364681f2ad1a63c618448c9d0"; + }; + } + { + name = "readdir_enhanced___readdir_enhanced_2.2.4.tgz"; + path = fetchurl { + name = "readdir_enhanced___readdir_enhanced_2.2.4.tgz"; + url = "https://registry.yarnpkg.com/readdir-enhanced/-/readdir-enhanced-2.2.4.tgz"; + sha1 = "773fb8a8de5f645fb13d9403746d490d4facb3e6"; + }; + } + { + name = "readdirp___readdirp_2.1.0.tgz"; + path = fetchurl { + name = "readdirp___readdirp_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/readdirp/-/readdirp-2.1.0.tgz"; + sha1 = "4ed0ad060df3073300c48440373f72d1cc642d78"; + }; + } + { + name = "readdirp___readdirp_3.1.1.tgz"; + path = fetchurl { + name = "readdirp___readdirp_3.1.1.tgz"; + url = "https://registry.yarnpkg.com/readdirp/-/readdirp-3.1.1.tgz"; + sha1 = "b158123ac343c8b0f31d65680269cc0fc1025db1"; + }; + } + { + name = "realpath_native___realpath_native_1.1.0.tgz"; + path = fetchurl { + name = "realpath_native___realpath_native_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/realpath-native/-/realpath-native-1.1.0.tgz"; + sha1 = "2003294fea23fb0672f2476ebe22fcf498a2d65c"; + }; + } + { + name = "redent___redent_1.0.0.tgz"; + path = fetchurl { + name = "redent___redent_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/redent/-/redent-1.0.0.tgz"; + sha1 = "cf916ab1fd5f1f16dfb20822dd6ec7f730c2afde"; + }; + } + { + name = "redent___redent_2.0.0.tgz"; + path = fetchurl { + name = "redent___redent_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/redent/-/redent-2.0.0.tgz"; + sha1 = "c1b2007b42d57eb1389079b3c8333639d5e1ccaa"; + }; + } + { + name = "regenerate_unicode_properties___regenerate_unicode_properties_8.1.0.tgz"; + path = fetchurl { + name = "regenerate_unicode_properties___regenerate_unicode_properties_8.1.0.tgz"; + url = "https://registry.yarnpkg.com/regenerate-unicode-properties/-/regenerate-unicode-properties-8.1.0.tgz"; + sha1 = "ef51e0f0ea4ad424b77bf7cb41f3e015c70a3f0e"; + }; + } + { + name = "regenerate___regenerate_1.4.0.tgz"; + path = fetchurl { + name = "regenerate___regenerate_1.4.0.tgz"; + url = "https://registry.yarnpkg.com/regenerate/-/regenerate-1.4.0.tgz"; + sha1 = "4a856ec4b56e4077c557589cae85e7a4c8869a11"; + }; + } + { + name = "regenerator_transform___regenerator_transform_0.14.1.tgz"; + path = fetchurl { + name = "regenerator_transform___regenerator_transform_0.14.1.tgz"; + url = "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.14.1.tgz"; + sha1 = "3b2fce4e1ab7732c08f665dfdb314749c7ddd2fb"; + }; + } + { + name = "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 = "regexp_tree___regexp_tree_0.1.11.tgz"; + path = fetchurl { + name = "regexp_tree___regexp_tree_0.1.11.tgz"; + url = "https://registry.yarnpkg.com/regexp-tree/-/regexp-tree-0.1.11.tgz"; + sha1 = "c9c7f00fcf722e0a56c7390983a7a63dd6c272f3"; + }; + } + { + name = "regexpp___regexpp_2.0.1.tgz"; + path = fetchurl { + name = "regexpp___regexpp_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/regexpp/-/regexpp-2.0.1.tgz"; + sha1 = "8d19d31cf632482b589049f8281f93dbcba4d07f"; + }; + } + { + name = "regexpu_core___regexpu_core_1.0.0.tgz"; + path = fetchurl { + name = "regexpu_core___regexpu_core_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-1.0.0.tgz"; + sha1 = "86a763f58ee4d7c2f6b102e4764050de7ed90c6b"; + }; + } + { + name = "regexpu_core___regexpu_core_4.5.4.tgz"; + path = fetchurl { + name = "regexpu_core___regexpu_core_4.5.4.tgz"; + url = "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-4.5.4.tgz"; + sha1 = "080d9d02289aa87fe1667a4f5136bc98a6aebaae"; + }; + } + { + name = "registry_auth_token___registry_auth_token_3.3.2.tgz"; + path = fetchurl { + name = "registry_auth_token___registry_auth_token_3.3.2.tgz"; + url = "https://registry.yarnpkg.com/registry-auth-token/-/registry-auth-token-3.3.2.tgz"; + sha1 = "851fd49038eecb586911115af845260eec983f20"; + }; + } + { + name = "registry_url___registry_url_3.1.0.tgz"; + path = fetchurl { + name = "registry_url___registry_url_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/registry-url/-/registry-url-3.1.0.tgz"; + sha1 = "3d4ef870f73dde1d77f0cf9a381432444e174942"; + }; + } + { + name = "regjsgen___regjsgen_0.2.0.tgz"; + path = fetchurl { + name = "regjsgen___regjsgen_0.2.0.tgz"; + url = "https://registry.yarnpkg.com/regjsgen/-/regjsgen-0.2.0.tgz"; + sha1 = "6c016adeac554f75823fe37ac05b92d5a4edb1f7"; + }; + } + { + name = "regjsgen___regjsgen_0.5.0.tgz"; + path = fetchurl { + name = "regjsgen___regjsgen_0.5.0.tgz"; + url = "https://registry.yarnpkg.com/regjsgen/-/regjsgen-0.5.0.tgz"; + sha1 = "a7634dc08f89209c2049adda3525711fb97265dd"; + }; + } + { + name = "regjsparser___regjsparser_0.1.5.tgz"; + path = fetchurl { + name = "regjsparser___regjsparser_0.1.5.tgz"; + url = "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.1.5.tgz"; + sha1 = "7ee8f84dc6fa792d3fd0ae228d24bd949ead205c"; + }; + } + { + name = "regjsparser___regjsparser_0.6.0.tgz"; + path = fetchurl { + name = "regjsparser___regjsparser_0.6.0.tgz"; + url = "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.6.0.tgz"; + sha1 = "f1e6ae8b7da2bae96c99399b868cd6c933a2ba9c"; + }; + } + { + name = "relateurl___relateurl_0.2.7.tgz"; + path = fetchurl { + name = "relateurl___relateurl_0.2.7.tgz"; + url = "https://registry.yarnpkg.com/relateurl/-/relateurl-0.2.7.tgz"; + sha1 = "54dbf377e51440aca90a4cd274600d3ff2d888a9"; + }; + } + { + name = "remark_html___remark_html_8.0.0.tgz"; + path = fetchurl { + name = "remark_html___remark_html_8.0.0.tgz"; + url = "https://registry.yarnpkg.com/remark-html/-/remark-html-8.0.0.tgz"; + sha1 = "9fcb859a6f3cb40f3ef15402950f1a62ec301b3a"; + }; + } + { + name = "remark_parse___remark_parse_5.0.0.tgz"; + path = fetchurl { + name = "remark_parse___remark_parse_5.0.0.tgz"; + url = "https://registry.yarnpkg.com/remark-parse/-/remark-parse-5.0.0.tgz"; + sha1 = "4c077f9e499044d1d5c13f80d7a98cf7b9285d95"; + }; + } + { + name = "remark_parse___remark_parse_6.0.3.tgz"; + path = fetchurl { + name = "remark_parse___remark_parse_6.0.3.tgz"; + url = "https://registry.yarnpkg.com/remark-parse/-/remark-parse-6.0.3.tgz"; + sha1 = "c99131052809da482108413f87b0ee7f52180a3a"; + }; + } + { + name = "remark_reference_links___remark_reference_links_4.0.4.tgz"; + path = fetchurl { + name = "remark_reference_links___remark_reference_links_4.0.4.tgz"; + url = "https://registry.yarnpkg.com/remark-reference-links/-/remark-reference-links-4.0.4.tgz"; + sha1 = "190579a0d6b002859d6cdbdc5aeb8bbdae4e06ab"; + }; + } + { + name = "remark_slug___remark_slug_5.1.2.tgz"; + path = fetchurl { + name = "remark_slug___remark_slug_5.1.2.tgz"; + url = "https://registry.yarnpkg.com/remark-slug/-/remark-slug-5.1.2.tgz"; + sha1 = "715ecdef8df1226786204b1887d31ab16aa24609"; + }; + } + { + name = "remark_stringify___remark_stringify_5.0.0.tgz"; + path = fetchurl { + name = "remark_stringify___remark_stringify_5.0.0.tgz"; + url = "https://registry.yarnpkg.com/remark-stringify/-/remark-stringify-5.0.0.tgz"; + sha1 = "336d3a4d4a6a3390d933eeba62e8de4bd280afba"; + }; + } + { + name = "remark_stringify___remark_stringify_6.0.4.tgz"; + path = fetchurl { + name = "remark_stringify___remark_stringify_6.0.4.tgz"; + url = "https://registry.yarnpkg.com/remark-stringify/-/remark-stringify-6.0.4.tgz"; + sha1 = "16ac229d4d1593249018663c7bddf28aafc4e088"; + }; + } + { + name = "remark_toc___remark_toc_5.1.1.tgz"; + path = fetchurl { + name = "remark_toc___remark_toc_5.1.1.tgz"; + url = "https://registry.yarnpkg.com/remark-toc/-/remark-toc-5.1.1.tgz"; + sha1 = "8c229d6f834cdb43fde6685e2d43248d3fc82d78"; + }; + } + { + name = "remark___remark_10.0.1.tgz"; + path = fetchurl { + name = "remark___remark_10.0.1.tgz"; + url = "https://registry.yarnpkg.com/remark/-/remark-10.0.1.tgz"; + sha1 = "3058076dc41781bf505d8978c291485fe47667df"; + }; + } + { + name = "remark___remark_9.0.0.tgz"; + path = fetchurl { + name = "remark___remark_9.0.0.tgz"; + url = "https://registry.yarnpkg.com/remark/-/remark-9.0.0.tgz"; + sha1 = "c5cfa8ec535c73a67c4b0f12bfdbd3a67d8b2f60"; + }; + } + { + name = "remote_origin_url___remote_origin_url_0.4.0.tgz"; + path = fetchurl { + name = "remote_origin_url___remote_origin_url_0.4.0.tgz"; + url = "https://registry.yarnpkg.com/remote-origin-url/-/remote-origin-url-0.4.0.tgz"; + sha1 = "4d3e2902f34e2d37d1c263d87710b77eb4086a30"; + }; + } + { + name = "remove_bom_buffer___remove_bom_buffer_3.0.0.tgz"; + path = fetchurl { + name = "remove_bom_buffer___remove_bom_buffer_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/remove-bom-buffer/-/remove-bom-buffer-3.0.0.tgz"; + sha1 = "c2bf1e377520d324f623892e33c10cac2c252b53"; + }; + } + { + name = "remove_bom_stream___remove_bom_stream_1.2.0.tgz"; + path = fetchurl { + name = "remove_bom_stream___remove_bom_stream_1.2.0.tgz"; + url = "https://registry.yarnpkg.com/remove-bom-stream/-/remove-bom-stream-1.2.0.tgz"; + sha1 = "05f1a593f16e42e1fb90ebf59de8e569525f9523"; + }; + } + { + 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 = "repeating___repeating_2.0.1.tgz"; + path = fetchurl { + name = "repeating___repeating_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/repeating/-/repeating-2.0.1.tgz"; + sha1 = "5214c53a926d3552707527fbab415dbc08d06dda"; + }; + } + { + name = "replace_ext___replace_ext_1.0.0.tgz"; + path = fetchurl { + name = "replace_ext___replace_ext_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/replace-ext/-/replace-ext-1.0.0.tgz"; + sha1 = "de63128373fcbf7c3ccfa4de5a480c45a67958eb"; + }; + } + { + name = "request_promise_core___request_promise_core_1.1.1.tgz"; + path = fetchurl { + name = "request_promise_core___request_promise_core_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/request-promise-core/-/request-promise-core-1.1.1.tgz"; + sha1 = "3eee00b2c5aa83239cfb04c5700da36f81cd08b6"; + }; + } + { + name = "request_promise_native___request_promise_native_1.0.5.tgz"; + path = fetchurl { + name = "request_promise_native___request_promise_native_1.0.5.tgz"; + url = "https://registry.yarnpkg.com/request-promise-native/-/request-promise-native-1.0.5.tgz"; + sha1 = "5281770f68e0c9719e5163fd3fab482215f4fda5"; + }; + } + { + name = "request___request_2.88.0.tgz"; + path = fetchurl { + name = "request___request_2.88.0.tgz"; + url = "https://registry.yarnpkg.com/request/-/request-2.88.0.tgz"; + sha1 = "9c2fca4f7d35b592efe57c7f0a55e81052124fef"; + }; + } + { + 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_1.0.1.tgz"; + path = fetchurl { + name = "require_main_filename___require_main_filename_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-1.0.1.tgz"; + sha1 = "97f717b69d48784f5f526a6c5aa8ffdda055a4d1"; + }; + } + { + name = "require_uncached___require_uncached_1.0.3.tgz"; + path = fetchurl { + name = "require_uncached___require_uncached_1.0.3.tgz"; + url = "https://registry.yarnpkg.com/require-uncached/-/require-uncached-1.0.3.tgz"; + sha1 = "4e0d56d6c9662fd31e43011c4b95aa49955421d3"; + }; + } + { + name = "requireindex___requireindex_1.1.0.tgz"; + path = fetchurl { + name = "requireindex___requireindex_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/requireindex/-/requireindex-1.1.0.tgz"; + sha1 = "e5404b81557ef75db6e49c5a72004893fe03e162"; + }; + } + { + name = "requires_port___requires_port_1.0.0.tgz"; + path = fetchurl { + name = "requires_port___requires_port_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/requires-port/-/requires-port-1.0.0.tgz"; + sha1 = "925d2601d39ac485e091cf0da5c6e694dc3dcaff"; + }; + } + { + name = "requizzle___requizzle_0.2.1.tgz"; + path = fetchurl { + name = "requizzle___requizzle_0.2.1.tgz"; + url = "https://registry.yarnpkg.com/requizzle/-/requizzle-0.2.1.tgz"; + sha1 = "6943c3530c4d9a7e46f1cddd51c158fc670cdbde"; + }; + } + { + name = "resolve_cwd___resolve_cwd_2.0.0.tgz"; + path = fetchurl { + name = "resolve_cwd___resolve_cwd_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/resolve-cwd/-/resolve-cwd-2.0.0.tgz"; + sha1 = "00a9f7387556e27038eae232caa372a6a59b665a"; + }; + } + { + name = "resolve_dir___resolve_dir_1.0.1.tgz"; + path = fetchurl { + name = "resolve_dir___resolve_dir_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/resolve-dir/-/resolve-dir-1.0.1.tgz"; + sha1 = "79a40644c362be82f26effe739c9bb5382046f43"; + }; + } + { + name = "resolve_from___resolve_from_1.0.1.tgz"; + path = fetchurl { + name = "resolve_from___resolve_from_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/resolve-from/-/resolve-from-1.0.1.tgz"; + sha1 = "26cbfe935d1aeeeabb29bc3fe5aeb01e93d44226"; + }; + } + { + name = "resolve_from___resolve_from_3.0.0.tgz"; + path = fetchurl { + name = "resolve_from___resolve_from_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/resolve-from/-/resolve-from-3.0.0.tgz"; + sha1 = "b22c7af7d9d6881bc8b6e653335eebcb0a188748"; + }; + } + { + 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_options___resolve_options_1.1.0.tgz"; + path = fetchurl { + name = "resolve_options___resolve_options_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/resolve-options/-/resolve-options-1.1.0.tgz"; + sha1 = "32bb9e39c06d67338dc9378c0d6d6074566ad131"; + }; + } + { + 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.1.7.tgz"; + path = fetchurl { + name = "resolve___resolve_1.1.7.tgz"; + url = "https://registry.yarnpkg.com/resolve/-/resolve-1.1.7.tgz"; + sha1 = "203114d82ad2c5ed9e8e0411b3932875e889e97b"; + }; + } + { + name = "resolve___resolve_1.11.1.tgz"; + path = fetchurl { + name = "resolve___resolve_1.11.1.tgz"; + url = "https://registry.yarnpkg.com/resolve/-/resolve-1.11.1.tgz"; + sha1 = "ea10d8110376982fef578df8fc30b9ac30a07a3e"; + }; + } + { + name = "responselike___responselike_1.0.2.tgz"; + path = fetchurl { + name = "responselike___responselike_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/responselike/-/responselike-1.0.2.tgz"; + sha1 = "918720ef3b631c5642be068f15ade5a46f4ba1e7"; + }; + } + { + name = "restore_cursor___restore_cursor_2.0.0.tgz"; + path = fetchurl { + name = "restore_cursor___restore_cursor_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-2.0.0.tgz"; + sha1 = "9f7ee287f82fd326d4fd162923d62129eee0dfaf"; + }; + } + { + 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 = "rfdc___rfdc_1.1.4.tgz"; + path = fetchurl { + name = "rfdc___rfdc_1.1.4.tgz"; + url = "https://registry.yarnpkg.com/rfdc/-/rfdc-1.1.4.tgz"; + sha1 = "ba72cc1367a0ccd9cf81a870b3b58bd3ad07f8c2"; + }; + } + { + name = "rimraf___rimraf_2.6.3.tgz"; + path = fetchurl { + name = "rimraf___rimraf_2.6.3.tgz"; + url = "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.3.tgz"; + sha1 = "b2d104fe0d8fb27cf9e0a1cda8262dd3833c6cab"; + }; + } + { + name = "ripemd160___ripemd160_2.0.1.tgz"; + path = fetchurl { + name = "ripemd160___ripemd160_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/ripemd160/-/ripemd160-2.0.1.tgz"; + sha1 = "0f4584295c53a3628af7e6d79aca21ce57d1c6e7"; + }; + } + { + name = "rope_sequence___rope_sequence_1.2.2.tgz"; + path = fetchurl { + name = "rope_sequence___rope_sequence_1.2.2.tgz"; + url = "https://registry.yarnpkg.com/rope-sequence/-/rope-sequence-1.2.2.tgz"; + sha1 = "49c4e5c2f54a48e990b050926771e2871bcb31ce"; + }; + } + { + name = "rsvp___rsvp_4.8.4.tgz"; + path = fetchurl { + name = "rsvp___rsvp_4.8.4.tgz"; + url = "https://registry.yarnpkg.com/rsvp/-/rsvp-4.8.4.tgz"; + sha1 = "b50e6b34583f3dd89329a2f23a8a2be072845911"; + }; + } + { + name = "run_async___run_async_2.3.0.tgz"; + path = fetchurl { + name = "run_async___run_async_2.3.0.tgz"; + url = "https://registry.yarnpkg.com/run-async/-/run-async-2.3.0.tgz"; + sha1 = "0371ab4ae0bdd720d4166d7dfda64ff7a445a6c0"; + }; + } + { + name = "run_queue___run_queue_1.0.3.tgz"; + path = fetchurl { + name = "run_queue___run_queue_1.0.3.tgz"; + url = "https://registry.yarnpkg.com/run-queue/-/run-queue-1.0.3.tgz"; + sha1 = "e848396f057d223f24386924618e25694161ec47"; + }; + } + { + name = "rw___rw_1.3.3.tgz"; + path = fetchurl { + name = "rw___rw_1.3.3.tgz"; + url = "https://registry.yarnpkg.com/rw/-/rw-1.3.3.tgz"; + sha1 = "3f862dfa91ab766b14885ef4d01124bfda074fb4"; + }; + } + { + name = "rxjs___rxjs_6.2.1.tgz"; + path = fetchurl { + name = "rxjs___rxjs_6.2.1.tgz"; + url = "https://registry.yarnpkg.com/rxjs/-/rxjs-6.2.1.tgz"; + sha1 = "246cebec189a6cbc143a3ef9f62d6f4c91813ca1"; + }; + } + { + name = "safe_buffer___safe_buffer_5.1.1.tgz"; + path = fetchurl { + name = "safe_buffer___safe_buffer_5.1.1.tgz"; + url = "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.1.tgz"; + sha1 = "893312af69b2123def71f57889001671eeb2c853"; + }; + } + { + 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_json_parse___safe_json_parse_1.0.1.tgz"; + path = fetchurl { + name = "safe_json_parse___safe_json_parse_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/safe-json-parse/-/safe-json-parse-1.0.1.tgz"; + sha1 = "3e76723e38dfdda13c9b1d29a1e07ffee4b30b57"; + }; + } + { + 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_html___sanitize_html_1.16.3.tgz"; + path = fetchurl { + name = "sanitize_html___sanitize_html_1.16.3.tgz"; + url = "https://registry.yarnpkg.com/sanitize-html/-/sanitize-html-1.16.3.tgz"; + sha1 = "96c1b44a36ff7312e1c22a14b05274370ac8bd56"; + }; + } + { + name = "sass_graph___sass_graph_2.2.4.tgz"; + path = fetchurl { + name = "sass_graph___sass_graph_2.2.4.tgz"; + url = "https://registry.yarnpkg.com/sass-graph/-/sass-graph-2.2.4.tgz"; + sha1 = "13fbd63cd1caf0908b9fd93476ad43a51d1e0b49"; + }; + } + { + name = "sax___sax_1.2.1.tgz"; + path = fetchurl { + name = "sax___sax_1.2.1.tgz"; + url = "https://registry.yarnpkg.com/sax/-/sax-1.2.1.tgz"; + sha1 = "7b8e656190b228e81a66aea748480d828cd2d37a"; + }; + } + { + name = "sax___sax_1.2.4.tgz"; + path = fetchurl { + name = "sax___sax_1.2.4.tgz"; + url = "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz"; + sha1 = "2816234e2378bddc4e5354fab5caa895df7100d9"; + }; + } + { + name = "schema_utils___schema_utils_0.4.5.tgz"; + path = fetchurl { + name = "schema_utils___schema_utils_0.4.5.tgz"; + url = "https://registry.yarnpkg.com/schema-utils/-/schema-utils-0.4.5.tgz"; + sha1 = "21836f0608aac17b78f9e3e24daff14a5ca13a3e"; + }; + } + { + name = "schema_utils___schema_utils_1.0.0.tgz"; + path = fetchurl { + name = "schema_utils___schema_utils_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/schema-utils/-/schema-utils-1.0.0.tgz"; + sha1 = "0b79a93204d7b600d4b2850d1f66c2a34951c770"; + }; + } + { + name = "scope_css___scope_css_1.2.1.tgz"; + path = fetchurl { + name = "scope_css___scope_css_1.2.1.tgz"; + url = "https://registry.yarnpkg.com/scope-css/-/scope-css-1.2.1.tgz"; + sha1 = "c35768bc900cad030a3e0d663a818c0f6a57f40e"; + }; + } + { + name = "scss_tokenizer___scss_tokenizer_0.2.3.tgz"; + path = fetchurl { + name = "scss_tokenizer___scss_tokenizer_0.2.3.tgz"; + url = "https://registry.yarnpkg.com/scss-tokenizer/-/scss-tokenizer-0.2.3.tgz"; + sha1 = "8eb06db9a9723333824d3f5530641149847ce5d1"; + }; + } + { + name = "select_hose___select_hose_2.0.0.tgz"; + path = fetchurl { + name = "select_hose___select_hose_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/select-hose/-/select-hose-2.0.0.tgz"; + sha1 = "625d8658f865af43ec962bfc376a37359a4994ca"; + }; + } + { + name = "select2___select2_3.5.2_browserify.tgz"; + path = fetchurl { + name = "select2___select2_3.5.2_browserify.tgz"; + url = "https://registry.yarnpkg.com/select2/-/select2-3.5.2-browserify.tgz"; + sha1 = "dc4dafda38d67a734e8a97a46f0d3529ae05391d"; + }; + } + { + name = "select___select_1.1.2.tgz"; + path = fetchurl { + name = "select___select_1.1.2.tgz"; + url = "https://registry.yarnpkg.com/select/-/select-1.1.2.tgz"; + sha1 = "0e7350acdec80b1108528786ec1d4418d11b396d"; + }; + } + { + name = "selfsigned___selfsigned_1.10.1.tgz"; + path = fetchurl { + name = "selfsigned___selfsigned_1.10.1.tgz"; + url = "https://registry.yarnpkg.com/selfsigned/-/selfsigned-1.10.1.tgz"; + sha1 = "bf8cb7b83256c4551e31347c6311778db99eec52"; + }; + } + { + name = "semver_diff___semver_diff_2.1.0.tgz"; + path = fetchurl { + name = "semver_diff___semver_diff_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/semver-diff/-/semver-diff-2.1.0.tgz"; + sha1 = "4bbb8437c8d37e4b0cf1a68fd726ec6d645d6d36"; + }; + } + { + name = "semver___semver_5.7.0.tgz"; + path = fetchurl { + name = "semver___semver_5.7.0.tgz"; + url = "https://registry.yarnpkg.com/semver/-/semver-5.7.0.tgz"; + sha1 = "790a7cf6fea5459bac96110b29b60412dc8ff96b"; + }; + } + { + name = "semver___semver_6.2.0.tgz"; + path = fetchurl { + name = "semver___semver_6.2.0.tgz"; + url = "https://registry.yarnpkg.com/semver/-/semver-6.2.0.tgz"; + sha1 = "4d813d9590aaf8a9192693d6c85b9344de5901db"; + }; + } + { + name = "semver___semver_5.3.0.tgz"; + path = fetchurl { + name = "semver___semver_5.3.0.tgz"; + url = "https://registry.yarnpkg.com/semver/-/semver-5.3.0.tgz"; + sha1 = "9b2ce5d3de02d17c6012ad326aa6b4d0cf54f94f"; + }; + } + { + name = "send___send_0.16.2.tgz"; + path = fetchurl { + name = "send___send_0.16.2.tgz"; + url = "https://registry.yarnpkg.com/send/-/send-0.16.2.tgz"; + sha1 = "6ecca1e0f8c156d141597559848df64730a6bbc1"; + }; + } + { + name = "serialize_javascript___serialize_javascript_1.7.0.tgz"; + path = fetchurl { + name = "serialize_javascript___serialize_javascript_1.7.0.tgz"; + url = "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-1.7.0.tgz"; + sha1 = "d6e0dfb2a3832a8c94468e6eb1db97e55a192a65"; + }; + } + { + name = "serve_index___serve_index_1.9.1.tgz"; + path = fetchurl { + name = "serve_index___serve_index_1.9.1.tgz"; + url = "https://registry.yarnpkg.com/serve-index/-/serve-index-1.9.1.tgz"; + sha1 = "d3768d69b1e7d82e5ce050fff5b453bea12a9239"; + }; + } + { + name = "serve_static___serve_static_1.13.2.tgz"; + path = fetchurl { + name = "serve_static___serve_static_1.13.2.tgz"; + url = "https://registry.yarnpkg.com/serve-static/-/serve-static-1.13.2.tgz"; + sha1 = "095e8472fd5b46237db50ce486a43f4b86c6cec1"; + }; + } + { + 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_immediate_shim___set_immediate_shim_1.0.1.tgz"; + path = fetchurl { + name = "set_immediate_shim___set_immediate_shim_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/set-immediate-shim/-/set-immediate-shim-1.0.1.tgz"; + sha1 = "4b2b1b27eb808a9f8dcc481a58e5e56f599f3f61"; + }; + } + { + name = "set_value___set_value_0.4.3.tgz"; + path = fetchurl { + name = "set_value___set_value_0.4.3.tgz"; + url = "https://registry.yarnpkg.com/set-value/-/set-value-0.4.3.tgz"; + sha1 = "7db08f9d3d22dc7f78e53af3c3bf4666ecdfccf1"; + }; + } + { + name = "set_value___set_value_2.0.0.tgz"; + path = fetchurl { + name = "set_value___set_value_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/set-value/-/set-value-2.0.0.tgz"; + sha1 = "71ae4a88f0feefbbf52d1ea604f3fb315ebb6274"; + }; + } + { + name = "setimmediate___setimmediate_1.0.5.tgz"; + path = fetchurl { + name = "setimmediate___setimmediate_1.0.5.tgz"; + url = "https://registry.yarnpkg.com/setimmediate/-/setimmediate-1.0.5.tgz"; + sha1 = "290cbb232e306942d7d7ea9b83732ab7856f8285"; + }; + } + { + name = "setprototypeof___setprototypeof_1.0.3.tgz"; + path = fetchurl { + name = "setprototypeof___setprototypeof_1.0.3.tgz"; + url = "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.0.3.tgz"; + sha1 = "66567e37043eeb4f04d91bd658c0cbefb55b8e04"; + }; + } + { + name = "setprototypeof___setprototypeof_1.1.0.tgz"; + path = fetchurl { + name = "setprototypeof___setprototypeof_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.1.0.tgz"; + sha1 = "d0bd85536887b6fe7c0d818cb962d9d91c54e656"; + }; + } + { + name = "sha.js___sha.js_2.4.10.tgz"; + path = fetchurl { + name = "sha.js___sha.js_2.4.10.tgz"; + url = "https://registry.yarnpkg.com/sha.js/-/sha.js-2.4.10.tgz"; + sha1 = "b1fde5cd7d11a5626638a07c604ab909cfa31f9b"; + }; + } + { + name = "sha1___sha1_1.1.1.tgz"; + path = fetchurl { + name = "sha1___sha1_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/sha1/-/sha1-1.1.1.tgz"; + sha1 = "addaa7a93168f393f19eb2b15091618e2700f848"; + }; + } + { + name = "shallow_clone___shallow_clone_3.0.1.tgz"; + path = fetchurl { + name = "shallow_clone___shallow_clone_3.0.1.tgz"; + url = "https://registry.yarnpkg.com/shallow-clone/-/shallow-clone-3.0.1.tgz"; + sha1 = "8f2981ad92531f55035b01fb230769a40e02efa3"; + }; + } + { + 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_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 = "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 = "sigmund___sigmund_1.0.1.tgz"; + path = fetchurl { + name = "sigmund___sigmund_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/sigmund/-/sigmund-1.0.1.tgz"; + sha1 = "3ff21f198cad2175f9f3b781853fd94d0d19b590"; + }; + } + { + name = "signal_exit___signal_exit_3.0.2.tgz"; + path = fetchurl { + name = "signal_exit___signal_exit_3.0.2.tgz"; + url = "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.2.tgz"; + sha1 = "b5fdc08f1287ea1178628e415e25132b73646c6d"; + }; + } + { + name = "sisteransi___sisteransi_1.0.0.tgz"; + path = fetchurl { + name = "sisteransi___sisteransi_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/sisteransi/-/sisteransi-1.0.0.tgz"; + sha1 = "77d9622ff909080f1c19e5f4a1df0c1b0a27b88c"; + }; + } + { + name = "slash___slash_1.0.0.tgz"; + path = fetchurl { + name = "slash___slash_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/slash/-/slash-1.0.0.tgz"; + sha1 = "c41f2f6c39fc16d1cd17ad4b5d896114ae470d55"; + }; + } + { + name = "slash___slash_2.0.0.tgz"; + path = fetchurl { + name = "slash___slash_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/slash/-/slash-2.0.0.tgz"; + sha1 = "de552851a1759df3a8f206535442f5ec4ddeab44"; + }; + } + { + 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 = "slugify___slugify_1.3.1.tgz"; + path = fetchurl { + name = "slugify___slugify_1.3.1.tgz"; + url = "https://registry.yarnpkg.com/slugify/-/slugify-1.3.1.tgz"; + sha1 = "f572127e8535329fbc6c1edb74ab856b61ad7de2"; + }; + } + { + name = "smooshpack___smooshpack_0.0.54.tgz"; + path = fetchurl { + name = "smooshpack___smooshpack_0.0.54.tgz"; + url = "https://registry.yarnpkg.com/smooshpack/-/smooshpack-0.0.54.tgz"; + sha1 = "9044358b85052d348b801f385678c8a0c76f2bb6"; + }; + } + { + 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 = "socket.io_adapter___socket.io_adapter_1.1.1.tgz"; + path = fetchurl { + name = "socket.io_adapter___socket.io_adapter_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/socket.io-adapter/-/socket.io-adapter-1.1.1.tgz"; + sha1 = "2a805e8a14d6372124dd9159ad4502f8cb07f06b"; + }; + } + { + name = "socket.io_client___socket.io_client_2.1.1.tgz"; + path = fetchurl { + name = "socket.io_client___socket.io_client_2.1.1.tgz"; + url = "https://registry.yarnpkg.com/socket.io-client/-/socket.io-client-2.1.1.tgz"; + sha1 = "dcb38103436ab4578ddb026638ae2f21b623671f"; + }; + } + { + name = "socket.io_parser___socket.io_parser_3.2.0.tgz"; + path = fetchurl { + name = "socket.io_parser___socket.io_parser_3.2.0.tgz"; + url = "https://registry.yarnpkg.com/socket.io-parser/-/socket.io-parser-3.2.0.tgz"; + sha1 = "e7c6228b6aa1f814e6148aea325b51aa9499e077"; + }; + } + { + name = "socket.io___socket.io_2.1.1.tgz"; + path = fetchurl { + name = "socket.io___socket.io_2.1.1.tgz"; + url = "https://registry.yarnpkg.com/socket.io/-/socket.io-2.1.1.tgz"; + sha1 = "a069c5feabee3e6b214a75b40ce0652e1cfb9980"; + }; + } + { + name = "sockjs_client___sockjs_client_1.3.0.tgz"; + path = fetchurl { + name = "sockjs_client___sockjs_client_1.3.0.tgz"; + url = "https://registry.yarnpkg.com/sockjs-client/-/sockjs-client-1.3.0.tgz"; + sha1 = "12fc9d6cb663da5739d3dc5fb6e8687da95cb177"; + }; + } + { + name = "sockjs___sockjs_0.3.19.tgz"; + path = fetchurl { + name = "sockjs___sockjs_0.3.19.tgz"; + url = "https://registry.yarnpkg.com/sockjs/-/sockjs-0.3.19.tgz"; + sha1 = "d976bbe800af7bd20ae08598d582393508993c0d"; + }; + } + { + name = "sort_keys___sort_keys_1.1.2.tgz"; + path = fetchurl { + name = "sort_keys___sort_keys_1.1.2.tgz"; + url = "https://registry.yarnpkg.com/sort-keys/-/sort-keys-1.1.2.tgz"; + sha1 = "441b6d4d346798f1b4e49e8920adfba0e543f9ad"; + }; + } + { + name = "sort_keys___sort_keys_2.0.0.tgz"; + path = fetchurl { + name = "sort_keys___sort_keys_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/sort-keys/-/sort-keys-2.0.0.tgz"; + sha1 = "658535584861ec97d730d6cf41822e1f56684128"; + }; + } + { + name = "sortablejs___sortablejs_1.10.0.tgz"; + path = fetchurl { + name = "sortablejs___sortablejs_1.10.0.tgz"; + url = "https://registry.yarnpkg.com/sortablejs/-/sortablejs-1.10.0.tgz"; + sha1 = "0ebc054acff2486569194a2f975b2b145dd5e7d6"; + }; + } + { + name = "sortablejs___sortablejs_1.9.0.tgz"; + path = fetchurl { + name = "sortablejs___sortablejs_1.9.0.tgz"; + url = "https://registry.yarnpkg.com/sortablejs/-/sortablejs-1.9.0.tgz"; + sha1 = "2d1e74ae6bac2cb4ad0622908f340848969eb88d"; + }; + } + { + name = "source_list_map___source_list_map_2.0.0.tgz"; + path = fetchurl { + name = "source_list_map___source_list_map_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/source-list-map/-/source-list-map-2.0.0.tgz"; + sha1 = "aaa47403f7b245a92fbc97ea08f250d6087ed085"; + }; + } + { + name = "source_map_resolve___source_map_resolve_0.5.2.tgz"; + path = fetchurl { + name = "source_map_resolve___source_map_resolve_0.5.2.tgz"; + url = "https://registry.yarnpkg.com/source-map-resolve/-/source-map-resolve-0.5.2.tgz"; + sha1 = "72e2cc34095543e43b2c62b2c4c10d4a9054f259"; + }; + } + { + name = "source_map_support___source_map_support_0.5.12.tgz"; + path = fetchurl { + name = "source_map_support___source_map_support_0.5.12.tgz"; + url = "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.12.tgz"; + sha1 = "b4f3b10d51857a5af0138d3ce8003b201613d599"; + }; + } + { + 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.0.tgz"; + path = fetchurl { + name = "source_map___source_map_0.5.0.tgz"; + url = "https://registry.yarnpkg.com/source-map/-/source-map-0.5.0.tgz"; + sha1 = "0fe96503ac86a5adb5de63f4e412ae4872cdbe86"; + }; + } + { + name = "source_map___source_map_0.4.4.tgz"; + path = fetchurl { + name = "source_map___source_map_0.4.4.tgz"; + url = "https://registry.yarnpkg.com/source-map/-/source-map-0.4.4.tgz"; + sha1 = "eba4f5da9c0dc999de68032d8b4f76173652036b"; + }; + } + { + name = "source_map___source_map_0.5.7.tgz"; + path = fetchurl { + name = "source_map___source_map_0.5.7.tgz"; + url = "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz"; + sha1 = "8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"; + }; + } + { + name = "source_map___source_map_0.6.1.tgz"; + path = fetchurl { + 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 = "space_separated_tokens___space_separated_tokens_1.1.4.tgz"; + path = fetchurl { + name = "space_separated_tokens___space_separated_tokens_1.1.4.tgz"; + url = "https://registry.yarnpkg.com/space-separated-tokens/-/space-separated-tokens-1.1.4.tgz"; + sha1 = "27910835ae00d0adfcdbd0ad7e611fb9544351fa"; + }; + } + { + name = "spdx_correct___spdx_correct_1.0.2.tgz"; + path = fetchurl { + name = "spdx_correct___spdx_correct_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-1.0.2.tgz"; + sha1 = "4b3073d933ff51f3912f03ac5519498a4150db40"; + }; + } + { + name = "spdx_expression_parse___spdx_expression_parse_1.0.4.tgz"; + path = fetchurl { + name = "spdx_expression_parse___spdx_expression_parse_1.0.4.tgz"; + url = "https://registry.yarnpkg.com/spdx-expression-parse/-/spdx-expression-parse-1.0.4.tgz"; + sha1 = "9bdf2f20e1f40ed447fbe273266191fced51626c"; + }; + } + { + name = "spdx_license_ids___spdx_license_ids_1.2.2.tgz"; + path = fetchurl { + name = "spdx_license_ids___spdx_license_ids_1.2.2.tgz"; + url = "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-1.2.2.tgz"; + sha1 = "c9df7a3424594ade6bd11900d596696dc06bac57"; + }; + } + { + name = "spdy_transport___spdy_transport_3.0.0.tgz"; + path = fetchurl { + name = "spdy_transport___spdy_transport_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/spdy-transport/-/spdy-transport-3.0.0.tgz"; + sha1 = "00d4863a6400ad75df93361a1608605e5dcdcf31"; + }; + } + { + name = "spdy___spdy_4.0.0.tgz"; + path = fetchurl { + name = "spdy___spdy_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/spdy/-/spdy-4.0.0.tgz"; + sha1 = "81f222b5a743a329aa12cea6a390e60e9b613c52"; + }; + } + { + name = "specificity___specificity_0.4.1.tgz"; + path = fetchurl { + name = "specificity___specificity_0.4.1.tgz"; + url = "https://registry.yarnpkg.com/specificity/-/specificity-0.4.1.tgz"; + sha1 = "aab5e645012db08ba182e151165738d00887b019"; + }; + } + { + 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.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 = "sql.js___sql.js_0.4.0.tgz"; + path = fetchurl { + name = "sql.js___sql.js_0.4.0.tgz"; + url = "https://registry.yarnpkg.com/sql.js/-/sql.js-0.4.0.tgz"; + sha1 = "23be9635520eb0ff43a741e7e830397266e88445"; + }; + } + { + name = "srcset___srcset_1.0.0.tgz"; + path = fetchurl { + name = "srcset___srcset_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/srcset/-/srcset-1.0.0.tgz"; + sha1 = "a5669de12b42f3b1d5e83ed03c71046fc48f41ef"; + }; + } + { + name = "sshpk___sshpk_1.15.2.tgz"; + path = fetchurl { + name = "sshpk___sshpk_1.15.2.tgz"; + url = "https://registry.yarnpkg.com/sshpk/-/sshpk-1.15.2.tgz"; + sha1 = "c946d6bd9b1a39d0e8635763f5242d6ed6dcb629"; + }; + } + { + name = "ssri___ssri_6.0.1.tgz"; + path = fetchurl { + name = "ssri___ssri_6.0.1.tgz"; + url = "https://registry.yarnpkg.com/ssri/-/ssri-6.0.1.tgz"; + sha1 = "2a3c41b28dd45b62b63676ecb74001265ae9edd8"; + }; + } + { + name = "stack_utils___stack_utils_1.0.2.tgz"; + path = fetchurl { + name = "stack_utils___stack_utils_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/stack-utils/-/stack-utils-1.0.2.tgz"; + sha1 = "33eba3897788558bebfc2db059dc158ec36cebb8"; + }; + } + { + name = "state_toggle___state_toggle_1.0.1.tgz"; + path = fetchurl { + name = "state_toggle___state_toggle_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/state-toggle/-/state-toggle-1.0.1.tgz"; + sha1 = "c3cb0974f40a6a0f8e905b96789eb41afa1cde3a"; + }; + } + { + 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 = "statuses___statuses_1.4.0.tgz"; + path = fetchurl { + name = "statuses___statuses_1.4.0.tgz"; + url = "https://registry.yarnpkg.com/statuses/-/statuses-1.4.0.tgz"; + sha1 = "bb73d446da2796106efcc1b601a253d6c46bd087"; + }; + } + { + name = "statuses___statuses_1.3.1.tgz"; + path = fetchurl { + name = "statuses___statuses_1.3.1.tgz"; + url = "https://registry.yarnpkg.com/statuses/-/statuses-1.3.1.tgz"; + sha1 = "faf51b9eb74aaef3b3acf4ad5f61abf24cb7b93e"; + }; + } + { + name = "stdout_stream___stdout_stream_1.4.1.tgz"; + path = fetchurl { + name = "stdout_stream___stdout_stream_1.4.1.tgz"; + url = "https://registry.yarnpkg.com/stdout-stream/-/stdout-stream-1.4.1.tgz"; + sha1 = "5ac174cdd5cd726104aa0c0b2bd83815d8d535de"; + }; + } + { + 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 = "stickyfilljs___stickyfilljs_2.0.5.tgz"; + path = fetchurl { + name = "stickyfilljs___stickyfilljs_2.0.5.tgz"; + url = "https://registry.yarnpkg.com/stickyfilljs/-/stickyfilljs-2.0.5.tgz"; + sha1 = "d229e372d2199ddf5d283bbe34ac1f7d2529c2fc"; + }; + } + { + name = "stream_array___stream_array_1.1.2.tgz"; + path = fetchurl { + name = "stream_array___stream_array_1.1.2.tgz"; + url = "https://registry.yarnpkg.com/stream-array/-/stream-array-1.1.2.tgz"; + sha1 = "9e5f7345f2137c30ee3b498b9114e80b52bb7eb5"; + }; + } + { + name = "stream_browserify___stream_browserify_2.0.1.tgz"; + path = fetchurl { + name = "stream_browserify___stream_browserify_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/stream-browserify/-/stream-browserify-2.0.1.tgz"; + sha1 = "66266ee5f9bdb9940a4e4514cafb43bb71e5c9db"; + }; + } + { + name = "stream_combiner2___stream_combiner2_1.1.1.tgz"; + path = fetchurl { + name = "stream_combiner2___stream_combiner2_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/stream-combiner2/-/stream-combiner2-1.1.1.tgz"; + sha1 = "fb4d8a1420ea362764e21ad4780397bebcb41cbe"; + }; + } + { + name = "stream_each___stream_each_1.2.2.tgz"; + path = fetchurl { + name = "stream_each___stream_each_1.2.2.tgz"; + url = "https://registry.yarnpkg.com/stream-each/-/stream-each-1.2.2.tgz"; + sha1 = "8e8c463f91da8991778765873fe4d960d8f616bd"; + }; + } + { + name = "stream_http___stream_http_2.8.2.tgz"; + path = fetchurl { + name = "stream_http___stream_http_2.8.2.tgz"; + url = "https://registry.yarnpkg.com/stream-http/-/stream-http-2.8.2.tgz"; + sha1 = "4126e8c6b107004465918aa2fc35549e77402c87"; + }; + } + { + name = "stream_shift___stream_shift_1.0.0.tgz"; + path = fetchurl { + name = "stream_shift___stream_shift_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/stream-shift/-/stream-shift-1.0.0.tgz"; + sha1 = "d5c752825e5367e786f78e18e445ea223a155952"; + }; + } + { + name = "streamroller___streamroller_1.0.6.tgz"; + path = fetchurl { + name = "streamroller___streamroller_1.0.6.tgz"; + url = "https://registry.yarnpkg.com/streamroller/-/streamroller-1.0.6.tgz"; + sha1 = "8167d8496ed9f19f05ee4b158d9611321b8cacd9"; + }; + } + { + name = "strict_uri_encode___strict_uri_encode_1.1.0.tgz"; + path = fetchurl { + name = "strict_uri_encode___strict_uri_encode_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz"; + sha1 = "279b225df1d582b1f54e65addd4352e18faa0713"; + }; + } + { + name = "string_length___string_length_2.0.0.tgz"; + path = fetchurl { + name = "string_length___string_length_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/string-length/-/string-length-2.0.0.tgz"; + sha1 = "d40dbb686a3ace960c1cffca562bf2c45f8363ed"; + }; + } + { + name = "string_template___string_template_0.2.1.tgz"; + path = fetchurl { + name = "string_template___string_template_0.2.1.tgz"; + url = "https://registry.yarnpkg.com/string-template/-/string-template-0.2.1.tgz"; + sha1 = "42932e598a352d01fc22ec3367d9d84eec6c9add"; + }; + } + { + name = "string_width___string_width_1.0.2.tgz"; + path = fetchurl { + name = "string_width___string_width_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/string-width/-/string-width-1.0.2.tgz"; + sha1 = "118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3"; + }; + } + { + name = "string_width___string_width_2.1.1.tgz"; + path = fetchurl { + name = "string_width___string_width_2.1.1.tgz"; + url = "https://registry.yarnpkg.com/string-width/-/string-width-2.1.1.tgz"; + sha1 = "ab93f27a8dc13d28cac815c462143a6d9012ae9e"; + }; + } + { + name = "string_width___string_width_3.0.0.tgz"; + path = fetchurl { + name = "string_width___string_width_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/string-width/-/string-width-3.0.0.tgz"; + sha1 = "5a1690a57cc78211fffd9bf24bbe24d090604eb1"; + }; + } + { + name = "string_width___string_width_4.1.0.tgz"; + path = fetchurl { + name = "string_width___string_width_4.1.0.tgz"; + url = "https://registry.yarnpkg.com/string-width/-/string-width-4.1.0.tgz"; + sha1 = "ba846d1daa97c3c596155308063e075ed1c99aff"; + }; + } + { + name = "string_decoder___string_decoder_0.10.31.tgz"; + path = fetchurl { + name = "string_decoder___string_decoder_0.10.31.tgz"; + url = "https://registry.yarnpkg.com/string_decoder/-/string_decoder-0.10.31.tgz"; + sha1 = "62e203bc41766c6c28c9fc84301dab1c5310fa94"; + }; + } + { + 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 = "stringify_entities___stringify_entities_1.3.2.tgz"; + path = fetchurl { + name = "stringify_entities___stringify_entities_1.3.2.tgz"; + url = "https://registry.yarnpkg.com/stringify-entities/-/stringify-entities-1.3.2.tgz"; + sha1 = "a98417e5471fd227b3e45d3db1861c11caf668f7"; + }; + } + { + name = "strip_ansi___strip_ansi_3.0.1.tgz"; + path = fetchurl { + name = "strip_ansi___strip_ansi_3.0.1.tgz"; + url = "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz"; + sha1 = "6a385fb8853d952d5ff05d0e8aaf94278dc63dcf"; + }; + } + { + name = "strip_ansi___strip_ansi_4.0.0.tgz"; + path = fetchurl { + name = "strip_ansi___strip_ansi_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-4.0.0.tgz"; + sha1 = "a8479022eb1ac368a871389b635262c505ee368f"; + }; + } + { + 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_bom___strip_bom_2.0.0.tgz"; + path = fetchurl { + name = "strip_bom___strip_bom_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/strip-bom/-/strip-bom-2.0.0.tgz"; + sha1 = "6219a85616520491f35788bdbf1447a99c7e6b0e"; + }; + } + { + name = "strip_bom___strip_bom_3.0.0.tgz"; + path = fetchurl { + name = "strip_bom___strip_bom_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/strip-bom/-/strip-bom-3.0.0.tgz"; + sha1 = "2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3"; + }; + } + { + name = "strip_css_comments___strip_css_comments_3.0.0.tgz"; + path = fetchurl { + name = "strip_css_comments___strip_css_comments_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/strip-css-comments/-/strip-css-comments-3.0.0.tgz"; + sha1 = "7a5625eff8a2b226cf8947a11254da96e13dae89"; + }; + } + { + 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_indent___strip_indent_1.0.1.tgz"; + path = fetchurl { + name = "strip_indent___strip_indent_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/strip-indent/-/strip-indent-1.0.1.tgz"; + sha1 = "0c7962a6adefa7bbd4ac366460a638552ae1a0a2"; + }; + } + { + name = "strip_indent___strip_indent_2.0.0.tgz"; + path = fetchurl { + name = "strip_indent___strip_indent_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/strip-indent/-/strip-indent-2.0.0.tgz"; + sha1 = "5ef8db295d01e6ed6cbf7aab96998d7822527b68"; + }; + } + { + 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 = "style_loader___style_loader_0.23.1.tgz"; + path = fetchurl { + name = "style_loader___style_loader_0.23.1.tgz"; + url = "https://registry.yarnpkg.com/style-loader/-/style-loader-0.23.1.tgz"; + sha1 = "cb9154606f3e771ab6c4ab637026a1049174d925"; + }; + } + { + name = "style_search___style_search_0.1.0.tgz"; + path = fetchurl { + name = "style_search___style_search_0.1.0.tgz"; + url = "https://registry.yarnpkg.com/style-search/-/style-search-0.1.0.tgz"; + sha1 = "7958c793e47e32e07d2b5cafe5c0bf8e12e77902"; + }; + } + { + name = "stylelint_config_recommended___stylelint_config_recommended_2.2.0.tgz"; + path = fetchurl { + name = "stylelint_config_recommended___stylelint_config_recommended_2.2.0.tgz"; + url = "https://registry.yarnpkg.com/stylelint-config-recommended/-/stylelint-config-recommended-2.2.0.tgz"; + sha1 = "46ab139db4a0e7151fd5f94af155512886c96d3f"; + }; + } + { + name = "stylelint_scss___stylelint_scss_3.9.2.tgz"; + path = fetchurl { + name = "stylelint_scss___stylelint_scss_3.9.2.tgz"; + url = "https://registry.yarnpkg.com/stylelint-scss/-/stylelint-scss-3.9.2.tgz"; + sha1 = "5435174a57696ee52eae40146778a4e62f7ed3a3"; + }; + } + { + name = "stylelint___stylelint_10.1.0.tgz"; + path = fetchurl { + name = "stylelint___stylelint_10.1.0.tgz"; + url = "https://registry.yarnpkg.com/stylelint/-/stylelint-10.1.0.tgz"; + sha1 = "1bc4c4ce878107e7c396b19226d91ba28268911a"; + }; + } + { + name = "subarg___subarg_1.0.0.tgz"; + path = fetchurl { + name = "subarg___subarg_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/subarg/-/subarg-1.0.0.tgz"; + sha1 = "f62cf17581e996b48fc965699f54c06ae268b8d2"; + }; + } + { + name = "sugarss___sugarss_2.0.0.tgz"; + path = fetchurl { + name = "sugarss___sugarss_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/sugarss/-/sugarss-2.0.0.tgz"; + sha1 = "ddd76e0124b297d40bf3cca31c8b22ecb43bc61d"; + }; + } + { + name = "supports_color___supports_color_2.0.0.tgz"; + path = fetchurl { + name = "supports_color___supports_color_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz"; + sha1 = "535d045ce6b6363fa40117084629995e9df324c7"; + }; + } + { + 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_6.1.0.tgz"; + path = fetchurl { + name = "supports_color___supports_color_6.1.0.tgz"; + url = "https://registry.yarnpkg.com/supports-color/-/supports-color-6.1.0.tgz"; + sha1 = "0764abc69c63d5ac842dd4867e8d025e880df8f3"; + }; + } + { + name = "svg_tags___svg_tags_1.0.0.tgz"; + path = fetchurl { + name = "svg_tags___svg_tags_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/svg-tags/-/svg-tags-1.0.0.tgz"; + sha1 = "58f71cee3bd519b59d4b2a843b6c7de64ac04764"; + }; + } + { + name = "svg4everybody___svg4everybody_2.1.9.tgz"; + path = fetchurl { + name = "svg4everybody___svg4everybody_2.1.9.tgz"; + url = "https://registry.yarnpkg.com/svg4everybody/-/svg4everybody-2.1.9.tgz"; + sha1 = "5bd9f6defc133859a044646d4743fabc28db7e2d"; + }; + } + { + name = "symbol_observable___symbol_observable_1.2.0.tgz"; + path = fetchurl { + name = "symbol_observable___symbol_observable_1.2.0.tgz"; + url = "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-1.2.0.tgz"; + sha1 = "c22688aed4eab3cdc2dfeacbb561660560a00804"; + }; + } + { + name = "symbol_tree___symbol_tree_3.2.2.tgz"; + path = fetchurl { + name = "symbol_tree___symbol_tree_3.2.2.tgz"; + url = "https://registry.yarnpkg.com/symbol-tree/-/symbol-tree-3.2.2.tgz"; + sha1 = "ae27db38f660a7ae2e1c3b7d1bc290819b8519e6"; + }; + } + { + name = "table___table_5.4.4.tgz"; + path = fetchurl { + name = "table___table_5.4.4.tgz"; + url = "https://registry.yarnpkg.com/table/-/table-5.4.4.tgz"; + sha1 = "6e0f88fdae3692793d1077fd172a4667afe986a6"; + }; + } + { + name = "taffydb___taffydb_2.6.2.tgz"; + path = fetchurl { + name = "taffydb___taffydb_2.6.2.tgz"; + url = "https://registry.yarnpkg.com/taffydb/-/taffydb-2.6.2.tgz"; + sha1 = "7cbcb64b5a141b6a2efc2c5d2c67b4e150b2a268"; + }; + } + { + name = "tapable___tapable_0.1.10.tgz"; + path = fetchurl { + name = "tapable___tapable_0.1.10.tgz"; + url = "https://registry.yarnpkg.com/tapable/-/tapable-0.1.10.tgz"; + sha1 = "29c35707c2b70e50d07482b5d202e8ed446dafd4"; + }; + } + { + name = "tapable___tapable_1.1.0.tgz"; + path = fetchurl { + name = "tapable___tapable_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/tapable/-/tapable-1.1.0.tgz"; + sha1 = "0d076a172e3d9ba088fd2272b2668fb8d194b78c"; + }; + } + { + name = "tar___tar_2.2.2.tgz"; + path = fetchurl { + name = "tar___tar_2.2.2.tgz"; + url = "https://registry.yarnpkg.com/tar/-/tar-2.2.2.tgz"; + sha1 = "0ca8848562c7299b8b446ff6a4d60cdbb23edc40"; + }; + } + { + name = "tar___tar_4.4.8.tgz"; + path = fetchurl { + name = "tar___tar_4.4.8.tgz"; + url = "https://registry.yarnpkg.com/tar/-/tar-4.4.8.tgz"; + sha1 = "b19eec3fde2a96e64666df9fdb40c5ca1bc3747d"; + }; + } + { + name = "term_size___term_size_1.2.0.tgz"; + path = fetchurl { + name = "term_size___term_size_1.2.0.tgz"; + url = "https://registry.yarnpkg.com/term-size/-/term-size-1.2.0.tgz"; + sha1 = "458b83887f288fc56d6fffbfad262e26638efa69"; + }; + } + { + name = "terser_webpack_plugin___terser_webpack_plugin_1.2.1.tgz"; + path = fetchurl { + name = "terser_webpack_plugin___terser_webpack_plugin_1.2.1.tgz"; + url = "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-1.2.1.tgz"; + sha1 = "7545da9ae5f4f9ae6a0ac961eb46f5e7c845cc26"; + }; + } + { + name = "terser___terser_3.14.1.tgz"; + path = fetchurl { + name = "terser___terser_3.14.1.tgz"; + url = "https://registry.yarnpkg.com/terser/-/terser-3.14.1.tgz"; + sha1 = "cc4764014af570bc79c79742358bd46926018a32"; + }; + } + { + name = "terser___terser_4.0.0.tgz"; + path = fetchurl { + name = "terser___terser_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/terser/-/terser-4.0.0.tgz"; + sha1 = "ef356f6f359a963e2cc675517f21c1c382877374"; + }; + } + { + name = "test_exclude___test_exclude_5.0.0.tgz"; + path = fetchurl { + name = "test_exclude___test_exclude_5.0.0.tgz"; + url = "https://registry.yarnpkg.com/test-exclude/-/test-exclude-5.0.0.tgz"; + sha1 = "cdce7cece785e0e829cd5c2b27baf18bc583cfb7"; + }; + } + { + name = "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 = "textextensions___textextensions_2.2.0.tgz"; + path = fetchurl { + name = "textextensions___textextensions_2.2.0.tgz"; + url = "https://registry.yarnpkg.com/textextensions/-/textextensions-2.2.0.tgz"; + sha1 = "38ac676151285b658654581987a0ce1a4490d286"; + }; + } + { + name = "three_orbit_controls___three_orbit_controls_82.1.0.tgz"; + path = fetchurl { + name = "three_orbit_controls___three_orbit_controls_82.1.0.tgz"; + url = "https://registry.yarnpkg.com/three-orbit-controls/-/three-orbit-controls-82.1.0.tgz"; + sha1 = "11a7f33d0a20ecec98f098b37780f6537374fab4"; + }; + } + { + name = "three_stl_loader___three_stl_loader_1.0.4.tgz"; + path = fetchurl { + name = "three_stl_loader___three_stl_loader_1.0.4.tgz"; + url = "https://registry.yarnpkg.com/three-stl-loader/-/three-stl-loader-1.0.4.tgz"; + sha1 = "6b3319a31e3b910aab1883d19b00c81a663c3e03"; + }; + } + { + name = "three___three_0.84.0.tgz"; + path = fetchurl { + name = "three___three_0.84.0.tgz"; + url = "https://registry.yarnpkg.com/three/-/three-0.84.0.tgz"; + sha1 = "95be85a55a0fa002aa625ed559130957dcffd918"; + }; + } + { + name = "throat___throat_4.1.0.tgz"; + path = fetchurl { + name = "throat___throat_4.1.0.tgz"; + url = "https://registry.yarnpkg.com/throat/-/throat-4.1.0.tgz"; + sha1 = "89037cbc92c56ab18926e6ba4cbb200e15672a6a"; + }; + } + { + name = "throttle_debounce___throttle_debounce_2.0.1.tgz"; + path = fetchurl { + name = "throttle_debounce___throttle_debounce_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/throttle-debounce/-/throttle-debounce-2.0.1.tgz"; + sha1 = "7307ddd6cd9acadb349132fbf6c18d78c88a5e62"; + }; + } + { + name = "through2_filter___through2_filter_3.0.0.tgz"; + path = fetchurl { + name = "through2_filter___through2_filter_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/through2-filter/-/through2-filter-3.0.0.tgz"; + sha1 = "700e786df2367c2c88cd8aa5be4cf9c1e7831254"; + }; + } + { + name = "through2___through2_2.0.5.tgz"; + path = fetchurl { + name = "through2___through2_2.0.5.tgz"; + url = "https://registry.yarnpkg.com/through2/-/through2-2.0.5.tgz"; + sha1 = "01c1e39eb31d07cb7d03a96a70823260b23132cd"; + }; + } + { + name = "through___through_2.3.8.tgz"; + path = fetchurl { + name = "through___through_2.3.8.tgz"; + url = "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz"; + sha1 = "0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"; + }; + } + { + name = "thunky___thunky_0.1.0.tgz"; + path = fetchurl { + name = "thunky___thunky_0.1.0.tgz"; + url = "https://registry.yarnpkg.com/thunky/-/thunky-0.1.0.tgz"; + sha1 = "bf30146824e2b6e67b0f2d7a4ac8beb26908684e"; + }; + } + { + name = "timeago.js___timeago.js_3.0.2.tgz"; + path = fetchurl { + name = "timeago.js___timeago.js_3.0.2.tgz"; + url = "https://registry.yarnpkg.com/timeago.js/-/timeago.js-3.0.2.tgz"; + sha1 = "32a67e7c0d887ea42ca588d3aae26f77de5e76cc"; + }; + } + { + name = "timed_out___timed_out_4.0.1.tgz"; + path = fetchurl { + name = "timed_out___timed_out_4.0.1.tgz"; + url = "https://registry.yarnpkg.com/timed-out/-/timed-out-4.0.1.tgz"; + sha1 = "f32eacac5a175bea25d7fab565ab3ed8741ef56f"; + }; + } + { + name = "timers_browserify___timers_browserify_2.0.10.tgz"; + path = fetchurl { + name = "timers_browserify___timers_browserify_2.0.10.tgz"; + url = "https://registry.yarnpkg.com/timers-browserify/-/timers-browserify-2.0.10.tgz"; + sha1 = "1d28e3d2aadf1d5a5996c4e9f95601cd053480ae"; + }; + } + { + name = "timezone_mock___timezone_mock_1.0.8.tgz"; + path = fetchurl { + name = "timezone_mock___timezone_mock_1.0.8.tgz"; + url = "https://registry.yarnpkg.com/timezone-mock/-/timezone-mock-1.0.8.tgz"; + sha1 = "1b9f7af13f2bf84b7aa3d3d6e24aa17255b6037d"; + }; + } + { + name = "tiny_emitter___tiny_emitter_2.0.2.tgz"; + path = fetchurl { + name = "tiny_emitter___tiny_emitter_2.0.2.tgz"; + url = "https://registry.yarnpkg.com/tiny-emitter/-/tiny-emitter-2.0.2.tgz"; + sha1 = "82d27468aca5ade8e5fd1e6d22b57dd43ebdfb7c"; + }; + } + { + name = "tiny_lr___tiny_lr_1.1.1.tgz"; + path = fetchurl { + name = "tiny_lr___tiny_lr_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/tiny-lr/-/tiny-lr-1.1.1.tgz"; + sha1 = "9fa547412f238fedb068ee295af8b682c98b2aab"; + }; + } + { + name = "tiptap_commands___tiptap_commands_1.4.0.tgz"; + path = fetchurl { + name = "tiptap_commands___tiptap_commands_1.4.0.tgz"; + url = "https://registry.yarnpkg.com/tiptap-commands/-/tiptap-commands-1.4.0.tgz"; + sha1 = "0cfb3ac138ee3099de56114cb119abd841fbcbe7"; + }; + } + { + name = "tiptap_extensions___tiptap_extensions_1.8.0.tgz"; + path = fetchurl { + name = "tiptap_extensions___tiptap_extensions_1.8.0.tgz"; + url = "https://registry.yarnpkg.com/tiptap-extensions/-/tiptap-extensions-1.8.0.tgz"; + sha1 = "3067620a024f1a9e5fae4450790b143d7ebe4394"; + }; + } + { + name = "tiptap_utils___tiptap_utils_1.1.1.tgz"; + path = fetchurl { + name = "tiptap_utils___tiptap_utils_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/tiptap-utils/-/tiptap-utils-1.1.1.tgz"; + sha1 = "e7aad3e84eb35f7abed704d15da0420029789d0d"; + }; + } + { + name = "tiptap___tiptap_1.8.0.tgz"; + path = fetchurl { + name = "tiptap___tiptap_1.8.0.tgz"; + url = "https://registry.yarnpkg.com/tiptap/-/tiptap-1.8.0.tgz"; + sha1 = "c671188075ffa5ee4f86470f95818fd9ce6f1040"; + }; + } + { + name = "tmp___tmp_0.0.33.tgz"; + path = fetchurl { + name = "tmp___tmp_0.0.33.tgz"; + url = "https://registry.yarnpkg.com/tmp/-/tmp-0.0.33.tgz"; + sha1 = "6d34335889768d21b2bcda0aa277ced3b1bfadf9"; + }; + } + { + 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_absolute_glob___to_absolute_glob_2.0.2.tgz"; + path = fetchurl { + name = "to_absolute_glob___to_absolute_glob_2.0.2.tgz"; + url = "https://registry.yarnpkg.com/to-absolute-glob/-/to-absolute-glob-2.0.2.tgz"; + sha1 = "1865f43d9e74b0822db9f145b78cff7d0f7c849b"; + }; + } + { + name = "to_array___to_array_0.1.4.tgz"; + path = fetchurl { + name = "to_array___to_array_0.1.4.tgz"; + url = "https://registry.yarnpkg.com/to-array/-/to-array-0.1.4.tgz"; + sha1 = "17e6c11f73dd4f3d74cda7a4ff3238e9ad9bf890"; + }; + } + { + name = "to_arraybuffer___to_arraybuffer_1.0.1.tgz"; + path = fetchurl { + name = "to_arraybuffer___to_arraybuffer_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz"; + sha1 = "7d229b1fcc637e466ca081180836a7aabff83f43"; + }; + } + { + 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_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 = "to_through___to_through_2.0.0.tgz"; + path = fetchurl { + name = "to_through___to_through_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/to-through/-/to-through-2.0.0.tgz"; + sha1 = "fc92adaba072647bc0b67d6b03664aa195093af6"; + }; + } + { + name = "toggle_selection___toggle_selection_1.0.6.tgz"; + path = fetchurl { + name = "toggle_selection___toggle_selection_1.0.6.tgz"; + url = "https://registry.yarnpkg.com/toggle-selection/-/toggle-selection-1.0.6.tgz"; + sha1 = "6e45b1263f2017fa0acc7d89d78b15b8bf77da32"; + }; + } + { + name = "touch___touch_3.1.0.tgz"; + path = fetchurl { + name = "touch___touch_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/touch/-/touch-3.1.0.tgz"; + sha1 = "fe365f5f75ec9ed4e56825e0bb76d24ab74af83b"; + }; + } + { + name = "tough_cookie___tough_cookie_2.4.3.tgz"; + path = fetchurl { + name = "tough_cookie___tough_cookie_2.4.3.tgz"; + url = "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.4.3.tgz"; + sha1 = "53f36da3f47783b0925afa06ff9f3b165280f781"; + }; + } + { + name = "tr46___tr46_1.0.1.tgz"; + path = fetchurl { + name = "tr46___tr46_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/tr46/-/tr46-1.0.1.tgz"; + sha1 = "a8b13fd6bfd2489519674ccde55ba3693b706d09"; + }; + } + { + name = "trim_lines___trim_lines_1.1.2.tgz"; + path = fetchurl { + name = "trim_lines___trim_lines_1.1.2.tgz"; + url = "https://registry.yarnpkg.com/trim-lines/-/trim-lines-1.1.2.tgz"; + sha1 = "c8adbdbdae21bb5c2766240a661f693afe23e59b"; + }; + } + { + name = "trim_newlines___trim_newlines_1.0.0.tgz"; + path = fetchurl { + name = "trim_newlines___trim_newlines_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/trim-newlines/-/trim-newlines-1.0.0.tgz"; + sha1 = "5887966bb582a4503a41eb524f7d35011815a613"; + }; + } + { + name = "trim_newlines___trim_newlines_2.0.0.tgz"; + path = fetchurl { + name = "trim_newlines___trim_newlines_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/trim-newlines/-/trim-newlines-2.0.0.tgz"; + sha1 = "b403d0b91be50c331dfc4b82eeceb22c3de16d20"; + }; + } + { + name = "trim_right___trim_right_1.0.1.tgz"; + path = fetchurl { + name = "trim_right___trim_right_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/trim-right/-/trim-right-1.0.1.tgz"; + sha1 = "cb2e1203067e0c8de1f614094b9fe45704ea6003"; + }; + } + { + name = "trim_trailing_lines___trim_trailing_lines_1.1.1.tgz"; + path = fetchurl { + name = "trim_trailing_lines___trim_trailing_lines_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/trim-trailing-lines/-/trim-trailing-lines-1.1.1.tgz"; + sha1 = "e0ec0810fd3c3f1730516b45f49083caaf2774d9"; + }; + } + { + name = "trim___trim_0.0.1.tgz"; + path = fetchurl { + name = "trim___trim_0.0.1.tgz"; + url = "https://registry.yarnpkg.com/trim/-/trim-0.0.1.tgz"; + sha1 = "5858547f6b290757ee95cccc666fb50084c460dd"; + }; + } + { + name = "trough___trough_1.0.3.tgz"; + path = fetchurl { + name = "trough___trough_1.0.3.tgz"; + url = "https://registry.yarnpkg.com/trough/-/trough-1.0.3.tgz"; + sha1 = "e29bd1614c6458d44869fc28b255ab7857ef7c24"; + }; + } + { + name = "true_case_path___true_case_path_1.0.3.tgz"; + path = fetchurl { + name = "true_case_path___true_case_path_1.0.3.tgz"; + url = "https://registry.yarnpkg.com/true-case-path/-/true-case-path-1.0.3.tgz"; + sha1 = "f813b5a8c86b40da59606722b144e3225799f47d"; + }; + } + { + name = "try_catch___try_catch_2.0.0.tgz"; + path = fetchurl { + name = "try_catch___try_catch_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/try-catch/-/try-catch-2.0.0.tgz"; + sha1 = "a491141d597f8b72b46757fe1c47059341a16aed"; + }; + } + { + name = "try_to_catch___try_to_catch_1.1.1.tgz"; + path = fetchurl { + name = "try_to_catch___try_to_catch_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/try-to-catch/-/try-to-catch-1.1.1.tgz"; + sha1 = "770162dd13b9a0e55da04db5b7f888956072038a"; + }; + } + { + name = "tryer___tryer_1.0.0.tgz"; + path = fetchurl { + name = "tryer___tryer_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/tryer/-/tryer-1.0.0.tgz"; + sha1 = "027b69fa823225e551cace3ef03b11f6ab37c1d7"; + }; + } + { + name = "ts_invariant___ts_invariant_0.2.1.tgz"; + path = fetchurl { + name = "ts_invariant___ts_invariant_0.2.1.tgz"; + url = "https://registry.yarnpkg.com/ts-invariant/-/ts-invariant-0.2.1.tgz"; + sha1 = "3d587f9d6e3bded97bf9ec17951dd9814d5a9d3f"; + }; + } + { + name = "ts_invariant___ts_invariant_0.3.2.tgz"; + path = fetchurl { + name = "ts_invariant___ts_invariant_0.3.2.tgz"; + url = "https://registry.yarnpkg.com/ts-invariant/-/ts-invariant-0.3.2.tgz"; + sha1 = "89a2ffeb70879b777258df1df1c59383c35209b0"; + }; + } + { + name = "ts_jest___ts_jest_24.0.0.tgz"; + path = fetchurl { + name = "ts_jest___ts_jest_24.0.0.tgz"; + url = "https://registry.yarnpkg.com/ts-jest/-/ts-jest-24.0.0.tgz"; + sha1 = "3f26bf2ec1fa584863a5a9c29bd8717d549efbf6"; + }; + } + { + name = "tslib___tslib_1.9.3.tgz"; + path = fetchurl { + name = "tslib___tslib_1.9.3.tgz"; + url = "https://registry.yarnpkg.com/tslib/-/tslib-1.9.3.tgz"; + sha1 = "d7e4dd79245d85428c4d7e4822a79917954ca286"; + }; + } + { + name = "tty_browserify___tty_browserify_0.0.0.tgz"; + path = fetchurl { + name = "tty_browserify___tty_browserify_0.0.0.tgz"; + url = "https://registry.yarnpkg.com/tty-browserify/-/tty-browserify-0.0.0.tgz"; + sha1 = "a157ba402da24e9bf957f9aa69d524eed42901a6"; + }; + } + { + 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 = "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.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_is___type_is_1.6.16.tgz"; + path = fetchurl { + name = "type_is___type_is_1.6.16.tgz"; + url = "https://registry.yarnpkg.com/type-is/-/type-is-1.6.16.tgz"; + sha1 = "f89ce341541c672b25ee7ae3c73dee3b2be50194"; + }; + } + { + 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 = "typescript___typescript_3.3.4000.tgz"; + path = fetchurl { + name = "typescript___typescript_3.3.4000.tgz"; + url = "https://registry.yarnpkg.com/typescript/-/typescript-3.3.4000.tgz"; + sha1 = "76b0f89cfdbf97827e1112d64f283f1151d6adf0"; + }; + } + { + name = "uc.micro___uc.micro_1.0.5.tgz"; + path = fetchurl { + name = "uc.micro___uc.micro_1.0.5.tgz"; + url = "https://registry.yarnpkg.com/uc.micro/-/uc.micro-1.0.5.tgz"; + sha1 = "0c65f15f815aa08b560a61ce8b4db7ffc3f45376"; + }; + } + { + name = "uglify_js___uglify_js_3.6.0.tgz"; + path = fetchurl { + name = "uglify_js___uglify_js_3.6.0.tgz"; + url = "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.6.0.tgz"; + sha1 = "704681345c53a8b2079fb6cec294b05ead242ff5"; + }; + } + { + name = "ultron___ultron_1.1.1.tgz"; + path = fetchurl { + name = "ultron___ultron_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/ultron/-/ultron-1.1.1.tgz"; + sha1 = "9fe1536a10a664a65266a1e3ccf85fd36302bc9c"; + }; + } + { + name = "unc_path_regex___unc_path_regex_0.1.2.tgz"; + path = fetchurl { + name = "unc_path_regex___unc_path_regex_0.1.2.tgz"; + url = "https://registry.yarnpkg.com/unc-path-regex/-/unc-path-regex-0.1.2.tgz"; + sha1 = "e73dd3d7b0d7c5ed86fbac6b0ae7d8c6a69d50fa"; + }; + } + { + name = "undefsafe___undefsafe_2.0.2.tgz"; + path = fetchurl { + name = "undefsafe___undefsafe_2.0.2.tgz"; + url = "https://registry.yarnpkg.com/undefsafe/-/undefsafe-2.0.2.tgz"; + sha1 = "225f6b9e0337663e0d8e7cfd686fc2836ccace76"; + }; + } + { + name = "underscore_contrib___underscore_contrib_0.3.0.tgz"; + path = fetchurl { + name = "underscore_contrib___underscore_contrib_0.3.0.tgz"; + url = "https://registry.yarnpkg.com/underscore-contrib/-/underscore-contrib-0.3.0.tgz"; + sha1 = "665b66c24783f8fa2b18c9f8cbb0e2c7d48c26c7"; + }; + } + { + name = "underscore___underscore_1.6.0.tgz"; + path = fetchurl { + name = "underscore___underscore_1.6.0.tgz"; + url = "https://registry.yarnpkg.com/underscore/-/underscore-1.6.0.tgz"; + sha1 = "8b38b10cacdef63337b8b24e4ff86d45aea529a8"; + }; + } + { + name = "underscore___underscore_1.9.0.tgz"; + path = fetchurl { + name = "underscore___underscore_1.9.0.tgz"; + url = "https://registry.yarnpkg.com/underscore/-/underscore-1.9.0.tgz"; + sha1 = "31dbb314cfcc88f169cd3692d9149d81a00a73e4"; + }; + } + { + name = "underscore___underscore_1.8.3.tgz"; + path = fetchurl { + name = "underscore___underscore_1.8.3.tgz"; + url = "https://registry.yarnpkg.com/underscore/-/underscore-1.8.3.tgz"; + sha1 = "4f3fb53b106e6097fcf9cb4109f2a5e9bdfa5022"; + }; + } + { + name = "unherit___unherit_1.1.1.tgz"; + path = fetchurl { + name = "unherit___unherit_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/unherit/-/unherit-1.1.1.tgz"; + sha1 = "132748da3e88eab767e08fabfbb89c5e9d28628c"; + }; + } + { + name = "unicode_canonical_property_names_ecmascript___unicode_canonical_property_names_ecmascript_1.0.4.tgz"; + path = fetchurl { + name = "unicode_canonical_property_names_ecmascript___unicode_canonical_property_names_ecmascript_1.0.4.tgz"; + url = "https://registry.yarnpkg.com/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-1.0.4.tgz"; + sha1 = "2619800c4c825800efdd8343af7dd9933cbe2818"; + }; + } + { + name = "unicode_match_property_ecmascript___unicode_match_property_ecmascript_1.0.4.tgz"; + path = fetchurl { + name = "unicode_match_property_ecmascript___unicode_match_property_ecmascript_1.0.4.tgz"; + url = "https://registry.yarnpkg.com/unicode-match-property-ecmascript/-/unicode-match-property-ecmascript-1.0.4.tgz"; + sha1 = "8ed2a32569961bce9227d09cd3ffbb8fed5f020c"; + }; + } + { + name = "unicode_match_property_value_ecmascript___unicode_match_property_value_ecmascript_1.1.0.tgz"; + path = fetchurl { + name = "unicode_match_property_value_ecmascript___unicode_match_property_value_ecmascript_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-1.1.0.tgz"; + sha1 = "5b4b426e08d13a80365e0d657ac7a6c1ec46a277"; + }; + } + { + name = "unicode_property_aliases_ecmascript___unicode_property_aliases_ecmascript_1.0.4.tgz"; + path = fetchurl { + name = "unicode_property_aliases_ecmascript___unicode_property_aliases_ecmascript_1.0.4.tgz"; + url = "https://registry.yarnpkg.com/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-1.0.4.tgz"; + sha1 = "5a533f31b4317ea76f17d807fa0d116546111dd0"; + }; + } + { + name = "unified___unified_6.2.0.tgz"; + path = fetchurl { + name = "unified___unified_6.2.0.tgz"; + url = "https://registry.yarnpkg.com/unified/-/unified-6.2.0.tgz"; + sha1 = "7fbd630f719126d67d40c644b7e3f617035f6dba"; + }; + } + { + name = "unified___unified_7.1.0.tgz"; + path = fetchurl { + name = "unified___unified_7.1.0.tgz"; + url = "https://registry.yarnpkg.com/unified/-/unified-7.1.0.tgz"; + sha1 = "5032f1c1ee3364bd09da12e27fdd4a7553c7be13"; + }; + } + { + name = "union_value___union_value_1.0.0.tgz"; + path = fetchurl { + name = "union_value___union_value_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/union-value/-/union-value-1.0.0.tgz"; + sha1 = "5c71c34cb5bad5dcebe3ea0cd08207ba5aa1aea4"; + }; + } + { + name = "uniq___uniq_1.0.1.tgz"; + path = fetchurl { + name = "uniq___uniq_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/uniq/-/uniq-1.0.1.tgz"; + sha1 = "b31c5ae8254844a3a8281541ce2b04b865a734ff"; + }; + } + { + name = "unique_filename___unique_filename_1.1.1.tgz"; + path = fetchurl { + name = "unique_filename___unique_filename_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/unique-filename/-/unique-filename-1.1.1.tgz"; + sha1 = "1d69769369ada0583103a1e6ae87681b56573230"; + }; + } + { + name = "unique_slug___unique_slug_2.0.0.tgz"; + path = fetchurl { + name = "unique_slug___unique_slug_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/unique-slug/-/unique-slug-2.0.0.tgz"; + sha1 = "db6676e7c7cc0629878ff196097c78855ae9f4ab"; + }; + } + { + name = "unique_stream___unique_stream_2.3.1.tgz"; + path = fetchurl { + name = "unique_stream___unique_stream_2.3.1.tgz"; + url = "https://registry.yarnpkg.com/unique-stream/-/unique-stream-2.3.1.tgz"; + sha1 = "c65d110e9a4adf9a6c5948b28053d9a8d04cbeac"; + }; + } + { + name = "unique_string___unique_string_1.0.0.tgz"; + path = fetchurl { + name = "unique_string___unique_string_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/unique-string/-/unique-string-1.0.0.tgz"; + sha1 = "9e1057cca851abb93398f8b33ae187b99caec11a"; + }; + } + { + name = "unist_builder___unist_builder_1.0.4.tgz"; + path = fetchurl { + name = "unist_builder___unist_builder_1.0.4.tgz"; + url = "https://registry.yarnpkg.com/unist-builder/-/unist-builder-1.0.4.tgz"; + sha1 = "e1808aed30bd72adc3607f25afecebef4dd59e17"; + }; + } + { + name = "unist_util_find_all_after___unist_util_find_all_after_1.0.2.tgz"; + path = fetchurl { + name = "unist_util_find_all_after___unist_util_find_all_after_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/unist-util-find-all-after/-/unist-util-find-all-after-1.0.2.tgz"; + sha1 = "9be49cfbae5ca1566b27536670a92836bf2f8d6d"; + }; + } + { + name = "unist_util_generated___unist_util_generated_1.1.4.tgz"; + path = fetchurl { + name = "unist_util_generated___unist_util_generated_1.1.4.tgz"; + url = "https://registry.yarnpkg.com/unist-util-generated/-/unist-util-generated-1.1.4.tgz"; + sha1 = "2261c033d9fc23fae41872cdb7663746e972c1a7"; + }; + } + { + name = "unist_util_is___unist_util_is_2.1.2.tgz"; + path = fetchurl { + name = "unist_util_is___unist_util_is_2.1.2.tgz"; + url = "https://registry.yarnpkg.com/unist-util-is/-/unist-util-is-2.1.2.tgz"; + sha1 = "1193fa8f2bfbbb82150633f3a8d2eb9a1c1d55db"; + }; + } + { + name = "unist_util_position___unist_util_position_3.0.3.tgz"; + path = fetchurl { + name = "unist_util_position___unist_util_position_3.0.3.tgz"; + url = "https://registry.yarnpkg.com/unist-util-position/-/unist-util-position-3.0.3.tgz"; + sha1 = "fff942b879538b242096c148153826664b1ca373"; + }; + } + { + name = "unist_util_remove_position___unist_util_remove_position_1.1.2.tgz"; + path = fetchurl { + name = "unist_util_remove_position___unist_util_remove_position_1.1.2.tgz"; + url = "https://registry.yarnpkg.com/unist-util-remove-position/-/unist-util-remove-position-1.1.2.tgz"; + sha1 = "86b5dad104d0bbfbeb1db5f5c92f3570575c12cb"; + }; + } + { + name = "unist_util_stringify_position___unist_util_stringify_position_1.1.2.tgz"; + path = fetchurl { + name = "unist_util_stringify_position___unist_util_stringify_position_1.1.2.tgz"; + url = "https://registry.yarnpkg.com/unist-util-stringify-position/-/unist-util-stringify-position-1.1.2.tgz"; + sha1 = "3f37fcf351279dcbca7480ab5889bb8a832ee1c6"; + }; + } + { + name = "unist_util_stringify_position___unist_util_stringify_position_2.0.1.tgz"; + path = fetchurl { + name = "unist_util_stringify_position___unist_util_stringify_position_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/unist-util-stringify-position/-/unist-util-stringify-position-2.0.1.tgz"; + sha1 = "de2a2bc8d3febfa606652673a91455b6a36fb9f3"; + }; + } + { + name = "unist_util_visit_parents___unist_util_visit_parents_2.0.1.tgz"; + path = fetchurl { + name = "unist_util_visit_parents___unist_util_visit_parents_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/unist-util-visit-parents/-/unist-util-visit-parents-2.0.1.tgz"; + sha1 = "63fffc8929027bee04bfef7d2cce474f71cb6217"; + }; + } + { + name = "unist_util_visit___unist_util_visit_1.4.1.tgz"; + path = fetchurl { + name = "unist_util_visit___unist_util_visit_1.4.1.tgz"; + url = "https://registry.yarnpkg.com/unist-util-visit/-/unist-util-visit-1.4.1.tgz"; + sha1 = "4724aaa8486e6ee6e26d7ff3c8685960d560b1e3"; + }; + } + { + 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 = "unpipe___unpipe_1.0.0.tgz"; + path = fetchurl { + name = "unpipe___unpipe_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/unpipe/-/unpipe-1.0.0.tgz"; + sha1 = "b2bf4ee8514aae6165b4817829d21b2ef49904ec"; + }; + } + { + 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 = "unzip_response___unzip_response_2.0.1.tgz"; + path = fetchurl { + name = "unzip_response___unzip_response_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/unzip-response/-/unzip-response-2.0.1.tgz"; + sha1 = "d2f0f737d16b0615e72a6935ed04214572d56f97"; + }; + } + { + name = "upath___upath_1.1.0.tgz"; + path = fetchurl { + name = "upath___upath_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/upath/-/upath-1.1.0.tgz"; + sha1 = "35256597e46a581db4793d0ce47fa9aebfc9fabd"; + }; + } + { + name = "update_notifier___update_notifier_2.5.0.tgz"; + path = fetchurl { + name = "update_notifier___update_notifier_2.5.0.tgz"; + url = "https://registry.yarnpkg.com/update-notifier/-/update-notifier-2.5.0.tgz"; + sha1 = "d0744593e13f161e406acb1d9408b72cad08aff6"; + }; + } + { + name = "upper_case___upper_case_1.1.3.tgz"; + path = fetchurl { + name = "upper_case___upper_case_1.1.3.tgz"; + url = "https://registry.yarnpkg.com/upper-case/-/upper-case-1.1.3.tgz"; + sha1 = "f6b4501c2ec4cdd26ba78be7222961de77621598"; + }; + } + { + name = "uri_js___uri_js_4.2.2.tgz"; + path = fetchurl { + name = "uri_js___uri_js_4.2.2.tgz"; + url = "https://registry.yarnpkg.com/uri-js/-/uri-js-4.2.2.tgz"; + sha1 = "94c540e1ff772956e2299507c010aea6c8838eb0"; + }; + } + { + name = "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_loader___url_loader_1.1.2.tgz"; + path = fetchurl { + name = "url_loader___url_loader_1.1.2.tgz"; + url = "https://registry.yarnpkg.com/url-loader/-/url-loader-1.1.2.tgz"; + sha1 = "b971d191b83af693c5e3fea4064be9e1f2d7f8d8"; + }; + } + { + name = "url_parse_lax___url_parse_lax_1.0.0.tgz"; + path = fetchurl { + name = "url_parse_lax___url_parse_lax_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/url-parse-lax/-/url-parse-lax-1.0.0.tgz"; + sha1 = "7af8f303645e9bd79a272e7a14ac68bc0609da73"; + }; + } + { + name = "url_parse_lax___url_parse_lax_3.0.0.tgz"; + 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 = "url_parse___url_parse_1.4.4.tgz"; + path = fetchurl { + name = "url_parse___url_parse_1.4.4.tgz"; + url = "https://registry.yarnpkg.com/url-parse/-/url-parse-1.4.4.tgz"; + sha1 = "cac1556e95faa0303691fec5cf9d5a1bc34648f8"; + }; + } + { + name = "url_search_params_polyfill___url_search_params_polyfill_5.0.0.tgz"; + path = fetchurl { + name = "url_search_params_polyfill___url_search_params_polyfill_5.0.0.tgz"; + url = "https://registry.yarnpkg.com/url-search-params-polyfill/-/url-search-params-polyfill-5.0.0.tgz"; + sha1 = "09b98337c89dcf6c6a6a0bfeb096f6ba83b7526b"; + }; + } + { + name = "url_to_options___url_to_options_1.0.1.tgz"; + path = fetchurl { + name = "url_to_options___url_to_options_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/url-to-options/-/url-to-options-1.0.1.tgz"; + sha1 = "1505a03a289a48cbd7a434efbaeec5055f5633a9"; + }; + } + { + name = "url___url_0.10.3.tgz"; + path = fetchurl { + name = "url___url_0.10.3.tgz"; + url = "https://registry.yarnpkg.com/url/-/url-0.10.3.tgz"; + sha1 = "021e4d9c7705f21bbf37d03ceb58767402774c64"; + }; + } + { + name = "url___url_0.11.0.tgz"; + path = fetchurl { + name = "url___url_0.11.0.tgz"; + url = "https://registry.yarnpkg.com/url/-/url-0.11.0.tgz"; + sha1 = "3838e97cfc60521eb73c525a8e55bfdd9e2e28f1"; + }; + } + { + 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 = "useragent___useragent_2.3.0.tgz"; + path = fetchurl { + name = "useragent___useragent_2.3.0.tgz"; + url = "https://registry.yarnpkg.com/useragent/-/useragent-2.3.0.tgz"; + sha1 = "217f943ad540cb2128658ab23fc960f6a88c9972"; + }; + } + { + 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 = "util.promisify___util.promisify_1.0.0.tgz"; + path = fetchurl { + name = "util.promisify___util.promisify_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/util.promisify/-/util.promisify-1.0.0.tgz"; + sha1 = "440f7165a459c9a16dc145eb8e72f35687097030"; + }; + } + { + name = "util___util_0.10.3.tgz"; + path = fetchurl { + name = "util___util_0.10.3.tgz"; + url = "https://registry.yarnpkg.com/util/-/util-0.10.3.tgz"; + sha1 = "7afb1afe50805246489e3db7fe0ed379336ac0f9"; + }; + } + { + name = "utils_merge___utils_merge_1.0.1.tgz"; + path = fetchurl { + name = "utils_merge___utils_merge_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.1.tgz"; + sha1 = "9f95710f50a267947b2ccc124741c1028427e713"; + }; + } + { + name = "uuid___uuid_3.3.2.tgz"; + path = fetchurl { + name = "uuid___uuid_3.3.2.tgz"; + url = "https://registry.yarnpkg.com/uuid/-/uuid-3.3.2.tgz"; + sha1 = "1b4af4955eb3077c501c23872fc6513811587131"; + }; + } + { + name = "v8_compile_cache___v8_compile_cache_2.0.2.tgz"; + path = fetchurl { + name = "v8_compile_cache___v8_compile_cache_2.0.2.tgz"; + url = "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.0.2.tgz"; + sha1 = "a428b28bb26790734c4fc8bc9fa106fccebf6a6c"; + }; + } + { + name = "validate_npm_package_license___validate_npm_package_license_3.0.1.tgz"; + path = fetchurl { + name = "validate_npm_package_license___validate_npm_package_license_3.0.1.tgz"; + url = "https://registry.yarnpkg.com/validate-npm-package-license/-/validate-npm-package-license-3.0.1.tgz"; + sha1 = "2804babe712ad3379459acfbe24746ab2c303fbc"; + }; + } + { + name = "value_or_function___value_or_function_3.0.0.tgz"; + path = fetchurl { + name = "value_or_function___value_or_function_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/value-or-function/-/value-or-function-3.0.0.tgz"; + sha1 = "1c243a50b595c1be54a754bfece8563b9ff8d813"; + }; + } + { + name = "vary___vary_1.1.2.tgz"; + path = fetchurl { + name = "vary___vary_1.1.2.tgz"; + url = "https://registry.yarnpkg.com/vary/-/vary-1.1.2.tgz"; + sha1 = "2299f02c6ded30d4a5961b0b9f74524a18f634fc"; + }; + } + { + 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 = "vfile_location___vfile_location_2.0.4.tgz"; + path = fetchurl { + name = "vfile_location___vfile_location_2.0.4.tgz"; + url = "https://registry.yarnpkg.com/vfile-location/-/vfile-location-2.0.4.tgz"; + sha1 = "2a5e7297dd0d9e2da4381464d04acc6b834d3e55"; + }; + } + { + name = "vfile_message___vfile_message_1.1.1.tgz"; + path = fetchurl { + name = "vfile_message___vfile_message_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/vfile-message/-/vfile-message-1.1.1.tgz"; + sha1 = "5833ae078a1dfa2d96e9647886cd32993ab313e1"; + }; + } + { + name = "vfile_message___vfile_message_2.0.1.tgz"; + path = fetchurl { + name = "vfile_message___vfile_message_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/vfile-message/-/vfile-message-2.0.1.tgz"; + sha1 = "951881861c22fc1eb39f873c0b93e336a64e8f6d"; + }; + } + { + name = "vfile_reporter___vfile_reporter_6.0.0.tgz"; + path = fetchurl { + name = "vfile_reporter___vfile_reporter_6.0.0.tgz"; + url = "https://registry.yarnpkg.com/vfile-reporter/-/vfile-reporter-6.0.0.tgz"; + sha1 = "753119f51dec9289b7508b457afc0cddf5e07f2e"; + }; + } + { + name = "vfile_sort___vfile_sort_2.2.1.tgz"; + path = fetchurl { + name = "vfile_sort___vfile_sort_2.2.1.tgz"; + url = "https://registry.yarnpkg.com/vfile-sort/-/vfile-sort-2.2.1.tgz"; + sha1 = "74e714f9175618cdae96bcaedf1a3dc711d87567"; + }; + } + { + name = "vfile_statistics___vfile_statistics_1.1.3.tgz"; + path = fetchurl { + name = "vfile_statistics___vfile_statistics_1.1.3.tgz"; + url = "https://registry.yarnpkg.com/vfile-statistics/-/vfile-statistics-1.1.3.tgz"; + sha1 = "e9c87071997fbcb4243764d2c3805e0bb0820c60"; + }; + } + { + name = "vfile___vfile_2.3.0.tgz"; + path = fetchurl { + name = "vfile___vfile_2.3.0.tgz"; + url = "https://registry.yarnpkg.com/vfile/-/vfile-2.3.0.tgz"; + sha1 = "e62d8e72b20e83c324bc6c67278ee272488bf84a"; + }; + } + { + name = "vfile___vfile_3.0.1.tgz"; + path = fetchurl { + name = "vfile___vfile_3.0.1.tgz"; + url = "https://registry.yarnpkg.com/vfile/-/vfile-3.0.1.tgz"; + sha1 = "47331d2abe3282424f4a4bb6acd20a44c4121803"; + }; + } + { + name = "vfile___vfile_4.0.1.tgz"; + path = fetchurl { + name = "vfile___vfile_4.0.1.tgz"; + url = "https://registry.yarnpkg.com/vfile/-/vfile-4.0.1.tgz"; + sha1 = "fc3d43a1c71916034216bf65926d5ee3c64ed60c"; + }; + } + { + name = "vinyl_fs___vinyl_fs_3.0.3.tgz"; + path = fetchurl { + name = "vinyl_fs___vinyl_fs_3.0.3.tgz"; + url = "https://registry.yarnpkg.com/vinyl-fs/-/vinyl-fs-3.0.3.tgz"; + sha1 = "c85849405f67428feabbbd5c5dbdd64f47d31bc7"; + }; + } + { + name = "vinyl_sourcemap___vinyl_sourcemap_1.1.0.tgz"; + path = fetchurl { + name = "vinyl_sourcemap___vinyl_sourcemap_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/vinyl-sourcemap/-/vinyl-sourcemap-1.1.0.tgz"; + sha1 = "92a800593a38703a8cdb11d8b300ad4be63b3e16"; + }; + } + { + name = "vinyl___vinyl_2.2.0.tgz"; + path = fetchurl { + name = "vinyl___vinyl_2.2.0.tgz"; + url = "https://registry.yarnpkg.com/vinyl/-/vinyl-2.2.0.tgz"; + sha1 = "d85b07da96e458d25b2ffe19fece9f2caa13ed86"; + }; + } + { + name = "visibilityjs___visibilityjs_1.2.4.tgz"; + path = fetchurl { + name = "visibilityjs___visibilityjs_1.2.4.tgz"; + url = "https://registry.yarnpkg.com/visibilityjs/-/visibilityjs-1.2.4.tgz"; + sha1 = "bff8663da62c8c10ad4ee5ae6a1ae6fac4259d63"; + }; + } + { + name = "vm_browserify___vm_browserify_0.0.4.tgz"; + path = fetchurl { + name = "vm_browserify___vm_browserify_0.0.4.tgz"; + url = "https://registry.yarnpkg.com/vm-browserify/-/vm-browserify-0.0.4.tgz"; + sha1 = "5d7ea45bbef9e4a6ff65f95438e0a87c357d5a73"; + }; + } + { + name = "void_elements___void_elements_2.0.1.tgz"; + path = fetchurl { + name = "void_elements___void_elements_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/void-elements/-/void-elements-2.0.1.tgz"; + sha1 = "c066afb582bb1cb4128d60ea92392e94d5e9dbec"; + }; + } + { + name = "vue_apollo___vue_apollo_3.0.0_beta.28.tgz"; + path = fetchurl { + name = "vue_apollo___vue_apollo_3.0.0_beta.28.tgz"; + url = "https://registry.yarnpkg.com/vue-apollo/-/vue-apollo-3.0.0-beta.28.tgz"; + sha1 = "be6a3a1504be2096cbfb23996537e2fc95c8c239"; + }; + } + { + name = "vue_eslint_parser___vue_eslint_parser_4.0.3.tgz"; + path = fetchurl { + name = "vue_eslint_parser___vue_eslint_parser_4.0.3.tgz"; + url = "https://registry.yarnpkg.com/vue-eslint-parser/-/vue-eslint-parser-4.0.3.tgz"; + sha1 = "80cf162e484387b2640371ad21ba1f86e0c10a61"; + }; + } + { + name = "vue_eslint_parser___vue_eslint_parser_6.0.4.tgz"; + path = fetchurl { + name = "vue_eslint_parser___vue_eslint_parser_6.0.4.tgz"; + url = "https://registry.yarnpkg.com/vue-eslint-parser/-/vue-eslint-parser-6.0.4.tgz"; + sha1 = "56ff47e2c2644bff39951d5a284982c7ecd6f7fa"; + }; + } + { + name = "vue_functional_data_merge___vue_functional_data_merge_3.1.0.tgz"; + path = fetchurl { + name = "vue_functional_data_merge___vue_functional_data_merge_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/vue-functional-data-merge/-/vue-functional-data-merge-3.1.0.tgz"; + sha1 = "08a7797583b7f35680587f8a1d51d729aa1dc657"; + }; + } + { + name = "vue_hot_reload_api___vue_hot_reload_api_2.3.0.tgz"; + path = fetchurl { + name = "vue_hot_reload_api___vue_hot_reload_api_2.3.0.tgz"; + url = "https://registry.yarnpkg.com/vue-hot-reload-api/-/vue-hot-reload-api-2.3.0.tgz"; + sha1 = "97976142405d13d8efae154749e88c4e358cf926"; + }; + } + { + name = "vue_jest___vue_jest_4.0.0_beta.2.tgz"; + path = fetchurl { + name = "vue_jest___vue_jest_4.0.0_beta.2.tgz"; + url = "https://registry.yarnpkg.com/vue-jest/-/vue-jest-4.0.0-beta.2.tgz"; + sha1 = "f2120ea9d24224aad3a100c2010b0760d47ee6fe"; + }; + } + { + name = "vue_loader___vue_loader_15.7.0.tgz"; + path = fetchurl { + name = "vue_loader___vue_loader_15.7.0.tgz"; + url = "https://registry.yarnpkg.com/vue-loader/-/vue-loader-15.7.0.tgz"; + sha1 = "27275aa5a3ef4958c5379c006dd1436ad04b25b3"; + }; + } + { + name = "vue_resource___vue_resource_1.5.1.tgz"; + path = fetchurl { + name = "vue_resource___vue_resource_1.5.1.tgz"; + url = "https://registry.yarnpkg.com/vue-resource/-/vue-resource-1.5.1.tgz"; + sha1 = "0f3d685e3254d21800bebd966edcf56c34b3b6e4"; + }; + } + { + name = "vue_router___vue_router_3.0.2.tgz"; + path = fetchurl { + name = "vue_router___vue_router_3.0.2.tgz"; + url = "https://registry.yarnpkg.com/vue-router/-/vue-router-3.0.2.tgz"; + sha1 = "dedc67afe6c4e2bc25682c8b1c2a8c0d7c7e56be"; + }; + } + { + name = "vue_style_loader___vue_style_loader_4.1.0.tgz"; + path = fetchurl { + name = "vue_style_loader___vue_style_loader_4.1.0.tgz"; + url = "https://registry.yarnpkg.com/vue-style-loader/-/vue-style-loader-4.1.0.tgz"; + sha1 = "7588bd778e2c9f8d87bfc3c5a4a039638da7a863"; + }; + } + { + name = "vue_template_compiler___vue_template_compiler_2.6.10.tgz"; + path = fetchurl { + name = "vue_template_compiler___vue_template_compiler_2.6.10.tgz"; + url = "https://registry.yarnpkg.com/vue-template-compiler/-/vue-template-compiler-2.6.10.tgz"; + sha1 = "323b4f3495f04faa3503337a82f5d6507799c9cc"; + }; + } + { + name = "vue_template_es2015_compiler___vue_template_es2015_compiler_1.9.1.tgz"; + path = fetchurl { + name = "vue_template_es2015_compiler___vue_template_es2015_compiler_1.9.1.tgz"; + url = "https://registry.yarnpkg.com/vue-template-es2015-compiler/-/vue-template-es2015-compiler-1.9.1.tgz"; + sha1 = "1ee3bc9a16ecbf5118be334bb15f9c46f82f5825"; + }; + } + { + name = "vue_virtual_scroll_list___vue_virtual_scroll_list_1.3.1.tgz"; + path = fetchurl { + name = "vue_virtual_scroll_list___vue_virtual_scroll_list_1.3.1.tgz"; + url = "https://registry.yarnpkg.com/vue-virtual-scroll-list/-/vue-virtual-scroll-list-1.3.1.tgz"; + sha1 = "efcb83d3a3dcc69cd886fa4de1130a65493e8f76"; + }; + } + { + name = "vue___vue_2.6.10.tgz"; + path = fetchurl { + name = "vue___vue_2.6.10.tgz"; + url = "https://registry.yarnpkg.com/vue/-/vue-2.6.10.tgz"; + sha1 = "a72b1a42a4d82a721ea438d1b6bf55e66195c637"; + }; + } + { + name = "vuedraggable___vuedraggable_2.23.0.tgz"; + path = fetchurl { + name = "vuedraggable___vuedraggable_2.23.0.tgz"; + url = "https://registry.yarnpkg.com/vuedraggable/-/vuedraggable-2.23.0.tgz"; + sha1 = "1f4a5a601675a5dbf0d96ee61aebfffa43445262"; + }; + } + { + name = "vuex___vuex_3.1.0.tgz"; + path = fetchurl { + name = "vuex___vuex_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/vuex/-/vuex-3.1.0.tgz"; + sha1 = "634b81515cf0cfe976bd1ffe9601755e51f843b9"; + }; + } + { + name = "w3c_hr_time___w3c_hr_time_1.0.1.tgz"; + path = fetchurl { + name = "w3c_hr_time___w3c_hr_time_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/w3c-hr-time/-/w3c-hr-time-1.0.1.tgz"; + sha1 = "82ac2bff63d950ea9e3189a58a65625fedf19045"; + }; + } + { + name = "w3c_keyname___w3c_keyname_1.1.8.tgz"; + path = fetchurl { + name = "w3c_keyname___w3c_keyname_1.1.8.tgz"; + url = "https://registry.yarnpkg.com/w3c-keyname/-/w3c-keyname-1.1.8.tgz"; + sha1 = "4e2219663760fd6535b7a1550f1552d71fc9372c"; + }; + } + { + 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 = "watchpack___watchpack_1.5.0.tgz"; + path = fetchurl { + name = "watchpack___watchpack_1.5.0.tgz"; + url = "https://registry.yarnpkg.com/watchpack/-/watchpack-1.5.0.tgz"; + sha1 = "231e783af830a22f8966f65c4c4bacc814072eed"; + }; + } + { + name = "wbuf___wbuf_1.7.3.tgz"; + path = fetchurl { + name = "wbuf___wbuf_1.7.3.tgz"; + url = "https://registry.yarnpkg.com/wbuf/-/wbuf-1.7.3.tgz"; + sha1 = "c1d8d149316d3ea852848895cb6a0bfe887b87df"; + }; + } + { + name = "webidl_conversions___webidl_conversions_4.0.2.tgz"; + path = fetchurl { + name = "webidl_conversions___webidl_conversions_4.0.2.tgz"; + url = "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-4.0.2.tgz"; + sha1 = "a855980b1f0b6b359ba1d5d9fb39ae941faa63ad"; + }; + } + { + name = "webpack_bundle_analyzer___webpack_bundle_analyzer_3.3.2.tgz"; + path = fetchurl { + name = "webpack_bundle_analyzer___webpack_bundle_analyzer_3.3.2.tgz"; + url = "https://registry.yarnpkg.com/webpack-bundle-analyzer/-/webpack-bundle-analyzer-3.3.2.tgz"; + sha1 = "3da733a900f515914e729fcebcd4c40dde71fc6f"; + }; + } + { + name = "webpack_cli___webpack_cli_3.2.1.tgz"; + path = fetchurl { + name = "webpack_cli___webpack_cli_3.2.1.tgz"; + url = "https://registry.yarnpkg.com/webpack-cli/-/webpack-cli-3.2.1.tgz"; + sha1 = "779c696c82482491f0803907508db2e276ed3b61"; + }; + } + { + name = "webpack_dev_middleware___webpack_dev_middleware_3.4.0.tgz"; + path = fetchurl { + name = "webpack_dev_middleware___webpack_dev_middleware_3.4.0.tgz"; + url = "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-3.4.0.tgz"; + sha1 = "1132fecc9026fd90f0ecedac5cbff75d1fb45890"; + }; + } + { + name = "webpack_dev_middleware___webpack_dev_middleware_3.7.0.tgz"; + path = fetchurl { + name = "webpack_dev_middleware___webpack_dev_middleware_3.7.0.tgz"; + url = "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-3.7.0.tgz"; + sha1 = "ef751d25f4e9a5c8a35da600c5fda3582b5c6cff"; + }; + } + { + name = "webpack_dev_server___webpack_dev_server_3.1.14.tgz"; + path = fetchurl { + name = "webpack_dev_server___webpack_dev_server_3.1.14.tgz"; + url = "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-3.1.14.tgz"; + sha1 = "60fb229b997fc5a0a1fc6237421030180959d469"; + }; + } + { + name = "webpack_log___webpack_log_2.0.0.tgz"; + path = fetchurl { + name = "webpack_log___webpack_log_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/webpack-log/-/webpack-log-2.0.0.tgz"; + sha1 = "5b7928e0637593f119d32f6227c1e0ac31e1b47f"; + }; + } + { + name = "webpack_sources___webpack_sources_1.3.0.tgz"; + path = fetchurl { + name = "webpack_sources___webpack_sources_1.3.0.tgz"; + url = "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-1.3.0.tgz"; + sha1 = "2a28dcb9f1f45fe960d8f1493252b5ee6530fa85"; + }; + } + { + name = "webpack_stats_plugin___webpack_stats_plugin_0.2.1.tgz"; + path = fetchurl { + name = "webpack_stats_plugin___webpack_stats_plugin_0.2.1.tgz"; + url = "https://registry.yarnpkg.com/webpack-stats-plugin/-/webpack-stats-plugin-0.2.1.tgz"; + sha1 = "1f5bac13fc25d62cbb5fd0ff646757dc802b8595"; + }; + } + { + name = "webpack___webpack_4.29.0.tgz"; + path = fetchurl { + name = "webpack___webpack_4.29.0.tgz"; + url = "https://registry.yarnpkg.com/webpack/-/webpack-4.29.0.tgz"; + sha1 = "f2cfef83f7ae404ba889ff5d43efd285ca26e750"; + }; + } + { + name = "websocket_driver___websocket_driver_0.6.5.tgz"; + path = fetchurl { + name = "websocket_driver___websocket_driver_0.6.5.tgz"; + url = "https://registry.yarnpkg.com/websocket-driver/-/websocket-driver-0.6.5.tgz"; + sha1 = "5cb2556ceb85f4373c6d8238aa691c8454e13a36"; + }; + } + { + name = "websocket_extensions___websocket_extensions_0.1.1.tgz"; + path = fetchurl { + name = "websocket_extensions___websocket_extensions_0.1.1.tgz"; + url = "https://registry.yarnpkg.com/websocket-extensions/-/websocket-extensions-0.1.1.tgz"; + sha1 = "76899499c184b6ef754377c2dbb0cd6cb55d29e7"; + }; + } + { + 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_6.5.0.tgz"; + path = fetchurl { + name = "whatwg_url___whatwg_url_6.5.0.tgz"; + url = "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-6.5.0.tgz"; + sha1 = "f2df02bff176fd65070df74ad5ccbb5a199965a8"; + }; + } + { + name = "whatwg_url___whatwg_url_7.0.0.tgz"; + path = fetchurl { + name = "whatwg_url___whatwg_url_7.0.0.tgz"; + url = "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-7.0.0.tgz"; + sha1 = "fde926fa54a599f3adf82dff25a9f7be02dc6edd"; + }; + } + { + name = "which_module___which_module_1.0.0.tgz"; + path = fetchurl { + name = "which_module___which_module_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/which-module/-/which-module-1.0.0.tgz"; + sha1 = "bba63ca861948994ff307736089e3b96026c2a4f"; + }; + } + { + name = "which_module___which_module_2.0.0.tgz"; + path = fetchurl { + 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 = "wide_align___wide_align_1.1.3.tgz"; + path = fetchurl { + name = "wide_align___wide_align_1.1.3.tgz"; + url = "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.3.tgz"; + sha1 = "ae074e6bdc0c14a431e804e624549c633b000457"; + }; + } + { + name = "widest_line___widest_line_2.0.0.tgz"; + path = fetchurl { + name = "widest_line___widest_line_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/widest-line/-/widest-line-2.0.0.tgz"; + sha1 = "0142a4e8a243f8882c0233aa0e0281aa76152273"; + }; + } + { + name = "wordwrap___wordwrap_0.0.3.tgz"; + path = fetchurl { + name = "wordwrap___wordwrap_0.0.3.tgz"; + url = "https://registry.yarnpkg.com/wordwrap/-/wordwrap-0.0.3.tgz"; + sha1 = "a3d5da6cd5c0bc0008d37234bbaf1bed63059107"; + }; + } + { + name = "wordwrap___wordwrap_1.0.0.tgz"; + path = fetchurl { + name = "wordwrap___wordwrap_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/wordwrap/-/wordwrap-1.0.0.tgz"; + sha1 = "27584810891456a4171c8d0226441ade90cbcaeb"; + }; + } + { + name = "worker_farm___worker_farm_1.5.2.tgz"; + path = fetchurl { + name = "worker_farm___worker_farm_1.5.2.tgz"; + url = "https://registry.yarnpkg.com/worker-farm/-/worker-farm-1.5.2.tgz"; + sha1 = "32b312e5dc3d5d45d79ef44acc2587491cd729ae"; + }; + } + { + name = "worker_loader___worker_loader_2.0.0.tgz"; + path = fetchurl { + name = "worker_loader___worker_loader_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/worker-loader/-/worker-loader-2.0.0.tgz"; + sha1 = "45fda3ef76aca815771a89107399ee4119b430ac"; + }; + } + { + name = "wrap_ansi___wrap_ansi_2.1.0.tgz"; + path = fetchurl { + name = "wrap_ansi___wrap_ansi_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-2.1.0.tgz"; + sha1 = "d8fc3d284dd05794fe84973caecdd1cf824fdd85"; + }; + } + { + 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_2.4.1.tgz"; + path = fetchurl { + name = "write_file_atomic___write_file_atomic_2.4.1.tgz"; + url = "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-2.4.1.tgz"; + sha1 = "d0b05463c188ae804396fd5ab2a370062af87529"; + }; + } + { + name = "write___write_1.0.3.tgz"; + path = fetchurl { + name = "write___write_1.0.3.tgz"; + url = "https://registry.yarnpkg.com/write/-/write-1.0.3.tgz"; + sha1 = "0800e14523b923a387e415123c865616aae0f5c3"; + }; + } + { + name = "write___write_0.2.1.tgz"; + path = fetchurl { + name = "write___write_0.2.1.tgz"; + url = "https://registry.yarnpkg.com/write/-/write-0.2.1.tgz"; + sha1 = "5fc03828e264cea3fe91455476f7a3c566cb0757"; + }; + } + { + name = "ws___ws_5.2.2.tgz"; + path = fetchurl { + name = "ws___ws_5.2.2.tgz"; + url = "https://registry.yarnpkg.com/ws/-/ws-5.2.2.tgz"; + sha1 = "dffef14866b8e8dc9133582514d1befaf96e980f"; + }; + } + { + name = "ws___ws_6.0.0.tgz"; + path = fetchurl { + name = "ws___ws_6.0.0.tgz"; + url = "https://registry.yarnpkg.com/ws/-/ws-6.0.0.tgz"; + sha1 = "eaa494aded00ac4289d455bac8d84c7c651cef35"; + }; + } + { + name = "ws___ws_3.3.3.tgz"; + path = fetchurl { + name = "ws___ws_3.3.3.tgz"; + url = "https://registry.yarnpkg.com/ws/-/ws-3.3.3.tgz"; + sha1 = "f1cf84fe2d5e901ebce94efaece785f187a228f2"; + }; + } + { + name = "x_is_string___x_is_string_0.1.0.tgz"; + path = fetchurl { + name = "x_is_string___x_is_string_0.1.0.tgz"; + url = "https://registry.yarnpkg.com/x-is-string/-/x-is-string-0.1.0.tgz"; + sha1 = "474b50865af3a49a9c4657f05acd145458f77d82"; + }; + } + { + name = "xdg_basedir___xdg_basedir_3.0.0.tgz"; + path = fetchurl { + name = "xdg_basedir___xdg_basedir_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/xdg-basedir/-/xdg-basedir-3.0.0.tgz"; + sha1 = "496b2cc109eca8dbacfe2dc72b603c17c5870ad4"; + }; + } + { + name = "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 = "xml2js___xml2js_0.4.19.tgz"; + path = fetchurl { + name = "xml2js___xml2js_0.4.19.tgz"; + url = "https://registry.yarnpkg.com/xml2js/-/xml2js-0.4.19.tgz"; + sha1 = "686c20f213209e94abf0d1bcf1efaa291c7827a7"; + }; + } + { + name = "xml___xml_1.0.1.tgz"; + path = fetchurl { + name = "xml___xml_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/xml/-/xml-1.0.1.tgz"; + sha1 = "78ba72020029c5bc87b8a81a3cfcd74b4a2fc1e5"; + }; + } + { + name = "xmlbuilder___xmlbuilder_8.2.2.tgz"; + path = fetchurl { + name = "xmlbuilder___xmlbuilder_8.2.2.tgz"; + url = "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-8.2.2.tgz"; + sha1 = "69248673410b4ba42e1a6136551d2922335aa773"; + }; + } + { + name = "xmlbuilder___xmlbuilder_9.0.7.tgz"; + path = fetchurl { + name = "xmlbuilder___xmlbuilder_9.0.7.tgz"; + url = "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-9.0.7.tgz"; + sha1 = "132ee63d2ec5565c557e20f4c22df9aca686b10d"; + }; + } + { + name = "xmlcreate___xmlcreate_1.0.2.tgz"; + path = fetchurl { + name = "xmlcreate___xmlcreate_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/xmlcreate/-/xmlcreate-1.0.2.tgz"; + sha1 = "fa6bf762a60a413fb3dd8f4b03c5b269238d308f"; + }; + } + { + name = "xmlhttprequest_ssl___xmlhttprequest_ssl_1.5.5.tgz"; + path = fetchurl { + name = "xmlhttprequest_ssl___xmlhttprequest_ssl_1.5.5.tgz"; + url = "https://registry.yarnpkg.com/xmlhttprequest-ssl/-/xmlhttprequest-ssl-1.5.5.tgz"; + sha1 = "c2876b06168aadc40e57d97e81191ac8f4398b3e"; + }; + } + { + name = "xmlhttprequest___xmlhttprequest_1.8.0.tgz"; + path = fetchurl { + name = "xmlhttprequest___xmlhttprequest_1.8.0.tgz"; + url = "https://registry.yarnpkg.com/xmlhttprequest/-/xmlhttprequest-1.8.0.tgz"; + sha1 = "67fe075c5c24fef39f9d65f5f7b7fe75171968fc"; + }; + } + { + name = "xregexp___xregexp_4.0.0.tgz"; + path = fetchurl { + name = "xregexp___xregexp_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/xregexp/-/xregexp-4.0.0.tgz"; + sha1 = "e698189de49dd2a18cc5687b05e17c8e43943020"; + }; + } + { + name = "xtend___xtend_4.0.2.tgz"; + path = fetchurl { + name = "xtend___xtend_4.0.2.tgz"; + url = "https://registry.yarnpkg.com/xtend/-/xtend-4.0.2.tgz"; + sha1 = "bb72779f5fa465186b1f438f674fa347fdb5db54"; + }; + } + { + name = "xterm___xterm_3.5.0.tgz"; + path = fetchurl { + name = "xterm___xterm_3.5.0.tgz"; + url = "https://registry.yarnpkg.com/xterm/-/xterm-3.5.0.tgz"; + sha1 = "ba3f464bc5730c9d259ebe62131862224db9ddcc"; + }; + } + { + name = "y18n___y18n_3.2.1.tgz"; + path = fetchurl { + name = "y18n___y18n_3.2.1.tgz"; + url = "https://registry.yarnpkg.com/y18n/-/y18n-3.2.1.tgz"; + sha1 = "6d15fba884c08679c0d77e88e7759e811e07fa41"; + }; + } + { + name = "y18n___y18n_4.0.0.tgz"; + path = fetchurl { + name = "y18n___y18n_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/y18n/-/y18n-4.0.0.tgz"; + sha1 = "95ef94f85ecc81d007c264e190a120f0a3c8566b"; + }; + } + { + name = "yallist___yallist_2.1.2.tgz"; + path = fetchurl { + name = "yallist___yallist_2.1.2.tgz"; + url = "https://registry.yarnpkg.com/yallist/-/yallist-2.1.2.tgz"; + sha1 = "1c11f9218f076089a47dd512f93c6699a6a81d52"; + }; + } + { + name = "yallist___yallist_3.0.3.tgz"; + path = fetchurl { + name = "yallist___yallist_3.0.3.tgz"; + url = "https://registry.yarnpkg.com/yallist/-/yallist-3.0.3.tgz"; + sha1 = "b4b049e314be545e3ce802236d6cd22cd91c3de9"; + }; + } + { + name = "yargs_parser___yargs_parser_10.1.0.tgz"; + path = fetchurl { + name = "yargs_parser___yargs_parser_10.1.0.tgz"; + url = "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-10.1.0.tgz"; + sha1 = "7202265b89f7e9e9f2e5765e0fe735a905edbaa8"; + }; + } + { + name = "yargs_parser___yargs_parser_11.1.1.tgz"; + path = fetchurl { + name = "yargs_parser___yargs_parser_11.1.1.tgz"; + url = "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-11.1.1.tgz"; + sha1 = "879a0865973bca9f6bab5cbdf3b1c67ec7d3bcf4"; + }; + } + { + name = "yargs_parser___yargs_parser_5.0.0.tgz"; + path = fetchurl { + name = "yargs_parser___yargs_parser_5.0.0.tgz"; + url = "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-5.0.0.tgz"; + sha1 = "275ecf0d7ffe05c77e64e7c86e4cd94bf0e1228a"; + }; + } + { + name = "yargs___yargs_12.0.2.tgz"; + path = fetchurl { + name = "yargs___yargs_12.0.2.tgz"; + url = "https://registry.yarnpkg.com/yargs/-/yargs-12.0.2.tgz"; + sha1 = "fe58234369392af33ecbef53819171eff0f5aadc"; + }; + } + { + name = "yargs___yargs_12.0.5.tgz"; + path = fetchurl { + name = "yargs___yargs_12.0.5.tgz"; + url = "https://registry.yarnpkg.com/yargs/-/yargs-12.0.5.tgz"; + sha1 = "05f5997b609647b64f66b81e3b4b10a368e7ad13"; + }; + } + { + name = "yargs___yargs_7.1.0.tgz"; + path = fetchurl { + name = "yargs___yargs_7.1.0.tgz"; + url = "https://registry.yarnpkg.com/yargs/-/yargs-7.1.0.tgz"; + sha1 = "6ba318eb16961727f5d284f8ea003e8d6154d0c8"; + }; + } + { + name = "yarn_deduplicate___yarn_deduplicate_1.1.1.tgz"; + path = fetchurl { + name = "yarn_deduplicate___yarn_deduplicate_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/yarn-deduplicate/-/yarn-deduplicate-1.1.1.tgz"; + sha1 = "19b4a87654b66f55bf3a4bd6b153b4e4ab1b6e6d"; + }; + } + { + name = "yeast___yeast_0.1.2.tgz"; + path = fetchurl { + name = "yeast___yeast_0.1.2.tgz"; + url = "https://registry.yarnpkg.com/yeast/-/yeast-0.1.2.tgz"; + sha1 = "008e06d8094320c372dbc2f8ed76a0ca6c8ac419"; + }; + } + { + name = "zen_observable_ts___zen_observable_ts_0.8.18.tgz"; + path = fetchurl { + name = "zen_observable_ts___zen_observable_ts_0.8.18.tgz"; + url = "https://registry.yarnpkg.com/zen-observable-ts/-/zen-observable-ts-0.8.18.tgz"; + sha1 = "ade44b1060cc4a800627856ec10b9c67f5f639c8"; + }; + } + { + name = "zen_observable___zen_observable_0.8.11.tgz"; + path = fetchurl { + name = "zen_observable___zen_observable_0.8.11.tgz"; + url = "https://registry.yarnpkg.com/zen-observable/-/zen-observable-0.8.11.tgz"; + sha1 = "d3415885eeeb42ee5abb9821c95bb518fcd6d199"; + }; + } + { + name = "zrender___zrender_4.0.7.tgz"; + path = fetchurl { + name = "zrender___zrender_4.0.7.tgz"; + url = "https://registry.yarnpkg.com/zrender/-/zrender-4.0.7.tgz"; + sha1 = "15ae960822f5efed410995d37e5107fe3de10e6d"; + }; + } + ]; +} diff --git a/pkgs/applications/version-management/meld/default.nix b/pkgs/applications/version-management/meld/default.nix index 168827c3548f..5342a0697ab2 100644 --- a/pkgs/applications/version-management/meld/default.nix +++ b/pkgs/applications/version-management/meld/default.nix @@ -60,6 +60,6 @@ python3.pkgs.buildPythonApplication rec { homepage = http://meldmerge.org/; license = licenses.gpl2; platforms = platforms.linux ++ platforms.darwin; - maintainers = with maintainers; [ jtojnar mimadrid ]; + maintainers = with maintainers; [ jtojnar mimame ]; }; } diff --git a/pkgs/applications/version-management/sourcehut/core.nix b/pkgs/applications/version-management/sourcehut/core.nix index ca054c5cfde9..4b12d66a3a2d 100644 --- a/pkgs/applications/version-management/sourcehut/core.nix +++ b/pkgs/applications/version-management/sourcehut/core.nix @@ -1,7 +1,7 @@ { stdenv, fetchgit, fetchNodeModules, buildPythonPackage , pgpy, flask, bleach, misaka, humanize, markdown, psycopg2, pygments, requests , sqlalchemy, flask_login, beautifulsoup4, sqlalchemy-utils, celery, alembic -, sassc, nodejs-11_x +, sassc, nodejs , writeText }: buildPythonPackage rec { @@ -16,7 +16,7 @@ buildPythonPackage rec { node_modules = fetchNodeModules { src = "${src}/srht"; - nodejs = nodejs-11_x; + nodejs = nodejs; sha256 = "0axl50swhcw8llq8z2icwr4nkr5qsw2riih0a040f9wx4xiw4p6p"; }; @@ -26,7 +26,7 @@ buildPythonPackage rec { nativeBuildInputs = [ sassc - nodejs-11_x + nodejs ]; propagatedBuildInputs = [ @@ -75,6 +75,7 @@ buildPythonPackage rec { homepage = https://git.sr.ht/~sircmpwn/srht; description = "Core modules for sr.ht"; license = licenses.bsd3; + broken = true; maintainers = with maintainers; [ eadwu ]; }; } diff --git a/pkgs/applications/version-management/sourcehut/default.nix b/pkgs/applications/version-management/sourcehut/default.nix index 00a3cf271113..3fa5399c2b56 100644 --- a/pkgs/applications/version-management/sourcehut/default.nix +++ b/pkgs/applications/version-management/sourcehut/default.nix @@ -1,5 +1,5 @@ { python37, openssl -, callPackage }: +, callPackage, recurseIntoAttrs }: # To expose the *srht modules, they have to be a python module so we use `buildPythonModule` # Then we expose them through all-packages.nix as an application through `toPythonApplication` @@ -25,7 +25,7 @@ let scmsrht = self.callPackage ./scm.nix { }; }; }; -in with python.pkgs; { +in with python.pkgs; recurseIntoAttrs { inherit python; buildsrht = toPythonApplication buildsrht; dispatchsrht = toPythonApplication dispatchsrht; diff --git a/pkgs/applications/version-management/src/default.nix b/pkgs/applications/version-management/src/default.nix index a3fcd209efc0..8ff384d84b7f 100644 --- a/pkgs/applications/version-management/src/default.nix +++ b/pkgs/applications/version-management/src/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "src"; - version = "1.26"; + version = "1.27"; src = fetchurl { url = "http://www.catb.org/~esr/src/${pname}-${version}.tar.gz"; - sha256 = "06npsnf2bfjgcs7wilhcqn24zn286nyy4qyp3yp88zapkxzlap23"; + sha256 = "0764kcyh54plzmvfyhh086wpszh67nv1nsxgk95n9bxxinr7sn3x"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/video/clipgrab/default.nix b/pkgs/applications/video/clipgrab/default.nix index 1872750deb00..145b7cc06c2d 100644 --- a/pkgs/applications/video/clipgrab/default.nix +++ b/pkgs/applications/video/clipgrab/default.nix @@ -5,10 +5,10 @@ mkDerivation rec { pname = "clipgrab"; - version = "3.8.4"; + version = "3.8.5"; src = fetchurl { - sha256 = "0pyrg3rrsd538vnrv6x2frhbq9k2638nzffjsar1p76wxp8fm42s"; + sha256 = "0jfjnzwvz4ynlld0ih7f7d575s5w2dag0hvb02c6qan7xm5jdhv9"; # The .tar.bz2 "Download" link is a binary blob, the source is the .tar.gz! url = "https://download.clipgrab.org/${pname}-${version}.tar.gz"; }; diff --git a/pkgs/applications/video/handbrake/default.nix b/pkgs/applications/video/handbrake/default.nix index a15a4cd5999a..2e216369de9c 100644 --- a/pkgs/applications/video/handbrake/default.nix +++ b/pkgs/applications/video/handbrake/default.nix @@ -2,10 +2,14 @@ # # Derivation patches HandBrake to use Nix closure dependencies. # +# NOTE: 2019-07-19: This derivation does not currently support the native macOS +# GUI--it produces the "HandbrakeCLI" CLI version only. In the future it would +# be nice to add the native GUI (and/or the GTK GUI) as an option too, but that +# requires invoking the Xcode build system, which is non-trivial for now. { stdenv, lib, fetchurl, # Main build tools - python2, pkgconfig, autoconf, automake, cmake, nasm, libtool, m4, + python2, pkgconfig, autoconf, automake, cmake, nasm, libtool, m4, lzma, # Processing, video codecs, containers ffmpeg-full, nv-codec-headers, libogg, x264, x265, libvpx, libtheora, # Codecs, audio @@ -14,20 +18,34 @@ libiconv, fribidi, fontconfig, freetype, libass, jansson, libxml2, harfbuzz, # Optical media libdvdread, libdvdnav, libdvdcss, libbluray, - useGtk ? true, wrapGAppsHook ? null, - intltool ? null, - glib ? null, - gtk3 ? null, - libappindicator-gtk3 ? null, - libnotify ? null, - gst_all_1 ? null, - dbus-glib ? null, - udev ? null, - libgudev ? null, - hicolor-icon-theme ? null, + # Darwin-specific + AudioToolbox ? null, + Foundation ? null, + libobjc ? null, + VideoToolbox ? null, + # GTK + # NOTE: 2019-07-19: The gtk3 package has a transitive dependency on dbus, + # which in turn depends on systemd. systemd is not supported on Darwin, so + # for now we disable GTK GUI support on Darwin. (It may be possible to remove + # this restriction later.) + useGtk ? !stdenv.isDarwin, wrapGAppsHook ? null, + intltool ? null, + glib ? null, + gtk3 ? null, + libappindicator-gtk3 ? null, + libnotify ? null, + gst_all_1 ? null, + dbus-glib ? null, + udev ? null, + libgudev ? null, + hicolor-icon-theme ? null, + # FDK useFdk ? false, fdk_aac ? null }: +assert stdenv.isDarwin -> AudioToolbox != null && Foundation != null + && libobjc != null && VideoToolbox != null; + stdenv.mkDerivation rec { pname = "handbrake"; version = "1.2.2"; @@ -45,12 +63,13 @@ stdenv.mkDerivation rec { ffmpeg-full libogg libtheora x264 x265 libvpx libopus lame libvorbis a52dec speex libsamplerate libiconv fribidi fontconfig freetype libass jansson libxml2 harfbuzz - libdvdread libdvdnav libdvdcss libbluray + libdvdread libdvdnav libdvdcss libbluray lzma ] ++ lib.optionals useGtk [ glib gtk3 libappindicator-gtk3 libnotify gst_all_1.gstreamer gst_all_1.gst-plugins-base dbus-glib udev libgudev hicolor-icon-theme ] ++ lib.optional useFdk fdk_aac + ++ lib.optionals stdenv.isDarwin [ AudioToolbox Foundation libobjc VideoToolbox ] # NOTE: 2018-12-27: Handbrake supports nv-codec-headers for Linux only, # look at ./make/configure.py search "enable_nvenc" ++ lib.optional stdenv.isLinux nv-codec-headers; @@ -59,13 +78,16 @@ stdenv.mkDerivation rec { # (default distribution bundles&builds 3rd party libs), # don't trigger cmake build dontUseCmakeConfigure = true; - enableParallelBuilding = true; + # cp: cannot create regular file './internal_defaults.json': File exists + enableParallelBuilding = false; preConfigure = '' patchShebangs scripts substituteInPlace libhb/module.defs \ --replace /usr/include/libxml2 ${libxml2.dev}/include/libxml2 + substituteInPlace libhb/module.defs \ + --replace '$(CONTRIB.build/)include/libxml2' ${libxml2.dev}/include/libxml2 # Force using nixpkgs dependencies sed -i '/MODULES += contrib/d' make/include/main.defs @@ -75,8 +97,9 @@ stdenv.mkDerivation rec { configureFlags = [ "--disable-df-fetch" "--disable-df-verify" - (if useGtk then "--disable-gtk-update-checks" else "--disable-gtk") - (if useFdk then "--enable-fdk-aac" else "") + (if useGtk then "--disable-gtk-update-checks" else "--disable-gtk") + (if useFdk then "--enable-fdk-aac" else "") + (if stdenv.isDarwin then "--disable-xcode" else "") ]; # NOTE: 2018-12-27: Check NixOS HandBrake test if changing diff --git a/pkgs/applications/video/kino/default.nix b/pkgs/applications/video/kino/default.nix index 4ddd84433e88..1b9f0d0997a0 100644 --- a/pkgs/applications/video/kino/default.nix +++ b/pkgs/applications/video/kino/default.nix @@ -80,7 +80,7 @@ stdenv.mkDerivation { postInstall = " rpath=`patchelf --print-rpath \$out/bin/kino`; - for i in $\buildInputs; do + for i in $buildInputs; do echo adding \$i/lib rpath=\$rpath\${rpath:+:}\$i/lib done diff --git a/pkgs/applications/video/kodi/default.nix b/pkgs/applications/video/kodi/default.nix index 773c63b0036d..7953cde24139 100644 --- a/pkgs/applications/video/kodi/default.nix +++ b/pkgs/applications/video/kodi/default.nix @@ -13,7 +13,7 @@ , libmpeg2, libsamplerate, libmad , libogg, libvorbis, flac, libxslt , lzo, libcdio, libmodplug, libass, libbluray -, sqlite, mysql, nasm, gnutls, libva, libdrm +, sqlite, libmysqlclient, nasm, gnutls, libva, libdrm , curl, bzip2, zip, unzip, glxinfo, xdpyinfo , libcec, libcec_platform, dcadec, libuuid , libcrossguid, libmicrohttpd @@ -161,7 +161,7 @@ in stdenv.mkDerivation { libmpeg2 libsamplerate libmad libogg libvorbis flac libxslt systemd lzo libcdio libmodplug libass libbluray - sqlite mysql.connector-c avahi lame + sqlite libmysqlclient avahi lame curl bzip2 zip unzip glxinfo xdpyinfo libcec libcec_platform dcadec libuuid libgcrypt libgpgerror libunistring diff --git a/pkgs/applications/video/minitube/default.nix b/pkgs/applications/video/minitube/default.nix index a9876da234f7..f1f757d588fd 100644 --- a/pkgs/applications/video/minitube/default.nix +++ b/pkgs/applications/video/minitube/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, wrapQtAppsHook, phonon, phonon-backend-vlc, qtbase, qmake -, qtdeclarative, qttools +, qtdeclarative, qttools, qtx11extras, mpv # "Free" key generated by nckx <github@tobias.gr>. I no longer have a Google # account. You'll need to generate (and please share :-) a new one if it breaks. @@ -7,16 +7,17 @@ stdenv.mkDerivation rec { pname = "minitube"; - version = "2.9"; + version = "3.2"; src = fetchFromGitHub { - sha256 = "11zkmwqadlgrrghs3rxq0h0fllfnyd3g09d7gdd6vd9r1a1yz73f"; + sha256 = "0175sgqmszakqd631bni4aqjpx68h6n49zjvg23fb1yyancnkn4c"; rev = version; repo = "minitube"; owner = "flaviotordini"; + fetchSubmodules = true; }; - buildInputs = [ phonon phonon-backend-vlc qtbase qtdeclarative qttools ]; + buildInputs = [ phonon phonon-backend-vlc qtbase qtdeclarative qttools qtx11extras mpv ]; nativeBuildInputs = [ wrapQtAppsHook qmake ]; qmakeFlags = [ "DEFINES+=APP_GOOGLE_API_KEY=${withAPIKey}" ]; diff --git a/pkgs/applications/video/mkvtoolnix/default.nix b/pkgs/applications/video/mkvtoolnix/default.nix index 04ddbbb8c06a..af917981e1cf 100644 --- a/pkgs/applications/video/mkvtoolnix/default.nix +++ b/pkgs/applications/video/mkvtoolnix/default.nix @@ -50,6 +50,8 @@ stdenv.mkDerivation rec { (enableFeature withGUI "qt") ]; + CXXFLAGS = optional stdenv.cc.isClang "-std=c++14"; + dontWrapQtApps = true; postFixup = optionalString withGUI '' wrapQtApp $out/bin/mkvtoolnix-gui diff --git a/pkgs/applications/video/obs-studio/default.nix b/pkgs/applications/video/obs-studio/default.nix index 5e7cf9353b25..72aa59571bf5 100644 --- a/pkgs/applications/video/obs-studio/default.nix +++ b/pkgs/applications/video/obs-studio/default.nix @@ -37,13 +37,13 @@ let optional = stdenv.lib.optional; in mkDerivation rec { pname = "obs-studio"; - version = "23.2.1"; + version = "24.0.1"; src = fetchFromGitHub { owner = "jp9000"; repo = "obs-studio"; rev = version; - sha256 = "05brixq2z98mvn1q2rgdl27xj798509nv8yh6h0yzqyk9gly4anz"; + sha256 = "056s0hs1ds3c57sc0gy39dxaxvwlakl3w25jxgawh0fs99211ar5"; }; nativeBuildInputs = [ cmake diff --git a/pkgs/applications/video/obs-studio/linuxbrowser.nix b/pkgs/applications/video/obs-studio/linuxbrowser.nix index 52aa57bf1986..4761cd0e50a3 100644 --- a/pkgs/applications/video/obs-studio/linuxbrowser.nix +++ b/pkgs/applications/video/obs-studio/linuxbrowser.nix @@ -44,5 +44,6 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ puffnfresh ]; license = licenses.gpl2; platforms = with platforms; linux; + broken = true; }; } diff --git a/pkgs/applications/video/obs-studio/wlrobs.nix b/pkgs/applications/video/obs-studio/wlrobs.nix new file mode 100644 index 000000000000..13a53f94590a --- /dev/null +++ b/pkgs/applications/video/obs-studio/wlrobs.nix @@ -0,0 +1,37 @@ +# (the following is somewhat lifted from ./linuxbrowser.nix) +# We don't have a wrapper which can supply obs-studio plugins so you have to +# somewhat manually install this: + +# nix-env -f . -iA obs-wlrobs +# mkdir -p ~/.config/obs-studio/plugins/wlrobs/bin/64bit +# ln -s ~/.nix-profile/share/obs/obs-plugins/wlrobs/bin/64bit/libwlrobs.so ~/.config/obs-studio/plugins/wlrobs/bin/64bit +{ stdenv, fetchhg, wayland, obs-studio }: +stdenv.mkDerivation { + pname = "obs-wlrobs"; + version = "20191008"; + + src = fetchhg { + url = "https://hg.sr.ht/~scoopta/wlrobs"; + rev = "82e2b93c6f662dfd9d69f7826c0096bef585c3ae"; + sha256 = "1d2mlybkwyr0jw6paamazla2a1cyj60bs10i0lk9jclxnp780fy6"; + }; + + buildInputs = [ wayland obs-studio ]; + + preBuild = '' + cd Release + ''; + + installPhase = '' + mkdir -p $out/share/obs/obs-plugins/wlrobs/bin/64bit + cp ./libwlrobs.so $out/share/obs/obs-plugins/wlrobs/bin/64bit/ + ''; + + meta = with stdenv.lib; { + description = "An obs-studio plugin that allows you to screen capture on wlroots based wayland compositors"; + homepage = https://hg.sr.ht/~scoopta/wlrobs; + maintainers = with maintainers; [ grahamc ]; + license = licenses.gpl3; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/applications/video/peek/default.nix b/pkgs/applications/video/peek/default.nix index 374ea08816f7..4872b5ec2eb6 100644 --- a/pkgs/applications/video/peek/default.nix +++ b/pkgs/applications/video/peek/default.nix @@ -1,45 +1,78 @@ -{ stdenv, fetchFromGitHub, cmake, gettext, libxml2, pkgconfig, txt2man, vala_0_40, wrapGAppsHook -, gsettings-desktop-schemas, gtk3, keybinder3, ffmpeg +{ stdenv +, fetchFromGitHub +, meson +, ninja +, gettext +, desktop-file-utils +, appstream-glib +, pkgconfig +, txt2man +, gzip +, vala +, wrapGAppsHook +, gsettings-desktop-schemas +, gtk3 +, glib +, cairo +, keybinder3 +, ffmpeg +, python3 +, libxml2 +, gst_all_1 +, which +, gifski }: stdenv.mkDerivation rec { pname = "peek"; - version = "1.3.1"; + version = "1.4.0"; src = fetchFromGitHub { owner = "phw"; - repo = pname; + repo = "peek"; rev = version; - sha256 = "1fnvlklmg6s5rs3ql74isa5fgdkqqrpsyf8k2spxj520239l4vgb"; + sha256 = "0q70hz9anqywqgksd43i8v9ijwy6djyzwnzzd94j44xqwsk9zdbb"; }; - preConfigure = '' - gappsWrapperArgs+=(--prefix PATH : ${stdenv.lib.makeBinPath [ ffmpeg ]}) - ''; - nativeBuildInputs = [ - cmake + appstream-glib + desktop-file-utils gettext + gzip + meson + ninja + libxml2 pkgconfig - libxml2.bin txt2man - vala_0_40 # See https://github.com/NixOS/nixpkgs/issues/58433 + python3 + vala wrapGAppsHook ]; buildInputs = [ + cairo + glib gsettings-desktop-schemas gtk3 + gst_all_1.gstreamer + gst_all_1.gst-plugins-good + gst_all_1.gst-plugins-ugly keybinder3 ]; - enableParallelBuilding = true; + postPatch = '' + patchShebangs build-aux/meson/postinstall.py data/man/build_man.sh + ''; + + preFixup = '' + gappsWrapperArgs+=(--prefix PATH : ${stdenv.lib.makeBinPath [ which ffmpeg gifski ]}) + ''; meta = with stdenv.lib; { - homepage = https://github.com/phw/peek; + homepage = https://github.com/phw/peek; description = "Simple animated GIF screen recorder with an easy to use interface"; - license = licenses.gpl3; - maintainers = with maintainers; [ puffnfresh ]; - platforms = platforms.linux; + license = licenses.gpl3; + maintainers = with maintainers; [ puffnfresh worldofpeace ]; + platforms = platforms.linux; }; } diff --git a/pkgs/applications/video/shotcut/default.nix b/pkgs/applications/video/shotcut/default.nix index 176c4be4946d..4636ce48b1a5 100644 --- a/pkgs/applications/video/shotcut/default.nix +++ b/pkgs/applications/video/shotcut/default.nix @@ -1,21 +1,36 @@ -{ stdenv, fetchFromGitHub, SDL2, frei0r, gettext, mlt, jack1, mkDerivation -, pkgconfig, qtbase, qtmultimedia, qtwebkit, qtx11extras, qtwebsockets -, qtquickcontrols, qtgraphicaleffects, libmlt, qmake, qttools }: +{ stdenv, fetchFromGitHub, fetchpatch, mkDerivation, SDL2, frei0r, gettext, mlt +, jack1, pkgconfig, qtbase, qtmultimedia, qtwebkit, qtx11extras, qtwebsockets +, qtquickcontrols, qtgraphicaleffects, libmlt, qmake, qttools +}: assert stdenv.lib.versionAtLeast libmlt.version "6.8.0"; assert stdenv.lib.versionAtLeast mlt.version "6.8.0"; +let + # https://github.com/mltframework/shotcut/issues/771 + fixVaapiRendering1 = fetchpatch { + url = "https://github.com/peti/shotcut/commit/038f6839298fc1e9e80ddf84fe168a78118bc625.patch"; + sha256 = "153z1g6criszd6gdkw4f5zk0gmh0jar6l2g8fzwjhhcvkdz30vbp"; + }; + fixVaapiRendering2 = fetchpatch { + url = "https://github.com/peti/shotcut/commit/653c485f92d2847fdac517e3f797c9254826ffab.patch"; + sha256 = "1qd0zgyahda72xh3avlg7lg0jq94wq5847154qlrgzj8b4n7vizw"; + }; +in + mkDerivation rec { pname = "shotcut"; - version = "19.08.16"; + version = "19.09.14"; src = fetchFromGitHub { owner = "mltframework"; repo = "shotcut"; rev = "v${version}"; - sha256 = "0alnnfgimfs8fjddkcfx4pzyijwz5dgnqic5qazaza6f4kf60801"; + sha256 = "1cl8ba1n0h450r4n5mfqmyjaxvczs3m19blwxslqskvmxy5my3cn"; }; + patches = [ fixVaapiRendering1 fixVaapiRendering2 ]; + enableParallelBuilding = true; nativeBuildInputs = [ pkgconfig qmake ]; buildInputs = [ @@ -30,13 +45,14 @@ mkDerivation rec { prePatch = '' sed 's_shotcutPath, "qmelt"_"${mlt}/bin/melt"_' -i src/jobs/meltjob.cpp sed 's_shotcutPath, "ffmpeg"_"${mlt.ffmpeg}/bin/ffmpeg"_' -i src/jobs/ffmpegjob.cpp + sed 's_qApp->applicationDirPath(), "ffmpeg"_"${mlt.ffmpeg}/bin/ffmpeg"_' -i src/docks/encodedock.cpp NICE=$(type -P nice) sed "s_/usr/bin/nice_''${NICE}_" -i src/jobs/meltjob.cpp src/jobs/ffmpegjob.cpp ''; qtWrapperArgs = [ "--prefix FREI0R_PATH : ${frei0r}/lib/frei0r-1" - "--prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [jack1 SDL2 ]}" + "--prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [jack1 SDL2]}" "--prefix PATH : ${mlt}/bin" ]; diff --git a/pkgs/applications/video/streamlink/default.nix b/pkgs/applications/video/streamlink/default.nix index e33610ac4163..b5ffdb018ffe 100644 --- a/pkgs/applications/video/streamlink/default.nix +++ b/pkgs/applications/video/streamlink/default.nix @@ -1,14 +1,14 @@ { stdenv, pythonPackages, fetchFromGitHub, rtmpdump, ffmpeg }: pythonPackages.buildPythonApplication rec { - version = "1.1.1"; + version = "1.2.0"; pname = "streamlink"; src = fetchFromGitHub { owner = "streamlink"; repo = "streamlink"; rev = version; - sha256 = "1vyf0pifdqygg98azdkfhy5fdckb0w2ca7c46mkrj452gkvmcq33"; + sha256 = "0l8b9ipfmd6dic07ajqqml26jdydz0k046hvx32mqp64jl5jpznh"; }; checkInputs = with pythonPackages; [ pytest mock requests-mock freezegun ]; diff --git a/pkgs/applications/video/vlc/default.nix b/pkgs/applications/video/vlc/default.nix index a38076ca42b6..2396a224d451 100644 --- a/pkgs/applications/video/vlc/default.nix +++ b/pkgs/applications/video/vlc/default.nix @@ -5,7 +5,7 @@ , libvorbis, libtheora, speex, lua5, libgcrypt, libgpgerror, libupnp , libcaca, libpulseaudio, flac, schroedinger, libxml2, librsvg , mpeg2dec, systemd, gnutls, avahi, libcddb, libjack2, SDL, SDL_image -, libmtp, unzip, taglib, libkate, libtiger, libv4l, samba, liboggz +, libmtp, unzip, taglib, libkate, libtiger, libv4l, samba, libssh2, liboggz , libass, libva, libdvbpsi, libdc1394, libraw1394, libopus , libvdpau, libsamplerate, live555, fluidsynth, wayland, wayland-protocols , onlyLibVLC ? false @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { libbluray dbus fribidi libvorbis libtheora speex lua5 libgcrypt libgpgerror libupnp libcaca libpulseaudio flac schroedinger libxml2 librsvg mpeg2dec systemd gnutls avahi libcddb SDL SDL_image libmtp unzip taglib libarchive - libkate libtiger libv4l samba liboggz libass libdvbpsi libva + libkate libtiger libv4l samba libssh2 liboggz libass libdvbpsi libva xorg.xlibsWrapper xorg.libXv xorg.libXvMC xorg.libXpm xorg.xcbutilkeysyms libdc1394 libraw1394 libopus libebml libmatroska libvdpau libsamplerate fluidsynth wayland wayland-protocols diff --git a/pkgs/applications/virtualization/OVMF/default.nix b/pkgs/applications/virtualization/OVMF/default.nix index ecf6f1c54218..c0080329487f 100644 --- a/pkgs/applications/virtualization/OVMF/default.nix +++ b/pkgs/applications/virtualization/OVMF/default.nix @@ -42,7 +42,7 @@ edk2.mkDerivation projectDscPath { mv -v $out/FV/QEMU_{EFI,VARS}.fd $fd/FV # Uses Fedora dir layout: https://src.fedoraproject.org/cgit/rpms/edk2.git/tree/edk2.spec - # FIXME: why is it different from Debian dir layout? https://anonscm.debian.org/cgit/pkg-qemu/edk2.git/tree/debian/rules + # FIXME: why is it different from Debian dir layout? https://salsa.debian.org/qemu-team/edk2/blob/debian/debian/rules dd of=$fd/AAVMF/QEMU_EFI-pflash.raw if=/dev/zero bs=1M count=64 dd of=$fd/AAVMF/QEMU_EFI-pflash.raw if=$fd/FV/QEMU_EFI.fd conv=notrunc dd of=$fd/AAVMF/vars-template-pflash.raw if=/dev/zero bs=1M count=64 diff --git a/pkgs/applications/virtualization/cri-o/default.nix b/pkgs/applications/virtualization/cri-o/default.nix index 0d2d0278cc3b..07b6d0249904 100644 --- a/pkgs/applications/virtualization/cri-o/default.nix +++ b/pkgs/applications/virtualization/cri-o/default.nix @@ -17,7 +17,7 @@ buildGoPackage rec { project = "cri-o"; - version = "1.15.1"; + version = "1.15.2"; name = "${project}-${version}${flavor}"; goPackagePath = "github.com/${project}/${project}"; @@ -26,7 +26,7 @@ buildGoPackage rec { owner = "cri-o"; repo = "cri-o"; rev = "v${version}"; - sha256 = "0yjj03qwwb6g05pzavimgj14p6805m3w8qqpl4fp4fpmbrsx4sb0"; + sha256 = "0fiizxwxdq87h943421ivgw49jndk23yjz3saf1rzmn7g3xh2pn4"; }; outputs = [ "bin" "out" ]; diff --git a/pkgs/applications/virtualization/firecracker/default.nix b/pkgs/applications/virtualization/firecracker/default.nix index 45ec7383fc87..53ace1b5d8b4 100644 --- a/pkgs/applications/virtualization/firecracker/default.nix +++ b/pkgs/applications/virtualization/firecracker/default.nix @@ -1,7 +1,7 @@ { fetchurl, stdenv }: let - version = "0.15.2"; + version = "0.18.0"; baseurl = "https://github.com/firecracker-microvm/firecracker/releases/download"; fetchbin = name: sha256: fetchurl { @@ -9,8 +9,8 @@ let inherit sha256; }; - firecracker-bin = fetchbin "firecracker" "11g0iz1krsm6gzhvf0fb4101c6qyk6bl8j3kjidbb52x9i4aqsxk"; - jailer-bin = fetchbin "jailer" "0j1gc1cdsfsi82fkvvxla25791lcvk6vmp46i82f0ms9xm7xhswz"; + firecracker-bin = fetchbin "firecracker" "140g93z0k8yd9lr049ps4dj0psb9ac1v7g5zs7lzpws9rj8shmgh"; + jailer-bin = fetchbin "jailer" "0sk1zm1fx0zdy5il8vyygzads72ni2lcil42wv59j8b2bg8p7fwd"; in stdenv.mkDerivation { name = "firecracker-${version}"; diff --git a/pkgs/applications/virtualization/lkl/default.nix b/pkgs/applications/virtualization/lkl/default.nix index 318929eb2253..cd6600387cde 100644 --- a/pkgs/applications/virtualization/lkl/default.nix +++ b/pkgs/applications/virtualization/lkl/default.nix @@ -3,8 +3,8 @@ stdenv.mkDerivation rec { pname = "lkl"; - version = "2019-06-20"; - rev = "0a4ebeadad12b94db665b8daf30e44e949a02d90"; + version = "2019-10-04"; + rev = "06ca3ddb74dc5b84fa54fa1746737f2df502e047"; outputs = [ "dev" "lib" "out" ]; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { inherit rev; owner = "lkl"; repo = "linux"; - sha256 = "09y9ci3j0lp3z74h577ng2s9a4n4glqpqndyc9iy6wdqaj764gm6"; + sha256 = "0qjp0r338bwgrqdsvy5mkdh7ryas23m47yvxfwdknfyl0k3ylq62"; }; # Fix a /usr/bin/env reference in here that breaks sandboxed builds diff --git a/pkgs/applications/virtualization/podman/default.nix b/pkgs/applications/virtualization/podman/default.nix index ff768cb7878c..35a89f3f989c 100644 --- a/pkgs/applications/virtualization/podman/default.nix +++ b/pkgs/applications/virtualization/podman/default.nix @@ -5,13 +5,13 @@ buildGoPackage rec { pname = "podman"; - version = "1.5.1"; + version = "1.6.1"; src = fetchFromGitHub { owner = "containers"; repo = "libpod"; rev = "v${version}"; - sha256 = "1jg7fdshqz0x71339i0wndskb17x1k5rwpkjiwd463f96fnbfp4x"; + sha256 = "0s9jxcjx9bkml606rn29358pfavd85m6zshra4qkpbc1iwa6hgr9"; }; goPackagePath = "github.com/containers/libpod"; diff --git a/pkgs/applications/virtualization/qemu/utils.nix b/pkgs/applications/virtualization/qemu/utils.nix new file mode 100644 index 000000000000..430d71221797 --- /dev/null +++ b/pkgs/applications/virtualization/qemu/utils.nix @@ -0,0 +1,16 @@ +{ stdenv, qemu }: + +stdenv.mkDerivation rec { + name = "qemu-utils-${version}"; + version = qemu.version; + + buildInputs = [ qemu ]; + unpackPhase = "true"; + + installPhase = '' + mkdir -p "$out/bin" + cp "${qemu}/bin/qemu-img" "$out/bin/qemu-img" + cp "${qemu}/bin/qemu-io" "$out/bin/qemu-io" + cp "${qemu}/bin/qemu-nbd" "$out/bin/qemu-nbd" + ''; +} diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix index ac52b83e43d2..633f047be5a0 100644 --- a/pkgs/applications/virtualization/virtualbox/default.nix +++ b/pkgs/applications/virtualization/virtualbox/default.nix @@ -92,6 +92,9 @@ in stdenv.mkDerivation { }) ++ [ ./qtx11extras.patch + # Kernel 5.3 fix, should be fixed with VirtualBox 6.0.14 + # https://www.virtualbox.org/ticket/18911 + ./kernel-5.3-fix.patch ]; postPatch = '' diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix index ad860b07bdf6..3d1cdb055906 100644 --- a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix +++ b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix @@ -1,9 +1,9 @@ { stdenv, fetchurl, lib, patchelf, cdrkit, kernel, which, makeWrapper -, zlib, xorg, dbus, virtualbox }: +, zlib, xorg, dbus, virtualbox, dos2unix }: let version = virtualbox.version; - xserverVListFunc = builtins.elemAt (stdenv.lib.splitString "." xorg.xorgserver.version); + xserverVListFunc = builtins.elemAt (stdenv.lib.splitVersion xorg.xorgserver.version); # Forced to 1.18 in <nixpkgs/nixos/modules/services/x11/xserver.nix> # as it even fails to build otherwise. Still, override this even here, @@ -12,9 +12,16 @@ let # It's likely to work again in some future update. xserverABI = let abi = xserverVListFunc 0 + xserverVListFunc 1; in if abi == "119" || abi == "120" then "118" else abi; -in -stdenv.mkDerivation { + # Specifies how to patch binaries to make sure that libraries loaded using + # dlopen are found. We grep binaries for specific library names and patch + # RUNPATH in matching binaries to contain the needed library paths. + dlopenLibs = [ + { name = "libdbus-1.so"; pkg = dbus; } + { name = "libXfixes.so"; pkg = xorg.libXfixes; } + ]; + +in stdenv.mkDerivation { name = "VirtualBox-GuestAdditions-${version}-${kernel.version}"; src = fetchurl { @@ -25,9 +32,6 @@ stdenv.mkDerivation { KERN_DIR = "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"; KERN_INCL = "${kernel.dev}/lib/modules/${kernel.modDirVersion}/source/include"; - # If you add a patch you probably need this. - #patchFlags = [ "-p1" "-d" "install/src/vboxguest-${version}" ]; - hardeningDisable = [ "pic" ]; NIX_CFLAGS_COMPILE = "-Wno-error=incompatible-pointer-types -Wno-error=implicit-function-declaration"; @@ -35,15 +39,24 @@ stdenv.mkDerivation { nativeBuildInputs = [ patchelf makeWrapper ]; buildInputs = [ cdrkit ] ++ kernel.moduleBuildDependencies; - postPatch = '' + + prePatch = '' substituteInPlace src/vboxguest-${version}/vboxvideo/vbox_ttm.c \ --replace "<ttm/" "<drm/ttm/" + ${dos2unix}/bin/dos2unix src/vboxguest-${version}/vboxguest/r0drv/linux/mp-r0drv-linux.c ''; + patchFlags = [ "-p1" "-d" "src/vboxguest-${version}" ]; + # Kernel 5.3 fix, should be fixed with VirtualBox 6.0.14 + # https://www.virtualbox.org/ticket/18911 + patches = [ ./kernel-5.3-fix.patch ]; + unpackPhase = '' ${if stdenv.hostPlatform.system == "i686-linux" || stdenv.hostPlatform.system == "x86_64-linux" then '' isoinfo -J -i $src -x /VBoxLinuxAdditions.run > ./VBoxLinuxAdditions.run chmod 755 ./VBoxLinuxAdditions.run + # An overflow leads the is-there-enough-space check to fail when there's too much space available, so fake how much space there is + sed -i 's/\$leftspace/16383/' VBoxLinuxAdditions.run ./VBoxLinuxAdditions.run --noexec --keep '' else throw ("Architecture: "+stdenv.hostPlatform.system+" not supported for VirtualBox guest additions") @@ -134,13 +147,13 @@ stdenv.mkDerivation { # Stripping breaks these binaries for some reason. dontStrip = true; - # Some code dlopen() libdbus, patch RUNPATH in fixupPhase so it isn't stripped. - postFixup = '' - for i in $(grep -F libdbus-1.so -l -r $out/{lib,bin}); do + # Patch RUNPATH according to dlopenLibs (see the comment there). + postFixup = lib.concatMapStrings (library: '' + for i in $(grep -F ${lib.escapeShellArg library.name} -l -r $out/{lib,bin}); do origRpath=$(patchelf --print-rpath "$i") - patchelf --set-rpath "$origRpath:${lib.makeLibraryPath [ dbus ]}" "$i" + patchelf --set-rpath "$origRpath:${lib.makeLibraryPath [ library.pkg ]}" "$i" done - ''; + '') dlopenLibs; meta = { description = "Guest additions for VirtualBox"; diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions/kernel-5.3-fix.patch b/pkgs/applications/virtualization/virtualbox/guest-additions/kernel-5.3-fix.patch new file mode 100644 index 000000000000..0bdd9ec10563 --- /dev/null +++ b/pkgs/applications/virtualization/virtualbox/guest-additions/kernel-5.3-fix.patch @@ -0,0 +1,50 @@ +--- a/vboxguest/r0drv/linux/mp-r0drv-linux.c ++++ a/vboxguest/r0drv/linux/mp-r0drv-linux.c +@@ -283,12 +283,15 @@ + if (RTCpuSetCount(&OnlineSet) > 1) + { + /* Fire the function on all other CPUs without waiting for completion. */ +-# if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27) ++# if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 3, 0) ++ smp_call_function(rtmpLinuxAllWrapper, &Args, 0 /* wait */); ++# elif LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27) + int rc = smp_call_function(rtmpLinuxAllWrapper, &Args, 0 /* wait */); ++ Assert(!rc); NOREF(rc); + # else + int rc = smp_call_function(rtmpLinuxAllWrapper, &Args, 0 /* retry */, 0 /* wait */); +-# endif + Assert(!rc); NOREF(rc); ++# endif + } + #endif + +@@ -326,7 +329,6 @@ + { + #ifdef CONFIG_SMP + IPRT_LINUX_SAVE_EFL_AC(); +- int rc; + RTMPARGS Args; + + RTTHREADPREEMPTSTATE PreemptState = RTTHREADPREEMPTSTATE_INITIALIZER; +@@ -337,14 +339,17 @@ + Args.cHits = 0; + + RTThreadPreemptDisable(&PreemptState); +-# if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27) +- rc = smp_call_function(rtmpLinuxWrapper, &Args, 1 /* wait */); ++# if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 3, 0) ++ smp_call_function(rtmpLinuxWrapper, &Args, 1 /* wait */); ++# elif LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27) ++ int rc = smp_call_function(rtmpLinuxWrapper, &Args, 1 /* wait */); ++ Assert(rc == 0); NOREF(rc); + # else /* older kernels */ +- rc = smp_call_function(rtmpLinuxWrapper, &Args, 0 /* retry */, 1 /* wait */); ++ int rc = smp_call_function(rtmpLinuxWrapper, &Args, 0 /* retry */, 1 /* wait */); ++ Assert(rc == 0); NOREF(rc); + # endif /* older kernels */ + RTThreadPreemptRestore(&PreemptState); + +- Assert(rc == 0); NOREF(rc); + IPRT_LINUX_RESTORE_EFL_AC(); + #else + RT_NOREF(pfnWorker, pvUser1, pvUser2); diff --git a/pkgs/applications/virtualization/virtualbox/kernel-5.3-fix.patch b/pkgs/applications/virtualization/virtualbox/kernel-5.3-fix.patch new file mode 100644 index 000000000000..ba9c7c941db9 --- /dev/null +++ b/pkgs/applications/virtualization/virtualbox/kernel-5.3-fix.patch @@ -0,0 +1,72 @@ +--- a/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c ++++ b/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c +@@ -2123,7 +2123,9 @@ + #endif + if (in_dev != NULL) + { +- for_ifa(in_dev) { ++ struct in_ifaddr *ifa; ++ ++ for (ifa = in_dev->ifa_list; ifa; ifa = ifa->ifa_next) { + if (VBOX_IPV4_IS_LOOPBACK(ifa->ifa_address)) + return NOTIFY_OK; + +@@ -2137,7 +2139,7 @@ + + pThis->pSwitchPort->pfnNotifyHostAddress(pThis->pSwitchPort, + /* :fAdded */ true, kIntNetAddrType_IPv4, &ifa->ifa_address); +- } endfor_ifa(in_dev); ++ } + } + + /* +--- a/src/VBox/Runtime/r0drv/linux/mp-r0drv-linux.c ++++ a/src/VBox/Runtime/r0drv/linux/mp-r0drv-linux.c +@@ -283,12 +283,15 @@ + if (RTCpuSetCount(&OnlineSet) > 1) + { + /* Fire the function on all other CPUs without waiting for completion. */ +-# if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27) ++# if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 3, 0) ++ smp_call_function(rtmpLinuxAllWrapper, &Args, 0 /* wait */); ++# elif LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27) + int rc = smp_call_function(rtmpLinuxAllWrapper, &Args, 0 /* wait */); ++ Assert(!rc); NOREF(rc); + # else + int rc = smp_call_function(rtmpLinuxAllWrapper, &Args, 0 /* retry */, 0 /* wait */); +-# endif + Assert(!rc); NOREF(rc); ++# endif + } + #endif + +@@ -326,7 +329,6 @@ + { + #ifdef CONFIG_SMP + IPRT_LINUX_SAVE_EFL_AC(); +- int rc; + RTMPARGS Args; + + RTTHREADPREEMPTSTATE PreemptState = RTTHREADPREEMPTSTATE_INITIALIZER; +@@ -337,14 +339,17 @@ + Args.cHits = 0; + + RTThreadPreemptDisable(&PreemptState); +-# if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27) +- rc = smp_call_function(rtmpLinuxWrapper, &Args, 1 /* wait */); ++# if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 3, 0) ++ smp_call_function(rtmpLinuxWrapper, &Args, 1 /* wait */); ++# elif LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27) ++ int rc = smp_call_function(rtmpLinuxWrapper, &Args, 1 /* wait */); ++ Assert(rc == 0); NOREF(rc); + # else /* older kernels */ +- rc = smp_call_function(rtmpLinuxWrapper, &Args, 0 /* retry */, 1 /* wait */); ++ int rc = smp_call_function(rtmpLinuxWrapper, &Args, 0 /* retry */, 1 /* wait */); ++ Assert(rc == 0); NOREF(rc); + # endif /* older kernels */ + RTThreadPreemptRestore(&PreemptState); + +- Assert(rc == 0); NOREF(rc); + IPRT_LINUX_RESTORE_EFL_AC(); + #else + RT_NOREF(pfnWorker, pvUser1, pvUser2); diff --git a/pkgs/applications/virtualization/x11docker/default.nix b/pkgs/applications/virtualization/x11docker/default.nix index ea8a24e57a34..1d18e4d14e8b 100644 --- a/pkgs/applications/virtualization/x11docker/default.nix +++ b/pkgs/applications/virtualization/x11docker/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchFromGitHub, makeWrapper, nx-libs, xorg }: stdenv.mkDerivation rec { pname = "x11docker"; - version = "6.0.0"; + version = "6.2.0"; src = fetchFromGitHub { owner = "mviereck"; repo = "x11docker"; rev = "v${version}"; - sha256 = "1sfdxlh50hv8j3dj5bphihqdyf8s7ixm6ckrmvqgr2y3gak1y840"; + sha256 = "19q5vrhspxpjkdhhlgya2sa2fgjg8gyd3kmnb83nlfs46p8jx4f4"; }; nativeBuildInputs = [ makeWrapper ]; buildInputs = [ nx-libs xorg.xhost xorg.xinit ]; diff --git a/pkgs/applications/virtualization/xen/4.10.nix b/pkgs/applications/virtualization/xen/4.10.nix index 042b01e86780..d3c2ed9060c7 100644 --- a/pkgs/applications/virtualization/xen/4.10.nix +++ b/pkgs/applications/virtualization/xen/4.10.nix @@ -38,11 +38,11 @@ let in callPackage (import ./generic.nix (rec { - version = "4.10.0"; + version = "4.10.4"; src = fetchurl { url = "https://downloads.xenproject.org/release/xen/${version}/xen-${version}.tar.gz"; - sha256 = "0i38ap5b5m1kix6xb0vn9ya1yab35adyc98bzfnbq4lb7w1afqh2"; + sha256 = "0ipkr7b3v3y183n6nfmz7q3gnzxa20011df4jpvxi6pmr8cpnkwh"; }; # Sources needed to build tools and firmwares. @@ -52,12 +52,9 @@ callPackage (import ./generic.nix (rec { url = https://xenbits.xen.org/git-http/qemu-xen.git; # rev = "refs/tags/qemu-xen-${version}"; # use revision hash - reproducible but must be updated with each new version - rev = "b79708a8ed1b3d18bee67baeaf33b3fa529493e2"; - sha256 = "1yxxad6nvlfmrbgyc8ix19qmrsn1rx4zpyiqnfi4x4kg94acwa5w"; + rev = "qemu-xen-${version}"; + sha256 = "0laxvhdjz1njxjvq3jzw2yqvdr9gdn188kqjf2gcrfzgih7xv2ym"; }; - patches = [ - qemuMemfdBuildFix - ]; buildInputs = qemuDeps; postPatch = '' # needed in build but /usr/bin/env is not available in sandbox @@ -151,17 +148,16 @@ callPackage (import ./generic.nix (rec { ++ optional (withOVMF) "--with-system-ovmf=${OVMF.fd}/FV/OVMF.fd" ++ optional (withInternalOVMF) "--enable-ovmf"; - patches = with xsa; flatten [ - XSA_252 - XSA_253 - XSA_255_1 - XSA_255_2 - XSA_256 + NIX_CFLAGS_COMPILE = [ + # Fix build on Glibc 2.24. + "-Wno-error=deprecated-declarations" + # Fix build with GCC 8 + "-Wno-error=maybe-uninitialized" + "-Wno-error=stringop-truncation" + "-Wno-error=format-truncation" + "-Wno-error=array-bounds" ]; - # Fix build on Glibc 2.24. - NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations"; - postPatch = '' # Avoid a glibc >= 2.25 deprecation warnings that get fatal via -Werror. sed 1i'#include <sys/sysmacros.h>' \ diff --git a/pkgs/applications/virtualization/xen/xsa-patches.nix b/pkgs/applications/virtualization/xen/xsa-patches.nix index de692820d8f7..26cdbc1f65f7 100644 --- a/pkgs/applications/virtualization/xen/xsa-patches.nix +++ b/pkgs/applications/virtualization/xen/xsa-patches.nix @@ -66,30 +66,12 @@ in { sha256 = "0nnznkrvfbbc8z64dr9wvbdijd4qbpc0wz2j5vpmx6b32sm7932f"; }); - # 4.8 - XSA_202 = (xsaPatch { - name = "202"; - sha256 = "0j1d5akcjgx8w2c6w6p9znv77fkmps0880m2xgpbgs1ra9grshm1"; - }); - - # 4.8 - XSA_203 = (xsaPatch { - name = "203"; - sha256 = "1s1q7xskvpg87ivwfaiqr0cj3ajdkhkhpmpikfkvq127h8hhmd8j"; - }); - # 4.5 XSA_204_45 = (xsaPatch { name = "204-4.5"; sha256 = "083z9pbdz3f532fnzg7n2d5wzv6rmqc0f4mvc3mnmkd0rzqw8vcp"; }); - # 4.8 - XSA_204 = (xsaPatch { - name = "204-4.8"; - sha256 = "0rs498s4w2alz3h6jhlr2y0ni630vhggmxbrd1p1p3gcv8p6zzrr"; - }); - # 4.5 XSA_206_45 = [ (xsaPatch { @@ -190,86 +172,12 @@ in { }) ]; - # 4.8 - XSA_206 = [ - (xsaPatch { - name = "206-4.8/0001-xenstored-apply-a-write-transaction-rate-limit"; - sha256 = "1c81d93i3qx7l38f9af0sd84w5x51zvn262mzl25ilcklql4kzl6"; - }) - (xsaPatch { - name = "206-4.8/0002-xenstored-Log-when-the-write-transaction-rate-limit-"; - sha256 = "0b8iw409wi1x6p0swpnr51lcdlla1lgxjv5f910sj4wl96bca84q"; - }) - (xsaPatch { - name = "206-4.8/0003-oxenstored-comments-explaining-some-variables"; - sha256 = "1d3n0y9syya4kaavrvqn01d3wsn85gmw7qrbylkclznqgkwdsr2p"; - }) - (xsaPatch { - name = "206-4.8/0004-oxenstored-handling-of-domain-conflict-credit"; - sha256 = "020rw7hgc0dmhr4admz91kd99b4z1bdpji47nsy1255bjgvwc01k"; - }) - (xsaPatch { - name = "206-4.8/0005-oxenstored-ignore-domains-with-no-conflict-credit"; - sha256 = "1ilhcgyn803bxvfbqv0ihfrh9jfpp0lidkv7i4613f9v9vjm8q0h"; - }) - (xsaPatch { - name = "206-4.8/0006-oxenstored-add-transaction-info-relevant-to-history-"; - sha256 = "1dbd9pzda6hn9wj9pck44dlgz9nxvch3bzgrpaivanww8llxdfzz"; - }) - (xsaPatch { - name = "206-4.8/0007-oxenstored-support-commit-history-tracking"; - sha256 = "1jfr56c22fqkhj6fnv1ha7zsid86zm9l0nihpb8m932xgc4a6h9h"; - }) - (xsaPatch { - name = "206-4.8/0008-oxenstored-only-record-operations-with-side-effects-"; - sha256 = "1y845hj8krjdrirbd2jx4jqgnylwjv7bxnk7474lkld5kdnlbjyf"; - }) - (xsaPatch { - name = "206-4.8/0009-oxenstored-discard-old-commit-history-on-txn-end"; - sha256 = "1lcr9gz2b77x74sr1flfymyyz4xzs04iv88rc1633ibyqxmvk0lx"; - }) - (xsaPatch { - name = "206-4.8/0010-oxenstored-track-commit-history"; - sha256 = "1qwnivak4y038mpby75aaz0y70r0l3yc3hsz6wl5x0b74q6yy0ja"; - }) - (xsaPatch { - name = "206-4.8/0011-oxenstored-blame-the-connection-that-caused-a-transa"; - sha256 = "0p2w5ddyhc6d95dnlxzc5k77j063p02d53ab7m7ijfm7m6gknq8y"; - }) - (xsaPatch { - name = "206-4.8/0012-oxenstored-allow-self-conflicts"; - sha256 = "1571l81m30cbmqm4pk33q33p3dy58sfy2lnkl2wbgl2b3mkk657l"; - }) - (xsaPatch { - name = "206-4.8/0013-oxenstored-do-not-commit-read-only-transactions"; - sha256 = "15985wl635w22dddjyx5l97b5p6m55mzv5ygk7xr0jx7mi192f9x"; - }) - (xsaPatch { - name = "206-4.8/0014-oxenstored-don-t-wake-to-issue-no-conflict-credit"; - sha256 = "08672w4gaf2n3r8xy09h874gh5lg2vnrkjzq6xzvzdhdl092mipw"; - }) - (xsaPatch { - name = "206-4.8/0015-oxenstored-transaction-conflicts-improve-logging"; - sha256 = "0ck98ms0py8wjsc38pbx6222x7n6l90zckfa7m7nnszsyc0sxxad"; - }) - (xsaPatch { - name = "206-4.8/0016-oxenstored-trim-history-in-the-frequent_ops-function"; - sha256 = "014zs6i4gzrimn814k5i7gz66vbb0adkzr2qyai7i4fxc9h9r7w8"; - }) - ]; - # 4.5 - 4.8 XSA_207 = (xsaPatch { name = "207"; sha256 = "0wdlhijmw9mdj6a82pyw1rwwiz605dwzjc392zr3fpb2jklrvibc"; }); - # 4.8 - XSA_210 = (xsaPatch { - name = "210"; - sha256 = "02mykxqxnsrd0sr4ij022j8y7618wzi2a6j6j761vx8qgmh11xai"; - }); - # 4.5 - 4.8 XSA_212 = (xsaPatch { name = "212"; @@ -282,12 +190,6 @@ in { sha256 = "1vnqf89ydacr5bq3d6z2r33xb2sn5vsd934rncyc28ybc9rvj6wm"; }); - # 4.8 - XSA_213 = (xsaPatch { - name = "213-4.8"; - sha256 = "0ia3zr6r3bqy2h48fdy7p0iz423lniy3i0qkdvzgv5a8m80darr2"; - }); - # 4.5 - 4.8 XSA_214 = (xsaPatch { name = "214"; @@ -306,12 +208,6 @@ in { sha256 = "067pgsfrb9py2dhm1pk9g8f6fs40vyfrcxhj8c12vzamb6svzmn4"; }); - # 4.6 - 4.8 - XSA_217 = (xsaPatch { - name = "217"; - sha256 = "1khs5ilif14dzcm7lmikjzkwsrfzlmir1rgrgzkc411gf18ylzmj"; - }); - # 4.5 XSA_218_45 = [ (xsaPatch { @@ -332,46 +228,18 @@ in { }) ]; - # 4.8 - XSA_218 = [ - (xsaPatch { - name = "218-4.8/0001-gnttab-fix-unmap-pin-accounting-race"; - sha256 = "0r363frai239r2wmwxi48kcr50gbk5l64nja0h9lppi3z2y3dkdd"; - }) - (xsaPatch { - name = "218-4.8/0002-gnttab-Avoid-potential-double-put-of-maptrack-entry"; - sha256 = "07wm06i7frv7bsaykakx3g9h0hfqv96zcadvwf6wv194dggq1plc"; - }) - (xsaPatch { - name = "218-4.8/0003-gnttab-correct-maptrack-table-accesses"; - sha256 = "0ad0irc3p4dmla8sp3frxbh2qciji1dipkslh0xqvy2hyf9p80y9"; - }) - ]; - # 4.5 XSA_219_45 = (xsaPatch { name = "219-4.5"; sha256 = "003msr5vhsc66scmdpgn0lp3p01g4zfw5vj86y5lw9ajkbaywdsm"; }); - # 4.8 - XSA_219 = (xsaPatch { - name = "219-4.8"; - sha256 = "16q7kiamy86x8qdvls74wmq5j72kgzgdilryig4q1b21mp0ij1jq"; - }); - # 4.5 XSA_220_45 = (xsaPatch { name = "220-4.5"; sha256 = "1dj9nn6lzxlipjb3nb7b9m4337fl6yn2bd7ap1lqrjn8h9zkk1pp"; }); - # 4.8 - XSA_220 = (xsaPatch { - name = "220-4.8"; - sha256 = "0214qyqx7qap5y1pdi9fm0vz4y2fbyg71gaq36fisknj35dv2mh5"; - }); - # 4.5 - 4.8 XSA_221 = (xsaPatch { name = "221"; @@ -390,18 +258,6 @@ in { }) ]; - # 4.8 - XSA_222 = [ - (xsaPatch { - name = "222-1"; - sha256 = "0x02x4kqwfw255638fh2zcxwig1dy6kadlmqim1jgnjgmrvvqas2"; - }) - (xsaPatch { - name = "222-2-4.8"; - sha256 = "1xhyp6q3c5l8djh965g1i8201m2wvhms8k886h4sn30hks38giin"; - }) - ]; - # 4.5 - 4.8 XSA_223 = (xsaPatch { name = "223"; @@ -428,32 +284,6 @@ in { }) ]; - # 4.8 - XSA_224 = [ - (xsaPatch { - name = "224-4.8/0001-gnttab-Fix-handling-of-dev_bus_addr-during-unmap"; - sha256 = "1k326yan5811qzyvpdfkv801a19nyd09nsqayi8gyh58xx9c21m4"; - }) - (xsaPatch { - name = "224-4.8/0002-gnttab-never-create-host-mapping-unless-asked-to"; - sha256 = "06nj1x59bbx9hrj26xmvbw8z805lfqhld9hm0ld0fs6dmcpqzcck"; - }) - (xsaPatch { - name = "224-4.8/0003-gnttab-correct-logic-to-get-page-references-during-m"; - sha256 = "0kmag6fdsskgplcvzqp341yfi6pgc14wvjj58bp7ydb9hdk53qx2"; - }) - (xsaPatch { - name = "224-4.8/0004-gnttab-__gnttab_unmap_common_complete-is-all-or-noth"; - sha256 = "1ww80pi7jr4gjpymkcw8qxmr5as18b2asdqv35527nqprylsff9f"; - }) - ]; - - # 4.6 - 4.8 - XSA_225 = (xsaPatch { - name = "225"; - sha256 = "0lcp2bs0r849xnvhrdf8s821v36cqdbzk8lwz6chrjhjalk6ha2g"; - }); - # 4.5 XSA_226_45 = [ (xsaPatch { @@ -466,42 +296,12 @@ in { }) ]; - # 4.8 - 4.9 - XSA_226 = [ - (xsaPatch { - name = "226-4.9/0001-gnttab-dont-use-possibly-unbounded-tail-calls"; - sha256 = "1hx47ppv5q33cw4dwp82lgvv4fp28gx7rxijw0iaczsv8bvb8vcg"; - }) - (xsaPatch { - name = "226-4.9/0002-gnttab-fix-transitive-grant-handling"; - sha256 = "1gzp8m2zfihwlk71c3lqyd0ajh9h11pvkhzhw0mawckxy0qksvlc"; - }) - ]; - # 4.5 XSA_227_45 = (xsaPatch { name = "227-4.5"; sha256 = "1qfjfisgqm4x98qw54x2qrvgjnvvzizx9p1pjhcnsps9q6g1y3x8"; }); - # 4.8 - 4.9 - XSA_227 = (xsaPatch { - name = "227"; - sha256 = "0zdcm43i5n08rh7rrnb0fcssvd4fgawwmizsa16w2ak7pzvgmg94"; - }); - - # 4.8 - XSA_228_48 = (xsaPatch { - name = "228-4.8"; - sha256 = "085pnzwyv0rdb51hv5vhbhwfyxl0wg8sxcm912gjq8z7da5cv10n"; - }); - - # 4.9 - XSA_228 = (xsaPatch { - name = "228"; - sha256 = "0c9nvfpnr5ira7ha3fszhvvh71nsxrvmzrab56xwjhl2dbw2yy23"; - }); - # 4.5 - 4.9 XSA_230 = (xsaPatch { name = "230"; @@ -514,12 +314,6 @@ in { sha256 = "06gwx2f1lg51dfk2b4zxp7wv9c4pxdi87pg2asvmxqc78ir7l5s6"; }); - # 4.8 - 4.9 - XSA_231 = (xsaPatch { - name = "231-4.9"; - sha256 = "09r8xxq2fd52wrk6i0y0sk3nbidfg6pzzrkx327hfmdjj76iyz3b"; - }); - # 4.5 - 4.9 XSA_232 = (xsaPatch { name = "232"; @@ -538,42 +332,18 @@ in { sha256 = "1ji6hbgybb4gbgz5l5fis9midnvjbddzam8d63377rkzdyb3yz9f"; }); - # 4.8 - XSA_234_48 = (xsaPatch { - name = "234-4.8"; - sha256 = "08n1pf7z5y67dmay1ap39bi81clgkx82fpmfn7jsh8k4aw94jrsa"; - }); - - # 4.9 - XSA_234 = (xsaPatch { - name = "234-4.9"; - sha256 = "1znmxg432is0virw8321gax8zqq2zcmi2pc5p2j31sixylixsvzx"; - }); - # 4.5 XSA_235_45 = (xsaPatch { name = "235-4.5"; sha256 = "0hhgnql2gji111020z4wiyzg23wqs6ymanb67rg11p4qad1fp3ff"; }); - # 4.8 - 4.9 - XSA_235 = (xsaPatch { - name = "235-4.9"; - sha256 = "1rj4jkmh79wm30jq9f8x65qv3al8l91zc3m5s23q0x6abn3pfb9z"; - }); - # 4.5 XSA_236_45 = (xsaPatch { name = "236-4.5"; sha256 = "0hcla86x81wykssd2967gblp7fzx61290p4ls4v0hcyxdg2bs2yz"; }); - # 4.8 - 4.9 - XSA_236 = (xsaPatch { - name = "236-4.9"; - sha256 = "0vqxy7mgflga05l33j3488fwxmdw3p9yxj4ylhk9n3nw8id72ghq"; - }); - # 4.5 XSA_237_45 = [ (xsaPatch { @@ -598,78 +368,18 @@ in { }) ]; - # 4.8 - XSA_237_48 = [ - (xsaPatch { - name = "237-4.8/0001-x86-dont-allow-MSI-pIRQ-mapping-on-unowned-device"; - sha256 = "0qjisp37lwi2611mp7fbbm1s7m0bx726rrg79dnxs2mj0skw59iv"; - }) - (xsaPatch { - name = "237-4.8/0002-x86-enforce-proper-privilege-when-mapping-pIRQ-s"; - sha256 = "05q1dny13jrqhjfwak7r635mqp9chpibjvn8b7d90japc1nzpq62"; - }) - (xsaPatch { - name = "237-4.8/0003-x86-MSI-disallow-redundant-enabling"; - sha256 = "1907lv8nb2zhpb6k6jlw4m0hm0n0lyd69vfr3wpzbc56dn0w7jqd"; - }) - (xsaPatch { - name = "237-4.8/0004-x86-IRQ-conditionally-preserve-irq-pirq-mapping-on-error"; - sha256 = "06nrq0bx3p9ipab2r1why6qm4g32dj0x5q24hfkwc6ih0l9xwf8h"; - }) - (xsaPatch { - name = "237-4.8/0005-x86-FLASK-fix-unmap-domain-IRQ-XSM-hook"; - sha256 = "1nbg7bjw2hv55gnkhf6chkh35va6brs08acq1d5jxncl6kv0amc1"; - }) - ]; - - # 4.9 - XSA_237 = [ - (xsaPatch { - name = "237-4.9/0001-x86-dont-allow-MSI-pIRQ-mapping-on-unowned-device"; - sha256 = "1cbl24mqxa62h0wgsnrpcs6y6vs53znzj7g8dfsbmf74xwrd4px6"; - }) - (xsaPatch { - name = "237-4.9/0002-x86-enforce-proper-privilege-when-mapping-pIRQ-s"; - sha256 = "0p60148j18b78pxz0dx5ymh1gyrhg2cgmxq0jxmbk090bc4jql35"; - }) - (xsaPatch { - name = "237-4.9/0003-x86-MSI-disallow-redundant-enabling"; - sha256 = "1907lv8nb2zhpb6k6jlw4m0hm0n0lyd69vfr3wpzbc56dn0w7jqd"; - }) - (xsaPatch { - name = "237-4.9/0004-x86-IRQ-conditionally-preserve-irq-pirq-mapping-on-error"; - sha256 = "0q95z5641amni53agimnzbspva53p0hz5wl16zaz2yhnjasj5pzr"; - }) - (xsaPatch { - name = "237-4.9/0005-x86-FLASK-fix-unmap-domain-IRQ-XSM-hook"; - sha256 = "0bnqx9w7ppgx8wxj2zw09z0rkv1jzn3r0bd76cz0r22wz29fsdp2"; - }) - ]; - # 4.5 XSA_238_45 = (xsaPatch { name = "238-4.5"; sha256 = "1x2fg5vfv5jc084h5gjm6fq0nxjpzvi96px3sqzz4pvsvy4y4i1z"; }); - # 4.8 - 4.9 - XSA_238 = (xsaPatch { - name = "238"; - sha256 = "1cbmg1bi5ajh7qbwsl92ynaxw2c3p7i24p3wds81r4n93r0y5dxk"; - }); - # 4.5 XSA_239_45 = (xsaPatch { name = "239-4.5"; sha256 = "06bi8q3973yajxsdj7pcqarvb56q2gisxdiy0cpbyffbmpkfv3h6"; }); - # 4.8 - 4.9 - XSA_239 = (xsaPatch { - name = "239"; - sha256 = "1a9r8j7167s43ds5i7v7mm4y970vjnbhhkrjzpmzlcx8kcz96vh3"; - }); - # 4.5 XSA_240_45 = [ (xsaPatch { @@ -682,42 +392,12 @@ in { }) ]; - # 4.8 - XSA_240_48 = [ - (xsaPatch { - name = "240-4.8/0001-x86-limit-linear-page-table-use-to-a-single-level"; - sha256 = "0m44qhhqk2pdwqg8g28pypqrylq6iw00k9qrzf6qd0iza2y42kgj"; - }) - (xsaPatch { - name = "240-4.8/0002-x86-mm-Disable-PV-linear-pagetables-by-default"; - sha256 = "1jd720wvngj9wq3fprdhakxvqlff0jd8zcx2pd3vsn2qvjbvr2gf"; - }) - ]; - - # 4.9 - XSA_240 = [ - (xsaPatch { - name = "240-4.9/0001-x86-limit-linear-page-table-use-to-a-single-level"; - sha256 = "1759ni80aifakm44g4cc6pnmbcn1xjic8j66fvj0vibm0wqk6xck"; - }) - (xsaPatch { - name = "240-4.9/0002-x86-mm-Disable-PV-linear-pagetables-by-default"; - sha256 = "0g6dpi006p5cjxw5d8h33p0429fdmdm6nqzj0m63ralpqvns3ib5"; - }) - ]; - # 4.5 - 4.8 XSA_241 = (xsaPatch { name = "241-4.8"; sha256 = "16zb75kzs98f4mdxhbyczk5mbh9dvn6j3yhfafki34x1dfdnq4pj"; }); - # 4.9 - XSA_241_49 = (xsaPatch { - name = "241-4.9"; - sha256 = "0xlhin7wkhmlnbp9mqcbq3q4drdwb5la482ja9nwkhi8i867p6wc"; - }); - # 4.5 - 4.9 XSA_242 = (xsaPatch { name = "242-4.9"; @@ -736,30 +416,12 @@ in { }) ]; - # 4.8 - XSA_243_48 = (xsaPatch { - name = "243-4.8"; - sha256 = "1q60zn55l9wpq45nrxh0av59sjz0jg8pkjm1gkyywkdsgg4fg5z4"; - }); - - # 4.9 - XSA_243 = (xsaPatch { - name = "243"; - sha256 = "06fnbnh9zlsbkqih9ipnb7a8gly54m7lp17d854j1r370ad3c4yg"; - }); - # 4.5 XSA_244_45 = (xsaPatch { name = "244-4.5"; sha256 = "05ci3vdl1ywfjpzcvsy1k52whxjk8pxzj7dh3r94yqasr56i5v2l"; }); - # 4.8 - 4.9 - XSA_244 = (xsaPatch { - name = "244"; - sha256 = "10308xsgmhb0vg6fk0ql8v94zifv6dcv6vkaicryfp405yj2rzkm"; - }); - # 4.5 - 4.9 XSA_245 = [ (xsaPatch { @@ -780,26 +442,6 @@ in { }) ]; - # 4.8 - 4.9 - XSA_246 = [ - (xsaPatch { - name = "246-4.9"; - sha256 = "0z68vm0z5zvv9gm06pxs9kxq2q9fdbl0l0cm71ggzdplg1vw0snz"; - }) - ]; - - # 4.8 - XSA_247_48 = [ - (xsaPatch { - name = "247-4.8/0001-p2m-Always-check-to-see-if-removing-a-p2m-entry-actu"; - sha256 = "0kvjrk90n69s721c2qj2df5raml3pjk6bg80aig353p620w6s3xh"; - }) - (xsaPatch { - name = "247-4.8/0002-p2m-Check-return-value-of-p2m_set_entry-when-decreas"; - sha256 = "1s9kv6h6dd8psi5qf5l5gpk9qhq8blckwhl76cjbldcgi6imb3nr"; - }) - ]; - # 4.5 XSA_247_45 = [ (xsaPatch { @@ -820,14 +462,6 @@ in { }) ]; - # 4.8 - XSA_248_48 = [ - (xsaPatch { - name = "248-4.8"; - sha256 = "1ycw29q22ymxg18kxpr5p7vhpmp8klssbp5gq77hspxzz2mb96q1"; - }) - ]; - # 4.5 .. 4.9 XSA_249 = [ (xsaPatch { @@ -835,6 +469,7 @@ in { sha256 = "0v6ngzqhkz7yv4n83xlpxfbkr2qyg5b1cds7ikkinm86hiqy6agl"; }) ]; + # 4.5 XSA_250_45 = [ (xsaPatch { @@ -842,13 +477,7 @@ in { sha256 = "0pqldl6qnl834gvfp90z247q9xcjh3835s2iffnajz7jhjb2145d"; }) ]; - # 4.8 ... - XSA_250 = [ - (xsaPatch { - name = "250"; - sha256 = "1wpigg8kmha57sspqqln3ih9nbczsw6rx3v72mc62lh62qvwd7x8"; - }) - ]; + # 4.5 XSA_251_45 = [ (xsaPatch { @@ -856,81 +485,4 @@ in { sha256 = "0lc94cx271z09r0mhxaypyd9d4740051p28idf5calx5228dqjgm"; }) ]; - # 4.8 - XSA_251_48 = [ - (xsaPatch { - name = "251-4.8"; - sha256 = "079wi0j6iydid2zj7k584w2c393kgh588w7sjz2nn4039qn8k9mq"; - }) - ]; - # 4.8 - XSA_252_49 = [ - (xsaPatch { - name = "252-4.9"; - sha256 = "03sbn90nlkk5ba1n168rxjkc7x3mqj7rfqvspbwblmwikfbnms2n"; - }) - ]; - # 4.8 - XSA_255_49_1= [ - (xsaPatch { - name = "255-4.9-1"; - sha256 = "0gbin7yxbkq40lvm3gvj1vffavvbng3zpd2m8l1kqyz0rv4vm9zc"; - }) - ]; - # 4.8 - XSA_255_49_2= [ - (xsaPatch { - name = "255-4.9-2"; - sha256 = "0fyg5nnyfpfr80qq83pr64zjp5w1nx94bdblzsjap8gaqcahyr12"; - }) - ]; - # 4.8 - XSA_256_48= [ - (xsaPatch { - name = "256-4.8"; - sha256 = "1w84f717kxwx0h3rw18r4f8pl0l1h5xlj5fy80sr0ws4xkp1qdn4"; - }) - ]; - - - # 4.10 - XSA_252 = [ - (xsaPatch { - name = "252"; - sha256 = "0v4sg20dnvnwrjh3x69gk81v2kmcql7g2s044vg3wcxhzvij1rrn"; - }) - ]; - - # 4.10 - XSA_253 = [ - (xsaPatch { - name = "253"; - sha256 = "0445vzlzy3gd499xraqh5r4qjar6qr0y3813h22jy1n84nhxz27i"; - }) - ]; - - # 4.10 - XSA_255_1 = [ - (xsaPatch { - name = "255-1"; - sha256 = "05g2f3ji1rrjlw3yw4nrns50pnmsib8ybrf64scr1817mj0q9myr"; - }) - ]; - - # 4.10 - XSA_255_2 = [ - (xsaPatch { - name = "255-2"; - sha256 = "08wbngw5z0f9g8di59hww3hhi7j9z49bpc4xlwn5akfcwbgf0961"; - }) - ]; - - # 4.10 - XSA_256 = [ - (xsaPatch { - name = "256"; - sha256 = "1hicwhbwj6k25px55f4ncx1c5xiihi8pfvsb3kv57k7kaicb7pza"; - }) - ]; - } diff --git a/pkgs/applications/window-managers/2bwm/default.nix b/pkgs/applications/window-managers/2bwm/default.nix index 4b61fe3d7e6c..cd1a3a4baf7a 100644 --- a/pkgs/applications/window-managers/2bwm/default.nix +++ b/pkgs/applications/window-managers/2bwm/default.nix @@ -3,14 +3,14 @@ , libX11, xcbutil, xcbutilxrm }: stdenv.mkDerivation rec { - version = "0.2"; + version = "0.3"; pname = "2bwm"; src = fetchFromGitHub { owner = "venam"; repo = "2bwm"; rev = "v${version}"; - sha256 = "1la1ixpm5knsj2gvdcmxzj1jfbzxvhmgzps4f5kbvx5047xc6ici"; + sha256 = "1xwib612ahv4rg9yl5injck89dlpyp5475xqgag0ydfd0r4sfld7"; }; # Allow users set their own list of patches diff --git a/pkgs/applications/window-managers/cwm/default.nix b/pkgs/applications/window-managers/cwm/default.nix index 1354171dcfac..c109cd5cb68a 100644 --- a/pkgs/applications/window-managers/cwm/default.nix +++ b/pkgs/applications/window-managers/cwm/default.nix @@ -1,13 +1,15 @@ { stdenv, fetchFromGitHub, libX11, libXinerama, libXrandr, libXft, yacc, pkgconfig }: -stdenv.mkDerivation { - name = "cwm-5.6"; +stdenv.mkDerivation rec { + + pname = "cwm"; + version = "6.3"; src = fetchFromGitHub { - owner = "chneukirchen"; - repo = "cwm"; - rev = "b7a8c11750d11721a897fdb8442d52f15e7a24a0"; - sha256 = "0a0x8rgqif4kxy7hj70hck7jma6c8jy4428ybl8fz9qxgxh014ml"; + owner = "leahneukirchen"; + repo = pname; + rev = "v${version}"; + sha256 = "1m08gd6nscwfx6040zbg2zl89m4g73im68iflzcihd6pdc8rzzs4"; }; nativeBuildInputs = [ pkgconfig ]; @@ -17,8 +19,8 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "A lightweight and efficient window manager for X11"; - homepage = https://github.com/chneukirchen/cwm; - maintainers = []; + homepage = "https://github.com/leahneukirchen/cwm"; + maintainers = with maintainers; [ "0x4A6F" mkf ]; license = licenses.isc; platforms = platforms.linux; }; diff --git a/pkgs/applications/window-managers/dwm/dwm-status.nix b/pkgs/applications/window-managers/dwm/dwm-status.nix index 1787e40eb96c..ecd792f74e78 100644 --- a/pkgs/applications/window-managers/dwm/dwm-status.nix +++ b/pkgs/applications/window-managers/dwm/dwm-status.nix @@ -9,19 +9,19 @@ in rustPlatform.buildRustPackage rec { pname = "dwm-status"; - version = "1.6.2"; + version = "1.6.3"; src = fetchFromGitHub { owner = "Gerschtli"; repo = "dwm-status"; rev = version; - sha256 = "16vf7val1isc4227amng2ap9af34xa2va23dxv43px006xhrar78"; + sha256 = "02sprsr7822ynkwpf3xdgmkdrgkw3vgijhlh65bayiv3b5lwb54n"; }; nativeBuildInputs = [ makeWrapper pkgconfig ]; buildInputs = [ dbus gdk-pixbuf libnotify xorg.libX11 ]; - cargoSha256 = "0pprf8509d321azg2l51lpxylgpk7290y38z9p5hxgkcwhrhrcss"; + cargoSha256 = "0l6x59bzzilc78gsi5rlgq9zjvp8qjphfsds776ljzmkbdq8q4iz"; postInstall = lib.optionalString (bins != []) '' wrapProgram $out/bin/dwm-status --prefix "PATH" : "${stdenv.lib.makeBinPath bins}" diff --git a/pkgs/applications/window-managers/fvwm/default.nix b/pkgs/applications/window-managers/fvwm/default.nix index 27657c10a7e3..cc503b2db4f4 100644 --- a/pkgs/applications/window-managers/fvwm/default.nix +++ b/pkgs/applications/window-managers/fvwm/default.nix @@ -9,11 +9,11 @@ assert gestures -> libstroke != null; stdenv.mkDerivation rec { pname = "fvwm"; - version = "2.6.8"; + version = "2.6.9"; src = fetchurl { url = "https://github.com/fvwmorg/fvwm/releases/download/${version}/${pname}-${version}.tar.gz"; - sha256 = "0hgkkdzcqjnaabvv9cnh0bz90nnjskbhjg9qnzpi2x0mbliwjdpv"; + sha256 = "1bliqcnap7vb3m2rn8wvxyfhbf35h9x34s41fl4301yhrkrlrihv"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/applications/window-managers/i3/gaps.nix b/pkgs/applications/window-managers/i3/gaps.nix index 4d4ab6d96cc5..e5c478987df4 100644 --- a/pkgs/applications/window-managers/i3/gaps.nix +++ b/pkgs/applications/window-managers/i3/gaps.nix @@ -3,12 +3,12 @@ i3.overrideAttrs (oldAttrs : rec { name = "i3-gaps-${version}"; - version = "4.17"; + version = "4.17.1"; releaseDate = "2019-01-27"; src = fetchurl { url = "https://github.com/Airblader/i3/archive/${version}.tar.gz"; - sha256 = "1vd2xv91xrcr07s2dywq9rvidqqmbs41hlvhcvr1927gz200vgjg"; + sha256 = "02jpvwmfwv58dfdwvcvkdfcyca7l7zw7hx18aj4cqm3gg0r5pmqh"; }; nativeBuildInputs = oldAttrs.nativeBuildInputs ++ [ autoreconfHook ]; diff --git a/pkgs/applications/window-managers/i3/status-rust.nix b/pkgs/applications/window-managers/i3/status-rust.nix index 60edf05892de..c87314089515 100644 --- a/pkgs/applications/window-managers/i3/status-rust.nix +++ b/pkgs/applications/window-managers/i3/status-rust.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "i3status-rust"; - version = "0.10.0"; + version = "0.11.0"; src = fetchFromGitHub { owner = "greshake"; repo = pname; rev = "v${version}"; - sha256 = "0i1k884ha08w7r5q5z012q2w7hs333b3c18hkbrhamknpvy6c2i0"; + sha256 = "15083nagd0kzpkay5jxcq5i16yvybd4sh03g9x4q9xq4cy0qwj11"; }; - cargoSha256 = "1w43k3ld9ra7blbn593mpi8qg5pgcglwqwddkrb55yxnpnkaxvzy"; + cargoSha256 = "1cbx2jll0bj547dvwzjprzidndbqn1c4c6hmbfgjgdkxmmrpb0r1"; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/applications/window-managers/qtile/default.nix b/pkgs/applications/window-managers/qtile/default.nix index dc78702b03c5..6d0e6bdac45e 100644 --- a/pkgs/applications/window-managers/qtile/default.nix +++ b/pkgs/applications/window-managers/qtile/default.nix @@ -32,7 +32,7 @@ python37Packages.buildPythonApplication rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ glib libxcb cairo pango python37Packages.xcffib ]; - pythonPath = with python37Packages; [ xcffib cairocffi-xcffib ]; + pythonPath = with python37Packages; [ xcffib cairocffi-xcffib setuptools ]; postInstall = '' wrapProgram $out/bin/qtile \ |